Binary files /tmp/gt9PoEyweM/language-pack-zh-hans-base-12.04+20111229/data/extra.tar and /tmp/95nzOAaihX/language-pack-zh-hans-base-12.04+20120221/data/extra.tar differ diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/acl.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/acl.po 2012-02-23 07:11: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: 2011-12-29 10:35+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/adduser.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/adduser.po 2012-02-23 07:11:24.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: 2011-12-29 09:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:24+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/alsa-utils.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/alsa-utils.po 2012-02-23 07:11:24.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: alsa-utils\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-01-31 15:27+0100\n" +"POT-Creation-Date: 2012-01-25 10:44+0100\n" "PO-Revision-Date: 2009-09-16 03:39+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (Taiwan) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 09:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" @@ -216,131 +216,131 @@ msgid "Side" msgstr "" -#: alsamixer/mixer_widget.c:84 alsamixer/mixer_widget.c:89 +#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100 msgid "cannot open mixer" msgstr "" -#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:172 +#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183 msgid "cannot load mixer controls" msgstr "" -#: alsamixer/mixer_widget.c:162 +#: alsamixer/mixer_widget.c:173 #, c-format msgid "Cannot open mixer device '%s'." msgstr "" -#: alsamixer/mixer_widget.c:183 +#: alsamixer/mixer_widget.c:194 msgid "Esc Exit" msgstr "" -#: alsamixer/mixer_widget.c:184 +#: alsamixer/mixer_widget.c:195 msgid "F1 ? H Help" msgstr "" -#: alsamixer/mixer_widget.c:185 +#: alsamixer/mixer_widget.c:196 msgid "F2 / System information" msgstr "" -#: alsamixer/mixer_widget.c:186 +#: alsamixer/mixer_widget.c:197 msgid "F3 Show playback controls" msgstr "" -#: alsamixer/mixer_widget.c:187 +#: alsamixer/mixer_widget.c:198 msgid "F4 Show capture controls" msgstr "" -#: alsamixer/mixer_widget.c:188 +#: alsamixer/mixer_widget.c:199 msgid "F5 Show all controls" msgstr "" -#: alsamixer/mixer_widget.c:189 +#: alsamixer/mixer_widget.c:200 msgid "Tab Toggle view mode (F3/F4/F5)" msgstr "" -#: alsamixer/mixer_widget.c:190 +#: alsamixer/mixer_widget.c:201 msgid "F6 S Select sound card" msgstr "" -#: alsamixer/mixer_widget.c:191 +#: alsamixer/mixer_widget.c:202 msgid "L Redraw screen" msgstr "" -#: alsamixer/mixer_widget.c:193 +#: alsamixer/mixer_widget.c:204 msgid "Left Move to the previous control" msgstr "" -#: alsamixer/mixer_widget.c:194 +#: alsamixer/mixer_widget.c:205 msgid "Right Move to the next control" msgstr "" -#: alsamixer/mixer_widget.c:196 +#: alsamixer/mixer_widget.c:207 msgid "Up/Down Change volume" msgstr "" -#: alsamixer/mixer_widget.c:197 +#: alsamixer/mixer_widget.c:208 msgid "+ - Change volume" msgstr "" -#: alsamixer/mixer_widget.c:198 +#: alsamixer/mixer_widget.c:209 msgid "Page Up/Dn Change volume in big steps" msgstr "" -#: alsamixer/mixer_widget.c:199 +#: alsamixer/mixer_widget.c:210 msgid "End Set volume to 0%" msgstr "" -#: alsamixer/mixer_widget.c:200 +#: alsamixer/mixer_widget.c:211 msgid "0-9 Set volume to 0%-90%" msgstr "" -#: alsamixer/mixer_widget.c:201 +#: alsamixer/mixer_widget.c:212 msgid "Q W E Increase left/both/right volumes" msgstr "" #. TRANSLATORS: or Y instead of Z -#: alsamixer/mixer_widget.c:203 +#: alsamixer/mixer_widget.c:214 msgid "Z X C Decrease left/both/right volumes" msgstr "" -#: alsamixer/mixer_widget.c:204 +#: alsamixer/mixer_widget.c:215 msgid "B Balance left and right volumes" msgstr "" -#: alsamixer/mixer_widget.c:206 +#: alsamixer/mixer_widget.c:217 msgid "M Toggle mute" msgstr "" #. TRANSLATORS: or , . -#: alsamixer/mixer_widget.c:208 +#: alsamixer/mixer_widget.c:219 msgid "< > Toggle left/right mute" msgstr "" -#: alsamixer/mixer_widget.c:210 +#: alsamixer/mixer_widget.c:221 msgid "Space Toggle capture" msgstr "" #. TRANSLATORS: or Insert Delete -#: alsamixer/mixer_widget.c:212 +#: alsamixer/mixer_widget.c:223 msgid "; ' Toggle left/right capture" msgstr "" -#: alsamixer/mixer_widget.c:214 +#: alsamixer/mixer_widget.c:225 msgid "Authors:" msgstr "" -#: alsamixer/mixer_widget.c:215 +#: alsamixer/mixer_widget.c:226 msgid " Tim Janik" msgstr "" -#: alsamixer/mixer_widget.c:216 +#: alsamixer/mixer_widget.c:227 msgid " Jaroslav Kysela " msgstr "" -#: alsamixer/mixer_widget.c:217 +#: alsamixer/mixer_widget.c:228 msgid " Clemens Ladisch " msgstr "" -#: alsamixer/mixer_widget.c:219 +#: alsamixer/mixer_widget.c:230 msgid "Help" msgstr "" @@ -357,23 +357,23 @@ msgid "Cannot open file \"%s\"." msgstr "" -#: aplay/aplay.c:152 +#: aplay/aplay.c:163 msgid "raw data" msgstr "原始資料" -#: aplay/aplay.c:153 +#: aplay/aplay.c:164 msgid "VOC" msgstr "VOC" -#: aplay/aplay.c:155 +#: aplay/aplay.c:166 msgid "WAVE" msgstr "WAVE" -#: aplay/aplay.c:156 +#: aplay/aplay.c:167 msgid "Sparc Audio" msgstr "Sparc Audio" -#: aplay/aplay.c:177 +#: aplay/aplay.c:188 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -403,12 +403,14 @@ "-v, --verbose show PCM structure and setup (accumulative)\n" "-V, --vumeter=TYPE enable VU meter (TYPE: mono or stereo)\n" "-I, --separate-channels one file for each channel\n" +"-i, --interactive allow interactive operation from stdin\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" " --disable-softvol disable software volume control (softvol)\n" " --test-position test ring buffer position\n" -" --test-coef=#\t test coeficient for ring buffer position (default 8)\n" +" --test-coef=# test coefficient for ring buffer position (default " +"8)\n" " expression for validation is: coef * (buffer_size / " "2)\n" " --test-nowait do not wait for ring buffer - eats whole CPU\n" @@ -419,12 +421,12 @@ " --use-strftime apply the strftime facility to the output file name\n" msgstr "" -#: aplay/aplay.c:216 speaker-test/speaker-test.c:819 +#: aplay/aplay.c:228 speaker-test/speaker-test.c:819 #, c-format msgid "Recognized sample formats are:" msgstr "認可的取樣格式是︰" -#: aplay/aplay.c:222 +#: aplay/aplay.c:234 #, c-format msgid "" "\n" @@ -433,450 +435,450 @@ "\n" "有部份可能選取的硬體不提供\n" -#: aplay/aplay.c:223 +#: aplay/aplay.c:235 #, c-format msgid "The availabled format shortcuts are:\n" msgstr "可用的快捷键格式是:\n" -#: aplay/aplay.c:224 +#: aplay/aplay.c:236 #, c-format msgid "-f cd (16 bit little endian, 44100, stereo)\n" msgstr "-f cd (16 bit little endian, 44100, stereo)\n" -#: aplay/aplay.c:225 +#: aplay/aplay.c:237 #, c-format msgid "-f cdr (16 bit big endian, 44100, stereo)\n" msgstr "-f cdr (16 bit big endian, 44100, stereo)\n" -#: aplay/aplay.c:226 +#: aplay/aplay.c:238 #, c-format msgid "-f dat (16 bit little endian, 48000, stereo)\n" msgstr "-f dat (16 bit little endian, 48000, stereo)\n" -#: aplay/aplay.c:240 +#: aplay/aplay.c:252 msgid "no soundcards found..." msgstr "找不到音效卡…" -#: aplay/aplay.c:243 +#: aplay/aplay.c:255 #, c-format msgid "**** List of %s Hardware Devices ****\n" msgstr "**** %s 硬體裝置清單 ****\n" -#: aplay/aplay.c:272 +#: aplay/aplay.c:284 #, c-format msgid "card %i: %s [%s], device %i: %s [%s]\n" msgstr "card %i: %s [%s], device %i: %s [%s]\n" -#: aplay/aplay.c:278 +#: aplay/aplay.c:290 #, c-format msgid " Subdevices: %i/%i\n" msgstr " 子设备: %i/%i\n" -#: aplay/aplay.c:285 +#: aplay/aplay.c:297 #, c-format msgid " Subdevice #%i: %s\n" msgstr " 子设备 #%i: %s\n" -#: aplay/aplay.c:362 +#: aplay/aplay.c:380 #, c-format msgid "Aborted by signal %s...\n" msgstr "被信号 %s...退出\n" -#: aplay/aplay.c:473 +#: aplay/aplay.c:492 msgid "command should be named either arecord or aplay" msgstr "无论是录音还是播放,命令应该被命名" -#: aplay/aplay.c:512 +#: aplay/aplay.c:531 #, c-format msgid "unrecognized file format %s" msgstr "未認可的檔案格式 %s" -#: aplay/aplay.c:519 +#: aplay/aplay.c:538 #, c-format msgid "value %i for channels is invalid" msgstr "频道的值%i 是无效的" -#: aplay/aplay.c:538 +#: aplay/aplay.c:557 #, c-format msgid "wrong extended format '%s'" msgstr "错误的拓展形式 '%s'" -#: aplay/aplay.c:549 +#: aplay/aplay.c:568 #, c-format msgid "bad speed value %i" msgstr "错误的速度值: %i" -#: aplay/aplay.c:644 +#: aplay/aplay.c:666 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "请尝试执行\"%s --help\"来获取更多信息。\n" -#: aplay/aplay.c:660 +#: aplay/aplay.c:682 #, c-format msgid "audio open error: %s" msgstr "音乐打开错误: %s" -#: aplay/aplay.c:665 +#: aplay/aplay.c:687 #, c-format msgid "info error: %s" msgstr "資訊錯誤︰%s" -#: aplay/aplay.c:672 +#: aplay/aplay.c:694 #, c-format msgid "nonblock setting error: %s" msgstr "未设置块错误: %s" -#: aplay/aplay.c:682 aplay/aplay.c:806 aplay/aplay.c:1174 +#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196 msgid "not enough memory" msgstr "記憶體不足" -#: aplay/aplay.c:706 +#: aplay/aplay.c:728 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "" -#: aplay/aplay.c:796 +#: aplay/aplay.c:818 #, c-format msgid "read error (called from line %i)" msgstr "讀取錯誤(第 %i 行)" -#: aplay/aplay.c:854 +#: aplay/aplay.c:876 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "未知'fmt'块的长度(读 %u,至少应该是%u)" -#: aplay/aplay.c:864 +#: aplay/aplay.c:886 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" msgstr "可拓展'fmt'块的长度未知(读%u,应该至少%u)" -#: aplay/aplay.c:869 +#: aplay/aplay.c:891 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "在'fmt'块中的错误格式标签" -#: aplay/aplay.c:876 +#: aplay/aplay.c:898 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "不能播放不是PCM或者FLOAT编码的0x%04x格式的波形文件" -#: aplay/aplay.c:880 +#: aplay/aplay.c:902 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "不能播放%d声道的波形文件" -#: aplay/aplay.c:888 aplay/aplay.c:988 +#: aplay/aplay.c:910 aplay/aplay.c:1010 #, c-format msgid "Warning: format is changed to U8\n" msgstr "警告:格式已變更至 U8\n" -#: aplay/aplay.c:894 +#: aplay/aplay.c:916 #, c-format msgid "Warning: format is changed to S16_LE\n" msgstr "警告:格式已變更至 S16_LE\n" -#: aplay/aplay.c:902 +#: aplay/aplay.c:924 #, c-format msgid "Warning: format is changed to S24_3LE\n" msgstr "警告:格式已變更至 S24_3LE\n" -#: aplay/aplay.c:908 +#: aplay/aplay.c:930 #, c-format msgid "Warning: format is changed to S24_LE\n" msgstr "警告:格式已變更至 S24_LE\n" -#: aplay/aplay.c:912 +#: aplay/aplay.c:934 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" msgstr " 不能播放有着%d比特样本在%d比特宽度(%d个频道)的波形文件" -#: aplay/aplay.c:924 +#: aplay/aplay.c:946 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr " 不能播放有着样本文件%d宽度样本文件的波形文件" -#: aplay/aplay.c:982 +#: aplay/aplay.c:1004 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "警告:格式已變更至 MU_LAW\n" -#: aplay/aplay.c:994 +#: aplay/aplay.c:1016 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "警告:格式已變更至 S16_BE\n" -#: aplay/aplay.c:1007 aplay/aplay.c:1925 aplay/aplay.c:1932 aplay/aplay.c:2455 -#: aplay/aplay.c:2467 +#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483 +#: aplay/aplay.c:2495 msgid "read error" msgstr "讀取錯誤" -#: aplay/aplay.c:1037 +#: aplay/aplay.c:1059 msgid "Broken configuration for this PCM: no configurations available" msgstr "被破坏的PCM配置:没有可用的配置文件" -#: aplay/aplay.c:1054 +#: aplay/aplay.c:1076 msgid "Access type not available" msgstr "类型不可用" -#: aplay/aplay.c:1059 +#: aplay/aplay.c:1081 msgid "Sample format non available" msgstr "样本格式不可用" -#: aplay/aplay.c:1065 +#: aplay/aplay.c:1087 msgid "Channels count non available" msgstr "频道计数不可用" -#: aplay/aplay.c:1080 +#: aplay/aplay.c:1102 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "警告:频率不精确(要求=%iHz,收到=%iHz)\n" -#: aplay/aplay.c:1086 +#: aplay/aplay.c:1108 #, c-format msgid " please, try the plug plugin %s\n" msgstr " 请尝试plug插件%s\n" -#: aplay/aplay.c:1123 +#: aplay/aplay.c:1145 msgid "Unable to install hw params:" msgstr "无法安装hw参数:" -#: aplay/aplay.c:1130 +#: aplay/aplay.c:1152 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "无法使用和缓冲区大小(%lu==%lu)一样的时间段" -#: aplay/aplay.c:1161 +#: aplay/aplay.c:1183 msgid "unable to install sw params:" msgstr "无法安装sw参数:" -#: aplay/aplay.c:1192 +#: aplay/aplay.c:1214 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "" -#: aplay/aplay.c:1215 +#: aplay/aplay.c:1239 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "" -#: aplay/aplay.c:1237 +#: aplay/aplay.c:1263 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "" -#: aplay/aplay.c:1242 +#: aplay/aplay.c:1268 #, c-format msgid "pause push error: %s" msgstr "" -#: aplay/aplay.c:1251 +#: aplay/aplay.c:1277 #, c-format msgid "pause release error: %s" msgstr "" -#: aplay/aplay.c:1265 +#: aplay/aplay.c:1293 #, c-format msgid "" "\r=== PAUSE === " msgstr "" -#: aplay/aplay.c:1307 +#: aplay/aplay.c:1335 #, c-format msgid "status error: %s" msgstr "状态错误:%s" -#: aplay/aplay.c:1317 aplay/aplay.c:1328 +#: aplay/aplay.c:1345 aplay/aplay.c:1356 #, c-format msgid "%s!!! (at least %.3f ms long)\n" msgstr "%s(至少%.3f ms长)\n" -#: aplay/aplay.c:1318 aplay/aplay.c:1321 aplay/aplay.c:1329 +#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357 msgid "underrun" msgstr "后台运行" -#: aplay/aplay.c:1318 aplay/aplay.c:1329 +#: aplay/aplay.c:1346 aplay/aplay.c:1357 msgid "overrun" msgstr "前台运行" -#: aplay/aplay.c:1333 +#: aplay/aplay.c:1361 #, c-format msgid "Status:\n" msgstr "状态:\n" -#: aplay/aplay.c:1337 +#: aplay/aplay.c:1365 #, c-format msgid "xrun: prepare error: %s" msgstr "xrun:准备错误:%s" -#: aplay/aplay.c:1343 +#: aplay/aplay.c:1371 #, c-format msgid "Status(DRAINING):\n" msgstr "状态(DRAINING):\n" -#: aplay/aplay.c:1347 +#: aplay/aplay.c:1375 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "捕捉流格式变化?尝试恢复...\n" -#: aplay/aplay.c:1349 +#: aplay/aplay.c:1377 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "xrun(DRAINING):准备错误:%s" -#: aplay/aplay.c:1356 +#: aplay/aplay.c:1384 #, c-format msgid "Status(R/W):\n" msgstr "状态(R/W):\n" -#: aplay/aplay.c:1359 +#: aplay/aplay.c:1387 #, c-format msgid "read/write error, state = %s" msgstr "读/写错误,状态=%s" -#: aplay/aplay.c:1369 +#: aplay/aplay.c:1397 #, c-format msgid "Suspended. Trying resume. " msgstr "停止了,正尝试恢复 " -#: aplay/aplay.c:1374 +#: aplay/aplay.c:1402 #, c-format msgid "Failed. Restarting stream. " msgstr "失败,正重新开始流 " -#: aplay/aplay.c:1376 +#: aplay/aplay.c:1404 #, c-format msgid "suspend: prepare error: %s" msgstr "停止:准备错误:%s" -#: aplay/aplay.c:1381 +#: aplay/aplay.c:1409 #, c-format msgid "Done.\n" msgstr "完成。\n" -#: aplay/aplay.c:1403 +#: aplay/aplay.c:1431 #, c-format msgid " !clip " msgstr " !clip " -#: aplay/aplay.c:1550 +#: aplay/aplay.c:1578 #, c-format msgid "Unsupported bit size %d.\n" msgstr "不支持的比特大小%d。\n" -#: aplay/aplay.c:1584 +#: aplay/aplay.c:1612 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "最大峰值(%li 样本):0x%08x " -#: aplay/aplay.c:1618 +#: aplay/aplay.c:1646 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " "%li\n" msgstr "可疑的缓冲位置(总共 %li):作用=%li,延迟=%li,缓冲=%li\n" -#: aplay/aplay.c:1682 +#: aplay/aplay.c:1710 #, c-format msgid "write error: %s" msgstr "写入错误:%s" -#: aplay/aplay.c:1729 +#: aplay/aplay.c:1757 #, c-format msgid "writev error: %s" msgstr "writev 错误: %s" -#: aplay/aplay.c:1773 +#: aplay/aplay.c:1801 #, c-format msgid "read error: %s" msgstr "读取错误:%s" -#: aplay/aplay.c:1817 +#: aplay/aplay.c:1845 #, c-format msgid "readv error: %s" msgstr "readv 错误: %s" -#: aplay/aplay.c:1865 +#: aplay/aplay.c:1893 msgid "can't allocate buffer for silence" msgstr "不能为无声分配缓冲" -#: aplay/aplay.c:1874 aplay/aplay.c:2100 aplay/aplay.c:2105 aplay/aplay.c:2152 -#: aplay/aplay.c:2161 aplay/aplay.c:2168 aplay/aplay.c:2178 aplay/aplay.c:2184 -#: aplay/aplay.c:2256 aplay/aplay.c:2286 aplay/aplay.c:2300 +#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180 +#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212 +#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328 msgid "write error" msgstr "写入错误" -#: aplay/aplay.c:1887 +#: aplay/aplay.c:1915 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - 无声错误" -#: aplay/aplay.c:1890 +#: aplay/aplay.c:1918 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush 错误" -#: aplay/aplay.c:1916 +#: aplay/aplay.c:1944 msgid "malloc error" msgstr "分配错误" -#: aplay/aplay.c:1920 +#: aplay/aplay.c:1948 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "正在播放Creative Labs Channel 文件 '%s'...\n" -#: aplay/aplay.c:1988 aplay/aplay.c:2080 +#: aplay/aplay.c:2016 aplay/aplay.c:2108 msgid "can't play packed .voc files" msgstr "无法播放打包的.voc文件" -#: aplay/aplay.c:2040 +#: aplay/aplay.c:2068 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "无法播放循环;%s不可取\n" -#: aplay/aplay.c:2089 +#: aplay/aplay.c:2117 #, c-format msgid "unknown blocktype %d. terminate." msgstr "未知块类型 %d。结束。" -#: aplay/aplay.c:2220 +#: aplay/aplay.c:2248 #, c-format msgid "Wave doesn't support %s format..." msgstr "波不支持%s格式..." -#: aplay/aplay.c:2280 +#: aplay/aplay.c:2308 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc Audio不支持%s格式..." -#: aplay/aplay.c:2361 +#: aplay/aplay.c:2389 msgid "Playing" msgstr "正在播放" -#: aplay/aplay.c:2361 +#: aplay/aplay.c:2389 msgid "Recording" msgstr "正在录音" -#: aplay/aplay.c:2365 +#: aplay/aplay.c:2393 #, c-format msgid "Rate %d Hz, " msgstr "频率%dHz, " -#: aplay/aplay.c:2367 +#: aplay/aplay.c:2395 #, c-format msgid "Mono" msgstr "Mono" -#: aplay/aplay.c:2369 +#: aplay/aplay.c:2397 #, c-format msgid "Stereo" msgstr "Stereo" -#: aplay/aplay.c:2371 +#: aplay/aplay.c:2399 #, c-format msgid "Channels %i" msgstr "频道 %i" -#: aplay/aplay.c:2882 aplay/aplay.c:2935 +#: aplay/aplay.c:2910 aplay/aplay.c:2963 #, c-format msgid "You need to specify %d files" msgstr "你需要指定%d个文件" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2012-01-02 18:07:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2012-02-23 07:11:57.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: 2011-12-29 16:37+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/app-install-data.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/app-install-data.po 2012-01-02 18:07:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/app-install-data.po 2012-02-23 07:11:57.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: app-install-data-ubuntu\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-11-28 20:33+0000\n" +"POT-Creation-Date: 2012-01-31 17:33+0000\n" "PO-Revision-Date: 2011-09-13 11:56+0000\n" "Last-Translator: John Lin \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:42+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:42+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" @@ -51,29 +51,29 @@ msgstr "为最新的 ATI 显卡提供优化的 OpenGL 硬件加速" #: ../menu-data-additional/flashplugin-installer.desktop.in.h:1 -msgid "Adobe Flash plugin" -msgstr "Adobe Flash 插件" - -#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2 msgid "Installer for the Adobe Flash plugin for Mozilla" msgstr "Mozilla 的 Adobe Flash 插件安装程序" -#: ../menu-data-additional/gnome-utils.desktop.in.h:1 -msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool" -msgstr "字典,磁盘使用分析器,日志文件查看器,搜索工具" +#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2 +msgid "Adobe Flash plugin" +msgstr "Adobe Flash 插件" -#: ../menu-data-additional/gnome-utils.desktop.in.h:2 +#: ../menu-data-additional/gnome-utils.desktop.in.h:1 msgid "GNOME Desktop Utilities" msgstr "GNOME 桌面工具" -#: ../menu-data-additional/icedtea-plugin.desktop.in.h:1 -msgid "Icedtea Java Browser Plugin" -msgstr "Icedtea Java 浏览器插件" +#: ../menu-data-additional/gnome-utils.desktop.in.h:2 +msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool" +msgstr "字典,磁盘使用分析器,日志文件查看器,搜索工具" -#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2 +#: ../menu-data-additional/icedtea-plugin.desktop.in.h:1 msgid "Icedtea Java Plugin" msgstr "Icedtea Java 插件" +#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2 +msgid "Icedtea Java Browser Plugin" +msgstr "Icedtea Java 浏览器插件" + #: ../menu-data-additional/kernelpanic.desktop.in.h:1 msgid "Kernel Panic" msgstr "Kernel Panic" @@ -141,21 +141,21 @@ msgstr "这是一个免费剪贴画集" #: ../menu-data-additional/pidgin-otr.desktop.in.h:1 -msgid "Off-the-Record Messaging plugin for pidgin" -msgstr "Pidgin 私密通信插件" - -#: ../menu-data-additional/pidgin-otr.desktop.in.h:2 msgid "Pidgin Internet Messenger Off-the-Record Plugin" msgstr "Pidgin 即时通信软件的无痕迹聊天插件" -#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1 -msgid "30 useful plugins for pidgin" -msgstr "30 个有用的 Pidgin 插件" +#: ../menu-data-additional/pidgin-otr.desktop.in.h:2 +msgid "Off-the-Record Messaging plugin for pidgin" +msgstr "Pidgin 私密通信插件" -#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2 +#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1 msgid "Pidgin Internet Messenger Plugin Pack" msgstr "Pidgin 互联网即时通信软件的插件包" +#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2 +msgid "30 useful plugins for pidgin" +msgstr "30 个有用的 Pidgin 插件" + #: ../menu-data-additional/rar.desktop.in.h:1 msgid "RAR" msgstr "RAR格式的文件" @@ -165,21 +165,21 @@ msgstr "RAR 压缩/解压缩工具" #: ../menu-data-additional/spamassassin.desktop.in.h:1 -msgid "Spam filter using text analysis (works with Evolution Mail)" -msgstr "使用文本分析的垃圾邮件过滤器(用于 Evolution 邮件应用程序)" - -#: ../menu-data-additional/spamassassin.desktop.in.h:2 msgid "Spamassassin" msgstr "Spamassassin" -#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:1 -msgid "A totem plugin to watch streams from arte.tv" -msgstr "用来收看来自 arte.tv 视频流的 totem 插件" +#: ../menu-data-additional/spamassassin.desktop.in.h:2 +msgid "Spam filter using text analysis (works with Evolution Mail)" +msgstr "使用文本分析的垃圾邮件过滤器(用于 Evolution 邮件应用程序)" -#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2 +#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:1 msgid "Arte plugin for totem" msgstr "totem 上的 Arte 的插件" +#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2 +msgid "A totem plugin to watch streams from arte.tv" +msgstr "用来收看来自 arte.tv 视频流的 totem 插件" + #: ../menu-data-additional/ubuntu-restricted-extras.desktop.in.h:1 msgid "" "Commonly used applications with restricted copyright (mp3, avi, mpeg, " @@ -290,14 +290,14 @@ msgstr "Thunderbird 的 GPG 支持" #: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:1 +msgid "Firefox Launchpad plugin" +msgstr "Firefox Launchpad 插件" + +#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2 msgid "" "Firefox Launchpad integration adds quick search for Launchpad services" msgstr "Firefox 与 Launchpad 的整合程序,为 Lanchpad 服务添加快速查找" -#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2 -msgid "Firefox Launchpad plugin" -msgstr "Firefox Launchpad 插件" - #: ../menu-data-xul-extensions/xul-ext-ubufox.desktop.in.h:1 msgid "Ubufox extension for Firefox" msgstr "Firefox Ubufox 扩展" @@ -315,12 +315,20 @@ msgstr "X11 下的 3D 国际象棋" #: ../menu-data/3depict:3depict.desktop.in.h:1 +msgid "Valued point cloud visualisation and analysis" +msgstr "数值点群的可视化和分析" + +#: ../menu-data/3depict:3depict.desktop.in.h:2 msgid "3depict" msgstr "3depict" -#: ../menu-data/3depict:3depict.desktop.in.h:2 -msgid "Valued point cloud visualisation and analysis" -msgstr "数值点群的可视化和分析" +#: ../menu-data/4digits:4digits.desktop.in.h:1 +msgid "4digits" +msgstr "" + +#: ../menu-data/4digits:4digits.desktop.in.h:2 +msgid "A guess-the-number game, aka Bulls and Cows" +msgstr "" #: ../menu-data/7kaa:7kaa.desktop.in.h:1 msgid "Seven Kingdoms" @@ -363,21 +371,21 @@ msgstr "管理音乐" #: ../menu-data/abuse:abuse.desktop.in.h:1 -msgid "A side-scrolling shoot-em-up action game" -msgstr "横版动作射击游戏" - -#: ../menu-data/abuse:abuse.desktop.in.h:2 msgid "Abuse" msgstr "Abuse" -#: ../menu-data/accerciser:accerciser.desktop.in.h:1 -msgid "Accerciser Accessibility Explorer" -msgstr "" +#: ../menu-data/abuse:abuse.desktop.in.h:2 +msgid "A side-scrolling shoot-em-up action game" +msgstr "横版动作射击游戏" -#: ../menu-data/accerciser:accerciser.desktop.in.h:2 +#: ../menu-data/accerciser:accerciser.desktop.in.h:1 msgid "Give your application an accessibility workout" msgstr "为您的应用程序提供一个无障碍解决方案" +#: ../menu-data/accerciser:accerciser.desktop.in.h:2 +msgid "Accerciser Accessibility Explorer" +msgstr "" + #: ../menu-data/ace-of-penguins:penguin-canfield.desktop.in.h:1 msgid "Penguin Canfield" msgstr "" @@ -491,13 +499,13 @@ msgstr "在 4D 环境下驾驶您的飞船" #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:1 -msgid "A 2D graphical RPG" -msgstr "一个 2D 图形化角色扮演游戏" - -#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2 msgid "Waste's Edge" msgstr "荒野之缘" +#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2 +msgid "A 2D graphical RPG" +msgstr "一个 2D 图形化角色扮演游戏" + #: ../menu-data/adun.app:UL.desktop.in.h:1 msgid "Adun" msgstr "Adun" @@ -507,13 +515,13 @@ msgstr "生物分子模拟器" #: ../menu-data/aee:xae.desktop.in.h:1 -msgid "Small text editor" -msgstr "小文本编辑器" - -#: ../menu-data/aee:xae.desktop.in.h:2 msgid "xae" msgstr "xae" +#: ../menu-data/aee:xae.desktop.in.h:2 +msgid "Small text editor" +msgstr "小文本编辑器" + #: ../menu-data/aeolus:aeolus.desktop.in.h:1 msgid "Aeolus" msgstr "Aeolus" @@ -539,13 +547,13 @@ msgstr "生成颜色图" #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:1 -msgid "Simple agenda and calendar application for GNUstep" -msgstr "GNUstep 的简单日程表和日历程序" - -#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2 msgid "SimpleAgenda" msgstr "SimpleAgenda" +#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2 +msgid "Simple agenda and calendar application for GNUstep" +msgstr "GNUstep 的简单日程表和日历程序" + #: ../menu-data/agtl:advancedcaching.desktop.in.h:1 msgid "AGTL Geocaching Tool" msgstr "" @@ -579,21 +587,21 @@ msgstr "" #: ../menu-data/akregator:kde4__akregator.desktop.in.h:1 -msgid "A KDE News Feed Reader" -msgstr "" - -#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2 msgid "Akregator" msgstr "Akregator" -#: ../menu-data/alacarte:alacarte.desktop.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "更改显示于主菜单的应用程序" +#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2 +msgid "A KDE News Feed Reader" +msgstr "" -#: ../menu-data/alacarte:alacarte.desktop.in.h:2 +#: ../menu-data/alacarte:alacarte.desktop.in.h:1 msgid "Main Menu" msgstr "主菜单" +#: ../menu-data/alacarte:alacarte.desktop.in.h:2 +msgid "Change which applications are shown on the main menu" +msgstr "更改显示于主菜单的应用程序" + #: ../menu-data/alarm-clock-applet:alarm-clock-applet.desktop.in.h:1 #: ../menu-data/alarm-clock:alarm-clock.desktop.in.h:1 msgid "Alarm Clock" @@ -616,13 +624,13 @@ msgstr "复古平台游戏" #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1 -msgid "A standalone 3D first person online deathmatch shooter" -msgstr "" - -#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2 msgid "Alien Arena" msgstr "Alien Arena" +#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2 +msgid "A standalone 3D first person online deathmatch shooter" +msgstr "" + #: ../menu-data/aliki:aliki-alsa.desktop.in.h:1 msgid "Aliki (with ALSA support)" msgstr "" @@ -681,6 +689,14 @@ msgid "OpenAL-Soft Configuration Utility" msgstr "OpenAL-Soft 配置工具" +#: ../menu-data/altos:altos.desktop.in.h:1 +msgid "AltOS UI" +msgstr "" + +#: ../menu-data/altos:altos.desktop.in.h:2 +msgid "View and log downlink data from Altus Metrum products" +msgstr "" + #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1 msgid "Amarok" msgstr "Amarok" @@ -690,19 +706,19 @@ msgstr "Amarok - 重新发现您的音乐!" #: ../menu-data/amide:amide.desktop.in.h:1 -msgid "A Medical Image Data Examiner" -msgstr "医学影像数据的检验工具" - -#: ../menu-data/amide:amide.desktop.in.h:2 msgid "Amide" msgstr "Amide" +#: ../menu-data/amide:amide.desktop.in.h:2 +msgid "A Medical Image Data Examiner" +msgstr "医学影像数据的检验工具" + #: ../menu-data/amoebax:amoebax.desktop.in.h:1 -msgid "Amoebax" +msgid "Defeat your opponent by filling up their grid up with garbage." msgstr "" #: ../menu-data/amoebax:amoebax.desktop.in.h:2 -msgid "Defeat your opponent by filling up their grid up with garbage." +msgid "Amoebax" msgstr "" #: ../menu-data/amor:kde4__amor.desktop.in.h:1 @@ -738,37 +754,37 @@ msgstr "模块化软件合成" #: ../menu-data/amsn:amsn.desktop.in.h:1 -msgid "MSN Messenger for Linux" -msgstr "Linux 下的 MSN 信使" - -#: ../menu-data/amsn:amsn.desktop.in.h:2 msgid "aMSN" msgstr "aMSN" -#: ../menu-data/amsynth:amsynth.desktop.in.h:1 -msgid "Two oscillator software synthesizer" -msgstr "双振荡器软件合成器" +#: ../menu-data/amsn:amsn.desktop.in.h:2 +msgid "MSN Messenger for Linux" +msgstr "Linux 下的 MSN 信使" -#: ../menu-data/amsynth:amsynth.desktop.in.h:2 +#: ../menu-data/amsynth:amsynth.desktop.in.h:1 msgid "amSynth" msgstr "amSynth" -#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1 -msgid "aMule remote control" -msgstr "aMule 远程控制" +#: ../menu-data/amsynth:amsynth.desktop.in.h:2 +msgid "Two oscillator software synthesizer" +msgstr "双振荡器软件合成器" -#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2 +#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1 msgid "aMuleGUI" msgstr "aMuleGUI" -#: ../menu-data/amule:amule.desktop.in.h:1 -msgid "A client for the eD2k network" -msgstr "一个 eD2k 网络客户端" +#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2 +msgid "aMule remote control" +msgstr "aMule 远程控制" -#: ../menu-data/amule:amule.desktop.in.h:2 +#: ../menu-data/amule:amule.desktop.in.h:1 msgid "aMule" msgstr "aMule" +#: ../menu-data/amule:amule.desktop.in.h:2 +msgid "A client for the eD2k network" +msgstr "一个 eD2k 网络客户端" + #: ../menu-data/anagramarama:anagramarama.desktop.in.h:1 msgid "Anagramarama" msgstr "Anagramarama" @@ -778,32 +794,32 @@ msgstr "使用SDL开发的高速拼词游戏" #: ../menu-data/angband:angband-gtk.desktop.in.h:1 -#: ../menu-data/angband:angband-sdl.desktop.in.h:1 -#: ../menu-data/angband:angband-x11.desktop.in.h:1 -msgid "" -"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien" +msgid "Angband (GTK)" msgstr "" #: ../menu-data/angband:angband-gtk.desktop.in.h:2 -msgid "Angband (GTK)" +#: ../menu-data/angband:angband-sdl.desktop.in.h:2 +#: ../menu-data/angband:angband-x11.desktop.in.h:2 +msgid "" +"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien" msgstr "" -#: ../menu-data/angband:angband-sdl.desktop.in.h:2 +#: ../menu-data/angband:angband-sdl.desktop.in.h:1 msgid "Angband (SDL)" msgstr "" -#: ../menu-data/angband:angband-x11.desktop.in.h:2 +#: ../menu-data/angband:angband-x11.desktop.in.h:1 msgid "Angband (X11)" msgstr "" #: ../menu-data/angrydd:angrydd.desktop.in.h:1 -msgid "\"Falling blocks puzzle game\"" -msgstr "俄罗斯方块游戏" - -#: ../menu-data/angrydd:angrydd.desktop.in.h:2 msgid "Angry Drunken Dwarves" msgstr "愤怒的醉酒小矮人" +#: ../menu-data/angrydd:angrydd.desktop.in.h:2 +msgid "\"Falling blocks puzzle game\"" +msgstr "俄罗斯方块游戏" + #: ../menu-data/anjuta:anjuta.desktop.in.h:1 msgid "Anjuta IDE" msgstr "Anjuta IDE" @@ -813,21 +829,21 @@ msgstr "在集成开发环境中开发软件" #: ../menu-data/anki:anki.desktop.in.h:1 -msgid "An intelligent spaced-repetition memory training program" -msgstr "一个巧妙的空间重复记忆力训练程序" - -#: ../menu-data/anki:anki.desktop.in.h:2 msgid "Anki" msgstr "Anki" -#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1 -msgid "Translate as you type" -msgstr "在打字的同时进行翻译" +#: ../menu-data/anki:anki.desktop.in.h:2 +msgid "An intelligent spaced-repetition memory training program" +msgstr "一个巧妙的空间重复记忆力训练程序" -#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2 +#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1 msgid "Translator" msgstr "Translator" +#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2 +msgid "Translate as you type" +msgstr "在打字的同时进行翻译" + #: ../menu-data/apper:kde4__apper.desktop.in.h:1 msgid "Apper" msgstr "" @@ -841,7 +857,7 @@ msgstr "Aptitude 软件包管理器" #: ../menu-data/aptitude-gtk:aptitude-gtk.desktop.in.h:2 -#: ../menu-data/synaptic:synaptic.desktop.in.h:1 +#: ../menu-data/synaptic:synaptic.desktop.in.h:2 msgid "Install, remove and upgrade software packages" msgstr "安装、删除和升级软件包" @@ -858,13 +874,13 @@ msgstr "AptURL" #: ../menu-data/apvlv:apvlv.desktop.in.h:1 -msgid "Alf's PDF Viewer Like Vim" -msgstr "" - -#: ../menu-data/apvlv:apvlv.desktop.in.h:2 msgid "apvlv" msgstr "apvlv" +#: ../menu-data/apvlv:apvlv.desktop.in.h:2 +msgid "Alf's PDF Viewer Like Vim" +msgstr "" + #: ../menu-data/aqemu:aqemu.desktop.in.h:1 msgid "AQEMU" msgstr "AQEMU" @@ -923,11 +939,11 @@ msgstr "" #: ../menu-data/ardesia:ardesia.desktop.in.h:1 -msgid "Annotate on the desktop screen." +msgid "Ardesia desktop sketchpad " msgstr "" #: ../menu-data/ardesia:ardesia.desktop.in.h:2 -msgid "Ardesia desktop sketchpad " +msgid "Annotate on the desktop screen." msgstr "" #: ../menu-data/ardour-i686:ardour.desktop.in.h:1 @@ -981,21 +997,21 @@ msgstr "" #: ../menu-data/armagetronad:armagetronad.desktop.in.h:1 -msgid "3d light cycle game" -msgstr "3D 模式的自行车比赛" - -#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2 msgid "Armagetron Advanced" msgstr "Armagetron 高级版" +#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2 +msgid "3d light cycle game" +msgstr "3D 模式的自行车比赛" + #: ../menu-data/arora:arora.desktop.in.h:1 msgid "Arora" msgstr "Arora" #: ../menu-data/arora:arora.desktop.in.h:2 -#: ../menu-data/dooble:dooble.desktop.in.h:1 -#: ../menu-data/firefox:firefox.desktop.in.h:1 -#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1 +#: ../menu-data/dooble:dooble.desktop.in.h:2 +#: ../menu-data/firefox:firefox.desktop.in.h:2 +#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2 msgid "Browse the World Wide Web" msgstr "浏览互联网" @@ -1016,21 +1032,21 @@ msgstr "定义命令" #: ../menu-data/asciijump:asciijump.desktop.in.h:1 -msgid "A clone of the dsj game" +msgid "asciijump" msgstr "" #: ../menu-data/asciijump:asciijump.desktop.in.h:2 -msgid "asciijump" +msgid "A clone of the dsj game" msgstr "" #: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:1 -msgid "Allows you to select the default ALSA sound card" -msgstr "选择默认的 ALSA 声卡" - -#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2 msgid "Default Sound Card" msgstr "默认声卡" +#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2 +msgid "Allows you to select the default ALSA sound card" +msgstr "选择默认的 ALSA 声卡" + #: ../menu-data/assaultcube:assaultcube.desktop.in.h:1 msgid "AssaultCube" msgstr "AssaultCube" @@ -1048,15 +1064,15 @@ msgstr "修改文件类型的检测和显示" #: ../menu-data/asunder:asunder.desktop.in.h:1 +msgid "Asunder CD Ripper" +msgstr "Asunder CD 抓轨器" + +#: ../menu-data/asunder:asunder.desktop.in.h:2 msgid "" "An application to save tracks from an Audio CD as WAV, MP3, OGG, FLAC, " "and/or Wavpack" msgstr "" -#: ../menu-data/asunder:asunder.desktop.in.h:2 -msgid "Asunder CD Ripper" -msgstr "Asunder CD 抓轨器" - #: ../menu-data/asylum:asylum.desktop.in.h:1 msgid "Asylum" msgstr "Asylum" @@ -1094,14 +1110,15 @@ msgstr "Attal" #: ../menu-data/attal:attal.desktop.in.h:2 +#: ../menu-data/triplea:triplea.desktop.in.h:2 msgid "Turn based strategy game" msgstr "回合制策略游戏" -#: ../menu-data/audacious:audacious2.desktop.in.h:1 +#: ../menu-data/audacious:audacious.desktop.in.h:1 msgid "Audacious" msgstr "Audacious" -#: ../menu-data/audacious:audacious2.desktop.in.h:2 +#: ../menu-data/audacious:audacious.desktop.in.h:2 msgid "Listen to music" msgstr "欣赏音乐" @@ -1144,6 +1161,14 @@ msgid "AutoKey (QT)" msgstr "AutoKey (QT)" +#: ../menu-data/autorenamer:autorenamer.desktop.in.h:1 +msgid "AutoRenamer" +msgstr "" + +#: ../menu-data/autorenamer:autorenamer.desktop.in.h:2 +msgid "Automatically rename files have them sort in given order" +msgstr "" + #: ../menu-data/avahi-discover:avahi-discover.desktop.in.h:1 msgid "Avahi Zeroconf Browser" msgstr "Avahi Zeroconf 浏览器" @@ -1169,13 +1194,13 @@ msgstr "浏览开启了 Zeroconf 功能的 VNC 服务器" #: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:1 -msgid "A dock-like window navigator." -msgstr "Dock 样式的窗口导航工具" - -#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2 msgid "Avant Window Navigator" msgstr "Avant 窗口导航器 (AWN)" +#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2 +msgid "A dock-like window navigator." +msgstr "Dock 样式的窗口导航工具" + #: ../menu-data/avidemux-qt:avidemux-qt.desktop.in.h:1 msgid "Avidemux (Qt)" msgstr "Avidemux (Qt)" @@ -1190,13 +1215,13 @@ msgstr "Avidemux (GTK+)" #: ../menu-data/avogadro:avogadro.desktop.in.h:1 -msgid "Advanced molecular editor" -msgstr "高级分子编辑器" - -#: ../menu-data/avogadro:avogadro.desktop.in.h:2 msgid "Avogadro" msgstr "Avogadro" +#: ../menu-data/avogadro:avogadro.desktop.in.h:2 +msgid "Advanced molecular editor" +msgstr "高级分子编辑器" + #: ../menu-data/aweather:aweather.desktop.in.h:1 msgid "AWeather" msgstr "" @@ -1222,13 +1247,13 @@ msgstr "Axel 的前端 - 一个轻量级的下载加速器" #: ../menu-data/ayttm:ayttm.desktop.in.h:1 -msgid "\"The GTK Unified Messaging Client\"" -msgstr "\"GTK 通用消息客户端\"" - -#: ../menu-data/ayttm:ayttm.desktop.in.h:2 msgid "ayttm" msgstr "ayttm" +#: ../menu-data/ayttm:ayttm.desktop.in.h:2 +msgid "\"The GTK Unified Messaging Client\"" +msgstr "\"GTK 通用消息客户端\"" + #: ../menu-data/azureus:azureus.desktop.in.h:1 msgid "Download and share files using the BitTorrent P2P network" msgstr "通过 BitTorrent P2P 网络下载及分享文件" @@ -1238,13 +1263,13 @@ msgstr "Vuze" #: ../menu-data/babiloo:babiloo.desktop.in.h:1 -msgid "Application to view dictionaries" -msgstr "辞典查看器" - -#: ../menu-data/babiloo:babiloo.desktop.in.h:2 msgid "Babiloo" msgstr "Babiloo" +#: ../menu-data/babiloo:babiloo.desktop.in.h:2 +msgid "Application to view dictionaries" +msgstr "辞典查看器" + #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:1 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:1 msgid "Back In Time" @@ -1264,20 +1289,28 @@ msgstr "玩 3D 探险和角色扮演游戏" #: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:1 -msgid "3D adventure and roleplaying game" -msgstr "3D 探险和角色扮演游戏" - -#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2 msgid "Balazar Brothers" msgstr "Balazar Brothers" +#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2 +msgid "3D adventure and roleplaying game" +msgstr "3D 探险和角色扮演游戏" + #: ../menu-data/balder2d:Balder2D.desktop.in.h:1 +msgid "Balder2D" +msgstr "Balder2D" + +#: ../menu-data/balder2d:Balder2D.desktop.in.h:2 msgid "2D overhead shooter in Zero G" msgstr "2D 零重力高空射击游戏" -#: ../menu-data/balder2d:Balder2D.desktop.in.h:2 -msgid "Balder2D" -msgstr "Balder2D" +#: ../menu-data/ballview:ballview.desktop.in.h:1 +msgid "BALLView" +msgstr "BALLView" + +#: ../menu-data/ballview:ballview.desktop.in.h:2 +msgid "Molecular modeling and visualization tool" +msgstr "分子建模与可视化工具" #: ../menu-data/ballz:ballz.desktop.in.h:1 msgid "B.A.L.L.Z." @@ -1289,13 +1322,13 @@ #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:1 #: ../menu-data/balsa:balsa.desktop.in.h:1 -msgid "Balsa Mail Client" -msgstr "" +msgid "E-Mail utility" +msgstr "电子邮件工具" #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:2 #: ../menu-data/balsa:balsa.desktop.in.h:2 -msgid "E-Mail utility" -msgstr "电子邮件工具" +msgid "Balsa Mail Client" +msgstr "" #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:1 msgid "Bangarang" @@ -1303,7 +1336,7 @@ #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2 -#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2 +#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1 msgid "Media Player" msgstr "媒体播放器" @@ -1316,20 +1349,28 @@ msgstr "播放、管理媒体文件" #: ../menu-data/bareftp:bareftp.desktop.in.h:1 -msgid "Transfer files using the FTP, FTPS or SFTP protocol" -msgstr "通过 FTP、FTPS 或 SFTP 协议传输文件" - -#: ../menu-data/bareftp:bareftp.desktop.in.h:2 msgid "bareFTP" msgstr "bareFTP" +#: ../menu-data/bareftp:bareftp.desktop.in.h:2 +msgid "Transfer files using the FTP, FTPS or SFTP protocol" +msgstr "通过 FTP、FTPS 或 SFTP 协议传输文件" + #: ../menu-data/barrage:barrage.desktop.in.h:1 +msgid "Barrage" +msgstr "Barrage" + +#: ../menu-data/barrage:barrage.desktop.in.h:2 msgid "A rather destructive action game." msgstr "" -#: ../menu-data/barrage:barrage.desktop.in.h:2 -msgid "Barrage" -msgstr "Barrage" +#: ../menu-data/basenji:basenji.desktop.in.h:1 +msgid "Basenji" +msgstr "" + +#: ../menu-data/basenji:basenji.desktop.in.h:2 +msgid "A portable volume indexer." +msgstr "" #: ../menu-data/basex:basexgui.desktop.in.h:1 msgid "BaseX XML Database" @@ -1384,13 +1425,13 @@ msgstr "坦克足球" #: ../menu-data/bauble:bauble.desktop.in.h:1 -msgid "An application for managing botanical collections" -msgstr "一个管理植物收藏的应用程序" - -#: ../menu-data/bauble:bauble.desktop.in.h:2 msgid "Bauble" msgstr "Bauble" +#: ../menu-data/bauble:bauble.desktop.in.h:2 +msgid "An application for managing botanical collections" +msgstr "一个管理植物收藏的应用程序" + #: ../menu-data/beidgui:beidgui35.desktop.in.h:1 msgid "Belgian eID" msgstr "Belgian eID" @@ -1400,15 +1441,15 @@ msgstr "显示和管理电子身份 (eID) 卡" #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:1 +msgid "Beneath A Steel Sky" +msgstr "Beneath A Steel Sky" + +#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2 msgid "" "A science-fiction adventure game set in a bleak post-apocalyptic vision of " "the future" msgstr "一个开始于幻想未来世界末日的科幻冒险游戏" -#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2 -msgid "Beneath A Steel Sky" -msgstr "Beneath A Steel Sky" - #: ../menu-data/berusky:berusky.desktop.in.h:1 msgid "Berusky" msgstr "Berusky" @@ -1418,11 +1459,11 @@ msgstr "基于 Sokoban(TM) 的逻辑游戏" #: ../menu-data/betaradio:betaradio.desktop.in.h:1 -msgid "An easy way to listen to internet radio of Taiwan." +msgid "BetaRadio Tuner" msgstr "" #: ../menu-data/betaradio:betaradio.desktop.in.h:2 -msgid "BetaRadio Tuner" +msgid "An easy way to listen to internet radio of Taiwan." msgstr "" #: ../menu-data/between:between.desktop.in.h:1 @@ -1433,22 +1474,38 @@ msgid "game about consciousness and isolation" msgstr "" -#: ../menu-data/bibledit:bibledit.desktop.in.h:1 +#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:1 +msgid "Bibledit-BibleTime" +msgstr "" + +#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:2 +msgid "Bibledit BibleTime Interface" +msgstr "" + +#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:1 +msgid "Bibledit-Gtk" +msgstr "" + +#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:2 msgid "Bible Editor" msgstr "圣经编辑器" -#: ../menu-data/bibledit:bibledit.desktop.in.h:2 -msgid "Bibledit" -msgstr "Bibledit" +#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:1 +msgid "Bibledit-Xiphos" +msgstr "" -#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1 -msgid "A simple KDE Application" -msgstr "一个简单的 KDE 应用程序" +#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:2 +msgid "Bibledit Xiphos Interface" +msgstr "" -#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2 +#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1 msgid "BibleMemorizer" msgstr "圣经记忆助手" +#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2 +msgid "A simple KDE Application" +msgstr "一个简单的 KDE 应用程序" + #: ../menu-data/bibletime:bibletime.desktop.in.h:1 msgid "An easy to use bible study tool" msgstr "简单的圣经学习工具" @@ -1498,21 +1555,13 @@ msgstr "多彩的逻辑游戏,具有街机和战术模式" #: ../menu-data/bino:bino.desktop.in.h:1 -msgid "3D video player" +msgid "Bino" msgstr "" #: ../menu-data/bino:bino.desktop.in.h:2 -msgid "Bino" +msgid "3D video player" msgstr "" -#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:1 -msgid "BioCocoa" -msgstr "BioCocoa" - -#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:2 -msgid "GNUstep BioCocoa" -msgstr "GNUstep BioCocoa" - #: ../menu-data/biogenesis:biogenesis.desktop.in.h:1 msgid "Biogenesis" msgstr "" @@ -1524,13 +1573,13 @@ msgstr "" #: ../menu-data/bist:bist.desktop.in.h:1 -msgid "Bist stands for bidimensional structures" -msgstr "Bist 代表两维结构" - -#: ../menu-data/bist:bist.desktop.in.h:2 msgid "bist" msgstr "bist" +#: ../menu-data/bist:bist.desktop.in.h:2 +msgid "Bist stands for bidimensional structures" +msgstr "Bist 代表两维结构" + #: ../menu-data/bitmeter:bitmeter.desktop.in.h:1 msgid "Bitmeter" msgstr "Bitmeter" @@ -1548,13 +1597,13 @@ msgstr "CDMA 手机工具" #: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:1 -msgid "A small and fast BitTorrent client" -msgstr "一个轻量级的高速BT客户端" - -#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2 msgid "BitStormLite" msgstr "BitStormLite" +#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2 +msgid "A small and fast BitTorrent client" +msgstr "一个轻量级的高速BT客户端" + #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:1 msgid "Bittornado Client" msgstr "Bittornado Client" @@ -1596,11 +1645,11 @@ msgstr "释放空间及保护隐私" #: ../menu-data/blender:blender.desktop.in.h:1 -msgid "3D modeling, animation, rendering and post-production" +msgid "Blender" msgstr "" #: ../menu-data/blender:blender.desktop.in.h:2 -msgid "Blender" +msgid "3D modeling, animation, rendering and post-production" msgstr "" #: ../menu-data/bless:bless.desktop.in.h:1 @@ -1612,13 +1661,13 @@ msgstr "编辑二进制文件" #: ../menu-data/blinken:kde4__blinken.desktop.in.h:1 -msgid "A memory enhancement game" -msgstr "记忆强化游戏" - -#: ../menu-data/blinken:kde4__blinken.desktop.in.h:2 msgid "Blinken" msgstr "Blinken" +#: ../menu-data/blinken:kde4__blinken.desktop.in.h:2 +msgid "A memory enhancement game" +msgstr "记忆强化游戏" + #: ../menu-data/blobandconquer:blobAndConquer.desktop.in.h:1 msgid "Blob Wars : Blob And Conquer" msgstr "团团的战争:团团与征服" @@ -1632,17 +1681,17 @@ msgstr "沙滩排球2" #: ../menu-data/blobby:blobby.desktop.in.h:2 -msgid "Volley-Ball Game" -msgstr "排球游戏" +msgid "Volleyball Game" +msgstr "" #: ../menu-data/bloboats:bloboats.desktop.in.h:1 -msgid "An arcade-like boat racing game" -msgstr "一个街机型式的船只竞速游戏" - -#: ../menu-data/bloboats:bloboats.desktop.in.h:2 msgid "Bloboats" msgstr "Bloboats" +#: ../menu-data/bloboats:bloboats.desktop.in.h:2 +msgid "An arcade-like boat racing game" +msgstr "一个街机型式的船只竞速游戏" + #: ../menu-data/blobwars:blobwars.desktop.in.h:1 msgid "Blob Wars : Metal Blob Solid" msgstr "" @@ -1676,13 +1725,13 @@ msgstr "令人毛骨悚然的俄罗斯方块类型游戏" #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:1 -msgid "A KDE Blogging Client" -msgstr "KDE 的博客客户端" - -#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2 msgid "Blogilo" msgstr "Blogilo" +#: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2 +msgid "A KDE Blogging Client" +msgstr "KDE 的博客客户端" + #: ../menu-data/bluefish:bluefish.desktop.in.h:1 msgid "Bluefish Editor" msgstr "Bluefish 编辑器" @@ -1692,22 +1741,22 @@ msgstr "网络开发编辑器" #: ../menu-data/blueman:blueman-manager.desktop.in.h:1 -msgid "Blueman Bluetooth Manager" -msgstr "Blueman 蓝牙管理器" - -#: ../menu-data/blueman:blueman-manager.desktop.in.h:2 msgid "Bluetooth Manager" msgstr "蓝牙管理器" +#: ../menu-data/blueman:blueman-manager.desktop.in.h:2 +msgid "Blueman Bluetooth Manager" +msgstr "Blueman 蓝牙管理器" + #: ../menu-data/bluemindo:Bluemindo.desktop.in.h:1 +msgid "Bluemindo" +msgstr "Bluemindo" + +#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2 msgid "" "A really simple but powerful audio player in Python/PyGTK, using Gstreamer." msgstr "一个简单但功能强大的音频播放器,使用 Python/PyGTK 和 Gstreamer 编写。" -#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2 -msgid "Bluemindo" -msgstr "Bluemindo" - #: ../menu-data/blueproximity:blueproximity.desktop.in.h:1 msgid "BlueProximity" msgstr "BlueProximity" @@ -1725,13 +1774,13 @@ msgstr "关于新发现的蓝牙设备的信息和通知" #: ../menu-data/bmon:bmon.desktop.in.h:1 -msgid "Bandwidth monitor" -msgstr "带宽监视器" - -#: ../menu-data/bmon:bmon.desktop.in.h:2 msgid "bmon" msgstr "bmon" +#: ../menu-data/bmon:bmon.desktop.in.h:2 +msgid "Bandwidth monitor" +msgstr "带宽监视器" + #: ../menu-data/boa-constructor:boa-constructor.desktop.in.h:1 msgid "Boa Constructor" msgstr "Boa 构建器" @@ -1756,14 +1805,22 @@ msgid "Configure or monitor a BOINC core client" msgstr "配置和监视 BOINC 核心客户" -#: ../menu-data/bomber:kde4__bomber.desktop.in.h:1 -msgid "Arcade Bombing Game" +#: ../menu-data/bokken:bokken.desktop.in.h:1 +msgid "Bokken" msgstr "" -#: ../menu-data/bomber:kde4__bomber.desktop.in.h:2 +#: ../menu-data/bokken:bokken.desktop.in.h:2 +msgid "Reverse engineering suite" +msgstr "" + +#: ../menu-data/bomber:kde4__bomber.desktop.in.h:1 msgid "Bomber" msgstr "Bomber" +#: ../menu-data/bomber:kde4__bomber.desktop.in.h:2 +msgid "Arcade Bombing Game" +msgstr "" + #: ../menu-data/bomberclone:bomberclone.desktop.in.h:1 msgid "Bomberclone" msgstr "Bomberclone" @@ -1781,13 +1838,13 @@ msgstr "DVD 制作程序" #: ../menu-data/boswars:boswars.desktop.in.h:1 -msgid "Battle for survival" -msgstr "为生存而战" - -#: ../menu-data/boswars:boswars.desktop.in.h:2 msgid "Bos Wars" msgstr "Bos Wars" +#: ../menu-data/boswars:boswars.desktop.in.h:2 +msgid "Battle for survival" +msgstr "为生存而战" + #: ../menu-data/bouml:bouml.desktop.in.h:1 msgid "BOUML" msgstr "BOUML" @@ -1813,37 +1870,41 @@ msgstr "五子棋游戏" #: ../menu-data/bpython:bpython.desktop.in.h:1 -msgid "A fancy interface to the python interpreter!" -msgstr "Python 直译器的花哨界面!" - -#: ../menu-data/bpython:bpython.desktop.in.h:2 msgid "bpython" msgstr "bpython" -#: ../menu-data/brasero:brasero.desktop.in.h:1 -msgid "Brasero Disc Burner" +#: ../menu-data/bpython:bpython.desktop.in.h:2 +msgid "A fancy interface to the python interpreter!" +msgstr "Python 直译器的花哨界面!" + +#: ../menu-data/braindump:kde4__braindump.desktop.in.h:1 +msgid "Braindump" msgstr "" -#: ../menu-data/brasero:brasero.desktop.in.h:2 +#: ../menu-data/brasero:brasero.desktop.in.h:1 msgid "Create and copy CDs and DVDs" msgstr "创建、复制 CD 和 DVD" +#: ../menu-data/brasero:brasero.desktop.in.h:2 +msgid "Brasero Disc Burner" +msgstr "" + #: ../menu-data/brewtarget:brewtarget.desktop.in.h:1 -msgid "Beer calculator" +msgid "Brewtarget" msgstr "" #: ../menu-data/brewtarget:brewtarget.desktop.in.h:2 -msgid "Brewtarget" +msgid "Beer calculator" msgstr "" #: ../menu-data/briquolo:briquolo.desktop.in.h:1 -msgid "An OpenGL breakout" -msgstr "一个 OpenGL 的打砖块游戏" - -#: ../menu-data/briquolo:briquolo.desktop.in.h:2 msgid "Briquolo" msgstr "Briquolo" +#: ../menu-data/briquolo:briquolo.desktop.in.h:2 +msgid "An OpenGL breakout" +msgstr "一个 OpenGL 的打砖块游戏" + #: ../menu-data/brp-pacu:brp-pacu.desktop.in.h:1 msgid "Brp-pacu" msgstr "" @@ -1861,19 +1922,19 @@ msgstr "像国际象棋选手一样玩3D象棋游戏" #: ../menu-data/bsnes:bsnes.desktop.in.h:1 -msgid "SNES emulator" +msgid "bsnes" msgstr "" #: ../menu-data/bsnes:bsnes.desktop.in.h:2 -msgid "bsnes" +msgid "SNES emulator" msgstr "" #: ../menu-data/bsnes:snespurify.desktop.in.h:1 -msgid "Tool for resolving problems with SNES ROMs" +msgid "snespurify" msgstr "" #: ../menu-data/bsnes:snespurify.desktop.in.h:2 -msgid "snespurify" +msgid "Tool for resolving problems with SNES ROMs" msgstr "" #: ../menu-data/btanks:btanks.desktop.in.h:1 @@ -1884,25 +1945,13 @@ msgid "fast 2D tank arcade game with multiplayer and split-screen modes" msgstr "支持多玩家和多画面的 2D 坦克街机游戏" -#: ../menu-data/btnx-config:btnx-config.desktop.in.h:1 -msgid "btnx" -msgstr "btnx" - #: ../menu-data/bubbros:bubbros.desktop.in.h:1 -msgid "Kill evil enemies by catching them into bubbles and smashing those" -msgstr "把邪恶的敌人抓到泡泡里,然后打烂他们" - -#: ../menu-data/bubbros:bubbros.desktop.in.h:2 msgid "The Bub's Brothers" msgstr "The Bub's Brothers" -#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:1 -msgid "Bug Report Tool" -msgstr "错误报告工具" - -#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:2 -msgid "Report a bug in GNOME-based applications" -msgstr "报告 GNOME 应用程序中的错误" +#: ../menu-data/bubbros:bubbros.desktop.in.h:2 +msgid "Kill evil enemies by catching them into bubbles and smashing those" +msgstr "把邪恶的敌人抓到泡泡里,然后打烂他们" #: ../menu-data/bugsquish:bugsquish.desktop.in.h:1 msgid "Bug Squish" @@ -1929,13 +1978,13 @@ msgstr "图形化运行级别配置工具" #: ../menu-data/burgerspace:burgerspace.desktop.in.h:1 -msgid "A hamburger-smashing video game" -msgstr "碎汉堡游戏" - -#: ../menu-data/burgerspace:burgerspace.desktop.in.h:2 msgid "BurgerSpace" msgstr "BurgerSpace" +#: ../menu-data/burgerspace:burgerspace.desktop.in.h:2 +msgid "A hamburger-smashing video game" +msgstr "碎汉堡游戏" + #: ../menu-data/buxon:buxon.desktop.in.h:1 msgid "Buxon" msgstr "Buxon" @@ -1953,19 +2002,19 @@ msgstr "编辑 buzztard 歌曲文件" #: ../menu-data/bygfoot:bygfoot.desktop.in.h:1 -msgid " A soccer manager game" -msgstr " 一个足球经理游戏" - -#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2 msgid "bygfoot" msgstr "bygfoot" +#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2 +msgid " A soccer manager game" +msgstr " 一个足球经理游戏" + #: ../menu-data/byobu:byobu.desktop.in.h:1 -msgid "Advanced Command Line and Text Window Manager" +msgid "Byobu Terminal" msgstr "" #: ../menu-data/byobu:byobu.desktop.in.h:2 -msgid "Byobu Terminal" +msgid "Advanced Command Line and Text Window Manager" msgstr "" #: ../menu-data/bzflag-data:bzflag.desktop.in.h:1 @@ -1985,13 +2034,13 @@ msgstr "用于 Bazaar 的图形界面程序" #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:1 -msgid "Apply Bazaar Bundle" -msgstr "" - -#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2 msgid "Bazaar" msgstr "Bazaar" +#: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2 +msgid "Apply Bazaar Bundle" +msgstr "" + #: ../menu-data/cadabra:cadabra.desktop.in.h:1 msgid "Cadabra" msgstr "Cadabra" @@ -2025,12 +2074,73 @@ msgstr "GLX-Dock (使用 OpenGL 的 Cairo-Dock)" #: ../menu-data/calibre:calibre.desktop.in.h:1 +msgid "calibre" +msgstr "calibre" + +#: ../menu-data/calibre:calibre.desktop.in.h:2 msgid "E-book library management" msgstr "电子书图书馆管理" -#: ../menu-data/calibre:calibre.desktop.in.h:2 -msgid "calibre" -msgstr "calibre" +#: ../menu-data/calligra-data:kde4__calligra.desktop.in.h:1 +msgid "Calligra" +msgstr "" + +#: ../menu-data/calligraactive:calligraactive.desktop.in.h:1 +msgid "Calligra Active" +msgstr "" + +#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:1 +msgid "Calligra Flow" +msgstr "" + +#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:2 +msgid "Flowchart & Diagram Editing" +msgstr "流程图和图表编辑" + +#: ../menu-data/calligramobile:hildon__calligramobile.desktop.in.h:1 +msgid "Calligra Mobile" +msgstr "" + +#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:1 +msgid "Plan" +msgstr "" + +#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:2 +#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:2 +#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2 +#: ../menu-data/planner:planner.desktop.in.h:1 +msgid "Project Management" +msgstr "项目管理" + +#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:1 +msgid "Plan WorkPackage Handler" +msgstr "" + +#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:1 +msgid "Calligra Stage" +msgstr "" + +#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:2 +#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2 +msgid "Write presentation documents" +msgstr "编辑演示文稿" + +#: ../menu-data/calligratables:kde4__tables.desktop.in.h:1 +msgid "Calligra Tables" +msgstr "" + +#: ../menu-data/calligratables:kde4__tables.desktop.in.h:2 +#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2 +msgid "Write spreadsheet documents" +msgstr "编辑电子表格文档" + +#: ../menu-data/calligrawords:kde4__words.desktop.in.h:1 +msgid "Calligra Words" +msgstr "" + +#: ../menu-data/calligrawords:kde4__words.desktop.in.h:2 +msgid "Write documents" +msgstr "" #: ../menu-data/cameleon:cameleon.desktop.in.h:1 msgid "Cameleon" @@ -2061,13 +2171,13 @@ msgstr "查看、修改和保存来自网络摄像头的图像" #: ../menu-data/canorus:canorus.desktop.in.h:1 -msgid "A free next-generation cross-platform music score editor!" -msgstr "免费的新一代跨平台乐谱编辑器" - -#: ../menu-data/canorus:canorus.desktop.in.h:2 msgid "Canorus" msgstr "Canorus" +#: ../menu-data/canorus:canorus.desktop.in.h:2 +msgid "A free next-generation cross-platform music score editor!" +msgstr "免费的新一代跨平台乐谱编辑器" + #: ../menu-data/cantor:kde4__cantor.desktop.in.h:1 msgid "Cantor" msgstr "Cantor" @@ -2077,13 +2187,13 @@ msgstr "" #: ../menu-data/caret:caret.desktop.in.h:1 -msgid "Caret" -msgstr "Caret" - -#: ../menu-data/caret:caret.desktop.in.h:2 msgid "Cortical Surface Reconstruction and Visualization" msgstr "表面皮质重建及造影" +#: ../menu-data/caret:caret.desktop.in.h:2 +msgid "Caret" +msgstr "Caret" + #: ../menu-data/caribou:caribou.desktop.in.h:1 msgid "Caribou" msgstr "" @@ -2101,11 +2211,11 @@ msgstr "CaRMetal 互动式几何学" #: ../menu-data/catdoc:wordview.desktop.in.h:1 -msgid "Microsoft doc document file viewer" +msgid "Wordview Microsoft doc Viewer" msgstr "" #: ../menu-data/catdoc:wordview.desktop.in.h:2 -msgid "Wordview Microsoft doc Viewer" +msgid "Microsoft doc document file viewer" msgstr "" #: ../menu-data/catfish:catfish.desktop.in.h:1 @@ -2125,14 +2235,14 @@ msgstr "" #: ../menu-data/cbrpager:cbrpager.desktop.in.h:1 -#: ../menu-data/comix:comix.desktop.in.h:1 -msgid "A viewer for comic book archives" -msgstr "漫画集阅读器" - -#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2 msgid "Cbrpager" msgstr "Cbrpager" +#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2 +#: ../menu-data/comix:comix.desktop.in.h:2 +msgid "A viewer for comic book archives" +msgstr "漫画集阅读器" + #: ../menu-data/cdcat:cdcat.desktop.in.h:1 msgid "CdCat" msgstr "" @@ -2199,13 +2309,13 @@ msgstr "和人或电脑下围棋" #: ../menu-data/charmap.app:Charmap.desktop.in.h:1 -msgid "Character map for GNUstep" -msgstr "GNUstep 的字符映射表" - -#: ../menu-data/charmap.app:Charmap.desktop.in.h:2 msgid "Charmap" msgstr "字符映射" +#: ../menu-data/charmap.app:Charmap.desktop.in.h:2 +msgid "Character map for GNUstep" +msgstr "GNUstep 的字符映射表" + #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:1 msgid "System Testing" msgstr "系统测试" @@ -2219,7 +2329,7 @@ msgstr "CheckGMail" #: ../menu-data/checkgmail:checkgmail.desktop.in.h:2 -#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2 +#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1 msgid "Gmail Notifier" msgstr "Gmail 通知" @@ -2239,6 +2349,14 @@ msgid "Draw and make calculations on chemical structures" msgstr "绘制和计算化学结构" +#: ../menu-data/cherrytree:cherrytree.desktop.in.h:1 +msgid "CherryTree" +msgstr "" + +#: ../menu-data/cherrytree:cherrytree.desktop.in.h:2 +msgid "Hierarchical Note Taking" +msgstr "" + #: ../menu-data/childsplay:childsplay.desktop.in.h:1 msgid "Childsplay" msgstr "Childsplay" @@ -2286,8 +2404,8 @@ msgstr "Choqok" #: ../menu-data/choqok:kde4__choqok.desktop.in.h:2 -msgid "KDE Micro-blogging Client" -msgstr "KDE 微博客户端" +msgid "Micro-blogging Client" +msgstr "" #: ../menu-data/chromium-bsu:chromium-bsu.desktop.in.h:1 msgid "Chromium B.S.U." @@ -2306,24 +2424,24 @@ msgstr "将小丑们在落下前掷出并用他们击打气球。" #: ../menu-data/clam-chordata:Chordata.desktop.in.h:1 -msgid "Analize chords (Chordata)" +msgid "CLAM Chordata" msgstr "" #: ../menu-data/clam-chordata:Chordata.desktop.in.h:2 -msgid "CLAM Chordata" +msgid "MP3/OGG/Wav songs chord analyser" msgstr "" #: ../menu-data/clam-chordata:Chordata.desktop.in.h:3 -msgid "MP3/OGG/Wav songs chord analyser" +msgid "Analize chords (Chordata)" msgstr "" #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:1 -msgid "" -"An audio tool to build processing networks by connecting functional boxes" +msgid "CLAM Network Editor" msgstr "" #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:2 -msgid "CLAM Network Editor" +msgid "" +"An audio tool to build processing networks by connecting functional boxes" msgstr "" #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:3 @@ -2335,11 +2453,11 @@ msgstr "" #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:2 -msgid "Run with Prototyper" +msgid "Runs an audio processing core under a QT designer interface" msgstr "" #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:3 -msgid "Runs an audio processing core under a QT designer interface" +msgid "Run with Prototyper" msgstr "" #: ../menu-data/clamtk:clamtk.desktop.in.h:1 @@ -2379,7 +2497,7 @@ msgstr "" #: ../menu-data/clipit:clipit.desktop.in.h:2 -#: ../menu-data/parcellite:parcellite.desktop.in.h:1 +#: ../menu-data/parcellite:parcellite.desktop.in.h:2 msgid "Clipboard Manager" msgstr "剪贴板管理器" @@ -2410,14 +2528,14 @@ msgstr "在一个输入窗口里面控制多个ssh或者rsh回话" #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:1 +msgid "code-aster-gui" +msgstr "code-aster-gui" + +#: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2 #: ../menu-data/eficas:eficas.desktop.in.h:2 msgid "Graphical command editor for Code_Aster." msgstr "Code_Aster 的图形化命令编辑器。" -#: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2 -msgid "code-aster-gui" -msgstr "code-aster-gui" - #: ../menu-data/codeblocks:codeblocks.desktop.in.h:1 msgid "Code::Blocks IDE" msgstr "Code::Blocks IDE" @@ -2439,25 +2557,21 @@ msgstr "" #: ../menu-data/colorcode:colorcode.desktop.in.h:1 -msgid "Advanced clone of the MasterMind code-breaking game" -msgstr "“珠玑妙算(MasterMind)”密码破译游戏的改进版。" - -#: ../menu-data/colorcode:colorcode.desktop.in.h:2 msgid "ColorCode" msgstr "ColorCode" +#: ../menu-data/colorcode:colorcode.desktop.in.h:2 +msgid "Advanced clone of the MasterMind code-breaking game" +msgstr "“珠玑妙算(MasterMind)”密码破译游戏的改进版。" + #: ../menu-data/colorname:colorname.desktop.in.h:1 msgid "colorname" msgstr "颜色名称" -#: ../menu-data/comix:comix.desktop.in.h:2 +#: ../menu-data/comix:comix.desktop.in.h:1 msgid "Comix" msgstr "Comix" -#: ../menu-data/compiz-core:compiz.desktop.in.h:1 -msgid "Compiz" -msgstr "Compiz" - #: ../menu-data/compizconfig-settings-manager:ccsm.desktop.in.h:1 msgid "CompizConfig Settings Manager" msgstr "CompizConfig 设置管理器" @@ -2466,22 +2580,22 @@ msgid "Configure Compiz with CompizConfig" msgstr "用 CompizConfig 配置 Compiz" -#: ../menu-data/composite-data:composite.desktop.in.h:1 +#: ../menu-data/composite:composite.desktop.in.h:1 msgid "Composite" msgstr "Composite" -#: ../menu-data/composite-data:composite.desktop.in.h:2 -msgid "Live performance sequencer, sampler, looper" -msgstr "现场表演定序器、取样器、循环器" +#: ../menu-data/composite:composite.desktop.in.h:2 +msgid "Live performance sequencer" +msgstr "" #: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:1 -msgid "Clean up a system so it's more like a freshly installed one" -msgstr "清理系统以使之如同全新安装" - -#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2 msgid "Computer Janitor" msgstr "电脑清洁工" +#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2 +msgid "Clean up a system so it's more like a freshly installed one" +msgstr "清理系统以使之如同全新安装" + #: ../menu-data/conduit:conduit.desktop.in.h:1 msgid "Conduit Synchronizer" msgstr "管道同步装置" @@ -2523,15 +2637,16 @@ msgstr "Connectagram" #: ../menu-data/contacts:contacts.desktop.in.h:1 -msgid "Address book" -msgstr "地址簿" - -#: ../menu-data/contacts:contacts.desktop.in.h:2 #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1 -#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2 +#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 +#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 msgid "Contacts" msgstr "联系人" +#: ../menu-data/contacts:contacts.desktop.in.h:2 +msgid "Address book" +msgstr "地址簿" + #: ../menu-data/controlaula:controlaula.desktop.in.h:1 msgid " Classrooom control" msgstr " 课堂控制" @@ -2541,13 +2656,13 @@ msgstr "控制教室里计算机的工具" #: ../menu-data/convertall:convertall.desktop.in.h:1 -msgid "Convert between many different units" -msgstr "在不同单位间转换" - -#: ../menu-data/convertall:convertall.desktop.in.h:2 msgid "ConvertAll" msgstr "ConvertAll" +#: ../menu-data/convertall:convertall.desktop.in.h:2 +msgid "Convert between many different units" +msgstr "在不同单位间转换" + #: ../menu-data/coqide:coqide.desktop.in.h:1 msgid "CoqIDE Proof Assistant" msgstr "CoqIDE 证明助手" @@ -2565,19 +2680,19 @@ msgstr "管理你的桌面壁纸" #: ../menu-data/cowbell:cowbell.desktop.in.h:1 -msgid "An elegant music organizer" -msgstr "优雅的音乐管理器" - -#: ../menu-data/cowbell:cowbell.desktop.in.h:2 msgid "Cowbell Music Organizer" msgstr "Cowbell 音乐管理器" +#: ../menu-data/cowbell:cowbell.desktop.in.h:2 +msgid "An elegant music organizer" +msgstr "优雅的音乐管理器" + #: ../menu-data/cqrlog:cqrlog.desktop.in.h:1 -msgid "Advanced logging program for hamradio operators" +msgid "CQRLOG" msgstr "" #: ../menu-data/cqrlog:cqrlog.desktop.in.h:2 -msgid "CQRLOG" +msgid "Advanced logging program for hamradio operators" msgstr "" #: ../menu-data/crack-attack:crack-attack.desktop.in.h:1 @@ -2609,11 +2724,11 @@ msgstr "演示人工生命的 3D 培养皿宇宙" #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:1 -msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game" +msgid "Crossfire GTK Client V2" msgstr "" #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:2 -msgid "Crossfire GTK Client V2" +msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game" msgstr "" #: ../menu-data/cryptkeeper:cryptkeeper.desktop.in.h:1 @@ -2621,21 +2736,21 @@ msgstr "Cryptkeeper" #: ../menu-data/csmash:csmash.desktop.in.h:1 -msgid "3D tabletennis game" -msgstr "三维台球游戏" - -#: ../menu-data/csmash:csmash.desktop.in.h:2 msgid "Cannon Smash" msgstr "Cannon Smash" -#: ../menu-data/cssed:cssed.desktop.in.h:1 -msgid "Css and Web Development Editor" -msgstr "CSS 和网页开发编辑器" +#: ../menu-data/csmash:csmash.desktop.in.h:2 +msgid "3D tabletennis game" +msgstr "三维台球游戏" -#: ../menu-data/cssed:cssed.desktop.in.h:2 +#: ../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 计算机断层扫描成像模拟器" @@ -2668,14 +2783,18 @@ msgid "Serial Terminal" msgstr "" -#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1 -msgid "A free and romantic music player" -msgstr "一个自由而浪漫的音乐播放器" +#: ../menu-data/cycle:cycle.desktop.in.h:1 +msgid "Cycle" +msgstr "" -#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2 +#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1 msgid "Cynthiune" msgstr "Cynthiune" +#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2 +msgid "A free and romantic music player" +msgstr "一个自由而浪漫的音乐播放器" + #: ../menu-data/cytadela:cytadela.desktop.in.h:1 msgid "Cytadela" msgstr "" @@ -2709,13 +2828,13 @@ msgstr "" #: ../menu-data/daemonfs:daemonfs.desktop.in.h:1 -msgid "DaemonFS" -msgstr "" - -#: ../menu-data/daemonfs:daemonfs.desktop.in.h:2 msgid "Real time monitoring software" msgstr "实时监控软件" +#: ../menu-data/daemonfs:daemonfs.desktop.in.h:2 +msgid "DaemonFS" +msgstr "" + #: ../menu-data/daisy-player:daisy-player.desktop.in.h:1 msgid "Daisy player" msgstr "" @@ -2733,11 +2852,11 @@ msgstr "" #: ../menu-data/darktable:darktable.desktop.in.h:1 -msgid "Darktable Photo Workflow Software" +msgid "Organize and develop images from digital cameras" msgstr "" #: ../menu-data/darktable:darktable.desktop.in.h:2 -msgid "Organize and develop images from digital cameras" +msgid "Darktable Photo Workflow Software" msgstr "" #: ../menu-data/dasher:dasher.desktop.in.h:1 @@ -2759,22 +2878,22 @@ msgstr "您的日程安排" #: ../menu-data/dc-qt:dc-qt.desktop.in.h:1 -msgid "GUI for Direct Connect Protocol" -msgstr "直连协议(DCP)的图形用户界面" - -#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2 msgid "dc-qt" msgstr "dc-qt" +#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2 +msgid "GUI for Direct Connect Protocol" +msgstr "直连协议(DCP)的图形用户界面" + #: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:1 +msgid "dconf Editor" +msgstr "" + +#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2 msgid "Directly edit your entire configuration database" msgstr "直接编辑您的整个配置数据库" -#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2 -msgid "dconf Editor" -msgstr "" - #: ../menu-data/ddd:ddd.desktop.in.h:1 msgid "Data Display Debugger" msgstr "数据显示调试器" @@ -2808,13 +2927,13 @@ msgstr "Debian 参考指南" #: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:1 -msgid "A simple audio player" -msgstr "简单的音乐播放器" - -#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2 msgid "Decibel Audio Player" msgstr "Decibel 音乐播放器" +#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2 +msgid "A simple audio player" +msgstr "简单的音乐播放器" + #: ../menu-data/defendguin:defendguin.desktop.in.h:1 msgid "Defendguin" msgstr "Defendguin" @@ -2824,16 +2943,16 @@ msgstr "拯救企鹅" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1 -msgid "Back Up Now" +#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1 +msgid "Backup" msgstr "" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2 -#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1 -msgid "Backup" +msgid "Change your backup settings" msgstr "" #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3 -msgid "Change your backup settings" +msgid "Back Up Now" msgstr "" #: ../menu-data/dell-recovery:dell-recovery-media.desktop.in.h:1 @@ -2846,20 +2965,20 @@ #: ../menu-data/deluge-gtk:deluge.desktop.in.h:2 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:1 -#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1 -#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1 +#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2 +#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2 msgid "Download and share files over BitTorrent" msgstr "通过BitTorrent下载和共享文件" #: ../menu-data/denemo:denemo.desktop.in.h:1 -#: ../menu-data/nted:nted.desktop.in.h:1 -msgid "Edit musical scores" -msgstr "编辑乐谱" - -#: ../menu-data/denemo:denemo.desktop.in.h:2 msgid "GNU Denemo" msgstr "GNU Denemo" +#: ../menu-data/denemo:denemo.desktop.in.h:2 +#: ../menu-data/nted:nted.desktop.in.h:2 +msgid "Edit musical scores" +msgstr "编辑乐谱" + #: ../menu-data/deskscribe:deskscribe.desktop.in.h:1 msgid "DeskScribe" msgstr "DeskScribe" @@ -2869,12 +2988,17 @@ msgstr "用户桌面活动记录工具" #: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:1 +msgid "Desktop Webmail" +msgstr "桌面邮件" + +#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2 msgid "Compose email in browser" msgstr "在浏览器中撰写电子邮件" -#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2 -msgid "Desktop Webmail" -msgstr "桌面邮件" +#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:3 +#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3 +msgid "Compose New Message" +msgstr "撰写新消息" #: ../menu-data/desktopcouch-tools:desktopcouch-pair.desktop.in.h:1 msgid "CouchDB Pairing Tool" @@ -2885,21 +3009,21 @@ msgstr "桌面 CouchDB 配对应用程序" #: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:1 -msgid "A Tray-Icon for DesktopNova" -msgstr "DesktopNova 的托盘图标" - -#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2 msgid "DesktopNova-Tray" msgstr "DesktopNova-Tray" -#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1 -msgid "Changes your background image automatically" -msgstr "自动更换您的壁纸" +#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2 +msgid "A Tray-Icon for DesktopNova" +msgstr "DesktopNova 的托盘图标" -#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2 +#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1 msgid "DesktopNova" msgstr "DesktopNova" +#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2 +msgid "Changes your background image automatically" +msgstr "自动更换您的壁纸" + #: ../menu-data/desmume:desmume.desktop.in.h:1 msgid "DeSmuME (Gtk)" msgstr "DeSmuME (Gtk)" @@ -2909,23 +3033,23 @@ msgstr "NDS 模拟器" #: ../menu-data/devede:devede.desktop.in.h:1 +msgid "DeVeDe DVD/CD Video Creator" +msgstr "" + +#: ../menu-data/devede:devede.desktop.in.h:2 msgid "" "Allows to create video CDs and DVDs, suitable to be reproduced in home DVD " "players" msgstr "允许创建视频CD和DVD, 可用于家用DVD播放机播放。" -#: ../menu-data/devede:devede.desktop.in.h:2 -msgid "DeVeDe DVD/CD Video Creator" -msgstr "" - #: ../menu-data/devhelp:devhelp.desktop.in.h:1 -msgid "Developer's Help program" -msgstr "开发者帮助程序" - -#: ../menu-data/devhelp:devhelp.desktop.in.h:2 msgid "Devhelp" msgstr "Devhelp" +#: ../menu-data/devhelp:devhelp.desktop.in.h:2 +msgid "Developer's Help program" +msgstr "开发者帮助程序" + #: ../menu-data/dff:dff.desktop.in.h:1 msgid "DFF" msgstr "" @@ -2942,11 +3066,11 @@ msgid "Desktop Flickr Organizer for Gnome" msgstr "用于 Gnome 的 Flickr 桌面管理器" -#: ../menu-data/dia-common:dia-common.desktop.in.h:1 -msgid "Dia Diagram Editor" -msgstr "Dia 图表编辑器" +#: ../menu-data/dia-common:dia.desktop.in.h:1 +msgid "Dia" +msgstr "" -#: ../menu-data/dia-common:dia-common.desktop.in.h:2 +#: ../menu-data/dia-common:dia.desktop.in.h:2 msgid "Edit your Diagrams" msgstr "编辑您的图表" @@ -2959,21 +3083,21 @@ msgstr "" #: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:1 -msgid "A Dict client for GNUstep" -msgstr "GNUstep 的字典客户端" - -#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2 msgid "Dictionary Reader" msgstr "字典阅读器" -#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1 -msgid "Compare two PDF files" -msgstr "比较两个 PDF 文件" +#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2 +msgid "A Dict client for GNUstep" +msgstr "GNUstep 的字典客户端" -#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2 +#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1 msgid "DiffPDF" msgstr "DiffPDF" +#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2 +msgid "Compare two PDF files" +msgstr "比较两个 PDF 文件" + #: ../menu-data/diffuse:diffuse.desktop.in.h:1 msgid "Diffuse Merge Tool" msgstr "Diffuse 合并工具" @@ -2983,15 +3107,15 @@ msgstr "用于合并和比较文本文件的图形化工具" #: ../menu-data/digikam:kde4__digikam.desktop.in.h:1 -#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1 +msgid "digiKam" +msgstr "digiKam" + +#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2 +#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2 msgid "" "Manage your photographs like a professional with the power of open source" msgstr "" -#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2 -msgid "digiKam" -msgstr "digiKam" - #: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:1 msgid "A tool to assemble images as a panorama" msgstr "" @@ -3008,6 +3132,14 @@ msgid "Lightweight browser" msgstr "轻量级网络播放器" +#: ../menu-data/dino:dino.desktop.in.h:1 +msgid "Dino" +msgstr "" + +#: ../menu-data/dino:dino.desktop.in.h:2 +msgid "Integrated MIDI piano roll editor and sequencer engine" +msgstr "" + #: ../menu-data/djplay:djplay.desktop.in.h:1 msgid "DJPlay" msgstr "DJPlay" @@ -3025,19 +3157,19 @@ msgstr "DjVu 查看器" #: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:1 -msgid "Graphical editor for DjVu" -msgstr "DjVu 图形化编辑器" - -#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2 msgid "djvusmooth" msgstr "djvusmooth" +#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2 +msgid "Graphical editor for DjVu" +msgstr "DjVu 图形化编辑器" + #: ../menu-data/dkopp:dkopp.desktop.in.h:1 -msgid "Full and incremental backup to DVD with verify" +msgid "dkopp" msgstr "" #: ../menu-data/dkopp:dkopp.desktop.in.h:2 -msgid "dkopp" +msgid "Full and incremental backup to DVD with verify" msgstr "" #: ../menu-data/dlume:dlume.desktop.in.h:1 @@ -3057,20 +3189,12 @@ msgstr "" #: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:1 -msgid "Convert to OpenDocument" -msgstr "转换为 OpenDocument 格式" - -#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2 msgid "docbook2odf" msgstr "docbook2odf" -#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:1 -msgid "DockbarX Preference" -msgstr "" - -#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:2 -msgid "Preference dialog for DockbarX" -msgstr "" +#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2 +msgid "Convert to OpenDocument" +msgstr "转换为 OpenDocument 格式" #: ../menu-data/docky:docky.desktop.in.h:1 msgid "Docky" @@ -3093,12 +3217,12 @@ msgstr "Dolphin" #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2 -#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2 -#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2 +#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 +#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1 msgid "File Manager" msgstr "文件管理器" -#: ../menu-data/dooble:dooble.desktop.in.h:2 +#: ../menu-data/dooble:dooble.desktop.in.h:1 msgid "Dooble" msgstr "Dooble" @@ -3139,7 +3263,7 @@ msgstr "Dragon 播放器" #: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:2 -#: ../menu-data/xine-ui:xine.desktop.in.h:1 +#: ../menu-data/xine-ui:xine.desktop.in.h:2 msgid "Video Player" msgstr "视频播放器" @@ -3160,13 +3284,13 @@ msgstr "三维国际象棋游戏" #: ../menu-data/dreampie:dreampie.desktop.in.h:1 -msgid "An interactive Python shell" -msgstr "交互式的 Python shell" - -#: ../menu-data/dreampie:dreampie.desktop.in.h:2 msgid "DreamPie" msgstr "DreamPie" +#: ../menu-data/dreampie:dreampie.desktop.in.h:2 +msgid "An interactive Python shell" +msgstr "交互式的 Python shell" + #: ../menu-data/drgeo:drgeo.desktop.in.h:1 msgid "Dr.Geo" msgstr "Dr.Geo" @@ -3226,37 +3350,37 @@ msgstr "" #: ../menu-data/dvd95:dvd95.desktop.in.h:1 -msgid "Convert a DVD9 into a DVD5" -msgstr "将 DVD9 转换为 DVD5" - -#: ../menu-data/dvd95:dvd95.desktop.in.h:2 msgid "Dvd95 Converter" msgstr "Dvd95 转换器" -#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1 -msgid "Additional error protection for CD/DVD media" -msgstr "对 CD/DVD 介质提供额外的错误保护" +#: ../menu-data/dvd95:dvd95.desktop.in.h:2 +msgid "Convert a DVD9 into a DVD5" +msgstr "将 DVD9 转换为 DVD5" -#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2 +#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1 msgid "dvdisaster" msgstr "dvdisaster" -#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1 -msgid "Queue dvd::rip projects" -msgstr "创建 dvd::rip 项目队列" +#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2 +msgid "Additional error protection for CD/DVD media" +msgstr "对 CD/DVD 介质提供额外的错误保护" -#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2 +#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1 msgid "dvd::rip queue" msgstr "dvd::rip 队列" -#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1 -msgid "Rip DVDs" -msgstr "抓取 DVD" +#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2 +msgid "Queue dvd::rip projects" +msgstr "创建 dvd::rip 项目队列" -#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2 +#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1 msgid "dvd::rip" msgstr "dvd::rip" +#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2 +msgid "Rip DVDs" +msgstr "抓取 DVD" + #: ../menu-data/dvdstyler-data:dvdstyler.desktop.in.h:1 msgid "DVD Styler" msgstr "DVD Styler" @@ -3302,45 +3426,45 @@ msgstr "" #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:1 -msgid "earth3d" -msgstr "earth3d" - -#: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2 msgid "earth3d - 3D Model of the earth" msgstr "earth3d - 地球的三维模型" -#: ../menu-data/easychem:easychem.desktop.in.h:1 -msgid "Create high-quality chemical formulas" -msgstr "创建高质量的化学方程式" +#: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2 +msgid "earth3d" +msgstr "earth3d" -#: ../menu-data/easychem:easychem.desktop.in.h:2 +#: ../menu-data/easychem:easychem.desktop.in.h:1 msgid "EasyChem Chemical Structures Editor" msgstr "EasyChem 化学结构编辑器" -#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1 -msgid "A graphical GNUstep diff utility" -msgstr "一个图形 GNUstep diff 工具" +#: ../menu-data/easychem:easychem.desktop.in.h:2 +msgid "Create high-quality chemical formulas" +msgstr "创建高质量的化学方程式" -#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2 +#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1 msgid "EasyDiff" msgstr "EasyDiff" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1 -msgid "A GUI for mp3gain, vorbisgain and aacgain" -msgstr "一个 mp3gain, vorbisgain 和 aacgain 的图形用户界面" +#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2 +msgid "A graphical GNUstep diff utility" +msgstr "一个图形 GNUstep diff 工具" -#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2 +#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1 msgid "easyMP3Gain" msgstr "easyMP3Gain" -#: ../menu-data/easystroke:easystroke.desktop.in.h:1 -msgid "Control your desktop using mouse gestures" -msgstr "使用鼠标手势控制您的桌面" +#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2 +msgid "A GUI for mp3gain, vorbisgain and aacgain" +msgstr "一个 mp3gain, vorbisgain 和 aacgain 的图形用户界面" -#: ../menu-data/easystroke:easystroke.desktop.in.h:2 +#: ../menu-data/easystroke:easystroke.desktop.in.h:1 msgid "Easystroke Gesture Recognition" msgstr "Easystroke 手势识别" +#: ../menu-data/easystroke:easystroke.desktop.in.h:2 +msgid "Control your desktop using mouse gestures" +msgstr "使用鼠标手势控制您的桌面" + #: ../menu-data/easytag:easytag.desktop.in.h:1 msgid "EasyTAG Audio File Tag Viewer/Editor" msgstr "" @@ -3352,20 +3476,12 @@ msgstr "" #: ../menu-data/eboard:eboard.desktop.in.h:1 -msgid "A graphical chessboard program" -msgstr "一个图形化的国际象棋程序" - -#: ../menu-data/eboard:eboard.desktop.in.h:2 msgid "eboard" msgstr "eboard" -#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:1 -msgid "Speaking e-reader" -msgstr "" - -#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:2 -msgid "eBook speaker" -msgstr "" +#: ../menu-data/eboard:eboard.desktop.in.h:2 +msgid "A graphical chessboard program" +msgstr "一个图形化的国际象棋程序" #: ../menu-data/ebumeter:ebumeter.desktop.in.h:1 msgid "Ebumeter" @@ -3392,25 +3508,25 @@ msgstr "Eclipse 集成开发环境" #: ../menu-data/edenmath.app:EdenMath.desktop.in.h:1 -msgid "A Scientific Calculator" -msgstr "科学计算器" - -#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2 msgid "EdenMath" msgstr "EdenMath" +#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2 +msgid "A Scientific Calculator" +msgstr "科学计算器" + #: ../menu-data/edubuntu-menueditor:menueditor.desktop.in.h:1 msgid "Edubuntu menu editor" msgstr "Edubuntu 菜单编辑器" #: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:1 -msgid "Bookkeeping program for small to medium sized companies" -msgstr "面向中小型公司的记账程序" - -#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2 msgid "EekBoek" msgstr "EekBoek" +#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2 +msgid "Bookkeeping program for small to medium sized companies" +msgstr "面向中小型公司的记账程序" + #: ../menu-data/efax-gtk:efax-gtk.desktop.in.h:1 msgid "Efax-gtk" msgstr "Efax-gtk" @@ -3424,22 +3540,22 @@ msgstr "" #: ../menu-data/efte:efte.desktop.in.h:1 -msgid "Fast, extendable programmers' text editor" -msgstr "快速,可扩展的程序员用文本编辑器" - -#: ../menu-data/efte:efte.desktop.in.h:2 msgid "eFTE" msgstr "eFTE" -#: ../menu-data/egoboo:egoboo.desktop.in.h:1 -msgid "3D dungeon crawling game" -msgstr "3D 迷宫探险游戏" +#: ../menu-data/efte:efte.desktop.in.h:2 +msgid "Fast, extendable programmers' text editor" +msgstr "快速,可扩展的程序员用文本编辑器" -#: ../menu-data/egoboo:egoboo.desktop.in.h:2 +#: ../menu-data/egoboo:egoboo.desktop.in.h:1 msgid "Egoboo" msgstr "Egoboo" -#: ../menu-data/eiciel:eiciel.desktop.in.h:1 +#: ../menu-data/egoboo:egoboo.desktop.in.h:2 +msgid "3D dungeon crawling game" +msgstr "3D 迷宫探险游戏" + +#: ../menu-data/eiciel:eiciel.desktop.in.h:1 msgid "Eiciel" msgstr "Eiciel" @@ -3449,13 +3565,13 @@ msgstr "查看或更改文件与目录的访问控制列表和用户扩展属性" #: ../menu-data/einstein:einstein.desktop.in.h:1 -msgid "\"Puzzle game inspired on Einstein's puzzle\"" -msgstr "" - -#: ../menu-data/einstein:einstein.desktop.in.h:2 msgid "Einstein" msgstr "Einstein" +#: ../menu-data/einstein:einstein.desktop.in.h:2 +msgid "\"Puzzle game inspired on Einstein's puzzle\"" +msgstr "" + #: ../menu-data/eiskaltdcpp-gtk:eiskaltdcpp-gtk.desktop.in.h:1 msgid "EiskaltDC++ Gtk" msgstr "" @@ -3478,22 +3594,30 @@ msgstr "" #: ../menu-data/electric:electric.desktop.in.h:1 -msgid "Electrical CAD System" -msgstr "电气 CAD 系统" - -#: ../menu-data/electric:electric.desktop.in.h:2 msgid "electric" msgstr "electric" +#: ../menu-data/electric:electric.desktop.in.h:2 +msgid "Electrical CAD System" +msgstr "电气 CAD 系统" + #: ../menu-data/elinks-lite:elinks.desktop.in.h:1 #: ../menu-data/elinks:elinks.desktop.in.h:1 -msgid "Browse the web in text mode" -msgstr "用文字模式浏览网页" +msgid "ELinks Web Browser" +msgstr "ELinks 网络浏览器" #: ../menu-data/elinks-lite:elinks.desktop.in.h:2 #: ../menu-data/elinks:elinks.desktop.in.h:2 -msgid "ELinks Web Browser" -msgstr "ELinks 网络浏览器" +msgid "Browse the web in text mode" +msgstr "用文字模式浏览网页" + +#: ../menu-data/elki:elki.desktop.in.h:1 +msgid "ELKI" +msgstr "" + +#: ../menu-data/elki:elki.desktop.in.h:2 +msgid "Data mining algorithm development framework" +msgstr "" #: ../menu-data/elmer:ElmerGUI.desktop.in.h:1 msgid "Elmer" @@ -3528,45 +3652,45 @@ msgstr "在默认浏览器中打开本地 EMBOSS Explorer 网站。" #: ../menu-data/emelfm2:emelfm2.desktop.in.h:1 -msgid "2-pane Gtk+2 file manager" -msgstr "双面板 Gtk+2 文件管理器" - -#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2 msgid "emelFM2" msgstr "emelFM2" -#: ../menu-data/emerillon:emerillon.desktop.in.h:1 -msgid "Browse maps" -msgstr "浏览地图" +#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2 +msgid "2-pane Gtk+2 file manager" +msgstr "双面板 Gtk+2 文件管理器" -#: ../menu-data/emerillon:emerillon.desktop.in.h:2 +#: ../menu-data/emerillon:emerillon.desktop.in.h:1 msgid "Emerillon Map Viewer" msgstr "" +#: ../menu-data/emerillon:emerillon.desktop.in.h:2 +msgid "Browse maps" +msgstr "浏览地图" + #: ../menu-data/emesene:emesene.desktop.in.h:1 -msgid "Instant messaging client for MSN, Gtalk and Facebook" +msgid "emesene" msgstr "" #: ../menu-data/emesene:emesene.desktop.in.h:2 -msgid "emesene" +msgid "Instant messaging client for MSN, Gtalk and Facebook" msgstr "" #: ../menu-data/emma:emma.desktop.in.h:1 -msgid "MySQL managing assistant" -msgstr "MySQL 管理助手" - -#: ../menu-data/emma:emma.desktop.in.h:2 msgid "emma" msgstr "emma" -#: ../menu-data/empathy:empathy.desktop.in.h:1 -msgid "Chat on Google Talk, Facebook, MSN and many other chat services" -msgstr "使用 Google Talk、Facebook、MSN 和其他众多聊天服务交谈" +#: ../menu-data/emma:emma.desktop.in.h:2 +msgid "MySQL managing assistant" +msgstr "MySQL 管理助手" -#: ../menu-data/empathy:empathy.desktop.in.h:2 +#: ../menu-data/empathy:empathy.desktop.in.h:1 msgid "Empathy Internet Messaging" msgstr "" +#: ../menu-data/empathy:empathy.desktop.in.h:2 +msgid "Chat on Google Talk, Facebook, MSN and many other chat services" +msgstr "使用 Google Talk、Facebook、MSN 和其他众多聊天服务交谈" + #: ../menu-data/empcommand:empcommand.desktop.in.h:1 msgid "EMPCommand" msgstr "" @@ -3610,13 +3734,13 @@ msgstr "克服重重障碍,用弹子打开一对对的石头" #: ../menu-data/enna:enna.desktop.in.h:1 -msgid "EFL Multimedia Center" -msgstr "EFL 多媒体中心" - -#: ../menu-data/enna:enna.desktop.in.h:2 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" @@ -3626,14 +3750,14 @@ msgstr "标签编辑器" #: ../menu-data/eog:eog.desktop.in.h:1 -msgid "Browse and rotate images" -msgstr "浏览及旋转图像" - -#: ../menu-data/eog:eog.desktop.in.h:2 #: ../menu-data/gpicview:gpicview.desktop.in.h:1 msgid "Image Viewer" msgstr "图像查看器" +#: ../menu-data/eog:eog.desktop.in.h:2 +msgid "Browse and rotate images" +msgstr "浏览及旋转图像" + #: ../menu-data/epdfview:epdfview.desktop.in.h:1 msgid "Lightweight PDF document viewer" msgstr "轻量级 PDF 文档浏览器" @@ -3643,32 +3767,32 @@ msgstr "ePDFViewer" #: ../menu-data/epigrass:epigrass.desktop.in.h:1 -msgid "Epidemics Simulator" -msgstr "疫情模拟器" - -#: ../menu-data/epigrass:epigrass.desktop.in.h:2 msgid "Epigrass" msgstr "Epigrass" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1 -#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1 -msgid "Browse the web" -msgstr "浏览网页" +#: ../menu-data/epigrass:epigrass.desktop.in.h:2 +msgid "Epidemics Simulator" +msgstr "疫情模拟器" -#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2 +#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1 msgid "Epiphany Web Browser" msgstr "Epiphany 网页浏览器" +#: ../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 "浏览网页" + #: ../menu-data/epiphany:epiphany-game.desktop.in.h:1 +msgid "Epiphany" +msgstr "Epiphany" + +#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2 msgid "" "Collect valuable minerals, while avoiding being hit by a falling boulder or " "a bomb" msgstr "收集有价值的矿石,同时躲开落下的巨石和炸弹。" -#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2 -msgid "Epiphany" -msgstr "Epiphany" - #: ../menu-data/epoptes:epoptes.desktop.in.h:1 msgid "Epoptes" msgstr "" @@ -3694,13 +3818,13 @@ msgstr "全功能的 Python 集成开发环境" #: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:1 -msgid "Let the computer read out text for you" -msgstr "让电脑来为您读出文本。" - -#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2 msgid "eSpeak speech synthesizer" msgstr "eSpeak 语音合成器" +#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2 +msgid "Let the computer read out text for you" +msgstr "让电脑来为您读出文本。" + #: ../menu-data/esperanza:esperanza.desktop.in.h:1 msgid "Esperanza" msgstr "Esperanza" @@ -3710,14 +3834,6 @@ "XMMS2 client which aims to be as feature-full and easy-to-use as possible" msgstr "以“多功能并易用”为目标的 XMMS2 客户端" -#: ../menu-data/esteidutil:esteidutil.desktop.in.h:1 -msgid "EstEID smartcard management tool" -msgstr "EstEID 智能卡管理工具" - -#: ../menu-data/esteidutil:esteidutil.desktop.in.h:2 -msgid "esteidutil" -msgstr "esteidutil" - #: ../menu-data/etherape:etherape.desktop.in.h:1 msgid "EtherApe" msgstr "EtherApe" @@ -3727,50 +3843,51 @@ msgstr "图形化网络监视器" #: ../menu-data/etoys:etoys.desktop.in.h:1 -msgid " A media-rich model, simulation construction kit and authoring tool" -msgstr " 一个富媒体模型,模拟构建工具包和创作工具。" - -#: ../menu-data/etoys:etoys.desktop.in.h:2 msgid "eToys" msgstr "eToys" -#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1 -msgid "Multipurpose sniffer/interceptor/logger" -msgstr "多用途嗅探器/拦截器/日志器" +#: ../menu-data/etoys:etoys.desktop.in.h:2 +msgid " A media-rich model, simulation construction kit and authoring tool" +msgstr " 一个富媒体模型,模拟构建工具包和创作工具。" -#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2 +#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1 msgid "ettercap" msgstr "ettercap" -#: ../menu-data/etw:etw.desktop.in.h:1 -msgid "Arcade Soccer Game" -msgstr "足球街机游戏" +#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2 +msgid "Multipurpose sniffer/interceptor/logger" +msgstr "多用途嗅探器/拦截器/日志器" -#: ../menu-data/etw:etw.desktop.in.h:2 +#: ../menu-data/etw:etw.desktop.in.h:1 msgid "Eat The Whistle" msgstr "" -#: ../menu-data/euler:euler.desktop.in.h:1 -msgid "An interactive mathematical program" -msgstr "一个交互性数学程序" +#: ../menu-data/etw:etw.desktop.in.h:2 +msgid "Arcade Soccer Game" +msgstr "足球街机游戏" -#: ../menu-data/euler:euler.desktop.in.h:2 +#: ../menu-data/euler:euler.desktop.in.h:1 msgid "Euler" msgstr "Euler" +#: ../menu-data/euler:euler.desktop.in.h:2 +msgid "An interactive mathematical program" +msgstr "一个交互性数学程序" + #: ../menu-data/evilvte:evilvte.desktop.in.h:1 +msgid "evilvte" +msgstr "evilvte" + +#: ../menu-data/evilvte:evilvte.desktop.in.h:2 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1 msgid "Terminal Emulator" msgstr "终端模拟器" -#: ../menu-data/evilvte:evilvte.desktop.in.h:2 -msgid "evilvte" -msgstr "evilvte" - #: ../menu-data/evince-common:evince.desktop.in.h:1 -#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.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/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2 +#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2 +#: ../menu-data/okular:kde4__okular.desktop.in.h:2 +#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2 msgid "Document Viewer" msgstr "文档察看器" @@ -3778,14 +3895,6 @@ msgid "View multi-page documents" msgstr "查看多页文档" -#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:1 -msgid "Evolution RSS" -msgstr "" - -#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:2 -msgid "Evolution plugin that enables Evolution Mail to display rss feeds." -msgstr "" - #: ../menu-data/evolution:evolution.desktop.in.h:1 msgid "Evolution Mail and Calendar" msgstr "Evolution 邮件和日历" @@ -3811,14 +3920,14 @@ msgstr "聆听、浏览或管理您的音乐" #: ../menu-data/exfalso:exfalso.desktop.in.h:1 -msgid "Edit tags in your audio files" -msgstr "编辑您的音频文件中的标签" - -#: ../menu-data/exfalso:exfalso.desktop.in.h:2 msgid "Ex Falso" msgstr "Ex Falso" -#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1 +#: ../menu-data/exfalso:exfalso.desktop.in.h:2 +msgid "Edit tags in your audio files" +msgstr "编辑您的音频文件中的标签" + +#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2 msgid "Browse the file system" msgstr "" @@ -3831,14 +3940,14 @@ msgstr "" #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2 -#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3 +#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 #: ../menu-data/roxterm:roxterm.desktop.in.h:2 #: ../menu-data/sakura:sakura.desktop.in.h:2 msgid "Use the command line" msgstr "使用命令行" -#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2 -#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1 +#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1 +#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2 msgid "Web Browser" msgstr "网络浏览器" @@ -3851,13 +3960,13 @@ msgstr "" #: ../menu-data/extace:extace.desktop.in.h:1 -msgid "Audio Waveform Monitor" -msgstr "音频波形监视器" - -#: ../menu-data/extace:extace.desktop.in.h:2 msgid "Extace Waveform Display" msgstr "Extace 波形显示" +#: ../menu-data/extace:extace.desktop.in.h:2 +msgid "Audio Waveform Monitor" +msgstr "音频波形监视器" + #: ../menu-data/extcalc:extcalc.desktop.in.h:1 msgid "Extcalc" msgstr "Extcalc 计算器" @@ -3894,22 +4003,14 @@ msgid "No name" msgstr "" -#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:1 -msgid "Tool for construction of phylogenetic trees of DNA sequences" -msgstr "DNA 序列系统发生树构造工具" - -#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:2 -msgid "fastDNAml" -msgstr "fastDNAml" - #: ../menu-data/fatrat:fatrat.desktop.in.h:1 -msgid "FatRat" -msgstr "FatRat" - -#: ../menu-data/fatrat:fatrat.desktop.in.h:2 msgid "Qt-based download/upload manager" msgstr "基于 Qt 的下载/上传管理器" +#: ../menu-data/fatrat:fatrat.desktop.in.h:2 +msgid "FatRat" +msgstr "FatRat" + #: ../menu-data/faumachine:faum.desktop.in.h:1 msgid "FAUmachine" msgstr "FAUmachine" @@ -3952,27 +4053,27 @@ msgstr "" #: ../menu-data/fcitx-data:fcitx.desktop.in.h:1 -msgid "Chinese Input Method" +msgid "Fcitx" msgstr "" #: ../menu-data/fcitx-data:fcitx.desktop.in.h:2 -msgid "Fcitx" +msgid "Chinese Input Method" msgstr "" #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1 -msgid "Chinese Input Method (Use Kimpanel)" +msgid "Fcitx Kimpanel" msgstr "" #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2 -msgid "Fcitx Kimpanel" +msgid "Chinese Input Method (Use Kimpanel)" msgstr "" #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1 -msgid "Chinese Input Method (Use Light weight UI)" +msgid "Fcitx Light UI" msgstr "" #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2 -msgid "Fcitx Light UI" +msgid "Chinese Input Method (Use Light weight UI)" msgstr "" #: ../menu-data/feh:feh.desktop.in.h:1 @@ -3980,40 +4081,40 @@ msgstr "Feh" #: ../menu-data/feh:feh.desktop.in.h:2 -#: ../menu-data/preview.app:Preview.desktop.in.h:1 +#: ../menu-data/preview.app:Preview.desktop.in.h:2 msgid "Image viewer" msgstr "图像浏览器" #: ../menu-data/felix-latin:felix.desktop.in.h:1 -msgid "Gaffiot's dictionary is a reference book" +msgid "Latin-French dictionary" msgstr "" #: ../menu-data/felix-latin:felix.desktop.in.h:2 -msgid "Latin-French dictionary" +msgid "Gaffiot's dictionary is a reference book" msgstr "" #: ../menu-data/ferret:ferret.desktop.in.h:1 -msgid "Design E-R databases" -msgstr "设计 E-R 数据库" - -#: ../menu-data/ferret:ferret.desktop.in.h:2 msgid "ferret" msgstr "ferret" -#: ../menu-data/fet:fet.desktop.in.h:1 -msgid "Generate timetables for educational institutions" -msgstr "为教育机构创建时间表" +#: ../menu-data/ferret:ferret.desktop.in.h:2 +msgid "Design E-R databases" +msgstr "设计 E-R 数据库" -#: ../menu-data/fet:fet.desktop.in.h:2 +#: ../menu-data/fet:fet.desktop.in.h:1 msgid "Timetable Generator" msgstr "时间表生成器" +#: ../menu-data/fet:fet.desktop.in.h:2 +msgid "Generate timetables for educational institutions" +msgstr "为教育机构创建时间表" + #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:1 -msgid "Audio mixer for Firewire devices" +msgid "FFADO Mixer" msgstr "" #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:2 -msgid "FFADO Mixer" +msgid "Audio mixer for Firewire devices" msgstr "" #: ../menu-data/fgo:fgo.desktop.in.h:1 @@ -4049,13 +4150,13 @@ msgstr "查看磁盘使用信息" #: ../menu-data/filezilla:filezilla.desktop.in.h:1 -msgid "Download and upload files via FTP, FTPS and SFTP" -msgstr "通过 FTP、FTPS 和 SFTP 上传下载文件" - -#: ../menu-data/filezilla:filezilla.desktop.in.h:2 msgid "FileZilla" msgstr "FileZila" +#: ../menu-data/filezilla:filezilla.desktop.in.h:2 +msgid "Download and upload files via FTP, FTPS and SFTP" +msgstr "通过 FTP、FTPS 和 SFTP 上传下载文件" + #: ../menu-data/filler:filler.desktop.in.h:1 msgid "Filler" msgstr "Filler" @@ -4080,7 +4181,7 @@ msgid "Record and edit multitrack audio" msgstr "" -#: ../menu-data/firefox:firefox.desktop.in.h:2 +#: ../menu-data/firefox:firefox.desktop.in.h:1 msgid "Firefox Web Browser" msgstr "Firefox 网络浏览器" @@ -4089,54 +4190,62 @@ msgstr "" #: ../menu-data/firestarter:firestarter.desktop.in.h:1 -msgid "Desktop Firewall Tool" -msgstr "桌面防火墙工具" - -#: ../menu-data/firestarter:firestarter.desktop.in.h:2 msgid "Firestarter" msgstr "Firestarter" -#: ../menu-data/fityk:fityk.desktop.in.h:1 -msgid "Peak fitting and data analysis" -msgstr "峰值拟合和数据分析" +#: ../menu-data/firestarter:firestarter.desktop.in.h:2 +msgid "Desktop Firewall Tool" +msgstr "桌面防火墙工具" -#: ../menu-data/fityk:fityk.desktop.in.h:2 +#: ../menu-data/fityk:fityk.desktop.in.h:1 msgid "fityk" msgstr "fityk" +#: ../menu-data/fityk:fityk.desktop.in.h:2 +msgid "Peak fitting and data analysis" +msgstr "峰值拟合和数据分析" + #: ../menu-data/flamerobin:flamerobin.desktop.in.h:1 +msgid "FlameRobin" +msgstr "FlameRobin" + +#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2 msgid "Administration Tool for Firebird DBMS" msgstr "Firebird 数据库管理系统管理工具" -#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2 -msgid "FlameRobin" -msgstr "FlameRobin" +#: ../menu-data/flare:flare.desktop.in.h:1 +msgid "Flare" +msgstr "" + +#: ../menu-data/flare:flare.desktop.in.h:2 +msgid "A single player, 2D-isometric, action Role-Playing Game" +msgstr "" #: ../menu-data/fldiff:fldiff.desktop.in.h:1 -msgid "A graphical diff program" +msgid "fldiff" msgstr "" #: ../menu-data/fldiff:fldiff.desktop.in.h:2 -msgid "fldiff" +msgid "A graphical diff program" msgstr "" #: ../menu-data/fldigi:flarq.desktop.in.h:1 -msgid "Amateur Radio Data Transfer with ARQ" -msgstr "使用 ARQ 的业余无线电的数据传送工具" - -#: ../menu-data/fldigi:flarq.desktop.in.h:2 msgid "Flarq" msgstr "Flarq" -#: ../menu-data/fldigi:fldigi.desktop.in.h:1 -#: ../menu-data/linpsk:linpsk.desktop.in.h:1 -msgid "Amateur Radio Sound Card Communications" -msgstr "业余无线电声卡通信" +#: ../menu-data/fldigi:flarq.desktop.in.h:2 +msgid "Amateur Radio Data Transfer with ARQ" +msgstr "使用 ARQ 的业余无线电的数据传送工具" -#: ../menu-data/fldigi:fldigi.desktop.in.h:2 +#: ../menu-data/fldigi:fldigi.desktop.in.h:1 msgid "Fldigi" msgstr "Fldigi" +#: ../menu-data/fldigi:fldigi.desktop.in.h:2 +#: ../menu-data/linpsk:linpsk.desktop.in.h:2 +msgid "Amateur Radio Sound Card Communications" +msgstr "业余无线电声卡通信" + #: ../menu-data/flegita:flegita.desktop.in.h:1 msgid "Scanner Utility" msgstr "扫描仪工具" @@ -4146,67 +4255,67 @@ msgstr "简单的图像扫描" #: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:1 +msgid "Flight of the Amazon Queen" +msgstr "" + +#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2 msgid "" "Embark on a quest to rescue a kidnapped princess and in the process, " "discover the true sinister intentions of a suspiciously located Lederhosen " "company" msgstr "" -#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2 -msgid "Flight of the Amazon Queen" -msgstr "" - #: ../menu-data/flightgear:flightgear.desktop.in.h:1 -msgid "A flight simulator" -msgstr "一个飞行模拟器" - -#: ../menu-data/flightgear:flightgear.desktop.in.h:2 msgid "FlightGear" msgstr "FlightGear" -#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1 -msgid "A tetris-like game" -msgstr "一個類似俄羅斯方塊的遊戲" +#: ../menu-data/flightgear:flightgear.desktop.in.h:2 +msgid "A flight simulator" +msgstr "一个飞行模拟器" -#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2 +#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1 msgid "FloboPuyo" msgstr "FloboPuyo" -#: ../menu-data/flphoto:flphoto.desktop.in.h:1 -msgid "FLTK Photo Software" -msgstr "FLTK 相片软件" +#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2 +msgid "A tetris-like game" +msgstr "一個類似俄羅斯方塊的遊戲" -#: ../menu-data/flphoto:flphoto.desktop.in.h:2 +#: ../menu-data/flphoto:flphoto.desktop.in.h:1 msgid "flPhoto" msgstr "flPhoto" -#: ../menu-data/flpsed:flpsed.desktop.in.h:1 -msgid "Add text and annotations to PDF and PostScript documents" -msgstr "向 PDF 和 PostScript 文档添加文本和注释" +#: ../menu-data/flphoto:flphoto.desktop.in.h:2 +msgid "FLTK Photo Software" +msgstr "FLTK 相片软件" -#: ../menu-data/flpsed:flpsed.desktop.in.h:2 +#: ../menu-data/flpsed:flpsed.desktop.in.h:1 msgid "flpsed PDF Annotator" msgstr "flpsed PDF 注释程序" +#: ../menu-data/flpsed:flpsed.desktop.in.h:2 +msgid "Add text and annotations to PDF and PostScript documents" +msgstr "向 PDF 和 PostScript 文档添加文本和注释" + #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:1 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:1 -msgid "Block Attack! Game" -msgstr "Block Attack! 游戏" +msgid "FLTK Block Attack!" +msgstr "" #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:2 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:2 -msgid "FLTK Block Attack!" -msgstr "" +msgid "Block Attack! Game" +msgstr "Block Attack! 游戏" #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:1 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:1 -msgid "Checkers Game" -msgstr "跳棋游戏" +msgid "FLTK Checkers" +msgstr "FLTK 跳棋" #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:2 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:2 -msgid "FLTK Checkers" -msgstr "FLTK 跳棋" +msgid "Checkers Game" +msgstr "跳棋游戏" #: ../menu-data/fltk1.1-games:flsudoku.desktop.in.h:1 #: ../menu-data/fltk1.3-games:flsudoku.desktop.in.h:1 @@ -4219,13 +4328,13 @@ msgstr "数独游戏" #: ../menu-data/fluid:fluid.desktop.in.h:1 -msgid "FLTK GUI Designer" -msgstr "FLTK GUI 设计器" - -#: ../menu-data/fluid:fluid.desktop.in.h:2 msgid "FLUID" msgstr "FLUID" +#: ../menu-data/fluid:fluid.desktop.in.h:2 +msgid "FLTK GUI Designer" +msgstr "FLTK GUI 设计器" + #: ../menu-data/flumotion:flumotion-admin.desktop.in.h:1 msgid "Flumotion Streaming Server Administration" msgstr "Flumotion 流媒体服务器管理" @@ -4235,20 +4344,20 @@ msgstr "管理 Flumotion 流媒体服务器" #: ../menu-data/flush:flush.desktop.in.h:1 -msgid "Downloading files by BitTorrent protocol" +msgid "Flush" msgstr "" #: ../menu-data/flush:flush.desktop.in.h:2 -msgid "Flush" +msgid "Downloading files by BitTorrent protocol" msgstr "" #: ../menu-data/fmit:fmit.desktop.in.h:1 -msgid "Music instrument tuner" -msgstr "乐器调音师" +msgid "FMIT" +msgstr "" #: ../menu-data/fmit:fmit.desktop.in.h:2 -msgid "fmit" -msgstr "fmit" +msgid "Tune musical instruments" +msgstr "" #: ../menu-data/focuswriter:focuswriter.desktop.in.h:1 msgid "FocusWriter" @@ -4271,29 +4380,29 @@ msgstr "预览、比较和管理字体" #: ../menu-data/font-manager:font-sampler.desktop.in.h:1 -msgid "Create a PDF sample sheet from a directory of fonts" +msgid "Font Sampler" msgstr "" #: ../menu-data/font-manager:font-sampler.desktop.in.h:2 -msgid "Font Sampler" +msgid "Create a PDF sample sheet from a directory of fonts" msgstr "" #: ../menu-data/fontforge:fontforge.desktop.in.h:1 -msgid "An outline font editor" -msgstr "" - -#: ../menu-data/fontforge:fontforge.desktop.in.h:2 msgid "FontForge" msgstr "FontForge" -#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1 -msgid "A font manager" -msgstr "字体管理器" +#: ../menu-data/fontforge:fontforge.desktop.in.h:2 +msgid "An outline font editor" +msgstr "" -#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2 +#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1 msgid "Fontmatrix" msgstr "Fontmatrix" +#: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2 +msgid "A font manager" +msgstr "字体管理器" + #: ../menu-data/fontypython:fontypython.desktop.in.h:1 msgid "Fonty Python Font Manager" msgstr "Fonty Python 字体管理器" @@ -4311,21 +4420,21 @@ msgstr "" #: ../menu-data/foobillard:foobillard.desktop.in.h:1 -msgid "3D billiards game using OpenGL" -msgstr "使用 OpenGL 的三维台球游戏" - -#: ../menu-data/foobillard:foobillard.desktop.in.h:2 msgid "Foobillard" msgstr "Foobillard" -#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1 -msgid "Foomatic-GUI printer configuration tool" -msgstr "Foomatic-GUI 打印机配置工具" +#: ../menu-data/foobillard:foobillard.desktop.in.h:2 +msgid "3D billiards game using OpenGL" +msgstr "使用 OpenGL 的三维台球游戏" -#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2 +#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1 msgid "Printers" msgstr "打印机" +#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2 +msgid "Foomatic-GUI printer configuration tool" +msgstr "Foomatic-GUI 打印机配置工具" + #: ../menu-data/fotowall:fotowall.desktop.in.h:1 msgid "Fotowall" msgstr "Fotowall" @@ -4334,47 +4443,48 @@ msgid "Photo collection creativity tool" msgstr "相册创造力工具" -#: ../menu-data/fotoxx:fotoxx.desktop.in.h:1 -msgid "Digital Photo Editor" -msgstr "数码照片编辑器" - -#: ../menu-data/fotoxx:fotoxx.desktop.in.h:2 +#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:1 msgid "fotoxx" msgstr "fotoxx" -#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1 -msgid "Display map and GPS position" -msgstr "显示地图和 GPS 位置" +#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:2 +msgid "Edit photos and manage collections" +msgstr "" -#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2 +#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1 msgid "FoxtrotGPS" msgstr "" +#: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2 +msgid "Display map and GPS position" +msgstr "显示地图和 GPS 位置" + #: ../menu-data/fpm2:fpm2.desktop.in.h:1 msgid "Figaro's Password Manager 2" msgstr "Figaro 的密码管理器 2" #: ../menu-data/fpm2:fpm2.desktop.in.h:2 +#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:2 msgid "Manage passwords" msgstr "管理密码" #: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:1 -msgid "Fingerprint scanning demonstration" -msgstr "指纹扫描演示程序" - -#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2 msgid "fprint-demo" msgstr "fprint-demo" -#: ../menu-data/fqterm:fqterm.desktop.in.h:1 -#: ../menu-data/qterm:qterm.desktop.in.h:1 -msgid "BBS client based on Qt library in linux" -msgstr "Linux 下基于 Qt 库的 BBS 客户端" +#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2 +msgid "Fingerprint scanning demonstration" +msgstr "指纹扫描演示程序" -#: ../menu-data/fqterm:fqterm.desktop.in.h:2 +#: ../menu-data/fqterm:fqterm.desktop.in.h:1 msgid "FQTerm" msgstr "FQTerm" +#: ../menu-data/fqterm:fqterm.desktop.in.h:2 +#: ../menu-data/qterm:qterm.desktop.in.h:2 +msgid "BBS client based on Qt library in linux" +msgstr "Linux 下基于 Qt 库的 BBS 客户端" + #: ../menu-data/fracplanet:fracplanet.desktop.in.h:1 msgid "Fracplanet" msgstr "" @@ -4400,38 +4510,51 @@ msgstr "" #: ../menu-data/freealchemist:freealchemist.desktop.in.h:1 -msgid "A simpler figure block game" -msgstr "" - -#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2 msgid "FreeAlchemist" msgstr "FreeAlchemist" -#: ../menu-data/freebirth:freebirth.desktop.in.h:1 -msgid "Bass synthesizer/sample player/sequencer" +#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2 +msgid "A simpler figure block game" msgstr "" -#: ../menu-data/freebirth:freebirth.desktop.in.h:2 +#: ../menu-data/freebirth:freebirth.desktop.in.h:1 msgid "Freebirth" msgstr "Freebirth" -#: ../menu-data/freecad:freecad.desktop.in.h:1 -msgid "Feature based Parametric Modeler" +#: ../menu-data/freebirth:freebirth.desktop.in.h:2 +msgid "Bass synthesizer/sample player/sequencer" msgstr "" -#: ../menu-data/freecad:freecad.desktop.in.h:2 +#: ../menu-data/freecad:freecad.desktop.in.h:1 msgid "FreeCAD" msgstr "FreeCAD" +#: ../menu-data/freecad:freecad.desktop.in.h:2 +msgid "Feature based Parametric Modeler" +msgstr "" + +#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:1 +msgid "Freeciv modpack installer" +msgstr "" + +#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:2 +msgid "Download and install add-ons for Freeciv" +msgstr "" + #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1 msgid "Freeciv" msgstr "Freeciv" #: ../menu-data/freeciv-client-gtk:freeciv-gtk.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-server:freeciv-server.desktop.in.h:1 +msgid "Freeciv server" +msgstr "" + #: ../menu-data/freecol:freecol.desktop.in.h:1 msgid "FreeCol" msgstr "FreeCol" @@ -4461,26 +4584,26 @@ msgstr "" #: ../menu-data/freedm:freedm.desktop.in.h:1 -#: ../menu-data/freedoom:freedoom.desktop.in.h:1 -msgid "First Person Shooter Game" -msgstr "第一人称射击游戏" - -#: ../menu-data/freedm:freedm.desktop.in.h:2 msgid "Free DM" msgstr "Free DM" +#: ../menu-data/freedm:freedm.desktop.in.h:2 #: ../menu-data/freedoom:freedoom.desktop.in.h:2 +msgid "First Person Shooter Game" +msgstr "第一人称射击游戏" + +#: ../menu-data/freedoom:freedoom.desktop.in.h:1 msgid "Freedoom" msgstr "Freedoom" #: ../menu-data/freedroid:freedroid.desktop.in.h:1 -msgid "Clear a spaceship from all droids" -msgstr "" - -#: ../menu-data/freedroid:freedroid.desktop.in.h:2 msgid "Freedroid" msgstr "Freedroid" +#: ../menu-data/freedroid:freedroid.desktop.in.h:2 +msgid "Clear a spaceship from all droids" +msgstr "" + #: ../menu-data/freedroidrpg:freedroidrpg.desktop.in.h:1 msgid "Freedroid RPG" msgstr "Freedroid RPG" @@ -4490,80 +4613,80 @@ msgstr "" #: ../menu-data/freegish:freegish.desktop.in.h:1 -msgid "A physics based arcade game" +msgid "FreeGish" msgstr "" #: ../menu-data/freegish:freegish.desktop.in.h:2 -msgid "FreeGish" +msgid "A physics based arcade game" msgstr "" #: ../menu-data/freeguide:freeguide.desktop.in.h:1 -msgid "Download a TV guide from the Internet and view it" -msgstr "浏览从互联网上下载的电视指南" - -#: ../menu-data/freeguide:freeguide.desktop.in.h:2 msgid "FreeGuide" msgstr "FreeGuide" -#: ../menu-data/freemat:freemat.desktop.in.h:1 -msgid "FreeMat" -msgstr "FreeMat" +#: ../menu-data/freeguide:freeguide.desktop.in.h:2 +msgid "Download a TV guide from the Internet and view it" +msgstr "浏览从互联网上下载的电视指南" -#: ../menu-data/freemat:freemat.desktop.in.h:2 +#: ../menu-data/freemat:freemat.desktop.in.h:1 msgid "" "a free environment for rapid engineering and scientific prototyping and data " "processing." msgstr "" -#: ../menu-data/freemind:freemind.desktop.in.h:1 -msgid "A free mind mapping tool" -msgstr "一个免费的思维导图工具" +#: ../menu-data/freemat:freemat.desktop.in.h:2 +msgid "FreeMat" +msgstr "FreeMat" -#: ../menu-data/freemind:freemind.desktop.in.h:2 +#: ../menu-data/freemind:freemind.desktop.in.h:1 msgid "FreeMind" msgstr "FreeMind" -#: ../menu-data/freemix:freemix.desktop.in.h:1 -msgid "Live video performance tool" -msgstr "视频现场演出工具" +#: ../menu-data/freemind:freemind.desktop.in.h:2 +msgid "A free mind mapping tool" +msgstr "一个免费的思维导图工具" -#: ../menu-data/freemix:freemix.desktop.in.h:2 +#: ../menu-data/freemix:freemix.desktop.in.h:1 msgid "freemix" msgstr "freemix" -#: ../menu-data/freeplane:freeplane.desktop.in.h:1 -msgid "" -"A free tool to structure and organise your information with mind mapping" +#: ../menu-data/freemix:freemix.desktop.in.h:2 +msgid "Live video performance tool" +msgstr "视频现场演出工具" + +#: ../menu-data/freeplane:freeplane.desktop.in.h:1 +msgid "Freeplane" msgstr "" #: ../menu-data/freeplane:freeplane.desktop.in.h:2 -msgid "Freeplane" +msgid "" +"A free tool to structure and organise your information with mind mapping" msgstr "" #: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:1 -msgid "Download updated version of FreePOPs plugins" -msgstr "下载 FreePOPs 插件的新版本" - -#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2 msgid "FreePOPs updater" msgstr "FreePOPs 更新程序" -#: ../menu-data/freespeak:freespeak.desktop.in.h:1 -msgid "A free frontend to online translator engines" -msgstr "一个在线翻译引擎的免费前端" +#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2 +msgid "Download updated version of FreePOPs plugins" +msgstr "下载 FreePOPs 插件的新版本" -#: ../menu-data/freespeak:freespeak.desktop.in.h:2 +#: ../menu-data/freespeak:freespeak.desktop.in.h:1 msgid "FreeSpeak" msgstr "FreeSpeak" -#: ../menu-data/freetennis:freetennis.desktop.in.h:1 -msgid "Free Tennis - a free tennis simulation" -msgstr "Free Tennis - 一个免费的网球模拟程序" +#: ../menu-data/freespeak:freespeak.desktop.in.h:2 +msgid "A free frontend to online translator engines" +msgstr "一个在线翻译引擎的免费前端" -#: ../menu-data/freetennis:freetennis.desktop.in.h:2 +#: ../menu-data/freetennis:freetennis.desktop.in.h:1 msgid "FreeTennis" msgstr "FreeTennis" +#: ../menu-data/freetennis:freetennis.desktop.in.h:2 +msgid "Free Tennis - a free tennis simulation" +msgstr "Free Tennis - 一个免费的网球模拟程序" + #: ../menu-data/freevial:freevial.desktop.in.h:1 msgid "Freevial" msgstr "Freevial" @@ -4577,8 +4700,8 @@ msgstr "Freevo" #: ../menu-data/freevo:freevo.desktop.in.h:2 -msgid "Playing various multimedia formats, like pictures, audio or video. " -msgstr "播放各种多媒体格式,如图片、音频或视频。 " +msgid "Playing various multimedia formats, like pictures, audio or video" +msgstr "" #: ../menu-data/freewheeling:freewheeling.desktop.in.h:1 msgid "FreeWheeling" @@ -4596,14 +4719,14 @@ msgid "Realtime audio processor based on frequency spectral manipulation" msgstr "基于频谱操作的实时音频处理器" -#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:1 -msgid "Frescobaldi" -msgstr "Frescobaldi" - -#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:2 +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1 msgid "LilyPond Music Editor" msgstr "LilyPond 音乐编辑器" +#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2 +msgid "Frescobaldi" +msgstr "Frescobaldi" + #: ../menu-data/fretsonfire-game:fretsonfire-game.desktop.in.h:1 msgid "Frets on Fire" msgstr "" @@ -4646,11 +4769,11 @@ msgstr "" #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1 -msgid "FSL 4.1" +msgid "Software Collection for (f)MRI Data Analysis" msgstr "" #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2 -msgid "Software Collection for (f)MRI Data Analysis" +msgid "FSL 4.1" msgstr "" #: ../menu-data/fslint:fslint.desktop.in.h:1 @@ -4721,6 +4844,14 @@ msgid "Render Peter de Jong maps" msgstr "" +#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:1 +msgid "GNOME2 IP Messenger" +msgstr "GNOME2 IP 信使" + +#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:2 +msgid "IP Messenger for the GNOME2" +msgstr "GNOME2 中的 IP 信使程序" + #: ../menu-data/g3data:g3data.desktop.in.h:1 msgid "G3Data Graph Analyzer" msgstr "" @@ -4730,13 +4861,13 @@ msgstr "" #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:1 -msgid "3D model viewer" -msgstr "三维模型查看器" - -#: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2 msgid "G3DViewer" msgstr "G3DViewer" +#: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2 +msgid "3D model viewer" +msgstr "三维模型查看器" + #: ../menu-data/gabedit:gabedit.desktop.in.h:1 msgid "Gabedit QC-GUI" msgstr "Gabedit QC-GUI" @@ -4746,13 +4877,13 @@ msgstr "计算化学软件包的图形用户界面" #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:1 -msgid "BIND DNS server administration" -msgstr "BIND DNS 服务器管理" - -#: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2 msgid "GADMIN-BIND" msgstr "GADMIN-BIND" +#: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2 +msgid "BIND DNS server administration" +msgstr "BIND DNS 服务器管理" + #: ../menu-data/gadmin-openvpn-client:gadmin-openvpn-client.desktop.in.h:1 msgid "GADMIN-OPENVPN-Client" msgstr "GADMIN-OPENVPN-Client" @@ -4790,21 +4921,21 @@ msgstr "SAMBA 文件、打印和域服务器管理" #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:1 -msgid "Find Synonyms and Homonyms" -msgstr "寻找同义词和同音词" - -#: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2 msgid "GTK Aiksaurus" msgstr "GTK Aiksaurus" -#: ../menu-data/gajim:gajim.desktop.in.h:1 -msgid "A GTK+ Jabber client" -msgstr "一个 GTK+ Jabber 客户端" +#: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2 +msgid "Find Synonyms and Homonyms" +msgstr "寻找同义词和同音词" -#: ../menu-data/gajim:gajim.desktop.in.h:2 +#: ../menu-data/gajim:gajim.desktop.in.h:1 msgid "Gajim Instant Messenger" msgstr "Gajim 即时通讯软件" +#: ../menu-data/gajim:gajim.desktop.in.h:2 +msgid "A GTK+ Jabber client" +msgstr "一个 GTK+ Jabber 客户端" + #: ../menu-data/galan:galan.desktop.in.h:1 msgid "gAlan" msgstr "gAlan" @@ -4818,13 +4949,13 @@ msgstr "执行简单的科学计算" #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:1 -msgid "Gallery Uploader" -msgstr "Gallery 上传程序" - -#: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2 msgid "Upload pictures and videos to Gallery" msgstr "上传图片和影片到 Gallery" +#: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2 +msgid "Gallery Uploader" +msgstr "Gallery 上传程序" + #: ../menu-data/gally:kde4__gally.desktop.in.h:1 msgid "Gally" msgstr "" @@ -4850,45 +4981,45 @@ msgstr "Gamazons 游戏" #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:1 -msgid "Gambas Almost Means Basic" -msgstr "" - -#: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2 msgid "Gambas2" msgstr "Gambas2" -#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:1 -msgid "A game hacking tool. A GUI front-end for scanmem." -msgstr "一个游戏修改工具。 scanmem 的图形界面前端。" +#: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2 +msgid "Gambas Almost Means Basic" +msgstr "" -#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2 +#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:1 msgid "Game Conqueror" msgstr "游戏修改器" -#: ../menu-data/gamgi:gamgi.desktop.in.h:1 -msgid "Construct, view and analyse atomic structures" -msgstr "构建、查看和分析原子结构" +#: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2 +msgid "A game hacking tool. A GUI front-end for scanmem." +msgstr "一个游戏修改工具。 scanmem 的图形界面前端。" -#: ../menu-data/gamgi:gamgi.desktop.in.h:2 +#: ../menu-data/gamgi:gamgi.desktop.in.h:1 msgid "gamgi" msgstr "gamgi" -#: ../menu-data/gamt:gamt.desktop.in.h:1 -msgid "Intel AMT serial-over-lan client." -msgstr "" +#: ../menu-data/gamgi:gamgi.desktop.in.h:2 +msgid "Construct, view and analyse atomic structures" +msgstr "构建、查看和分析原子结构" -#: ../menu-data/gamt:gamt.desktop.in.h:2 +#: ../menu-data/gamt:gamt.desktop.in.h:1 msgid "gamt" msgstr "gamt" -#: ../menu-data/ganyremote:ganyremote.desktop.in.h:1 -msgid "Bluetooth remote control" -msgstr "蓝牙远端控制" +#: ../menu-data/gamt:gamt.desktop.in.h:2 +msgid "Intel AMT serial-over-lan client." +msgstr "" -#: ../menu-data/ganyremote:ganyremote.desktop.in.h:2 +#: ../menu-data/ganyremote:ganyremote.desktop.in.h:1 msgid "ganyremote" msgstr "ganyremote" +#: ../menu-data/ganyremote:ganyremote.desktop.in.h:2 +msgid "Bluetooth remote control" +msgstr "蓝牙远端控制" + #: ../menu-data/gaphor:gaphor.desktop.in.h:1 msgid "Gaphor" msgstr "Gaphor" @@ -4898,11 +5029,11 @@ msgstr "Gaphor 建模工具" #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:1 -msgid "Abstract vertical shooter with music elements" +msgid "Garden of Coloured Lights" msgstr "" #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:2 -msgid "Garden of Coloured Lights" +msgid "Abstract vertical shooter with music elements" msgstr "" #: ../menu-data/gargoyle-free:gargoyle.desktop.in.h:1 @@ -4931,11 +5062,11 @@ msgstr "" #: ../menu-data/gatos:gatos-conf.desktop.in.h:1 -msgid "Gatos Configuration Editor" +msgid "gatos-conf" msgstr "" #: ../menu-data/gatos:gatos-conf.desktop.in.h:2 -msgid "gatos-conf" +msgid "Gatos Configuration Editor" msgstr "" #: ../menu-data/gatos:xatitv.desktop.in.h:1 @@ -4971,29 +5102,29 @@ msgstr "" #: ../menu-data/gbemol:gbemol.desktop.in.h:1 -msgid "MPD client" -msgstr "MPD 客户端" - -#: ../menu-data/gbemol:gbemol.desktop.in.h:2 msgid "gbemol" msgstr "gbemol" -#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1 -msgid "GTK2 Bulgarian-English Dictionary" -msgstr "GTK2 保加利亚语-英语字典" +#: ../menu-data/gbemol:gbemol.desktop.in.h:2 +msgid "MPD client" +msgstr "MPD 客户端" -#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2 +#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1 msgid "GbgOffice" msgstr "GbgOffice" -#: ../menu-data/gbirthday:gbirthday.desktop.in.h:1 -msgid "Birthday reminder for E-Mail contacts" -msgstr "" +#: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2 +msgid "GTK2 Bulgarian-English Dictionary" +msgstr "GTK2 保加利亚语-英语字典" -#: ../menu-data/gbirthday:gbirthday.desktop.in.h:2 +#: ../menu-data/gbirthday:gbirthday.desktop.in.h:1 msgid "GBirthday" msgstr "GBirthday" +#: ../menu-data/gbirthday:gbirthday.desktop.in.h:2 +msgid "Birthday reminder for E-Mail contacts" +msgstr "" + #: ../menu-data/gbonds:gbonds.desktop.in.h:1 msgid "GBonds" msgstr "GBonds" @@ -5003,15 +5134,15 @@ msgstr "" #: ../menu-data/gbrainy:gbrainy.desktop.in.h:1 +msgid "gbrainy" +msgstr "gbrainy" + +#: ../menu-data/gbrainy:gbrainy.desktop.in.h:2 msgid "" "Play games that challenge your logic, verbal, calculation and memory " "abilities" msgstr "" -#: ../menu-data/gbrainy:gbrainy.desktop.in.h:2 -msgid "gbrainy" -msgstr "gbrainy" - #: ../menu-data/gcalctool:gcalctool.desktop.in.h:1 msgid "Calculator" msgstr "计算器" @@ -5021,37 +5152,29 @@ msgstr "进行算术、科学和财务计算" #: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:1 -msgid "Edit chemical 2D structures" -msgstr "编辑二维化学结构" - -#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2 msgid "GChemPaint Chemical Structures Editor" msgstr "GChemPaint 化学结构编辑器" -#: ../menu-data/gcin:gcin-setup.desktop.in.h:1 -msgid "Setup utility for gcin input method" -msgstr "gcin 输入法的设置工具" - -#: ../menu-data/gcin:gcin-setup.desktop.in.h:2 -msgid "gcin Setup" -msgstr "gcin 设置" +#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2 +msgid "Edit chemical 2D structures" +msgstr "编辑二维化学结构" #: ../menu-data/gcipher:gcipher.desktop.in.h:1 -msgid "A simple encryption tool" -msgstr "简单的加密工具" - -#: ../menu-data/gcipher:gcipher.desktop.in.h:2 msgid "GCipher" msgstr "GCipher" -#: ../menu-data/gco:gco.desktop.in.h:1 -msgid "A GNOME interface for managing your comic book collection" -msgstr "用于管理您的漫画藏书的 GNOME 界面" +#: ../menu-data/gcipher:gcipher.desktop.in.h:2 +msgid "A simple encryption tool" +msgstr "简单的加密工具" -#: ../menu-data/gco:gco.desktop.in.h:2 +#: ../menu-data/gco:gco.desktop.in.h:1 msgid "GNOME Comics Organizer" msgstr "GNOME 漫画管理器" +#: ../menu-data/gco:gco.desktop.in.h:2 +msgid "A GNOME interface for managing your comic book collection" +msgstr "用于管理您的漫画藏书的 GNOME 界面" + #: ../menu-data/gcolor2:gcolor2.desktop.in.h:1 msgid "Gcolor2" msgstr "Gcolor2" @@ -5061,41 +5184,41 @@ msgstr "简易 GTK2 颜色选择拾取器" #: ../menu-data/gcompris:gcompris.desktop.in.h:1 -msgid "Educational game for ages 2 to 10" -msgstr "面向 2 到 10 岁孩子的教育游戏" - -#: ../menu-data/gcompris:gcompris.desktop.in.h:2 msgid "Educational suite GCompris" msgstr "教育套件 GCompris" -#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1 -msgid "A Cleaning tool for GConf" -msgstr "GConf 清理工具" +#: ../menu-data/gcompris:gcompris.desktop.in.h:2 +msgid "Educational game for ages 2 to 10" +msgstr "面向 2 到 10 岁孩子的教育游戏" -#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2 +#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1 msgid "GConf Cleaner" msgstr "GConf 清理器" +#: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2 +msgid "A Cleaning tool for GConf" +msgstr "GConf 清理工具" + #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:1 msgid "Configuration Editor" msgstr "配置编辑器" #: ../menu-data/gconjugue:gconjugue.desktop.in.h:1 -msgid "Conjugates Portuguese verbs" -msgstr "" - -#: ../menu-data/gconjugue:gconjugue.desktop.in.h:2 msgid "GConjugue" msgstr "GConjugue" -#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1 -msgid "Edit and display crystalline structures" -msgstr "编辑和显示晶体结构" +#: ../menu-data/gconjugue:gconjugue.desktop.in.h:2 +msgid "Conjugates Portuguese verbs" +msgstr "" -#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2 +#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1 msgid "Gnome Crystal Crystalline Structures Viewer" msgstr "Gnome Crystal 晶体结构查看器" +#: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2 +msgid "Edit and display crystalline structures" +msgstr "编辑和显示晶体结构" + #: ../menu-data/gcstar:gcstar.desktop.in.h:1 msgid "GCstar Collections Manager" msgstr "GCstar 收藏管理器" @@ -5105,37 +5228,37 @@ msgstr "管理您的电影、游戏、图书、音乐等收藏" #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:1 -msgid "Display chemical 3D structures" -msgstr "显示三维化学结构" - -#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2 msgid "Molecules Viewer" msgstr "分子结构查看器" -#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1 -msgid "A simple calculator for chemistry" -msgstr "简单的化学计算器" +#: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2 +msgid "Display chemical 3D structures" +msgstr "显示三维化学结构" -#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1 msgid "Chemical calculator" msgstr "化学计算器" -#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1 -msgid "A Mendeleiev table of the chemical elements" -msgstr "门捷列夫化学元素表" +#: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2 +msgid "A simple calculator for chemistry" +msgstr "简单的化学计算器" -#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1 msgid "Periodic table of the elements" msgstr "元素周期表" -#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1 -msgid "A spectrum viewer for the GNOME desktop" -msgstr "GNOME 桌面的一个频谱查看器" +#: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2 +msgid "A Mendeleiev table of the chemical elements" +msgstr "门捷列夫化学元素表" -#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2 +#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1 msgid "Spectrum viewer" msgstr "频谱查看器" +#: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2 +msgid "A spectrum viewer for the GNOME desktop" +msgstr "GNOME 桌面的一个频谱查看器" + #: ../menu-data/gcursor:gcursor.desktop.in.h:1 msgid "Cursor Selection" msgstr "光标选择器" @@ -5159,7 +5282,7 @@ #: ../menu-data/gdebi-kde:kde4__gdebi-kde.desktop.in.h:2 #: ../menu-data/gdebi:gdebi.desktop.in.h:2 -#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1 +#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2 msgid "Install and view software packages" msgstr "安装和查看软件包" @@ -5172,21 +5295,21 @@ msgstr "映射/挂载加密分区的图形用户界面" #: ../menu-data/gdesklets:gdesklets.desktop.in.h:1 -msgid "A desktop applet system for GNOME" -msgstr "一个 GNOME 的桌面小程序系统" - -#: ../menu-data/gdesklets:gdesklets.desktop.in.h:2 msgid "gDesklets" msgstr "gDesklets" -#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1 -msgid "GUI for devilspie matching daemon" -msgstr "" +#: ../menu-data/gdesklets:gdesklets.desktop.in.h:2 +msgid "A desktop applet system for GNOME" +msgstr "一个 GNOME 的桌面小程序系统" -#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2 +#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1 msgid "gDevilspie" msgstr "gDevilspie" +#: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2 +msgid "GUI for devilspie matching daemon" +msgstr "" + #: ../menu-data/gdigi:gdigi.desktop.in.h:1 msgid "gdigi" msgstr "" @@ -5201,13 +5324,13 @@ msgstr "对分子建模和操作,并创建高质量的渲染输出" #: ../menu-data/gdmap:gdmap.desktop.in.h:1 -msgid "Display disk space using tree maps" -msgstr "使用树状图显示磁盘空间" - -#: ../menu-data/gdmap:gdmap.desktop.in.h:2 msgid "Graphical Disk Map" msgstr "图形化磁盘使用图" +#: ../menu-data/gdmap:gdmap.desktop.in.h:2 +msgid "Display disk space using tree maps" +msgstr "使用树状图显示磁盘空间" + #: ../menu-data/gdpc:gdpc.desktop.in.h:1 msgid "GDPC Molecular Dynamic Simulator" msgstr "GDPC 分子动态模拟器" @@ -5217,78 +5340,74 @@ msgstr "可视化的分子动态模拟" #: ../menu-data/geany:geany.desktop.in.h:1 -msgid "A fast and lightweight IDE using GTK2" -msgstr "使用 GTK2 的快速轻量级集成开发环境" - -#: ../menu-data/geany:geany.desktop.in.h:2 msgid "Geany" msgstr "Geany" -#: ../menu-data/gebabbel:gebabbel.desktop.in.h:1 -msgid "Convert GPS data and exchange it with a GPS unit" -msgstr "转换 GPS 数据并将数据与 GPS 单元交换" +#: ../menu-data/geany:geany.desktop.in.h:2 +msgid "A fast and lightweight IDE using GTK2" +msgstr "使用 GTK2 的快速轻量级集成开发环境" -#: ../menu-data/gebabbel:gebabbel.desktop.in.h:2 +#: ../menu-data/gebabbel:gebabbel.desktop.in.h:1 msgid "Gebabbel" msgstr "Gebabbel" +#: ../menu-data/gebabbel:gebabbel.desktop.in.h:2 +msgid "Convert GPS data and exchange it with a GPS unit" +msgstr "转换 GPS 数据并将数据与 GPS 单元交换" + #: ../menu-data/gecrit:gecrit.desktop.in.h:1 -msgid "A python text editor." +msgid "gEcrit" msgstr "" #: ../menu-data/gecrit:gecrit.desktop.in.h:2 -msgid "gEcrit" +msgid "A python text editor." msgstr "" #: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:1 -msgid "Manipulate component attributes with gattrib" -msgstr "通过 gattrib 编辑元件属性" - -#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2 msgid "gEDA Attribute Editor" msgstr "gEDA 属性编辑器" -#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1 -msgid "Create and edit electrical schematics and symbols with gschem" -msgstr "使用 gschem 创建和编辑电路原理图和符号" +#: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2 +msgid "Manipulate component attributes with gattrib" +msgstr "通过 gattrib 编辑元件属性" -#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2 +#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1 msgid "gEDA Schematic Editor" msgstr "gEDA 原理图编辑器" -#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1 -msgid "Create and edit electronics projects with xgsch2pcb" -msgstr "使用 xgsch2pcb 创建和编辑电子设计项目" +#: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2 +msgid "Create and edit electrical schematics and symbols with gschem" +msgstr "使用 gschem 创建和编辑电路原理图和符号" -#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2 +#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1 msgid "gEDA Schematic -> PCB Project" msgstr "gEDA 原理图 -> PCB 项目" +#: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2 +msgid "Create and edit electronics projects with xgsch2pcb" +msgstr "使用 xgsch2pcb 创建和编辑电子设计项目" + #: ../menu-data/gedit:gedit.desktop.in.h:1 -#: ../menu-data/jedit:jedit.desktop.in.h:1 -#: ../menu-data/scribes:scribes.desktop.in.h:1 -#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1 +#: ../menu-data/jedit:jedit.desktop.in.h:2 +#: ../menu-data/scribes:scribes.desktop.in.h:2 +#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2 msgid "Edit text files" msgstr "编辑文本文件" #: ../menu-data/gedit:gedit.desktop.in.h:2 -#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2 +#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 +#: ../menu-data/mined:mined.desktop.in.h:2 msgid "Text Editor" msgstr "文本编辑器" -#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:1 -msgid "Geeqie (GPS support)" -msgstr "Geeqie (GPS 支持)" +#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1 +msgid "Geeqie" +msgstr "Geeqie" -#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:2 #: ../menu-data/geeqie:geeqie-standard.desktop.in.h:2 msgid "View and manage images" msgstr "查看和管理图像" -#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1 -msgid "Geeqie" -msgstr "Geeqie" - #: ../menu-data/gelemental:gelemental.desktop.in.h:1 msgid "Periodic Table" msgstr "周期表" @@ -5318,29 +5437,29 @@ msgstr "仿真各种神经系统" #: ../menu-data/genpo:genpo.desktop.in.h:1 -msgid "GENPO is the GENeral Purpose Organ." -msgstr "" - -#: ../menu-data/genpo:genpo.desktop.in.h:2 msgid "Genpo" msgstr "Genpo" -#: ../menu-data/gentoo:gentoo.desktop.in.h:1 -msgid "Fully GUI-configurable, two-pane X file manager" +#: ../menu-data/genpo:genpo.desktop.in.h:2 +msgid "GENPO is the GENeral Purpose Organ." msgstr "" -#: ../menu-data/gentoo:gentoo.desktop.in.h:2 +#: ../menu-data/gentoo:gentoo.desktop.in.h:1 msgid "Gentoo" msgstr "" -#: ../menu-data/geogebra:geogebra.desktop.in.h:1 -msgid "Create interactive mathematical constructions and applets. " +#: ../menu-data/gentoo:gentoo.desktop.in.h:2 +msgid "Fully GUI-configurable, two-pane X file manager" msgstr "" -#: ../menu-data/geogebra:geogebra.desktop.in.h:2 +#: ../menu-data/geogebra:geogebra.desktop.in.h:1 msgid "GeoGebra" msgstr "GeoGebra" +#: ../menu-data/geogebra:geogebra.desktop.in.h:2 +msgid "Create interactive mathematical constructions and applets. " +msgstr "" + #: ../menu-data/geomview:geomview.desktop.in.h:1 msgid "Geomview" msgstr "Geomview" @@ -5350,49 +5469,49 @@ msgstr "交互式的几何学查看程序" #: ../menu-data/geotranz:geotranz.desktop.in.h:1 -msgid "Geographic coordinates translator" -msgstr "地理坐标转换程序" - -#: ../menu-data/geotranz:geotranz.desktop.in.h:2 msgid "Geotranz" msgstr "Geotranz" -#: ../menu-data/gerbv:gerbv.desktop.in.h:1 -msgid "Gerber file viewer for PCB design" -msgstr "PCB 设计的 Gerber 文件查看器" +#: ../menu-data/geotranz:geotranz.desktop.in.h:2 +msgid "Geographic coordinates translator" +msgstr "地理坐标转换程序" -#: ../menu-data/gerbv:gerbv.desktop.in.h:2 +#: ../menu-data/gerbv:gerbv.desktop.in.h:1 msgid "Gerbv Gerber File Viewer" msgstr "Gerbv Gerber 文件查看器" +#: ../menu-data/gerbv:gerbv.desktop.in.h:2 +msgid "Gerber file viewer for PCB design" +msgstr "PCB 设计的 Gerber 文件查看器" + #: ../menu-data/gerstensaft:gerstensaft.desktop.in.h:1 msgid "Graphical frontend to SAFT" msgstr "SAFT 的图形前端" #: ../menu-data/gespeaker:gespeaker.desktop.in.h:1 -msgid "A frontend for espeak" -msgstr "espeak 的前端" - -#: ../menu-data/gespeaker:gespeaker.desktop.in.h:2 msgid "Gespeaker" msgstr "Gespeaker" -#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:1 -msgid "Extract cursors and icons from MS Windows compatible resource files" -msgstr "从与微软 Windows 兼容的资源文件中提取光标和图标" +#: ../menu-data/gespeaker:gespeaker.desktop.in.h:2 +msgid "A frontend for espeak" +msgstr "espeak 的前端" -#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2 +#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:1 msgid "gExtractWinIcons" msgstr "gExtractWinIcons" -#: ../menu-data/gfaim:gfaim.desktop.in.h:1 -msgid "Find any recipe you want" -msgstr "查找任何您想要的食谱" +#: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2 +msgid "Extract cursors and icons from MS Windows compatible resource files" +msgstr "从与微软 Windows 兼容的资源文件中提取光标和图标" -#: ../menu-data/gfaim:gfaim.desktop.in.h:2 +#: ../menu-data/gfaim:gfaim.desktop.in.h:1 msgid "Gfaim" msgstr "Gfaim" +#: ../menu-data/gfaim:gfaim.desktop.in.h:2 +msgid "Find any recipe you want" +msgstr "查找任何您想要的食谱" + #: ../menu-data/gfax:gfax.desktop.in.h:1 msgid "Gfax Facsimile Program" msgstr "Gfax 传真程序" @@ -5414,13 +5533,13 @@ msgstr "GFingerPoken 逻辑游戏" #: ../menu-data/gftp-gtk:gftp.desktop.in.h:1 -msgid "Download and upload files using multiple file transfer protocols" -msgstr "通过多种文件传输协议下载和上传文件" - -#: ../menu-data/gftp-gtk:gftp.desktop.in.h:2 msgid "gFTP" msgstr "gFTP" +#: ../menu-data/gftp-gtk:gftp.desktop.in.h:2 +msgid "Download and upload files using multiple file transfer protocols" +msgstr "通过多种文件传输协议下载和上传文件" + #: ../menu-data/ggcov:Development__ggcov.desktop.in.h:1 msgid "GGcov" msgstr "GGcov" @@ -5438,31 +5557,31 @@ msgstr "探索性数据分析用的多元交互图形" #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:1 -#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1 -#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1 -msgid "GGZ Core Client" -msgstr "GGZ 核心客户端" - -#: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2 msgid "GGZ-Gnome" msgstr "GGZ-Gnome" +#: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2 #: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2 +#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2 +msgid "GGZ Core Client" +msgstr "GGZ 核心客户端" + +#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1 msgid "ggz-gtk" msgstr "ggz-gtk" -#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2 +#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1 msgid "ggz-txt" msgstr "ggz-txt" #: ../menu-data/ghemical:ghemical.desktop.in.h:1 -msgid "Draw models of molecules" -msgstr "绘制分子模型" - -#: ../menu-data/ghemical:ghemical.desktop.in.h:2 msgid "ghemical" msgstr "ghemical" +#: ../menu-data/ghemical:ghemical.desktop.in.h:2 +msgid "Draw models of molecules" +msgstr "绘制分子模型" + #: ../menu-data/ghex:ghex.desktop.in.h:1 msgid "GHex" msgstr "" @@ -5472,13 +5591,13 @@ msgstr "" #: ../menu-data/ghextris:ghextris.desktop.in.h:1 -msgid "Fit falling blocks together on a hexagonal grid" -msgstr "" - -#: ../menu-data/ghextris:ghextris.desktop.in.h:2 msgid "Ghextris" msgstr "Ghextris" +#: ../menu-data/ghextris:ghextris.desktop.in.h:2 +msgid "Fit falling blocks together on a hexagonal grid" +msgstr "" + #: ../menu-data/ghkl:ghkl.desktop.in.h:1 msgid "ghkl" msgstr "ghkl" @@ -5496,13 +5615,13 @@ msgstr "Git 仓库查看器" #: ../menu-data/gigolo:gigolo.desktop.in.h:1 -msgid "A simple frontend to easily connect to remote filesystems" -msgstr "一个可以方便地连接远程文件系统的简易前端" - -#: ../menu-data/gigolo:gigolo.desktop.in.h:2 msgid "Gigolo" msgstr "Gigolo" +#: ../menu-data/gigolo:gigolo.desktop.in.h:2 +msgid "A simple frontend to easily connect to remote filesystems" +msgstr "一个可以方便地连接远程文件系统的简易前端" + #: ../menu-data/gimmix:gimmix.desktop.in.h:1 msgid "Gimmix" msgstr "Gimmix" @@ -5512,13 +5631,13 @@ msgstr "Gimmix 是一个用 C 语言写的图形化音乐播放器守护进程(MPD)客户端。" #: ../menu-data/gimp:gimp.desktop.in.h:1 -msgid "Create images and edit photographs" -msgstr "创建图像和编辑照片" - -#: ../menu-data/gimp:gimp.desktop.in.h:2 msgid "GIMP Image Editor" msgstr "GIMP 图像编辑器" +#: ../menu-data/gimp:gimp.desktop.in.h:2 +msgid "Create images and edit photographs" +msgstr "创建图像和编辑照片" + #: ../menu-data/ginkgocadx:ginkgocadx.desktop.in.h:1 msgid "Ginkgo CADx" msgstr "" @@ -5528,47 +5647,47 @@ msgstr "" #: ../menu-data/gip:gip.desktop.in.h:1 -msgid "Calculate IP addresses and networks" -msgstr "计算 IP 地址和网络" - -#: ../menu-data/gip:gip.desktop.in.h:2 msgid "Gip IP Address Calculator" msgstr "Gip IP 地址计算器" +#: ../menu-data/gip:gip.desktop.in.h:2 +msgid "Calculate IP addresses and networks" +msgstr "计算 IP 地址和网络" + #: ../menu-data/gisomount:gisomount.desktop.in.h:1 msgid "gISOMount" msgstr "gISOMount" #: ../menu-data/git-cola:cola.desktop.in.h:1 -msgid "A highly caffeinated git GUI" -msgstr "一个高效的 GIT 前端" - -#: ../menu-data/git-cola:cola.desktop.in.h:2 msgid "Cola Git GUI" msgstr "Cola Git 图形用户界面" -#: ../menu-data/gitg:gitg.desktop.in.h:1 -msgid "Git repository browser" -msgstr "Git 仓库浏览器" +#: ../menu-data/git-cola:cola.desktop.in.h:2 +msgid "A highly caffeinated git GUI" +msgstr "一个高效的 GIT 前端" -#: ../menu-data/gitg:gitg.desktop.in.h:2 +#: ../menu-data/gitg:gitg.desktop.in.h:1 msgid "gitg" msgstr "gitg" +#: ../menu-data/gitg:gitg.desktop.in.h:2 +msgid "Git repository browser" +msgstr "Git 仓库浏览器" + #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1 -msgid "Display JACK transport timecode" +msgid "G. JACK Clock" msgstr "" #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:2 -msgid "G. JACK Clock" +msgid "Display JACK transport timecode" msgstr "" #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:1 -msgid "Access JACK transport mechanism via a dynamic graphical slider. " +msgid "G. JACK Transport" msgstr "" #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:2 -msgid "G. JACK Transport" +msgid "Access JACK transport mechanism via a dynamic graphical slider. " msgstr "" #: ../menu-data/gjiten:gjiten.desktop.in.h:1 @@ -5588,21 +5707,21 @@ msgstr "存储和组织您的随感" #: ../menu-data/gkamus:gkamus.desktop.in.h:1 -msgid "English - Indonesian dictionary" +msgid "gKamus" msgstr "" #: ../menu-data/gkamus:gkamus.desktop.in.h:2 -msgid "gKamus" +msgid "English - Indonesian dictionary" msgstr "" #: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:1 -msgid "Enable/disable installed plugins" -msgstr "启用/禁用安装的插件" - -#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2 msgid "Keyboard Indicator plugins" msgstr "键盘指示器插件" +#: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2 +msgid "Enable/disable installed plugins" +msgstr "启用/禁用安装的插件" + #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1 msgid "Keyboard Layout" msgstr "" @@ -5628,37 +5747,37 @@ msgstr "CPU、内存、磁盘、网络、邮件监视器" #: ../menu-data/gl-117:gl-117.desktop.in.h:1 -msgid "Play a flight simulator" -msgstr "" - -#: ../menu-data/gl-117:gl-117.desktop.in.h:2 msgid "gl-117" msgstr "gl-117" -#: ../menu-data/glabels:glabels.desktop.in.h:1 -msgid "Create labels, business cards and media covers" -msgstr "创建标签、商务名片和媒体封面" +#: ../menu-data/gl-117:gl-117.desktop.in.h:2 +msgid "Play a flight simulator" +msgstr "" -#: ../menu-data/glabels:glabels.desktop.in.h:2 +#: ../menu-data/glabels:glabels.desktop.in.h:1 msgid "gLabels Label Designer" msgstr "gLabels 标签设计器" +#: ../menu-data/glabels:glabels.desktop.in.h:2 +msgid "Create labels, business cards and media covers" +msgstr "创建标签、商务名片和媒体封面" + #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:1 #: ../menu-data/glade:glade.desktop.in.h:1 -msgid "Create or open user interface designs for GTK+ applications" -msgstr "创建或打开 GTK+ 应用程序的用户界面设计" +msgid "Glade Interface Designer" +msgstr "Glade 界面设计器" #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:2 #: ../menu-data/glade:glade.desktop.in.h:2 -msgid "Glade Interface Designer" -msgstr "Glade 界面设计器" +msgid "Create or open user interface designs for GTK+ applications" +msgstr "创建或打开 GTK+ 应用程序的用户界面设计" #: ../menu-data/gladish:gladish.desktop.in.h:1 -msgid "LADI Session Handler" +msgid "gladish" msgstr "" #: ../menu-data/gladish:gladish.desktop.in.h:2 -msgid "gladish" +msgid "LADI Session Handler" msgstr "" #: ../menu-data/glame:Multimedia__glame.desktop.in.h:1 @@ -5677,14 +5796,6 @@ msgid "Play the classic two-player boardgame of chess" msgstr "" -#: ../menu-data/glest:glest.desktop.in.h:1 -msgid "Glest" -msgstr "Glest" - -#: ../menu-data/glest:glest.desktop.in.h:2 -msgid "Play a real-time strategy game with 3D graphics" -msgstr "一个三维图形界面的实时策略游戏" - #: ../menu-data/glfer:glfer.desktop.in.h:1 msgid "glfer" msgstr "glfer" @@ -5710,61 +5821,53 @@ msgstr "使用 gdk-pixbuf 和 OpenGL 查看图像" #: ../menu-data/glob2:glob2.desktop.in.h:1 -msgid "An innovative new strategy game" -msgstr "" - -#: ../menu-data/glob2:glob2.desktop.in.h:2 msgid "Globulation 2" msgstr "Globulation 2" +#: ../menu-data/glob2:glob2.desktop.in.h:2 +msgid "An innovative new strategy game" +msgstr "" + #: ../menu-data/globs:globs.desktop.in.h:1 -msgid "GL Open Benchmark Suite" +msgid "Globs" msgstr "" #: ../menu-data/globs:globs.desktop.in.h:2 -msgid "Globs" +msgid "GL Open Benchmark Suite" msgstr "" #: ../menu-data/glogg:glogg.desktop.in.h:1 -msgid "A smart interactive log explorer." +msgid "glogg" msgstr "" #: ../menu-data/glogg:glogg.desktop.in.h:2 -msgid "glogg" +msgid "A smart interactive log explorer." msgstr "" -#: ../menu-data/glom:glom.desktop.in.h:1 -msgid "A user-friendly database environment." -msgstr "一个对用户友好的数据库环境。" - -#: ../menu-data/glom:glom.desktop.in.h:2 -msgid "Glom" -msgstr "Glom" - #: ../menu-data/glpeces:glpeces.desktop.in.h:1 -msgid "GLPeces" +msgid "Play with 33 tangram and more 4600 figures" msgstr "" #: ../menu-data/glpeces:glpeces.desktop.in.h:2 -msgid "Play with 33 tangram and more 4600 figures" +msgid "GLPeces" msgstr "" #: ../menu-data/gltron:gltron.desktop.in.h:1 -msgid "Play a Tron-like light cycle game" -msgstr "" - -#: ../menu-data/gltron:gltron.desktop.in.h:2 msgid "glTron" msgstr "glTron" -#: ../menu-data/glurp:glurp.desktop.in.h:1 -msgid "A Client for the MPD daemon" -msgstr "一个 MPD 守护进程的客户端" +#: ../menu-data/gltron:gltron.desktop.in.h:2 +msgid "Play a Tron-like light cycle game" +msgstr "" -#: ../menu-data/glurp:glurp.desktop.in.h:2 +#: ../menu-data/glurp:glurp.desktop.in.h:1 msgid "Glurp" msgstr "Glurp" +#: ../menu-data/glurp:glurp.desktop.in.h:2 +msgid "A Client for the MPD daemon" +msgstr "一个 MPD 守护进程的客户端" + #: ../menu-data/gmail-notify:gmail-notify.desktop.in.h:1 msgid "Gmail Notify" msgstr "Gmail 通知" @@ -5782,19 +5885,19 @@ msgstr "浏览和玩经典的街机游戏" #: ../menu-data/gmanedit:gmanedit.desktop.in.h:1 -msgid "GNOME Manpages Editor" -msgstr "GNOME 手册编辑器" - -#: ../menu-data/gmanedit:gmanedit.desktop.in.h:2 msgid "gmanedit" msgstr "gmanedit" +#: ../menu-data/gmanedit:gmanedit.desktop.in.h:2 +msgid "GNOME Manpages Editor" +msgstr "GNOME 手册编辑器" + #: ../menu-data/gmbox:gmbox.desktop.in.h:1 -msgid "Google Music Box" +msgid "gmbox" msgstr "" #: ../menu-data/gmbox:gmbox.desktop.in.h:2 -msgid "gmbox" +msgid "Google Music Box" msgstr "" #: ../menu-data/gmchess:gmchess.desktop.in.h:1 @@ -5806,19 +5909,19 @@ msgstr "下中国象棋" #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:1 -msgid "Alsa mixer" +msgid "Gmerlin mixer" msgstr "" #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2 -msgid "Gmerlin mixer" +msgid "Alsa mixer" msgstr "" #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1 -msgid "Configure the Gmerlin keyboard daemon" +msgid "Gmerlin KBD" msgstr "" #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:2 -msgid "Gmerlin KBD" +msgid "Configure the Gmerlin keyboard daemon" msgstr "" #: ../menu-data/gmerlin:gmerlin-player.desktop.in.h:1 @@ -5830,27 +5933,27 @@ msgstr "多格式的媒体播放器" #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:1 -msgid "Configure gmerlin plugins" +msgid "Gmerlin plugin configurator" msgstr "" #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:2 -msgid "Gmerlin plugin configurator" +msgid "Configure gmerlin plugins" msgstr "" #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:1 -msgid "Audio/video recorder" -msgstr "录音/录像机" - -#: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2 msgid "Gmerlin recorder" msgstr "" +#: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2 +msgid "Audio/video recorder" +msgstr "录音/录像机" + #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:1 -msgid "Gmerlin multimedia transcoder" +msgid "Gmerlin transcoder" msgstr "" #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:2 -msgid "Gmerlin transcoder" +msgid "Gmerlin multimedia transcoder" msgstr "" #: ../menu-data/gmerlin:gmerlin-visualizer.desktop.in.h:1 @@ -5862,27 +5965,27 @@ msgstr "" #: ../menu-data/gmfsk:gmfsk.desktop.in.h:1 -msgid "HF digital mode terminal" -msgstr "" - -#: ../menu-data/gmfsk:gmfsk.desktop.in.h:2 msgid "gMFSK" msgstr "gMFSK" +#: ../menu-data/gmfsk:gmfsk.desktop.in.h:2 +msgid "HF digital mode terminal" +msgstr "" + #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:1 -msgid "Analyse MIDI messages through ALSA" +msgid "Gmidimonitor (with ALSA support)" msgstr "" #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:2 -msgid "Gmidimonitor (with ALSA support)" +msgid "Analyse MIDI messages through ALSA" msgstr "" #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:1 -msgid "Analyse MIDI messages through JACK" +msgid "Gmidimonitor (with JACK support)" msgstr "" #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:2 -msgid "Gmidimonitor (with JACK support)" +msgid "Analyse MIDI messages through JACK" msgstr "" #: ../menu-data/gmlive:gmlive.desktop.in.h:1 @@ -5898,13 +6001,13 @@ msgstr "gMobileMedia (移动媒体浏览器)" #: ../menu-data/gmorgan:gmorgan.desktop.in.h:1 -msgid "MIDI rhythm station for ALSA" -msgstr "" - -#: ../menu-data/gmorgan:gmorgan.desktop.in.h:2 msgid "gmorgan" msgstr "gmorgan" +#: ../menu-data/gmorgan:gmorgan.desktop.in.h:2 +msgid "MIDI rhythm station for ALSA" +msgstr "" + #: ../menu-data/gmountiso:gmount-iso.desktop.in.h:1 msgid "Gmount-iso" msgstr "Gmount-iso" @@ -5914,46 +6017,46 @@ msgstr "挂载 CD 和 DVD 镜像" #: ../menu-data/gmpc:gmpc.desktop.in.h:1 -msgid "A gnome frontend for the mpd daemon" -msgstr "mpd 守护进程的一个 Gnome 前端" - -#: ../menu-data/gmpc:gmpc.desktop.in.h:2 msgid "Gnome Music Player Client" msgstr "Gnome 音乐播放客户端" -#: ../menu-data/gmsh:gmsh.desktop.in.h:1 -#: ../menu-data/netgen:netgen.desktop.in.h:1 -msgid "3-D finite element mesh generator" -msgstr "三维有限元网格生成器" +#: ../menu-data/gmpc:gmpc.desktop.in.h:2 +msgid "A gnome frontend for the mpd daemon" +msgstr "mpd 守护进程的一个 Gnome 前端" -#: ../menu-data/gmsh:gmsh.desktop.in.h:2 +#: ../menu-data/gmsh:gmsh.desktop.in.h:1 msgid "Gmsh Mesh Generator" msgstr "Gmsh 网格生成器" +#: ../menu-data/gmsh:gmsh.desktop.in.h:2 +#: ../menu-data/netgen:netgen.desktop.in.h:2 +msgid "3-D finite element mesh generator" +msgstr "三维有限元网格生成器" + #: ../menu-data/gmtp:gMTP.desktop.in.h:1 -msgid "A simple MTP Client for MP3 Players" +msgid "gMTP" msgstr "" #: ../menu-data/gmtp:gMTP.desktop.in.h:2 -msgid "gMTP" +msgid "A simple MTP Client for MP3 Players" msgstr "" #: ../menu-data/gmult:gmult.desktop.in.h:1 -msgid "Figure out which letters are which numbers" +msgid "Multiplication Puzzle" msgstr "" #: ../menu-data/gmult:gmult.desktop.in.h:2 -msgid "Multiplication Puzzle" +msgid "Figure out which letters are which numbers" msgstr "" #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:1 -msgid "Jukebox for large collections of mp3/ogg/flac/mpc" -msgstr "大曲库 mp3/ogg/flac/mpc 音乐点唱机" - -#: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2 msgid "gmusicbrowser" msgstr "gmusicbrowser" +#: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2 +msgid "Jukebox for large collections of mp3/ogg/flac/mpc" +msgstr "大曲库 mp3/ogg/flac/mpc 音乐点唱机" + #: ../menu-data/gmysqlcc:gmysqlcc.desktop.in.h:1 msgid "GMySQLcc" msgstr "GMySQLcc" @@ -5975,21 +6078,21 @@ msgstr "" #: ../menu-data/gnibbles:gnibbles.desktop.in.h:1 -msgid "Guide a worm around a maze" -msgstr "" - -#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2 msgid "Nibbles" msgstr "Nibbles" -#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1 -msgid "Avoid the robots and make them crash into each other" -msgstr "躲避机器人并让它们自相残杀" +#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2 +msgid "Guide a worm around a maze" +msgstr "" -#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2 +#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1 msgid "Robots" msgstr "机器人" +#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2 +msgid "Avoid the robots and make them crash into each other" +msgstr "躲避机器人并让它们自相残杀" + #: ../menu-data/gnoemoe:gnoemoe.desktop.in.h:1 msgid "GnoeMoe" msgstr "GnoeMoe" @@ -5999,13 +6102,13 @@ msgstr "GnoeMoe Gnome MOO 客户端" #: ../menu-data/gnomad2:gnomad2.desktop.in.h:1 -msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs" -msgstr "" - -#: ../menu-data/gnomad2:gnomad2.desktop.in.h:2 msgid "Gnomad 2" msgstr "Gnomad 2" +#: ../menu-data/gnomad2:gnomad2.desktop.in.h:2 +msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs" +msgstr "" + #: ../menu-data/gnome-activity-journal:gnome-activity-journal.desktop.in.h:1 msgid "Activity Journal" msgstr "活动志" @@ -6017,13 +6120,13 @@ msgstr "浏览按时间顺序排列的活动志,轻松找到文件。" #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:1 -msgid "ALSA sound mixer for GNOME" -msgstr "用于 GNOME 的 ALSA 混音器" - -#: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2 msgid "GNOME ALSA Mixer" msgstr "GNOME ALSA 混音器" +#: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2 +msgid "ALSA sound mixer for GNOME" +msgstr "用于 GNOME 的 ALSA 混音器" + #: ../menu-data/gnome-blog:gnome-blog.desktop.in.h:1 msgid "Blog Entry Poster" msgstr "博客文章发布器" @@ -6073,13 +6176,13 @@ msgstr "通过 BitTorrent 下载文件" #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:1 -msgid "Customize your GNOME desktop" -msgstr "自定义您的 GNOME 桌面" - -#: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2 msgid "GNOME Color Chooser" msgstr "GNOME 颜色选择器" +#: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2 +msgid "Customize your GNOME desktop" +msgstr "自定义您的 GNOME 桌面" + #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1 msgid "Color" msgstr "" @@ -6113,13 +6216,13 @@ msgstr "" #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:1 -msgid "A two paned file manager" -msgstr "双面板文件管理器" - -#: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2 msgid "GNOME Commander" msgstr "GNOME Commander" +#: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2 +msgid "A two paned file manager" +msgstr "双面板文件管理器" + #: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:1 msgid "Disk Utility" msgstr "磁盘实用工具" @@ -6129,21 +6232,21 @@ msgstr "管理驱动器及媒体" #: ../menu-data/gnome-do:gnome-do.desktop.in.h:1 +msgid "GNOME Do" +msgstr "GNOME Do" + +#: ../menu-data/gnome-do:gnome-do.desktop.in.h:2 msgid "" "Do things as quickly as possible (but no quicker) with your files, " "bookmarks, applications, music, contacts, and more!" msgstr "方便快捷地处理你的文件、书签、应用程序、音乐、通讯簿...还有更多!" -#: ../menu-data/gnome-do:gnome-do.desktop.in.h:2 -msgid "GNOME Do" -msgstr "GNOME Do" - #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:1 -msgid "Access, manage and share documents" +msgid "Documents" msgstr "" #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2 -msgid "Documents" +msgid "Access, manage and share documents" msgstr "" #: ../menu-data/gnome-dvb-client:gnome-dvb-control.desktop.in.h:1 @@ -6155,7 +6258,7 @@ msgstr "" #: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1 -#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1 +#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2 msgid "Font Viewer" msgstr "" @@ -6164,13 +6267,13 @@ msgstr "" #: ../menu-data/gnome-format:gnome-format.desktop.in.h:1 -msgid "Format external storage devices" -msgstr "格式化外部存储设备" - -#: ../menu-data/gnome-format:gnome-format.desktop.in.h:2 msgid "Gnome Format" msgstr "Gnome Format" +#: ../menu-data/gnome-format:gnome-format.desktop.in.h:2 +msgid "Format external storage devices" +msgstr "格式化外部存储设备" + #: ../menu-data/gnome-genius:gnome-genius.desktop.in.h:1 msgid "Genius Math Tool" msgstr "Genius 数学工具" @@ -6179,7 +6282,7 @@ msgid "Genius Mathematical Tool and Calculator" msgstr "Genius 数学工具和计算器" -#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1 +#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2 msgid "Gmail Inbox Monitor" msgstr "Gmail 收件箱监视器" @@ -6208,61 +6311,53 @@ msgstr "" #: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:1 -msgid "Configure your remote control" -msgstr "配置您的远程控制" - -#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2 msgid "Infrared Remote Control" msgstr "红外遥控" -#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1 -msgid "Disassemble a pile of tiles by removing matching pairs" -msgstr "" - -#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2 -msgid "Mahjongg" -msgstr "" +#: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2 +msgid "Configure your remote control" +msgstr "配置您的远程控制" #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:1 -msgid "Break the hidden code!" -msgstr "" - -#: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2 msgid "Mastermind" msgstr "Mastermind" -#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1 -msgid "A simple media player for GNOME" -msgstr "GNOME 下的一个简易媒体播放器" +#: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2 +msgid "Break the hidden code!" +msgstr "" -#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2 +#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1 msgid "GNOME Media Player" msgstr "GNOME 媒体播放器" -#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1 -msgid "Record sound clips" -msgstr "录制声音剪辑" +#: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2 +msgid "A simple media player for GNOME" +msgstr "GNOME 下的一个简易媒体播放器" -#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2 +#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1 msgid "Sound Recorder" msgstr "录音机" -#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1 -msgid "Configure defaults for GStreamer applications" -msgstr "配置 GStreamer 应用程序的默认值" +#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2 +msgid "Record sound clips" +msgstr "录制声音剪辑" -#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2 +#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1 msgid "Multimedia Systems Selector" msgstr "多媒体系统选择器" -#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1 -msgid "Controls the mouse via Webcam." -msgstr "通过摄像头控制鼠标。" +#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2 +msgid "Configure defaults for GStreamer applications" +msgstr "配置 GStreamer 应用程序的默认值" -#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2 +#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1 msgid "MouseTrap" msgstr "MouseTrap" +#: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2 +msgid "Controls the mouse via Webcam." +msgstr "通过摄像头控制鼠标。" + #: ../menu-data/gnome-mplayer:gnome-mplayer.desktop.in.h:1 msgid "GNOME MPlayer" msgstr "GNOME MPlayer" @@ -6288,14 +6383,14 @@ msgstr "查看网络信息" #: ../menu-data/gnome-network-admin:network.desktop.in.h:1 -msgid "Configure network devices and connections" -msgstr "配置网络设备和连接" - -#: ../menu-data/gnome-network-admin:network.desktop.in.h:2 -#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2 +#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 msgid "Network" msgstr "Network" +#: ../menu-data/gnome-network-admin:network.desktop.in.h:2 +msgid "Configure network devices and connections" +msgstr "配置网络设备和连接" + #: ../menu-data/gnome-orca:orca.desktop.in.h:1 msgid "Orca Screen Reader" msgstr "" @@ -6307,13 +6402,13 @@ msgstr "" #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:1 -msgid "Create and Edit Drawings or Images" -msgstr "创建和编辑绘图或图像" - -#: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2 msgid "Gnome Paint Drawing Editor" msgstr "Gnome 绘画编辑器" +#: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2 +msgid "Create and Edit Drawings or Images" +msgstr "创建和编辑绘图或图像" + #: ../menu-data/gnome-phone-manager:gnome-phone-manager.desktop.in.h:1 msgid "Phone Manager" msgstr "电话管理" @@ -6331,37 +6426,37 @@ msgstr "在一个页面上打印多个照片" #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1 -msgid "Cakes don't lie." +msgid "Gnome-Pie" msgstr "" #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:2 -msgid "Gnome-Pie" +msgid "Cakes don't lie." msgstr "" #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1 -msgid "Observe power management" +msgid "Power Statistics" msgstr "" #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2 -msgid "Power Statistics" +msgid "Observe power management" msgstr "" #: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:1 -msgid "GNOME Dialup Tool" -msgstr "GNOME 拨号工具" - -#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2 msgid "GNOME PPP" msgstr "GNOME PPP" -#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1 -msgid "Manage your system tasks" -msgstr "管理系统任务" +#: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2 +msgid "GNOME Dialup Tool" +msgstr "GNOME 拨号工具" -#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2 +#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1 msgid "Scheduled tasks" msgstr "计划任务" +#: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2 +msgid "Manage your system tasks" +msgstr "管理系统任务" + #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:1 msgid "GNOME Shell" msgstr "GNOME Shell" @@ -6371,13 +6466,13 @@ msgstr "窗口管理和应用程序启动" #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:1 -msgid "Preview and compare fonts" -msgstr "预览比较字体" - -#: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2 msgid "Specimen Font Previewer" msgstr "Specimen 字体预览器" +#: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2 +msgid "Preview and compare fonts" +msgstr "预览比较字体" + #: ../menu-data/gnome-split:gnome-split.desktop.in.h:1 msgid "GNOME Split" msgstr "" @@ -6403,22 +6498,22 @@ msgstr "通过这个数字格子谜游戏测试您的逻辑能力" #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:1 -msgid "New Terminal" -msgstr "" - -#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2 -#: ../menu-data/terminal.app:Terminal.desktop.in.h:2 -#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2 +#: ../menu-data/terminal.app:Terminal.desktop.in.h:1 +#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1 msgid "Terminal" msgstr "Terminal" +#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3 +msgid "New Terminal" +msgstr "" + #: ../menu-data/gnome-time-admin:time.desktop.in.h:1 -msgid "Change system time, date, and timezone" +msgid "Time and Date" msgstr "" #: ../menu-data/gnome-time-admin:time.desktop.in.h:2 -msgid "Time and Date" +msgid "Change system time, date, and timezone" msgstr "" #: ../menu-data/gnome-translate:gnome-translate.desktop.in.h:1 @@ -6462,30 +6557,30 @@ msgstr "建立盘片/CD目录" #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:1 -msgid "Gnome's KiSSeake dolls viewer" -msgstr "" - -#: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2 msgid "GnomeKiSS" msgstr "GnomeKiSS" +#: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2 +msgid "Gnome's KiSSeake dolls viewer" +msgstr "" + #: ../menu-data/gnomine:gnomine.desktop.in.h:1 +#: ../menu-data/mines.app:Mines.desktop.in.h:1 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:1 -msgid "Clear hidden mines from a minefield" -msgstr "扫除雷区里的雷" +msgid "Mines" +msgstr "Mines" #: ../menu-data/gnomine:gnomine.desktop.in.h:2 -#: ../menu-data/mines.app:Mines.desktop.in.h:2 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:2 -msgid "Mines" -msgstr "Mines" +msgid "Clear hidden mines from a minefield" +msgstr "扫除雷区里的雷" #: ../menu-data/gnomint:gnomint.desktop.in.h:1 -msgid "Manage X.509 certificates and CAs, easily and graphically" +msgid "gnoMint X.509 CA Manager" msgstr "" #: ../menu-data/gnomint:gnomint.desktop.in.h:2 -msgid "gnoMint X.509 CA Manager" +msgid "Manage X.509 certificates and CAs, easily and graphically" msgstr "" #: ../menu-data/gnote:gnote.desktop.in.h:1 @@ -6493,7 +6588,7 @@ msgstr "Gnote" #: ../menu-data/gnote:gnote.desktop.in.h:2 -#: ../menu-data/tomboy:tomboy.desktop.in.h:1 +#: ../menu-data/tomboy:tomboy.desktop.in.h:2 msgid "Take notes, link ideas, and stay organized" msgstr "记录便笺,链接想法,保持井井有条" @@ -6506,13 +6601,13 @@ msgstr "" #: ../menu-data/gnotravex:gnotravex.desktop.in.h:1 -msgid "Complete the puzzle by matching numbered tiles" -msgstr "匹配编号的牌片来完成谜题" - -#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2 msgid "Tetravex" msgstr "Tetravex" +#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2 +msgid "Complete the puzzle by matching numbered tiles" +msgstr "匹配编号的牌片来完成谜题" + #: ../menu-data/gnotski:gnotski.desktop.in.h:1 msgid "Klotski" msgstr "华容道" @@ -6538,13 +6633,13 @@ msgstr "" #: ../menu-data/gnubik:gnubik.desktop.in.h:1 -msgid "3D Rubik's cube game" -msgstr "3D 魔方游戏" - -#: ../menu-data/gnubik:gnubik.desktop.in.h:2 msgid "GNUbik" msgstr "GNUbik" +#: ../menu-data/gnubik:gnubik.desktop.in.h:2 +msgid "3D Rubik's cube game" +msgstr "3D 魔方游戏" + #: ../menu-data/gnucash:gnucash.desktop.in.h:1 msgid "GnuCash Finance Management" msgstr "GnuCash 财务管理" @@ -6586,13 +6681,13 @@ msgstr "" #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:1 -msgid "Calculation, Analysis, and Visualization of Information" -msgstr "计算,分析和信息可视化" - -#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2 msgid "Gnumeric Spreadsheet" msgstr "Gnumeric 电子表格" +#: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2 +msgid "Calculation, Analysis, and Visualization of Information" +msgstr "计算,分析和信息可视化" + #: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1 msgid "GNUnet Secured P2P" msgstr "GNUnet 安全点对点程序" @@ -6610,11 +6705,11 @@ msgstr "GNUnet 的 QT 前端" #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:1 -msgid "A clone of Robbo" +msgid "GNU Robbo" msgstr "" #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:2 -msgid "GNU Robbo" +msgid "A clone of Robbo" msgstr "" #: ../menu-data/gnusim8085:GNUSim8085.desktop.in.h:1 @@ -6638,13 +6733,13 @@ msgstr "GoatTracker" #: ../menu-data/gobby:gobby.desktop.in.h:1 -msgid "Edit text files collaboratively" -msgstr "协作编辑文本文件" - -#: ../menu-data/gobby:gobby.desktop.in.h:2 msgid "Gobby Collaborative Editor (0.4)" msgstr "Gobby 协作编辑器(0.4)" +#: ../menu-data/gobby:gobby.desktop.in.h:2 +msgid "Edit text files collaboratively" +msgstr "协作编辑文本文件" + #: ../menu-data/gofigure2:gofigure2.desktop.in.h:1 msgid "GoFigure2" msgstr "" @@ -6658,38 +6753,38 @@ msgstr "" #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2 -#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1 +#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2 msgid "Play and organize your music collection" msgstr "播放和组织您的音乐收藏" #: ../menu-data/gok:gok.desktop.in.h:1 -msgid "Navigate applications and type using alternative input devices" -msgstr "" - -#: ../menu-data/gok:gok.desktop.in.h:2 msgid "On-Screen Keyboard" msgstr "屏幕键盘" +#: ../menu-data/gok:gok.desktop.in.h:2 +msgid "Navigate applications and type using alternative input devices" +msgstr "" + #: ../menu-data/goldendict:goldendict.desktop.in.h:1 msgid "GoldenDict" msgstr "GoldenDict" #: ../menu-data/golly:golly.desktop.in.h:1 -msgid "A Conway's Game of Life simulator" -msgstr "" - -#: ../menu-data/golly:golly.desktop.in.h:2 msgid "Golly" msgstr "Golly" -#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1 -msgid "GNUstep Gomoku Game" -msgstr "GNUstep Gomoku 游戏" +#: ../menu-data/golly:golly.desktop.in.h:2 +msgid "A Conway's Game of Life simulator" +msgstr "" -#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2 +#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1 msgid "Gomoku.app" msgstr "Gomoku.app" +#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2 +msgid "GNUstep Gomoku Game" +msgstr "GNUstep Gomoku 游戏" + #: ../menu-data/goobox:goobox.desktop.in.h:1 #: ../menu-data/kscd:kde4__kscd.desktop.in.h:1 msgid "CD Player" @@ -6716,21 +6811,21 @@ msgstr "" #: ../menu-data/goplay:goplay.desktop.in.h:1 -msgid "Gaming packages browser" -msgstr "游戏包浏览器" - -#: ../menu-data/goplay:goplay.desktop.in.h:2 msgid "GoPlay!" msgstr "GoPlay!" -#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1 -msgid "GOsa" -msgstr "GOsa" +#: ../menu-data/goplay:goplay.desktop.in.h:2 +msgid "Gaming packages browser" +msgstr "游戏包浏览器" -#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2 +#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1 msgid "GOsa²" msgstr "" +#: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2 +msgid "GOsa" +msgstr "GOsa" + #: ../menu-data/gosmore:gosmore.desktop.in.h:1 msgid "Gosmore Map Viewer" msgstr "" @@ -6750,51 +6845,51 @@ msgstr "组织食谱、创建购物单、计算营养信息等等" #: ../menu-data/gpaco:gpaco.desktop.in.h:1 -msgid "Manages software installed from source code" -msgstr "管理从源代码安装的软件" - -#: ../menu-data/gpaco:gpaco.desktop.in.h:2 msgid "Package Organizer" msgstr "软件包管理器" -#: ../menu-data/gpaint:gpaint.desktop.in.h:1 -msgid "A small-scale painting program for GNOME, the GNU Desktop" -msgstr "GNOME 下的画图小程序" +#: ../menu-data/gpaco:gpaco.desktop.in.h:2 +msgid "Manages software installed from source code" +msgstr "管理从源代码安装的软件" -#: ../menu-data/gpaint:gpaint.desktop.in.h:2 +#: ../menu-data/gpaint:gpaint.desktop.in.h:1 msgid "GNU Paint" msgstr "GNU 绘画" -#: ../menu-data/gparted:gparted.desktop.in.h:1 -msgid "Create, reorganize, and delete partitions" -msgstr "创建,调整,删除分区" +#: ../menu-data/gpaint:gpaint.desktop.in.h:2 +msgid "A small-scale painting program for GNOME, the GNU Desktop" +msgstr "GNOME 下的画图小程序" -#: ../menu-data/gparted:gparted.desktop.in.h:2 +#: ../menu-data/gparted:gparted.desktop.in.h:1 msgid "GParted Partition Editor" msgstr "GParted 分区编辑器" -#: ../menu-data/gpdftext:gpdftext.desktop.in.h:1 -msgid "Edit text from ebook PDF files" -msgstr "编辑电子书 PDF 文件中的文本" +#: ../menu-data/gparted:gparted.desktop.in.h:2 +msgid "Create, reorganize, and delete partitions" +msgstr "创建,调整,删除分区" -#: ../menu-data/gpdftext:gpdftext.desktop.in.h:2 +#: ../menu-data/gpdftext:gpdftext.desktop.in.h:1 msgid "gPDFText ebook editor" msgstr "gPDFText 电子书编辑器" -#: ../menu-data/gphpedit:gphpedit.desktop.in.h:1 -msgid "Edit PHP source files" -msgstr "编辑 PHP 源文件" +#: ../menu-data/gpdftext:gpdftext.desktop.in.h:2 +msgid "Edit text from ebook PDF files" +msgstr "编辑电子书 PDF 文件中的文本" -#: ../menu-data/gphpedit:gphpedit.desktop.in.h:2 +#: ../menu-data/gphpedit:gphpedit.desktop.in.h:1 msgid "gPHPEdit" msgstr "gPHPEdit" +#: ../menu-data/gphpedit:gphpedit.desktop.in.h:2 +msgid "Edit PHP source files" +msgstr "编辑 PHP 源文件" + #: ../menu-data/gpick:gpick.desktop.in.h:1 -msgid "Color picker" +msgid "Gpick" msgstr "" #: ../menu-data/gpick:gpick.desktop.in.h:2 -msgid "Gpick" +msgid "Color picker" msgstr "" #: ../menu-data/gpicview:gpicview.desktop.in.h:2 @@ -6810,21 +6905,21 @@ msgstr "管理 iPod 上的照片,自由自在!" #: ../menu-data/gplanarity:gplanarity.desktop.in.h:1 -msgid "Puzzle game involving untangling planar graphs" -msgstr "" - -#: ../menu-data/gplanarity:gplanarity.desktop.in.h:2 msgid "gPlanarity" msgstr "gPlanarity" -#: ../menu-data/gpodder:gpodder.desktop.in.h:1 -msgid "Download audio and video content from podcasts" -msgstr "下载播客中的音频和视频内容" +#: ../menu-data/gplanarity:gplanarity.desktop.in.h:2 +msgid "Puzzle game involving untangling planar graphs" +msgstr "" -#: ../menu-data/gpodder:gpodder.desktop.in.h:2 +#: ../menu-data/gpodder:gpodder.desktop.in.h:1 msgid "gPodder Podcast Client" msgstr "gPodder 播客客户端" +#: ../menu-data/gpodder:gpodder.desktop.in.h:2 +msgid "Download audio and video content from podcasts" +msgstr "下载播客中的音频和视频内容" + #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:1 msgid "Pointing devices" msgstr "定点设备" @@ -6834,13 +6929,13 @@ msgstr "设置您的鼠标和触摸板的偏好设置" #: ../menu-data/gpomme:gpomme.desktop.in.h:1 -msgid "A graphical client for pommed" -msgstr "pommed 的图形客户端" - -#: ../menu-data/gpomme:gpomme.desktop.in.h:2 msgid "pommed GTK client" msgstr "pommed GTK 客户端" +#: ../menu-data/gpomme:gpomme.desktop.in.h:2 +msgid "A graphical client for pommed" +msgstr "pommed 的图形客户端" + #: ../menu-data/gpppon:gpppon.desktop.in.h:1 msgid "GNOME PPPon" msgstr "GNOME PPPon" @@ -6866,30 +6961,30 @@ msgstr "批量重命名文件和目录" #: ../menu-data/gprompter:gprompter.desktop.in.h:1 -#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1 -msgid "Predictive text editor powered by presage" +msgid "gprompter" msgstr "" #: ../menu-data/gprompter:gprompter.desktop.in.h:2 -msgid "gprompter" +#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2 +msgid "Predictive text editor powered by presage" msgstr "" #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:1 -msgid "Add coordinates to jpeg images using gpx files" -msgstr "" - -#: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2 msgid "GPSCorrelate" msgstr "GPSCorrelate" -#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:1 -msgid "GPS Navigation" -msgstr "GPS 导航" +#: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2 +msgid "Add coordinates to jpeg images using gpx files" +msgstr "" -#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2 +#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:1 msgid "GpsDrive" msgstr "GpsDrive" +#: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2 +msgid "GPS Navigation" +msgstr "GPS 导航" + #: ../menu-data/gpsk31:gpsk31.desktop.in.h:1 msgid "gpsk31" msgstr "gpsk31" @@ -6907,29 +7002,29 @@ msgstr "" #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:1 -msgid "GPS Trace Viewer" -msgstr "" - -#: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2 msgid "GPX Viewer" msgstr "GPX 查看器" -#: ../menu-data/grace:grace.desktop.in.h:1 -msgid "An XY plotting tool" -msgstr "二维绘图工具" +#: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2 +msgid "GPS Trace Viewer" +msgstr "" -#: ../menu-data/grace:grace.desktop.in.h:2 +#: ../menu-data/grace:grace.desktop.in.h:1 msgid "Grace" msgstr "Grace" -#: ../menu-data/grafx2:grafx2.desktop.in.h:1 -msgid "Deluxe Paint Clone" -msgstr "" +#: ../menu-data/grace:grace.desktop.in.h:2 +msgid "An XY plotting tool" +msgstr "二维绘图工具" -#: ../menu-data/grafx2:grafx2.desktop.in.h:2 +#: ../menu-data/grafx2:grafx2.desktop.in.h:1 msgid "GrafX2" msgstr "GrafX2" +#: ../menu-data/grafx2:grafx2.desktop.in.h:2 +msgid "Deluxe Paint Clone" +msgstr "" + #: ../menu-data/gramps:gramps.desktop.in.h:1 msgid "Gramps Genealogy System" msgstr "" @@ -6939,38 +7034,30 @@ "Manage genealogical information, perform genealogical research and analysis" msgstr "" -#: ../menu-data/grandr:grandr.desktop.in.h:1 -msgid "Configure multiple screens" -msgstr "配置多个屏幕" - -#: ../menu-data/grandr:grandr.desktop.in.h:2 -msgid "Multiple Screens" -msgstr "多屏幕" - #: ../menu-data/granule:granule.desktop.in.h:1 -msgid "Flashcards Program" -msgstr "闪存卡程序" - -#: ../menu-data/granule:granule.desktop.in.h:2 msgid "Granule" msgstr "Granule" -#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1 -msgid "Draw mathematical graphs/curves" -msgstr "绘制数学图形/曲线" +#: ../menu-data/granule:granule.desktop.in.h:2 +msgid "Flashcards Program" +msgstr "闪存卡程序" -#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2 +#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1 msgid "Graphmonkey" msgstr "Graphmonkey" -#: ../menu-data/graphthing:graphthing.desktop.in.h:1 -msgid "Create, manipulate and study graphs." -msgstr "创建、操作和学习图形。" +#: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2 +msgid "Draw mathematical graphs/curves" +msgstr "绘制数学图形/曲线" -#: ../menu-data/graphthing:graphthing.desktop.in.h:2 +#: ../menu-data/graphthing:graphthing.desktop.in.h:1 msgid "GraphThing" msgstr "GraphThing" +#: ../menu-data/graphthing:graphthing.desktop.in.h:2 +msgid "Create, manipulate and study graphs." +msgstr "创建、操作和学习图形。" + #: ../menu-data/gravitation:gravitation.desktop.in.h:1 msgid "Gravitation" msgstr "重力" @@ -6996,25 +7083,25 @@ msgstr "管理计算机连接" #: ../menu-data/grdesktop:grdesktop.desktop.in.h:1 -msgid "Connect to a remote Windows Terminal-Server" -msgstr "连接到远程 Windows 终端服务器" - -#: ../menu-data/grdesktop:grdesktop.desktop.in.h:2 msgid "Remotedesktop Client" msgstr "远程桌面客户端" +#: ../menu-data/grdesktop:grdesktop.desktop.in.h:2 +msgid "Connect to a remote Windows Terminal-Server" +msgstr "连接到远程 Windows 终端服务器" + #: ../menu-data/greenwich:greenwich.desktop.in.h:1 msgid "Greenwich" msgstr "" #: ../menu-data/gresistor:gresistor.desktop.in.h:1 -msgid "Resistor color code calculator" -msgstr "电阻色环计算器" - -#: ../menu-data/gresistor:gresistor.desktop.in.h:2 msgid "gResistor" msgstr "gResistor" +#: ../menu-data/gresistor:gresistor.desktop.in.h:2 +msgid "Resistor color code calculator" +msgstr "电阻色环计算器" + #: ../menu-data/gresolver:gresolver.desktop.in.h:1 msgid "DNS Query Tool" msgstr "DNS 查询工具" @@ -7024,13 +7111,13 @@ msgstr "执行高级 DNS 查询" #: ../menu-data/gretl-common:gretl.desktop.in.h:1 -msgid "Econometrics program" -msgstr "计量经济学程序" - -#: ../menu-data/gretl-common:gretl.desktop.in.h:2 msgid "gretl" msgstr "gretl" +#: ../menu-data/gretl-common:gretl.desktop.in.h:2 +msgid "Econometrics program" +msgstr "计量经济学程序" + #: ../menu-data/grhino:grhino.desktop.in.h:1 msgid "GRhino" msgstr "GRhino" @@ -7052,13 +7139,13 @@ msgstr "电影管理器" #: ../menu-data/gringotts:gringotts.desktop.in.h:1 -msgid "An electronic strongbox" -msgstr "一个电子保险柜" - -#: ../menu-data/gringotts:gringotts.desktop.in.h:2 msgid "Gringotts" msgstr "Gringotts" +#: ../menu-data/gringotts:gringotts.desktop.in.h:2 +msgid "An electronic strongbox" +msgstr "一个电子保险柜" + #: ../menu-data/grinvin:grinvin.desktop.in.h:1 msgid "GrInvIn" msgstr "GrInvIn" @@ -7072,11 +7159,11 @@ msgstr "" #: ../menu-data/gromit:gromit.desktop.in.h:1 -msgid "draw freehand screen annotations" +msgid "gromit" msgstr "" #: ../menu-data/gromit:gromit.desktop.in.h:2 -msgid "gromit" +msgid "draw freehand screen annotations" msgstr "" #: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:1 @@ -7088,13 +7175,13 @@ msgstr "" #: ../menu-data/grpn:grpn.desktop.in.h:1 -msgid "A reverse polish notation calculator" -msgstr "一个逆波兰表示法计算器" - -#: ../menu-data/grpn:grpn.desktop.in.h:2 msgid "Grpn Calculator" msgstr "Grpn 计算器" +#: ../menu-data/grpn:grpn.desktop.in.h:2 +msgid "A reverse polish notation calculator" +msgstr "一个逆波兰表示法计算器" + #: ../menu-data/grr.app:Grr.desktop.in.h:1 msgid "Grr Feed Reader" msgstr "Grr Feed 阅读器" @@ -7112,31 +7199,31 @@ msgstr "用 rsync 同步文件" #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:1 -msgid "A GUI to aid the scan-to-PDF process" -msgstr "辅助“扫描成 PDF”操作的图形用户界面" - -#: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2 msgid "gscan2pdf" msgstr "gscan2pdf" -#: ../menu-data/gshare:gshare-manager.desktop.in.h:1 -msgid "Configure the file sharing service" -msgstr "配置文件共享服务" +#: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2 +msgid "A GUI to aid the scan-to-PDF process" +msgstr "辅助“扫描成 PDF”操作的图形用户界面" -#: ../menu-data/gshare:gshare-manager.desktop.in.h:2 +#: ../menu-data/gshare:gshare-manager.desktop.in.h:1 msgid "File Sharing" msgstr "文件共享" +#: ../menu-data/gshare:gshare-manager.desktop.in.h:2 +msgid "Configure the file sharing service" +msgstr "配置文件共享服务" + #: ../menu-data/gshutdown:gshutdown.desktop.in.h:1 +msgid "GShutdown" +msgstr "GShutdown" + +#: ../menu-data/gshutdown:gshutdown.desktop.in.h:2 msgid "" "An advanced shutdown utility which allows you to schedule the shutdown or " "the restart of your computer" msgstr "" -#: ../menu-data/gshutdown:gshutdown.desktop.in.h:2 -msgid "GShutdown" -msgstr "GShutdown" - #: ../menu-data/gsmartcontrol:gsmartcontrol.desktop.in.h:1 msgid "GSmartControl" msgstr "GSmartControl" @@ -7155,45 +7242,45 @@ msgstr "RF 阻抗计算器" #: ../menu-data/gsoko:gsoko.desktop.in.h:1 -msgid "Clone of the Sokoban game" -msgstr "" - -#: ../menu-data/gsoko:gsoko.desktop.in.h:2 msgid "Sokoban" msgstr "Sokoban" +#: ../menu-data/gsoko:gsoko.desktop.in.h:2 +msgid "Clone of the Sokoban game" +msgstr "" + #: ../menu-data/gsql:gsql.desktop.in.h:1 -msgid "Integrated Database Development Environment for GNOME" +msgid "gsql" msgstr "" #: ../menu-data/gsql:gsql.desktop.in.h:2 -msgid "gsql" +msgid "Integrated Database Development Environment for GNOME" msgstr "" #: ../menu-data/gstm:gstm.desktop.in.h:1 -msgid "Manage SSH tunnel connections" -msgstr "管理 SSH 隧道连接" - -#: ../menu-data/gstm:gstm.desktop.in.h:2 msgid "gSTM" msgstr "gSTM" -#: ../menu-data/gtablix:gtablix.desktop.in.h:1 -msgid "Generate highschool timetables using a GUI for Tablix." -msgstr "使用 Tablix 的图形用户界面生成高中时间表。" +#: ../menu-data/gstm:gstm.desktop.in.h:2 +msgid "Manage SSH tunnel connections" +msgstr "管理 SSH 隧道连接" -#: ../menu-data/gtablix:gtablix.desktop.in.h:2 +#: ../menu-data/gtablix:gtablix.desktop.in.h:1 msgid "Gtablix Timetable Generator" msgstr "Gtablix 时间表生成器" -#: ../menu-data/gtali:gtali.desktop.in.h:1 -msgid "Beat the odds in a poker-style dice game" -msgstr "一种类似扑克的的骰子游戏" +#: ../menu-data/gtablix:gtablix.desktop.in.h:2 +msgid "Generate highschool timetables using a GUI for Tablix." +msgstr "使用 Tablix 的图形用户界面生成高中时间表。" -#: ../menu-data/gtali:gtali.desktop.in.h:2 +#: ../menu-data/gtali:gtali.desktop.in.h:1 msgid "Tali" msgstr "掷骰子" +#: ../menu-data/gtali:gtali.desktop.in.h:2 +msgid "Beat the odds in a poker-style dice game" +msgstr "一种类似扑克的的骰子游戏" + #: ../menu-data/gtamsanalyzer.app:GTAMSAnalyzer.desktop.in.h:1 msgid "GTAMSAnalyzer" msgstr "GTAMSAnalyzer" @@ -7227,13 +7314,13 @@ msgstr "GNOME 桌面环境的个人事务管理程序" #: ../menu-data/gthumb:gthumb.desktop.in.h:1 -msgid "View and organize your images" -msgstr "查看及管理图像" - -#: ../menu-data/gthumb:gthumb.desktop.in.h:2 msgid "gThumb Image Viewer" msgstr "" +#: ../menu-data/gthumb:gthumb.desktop.in.h:2 +msgid "View and organize your images" +msgstr "查看及管理图像" + #: ../menu-data/gtick:gtick.desktop.in.h:1 msgid "Gtick" msgstr "Gtick" @@ -7251,29 +7338,29 @@ msgstr "" #: ../menu-data/gtimer:gtimer.desktop.in.h:1 -msgid "GTK-based X11 task timer" +msgid "GTimer" msgstr "" #: ../menu-data/gtimer:gtimer.desktop.in.h:2 -msgid "GTimer" +msgid "GTK-based X11 task timer" msgstr "" #: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:1 -msgid "GTK+2.0 Theme Changer" -msgstr "GTK+2.0 主题变换器" - -#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2 msgid "Gtk-ChTheme" msgstr "Gtk-ChTheme" -#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1 -msgid "A GUI based Gnutella Servent" -msgstr "" +#: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2 +msgid "GTK+2.0 Theme Changer" +msgstr "GTK+2.0 主题变换器" -#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2 +#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1 msgid "gtk-gnutella" msgstr "gtk-gnutella" +#: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2 +msgid "A GUI based Gnutella Servent" +msgstr "" + #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1 #: ../menu-data/recorditnow:kde4__recorditnow.desktop.in.h:1 msgid "Desktop recorder" @@ -7284,37 +7371,37 @@ msgstr "录制桌面的视频" #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:1 -msgid "Color temperature adjustment tool" +msgid "Redshift" msgstr "" #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2 -msgid "Redshift" +msgid "Color temperature adjustment tool" msgstr "" #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1 -msgid "Save vector images of application windows" +msgid "Take Vector Screenshot" msgstr "" #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2 -msgid "Take Vector Screenshot" +msgid "Save vector images of application windows" msgstr "" #: ../menu-data/gtkam:gtkam.desktop.in.h:1 -msgid "Browse and download images from an attached digital camera" -msgstr "从连接的数码相机上浏览和下载图像" - -#: ../menu-data/gtkam:gtkam.desktop.in.h:2 msgid "Gtkam Digital Camera Browser" msgstr "Gtkam 数码相机浏览器" -#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:1 -msgid "Connect to a Monopd server" -msgstr "连接到 Monopd 服务器" +#: ../menu-data/gtkam:gtkam.desktop.in.h:2 +msgid "Browse and download images from an attached digital camera" +msgstr "从连接的数码相机上浏览和下载图像" -#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2 +#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:1 msgid "GtkAtlantic" msgstr "GtkAtlantic" +#: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2 +msgid "Connect to a Monopd server" +msgstr "连接到 Monopd 服务器" + #: ../menu-data/gtkballs:gtkballs.desktop.in.h:1 msgid "GtkBalls" msgstr "GtkBalls" @@ -7332,37 +7419,37 @@ msgstr "" #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:1 -msgid "Tune your Guitar" -msgstr "给您的吉它调音" - -#: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2 msgid "gtkGuitune" msgstr "gtkGuitune" +#: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2 +msgid "Tune your Guitar" +msgstr "给您的吉它调音" + #: ../menu-data/gtkhash:gtkhash.desktop.in.h:1 -msgid "Compute message digests and checksums" +msgid "GtkHash" msgstr "" #: ../menu-data/gtkhash:gtkhash.desktop.in.h:2 -msgid "GtkHash" +msgid "Compute message digests and checksums" msgstr "" #: ../menu-data/gtklick:gtklick.desktop.in.h:1 -msgid "A Simple Metronome" -msgstr "一个简单的节拍器" - -#: ../menu-data/gtklick:gtklick.desktop.in.h:2 msgid "gtklick" msgstr "gtklick" -#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:1 -msgid "A graphical tool to find and remove orphaned libraries" -msgstr "一个发现和删除孤立软件包的图形工具" +#: ../menu-data/gtklick:gtklick.desktop.in.h:2 +msgid "A Simple Metronome" +msgstr "一个简单的节拍器" -#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2 +#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:1 msgid "Remove orphaned packages" msgstr "删除孤立的软件包" +#: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2 +msgid "A graphical tool to find and remove orphaned libraries" +msgstr "一个发现和删除孤立软件包的图形工具" + #: ../menu-data/gtkperf:gtkperf.desktop.in.h:1 msgid "GtkPerf" msgstr "GtkPerf" @@ -7380,29 +7467,29 @@ msgstr "gtkpod iPod 管理器" #: ../menu-data/gtkterm:gtkterm.desktop.in.h:1 -msgid "Communicate with the serial port" -msgstr "使用串口通信" - -#: ../menu-data/gtkterm:gtkterm.desktop.in.h:2 msgid "Serial port terminal" msgstr "串口终端" +#: ../menu-data/gtkterm:gtkterm.desktop.in.h:2 +msgid "Communicate with the serial port" +msgstr "使用串口通信" + #: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:1 -msgid "Connect to your VNC servers" -msgstr "连接到您的虚拟专用网(VNC)服务器" - -#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2 msgid "Gtk VNC Viewer" msgstr "GTK VNC 查看器" -#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1 -msgid "A whiteboard written in GTK using the wiimote" -msgstr "一个使用 wiimote、用 GTK 写的白板程序" +#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2 +msgid "Connect to your VNC servers" +msgstr "连接到您的虚拟专用网(VNC)服务器" -#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2 +#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1 msgid "GTK Wiimote Whiteboard" msgstr "GTK Wiimote 白板" +#: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2 +msgid "A whiteboard written in GTK using the wiimote" +msgstr "一个使用 wiimote、用 GTK 写的白板程序" + #: ../menu-data/gtodo:gtodo.desktop.in.h:1 msgid "Todo list" msgstr "" @@ -7444,13 +7531,13 @@ msgstr "在文档中插入特殊字符" #: ../menu-data/gufw:gufw.desktop.in.h:1 -msgid "Allows you to configure ufw firewall" -msgstr "允许您配置 ufw 防火墙" - -#: ../menu-data/gufw:gufw.desktop.in.h:2 msgid "Firewall Configuration" msgstr "" +#: ../menu-data/gufw:gufw.desktop.in.h:2 +msgid "Allows you to configure ufw firewall" +msgstr "允许您配置 ufw 防火墙" + #: ../menu-data/gui-apt-key:gui-apt-key.desktop.in.h:1 msgid "APT Key Manager" msgstr "APT 密钥管理器" @@ -7460,11 +7547,11 @@ msgstr "APT 数字密钥图形化管理工具" #: ../menu-data/guitarix:guitarix.desktop.in.h:1 -msgid "Simple mono amplifier simulation" +msgid "guitarix" msgstr "" #: ../menu-data/guitarix:guitarix.desktop.in.h:2 -msgid "guitarix" +msgid "Simple mono amplifier simulation" msgstr "" #: ../menu-data/gummi:gummi.desktop.in.h:1 @@ -7488,86 +7575,86 @@ msgstr "" #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:1 -msgid "Graphical Web Links checker" -msgstr "图像化的网络链接检查器" - -#: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2 msgid "gurlchecker" msgstr "gurlchecker" -#: ../menu-data/guvcview:guvcview.desktop.in.h:1 -msgid "A video viewer and capturer for the linux uvc driver" -msgstr "" +#: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2 +msgid "Graphical Web Links checker" +msgstr "图像化的网络链接检查器" -#: ../menu-data/guvcview:guvcview.desktop.in.h:2 +#: ../menu-data/guvcview:guvcview.desktop.in.h:1 msgid "guvcview" msgstr "guvcview" +#: ../menu-data/guvcview:guvcview.desktop.in.h:2 +msgid "A video viewer and capturer for the linux uvc driver" +msgstr "" + #: ../menu-data/guymager:guymager.desktop.in.h:1 -msgid "Fast forensic imager" +msgid "Guymager" msgstr "" #: ../menu-data/guymager:guymager.desktop.in.h:2 -msgid "Guymager" +msgid "Fast forensic imager" msgstr "" #: ../menu-data/gv:gv.desktop.in.h:1 -msgid "View PS and/or PDF files" -msgstr "查看 PS 和/或 PDF 文件" - -#: ../menu-data/gv:gv.desktop.in.h:2 msgid "gv" msgstr "gv" -#: ../menu-data/gvb:gvb.desktop.in.h:1 -msgid "Gvb" -msgstr "Gvb" +#: ../menu-data/gv:gv.desktop.in.h:2 +msgid "View PS and/or PDF files" +msgstr "查看 PS 和/或 PDF 文件" -#: ../menu-data/gvb:gvb.desktop.in.h:2 +#: ../menu-data/gvb:gvb.desktop.in.h:1 msgid "Play with waves and vibrations" msgstr "" -#: ../menu-data/gvrng:gvrng.desktop.in.h:1 -msgid "Guido van Robot NG" -msgstr "" +#: ../menu-data/gvb:gvb.desktop.in.h:2 +msgid "Gvb" +msgstr "Gvb" -#: ../menu-data/gvrng:gvrng.desktop.in.h:2 +#: ../menu-data/gvrng:gvrng.desktop.in.h:1 msgid "GvRng" msgstr "GvRng" -#: ../menu-data/gwaei:gwaei.desktop.in.h:1 -msgid "Enter a Japanese or English word to easily get translations." -msgstr "输入一个日语或英语词,轻松获得翻译。" +#: ../menu-data/gvrng:gvrng.desktop.in.h:2 +msgid "Guido van Robot NG" +msgstr "" -#: ../menu-data/gwaei:gwaei.desktop.in.h:2 +#: ../menu-data/gwaei:gwaei.desktop.in.h:1 msgid "gWaei Japanese-English Dictionary" msgstr "gWaei 日-英词典" +#: ../menu-data/gwaei:gwaei.desktop.in.h:2 +msgid "Enter a Japanese or English word to easily get translations." +msgstr "输入一个日语或英语词,轻松获得翻译。" + #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:1 +msgid "gWakeOnLan" +msgstr "gWakeOnLan" + +#: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2 msgid "" "A GTK+ utility to awake turned off machine using the Wake On LAN feature." msgstr "一个使用网络唤醒功能唤醒关机的计算机的 GTK+ 工具。" -#: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2 -msgid "gWakeOnLan" -msgstr "gWakeOnLan" - #: ../menu-data/gwaterfall:waterfall.desktop.in.h:1 -msgid "View all characters of a font in all sizes." -msgstr "浏览一个字体的所有字符所有尺寸。" - -#: ../menu-data/gwaterfall:waterfall.desktop.in.h:2 msgid "Waterfall" msgstr "瀑布" -#: ../menu-data/gwave:gwave.desktop.in.h:1 -msgid "A waveform viewer eg for spice simulators " -msgstr "一个用于 spice 仿真程序等用途的波形查看器 " +#: ../menu-data/gwaterfall:waterfall.desktop.in.h:2 +msgid "View all characters of a font in all sizes." +msgstr "浏览一个字体的所有字符所有尺寸。" -#: ../menu-data/gwave:gwave.desktop.in.h:2 +#: ../menu-data/gwave:gwave.desktop.in.h:1 msgid "gwave" msgstr "gwave" +#: ../menu-data/gwave:gwave.desktop.in.h:2 +msgid "A waveform viewer eg for spice simulators " +msgstr "一个用于 spice 仿真程序等用途的波形查看器 " + #: ../menu-data/gwc:gwc.desktop.in.h:1 msgid "Gnome Wave Cleaner" msgstr "" @@ -7585,22 +7672,26 @@ msgstr "" #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:1 -msgid "A batch renaming tool for KDE" +msgid "GwenRename" msgstr "" #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:2 -msgid "GwenRename" +msgid "A batch renaming tool for KDE" msgstr "" #: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1 -msgid "A simple image viewer" -msgstr "一个简单的图像查看器" - -#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2 msgid "Gwenview" msgstr "Gwenview" +#: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2 +msgid "A simple image viewer" +msgstr "一个简单的图像查看器" + #: ../menu-data/gwhere:gwhere.desktop.in.h:1 +msgid "Removable media catalog managment" +msgstr "可移动媒体分类管理" + +#: ../menu-data/gwhere:gwhere.desktop.in.h:2 msgid "" "GWhere allows to manage a database of yours CDs and others removable media " "(hard disks, floppy drive, Zip drive, CD-ROM, etc...). With GWhere it's easy " @@ -7610,10 +7701,6 @@ "GWhere 可以管理您的 CD 和可移动媒体(硬盘、软盘、压缩磁盘、CD-ROM 等)的数据库。通过 GWhere,您可以方便地浏览您的 " "CD或进行快速搜索,而不必在操作时就将 CD 放在光驱中。" -#: ../menu-data/gwhere:gwhere.desktop.in.h:2 -msgid "Removable media catalog managment" -msgstr "可移动媒体分类管理" - #: ../menu-data/gwibber:gwibber.desktop.in.h:1 msgid "Gwibber Social Client" msgstr "" @@ -7623,13 +7710,13 @@ msgstr "更新您的微博客并跟踪联系人的状态" #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:1 -msgid "GNUstep Workspace Manager" -msgstr "GNUstep 工作区管理" - -#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2 msgid "GWorkspace" msgstr "GWorkspace" +#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2 +msgid "GNUstep Workspace Manager" +msgstr "GNUstep 工作区管理" + #: ../menu-data/gworldclock:gworldclock.desktop.in.h:1 msgid "See the time in other timezones" msgstr "查看别的时区的时间" @@ -7645,7 +7732,7 @@ #: ../menu-data/gwrite:gwrite.desktop.in.h:2 #: ../menu-data/leafpad:leafpad.desktop.in.h:2 #: ../menu-data/mousepad:mousepad.desktop.in.h:2 -#: ../menu-data/x2:x2.desktop.in.h:1 +#: ../menu-data/x2:x2.desktop.in.h:2 msgid "Simple text editor" msgstr "简单的文本编辑器" @@ -7658,21 +7745,21 @@ msgstr "SPM 数据可视化和分析" #: ../menu-data/gxmms2:gxmms2.desktop.in.h:1 -msgid "Play music" -msgstr "播放音乐" - -#: ../menu-data/gxmms2:gxmms2.desktop.in.h:2 msgid "gxmms2" msgstr "gxmms2" -#: ../menu-data/gxneur:gxneur.desktop.in.h:1 -msgid "Automatic keyboard layout switcher" -msgstr "键盘布局自动切换器" +#: ../menu-data/gxmms2:gxmms2.desktop.in.h:2 +msgid "Play music" +msgstr "播放音乐" -#: ../menu-data/gxneur:gxneur.desktop.in.h:2 +#: ../menu-data/gxneur:gxneur.desktop.in.h:1 msgid "gXNeur" msgstr "gXNeur" +#: ../menu-data/gxneur:gxneur.desktop.in.h:2 +msgid "Automatic keyboard layout switcher" +msgstr "键盘布局自动切换器" + #: ../menu-data/gxtuner:gxtuner.desktop.in.h:1 msgid "Gxtuner" msgstr "" @@ -7682,63 +7769,55 @@ msgstr "" #: ../menu-data/gyrus:gyrus.desktop.in.h:1 -msgid "Administer the mailboxes of your IMAP Cyrus servers" -msgstr "管理您的 IMAP Cyrus 服务器的邮箱" - -#: ../menu-data/gyrus:gyrus.desktop.in.h:2 msgid "Gyrus IMAP Cyrus Administrator" msgstr "Gyrus IMAP Cyrus 管理程序" +#: ../menu-data/gyrus:gyrus.desktop.in.h:2 +msgid "Administer the mailboxes of your IMAP Cyrus servers" +msgstr "管理您的 IMAP Cyrus 服务器的邮箱" + #: ../menu-data/hamfax:hamfax.desktop.in.h:1 -msgid "Send and receive radio facsimiles" +msgid "hamfax" msgstr "" #: ../menu-data/hamfax:hamfax.desktop.in.h:2 -msgid "hamfax" +msgid "Send and receive radio facsimiles" msgstr "" #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1 -msgid "Project Hamster - track your time" +msgid "Time Tracker" msgstr "" #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2 -msgid "Time Tracker" +msgid "Project Hamster - track your time" msgstr "" #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:1 +msgid "Foo2ZJS Firmware Installer (Hannah)" +msgstr "" + +#: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2 msgid "Foo2ZJS Firmware Downloader and Installer" msgstr "Foo2ZJS 固件下载器和安装器" -#: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2 -msgid "Foo2ZJS Firmware Installer (Hannah)" +#: ../menu-data/hannah:hannah.desktop.in.h:1 +msgid "Help Hannah's Horse" msgstr "" -#: ../menu-data/hannah:hannah.desktop.in.h:1 +#: ../menu-data/hannah:hannah.desktop.in.h:2 msgid "A pacman-like game" msgstr "一个类似 Pacman 的游戏" -#: ../menu-data/hannah:hannah.desktop.in.h:2 -msgid "Help Hannah's Horse" -msgstr "" - #: ../menu-data/hardinfo:hardinfo.desktop.in.h:1 msgid "System Profiler and Benchmark" msgstr "系统配置和评测" -#: ../menu-data/harpia:harpia.desktop.in.h:1 -msgid "Harpia" -msgstr "Harpia" - -#: ../menu-data/harpia:harpia.desktop.in.h:2 -msgid "Image Processing and Computer Vision Automatic Programming Tool" -msgstr "图像处理和计算机视觉自动编程工具" - #: ../menu-data/hasciicam:hasciicam.desktop.in.h:1 -msgid "(h)ascii for the masses!" +msgid "HasciiCam" msgstr "" #: ../menu-data/hasciicam:hasciicam.desktop.in.h:2 -msgid "HasciiCam" +msgid "(h)ascii for the masses!" msgstr "" #: ../menu-data/hatari:hatariui.desktop.in.h:1 @@ -7746,51 +7825,51 @@ msgstr "" #: ../menu-data/hdfview:hdfview.desktop.in.h:1 -msgid "HDF4/5 Data Browser" -msgstr "HDF4/5 数据浏览器" - -#: ../menu-data/hdfview:hdfview.desktop.in.h:2 msgid "hdfview" msgstr "" +#: ../menu-data/hdfview:hdfview.desktop.in.h:2 +msgid "HDF4/5 Data Browser" +msgstr "HDF4/5 数据浏览器" + #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:1 -msgid "A GUI for configuration of HDHomeRun devices" +msgid "HDHomeRun Config GUI" msgstr "" #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:2 -msgid "HDHomeRun Config GUI" +msgid "A GUI for configuration of HDHomeRun devices" msgstr "" #: ../menu-data/hedgewars:hedgewars.desktop.in.h:1 -msgid "Fighting Hedgehogs" -msgstr "" - -#: ../menu-data/hedgewars:hedgewars.desktop.in.h:2 msgid "Hedgewars" msgstr "Hedgewars" -#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1 -msgid "GNUstep Help Viewer" -msgstr "GNUstep 帮助查看器" +#: ../menu-data/hedgewars:hedgewars.desktop.in.h:2 +msgid "Fighting Hedgehogs" +msgstr "" -#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2 +#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1 msgid "HelpViewer" msgstr "帮助文件浏览器" +#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2 +msgid "GNUstep Help Viewer" +msgstr "GNUstep 帮助查看器" + #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:1 -msgid "GUI front-end of hercules emulator" +msgid "HerculesStudio" msgstr "" #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:2 -msgid "HerculesStudio" +msgid "GUI front-end of hercules emulator" msgstr "" #: ../menu-data/heroes-common:heroes.desktop.in.h:1 -msgid "Collect powerups and avoid your opponents' trails" +msgid "Heroes" msgstr "" #: ../menu-data/heroes-common:heroes.desktop.in.h:2 -msgid "Heroes" +msgid "Collect powerups and avoid your opponents' trails" msgstr "" #: ../menu-data/hex-a-hop:hex-a-hop.desktop.in.h:1 @@ -7834,11 +7913,11 @@ msgstr "" #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:1 -msgid "A minimal program to work with scanner." +msgid "sane-pygtk" msgstr "" #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:2 -msgid "sane-pygtk" +msgid "A minimal program to work with scanner." msgstr "" #: ../menu-data/holdingnuts:holdingnuts.desktop.in.h:1 @@ -7858,13 +7937,13 @@ msgstr "" #: ../menu-data/homebank:homebank.desktop.in.h:1 -msgid "Free, easy, personal accounting for everyone." -msgstr "为所有人准备的免费,易用的个人帐户软件" - -#: ../menu-data/homebank:homebank.desktop.in.h:2 msgid "HomeBank" msgstr "HomeBank" +#: ../menu-data/homebank:homebank.desktop.in.h:2 +msgid "Free, easy, personal accounting for everyone." +msgstr "为所有人准备的免费,易用的个人帐户软件" + #: ../menu-data/horae:artemis.desktop.in.h:1 msgid "Artemis" msgstr "Artemis" @@ -7906,29 +7985,29 @@ msgstr "" #: ../menu-data/hotssh:hotssh.desktop.in.h:1 -msgid "Connect to a remote computer using Secure Shell" -msgstr "使用加密 Shell 连接远程计算机" - -#: ../menu-data/hotssh:hotssh.desktop.in.h:2 msgid "Secure Shell" msgstr "Secure Shell" -#: ../menu-data/hotwire:hotwire.desktop.in.h:1 -msgid "Execute text commands" -msgstr "执行文本命令" +#: ../menu-data/hotssh:hotssh.desktop.in.h:2 +msgid "Connect to a remote computer using Secure Shell" +msgstr "使用加密 Shell 连接远程计算机" -#: ../menu-data/hotwire:hotwire.desktop.in.h:2 +#: ../menu-data/hotwire:hotwire.desktop.in.h:1 msgid "Hotwire Shell" msgstr "" -#: ../menu-data/hplip-gui:hplip.desktop.in.h:1 -msgid "HP Printing System Control Center" -msgstr "惠普打印系统控制中心" +#: ../menu-data/hotwire:hotwire.desktop.in.h:2 +msgid "Execute text commands" +msgstr "执行文本命令" -#: ../menu-data/hplip-gui:hplip.desktop.in.h:2 +#: ../menu-data/hplip-gui:hplip.desktop.in.h:1 msgid "HPLIP Toolbox" msgstr "HPLIP 工具箱" +#: ../menu-data/hplip-gui:hplip.desktop.in.h:2 +msgid "HP Printing System Control Center" +msgstr "惠普打印系统控制中心" + #: ../menu-data/htop:htop.desktop.in.h:1 msgid "Htop" msgstr "Htop" @@ -7937,51 +8016,38 @@ msgid "Show System Processes" msgstr "显示系统进程" -#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:1 -msgid "Hugin Calibrate Lens" -msgstr "" - -#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:2 -#: ../menu-data/hugin:hugin.desktop.in.h:2 -msgid "Stitch photographs together" -msgstr "将照片拼接在一起" - -#: ../menu-data/hugin:hugin.desktop.in.h:1 -msgid "Hugin Panorama Creator" -msgstr "" - #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:1 -msgid "A fast network logon cracker" +msgid "XHydra" msgstr "" #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:2 -msgid "XHydra" +msgid "A fast network logon cracker" msgstr "" #: ../menu-data/hydrogen:hydrogen.desktop.in.h:1 -msgid "Create drum sequences" -msgstr "" +msgid "Hydrogen" +msgstr "Hydrogen" #: ../menu-data/hydrogen:hydrogen.desktop.in.h:2 -msgid "Hydrogen Drum Machine" +msgid "Create drum sequences" msgstr "" #: ../menu-data/iagno:iagno.desktop.in.h:1 -msgid "Dominate the board in a classic version of Reversi" -msgstr "" - -#: ../menu-data/iagno:iagno.desktop.in.h:2 msgid "Iagno" msgstr "Iagno" -#: ../menu-data/ibus:ibus-setup.desktop.in.h:1 -msgid "Adjust methods for keyboard input." -msgstr "调整键盘输入方法。" +#: ../menu-data/iagno:iagno.desktop.in.h:2 +msgid "Dominate the board in a classic version of Reversi" +msgstr "" -#: ../menu-data/ibus:ibus-setup.desktop.in.h:2 +#: ../menu-data/ibus:ibus-setup.desktop.in.h:1 msgid "Keyboard Input Methods" msgstr "键盘输入方法" +#: ../menu-data/ibus:ibus-setup.desktop.in.h:2 +msgid "Adjust methods for keyboard input." +msgstr "调整键盘输入方法。" + #: ../menu-data/ibus:ibus.desktop.in.h:1 msgid "IBus" msgstr "" @@ -7999,11 +8065,11 @@ msgstr "" #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:1 -msgid "A monitor for an Icecream compilation network" +msgid "Icemon" msgstr "" #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2 -msgid "Icemon" +msgid "A monitor for an Icecream compilation network" msgstr "" #: ../menu-data/icedtea-netx-common:icedtea-netx-javaws.desktop.in.h:1 @@ -8059,13 +8125,13 @@ msgstr "Python 集成开发环境" #: ../menu-data/ifpgui:ifpgui.desktop.in.h:1 -msgid "KDE-style GUI for iRiver iFP flash players " -msgstr "" - -#: ../menu-data/ifpgui:ifpgui.desktop.in.h:2 msgid "ifpgui" msgstr "ifpgui" +#: ../menu-data/ifpgui:ifpgui.desktop.in.h:2 +msgid "KDE-style GUI for iRiver iFP flash players " +msgstr "" + #: ../menu-data/ifrit:ifrit.desktop.in.h:1 msgid "IFRIT 3D Data Visualization" msgstr "IFRIT 三维数据可视化" @@ -8075,23 +8141,23 @@ msgstr "" #: ../menu-data/ii-esu:ii-esu.desktop.in.h:1 -msgid "HIZ's ES" -msgstr "HIZ's ES" - -#: ../menu-data/ii-esu:ii-esu.desktop.in.h:2 msgid "ii-esu" msgstr "ii-esu" -#: ../menu-data/ike-qtgui:ike.desktop.in.h:1 -msgid "Application to manage remote site configurations" -msgstr "管理远程站点配置的应用程序" +#: ../menu-data/ii-esu:ii-esu.desktop.in.h:2 +msgid "HIZ's ES" +msgstr "HIZ's ES" -#: ../menu-data/ike-qtgui:ike.desktop.in.h:2 +#: ../menu-data/ike-qtgui:ike.desktop.in.h:1 msgid "Shrew Soft VPN Access Manager" msgstr "" +#: ../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:2 +#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1 msgid "Input Method" msgstr "输入法" @@ -8105,13 +8171,13 @@ msgstr "输入法切换器" #: ../menu-data/imagej:imagej.desktop.in.h:1 -msgid "Image processing and analysis" -msgstr "图像处理和分析" - -#: ../menu-data/imagej:imagej.desktop.in.h:2 msgid "ImageJ" msgstr "ImageJ" +#: ../menu-data/imagej:imagej.desktop.in.h:2 +msgid "Image processing and analysis" +msgstr "图像处理和分析" + #: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:1 msgid "ImageShack Uploader" msgstr "ImageShack 上传程序" @@ -8120,14 +8186,22 @@ msgid "Upload your images and videos to ImageShack" msgstr "将您的图像和视频上传到 ImageShack" -#: ../menu-data/imagination:imagination.desktop.in.h:1 -msgid "A lightweight DVD slideshow maker using GTK+2" +#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:1 +msgid "ImageVis3D" msgstr "" -#: ../menu-data/imagination:imagination.desktop.in.h:2 +#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:2 +msgid "Desktop volume rendering application for large data" +msgstr "" + +#: ../menu-data/imagination:imagination.desktop.in.h:1 msgid "Imagination" msgstr "Imagination" +#: ../menu-data/imagination:imagination.desktop.in.h:2 +msgid "A lightweight DVD slideshow maker using GTK+2" +msgstr "" + #: ../menu-data/imview:imview.desktop.in.h:1 msgid "Imview Image Viewer" msgstr "Imview 图像浏览器" @@ -8137,33 +8211,33 @@ msgstr "浏览和分析科学图像" #: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:1 +msgid "System Load Indicator" +msgstr "" + +#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2 msgid "" "A system load monitor capable of displaying graphs for CPU, ram, and swap " "space use, plus network traffic." msgstr "" -#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2 -msgid "System Load Indicator" +#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1 +msgid "Weather Indicator" msgstr "" -#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1 +#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2 msgid "" "A weather indicator that displays information for one or multiple places in " "the world" msgstr "" -#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2 -msgid "Weather Indicator" -msgstr "" - #: ../menu-data/inkscape:inkscape.desktop.in.h:1 -msgid "Create and edit Scalable Vector Graphics images" -msgstr "创建并编辑可缩放矢量图形(SVG)图像" - -#: ../menu-data/inkscape:inkscape.desktop.in.h:2 msgid "Inkscape Vector Graphics Editor" msgstr "Inkscape 矢量图形编辑器" +#: ../menu-data/inkscape:inkscape.desktop.in.h:2 +msgid "Create and edit Scalable Vector Graphics images" +msgstr "创建并编辑可缩放矢量图形(SVG)图像" + #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:1 msgid "Insanity testing system" msgstr "" @@ -8181,43 +8255,67 @@ msgstr "e 媒体播放器" #: ../menu-data/iok:iok.desktop.in.h:1 -msgid "Enter Indic characters with a virtual keyboard" +msgid "Indic Onscreen Keyboard" msgstr "" #: ../menu-data/iok:iok.desktop.in.h:2 -msgid "Indic Onscreen Keyboard" +msgid "Enter Indic characters with a virtual keyboard" msgstr "" #: ../menu-data/iptux:iptux.desktop.in.h:1 +msgid "iptux" +msgstr "信使 (iptux)" + +#: ../menu-data/iptux:iptux.desktop.in.h:2 msgid "Lan communication software" msgstr "局域网通信软件" -#: ../menu-data/iptux:iptux.desktop.in.h:2 -msgid "iptux" -msgstr "信使 (iptux)" +#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:1 +msgid "Enhanced interactive Python qtconsole" +msgstr "" -#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1 -msgid "A simple OBEX file transfer applet" +#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:2 +msgid "IPython Qt console" msgstr "" -#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2 +#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:3 +msgid "Pylab" +msgstr "" + +#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4 +msgid "Pylab (inline plots)" +msgstr "" + +#: ../menu-data/ipython:ipython.desktop.in.h:1 +msgid "Enhanced interactive Python shell" +msgstr "" + +#: ../menu-data/ipython:ipython.desktop.in.h:2 +msgid "ipython" +msgstr "" + +#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1 msgid "Ircp Tray" msgstr "Ircp Tray" -#: ../menu-data/iriverter:iriverter.desktop.in.h:1 -msgid "Convert videos for your handheld device" -msgstr "将视频转换为适合手持设备的格式" +#: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2 +msgid "A simple OBEX file transfer applet" +msgstr "" -#: ../menu-data/iriverter:iriverter.desktop.in.h:2 +#: ../menu-data/iriverter:iriverter.desktop.in.h:1 msgid "iriverter" msgstr "iriverter" +#: ../menu-data/iriverter:iriverter.desktop.in.h:2 +msgid "Convert videos for your handheld device" +msgstr "将视频转换为适合手持设备的格式" + #: ../menu-data/isag:isag.desktop.in.h:1 -msgid "Interactive System Activity Grapher for sysstat" +msgid "Isag System Activity Grapher" msgstr "" #: ../menu-data/isag:isag.desktop.in.h:2 -msgid "Isag System Activity Grapher" +msgid "Interactive System Activity Grapher for sysstat" msgstr "" #: ../menu-data/isomaster:isomaster.desktop.in.h:1 @@ -8237,11 +8335,11 @@ msgstr "将您的桌面会话录制为视频" #: ../menu-data/italc-master:italc.desktop.in.h:1 -msgid "Computer room overview" +msgid "iTalc master interface" msgstr "" #: ../menu-data/italc-master:italc.desktop.in.h:2 -msgid "iTalc master interface" +msgid "Computer room overview" msgstr "" #: ../menu-data/itksnap:itksnap.desktop.in.h:1 @@ -8253,21 +8351,21 @@ msgstr "ITK-SNAP" #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:1 -msgid "Analyse or generate an Audio signal through ALSA" +msgid "Jaaa (with ALSA support)" msgstr "" #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:2 -msgid "Jaaa (with ALSA support)" +msgid "Analyse or generate an Audio signal through ALSA" msgstr "" #: ../menu-data/jabref:jabref.desktop.in.h:1 -msgid "Graphical editor for BibTex bibliographies" -msgstr "BibTex 参考文献的图形化编辑器" - -#: ../menu-data/jabref:jabref.desktop.in.h:2 msgid "JabRef" msgstr "JabRef" +#: ../menu-data/jabref:jabref.desktop.in.h:2 +msgid "Graphical editor for BibTex bibliographies" +msgstr "BibTex 参考文献的图形化编辑器" + #: ../menu-data/jack-keyboard:jack-keyboard.desktop.in.h:1 msgid "JACK Keyboard" msgstr "" @@ -8313,13 +8411,13 @@ msgstr "Jajuk 高级点唱机" #: ../menu-data/jamin:jamin.desktop.in.h:1 -msgid "JACK Audio Mastering interface" -msgstr "" - -#: ../menu-data/jamin:jamin.desktop.in.h:2 msgid "JAMin" msgstr "JAMin" +#: ../menu-data/jamin:jamin.desktop.in.h:2 +msgid "JACK Audio Mastering interface" +msgstr "" + #: ../menu-data/jampal:jampal.desktop.in.h:1 msgid "Jampal" msgstr "" @@ -8329,29 +8427,29 @@ msgstr "" #: ../menu-data/japa:japa-alsa.desktop.in.h:1 -msgid "Analyse an Audio signal through ALSA" +msgid "Japa (with ALSA support)" msgstr "" #: ../menu-data/japa:japa-alsa.desktop.in.h:2 -msgid "Japa (with ALSA support)" +msgid "Analyse an Audio signal through ALSA" msgstr "" #: ../menu-data/japa:japa-jack.desktop.in.h:1 -msgid "Analyse an Audio signal through JACK" +msgid "Japa (with JACK support)" msgstr "" #: ../menu-data/japa:japa-jack.desktop.in.h:2 -msgid "Japa (with JACK support)" +msgid "Analyse an Audio signal through JACK" msgstr "" #: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:1 -msgid "French computering dictionary" -msgstr "法语计算机词典" - -#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2 msgid "Jargon Informatique" msgstr "" +#: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2 +msgid "French computering dictionary" +msgstr "法语计算机词典" + #: ../menu-data/javamorph:javamorph.desktop.in.h:1 msgid "JavaMorph" msgstr "JavaMorph" @@ -8369,13 +8467,13 @@ msgstr "" #: ../menu-data/jcgui:Jc_Gui.desktop.in.h:1 -msgid "Host for jconvolver" -msgstr "jconvolver 主机" - -#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2 msgid "Jc_Gui" msgstr "Jc_Gui" +#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2 +msgid "Host for jconvolver" +msgstr "jconvolver 主机" + #: ../menu-data/jclic:jclic.desktop.in.h:1 msgid "JClic" msgstr "JClic" @@ -8394,36 +8492,36 @@ msgid "JD is a 2ch browser based on gtkmm2." msgstr "" -#: ../menu-data/jedit:jedit.desktop.in.h:2 +#: ../menu-data/jedit:jedit.desktop.in.h:1 msgid "jEdit" msgstr "jEdit" #: ../menu-data/jeex:jeex.desktop.in.h:1 -msgid "Hexadecimal Editor for Linux" -msgstr "Linux 下的十六进制编辑器" - -#: ../menu-data/jeex:jeex.desktop.in.h:2 msgid "Jeex" msgstr "Jeex" +#: ../menu-data/jeex:jeex.desktop.in.h:2 +msgid "Hexadecimal Editor for Linux" +msgstr "Linux 下的十六进制编辑器" + #: ../menu-data/jemboss:jemboss.desktop.in.h:1 +msgid "Jemboss" +msgstr "Jemboss" + +#: ../menu-data/jemboss:jemboss.desktop.in.h:2 msgid "" "Graphical user interface for the European Molecular Biology Open Software " "Suite." msgstr "欧洲分子生物开放软件套件的图形用户界面。" -#: ../menu-data/jemboss:jemboss.desktop.in.h:2 -msgid "Jemboss" -msgstr "Jemboss" - #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:1 -msgid "Calculate Fractions is fun!" -msgstr "计算分数充满趣味!" - -#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2 msgid "JFractionLab" msgstr "JFractionLab" +#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2 +msgid "Calculate Fractions is fun!" +msgstr "计算分数充满趣味!" + #: ../menu-data/jftp:jftp.desktop.in.h:1 msgid "JFTP" msgstr "JFTP" @@ -8433,38 +8531,38 @@ msgstr "FTP、SMB、SFTP 和 NFS 的 Java 图形用户界面" #: ../menu-data/jhbuild:jhbuild.desktop.in.h:1 -msgid "Build GNOME modules" -msgstr "构建 GNOME 模块" - -#: ../menu-data/jhbuild:jhbuild.desktop.in.h:2 msgid "GNOME Build Tool" msgstr "GNOME 构建工具" -#: ../menu-data/jigzo:jigzo.desktop.in.h:1 -msgid "Photo puzzle game for children" -msgstr "" +#: ../menu-data/jhbuild:jhbuild.desktop.in.h:2 +msgid "Build GNOME modules" +msgstr "构建 GNOME 模块" -#: ../menu-data/jigzo:jigzo.desktop.in.h:2 +#: ../menu-data/jigzo:jigzo.desktop.in.h:1 msgid "jigzo" msgstr "jigzo" +#: ../menu-data/jigzo:jigzo.desktop.in.h:2 +msgid "Photo puzzle game for children" +msgstr "" + #: ../menu-data/jkmeter:jkmeter.desktop.in.h:1 -#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1 -msgid "Audio level meter for JACK" +msgid "Jkmeter" msgstr "" #: ../menu-data/jkmeter:jkmeter.desktop.in.h:2 -msgid "Jkmeter" +#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2 +msgid "Audio level meter for JACK" msgstr "" #: ../menu-data/jlgui:jlgui.desktop.in.h:1 -msgid "graphical music player" -msgstr "图形音乐播放器" - -#: ../menu-data/jlgui:jlgui.desktop.in.h:2 msgid "jlGui" msgstr "jlGui" +#: ../menu-data/jlgui:jlgui.desktop.in.h:2 +msgid "graphical music player" +msgstr "图形音乐播放器" + #: ../menu-data/jmeter:jmeter.desktop.in.h:1 msgid "JMeter" msgstr "JMeter" @@ -8490,21 +8588,21 @@ msgstr "" #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:1 -msgid "Audio test signals meter for JACK" +msgid "Jnoisemeter" msgstr "" #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:2 -msgid "Jnoisemeter" +msgid "Audio test signals meter for JACK" msgstr "" #: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:1 -msgid "Manage system jobs present on your computer" -msgstr "管理计算机上运行的系统任务" - -#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2 msgid "System Jobs" msgstr "系统任务" +#: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2 +msgid "Manage system jobs present on your computer" +msgstr "管理计算机上运行的系统任务" + #: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1 #: ../menu-data/jockey-kde:jockey-kde.desktop.in.h:1 msgid "Additional Drivers" @@ -8524,13 +8622,13 @@ msgstr "" #: ../menu-data/josm:josm.desktop.in.h:1 -msgid "Editor for OpenStreetMap.org" -msgstr "OpenStreetMap.org 编辑器" - -#: ../menu-data/josm:josm.desktop.in.h:2 msgid "Josm" msgstr "Josm" +#: ../menu-data/josm:josm.desktop.in.h:2 +msgid "Editor for OpenStreetMap.org" +msgstr "OpenStreetMap.org 编辑器" + #: ../menu-data/jovie:kde4__jovieapp.desktop.in.h:1 msgid "Jovie" msgstr "" @@ -8540,45 +8638,45 @@ msgstr "" #: ../menu-data/jpilot:jpilot.desktop.in.h:1 -msgid "Desktop organizer application for the Palm Pilot" -msgstr "" - -#: ../menu-data/jpilot:jpilot.desktop.in.h:2 msgid "J-Pilot" msgstr "J-Pilot" +#: ../menu-data/jpilot:jpilot.desktop.in.h:2 +msgid "Desktop organizer application for the Palm Pilot" +msgstr "" + #: ../menu-data/jscribble:jscribble.desktop.in.h:1 -msgid "Infinite Notepad" +msgid "jscribble" msgstr "" #: ../menu-data/jscribble:jscribble.desktop.in.h:2 -msgid "jscribble" +msgid "Infinite Notepad" msgstr "" #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1 -msgid "Joystick testing and configuration tool" +msgid "jstest-gtk" msgstr "" #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:2 -msgid "jstest-gtk" +msgid "Joystick testing and configuration tool" msgstr "" #: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:1 -msgid "File manager for Sony MP3 players" -msgstr "Sony MP3 播放器的文件管理器" - -#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2 msgid "JSymphonic" msgstr "JSymphonic" -#: ../menu-data/juffed:juffed.desktop.in.h:1 -msgid "Advanced text editor" -msgstr "高级文本编辑器" +#: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2 +msgid "File manager for Sony MP3 players" +msgstr "Sony MP3 播放器的文件管理器" -#: ../menu-data/juffed:juffed.desktop.in.h:2 +#: ../menu-data/juffed:juffed.desktop.in.h:1 msgid "JuffEd text editor" msgstr "JuffEd 文本编辑器" +#: ../menu-data/juffed:juffed.desktop.in.h:2 +msgid "Advanced text editor" +msgstr "高级文本编辑器" + #: ../menu-data/juk:kde4__juk.desktop.in.h:1 msgid "JuK" msgstr "JuK" @@ -8592,13 +8690,13 @@ msgstr "" #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:1 -msgid "Jump on your opponents to make them explode" -msgstr "" - -#: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2 msgid "Jump'n'Bump" msgstr "Jump'n'Bump" +#: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2 +msgid "Jump on your opponents to make them explode" +msgstr "" + #: ../menu-data/jxplorer:jxplorer.desktop.in.h:1 msgid "JXplorer" msgstr "JXplorer" @@ -8616,13 +8714,13 @@ msgstr "K3b" #: ../menu-data/k3d:k3d.desktop.in.h:1 -msgid "Free-as-in-freedom 3D modeling and animation software" -msgstr "" - -#: ../menu-data/k3d:k3d.desktop.in.h:2 msgid "K-3D" msgstr "K-3D" +#: ../menu-data/k3d:k3d.desktop.in.h:2 +msgid "Free-as-in-freedom 3D modeling and animation software" +msgstr "" + #: ../menu-data/k3dsurf:k3dsurf.desktop.in.h:1 msgid "K3DSurf" msgstr "K3DSurf" @@ -8632,21 +8730,21 @@ msgstr "" #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:1 -msgid "Directory statistics and disk usage" +msgid "K4DirStat" msgstr "" #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2 -msgid "K4DirStat" +msgid "Directory statistics and disk usage" msgstr "" #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:1 -msgid "DVD9 to DVD5 backup tool" -msgstr "DVD9 到 DVD5 备份工具" - -#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2 msgid "k9copy" msgstr "k9copy" +#: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2 +msgid "DVD9 to DVD5 backup tool" +msgstr "DVD9 到 DVD5 备份工具" + #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:1 msgid "Kabikaboo" msgstr "Kabikaboo" @@ -8655,26 +8753,22 @@ msgid "Manage large collections of notes" msgstr "" -#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1 -msgid "Kontact Touch Contacts" -msgstr "" - #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1 -msgid "Contact Manager" -msgstr "联系人管理器" - -#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2 msgid "KAddressBook" msgstr "KAddressBook" -#: ../menu-data/kadu:kadu.desktop.in.h:1 -msgid "Gadu-Gadu/XMPP protocol client" -msgstr "" +#: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2 +msgid "Contact Manager" +msgstr "联系人管理器" -#: ../menu-data/kadu:kadu.desktop.in.h:2 +#: ../menu-data/kadu:kadu.desktop.in.h:1 msgid "Kadu" msgstr "Kadu" +#: ../menu-data/kadu:kadu.desktop.in.h:2 +msgid "Gadu-Gadu/XMPP protocol client" +msgstr "" + #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:1 msgid "Kaffeine" msgstr "Kaffeine" @@ -8720,11 +8814,11 @@ msgstr "Kalzium" #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:1 -msgid "Fancy-looking animated application for taking photos from webcam" +msgid "Kamerka" msgstr "" #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2 -msgid "Kamerka" +msgid "Fancy-looking animated application for taking photos from webcam" msgstr "" #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1 @@ -8740,45 +8834,45 @@ msgstr "" #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:1 -msgid "KDE Letter Order Game" +msgid "Kanagram" msgstr "" #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2 -msgid "Kanagram" +msgid "KDE Letter Order Game" msgstr "" #: ../menu-data/kanatest:kanatest.desktop.in.h:1 -msgid "Drill game to learn Japanese kana characters" +msgid "Kana test" msgstr "" #: ../menu-data/kanatest:kanatest.desktop.in.h:2 -msgid "Kana test" +msgid "Drill game to learn Japanese kana characters" msgstr "" #: ../menu-data/kanyremote:kanyremote.desktop.in.h:1 -msgid "Bluetooth remote control for KDE" -msgstr "KDE 蓝牙远程控制" - -#: ../menu-data/kanyremote:kanyremote.desktop.in.h:2 msgid "kanyremote" msgstr "kanyremote" -#: ../menu-data/kapman:kde4__kapman.desktop.in.h:1 -msgid "Eat pills escaping ghosts" -msgstr "" +#: ../menu-data/kanyremote:kanyremote.desktop.in.h:2 +msgid "Bluetooth remote control for KDE" +msgstr "KDE 蓝牙远程控制" -#: ../menu-data/kapman:kde4__kapman.desktop.in.h:2 +#: ../menu-data/kapman:kde4__kapman.desktop.in.h:1 msgid "Kapman" msgstr "Kapman" -#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1 -msgid "KAppTemplate" -msgstr "KAppTemplate" +#: ../menu-data/kapman:kde4__kapman.desktop.in.h:2 +msgid "Eat pills escaping ghosts" +msgstr "" -#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2 +#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1 msgid "KDE Template Generator" msgstr "" +#: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2 +msgid "KAppTemplate" +msgstr "KAppTemplate" + #: ../menu-data/kasumi:kasumi.desktop.in.h:1 msgid "Anthy Dictionary editor" msgstr "Anthy 词典编辑器" @@ -8812,27 +8906,27 @@ msgstr "多语言 Unicode 文本编辑器" #: ../menu-data/kayali:kayali.desktop.in.h:1 -msgid "A Computer Algebra System" -msgstr "" - -#: ../menu-data/kayali:kayali.desktop.in.h:2 msgid "Kayali" msgstr "Kayali" -#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1 -msgid "Backup your data with an easy to use user interface" -msgstr "通过简易的用户界面备份您的数据" +#: ../menu-data/kayali:kayali.desktop.in.h:2 +msgid "A Computer Algebra System" +msgstr "" -#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2 +#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1 msgid "KBackup" msgstr "KBackup" +#: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2 +msgid "Backup your data with an easy to use user interface" +msgstr "通过简易的用户界面备份您的数据" + #: ../menu-data/kball:kball.desktop.in.h:1 -msgid "Find the exit" +msgid "KBall" msgstr "" #: ../menu-data/kball:kball.desktop.in.h:2 -msgid "KBall" +msgid "Find the exit" msgstr "" #: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:1 @@ -8844,11 +8938,11 @@ msgstr "" #: ../menu-data/kbedic:kbedic.desktop.in.h:1 -msgid "Bulgarian English dictionary" +msgid "kbe Dictionary" msgstr "" #: ../menu-data/kbedic:kbedic.desktop.in.h:2 -msgid "kbe Dictionary" +msgid "Bulgarian English dictionary" msgstr "" #: ../menu-data/kbibtex:kde4__kbibtex.desktop.in.h:1 @@ -8868,35 +8962,35 @@ msgstr "" #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:1 -msgid "Falling Blocks Game" +msgid "KBlocks" msgstr "" #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2 -msgid "KBlocks" +msgid "Falling Blocks Game" msgstr "" #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1 -msgid "Ball Bouncing Game" +msgid "KBounce" msgstr "" #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2 -msgid "KBounce" +msgid "Ball Bouncing Game" msgstr "" #: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1 -msgid "Breakout-like Game" -msgstr "" - -#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2 msgid "KBreakOut" msgstr "KBreakOut" +#: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2 +msgid "Breakout-like Game" +msgstr "" + #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1 -msgid "KBruch" +msgid "Practice exercises with fractions" msgstr "" #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2 -msgid "Practice exercises with fractions" +msgid "KBruch" msgstr "" #: ../menu-data/kcachegrind:kde4__kcachegrind.desktop.in.h:1 @@ -8916,11 +9010,11 @@ msgstr "科学计算器" #: ../menu-data/kcemu:kcemu.desktop.in.h:1 -msgid "Emulator for KC85 and compatible computer" +msgid "KCemu" msgstr "" #: ../menu-data/kcemu:kcemu.desktop.in.h:2 -msgid "KCemu" +msgid "Emulator for KC85 and compatible computer" msgstr "" #: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1 @@ -8932,23 +9026,23 @@ msgstr "KCharSelect" #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:1 +msgid "KCheckGMail" +msgstr "KCheckGMail" + +#: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2 msgid "" "A Kicker applet to display how many email messages you have in your Gmail " "account." msgstr "" -#: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2 -msgid "KCheckGMail" -msgstr "KCheckGMail" - #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:1 -msgid "A viewer of CHM (MS-Help) files" -msgstr "一个 CHM(微软帮助)文件查看器" - -#: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2 msgid "KchmViewer" msgstr "KchmViewer" +#: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2 +msgid "A viewer of CHM (MS-Help) files" +msgstr "一个 CHM(微软帮助)文件查看器" + #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:1 msgid "KDE collectd database-viewer" msgstr "KDE collectd 数据库查看器" @@ -8974,19 +9068,19 @@ msgstr "" #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:1 -msgid "Debug programs" -msgstr "调试程序" - -#: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2 msgid "KDbg" msgstr "KDbg" +#: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2 +msgid "Debug programs" +msgstr "调试程序" + #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1 -msgid "Touchpad management" +msgid "synaptiks" msgstr "" #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2 -msgid "synaptiks" +msgid "Touchpad management" msgstr "" #: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1 @@ -9009,21 +9103,21 @@ msgid "Network Folder Wizard" msgstr "网络文件夹向导" -#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2 +#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1 msgid "KFontView" msgstr "" #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:1 -msgid "A panel applet for resizing and reorientating X screens." +msgid "KRandRTray" msgstr "" #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2 -msgid "KRandRTray" +msgid "A panel applet for resizing and reorientating X screens." msgstr "" -#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2 -#: ../menu-data/okular:kde4__okular.desktop.in.h:2 -#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2 +#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1 +#: ../menu-data/okular:kde4__okular.desktop.in.h:1 +#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1 msgid "Okular" msgstr "Okular" @@ -9054,42 +9148,47 @@ msgstr "" #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:1 -msgid "Akonadi Tray Utility" -msgstr "Akonadi 托盘工具" - -#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2 msgid "Akonaditray" msgstr "Akonaditray" -#: ../menu-data/kdepim-wizards:kde4__groupwarewizard.desktop.in.h:1 -msgid "KDE Groupware Wizard" -msgstr "" +#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2 +msgid "Akonadi Tray Utility" +msgstr "Akonadi 托盘工具" #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1 -msgid "" -"Builds the KDE Platform and associated software from its source code. A " -"command-line only program." +msgid "KDE Source Builder" msgstr "" #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2 -msgid "KDE Source Builder" +msgid "" +"Builds the KDE Platform and associated software from its source code. A " +"command-line only program." msgstr "" #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:1 -msgid "A Subversion client for KDE" -msgstr "KDE 的 SVN 客户端" - -#: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2 msgid "kdesvn" msgstr "kdesvn" +#: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2 +msgid "A Subversion client for KDE" +msgstr "KDE 的 SVN 客户端" + #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:1 +msgid "KDevelop 4" +msgstr "KDevelop 4" + +#: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2 +#: ../menu-data/netbeans:netbeans.desktop.in.h:2 msgid "Integrated Development Environment" msgstr "集成开发环境" -#: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2 -msgid "KDevelop 4" -msgstr "KDevelop 4" +#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:1 +msgid "KDevelop 4 (Pick Session)" +msgstr "" + +#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:2 +msgid "Integrated Development Environment (Pick Session to start with)" +msgstr "" #: ../menu-data/kdf:kde4__kdf.desktop.in.h:1 msgid "KDiskFree" @@ -9108,26 +9207,30 @@ msgstr "" #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:1 -msgid "A File And Directory Comparison And Merge Tool" -msgstr "文件和目录比较合并工具" - -#: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2 msgid "KDiff3" msgstr "KDiff3" +#: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2 +msgid "A File And Directory Comparison And Merge Tool" +msgstr "文件和目录比较合并工具" + #: ../menu-data/kdocker:kdocker.desktop.in.h:1 -msgid "Docks any application into system tray" +msgid "KDocker" msgstr "" #: ../menu-data/kdocker:kdocker.desktop.in.h:2 -msgid "KDocker" +msgid "Docks any application into system tray" msgstr "" #: ../menu-data/kdrill:kdrill.desktop.in.h:1 msgid "KDrill" msgstr "" -#: ../menu-data/keepass2:keepass2.desktop.in.h:1 +#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:1 +msgid "Ked Password Manager" +msgstr "" + +#: ../menu-data/keepass2:keepass2.desktop.in.h:1 msgid "KeePass2" msgstr "" @@ -9136,13 +9239,13 @@ msgstr "" #: ../menu-data/keepassx:keepassx.desktop.in.h:1 -msgid "Cross Platform Password Manager" -msgstr "跨平台密码管理器" - -#: ../menu-data/keepassx:keepassx.desktop.in.h:2 msgid "KeePassX" msgstr "KeePassX" +#: ../menu-data/keepassx:keepassx.desktop.in.h:2 +msgid "Cross Platform Password Manager" +msgstr "跨平台密码管理器" + #: ../menu-data/kepas:kde4__kepas.desktop.in.h:1 msgid "Kepas" msgstr "Kepas" @@ -9160,21 +9263,21 @@ msgstr "杀死所有移动的对象" #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:1 -msgid "A currency converter and calculator" -msgstr "货币换算和计算器" - -#: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2 msgid "KEuroCalc" msgstr "KEuroCalc" -#: ../menu-data/kexi:kde4__kexi.desktop.in.h:1 -msgid "Develop desktop database applications" -msgstr "开发桌面数据库应用程序" +#: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2 +msgid "A currency converter and calculator" +msgstr "货币换算和计算器" -#: ../menu-data/kexi:kde4__kexi.desktop.in.h:2 +#: ../menu-data/kexi:kde4__kexi.desktop.in.h:1 msgid "Kexi" msgstr "Kexi" +#: ../menu-data/kexi:kde4__kexi.desktop.in.h:2 +msgid "Develop desktop database applications" +msgstr "开发桌面数据库应用程序" + #: ../menu-data/keyboardcast:keyboardcast.desktop.in.h:1 msgid "Keyboardcast" msgstr "Keyboardcast" @@ -9192,21 +9295,21 @@ msgstr "" #: ../menu-data/keysafe:keysafe.desktop.in.h:1 -msgid "A password safe" -msgstr "一个安全的密码" - -#: ../menu-data/keysafe:keysafe.desktop.in.h:2 msgid "KeySafe" msgstr "KeySafe" -#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1 -msgid "Edit keyboard maps for keytouch" -msgstr "为 Keytouch 编辑键盘图" +#: ../menu-data/keysafe:keysafe.desktop.in.h:2 +msgid "A password safe" +msgstr "一个安全的密码" -#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2 +#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1 msgid "KeyTouch Editor" msgstr "KeyTouch 编辑器" +#: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2 +msgid "Edit keyboard maps for keytouch" +msgstr "为 Keytouch 编辑键盘图" + #: ../menu-data/kfilereplace:kde4__kfilereplace.desktop.in.h:1 msgid "KFileReplace" msgstr "KFileReplace" @@ -9228,64 +9331,64 @@ msgstr "KFloppy" #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:1 -msgid "Four-in-a-row Board Game" +msgid "KFourInLine" msgstr "" #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2 -msgid "KFourInLine" +msgid "Four-in-a-row Board Game" msgstr "" #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:1 -msgid "" -"Access call history and phone book of your Fritz!Box and get notifications " -"on incoming and outgoing calls." +msgid "KFritz" msgstr "" #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:2 -msgid "KFritz" +msgid "" +"Access call history and phone book of your Fritz!Box and get notifications " +"on incoming and outgoing calls." msgstr "" #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:1 -msgid "A graphical FTP client" -msgstr "一个图形 FTP 客户端" - -#: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2 msgid "KFTPGrabber" msgstr "KFTPGrabber" +#: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2 +msgid "A graphical FTP client" +msgstr "一个图形 FTP 客户端" + #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1 -msgid "A Geography Learning Program" +msgid "KGeography" msgstr "" #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2 -msgid "KGeography" +msgid "A Geography Learning Program" msgstr "" #: ../menu-data/kget:kde4__kget.desktop.in.h:1 +msgid "KGet" +msgstr "KGet" + +#: ../menu-data/kget:kde4__kget.desktop.in.h:2 #: ../menu-data/steadyflow:steadyflow.desktop.in.h:1 msgid "Download Manager" msgstr "下载管理器" -#: ../menu-data/kget:kde4__kget.desktop.in.h:2 -msgid "KGet" -msgstr "KGet" - #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:1 -msgid "A Gmail notifier applet for KDE" -msgstr "KDE Gmail 通知小程序" - -#: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2 msgid "KGmailNotifier" msgstr "KGmailNotifier" -#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1 -msgid "A game of action and puzzle-solving" -msgstr "一个结合动作与解谜的游戏" +#: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2 +msgid "A Gmail notifier applet for KDE" +msgstr "KDE Gmail 通知小程序" -#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2 +#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1 msgid "KGoldrunner" msgstr "KGoldrunner" +#: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2 +msgid "A game of action and puzzle-solving" +msgstr "一个结合动作与解谜的游戏" + #: ../menu-data/kgpg:kde4__kgpg.desktop.in.h:1 msgid "A GnuPG frontend" msgstr "GnuPG 前端" @@ -9295,27 +9398,27 @@ msgstr "KGpg" #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:1 -msgid "KGrab" -msgstr "KGrab" - -#: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2 msgid "Screen Grabbing Program" msgstr "抓屏程序" +#: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2 +msgid "KGrab" +msgstr "KGrab" + #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1 -msgid "A Graphviz dot graph editor for KDE" +msgid "kgrapheditor" msgstr "" #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2 -msgid "kgrapheditor" +msgid "A Graphviz dot graph editor for KDE" msgstr "" #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1 -msgid "A Graphviz dot graph viewer for KDE" +msgid "kgraphviewer" msgstr "" #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2 -msgid "kgraphviewer" +msgid "A Graphviz dot graph viewer for KDE" msgstr "" #: ../menu-data/khangman:kde4__khangman.desktop.in.h:1 @@ -9327,13 +9430,13 @@ msgstr "" #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:1 -msgid "Convert Khmer between Unicode and legacy Khmer encodings." -msgstr "" - -#: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2 msgid "Khmer Converter" msgstr "Khmer 转换器" +#: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2 +msgid "Convert Khmer between Unicode and legacy Khmer encodings." +msgstr "" + #: ../menu-data/kicad:kicad.desktop.in.h:1 msgid "KiCad" msgstr "KiCad" @@ -9347,32 +9450,32 @@ msgstr "KIconEdit" #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:1 -#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1 -msgid "Audio Tagger" -msgstr "音频标签程序" - -#: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2 msgid "Kid3-qt" msgstr "Kid3-qt" +#: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2 #: ../menu-data/kid3:kde4__kid3.desktop.in.h:2 +msgid "Audio Tagger" +msgstr "音频标签程序" + +#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1 msgid "Kid3" msgstr "Kid3" #: ../menu-data/kig:kde4__kig.desktop.in.h:1 -msgid "Explore Geometric Constructions" +msgid "Kig" msgstr "" #: ../menu-data/kig:kde4__kig.desktop.in.h:2 -msgid "Kig" +msgid "Explore Geometric Constructions" msgstr "" #: ../menu-data/kigo:kde4__kigo.desktop.in.h:1 -msgid "Go Board Game" +msgid "Kigo" msgstr "" #: ../menu-data/kigo:kde4__kigo.desktop.in.h:2 -msgid "Kigo" +msgid "Go Board Game" msgstr "" #: ../menu-data/kiki-the-nano-bot:kiki-the-nano-bot.desktop.in.h:1 @@ -9388,11 +9491,11 @@ msgstr "正则表达式测试" #: ../menu-data/kildclient:kildclient.desktop.in.h:1 -msgid "Connect to MUDs (Multi User Dungeons)" +msgid "KildClient" msgstr "" #: ../menu-data/kildclient:kildclient.desktop.in.h:2 -msgid "KildClient" +msgid "Connect to MUDs (Multi User Dungeons)" msgstr "" #: ../menu-data/kile:kde4__kile.desktop.in.h:1 @@ -9408,35 +9511,44 @@ msgstr "Killbots" #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:1 -msgid "HTML Image Map Editor" +msgid "KImageMapEditor" msgstr "" #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:2 -msgid "KImageMapEditor" +msgid "HTML Image Map Editor" msgstr "" #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1 -msgid "Info Center" -msgstr "信息中心" - -#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2 msgid "KInfoCenter" msgstr "KInfoCenter" -#: ../menu-data/kino:Kino.desktop.in.h:1 -msgid "Edit DV video" -msgstr "编辑 DV 视频" +#: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2 +msgid "Info Center" +msgstr "信息中心" -#: ../menu-data/kino:Kino.desktop.in.h:2 +#: ../menu-data/kino:Kino.desktop.in.h:1 msgid "Kino" msgstr "Kino" +#: ../menu-data/kino:Kino.desktop.in.h:2 +msgid "Edit DV video" +msgstr "编辑 DV 视频" + #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1 -msgid "KDE Image Plugins Interface" +msgid "KIPI Plugins" msgstr "" #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2 -msgid "KIPI Plugins" +msgid "KDE Image Plugins Interface" +msgstr "" + +#. X-DocPath=photolayoutseditor/index.html +#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2 +msgid "Photo Layouts Editor" +msgstr "" + +#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:3 +msgid "Create beautiful and professional photo layouts from your photos" msgstr "" #: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1 @@ -9448,13 +9560,13 @@ msgstr "" #: ../menu-data/kita2:kde__kita2.desktop.in.h:1 -msgid "2ch client for KDE" -msgstr "KDE的 2ch 客户端" - -#: ../menu-data/kita2:kde__kita2.desktop.in.h:2 msgid "Kita2" msgstr "Kita2" +#: ../menu-data/kita2:kde__kita2.desktop.in.h:2 +msgid "2ch client for KDE" +msgstr "KDE的 2ch 客户端" + #: ../menu-data/kiten:kde4__kiten.desktop.in.h:1 msgid "Japanese Reference and Study Tool" msgstr "" @@ -9464,13 +9576,13 @@ msgstr "" #: ../menu-data/kitsune:kitsune.desktop.in.h:1 -msgid "Countdown" -msgstr "倒计时" - -#: ../menu-data/kitsune:kitsune.desktop.in.h:2 msgid "Kitsune" msgstr "Kitsune" +#: ../menu-data/kitsune:kitsune.desktop.in.h:2 +msgid "Countdown" +msgstr "倒计时" + #: ../menu-data/kjots:kde4__Kjots.desktop.in.h:1 msgid "KJots" msgstr "KJots" @@ -9492,11 +9604,11 @@ msgstr "KDE Gnash SWF 查看器" #: ../menu-data/klatexformula:klatexformula.desktop.in.h:1 -msgid "Generate images from LaTeX equations" +msgid "KLatexFormula" msgstr "" #: ../menu-data/klatexformula:klatexformula.desktop.in.h:2 -msgid "KLatexFormula" +msgid "Generate images from LaTeX equations" msgstr "" #: ../menu-data/klavaro:klavaro.desktop.in.h:1 @@ -9509,20 +9621,20 @@ #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:1 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:1 -msgid "Certificate Manager and Unified Crypto GUI" +msgid "Kleopatra" msgstr "" #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:2 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:2 -msgid "Kleopatra" +msgid "Certificate Manager and Unified Crypto GUI" msgstr "" #: ../menu-data/klettres:kde4__klettres.desktop.in.h:1 -msgid "KLettres" +msgid "a KDE program to learn the alphabet" msgstr "" #: ../menu-data/klettres:kde4__klettres.desktop.in.h:2 -msgid "a KDE program to learn the alphabet" +msgid "KLettres" msgstr "" #: ../menu-data/klickety:kde4__klickety.desktop.in.h:1 @@ -9530,19 +9642,19 @@ msgstr "" #: ../menu-data/klickety:kde4__ksame.desktop.in.h:1 -msgid "Board Game" +msgid "SameGame" msgstr "" #: ../menu-data/klickety:kde4__ksame.desktop.in.h:2 -msgid "SameGame" +msgid "Board Game" msgstr "" #: ../menu-data/klines:kde4__klines.desktop.in.h:1 -msgid "Kolor Lines" +msgid "Tactical Game" msgstr "" #: ../menu-data/klines:kde4__klines.desktop.in.h:2 -msgid "Tactical Game" +msgid "Kolor Lines" msgstr "" #: ../menu-data/klinkstatus:kde4__klinkstatus.desktop.in.h:1 @@ -9554,19 +9666,19 @@ msgstr "链接检查器" #: ../menu-data/klipper:kde4__klipper.desktop.in.h:1 -msgid "A cut & paste history utility" -msgstr "剪切和粘贴历史工具" - -#: ../menu-data/klipper:kde4__klipper.desktop.in.h:2 msgid "Klipper" msgstr "Klipper" +#: ../menu-data/klipper:kde4__klipper.desktop.in.h:2 +msgid "A cut & paste history utility" +msgstr "剪切和粘贴历史工具" + #: ../menu-data/klog:kde4__klog.desktop.in.h:1 -msgid "KDE Ham Radio logging program" +msgid "KLog" msgstr "" #: ../menu-data/klog:kde4__klog.desktop.in.h:2 -msgid "KLog" +msgid "KDE Ham Radio logging program" msgstr "" #: ../menu-data/kluppe:kluppe.desktop.in.h:1 @@ -9594,7 +9706,7 @@ msgstr "" #: ../menu-data/kmail-mobile:kde4__kmail-mobile.desktop.in.h:1 -msgid "Kontact Touch Mail" +msgid "Mail" msgstr "" #: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1 @@ -9626,19 +9738,19 @@ msgstr "KDE Live Messenger 客户端" #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:1 -msgid "KDE MIDI Metronome Using ALSA Sequencer" +msgid "KMetronome" msgstr "" #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:2 -msgid "KMetronome" +msgid "KDE MIDI Metronome Using ALSA Sequencer" msgstr "" #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:1 -msgid "ALSA Sequencer MIDI monitor" +msgid "KMidimon" msgstr "" #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:2 -msgid "KMidimon" +msgid "ALSA Sequencer MIDI monitor" msgstr "" #: ../menu-data/kmines:kde4__kmines.desktop.in.h:1 @@ -9650,19 +9762,19 @@ msgstr "扫雷游戏" #: ../menu-data/kmix:kde4__kmix.desktop.in.h:1 -msgid "KMix" -msgstr "KMix" - -#: ../menu-data/kmix:kde4__kmix.desktop.in.h:2 msgid "Sound Mixer" msgstr "混音器" +#: ../menu-data/kmix:kde4__kmix.desktop.in.h:2 +msgid "KMix" +msgstr "KMix" + #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:1 -msgid "An MLDonkey frontend for KDE" +msgid "KMLDonkey" msgstr "" #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2 -msgid "KMLDonkey" +msgid "An MLDonkey frontend for KDE" msgstr "" #: ../menu-data/kmousetool:kde4__kmousetool.desktop.in.h:1 @@ -9722,11 +9834,11 @@ msgstr "" #: ../menu-data/knights:kde4__knights.desktop.in.h:1 -msgid "Chess game" +msgid "Knights" msgstr "" #: ../menu-data/knights:kde4__knights.desktop.in.h:2 -msgid "Knights" +msgid "Chess game" msgstr "" #: ../menu-data/knode:kde4__KNode.desktop.in.h:1 @@ -9738,25 +9850,25 @@ msgstr "新闻阅读器" #: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1 -msgid "Kontact Touch Notes" +msgid "Notes" msgstr "" #: ../menu-data/knotes:kde4__knotes.desktop.in.h:1 -msgid "KNotes" +msgid "Popup Notes" msgstr "" #: ../menu-data/knotes:kde4__knotes.desktop.in.h:2 -msgid "Popup Notes" +msgid "KNotes" msgstr "" #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1 -msgid "Destroy enemy bases in space" -msgstr "摧毁太空中的敌方基地" - -#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2 msgid "Kobo Deluxe" msgstr "" +#: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2 +msgid "Destroy enemy bases in space" +msgstr "摧毁太空中的敌方基地" + #: ../menu-data/kodos:kodos.desktop.in.h:1 msgid "Kodos" msgstr "Kodos" @@ -9778,11 +9890,11 @@ msgstr "" #: ../menu-data/kollision:kde4__kollision.desktop.in.h:1 -msgid "A simple ball dodging game" +msgid "Kollision" msgstr "" #: ../menu-data/kollision:kde4__kollision.desktop.in.h:2 -msgid "Kollision" +msgid "A simple ball dodging game" msgstr "" #: ../menu-data/kolourpaint4:kde4__kolourpaint.desktop.in.h:1 @@ -9794,35 +9906,35 @@ msgstr "绘画程序" #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:1 -msgid "A KDE Directory Synchronization Application" -msgstr "一个 KDE 目录同步程序" - -#: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2 msgid "Komparator4" msgstr "Komparator4" -#: ../menu-data/kompare:kde4__kompare.desktop.in.h:1 -msgid "Diff/Patch Frontend" -msgstr "Diff/Patch 前端" +#: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2 +msgid "A KDE Directory Synchronization Application" +msgstr "一个 KDE 目录同步程序" -#: ../menu-data/kompare:kde4__kompare.desktop.in.h:2 +#: ../menu-data/kompare:kde4__kompare.desktop.in.h:1 msgid "Kompare" msgstr "Kompare" -#: ../menu-data/kompozer:kompozer.desktop.in.h:1 -msgid "Create Web Pages" -msgstr "创建网页" +#: ../menu-data/kompare:kde4__kompare.desktop.in.h:2 +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch 前端" -#: ../menu-data/kompozer:kompozer.desktop.in.h:2 +#: ../menu-data/kompozer:kompozer.desktop.in.h:1 msgid "KompoZer" msgstr "KompoZer" +#: ../menu-data/kompozer:kompozer.desktop.in.h:2 +msgid "Create Web Pages" +msgstr "创建网页" + #: ../menu-data/konquest:kde4__konquest.desktop.in.h:1 -msgid "Galactic Strategy Game" +msgid "Konquest" msgstr "" #: ../menu-data/konquest:kde4__konquest.desktop.in.h:2 -msgid "Konquest" +msgid "Galactic Strategy Game" msgstr "" #: ../menu-data/konsole:kde4__konsole.desktop.in.h:1 @@ -9858,18 +9970,18 @@ msgstr "Konversation" #: ../menu-data/kopete:kde4__kopete.desktop.in.h:1 -#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1 -#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1 -msgid "Instant Messenger" -msgstr "即时通讯程序" - -#: ../menu-data/kopete:kde4__kopete.desktop.in.h:2 msgid "Kopete" msgstr "Kopete" +#: ../menu-data/kopete:kde4__kopete.desktop.in.h:2 +#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2 +#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2 +msgid "Instant Messenger" +msgstr "即时通讯程序" + #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1 -msgid "Kontact Touch Calendar" -msgstr "" +msgid "Calendar" +msgstr "日历" #: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1 #: ../menu-data/korganizer:kde4__korganizer.desktop.in.h:1 @@ -9882,11 +9994,11 @@ msgstr "" #: ../menu-data/koules:koules.desktop.in.h:1 -msgid "Push your enemies away, but stay away from obstacles" +msgid "koules" msgstr "" #: ../menu-data/koules:koules.desktop.in.h:2 -msgid "koules" +msgid "Push your enemies away, but stay away from obstacles" msgstr "" #: ../menu-data/kover:kde4__kover.desktop.in.h:1 @@ -9905,14 +10017,6 @@ msgid "Patience Card Game" msgstr "" -#: ../menu-data/kphone:kphone.desktop.in.h:1 -msgid "Kphone" -msgstr "" - -#: ../menu-data/kphone:kphone.desktop.in.h:2 -msgid "Voice over IP (VoIP) phone application" -msgstr "" - #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1 msgid "KPhotoAlbum" msgstr "KPhotoAlbum" @@ -9925,12 +10029,7 @@ msgid "KPlato" msgstr "KPlato" -#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2 -#: ../menu-data/planner:planner.desktop.in.h:2 -msgid "Project Management" -msgstr "项目管理" - -#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1 +#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2 msgid "KPlayer" msgstr "KPlayer" @@ -9946,16 +10045,12 @@ msgid "KPresenter" msgstr "KPresenter" -#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2 -msgid "Write presentation documents" -msgstr "编辑演示文稿" - #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:1 -msgid "V4L/V4L2-Radio Application for KDE4" +msgid "kradio4" msgstr "" #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:2 -msgid "kradio4" +msgid "V4L/V4L2-Radio Application for KDE4" msgstr "" #: ../menu-data/kradioripper:kde4__kradioripper.desktop.in.h:1 @@ -10023,30 +10118,33 @@ msgstr "" #: ../menu-data/krfb:kde4__krfb.desktop.in.h:1 -#: ../menu-data/vino:vino-preferences.desktop.in.h:2 -msgid "Desktop Sharing" -msgstr "桌面共享" - -#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2 msgid "Krfb" msgstr "Krfb" -#: ../menu-data/krita:kde4__krita.desktop.in.h:1 -msgid "Edit and paint images" -msgstr "编辑和绘制图像" +#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2 +#: ../menu-data/vino:vino-preferences.desktop.in.h:1 +msgid "Desktop Sharing" +msgstr "桌面共享" -#: ../menu-data/krita:kde4__krita.desktop.in.h:2 +#: ../menu-data/krita:kde4__krita.desktop.in.h:1 +#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1 +#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1 msgid "Krita" msgstr "Krita" -#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1 -msgid "KRuler" -msgstr "KRuler" +#: ../menu-data/krita:kde4__krita.desktop.in.h:2 +msgid "Edit and paint images" +msgstr "编辑和绘制图像" -#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2 +#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1 +#: ../menu-data/screenruler:screenruler.desktop.in.h:1 msgid "Screen Ruler" msgstr "屏幕标尺" +#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2 +msgid "KRuler" +msgstr "KRuler" + #: ../menu-data/krusader:kde4__krusader.desktop.in.h:1 msgid "Krusader" msgstr "Krusader" @@ -10059,6 +10157,14 @@ msgid "KsCD" msgstr "" +#: ../menu-data/kscope:kscope.desktop.in.h:1 +msgid "KScope" +msgstr "" + +#: ../menu-data/kscope:kscope.desktop.in.h:2 +msgid "Source editing environment" +msgstr "" + #: ../menu-data/kseg:kseg.desktop.in.h:1 msgid "KSeg Geometry Sketchpad" msgstr "Kseg 几何画板" @@ -10076,13 +10182,13 @@ msgstr "" #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:1 -msgid "An advanced shut down utility" -msgstr "高级关机工具" - -#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2 msgid "KShutdown" msgstr "KShutdown" +#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2 +msgid "An advanced shut down utility" +msgstr "高级关机工具" + #: ../menu-data/ksirk:kde4__ksirk.desktop.in.h:1 msgid "KsirK" msgstr "" @@ -10092,13 +10198,13 @@ msgstr "" #: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:1 -msgid "KSnapshot" -msgstr "KSnapshot" - -#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2 msgid "Screen Capture Program" msgstr "屏幕捕获程序" +#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2 +msgid "KSnapshot" +msgstr "KSnapshot" + #: ../menu-data/kspaceduel:kde4__kspaceduel.desktop.in.h:1 msgid "KSpaceDuel" msgstr "" @@ -10111,34 +10217,30 @@ msgid "KSpread" msgstr "KSpread" -#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2 -msgid "Write spreadsheet documents" -msgstr "编辑电子表格文档" - #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1 -msgid "Connect the dots to create squares" +msgid "KSquares" msgstr "" #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2 -msgid "KSquares" +msgid "Connect the dots to create squares" msgstr "" #: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1 -msgid "Enter passphrase to authenticate to the ssh agent" +msgid "SSH AskPass" msgstr "" #: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2 -msgid "SSH AskPass" +msgid "Enter passphrase to authenticate to the ssh agent" msgstr "" #: ../menu-data/kst:kst.desktop.in.h:1 -msgid "Data Viewer" -msgstr "" - -#: ../menu-data/kst:kst.desktop.in.h:2 msgid "Kst" msgstr "Kst" +#: ../menu-data/kst:kst.desktop.in.h:2 +msgid "Data Viewer" +msgstr "" + #: ../menu-data/kstars:kde4__kstars.desktop.in.h:1 msgid "Desktop Planetarium" msgstr "" @@ -10188,7 +10290,7 @@ msgstr "" #: ../menu-data/ktikz:kde4__ktikz.desktop.in.h:2 -#: ../menu-data/qtikz:qtikz.desktop.in.h:1 +#: ../menu-data/qtikz:qtikz.desktop.in.h:2 msgid "Program for creating TikZ (from the LaTeX pgf package) diagrams" msgstr "" @@ -10209,35 +10311,35 @@ msgstr "" #: ../menu-data/ktoon:ktoon.desktop.in.h:1 -msgid "Animation" -msgstr "" - -#: ../menu-data/ktoon:ktoon.desktop.in.h:2 msgid "KToon" msgstr "KToon" -#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1 -msgid "A BitTorrent program for KDE" -msgstr "KDE BitTorrent 程序" +#: ../menu-data/ktoon:ktoon.desktop.in.h:2 +msgid "Animation" +msgstr "" -#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2 +#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1 msgid "KTorrent" msgstr "KTorrent" +#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2 +msgid "A BitTorrent program for KDE" +msgstr "KDE BitTorrent 程序" + #: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1 -msgid "KTouch" +msgid "Touch Typing Tutor" msgstr "" #: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2 -msgid "Touch Typing Tutor" +msgid "KTouch" msgstr "" #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1 -msgid "KSnake" +msgid "Snake-like Game" msgstr "" #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2 -msgid "Snake-like Game" +msgid "KSnake" msgstr "" #: ../menu-data/ktron:kde4__ktron.desktop.in.h:1 @@ -10245,27 +10347,27 @@ msgstr "" #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:1 -msgid "Picture Game for Children" +msgid "Potato Guy" msgstr "" #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2 -msgid "Potato Guy" +msgid "Picture Game for Children" msgstr "" #: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1 -msgid "Educational Programming Environment" +msgid "KTurtle" msgstr "" #: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2 -msgid "KTurtle" +msgid "Educational Programming Environment" msgstr "" #: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1 -msgid "A 3-D game based on Rubik's Cube" +msgid "Kubrick" msgstr "" #: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2 -msgid "Kubrick" +msgid "A 3-D game based on Rubik's Cube" msgstr "" #: ../menu-data/kuiviewer:kde4__kuiviewer.desktop.in.h:1 @@ -10277,13 +10379,13 @@ msgstr "Qt 设计器用户界面文件查看器" #: ../menu-data/kupfer:kupfer.desktop.in.h:1 -msgid "Convenient command and access tool for applications and documents" -msgstr "方便的应用程序和文档命令和访问工具" - -#: ../menu-data/kupfer:kupfer.desktop.in.h:2 msgid "Kupfer" msgstr "Kupfer" +#: ../menu-data/kupfer:kupfer.desktop.in.h:2 +msgid "Convenient command and access tool for applications and documents" +msgstr "方便的应用程序和文档命令和访问工具" + #: ../menu-data/kuser:kde4__kuser.desktop.in.h:1 msgid "KUser" msgstr "KUser" @@ -10293,29 +10395,29 @@ msgstr "用户管理器" #: ../menu-data/kvirc:kvirc.desktop.in.h:1 -msgid "Connect to Internet Relay Chat" -msgstr "连接到互联网中继聊天(IRC)" - -#: ../menu-data/kvirc:kvirc.desktop.in.h:2 msgid "KVIrc" msgstr "" -#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1 -msgid "A virtual keyboard for KDE" -msgstr "KDE 虚拟键盘" +#: ../menu-data/kvirc:kvirc.desktop.in.h:2 +msgid "Connect to Internet Relay Chat" +msgstr "连接到互联网中继聊天(IRC)" -#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2 +#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1 msgid "Kvkbd" msgstr "Kvkbd" -#: ../menu-data/kvpm:kvpm.desktop.in.h:1 -msgid "KDE Volume Partition Manager" -msgstr "KDE 卷分区管理器" +#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2 +msgid "A virtual keyboard for KDE" +msgstr "KDE 虚拟键盘" -#: ../menu-data/kvpm:kvpm.desktop.in.h:2 +#: ../menu-data/kvpm:kvpm.desktop.in.h:1 msgid "KVPM" msgstr "KVPM" +#: ../menu-data/kvpm:kvpm.desktop.in.h:2 +msgid "KDE Volume Partition Manager" +msgstr "KDE 卷分区管理器" + #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:1 msgid "GUI for various VPN clients" msgstr "各种 VPN 客户端的图形用户界面" @@ -10333,13 +10435,13 @@ msgstr "钱包管理工具" #: ../menu-data/kwave:kde4__kwave.desktop.in.h:1 -msgid "A sound editor for KDE" -msgstr "KDE 声音编辑器" - -#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2 msgid "Kwave Sound Editor" msgstr "Kwave 声音编辑器" +#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2 +msgid "A sound editor for KDE" +msgstr "KDE 声音编辑器" + #: ../menu-data/kword:kde4__kword.desktop.in.h:1 msgid "KWord" msgstr "KWord" @@ -10356,16 +10458,16 @@ msgid "KWordQuiz" msgstr "" -#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1 +#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2 msgid "KWrite" msgstr "KWrite" #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:1 -msgid "Application for recording x11 windows" +msgid "kx11grab" msgstr "" #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:2 -msgid "kx11grab" +msgid "Application for recording x11 windows" msgstr "" #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:1 @@ -10377,11 +10479,11 @@ msgstr "" #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:1 -msgid "Control your L2TP IPsec VPN connections" +msgid "L2TP Ipsec VPN Applet" msgstr "" #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:2 -msgid "L2TP Ipsec VPN Applet" +msgid "Control your L2TP IPsec VPN connections" msgstr "" #: ../menu-data/laby:laby.desktop.in.h:1 @@ -10401,37 +10503,37 @@ msgstr "" #: ../menu-data/laditools:ladiconf.desktop.in.h:1 -msgid "JACK and LASH control application configuration" +msgid "Linux Audio Configuration" msgstr "" #: ../menu-data/laditools:ladiconf.desktop.in.h:2 -msgid "Linux Audio Configuration" +msgid "JACK and LASH control application configuration" msgstr "" #: ../menu-data/laditools:laditray.desktop.in.h:1 -msgid "JACK and LASH control tray application" +msgid "LADITray" msgstr "" #: ../menu-data/laditools:laditray.desktop.in.h:2 -msgid "LADITray" +msgid "JACK and LASH control tray application" msgstr "" #: ../menu-data/landell:landell.desktop.in.h:1 -msgid "Audio and video streams manager" +msgid "Landell" msgstr "" #: ../menu-data/landell:landell.desktop.in.h:2 -msgid "Landell" +msgid "Audio and video streams manager" msgstr "" #: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:1 -msgid "Configure multiple and native language support on your system" -msgstr "配置您系统上的多语言和本地语言支持" - -#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2 msgid "Language Support" msgstr "语言支持" +#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2 +msgid "Configure multiple and native language support on your system" +msgstr "配置您系统上的多语言和本地语言支持" + #: ../menu-data/lastfm:lastfm.desktop.in.h:1 msgid "Last.fm" msgstr "Last.fm" @@ -10449,72 +10551,72 @@ msgstr "管理基于 LDAP 的目录" #: ../menu-data/latexdraw:latexdraw.desktop.in.h:1 -msgid "Graphical editor for PSTricks" -msgstr "PSTricks 图形编辑器" - -#: ../menu-data/latexdraw:latexdraw.desktop.in.h:2 msgid "LaTeXDraw" msgstr "LaTeXDraw" -#: ../menu-data/latexila-data:latexila.desktop.in.h:1 -msgid "Edit LaTeX documents" -msgstr "" +#: ../menu-data/latexdraw:latexdraw.desktop.in.h:2 +msgid "Graphical editor for PSTricks" +msgstr "PSTricks 图形编辑器" -#: ../menu-data/latexila-data:latexila.desktop.in.h:2 +#: ../menu-data/latexila-data:latexila.desktop.in.h:1 msgid "LaTeXila" msgstr "LaTeXila" -#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:1 -msgid "Lazarus (0.9.30)" +#: ../menu-data/latexila-data:latexila.desktop.in.h:2 +msgid "Edit LaTeX documents" msgstr "" -#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:2 -msgid "Lazarus IDE (0.9.30)" +#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:1 +msgid "Lazarus (0.9.30.2)" msgstr "" -#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1 -msgid "A ball-and-paddle game with nice graphics." +#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:2 +msgid "Lazarus IDE (0.9.30.2)" msgstr "" -#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2 +#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1 msgid "LBreakout2" msgstr "LBreakout2" -#: ../menu-data/lcrt:lcrt.desktop.in.h:1 -msgid "lcrt" -msgstr "" +#: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2 +msgid "A ball-and-paddle game with nice graphics." +msgstr "" + +#: ../menu-data/lcrt:lcrt.desktop.in.h:1 +msgid "lcrt" +msgstr "" #: ../menu-data/leafpad:leafpad.desktop.in.h:1 msgid "Leafpad" msgstr "Leafpad" #: ../menu-data/lebiniou:lebiniou.desktop.in.h:1 -msgid "Displays images that evolve with sound" +msgid "Le Biniou" msgstr "" #: ../menu-data/lebiniou:lebiniou.desktop.in.h:2 -msgid "Le Biniou" +msgid "Displays images that evolve with sound" msgstr "" #: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:1 -#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1 -msgid "A Wordpress blog client" -msgstr "一个 Wordpress 博客客户端" - -#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2 msgid "Lekhonee Gnome" msgstr "" +#: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2 #: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2 +msgid "A Wordpress blog client" +msgstr "一个 Wordpress 博客客户端" + +#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1 msgid "Lekhonee" msgstr "Lekhonee" #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:1 -msgid "Lemon Point of sale" +msgid "lemon" msgstr "" #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:2 -msgid "lemon" +msgid "Lemon Point of sale" msgstr "" #: ../menu-data/lernid:lernid.desktop.in.h:1 @@ -10546,13 +10648,13 @@ msgstr "" #: ../menu-data/librecad:librecad.desktop.in.h:1 -msgid "A professional CAD System" -msgstr "一个专业的 CAD 系统" - -#: ../menu-data/librecad:librecad.desktop.in.h:2 msgid "LibreCAD" msgstr "" +#: ../menu-data/librecad:librecad.desktop.in.h:2 +msgid "A professional CAD System" +msgstr "一个专业的 CAD 系统" + #: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:1 msgid "LibreOffice Base" msgstr "LibreOffice 数据库" @@ -10563,22 +10665,14 @@ "information by using Base." msgstr "" -#: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:3 -msgid "New Database" -msgstr "" - #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:1 msgid "LibreOffice Calc" msgstr "LibreOffice 表格" #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:2 -msgid "New Spreadsheet" -msgstr "" - -#: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:3 msgid "" -"Perform calculation, analyze information and manage lists in spreadsheets by " -"using Calc." +"Perform calculations, analyze information and manage lists in spreadsheets " +"by using Calc." msgstr "" #: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:1 @@ -10592,84 +10686,76 @@ msgstr "" #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:1 -msgid "Create and edit drawings, flow charts, and logos by using Draw." -msgstr "" - -#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2 msgid "LibreOffice Draw" msgstr "LibreOffice 绘图" -#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:3 -msgid "New Drawing" +#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2 +msgid "Create and edit drawings, flow charts, and logos by using Draw." msgstr "" #: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1 -msgid "" -"Create and edit presentations for slideshows, meeting and Web pages by using " -"Impress." -msgstr "" - -#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2 msgid "LibreOffice Impress" msgstr "LibreOffice 演示" -#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:3 -msgid "New Presentation" +#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2 +msgid "" +"Create and edit presentations for slideshows, meeting and Web pages by using " +"Impress." msgstr "" #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:1 -msgid "Create and edit scientific formulas and equations by using Math." -msgstr "" - -#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2 msgid "LibreOffice Math" msgstr "LibreOffice 公式" -#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:3 -msgid "New Formula" +#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2 +msgid "Create and edit scientific formulas and equations by using Math." msgstr "" #: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1 -msgid "" -"Create and edit text and graphics in letters, reports, documents and Web " -"pages by using Writer." -msgstr "" - -#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2 msgid "LibreOffice Writer" msgstr "LibreOffice 文档" -#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:3 -msgid "New Document" +#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2 +msgid "" +"Create and edit text and graphics in letters, reports, documents and Web " +"pages by using Writer." msgstr "" -#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2 -#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2 +#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1 +#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1 msgid "Licq" msgstr "Licq" #: ../menu-data/lifeograph:lifeograph.desktop.in.h:1 -msgid "Keep a private journal of your life" +msgid "Lifeograph" msgstr "" #: ../menu-data/lifeograph:lifeograph.desktop.in.h:2 -msgid "Lifeograph" +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 订阅" -#: ../menu-data/liferea:liferea.desktop.in.h:2 -msgid "Liferea Feed Reader" -msgstr "Liferea Feed 阅读器" +#: ../menu-data/lightsoff:lightsoff.desktop.in.h:1 +msgid "Lights Off" +msgstr "关灯" + +#: ../menu-data/lightsoff:lightsoff.desktop.in.h:2 +msgid "Turn off all the lights" +msgstr "关掉所有的灯" #: ../menu-data/lightspark:lightspark.desktop.in.h:1 -msgid "An alternative flash player" +msgid "Lightspark" msgstr "" #: ../menu-data/lightspark:lightspark.desktop.in.h:2 -msgid "Lightspark" +msgid "An alternative flash player" msgstr "" #: ../menu-data/lightyears:lightyears.desktop.in.h:1 @@ -10701,13 +10787,13 @@ msgstr "" #: ../menu-data/lingot:lingot.desktop.in.h:1 -msgid "LINGOT Is Not a Guitar-Only Tuner" -msgstr "" - -#: ../menu-data/lingot:lingot.desktop.in.h:2 msgid "Lingot" msgstr "Lingot" +#: ../menu-data/lingot:lingot.desktop.in.h:2 +msgid "LINGOT Is Not a Guitar-Only Tuner" +msgstr "" + #: ../menu-data/links2:links2.desktop.in.h:1 msgid "Links 2" msgstr "Links 2" @@ -10724,7 +10810,7 @@ msgid "Linphone is a web-phone" msgstr "Linphone 是一个网络电话程序" -#: ../menu-data/linpsk:linpsk.desktop.in.h:2 +#: ../menu-data/linpsk:linpsk.desktop.in.h:1 msgid "Linpsk" msgstr "" @@ -10745,21 +10831,21 @@ msgstr "钢琴游戏" #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:1 -msgid "A file-sharing client for the Direct Connect network" +msgid "LinuxDC++" msgstr "" #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:2 -msgid "LinuxDC++" +msgid "A file-sharing client for the Direct Connect network" msgstr "" #: ../menu-data/liquidwar:liquidwar.desktop.in.h:1 -msgid "A unique multiplayer wargame" -msgstr "一个特别的多人战争游戏" - -#: ../menu-data/liquidwar:liquidwar.desktop.in.h:2 msgid "Liquid War" msgstr "" +#: ../menu-data/liquidwar:liquidwar.desktop.in.h:2 +msgid "A unique multiplayer wargame" +msgstr "一个特别的多人战争游戏" + #: ../menu-data/listen:listen.desktop.in.h:1 msgid "Listen Music Player" msgstr "Listen 音乐播放器" @@ -10769,29 +10855,29 @@ msgstr "聆听、浏览或编辑您的音乐收藏" #: ../menu-data/literki:literki.desktop.in.h:1 -msgid "Hacker's keyboard" -msgstr "黑客的键盘" - -#: ../menu-data/literki:literki.desktop.in.h:2 msgid "Literki" msgstr "Literki" -#: ../menu-data/littlewizard:littlewizard.desktop.in.h:1 -msgid "Development environment for children" -msgstr "针对儿童的开发环境" +#: ../menu-data/literki:literki.desktop.in.h:2 +msgid "Hacker's keyboard" +msgstr "黑客的键盘" -#: ../menu-data/littlewizard:littlewizard.desktop.in.h:2 +#: ../menu-data/littlewizard:littlewizard.desktop.in.h:1 msgid "Little Wizard" msgstr "" -#: ../menu-data/live-magic:live-magic.desktop.in.h:1 -msgid "Create Debian Live systems (LiveCDs, etc.)" -msgstr "创建 Debian 自启动系统(LiveCD 等等)" +#: ../menu-data/littlewizard:littlewizard.desktop.in.h:2 +msgid "Development environment for children" +msgstr "针对儿童的开发环境" -#: ../menu-data/live-magic:live-magic.desktop.in.h:2 +#: ../menu-data/live-magic:live-magic.desktop.in.h:1 msgid "Live Magic" msgstr "Live Magic" +#: ../menu-data/live-magic:live-magic.desktop.in.h:2 +msgid "Create Debian Live systems (LiveCDs, etc.)" +msgstr "创建 Debian 自启动系统(LiveCD 等等)" + #: ../menu-data/livemix:livemix.desktop.in.h:1 msgid "LiveMix - Live Mixer" msgstr "LiveMix - 实时混音器" @@ -10809,37 +10895,37 @@ msgstr "视频编辑 / VJ 工具" #: ../menu-data/ll-scope:ll-scope.desktop.in.h:1 -msgid "An oscilloscope DSSI plugin" +msgid "Oscilloscope" msgstr "" #: ../menu-data/ll-scope:ll-scope.desktop.in.h:2 -msgid "Oscilloscope" +msgid "An oscilloscope DSSI plugin" msgstr "" #: ../menu-data/lletters:lletters.desktop.in.h:1 -msgid "GTK letters-learning game for small children" +msgid "Linux Letters and Numbers" msgstr "" #: ../menu-data/lletters:lletters.desktop.in.h:2 -msgid "Linux Letters and Numbers" +msgid "GTK letters-learning game for small children" msgstr "" #: ../menu-data/llk-linux:llk_linux.desktop.in.h:1 -msgid "Gtk based LianLianKan Game." -msgstr "基于 GTK 的连连看游戏" - -#: ../menu-data/llk-linux:llk_linux.desktop.in.h:2 msgid "llk_linux" msgstr "llk_linux" -#: ../menu-data/lmarbles:lmarbles.desktop.in.h:1 -msgid "Build figures out of colored marbles" -msgstr "" +#: ../menu-data/llk-linux:llk_linux.desktop.in.h:2 +msgid "Gtk based LianLianKan Game." +msgstr "基于 GTK 的连连看游戏" -#: ../menu-data/lmarbles:lmarbles.desktop.in.h:2 +#: ../menu-data/lmarbles:lmarbles.desktop.in.h:1 msgid "LMarbles" msgstr "LMarbles" +#: ../menu-data/lmarbles:lmarbles.desktop.in.h:2 +msgid "Build figures out of colored marbles" +msgstr "" + #: ../menu-data/lmemory:lmemory.desktop.in.h:1 msgid "LMemory" msgstr "LMemory" @@ -10857,19 +10943,19 @@ msgstr "管理行程/网络日志" #: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:1 -msgid "Computer-Aided Translation System" -msgstr "计算机辅助的翻译系统" - -#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2 msgid "Lokalize" msgstr "Lokalize" +#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2 +msgid "Computer-Aided Translation System" +msgstr "计算机辅助的翻译系统" + #: ../menu-data/lombard:lombard.desktop.in.h:1 -msgid "Create and edit movies" +msgid "Lombard Video Editor" msgstr "" #: ../menu-data/lombard:lombard.desktop.in.h:2 -msgid "Lombard Video Editor" +msgid "Create and edit movies" msgstr "" #: ../menu-data/londonlaw:londonlaw.desktop.in.h:1 @@ -10889,45 +10975,45 @@ msgstr "" #: ../menu-data/loqui:loqui.desktop.in.h:1 -msgid "IRC client" +msgid "Loqui" msgstr "" #: ../menu-data/loqui:loqui.desktop.in.h:2 -msgid "Loqui" +msgid "IRC client" msgstr "" #: ../menu-data/lostirc:lostirc.desktop.in.h:1 -msgid "Chat on IRC-networks" -msgstr "在 IRC 网络上聊天" - -#: ../menu-data/lostirc:lostirc.desktop.in.h:2 msgid "LostIRC" msgstr "LostIRC" +#: ../menu-data/lostirc:lostirc.desktop.in.h:2 +msgid "Chat on IRC-networks" +msgstr "在 IRC 网络上聊天" + #: ../menu-data/lottanzb:lottanzb.desktop.in.h:1 -msgid "Download from the Usenet with the help of NZB files" +msgid "LottaNZB Usenet Downloader" msgstr "" #: ../menu-data/lottanzb:lottanzb.desktop.in.h:2 -msgid "LottaNZB Usenet Downloader" +msgid "Download from the Usenet with the help of NZB files" msgstr "" #: ../menu-data/love:love.desktop.in.h:1 -msgid "Games development framework in lua" +msgid "LÖVE" msgstr "" #: ../menu-data/love:love.desktop.in.h:2 -msgid "LÖVE" +msgid "Games development framework in lua" msgstr "" #: ../menu-data/lprof:lprof.desktop.in.h:1 -msgid "Hardware ICC Profiler" -msgstr "" - -#: ../menu-data/lprof:lprof.desktop.in.h:2 msgid "LProf" msgstr "LProf" +#: ../menu-data/lprof:lprof.desktop.in.h:2 +msgid "Hardware ICC Profiler" +msgstr "" + #: ../menu-data/lshw-gtk:lshw-gtk.desktop.in.h:1 msgid "Hardware Lister" msgstr "" @@ -10937,11 +11023,11 @@ msgstr "提供硬件信息" #: ../menu-data/lskat:kde4__lskat.desktop.in.h:1 -msgid "Card Game" +msgid "LSkat" msgstr "" #: ../menu-data/lskat:kde4__lskat.desktop.in.h:2 -msgid "LSkat" +msgid "Card Game" msgstr "" #: ../menu-data/ltris:ltris.desktop.in.h:1 @@ -10961,29 +11047,38 @@ msgstr "" #: ../menu-data/luakit:luakit.desktop.in.h:1 -msgid "Fast, small, webkit based micro-browser extensible by Lua" +msgid "Luakit" msgstr "" #: ../menu-data/luakit:luakit.desktop.in.h:2 -msgid "Luakit" +msgid "Fast, small, webkit based micro-browser extensible by Lua" msgstr "" -#: ../menu-data/luciole:luciole.desktop.in.h:1 -msgid "Image Per Image capture tool for making animation movies." +#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1 +msgid "Lubuntu Software Center" msgstr "" -#: ../menu-data/luciole:luciole.desktop.in.h:2 +#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:2 +#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2 +msgid "Lets you choose from thousands of applications available for Ubuntu" +msgstr "" + +#: ../menu-data/luciole:luciole.desktop.in.h:1 msgid "Luciole" msgstr "Luciole" -#: ../menu-data/luckybackup:luckybackup.desktop.in.h:1 -msgid "Backup & sync your data with the power of rsync" -msgstr "通过强大的 rsync 备份和同步您的数据" +#: ../menu-data/luciole:luciole.desktop.in.h:2 +msgid "Image Per Image capture tool for making animation movies." +msgstr "" -#: ../menu-data/luckybackup:luckybackup.desktop.in.h:2 +#: ../menu-data/luckybackup:luckybackup.desktop.in.h:1 msgid "luckyBackup" msgstr "luckyBackup" +#: ../menu-data/luckybackup:luckybackup.desktop.in.h:2 +msgid "Backup & sync your data with the power of rsync" +msgstr "通过强大的 rsync 备份和同步您的数据" + #: ../menu-data/lugaru:lugaru.desktop.in.h:1 msgid "Lugaru" msgstr "" @@ -11011,11 +11106,11 @@ msgstr "配置LDAP用户时修改密码的网页" #: ../menu-data/lxinput:lxinput.desktop.in.h:1 -msgid "Configure keyboard, mouse, and other input devices" +msgid "Keyboard and Mouse" msgstr "" #: ../menu-data/lxinput:lxinput.desktop.in.h:2 -msgid "Keyboard and Mouse" +msgid "Configure keyboard, mouse, and other input devices" msgstr "" #: ../menu-data/lxkeymap:lxkeymap.desktop.in.h:1 @@ -11027,13 +11122,13 @@ msgstr "" #: ../menu-data/lxtask:lxtask.desktop.in.h:1 -msgid "Manage running processes" -msgstr "管理运行的进程" - -#: ../menu-data/lxtask:lxtask.desktop.in.h:2 msgid "Task Manager" msgstr "任务管理器" +#: ../menu-data/lxtask:lxtask.desktop.in.h:2 +msgid "Manage running processes" +msgstr "管理运行的进程" + #: ../menu-data/lybniz:lybniz.desktop.in.h:1 msgid "Lybniz Graph Plotter" msgstr "" @@ -11051,13 +11146,13 @@ msgstr "" #: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:1 -msgid "Filtering of astronomical images" -msgstr "天文图片过滤器" - -#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2 msgid "Lynkeos Image Processor" msgstr "Lynkeos 图像处理器" +#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2 +msgid "Filtering of astronomical images" +msgstr "天文图片过滤器" + #: ../menu-data/lyricue:lyricue.desktop.in.h:1 msgid "Lyricue" msgstr "Lyricue" @@ -11075,11 +11170,11 @@ msgstr "" #: ../menu-data/madbomber:madbomber.desktop.in.h:1 -msgid "Catch the Bombs" +msgid "Mad Bomber" msgstr "" #: ../menu-data/madbomber:madbomber.desktop.in.h:2 -msgid "Mad Bomber" +msgid "Catch the Bombs" msgstr "" #: ../menu-data/maelstrom:maelstrom.desktop.in.h:1 @@ -11114,28 +11209,36 @@ msgid "Play classic Mahjong puzzle game" msgstr "" -#: ../menu-data/mail-notification:mail-notification.desktop.in.h:1 -msgid "Get notified when new mail arrives" +#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1 +msgid "Mahjongg" msgstr "" -#: ../menu-data/mail-notification:mail-notification.desktop.in.h:2 -msgid "Mail Notification" -msgstr "邮件通知" +#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2 +msgid "Disassemble a pile of tiles by removing matching pairs" +msgstr "" + +#: ../menu-data/mail-notification:mail-notification.desktop.in.h:1 +msgid "Mail Notification" +msgstr "邮件通知" + +#: ../menu-data/mail-notification:mail-notification.desktop.in.h:2 +msgid "Get notified when new mail arrives" +msgstr "" #: ../menu-data/mana:mana.desktop.in.h:1 -msgid "A 2D MMORPG client" +msgid "Mana" msgstr "" #: ../menu-data/mana:mana.desktop.in.h:2 -msgid "Mana" +msgid "A 2D MMORPG client" msgstr "" #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:1 -msgid "Mandebulber" +msgid "Visit 3D Fractal World" msgstr "" #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:2 -msgid "Visit 3D Fractal World" +msgid "Mandebulber" msgstr "" #: ../menu-data/mangler:mangler.desktop.in.h:1 @@ -11155,19 +11258,27 @@ msgstr "" #: ../menu-data/marble:kde4__marble.desktop.in.h:1 -msgid "Desktop Globe" +msgid "Marble" msgstr "" #: ../menu-data/marble:kde4__marble.desktop.in.h:2 -msgid "Marble" +msgid "Desktop 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/massxpert:massxpert.desktop.in.h:1 -msgid "Bio-polymer mass spectrometry software" +msgid "massXpert" msgstr "" #: ../menu-data/massxpert:massxpert.desktop.in.h:2 -msgid "massXpert" +msgid "Bio-polymer mass spectrometry software" msgstr "" #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1 @@ -11179,21 +11290,21 @@ msgstr "虚拟键盘" #: ../menu-data/mathomatic:mathomatic.desktop.in.h:1 -msgid "Do symbolic mathematics and quick calculations" +msgid "Mathomatic" msgstr "" #: ../menu-data/mathomatic:mathomatic.desktop.in.h:2 -msgid "Mathomatic" +msgid "Do symbolic mathematics and quick calculations" msgstr "" #: ../menu-data/mathwar:MathWar.desktop.in.h:1 -msgid "A simple math game for kids" -msgstr "面向儿童的简单数学游戏" - -#: ../menu-data/mathwar:MathWar.desktop.in.h:2 msgid "MathWar" msgstr "数学战争" +#: ../menu-data/mathwar:MathWar.desktop.in.h:2 +msgid "A simple math game for kids" +msgstr "面向儿童的简单数学游戏" + #: ../menu-data/matlab-support:matlab.desktop.in.h:1 msgid "MATLAB" msgstr "" @@ -11203,19 +11314,19 @@ msgstr "" #: ../menu-data/mc:mc.desktop.in.h:1 -msgid "File manager" +msgid "Midnight Commander" msgstr "" #: ../menu-data/mc:mc.desktop.in.h:2 -msgid "Midnight Commander" +msgid "File manager" msgstr "" #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:1 -msgid "Graphical front end for mCRL2 toolset" +msgid "mCRL2" msgstr "" #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:2 -msgid "mCRL2" +msgid "Graphical front end for mCRL2 toolset" msgstr "" #: ../menu-data/mcu8051ide:mcu8051ide.desktop.in.h:1 @@ -11235,12 +11346,20 @@ msgstr "查看和导出微软 Access 数据库" #: ../menu-data/me-tv:me-tv.desktop.in.h:1 +msgid "Me TV" +msgstr "Me TV" + +#: ../menu-data/me-tv:me-tv.desktop.in.h:2 msgid "A digital television (DVB) viewer for GNOME" msgstr "GNOME 下的数字电视(DVB)观看程序" -#: ../menu-data/me-tv:me-tv.desktop.in.h:2 -msgid "Me TV" -msgstr "Me TV" +#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:1 +msgid "MediaInfo" +msgstr "" + +#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:2 +msgid "Supplies technical and tag information about a video or audio file" +msgstr "" #: ../menu-data/mediathekview:mediathekview.desktop.in.h:1 msgid "MediathekView" @@ -11259,14 +11378,14 @@ msgstr "" #: ../menu-data/medit:medit.desktop.in.h:1 +msgid "medit" +msgstr "medit" + +#: ../menu-data/medit:medit.desktop.in.h:2 #: ../menu-data/nedit:nedit.desktop.in.h:2 msgid "Text editor" msgstr "文本编辑器" -#: ../menu-data/medit:medit.desktop.in.h:2 -msgid "medit" -msgstr "medit" - #: ../menu-data/mednafen:mednafen.desktop.in.h:1 msgid "Mednafen" msgstr "" @@ -11275,28 +11394,36 @@ msgid "Multi-system video game emulator" msgstr "" -#: ../menu-data/meld:meld.desktop.in.h:1 -msgid "Compare and merge your files" -msgstr "比较和合并您的文件" +#: ../menu-data/megaglest:megaglest.desktop.in.h:1 +msgid "A real time strategy game." +msgstr "" -#: ../menu-data/meld:meld.desktop.in.h:2 +#: ../menu-data/megaglest:megaglest.desktop.in.h:2 +msgid "MegaGlest" +msgstr "" + +#: ../menu-data/meld:meld.desktop.in.h:1 msgid "Meld Diff Viewer" msgstr "" +#: ../menu-data/meld:meld.desktop.in.h:2 +msgid "Compare and merge your files" +msgstr "比较和合并您的文件" + #: ../menu-data/melting-gui:melting-gui.desktop.in.h:1 -msgid "\"Computes the melting temperature for a nucleic acid duplex.\"" +msgid "Melting" msgstr "" #: ../menu-data/melting-gui:melting-gui.desktop.in.h:2 -msgid "Melting" +msgid "\"Computes the melting temperature for a nucleic acid duplex.\"" msgstr "" #: ../menu-data/memaker:memaker.desktop.in.h:1 -msgid "Builds avatars for all your applications." +msgid "MeMaker" msgstr "" #: ../menu-data/memaker:memaker.desktop.in.h:2 -msgid "MeMaker" +msgid "Builds avatars for all your applications." msgstr "" #: ../menu-data/meritous:meritous.desktop.in.h:1 @@ -11327,68 +11454,68 @@ msgid "Metacity" msgstr "" -#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2 +#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1 msgid "Meterbridge" msgstr "" #: ../menu-data/mgm:mgm.desktop.in.h:1 -msgid "A highly configurable, very gaudy system load meter" +msgid "MGM System Monitor" msgstr "" #: ../menu-data/mgm:mgm.desktop.in.h:2 -msgid "MGM System Monitor" +msgid "A highly configurable, very gaudy system load meter" msgstr "" #: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:1 -msgid "Record, play, edit and convert sound files" -msgstr "录制、播放、编辑和转换声音文件" - -#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2 msgid "mhWaveEdit" msgstr "mhWaveEdit" +#: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2 +msgid "Record, play, edit and convert sound files" +msgstr "录制、播放、编辑和转换声音文件" + #: ../menu-data/micropolis:micropolis.desktop.in.h:1 -msgid "A real-time city management simulator" +msgid "Micropolis" msgstr "" #: ../menu-data/micropolis:micropolis.desktop.in.h:2 -msgid "Micropolis" +msgid "A real-time city management simulator" msgstr "" #: ../menu-data/midori:midori-private.desktop.in.h:1 -msgid "Open a new private browsing window" +msgid "Midori Private Browsing" msgstr "" #: ../menu-data/midori:midori-private.desktop.in.h:2 -msgid "Private Browsing" +msgid "Open a new private browsing window" msgstr "" #: ../menu-data/midori:midori.desktop.in.h:1 -msgid "Lightweight web browser" -msgstr "轻量的网络浏览器" - -#: ../menu-data/midori:midori.desktop.in.h:2 msgid "Midori" msgstr "Midori" +#: ../menu-data/midori:midori.desktop.in.h:2 +msgid "Lightweight web browser" +msgstr "轻量的网络浏览器" + #: ../menu-data/midori:midori.desktop.in.h:3 -msgid "New P_rivate Browsing Window" +msgid "New _Tab" msgstr "" #: ../menu-data/midori:midori.desktop.in.h:4 -msgid "New _Tab" +msgid "New _Window" msgstr "" #: ../menu-data/midori:midori.desktop.in.h:5 -msgid "New _Window" +msgid "New P_rivate Browsing Window" msgstr "" #: ../menu-data/milkytracker:milkytracker.desktop.in.h:1 -msgid "Fasttracker 2 Clone" +msgid "MilkyTracker" msgstr "" #: ../menu-data/milkytracker:milkytracker.desktop.in.h:2 -msgid "MilkyTracker" +msgid "Fasttracker 2 Clone" msgstr "" #: ../menu-data/milkytracker:milkytracker.desktop.in.h:3 @@ -11396,17 +11523,29 @@ msgstr "" #: ../menu-data/minbar:minbar.desktop.in.h:1 -msgid "Islamic prayer times" +msgid "Minbar Prayer Times" msgstr "" #: ../menu-data/minbar:minbar.desktop.in.h:2 -msgid "Minbar Prayer Times" +msgid "Islamic prayer times" msgstr "" -#: ../menu-data/mines.app:Mines.desktop.in.h:1 +#: ../menu-data/mined:mined.desktop.in.h:1 +msgid "MinEd" +msgstr "" + +#: ../menu-data/mines.app:Mines.desktop.in.h:2 msgid "GNUstep minesweeper game" msgstr "GNUstep 扫雷游戏" +#: ../menu-data/minetest:minetest.desktop.in.h:1 +msgid "Minetest" +msgstr "" + +#: ../menu-data/minetest:minetest.desktop.in.h:2 +msgid "InfiniMiner/Minecraft-inspired open game world" +msgstr "" + #: ../menu-data/minirok:kde4__minirok.desktop.in.h:1 msgid "Minirok" msgstr "Minirok" @@ -11419,29 +11558,21 @@ msgid "Watch YouTube videos" msgstr "观看 YouTube 视频" -#: ../menu-data/minitunes:minitunes.desktop.in.h:1 -msgid "Minitunes" -msgstr "" - -#: ../menu-data/minitunes:minitunes.desktop.in.h:2 -msgid "Play your music collection" -msgstr "" - #: ../menu-data/mirage:mirage.desktop.in.h:1 -msgid "A fast GTK+ Image Viewer" -msgstr "一个快速的 GTK+ 图像查看器" - -#: ../menu-data/mirage:mirage.desktop.in.h:2 msgid "Mirage" msgstr "Mirage" +#: ../menu-data/mirage:mirage.desktop.in.h:2 +msgid "A fast GTK+ Image Viewer" +msgstr "一个快速的 GTK+ 图像查看器" + #: ../menu-data/miro:miro.desktop.in.h:1 -msgid "" -"Fully featured video and music player, podcast client, and bittorrent client" +msgid "Miro music and video player" msgstr "" #: ../menu-data/miro:miro.desktop.in.h:2 -msgid "Miro music and video player" +msgid "" +"Fully featured video and music player, podcast client, and bittorrent client" msgstr "" #: ../menu-data/mirrormagic:mirrormagic.desktop.in.h:1 @@ -11449,45 +11580,45 @@ msgstr "" #: ../menu-data/mistelix:mistelix.desktop.in.h:1 -msgid "Author DVDs and slideshows" +msgid "Mistelix" msgstr "" #: ../menu-data/mistelix:mistelix.desktop.in.h:2 -msgid "Mistelix" +msgid "Author DVDs and slideshows" msgstr "" #: ../menu-data/mixxx:mixxx.desktop.in.h:1 -msgid "A digital DJ interface" -msgstr "" - -#: ../menu-data/mixxx:mixxx.desktop.in.h:2 msgid "Mixxx" msgstr "Mixxx" +#: ../menu-data/mixxx:mixxx.desktop.in.h:2 +msgid "A digital DJ interface" +msgstr "" + #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:1 -msgid "Show information about MKV files" +msgid "mkvinfo" msgstr "" #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:2 -msgid "mkvinfo" +msgid "Show information about MKV files" msgstr "" #: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:1 -msgid "MKV files creator" -msgstr "MKV 文件创建程序" - -#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2 msgid "mkvmerge GUI" msgstr "" -#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1 -msgid "Graphical frontend for MLDonkey" -msgstr "MLDonkey 的图形前端" +#: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2 +msgid "MKV files creator" +msgstr "MKV 文件创建程序" -#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2 +#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1 msgid "MLDonkey" msgstr "MLDonkey" +#: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2 +msgid "Graphical frontend for MLDonkey" +msgstr "MLDonkey 的图形前端" + #: ../menu-data/mlterm-common:mlterm.desktop.in.h:1 msgid "Multilingual Terminal" msgstr "" @@ -11497,51 +11628,51 @@ msgstr "" #: ../menu-data/mm3d:mm3d.desktop.in.h:1 -msgid "Create and edit 3D models and animations" -msgstr "创建和编辑三维模型和动画" - -#: ../menu-data/mm3d:mm3d.desktop.in.h:2 msgid "Misfit Model 3D" msgstr "" +#: ../menu-data/mm3d:mm3d.desktop.in.h:2 +msgid "Create and edit 3D models and animations" +msgstr "创建和编辑三维模型和动画" + #: ../menu-data/mmass:mmass.desktop.in.h:1 -msgid "Mass spectrum viewer and data analysis proteomics tool" +msgid "mMass" msgstr "" #: ../menu-data/mmass:mmass.desktop.in.h:2 -msgid "mMass" +msgid "Mass spectrum viewer and data analysis proteomics tool" msgstr "" #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:1 -msgid "massively multiplayer pong game" +msgid "mmpong-gl" msgstr "" #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:2 -msgid "mmpong-gl" +msgid "massively multiplayer pong game" msgstr "" #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:1 -msgid "A flash card program to make your review process more efficient" +msgid "Mnemosyne" msgstr "" #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:2 -msgid "Mnemosyne" +msgid "A flash card program to make your review process more efficient" msgstr "" #: ../menu-data/model-builder:model-builder.desktop.in.h:1 -msgid "Graphical ODE simulator" +msgid "Model Builder" msgstr "" #: ../menu-data/model-builder:model-builder.desktop.in.h:2 -msgid "Model Builder" +msgid "Graphical ODE simulator" msgstr "" #: ../menu-data/mokomaze:mokomaze.desktop.in.h:1 -msgid "Ball-in-the-labyrinth game" +msgid "Mokomaze" msgstr "" #: ../menu-data/mokomaze:mokomaze.desktop.in.h:2 -msgid "Mokomaze" +msgid "Ball-in-the-labyrinth game" msgstr "" #: ../menu-data/monajat-applet:monajat.desktop.in.h:1 @@ -11561,11 +11692,11 @@ msgstr "" #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:1 -msgid "MkS IDE" +msgid "Monkey Studio IDE" msgstr "" #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:2 -msgid "Monkey Studio IDE" +msgid "MkS IDE" msgstr "" #: ../menu-data/mono-runtime:mono-runtime-terminal.desktop.in.h:1 @@ -11577,31 +11708,31 @@ msgstr "" #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:1 +msgid "gsharp" +msgstr "gsharp" + +#: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2 msgid "" "Write C# in an interactive shell, and inject your code into running Mono " "processes" msgstr "" -#: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2 -msgid "gsharp" -msgstr "gsharp" - #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:1 -msgid "Identify differences in the API exposed by mono library assemblies." +msgid "Mono IL Contrast" msgstr "" #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:2 -msgid "Mono IL Contrast" +msgid "Identify differences in the API exposed by mono library assemblies." msgstr "" #: ../menu-data/monodevelop:monodevelop.desktop.in.h:1 -msgid "Develop .NET applications in an Integrated Development Environment" -msgstr "在集成开发环境中开发 .NET 应用程序" - -#: ../menu-data/monodevelop:monodevelop.desktop.in.h:2 msgid "MonoDevelop" msgstr "MonoDevelop" +#: ../menu-data/monodevelop:monodevelop.desktop.in.h:2 +msgid "Develop .NET applications in an Integrated Development Environment" +msgstr "在集成开发环境中开发 .NET 应用程序" + #: ../menu-data/monodoc-browser:monodoc.desktop.in.h:1 msgid "Mono Documentation" msgstr "Mono 文档" @@ -11619,27 +11750,27 @@ msgstr "Monodoc 文档浏览器" #: ../menu-data/monster-masher:monster-masher.desktop.in.h:1 -msgid "Mash monsters and save the gnomes" +msgid "Monster Masher" msgstr "" #: ../menu-data/monster-masher:monster-masher.desktop.in.h:2 -msgid "Monster Masher" +msgid "Mash monsters and save the gnomes" msgstr "" #: ../menu-data/monsterz:monsterz.desktop.in.h:1 -msgid "Little arcade puzzle game, similar to the famous Bejeweled" +msgid "Monsterz" msgstr "" #: ../menu-data/monsterz:monsterz.desktop.in.h:2 -msgid "Monsterz" +msgid "Little arcade puzzle game, similar to the famous Bejeweled" msgstr "" #: ../menu-data/moon-lander:moon-lander.desktop.in.h:1 -msgid "Fun game based on the classic moon lander" +msgid "Moonlander" msgstr "" #: ../menu-data/moon-lander:moon-lander.desktop.in.h:2 -msgid "Moonlander" +msgid "Fun game based on the classic moon lander" msgstr "" #: ../menu-data/moovida:moovida.desktop.in.h:1 @@ -11651,13 +11782,13 @@ msgstr "遥控 TV 播放电影和音乐" #: ../menu-data/moserial:moserial.desktop.in.h:1 -msgid "A serial terminal optimized for logging and file capture" -msgstr "" - -#: ../menu-data/moserial:moserial.desktop.in.h:2 msgid "moserial Terminal" msgstr "moserial 终端" +#: ../menu-data/moserial:moserial.desktop.in.h:2 +msgid "A serial terminal optimized for logging and file capture" +msgstr "" + #: ../menu-data/mountmanager:mountmanager-gtk.desktop.in.h:1 #: ../menu-data/mountmanager:mountmanager-kde.desktop.in.h:1 msgid "MountManager" @@ -11674,15 +11805,15 @@ msgid "Mousepad" msgstr "Mousepad" -#: ../menu-data/mp3diags:mp3diags.desktop.in.h:1 -msgid "MP3 Diags" -msgstr "MP3 Diags" - #. DocPath= -#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3 +#: ../menu-data/mp3diags:mp3diags.desktop.in.h:2 msgid "MP3 Diags - diagnosis and repair tool" msgstr "MP3 Diags - 诊断和修复工具" +#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3 +msgid "MP3 Diags" +msgstr "MP3 Diags" + #: ../menu-data/mp3splt-gtk:mp3splt-gtk.desktop.in.h:1 msgid "Mp3splt-gtk audio splitter" msgstr "" @@ -11692,19 +11823,28 @@ msgstr "" #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:1 +msgid "MPDCon" +msgstr "MPDCon" + +#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2 msgid "GNUstep client for MPD" msgstr "GNUstep 的 MPD 客户端" -#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2 -msgid "MPDCon" -msgstr "MPDCon" +#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:1 +msgid "MPlayer Media Player" +msgstr "" + +#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2 +#: ../menu-data/totem:totem.desktop.in.h:2 +msgid "Play movies and songs" +msgstr "播放影片和歌曲" #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:1 -msgid "Manage your MPMan portable mp3 player" +msgid "Mplinuxman" msgstr "" #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:2 -msgid "Mplinuxman" +msgid "Manage your MPMan portable mp3 player" msgstr "" #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1 @@ -11716,11 +11856,11 @@ msgstr "" #: ../menu-data/mricron:mricron-npm.desktop.in.h:1 -msgid "NPM" +msgid "Non-parametric MRI Analysis" msgstr "" #: ../menu-data/mricron:mricron-npm.desktop.in.h:2 -msgid "Non-parametric MRI Analysis" +msgid "NPM" msgstr "" #: ../menu-data/mricron:mricron.desktop.in.h:1 @@ -11756,11 +11896,11 @@ msgstr "" #: ../menu-data/mu-cade:mu-cade.desktop.in.h:1 -msgid "Kenta Cho's Mu-cade" +msgid "Mu-cade" msgstr "" #: ../menu-data/mu-cade:mu-cade.desktop.in.h:2 -msgid "Mu-cade" +msgid "Kenta Cho's Mu-cade" msgstr "" #: ../menu-data/mudlet:mudlet.desktop.in.h:1 @@ -11780,11 +11920,11 @@ msgstr "MultiGet 下载程序" #: ../menu-data/mumble:mumble.desktop.in.h:1 -msgid "A low-latency, high quality voice chat program for gaming" +msgid "Mumble" msgstr "" #: ../menu-data/mumble:mumble.desktop.in.h:2 -msgid "Mumble" +msgid "A low-latency, high quality voice chat program for gaming" msgstr "" #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:1 @@ -11800,7 +11940,7 @@ msgstr "" #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2 -#: ../menu-data/update-manager:update-manager.desktop.in.h:2 +#: ../menu-data/update-manager:update-manager.desktop.in.h:1 msgid "Update Manager" msgstr "更新管理器" @@ -11829,36 +11969,44 @@ msgstr "" #: ../menu-data/muse:muse.desktop.in.h:1 -msgid "Midi Music Editor" +msgid "MusE" msgstr "" #: ../menu-data/muse:muse.desktop.in.h:2 -msgid "MusE" +msgid "Midi Music Editor" msgstr "" #: ../menu-data/museeq:museeq.desktop.in.h:1 -msgid "C++/QT3 Museek client" +msgid "Museeq" msgstr "" #: ../menu-data/museeq:museeq.desktop.in.h:2 -msgid "Museeq" +msgid "C++/QT3 Museek client" msgstr "" #: ../menu-data/musescore:mscore.desktop.in.h:1 -msgid "MuseScore" +msgid "WYSIWYG Music score typesetter" msgstr "" #: ../menu-data/musescore:mscore.desktop.in.h:2 -msgid "WYSIWYG Music score typesetter" +msgid "MuseScore" msgstr "" #: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:1 +msgid "Musetup-gtk" +msgstr "Musetup-gtk" + +#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2 msgid "Museek daemon configuration tool" msgstr "Museek 守护进程配置工具" -#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2 -msgid "Musetup-gtk" -msgstr "Musetup-gtk" +#: ../menu-data/musique:musique.desktop.in.h:1 +msgid "Musique" +msgstr "" + +#: ../menu-data/musique:musique.desktop.in.h:2 +msgid "Play your music collection" +msgstr "" #: ../menu-data/mutt:mutt.desktop.in.h:1 msgid "Simple text-based Mail User Agent" @@ -11873,11 +12021,11 @@ msgstr "" #: ../menu-data/mx44:mx44.desktop.in.h:1 -msgid "Polyphonic, multichannel midi realtime software synthesizer" +msgid "mx44" msgstr "" #: ../menu-data/mx44:mx44.desktop.in.h:2 -msgid "mx44" +msgid "Polyphonic, multichannel midi realtime software synthesizer" msgstr "" #: ../menu-data/mypaint:mypaint.desktop.in.h:1 @@ -11888,36 +12036,20 @@ msgid "Painting program for digital artists" msgstr "" -#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:1 -msgid "MySQL Administration Tool" -msgstr "MySQL 管理工具" - -#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:2 -msgid "MySQL Administrator" -msgstr "MySQL 管理员" - #: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:1 -msgid "GUI client for MySQL" -msgstr "MySQL 图形用户界面客户端" - -#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2 msgid "MySQL Navigator" msgstr "MySQL 浏览器" -#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:1 -msgid "MySQL Query Browser" -msgstr "MySQL 查询浏览器" - -#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:2 -msgid "MySQL Query Tool" -msgstr "MySQL 查询工具" +#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2 +msgid "GUI client for MySQL" +msgstr "MySQL 图形用户界面客户端" #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:1 -msgid "A video RSS grabber" +msgid "MythNetTV" msgstr "" #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:2 -msgid "MythNetTV" +msgid "A video RSS grabber" msgstr "" #: ../menu-data/mythtv-backend:mythtv-setup.desktop.in.h:1 @@ -11929,35 +12061,43 @@ msgstr "" #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:1 +msgid "MythTV Frontend" +msgstr "MythTV 前端" + +#: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2 msgid "A frontend for all content on a mythtv-backend" msgstr "" -#: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2 -msgid "MythTV Frontend" -msgstr "MythTV 前端" +#: ../menu-data/myunity:myunity.desktop.in.h:1 +msgid "MyUnity" +msgstr "" -#: ../menu-data/nagstamon:nagstamon.desktop.in.h:1 -msgid "Nagios status monitor " -msgstr "Nagios 状态监视器 " +#: ../menu-data/myunity:myunity.desktop.in.h:2 +msgid "Configuratore per Unity" +msgstr "" -#: ../menu-data/nagstamon:nagstamon.desktop.in.h:2 +#: ../menu-data/nagstamon:nagstamon.desktop.in.h:1 msgid "nagstamon" msgstr "nagstamon" +#: ../menu-data/nagstamon:nagstamon.desktop.in.h:2 +msgid "Nagios status monitor " +msgstr "Nagios 状态监视器 " + #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:1 -msgid "Nanny parental control admin console" +msgid "Parental Control" msgstr "" #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:2 -msgid "Parental Control" +msgid "Nanny parental control admin console" msgstr "" #: ../menu-data/nautilus-actions:nact.desktop.in.h:1 -msgid "Configure items to be added to the Nautilus context menus" +msgid "Nautilus-Actions Configuration Tool" msgstr "" #: ../menu-data/nautilus-actions:nact.desktop.in.h:2 -msgid "Nautilus-Actions Configuration Tool" +msgid "Configure items to be added to the Nautilus context menus" msgstr "" #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:1 @@ -11985,13 +12125,13 @@ msgstr "" #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:1 -msgid "Enable or disable Nautilus scripts" -msgstr "启用或禁用 Nautilus 脚本" - -#: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2 msgid "Nautilus scripts manager" msgstr "Nautilus 脚本管理器" +#: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2 +msgid "Enable or disable Nautilus scripts" +msgstr "启用或禁用 Nautilus 脚本" + #: ../menu-data/navit:navit.desktop.in.h:1 msgid "Navit" msgstr "" @@ -12041,21 +12181,21 @@ msgstr "" #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:1 -msgid "NCurses Music Player Client" -msgstr "NCurses 音乐播放器客户端" - -#: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2 msgid "Ncmpcpp" msgstr "Ncmpcpp" -#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1 -msgid "Ndiswrapper driver installation tool" -msgstr "Ndiswrapper 驱动程序安装工具" +#: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2 +msgid "NCurses Music Player Client" +msgstr "NCurses 音乐播放器客户端" -#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2 +#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1 msgid "Windows Wireless Drivers" msgstr "Windows 无线驱动程序" +#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2 +msgid "Ndiswrapper driver installation tool" +msgstr "Ndiswrapper 驱动程序安装工具" + #: ../menu-data/nedit:nedit.desktop.in.h:1 msgid "NEdit" msgstr "NEdit" @@ -12069,13 +12209,13 @@ msgstr "" #: ../menu-data/nemiver:nemiver.desktop.in.h:1 -msgid "Debug Applications" -msgstr "调试程序" - -#: ../menu-data/nemiver:nemiver.desktop.in.h:2 msgid "Nemiver C/C++ Debugger" msgstr "" +#: ../menu-data/nemiver:nemiver.desktop.in.h:2 +msgid "Debug Applications" +msgstr "调试程序" + #: ../menu-data/netapplet:netapplet.desktop.in.h:1 msgid "Network Selector" msgstr "网络选择器" @@ -12084,6 +12224,10 @@ msgid "Network Selector Panel Applet" msgstr "网络选择面板程序" +#: ../menu-data/netbeans:netbeans.desktop.in.h:1 +msgid "NetBeans IDE 7.0.1" +msgstr "" + #: ../menu-data/netemul:netemul.desktop.in.h:1 msgid "NetEmul" msgstr "NetEmul" @@ -12092,7 +12236,7 @@ msgid "The LAN network simulator" msgstr "局域网模拟器" -#: ../menu-data/netgen:netgen.desktop.in.h:2 +#: ../menu-data/netgen:netgen.desktop.in.h:1 msgid "Netgen Mesh Generator" msgstr "" @@ -12116,39 +12260,39 @@ msgid "Netrek" msgstr "Netrek" -#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2 +#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1 msgid "NetSurf Web Browser" msgstr "NetSurf 网络浏览器" -#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1 +#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2 msgid "Manage your network connections" msgstr "" #: ../menu-data/neverball:neverball.desktop.in.h:1 -msgid "A 3D arcade game with a ball" -msgstr "" - -#: ../menu-data/neverball:neverball.desktop.in.h:2 msgid "Neverball" msgstr "Neverball" -#: ../menu-data/neverputt:neverputt.desktop.in.h:1 -msgid "A 3D mini golf game" -msgstr "一个三维迷你高尔夫游戏" +#: ../menu-data/neverball:neverball.desktop.in.h:2 +msgid "A 3D arcade game with a ball" +msgstr "" -#: ../menu-data/neverputt:neverputt.desktop.in.h:2 +#: ../menu-data/neverputt:neverputt.desktop.in.h:1 msgid "Neverputt" msgstr "Neverputt" +#: ../menu-data/neverputt:neverputt.desktop.in.h:2 +msgid "A 3D mini golf game" +msgstr "一个三维迷你高尔夫游戏" + #: ../menu-data/nexuiz:nexuiz.desktop.in.h:1 +msgid "Nexuiz" +msgstr "Nexuiz" + +#: ../menu-data/nexuiz:nexuiz.desktop.in.h:2 msgid "" "A networked 3D first person shooter game with high-quality graphic effects" msgstr "" -#: ../menu-data/nexuiz:nexuiz.desktop.in.h:2 -msgid "Nexuiz" -msgstr "Nexuiz" - #: ../menu-data/nfoview:nfoview.desktop.in.h:1 msgid "NFO Viewer" msgstr "NFO 浏览器" @@ -12174,13 +12318,13 @@ msgstr "" #: ../menu-data/nip2:nip2.desktop.in.h:1 -msgid "Image manipulation program based on VIPS" -msgstr "" - -#: ../menu-data/nip2:nip2.desktop.in.h:2 msgid "nip2" msgstr "nip2" +#: ../menu-data/nip2:nip2.desktop.in.h:2 +msgid "Image manipulation program based on VIPS" +msgstr "" + #: ../menu-data/njam:njam.desktop.in.h:1 msgid "Njam" msgstr "Njam" @@ -12190,50 +12334,50 @@ msgstr "" #: ../menu-data/njplot:njplot.desktop.in.h:1 +msgid "NJplot" +msgstr "NJplot" + +#: ../menu-data/njplot:njplot.desktop.in.h:2 msgid "" "Displays, modifies and exports in PostScript format phylogenetic trees" msgstr "" -#: ../menu-data/njplot:njplot.desktop.in.h:2 -msgid "NJplot" -msgstr "NJplot" - #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1 -msgid "Is a Qt4 interface for nmap scanner" -msgstr "Nmap 扫描仪的 Qt4 界面" - -#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2 msgid "NmapSI4 - User mode" msgstr "NmapSI4 - 用户模式" -#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1 -msgid "An Abstract Shooter by Kenta Cho" -msgstr "" +#: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2 +msgid "Is a Qt4 interface for nmap scanner" +msgstr "Nmap 扫描仪的 Qt4 界面" -#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2 +#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1 msgid "Noiz2sa" msgstr "Noiz2sa" +#: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2 +msgid "An Abstract Shooter by Kenta Cho" +msgstr "" + #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:1 -msgid "Display notifications" +msgid "Notification Daemon" msgstr "" #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:2 -msgid "Notification Daemon" +msgid "Display notifications" msgstr "" -#: ../menu-data/nted:nted.desktop.in.h:2 +#: ../menu-data/nted:nted.desktop.in.h:1 msgid "NtEd" msgstr "NtEd" #: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:1 -msgid "Enable/disable write support for NTFS with a simple click." -msgstr "点击将启用/禁用 NTFS 写入支持。" - -#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2 msgid "NTFS Configuration Tool" msgstr "NTFS 写入支持配置程序" +#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2 +msgid "Enable/disable write support for NTFS with a simple click." +msgstr "点击将启用/禁用 NTFS 写入支持。" + #: ../menu-data/nuapplet:nuapplet2.desktop.in.h:1 msgid "NuApplet" msgstr "NuApplet" @@ -12258,46 +12402,64 @@ msgid "Network UPS Tools GUI client" msgstr "" -#: ../menu-data/nvtv:nvtv.desktop.in.h:1 -msgid "Control the TV output of NVidia video cards" -msgstr "控制 NVidia 显卡的电视输出" +#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:1 +msgid "NVCLOCK" +msgstr "" -#: ../menu-data/nvtv:nvtv.desktop.in.h:2 +#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:2 +msgid "Overclock and Monitor NVIDIA cards" +msgstr "" + +#: ../menu-data/nvtv:nvtv.desktop.in.h:1 msgid "Nvtv TV Out" msgstr "Nvtv 电视输出" -#: ../menu-data/nzb:nzb.desktop.in.h:1 -msgid "Grab nzb files" -msgstr "" +#: ../menu-data/nvtv:nvtv.desktop.in.h:2 +msgid "Control the TV output of NVidia video cards" +msgstr "控制 NVidia 显卡的电视输出" -#: ../menu-data/nzb:nzb.desktop.in.h:2 +#: ../menu-data/nzb:nzb.desktop.in.h:1 msgid "Nzb" msgstr "Nzb" -#: ../menu-data/obconf:obconf.desktop.in.h:1 -msgid "Configure and personalize the Openbox window manager" -msgstr "配置和个性化 Openbox 窗口管理器" +#: ../menu-data/nzb:nzb.desktop.in.h:2 +msgid "Grab nzb files" +msgstr "" -#: ../menu-data/obconf:obconf.desktop.in.h:2 +#: ../menu-data/obconf:obconf.desktop.in.h:1 msgid "Openbox Configuration Manager" msgstr "Openbox 配置管理器" -#: ../menu-data/obextool:obextool.desktop.in.h:1 -msgid "A GUI for bluetooth transfers" -msgstr "蓝牙传输的一个 GUI" +#: ../menu-data/obconf:obconf.desktop.in.h:2 +msgid "Configure and personalize the Openbox window manager" +msgstr "配置和个性化 Openbox 窗口管理器" -#: ../menu-data/obextool:obextool.desktop.in.h:2 +#: ../menu-data/obextool:obextool.desktop.in.h:1 msgid "ObexTool" msgstr "ObexTool" -#: ../menu-data/objcryst-fox:fox.desktop.in.h:1 -msgid "Crystal structure determination" -msgstr "晶体结构测定" +#: ../menu-data/obextool:obextool.desktop.in.h:2 +msgid "A GUI for bluetooth transfers" +msgstr "蓝牙传输的一个 GUI" -#: ../menu-data/objcryst-fox:fox.desktop.in.h:2 +#: ../menu-data/objcryst-fox:fox.desktop.in.h:1 msgid "Fox" msgstr "Fox" +#: ../menu-data/objcryst-fox:fox.desktop.in.h:2 +msgid "Crystal structure determination" +msgstr "晶体结构测定" + +#: ../menu-data/oce-draw:oce-draw.desktop.in.h:1 +#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1 +msgid "OpenCASCADE" +msgstr "" + +#: ../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 "" + #: ../menu-data/ocrfeeder:ocrfeeder.desktop.in.h:1 msgid "OCRFeeder" msgstr "OCRFeeder" @@ -12315,79 +12477,83 @@ msgstr "使用 GNU Octave 进行科学计算" #: ../menu-data/oggconvert:oggconvert.desktop.in.h:1 -msgid "Convert media files to Free formats" -msgstr "转换媒体文件到自由格式" - -#: ../menu-data/oggconvert:oggconvert.desktop.in.h:2 msgid "OggConvert" msgstr "OggConvert" -#: ../menu-data/ogmrip:ogmrip.desktop.in.h:1 -msgid "A DVD encoder" -msgstr "一个 DVD 编码器" +#: ../menu-data/oggconvert:oggconvert.desktop.in.h:2 +msgid "Convert media files to Free formats" +msgstr "转换媒体文件到自由格式" -#: ../menu-data/ogmrip:ogmrip.desktop.in.h:2 +#: ../menu-data/ogmrip:ogmrip.desktop.in.h:1 msgid "DVD Encoder OGMRip" msgstr "DVD 编码器 OGMRip" +#: ../menu-data/ogmrip:ogmrip.desktop.in.h:2 +msgid "A DVD encoder" +msgstr "一个 DVD 编码器" + #: ../menu-data/okteta:kde4__okteta.desktop.in.h:1 +msgid "Okteta" +msgstr "Okteta" + +#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2 msgid "Hex Editor" msgstr "十六进制编辑器" -#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2 -msgid "Okteta" -msgstr "Okteta" +#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:1 +msgid "okular" +msgstr "" #: ../menu-data/omaque:kde4__omaque.desktop.in.h:1 msgid "Omaque" msgstr "" #: ../menu-data/omegat:omegat.desktop.in.h:1 -msgid "Computer-Assisted Translation tool" -msgstr "计算机辅助翻译工具" - -#: ../menu-data/omegat:omegat.desktop.in.h:2 msgid "OmegaT" msgstr "OmegaT" -#: ../menu-data/onboard:onboard.desktop.in.h:1 -msgid "Flexible onscreen keyboard for GNOME" -msgstr "灵活的 GNOME 屏幕键盘" +#: ../menu-data/omegat:omegat.desktop.in.h:2 +msgid "Computer-Assisted Translation tool" +msgstr "计算机辅助翻译工具" -#: ../menu-data/onboard:onboard.desktop.in.h:2 +#: ../menu-data/onboard:onboard.desktop.in.h:1 msgid "Onboard" msgstr "" +#: ../menu-data/onboard:onboard.desktop.in.h:2 +msgid "Flexible onscreen keyboard for GNOME" +msgstr "灵活的 GNOME 屏幕键盘" + #: ../menu-data/oneisenough:oneisenough.desktop.in.h:1 -msgid "2D platform game about communist and capitalist balls" +msgid "One Is Enough" msgstr "" #: ../menu-data/oneisenough:oneisenough.desktop.in.h:2 -msgid "One Is Enough" +msgid "2D platform game about communist and capitalist balls" msgstr "" #: ../menu-data/ontv:ontv.desktop.in.h:1 -msgid "Monitor TV programs" +msgid "OnTV" msgstr "" #: ../menu-data/ontv:ontv.desktop.in.h:2 -msgid "OnTV" +msgid "Monitor TV programs" msgstr "" #: ../menu-data/oolite:oolite.desktop.in.h:1 -msgid "An OpenGL Elite-like space game" -msgstr "" - -#: ../menu-data/oolite:oolite.desktop.in.h:2 msgid "Oolite" msgstr "Oolite" +#: ../menu-data/oolite:oolite.desktop.in.h:2 +msgid "An OpenGL Elite-like space game" +msgstr "" + #: ../menu-data/open-axiom:open-axiom.desktop.in.h:1 -msgid "Open scientific computation platform" +msgid "OpenAxiom" msgstr "" #: ../menu-data/open-axiom:open-axiom.desktop.in.h:2 -msgid "OpenAxiom" +msgid "Open scientific computation platform" msgstr "" #: ../menu-data/open-invaders:open-invaders.desktop.in.h:1 @@ -12399,29 +12565,29 @@ msgstr "" #: ../menu-data/openarena:openarena.desktop.in.h:1 +msgid "OpenArena" +msgstr "OpenArena" + +#: ../menu-data/openarena:openarena.desktop.in.h:2 msgid "" "A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake " "III Arena" msgstr "" -#: ../menu-data/openarena:openarena.desktop.in.h:2 -msgid "OpenArena" -msgstr "OpenArena" - #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:1 -msgid "Logs GSM and GPS and uploads to openBmap." +msgid "OBM" msgstr "" #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:2 -msgid "OBM" +msgid "Logs GSM and GPS and uploads to openBmap." msgstr "" #: ../menu-data/openbox:openbox.desktop.in.h:1 -msgid "Log in using the Openbox window manager (without a session manager)" +msgid "Openbox" msgstr "" #: ../menu-data/openbox:openbox.desktop.in.h:2 -msgid "Openbox" +msgid "Log in using the Openbox window manager (without a session manager)" msgstr "" #: ../menu-data/openbve:openbve.desktop.in.h:1 @@ -12432,14 +12598,6 @@ msgid "Train/railway simulator compatible with 'BVE Trainsim' routes" msgstr "" -#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1 -msgid "OpenCASCADE" -msgstr "" - -#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2 -msgid "OpenCASCADE DRAWEXE test harness" -msgstr "" - #: ../menu-data/opencity:opencity.desktop.in.h:1 msgid "OpenCity" msgstr "" @@ -12465,11 +12623,11 @@ msgstr "在本地或互联网词典中查找词语 " #: ../menu-data/openfetion:openfetion.desktop.in.h:1 -msgid "Fetion For Linux" +msgid "OpenFetion" msgstr "" #: ../menu-data/openfetion:openfetion.desktop.in.h:2 -msgid "OpenFetion" +msgid "Fetion For Linux" msgstr "" #: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1 @@ -12481,61 +12639,61 @@ msgstr "" #: ../menu-data/openrocket:openrocket.desktop.in.h:1 -msgid "Design and simulate model rockets" +msgid "OpenRocket" msgstr "" #: ../menu-data/openrocket:openrocket.desktop.in.h:2 -msgid "OpenRocket" +msgid "Design and simulate model rockets" msgstr "" #: ../menu-data/openshot:openshot.desktop.in.h:1 -msgid "Create and edit videos and movies" -msgstr "创建和编辑视频和影片" - -#: ../menu-data/openshot:openshot.desktop.in.h:2 msgid "OpenShot Video Editor" msgstr "OpenShot 视频编辑器" +#: ../menu-data/openshot:openshot.desktop.in.h:2 +msgid "Create and edit videos and movies" +msgstr "创建和编辑视频和影片" + #: ../menu-data/openstv:openstv.desktop.in.h:1 -msgid "Conduct a Single Transferable Vote election" +msgid "OpenSTV Voting Software" msgstr "" #: ../menu-data/openstv:openstv.desktop.in.h:2 -msgid "OpenSTV Voting Software" +msgid "Conduct a Single Transferable Vote election" msgstr "" #: ../menu-data/openteacher:openteacher.desktop.in.h:1 -msgid "Learn words in a foreign language." +msgid "OpenTeacher" msgstr "" #: ../menu-data/openteacher:openteacher.desktop.in.h:2 -msgid "OpenTeacher" +msgid "Learn words in a foreign language." msgstr "" #: ../menu-data/openttd:openttd.desktop.in.h:1 -msgid "A clone of Transport Tycoon Deluxe" +msgid "OpenTTD" msgstr "" #: ../menu-data/openttd:openttd.desktop.in.h:2 -msgid "OpenTTD" +msgid "A clone of Transport Tycoon Deluxe" msgstr "" #: ../menu-data/openuniverse:openuniverse.desktop.in.h:1 -msgid "Explore the solar system in this accurate simulation" -msgstr "在这个精确的仿真程序中探索太阳系" - -#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2 msgid "OpenUniverse Space Simulator" msgstr "OpenUniverse 太空模拟器" -#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1 -msgid "GTK+-2 Client for OpenVAS Security Scanner" -msgstr "OpenVAS 安全扫描器的 GTK+-2 客户端" +#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2 +msgid "Explore the solar system in this accurate simulation" +msgstr "在这个精确的仿真程序中探索太阳系" -#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2 +#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1 msgid "OpenVAS-Client" msgstr "OpenVAS客户端" +#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2 +msgid "GTK+-2 Client for OpenVAS Security Scanner" +msgstr "OpenVAS 安全扫描器的 GTK+-2 客户端" + #: ../menu-data/openwalnut-qt4:openwalnut.desktop.in.h:1 msgid "OpenWalnut" msgstr "" @@ -12549,11 +12707,11 @@ msgstr "" #: ../menu-data/optgeo:optgeo.desktop.in.h:1 -msgid "Interactive tool to study and simulate optic assemblies" +msgid "OptGeo" msgstr "" #: ../menu-data/optgeo:optgeo.desktop.in.h:2 -msgid "OptGeo" +msgid "Interactive tool to study and simulate optic assemblies" msgstr "" #: ../menu-data/orage:globaltime.desktop.in.h:1 @@ -12565,13 +12723,13 @@ msgstr "" #: ../menu-data/orage:xfcalendar.desktop.in.h:1 -msgid "Desktop calendar" -msgstr "桌面日历" - -#: ../menu-data/orage:xfcalendar.desktop.in.h:2 msgid "Orage Calendar" msgstr "" +#: ../menu-data/orage:xfcalendar.desktop.in.h:2 +msgid "Desktop calendar" +msgstr "桌面日历" + #: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:1 msgid "Orage preferences" msgstr "" @@ -12581,11 +12739,11 @@ msgstr "" #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:1 -msgid "Anti-terrorist Satellite Sniping Game" +msgid "Orbital Eunuchs Sniper" msgstr "" #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:2 -msgid "Orbital Eunuchs Sniper" +msgid "Anti-terrorist Satellite Sniping Game" msgstr "" #: ../menu-data/oregano:oregano.desktop.in.h:1 @@ -12605,19 +12763,19 @@ msgstr "" #: ../menu-data/othman:Othman.desktop.in.h:1 -msgid "Electronic Mus-haf" -msgstr "电子版古兰经" - -#: ../menu-data/othman:Othman.desktop.in.h:2 msgid "Othman Quran Browser" msgstr "Othman Quran 浏览器" +#: ../menu-data/othman:Othman.desktop.in.h:2 +msgid "Electronic Mus-haf" +msgstr "电子版古兰经" + #: ../menu-data/out-of-order:out-of-order.desktop.in.h:1 -msgid "Adventure Game" +msgid "Out Of Order" msgstr "" #: ../menu-data/out-of-order:out-of-order.desktop.in.h:2 -msgid "Out Of Order" +msgid "Adventure Game" msgstr "" #: ../menu-data/overgod:overgod.desktop.in.h:1 @@ -12638,11 +12796,11 @@ msgstr "" #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:1 -msgid "Pacemaker CRM GUI" +msgid "Pacemaker GUI" msgstr "" #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:2 -msgid "Pacemaker GUI" +msgid "Pacemaker CRM GUI" msgstr "" #: ../menu-data/packagesearch:packagesearch.desktop.in.h:1 @@ -12662,13 +12820,13 @@ msgstr "" #: ../menu-data/pacman:pacman.desktop.in.h:1 -msgid "A simple clone of the classic arcade game" -msgstr "" - -#: ../menu-data/pacman:pacman.desktop.in.h:2 msgid "Pacman" msgstr "Pacman" +#: ../menu-data/pacman:pacman.desktop.in.h:2 +msgid "A simple clone of the classic arcade game" +msgstr "" + #: ../menu-data/padre:padre.desktop.in.h:1 msgid "Padre" msgstr "" @@ -12686,26 +12844,26 @@ msgstr "" #: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:1 -msgid "Jigsaw puzzle game" -msgstr "" - -#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2 msgid "Palapeli" msgstr "Palapeli" -#: ../menu-data/paman:paman.desktop.in.h:1 -msgid "Manage your PulseAudio sound server" -msgstr "管理您的 PulseAudio 声音服务器" +#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2 +msgid "Jigsaw puzzle game" +msgstr "" -#: ../menu-data/paman:paman.desktop.in.h:2 +#: ../menu-data/paman:paman.desktop.in.h:1 msgid "PulseAudio Manager" msgstr "PulseAudio 管理器" +#: ../menu-data/paman:paman.desktop.in.h:2 +msgid "Manage your PulseAudio sound server" +msgstr "管理您的 PulseAudio 声音服务器" + #: ../menu-data/pan:pan.desktop.in.h:1 msgid "Pan Newsreader" msgstr "Pan 新闻阅读器" -#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:1 +#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2 msgid "Read News from Usenet" msgstr "从 Usenet 读取新闻" @@ -12733,7 +12891,7 @@ msgid "ParaView allows viewing of large data sets" msgstr "" -#: ../menu-data/parcellite:parcellite.desktop.in.h:2 +#: ../menu-data/parcellite:parcellite.desktop.in.h:1 msgid "Parcellite" msgstr "Parcellite" @@ -12750,13 +12908,13 @@ msgstr "" #: ../menu-data/parsec47:parsec47.desktop.in.h:1 -msgid "Kenta Cho's PARSEC47" -msgstr "" - -#: ../menu-data/parsec47:parsec47.desktop.in.h:2 msgid "PARSEC47" msgstr "PARSEC47" +#: ../menu-data/parsec47:parsec47.desktop.in.h:2 +msgid "Kenta Cho's PARSEC47" +msgstr "" + #: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:1 msgid "KDE Partition Manager" msgstr "KDE 分区管理器" @@ -12765,6 +12923,14 @@ msgid "Manage disks, partitions and file systems" msgstr "管理磁盘、分区和文件系统" +#: ../menu-data/pasaffe:pasaffe.desktop.in.h:1 +msgid "Pasaffe" +msgstr "" + +#: ../menu-data/pasaffe:pasaffe.desktop.in.h:2 +msgid "Pasaffe password manager" +msgstr "" + #: ../menu-data/passage:passage.desktop.in.h:1 msgid "Passage" msgstr "Passage" @@ -12782,22 +12948,22 @@ msgstr "一个密码管理器" #: ../menu-data/patchage:patchage.desktop.in.h:1 +msgid "Patchage" +msgstr "Patchage" + +#: ../menu-data/patchage:patchage.desktop.in.h:2 msgid "" "Connect audio and MIDI applications together and manage audio sessions" msgstr "将音频和 MIDI 应用程序连接到一起并管理音频会话" -#: ../menu-data/patchage:patchage.desktop.in.h:2 -msgid "Patchage" -msgstr "Patchage" - #: ../menu-data/pathogen:pathogen.desktop.in.h:1 -msgid "Destroy the pathogens" -msgstr "" - -#: ../menu-data/pathogen:pathogen.desktop.in.h:2 msgid "Pathogen" msgstr "Pathogen" +#: ../menu-data/pathogen:pathogen.desktop.in.h:2 +msgid "Destroy the pathogens" +msgstr "" + #: ../menu-data/pathological:pathological.desktop.in.h:1 msgid "Pathological" msgstr "Pathological" @@ -12807,35 +12973,35 @@ msgstr "" #: ../menu-data/pauker:pauker.desktop.in.h:1 -msgid "Generic card based learning program" -msgstr "" - -#: ../menu-data/pauker:pauker.desktop.in.h:2 msgid "Pauker" msgstr "Pauker" -#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1 -msgid "Adjust the volume level" -msgstr "调整音量" +#: ../menu-data/pauker:pauker.desktop.in.h:2 +msgid "Generic card based learning program" +msgstr "" -#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2 +#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1 msgid "PulseAudio Volume Control" msgstr "PulseAudio 音量控制" -#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1 -msgid "Monitor the output volume" -msgstr "监视输出音量" +#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2 +msgid "Adjust the volume level" +msgstr "调整音量" -#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2 +#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1 msgid "PulseAudio Volume Meter (Playback)" msgstr "PulseAudio 音量测量器 (回放)" +#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2 +msgid "Monitor the output volume" +msgstr "监视输出音量" + #: ../menu-data/paw++:paw++.desktop.in.h:1 -msgid "Analyze and graphically present experimental data" +msgid "Paw++ (Physics Analysis Workstation)" msgstr "" #: ../menu-data/paw++:paw++.desktop.in.h:2 -msgid "Paw++ (Physics Analysis Workstation)" +msgid "Analyze and graphically present experimental data" msgstr "" #: ../menu-data/pcalendar:pcalendar.desktop.in.h:1 @@ -12848,14 +13014,14 @@ msgstr "" #: ../menu-data/pcb-common:pcb.desktop.in.h:1 -msgid "Create and edit printed circuit board designs" -msgstr "创建和编辑印刷电路板设计" - -#: ../menu-data/pcb-common:pcb.desktop.in.h:2 msgid "PCB Designer" msgstr "PCB 设计器" -#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1 +#: ../menu-data/pcb-common:pcb.desktop.in.h:2 +msgid "Create and edit printed circuit board designs" +msgstr "创建和编辑印刷电路板设计" + +#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2 msgid "Browse the file system and manage the files" msgstr "浏览文件系统并管理文件" @@ -12883,14 +13049,22 @@ msgid "Sony PlayStation emulator" msgstr "" -#: ../menu-data/pdfchain:pdfchain.desktop.in.h:1 -msgid "GUI for PDFTK - A graphical tool for manipulating PDF" -msgstr "PDFTK 的图形用户界面 - 一个修改 PDF 的图形工具" +#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:1 +msgid "PDF Presenter Console" +msgstr "" -#: ../menu-data/pdfchain:pdfchain.desktop.in.h:2 +#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:2 +msgid "Presentation program for PDF files" +msgstr "" + +#: ../menu-data/pdfchain:pdfchain.desktop.in.h:1 msgid "PDF Chain" msgstr "PDF Chain" +#: ../menu-data/pdfchain:pdfchain.desktop.in.h:2 +msgid "GUI for the PDFTK - A graphical tool for manipulating PDF" +msgstr "" + #: ../menu-data/pdfedit:pdfedit.desktop.in.h:1 msgid "PDF Editor" msgstr "PDF 编辑器" @@ -12904,29 +13078,29 @@ msgstr "移除、提取和旋转 PDF 文档中的页面" #: ../menu-data/pdfsam:pdfsam.desktop.in.h:1 -msgid "A tool to split and merge pdf documents" -msgstr "一个分割和合并 PDF 文档的工具" - -#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2 msgid "pdfsam" msgstr "pdfsam" -#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1 -msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping" -msgstr "PDF 合并、重组、分割、旋转和剪切" +#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2 +msgid "A tool to split and merge pdf documents" +msgstr "一个分割和合并 PDF 文档的工具" -#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2 +#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1 msgid "PDF-Shuffler" msgstr "PDF-Shuffler" -#: ../menu-data/peg-e:peg-e.desktop.in.h:1 -msgid "Peg elimination game" -msgstr "" +#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2 +msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping" +msgstr "PDF 合并、重组、分割、旋转和剪切" -#: ../menu-data/peg-e:peg-e.desktop.in.h:2 +#: ../menu-data/peg-e:peg-e.desktop.in.h:1 msgid "Peg-E" msgstr "Peg-E" +#: ../menu-data/peg-e:peg-e.desktop.in.h:2 +msgid "Peg elimination game" +msgstr "" + #: ../menu-data/peg-solitaire:peg-solitaire.desktop.in.h:1 msgid "Peg-Solitaire" msgstr "" @@ -12940,86 +13114,86 @@ msgstr "" #: ../menu-data/pencil:pencil.desktop.in.h:1 -msgid "Draw cartoons" -msgstr "绘制卡通" - -#: ../menu-data/pencil:pencil.desktop.in.h:2 msgid "Pencil" msgstr "" +#: ../menu-data/pencil:pencil.desktop.in.h:2 +msgid "Draw cartoons" +msgstr "绘制卡通" + #: ../menu-data/penguin-command:penguin-command.desktop.in.h:1 -msgid "A Missile Command clone" +msgid "Penguin Command" msgstr "" #: ../menu-data/penguin-command:penguin-command.desktop.in.h:2 -msgid "Penguin Command" +msgid "A Missile Command clone" msgstr "" #: ../menu-data/penguintv:penguintv.desktop.in.h:1 -msgid "Aggregates rss feeds, podcasts, and video blogs" -msgstr "" - -#: ../menu-data/penguintv:penguintv.desktop.in.h:2 msgid "PenguinTV Media Aggregator" msgstr "PenguinTV 媒体聚合器" -#: ../menu-data/pente:pente.desktop.in.h:1 -msgid "Five in a row game for X" +#: ../menu-data/penguintv:penguintv.desktop.in.h:2 +msgid "Aggregates rss feeds, podcasts, and video blogs" msgstr "" -#: ../menu-data/pente:pente.desktop.in.h:2 +#: ../menu-data/pente:pente.desktop.in.h:1 msgid "Pente" msgstr "Pente" -#: ../menu-data/performous:performous.desktop.in.h:1 -msgid "A karaoke game" -msgstr "一个卡拉OK游戏" +#: ../menu-data/pente:pente.desktop.in.h:2 +msgid "Five in a row game for X" +msgstr "" -#: ../menu-data/performous:performous.desktop.in.h:2 +#: ../menu-data/pentobi:pentobi.desktop.in.h:1 +msgid "Pentobi" +msgstr "" + +#: ../menu-data/pentobi:pentobi.desktop.in.h:2 +msgid "Computer program that plays the board game Blokus" +msgstr "" + +#: ../menu-data/performous:performous.desktop.in.h:1 msgid "Performous" msgstr "Performous" -#: ../menu-data/perlprimer:perlprimer.desktop.in.h:1 -msgid "Graphical design of primers for PCR and sequencing" -msgstr "" +#: ../menu-data/performous:performous.desktop.in.h:2 +msgid "A karaoke game" +msgstr "一个卡拉OK游戏" -#: ../menu-data/perlprimer:perlprimer.desktop.in.h:2 +#: ../menu-data/perlprimer:perlprimer.desktop.in.h:1 msgid "PerlPrimer" msgstr "PerlPrimer" -#: ../menu-data/perroquet:perroquet.desktop.in.h:1 -msgid "Oral comprehension teacher" +#: ../menu-data/perlprimer:perlprimer.desktop.in.h:2 +msgid "Graphical design of primers for PCR and sequencing" msgstr "" -#: ../menu-data/perroquet:perroquet.desktop.in.h:2 +#: ../menu-data/perroquet:perroquet.desktop.in.h:1 msgid "Perroquet" msgstr "" -#: ../menu-data/pessulus:pessulus.desktop.in.h:1 -msgid "Configure the lockdown policy" -msgstr "配置锁闭策略" - -#: ../menu-data/pessulus:pessulus.desktop.in.h:2 -msgid "Lockdown Editor" -msgstr "锁闭编辑器" +#: ../menu-data/perroquet:perroquet.desktop.in.h:2 +msgid "Oral comprehension teacher" +msgstr "" #: ../menu-data/petri-foo:petri-foo.desktop.in.h:1 msgid "Petri-foo" msgstr "" #: ../menu-data/petri-foo:petri-foo.desktop.in.h:2 -#: ../menu-data/specimen:specimen.desktop.in.h:1 +#: ../menu-data/specimen:specimen.desktop.in.h:2 msgid "Sound Sampler" msgstr "" #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:1 -msgid "PostgreSQL Administration Tool" -msgstr "PostgreSQL 管理工具" - -#: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2 msgid "pgAdmin III" msgstr "pgAdmin III" +#: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2 +msgid "PostgreSQL Administration Tool" +msgstr "PostgreSQL 管理工具" + #: ../menu-data/phasex:phasex.desktop.in.h:1 msgid "PHASEX" msgstr "" @@ -13029,11 +13203,19 @@ msgstr "" #: ../menu-data/phatch:phatch.desktop.in.h:1 +msgid "Phatch PHoto bATCH Processor" +msgstr "" + +#: ../menu-data/phatch:phatch.desktop.in.h:2 msgid "Easily batch process images and edit metadata" msgstr "方便地批处理图像和编辑元数据" -#: ../menu-data/phatch:phatch.desktop.in.h:2 -msgid "Phatch PHoto bATCH Processor" +#: ../menu-data/phlipple:phlipple.desktop.in.h:1 +msgid "Phlipple" +msgstr "" + +#: ../menu-data/phlipple:phlipple.desktop.in.h:2 +msgid "Phlipping squares will never be the same again" msgstr "" #: ../menu-data/phoronix-test-suite:phoronix-test-suite.desktop.in.h:1 @@ -13045,22 +13227,30 @@ msgstr "" #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:1 -msgid "Create animated slideshows" +msgid "PhotoFilmStrip" msgstr "" #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:2 -msgid "PhotoFilmStrip" +msgid "Create animated slideshows" msgstr "" -#: ../menu-data/photoprint:fotoprint.desktop.in.h:1 -msgid "Color managed printing of multiple photos on single page" -msgstr "将多张照片打印到一页上,带颜色管理" - #. Encoding=UTF-8 -#: ../menu-data/photoprint:fotoprint.desktop.in.h:3 +#: ../menu-data/photoprint:fotoprint.desktop.in.h:2 msgid "PhotoPrint" msgstr "PhotoPrint" +#: ../menu-data/photoprint:fotoprint.desktop.in.h:3 +msgid "Color managed printing of multiple photos on single page" +msgstr "将多张照片打印到一页上,带颜色管理" + +#: ../menu-data/pianobooster:pianobooster.desktop.in.h:1 +msgid "Piano Booster" +msgstr "" + +#: ../menu-data/pianobooster:pianobooster.desktop.in.h:2 +msgid "Learn the piano just by playing a game" +msgstr "" + #: ../menu-data/picard:picard.desktop.in.h:1 msgid "MusicBrainz Picard" msgstr "" @@ -13078,14 +13268,14 @@ msgstr "Python 集成开发应用程序" #: ../menu-data/pidgin:pidgin.desktop.in.h:1 +msgid "Pidgin Internet Messenger" +msgstr "Pidgin 互联网即时通讯程序" + +#: ../menu-data/pidgin:pidgin.desktop.in.h:2 msgid "" "Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more" msgstr "通过即时消息交谈。支持 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 等协议" -#: ../menu-data/pidgin:pidgin.desktop.in.h:2 -msgid "Pidgin Internet Messenger" -msgstr "Pidgin 互联网即时通讯程序" - #: ../menu-data/pinball:pinball.desktop.in.h:1 msgid "Emilia Pinball" msgstr "" @@ -13095,19 +13285,19 @@ msgstr "" #: ../menu-data/pingus:pingus.desktop.in.h:1 -msgid "Guide a horde of penguins through various obstacles" -msgstr "" - -#: ../menu-data/pingus:pingus.desktop.in.h:2 msgid "Pingus" msgstr "Pingus" +#: ../menu-data/pingus:pingus.desktop.in.h:2 +msgid "Guide a horde of penguins through various obstacles" +msgstr "" + #: ../menu-data/pino:pino.desktop.in.h:1 -msgid "Fast, easy, and free Twitter and Identi.ca client" +msgid "Pino - Twitter and Identi.ca client" msgstr "" #: ../menu-data/pino:pino.desktop.in.h:2 -msgid "Pino - Twitter and Identi.ca client" +msgid "Fast, easy, and free Twitter and Identi.ca client" msgstr "" #: ../menu-data/pinot:pinot.desktop.in.h:1 @@ -13135,13 +13325,13 @@ msgstr "" #: ../menu-data/pipewalker:pipewalker.desktop.in.h:1 -msgid "Connect all hosts to network!" -msgstr "将所有主机连接到网络!" - -#: ../menu-data/pipewalker:pipewalker.desktop.in.h:2 msgid "PipeWalker" msgstr "PipeWalker" +#: ../menu-data/pipewalker:pipewalker.desktop.in.h:2 +msgid "Connect all hosts to network!" +msgstr "将所有主机连接到网络!" + #: ../menu-data/pithos:pithos.desktop.in.h:1 msgid "Pithos" msgstr "" @@ -13151,65 +13341,65 @@ msgstr "" #: ../menu-data/pitivi:pitivi.desktop.in.h:1 -msgid "Create and edit your own movies" -msgstr "创建和编辑您自己的电影" - -#: ../menu-data/pitivi:pitivi.desktop.in.h:2 msgid "Pitivi Video Editor" msgstr "Pitivi 视频编辑器" -#: ../menu-data/pixbros:pixbros.desktop.in.h:1 -msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop" -msgstr "2D 游戏,灵感源自于泡泡龙、雪人兄弟和吸尘小子" +#: ../menu-data/pitivi:pitivi.desktop.in.h:2 +msgid "Create and edit your own movies" +msgstr "创建和编辑您自己的电影" -#: ../menu-data/pixbros:pixbros.desktop.in.h:2 +#: ../menu-data/pixbros:pixbros.desktop.in.h:1 msgid "PIX Bros" msgstr "PIX Bros" -#: ../menu-data/pixelize:pixelize.desktop.in.h:1 -msgid "Create an image consisting of many small images" -msgstr "创建包含多个小图像的图像" +#: ../menu-data/pixbros:pixbros.desktop.in.h:2 +msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop" +msgstr "2D 游戏,灵感源自于泡泡龙、雪人兄弟和吸尘小子" -#: ../menu-data/pixelize:pixelize.desktop.in.h:2 +#: ../menu-data/pixelize:pixelize.desktop.in.h:1 msgid "Pixelize" msgstr "Pixelize" -#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1 -msgid "Help the frog cross the street" -msgstr "帮青蛙穿越街道" +#: ../menu-data/pixelize:pixelize.desktop.in.h:2 +msgid "Create an image consisting of many small images" +msgstr "创建包含多个小图像的图像" -#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2 +#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1 msgid "PIX Frogger" msgstr "PIX Frogger" +#: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2 +msgid "Help the frog cross the street" +msgstr "帮青蛙穿越街道" + #: ../menu-data/planets:planets.desktop.in.h:1 +msgid "Planets" +msgstr "Planets" + +#: ../menu-data/planets:planets.desktop.in.h:2 msgid "" "A simple interactive program for playing with simulations of planetary " "systems" msgstr "" -#: ../menu-data/planets:planets.desktop.in.h:2 -msgid "Planets" -msgstr "Planets" - -#: ../menu-data/planner:planner.desktop.in.h:1 +#: ../menu-data/planner:planner.desktop.in.h:2 msgid "Planner Project Management" msgstr "Planner 项目管理" #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1 -msgid "An engine for cool desktop eyecandy." -msgstr "桌面养眼引擎。" - -#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2 msgid "SuperKaramba" msgstr "SuperKaramba" +#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2 +msgid "An engine for cool desktop eyecandy." +msgstr "桌面养眼引擎。" + #: ../menu-data/playitslowly:playitslowly.desktop.in.h:1 -msgid "A tool to play back a piece of music at a different speed or pitch" +msgid "Play it Slowly" msgstr "" #: ../menu-data/playitslowly:playitslowly.desktop.in.h:2 -msgid "Play it Slowly" +msgid "A tool to play back a piece of music at a different speed or pitch" msgstr "" #: ../menu-data/playonlinux:PlayOnLinux.desktop.in.h:1 @@ -13217,45 +13407,45 @@ msgstr "在Linux上运行" #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:1 -msgid "Catch your son, he ate all the honey then ran away" +msgid "Plee the Bear" msgstr "" #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:2 -msgid "Plee the Bear" +msgid "Catch your son, he ate all the honey then ran away" msgstr "" #: ../menu-data/ploader:ploader.desktop.in.h:1 -msgid "application to upload your pictures to your Piwigo gallery" +msgid "pLoader" msgstr "" #: ../menu-data/ploader:ploader.desktop.in.h:2 -msgid "pLoader" +msgid "application to upload your pictures to your Piwigo gallery" msgstr "" #: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:1 -msgid "Personal dashboard for GNUstep" -msgstr "GNUstep 个人控制面板" - -#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2 msgid "PlopFolio" msgstr "PlopFolio" -#: ../menu-data/plotdrop:plotdrop.desktop.in.h:1 -msgid "Drag and Drop graph plotting" -msgstr "拖拽图标" +#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2 +msgid "Personal dashboard for GNUstep" +msgstr "GNUstep 个人控制面板" -#: ../menu-data/plotdrop:plotdrop.desktop.in.h:2 +#: ../menu-data/plotdrop:plotdrop.desktop.in.h:1 msgid "PlotDrop" msgstr "PlotDrop" -#: ../menu-data/podbrowser:podbrowser.desktop.in.h:1 -msgid "Browse Perl Documentation" -msgstr "浏览 Perl 文档" +#: ../menu-data/plotdrop:plotdrop.desktop.in.h:2 +msgid "Drag and Drop graph plotting" +msgstr "拖拽图标" -#: ../menu-data/podbrowser:podbrowser.desktop.in.h:2 +#: ../menu-data/podbrowser:podbrowser.desktop.in.h:1 msgid "Pod Browser" msgstr "Pod 浏览器" +#: ../menu-data/podbrowser:podbrowser.desktop.in.h:2 +msgid "Browse Perl Documentation" +msgstr "浏览 Perl 文档" + #: ../menu-data/poe.app:Poe.desktop.in.h:1 msgid "Poe" msgstr "Poe" @@ -13265,13 +13455,13 @@ msgstr "Vorbis 注释编辑器" #: ../menu-data/poedit:poedit.desktop.in.h:1 -msgid "Gettext catalogs editor" -msgstr "Gettext 翻译条目编辑器" - -#: ../menu-data/poedit:poedit.desktop.in.h:2 msgid "Poedit" msgstr "Poedit" +#: ../menu-data/poedit:poedit.desktop.in.h:2 +msgid "Gettext catalogs editor" +msgstr "Gettext 翻译条目编辑器" + #: ../menu-data/pokerth:pokerth.desktop.in.h:1 msgid "PokerTH" msgstr "PokerTH" @@ -13281,35 +13471,35 @@ msgstr "" #: ../menu-data/pondus:pondus.desktop.in.h:1 -msgid "Keep track of your weight" -msgstr "" - -#: ../menu-data/pondus:pondus.desktop.in.h:2 msgid "Pondus" msgstr "Pondus" -#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1 -msgid "Photo/Movie collection manager" -msgstr "相片/影视收集管理器" +#: ../menu-data/pondus:pondus.desktop.in.h:2 +msgid "Keep track of your weight" +msgstr "" -#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2 +#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1 msgid "PornView" msgstr "PornView" -#: ../menu-data/posterazor:posterazor.desktop.in.h:1 -msgid "Cuts a raster image into multipage PDF documents" -msgstr "" +#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2 +msgid "Photo/Movie collection manager" +msgstr "相片/影视收集管理器" -#: ../menu-data/posterazor:posterazor.desktop.in.h:2 +#: ../menu-data/posterazor:posterazor.desktop.in.h:1 msgid "PosteRazor" msgstr "PosteRazor" +#: ../menu-data/posterazor:posterazor.desktop.in.h:2 +msgid "Cuts a raster image into multipage PDF documents" +msgstr "" + #: ../menu-data/postler:postler.desktop.in.h:1 -msgid "Lean mail interface" +msgid "Postler" msgstr "" #: ../menu-data/postler:postler.desktop.in.h:2 -msgid "Postler" +msgid "Lean mail interface" msgstr "" #: ../menu-data/postr:postr.desktop.in.h:1 @@ -13321,37 +13511,37 @@ msgstr "上传相片到 Flickr" #: ../menu-data/pouetchess:pouetChess.desktop.in.h:1 -msgid "Play a game of chess, either against another player or against the AI" -msgstr "" - -#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2 msgid "pouetChess" msgstr "pouetChess" +#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2 +msgid "Play a game of chess, either against another player or against the AI" +msgstr "" + #: ../menu-data/powder:powder.desktop.in.h:1 -msgid "Graphical dungeon crawling game" +msgid "Powder" msgstr "" #: ../menu-data/powder:powder.desktop.in.h:2 -msgid "Powder" +msgid "Graphical dungeon crawling game" msgstr "" #: ../menu-data/powermanga:powermanga.desktop.in.h:1 -msgid "Play a vertical shoot 'em up game" +msgid "Powermanga" msgstr "" #: ../menu-data/powermanga:powermanga.desktop.in.h:2 -msgid "Powermanga" +msgid "Play a vertical shoot 'em up game" msgstr "" #: ../menu-data/pptview:pptview.desktop.in.h:1 -msgid "PowerPoint Viewer" -msgstr "PowerPoint 查看器" - -#: ../menu-data/pptview:pptview.desktop.in.h:2 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 "" @@ -13361,30 +13551,39 @@ msgstr "" #: ../menu-data/praat:praat.desktop.in.h:1 -msgid "Analyze, synthesize and manipulate speech" +msgid "Praat Speech Analyzer" msgstr "" #: ../menu-data/praat:praat.desktop.in.h:2 -msgid "Praat Speech Analyzer" +msgid "Analyze, synthesize and manipulate speech" msgstr "" #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1 -msgid "Batch renaming of files." -msgstr "批量重命名文件。" - -#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2 msgid "PrefixSuffix" msgstr "PrefixSuffix" +#: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2 +msgid "Batch renaming of files." +msgstr "批量重命名文件。" + #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:1 -msgid "Graphical notification applet for prelude" +msgid "prelude-notify" msgstr "" #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:2 -msgid "prelude-notify" +msgid "Graphical notification applet for prelude" msgstr "" -#: ../menu-data/preview.app:Preview.desktop.in.h:2 +#: ../menu-data/prerex:prerex.desktop.in.h:1 +msgid "prerex" +msgstr "" + +#: ../menu-data/prerex:prerex.desktop.in.h:2 +#: ../menu-data/vprerex:vprerex.desktop.in.h:2 +msgid "Edit course prerequisite charts" +msgstr "" + +#: ../menu-data/preview.app:Preview.desktop.in.h:1 msgid "Preview" msgstr "预览" @@ -13397,11 +13596,11 @@ msgstr "精度格栅图像卷积引擎" #: ../menu-data/primrose:primrose.desktop.in.h:1 -msgid "Captivating tile-clearing puzzle game" +msgid "Primrose" msgstr "" #: ../menu-data/primrose:primrose.desktop.in.h:2 -msgid "Primrose" +msgid "Captivating tile-clearing puzzle game" msgstr "" #: ../menu-data/project-x:projectx.desktop.in.h:1 @@ -13421,38 +13620,38 @@ msgstr "GNUstep 的官方集成开发环境" #: ../menu-data/projectl:projectl.desktop.in.h:1 -msgid "HIZ's ProjectL" +msgid "ProjectL" msgstr "" #: ../menu-data/projectl:projectl.desktop.in.h:2 -msgid "ProjectL" +msgid "HIZ's ProjectL" msgstr "" #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:1 -msgid "" -"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI" +msgid "projectM Jack Audio Visualization" msgstr "" #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:2 -msgid "projectM Jack Audio Visualization" +msgid "" +"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI" msgstr "" #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:1 -msgid "Visualization of PulseAudio streams with projectM" +msgid "projectM PulseAudio Visualization" msgstr "" #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2 -msgid "projectM PulseAudio Visualization" +msgid "Visualization of PulseAudio streams with projectM" msgstr "" #: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:1 -msgid "IDE for GNUstep" -msgstr "GNUstep 的 IDE" - -#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2 msgid "Project Manager IDE" msgstr "Project Manager IDE" +#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2 +msgid "IDE for GNUstep" +msgstr "GNUstep 的 IDE" + #: ../menu-data/promoe:promoe.desktop.in.h:1 msgid "Promoe" msgstr "Promoe" @@ -13470,37 +13669,37 @@ msgstr "" #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:1 -#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1 -#: ../menu-data/psi:psi.desktop.in.h:1 -msgid "Communicate over the Jabber network" -msgstr "通过 Jabber 网络交流" - -#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2 msgid "Psi Plus Webkit" msgstr "" +#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2 #: ../menu-data/psi-plus:psi-plus.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:1 msgid "Psi+" msgstr "" -#: ../menu-data/psi:psi.desktop.in.h:2 +#: ../menu-data/psi:psi.desktop.in.h:1 msgid "Psi" msgstr "Psi" #: ../menu-data/pspp:pspp.desktop.in.h:1 -msgid "Analyze statistical data with a free alternative to SPSS" +msgid "GNU PSPP" msgstr "" #: ../menu-data/pspp:pspp.desktop.in.h:2 -msgid "GNU PSPP" +msgid "Analyze statistical data with a free alternative to SPSS" msgstr "" #: ../menu-data/psychopy:psychopy.desktop.in.h:1 -msgid "PsychoPy" +msgid "Psychology Stimuli IDE" msgstr "" #: ../menu-data/psychopy:psychopy.desktop.in.h:2 -msgid "Psychology Stimuli IDE" +msgid "PsychoPy" msgstr "" #: ../menu-data/pterm:pterm.desktop.in.h:1 @@ -13512,21 +13711,21 @@ msgstr "启动一个 PuTTY 终端会话" #: ../menu-data/puddletag:puddletag.desktop.in.h:1 -msgid "Audio Tag Editor" +msgid "puddletag" msgstr "" #: ../menu-data/puddletag:puddletag.desktop.in.h:2 -msgid "puddletag" +msgid "Audio Tag Editor" msgstr "" #: ../menu-data/pureadmin:pureadmin.desktop.in.h:1 -msgid "Administer and monitor your FTP server" -msgstr "管理和监控您的 FTP 服务器" - -#: ../menu-data/pureadmin:pureadmin.desktop.in.h:2 msgid "PureAdmin" msgstr "PureAdmin" +#: ../menu-data/pureadmin:pureadmin.desktop.in.h:2 +msgid "Administer and monitor your FTP server" +msgstr "管理和监控您的 FTP 服务器" + #: ../menu-data/puredata-core:puredata.desktop.in.h:1 msgid "PureData" msgstr "PureData" @@ -13536,37 +13735,45 @@ msgstr "" #: ../menu-data/purrr:purrr.desktop.in.h:1 -msgid "A Mass-renamer for files" -msgstr "一个文件批量重命名工具" - -#: ../menu-data/purrr:purrr.desktop.in.h:2 msgid "Purrr" msgstr "Purrr" -#: ../menu-data/putty:putty.desktop.in.h:1 -msgid "Connect to an SSH server with PuTTY" -msgstr "通过 PuTTY 连接到 SSH 服务器" +#: ../menu-data/purrr:purrr.desktop.in.h:2 +msgid "A Mass-renamer for files" +msgstr "一个文件批量重命名工具" -#: ../menu-data/putty:putty.desktop.in.h:2 +#: ../menu-data/putty:putty.desktop.in.h:1 msgid "PuTTY SSH Client" msgstr "PuTTY SSH 客户端" +#: ../menu-data/putty:putty.desktop.in.h:2 +msgid "Connect to an SSH server with PuTTY" +msgstr "通过 PuTTY 连接到 SSH 服务器" + #: ../menu-data/pybackpack:pybackpack.desktop.in.h:1 +msgid "File Backup Manager" +msgstr "文件备份管理器" + +#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2 msgid "Back up important files" msgstr "备份重要的文件" -#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2 -msgid "File Backup Manager" -msgstr "文件备份管理器" +#: ../menu-data/pybik:pybik.desktop.in.h:1 +msgid "Pybik" +msgstr "" -#: ../menu-data/pybliographer:pybliographic.desktop.in.h:1 -msgid "Manage bibliographic databases" -msgstr "管理 书目数据库" +#: ../menu-data/pybik:pybik.desktop.in.h:2 +msgid "The magic cube" +msgstr "" -#: ../menu-data/pybliographer:pybliographic.desktop.in.h:2 +#: ../menu-data/pybliographer:pybliographic.desktop.in.h:1 msgid "Pybliographic Bibliography Manager" msgstr "Pybliographic 参考文献管理器" +#: ../menu-data/pybliographer:pybliographic.desktop.in.h:2 +msgid "Manage bibliographic databases" +msgstr "管理 书目数据库" + #: ../menu-data/pybridge:pybridge.desktop.in.h:1 msgid "PyBridge" msgstr "PyBridge" @@ -13582,19 +13789,19 @@ msgstr "PyChess 是一个全功能,美观大方,易于使用的 Gnome 桌面象棋客户端" #: ../menu-data/pygmy:pygmy.desktop.in.h:1 -msgid "GTK+ MPD client" -msgstr "GTK+ MPD 客户端" - -#: ../menu-data/pygmy:pygmy.desktop.in.h:2 msgid "Pygmy" msgstr "Pygmy" +#: ../menu-data/pygmy:pygmy.desktop.in.h:2 +msgid "GTK+ MPD client" +msgstr "GTK+ MPD 客户端" + #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:1 -msgid "Minimum-interface PyKaraoke" +msgid "PyKaraoke Mini" msgstr "" #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:2 -msgid "PyKaraoke Mini" +msgid "Minimum-interface PyKaraoke" msgstr "" #: ../menu-data/pykaraoke:pykaraoke.desktop.in.h:1 @@ -13606,35 +13813,35 @@ msgstr "" #: ../menu-data/pymca:edfviewer.desktop.in.h:1 -msgid "Display files in ESRF Data Format" +msgid "EDFviewer" msgstr "" #: ../menu-data/pymca:edfviewer.desktop.in.h:2 -msgid "EDFviewer" +msgid "Display files in ESRF Data Format" msgstr "" #: ../menu-data/pymca:elementsinfo.desktop.in.h:1 -msgid "Display X-ray information on elements" -msgstr "在元素上显示 X 射线信息" - -#: ../menu-data/pymca:elementsinfo.desktop.in.h:2 msgid "Elementsinfo" msgstr "" +#: ../menu-data/pymca:elementsinfo.desktop.in.h:2 +msgid "Display X-ray information on elements" +msgstr "在元素上显示 X 射线信息" + #: ../menu-data/pymca:peakidentifier.desktop.in.h:1 -msgid "Find the energy of X-ray spectral lines" +msgid "Peakidentifier" msgstr "" #: ../menu-data/pymca:peakidentifier.desktop.in.h:2 -msgid "Peakidentifier" +msgid "Find the energy of X-ray spectral lines" msgstr "" #: ../menu-data/pymca:pymca.desktop.in.h:1 -msgid "Analyse X-ray Fluorescence data" +msgid "PyMCA" msgstr "" #: ../menu-data/pymca:pymca.desktop.in.h:2 -msgid "PyMCA" +msgid "Analyse X-ray Fluorescence data" msgstr "" #: ../menu-data/pymca:pymcaroitool.desktop.in.h:1 @@ -13646,13 +13853,13 @@ msgstr "" #: ../menu-data/pymol:pymol.desktop.in.h:1 -msgid "Model molecular structures and produce high-quality images of them" -msgstr "对分子结构进行建模并生成高质量的图像" - -#: ../menu-data/pymol:pymol.desktop.in.h:2 msgid "PyMOL Molecular Graphics System" msgstr "PyMOL 分子图形系统" +#: ../menu-data/pymol:pymol.desktop.in.h:2 +msgid "Model molecular structures and produce high-quality images of them" +msgstr "对分子结构进行建模并生成高质量的图像" + #: ../menu-data/pynagram:pynagram.desktop.in.h:1 msgid "Pynagram" msgstr "" @@ -13666,13 +13873,13 @@ msgstr "pyNeighborhood" #: ../menu-data/pypar2:pypar2.desktop.in.h:1 -msgid "A graphical frontend for the par2 utility" -msgstr "par2 工具的图形前端" - -#: ../menu-data/pypar2:pypar2.desktop.in.h:2 msgid "PyPar2" msgstr "PyPar2" +#: ../menu-data/pypar2:pypar2.desktop.in.h:2 +msgid "A graphical frontend for the par2 utility" +msgstr "par2 工具的图形前端" + #: ../menu-data/pype:pype.desktop.in.h:1 msgid "PyPE" msgstr "PyPE" @@ -13685,34 +13892,34 @@ msgid "PyPI Browser" msgstr "PyPI 浏览器" -#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2 +#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1 msgid "pyprompter" msgstr "" #: ../menu-data/pyracerz:pyracerz.desktop.in.h:1 -msgid "2D racing game" -msgstr "二维赛车游戏" - -#: ../menu-data/pyracerz:pyracerz.desktop.in.h:2 msgid "pyRacerz" msgstr "pyRacerz" -#: ../menu-data/pyragua:pyragua.desktop.in.h:1 -msgid "A fast and lightweight IDE using wxPython" -msgstr "一个使用 wxPython 编写的快速轻量的集成开发环境" +#: ../menu-data/pyracerz:pyracerz.desktop.in.h:2 +msgid "2D racing game" +msgstr "二维赛车游戏" -#: ../menu-data/pyragua:pyragua.desktop.in.h:2 +#: ../menu-data/pyragua:pyragua.desktop.in.h:1 msgid "Pyragua" msgstr "Pyragua" -#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1 -msgid "Mass rename files" -msgstr "批量重命名文件" +#: ../menu-data/pyragua:pyragua.desktop.in.h:2 +msgid "A fast and lightweight IDE using wxPython" +msgstr "一个使用 wxPython 编写的快速轻量的集成开发环境" -#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2 +#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1 msgid "pyRenamer" msgstr "pyRenamer" +#: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2 +msgid "Mass rename files" +msgstr "批量重命名文件" + #: ../menu-data/pyrocket:pyrocket.desktop.in.h:1 msgid "Dream Cheeky Rocket Control" msgstr "" @@ -13721,42 +13928,50 @@ msgid "Enabling Cubicle Warfare on Linux" msgstr "" -#: ../menu-data/pyroom:pyroom.desktop.in.h:1 -msgid "Distraction free full-screen text editor" +#: ../menu-data/pyromaths:pyromaths.desktop.in.h:1 +msgid "Pyromaths" msgstr "" -#: ../menu-data/pyroom:pyroom.desktop.in.h:2 +#: ../menu-data/pyromaths:pyromaths.desktop.in.h:2 +msgid "Générateur d'exercices de maths" +msgstr "" + +#: ../menu-data/pyroom:pyroom.desktop.in.h:1 msgid "PyRoom" msgstr "PyRoom" -#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1 -msgid "A classical game of words" -msgstr "一个经典的单词游戏" +#: ../menu-data/pyroom:pyroom.desktop.in.h:2 +msgid "Distraction free full-screen text editor" +msgstr "" -#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2 +#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1 msgid "PyScrabble" msgstr "PyScrabble" -#: ../menu-data/pysdm:pysdm.desktop.in.h:1 -msgid "Management of Storage Devices" -msgstr "存储设备的管理" +#: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2 +msgid "A classical game of words" +msgstr "一个经典的单词游戏" -#: ../menu-data/pysdm:pysdm.desktop.in.h:2 +#: ../menu-data/pysdm:pysdm.desktop.in.h:1 msgid "Storage Device Manager" msgstr "存储设备管理器" +#: ../menu-data/pysdm:pysdm.desktop.in.h:2 +msgid "Management of Storage Devices" +msgstr "存储设备的管理" + #: ../menu-data/pysolfc:pysol.desktop.in.h:1 msgid "PySol Fan Club Edition" msgstr "" #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:1 -msgid "Configuration of PySyCache" -msgstr "PySyCache 的配置" - -#: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2 msgid "Pysycache Admin" msgstr "" +#: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2 +msgid "Configuration of PySyCache" +msgstr "PySyCache 的配置" + #: ../menu-data/pysycache:pysycache.desktop.in.h:1 msgid "PySyCache" msgstr "PySyCache" @@ -13766,21 +13981,21 @@ msgstr "教孩子来移动鼠标" #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:1 -msgid "Interactive tool to simulate acido-basic titrations" +msgid "pyAcidoBasic" msgstr "" #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:2 -msgid "pyAcidoBasic" +msgid "Interactive tool to simulate acido-basic titrations" msgstr "" #: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:1 -msgid "Automate your desktop using Dogtail" -msgstr "使用 Dogtail 自动化您的桌面" - -#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2 msgid "Dogtail Script Recorder" msgstr "Dogtail 脚本记录器" +#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2 +msgid "Automate your desktop using Dogtail" +msgstr "使用 Dogtail 自动化您的桌面" + #: ../menu-data/python-dogtail:sniff.desktop.in.h:1 msgid "AT-SPI Browser" msgstr "AT-SPI 浏览器" @@ -13823,35 +14038,35 @@ msgstr "XAFS 分析的交互程序" #: ../menu-data/python-lunch:lunch.desktop.in.h:1 -msgid "Distributed Process Launcher" +msgid "Lunch" msgstr "" #: ../menu-data/python-lunch:lunch.desktop.in.h:2 -msgid "Lunch" +msgid "Distributed Process Launcher" msgstr "" #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:1 -msgid "Interactive tool to track moving points in video framesets" +msgid "pyMecaVideo" msgstr "" #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:2 -msgid "pyMecaVideo" +msgid "Interactive tool to track moving points in video framesets" msgstr "" #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:1 -msgid "Multiplayer online poker" -msgstr "多人在线扑克" - -#: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2 msgid "poker2D" msgstr "poker2D" +#: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2 +msgid "Multiplayer online poker" +msgstr "多人在线扑克" + #: ../menu-data/python-web2py:web2py.desktop.in.h:1 -msgid "Enterprise web development framework using Python" +msgid "web2py" msgstr "" #: ../menu-data/python-web2py:web2py.desktop.in.h:2 -msgid "web2py" +msgid "Enterprise web development framework using Python" msgstr "" #: ../menu-data/python-whiteboard:python-whiteboard.desktop.in.h:1 @@ -13859,13 +14074,13 @@ msgstr "" #: ../menu-data/python-wxglade:wxglade.desktop.in.h:1 -msgid "GUI designer written in Python with wxPython" -msgstr "用 Python 使用 wxPython 写的 GUI 设计器" - -#: ../menu-data/python-wxglade:wxglade.desktop.in.h:2 msgid "wxGlade" msgstr "wxGlade" +#: ../menu-data/python-wxglade:wxglade.desktop.in.h:2 +msgid "GUI designer written in Python with wxPython" +msgstr "用 Python 使用 wxPython 写的 GUI 设计器" + #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1 msgid "PyCAD" msgstr "PyCAD" @@ -13875,30 +14090,30 @@ msgstr "PythonCAD" #: ../menu-data/pytrainer:pytrainer.desktop.in.h:1 -msgid "The Free Sport Training Center" -msgstr "免费的运动训练中心" +msgid "pytrainer" +msgstr "" #: ../menu-data/pytrainer:pytrainer.desktop.in.h:2 -msgid "pyTrainer" -msgstr "pyTrainer" +msgid "The Free Sport Training Center" +msgstr "免费的运动训练中心" #: ../menu-data/q4wine:q4wine.desktop.in.h:1 -msgid "Q4Wine" -msgstr "Q4Wine" - -#: ../menu-data/q4wine:q4wine.desktop.in.h:2 msgid "Qt4 utility for Wine applications and prefixes management." msgstr "" -#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1 -msgid "Powerful and easy to use calculator" -msgstr "功能强大而且易用的计算器" +#: ../menu-data/q4wine:q4wine.desktop.in.h:2 +msgid "Q4Wine" +msgstr "Q4Wine" -#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2 +#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1 msgid "Qalculate!" msgstr "Qalculate!" -#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2 +#: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2 +msgid "Powerful and easy to use calculator" +msgstr "功能强大而且易用的计算器" + +#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1 msgid "QApt Package Installer" msgstr "" @@ -13911,19 +14126,19 @@ msgstr "" #: ../menu-data/qasconfig:qasconfig.desktop.in.h:1 -msgid "ALSA configuration browser" +msgid "QasConfig" msgstr "" #: ../menu-data/qasconfig:qasconfig.desktop.in.h:2 -msgid "QasConfig" +msgid "ALSA configuration browser" msgstr "" #: ../menu-data/qasmixer:qasmixer.desktop.in.h:1 -msgid "Graphical mixer application for the ALSA" +msgid "QasMixer" msgstr "" #: ../menu-data/qasmixer:qasmixer.desktop.in.h:2 -msgid "QasMixer" +msgid "Graphical mixer application for the ALSA" msgstr "" #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:2 @@ -13931,16 +14146,16 @@ msgstr "qBittorrent" #: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:1 +msgid "qcomicbook" +msgstr "qcomicbook" + +#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2 msgid "" "QComicBook is a viewer for comic book archives (cbz, cbr, cbt). QComicBook " "has specific features like page preview, thumbnails view, bookmarks, manga " "mode for easing comicbook reading." msgstr "" -#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2 -msgid "qcomicbook" -msgstr "qcomicbook" - #: ../menu-data/qdacco:qdacco.desktop.in.h:1 msgid "Qdacco dictionary" msgstr "Qdacco 字典" @@ -13950,30 +14165,38 @@ msgstr "" #: ../menu-data/qdevelop:qdevelop.desktop.in.h:1 +msgid "QDevelop" +msgstr "QDevelop" + +#: ../menu-data/qdevelop:qdevelop.desktop.in.h:2 msgid "Development environment for Qt4" msgstr "Qt4 开发环境" -#: ../menu-data/qdevelop:qdevelop.desktop.in.h:2 -msgid "QDevelop" -msgstr "QDevelop" +#: ../menu-data/qdigidoc:qdigidoc-client.desktop.in.h:1 +msgid "DigiDoc3 Client" +msgstr "" -#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:1 -msgid "An electric diagrams editor." +#: ../menu-data/qdigidoc:qdigidoc-crypto.desktop.in.h:1 +msgid "DigiDoc3 Crypto" msgstr "" #. Encoding=UTF-8 -#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3 +#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:2 msgid "QElectroTech" msgstr "" -#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1 -msgid "Manage virtual machine configurations" -msgstr "管理虚拟机配置" +#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3 +msgid "An electric diagrams editor." +msgstr "" -#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2 +#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1 msgid "Qemu Launcher" msgstr "Qemu 加载器" +#: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2 +msgid "Manage virtual machine configurations" +msgstr "管理虚拟机配置" + #: ../menu-data/qemulator:qemulator.desktop.in.h:1 msgid "Qemu Virtual Engines manager" msgstr "Qemu 虚拟引擎管理器" @@ -13982,30 +14205,34 @@ msgid "Qemulator" msgstr "Qemulator" -#: ../menu-data/qfreefax:qfreefax.desktop.in.h:1 -msgid "GUI for fax fonctionality provided by French ISP \"Free\"" +#: ../menu-data/qesteidutil:qesteidutil.desktop.in.h:1 +msgid "ID-card Utility" msgstr "" -#: ../menu-data/qfreefax:qfreefax.desktop.in.h:2 +#: ../menu-data/qfreefax:qfreefax.desktop.in.h:1 msgid "qFreeFax" msgstr "qFreeFax" +#: ../menu-data/qfreefax:qfreefax.desktop.in.h:2 +msgid "GUI for fax fonctionality provided by French ISP \"Free\"" +msgstr "" + #: ../menu-data/qgis:qgis.desktop.in.h:1 -msgid "Geographical Information System" +msgid "Quantum GIS" msgstr "" #: ../menu-data/qgis:qgis.desktop.in.h:2 -msgid "Quantum GIS" +msgid "Geographical Information System" msgstr "" #: ../menu-data/qgit:qgit.desktop.in.h:1 -msgid "git GUI viewer" -msgstr "git GUI 浏览器" - -#: ../menu-data/qgit:qgit.desktop.in.h:2 msgid "qgit" msgstr "qgit" +#: ../menu-data/qgit:qgit.desktop.in.h:2 +msgid "git GUI viewer" +msgstr "git GUI 浏览器" + #: ../menu-data/qgo:kde__qgo.desktop.in.h:1 msgid "qgo" msgstr "qgo" @@ -14019,11 +14246,11 @@ msgstr "" #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:1 -msgid "GPS device mapping utility" +msgid "QLandkarteGT" msgstr "" #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2 -msgid "QLandkarteGT" +msgid "GPS device mapping utility" msgstr "" #: ../menu-data/qliss3d:qliss3d.desktop.in.h:1 @@ -14035,22 +14262,22 @@ msgstr "" #: ../menu-data/qlix:qlix.desktop.in.h:1 -msgid "" -"Manage tracks, files, and playlists between a host computer and an MTP device" -msgstr "" - -#: ../menu-data/qlix:qlix.desktop.in.h:2 msgid "Qlix" msgstr "Qlix" -#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:1 -msgid "Arpeggiator-Sequencer-LFO" +#: ../menu-data/qlix:qlix.desktop.in.h:2 +msgid "" +"Manage tracks, files, and playlists between a host computer and an MTP device" msgstr "" -#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2 +#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:1 msgid "QMidiArp" msgstr "QMidiArp" +#: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2 +msgid "Arpeggiator-Sequencer-LFO" +msgstr "" + #: ../menu-data/qmidinet:qmidinet.desktop.in.h:1 msgid "QmidiNet" msgstr "" @@ -14059,21 +14286,21 @@ msgid "QmidiNet is a MIDI Network Gateway via UDP/IP Multicast" msgstr "" -#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:1 -msgid "MIDI router and filter utility" -msgstr "" - #. Icon=qmidiroute -#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3 +#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:2 msgid "QMidiRoute" msgstr "QMidiRoute" +#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3 +msgid "MIDI router and filter utility" +msgstr "" + #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:1 -msgid "A tool to configure a Mikrokopter " +msgid "QMK-Groundstation" msgstr "" #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:2 -msgid "QMK-Groundstation" +msgid "A tool to configure a Mikrokopter " msgstr "" #: ../menu-data/qmmp:qmmp.desktop.in.h:1 @@ -14085,11 +14312,11 @@ msgstr "基于 Qt4 的多媒体播放器" #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:1 -msgid "A nicer MPD client" +msgid "QMPDClient" msgstr "" #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:2 -msgid "QMPDClient" +msgid "A nicer MPD client" msgstr "" #: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1 @@ -14097,21 +14324,21 @@ msgstr "" #: ../menu-data/qpxtool:qpxtool.desktop.in.h:1 -msgid "CD/DVD media quality checker" -msgstr "CD/DVD 媒体质量检查程序" - -#: ../menu-data/qpxtool:qpxtool.desktop.in.h:2 msgid "QPxTool" msgstr "QPxTool" -#: ../menu-data/qrfcview:qrfcview.desktop.in.h:1 -msgid "Downloads and displays RFC" -msgstr "下载和显示 RFC 文档" +#: ../menu-data/qpxtool:qpxtool.desktop.in.h:2 +msgid "CD/DVD media quality checker" +msgstr "CD/DVD 媒体质量检查程序" -#: ../menu-data/qrfcview:qrfcview.desktop.in.h:2 +#: ../menu-data/qrfcview:qrfcview.desktop.in.h:1 msgid "qRFCView" msgstr "qRFCView" +#: ../menu-data/qrfcview:qrfcview.desktop.in.h:2 +msgid "Downloads and displays RFC" +msgstr "下载和显示 RFC 文档" + #: ../menu-data/qsampler:qsampler.desktop.in.h:1 msgid "Qsampler" msgstr "" @@ -14133,21 +14360,21 @@ msgstr "qshutdown" #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:1 -msgid "Highlight your sources" -msgstr "高亮显示您的源代码" - -#: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2 msgid "QSource-Highlight" msgstr "QSource-Highlight" -#: ../menu-data/qstardict:qstardict.desktop.in.h:1 -msgid "QStarDict" -msgstr "QStarDict" +#: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2 +msgid "Highlight your sources" +msgstr "高亮显示您的源代码" -#: ../menu-data/qstardict:qstardict.desktop.in.h:2 +#: ../menu-data/qstardict:qstardict.desktop.in.h:1 msgid "QStarDict is Qt version of StarDict" msgstr "QStarDict 是 StarDict 的 Qt 版本" +#: ../menu-data/qstardict:qstardict.desktop.in.h:2 +msgid "QStarDict" +msgstr "QStarDict" + #: ../menu-data/qsynth:qsynth.desktop.in.h:1 msgid "Qsynth" msgstr "" @@ -14181,29 +14408,29 @@ msgstr "翻译基于 Qt3 程序中的消息的工具" #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:1 -msgid "A graphical configuration tool for programs using Qt 3" -msgstr "Qt 3 编写程序的图形配置工具" - -#: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2 msgid "Qt3 Configuration" msgstr "Qt3 配置" -#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1 -msgid "Interface Designer" -msgstr "界面设计器" +#: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2 +msgid "A graphical configuration tool for programs using Qt 3" +msgstr "Qt 3 编写程序的图形配置工具" -#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2 +#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1 msgid "Qt 4 Designer" msgstr "Qt 4 设计器" -#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1 -msgid "Document Browser" -msgstr "文档浏览器" +#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2 +msgid "Interface Designer" +msgstr "界面设计器" -#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2 +#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1 msgid "Qt 4 Assistant" msgstr "Qt4 助理" +#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2 +msgid "Document Browser" +msgstr "文档浏览器" + #: ../menu-data/qt4-dev-tools:linguist-qt4.desktop.in.h:1 msgid "Qt 4 Linguist" msgstr "Qt 4 Linguist" @@ -14225,37 +14452,37 @@ msgstr "使用数字万用表" #: ../menu-data/qtemu:qtemu.desktop.in.h:1 -msgid "Frontend to QEMU virtual machine monitor" -msgstr "QEMU 虚拟机监视器的前端" - -#: ../menu-data/qtemu:qtemu.desktop.in.h:2 msgid "QtEmu" msgstr "QtEmu" -#: ../menu-data/qterm:qterm.desktop.in.h:2 +#: ../menu-data/qtemu:qtemu.desktop.in.h:2 +msgid "Frontend to QEMU virtual machine monitor" +msgstr "QEMU 虚拟机监视器的前端" + +#: ../menu-data/qterm:qterm.desktop.in.h:1 msgid "QTerm" msgstr "QTerm" #: ../menu-data/qtgain:QtGain.desktop.in.h:1 -msgid "Add \"gain\" tags to your audio files" -msgstr "给您的音频文件添加“增益”标签" - -#: ../menu-data/qtgain:QtGain.desktop.in.h:2 msgid "QtGain" msgstr "QtGain" -#: ../menu-data/qtikz:qtikz.desktop.in.h:2 +#: ../menu-data/qtgain:QtGain.desktop.in.h:2 +msgid "Add \"gain\" tags to your audio files" +msgstr "给您的音频文件添加“增益”标签" + +#: ../menu-data/qtikz:qtikz.desktop.in.h:1 msgid "QTikZ" msgstr "" #: ../menu-data/qtiplot:qtiplot.desktop.in.h:1 -msgid "Analyze and plot scientific data" -msgstr "" - -#: ../menu-data/qtiplot:qtiplot.desktop.in.h:2 msgid "QtiPlot" msgstr "QtiPlot" +#: ../menu-data/qtiplot:qtiplot.desktop.in.h:2 +msgid "Analyze and plot scientific data" +msgstr "" + #: ../menu-data/qtm:qtm.desktop.in.h:1 msgid "QTM" msgstr "" @@ -14265,21 +14492,21 @@ msgstr "" #: ../menu-data/qtnx:qtnx.desktop.in.h:1 -msgid "Client for NX remote desktop" -msgstr "NX 远程桌面客户端" - -#: ../menu-data/qtnx:qtnx.desktop.in.h:2 msgid "QTNX" msgstr "QTNX" -#: ../menu-data/qtoctave:qtoctave.desktop.in.h:1 -msgid "Graphical Qt frontend for GNU Octave" -msgstr "GNU Octave 的图形 Qt 前端" +#: ../menu-data/qtnx:qtnx.desktop.in.h:2 +msgid "Client for NX remote desktop" +msgstr "NX 远程桌面客户端" -#: ../menu-data/qtoctave:qtoctave.desktop.in.h:2 +#: ../menu-data/qtoctave:qtoctave.desktop.in.h:1 msgid "QtOctave" msgstr "QtOctave" +#: ../menu-data/qtoctave:qtoctave.desktop.in.h:2 +msgid "Graphical Qt frontend for GNU Octave" +msgstr "GNU Octave 的图形 Qt 前端" + #: ../menu-data/qtodo:qtodo.desktop.in.h:1 msgid "QToDo" msgstr "QToDo" @@ -14327,62 +14554,86 @@ msgstr "" #: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:1 +msgid "Quadrapassel" +msgstr "" + +#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2 msgid "Fit falling blocks together" msgstr "将下落的方块组合在一起" -#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2 -msgid "Quadrapassel" +#: ../menu-data/quake3:quake3.desktop.in.h:1 +msgid "Quake III Arena" msgstr "" -#: ../menu-data/quake3:quake3.desktop.in.h:1 +#: ../menu-data/quake3:quake3.desktop.in.h:2 msgid "Play the original Quake III Arena" msgstr "" -#: ../menu-data/quake3:quake3.desktop.in.h:2 -msgid "Quake III Arena" +#: ../menu-data/quake:quake-armagon.desktop.in.h:1 +msgid "Quake: Scourge of Armagon" msgstr "" -#: ../menu-data/quarry:quarry.desktop.in.h:1 -msgid "A multi-purpose board game GUI for Go, Amazons and Reversi" +#: ../menu-data/quake:quake-armagon.desktop.in.h:2 +msgid "Mission Pack 1 for the classic first person shooter" msgstr "" -#: ../menu-data/quarry:quarry.desktop.in.h:2 +#: ../menu-data/quake:quake-dissolution.desktop.in.h:1 +msgid "Quake: Dissolution of Eternity" +msgstr "" + +#: ../menu-data/quake:quake-dissolution.desktop.in.h:2 +msgid "Mission Pack 2 for the classic first person shooter" +msgstr "" + +#: ../menu-data/quake:quake.desktop.in.h:1 +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" +#: ../menu-data/quarry:quarry.desktop.in.h:2 +msgid "A multi-purpose board game GUI for Go, Amazons and Reversi" +msgstr "" + #: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:1 #: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:1 -#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1 -#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1 -msgid "Distributed IRC client with central core component" -msgstr "带有中央核心组件的分布式 IRC 客户端" - -#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2 -#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2 msgid "Quassel IRC (Client only)" msgstr "Quassel IRC (仅仅包含客户端)" +#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2 +#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2 #: ../menu-data/quassel-qt4:quassel.desktop.in.h:2 #: ../menu-data/quassel:kde4__quassel.desktop.in.h:2 +msgid "Distributed IRC client with central core component" +msgstr "带有中央核心组件的分布式 IRC 客户端" + +#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1 +#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1 msgid "Quassel IRC" msgstr "Quassel IRC" #: ../menu-data/qucs:qucs.desktop.in.h:1 -msgid "A Universal Circuit Simulator" -msgstr "一个通用电路仿真程序" - -#: ../menu-data/qucs:qucs.desktop.in.h:2 msgid "Qucs" msgstr "Qucs" -#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1 -msgid "A graphical interface for easily configuring Synergy" -msgstr "" +#: ../menu-data/qucs:qucs.desktop.in.h:2 +msgid "A Universal Circuit Simulator" +msgstr "一个通用电路仿真程序" -#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2 +#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1 msgid "QuickSynergy" msgstr "QuickSynergy" +#: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2 +msgid "A graphical interface for easily configuring Synergy" +msgstr "" + #: ../menu-data/quitcount:quitcount.desktop.in.h:1 msgid "QuitCount" msgstr "QuitCount" @@ -14392,13 +14643,13 @@ msgstr "一个显示您戒烟以来省下了多少开支的简单统计程序" #: ../menu-data/quodlibet:quodlibet.desktop.in.h:1 -msgid "Listen to, browse, or edit your audio collection" -msgstr "聆听、浏览或编辑您的音乐收藏" - -#: ../menu-data/quodlibet:quodlibet.desktop.in.h:2 msgid "Quod Libet" msgstr "Quod Libet" +#: ../menu-data/quodlibet:quodlibet.desktop.in.h:2 +msgid "Listen to, browse, or edit your audio collection" +msgstr "聆听、浏览或编辑您的音乐收藏" + #: ../menu-data/qutecom:qutecom.desktop.in.h:1 msgid "QuteCom" msgstr "QuteCom" @@ -14410,27 +14661,27 @@ msgstr "使用多种协议在互联网上与他人交谈和发送即时消息" #: ../menu-data/qutim:qutim.desktop.in.h:1 -msgid "Communicate over IM" -msgstr "通过即时消息交流" - -#: ../menu-data/qutim:qutim.desktop.in.h:2 msgid "qutIM" msgstr "qutIM" +#: ../menu-data/qutim:qutim.desktop.in.h:2 +msgid "Communicate over IM" +msgstr "通过即时消息交流" + #: ../menu-data/qv4l2:qv4l2.desktop.in.h:1 -msgid "Allow testing Video4Linux devices" +msgid "QT V4L2 test Utility" msgstr "" #: ../menu-data/qv4l2:qv4l2.desktop.in.h:2 -msgid "QT V4L2 test Utility" +msgid "Allow testing Video4Linux devices" msgstr "" #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:1 -msgid "Interfaccia grafica per ViaggiaTreno" +msgid "QViaggiaTreno" msgstr "" #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:2 -msgid "QViaggiaTreno" +msgid "Interfaccia grafica per ViaggiaTreno" msgstr "" #: ../menu-data/qwbfsmanager:QWBFSManager.desktop.in.h:1 @@ -14444,35 +14695,27 @@ msgstr "QWBFS 管理器是用来管理格式化为WBFS文件系统的硬盘的一种图形用户界面。" #: ../menu-data/qweborf:qweborf.desktop.in.h:1 -msgid "Shares files using the HTTP protocol" +msgid "qweborf" msgstr "" #: ../menu-data/qweborf:qweborf.desktop.in.h:2 -msgid "qweborf" +msgid "Shares files using the HTTP protocol" msgstr "" -#: ../menu-data/qwit:qwit.desktop.in.h:1 -msgid "Qt4 Twitter Client" -msgstr "Qt4 Twitter 客户端" - -#: ../menu-data/qwit:qwit.desktop.in.h:2 -msgid "Qwit" -msgstr "Qwit" - #: ../menu-data/qwo:qwo.desktop.in.h:1 -msgid "An input method for touchscreens" -msgstr "触摸屏的一个输入方式" - -#: ../menu-data/qwo:qwo.desktop.in.h:2 msgid "qwo" msgstr "qwo" +#: ../menu-data/qwo:qwo.desktop.in.h:2 +msgid "An input method for touchscreens" +msgstr "触摸屏的一个输入方式" + #: ../menu-data/qxw:qxw.desktop.in.h:1 -msgid "Construct crossword puzzles" +msgid "Qxw" msgstr "" #: ../menu-data/qxw:qxw.desktop.in.h:2 -msgid "Qxw" +msgid "Construct crossword puzzles" msgstr "" #: ../menu-data/r-cran-rcmdr:Rcmdr.desktop.in.h:1 @@ -14496,40 +14739,40 @@ msgstr "" #: ../menu-data/raincat:raincat.desktop.in.h:1 -msgid "2D puzzle game featuring a fuzzy little cat" +msgid "Raincat" msgstr "" #: ../menu-data/raincat:raincat.desktop.in.h:2 -msgid "Raincat" +msgid "2D puzzle game featuring a fuzzy little cat" msgstr "" #: ../menu-data/rakarrack:rakarrack.desktop.in.h:1 -msgid "Guitar Effects Processor" +msgid "Rakarrack" msgstr "" #: ../menu-data/rakarrack:rakarrack.desktop.in.h:2 -msgid "Rakarrack" +msgid "Guitar Effects Processor" msgstr "" #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:1 -msgid "" -"Download photos and videos from cameras, memory cards and Portable Storage " -"Devices" +msgid "Rapid Photo Downloader" msgstr "" #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:2 -msgid "Rapid Photo Downloader" +msgid "" +"Download photos and videos from cameras, memory cards and Portable Storage " +"Devices" msgstr "" #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:1 -#: ../menu-data/subcommander:subcommander.desktop.in.h:1 -msgid "A GUI Client for Subversion" -msgstr "Subversion 的一个 GUI 客户端" - -#: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2 msgid "RapidSVN" msgstr "RapidSVN" +#: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2 +#: ../menu-data/subcommander:subcommander.desktop.in.h:2 +msgid "A GUI Client for Subversion" +msgstr "Subversion 的一个 GUI 客户端" + #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:1 msgid "RasMol (GTK version)" msgstr "RasMol (GTK 版本)" @@ -14555,13 +14798,13 @@ msgstr "" #: ../menu-data/rbbr:rbbr.desktop.in.h:1 -msgid "Browse Ruby Classes and Modules" -msgstr "浏览 Ruby 类和模块" - -#: ../menu-data/rbbr:rbbr.desktop.in.h:2 msgid "Ruby Browser" msgstr "Ruby 浏览器" +#: ../menu-data/rbbr:rbbr.desktop.in.h:2 +msgid "Browse Ruby Classes and Modules" +msgstr "浏览 Ruby 类和模块" + #: ../menu-data/recoll:recoll-searchgui.desktop.in.h:1 msgid "Find documents by specifying search terms" msgstr "通过指定搜索词查找文档" @@ -14574,75 +14817,75 @@ msgid "RecordItNow" msgstr "RecordItNow" -#: ../menu-data/rednotebook:rednotebook.desktop.in.h:1 -msgid "Daily journal with calendar, templates and keyword searching " -msgstr "" - #. Encoding=UTF-­8 #Encoding causes problems -#: ../menu-data/rednotebook:rednotebook.desktop.in.h:3 +#: ../menu-data/rednotebook:rednotebook.desktop.in.h:2 msgid "RedNotebook" msgstr "RedNotebook" -#: ../menu-data/referencer:referencer.desktop.in.h:1 -msgid "Document organiser" -msgstr "文档管理器" +#: ../menu-data/rednotebook:rednotebook.desktop.in.h:3 +msgid "Daily journal with calendar, templates and keyword searching " +msgstr "" -#: ../menu-data/referencer:referencer.desktop.in.h:2 +#: ../menu-data/referencer:referencer.desktop.in.h:1 msgid "Referencer" msgstr "" -#: ../menu-data/regexxer:regexxer.desktop.in.h:1 -msgid "Search and replace using regular expressions" -msgstr "使用正则表达式搜索和替换" +#: ../menu-data/referencer:referencer.desktop.in.h:2 +msgid "Document organiser" +msgstr "文档管理器" -#: ../menu-data/regexxer:regexxer.desktop.in.h:2 +#: ../menu-data/regexxer:regexxer.desktop.in.h:1 msgid "regexxer Search Tool" msgstr "regexxer 搜索工具" -#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1 -msgid "A Normal Surface Theory Calculator" -msgstr "一个正常的表面理论计算器" +#: ../menu-data/regexxer:regexxer.desktop.in.h:2 +msgid "Search and replace using regular expressions" +msgstr "使用正则表达式搜索和替换" -#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2 +#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1 msgid "Regina" msgstr "Regina" -#: ../menu-data/reinteract:reinteract.desktop.in.h:1 -msgid "Interactive Python shell" -msgstr "交互式 Python shell" +#: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2 +msgid "A Normal Surface Theory Calculator" +msgstr "一个正常的表面理论计算器" -#: ../menu-data/reinteract:reinteract.desktop.in.h:2 +#: ../menu-data/reinteract:reinteract.desktop.in.h:1 msgid "Reinteract" msgstr "Reinteract" -#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2 +#: ../menu-data/reinteract:reinteract.desktop.in.h:2 +msgid "Interactive Python shell" +msgstr "交互式 Python shell" + +#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1 msgid "rekonq" msgstr "rekonq" #: ../menu-data/relational:relational.desktop.in.h:1 -msgid "Learn and experiment relational algebra" +msgid "Relational" msgstr "" #: ../menu-data/relational:relational.desktop.in.h:2 -msgid "Relational" +msgid "Learn and experiment relational algebra" msgstr "" #: ../menu-data/reminiscence:reminiscence.desktop.in.h:1 -msgid "A port of FlashBack game engine" +msgid "REminiscence" msgstr "" #: ../menu-data/reminiscence:reminiscence.desktop.in.h:2 -msgid "REminiscence" +msgid "A port of FlashBack game engine" msgstr "" #: ../menu-data/remmina:remmina.desktop.in.h:1 -msgid "Connect to remote desktops" -msgstr "连接到远程桌面" - -#: ../menu-data/remmina:remmina.desktop.in.h:2 msgid "Remmina Remote Desktop Client" msgstr "Remmina 远程桌面客户端" +#: ../menu-data/remmina:remmina.desktop.in.h:2 +msgid "Connect to remote desktops" +msgstr "连接到远程桌面" + #: ../menu-data/renpy-demo:renpy-demo.desktop.in.h:1 msgid "Ren'Py Demo" msgstr "" @@ -14668,13 +14911,13 @@ msgstr "" #: ../menu-data/resapplet:resapplet.desktop.in.h:1 -msgid "Change your screen resolution" -msgstr "改变你的屏幕分辨率" - -#: ../menu-data/resapplet:resapplet.desktop.in.h:2 msgid "Resolution Switcher" msgstr "分辨率切换器" +#: ../menu-data/resapplet:resapplet.desktop.in.h:2 +msgid "Change your screen resolution" +msgstr "改变你的屏幕分辨率" + #: ../menu-data/retext:retext.desktop.in.h:1 msgid "ReText" msgstr "" @@ -14684,13 +14927,13 @@ msgstr "" #: ../menu-data/revelation:revelation.desktop.in.h:1 -msgid "Organize and secure your passwords" -msgstr "管理和保护您的密码" - -#: ../menu-data/revelation:revelation.desktop.in.h:2 msgid "Revelation Password Manager" msgstr "Revelation 密码管理器" +#: ../menu-data/revelation:revelation.desktop.in.h:2 +msgid "Organize and secure your passwords" +msgstr "管理和保护您的密码" + #: ../menu-data/rfdump:rfdump.desktop.in.h:1 msgid "RFDump" msgstr "RFDump" @@ -14700,13 +14943,13 @@ msgstr "直接与 RFID 读卡器进行交互操作的工具" #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:1 -msgid "Very basic painting program" -msgstr "非常基本的绘图程序" - -#: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2 msgid "rgbPaint" msgstr "rgbPaint" +#: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2 +msgid "Very basic painting program" +msgstr "非常基本的绘图程序" + #: ../menu-data/rhinote:rhinote.desktop.in.h:1 msgid "Rhinote" msgstr "Rhinote" @@ -14715,7 +14958,7 @@ msgid "Virtual sticky-notes" msgstr "" -#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2 +#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1 msgid "Rhythmbox Music Player" msgstr "" @@ -14728,62 +14971,62 @@ msgstr "" #: ../menu-data/ripoff:ripoff.desktop.in.h:1 -msgid "Rip audio from your CDs" +msgid "RipOff" msgstr "" #: ../menu-data/ripoff:ripoff.desktop.in.h:2 -msgid "RipOff" +msgid "Rip audio from your CDs" msgstr "" #: ../menu-data/ripperx:ripperx.desktop.in.h:1 -msgid "Rip Cds" +msgid "Ripper X" msgstr "" #: ../menu-data/ripperx:ripperx.desktop.in.h:2 -msgid "Ripper X" +msgid "Rip Cds" msgstr "" #: ../menu-data/ristretto:ristretto.desktop.in.h:1 -msgid "Look at your images's easily" +msgid "Ristretto Image Viewer" msgstr "" #: ../menu-data/ristretto:ristretto.desktop.in.h:2 -msgid "Ristretto Image Viewer" +msgid "Look at your images easily" msgstr "" #: ../menu-data/rkward:kde4__rkward.desktop.in.h:1 -msgid "GUI for the R-project" -msgstr "" - -#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2 msgid "RKWard" msgstr "RKWard" -#: ../menu-data/rlplot:rlplot.desktop.in.h:1 -msgid "Generate publication quality graphs" -msgstr "生成出版质量的图形" +#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2 +msgid "GUI for the R-project" +msgstr "" -#: ../menu-data/rlplot:rlplot.desktop.in.h:2 +#: ../menu-data/rlplot:rlplot.desktop.in.h:1 msgid "Rlplot Graph Generator" msgstr "" -#. GNOME and KDE 3 uses Comment. -#: ../menu-data/rlvm:rlvm.desktop.in.h:2 -msgid "RealLive Emulator" -msgstr "" +#: ../menu-data/rlplot:rlplot.desktop.in.h:2 +msgid "Generate publication quality graphs" +msgstr "生成出版质量的图形" -#: ../menu-data/rlvm:rlvm.desktop.in.h:3 +#: ../menu-data/rlvm:rlvm.desktop.in.h:1 msgid "rlvm" msgstr "" -#: ../menu-data/robocode:robocode.desktop.in.h:1 -msgid "Java programming game based on battle tanks" +#. GNOME and KDE 3 uses Comment. +#: ../menu-data/rlvm:rlvm.desktop.in.h:3 +msgid "RealLive Emulator" msgstr "" -#: ../menu-data/robocode:robocode.desktop.in.h:2 +#: ../menu-data/robocode:robocode.desktop.in.h:1 msgid "Robocode" msgstr "Robocode" +#: ../menu-data/robocode:robocode.desktop.in.h:2 +msgid "Java programming game based on battle tanks" +msgstr "" + #: ../menu-data/robocut:robocut.desktop.in.h:1 msgid "Robocut" msgstr "" @@ -14793,13 +15036,13 @@ msgstr "" #: ../menu-data/rocs:kde4__rocs.desktop.in.h:1 -msgid "Graph Theory Tool for Professors and Students." -msgstr "专家和学生用的图论工具" - -#: ../menu-data/rocs:kde4__rocs.desktop.in.h:2 msgid "Rocs" msgstr "Rocs" +#: ../menu-data/rocs:kde4__rocs.desktop.in.h:2 +msgid "Graph Theory Tool for Professors and Students." +msgstr "专家和学生用的图论工具" + #: ../menu-data/rootstock-gtk:rootstock.desktop.in.h:1 msgid "RootStock" msgstr "" @@ -14813,12 +15056,12 @@ msgstr "Rosegarden" #: ../menu-data/rott:rott.desktop.in.h:1 -msgid "" -"A high quality, fast scrolling first-person perspective 3D action game" +msgid "Rise of the Triad" msgstr "" #: ../menu-data/rott:rott.desktop.in.h:2 -msgid "Rise of the Triad" +msgid "" +"A high quality, fast scrolling first-person perspective 3D action game" msgstr "" #: ../menu-data/roxterm:roxterm.desktop.in.h:1 @@ -14826,37 +15069,37 @@ msgstr "ROXTerm" #: ../menu-data/rrootage:rrootage.desktop.in.h:1 -msgid "Destroy autocreated battleships" -msgstr "" - -#: ../menu-data/rrootage:rrootage.desktop.in.h:2 msgid "rRootage" msgstr "rRootage" -#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1 -msgid "Makes sure you rest now and then" -msgstr "时常提醒您休息" +#: ../menu-data/rrootage:rrootage.desktop.in.h:2 +msgid "Destroy autocreated battleships" +msgstr "" -#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2 +#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1 msgid "RSIBreak" msgstr "RSIBreak" -#: ../menu-data/rubrica:rubrica2.desktop.in.h:1 -msgid "Manage contacts and addresses" -msgstr "管理联系人和地址" +#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2 +msgid "Makes sure you rest now and then" +msgstr "时常提醒您休息" -#: ../menu-data/rubrica:rubrica2.desktop.in.h:2 +#: ../menu-data/rubrica:rubrica2.desktop.in.h:1 msgid "Rubrica Addressbook" msgstr "Rubrica 地址薄" -#: ../menu-data/rutilt:rutilt.desktop.in.h:1 -msgid "Manage your wireless network interfaces" -msgstr "管理您的无线网络接口" +#: ../menu-data/rubrica:rubrica2.desktop.in.h:2 +msgid "Manage contacts and addresses" +msgstr "管理联系人和地址" -#: ../menu-data/rutilt:rutilt.desktop.in.h:2 +#: ../menu-data/rutilt:rutilt.desktop.in.h:1 msgid "RutilT WLAN Manager" msgstr "RutilT WLAN 管理器" +#: ../menu-data/rutilt:rutilt.desktop.in.h:2 +msgid "Manage your wireless network interfaces" +msgstr "管理您的无线网络接口" + #: ../menu-data/rygel:rygel.desktop.in.h:1 msgid "Rygel" msgstr "Rygel" @@ -14865,20 +15108,12 @@ msgid "UPnP/DLNA Services" msgstr "UPnP/DLNA 服务" -#: ../menu-data/sabayon:sabayon.desktop.in.h:1 -msgid "Establish and Edit Profiles for Users" -msgstr "建立和编辑用户个人资料" - -#: ../menu-data/sabayon:sabayon.desktop.in.h:2 -msgid "User Profile Editor" -msgstr "用户个人资料编辑器" - #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:1 -msgid "Download from usenet" +msgid "SABnzbd+" msgstr "" #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:2 -msgid "SABnzbd+" +msgid "Download from usenet" msgstr "" #: ../menu-data/sadms:sadms.desktop.in.h:1 @@ -14894,55 +15129,47 @@ msgstr "查看和编辑地理信息" #: ../menu-data/sagasu:sagasu.desktop.in.h:1 -msgid "GNOME tool to find strings in a set of files" -msgstr "在一系列文件中查看字符串的 GNOME 工具" - -#: ../menu-data/sagasu:sagasu.desktop.in.h:2 msgid "Sagasu" msgstr "Sagasu" -#: ../menu-data/sagcad:sagcad.desktop.in.h:1 -msgid "Draw and create" -msgstr "绘画创作" +#: ../menu-data/sagasu:sagasu.desktop.in.h:2 +msgid "GNOME tool to find strings in a set of files" +msgstr "在一系列文件中查看字符串的 GNOME 工具" -#: ../menu-data/sagcad:sagcad.desktop.in.h:2 +#: ../menu-data/sagcad:sagcad.desktop.in.h:1 msgid "SagCAD" msgstr "SagCAD" +#: ../menu-data/sagcad:sagcad.desktop.in.h:2 +msgid "Draw and create" +msgstr "绘画创作" + #: ../menu-data/sailcut:sailcut.desktop.in.h:1 -msgid "Sail Design Application" +msgid "Sailcut CAD" msgstr "" #: ../menu-data/sailcut:sailcut.desktop.in.h:2 -msgid "Sailcut CAD" +msgid "Sail Design Application" msgstr "" #: ../menu-data/sakura:sakura.desktop.in.h:1 msgid "Sakura" msgstr "" -#: ../menu-data/salasaga:salasaga.desktop.in.h:1 -msgid "Create eLearning for desktop applications" -msgstr "" - -#: ../menu-data/salasaga:salasaga.desktop.in.h:2 -msgid "Salasaga" -msgstr "" - #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:1 -msgid "Create 3D games and worlds" +msgid "Platinum Arts Sandbox Gamemaker" msgstr "" #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:2 -msgid "Platinum Arts Sandbox Gamemaker" +msgid "Create 3D games and worlds" msgstr "" #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:1 -msgid "A networked, fast-paced 3D first-person shooter" +msgid "Sauerbraten" msgstr "" #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:2 -msgid "Sauerbraten" +msgid "A networked, fast-paced 3D first-person shooter" msgstr "" #: ../menu-data/sawfish:sawfish.desktop.in.h:1 @@ -14950,11 +15177,11 @@ msgstr "" #: ../menu-data/scantailor:scantailor.desktop.in.h:1 -msgid "Interactive post-processing tool for scanned pages" +msgid "Scan Tailor" msgstr "" #: ../menu-data/scantailor:scantailor.desktop.in.h:2 -msgid "Scan Tailor" +msgid "Interactive post-processing tool for scanned pages" msgstr "" #: ../menu-data/scenic:scenic.desktop.in.h:1 @@ -14966,13 +15193,13 @@ msgstr "" #: ../menu-data/scidavis:scidavis.desktop.in.h:1 -msgid "Application for scientific data analysis and visualization" -msgstr "科学数据分析和可视化应用程序" - -#: ../menu-data/scidavis:scidavis.desktop.in.h:2 msgid "SciDAVis" msgstr "SciDAVis" +#: ../menu-data/scidavis:scidavis.desktop.in.h:2 +msgid "Application for scientific data analysis and visualization" +msgstr "科学数据分析和可视化应用程序" + #: ../menu-data/scilab-cli:scilab-cli.desktop.in.h:1 #: ../menu-data/scilab:scilab-adv-cli.desktop.in.h:1 #: ../menu-data/scilab:scilab.desktop.in.h:1 @@ -14999,36 +15226,33 @@ msgid "Setup utility for Smart Common Input Method platform" msgstr "智能通用输入法平台(SCIM)的设置工具" +#: ../menu-data/scite:SciTE.desktop.in.h:1 #: ../menu-data/scite:scite.desktop.in.h:1 -msgid "Programming editor" -msgstr "程序编辑器" - -#: ../menu-data/scite:scite.desktop.in.h:2 msgid "SciTE Text Editor" msgstr "SciTE 文本编辑器" -#: ../menu-data/scolasync:scolasync.desktop.in.h:1 -msgid "Interactive tool to copy files to or from USB storage media" +#: ../menu-data/scite:SciTE.desktop.in.h:2 +msgid "Edit your source files" msgstr "" -#: ../menu-data/scolasync:scolasync.desktop.in.h:2 +#: ../menu-data/scite:scite.desktop.in.h:2 +msgid "Programming editor" +msgstr "程序编辑器" + +#: ../menu-data/scolasync:scolasync.desktop.in.h:1 msgid "ScolaSync" msgstr "" -#: ../menu-data/scolily:scolily.desktop.in.h:1 -msgid "Create scores on-the-fly by recording from mic" +#: ../menu-data/scolasync:scolasync.desktop.in.h:2 +msgid "Interactive tool to copy files to or from USB storage media" msgstr "" -#: ../menu-data/scolily:scolily.desktop.in.h:2 +#: ../menu-data/scolily:scolily.desktop.in.h:1 msgid "Scolily Score Recorder" msgstr "" -#: ../menu-data/scorched3d:scorched3d.desktop.in.h:1 -msgid "3D artillery game similar to Scorched Earth" -msgstr "" - -#: ../menu-data/scorched3d:scorched3d.desktop.in.h:2 -msgid "Scorched 3D" +#: ../menu-data/scolily:scolily.desktop.in.h:2 +msgid "Create scores on-the-fly by recording from mic" msgstr "" #: ../menu-data/screenie-qt:screenie-qt.desktop.in.h:1 @@ -15040,70 +15264,74 @@ msgstr "" #: ../menu-data/screenkey:screenkey.desktop.in.h:1 -msgid "Screencast your keys" +msgid "Screenkey" msgstr "" #: ../menu-data/screenkey:screenkey.desktop.in.h:2 -msgid "Screenkey" +msgid "Screencast your keys" msgstr "" #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:1 -msgid "A graphical tool to manage your Screenlets." +msgid "Screenlets" msgstr "" #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:2 -msgid "Screenlets" +msgid "A graphical tool to manage your Screenlets." msgstr "" -#: ../menu-data/scribes:scribes.desktop.in.h:2 +#: ../menu-data/screenruler:screenruler.desktop.in.h:2 +msgid "Measure objects on your screen" +msgstr "测量屏幕对象" + +#: ../menu-data/scribes:scribes.desktop.in.h:1 msgid "Scribes Text Editor" msgstr "Scribes 文本编辑器" #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:1 -#: ../menu-data/scribus:scribus.desktop.in.h:1 -msgid "Page Layout and Publication" -msgstr "页面布局和出版" - -#: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2 msgid "ScribusNG" msgstr "ScribusNG" +#: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2 #: ../menu-data/scribus:scribus.desktop.in.h:2 +msgid "Page Layout and Publication" +msgstr "页面布局和出版" + +#: ../menu-data/scribus:scribus.desktop.in.h:1 msgid "Scribus" msgstr "" #: ../menu-data/scummvm-data:scummvm.desktop.in.h:1 -msgid "Interpreter for several adventure games" +msgid "ScummVM" msgstr "" #: ../menu-data/scummvm-data:scummvm.desktop.in.h:2 -msgid "ScummVM" +msgid "Interpreter for several adventure games" msgstr "" #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:1 -msgid "Breakout Game" +msgid "SDL-Ball" msgstr "" #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:2 -msgid "SDL-Ball" +msgid "Breakout Game" msgstr "" #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:1 -msgid "Multiplatform basic interpreter for the development of videogames" +msgid "sdlBasic" msgstr "" #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:2 -msgid "sdlBasic" +msgid "Multiplatform basic interpreter for the development of videogames" msgstr "" #: ../menu-data/seahorse:seahorse.desktop.in.h:1 -msgid "Manage your passwords and encryption keys" -msgstr "管理您的密码和加密密钥" - -#: ../menu-data/seahorse:seahorse.desktop.in.h:2 msgid "Passwords and Keys" msgstr "" +#: ../menu-data/seahorse:seahorse.desktop.in.h:2 +msgid "Manage your passwords and encryption keys" +msgstr "管理您的密码和加密密钥" + #: ../menu-data/seamonkey:seamonkey.desktop.in.h:1 msgid "SeaMonkey" msgstr "" @@ -15117,62 +15345,70 @@ msgstr "查找和恢复" #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:1 -msgid "Regular expression power search utilty" -msgstr "" - -#: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2 msgid "Searchmonkey" msgstr "Searchmonkey" +#: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2 +msgid "Regular expression power search utilty" +msgstr "" + #: ../menu-data/seaview:seaview.desktop.in.h:1 -msgid "" -"Edits multiple sequence alignments and prints them in PostScript format." +msgid "SeaView" msgstr "" #: ../menu-data/seaview:seaview.desktop.in.h:2 -msgid "SeaView" +msgid "" +"Edits multiple sequence alignments and prints them in PostScript format." msgstr "" #: ../menu-data/secpanel:secpanel.desktop.in.h:1 -msgid "A graphical user interface for SSH and SCP" -msgstr "SSH 和 SCP 的一个图形用户界面" - -#: ../menu-data/secpanel:secpanel.desktop.in.h:2 msgid "SecPanel" msgstr "SecPanel" -#: ../menu-data/semantik:kde4__semantik.desktop.in.h:1 -msgid "Mind mapping software" -msgstr "思维导图工具" +#: ../menu-data/secpanel:secpanel.desktop.in.h:2 +msgid "A graphical user interface for SSH and SCP" +msgstr "SSH 和 SCP 的一个图形用户界面" -#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2 +#: ../menu-data/semantik:kde4__semantik.desktop.in.h:1 msgid "Semantik" msgstr "Semantik" +#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2 +msgid "Mind mapping software" +msgstr "思维导图工具" + #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:1 -msgid "Action launcher based on system activity" +msgid "Sentinella" msgstr "" #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:2 -msgid "Sentinella" +msgid "Action launcher based on system activity" msgstr "" #: ../menu-data/seq24:seq24.desktop.in.h:1 -msgid "MIDI Sequencer" +msgid "Seq24" msgstr "" #: ../menu-data/seq24:seq24.desktop.in.h:2 -msgid "Seq24" +msgid "MIDI Sequencer" msgstr "" #: ../menu-data/series60-remote:series60-remote.desktop.in.h:1 -msgid "Application to manage your S60 mobile phone" +msgid "Series60-Remote" msgstr "" #: ../menu-data/series60-remote:series60-remote.desktop.in.h:2 -msgid "Series60-Remote" +msgid "Application to manage your S60 mobile phone" msgstr "" +#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:1 +msgid "SFLphone VoIP Client" +msgstr "" + +#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:2 +msgid "Call and receive calls with SIP or IAX protocols" +msgstr "使用 SIP 或 IAX 协议拨打和接听电话" + #: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:1 msgid "Black Box" msgstr "黑盒" @@ -15219,15 +15455,15 @@ msgstr "" #: ../menu-data/sgt-puzzles:filling.desktop.in.h:1 +msgid "Filling" +msgstr "Filling" + +#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2 msgid "" "Fill in digits so that each connected region of squares containing the same " "digit has an area equal to that digit" msgstr "" -#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2 -msgid "Filling" -msgstr "Filling" - #: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:1 msgid "Flip" msgstr "Flip" @@ -15237,37 +15473,37 @@ msgstr "点亮所有的方块" #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:1 +msgid "Galaxies" +msgstr "Galaxies" + +#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2 msgid "" "Draw edges along the grid lines which divide the rectangle under certain " "rules" msgstr "" -#: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2 -msgid "Galaxies" -msgstr "Galaxies" - #: ../menu-data/sgt-puzzles:guess.desktop.in.h:1 -msgid "Game similar to the famous 'Mastermind'" -msgstr "" - -#: ../menu-data/sgt-puzzles:guess.desktop.in.h:2 msgid "Guess" msgstr "Guess" -#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1 -msgid "Collect all the gems without running into any mines" -msgstr "避开地雷,收集到所有的宝石" +#: ../menu-data/sgt-puzzles:guess.desktop.in.h:2 +msgid "Game similar to the famous 'Mastermind'" +msgstr "" -#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1 msgid "Inertia" msgstr "Inertia" +#: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2 +msgid "Collect all the gems without running into any mines" +msgstr "避开地雷,收集到所有的宝石" + #: ../menu-data/sgt-puzzles:keen.desktop.in.h:1 -msgid "Game based on KenKen" +msgid "Keen" msgstr "" #: ../menu-data/sgt-puzzles:keen.desktop.in.h:2 -msgid "Keen" +msgid "Game based on KenKen" msgstr "" #: ../menu-data/sgt-puzzles:lightup.desktop.in.h:1 @@ -15279,11 +15515,11 @@ msgstr "" #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:1 -msgid "Draw lines around a digit according to the number in it" +msgid "Loopy" msgstr "" #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2 -msgid "Loopy" +msgid "Draw lines around a digit according to the number in it" msgstr "" #: ../menu-data/sgt-puzzles:magnets.desktop.in.h:1 @@ -15295,13 +15531,13 @@ msgstr "" #: ../menu-data/sgt-puzzles:map.desktop.in.h:1 -msgid "" -"Colour each region with one of four colours so that no two regions sharing a " -"boundary have the same colour" +msgid "Map" msgstr "" #: ../menu-data/sgt-puzzles:map.desktop.in.h:2 -msgid "Map" +msgid "" +"Colour each region with one of four colours so that no two regions sharing a " +"boundary have the same colour" msgstr "" #: ../menu-data/sgt-puzzles:netgame.desktop.in.h:1 @@ -15313,22 +15549,22 @@ msgstr "" #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:1 -msgid "" -"Game combining the grid generation of Net with the movement of Sixteen" -msgstr "" - -#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2 msgid "Netslide" msgstr "Netslide" -#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1 -msgid "Fill in the entire grid black or white" +#: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2 +msgid "" +"Game combining the grid generation of Net with the movement of Sixteen" msgstr "" -#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1 msgid "Pattern" msgstr "Pattern" +#: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2 +msgid "Fill in the entire grid black or white" +msgstr "" + #: ../menu-data/sgt-puzzles:pegs.desktop.in.h:1 msgid "Pegs" msgstr "Pegs" @@ -15338,11 +15574,11 @@ msgstr "" #: ../menu-data/sgt-puzzles:range.desktop.in.h:1 -msgid "Fill the grid so the range of each numbered square matches the number" +msgid "Range" msgstr "" #: ../menu-data/sgt-puzzles:range.desktop.in.h:2 -msgid "Range" +msgid "Fill the grid so the range of each numbered square matches the number" msgstr "" #: ../menu-data/sgt-puzzles:rect.desktop.in.h:1 @@ -15355,45 +15591,45 @@ msgstr "" #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:1 -msgid "" -"Clear the grid of coloured squares by highlighting contiguous regions of " -"more than one coloured square" +msgid "Same Game" msgstr "" #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2 -msgid "Same Game" +msgid "" +"Clear the grid of coloured squares by highlighting contiguous regions of " +"more than one coloured square" msgstr "" #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:1 -msgid "Link the squares of a grid according to the arrows on them" +msgid "Signpost" msgstr "" #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2 -msgid "Signpost" +msgid "Link the squares of a grid according to the arrows on them" msgstr "" #: ../menu-data/sgt-puzzles:singles.desktop.in.h:1 -msgid "Puzzle game based on Hitori" +msgid "Singles" msgstr "" #: ../menu-data/sgt-puzzles:singles.desktop.in.h:2 -msgid "Singles" +msgid "Puzzle game based on Hitori" msgstr "" #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1 -msgid "Game similar to Fifteen, but with a different type of move" +msgid "Sixteen" msgstr "" #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2 -msgid "Sixteen" +msgid "Game similar to Fifteen, but with a different type of move" msgstr "" #: ../menu-data/sgt-puzzles:slant.desktop.in.h:1 -msgid "Draw a diagonal line and choose which way each line slants" +msgid "Slant" msgstr "" #: ../menu-data/sgt-puzzles:slant.desktop.in.h:2 -msgid "Slant" +msgid "Draw a diagonal line and choose which way each line slants" msgstr "" #: ../menu-data/sgt-puzzles:solo.desktop.in.h:1 @@ -15405,43 +15641,43 @@ msgstr "" #: ../menu-data/sgt-puzzles:tents.desktop.in.h:1 -msgid "Place tents in some of the remaining squares, under some conditions" +msgid "Tents" msgstr "" #: ../menu-data/sgt-puzzles:tents.desktop.in.h:2 -msgid "Tents" +msgid "Place tents in some of the remaining squares, under some conditions" msgstr "" #: ../menu-data/sgt-puzzles:towers.desktop.in.h:1 -msgid "Puzzle game based on Skyscrapers" +msgid "Towers" msgstr "" #: ../menu-data/sgt-puzzles:towers.desktop.in.h:2 -msgid "Towers" +msgid "Puzzle game based on Skyscrapers" msgstr "" #: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1 -msgid "Arrange the numbers into ascending order " -msgstr "将数字升序排列 " - -#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2 msgid "Twiddle" msgstr "Twiddle" -#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1 -msgid "Fully populate the grid with numbers under some conditions" -msgstr "" +#: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2 +msgid "Arrange the numbers into ascending order " +msgstr "将数字升序排列 " -#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2 +#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1 msgid "Unequal" msgstr "Unequal" +#: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2 +msgid "Fully populate the grid with numbers under some conditions" +msgstr "" + #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:1 -msgid "Position the points so that no line crosses another" +msgid "Untangle" msgstr "" #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2 -msgid "Untangle" +msgid "Position the points so that no line crosses another" msgstr "" #: ../menu-data/shisen.app:Shisen.desktop.in.h:1 @@ -15449,11 +15685,11 @@ msgstr "Shisen" #: ../menu-data/shoes:shoes.desktop.in.h:1 -msgid "Interpreter for Shoes programs" +msgid "Shoes" msgstr "" #: ../menu-data/shoes:shoes.desktop.in.h:2 -msgid "Shoes" +msgid "Interpreter for Shoes programs" msgstr "" #: ../menu-data/shotwell:shotwell.desktop.in.h:1 @@ -15464,32 +15700,32 @@ msgid "Shotwell Photo Manager" msgstr "Shotwell 照片管理器" -#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2 +#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1 msgid "showFoto" msgstr "showFoto" #: ../menu-data/showq:showq.desktop.in.h:1 -msgid "MIDI controllable audio player" +msgid "ShowQ" msgstr "" #: ../menu-data/showq:showq.desktop.in.h:2 -msgid "ShowQ" +msgid "MIDI controllable audio player" msgstr "" #: ../menu-data/shutter:shutter.desktop.in.h:1 -msgid "Capture an area of the screen" -msgstr "" +msgid "Shutter" +msgstr "Shutter" #: ../menu-data/shutter:shutter.desktop.in.h:2 -msgid "Capture the current active window" +msgid "Capture, edit and share screenshots" msgstr "" #: ../menu-data/shutter:shutter.desktop.in.h:3 -msgid "Capture the entire screen" +msgid "Capture an area of the screen" msgstr "" #: ../menu-data/shutter:shutter.desktop.in.h:4 -msgid "Capture, edit and share screenshots" +msgid "Capture the entire screen" msgstr "" #: ../menu-data/shutter:shutter.desktop.in.h:5 @@ -15497,8 +15733,8 @@ msgstr "" #: ../menu-data/shutter:shutter.desktop.in.h:6 -msgid "Shutter" -msgstr "Shutter" +msgid "Capture the current active window" +msgstr "" #: ../menu-data/sigviewer:sigviewer.desktop.in.h:1 msgid "SigViewer" @@ -15509,86 +15745,78 @@ "Viewer for biosignals such as EEG, EMG, and ECG. http://sigviewer.sf.net" msgstr "" -#: ../menu-data/sim-qt:kde__sim.desktop.in.h:1 -msgid "SIM Instant Messenger" -msgstr "SIM 即时通讯" - -#: ../menu-data/sim-qt:kde__sim.desktop.in.h:2 -msgid "Sim-IM" -msgstr "Sim-IM" - #: ../menu-data/simdock:simdock.desktop.in.h:1 -msgid "A dockbar for GNOME" +msgid "SimDock" msgstr "" #: ../menu-data/simdock:simdock.desktop.in.h:2 -msgid "SimDock" +msgid "A dockbar for GNOME" msgstr "" #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:1 -msgid "Reduce and rotate images in three-four clicks." +msgid "Simple Image Reducer" msgstr "" #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:2 -msgid "Simple Image Reducer" +msgid "Reduce and rotate images in three-four clicks." msgstr "" #: ../menu-data/simple-scan:simple-scan.desktop.in.h:1 -msgid "Scan Documents" -msgstr "扫描文档" - -#: ../menu-data/simple-scan:simple-scan.desktop.in.h:2 msgid "Simple Scan" msgstr "扫描易" +#: ../menu-data/simple-scan:simple-scan.desktop.in.h:2 +msgid "Scan Documents" +msgstr "扫描文档" + #: ../menu-data/sineshaper:sineshaper.desktop.in.h:1 -msgid "Monophonic synth plugin with two oscillators and waveshapers" +msgid "Sineshaper" msgstr "" #: ../menu-data/sineshaper:sineshaper.desktop.in.h:2 -msgid "Sineshaper" +msgid "Monophonic synth plugin with two oscillators and waveshapers" msgstr "" #: ../menu-data/singularity:singularity.desktop.in.h:1 -msgid "Become the singularity" +msgid "Singularity" msgstr "" #: ../menu-data/singularity:singularity.desktop.in.h:2 -msgid "Singularity" +msgid "Become the singularity" msgstr "" #: ../menu-data/sitplus:sitplus.desktop.in.h:1 -msgid "Framework for ludic-therapeutic activities" +msgid "Sitplus" msgstr "" #: ../menu-data/sitplus:sitplus.desktop.in.h:2 -msgid "Sitplus" +msgid "Framework for ludic-therapeutic activities" msgstr "" #: ../menu-data/sixpack:SIXpack.desktop.in.h:1 -msgid "EXAFS data analysis" -msgstr "EXAFS 数据分析器" - -#: ../menu-data/sixpack:SIXpack.desktop.in.h:2 msgid "SIXpack" msgstr "SIXpack" -#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1 -msgid "Scan and save images" -msgstr "搜索并且保存图片" +#: ../menu-data/sixpack:SIXpack.desktop.in.h:2 +msgid "EXAFS data analysis" +msgstr "EXAFS 数据分析器" -#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2 +#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1 msgid "Skanlite" msgstr "Skanlite" -#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1 -msgid "Manage your money" -msgstr "" +#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2 +msgid "Scan and save images" +msgstr "搜索并且保存图片" -#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2 +#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1 msgid "skrooge" msgstr "skrooge" +#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2 +msgid "Manage your money" +msgstr "" + #: ../menu-data/slashem-gtk:slashem-gtk.desktop.in.h:1 msgid "GTK Slash'EM" msgstr "" @@ -15606,19 +15834,11 @@ msgstr "" #: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:1 -msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)" -msgstr "" - -#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2 msgid "X Slash'EM" msgstr "" -#: ../menu-data/slicer:slicer.desktop.in.h:1 -msgid "3D Slicer" -msgstr "" - -#: ../menu-data/slicer:slicer.desktop.in.h:2 -msgid "Start 3D Slicer" +#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2 +msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)" msgstr "" #: ../menu-data/slimevolley:slimevolley.desktop.in.h:1 @@ -15638,69 +15858,69 @@ msgstr "" #: ../menu-data/slingshot:slingshot.desktop.in.h:1 -msgid "2D space shooting game with gravity" +msgid "Slingshot" msgstr "" #: ../menu-data/slingshot:slingshot.desktop.in.h:2 -msgid "Slingshot" +msgid "2D space shooting game with gravity" msgstr "" #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:1 -msgid "Edit SLUDGE floor plans" +msgid "SLUDGE Floor Maker" msgstr "" #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:2 -msgid "SLUDGE Floor Maker" +msgid "Edit SLUDGE floor plans" msgstr "" #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:1 -msgid "Manage and compile SLUDGE projects" +msgid "SLUDGE Project Manager" msgstr "" #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:2 -msgid "SLUDGE Project Manager" +msgid "Manage and compile SLUDGE projects" msgstr "" #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:1 -msgid "Edit SLUDGE sprite banks" +msgid "SLUDGE Sprite Bank Editor" msgstr "" #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:2 -msgid "SLUDGE Sprite Bank Editor" +msgid "Edit SLUDGE sprite banks" msgstr "" #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:1 -msgid "Edit SLUDGE translation files" +msgid "SLUDGE Translation Editor" msgstr "" #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:2 -msgid "SLUDGE Translation Editor" +msgid "Edit SLUDGE translation files" msgstr "" #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:1 -msgid "Edit SLUDGE z-buffer files" +msgid "SLUDGE Z-Buffer Maker" msgstr "" #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:2 -msgid "SLUDGE Z-Buffer Maker" +msgid "Edit SLUDGE z-buffer files" msgstr "" #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:1 -msgid "Play SLUDGE games" +msgid "SLUDGE Engine" msgstr "" #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:2 -msgid "SLUDGE Engine" +msgid "Play SLUDGE games" msgstr "" #: ../menu-data/sm:sm.desktop.in.h:1 -msgid "Displays a short text fullscreen" -msgstr "全屏显示一小段文字" - -#: ../menu-data/sm:sm.desktop.in.h:2 msgid "Screen-Message" msgstr "屏幕消息" +#: ../menu-data/sm:sm.desktop.in.h:2 +msgid "Displays a short text fullscreen" +msgstr "全屏显示一小段文字" + #: ../menu-data/smartpm:smart.desktop.in.h:1 msgid "Smart Package Manager" msgstr "智能包管理器" @@ -15714,11 +15934,11 @@ msgstr "SMB/CIFS 共享浏览器" #: ../menu-data/smc:smc.desktop.in.h:1 -msgid "A 2D platform game with style similar to classic sidescroller games" +msgid "Secret Maryo Chronicles" msgstr "" #: ../menu-data/smc:smc.desktop.in.h:2 -msgid "Secret Maryo Chronicles" +msgid "A 2D platform game with style similar to classic sidescroller games" msgstr "" #: ../menu-data/smplayer:smplayer.desktop.in.h:1 @@ -15730,35 +15950,35 @@ msgstr "SMPlayer" #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:1 -msgid "Chat with other people on IRC" -msgstr "与他人通过 IRC 交谈" - -#: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2 msgid "Smuxi IRC Client" msgstr "Smuxi IRC 客户端" +#: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2 +msgid "Chat with other people on IRC" +msgstr "与他人通过 IRC 交谈" + #: ../menu-data/snake4:snake4.desktop.in.h:1 -msgid "Fruit-eating snake game" +msgid "Snake4" msgstr "" #: ../menu-data/snake4:snake4.desktop.in.h:2 -msgid "Snake4" +msgid "Fruit-eating snake game" msgstr "" #: ../menu-data/snappea:snappea.desktop.in.h:1 -msgid "Create and study hyperbolic 3-manifolds" +msgid "Snappea 3-Manifold Creator" msgstr "" #: ../menu-data/snappea:snappea.desktop.in.h:2 -msgid "Snappea 3-Manifold Creator" +msgid "Create and study hyperbolic 3-manifolds" msgstr "" #: ../menu-data/snowballz:snowball.desktop.in.h:1 -msgid "Command your army of penguins" +msgid "SnowballZ" msgstr "" #: ../menu-data/snowballz:snowball.desktop.in.h:2 -msgid "SnowballZ" +msgid "Command your army of penguins" msgstr "" #: ../menu-data/socnetv:socnetv.desktop.in.h:1 @@ -15770,49 +15990,45 @@ msgstr "" #: ../menu-data/sofa-apps:sofa.desktop.in.h:1 -msgid "Open Source Framework for Medical Simulation" +msgid "SOFA" msgstr "" #: ../menu-data/sofa-apps:sofa.desktop.in.h:2 -msgid "SOFA" +msgid "Open Source Framework for Medical Simulation" msgstr "" #: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:1 -msgid "Lets you choose from thousands of applications available for Ubuntu" -msgstr "" - -#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2 msgid "Ubuntu Software Center" msgstr "Ubuntu 软件中心" #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1 -msgid "Configure the sources for installable software and updates" -msgstr "配置可安装软件和更新的软件源" +msgid "Software Sources" +msgstr "软件源" #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:2 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:2 -msgid "Software Sources" -msgstr "软件源" +msgid "Configure the sources for installable software and updates" +msgstr "配置可安装软件和更新的软件源" #: ../menu-data/solarwolf:solarwolf.desktop.in.h:1 msgid "SolarWolf" msgstr "" #: ../menu-data/solfege:solfege.desktop.in.h:1 -msgid "Ear training" -msgstr "" - -#: ../menu-data/solfege:solfege.desktop.in.h:2 msgid "GNU Solfege" msgstr "GNU Solfege" +#: ../menu-data/solfege:solfege.desktop.in.h:2 +msgid "Ear training" +msgstr "" + #: ../menu-data/sonata:sonata.desktop.in.h:1 -msgid "An elegant GTK+ MPD client" +msgid "Sonata" msgstr "" #: ../menu-data/sonata:sonata.desktop.in.h:2 -msgid "Sonata" +msgid "An elegant GTK+ MPD client" msgstr "" #: ../menu-data/songwrite:songwrite.desktop.in.h:1 @@ -15836,43 +16052,43 @@ msgstr "" #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:1 -msgid "Copy music from your CDs" -msgstr "从您的 CD 中复制音乐" - -#: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2 msgid "Sound Juicer Audio CD Extractor" msgstr "" -#: ../menu-data/soundconverter:soundconverter.desktop.in.h:1 -msgid "Convert audio files into other formats" -msgstr "将音频文件转换成其他格式" +#: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2 +msgid "Copy music from your CDs" +msgstr "从您的 CD 中复制音乐" -#: ../menu-data/soundconverter:soundconverter.desktop.in.h:2 +#: ../menu-data/soundconverter:soundconverter.desktop.in.h:1 msgid "Sound Converter" msgstr "声音转换器" -#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1 -msgid "An audio file converter" -msgstr "音频文件转换器" +#: ../menu-data/soundconverter:soundconverter.desktop.in.h:2 +msgid "Convert audio files into other formats" +msgstr "将音频文件转换成其他格式" -#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2 +#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1 msgid "soundKonverter" msgstr "soundKonverter" +#: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2 +msgid "An audio file converter" +msgstr "音频文件转换器" + #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:1 -msgid "Develop, modify or debug a source-highlight definition file" +msgid "Source-Highlight-IDE" msgstr "" #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:2 -msgid "Source-Highlight-IDE" +msgid "Develop, modify or debug a source-highlight definition file" msgstr "" #: ../menu-data/spacezero:spacezero.desktop.in.h:1 -msgid "Real Time Strategy 2D space combat multiplayer net game." +msgid "Spacezero" msgstr "" #: ../menu-data/spacezero:spacezero.desktop.in.h:2 -msgid "Spacezero" +msgid "Real Time Strategy 2D space combat multiplayer net game." msgstr "" #: ../menu-data/sparkleshare:sparkleshare.desktop.in.h:1 @@ -15884,25 +16100,25 @@ msgstr "" #: ../menu-data/spe:spe.desktop.in.h:1 -msgid "Integrated Python Development Environment" -msgstr "Python 集成开发环境" - -#: ../menu-data/spe:spe.desktop.in.h:2 msgid "SPE (Stani's Python Editor)" msgstr "" -#: ../menu-data/specimen:specimen.desktop.in.h:2 +#: ../menu-data/spe:spe.desktop.in.h:2 +msgid "Integrated Python Development Environment" +msgstr "Python 集成开发环境" + +#: ../menu-data/specimen:specimen.desktop.in.h:1 msgid "Specimen" msgstr "" #: ../menu-data/specto:specto.desktop.in.h:1 -msgid "Be notified of everything" -msgstr "" - -#: ../menu-data/specto:specto.desktop.in.h:2 msgid "Specto" msgstr "Specto" +#: ../menu-data/specto:specto.desktop.in.h:2 +msgid "Be notified of everything" +msgstr "" + #: ../menu-data/spectools:spectool_gtk.desktop.in.h:1 msgid "2.4 GHz spectrum analysis using the Wi-Spy hardware device" msgstr "使用 Wi-Spy 硬件设备进行 2.4 GHz 频谱分析" @@ -15912,35 +16128,35 @@ msgstr "频谱工具" #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:1 -msgid "High precision calculator" -msgstr "高精度计算器" - -#: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2 msgid "SpeedCrunch" msgstr "SpeedCrunch" +#: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2 +msgid "High precision calculator" +msgstr "高精度计算器" + #: ../menu-data/spek:spek.desktop.in.h:1 -msgid "Spek Spectrum Analyser" +msgid "View spectrograms of your audio files" msgstr "" #: ../menu-data/spek:spek.desktop.in.h:2 -msgid "View spectrograms of your audio files" +msgid "Spek Spectrum Analyser" msgstr "" #: ../menu-data/spim:xspim.desktop.in.h:1 -msgid "Graphical MIPS32 Assembly language emulator" -msgstr "图形化的 MIPS32 汇编语言仿真器" - -#: ../menu-data/spim:xspim.desktop.in.h:2 msgid "xSPIM" msgstr "xSPIM" +#: ../menu-data/spim:xspim.desktop.in.h:2 +msgid "Graphical MIPS32 Assembly language emulator" +msgstr "图形化的 MIPS32 汇编语言仿真器" + #: ../menu-data/spotlighter:spotlighter.desktop.in.h:1 -msgid "Show and move a spotlight on the desktop" +msgid "Spotlighter" msgstr "" #: ../menu-data/spotlighter:spotlighter.desktop.in.h:2 -msgid "Spotlighter" +msgid "Show and move a spotlight on the desktop" msgstr "" #: ../menu-data/spout:spout.desktop.in.h:1 @@ -15948,53 +16164,53 @@ msgstr "" #: ../menu-data/spring:spring.desktop.in.h:1 -msgid "An open source RTS with similar gameplay to TA" +msgid "Spring" msgstr "" #: ../menu-data/spring:spring.desktop.in.h:2 -msgid "Spring" +msgid "An open source RTS with similar gameplay to TA" msgstr "" #: ../menu-data/springlobby:springlobby.desktop.in.h:1 -msgid "Play real-time strategy games using the Spring engine" +msgid "SpringLobby" msgstr "" #: ../menu-data/springlobby:springlobby.desktop.in.h:2 -msgid "SpringLobby" +msgid "Play real-time strategy games using the Spring engine" msgstr "" #: ../menu-data/spyder:spyder.desktop.in.h:1 -msgid "Python IDE for scientists" +msgid "spyder" msgstr "" #: ../menu-data/spyder:spyder.desktop.in.h:2 -msgid "spyder" +msgid "Python IDE for scientists" msgstr "" #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1 -msgid "GUI editor for SQLite databases" -msgstr "SQLite 数据库图形用户界面编辑器" - -#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2 msgid "SQLite database browser" msgstr "SQLite 数据库浏览器" -#: ../menu-data/sqliteman:sqliteman.desktop.in.h:1 -msgid "Administer and develop your Sqlite3 databases" -msgstr "管理和开发您的 Sqlite3 数据库" +#: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2 +msgid "GUI editor for SQLite databases" +msgstr "SQLite 数据库图形用户界面编辑器" -#: ../menu-data/sqliteman:sqliteman.desktop.in.h:2 +#: ../menu-data/sqliteman:sqliteman.desktop.in.h:1 msgid "Sqliteman" msgstr "Sqliteman" -#: ../menu-data/squeak-vm:squeak.desktop.in.h:1 -msgid " Programming system and content development tool" -msgstr " 编程系统和内容开发工具" +#: ../menu-data/sqliteman:sqliteman.desktop.in.h:2 +msgid "Administer and develop your Sqlite3 databases" +msgstr "管理和开发您的 Sqlite3 数据库" -#: ../menu-data/squeak-vm:squeak.desktop.in.h:2 +#: ../menu-data/squeak-vm:squeak.desktop.in.h:1 msgid "Squeak" msgstr "Squeak" +#: ../menu-data/squeak-vm:squeak.desktop.in.h:2 +msgid " Programming system and content development tool" +msgstr " 编程系统和内容开发工具" + #: ../menu-data/squeeze:squeeze.desktop.in.h:1 msgid "Squeeze" msgstr "" @@ -16013,21 +16229,21 @@ msgstr "SSVNC - 访问远程 VNC 桌面" #: ../menu-data/stackapplet:stackapplet.desktop.in.h:1 -msgid "Launch the StackApplet indicator" +msgid "StackApplet" msgstr "" #: ../menu-data/stackapplet:stackapplet.desktop.in.h:2 -msgid "StackApplet" +msgid "Launch the StackApplet indicator" msgstr "" #: ../menu-data/stardict-common:stardict.desktop.in.h:1 -msgid "Lookup words" -msgstr "查找词语" - -#: ../menu-data/stardict-common:stardict.desktop.in.h:2 msgid "StarDict" msgstr "星际译王" +#: ../menu-data/stardict-common:stardict.desktop.in.h:2 +msgid "Lookup words" +msgstr "查找词语" + #: ../menu-data/starplot:starplot.desktop.in.h:1 msgid "StarPlot Star Chart Viewer" msgstr "" @@ -16037,13 +16253,13 @@ msgstr "" #: ../menu-data/startupmanager:startupmanager.desktop.in.h:1 -msgid "Change settings for the bootloader and splash screen" -msgstr "修改启动引导程序和启动选择界面的设置" - -#: ../menu-data/startupmanager:startupmanager.desktop.in.h:2 msgid "StartUp-Manager" msgstr "启动管理器" +#: ../menu-data/startupmanager:startupmanager.desktop.in.h:2 +msgid "Change settings for the bootloader and splash screen" +msgstr "修改启动引导程序和启动选择界面的设置" + #: ../menu-data/starvoyager:starvoyager.desktop.in.h:1 msgid "Star Voyager" msgstr "" @@ -16053,29 +16269,29 @@ msgstr "" #: ../menu-data/stella:stella.desktop.in.h:1 -msgid "A multi-platform Atari 2600 emulator" +msgid "Stella" msgstr "" #: ../menu-data/stella:stella.desktop.in.h:2 -msgid "Stella" +msgid "A multi-platform Atari 2600 emulator" msgstr "" #: ../menu-data/stellarium:stellarium.desktop.in.h:1 -msgid "Planetarium" +msgid "Stellarium" msgstr "" #: ../menu-data/stellarium:stellarium.desktop.in.h:2 -msgid "Stellarium" +msgid "Planetarium" msgstr "" #: ../menu-data/step:kde4__step.desktop.in.h:1 -msgid "Simulate physics experiments" -msgstr "模拟物理实验" - -#: ../menu-data/step:kde4__step.desktop.in.h:2 msgid "Step" msgstr "Step" +#: ../menu-data/step:kde4__step.desktop.in.h:2 +msgid "Simulate physics experiments" +msgstr "模拟物理实验" + #: ../menu-data/stepbill.app:StepBill.desktop.in.h:1 msgid "StepBill" msgstr "StepBill" @@ -16085,19 +16301,19 @@ msgstr "StepBill - GNUstep 下的 XBill (基于 MacBill)" #: ../menu-data/stopmotion:stopmotion.desktop.in.h:1 -msgid "Program to create stop-motion animations" +msgid "Stopmotion" msgstr "" #: ../menu-data/stopmotion:stopmotion.desktop.in.h:2 -msgid "Stopmotion" +msgid "Program to create stop-motion animations" msgstr "" #: ../menu-data/stopwatch:stopwatch.desktop.in.h:1 -msgid "A virtual stopwatch" +msgid "Stopwatch" msgstr "" #: ../menu-data/stopwatch:stopwatch.desktop.in.h:2 -msgid "Stopwatch" +msgid "A virtual stopwatch" msgstr "" #: ../menu-data/stormbaancoureur:stormbaancoureur.desktop.in.h:1 @@ -16109,27 +16325,27 @@ msgstr "" #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:1 -msgid "Listen to shoutcast/xiph/live365 music stations" +msgid "streamtuner2" msgstr "" #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:2 -msgid "streamtuner2" +msgid "Listen to shoutcast/xiph/live365 music stations" msgstr "" #: ../menu-data/streamtuner:streamtuner.desktop.in.h:1 -msgid "Browse Internet stream directories" +msgid "streamtuner" msgstr "" #: ../menu-data/streamtuner:streamtuner.desktop.in.h:2 -msgid "streamtuner" +msgid "Browse Internet stream directories" msgstr "" #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:1 -msgid "Audio file player with time stretch" +msgid "StretchPlayer" msgstr "" #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:2 -msgid "StretchPlayer" +msgid "Audio file player with time stretch" msgstr "" #: ../menu-data/stroq:stroq.desktop.in.h:1 @@ -16141,41 +16357,41 @@ msgstr "" #: ../menu-data/structure-synth:structure-synth.desktop.in.h:1 -msgid "Application for creating 3D structures" +msgid "Structure Synth" msgstr "" #: ../menu-data/structure-synth:structure-synth.desktop.in.h:2 -msgid "Structure Synth" +msgid "Application for creating 3D structures" msgstr "" -#: ../menu-data/subcommander:subcommander.desktop.in.h:2 +#: ../menu-data/subcommander:subcommander.desktop.in.h:1 msgid "Subcommander" msgstr "" #: ../menu-data/subdownloader:subdownloader.desktop.in.h:1 -msgid "Application to download/upload subtitles of your movies." -msgstr "下载/上传影片字幕的应用程序" - -#: ../menu-data/subdownloader:subdownloader.desktop.in.h:2 msgid "SubDownloader" msgstr "字幕下载器" -#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:1 -msgid "KDE subtitle editor" -msgstr "KDE 字幕编辑器" +#: ../menu-data/subdownloader:subdownloader.desktop.in.h:2 +msgid "Application to download/upload subtitles of your movies." +msgstr "下载/上传影片字幕的应用程序" -#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2 +#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:1 msgid "Subtitle Composer" msgstr "字幕创作器" -#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1 -msgid "A subtitle editor based on GStreamer and Gtk+" -msgstr "一个基于 GStreamer 和 Gtk+ 的字幕编辑器" +#: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2 +msgid "KDE subtitle editor" +msgstr "KDE 字幕编辑器" -#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2 +#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1 msgid "Subtitle Editor" msgstr "字幕编辑器" +#: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2 +msgid "A subtitle editor based on GStreamer and Gtk+" +msgstr "一个基于 GStreamer 和 Gtk+ 的字幕编辑器" + #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1 #: ../menu-data/sugar-emulator-0.86:sugar-emulator.desktop.in.h:1 #: ../menu-data/sugar-emulator-0.88:sugar-emulator.desktop.in.h:1 @@ -16191,19 +16407,19 @@ msgstr "Sugar 桌面环境模拟器" #: ../menu-data/sunflow:sunflow.desktop.in.h:1 -msgid "Photorealistic Rendering Engine" +msgid "Sunflow" msgstr "" #: ../menu-data/sunflow:sunflow.desktop.in.h:2 -msgid "Sunflow" +msgid "Photorealistic Rendering Engine" msgstr "" #: ../menu-data/supercollider-emacs:scel.desktop.in.h:1 -msgid "Emacs environment for SuperCollider" +msgid "SuperCollider Emacs (scel)" msgstr "" #: ../menu-data/supercollider-emacs:scel.desktop.in.h:2 -msgid "SuperCollider Emacs (scel)" +msgid "Emacs environment for SuperCollider" msgstr "" #: ../menu-data/supercollider-vim:scvim.desktop.in.h:1 @@ -16215,19 +16431,19 @@ msgstr "" #: ../menu-data/supertux-stable:supertux.desktop.in.h:1 -msgid "A Super Mario inspired penguin platform game" +msgid "SuperTux" msgstr "" #: ../menu-data/supertux-stable:supertux.desktop.in.h:2 -msgid "SuperTux" +msgid "A Super Mario inspired penguin platform game" msgstr "" #: ../menu-data/supertux:supertux2.desktop.in.h:1 -msgid "Play a classic 2D platform game" +msgid "SuperTux 2" msgstr "" #: ../menu-data/supertux:supertux2.desktop.in.h:2 -msgid "SuperTux 2" +msgid "Play a classic 2D platform game" msgstr "" #: ../menu-data/supertuxkart:supertuxkart.desktop.in.h:1 @@ -16247,27 +16463,27 @@ msgstr "" #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:1 -msgid "Enter cave survey data for Survex" +msgid "SvxEdit Cave Survey Data Editor" msgstr "" #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:2 -msgid "SvxEdit Cave Survey Data Editor" +msgid "Enter cave survey data for Survex" msgstr "" #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:1 -msgid "A Workbench for Subversion" +msgid "SVN Workbench" msgstr "" #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:2 -msgid "SVN Workbench" +msgid "A Workbench for Subversion" msgstr "" #: ../menu-data/swami:swami.desktop.in.h:1 -msgid "Create, play and organize MIDI instruments and sounds" +msgid "Swami Instrument Editor" msgstr "" #: ../menu-data/swami:swami.desktop.in.h:2 -msgid "Swami Instrument Editor" +msgid "Create, play and organize MIDI instruments and sounds" msgstr "" #: ../menu-data/sweep:sweep.desktop.in.h:1 @@ -16287,38 +16503,46 @@ msgstr "系统清理器" #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:1 -msgid "Interior 2D design application with 3D preview" +msgid "Sweet Home 3D" msgstr "" #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2 -msgid "Sweet Home 3D" +msgid "Interior 2D design application with 3D preview" +msgstr "" + +#: ../menu-data/swell-foop:swell-foop.desktop.in.h:1 +msgid "Swell Foop" +msgstr "" + +#: ../menu-data/swell-foop:swell-foop.desktop.in.h:2 +msgid "Clear the screen by removing groups of colored and shaped tiles" msgstr "" #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:1 -msgid "Full-text search program for Sylpheed" +msgid "Sylph-Searcher" msgstr "" #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:2 -msgid "Sylph-Searcher" +msgid "Full-text search program for Sylpheed" msgstr "" #: ../menu-data/sylpheed:sylpheed.desktop.in.h:1 -msgid "E-Mail client" -msgstr "电子邮件客户端" - -#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2 msgid "Sylpheed" msgstr "" +#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2 +msgid "E-Mail client" +msgstr "电子邮件客户端" + #: ../menu-data/synapse:synapse.desktop.in.h:1 -msgid "Search everything you do." +msgid "Synapse" msgstr "" #: ../menu-data/synapse:synapse.desktop.in.h:2 -msgid "Synapse" +msgid "Search everything you do." msgstr "" -#: ../menu-data/synaptic:synaptic.desktop.in.h:2 +#: ../menu-data/synaptic:synaptic.desktop.in.h:1 msgid "Synaptic Package Manager" msgstr "新立得软件包管理器" @@ -16331,43 +16555,43 @@ msgstr "保持更新" #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:1 -msgid "SynCE PDA control for GNOME" +msgid "SynCE Tray Icon" msgstr "" #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:2 -msgid "SynCE Tray Icon" +msgid "SynCE PDA control for GNOME" msgstr "" #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1 -msgid "Configure Sync Mail Dir" -msgstr "配置同步邮件目录" - -#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2 msgid "Sync Mail Dir" msgstr "同步邮件目录" +#: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2 +msgid "Configure Sync Mail Dir" +msgstr "配置同步邮件目录" + #: ../menu-data/syncropated:syncropated.desktop.in.h:1 -msgid "Media Syncronizer" +msgid "Syncropated!" msgstr "" #: ../menu-data/syncropated:syncropated.desktop.in.h:2 -msgid "Syncropated!" +msgid "Media Syncronizer" msgstr "" #: ../menu-data/sysinfo:sysinfo.desktop.in.h:1 -msgid "Display detailed computer/system information" -msgstr "显示详细的计算机/系统信息" - -#: ../menu-data/sysinfo:sysinfo.desktop.in.h:2 msgid "Sysinfo" msgstr "Sysinfo" +#: ../menu-data/sysinfo:sysinfo.desktop.in.h:2 +msgid "Display detailed computer/system information" +msgstr "显示详细的计算机/系统信息" + #: ../menu-data/sysprof:sysprof.desktop.in.h:1 -msgid "A system-wide linux profiler" +msgid "Sysprof Profiler" msgstr "" #: ../menu-data/sysprof:sysprof.desktop.in.h:2 -msgid "Sysprof Profiler" +msgid "A system-wide linux profiler" msgstr "" #: ../menu-data/system-config-audit:system-config-audit.desktop.in.h:1 @@ -16387,49 +16611,61 @@ msgstr "" #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1 -msgid "Change system date and time" -msgstr "更改系统日期和时间" - -#: ../menu-data/system-config-date:system-config-date.desktop.in.h:2 msgid "Date & Time" msgstr "日期和时间" +#: ../menu-data/system-config-date:system-config-date.desktop.in.h:2 +msgid "Change system date and time" +msgstr "更改系统日期和时间" + #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:1 -msgid "Create a kickstart file" +msgid "Kickstart" msgstr "" #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:2 -msgid "Kickstart" +msgid "Create a kickstart file" msgstr "" #: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:1 -msgid "Configure LVM in a graphical setting" -msgstr "在图形环境中配置逻辑卷管理(LVM)" - -#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2 msgid "Logical Volume Management" msgstr "逻辑卷管理(LVM)" -#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1 -msgid "Configure printers" -msgstr "配置打印机" +#: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2 +msgid "Configure LVM in a graphical setting" +msgstr "在图形环境中配置逻辑卷管理(LVM)" -#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2 +#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1 msgid "Printing" msgstr "打印" +#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2 +msgid "Configure printers" +msgstr "配置打印机" + #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:1 +msgid "Samba" +msgstr "Samba" + +#: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2 msgid "Create, modify, and delete samba shares" msgstr "创建、修改和删除 samba 共享" -#: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2 -msgid "Samba" -msgstr "Samba" +#: ../menu-data/systemsettings:kde4__kdesystemsettings.desktop.in.h:1 +msgid "KDE System Settings" +msgstr "" #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1 msgid "System Settings" msgstr "系统设置" +#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:1 +msgid "Tagaini Jisho" +msgstr "" + +#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:2 +msgid "A free Japanese dictionary and study assistant" +msgstr "" + #: ../menu-data/tagtool:tagtool.desktop.in.h:1 msgid "Audio Tag Tool" msgstr "" @@ -16439,55 +16675,55 @@ msgstr "" #: ../menu-data/tagua:kde4__tagua.desktop.in.h:1 -msgid "A generic board game application." +msgid "Tagua" msgstr "" #: ../menu-data/tagua:kde4__tagua.desktop.in.h:2 -msgid "Tagua" +msgid "A generic board game application." msgstr "" #: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:1 -msgid "An IRC Client for GNUstep and Mac OS X" -msgstr "GNUstep 和 Mac OS X 的一个 IRC 客户端" - -#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2 msgid "TalkSoup" msgstr "TalkSoup" -#: ../menu-data/tangerine:tangerine.desktop.in.h:1 -msgid "Share your music with close friends" -msgstr "与好友分享您的音乐" +#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2 +msgid "An IRC Client for GNUstep and Mac OS X" +msgstr "GNUstep 和 Mac OS X 的一个 IRC 客户端" -#: ../menu-data/tangerine:tangerine.desktop.in.h:2 +#: ../menu-data/tangerine:tangerine.desktop.in.h:1 msgid "Tangerine Media Sharing" msgstr "Tangerine 音乐分享" +#: ../menu-data/tangerine:tangerine.desktop.in.h:2 +msgid "Share your music with close friends" +msgstr "与好友分享您的音乐" + #: ../menu-data/tanglet:tanglet.desktop.in.h:1 -msgid "Single player variant of Boggle" +msgid "Tanglet" msgstr "" #: ../menu-data/tanglet:tanglet.desktop.in.h:2 -msgid "Tanglet" +msgid "Single player variant of Boggle" msgstr "" #: ../menu-data/tasks-mobile:kde4__tasks-mobile.desktop.in.h:1 -msgid "Kontact Touch Tasks" +msgid "Tasks" msgstr "" #: ../menu-data/tasque:tasque.desktop.in.h:1 -msgid "Easy quick task management" +msgid "Tasque" msgstr "" #: ../menu-data/tasque:tasque.desktop.in.h:2 -msgid "Tasque" +msgid "Easy quick task management" msgstr "" #: ../menu-data/tatan:tatan.desktop.in.h:1 -msgid "HIZ's Tatan" +msgid "Tatan" msgstr "" #: ../menu-data/tatan:tatan.desktop.in.h:2 -msgid "Tatan" +msgid "HIZ's Tatan" msgstr "" #: ../menu-data/taxbird:taxbird.desktop.in.h:1 @@ -16498,6 +16734,46 @@ msgid "freier Elster-Client für Linux" msgstr "" +#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:1 +msgid "TCOS Server Configurator" +msgstr "" + +#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:2 +msgid "Configure TCOS server daemons and users" +msgstr "" + +#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:1 +msgid "TCOS Standalone" +msgstr "" + +#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:2 +msgid "Configure standalone mode of TCOS" +msgstr "" + +#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:1 +msgid "TCOS-config" +msgstr "" + +#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:2 +msgid "Configure and make bootable initramfs images for thin client networks" +msgstr "" + +#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:1 +msgid "TcosMonitor" +msgstr "" + +#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:2 +msgid "Thin client network monitor" +msgstr "" + +#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:1 +msgid "TcosPersonalize" +msgstr "" + +#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:2 +msgid "Configure a simple TCOS thin client" +msgstr "" + #: ../menu-data/tea:tea.desktop.in.h:1 msgid "TEA Text Editor" msgstr "TEA 文本编辑器" @@ -16515,11 +16791,11 @@ msgstr "" #: ../menu-data/teeworlds:teeworlds.desktop.in.h:1 -msgid "An online multi-player platform 2D shooter" +msgid "Teeworlds" msgstr "" #: ../menu-data/teeworlds:teeworlds.desktop.in.h:2 -msgid "Teeworlds" +msgid "An online multi-player platform 2D shooter" msgstr "" #: ../menu-data/teg:teg.desktop.in.h:1 @@ -16531,19 +16807,19 @@ msgstr "" #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:1 -msgid "Handwriting Recognition" -msgstr "手写识别" - -#: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2 msgid "Tegaki Recognize" msgstr "Tegaki 识别" +#: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2 +msgid "Handwriting Recognition" +msgstr "手写识别" + #: ../menu-data/tekka:tekka.desktop.in.h:1 -msgid "Chat on IRC" +msgid "tekka IRC Client" msgstr "" #: ../menu-data/tekka:tekka.desktop.in.h:2 -msgid "tekka IRC Client" +msgid "Chat on IRC" msgstr "" #: ../menu-data/telegnome:telegnome.desktop.in.h:1 @@ -16555,13 +16831,13 @@ msgstr "" #: ../menu-data/teleport:teleport.desktop.in.h:1 -msgid "Move applications between displays" -msgstr "将应用程序在多个显示器之间移动" - -#: ../menu-data/teleport:teleport.desktop.in.h:2 msgid "Teleport" msgstr "Teleport" +#: ../menu-data/teleport:teleport.desktop.in.h:2 +msgid "Move applications between displays" +msgstr "将应用程序在多个显示器之间移动" + #: ../menu-data/tellico:kde4__tellico.desktop.in.h:1 msgid "A collection manager" msgstr "一个收集管理器" @@ -16571,63 +16847,63 @@ msgstr "Tellico" #: ../menu-data/tennix:tennix.desktop.in.h:1 -msgid "Play tennis against the computer or a friend" -msgstr "和计算机或朋友打网球" - -#: ../menu-data/tennix:tennix.desktop.in.h:2 msgid "Tennix!" msgstr "Tennix!" -#: ../menu-data/terminal.app:Terminal.desktop.in.h:1 +#: ../menu-data/tennix:tennix.desktop.in.h:2 +msgid "Play tennis against the computer or a friend" +msgstr "和计算机或朋友打网球" + +#: ../menu-data/terminal.app:Terminal.desktop.in.h:2 msgid "A terminal emulator" msgstr "终端模拟器" #: ../menu-data/terminator:terminator.desktop.in.h:1 -msgid "Multiple terminals in one window" -msgstr "一个窗口中的多个终端" - -#: ../menu-data/terminator:terminator.desktop.in.h:2 msgid "Terminator" msgstr "Terminator" +#: ../menu-data/terminator:terminator.desktop.in.h:2 +msgid "Multiple terminals in one window" +msgstr "一个窗口中的多个终端" + #: ../menu-data/termit:termit.desktop.in.h:1 -msgid "Lightweight terminal emulator" +msgid "Termit" msgstr "" #: ../menu-data/termit:termit.desktop.in.h:2 -msgid "Termit" +msgid "Lightweight terminal emulator" msgstr "" #: ../menu-data/terraintool:terraintool.desktop.in.h:1 -msgid "Generate surface mesh in survex format" +msgid "Terraintool surface mesh generator" msgstr "" #: ../menu-data/terraintool:terraintool.desktop.in.h:2 -msgid "Terraintool surface mesh generator" +msgid "Generate surface mesh in survex format" msgstr "" #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:1 -msgid "Download and run an Ubuntu ISO in a Virtual Machine" -msgstr "在虚拟机中下载和运行 Ubuntu ISO 镜像" - -#: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2 msgid "Test Drive an Ubuntu ISO" msgstr "" +#: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2 +msgid "Download and run an Ubuntu ISO in a Virtual Machine" +msgstr "在虚拟机中下载和运行 Ubuntu ISO 镜像" + #: ../menu-data/tetraproc:tetraproc.desktop.in.h:1 -msgid "Tetrahedral Microphone Processor for Ambisonic Recording" +msgid "Tetraproc" msgstr "" #: ../menu-data/tetraproc:tetraproc.desktop.in.h:2 -msgid "Tetraproc" +msgid "Tetrahedral Microphone Processor for Ambisonic Recording" msgstr "" #: ../menu-data/tetzle:tetzle.desktop.in.h:1 -msgid "Jigsaw puzzle with tetromino pieces" +msgid "Tetzle" msgstr "" #: ../menu-data/tetzle:tetzle.desktop.in.h:2 -msgid "Tetzle" +msgid "Jigsaw puzzle with tetromino pieces" msgstr "" #: ../menu-data/tex-guy:tex-guy.desktop.in.h:1 @@ -16639,13 +16915,13 @@ msgstr "查看使用 TeX 和 LaTeX 生成的 DVI 文件" #: ../menu-data/texmacs-common:texmacs.desktop.in.h:1 -msgid "A structured wysiwyg scientific text editor" -msgstr "一个结构化的所见即所得的科学文本编辑器" - -#: ../menu-data/texmacs-common:texmacs.desktop.in.h:2 msgid "GNU TeXmacs Editor" msgstr "GNU TeXmacs 编辑器" +#: ../menu-data/texmacs-common:texmacs.desktop.in.h:2 +msgid "A structured wysiwyg scientific text editor" +msgstr "一个结构化的所见即所得的科学文本编辑器" + #: ../menu-data/texmaker:texmaker.desktop.in.h:1 msgid "LaTeX development environment" msgstr "LaTeX 开发环境" @@ -16663,44 +16939,44 @@ msgstr "基于 OpenStep API 的文本编辑器" #: ../menu-data/texworks:texworks.desktop.in.h:1 +msgid "TeXworks" +msgstr "TeXworks" + +#: ../menu-data/texworks:texworks.desktop.in.h:2 msgid "" "A simple environment for editing, typesetting, and previewing TeX documents" msgstr "" -#: ../menu-data/texworks:texworks.desktop.in.h:2 -msgid "TeXworks" -msgstr "TeXworks" - #: ../menu-data/tgif:tgif.desktop.in.h:1 -msgid "Interactive 2-D vector drawing program for X11" +msgid "Tgif" msgstr "" #: ../menu-data/tgif:tgif.desktop.in.h:2 -msgid "Tgif" +msgid "Interactive 2-D vector drawing program for X11" msgstr "" #: ../menu-data/thawab:thawab.desktop.in.h:1 -msgid "Electronic Arabic/Islamic Encyclopedia" +msgid "Thawab" msgstr "" #: ../menu-data/thawab:thawab.desktop.in.h:2 -msgid "Thawab" +msgid "Electronic Arabic/Islamic Encyclopedia" msgstr "" #: ../menu-data/themonospot:themonospot.desktop.in.h:1 -msgid "themonospot" +msgid "themonospot - extract information from avi or mkv files" msgstr "" #: ../menu-data/themonospot:themonospot.desktop.in.h:2 -msgid "themonospot - extract information from avi or mkv files" +msgid "themonospot" msgstr "" #: ../menu-data/theorur:theorur.desktop.in.h:1 -msgid "Broadcast multimedia streams over an Icecast system" +msgid "Theorur" msgstr "" #: ../menu-data/theorur:theorur.desktop.in.h:2 -msgid "Theorur" +msgid "Broadcast multimedia streams over an Icecast system" msgstr "" #: ../menu-data/therion-viewer:therion-viewer.desktop.in.h:1 @@ -16712,71 +16988,67 @@ msgstr "" #: ../menu-data/therion:therion.desktop.in.h:1 -msgid "Draw up surveys in Therion format" +msgid "Therion" msgstr "" #: ../menu-data/therion:therion.desktop.in.h:2 -msgid "Therion" +msgid "Draw up surveys in Therion format" msgstr "" #: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:1 -msgid "Control Thin Client connections" -msgstr "控制瘦客户端连接" - -#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2 msgid "Thin Client Manager" msgstr "瘦客户端管理器" -#: ../menu-data/thoggen:thoggen.desktop.in.h:1 -msgid "Extracts Video from your DVDs" -msgstr "从您的 DVD 中提取视频" +#: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2 +msgid "Control Thin Client connections" +msgstr "控制瘦客户端连接" -#: ../menu-data/thoggen:thoggen.desktop.in.h:2 +#: ../menu-data/thoggen:thoggen.desktop.in.h:1 msgid "Thoggen DVD Ripper" msgstr "Thoggen DVD Ripper" +#: ../menu-data/thoggen:thoggen.desktop.in.h:2 +msgid "Extracts Video from your DVDs" +msgstr "从您的 DVD 中提取视频" + #: ../menu-data/threadscope:threadscope.desktop.in.h:1 -msgid "Haskell GHC thread profiler" +msgid "threadscope" msgstr "" #: ../menu-data/threadscope:threadscope.desktop.in.h:2 -msgid "threadscope" +msgid "Haskell GHC thread profiler" msgstr "" #: ../menu-data/thunar:Thunar.desktop.in.h:1 -msgid "Browse the filesystem with the file manager" -msgstr "使用文件管理器浏览文件系统" - -#: ../menu-data/thunar:Thunar.desktop.in.h:2 msgid "Thunar File Manager" msgstr "Thunar 文件管理器" +#: ../menu-data/thunar:Thunar.desktop.in.h:2 +msgid "Browse the filesystem with the file manager" +msgstr "使用文件管理器浏览文件系统" + #: ../menu-data/thunderbird:thunderbird.desktop.in.h:1 -msgid "Compose New Message" -msgstr "撰写新消息" +msgid "Thunderbird Mail" +msgstr "" -#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3 +#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2 msgid "Send and receive mail with Thunderbird" msgstr "" -#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4 -msgid "Thunderbird Mail" +#: ../menu-data/tickr:tickr.desktop.in.h:1 +msgid "Tickr - RSS Feed Reader" msgstr "" -#: ../menu-data/tickr:tickr.desktop.in.h:1 +#: ../menu-data/tickr:tickr.desktop.in.h:2 msgid "GTK-based highly graphically-customizable RSS Ticker" msgstr "" -#: ../menu-data/tickr:tickr.desktop.in.h:2 -msgid "Tickr - RSS Feed Reader" -msgstr "" - #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:1 -msgid "Simple, fun tic tac toe game for GNOME" +msgid "Tic Tac Toe" msgstr "" #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:2 -msgid "Tic Tac Toe" +msgid "Simple, fun tic tac toe game for GNOME" msgstr "" #: ../menu-data/tiger:tiger.desktop.in.h:1 @@ -16808,86 +17080,70 @@ msgstr "" #: ../menu-data/tint2:tint2conf.desktop.in.h:1 -msgid "Customize the panel settings" +msgid "Panel tint2" msgstr "" #: ../menu-data/tint2:tint2conf.desktop.in.h:2 -msgid "Panel tint2" +msgid "Customize the panel settings" msgstr "" #: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:1 -msgid "A tool to train your ears to hear relative pitch" -msgstr "" - -#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2 msgid "Tiny Ear Trainer" msgstr "" -#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:1 -msgid "A program to learn touch typing" -msgstr "" - -#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:2 -msgid "Tipptrainer Typing Tutor" +#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2 +msgid "A tool to train your ears to hear relative pitch" msgstr "" #: ../menu-data/titanion:titanion.desktop.in.h:1 -msgid "Kenta Cho's Titanion" +msgid "Titanion" msgstr "" #: ../menu-data/titanion:titanion.desktop.in.h:2 -msgid "Titanion" +msgid "Kenta Cho's Titanion" msgstr "" #: ../menu-data/tkabber:tkabber.desktop.in.h:1 -msgid "Communicate via XMPP (Jabber) protocol" -msgstr "通过 XMPP(Jabber) 协议通信" - -#: ../menu-data/tkabber:tkabber.desktop.in.h:2 msgid "Tkabber" msgstr "Tkabber" -#: ../menu-data/tkcvs:tkcvs.desktop.in.h:1 -msgid "A graphical frontend to CVS and Subversion." -msgstr "CVS 和 Subversion 的一个图形前端。" +#: ../menu-data/tkabber:tkabber.desktop.in.h:2 +msgid "Communicate via XMPP (Jabber) protocol" +msgstr "通过 XMPP(Jabber) 协议通信" -#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2 +#: ../menu-data/tkcvs:tkcvs.desktop.in.h:1 msgid "tkcvs" msgstr "tkcvs" -#: ../menu-data/tkdiff:tkdiff.desktop.in.h:1 -msgid "TkDiff File Comparison" -msgstr "TkDiff 文件比较" - -#: ../menu-data/tkdiff:tkdiff.desktop.in.h:2 -msgid "TkDiff is a graphical front-end for the standard Unix 'diff' utility." -msgstr "TkDiff 是标准的 Unix “diff” 工具的一个图形前端" +#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2 +msgid "A graphical frontend to CVS and Subversion." +msgstr "CVS 和 Subversion 的一个图形前端。" #: ../menu-data/tkgate:tkgate.desktop.in.h:1 -msgid "Event driven digital circuit simulator with Tcl/Tk" -msgstr "" - -#: ../menu-data/tkgate:tkgate.desktop.in.h:2 msgid "tkgate Circuit Simulator" msgstr "tkgate 电路仿真程序" +#: ../menu-data/tkgate:tkgate.desktop.in.h:2 +msgid "Event driven digital circuit simulator with Tcl/Tk" +msgstr "" + #: ../menu-data/tmw:tmw.desktop.in.h:1 -msgid "The Mana World 2D MMORPG client" +msgid "The Mana world" msgstr "" #: ../menu-data/tmw:tmw.desktop.in.h:2 -msgid "The Mana world" +msgid "The Mana World 2D MMORPG client" msgstr "" #: ../menu-data/tomatoes:tomatoes.desktop.in.h:1 -msgid "How many tomatoes can you smash in ten short minutes?" +msgid "I Have No Tomatoes" msgstr "" #: ../menu-data/tomatoes:tomatoes.desktop.in.h:2 -msgid "I Have No Tomatoes" +msgid "How many tomatoes can you smash in ten short minutes?" msgstr "" -#: ../menu-data/tomboy:tomboy.desktop.in.h:2 +#: ../menu-data/tomboy:tomboy.desktop.in.h:1 msgid "Tomboy Notes" msgstr "Tomboy 便签" @@ -16900,71 +17156,67 @@ msgstr "" #: ../menu-data/toppler:toppler.desktop.in.h:1 -msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines." +msgid "Tower Toppler" msgstr "" #: ../menu-data/toppler:toppler.desktop.in.h:2 -msgid "Tower Toppler" +msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines." msgstr "" #: ../menu-data/tora:tora.desktop.in.h:1 -msgid "A graphical toolkit for database administration and development" -msgstr "" - -#: ../menu-data/tora:tora.desktop.in.h:2 msgid "TOra" msgstr "TOra" -#: ../menu-data/torchat:torchat.desktop.in.h:1 -msgid "Decentralized instant messenger built on top of the Tor Network" +#: ../menu-data/tora:tora.desktop.in.h:2 +msgid "A graphical toolkit for database administration and development" msgstr "" -#: ../menu-data/torchat:torchat.desktop.in.h:2 +#: ../menu-data/torchat:torchat.desktop.in.h:1 msgid "TorChat" msgstr "" -#: ../menu-data/torcs:torcs.desktop.in.h:1 -msgid "3D racing cars simulator game" +#: ../menu-data/torchat:torchat.desktop.in.h:2 +msgid "Decentralized instant messenger built on top of the Tor Network" msgstr "" -#: ../menu-data/torcs:torcs.desktop.in.h:2 +#: ../menu-data/torcs:torcs.desktop.in.h:1 msgid "TORCS" msgstr "TORCS" +#: ../menu-data/torcs:torcs.desktop.in.h:2 +msgid "3D racing cars simulator game" +msgstr "" + #: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:1 msgid "TortoiseHG Workbench" msgstr "" #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:1 -msgid "HIZ's version of Torus Trooper" +msgid "Torus Trooper Pure" msgstr "" #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:2 -msgid "Torus Trooper Pure" +msgid "HIZ's version of Torus Trooper" msgstr "" #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1 -msgid "Kenta Cho's Torus Trooper" +msgid "Torus Trooper" msgstr "" #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:2 -msgid "Torus Trooper" +msgid "Kenta Cho's Torus Trooper" msgstr "" #: ../menu-data/totem:totem.desktop.in.h:1 msgid "Movie Player" msgstr "电影播放器" -#: ../menu-data/totem:totem.desktop.in.h:2 -msgid "Play movies and songs" -msgstr "播放影片和歌曲" - #: ../menu-data/tovidgui:tovidgui.desktop.in.h:1 -msgid "Author videos to DVD with menus" +msgid "tovid GUI" msgstr "" #: ../menu-data/tovidgui:tovidgui.desktop.in.h:2 -msgid "tovid GUI" +msgid "Author videos to DVD with menus" msgstr "" #: ../menu-data/trackballs:trackballs.desktop.in.h:1 @@ -16994,19 +17246,19 @@ msgstr "" #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:1 -msgid "Transfer miis from a wiimote" -msgstr "" - -#: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2 msgid "Transfermii" msgstr "Transfermii" +#: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2 +msgid "Transfer miis from a wiimote" +msgstr "" + #: ../menu-data/transgui:transgui.desktop.in.h:1 -msgid "GUI to remotely control a Transmission daemon" +msgid "Transmission remote GUI" msgstr "" #: ../menu-data/transgui:transgui.desktop.in.h:2 -msgid "Transmission remote GUI" +msgid "GUI to remotely control a Transmission daemon" msgstr "" #: ../menu-data/transmageddon:transmageddon.desktop.in.h:1 @@ -17017,11 +17269,11 @@ msgid "Video format conversion tool" msgstr "视频格式转换工具" -#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2 +#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1 msgid "Transmission BitTorrent Client" msgstr "" -#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2 +#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1 msgid "Qtransmission Bittorrent Client" msgstr "" @@ -17037,65 +17289,47 @@ msgid "Office Document Reader" msgstr "Office文档阅读器" -#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:1 -msgid "" -"Reconstruction of phylogenetic trees by maximum likelihood (parallelized " -"version)" -msgstr "" - -#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:2 -msgid "tree-ppuzzle" -msgstr "tree-ppuzzle" - -#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:1 -msgid "Reconstruction of phylogenetic trees by maximum likelihood" -msgstr "" - -#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:2 -msgid "tree-puzzle" -msgstr "tree-ppuzzle" - #: ../menu-data/treeline:treeline.desktop.in.h:1 -msgid "Tree-like structured custom data manager" +msgid "TreeLine" msgstr "" #: ../menu-data/treeline:treeline.desktop.in.h:2 -msgid "TreeLine" +msgid "Tree-like structured custom data manager" msgstr "" #: ../menu-data/treeviewx:treeviewx.desktop.in.h:1 -msgid "" -"Displays, modifies, prints and exports in SVG format phylogenetic trees" -msgstr "" - -#: ../menu-data/treeviewx:treeviewx.desktop.in.h:2 msgid "TreeView X" msgstr "TreeView X" -#: ../menu-data/tremulous:tremulous.desktop.in.h:1 +#: ../menu-data/treeviewx:treeviewx.desktop.in.h:2 msgid "" -"Aliens vs Humans, First Person Shooter game with elements of Real Time " -"Strategy" +"Displays, modifies, prints and exports in SVG format phylogenetic trees" msgstr "" -#: ../menu-data/tremulous:tremulous.desktop.in.h:2 +#: ../menu-data/tremulous:tremulous.desktop.in.h:1 msgid "Tremulous" msgstr "Tremulous" -#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:1 -msgid "3D rally racing car game" +#: ../menu-data/tremulous:tremulous.desktop.in.h:2 +msgid "" +"Aliens vs Humans, First Person Shooter game with elements of Real Time " +"Strategy" msgstr "" -#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2 +#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:1 msgid "Trigger" msgstr "Trigger" +#: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2 +msgid "3D rally racing car game" +msgstr "" + #: ../menu-data/trimage:trimage.desktop.in.h:1 -msgid "A cross-platform tool for optimizing PNG and JPG files." +msgid "Trimage image compressor" msgstr "" #: ../menu-data/trimage:trimage.desktop.in.h:2 -msgid "Trimage image compressor" +msgid "A cross-platform tool for optimizing PNG and JPG files." msgstr "" #: ../menu-data/triplane:triplane.desktop.in.h:1 @@ -17106,6 +17340,10 @@ msgid "side-scrolling dogfighting game" msgstr "" +#: ../menu-data/triplea:triplea.desktop.in.h:1 +msgid "TripleA" +msgstr "" + #: ../menu-data/tritium:tritium.desktop.in.h:1 msgid "Tritium" msgstr "Tritium" @@ -17115,29 +17353,29 @@ msgstr "Tritium 窗口管理器" #: ../menu-data/trovacap:trovacap.desktop.in.h:1 -msgid "Computes Italian ZIP codes" +msgid "TrovaCAP" msgstr "" #: ../menu-data/trovacap:trovacap.desktop.in.h:2 -msgid "TrovaCAP" +msgid "Computes Italian ZIP codes" msgstr "" #: ../menu-data/trustedqsl:tqsl.desktop.in.h:1 -msgid "Sign QSO data for upload to LoTW" +msgid "TrustedQSL" msgstr "" #: ../menu-data/trustedqsl:tqsl.desktop.in.h:2 -msgid "TrustedQSL" +msgid "Sign QSO data for upload to LoTW" msgstr "" #: ../menu-data/tryton-client:tryton-client.desktop.in.h:1 -msgid "Access Tryton server" -msgstr "访问 Tryton 服务器" - -#: ../menu-data/tryton-client:tryton-client.desktop.in.h:2 msgid "Tryton" msgstr "Tryton" +#: ../menu-data/tryton-client:tryton-client.desktop.in.h:2 +msgid "Access Tryton server" +msgstr "访问 Tryton 服务器" + #: ../menu-data/tryton-neso:neso.desktop.in.h:1 msgid "Neso" msgstr "Neso" @@ -17155,11 +17393,11 @@ msgstr "" #: ../menu-data/tucan:tucan.desktop.in.h:1 -msgid "Download and upload manager for hosting sites." +msgid "Tucan Manager" msgstr "" #: ../menu-data/tucan:tucan.desktop.in.h:2 -msgid "Tucan Manager" +msgid "Download and upload manager for hosting sites." msgstr "" #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1 @@ -17171,27 +17409,27 @@ msgstr "" #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:1 -msgid "Kenta Cho's Tumiki Fighters" +msgid "Tumiki Fighters" msgstr "" #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:2 -msgid "Tumiki Fighters" +msgid "Kenta Cho's Tumiki Fighters" msgstr "" #: ../menu-data/tunapie:tunapie.desktop.in.h:1 -msgid "Lists audio and video streams from shoutcast and icecast" -msgstr "" - -#: ../menu-data/tunapie:tunapie.desktop.in.h:2 msgid "Tunapie" msgstr "Tunapie" +#: ../menu-data/tunapie:tunapie.desktop.in.h:2 +msgid "Lists audio and video streams from shoutcast and icecast" +msgstr "" + #: ../menu-data/tunnelx:tunnelx.desktop.in.h:1 -msgid "Draw cave surveys" +msgid "Tunnel Cave Drawing Software" msgstr "" #: ../menu-data/tunnelx:tunnelx.desktop.in.h:2 -msgid "Tunnel Cave Drawing Software" +msgid "Draw cave surveys" msgstr "" #: ../menu-data/turpial:turpial.desktop.in.h:1 @@ -17203,11 +17441,11 @@ msgstr "" #: ../menu-data/turtleart:turtleart.desktop.in.h:1 -msgid "A Logo programming environment" +msgid "TurtleArt" msgstr "" #: ../menu-data/turtleart:turtleart.desktop.in.h:2 -msgid "TurtleArt" +msgid "A Logo programming environment" msgstr "" #: ../menu-data/tuxcards:tuxcards.desktop.in.h:1 @@ -17219,29 +17457,29 @@ msgstr "" #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:1 -msgid "A two panel file manager" -msgstr "一个两栏文件管理器" - -#: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2 msgid "Tux Commander" msgstr "Tux Commander" +#: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2 +msgid "A two panel file manager" +msgstr "一个两栏文件管理器" + #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1 -msgid "2D Football Game" +msgid "Tuxfootball" msgstr "" #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2 -msgid "Tuxfootball" +msgid "2D Football Game" msgstr "" #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1 -msgid "Edit, playback guitar tablatures" -msgstr "" - -#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2 msgid "tuxguitar" msgstr "tuxguitar" +#: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2 +msgid "Edit, playback guitar tablatures" +msgstr "" + #: ../menu-data/tuxmath:tuxmath.desktop.in.h:1 msgid "Tux Math " msgstr "" @@ -17251,27 +17489,27 @@ msgstr "" #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:1 -msgid "A drawing program for children." -msgstr "面向儿童的绘画程序" - -#: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2 msgid "Tux Paint" msgstr "Tux Paint" -#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1 -msgid "Play Shufflepuck with Tux" -msgstr "" +#: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2 +msgid "A drawing program for children." +msgstr "面向儿童的绘画程序" -#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2 +#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1 msgid "Tuxpuck" msgstr "Tuxpuck" +#: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2 +msgid "Play Shufflepuck with Tux" +msgstr "" + #: ../menu-data/tuxtype:tuxtype.desktop.in.h:1 -msgid "Educational typing tutor game starring Tux" +msgid "Tux Typing" msgstr "" #: ../menu-data/tuxtype:tuxtype.desktop.in.h:2 -msgid "Tux Typing" +msgid "Educational typing tutor game starring Tux" msgstr "" #: ../menu-data/tvtime:net-tvtime.desktop.in.h:1 @@ -17283,25 +17521,25 @@ msgstr "TVtime 电视浏览器" #: ../menu-data/twinkle:twinkle.desktop.in.h:1 -msgid "A SIP softphone" -msgstr "一个 SIP 软电话" - -#: ../menu-data/twinkle:twinkle.desktop.in.h:2 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 "" #: ../menu-data/txtreader:txtreader.desktop.in.h:1 -msgid "Read text novels and more" -msgstr "阅读文字小说和其他内容" - -#: ../menu-data/txtreader:txtreader.desktop.in.h:2 msgid "Txt Reader" msgstr "Txt 阅读器" +#: ../menu-data/txtreader:txtreader.desktop.in.h:2 +msgid "Read text novels and more" +msgstr "阅读文字小说和其他内容" + #: ../menu-data/uae:uae.desktop.in.h:1 msgid "UAE" msgstr "UAE" @@ -17311,29 +17549,29 @@ msgstr "" #: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:1 -msgid "Configure and manage your Ubuntu One account" -msgstr "配置和管理您的 Ubuntu One 账户" - -#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2 msgid "Ubuntu One" msgstr "Ubuntu One" -#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1 -msgid "Change settings for multimedia production" +#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2 +msgid "Configure and manage your Ubuntu One account" +msgstr "配置和管理您的 Ubuntu One 账户" + +#: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1 +msgid "Ubuntu Studio Controls" msgstr "" #: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:2 -msgid "Ubuntu Studio Controls" +msgid "Change settings for multimedia production" msgstr "" #: ../menu-data/uck:uck.desktop.in.h:1 -msgid "Customize your Ubuntu Desktop CDs easily" -msgstr "方便地定制您的 Ubuntu 桌面 CD" - -#: ../menu-data/uck:uck.desktop.in.h:2 msgid "Ubuntu Customization Kit" msgstr "Ubuntu 定制套件" +#: ../menu-data/uck:uck.desktop.in.h:2 +msgid "Customize your Ubuntu Desktop CDs easily" +msgstr "方便地定制您的 Ubuntu 桌面 CD" + #: ../menu-data/udav:udav.desktop.in.h:1 msgid "Udav" msgstr "Udav" @@ -17343,30 +17581,30 @@ msgstr "基于 MathGL 的数据可视化" #: ../menu-data/ufraw:ufraw.desktop.in.h:1 -msgid "A utility to read and manipulate raw images from digital cameras" -msgstr "" - -#: ../menu-data/ufraw:ufraw.desktop.in.h:2 msgid "UFRaw" msgstr "UFRaw" -#: ../menu-data/ugene:ugene.desktop.in.h:1 -msgid "Integrated Bioinformatics Suite" -msgstr "集成的生物信息套件" +#: ../menu-data/ufraw:ufraw.desktop.in.h:2 +msgid "A utility to read and manipulate raw images from digital cameras" +msgstr "" -#: ../menu-data/ugene:ugene.desktop.in.h:2 +#: ../menu-data/ugene:ugene.desktop.in.h:1 msgid "Unipro UGENE" msgstr "Unipro UGENE" +#: ../menu-data/ugene:ugene.desktop.in.h:2 +msgid "Integrated Bioinformatics Suite" +msgstr "集成的生物信息套件" + #: ../menu-data/uget:uget-gtk.desktop.in.h:1 -msgid "Download multiple URLs and apply it to one of setting/queue." +msgid "uGet" msgstr "" #: ../menu-data/uget:uget-gtk.desktop.in.h:2 -msgid "uGet" +msgid "Download multiple URLs and apply it to one of setting/queue." msgstr "" -#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1 +#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2 msgid "Customize uim input method environment" msgstr "定制 uim 输入法环境" @@ -17379,27 +17617,27 @@ msgstr "" #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:1 -msgid "Graphical interface to build UIMA CPE" -msgstr "构建 UIMA CPE 的图形界面" - -#: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2 msgid "UIMA CPE Gui" msgstr "" -#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1 -msgid "Simple UIMA analysis engine runner" -msgstr "" +#: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2 +msgid "Graphical interface to build UIMA CPE" +msgstr "构建 UIMA CPE 的图形界面" -#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2 +#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1 msgid "UIMA Document Analyzer" msgstr "UIMA 文档分析器" +#: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2 +msgid "Simple UIMA analysis engine runner" +msgstr "" + #: ../menu-data/ukopp:ukopp.desktop.in.h:1 -msgid "Full and incremental backup with media verification" +msgid "ukopp" msgstr "" #: ../menu-data/ukopp:ukopp.desktop.in.h:2 -msgid "ukopp" +msgid "Full and incremental backup with media verification" msgstr "" #: ../menu-data/ultracopier:ultracopier.desktop.in.h:1 @@ -17411,103 +17649,103 @@ msgstr "" #: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:1 -msgid "UML Modeller" -msgstr "UML 建模工具" - -#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2 msgid "Umbrello" msgstr "Umbrello" -#: ../menu-data/umit:umit.desktop.in.h:1 -msgid "Explore the network and scan ports" -msgstr "查看网络和扫描端口" +#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2 +msgid "UML Modeller" +msgstr "UML 建模工具" -#: ../menu-data/umit:umit.desktop.in.h:2 +#: ../menu-data/umit:umit.desktop.in.h:1 msgid "Umit Network Scanner" msgstr "Umit Network 扫描器" -#: ../menu-data/unetbootin:unetbootin.desktop.in.h:1 -msgid "Tool for creating Live USB drives" -msgstr "创建自启动 U 盘的工具" +#: ../menu-data/umit:umit.desktop.in.h:2 +msgid "Explore the network and scan ports" +msgstr "查看网络和扫描端口" -#: ../menu-data/unetbootin:unetbootin.desktop.in.h:2 +#: ../menu-data/unetbootin:unetbootin.desktop.in.h:1 msgid "UNetbootin" msgstr "UNetbootin" +#: ../menu-data/unetbootin:unetbootin.desktop.in.h:2 +msgid "Tool for creating Live USB drives" +msgstr "创建自启动 U 盘的工具" + #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1 +#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1 +msgid "Unison" +msgstr "Unison" + +#: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2 msgid "GTK interface for the unison file synchronization tool 2.32.52" msgstr "" -#: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2 #: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2 -msgid "Unison" -msgstr "Unison" - -#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1 msgid "GTK interface for the unison file synchronization tool 2.27.57" msgstr "" #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:1 -msgid "A Qt-based applications launcher" +msgid "Unity 2d Launcher" msgstr "" #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2 -msgid "Unity 2d Launcher" +msgid "A Qt-based applications launcher" msgstr "" #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1 -msgid "A Qt-based panel" +msgid "Unity 2D Panel" msgstr "" #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:2 -msgid "Unity 2D Panel" +msgid "A Qt-based panel" msgstr "" #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:1 -msgid "A Qt-based implementation of Unity Places" +msgid "Unity 2D Places" msgstr "" #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:2 -msgid "Unity 2D Places" +msgid "A Qt-based implementation of Unity Places" msgstr "" -#: ../menu-data/update-manager:update-manager.desktop.in.h:1 +#: ../menu-data/update-manager:update-manager.desktop.in.h:2 msgid "Show and install available updates" msgstr "显示并安装可用更新" #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:1 -msgid " DLNA/UPnP device and service analyzer,control-point and test-tool" +msgid "UPnP Inspector" msgstr "" #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2 -msgid "UPnP Inspector" +msgid " DLNA/UPnP device and service analyzer,control-point and test-tool" msgstr "" #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:1 -msgid "A simple program to manage UPnP IGD compliant routers" +msgid "UPnP Router Control" msgstr "" #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:2 -msgid "UPnP Router Control" +msgid "A simple program to manage UPnP IGD compliant routers" msgstr "" #: ../menu-data/uqm:uqm.desktop.in.h:1 -msgid "An interstellar adventure game" +msgid "The Ur-Quan Masters" msgstr "" #: ../menu-data/uqm:uqm.desktop.in.h:2 -msgid "The Ur-Quan Masters" +msgid "An interstellar adventure game" msgstr "" #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:1 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:1 -msgid "Create a startup disk using a CD or disc image" -msgstr "使用 CD 或磁盘镜像创建启动磁盘" +msgid "Startup Disk Creator" +msgstr "启动磁盘创建器" #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:2 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:2 -msgid "Startup Disk Creator" -msgstr "启动磁盘创建器" +msgid "Create a startup disk using a CD or disc image" +msgstr "使用 CD 或磁盘镜像创建启动磁盘" #: ../menu-data/usb-imagewriter:imagewriter.desktop.in.h:1 msgid "ImageWriter" @@ -17538,13 +17776,13 @@ msgstr "挂载和卸载文件系统" #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:1 -msgid "Change your login password" -msgstr "改变您的登录密码" - -#: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2 msgid "Password" msgstr "密码" +#: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2 +msgid "Change your login password" +msgstr "改变您的登录密码" + #: ../menu-data/utf8-migration-tool:utf8migrationtool.desktop.in.h:1 msgid "UTF-8 Migration Tool" msgstr "" @@ -17558,45 +17796,49 @@ msgstr "" #: ../menu-data/v-sim-common:v-sim.desktop.in.h:1 -msgid "Atomic visualisation" +msgid "V_Sim" msgstr "" #: ../menu-data/v-sim-common:v-sim.desktop.in.h:2 -msgid "V_Sim" +msgid "Atomic visualisation" msgstr "" #: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:1 -msgid "A universal control panel for V4L2 devices" -msgstr "一个通用的 V4L2 设备控制面板" - -#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2 msgid "Video4Linux Control Panel" msgstr "Video4Linux 控制面板" +#: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2 +msgid "A universal control panel for V4L2 devices" +msgstr "一个通用的 V4L2 设备控制面板" + #: ../menu-data/vagalume:vagalume.desktop.in.h:1 +msgid "Last.fm Client" +msgstr "" + +#: ../menu-data/vagalume:vagalume.desktop.in.h:2 msgid "Vagalume Last.fm Client" msgstr "" #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:1 -msgid "Kenta Cho's Val & Rick" +msgid "Val & Rick" msgstr "" #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2 -msgid "Val & Rick" +msgid "Kenta Cho's Val & Rick" msgstr "" -#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1 +#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2 msgid "Command Line Interface" msgstr "" #: ../menu-data/valknut:valknut.desktop.in.h:1 -msgid "Share files over the Direct Connect network" -msgstr "" - -#: ../menu-data/valknut:valknut.desktop.in.h:2 msgid "Valknut" msgstr "Valknut" +#: ../menu-data/valknut:valknut.desktop.in.h:2 +msgid "Share files over the Direct Connect network" +msgstr "" + #: ../menu-data/vbaexpress:vbaexpress.desktop.in.h:1 msgid "VBA Express" msgstr "" @@ -17606,27 +17848,27 @@ msgstr "" #: ../menu-data/vectoroids:vectoroids.desktop.in.h:1 -msgid "A clone of the classic arcade game \"Asteroids\"" -msgstr "经典街机游戏 “小行星” 的一个克隆" - -#: ../menu-data/vectoroids:vectoroids.desktop.in.h:2 msgid "Vectoroids" msgstr "Vectoroids" -#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1 -msgid "French conjugation system" -msgstr "法国共轭体系" +#: ../menu-data/vectoroids:vectoroids.desktop.in.h:2 +msgid "A clone of the classic arcade game \"Asteroids\"" +msgstr "经典街机游戏 “小行星” 的一个克隆" -#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2 +#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1 msgid "Verbiste" msgstr "Verbiste" +#: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2 +msgid "French conjugation system" +msgstr "法国共轭体系" + #: ../menu-data/veusz:veusz.desktop.in.h:1 -msgid "For graphing and manipulation of scientific data" +msgid "Veusz" msgstr "" #: ../menu-data/veusz:veusz.desktop.in.h:2 -msgid "Veusz" +msgid "For graphing and manipulation of scientific data" msgstr "" #: ../menu-data/vice:x128.desktop.in.h:1 @@ -17654,13 +17896,13 @@ msgstr "Commodore VIC-20" #: ../menu-data/vidalia:vidalia.desktop.in.h:1 -msgid "Tor GUI" -msgstr "Tor 图形用户界面" - -#: ../menu-data/vidalia:vidalia.desktop.in.h:2 msgid "Vidalia" msgstr "Vidalia" +#: ../menu-data/vidalia:vidalia.desktop.in.h:2 +msgid "Tor GUI" +msgstr "Tor 图形用户界面" + #: ../menu-data/videocut:videocut.desktop.in.h:1 msgid "A simple video application" msgstr "一个简单的视频程序" @@ -17670,93 +17912,89 @@ msgstr "VideoCut" #: ../menu-data/videoporama:videoporama.desktop.in.h:1 -msgid "Make and export image slideshows" -msgstr "制作和导出图像幻灯片" - -#: ../menu-data/videoporama:videoporama.desktop.in.h:2 msgid "Videoporama" msgstr "Videoporama" +#: ../menu-data/videoporama:videoporama.desktop.in.h:2 +msgid "Make and export image slideshows" +msgstr "制作和导出图像幻灯片" + #: ../menu-data/viewmol:viewmol.desktop.in.h:1 msgid "Viewmol" msgstr "Viewmol" #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:1 -msgid "A spicy PDF Reader." -msgstr "好用的PDF阅读器" - -#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2 msgid "ViewPDF" msgstr "阅览PDF文件" -#: ../menu-data/viking:viking.desktop.in.h:1 -msgid "Map Based GPS Data Manager (live data capable)." -msgstr "基于地图的 GPS 数据管理器 (实时数据能力)" +#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2 +msgid "A spicy PDF Reader." +msgstr "好用的PDF阅读器" -#: ../menu-data/viking:viking.desktop.in.h:2 +#: ../menu-data/viking:viking.desktop.in.h:1 msgid "Viking" msgstr "Viking" -#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2 +#: ../menu-data/viking:viking.desktop.in.h:2 +msgid "Map Based GPS Data Manager (live data capable)." +msgstr "基于地图的 GPS 数据管理器 (实时数据能力)" + +#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1 msgid "GVim" msgstr "" #: ../menu-data/vinagre:vinagre.desktop.in.h:1 -msgid "Access remote desktops" -msgstr "访问远程桌面" - -#: ../menu-data/vinagre:vinagre.desktop.in.h:2 msgid "Remote Desktop Viewer" msgstr "远程桌面查看器" -#: ../menu-data/vino:vino-preferences.desktop.in.h:1 +#: ../menu-data/vinagre:vinagre.desktop.in.h:2 +msgid "Access remote desktops" +msgstr "访问远程桌面" + +#: ../menu-data/vino:vino-preferences.desktop.in.h:2 msgid "Choose how other users can remotely view your desktop" msgstr "选择其他用户如何从远程查看您的桌面" #: ../menu-data/viridian:viridian.desktop.in.h:1 -msgid "Stand alone front end for Ampache." +msgid "viridian" msgstr "" #: ../menu-data/viridian:viridian.desktop.in.h:2 -msgid "viridian" +msgid "Stand alone front end for Ampache." msgstr "" #: ../menu-data/virt-manager:virt-manager.desktop.in.h:1 -msgid "Manage virtual machines" -msgstr "管理虚拟机" - -#: ../menu-data/virt-manager:virt-manager.desktop.in.h:2 msgid "Virtual Machine Manager" msgstr "虚拟机管理器" +#: ../menu-data/virt-manager:virt-manager.desktop.in.h:2 +msgid "Manage virtual machines" +msgstr "管理虚拟机" + #: ../menu-data/virtaal:virtaal.desktop.in.h:1 +msgid "Virtaal" +msgstr "Virtaal" + +#: ../menu-data/virtaal:virtaal.desktop.in.h:2 msgid "" "A translation tool to help a human translator translate files into other " "languages" msgstr "一个帮助一个翻译者翻译文件到其它语言的翻译工具" -#: ../menu-data/virtaal:virtaal.desktop.in.h:2 -msgid "Virtaal" -msgstr "Virtaal" - #: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:1 -msgid "Run several virtual systems on a single host computer" -msgstr "在一个主机上运行多个虚拟系统" - -#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2 msgid "VirtualBox" msgstr "" -#: ../menu-data/viruskiller:viruskiller.desktop.in.h:1 -msgid "Virus Killer" -msgstr "病毒杀手" +#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2 +msgid "Run several virtual systems on a single host computer" +msgstr "在一个主机上运行多个虚拟系统" #: ../menu-data/visolate:visolate.desktop.in.h:1 -msgid "PCB CNC converter" +msgid "Visolate" msgstr "" #: ../menu-data/visolate:visolate.desktop.in.h:2 -msgid "Visolate" +msgid "PCB CNC converter" msgstr "" #: ../menu-data/visualboyadvance-gtk:VisualBoyAdvance.desktop.in.h:1 @@ -17768,45 +18006,45 @@ msgstr "GBA 模拟器" #: ../menu-data/visualvm:visualvm.desktop.in.h:1 -msgid "All-in-One Java Troubleshooting Tool" -msgstr "全合一的 Java 疑难解答工具" - -#: ../menu-data/visualvm:visualvm.desktop.in.h:2 msgid "VisualVM" msgstr "VisualVM" +#: ../menu-data/visualvm:visualvm.desktop.in.h:2 +msgid "All-in-One Java Troubleshooting Tool" +msgstr "全合一的 Java 疑难解答工具" + #: ../menu-data/vitables:vitables.desktop.in.h:1 -msgid "PyTables & HDF5 Files Visualizer" +msgid "ViTables" msgstr "" #: ../menu-data/vitables:vitables.desktop.in.h:2 -msgid "ViTables" +msgid "PyTables & HDF5 Files Visualizer" msgstr "" #: ../menu-data/vite:vite.desktop.in.h:1 -msgid "A visual trace explorer" -msgstr "" - -#: ../menu-data/vite:vite.desktop.in.h:2 msgid "ViTE" msgstr "ViTE" -#: ../menu-data/vkeybd:vkeybd.desktop.in.h:1 -msgid "MIDI Virtual Keyboard" -msgstr "MIDI 虚拟键盘" +#: ../menu-data/vite:vite.desktop.in.h:2 +msgid "A visual trace explorer" +msgstr "" -#: ../menu-data/vkeybd:vkeybd.desktop.in.h:2 +#: ../menu-data/vkeybd:vkeybd.desktop.in.h:1 msgid "Virtual MIDI Keyboard" msgstr "虚拟 MIDI 键盘" -#: ../menu-data/vlc:vlc.desktop.in.h:1 -msgid "Read, capture, broadcast your multimedia streams" -msgstr "读取,录制,播放你的多媒体流" +#: ../menu-data/vkeybd:vkeybd.desktop.in.h:2 +msgid "MIDI Virtual Keyboard" +msgstr "MIDI 虚拟键盘" -#: ../menu-data/vlc:vlc.desktop.in.h:2 +#: ../menu-data/vlc:vlc.desktop.in.h:1 msgid "VLC media player" msgstr "VLC 多媒体播放程序" +#: ../menu-data/vlc:vlc.desktop.in.h:2 +msgid "Read, capture, broadcast your multimedia streams" +msgstr "读取,录制,播放你的多媒体流" + #: ../menu-data/vmpk:vmpk.desktop.in.h:1 msgid "VMPK" msgstr "VMPK" @@ -17825,27 +18063,31 @@ msgstr "vodovod" #: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:1 -msgid "Control your volume settings" -msgstr "控制音量设置" - -#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2 msgid "VolumeControl" msgstr "音量控制" -#: ../menu-data/vor:vor.desktop.in.h:1 -msgid "Variations on Rockdodger" -msgstr "" +#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2 +msgid "Control your volume settings" +msgstr "控制音量设置" -#: ../menu-data/vor:vor.desktop.in.h:2 +#: ../menu-data/vor:vor.desktop.in.h:1 msgid "VoR" msgstr "VoR" +#: ../menu-data/vor:vor.desktop.in.h:2 +msgid "Variations on Rockdodger" +msgstr "" + #: ../menu-data/voxbo:vbview2.desktop.in.h:1 -msgid "VBView2" +msgid "VoxBo Image Viewer" msgstr "" #: ../menu-data/voxbo:vbview2.desktop.in.h:2 -msgid "VoxBo Image Viewer" +msgid "VBView2" +msgstr "" + +#: ../menu-data/vprerex:vprerex.desktop.in.h:1 +msgid "vprerex" msgstr "" #: ../menu-data/vusb-analyzer:vusb-analyzer.desktop.in.h:1 @@ -17857,32 +18099,32 @@ msgstr "" #: ../menu-data/vym:vym.desktop.in.h:1 -msgid "Create mind maps" -msgstr "创建思维导图" - -#: ../menu-data/vym:vym.desktop.in.h:2 msgid "VYM - View Your Mind" msgstr "VYM - 浏览您的思维" -#: ../menu-data/w3af:w3af.desktop.in.h:1 -msgid "Web Application Attack and Audit Framework" -msgstr "" +#: ../menu-data/vym:vym.desktop.in.h:2 +msgid "Create mind maps" +msgstr "创建思维导图" -#: ../menu-data/w3af:w3af.desktop.in.h:2 +#: ../menu-data/w3af:w3af.desktop.in.h:1 msgid "w3af" msgstr "w3af" +#: ../menu-data/w3af:w3af.desktop.in.h:2 +msgid "Web Application Attack and Audit Framework" +msgstr "" + #: ../menu-data/wakeup:wakeup.desktop.in.h:1 -msgid "" -"A talking and fully customizable alarm clock that will operate from poweroff" +msgid "Wakeup" msgstr "" #: ../menu-data/wakeup:wakeup.desktop.in.h:2 -msgid "Wakeup" +msgid "" +"A talking and fully customizable alarm clock that will operate from poweroff" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:1 -msgid "Change Wallpaper" +msgid "Wallch" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:2 @@ -17890,197 +18132,200 @@ msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:3 -msgid "Live Earth Wallpaper" +msgid "Start" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:4 -msgid "Next" +msgid "Pause" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:5 -msgid "Pause" +msgid "Stop" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:6 -msgid "Previous" +msgid "Next" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:7 -msgid "Start" +msgid "Previous" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:8 -msgid "Start Changing Wallpapers" +msgid "Change Wallpaper" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:9 -msgid "Stop" +msgid "Start Changing Wallpapers" msgstr "" #: ../menu-data/wallch:wallch.desktop.in.h:10 -msgid "Wallch" +msgid "Live Earth Wallpaper" msgstr "" #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:1 -msgid "KDE4 Wallpaper changer" -msgstr "KDE4 壁纸切换程序" - -#: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2 msgid "Wally" msgstr "Wally" -#: ../menu-data/wammu:wammu.desktop.in.h:1 -msgid "Application for mobile phones - frontend for Gammu" -msgstr "移动电话应用程序 - Gammu 前端" +#: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2 +msgid "KDE4 Wallpaper changer" +msgstr "KDE4 壁纸切换程序" -#: ../menu-data/wammu:wammu.desktop.in.h:2 +#: ../menu-data/wammu:wammu.desktop.in.h:1 msgid "Wammu" msgstr "Wammu" -#: ../menu-data/warmux:warmux.desktop.in.h:1 -msgid "A 2D game where funny characters launch funny weapons" -msgstr "一个好玩儿的字符加载好玩儿的武器的二维游戏" +#: ../menu-data/wammu:wammu.desktop.in.h:2 +msgid "Application for mobile phones - frontend for Gammu" +msgstr "移动电话应用程序 - Gammu 前端" -#: ../menu-data/warmux:warmux.desktop.in.h:2 +#: ../menu-data/warmux:warmux.desktop.in.h:1 msgid "Warmux" msgstr "" -#: ../menu-data/warsow:warsow.desktop.in.h:1 -msgid "A fast paced, networked 3D first person shooter" -msgstr "" +#: ../menu-data/warmux:warmux.desktop.in.h:2 +msgid "A 2D game where funny characters launch funny weapons" +msgstr "一个好玩儿的字符加载好玩儿的武器的二维游戏" -#: ../menu-data/warsow:warsow.desktop.in.h:2 +#: ../menu-data/warsow:warsow.desktop.in.h:1 msgid "Warsow" msgstr "Warsow" -#: ../menu-data/warzone2100:warzone2100.desktop.in.h:1 -msgid "Postnuclear realtime strategy" +#: ../menu-data/warsow:warsow.desktop.in.h:2 +msgid "A fast paced, networked 3D first person shooter" msgstr "" -#: ../menu-data/warzone2100:warzone2100.desktop.in.h:2 +#: ../menu-data/warzone2100:warzone2100.desktop.in.h:1 msgid "Warzone 2100" msgstr "Warzone 2100" -#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1 -msgid "Split wave files into multiple chunks" -msgstr "把波形文件分割成多个块" +#: ../menu-data/warzone2100:warzone2100.desktop.in.h:2 +msgid "Postnuclear realtime strategy" +msgstr "" -#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2 +#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1 msgid "Wavbreaker File Splitter" msgstr "Wavbreaker 文件分割器" -#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1 -msgid "Manipulate sound files" -msgstr "处理声音文件" +#: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2 +msgid "Split wave files into multiple chunks" +msgstr "把波形文件分割成多个块" -#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2 +#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1 msgid "wavesurfer" msgstr "wavesurfer" -#: ../menu-data/webboard:webboard.desktop.in.h:1 -msgid "" -"Publish text notes and source code on a pastebin server for collaborative " -"debugging" -msgstr "在一个 pastebin 服务器上发布文字说明和源代码来协作调试" - -#: ../menu-data/webboard:webboard.desktop.in.h:2 -msgid "WebBoard" -msgstr "WebBoard" +#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2 +msgid "Manipulate sound files" +msgstr "处理声音文件" #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:1 -msgid "Copy websites to your computer" -msgstr "将网站复制到你的计算机" - -#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2 msgid "WebHTTrack Website Copier" msgstr "WebHTTrack 网站复制工具" -#: ../menu-data/webissues:webissues.desktop.in.h:1 -msgid "Desktop Client for the WebIssues team collaboration system" -msgstr "" +#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2 +msgid "Copy websites to your computer" +msgstr "将网站复制到你的计算机" -#: ../menu-data/webissues:webissues.desktop.in.h:2 +#: ../menu-data/webissues:webissues.desktop.in.h:1 msgid "WebIssues" msgstr "WebIssues" +#: ../menu-data/webissues:webissues.desktop.in.h:2 +msgid "Desktop Client for the WebIssues team collaboration system" +msgstr "" + #: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:1 +msgid "Zoho Webservice Spreadsheet" +msgstr "Zoho 网络服务电子表格" + +#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2 msgid "" "Perform calculation, analyze information and manage lists in spreadsheets " "using Zoho web services." msgstr "使用 Zoho 网络服务执行计算、分析信息和管理电子表格中的数据列。" -#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2 -msgid "Zoho Webservice Spreadsheet" -msgstr "Zoho 网络服务电子表格" - #: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1 +msgid "Zoho Webservice Presentation" +msgstr "Zoho 网络服务演示" + +#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2 msgid "" "Create and edit presentations for slideshows, meeting and Web pages using " "Zoho web services." msgstr "使用 Zoho 网络服务创建和编辑用于幻灯片、会议和网页的演示文稿。" -#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2 -msgid "Zoho Webservice Presentation" -msgstr "Zoho 网络服务演示" - #: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1 +msgid "Zoho Webservice Word Processor" +msgstr "Zoho 网络服务文字处理" + +#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2 msgid "" "Create and edit text and graphics in letters, reports, documents and Web " "pages using Zoho web services." msgstr "使用 Zoho 网络服务创建和编辑信函、报告、文档和网页中的文字和图形。" -#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2 -msgid "Zoho Webservice Word Processor" -msgstr "Zoho 网络服务文字处理" - #: ../menu-data/weka:weka.desktop.in.h:1 +msgid "weka" +msgstr "weka" + +#: ../menu-data/weka:weka.desktop.in.h:2 msgid "Machine learning algorithms for data mining tasks" msgstr "数据挖掘任务的机器学习算法" -#: ../menu-data/weka:weka.desktop.in.h:2 -msgid "weka" -msgstr "weka" +#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:1 +msgid "Battle for Wesnoth (1.10)" +msgstr "" -#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1 +#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2 +#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2 msgid "A fantasy turn-based strategy game" msgstr "一个奇幻回合制战略游戏" -#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2 +#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:1 +msgid "Battle for Wesnoth Map Editor (1.10)" +msgstr "" + +#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:2 +msgid "A map editor for Battle for Wesnoth maps" +msgstr "" + +#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1 msgid "Battle for Wesnoth (1.8)" msgstr "" #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:1 -msgid "2D platform game with a slight rotational twist" +msgid "Which Way is Up" msgstr "" #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:2 -msgid "Which Way is Up" +msgid "2D platform game with a slight rotational twist" msgstr "" #: ../menu-data/wicd-gtk:wicd.desktop.in.h:1 -msgid "Start the Wicd client without system tray icon" -msgstr "启动 Wicd 客户端不使用系统托盘图标" - -#: ../menu-data/wicd-gtk:wicd.desktop.in.h:2 msgid "Wicd Network Manager" msgstr "Wicd 网络管理器" +#: ../menu-data/wicd-gtk:wicd.desktop.in.h:2 +msgid "Start the Wicd client without system tray icon" +msgstr "启动 Wicd 客户端不使用系统托盘图标" + #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:1 -msgid "Wicd Client KDE" +msgid "Wicd client" msgstr "" #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:2 -msgid "Wicd client" +msgid "Wicd Client KDE" msgstr "" #: ../menu-data/widelands:widelands.desktop.in.h:1 -msgid "A a real-time build-up strategy game" -msgstr "一个实时增长战略游戏" - -#: ../menu-data/widelands:widelands.desktop.in.h:2 msgid "Widelands" msgstr "Widelands" +#: ../menu-data/widelands:widelands.desktop.in.h:2 +msgid "A a real-time build-up strategy game" +msgstr "一个实时增长战略游戏" + #: ../menu-data/widemargin:widemargin.desktop.in.h:1 msgid "Simple Bible Application" msgstr "" @@ -18090,20 +18335,12 @@ msgstr "" #: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:1 -msgid "Tool for connecting to wireless networks" -msgstr "用于连接无线网络的工具" - -#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2 msgid "WiFi Radar" msgstr "WiFi 雷达" -#: ../menu-data/wiican:wiican.desktop.in.h:1 -msgid "Wiican" -msgstr "" - -#: ../menu-data/wiican:wiican.desktop.in.h:2 -msgid "Wiimote manager usage assistant and mapping manager" -msgstr "" +#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2 +msgid "Tool for connecting to wireless networks" +msgstr "用于连接无线网络的工具" #: ../menu-data/willowng-config-gnome:willowng.desktop.in.h:1 #: ../menu-data/willowng-config-kde:kde__willowng-kde.desktop.in.h:1 @@ -18121,29 +18358,29 @@ msgstr "Wine Windows 程序加载器" #: ../menu-data/winefish:winefish.desktop.in.h:1 -msgid "LaTeX Editor based on Bluefish" -msgstr "基于 Bluefish 的 LaTeX 编辑器" - -#: ../menu-data/winefish:winefish.desktop.in.h:2 msgid "Winefish LaTeX Editor" msgstr "Winefish LaTeX 编辑器" -#: ../menu-data/winff:winff.desktop.in.h:1 -msgid "GUI for FFMPEG" -msgstr "FFMPEG 的 GUI" +#: ../menu-data/winefish:winefish.desktop.in.h:2 +msgid "LaTeX Editor based on Bluefish" +msgstr "基于 Bluefish 的 LaTeX 编辑器" -#: ../menu-data/winff:winff.desktop.in.h:2 +#: ../menu-data/winff:winff.desktop.in.h:1 msgid "WinFF" msgstr "WinFF" -#: ../menu-data/wings3d:wings3d.desktop.in.h:1 -msgid "Create and edit 3D models of objects" -msgstr "为对象创建并编辑三维模型" +#: ../menu-data/winff:winff.desktop.in.h:2 +msgid "GUI for FFMPEG" +msgstr "FFMPEG 的 GUI" -#: ../menu-data/wings3d:wings3d.desktop.in.h:2 +#: ../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/wininfo:xdg-wininfo.desktop.in.h:1 msgid "A window information utility for X" msgstr "X 的一个窗口信息工具" @@ -18153,47 +18390,55 @@ msgstr "X 视窗信息" #: ../menu-data/winpdb:winpdb.desktop.in.h:1 -msgid "Platform independent Python debugger" -msgstr "依赖平台的 Python 调试器" - -#: ../menu-data/winpdb:winpdb.desktop.in.h:2 msgid "Winpdb" msgstr "Winpdb" -#: ../menu-data/wireshark:wireshark.desktop.in.h:1 -msgid "Network traffic analyzer" -msgstr "网络流量分析器" +#: ../menu-data/winpdb:winpdb.desktop.in.h:2 +msgid "Platform independent Python debugger" +msgstr "依赖平台的 Python 调试器" -#: ../menu-data/wireshark:wireshark.desktop.in.h:2 +#: ../menu-data/wireshark:wireshark.desktop.in.h:1 msgid "Wireshark" msgstr "Wireshark" +#: ../menu-data/wireshark:wireshark.desktop.in.h:2 +msgid "Network traffic analyzer" +msgstr "网络流量分析器" + #: ../menu-data/wizznic:wizznic.desktop.in.h:1 -msgid "A puzzle-block falling game." +msgid "Wizznic" msgstr "" #: ../menu-data/wizznic:wizznic.desktop.in.h:2 -msgid "Wizznic" +msgid "A puzzle-block falling game." msgstr "" #: ../menu-data/wmgui:wmgui.desktop.in.h:1 -msgid "Simple GTK gui to the wiimote to test and display the wiimote data." -msgstr "Wiimote 的用来测试并显示 Wiimote 数据的简单 GTK 图形界面。" - -#: ../menu-data/wmgui:wmgui.desktop.in.h:2 msgid "Wmgui" msgstr "Wmgui" +#: ../menu-data/wmgui:wmgui.desktop.in.h:2 +msgid "Simple GTK gui to the wiimote to test and display the wiimote data." +msgstr "Wiimote 的用来测试并显示 Wiimote 数据的简单 GTK 图形界面。" + #: ../menu-data/wmitime:wmitime.desktop.in.h:1 msgid "Wmitime" msgstr "Wmitime" +#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:1 +msgid "Wolf4SDL" +msgstr "" + +#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:2 +msgid "SDL-Port of Wolfenstein 3-D and Spear of Destiny" +msgstr "" + #: ../menu-data/worker:worker.desktop.in.h:1 -msgid "File manager for X." +msgid "Worker" msgstr "" #: ../menu-data/worker:worker.desktop.in.h:2 -msgid "Worker" +msgid "File manager for X." msgstr "" #: ../menu-data/workrave:workrave.desktop.in.h:1 @@ -18206,37 +18451,45 @@ msgstr "Workrave" #: ../menu-data/wpagui:wpa_gui.desktop.in.h:1 -msgid "Graphical user interface for wpa_supplicant" -msgstr "Wpa_supplicant 的图形用户界面" - -#: ../menu-data/wpagui:wpa_gui.desktop.in.h:2 msgid "wpa_gui" msgstr "wpa_gui" +#: ../menu-data/wpagui:wpa_gui.desktop.in.h:2 +msgid "Graphical user interface for wpa_supplicant" +msgstr "Wpa_supplicant 的图形用户界面" + #: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:1 +msgid "WrapperFactory" +msgstr "WrapperFactory" + +#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2 msgid "Graphically create Unix application wrappers for GNUstep" msgstr "为 GNUstep 图形化地创建 Unix 应用程序封装器" -#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2 -msgid "WrapperFactory" -msgstr "WrapperFactory" +#: ../menu-data/writetype:writetype.desktop.in.h:1 +msgid "Writetype" +msgstr "" -#: ../menu-data/wsjt:wsjt.desktop.in.h:1 -msgid "Amateur radio weak signal communications" -msgstr "业余无线电弱信号通讯" +#: ../menu-data/writetype:writetype.desktop.in.h:2 +msgid "A word processor to make typing easier" +msgstr "" -#: ../menu-data/wsjt:wsjt.desktop.in.h:2 +#: ../menu-data/wsjt:wsjt.desktop.in.h:1 msgid "WSJT" msgstr "WSJT" -#: ../menu-data/wxbanker:wxbanker.desktop.in.h:1 -msgid "A lightweight personal finance manager" -msgstr "一个轻量级的个人财务管理" +#: ../menu-data/wsjt:wsjt.desktop.in.h:2 +msgid "Amateur radio weak signal communications" +msgstr "业余无线电弱信号通讯" -#: ../menu-data/wxbanker:wxbanker.desktop.in.h:2 +#: ../menu-data/wxbanker:wxbanker.desktop.in.h:1 msgid "wxBanker Finance Manager" msgstr "wxBanker 财务管理" +#: ../menu-data/wxbanker:wxbanker.desktop.in.h:2 +msgid "A lightweight personal finance manager" +msgstr "一个轻量级的个人财务管理" + #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:1 msgid "wxFormBuilder" msgstr "wxFormBuilder" @@ -18246,22 +18499,22 @@ msgstr "wxWidgets GUI 设计器" #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1 -msgid "Perform symbolic and numeric calculations using Maxima" -msgstr "使用 Maxima 进行符号和数值计算" - -#: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2 msgid "wxMaxima" msgstr "wxMaxima" -#: ../menu-data/x11vnc:x11vnc.desktop.in.h:1 -msgid "Share this desktop by VNC" -msgstr "通过 VNC 共享桌面" +#: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2 +msgid "Perform symbolic and numeric calculations using Maxima" +msgstr "使用 Maxima 进行符号和数值计算" -#: ../menu-data/x11vnc:x11vnc.desktop.in.h:2 +#: ../menu-data/x11vnc:x11vnc.desktop.in.h:1 msgid "X11VNC Server" msgstr "X11VNC 服务器" -#: ../menu-data/x2:x2.desktop.in.h:2 +#: ../menu-data/x11vnc:x11vnc.desktop.in.h:2 +msgid "Share this desktop by VNC" +msgstr "通过 VNC 共享桌面" + +#: ../menu-data/x2:x2.desktop.in.h:1 msgid "X2" msgstr "" @@ -18275,37 +18528,37 @@ msgstr "" #: ../menu-data/xacobeo:xacobeo.desktop.in.h:1 -msgid "Build and execute XPath queries" +msgid "Xacobeo" msgstr "" #: ../menu-data/xacobeo:xacobeo.desktop.in.h:2 -msgid "Xacobeo" +msgid "Build and execute XPath queries" msgstr "" #: ../menu-data/xaos:xaos.desktop.in.h:1 -msgid "Fractal Generator" +msgid "Xaos - Fractal Zoomer" msgstr "" #: ../menu-data/xaos:xaos.desktop.in.h:2 -msgid "Xaos - Fractal Zoomer" +msgid "Fractal Generator" msgstr "" #: ../menu-data/xaralx:xaralx.desktop.in.h:1 -msgid "Versatile vector graphics program" -msgstr "Versatile 矢量图形程序" - -#: ../menu-data/xaralx:xaralx.desktop.in.h:2 msgid "Xara Xtreme" msgstr "Xara Xtreme" -#: ../menu-data/xarchiver:xarchiver.desktop.in.h:1 -msgid "A GTK+2 only archive manager" -msgstr "仅依赖于 GTK+2 的归档管理器" +#: ../menu-data/xaralx:xaralx.desktop.in.h:2 +msgid "Versatile vector graphics program" +msgstr "Versatile 矢量图形程序" -#: ../menu-data/xarchiver:xarchiver.desktop.in.h:2 +#: ../menu-data/xarchiver:xarchiver.desktop.in.h:1 msgid "Xarchiver" msgstr "Xarchiver" +#: ../menu-data/xarchiver:xarchiver.desktop.in.h:2 +msgid "A GTK+2 only archive manager" +msgstr "仅依赖于 GTK+2 的归档管理器" + #: ../menu-data/xawtv:xawtv.desktop.in.h:1 msgid "TV viewer for X11" msgstr "X11 的电视浏览器" @@ -18315,79 +18568,79 @@ msgstr "XawTV" #: ../menu-data/xbill:xbill.desktop.in.h:1 -msgid "Get rid of those Wingdows Viruses!" -msgstr "" - -#: ../menu-data/xbill:xbill.desktop.in.h:2 msgid "XBill" msgstr "XBill" -#: ../menu-data/xboard:xboard.desktop.in.h:1 -msgid "Use an X Windows Chess Board" +#: ../menu-data/xbill:xbill.desktop.in.h:2 +msgid "Get rid of those Wingdows Viruses!" msgstr "" -#: ../menu-data/xboard:xboard.desktop.in.h:2 +#: ../menu-data/xboard:xboard.desktop.in.h:1 msgid "XBoard" msgstr "XBoard" -#: ../menu-data/xboing:xboing.desktop.in.h:1 -msgid "Destroy some blocks" -msgstr "毁灭一些块" +#: ../menu-data/xboard:xboard.desktop.in.h:2 +msgid "Use an X Windows Chess Board" +msgstr "" -#: ../menu-data/xboing:xboing.desktop.in.h:2 +#: ../menu-data/xboing:xboing.desktop.in.h:1 msgid "XBoing II" msgstr "XBoing II" +#: ../menu-data/xboing:xboing.desktop.in.h:2 +msgid "Destroy some blocks" +msgstr "毁灭一些块" + #: ../menu-data/xca:xca.desktop.in.h:1 +msgid "XCA" +msgstr "XCA" + +#: ../menu-data/xca:xca.desktop.in.h:2 msgid "" "A graphical user interface for handling and issuing X.509 compliant " "Certificates" msgstr "" -#: ../menu-data/xca:xca.desktop.in.h:2 -msgid "XCA" -msgstr "XCA" - #: ../menu-data/xcdroast:xcdroast.desktop.in.h:1 -msgid "Create a CD" -msgstr "创建一个 CD" - -#: ../menu-data/xcdroast:xcdroast.desktop.in.h:2 msgid "X-CD-Roast" msgstr "X-CD-Roast" -#: ../menu-data/xcfa:xcfa.desktop.in.h:1 -msgid "X Convert File Audio. Programme pour convertir les fichiers audio." -msgstr "X 转换音频文件。程序转换为音频文件。" +#: ../menu-data/xcdroast:xcdroast.desktop.in.h:2 +msgid "Create a CD" +msgstr "创建一个 CD" -#: ../menu-data/xcfa:xcfa.desktop.in.h:2 +#: ../menu-data/xcfa:xcfa.desktop.in.h:1 msgid "XCFA" msgstr "XCFA" -#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1 -msgid "Chat with people using IRC" -msgstr "使用 IRC 跟人们聊天" +#: ../menu-data/xcfa:xcfa.desktop.in.h:2 +msgid "X Convert File Audio. Programme pour convertir les fichiers audio." +msgstr "X 转换音频文件。程序转换为音频文件。" -#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2 +#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1 msgid "XChat-GNOME IRC Chat" msgstr "XChat-GNOME IRC 聊天工具" -#: ../menu-data/xchat:xchat.desktop.in.h:1 -msgid "Chat with other people using Internet Relay Chat" -msgstr "使用互联网中继聊天来和其他人交流" +#: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2 +msgid "Chat with people using IRC" +msgstr "使用 IRC 跟人们聊天" -#: ../menu-data/xchat:xchat.desktop.in.h:2 +#: ../menu-data/xchat:xchat.desktop.in.h:1 msgid "XChat IRC" msgstr "XChat IRC" -#: ../menu-data/xchm:xchm.desktop.in.h:1 -msgid "Compiled HTML Help (CHM) file viewer" -msgstr "编译的 HTML 帮助 (CHM) 文件浏览器" +#: ../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:2 +#: ../menu-data/xchm:xchm.desktop.in.h:1 msgid "xCHM" msgstr "xCHM" +#: ../menu-data/xchm:xchm.desktop.in.h:2 +msgid "Compiled HTML Help (CHM) file viewer" +msgstr "编译的 HTML 帮助 (CHM) 文件浏览器" + #: ../menu-data/xdemineur:xdemineur.desktop.in.h:1 msgid "Xdemineur" msgstr "Xdemineur" @@ -18397,48 +18650,48 @@ msgstr "X 的另外一个扫雷舰" #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:1 -msgid "X.org Diagnostic and Repair Utility" +msgid "xdiagnose" msgstr "" #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:2 -msgid "xdiagnose" +msgid "X.org Diagnostic and Repair Utility" msgstr "" #: ../menu-data/xdot:xdot.desktop.in.h:1 -msgid "Interactive viewer for Graphviz dot files" +msgid "XDot" msgstr "" #: ../menu-data/xdot:xdot.desktop.in.h:2 -msgid "XDot" +msgid "Interactive viewer for Graphviz dot files" msgstr "" #: ../menu-data/xdx:Xdx.desktop.in.h:1 -msgid "DX-cluster client for amateur radio" -msgstr "用于业余无线电爱好者的 DX-集群 客户端" - -#: ../menu-data/xdx:Xdx.desktop.in.h:2 msgid "Xdx" msgstr "Xdx" -#: ../menu-data/xenwatch:xenwatch.desktop.in.h:1 -msgid "watch xen domains" -msgstr "监视 xen 域名" +#: ../menu-data/xdx:Xdx.desktop.in.h:2 +msgid "DX-cluster client for amateur radio" +msgstr "用于业余无线电爱好者的 DX-集群 客户端" -#: ../menu-data/xenwatch:xenwatch.desktop.in.h:2 +#: ../menu-data/xenwatch:xenwatch.desktop.in.h:1 msgid "xenwatch" msgstr "xenwatch" +#: ../menu-data/xenwatch:xenwatch.desktop.in.h:2 +msgid "watch xen domains" +msgstr "监视 xen 域名" + #: ../menu-data/xfburn:xfburn.desktop.in.h:1 -msgid "Burn Image (xfburn)" -msgstr "刻录镜像 (xfburn)" +msgid "Xfburn" +msgstr "Xfburn" #: ../menu-data/xfburn:xfburn.desktop.in.h:2 msgid "CD and DVD burning application" msgstr "CD 和 DVD 的刻录程序" #: ../menu-data/xfburn:xfburn.desktop.in.h:3 -msgid "Xfburn" -msgstr "Xfburn" +msgid "Burn Image (xfburn)" +msgstr "刻录镜像 (xfburn)" #: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:1 msgid "Desktop " @@ -18449,21 +18702,21 @@ msgstr "" #: ../menu-data/xfe:xfe.desktop.in.h:1 -msgid "A lightweight file manager for X Window" -msgstr "一个 X 窗口系统的轻量文件管理器" - -#: ../menu-data/xfe:xfe.desktop.in.h:2 msgid "Xfe" msgstr "Xfe" -#: ../menu-data/xfig:xfig.desktop.in.h:1 -msgid "Diagram editor" -msgstr "图表编辑器" +#: ../menu-data/xfe:xfe.desktop.in.h:2 +msgid "A lightweight file manager for X Window" +msgstr "一个 X 窗口系统的轻量文件管理器" -#: ../menu-data/xfig:xfig.desktop.in.h:2 +#: ../menu-data/xfig:xfig.desktop.in.h:1 msgid "Xfig" msgstr "Xfig" +#: ../menu-data/xfig:xfig.desktop.in.h:2 +msgid "Diagram editor" +msgstr "图表编辑器" + #: ../menu-data/xflr5:xflr5.desktop.in.h:1 msgid "XFLR5" msgstr "" @@ -18473,35 +18726,35 @@ msgstr "" #: ../menu-data/xfmpc:xfmpc.desktop.in.h:1 -msgid "MPD client written in GTK+ for Xfce" -msgstr "使用 GTK+ 的为 Xfce 编写的 MPD 客户端" - -#: ../menu-data/xfmpc:xfmpc.desktop.in.h:2 msgid "Xfmpc" msgstr "Xfmpc" +#: ../menu-data/xfmpc:xfmpc.desktop.in.h:2 +msgid "MPD client written in GTK+ for Xfce" +msgstr "使用 GTK+ 的为 Xfce 编写的 MPD 客户端" + #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1 -msgid "Configure window behavior and shortcuts" +msgid "Window Manager" msgstr "" #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2 -msgid "Window Manager" +msgid "Configure window behavior and shortcuts" msgstr "" #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1 -msgid "Fine-tune window behaviour and effects" +msgid "Window Manager Tweaks" msgstr "" #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2 -msgid "Window Manager Tweaks" +msgid "Fine-tune window behaviour and effects" msgstr "" #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1 -msgid "Set number and names of workspaces" +msgid "Workspaces" msgstr "" #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2 -msgid "Workspaces" +msgid "Set number and names of workspaces" msgstr "" #: ../menu-data/xgalaga:xgalaga.desktop.in.h:1 @@ -18513,18 +18766,18 @@ msgstr "运行 Galaga 游戏" #: ../menu-data/xgnokii:xgnokii.desktop.in.h:1 -msgid "Manage your mobile phone" -msgstr "管理您的手机" - -#: ../menu-data/xgnokii:xgnokii.desktop.in.h:2 msgid "Xgnokii" msgstr "Xgnokii" +#: ../menu-data/xgnokii:xgnokii.desktop.in.h:2 +msgid "Manage your mobile phone" +msgstr "管理您的手机" + #: ../menu-data/xhtml2ps:xhtml2ps.desktop.in.h:1 msgid "xhtml2ps" msgstr "" -#: ../menu-data/xine-ui:xine.desktop.in.h:2 +#: ../menu-data/xine-ui:xine.desktop.in.h:1 msgid "xine" msgstr "" @@ -18553,241 +18806,233 @@ msgstr "" #: ../menu-data/xiphos:xiphos.desktop.in.h:1 -msgid "Study the Bible" -msgstr "学习圣经" - -#: ../menu-data/xiphos:xiphos.desktop.in.h:2 msgid "Xiphos Bible Guide" msgstr "Xiphos 圣经指导" +#: ../menu-data/xiphos:xiphos.desktop.in.h:2 +msgid "Study the Bible" +msgstr "学习圣经" + #: ../menu-data/xiterm+thai:xiterm+thai.desktop.in.h:1 msgid "Thai X terminal" msgstr "泰国 X 终端" #: ../menu-data/xjadeo:xjadeo.desktop.in.h:1 -msgid "A simple video player that gets sync from jack transport." -msgstr "一个用来获取 jack 运输同步的简单视频播放器。" - -#: ../menu-data/xjadeo:xjadeo.desktop.in.h:2 msgid "Xjadeo" msgstr "" -#: ../menu-data/xjump:xjump.desktop.in.h:1 -msgid "A jumping game" -msgstr "一个跳跃游戏" +#: ../menu-data/xjadeo:xjadeo.desktop.in.h:2 +msgid "A simple video player that gets sync from jack transport." +msgstr "一个用来获取 jack 运输同步的简单视频播放器。" -#: ../menu-data/xjump:xjump.desktop.in.h:2 +#: ../menu-data/xjump:xjump.desktop.in.h:1 msgid "XJump" msgstr "XJump" -#: ../menu-data/xlog:xlog.desktop.in.h:1 -msgid "Amateur Radio logging program" -msgstr "业余无线电记录程序" +#: ../menu-data/xjump:xjump.desktop.in.h:2 +msgid "A jumping game" +msgstr "一个跳跃游戏" -#: ../menu-data/xlog:xlog.desktop.in.h:2 +#: ../menu-data/xlog:xlog.desktop.in.h:1 msgid "Xlog" msgstr "Xlog" +#: ../menu-data/xlog:xlog.desktop.in.h:2 +msgid "Amateur Radio logging program" +msgstr "业余无线电记录程序" + #: ../menu-data/xmabacus:xmabacus.desktop.in.h:2 msgid "simulation of the ancient calculator (Motif version)" msgstr "" #: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:1 -msgid "A colorful solitaire Mah Jongg game" -msgstr "一个彩色的纸牌麻将游戏" - -#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2 msgid "xmahjongg" msgstr "xmahjongg" -#: ../menu-data/xmakemol:xmakemol.desktop.in.h:1 -msgid "View and manipulate atomic and other chemical systems" -msgstr "查看和操纵原子和其他化学系统" +#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2 +msgid "A colorful solitaire Mah Jongg game" +msgstr "一个彩色的纸牌麻将游戏" -#: ../menu-data/xmakemol:xmakemol.desktop.in.h:2 +#: ../menu-data/xmakemol:xmakemol.desktop.in.h:1 msgid "XMakemol" msgstr "XMakemol" -#: ../menu-data/xmaxima:xmaxima.desktop.in.h:1 -msgid "An interface to the Maxima Computer Algebra System" -msgstr "Maxima 计算机代数系统的一个接口" +#: ../menu-data/xmakemol:xmakemol.desktop.in.h:2 +msgid "View and manipulate atomic and other chemical systems" +msgstr "查看和操纵原子和其他化学系统" -#: ../menu-data/xmaxima:xmaxima.desktop.in.h:2 +#: ../menu-data/xmaxima:xmaxima.desktop.in.h:1 msgid "Maxima Algebra System" msgstr "Maxima 代数系统" +#: ../menu-data/xmaxima:xmaxima.desktop.in.h:2 +msgid "An interface to the Maxima Computer Algebra System" +msgstr "Maxima 计算机代数系统的一个接口" + #: ../menu-data/xmille:xmille.desktop.in.h:1 msgid "Xmille" msgstr "Xmille" #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:1 -msgid "Edit XML documents" -msgstr "编辑 XML 文档" - -#: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2 msgid "XML Copy Editor" msgstr "XML 副本编辑器" -#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1 -msgid "XMMS2 tray icon" -msgstr "XMMS2 托盘图标" +#: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2 +msgid "Edit XML documents" +msgstr "编辑 XML 文档" -#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2 +#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1 msgid "XMMS2tray" msgstr "XMMS2tray" +#: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2 +msgid "XMMS2 tray icon" +msgstr "XMMS2 托盘图标" + #: ../menu-data/xmonad:xmonad.desktop.in.h:1 msgid "Xmonad" msgstr "Xmonad" #: ../menu-data/xmotd:xmotd.desktop.in.h:1 -msgid "A message of the day browser for X" -msgstr "X 的今日信息浏览器" - -#: ../menu-data/xmotd:xmotd.desktop.in.h:2 msgid "Message of the day" msgstr "今日信息" -#: ../menu-data/xmoto:xmoto.desktop.in.h:1 -msgid "Motocross game" -msgstr "Motocross 游戏" +#: ../menu-data/xmotd:xmotd.desktop.in.h:2 +msgid "A message of the day browser for X" +msgstr "X 的今日信息浏览器" -#: ../menu-data/xmoto:xmoto.desktop.in.h:2 +#: ../menu-data/xmoto:xmoto.desktop.in.h:1 msgid "Xmoto" msgstr "Xmoto" -#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1 -#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1 -msgid "barrel game" -msgstr "" +#: ../menu-data/xmoto:xmoto.desktop.in.h:2 +msgid "Motocross game" +msgstr "Motocross 游戏" -#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1 msgid "xmbarrel" msgstr "xmbarrel" -#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1 -#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1 -msgid "cubes game" -msgstr "立方体游戏" +#: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2 +#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2 +msgid "barrel game" +msgstr "" -#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1 msgid "xmcubes" msgstr "xmcubes" -#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1 -#: ../menu-data/xpuzzles:xdino.desktop.in.h:1 -msgid "dino game" -msgstr "dino 游戏" +#: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2 +#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2 +msgid "cubes game" +msgstr "立方体游戏" -#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1 msgid "xmdino" msgstr "xmdino" -#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1 -#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1 -msgid "hexagons game" -msgstr "hexagons 游戏" +#: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2 +#: ../menu-data/xpuzzles:xdino.desktop.in.h:2 +msgid "dino game" +msgstr "dino 游戏" -#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1 msgid "xmhexagons" msgstr "xmhexagons" -#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1 -#: ../menu-data/xpuzzles:xmball.desktop.in.h:1 -msgid "mball game" -msgstr "mball 游戏" +#: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2 +#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2 +msgid "hexagons game" +msgstr "hexagons 游戏" -#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1 msgid "xmmball" msgstr "xmmball" -#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1 -#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1 -msgid "mlink game" -msgstr "mlink 游戏" +#: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2 +#: ../menu-data/xpuzzles:xmball.desktop.in.h:2 +msgid "mball game" +msgstr "mball 游戏" -#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1 msgid "xmmlink" msgstr "xmmlink" -#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1 -#: ../menu-data/xpuzzles:xoct.desktop.in.h:1 -msgid "oct game" -msgstr "oct 游戏" +#: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2 +#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2 +msgid "mlink game" +msgstr "mlink 游戏" -#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1 msgid "xmoct" msgstr "xmoct" -#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1 -#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1 -msgid "panex game" -msgstr "panex 游戏" +#: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2 +#: ../menu-data/xpuzzles:xoct.desktop.in.h:2 +msgid "oct game" +msgstr "oct 游戏" -#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1 msgid "xmpanex" msgstr "xmpanex" -#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1 -#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1 -msgid "pyraminx game" -msgstr "pyraminx 游戏" +#: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2 +#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2 +msgid "panex game" +msgstr "panex 游戏" -#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1 msgid "xmpyraminx" msgstr "xmpyraminx" -#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1 -#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1 -msgid "rubik game" -msgstr "rubik 游戏" +#: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2 +#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2 +msgid "pyraminx game" +msgstr "pyraminx 游戏" -#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1 msgid "xmrubik" msgstr "xmrubik" -#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1 -#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1 -msgid "skewb game" -msgstr "skewb 游戏" +#: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2 +#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2 +msgid "rubik game" +msgstr "rubik 游戏" -#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1 msgid "xmskewb" msgstr "xmskewb" -#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1 -#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1 -msgid "triangles game" -msgstr "triangles 游戏" +#: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2 +#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2 +msgid "skewb game" +msgstr "skewb 游戏" -#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2 +#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1 msgid "xmtriangles" msgstr "xmtriangles" -#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1 -msgid "Configure network card" -msgstr "配置网卡" +#: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2 +#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2 +msgid "triangles game" +msgstr "triangles 游戏" -#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2 +#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1 msgid "xnetcardconfig" msgstr "xnetcardconfig" -#: ../menu-data/xoids:xoids.desktop.in.h:1 -msgid "Pilot a spaceship and destroy asteroids and UFOs" -msgstr "驾驶一个宇宙飞船并摧毁小行星和不明飞行物" - -#: ../menu-data/xoids:xoids.desktop.in.h:2 -msgid "Xoids" -msgstr "Xoids" +#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2 +msgid "Configure network card" +msgstr "配置网卡" #: ../menu-data/xoo:xoo.desktop.in.h:1 -msgid "Handheld Device Simulator" -msgstr "手持设备模拟器" - -#: ../menu-data/xoo:xoo.desktop.in.h:2 msgid "Xoo" msgstr "Xoo" +#: ../menu-data/xoo:xoo.desktop.in.h:2 +msgid "Handheld Device Simulator" +msgstr "手持设备模拟器" + #: ../menu-data/xoscope:xoscope.desktop.in.h:1 msgid "Xoscope" msgstr "Xoscope" @@ -18797,29 +19042,29 @@ msgstr "数字示波器" #: ../menu-data/xosview:xosview.desktop.in.h:1 -msgid "X based system monitor" -msgstr "基于 X 的系统监视器" - -#: ../menu-data/xosview:xosview.desktop.in.h:2 msgid "Xosview" msgstr "Xosview" -#: ../menu-data/xournal:xournal.desktop.in.h:1 -msgid "Take handwritten notes" -msgstr "进行手写笔记" +#: ../menu-data/xosview:xosview.desktop.in.h:2 +msgid "X based system monitor" +msgstr "基于 X 的系统监视器" -#: ../menu-data/xournal:xournal.desktop.in.h:2 +#: ../menu-data/xournal:xournal.desktop.in.h:1 msgid "Xournal" msgstr "Xournal" -#: ../menu-data/xpad:xpad.desktop.in.h:1 -msgid "Jot down notes for later" -msgstr "简要记录备注以备日后使用" +#: ../menu-data/xournal:xournal.desktop.in.h:2 +msgid "Take handwritten notes" +msgstr "进行手写笔记" -#: ../menu-data/xpad:xpad.desktop.in.h:2 +#: ../menu-data/xpad:xpad.desktop.in.h:1 msgid "Xpad" msgstr "Xpad" +#: ../menu-data/xpad:xpad.desktop.in.h:2 +msgid "Jot down notes for later" +msgstr "简要记录备注以备日后使用" + #: ../menu-data/xpaint:xpaint.desktop.in.h:1 msgid "XPaint" msgstr "XPaint" @@ -18829,123 +19074,123 @@ msgstr "Xpaint 绘图应用程序" #: ../menu-data/xpdf:xpdf.desktop.in.h:1 -msgid "View PDF files" -msgstr "浏览 PDF 文件" - -#: ../menu-data/xpdf:xpdf.desktop.in.h:2 msgid "xpdf" msgstr "xpdf" -#: ../menu-data/xpn:xpn.desktop.in.h:2 +#: ../menu-data/xpdf:xpdf.desktop.in.h:2 +msgid "View PDF files" +msgstr "浏览 PDF 文件" + +#: ../menu-data/xpn:xpn.desktop.in.h:1 msgid "Xpn Newsreader" msgstr "Xpn 新闻阅读器" -#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2 +#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1 msgid "xbarrel" msgstr "xbarrel" -#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2 +#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1 msgid "xcubes" msgstr "xcubes" -#: ../menu-data/xpuzzles:xdino.desktop.in.h:2 +#: ../menu-data/xpuzzles:xdino.desktop.in.h:1 msgid "xdino" msgstr "xdino" -#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2 +#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1 msgid "xhexagons" msgstr "xhexagons" -#: ../menu-data/xpuzzles:xmball.desktop.in.h:2 +#: ../menu-data/xpuzzles:xmball.desktop.in.h:1 msgid "xmball" msgstr "xmball" -#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2 +#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1 msgid "xmlink" msgstr "xmlink" -#: ../menu-data/xpuzzles:xoct.desktop.in.h:2 +#: ../menu-data/xpuzzles:xoct.desktop.in.h:1 msgid "xoct" msgstr "xoct" -#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2 +#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1 msgid "xpanex" msgstr "xpanex" -#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2 +#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1 msgid "xpyraminx" msgstr "xpyraminx" -#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2 +#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1 msgid "xrubik" msgstr "xrubik" -#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2 +#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1 msgid "xskewb" msgstr "xskewb" -#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2 +#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1 msgid "xtriangles" msgstr "xtriangles" #: ../menu-data/xqf:xqf.desktop.in.h:1 -msgid "Locate and connect to game servers" -msgstr "定位并连接到游戏服务器" - -#: ../menu-data/xqf:xqf.desktop.in.h:2 msgid "XQF Game Server Browser" msgstr "XQF 游戏服务器浏览器" +#: ../menu-data/xqf:xqf.desktop.in.h:2 +msgid "Locate and connect to game servers" +msgstr "定位并连接到游戏服务器" + #: ../menu-data/xsane:xsane.desktop.in.h:1 +msgid "XSane Image scanning program" +msgstr "XSane 图像扫描程序" + +#: ../menu-data/xsane:xsane.desktop.in.h:2 msgid "" "A program to work with scanner. Can be used as a scanning, copier, OCR, fax " "tools." msgstr "一个扫描仪程序。可以用作扫描、复印、OCR、传真工具。" -#: ../menu-data/xsane:xsane.desktop.in.h:2 -msgid "XSane Image scanning program" -msgstr "XSane 图像扫描程序" - #: ../menu-data/xscavenger:xscavenger.desktop.in.h:1 -msgid "X11 clone of Lode Runner" +msgid "XScavenger" msgstr "" #: ../menu-data/xscavenger:xscavenger.desktop.in.h:2 -msgid "XScavenger" +msgid "X11 clone of Lode Runner" msgstr "" #: ../menu-data/xscorch:xscorch.desktop.in.h:1 -msgid "Clone of Scorched Earth" -msgstr "焦土作战的克隆" - -#: ../menu-data/xscorch:xscorch.desktop.in.h:2 msgid "Xscorch" msgstr "Xscorch" +#: ../menu-data/xscorch:xscorch.desktop.in.h:2 +msgid "Clone of Scorched Earth" +msgstr "焦土作战的克隆" + #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:1 -msgid "XML Schema Definition (XSD) diagram viewer" +msgid "XSD Diagram" msgstr "" #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:2 -msgid "XSD Diagram" +msgid "XML Schema Definition (XSD) diagram viewer" msgstr "" #: ../menu-data/xsensors:xsensors.desktop.in.h:1 -msgid "View hardware health" -msgstr "查看硬件健康状况" - -#: ../menu-data/xsensors:xsensors.desktop.in.h:2 msgid "XSensors" msgstr "XSensors" -#: ../menu-data/xshogi:xshogi.desktop.in.h:1 -msgid "Play Shogi Game" -msgstr "运行 Shogi 游戏" +#: ../menu-data/xsensors:xsensors.desktop.in.h:2 +msgid "View hardware health" +msgstr "查看硬件健康状况" -#: ../menu-data/xshogi:xshogi.desktop.in.h:2 +#: ../menu-data/xshogi:xshogi.desktop.in.h:1 msgid "Xshogi" msgstr "Xshogi" +#: ../menu-data/xshogi:xshogi.desktop.in.h:2 +msgid "Play Shogi Game" +msgstr "运行 Shogi 游戏" + #: ../menu-data/xsol:xsol.desktop.in.h:1 msgid "Klondike Solitaire" msgstr "" @@ -18963,64 +19208,56 @@ msgstr "" #: ../menu-data/xtide:xtide.desktop.in.h:1 -msgid "View tide and current predictions" -msgstr "查看潮流和当前的预测" - -#: ../menu-data/xtide:xtide.desktop.in.h:2 msgid "XTide Tide Predictor" msgstr "XTide 潮流预测器" -#: ../menu-data/xvattr:xvattr.desktop.in.h:1 -msgid "XVideo Settings Utility" -msgstr "XVideo 设置工具" +#: ../menu-data/xtide:xtide.desktop.in.h:2 +msgid "View tide and current predictions" +msgstr "查看潮流和当前的预测" -#: ../menu-data/xvattr:xvattr.desktop.in.h:2 +#: ../menu-data/xvattr:xvattr.desktop.in.h:1 msgid "gxvattr" msgstr "gxvattr" -#: ../menu-data/xvidcap:xvidcap.desktop.in.h:1 -msgid "X11 Screencam" -msgstr "X11 屏幕相机" - -#: ../menu-data/xvidcap:xvidcap.desktop.in.h:2 -msgid "XVidCap Screen Capture" -msgstr "XVidCap 屏幕捕捉" +#: ../menu-data/xvattr:xvattr.desktop.in.h:2 +msgid "XVideo Settings Utility" +msgstr "XVideo 设置工具" #: ../menu-data/xvile:uxvile.desktop.in.h:1 msgid "UXVile" msgstr "UXVile" #: ../menu-data/xvile:uxvile.desktop.in.h:2 -#: ../menu-data/xvile:xvile.desktop.in.h:1 +#: ../menu-data/xvile:xvile.desktop.in.h:2 msgid "VI Like Emacs" msgstr "VI 风格的 Emacs" -#: ../menu-data/xvile:xvile.desktop.in.h:2 +#: ../menu-data/xvile:xvile.desktop.in.h:1 msgid "XVile" msgstr "XVile" #: ../menu-data/xwelltris:xwelltris.desktop.in.h:1 -msgid "Play a 3D Tetris like game" -msgstr "运行一个三维仿俄罗斯方块的游戏" - -#: ../menu-data/xwelltris:xwelltris.desktop.in.h:2 msgid "XWelltris" msgstr "XWelltris" -#: ../menu-data/xword:xword.desktop.in.h:1 -msgid "Do crossword puzzles" -msgstr "做填字游戏" +#: ../menu-data/xwelltris:xwelltris.desktop.in.h:2 +msgid "Play a 3D Tetris like game" +msgstr "运行一个三维仿俄罗斯方块的游戏" -#: ../menu-data/xword:xword.desktop.in.h:2 +#: ../menu-data/xword:xword.desktop.in.h:1 msgid "Xword" msgstr "Xword" +#: ../menu-data/xword:xword.desktop.in.h:2 +msgid "Do crossword puzzles" +msgstr "做填字游戏" + #: ../menu-data/xxxterm:xxxterm.desktop.in.h:1 -msgid "Minimalist's Web Browser" +msgid "xxxterm Browser" msgstr "" #: ../menu-data/xxxterm:xxxterm.desktop.in.h:2 -msgid "xxxterm Browser" +msgid "Minimalist's Web Browser" msgstr "" #: ../menu-data/xyscan:xyscan.desktop.in.h:1 @@ -19032,15 +19269,15 @@ msgstr "" #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:1 -#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1 -msgid "Sega Saturn emulator" -msgstr "世嘉土星模拟器" - -#: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2 msgid "Yabause (Gtk port)" msgstr "Yabause (Gtk 端口)" +#: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2 #: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2 +msgid "Sega Saturn emulator" +msgstr "世嘉土星模拟器" + +#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1 msgid "Yabause (Qt port)" msgstr "Yabause (Qt 端口)" @@ -19049,21 +19286,21 @@ msgstr "" #: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:1 -msgid "An open source Yahtzee like game written in C#" -msgstr "用 C# 写的开源类 Yahtzee 游戏" - -#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2 msgid "YahtzeeSharp" msgstr "YahtzeeSharp" -#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1 -msgid "A drop-down terminal emulator based on KDE Konsole technology." -msgstr "" +#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2 +msgid "An open source Yahtzee like game written in C#" +msgstr "用 C# 写的开源类 Yahtzee 游戏" -#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2 +#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1 msgid "Yakuake" msgstr "Yakuake" +#: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2 +msgid "A drop-down terminal emulator based on KDE Konsole technology." +msgstr "" + #: ../menu-data/yapet:yapet.desktop.in.h:1 msgid "YAPET" msgstr "YAPET" @@ -19073,45 +19310,45 @@ msgstr "又一个密码加密工具" #: ../menu-data/yarssr:yarssr.desktop.in.h:1 -msgid "RSS reader for the notification area" -msgstr "通知区域的 RSS 阅读器" - -#: ../menu-data/yarssr:yarssr.desktop.in.h:2 msgid "Yarssr" msgstr "Yarssr" -#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1 -msgid "Place phone calls over the Internet" -msgstr "在互联网上进行电话呼叫" +#: ../menu-data/yarssr:yarssr.desktop.in.h:2 +msgid "RSS reader for the notification area" +msgstr "通知区域的 RSS 阅读器" -#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2 +#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1 msgid "Yate VoIP Client" msgstr "Yate VoIP 客户端" -#: ../menu-data/yelp:yelp.desktop.in.h:1 -msgid "Get help with Unity" -msgstr "" +#: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2 +msgid "Place phone calls over the Internet" +msgstr "在互联网上进行电话呼叫" -#: ../menu-data/yelp:yelp.desktop.in.h:2 +#: ../menu-data/yelp:yelp.desktop.in.h:1 msgid "Help" msgstr "帮助" -#: ../menu-data/ygraph:ygraph.desktop.in.h:1 -msgid "Produce simple xy-plots of scientific data" -msgstr "为科学数据产生简单的 XY 绘图" +#: ../menu-data/yelp:yelp.desktop.in.h:2 +msgid "Get help with Unity" +msgstr "" -#: ../menu-data/ygraph:ygraph.desktop.in.h:2 +#: ../menu-data/ygraph:ygraph.desktop.in.h:1 msgid "ygraph Scientific Data Plotter" msgstr "ygraph 科学数据绘图仪" -#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1 -msgid "A 3D platform game" -msgstr "一个三维平台游戏" +#: ../menu-data/ygraph:ygraph.desktop.in.h:2 +msgid "Produce simple xy-plots of scientific data" +msgstr "为科学数据产生简单的 XY 绘图" -#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2 +#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1 msgid "Yo Frankie!" msgstr "" +#: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2 +msgid "A 3D platform game" +msgstr "一个三维平台游戏" + #: ../menu-data/yorick-cubeview:cubeview.desktop.in.h:1 msgid "3D FITS data viewer for spectro-imaging" msgstr "3D FITS 光谱成像数据查看器。" @@ -19129,13 +19366,13 @@ msgstr "Spydr" #: ../menu-data/yoshimi:yoshimi.desktop.in.h:1 -msgid "Software Synthesizer based on ZynAddSubFX" -msgstr "" - -#: ../menu-data/yoshimi:yoshimi.desktop.in.h:2 msgid "Yoshimi" msgstr "Yoshimi" +#: ../menu-data/yoshimi:yoshimi.desktop.in.h:2 +msgid "Software Synthesizer based on ZynAddSubFX" +msgstr "" + #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1 msgid "Online Translator YouTranslate!" msgstr "在线翻译器 YouTranslate!" @@ -19145,43 +19382,43 @@ msgstr "使用一个在线翻译服务来翻译单词或者句子" #: ../menu-data/z88:z88.desktop.in.h:1 -msgid " Finite Element Analysis Program" -msgstr " 有限元分析程序" - -#: ../menu-data/z88:z88.desktop.in.h:2 msgid "Z88" msgstr "Z88" -#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1 -msgid "TODO Management Application" -msgstr "" +#: ../menu-data/z88:z88.desktop.in.h:2 +msgid " Finite Element Analysis Program" +msgstr " 有限元分析程序" -#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2 +#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1 msgid "Zanshin" msgstr "Zanshin" -#: ../menu-data/zapping:zapping.desktop.in.h:1 -msgid "Lets you watch TV in a window" -msgstr "让您在一个窗口中观看电视" +#: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2 +msgid "TODO Management Application" +msgstr "" -#: ../menu-data/zapping:zapping.desktop.in.h:2 +#: ../menu-data/zapping:zapping.desktop.in.h:1 msgid "Zapping TV Viewer" msgstr "Zapping 电视浏览器" -#: ../menu-data/zatacka:zatacka.desktop.in.h:1 -msgid "Arcade multiplayer game for 2-6 players" -msgstr "2-6 个人玩的街机多人游戏" +#: ../menu-data/zapping:zapping.desktop.in.h:2 +msgid "Lets you watch TV in a window" +msgstr "让您在一个窗口中观看电视" -#: ../menu-data/zatacka:zatacka.desktop.in.h:2 +#: ../menu-data/zatacka:zatacka.desktop.in.h:1 msgid "Zatacka" msgstr "Zatacka" +#: ../menu-data/zatacka:zatacka.desktop.in.h:2 +msgid "Arcade multiplayer game for 2-6 players" +msgstr "2-6 个人玩的街机多人游戏" + #: ../menu-data/zathura:zathura.desktop.in.h:1 -msgid "A minimalistic PDF viewer" +msgid "Zathura" msgstr "" #: ../menu-data/zathura:zathura.desktop.in.h:2 -msgid "Zathura" +msgid "A minimalistic PDF viewer" msgstr "" #: ../menu-data/zaz:zaz.desktop.in.h:1 @@ -19193,45 +19430,53 @@ msgstr "" #: ../menu-data/zekr:zekr.desktop.in.h:1 -msgid "Study The Quran" -msgstr "研究可兰经" - -#: ../menu-data/zekr:zekr.desktop.in.h:2 msgid "Zekr " msgstr "Zekr " -#: ../menu-data/zenmap:zenmap.desktop.in.h:1 -msgid "A cross-platform GUI for the Nmap Security Scanner." -msgstr "一个跨平台的 Nmap 安全扫描仪的 GUI。" +#: ../menu-data/zekr:zekr.desktop.in.h:2 +msgid "Study The Quran" +msgstr "研究可兰经" -#: ../menu-data/zenmap:zenmap.desktop.in.h:2 +#: ../menu-data/zenmap:zenmap.desktop.in.h:1 msgid "Zenmap" msgstr "Zenmap" +#: ../menu-data/zenmap:zenmap.desktop.in.h:2 +msgid "A cross-platform GUI for the Nmap Security Scanner." +msgstr "一个跨平台的 Nmap 安全扫描仪的 GUI。" + #: ../menu-data/zhone:zhone.desktop.in.h:1 -msgid "Feature Phone UI" +msgid "Zhone" msgstr "" #: ../menu-data/zhone:zhone.desktop.in.h:2 -msgid "Zhone" +msgid "Feature Phone UI" msgstr "" #: ../menu-data/zim:zim.desktop.in.h:1 +msgid "Zim Desktop Wiki" +msgstr "Zim 桌面维基" + +#: ../menu-data/zim:zim.desktop.in.h:2 msgid "Edit text files \"wiki style\"" msgstr "编辑文本文件 “维基风格”" -#: ../menu-data/zim:zim.desktop.in.h:2 -msgid "Zim Desktop Wiki" -msgstr "Zim 桌面维基" +#: ../menu-data/zim:zim.desktop.in.h:3 +msgid "Quick Note" +msgstr "" -#: ../menu-data/zipper.app:Zipper.desktop.in.h:1 -msgid "GUI for various compressed file formats" -msgstr "各种压缩格式的图形工具" +#: ../menu-data/zim:zim.desktop.in.h:4 +msgid "Quick Note from Clipboard" +msgstr "" -#: ../menu-data/zipper.app:Zipper.desktop.in.h:2 +#: ../menu-data/zipper.app:Zipper.desktop.in.h:1 msgid "Zipper" msgstr "Zipper" +#: ../menu-data/zipper.app:Zipper.desktop.in.h:2 +msgid "GUI for various compressed file formats" +msgstr "各种压缩格式的图形工具" + #: ../menu-data/zita-at1:zita-at1.desktop.in.h:1 msgid "AT1" msgstr "" @@ -19249,37 +19494,37 @@ msgstr "" #: ../menu-data/zsnes:zsnes.desktop.in.h:1 -msgid "Play Super Nintendo (SNES) games" -msgstr "运行 Super Nintendo (SNES) 游戏" - -#: ../menu-data/zsnes:zsnes.desktop.in.h:2 msgid "ZSNES Emulator" msgstr "ZSNES 仿真器" -#: ../menu-data/zygrib:zygrib.desktop.in.h:1 -msgid "Multi-protocol Messaging Client" -msgstr "多协议消息客户端" +#: ../menu-data/zsnes:zsnes.desktop.in.h:2 +msgid "Play Super Nintendo (SNES) games" +msgstr "运行 Super Nintendo (SNES) 游戏" -#: ../menu-data/zygrib:zygrib.desktop.in.h:2 +#: ../menu-data/zygrib:zygrib.desktop.in.h:1 msgid "zyGrib GRIB file viewer" msgstr "zyGrib GRIB 文件查看器" +#: ../menu-data/zygrib:zygrib.desktop.in.h:2 +msgid "Multi-protocol Messaging Client" +msgstr "多协议消息客户端" + #: ../menu-data/zynaddsubfx:zynaddsubfx.desktop.in.h:1 msgid "ZynAddSubFX Software Synthesizer" msgstr "ZynAddSubFX 软件合成器" #: ../menu-data/zynjacku:lv2rack.desktop.in.h:1 -msgid "LV2 plugins host for JACK" +msgid "Lv2rack" msgstr "" #: ../menu-data/zynjacku:lv2rack.desktop.in.h:2 -msgid "Lv2rack" +msgid "LV2 plugins host for JACK" msgstr "" #: ../menu-data/zynjacku:zynjacku.desktop.in.h:1 -msgid "LV2 synths host for JACK" -msgstr "" - -#: ../menu-data/zynjacku:zynjacku.desktop.in.h:2 msgid "Zynjacku" msgstr "Zynjacku" + +#: ../menu-data/zynjacku:zynjacku.desktop.in.h:2 +msgid "LV2 synths host for JACK" +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apport.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apport.po 2012-02-23 07:11:53.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-24 15:39+0000\n" +"POT-Creation-Date: 2012-02-20 16:20+0000\n" "PO-Revision-Date: 2011-09-29 16:22+0000\n" "Last-Translator: Fenghua Wang \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 15:37+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:39+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: ../apport/ui.py:92 @@ -42,103 +42,107 @@ "\n" "%s" -#: ../apport/ui.py:213 +#. package does not exist +#: ../apport/ui.py:193 ../apport/ui.py:200 ../apport/ui.py:206 +#: ../apport/ui.py:285 ../apport/ui.py:293 ../apport/ui.py:364 +#: ../apport/ui.py:367 ../apport/ui.py:565 ../apport/ui.py:898 +#: ../apport/ui.py:1033 ../apport/ui.py:1037 ../apport/ui.py:1056 +#: ../apport/ui.py:1062 ../apport/ui.py:1615 ../apport/ui.py:1632 +#: ../apport/ui.py:2254 ../apport/ui.py:2273 ../apport/ui.py:2284 +#: ../apport/ui.py:2295 +msgid "Invalid problem report" +msgstr "无效的问题报告" + +#: ../apport/ui.py:195 ../apport/ui.py:1039 +msgid "This problem report is damaged and cannot be processed." +msgstr "该问题报告已损坏,无法处理。" + +#: ../apport/ui.py:201 +msgid "The report belongs to a package that is not installed." +msgstr "该报告属于一个未安装的软件包。" + +#: ../apport/ui.py:207 +msgid "An error occurred while attempting to process this problem report." +msgstr "" + +#: ../apport/ui.py:246 msgid "unknown program" msgstr "未知程序" -#: ../apport/ui.py:214 ../gtk/apport-gtk.py:81 +#: ../apport/ui.py:247 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "抱歉,“%s”程序异常退出" -#: ../apport/ui.py:215 ../apport/ui.py:1105 +#: ../apport/ui.py:248 ../apport/ui.py:1077 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../apport/ui.py:216 +#: ../apport/ui.py:249 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 -#: ../apport/ui.py:243 ../apport/ui.py:269 ../apport/ui.py:275 -#: ../apport/ui.py:305 ../apport/ui.py:313 ../apport/ui.py:384 -#: ../apport/ui.py:387 ../apport/ui.py:583 ../apport/ui.py:926 -#: ../apport/ui.py:1061 ../apport/ui.py:1065 ../apport/ui.py:1084 -#: ../apport/ui.py:1090 ../apport/ui.py:1702 ../apport/ui.py:1719 -#: ../apport/ui.py:2334 ../apport/ui.py:2350 ../apport/ui.py:2361 -#: ../apport/ui.py:2372 -msgid "Invalid problem report" -msgstr "无效的问题报告" - -#: ../apport/ui.py:244 ../apport/ui.py:276 -msgid "The report belongs to a package that is not installed." -msgstr "该报告属于一个未安装的软件包。" - -#: ../apport/ui.py:271 ../apport/ui.py:1067 -msgid "This problem report is damaged and cannot be processed." -msgstr "该问题报告已损坏,无法处理。" - -#: ../apport/ui.py:306 +#: ../apport/ui.py:286 msgid "You are not allowed to access this problem report." msgstr "您不被允许访问这个问题报告。" -#: ../apport/ui.py:309 +#: ../apport/ui.py:289 msgid "Error" msgstr "错误" -#: ../apport/ui.py:310 +#: ../apport/ui.py:290 msgid "There is not enough disk space available to process this report." msgstr "没有足够的空间来执行报告。" -#: ../apport/ui.py:337 +#: ../apport/ui.py:317 msgid "No package specified" msgstr "没有指定软件包" -#: ../apport/ui.py:338 +#: ../apport/ui.py:318 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../apport/ui.py:354 +#: ../apport/ui.py:334 msgid "Invalid PID" msgstr "无效的 PID" -#: ../apport/ui.py:355 +#: ../apport/ui.py:335 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../apport/ui.py:363 +#: ../apport/ui.py:343 msgid "Permission denied" msgstr "没有权限" -#: ../apport/ui.py:364 +#: ../apport/ui.py:344 msgid "" "The specified process does not belong to you. Please run this program as the " "process owner or as root." msgstr "指定的进程不属于您。请作为进程的所有者或 root 运行这个进程。" -#: ../apport/ui.py:385 +#: ../apport/ui.py:365 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" -#: ../apport/ui.py:388 +#: ../apport/ui.py:368 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" -#: ../apport/ui.py:413 ../apport/ui.py:595 ../apport/ui.py:600 +#: ../apport/ui.py:393 ../apport/ui.py:577 ../apport/ui.py:582 msgid "Cannot create report" msgstr "不能创建报告" -#: ../apport/ui.py:427 ../apport/ui.py:473 ../apport/ui.py:490 +#: ../apport/ui.py:408 ../apport/ui.py:454 ../apport/ui.py:471 msgid "Updating problem report" msgstr "更新问题报告" -#: ../apport/ui.py:428 +#: ../apport/ui.py:409 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -148,7 +152,7 @@ "您不是该问题报告的报告者或订阅者,或者该报告被视为重复或已经结案。\n" "请使用\"报告问题\"新建一份报告。" -#: ../apport/ui.py:437 +#: ../apport/ui.py:418 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 " @@ -163,51 +167,51 @@ "因此,我们建议您使用”apport-bug“来提交新的错误报告,并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么?" -#: ../apport/ui.py:474 ../apport/ui.py:491 +#: ../apport/ui.py:455 ../apport/ui.py:472 msgid "No additional information collected." msgstr "未收集更多信息。" -#: ../apport/ui.py:540 +#: ../apport/ui.py:522 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题?" -#: ../apport/ui.py:557 +#: ../apport/ui.py:539 msgid "Unknown symptom" msgstr "未知症状" -#: ../apport/ui.py:558 +#: ../apport/ui.py:540 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状\"%s\"不可知。" -#: ../apport/ui.py:586 +#: ../apport/ui.py:568 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "在关闭这个消息只后,请点击要报告问题的程序窗口。" -#: ../apport/ui.py:596 ../apport/ui.py:601 +#: ../apport/ui.py:578 ../apport/ui.py:583 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" -#: ../apport/ui.py:615 +#: ../apport/ui.py:597 msgid "%prog " msgstr "%prog <报告号>" -#: ../apport/ui.py:617 +#: ../apport/ui.py:599 msgid "Specify package name." msgstr "请指定包的名称。" -#: ../apport/ui.py:619 ../apport/ui.py:668 +#: ../apport/ui.py:601 ../apport/ui.py:650 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记,可被多次指定。" -#: ../apport/ui.py:649 +#: ../apport/ui.py:631 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" -#: ../apport/ui.py:652 +#: ../apport/ui.py:634 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 " @@ -215,116 +219,116 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数,或单独使用 --pid 参数。如果二者均未给出,将显示一系列症状供选择。" -#: ../apport/ui.py:654 +#: ../apport/ui.py:636 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" -#: ../apport/ui.py:656 +#: ../apport/ui.py:638 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" -#: ../apport/ui.py:658 +#: ../apport/ui.py:640 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" msgstr "针对某个症状报告 bug。" -#: ../apport/ui.py:660 +#: ../apport/ui.py:642 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,则是可选的。(如果只给定软件包名这一个参数则它是必需的。)" -#: ../apport/ui.py:662 +#: ../apport/ui.py:644 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 作为唯一参数。)" -#: ../apport/ui.py:664 +#: ../apport/ui.py:646 #, 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 中汇报崩溃。(如果文件只给定了参数时实现。)" -#: ../apport/ui.py:666 +#: ../apport/ui.py:648 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 "在提交漏洞模式中,将收集到的信息保存到要报告的文件中。可以稍后在另一台机器上提交这个文件。" -#: ../apport/ui.py:670 +#: ../apport/ui.py:652 msgid "Print the Apport version number." msgstr "打印 Apport 版本号" -#: ../apport/ui.py:802 +#: ../apport/ui.py:784 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "" -#: ../apport/ui.py:803 +#: ../apport/ui.py:785 msgid "Run gdb session" msgstr "" -#: ../apport/ui.py:804 +#: ../apport/ui.py:786 msgid "Run gdb session without downloading debug symbols" msgstr "" #. TRANSLATORS: %s contains the crash report file name -#: ../apport/ui.py:806 +#: ../apport/ui.py:788 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "" -#: ../apport/ui.py:844 +#: ../apport/ui.py:828 #, python-format msgid "The problem happened with the program %s which changed since then." msgstr "" -#: ../apport/ui.py:927 +#: ../apport/ui.py:899 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../apport/ui.py:942 +#: ../apport/ui.py:914 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../apport/ui.py:943 +#: ../apport/ui.py:915 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法用浏览器打开网页 %s" -#: ../apport/ui.py:1017 +#: ../apport/ui.py:989 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../apport/ui.py:1028 +#: ../apport/ui.py:1000 msgid "Network problem" msgstr "网络问题" -#: ../apport/ui.py:1030 +#: ../apport/ui.py:1002 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库,请检查您的 Internet 连接。" -#: ../apport/ui.py:1056 +#: ../apport/ui.py:1028 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../apport/ui.py:1057 +#: ../apport/ui.py:1029 msgid "Your system does not have enough memory to process this crash report." msgstr "你的系统没有足够的内存来处理这一次崩溃报告。" -#: ../apport/ui.py:1080 ../apport/ui.py:1089 +#: ../apport/ui.py:1052 ../apport/ui.py:1061 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../apport/ui.py:1108 +#: ../apport/ui.py:1080 #, python-format msgid "" "The problem cannot be reported:\n" @@ -335,18 +339,18 @@ "\n" "%s" -#: ../apport/ui.py:1141 ../apport/ui.py:1148 +#: ../apport/ui.py:1113 ../apport/ui.py:1120 msgid "Problem already known" msgstr "这是已知问题" -#: ../apport/ui.py:1142 +#: ../apport/ui.py:1114 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 "关于这个问题,之前已经有缺陷报告如网页所示。您是否有所补充?" -#: ../apport/ui.py:1149 +#: ../apport/ui.py:1121 msgid "This problem was already reported to developers. Thank you!" msgstr "" @@ -364,12 +368,12 @@ msgstr "请选择(%s):" #. translators: first %s: application name, second %s: date, third %s: time -#: ../bin/apport-cli.py:139 +#: ../bin/apport-cli.py:140 #, python-format msgid "%s closed unexpectedly on %s at %s." msgstr "%s 异常关闭在 %s 在 %s。" -#: ../bin/apport-cli.py:143 +#: ../bin/apport-cli.py:144 msgid "" "If you were not doing anything confidential (entering passwords or other\n" "private information), you can help to improve the application by reporting\n" @@ -378,57 +382,53 @@ "如果您没有做任何机密的事情 (输入密码或者其它私人信息),\n" "可以通过汇报这个问题来改进程序。" -#: ../bin/apport-cli.py:146 ../bin/apport-cli.py:165 ../bin/apport-cli.py:183 -#: ../kde/apport-kde.py:202 ../kde/apport-kde.py:233 ../kde/apport-kde.py:254 +#: ../bin/apport-cli.py:147 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184 msgid "&Report Problem..." msgstr "提交问题报告(&R)…" -#: ../bin/apport-cli.py:147 +#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:249 msgid "Cancel and &ignore future crashes of this program version" msgstr "终止并忽略这个版本软件以后出现的崩溃。" -#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184 -#: ../bin/apport-cli.py:243 ../bin/apport-cli.py:326 ../bin/apport-cli.py:358 -#: ../bin/apport-cli.py:379 +#: ../bin/apport-cli.py:149 ../bin/apport-cli.py:167 ../bin/apport-cli.py:185 +#: ../bin/apport-cli.py:251 ../bin/apport-cli.py:333 ../bin/apport-cli.py:365 +#: ../bin/apport-cli.py:386 msgid "&Cancel" msgstr "取消(&C)" -#: ../bin/apport-cli.py:163 +#: ../bin/apport-cli.py:164 #, python-format msgid "The package \"%s\" failed to install or upgrade." msgstr "软件包\"%s\"安装或者升级失败。" -#: ../bin/apport-cli.py:164 ../gtk/apport-gtk.ui.h:23 ../kde/apport-kde.py:230 +#: ../bin/apport-cli.py:165 msgid "" "You can help the developers to fix the package by reporting the problem." msgstr "请报告问题,这能帮助开发者修正它。" -#: ../bin/apport-cli.py:176 ../gtk/apport-gtk.py:133 ../kde/apport-kde.py:245 +#: ../bin/apport-cli.py:177 msgid "Your system encountered a serious kernel problem." msgstr "您的系统遇到了一个严重的内核问题。" -#: ../bin/apport-cli.py:180 ../gtk/apport-gtk.py:137 ../kde/apport-kde.py:249 +#: ../bin/apport-cli.py:181 msgid "You can help the developers to fix the problem by reporting it." msgstr "您可以通过报告这个信息来帮助开发者解决这个问题。" -#: ../bin/apport-cli.py:208 +#: ../bin/apport-cli.py:212 #, python-format msgid "(%i bytes)" msgstr "(%i 字节)" -#: ../bin/apport-cli.py:210 ../gtk/apport-gtk.py:167 ../kde/apport-kde.py:297 +#: ../bin/apport-cli.py:214 ../gtk/apport-gtk.py:117 ../kde/apport-kde.py:307 msgid "(binary data)" msgstr "(二进制数据)" -#: ../bin/apport-cli.py:218 ../gtk/apport-gtk.py:190 ../kde/apport-kde.py:269 -msgid "Send this data to the developers?" -msgstr "是否发送这些数据给开发者?" - -#: ../bin/apport-cli.py:220 ../kde/apport-kde.py:274 +#: ../bin/apport-cli.py:235 ../test/gtk.py:248 ../gtk/apport-gtk.py:145 +#: ../kde/apport-kde.py:153 ../test/kde.py:169 msgid "Send problem report to the developers?" msgstr "向开发者发送问题报告?" -#: ../bin/apport-cli.py:221 +#: ../bin/apport-cli.py:236 msgid "" "After the problem report has been sent, please fill out the form in the\n" "automatically opened web browser." @@ -436,51 +436,41 @@ "当问题报告被发出之后,请填写\n" "自动弹出窗口的表格。" -#: ../bin/apport-cli.py:226 -#, python-format -msgid "&Send complete report (recommended; %s)" -msgstr "发送完整的报告(&S)(推荐:%s)" - -#: ../bin/apport-cli.py:228 -#, python-format -msgid "Send &reduced report (slow Internet connection; %s)" -msgstr "发送精简的报告(慢速网络连接: %s)" - -#: ../bin/apport-cli.py:231 +#: ../bin/apport-cli.py:239 #, python-format msgid "&Send report (%s)" msgstr "发送报告(&S)(%s)" -#: ../bin/apport-cli.py:236 +#: ../bin/apport-cli.py:243 msgid "&Examine locally" msgstr "" -#: ../bin/apport-cli.py:240 +#: ../bin/apport-cli.py:247 msgid "&View report" msgstr "查看报告(&V)" -#: ../bin/apport-cli.py:241 +#: ../bin/apport-cli.py:248 msgid "&Keep report file for sending later or copying to somewhere else" msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" -#: ../bin/apport-cli.py:275 +#: ../bin/apport-cli.py:284 msgid "Problem report file:" msgstr "问题报告文件:" -#: ../bin/apport-cli.py:283 ../bin/apport-cli.py:288 +#: ../bin/apport-cli.py:290 ../bin/apport-cli.py:295 msgid "&Confirm" msgstr "确认(&C)" -#: ../bin/apport-cli.py:287 +#: ../bin/apport-cli.py:294 #, python-format msgid "Error: %s" msgstr "错误:%s" -#: ../bin/apport-cli.py:293 ../kde/apport-kde.py:336 +#: ../bin/apport-cli.py:300 ../kde/apport-kde.py:343 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../bin/apport-cli.py:294 +#: ../bin/apport-cli.py:301 msgid "" "The collected information can be sent to the developers to improve the\n" "application. This might take a few minutes." @@ -488,11 +478,11 @@ "收集到的信息将会传送到开发人员处以改进软件。\n" "这可能会花费几分钟时间," -#: ../bin/apport-cli.py:306 ../gtk/apport-gtk.ui.h:22 ../kde/apport-kde.py:353 +#: ../bin/apport-cli.py:313 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:360 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../bin/apport-cli.py:307 +#: ../bin/apport-cli.py:314 msgid "" "The collected information is being sent to the bug tracking system.\n" "This might take a few minutes." @@ -500,50 +490,50 @@ "收集到的信息正在被发送到错误跟踪系统。\n" "这可能要花费几分钟时间。" -#: ../bin/apport-cli.py:357 +#: ../bin/apport-cli.py:364 msgid "&Done" msgstr "完成(&D)" -#: ../bin/apport-cli.py:363 +#: ../bin/apport-cli.py:370 msgid "none" msgstr "无" -#: ../bin/apport-cli.py:364 +#: ../bin/apport-cli.py:371 #, python-format msgid "Selected: %s. Multiple choices:" msgstr "已选择:%s。 多重选择:" -#: ../bin/apport-cli.py:380 +#: ../bin/apport-cli.py:387 msgid "Choices:" msgstr "选择:" -#: ../bin/apport-cli.py:394 +#: ../bin/apport-cli.py:401 msgid "Path to file (Enter to cancel):" msgstr "文件的路径(回车取消):" -#: ../bin/apport-cli.py:400 +#: ../bin/apport-cli.py:407 msgid "File does not exist." msgstr "文件不存在。" -#: ../bin/apport-cli.py:402 +#: ../bin/apport-cli.py:409 msgid "This is a directory." msgstr "这是一个目录。" -#: ../bin/apport-cli.py:408 +#: ../bin/apport-cli.py:415 msgid "To continue, you must visit the following URL:" msgstr "要继续,您必须访问下面这个网址:" -#: ../bin/apport-cli.py:410 +#: ../bin/apport-cli.py:417 msgid "" "You can launch a browser now, or copy this URL into a browser on another " "computer." msgstr "您现在可以加载一个浏览器,或者复制这个网址到另外一个电脑的浏览器。" -#: ../bin/apport-cli.py:412 +#: ../bin/apport-cli.py:419 msgid "Launch a browser now" msgstr "现在启动一个浏览器" -#: ../bin/apport-cli.py:426 +#: ../bin/apport-cli.py:433 msgid "No pending crash reports. Try --help for more information." msgstr "没有已知的崩溃报告,尝试 --help 以获得更多信息。" @@ -565,108 +555,71 @@ "completed normally." msgstr "这个恢复过程已经非常接近尾声, 将正常地结束。" -#: ../gtk/apport-gtk.ui.h:1 -msgid "Collecting problem information" -msgstr "正在收集问题信息" +#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:395 ../kde/apport-kde.py:431 +msgid "Apport" +msgstr "Apport" #: ../gtk/apport-gtk.ui.h:2 -msgid "" -"Send problem report to the developers?\n" -"\n" -"After the problem report has been sent, please fill out the form in the " -"automatically opened web browser." +msgid "Crash report" +msgstr "" + +#: ../gtk/apport-gtk.ui.h:3 +msgid "Sorry, Ubuntu has experienced an internal error." +msgstr "" + +#: ../gtk/apport-gtk.ui.h:4 ../test/gtk.py:153 ../test/gtk.py:189 +#: ../gtk/apport-gtk.py:221 ../kde/apport-kde.py:199 ../test/kde.py:143 +msgid "If you notice further problems, try restarting the computer." msgstr "" -"向开发人员发送问题报告?\n" -"\n" -"发送问题后,请填写网络浏览器中自动打开的表格。" #: ../gtk/apport-gtk.ui.h:5 -msgid "Uploading problem information" -msgstr "正在上传问题信息" +msgid "Send an error report to help fix this problem" +msgstr "" -#: ../gtk/apport-gtk.ui.h:7 -#, no-c-format -msgid "" -"Sorry, the package \"%s\" failed to " -"install or upgrade." -msgstr "对不起,软件包 \"%s\" 安装或升级失败" +#: ../gtk/apport-gtk.ui.h:6 +msgid "Ignore future problems of this program version" +msgstr "" -#: ../gtk/apport-gtk.ui.h:8 -msgid "Application problem" -msgstr "应用程序问题" +#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:164 ../gtk/apport-gtk.py:461 +#: ../kde/apport-kde.py:240 +msgid "Show Details" +msgstr "" -#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:388 ../kde/apport-kde.py:424 -msgid "Apport" -msgstr "Apport" +#: ../gtk/apport-gtk.ui.h:8 +msgid "_Examine locally" +msgstr "" -#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:305 -#, no-c-format, python-format -msgid "Complete report (recommended; %s)" -msgstr "完整报告(推荐;%s)" +#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:212 ../kde/apport-kde.py:192 +msgid "Leave Closed" +msgstr "" -#: ../gtk/apport-gtk.ui.h:12 -msgid "Content of the report" -msgstr "报告的内容" +#: ../gtk/apport-gtk.ui.h:10 ../test/gtk.py:68 ../test/gtk.py:95 +#: ../test/gtk.py:161 ../test/gtk.py:197 ../gtk/apport-gtk.py:176 +#: ../gtk/apport-gtk.py:224 ../kde/apport-kde.py:202 ../test/kde.py:63 +#: ../test/kde.py:88 ../test/kde.py:149 +msgid "Continue" +msgstr "" -#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:197 -msgid "" -"If you were not doing anything confidential (entering passwords or other " -"private information), you can help to improve the application by reporting " -"the problem." -msgstr "如果您现在的动作不涉及机密信息(即不是输入口令等涉及私密信息的动作),则可以报告本问题以便改进程序。" +#: ../gtk/apport-gtk.ui.h:11 +msgid "Collecting problem information" +msgstr "正在收集问题信息" -#: ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.ui.h:12 msgid "" "Information is being collected that may help the developers fix the problem " "you report." msgstr "正在收集信息,这些信息将会帮助开发人员修复您报告的问题。" -#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:252 -msgid "Kernel problem" -msgstr "内核问题" - -#: ../gtk/apport-gtk.ui.h:16 -msgid "Package problem" -msgstr "软件包问题" - -#: ../gtk/apport-gtk.ui.h:18 ../kde/apport-kde.py:308 -#, no-c-format, python-format -msgid "Reduced report (slow Internet connection; %s)" -msgstr "精简报告(适用于慢速连接;%s)" - -#: ../gtk/apport-gtk.ui.h:19 -msgid "Restart _Program" -msgstr "重启程序(_P)" +#: ../gtk/apport-gtk.ui.h:14 +msgid "Uploading problem information" +msgstr "正在上传问题信息" -#: ../gtk/apport-gtk.ui.h:20 ../kde/apport-kde.py:354 +#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:361 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." msgstr "正在将收集的信息到缺陷跟踪系统。可能需要几分钟时间。" -#: ../gtk/apport-gtk.ui.h:21 -msgid "" -"This will remove some large items from the report. These are very useful for " -"developers to debug the problem, but might be too big for you to upload if " -"you have a slow internet connection." -msgstr "这会移除报告的一些大条目。虽然这对开发者报告问题很有用,但如果带宽窄则会上传太慢。" - -#: ../gtk/apport-gtk.ui.h:24 -msgid "_Examine locally" -msgstr "" - -#: ../gtk/apport-gtk.ui.h:25 -msgid "_Ignore future crashes of this program version" -msgstr "忽略这个程序以后的崩溃(_I)" - -#: ../gtk/apport-gtk.ui.h:26 -msgid "_Report Problem..." -msgstr "报告问题(_R)..." - -#: ../gtk/apport-gtk.ui.h:27 -msgid "_Send Report" -msgstr "发送报告(_S)" - #: ../bin/apport-retrace.py:37 msgid "%prog [options] " msgstr "%prog [选项] " @@ -769,83 +722,110 @@ #: ../gtk/apport-gtk-mime.desktop.in.h:1 ../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 malfunction to the developers" -msgstr "向开发者报告一个故障" +msgid "Report a problem..." +msgstr "提交一份问题报告…" #: ../gtk/apport-gtk-mime.desktop.in.h:2 ../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 problem..." -msgstr "提交一份问题报告…" +msgid "Report a malfunction to the developers" +msgstr "向开发者报告一个故障" + +#: ../test/gtk.py:61 ../test/kde.py:58 +msgid "Ubuntu has restarted after experiencing an internal error." +msgstr "" + +#: ../test/gtk.py:88 ../gtk/apport-gtk.py:200 ../kde/apport-kde.py:181 +#: ../test/kde.py:83 +msgid "Sorry, a problem occurred while installing software." +msgstr "" + +#: ../test/gtk.py:99 ../test/kde.py:91 +msgid "Package: apport 1.2.3~0ubuntu1" +msgstr "" + +#: ../test/gtk.py:123 ../test/kde.py:115 +msgid "The application Apport has closed unexpectedly." +msgstr "" + +#: ../test/gtk.py:130 ../gtk/apport-gtk.py:213 ../gtk/apport-gtk.py:267 +#: ../kde/apport-kde.py:193 ../kde/apport-kde.py:326 ../test/kde.py:120 +msgid "Relaunch" +msgstr "" + +#: ../test/gtk.py:151 ../test/kde.py:141 +msgid "Sorry, Ubuntu has experienced an internal error." +msgstr "" + +#: ../test/gtk.py:187 +msgid "Sorry, the application apport has closed unexpectedly." +msgstr "" + +#: ../test/gtk.py:204 +msgid "Sorry, apport has closed unexpectedly." +msgstr "" + +#: ../test/gtk.py:256 ../gtk/apport-gtk.py:154 ../kde/apport-kde.py:161 +#: ../test/kde.py:175 +msgid "Send" +msgstr "" #: ../data/kernel_oops.py:28 msgid "Your system might become unstable now and might need to be restarted." msgstr "您的系统可能现在不稳定,它也许需要重启。" -#: ../gtk/apport-gtk.py:79 ../gtk/apport-gtk.py:83 ../kde/apport-kde.py:188 +#: ../gtk/apport-gtk.py:132 #, python-format -msgid "Sorry, %s closed unexpectedly" -msgstr "抱歉,%s 异常关闭" - -#: ../kde/apport-kde.py:133 -msgid "&Details..." -msgstr "细节(&D)..." - -#: ../kde/apport-kde.py:160 -msgid "Username:" -msgstr "用户名:" - -#: ../kde/apport-kde.py:161 -msgid "Password:" -msgstr "密码:" +msgid "Sorry, the application %s has closed unexpectedly." +msgstr "" -#: ../kde/apport-kde.py:191 +#: ../gtk/apport-gtk.py:135 #, python-format -msgid "Sorry, the program \"%s\" closed unexpectedly." -msgstr "对不起,程序 \"%s\" 异常关闭。" +msgid "Sorry, %s has closed unexpectedly." +msgstr "" -#: ../kde/apport-kde.py:194 +#: ../gtk/apport-gtk.py:139 ../kde/apport-kde.py:196 #, python-format -msgid "Sorry, %s closed unexpectedly." -msgstr "对不起,%s 异常关闭。" +msgid "Sorry, %s has experienced an internal error." +msgstr "" -#: ../kde/apport-kde.py:200 -msgid "&Ignore future crashes of this program version" -msgstr "忽略本程序版本以后发生的崩溃(&I)" +#: ../gtk/apport-gtk.py:185 ../kde/apport-kde.py:167 +#, python-format +msgid "%s has restarted after experiencing an internal error." +msgstr "" -#: ../kde/apport-kde.py:209 -msgid "Restart &Program" -msgstr "重新启动程序(&R)" +#: ../gtk/apport-gtk.py:193 ../kde/apport-kde.py:175 +#, python-format +msgid "Package: %s" +msgstr "" -#: ../kde/apport-kde.py:228 +#: ../gtk/apport-gtk.py:209 ../kde/apport-kde.py:187 #, python-format -msgid "Sorry, the package \"%s\" failed to install or upgrade." -msgstr "抱歉,程序包 “%s” 安装或升级失败。" +msgid "The application %s has closed unexpectedly." +msgstr "" -#: ../kde/apport-kde.py:268 ../kde/apport-kde.py:273 -msgid "Generic error" -msgstr "常规错误" +#: ../gtk/apport-gtk.py:464 ../kde/apport-kde.py:237 +msgid "Hide Details" +msgstr "" -#: ../kde/apport-kde.py:275 -msgid "" -"After the problem report has been sent, please fill out the form in the " -"automatically opened web browser." -msgstr "所有问题报告都已发送,请填写网络浏览器中自动打开的表格." +#: ../kde/apport-kde.py:269 +msgid "Username:" +msgstr "用户名:" -#: ../kde/apport-kde.py:278 -msgid "&Send" -msgstr "发送(&S)" +#: ../kde/apport-kde.py:270 +msgid "Password:" +msgstr "密码:" -#: ../kde/apport-kde.py:335 +#: ../kde/apport-kde.py:342 msgid "Collecting Problem Information" msgstr "正在收集问题信息" -#: ../kde/apport-kde.py:337 +#: ../kde/apport-kde.py:344 msgid "" "The collected information can be sent to the developers to improve the " "application. This might take a few minutes." msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。" -#: ../kde/apport-kde.py:352 +#: ../kde/apport-kde.py:359 msgid "Uploading Problem Information" msgstr "上传问题信息" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2012-02-23 07:11:24.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: 2011-12-29 09:06+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:26+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:80 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apt.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt.po 2012-02-23 07:11:24.000000000 +0000 @@ -9,162 +9,162 @@ msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-29 19:46+0000\n" -"PO-Revision-Date: 2011-12-06 08:58+0000\n" +"POT-Creation-Date: 2012-02-14 10:00+0000\n" +"PO-Revision-Date: 2012-02-14 12:39+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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: 2011-12-29 09:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" -#: cmdline/apt-cache.cc:154 +#: cmdline/apt-cache.cc:158 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n" -#: cmdline/apt-cache.cc:282 +#: cmdline/apt-cache.cc:286 msgid "Total package names: " msgstr "软件包名称总数: " -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:288 msgid "Total package structures: " msgstr "全部软件包结构: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:328 msgid " Normal packages: " msgstr " 普通软件包: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:329 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包: " -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:330 msgid " Single virtual packages: " msgstr " 单虚拟软件包: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:331 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包: " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:332 msgid " Missing: " msgstr " 缺失: " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:334 msgid "Total distinct versions: " msgstr "按版本共计: " -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:336 msgid "Total distinct descriptions: " msgstr "按不同的说明共计: " -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:338 msgid "Total dependencies: " msgstr "按依赖关系共计: " -#: cmdline/apt-cache.cc:337 +#: cmdline/apt-cache.cc:341 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:343 msgid "Total Desc/File relations: " msgstr "按说明/文件关系共计: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:345 msgid "Total Provides mappings: " msgstr "提供映射共计: " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:357 msgid "Total globbed strings: " msgstr "Glob 字串共计: " -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:371 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计: " -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:376 msgid "Total slack space: " msgstr "空闲空间共计: " -#: cmdline/apt-cache.cc:380 +#: cmdline/apt-cache.cc:384 msgid "Total space accounted for: " msgstr "总占用空间: " -#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步。" -#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 -#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 -#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 +#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40 +#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163 msgid "No packages found" msgstr "没有发现匹配的软件包" -#: cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:1222 msgid "You must give at least one search pattern" msgstr "您必须明确地给出至少一个表达式" -#: cmdline/apt-cache.cc:1353 +#: cmdline/apt-cache.cc:1357 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1448 +#: cmdline/apt-cache.cc:1452 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:1478 +#: cmdline/apt-cache.cc:1482 msgid "Package files:" msgstr "软件包文件:" -#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步,无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1499 +#: cmdline/apt-cache.cc:1503 msgid "Pinned packages:" msgstr "被锁定的软件包:" -#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560 msgid "(not found)" msgstr "(未找到)" -#: cmdline/apt-cache.cc:1519 +#: cmdline/apt-cache.cc:1523 msgid " Installed: " msgstr " 已安装: " -#: cmdline/apt-cache.cc:1520 +#: cmdline/apt-cache.cc:1524 msgid " Candidate: " msgstr " 候选软件包: " -#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550 msgid "(none)" msgstr "(无)" -#: cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1557 msgid " Package pin: " msgstr " 软件包锁: " #. Show the priority tables -#: cmdline/apt-cache.cc:1562 +#: cmdline/apt-cache.cc:1566 msgid " Version table:" msgstr " 版本列表:" -#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3230 cmdline/apt-internal-solver.cc:30 -#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 +#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-get.cc:3264 cmdline/apt-internal-solver.cc:32 +#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s,用于 %s 构架,编译于 %s %s\n" -#: cmdline/apt-cache.cc:1682 +#: cmdline/apt-cache.cc:1686 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -201,28 +201,28 @@ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:77 +#: cmdline/apt-cdrom.cc:79 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "请给这张盘片起个名字,比如“Debian 5.0.3 Disk 1”" -#: cmdline/apt-cdrom.cc:92 +#: cmdline/apt-cdrom.cc:94 msgid "Please insert a Disc in the drive and press enter" msgstr "请把盘片插入驱动器再按回车键" -#: cmdline/apt-cdrom.cc:127 +#: cmdline/apt-cdrom.cc:129 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "无法将 %s 挂载到 %s" -#: cmdline/apt-cdrom.cc:162 +#: cmdline/apt-cdrom.cc:164 msgid "Repeat this process for the rest of the CDs in your set." msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" -#: cmdline/apt-config.cc:44 +#: cmdline/apt-config.cc:46 msgid "Arguments not in pairs" msgstr "参数没有成对" -#: cmdline/apt-config.cc:79 +#: cmdline/apt-config.cc:81 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -250,12 +250,12 @@ " -c=? 读取指定的配置文件\n" " -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:98 +#: cmdline/apt-extracttemplates.cc:100 #, c-format msgid "%s not a valid DEB package." msgstr "%s 不是一个有效的 DEB 软件包。" -#: cmdline/apt-extracttemplates.cc:232 +#: cmdline/apt-extracttemplates.cc:234 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -279,40 +279,40 @@ " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 +#: cmdline/apt-extracttemplates.cc:269 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" -#: cmdline/apt-extracttemplates.cc:309 +#: cmdline/apt-extracttemplates.cc:311 msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" -#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 msgid "Package extension list is too long" msgstr "软件包的扩展列表太长" -#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 -#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 -#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 +#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:261 msgid "Source extension list is too long" msgstr "源扩展列表太长" -#: ftparchive/apt-ftparchive.cc:377 +#: ftparchive/apt-ftparchive.cc:378 msgid "Error writing header to contents file" msgstr "将头写入到目录文件时出错" -#: ftparchive/apt-ftparchive.cc:407 +#: ftparchive/apt-ftparchive.cc:408 #, c-format msgid "Error processing contents %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:595 +#: ftparchive/apt-ftparchive.cc:596 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -392,135 +392,135 @@ " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:801 +#: ftparchive/apt-ftparchive.cc:802 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:879 +#: ftparchive/apt-ftparchive.cc:880 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:43 +#: ftparchive/cachedb.cc:46 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "数据库被损坏,该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:61 +#: ftparchive/cachedb.cc:64 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期,现尝试进行升级 %s" -#: ftparchive/cachedb.cc:72 +#: ftparchive/cachedb.cc:75 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "数据库格式无效。如果您是从一个老版本的 apt 升级而来,请删除数据库并重建它。" -#: ftparchive/cachedb.cc:77 +#: ftparchive/cachedb.cc:80 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开数据库文件 %s:%s" -#: ftparchive/cachedb.cc:123 +#: ftparchive/cachedb.cc:126 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:245 +#: ftparchive/cachedb.cc:248 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:482 +#: ftparchive/cachedb.cc:489 msgid "Unable to get a cursor" msgstr "无法获得游标" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告:无法读取目录 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:85 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告:无法获得 %s 的状态\n" -#: ftparchive/writer.cc:139 +#: ftparchive/writer.cc:141 msgid "E: " msgstr "错误: " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "W: " msgstr "警告: " -#: ftparchive/writer.cc:148 +#: ftparchive/writer.cc:150 msgid "E: Errors apply to file " msgstr "错误:处理文件时出错 " -#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 #, c-format msgid "Failed to resolve %s" msgstr "无法解析 %s" -#: ftparchive/writer.cc:179 +#: ftparchive/writer.cc:181 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:206 +#: ftparchive/writer.cc:208 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:267 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:275 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:279 #, c-format msgid "Failed to unlink %s" msgstr "无法使用 unlink 删除 %s" -#: ftparchive/writer.cc:284 +#: ftparchive/writer.cc:286 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:294 +#: ftparchive/writer.cc:296 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:399 +#: ftparchive/writer.cc:401 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:407 ftparchive/writer.cc:709 +#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:475 ftparchive/writer.cc:825 +#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:719 +#: ftparchive/writer.cc:721 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:723 +#: ftparchive/writer.cc:725 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" -#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 +#: ftparchive/contents.cc:339 ftparchive/contents.cc:370 msgid "realloc - Failed to allocate memory" msgstr "realloc - 分配内存失败" @@ -531,81 +531,69 @@ #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format -msgid "Malformed override %s line %lu #1" -msgstr "override 文件 %s 第 %lu 行的格式有误 #1" +msgid "Malformed override %s line %llu #1" +msgstr "" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format -msgid "Malformed override %s line %lu #2" -msgstr "override 文件 %s 第 %lu 行的格式有误 #2" +msgid "Malformed override %s line %llu #2" +msgstr "" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format -msgid "Malformed override %s line %lu #3" -msgstr "override 文件 %s 第 %lu 行的格式有误 #3" +msgid "Malformed override %s line %llu #3" +msgstr "" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:67 +#: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:97 +#: ftparchive/multicompress.cc:100 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:165 +#: ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:191 +#: ftparchive/multicompress.cc:189 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:194 +#: ftparchive/multicompress.cc:192 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:208 +#: ftparchive/multicompress.cc:206 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:231 +#: ftparchive/multicompress.cc:229 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误,无法创建 %s" -#: ftparchive/multicompress.cc:282 -msgid "Failed to create subprocess IPC" -msgstr "无法创建子进程的 IPC 管道" - -#: ftparchive/multicompress.cc:319 -msgid "Failed to exec compressor " -msgstr "无法执行压缩程序 " - -#: ftparchive/multicompress.cc:358 -msgid "decompressor" -msgstr "解压程序" - -#: ftparchive/multicompress.cc:401 +#: ftparchive/multicompress.cc:304 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:453 +#: ftparchive/multicompress.cc:342 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时无法读取数据" -#: ftparchive/multicompress.cc:470 +#: ftparchive/multicompress.cc:358 #, c-format msgid "Problem unlinking %s" msgstr "在使用 unlink 删除 %s 时出错" -#: ftparchive/multicompress.cc:485 +#: ftparchive/multicompress.cc:373 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" @@ -719,34 +707,34 @@ msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:633 +#: cmdline/apt-get.cc:632 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "注意,为任务 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:637 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "注意,根据正则表达式 %2$s 选中了 %1$s\n" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:654 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是由下面的软件包提供的虚拟软件包:\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:665 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:674 msgid " [Not candidate version]" msgstr " [无候选版本]" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:676 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:681 +#: cmdline/apt-get.cc:679 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -757,177 +745,177 @@ "这可能意味着这个缺失的软件包可能已被废弃,\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:699 +#: cmdline/apt-get.cc:697 msgid "However the following packages replace it:" msgstr "可是下列软件包取代了它:" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:709 #, c-format msgid "Package '%s' has no installation candidate" msgstr "软件包 %s 没有可供安装的候选者" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:720 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "类似 %s 的虚拟软件包可以卸载\n" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:764 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "注意,选取 %s 而非 %s\n" -#: cmdline/apt-get.cc:783 +#: cmdline/apt-get.cc:794 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s,它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:798 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "忽略了 %s,它已经被安装而且仅请求了升级。\n" -#: cmdline/apt-get.cc:799 +#: cmdline/apt-get.cc:810 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s,因为无法下载它。\n" -#: cmdline/apt-get.cc:804 +#: cmdline/apt-get.cc:815 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2093 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:860 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:854 +#: cmdline/apt-get.cc:865 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:907 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装,因而不会被卸载\n" -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:985 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:988 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:991 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:994 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:985 +#: cmdline/apt-get.cc:996 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:1000 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:1003 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。请试用 -f 选项。" -#: cmdline/apt-get.cc:1017 +#: cmdline/apt-get.cc:1028 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】:下列软件包不能通过验证!" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1032 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1039 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包吗?[y/N] " -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1041 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200 +#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes" -#: cmdline/apt-get.cc:1080 +#: cmdline/apt-get.cc:1091 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1100 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:1100 +#: cmdline/apt-get.cc:1111 msgid "Internal error, Ordering didn't finish" msgstr "内部错误,Ordering 未能完成" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1149 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符,请发信给 apt@packages.debian.org 吧" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1145 +#: cmdline/apt-get.cc:1156 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1150 +#: cmdline/apt-get.cc:1161 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1157 +#: cmdline/apt-get.cc:1168 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1162 +#: cmdline/apt-get.cc:1173 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2506 -#: cmdline/apt-get.cc:2509 +#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:1190 +#: cmdline/apt-get.cc:1201 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 上没有足够的可用空间。" -#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226 +#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了仅执行常规操作,但这不是个常规操作。" -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1219 msgid "Yes, do as I say!" msgstr "是,按我说的做!" -#: cmdline/apt-get.cc:1210 +#: cmdline/apt-get.cc:1221 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -938,46 +926,46 @@ "若还想继续的话,就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235 +#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1242 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗?[Y/n] " -#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:1321 +#: cmdline/apt-get.cc:1332 msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2583 +#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611 msgid "Download complete and in download only mode" msgstr "下载完毕,目前是“仅下载”模式" -#: cmdline/apt-get.cc:1328 +#: cmdline/apt-get.cc:1339 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项再试试?" -#: cmdline/apt-get.cc:1332 +#: cmdline/apt-get.cc:1343 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换" -#: cmdline/apt-get.cc:1337 +#: cmdline/apt-get.cc:1348 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1349 msgid "Aborting install." msgstr "中止安装。" -#: cmdline/apt-get.cc:1366 +#: cmdline/apt-get.cc:1377 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -986,35 +974,35 @@ "all files have been overwritten by other packages:" msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失:" -#: cmdline/apt-get.cc:1370 +#: cmdline/apt-get.cc:1381 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "注意:这是自动被 dpkg 有意完成的。" -#: cmdline/apt-get.cc:1508 +#: cmdline/apt-get.cc:1519 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s" -#: cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1551 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "选择 %s 作为源代码包而非 %s\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1589 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "忽略不可用的 %2$s 软件包的 %1$s 版" -#: cmdline/apt-get.cc:1594 +#: cmdline/apt-get.cc:1605 msgid "The update command takes no arguments" msgstr "update 命令不需要参数" -#: cmdline/apt-get.cc:1656 +#: cmdline/apt-get.cc:1668 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除,无法启动自动删除器" -#: cmdline/apt-get.cc:1751 +#: cmdline/apt-get.cc:1772 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1030,15 +1018,15 @@ #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1754 cmdline/apt-get.cc:1923 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助:" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1779 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误,自动卸载工具坏事了" -#: cmdline/apt-get.cc:1765 +#: cmdline/apt-get.cc:1786 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1046,32 +1034,32 @@ "required:" msgstr[0] "下列软件包是自动安装的并且现在不需要了:" -#: cmdline/apt-get.cc:1769 +#: cmdline/apt-get.cc:1790 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1792 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来卸载它们" -#: cmdline/apt-get.cc:1790 +#: cmdline/apt-get.cc:1811 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误,全部升级工具坏事了" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1910 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1914 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可以指定一个解决办法)。" -#: cmdline/apt-get.cc:1908 +#: cmdline/apt-get.cc:1929 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1082,73 +1070,73 @@ "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1929 +#: cmdline/apt-get.cc:1950 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1976 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包:" -#: cmdline/apt-get.cc:2045 +#: cmdline/apt-get.cc:2066 msgid "Suggested packages:" msgstr "建议安装的软件包:" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2067 msgid "Recommended packages:" msgstr "推荐安装的软件包:" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2109 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:2095 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2119 +#: cmdline/apt-get.cc:2140 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2143 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2148 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2194 cmdline/apt-get.cc:2202 +#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误,问题解决工具坏事了" -#: cmdline/apt-get.cc:2226 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2368 +#: cmdline/apt-get.cc:2396 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码,必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2408 cmdline/apt-get.cc:2720 +#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2425 +#: cmdline/apt-get.cc:2453 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1157,7 +1145,7 @@ "提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n" "%s\n" -#: cmdline/apt-get.cc:2430 +#: cmdline/apt-get.cc:2458 #, c-format msgid "" "Please use:\n" @@ -1165,142 +1153,142 @@ "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2483 +#: cmdline/apt-get.cc:2511 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2520 +#: cmdline/apt-get.cc:2548 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2529 +#: cmdline/apt-get.cc:2557 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2534 +#: cmdline/apt-get.cc:2562 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2606 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2609 +#: cmdline/apt-get.cc:2637 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2622 +#: cmdline/apt-get.cc:2650 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2644 +#: cmdline/apt-get.cc:2672 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2664 +#: cmdline/apt-get.cc:2692 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2683 +#: cmdline/apt-get.cc:2711 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包" -#: cmdline/apt-get.cc:2708 +#: cmdline/apt-get.cc:2736 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) " "APT::Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2725 +#: cmdline/apt-get.cc:2753 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2745 +#: cmdline/apt-get.cc:2773 #, c-format msgid "%s has no build depends.\n" msgstr "%s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2875 +#: cmdline/apt-get.cc:2909 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:2896 +#: cmdline/apt-get.cc:2930 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2919 +#: cmdline/apt-get.cc:2953 #, c-format msgid "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新" -#: cmdline/apt-get.cc:2958 +#: cmdline/apt-get.cc:2992 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2964 +#: cmdline/apt-get.cc:2998 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:2987 +#: cmdline/apt-get.cc:3021 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s" -#: cmdline/apt-get.cc:3003 +#: cmdline/apt-get.cc:3037 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:3008 +#: cmdline/apt-get.cc:3042 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:3101 cmdline/apt-get.cc:3113 +#: cmdline/apt-get.cc:3135 cmdline/apt-get.cc:3147 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3235 +#: cmdline/apt-get.cc:3269 msgid "Supported modules:" msgstr "支持的模块:" -#: cmdline/apt-get.cc:3276 +#: cmdline/apt-get.cc:3310 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1346,7 +1334,7 @@ " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3441 +#: cmdline/apt-get.cc:3475 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1357,33 +1345,33 @@ "   apt-get 需要 root 特权进行实际的执行。\n" "   同时请记住此时并未锁定,所以请勿完全相信当前的情况!" -#: cmdline/acqprogress.cc:57 +#: cmdline/acqprogress.cc:59 msgid "Hit " msgstr "命中 " -#: cmdline/acqprogress.cc:81 +#: cmdline/acqprogress.cc:83 msgid "Get:" msgstr "获取:" -#: cmdline/acqprogress.cc:112 +#: cmdline/acqprogress.cc:114 msgid "Ign " msgstr "忽略 " -#: cmdline/acqprogress.cc:116 +#: cmdline/acqprogress.cc:118 msgid "Err " msgstr "错误 " -#: cmdline/acqprogress.cc:137 +#: cmdline/acqprogress.cc:139 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB,耗时 %s (%sB/s)\n" -#: cmdline/acqprogress.cc:227 +#: cmdline/acqprogress.cc:229 #, c-format msgid " [Working]" msgstr " [执行中]" -#: cmdline/acqprogress.cc:283 +#: cmdline/acqprogress.cc:285 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1394,7 +1382,7 @@ "“%s”\n" "的盘片插入驱动器“%s”再按回车键\n" -#: cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-internal-solver.cc:36 msgid "" "Usage: apt-internal-resolver\n" "\n" @@ -1410,46 +1398,46 @@ " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc:49 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "" -#: cmdline/apt-mark.cc:52 +#: cmdline/apt-mark.cc:55 #, c-format msgid "%s was already set to manually installed.\n" msgstr "" -#: cmdline/apt-mark.cc:54 +#: cmdline/apt-mark.cc:57 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "" -#: cmdline/apt-mark.cc:169 +#: cmdline/apt-mark.cc:172 #, c-format msgid "%s was already set on hold.\n" msgstr "" -#: cmdline/apt-mark.cc:171 +#: cmdline/apt-mark.cc:174 #, c-format msgid "%s was already not hold.\n" msgstr "" -#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210 #, c-format msgid "%s set on hold.\n" msgstr "" -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215 #, c-format msgid "Canceled hold on %s.\n" msgstr "" -#: cmdline/apt-mark.cc:220 +#: cmdline/apt-mark.cc:223 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:268 +#: cmdline/apt-mark.cc:271 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1471,11 +1459,11 @@ "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt-sortpkgs.cc:86 +#: cmdline/apt-sortpkgs.cc:89 msgid "Unknown package record!" msgstr "未知的软件包记录!" -#: cmdline/apt-sortpkgs.cc:150 +#: cmdline/apt-sortpkgs.cc:153 msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" "\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/apturl.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apturl.po 2012-02-23 07:11:58.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: 2011-12-29 16:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:55+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../apturl-gtk:50 ../apturl-kde:53 msgid "User requested interrupt." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/aspell.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/aspell.po 2012-02-23 07:11:25.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: 2011-12-29 09:08+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:27+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: common/info.cpp:232 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/attr.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/attr.po 2012-02-23 07:11:25.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: 2011-12-29 09:09+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../attr/attr.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/avahi.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/avahi.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/avahi.po 2012-02-23 07:11: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: 2011-12-29 14:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:56+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: ../avahi-common/error.c:30 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bacula.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bacula.po 2012-01-02 18:07:13.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bacula.po 2012-02-23 07:11:37.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: bacula\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-10-29 11:54+0200\n" +"POT-Creation-Date: 2012-01-17 20:45+0100\n" "PO-Revision-Date: 2009-10-19 18:28+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/dird/jobq.c:74 #, c-format @@ -48,7 +48,7 @@ msgstr "" #: src/dird/jobq.c:220 src/dird/job.c:113 src/stored/dircmd.c:198 -#: src/stored/stored.c:531 +#: src/stored/stored.c:503 #, c-format msgid "Unable to init job cond variable: ERR=%s\n" msgstr "" @@ -93,7 +93,7 @@ msgid "Continue? (yes/mod/no): " msgstr "" -#: src/dird/ua_select.c:62 src/dird/ua_run.c:226 +#: src/dird/ua_select.c:62 src/dird/ua_run.c:232 msgid "mod" msgstr "" @@ -113,8 +113,8 @@ msgid "The defined Storage resources are:\n" msgstr "" -#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:697 src/dird/ua_cmds.c:1000 -#: src/dird/ua_run.c:231 src/wx-console/wxbrestorepanel.cpp:339 +#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:715 src/dird/ua_cmds.c:996 +#: src/dird/ua_run.c:237 src/wx-console/wxbrestorepanel.cpp:339 #: src/wx-console/wxbrestorepanel.cpp:355 #: src/wx-console/wxbrestorepanel.cpp:479 #: src/wx-console/wxbrestorepanel.cpp:480 @@ -135,7 +135,7 @@ msgid "The defined FileSet resources are:\n" msgstr "" -#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:233 +#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:239 msgid "FileSet" msgstr "" @@ -143,7 +143,7 @@ msgid "Select FileSet resource" msgstr "" -#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1987 +#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1983 msgid "Could not find a Catalog resource\n" msgstr "" @@ -170,7 +170,7 @@ #: src/dird/ua_select.c:266 src/dird/ua_select.c:289 src/dird/ua_select.c:330 #: src/dird/ua_select.c:1187 src/dird/dird_conf.c:650 src/dird/ua_prune.c:593 -#: src/dird/ua_run.c:232 +#: src/dird/ua_run.c:238 msgid "Job" msgstr "" @@ -195,8 +195,8 @@ msgid "The defined Client resources are:\n" msgstr "" -#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:698 -#: src/dird/ua_cmds.c:1001 src/dird/ua_run.c:237 +#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:716 +#: src/dird/ua_cmds.c:997 src/dird/ua_run.c:243 #: src/wx-console/wxbrestorepanel.cpp:336 #: src/wx-console/wxbrestorepanel.cpp:354 #: src/wx-console/wxbrestorepanel.cpp:431 @@ -274,7 +274,7 @@ msgstr "" #: src/dird/ua_select.c:553 src/dird/ua_select.c:667 src/dird/ua_update.c:615 -#: src/dird/ua_run.c:245 src/wx-console/wxbrestorepanel.cpp:338 +#: src/dird/ua_run.c:251 src/wx-console/wxbrestorepanel.cpp:338 #: src/wx-console/wxbrestorepanel.cpp:527 #: src/wx-console/wxbrestorepanel.cpp:537 #: src/wx-console/wxbrestorepanel.cpp:1834 @@ -411,7 +411,7 @@ msgid "Warning Job %s is not running. Continuing anyway ...\n" msgstr "" -#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:697 src/dird/ua_cmds.c:743 +#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:693 src/dird/ua_cmds.c:739 msgid "Unauthorized command from this console.\n" msgstr "" @@ -453,7 +453,7 @@ msgid "Confirm cancel (yes/no): " msgstr "" -#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:738 src/dird/ua_cmds.c:1105 +#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:734 src/dird/ua_cmds.c:1101 #, c-format msgid "Job \"%s\" not found.\n" msgstr "" @@ -557,32 +557,32 @@ msgid "Unimplemented verify level %d\n" msgstr "" -#: src/dird/verify.c:424 +#: src/dird/verify.c:421 msgid "Verify OK" msgstr "" -#: src/dird/verify.c:428 +#: src/dird/verify.c:425 msgid "*** Verify Error ***" msgstr "" -#: src/dird/verify.c:432 +#: src/dird/verify.c:429 msgid "Verify warnings" msgstr "" -#: src/dird/verify.c:435 +#: src/dird/verify.c:432 msgid "Verify Canceled" msgstr "" -#: src/dird/verify.c:438 +#: src/dird/verify.c:435 msgid "Verify Differences" msgstr "" -#: src/dird/verify.c:443 +#: src/dird/verify.c:440 #, c-format msgid "Inappropriate term code: %d %c\n" msgstr "" -#: src/dird/verify.c:457 +#: src/dird/verify.c:454 #, c-format msgid "" "%s %s %s (%s):\n" @@ -605,7 +605,7 @@ "\n" msgstr "" -#: src/dird/verify.c:492 +#: src/dird/verify.c:489 #, c-format msgid "" "%s %s %s (%s):\n" @@ -626,91 +626,91 @@ "\n" msgstr "" -#: src/dird/verify.c:570 +#: src/dird/verify.c:567 #, c-format msgid "" "birdfixed name. Max=%d: " msgstr "" -#: src/dird/ua_cmds.c:335 +#: src/dird/ua_cmds.c:334 #, c-format msgid "The number must be between 0 and %d\n" msgstr "" -#: src/dird/ua_cmds.c:343 +#: src/dird/ua_cmds.c:342 msgid "Enter Volume name: " msgstr "" -#: src/dird/ua_cmds.c:347 +#: src/dird/ua_cmds.c:346 msgid "Enter base volume name: " msgstr "" -#: src/dird/ua_cmds.c:356 src/dird/ua_label.c:648 +#: src/dird/ua_cmds.c:355 src/dird/ua_label.c:648 msgid "Volume name too long.\n" msgstr "卷名过长\n" -#: src/dird/ua_cmds.c:360 src/dird/ua_label.c:654 src/lib/edit.c:501 +#: src/dird/ua_cmds.c:359 src/dird/ua_label.c:654 src/lib/edit.c:501 msgid "Volume name must be at least one character long.\n" msgstr "卷名至少要有一个字符。\n" -#: src/dird/ua_cmds.c:371 +#: src/dird/ua_cmds.c:370 msgid "Enter the starting number: " msgstr "" -#: src/dird/ua_cmds.c:376 +#: src/dird/ua_cmds.c:375 msgid "Start number must be greater than zero.\n" msgstr "" -#: src/dird/ua_cmds.c:387 +#: src/dird/ua_cmds.c:386 msgid "Enter slot (0 for none): " msgstr "" -#: src/dird/ua_cmds.c:391 +#: src/dird/ua_cmds.c:390 msgid "InChanger? yes/no: " msgstr "" -#: src/dird/ua_cmds.c:419 +#: src/dird/ua_cmds.c:415 #, c-format msgid "%d Volumes created in pool %s\n" msgstr "" -#: src/dird/ua_cmds.c:435 src/dird/ua_cmds.c:1037 +#: src/dird/ua_cmds.c:431 src/dird/ua_cmds.c:1033 msgid "Turn on or off? " msgstr "" -#: src/dird/ua_cmds.c:549 +#: src/dird/ua_cmds.c:545 #, c-format msgid "" "Can't set %s RecyclePool to %s, %s is not in database.\n" "Try to update it with 'update pool=%s'\n" msgstr "" -#: src/dird/ua_cmds.c:567 +#: src/dird/ua_cmds.c:563 #, c-format msgid "" "Can't set %s ScratchPool to %s, %s is not in database.\n" "Try to update it with 'update pool=%s'\n" msgstr "" -#: src/dird/ua_cmds.c:636 +#: src/dird/ua_cmds.c:632 #, c-format msgid "" "Error: Pool %s already exists.\n" "Use update to change it.\n" msgstr "" -#: src/dird/ua_cmds.c:647 +#: src/dird/ua_cmds.c:643 #, c-format msgid "Pool %s created.\n" msgstr "" -#: src/dird/ua_cmds.c:677 +#: src/dird/ua_cmds.c:673 msgid "Python interpreter restarted.\n" msgstr "" -#: src/dird/ua_cmds.c:680 src/dird/ua_cmds.c:1335 +#: src/dird/ua_cmds.c:676 src/dird/ua_cmds.c:1331 msgid "Nothing done.\n" msgstr "" -#: src/dird/ua_cmds.c:704 src/dird/ua_cmds.c:1088 src/dird/ua_run.c:1562 +#: src/dird/ua_cmds.c:700 src/dird/ua_cmds.c:1084 src/dird/ua_run.c:1582 #, c-format msgid "Client \"%s\" not found.\n" msgstr "" -#: src/dird/ua_cmds.c:713 +#: src/dird/ua_cmds.c:709 #, c-format msgid "Client \"%s\" address set to %s\n" msgstr "" -#: src/dird/ua_cmds.c:747 +#: src/dird/ua_cmds.c:743 #, c-format msgid "Job \"%s\" %sabled\n" msgstr "" -#: src/dird/ua_cmds.c:925 +#: src/dird/ua_cmds.c:921 msgid "Enter new debug level: " msgstr "" -#: src/dird/ua_cmds.c:1002 +#: src/dird/ua_cmds.c:998 msgid "All" msgstr "" -#: src/dird/ua_cmds.c:1003 +#: src/dird/ua_cmds.c:999 msgid "Select daemon type to set debug level" msgstr "" -#: src/dird/ua_cmds.c:1092 src/dird/ua_cmds.c:1930 +#: src/dird/ua_cmds.c:1088 src/dird/ua_cmds.c:1926 #, c-format msgid "No authorization for Client \"%s\"\n" msgstr "" -#: src/dird/ua_cmds.c:1097 +#: src/dird/ua_cmds.c:1093 msgid "Client name missing.\n" msgstr "" -#: src/dird/ua_cmds.c:1109 src/dird/ua_cmds.c:1170 src/dird/ua_cmds.c:1952 +#: src/dird/ua_cmds.c:1105 src/dird/ua_cmds.c:1166 src/dird/ua_cmds.c:1948 #, c-format msgid "No authorization for Job \"%s\"\n" msgstr "" -#: src/dird/ua_cmds.c:1114 +#: src/dird/ua_cmds.c:1110 msgid "Job name missing.\n" msgstr "" -#: src/dird/ua_cmds.c:1123 +#: src/dird/ua_cmds.c:1119 #, c-format msgid "Fileset \"%s\" not found.\n" msgstr "" -#: src/dird/ua_cmds.c:1127 +#: src/dird/ua_cmds.c:1123 #, c-format msgid "No authorization for FileSet \"%s\"\n" msgstr "" -#: src/dird/ua_cmds.c:1132 +#: src/dird/ua_cmds.c:1128 msgid "Fileset name missing.\n" msgstr "" -#: src/dird/ua_cmds.c:1143 src/dird/ua_run.c:557 +#: src/dird/ua_cmds.c:1139 src/dird/ua_run.c:563 #, c-format msgid "Level \"%s\" not valid.\n" msgstr "" -#: src/dird/ua_cmds.c:1147 +#: src/dird/ua_cmds.c:1143 msgid "Level value missing.\n" msgstr "" -#: src/dird/ua_cmds.c:1153 +#: src/dird/ua_cmds.c:1149 msgid "Invalid value for accurate. It must be yes or no.\n" msgstr "" -#: src/dird/ua_cmds.c:1166 +#: src/dird/ua_cmds.c:1162 msgid "No job specified.\n" msgstr "" -#: src/dird/ua_cmds.c:1214 +#: src/dird/ua_cmds.c:1210 msgid "Error sending include list.\n" msgstr "" -#: src/dird/ua_cmds.c:1219 +#: src/dird/ua_cmds.c:1215 msgid "Error sending exclude list.\n" msgstr "" -#: src/dird/ua_cmds.c:1321 +#: src/dird/ua_cmds.c:1317 msgid "" "In general it is not a good idea to delete either a\n" "Pool or a Volume since they may contain data.\n" "\n" msgstr "" -#: src/dird/ua_cmds.c:1324 +#: src/dird/ua_cmds.c:1320 msgid "Choose catalog item to delete" msgstr "" -#: src/dird/ua_cmds.c:1388 +#: src/dird/ua_cmds.c:1384 msgid "Enter JobId to delete: " msgstr "" -#: src/dird/ua_cmds.c:1427 +#: src/dird/ua_cmds.c:1423 #, c-format msgid "Job %s and associated records deleted from the catalog.\n" msgstr "" -#: src/dird/ua_cmds.c:1442 +#: src/dird/ua_cmds.c:1438 #, c-format msgid "" "\n" @@ -2009,44 +2009,44 @@ "and all Jobs saved on that volume from the Catalog\n" msgstr "" -#: src/dird/ua_cmds.c:1449 +#: src/dird/ua_cmds.c:1445 #, c-format msgid "Are you sure you want to delete Volume \"%s\"? (yes/no): " msgstr "" -#: src/dird/ua_cmds.c:1462 +#: src/dird/ua_cmds.c:1458 msgid "Can't list jobs on this volume\n" msgstr "" -#: src/dird/ua_cmds.c:1487 +#: src/dird/ua_cmds.c:1483 #, c-format msgid "Are you sure you want to delete Pool \"%s\"? (yes/no): " msgstr "" -#: src/dird/ua_cmds.c:1602 +#: src/dird/ua_cmds.c:1598 #, c-format msgid "Using Catalog name=%s DB=%s\n" msgstr "" -#: src/dird/ua_cmds.c:1670 +#: src/dird/ua_cmds.c:1666 msgid "ERR: Can't open db\n" msgstr "" -#: src/dird/ua_cmds.c:1717 +#: src/dird/ua_cmds.c:1713 msgid "Wait on mount timed out\n" msgstr "" -#: src/dird/ua_cmds.c:1727 +#: src/dird/ua_cmds.c:1723 msgid "ERR: Job was not found\n" msgstr "" -#: src/dird/ua_cmds.c:1803 +#: src/dird/ua_cmds.c:1799 msgid "" " Command Description\n" " ======= ===========\n" msgstr "" -#: src/dird/ua_cmds.c:1807 +#: src/dird/ua_cmds.c:1803 #, c-format msgid "" " %-13s %s\n" @@ -2055,12 +2055,12 @@ "\t%s\n" msgstr "" -#: src/dird/ua_cmds.c:1812 +#: src/dird/ua_cmds.c:1808 #, c-format msgid " %-13s %s\n" msgstr "" -#: src/dird/ua_cmds.c:1816 +#: src/dird/ua_cmds.c:1812 #, c-format msgid "" "\n" @@ -2068,29 +2068,29 @@ "\n" msgstr "" -#: src/dird/ua_cmds.c:1818 +#: src/dird/ua_cmds.c:1814 msgid "" "\n" "When at a prompt, entering a period cancels the command.\n" "\n" msgstr "" -#: src/dird/ua_cmds.c:1854 src/filed/status.c:85 +#: src/dird/ua_cmds.c:1850 src/filed/status.c:85 #, c-format msgid "%s Version: %s (%s) %s %s %s %s\n" msgstr "" -#: src/dird/ua_cmds.c:1913 src/dird/ua_cmds.c:1940 src/dird/ua_cmds.c:1962 +#: src/dird/ua_cmds.c:1909 src/dird/ua_cmds.c:1936 src/dird/ua_cmds.c:1958 #, c-format msgid "No authorization for Catalog \"%s\"\n" msgstr "" -#: src/dird/ua_cmds.c:2007 +#: src/dird/ua_cmds.c:2003 #, c-format msgid "Could not open catalog database \"%s\".\n" msgstr "" -#: src/dird/ua_cmds.c:2017 +#: src/dird/ua_cmds.c:2013 #, c-format msgid "Using Catalog \"%s\"\n" msgstr "" @@ -2240,7 +2240,7 @@ msgid "%d total files; %d marked to be restored; %s bytes.\n" msgstr "" -#: src/dird/ua_tree.c:775 src/stored/btape.c:2943 +#: src/dird/ua_tree.c:775 src/stored/btape.c:2947 #, c-format msgid "" " Command Description\n" @@ -2643,13 +2643,13 @@ msgid "Cannot find Console resource %s\n" msgstr "" -#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:608 +#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:611 #: src/filed/filed_conf.c:381 #, c-format msgid "Cannot find Director resource %s\n" msgstr "" -#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:614 +#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:617 #, c-format msgid "Cannot find Storage resource %s\n" msgstr "" @@ -2705,33 +2705,33 @@ msgid "Expected one of: %s, got: %s" msgstr "" -#: src/dird/dird_conf.c:1704 +#: src/dird/dird_conf.c:1703 #, c-format msgid "Expected a Migration Job Type keyword, got: %s" msgstr "" -#: src/dird/dird_conf.c:1730 +#: src/dird/dird_conf.c:1729 #, c-format msgid "Expected a Job Type keyword, got: %s" msgstr "" -#: src/dird/dird_conf.c:1754 +#: src/dird/dird_conf.c:1753 #, c-format msgid "Expected a Job Level keyword, got: %s" msgstr "" -#: src/dird/dird_conf.c:1774 +#: src/dird/dird_conf.c:1773 #, c-format msgid "Expected a Restore replacement option, got: %s" msgstr "" -#: src/dird/dird_conf.c:1824 src/dird/dird_conf.c:1940 +#: src/dird/dird_conf.c:1823 src/dird/dird_conf.c:1939 #: src/lib/parse_conf.c:761 src/lib/parse_conf.c:777 #, c-format msgid "Expect %s, got: %s" msgstr "" -#: src/dird/dird_conf.c:1846 src/lib/parse_conf.c:478 +#: src/dird/dird_conf.c:1845 src/lib/parse_conf.c:478 #, c-format msgid "Could not find config Resource %s referenced on line %d : %s\n" msgstr "" @@ -3136,78 +3136,78 @@ msgid "FD gave bad response to JobId command: %s\n" msgstr "FD对JobId命令作出了不正确的响应:%s\n" -#: src/dird/fd_cmds.c:183 src/dird/fd_cmds.c:268 +#: src/dird/fd_cmds.c:184 src/dird/fd_cmds.c:272 msgid ", since=" msgstr ",始于=" -#: src/dird/fd_cmds.c:246 +#: src/dird/fd_cmds.c:249 msgid "" "No prior or suitable Full backup found in catalog. Doing FULL backup.\n" msgstr "没有在目录中找到先前或合适的完全备份。执行完全备份。\n" -#: src/dird/fd_cmds.c:247 src/dird/fd_cmds.c:253 src/dird/fd_cmds.c:261 +#: src/dird/fd_cmds.c:250 src/dird/fd_cmds.c:256 src/dird/fd_cmds.c:265 #, c-format msgid " (upgraded from %s)" msgstr " (已从 %s 更新)" -#: src/dird/fd_cmds.c:252 +#: src/dird/fd_cmds.c:255 msgid "" "No prior or suitable Differential backup found in catalog. Doing " "Differential backup.\n" msgstr "" -#: src/dird/fd_cmds.c:259 +#: src/dird/fd_cmds.c:263 #, c-format msgid "Prior failed job found in catalog. Upgrading to %s.\n" msgstr "在目录中发现了先前失败的任务。更新到 %s。\n" -#: src/dird/fd_cmds.c:322 +#: src/dird/fd_cmds.c:328 #, c-format msgid "Unimplemented backup level %d %c\n" msgstr "未实现的的备份等级 %d %c\n" -#: src/dird/fd_cmds.c:395 +#: src/dird/fd_cmds.c:401 msgid "" "FD compression disabled for this Job because AllowCompress=No in Storage " "resource.\n" msgstr "" -#: src/dird/fd_cmds.c:494 src/filed/job.c:822 +#: src/dird/fd_cmds.c:500 src/filed/job.c:858 #, c-format msgid "Cannot run program: %s. ERR=%s\n" msgstr "无法运行程序%s。错误为%s\n" -#: src/dird/fd_cmds.c:505 src/dird/fd_cmds.c:530 src/dird/fd_cmds.c:544 +#: src/dird/fd_cmds.c:511 src/dird/fd_cmds.c:536 src/dird/fd_cmds.c:550 msgid ">filed: write error on socket\n" msgstr ">归档:写入时套接字错误\n" -#: src/dird/fd_cmds.c:511 +#: src/dird/fd_cmds.c:517 #, c-format msgid "Error running program: %s. ERR=%s\n" msgstr "程序%s运行错误,错误代码%s\n" -#: src/dird/fd_cmds.c:520 +#: src/dird/fd_cmds.c:526 #, c-format msgid "Cannot open included file: %s. ERR=%s\n" msgstr "无法打开包含文件%s,错误代码%s\n" -#: src/dird/fd_cmds.c:666 +#: src/dird/fd_cmds.c:672 #, c-format msgid "Client \"%s\" RunScript failed.\n" msgstr "客户端 \"%s\" 运行脚本失败.\n" -#: src/dird/fd_cmds.c:689 +#: src/dird/fd_cmds.c:695 #, c-format msgid "" "Client \"%s\" may not be used to restore this job. Please upgrade your " "client.\n" msgstr "" -#: src/dird/fd_cmds.c:755 +#: src/dird/fd_cmds.c:770 msgid "RestoreObject failed.\n" msgstr "" -#: src/dird/fd_cmds.c:791 +#: src/dird/fd_cmds.c:806 #, c-format msgid "" " %s\n" msgstr "" -#: src/dird/ua_run.c:693 +#: src/dird/ua_run.c:699 msgid "Cannot use your regexp.\n" msgstr "" -#: src/dird/ua_run.c:706 src/dird/ua_run.c:736 +#: src/dird/ua_run.c:712 src/dird/ua_run.c:742 msgid "Levels:\n" msgstr "" -#: src/dird/ua_run.c:708 src/stored/status.c:600 src/lib/util.c:426 +#: src/dird/ua_run.c:714 src/stored/status.c:600 src/lib/util.c:426 #: src/lib/util.c:472 src/filed/status.c:519 msgid "Full" msgstr "" -#: src/dird/ua_run.c:709 src/stored/status.c:603 src/lib/util.c:429 +#: src/dird/ua_run.c:715 src/stored/status.c:603 src/lib/util.c:429 #: src/filed/status.c:522 msgid "Incremental" msgstr "" -#: src/dird/ua_run.c:710 src/stored/status.c:606 src/lib/util.c:432 +#: src/dird/ua_run.c:716 src/stored/status.c:606 src/lib/util.c:432 #: src/filed/status.c:525 msgid "Differential" msgstr "" -#: src/dird/ua_run.c:711 src/stored/status.c:609 src/lib/util.c:435 +#: src/dird/ua_run.c:717 src/stored/status.c:609 src/lib/util.c:435 #: src/filed/status.c:528 msgid "Since" msgstr "" -#: src/dird/ua_run.c:712 +#: src/dird/ua_run.c:718 msgid "VirtualFull" msgstr "" -#: src/dird/ua_run.c:713 src/dird/ua_run.c:742 +#: src/dird/ua_run.c:719 src/dird/ua_run.c:748 msgid "Select level" msgstr "" -#: src/dird/ua_run.c:737 +#: src/dird/ua_run.c:743 msgid "Initialize Catalog" msgstr "" -#: src/dird/ua_run.c:738 src/stored/status.c:612 src/lib/util.c:438 +#: src/dird/ua_run.c:744 src/stored/status.c:612 src/lib/util.c:438 #: src/filed/status.c:531 msgid "Verify Catalog" msgstr "" -#: src/dird/ua_run.c:739 src/lib/util.c:444 +#: src/dird/ua_run.c:745 src/lib/util.c:444 msgid "Verify Volume to Catalog" msgstr "" -#: src/dird/ua_run.c:740 src/lib/util.c:447 +#: src/dird/ua_run.c:746 src/lib/util.c:447 msgid "Verify Disk to Catalog" msgstr "" -#: src/dird/ua_run.c:741 +#: src/dird/ua_run.c:747 msgid "Verify Volume Data (not yet implemented)" msgstr "" -#: src/dird/ua_run.c:762 +#: src/dird/ua_run.c:768 msgid "Level not appropriate for this Job. Cannot be changed.\n" msgstr "" -#: src/dird/ua_run.c:793 +#: src/dird/ua_run.c:799 #, c-format msgid "" "Run Admin Job\n" @@ -4577,7 +4582,7 @@ "Priority: %d\n" msgstr "" -#: src/dird/ua_run.c:837 +#: src/dird/ua_run.c:843 #, c-format msgid "" "Run Backup job\n" @@ -4592,12 +4597,12 @@ "%s%s%s" msgstr "" -#: src/dird/ua_run.c:868 +#: src/dird/ua_run.c:874 #, c-format msgid "Could not get job record for selected JobId. ERR=%s" msgstr "" -#: src/dird/ua_run.c:907 +#: src/dird/ua_run.c:913 #, c-format msgid "" "Run Verify Job\n" @@ -4613,11 +4618,11 @@ "Priority: %d\n" msgstr "" -#: src/dird/ua_run.c:936 +#: src/dird/ua_run.c:942 msgid "Please enter a JobId for restore: " msgstr "" -#: src/dird/ua_run.c:976 +#: src/dird/ua_run.c:982 #, c-format msgid "" "Run Restore job\n" @@ -4635,7 +4640,7 @@ "Plugin Options: %s\n" msgstr "" -#: src/dird/ua_run.c:1032 +#: src/dird/ua_run.c:1038 #, c-format msgid "" "Run Restore job\n" @@ -4653,7 +4658,7 @@ "Plugin Options: %s\n" msgstr "" -#: src/dird/ua_run.c:1063 +#: src/dird/ua_run.c:1069 #, c-format msgid "" "Run Restore job\n" @@ -4661,17 +4666,17 @@ "Bootstrap: %s\n" msgstr "" -#: src/dird/ua_run.c:1071 +#: src/dird/ua_run.c:1077 #, c-format msgid "RegexWhere: %s\n" msgstr "" -#: src/dird/ua_run.c:1074 +#: src/dird/ua_run.c:1080 #, c-format msgid "Where: %s\n" msgstr "" -#: src/dird/ua_run.c:1078 +#: src/dird/ua_run.c:1084 #, c-format msgid "" "Replace: %s\n" @@ -4684,211 +4689,249 @@ "Plugin Options: %s\n" msgstr "" -#: src/dird/ua_run.c:1133 +#: src/dird/ua_run.c:1139 msgid "Run Copy job\n" msgstr "" -#: src/dird/ua_run.c:1135 +#: src/dird/ua_run.c:1141 msgid "Run Migration job\n" msgstr "" -#: src/dird/ua_run.c:1164 +#: src/dird/ua_run.c:1170 #, c-format msgid "Unknown Job Type=%d\n" msgstr "" -#: src/dird/ua_run.c:1231 +#: src/dird/ua_run.c:1239 #, c-format msgid "Value missing for keyword %s\n" msgstr "" -#: src/dird/ua_run.c:1238 +#: src/dird/ua_run.c:1246 msgid "Job name specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1246 +#: src/dird/ua_run.c:1254 msgid "JobId specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1255 src/dird/ua_run.c:1395 +#: src/dird/ua_run.c:1263 src/dird/ua_run.c:1403 msgid "Client specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1263 +#: src/dird/ua_run.c:1271 msgid "FileSet specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1271 +#: src/dird/ua_run.c:1279 msgid "Level specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1280 +#: src/dird/ua_run.c:1288 msgid "Storage specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1288 +#: src/dird/ua_run.c:1296 msgid "RegexWhere or Where specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1293 +#: src/dird/ua_run.c:1301 msgid "No authorization for \"regexwhere\" specification.\n" msgstr "" -#: src/dird/ua_run.c:1300 +#: src/dird/ua_run.c:1308 msgid "Where or RegexWhere specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1305 +#: src/dird/ua_run.c:1313 msgid "No authoriztion for \"where\" specification.\n" msgstr "" -#: src/dird/ua_run.c:1312 +#: src/dird/ua_run.c:1320 msgid "Bootstrap specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1320 +#: src/dird/ua_run.c:1328 msgid "Replace specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1328 +#: src/dird/ua_run.c:1336 msgid "When specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1336 +#: src/dird/ua_run.c:1344 msgid "Priority specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1341 +#: src/dird/ua_run.c:1349 msgid "Priority must be positive nonzero setting it to 10.\n" msgstr "" -#: src/dird/ua_run.c:1351 +#: src/dird/ua_run.c:1359 msgid "Verify Job specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1379 +#: src/dird/ua_run.c:1387 msgid "Migration Job specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1387 +#: src/dird/ua_run.c:1395 msgid "Pool specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1403 +#: src/dird/ua_run.c:1411 msgid "Restore Client specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1410 +#: src/dird/ua_run.c:1418 msgid "Plugin Options not yet implemented.\n" msgstr "" -#: src/dird/ua_run.c:1413 +#: src/dird/ua_run.c:1421 msgid "Plugin Options specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1418 +#: src/dird/ua_run.c:1426 msgid "No authoriztion for \"PluginOptions\" specification.\n" msgstr "" -#: src/dird/ua_run.c:1425 +#: src/dird/ua_run.c:1433 msgid "Spool flag specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1432 +#: src/dird/ua_run.c:1440 msgid "Invalid spooldata flag.\n" msgstr "" -#: src/dird/ua_run.c:1441 +#: src/dird/ua_run.c:1449 msgid "IgnoreDuplicateCheck flag specified twice.\n" msgstr "" -#: src/dird/ua_run.c:1448 +#: src/dird/ua_run.c:1456 msgid "Invalid ignoreduplicatecheck flag.\n" msgstr "" -#: src/dird/ua_run.c:1469 +#: src/dird/ua_run.c:1461 +msgid "Accurate flag specified twice.\n" +msgstr "" + +#: src/dird/ua_run.c:1468 +msgid "Invalid accurate flag.\n" +msgstr "" + +#: src/dird/ua_run.c:1489 #, c-format msgid "Invalid keyword: %s\n" msgstr "" -#: src/dird/ua_run.c:1484 +#: src/dird/ua_run.c:1504 #, c-format msgid "Catalog \"%s\" not found\n" msgstr "" -#: src/dird/ua_run.c:1488 +#: src/dird/ua_run.c:1508 #, c-format msgid "No authorization. Catalog \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1499 +#: src/dird/ua_run.c:1519 #, c-format msgid "Job \"%s\" not found\n" msgstr "" -#: src/dird/ua_run.c:1506 +#: src/dird/ua_run.c:1526 msgid "A job name must be specified.\n" msgstr "" -#: src/dird/ua_run.c:1512 +#: src/dird/ua_run.c:1532 #, c-format msgid "No authorization. Job \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1520 +#: src/dird/ua_run.c:1540 #, c-format msgid "Pool \"%s\" not found.\n" msgstr "" -#: src/dird/ua_run.c:1530 +#: src/dird/ua_run.c:1550 #, c-format msgid "No authorization. Pool \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1540 +#: src/dird/ua_run.c:1560 #, c-format msgid "Storage \"%s\" not found.\n" msgstr "" -#: src/dird/ua_run.c:1549 src/dird/job.c:1242 +#: src/dird/ua_run.c:1569 src/dird/job.c:1242 msgid "No storage specified.\n" msgstr "" -#: src/dird/ua_run.c:1552 +#: src/dird/ua_run.c:1572 #, c-format msgid "No authorization. Storage \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1572 src/dird/ua_run.c:1592 +#: src/dird/ua_run.c:1592 src/dird/ua_run.c:1612 #, c-format msgid "No authorization. Client \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1582 +#: src/dird/ua_run.c:1602 #, c-format msgid "Restore Client \"%s\" not found.\n" msgstr "" -#: src/dird/ua_run.c:1601 +#: src/dird/ua_run.c:1621 #, c-format msgid "FileSet \"%s\" not found.\n" msgstr "" -#: src/dird/ua_run.c:1610 +#: src/dird/ua_run.c:1630 #, c-format msgid "No authorization. FileSet \"%s\".\n" msgstr "" -#: src/dird/ua_run.c:1618 +#: src/dird/ua_run.c:1638 #, c-format msgid "Verify Job \"%s\" not found.\n" msgstr "" -#: src/dird/ua_run.c:1628 +#: src/dird/ua_run.c:1648 #, c-format msgid "Migration Job \"%s\" not found.\n" msgstr "" +#: src/dird/dir_plugins.c:180 src/stored/sd_plugins.c:183 +#: src/filed/fd_plugins.c:973 +#, c-format +msgid "Loaded plugin: %s\n" +msgstr "" + +#: src/dird/dir_plugins.c:200 src/stored/sd_plugins.c:203 +#: src/filed/fd_plugins.c:992 +#, c-format +msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n" +msgstr "" + +#: src/dird/dir_plugins.c:208 src/stored/sd_plugins.c:211 +#: src/filed/fd_plugins.c:1000 +#, c-format +msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n" +msgstr "" + +#: src/dird/dir_plugins.c:217 src/stored/sd_plugins.c:220 +#: src/filed/fd_plugins.c:1008 +#, c-format +msgid "Plugin license incompatible. Plugin=%s license=%s\n" +msgstr "" + +#: src/dird/dir_plugins.c:225 src/stored/sd_plugins.c:228 +#: src/filed/fd_plugins.c:1016 +#, c-format +msgid "Plugin size incorrect. Plugin=%s wanted=%d got=%d\n" +msgstr "" + #: src/dird/backup.c:96 msgid "No Storage specification found in Job or Pool.\n" msgstr "没有在任务或链接池中找到存储具体说明。\n" @@ -4925,11 +4968,11 @@ msgid "No Job status returned from FD.\n" msgstr "FD没有返回任务状态。\n" -#: src/dird/backup.c:649 +#: src/dird/backup.c:647 msgid "Backup failed -- incomplete" msgstr "" -#: src/dird/backup.c:722 +#: src/dird/backup.c:720 #, c-format msgid "" "%s %s %s (%s):\n" @@ -4968,13 +5011,13 @@ "\n" msgstr "" -#: src/dird/backup.c:824 +#: src/dird/backup.c:822 #, c-format msgid "" "Could not get Job Volume Parameters to update Bootstrap file. ERR=%s\n" msgstr "无法获得更新Bootstrap文件的工作卷参数。错误=%s\n" -#: src/dird/backup.c:860 +#: src/dird/backup.c:858 #, c-format msgid "" "Could not open WriteBootstrap file:\n" @@ -4983,7 +5026,7 @@ "无法打开WriteBootstrap文件。\n" "%s: 错误=%s\n" -#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2370 +#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2409 #, c-format msgid "Could not open bootstrap file %s: ERR=%s\n" msgstr "无法打开引导文件 %s:错误为%s\n" @@ -5051,25 +5094,25 @@ "\n" msgstr "" -#: src/dird/ua_status.c:175 +#: src/dird/ua_status.c:174 msgid "Status available for:\n" msgstr "" -#: src/dird/ua_status.c:181 +#: src/dird/ua_status.c:180 msgid "Select daemon type for status" msgstr "" -#: src/dird/ua_status.c:295 src/stored/status.c:218 +#: src/dird/ua_status.c:294 src/stored/status.c:218 #, c-format msgid "%s Version: %s (%s) %s %s %s\n" msgstr "" -#: src/dird/ua_status.c:298 +#: src/dird/ua_status.c:297 #, c-format -msgid "Daemon started %s. Jobs: run=%d, running=%d\n" +msgid "Daemon started %s. Jobs: run=%d, running=%d mode=%d,%d\n" msgstr "" -#: src/dird/ua_status.c:300 src/stored/status.c:229 src/filed/status.c:142 +#: src/dird/ua_status.c:300 src/stored/status.c:228 src/filed/status.c:142 #, c-format msgid " Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n" msgstr "" @@ -5322,7 +5365,7 @@ msgid "Diffs" msgstr "" -#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1520 +#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1521 #: src/lib/util.c:189 src/lib/util.c:324 src/filed/status.c:376 #: src/wx-console/wxbconfigpanel.cpp:209 msgid "OK" @@ -5381,35 +5424,35 @@ msgid "Comment must be at least one character long.\n" msgstr "" -#: src/dird/pythondir.c:122 src/stored/pythonsd.c:101 +#: src/dird/pythondir.c:121 src/stored/pythonsd.c:101 #: src/stored/pythonsd.c:166 src/filed/pythonfd.c:94 src/filed/pythonfd.c:148 #: src/filed/pythonfd.c:212 msgid "Job pointer not found." msgstr "" -#: src/dird/pythondir.c:154 +#: src/dird/pythondir.c:153 msgid "Pool record not found." msgstr "" -#: src/dird/pythondir.c:210 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125 +#: src/dird/pythondir.c:209 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125 #, c-format msgid "Attribute %s not found." msgstr "" -#: src/dird/pythondir.c:253 src/dird/pythondir.c:259 src/stored/pythonsd.c:183 +#: src/dird/pythondir.c:252 src/dird/pythondir.c:258 src/stored/pythonsd.c:183 #: src/filed/pythonfd.c:167 msgid "Read-only attribute" msgstr "" -#: src/dird/pythondir.c:285 +#: src/dird/pythondir.c:284 msgid "Priority must be 1-100" msgstr "" -#: src/dird/pythondir.c:290 +#: src/dird/pythondir.c:289 msgid "Job Level can be set only during JobInit" msgstr "" -#: src/dird/pythondir.c:304 +#: src/dird/pythondir.c:303 msgid "Bad JobLevel string" msgstr "" @@ -5538,12 +5581,12 @@ msgid "Client resource" msgstr "" -#: src/dird/job.c:1411 +#: src/dird/job.c:1403 #, c-format msgid "Could not start clone job: \"%s\".\n" msgstr "" -#: src/dird/job.c:1414 +#: src/dird/job.c:1406 #, c-format msgid "Clone JobId %d started.\n" msgstr "" @@ -5571,16 +5614,16 @@ msgstr "" #: src/dird/authenticate.c:127 src/wx-console/authenticate.c:127 -#: src/console/authenticate.c:125 +#: src/console/authenticate.c:122 msgid "" "Authorization problem: Remote server did not advertise required TLS " "support.\n" msgstr "" -#: src/dird/authenticate.c:134 src/stored/authenticate.c:147 -#: src/stored/authenticate.c:258 src/wx-console/authenticate.c:133 -#: src/console/authenticate.c:132 src/filed/authenticate.c:158 -#: src/filed/authenticate.c:277 +#: src/dird/authenticate.c:134 src/stored/authenticate.c:146 +#: src/stored/authenticate.c:257 src/wx-console/authenticate.c:133 +#: src/console/authenticate.c:129 src/filed/authenticate.c:160 +#: src/filed/authenticate.c:279 msgid "Authorization problem: Remote server requires TLS.\n" msgstr "" @@ -5660,37 +5703,37 @@ msgid "File daemon at \"%s:%d\" rejected Hello command\n" msgstr "" -#: src/dird/authenticate.c:303 +#: src/dird/authenticate.c:302 #, c-format msgid "UA Hello from %s:%s:%d is invalid. Len=%d\n" msgstr "" -#: src/dird/authenticate.c:310 +#: src/dird/authenticate.c:309 #, c-format msgid "UA Hello from %s:%s:%d is invalid. Got: %s\n" msgstr "" -#: src/dird/authenticate.c:380 +#: src/dird/authenticate.c:377 msgid "" "Authorization problem: Remote client did not advertise required TLS " "support.\n" msgstr "" -#: src/dird/authenticate.c:388 +#: src/dird/authenticate.c:385 msgid "Authorization problem: Remote client requires TLS.\n" msgstr "" -#: src/dird/authenticate.c:403 src/filed/authenticate.c:167 -#: src/filed/authenticate.c:286 +#: src/dird/authenticate.c:400 src/filed/authenticate.c:169 +#: src/filed/authenticate.c:288 msgid "TLS negotiation failed.\n" msgstr "" -#: src/dird/authenticate.c:417 +#: src/dird/authenticate.c:414 #, c-format msgid "Unable to authenticate console \"%s\" at %s:%s:%d.\n" msgstr "" -#: src/dird/authenticate.c:422 +#: src/dird/authenticate.c:419 #, c-format msgid "1000 OK: %s Version: %s (%s)\n" msgstr "" @@ -5723,8 +5766,8 @@ #: src/dird/catreq.c:204 #, c-format -msgid "1998 Volume \"%s\" status is %s, %s.\n" -msgstr "1998 卷\"%s\"的状态为:%s, %s。\n" +msgid "1998 Volume \"%s\" catalog status is %s, %s.\n" +msgstr "" #: src/dird/catreq.c:209 #, c-format @@ -5815,13 +5858,13 @@ msgid "Invalid Catalog Update; DB not open: %s" msgstr "无效目录更新;DB没有打开:%s" -#: src/dird/catreq.c:671 src/dird/catreq.c:689 src/lib/bsock.c:605 +#: src/dird/catreq.c:670 src/dird/catreq.c:685 src/lib/bsock.c:605 #, c-format msgid "fread attr spool error. ERR=%s\n" msgstr "" #: src/dird/msgchan.c:106 src/tray-monitor/tray-monitor.c:952 -#: src/filed/job.c:1727 src/qt-console/tray-monitor/tray-monitor.cpp:375 +#: src/filed/job.c:1771 src/qt-console/tray-monitor/tray-monitor.cpp:375 msgid "Storage daemon" msgstr "存储守护进程" @@ -6263,14 +6306,14 @@ "Please see " msgstr "" -#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:155 +#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:152 #: src/qt-console/tray-monitor/authenticate.cpp:96 #, c-format msgid "Bad response to Hello command: ERR=%s\n" msgstr "" #: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157 -#: src/console/authenticate.c:162 +#: src/console/authenticate.c:159 #: src/qt-console/tray-monitor/authenticate.cpp:103 msgid "Director rejected Hello command\n" msgstr "" @@ -6301,31 +6344,31 @@ "Please see " msgstr "" -#: src/stored/reserve.c:88 +#: src/stored/reserve.c:86 #, c-format msgid "Unable to initialize reservation lock. ERR=%s\n" msgstr "" -#: src/stored/reserve.c:158 +#: src/stored/reserve.c:156 #, c-format msgid "Hey! num_writers=%d!!!!\n" msgstr "" -#: src/stored/reserve.c:256 +#: src/stored/reserve.c:255 msgid "3939 Could not get dcr\n" msgstr "" -#: src/stored/reserve.c:358 +#: src/stored/reserve.c:357 #, c-format msgid "Device reservation failed for JobId=%d: %s\n" msgstr "" -#: src/stored/reserve.c:367 +#: src/stored/reserve.c:366 #, c-format msgid "Failed command: %s\n" msgstr "" -#: src/stored/reserve.c:626 src/stored/dircmd.c:618 +#: src/stored/reserve.c:625 src/stored/dircmd.c:618 #, c-format msgid "" "\n" @@ -6333,85 +6376,85 @@ "does not exist.\n" msgstr "" -#: src/stored/reserve.c:630 src/stored/dircmd.c:596 +#: src/stored/reserve.c:629 src/stored/dircmd.c:596 #, c-format msgid "" "\n" " Device \"%s\" requested by DIR could not be opened or does not exist.\n" msgstr "" -#: src/stored/reserve.c:646 +#: src/stored/reserve.c:645 #, c-format msgid "3926 Could not get dcr for device: %s\n" msgstr "" -#: src/stored/reserve.c:772 +#: src/stored/reserve.c:771 #, c-format msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n" msgstr "" -#: src/stored/reserve.c:782 +#: src/stored/reserve.c:781 #, c-format msgid "3602 JobId=%u device %s is busy (already reading/writing).\n" msgstr "" -#: src/stored/reserve.c:829 +#: src/stored/reserve.c:833 #, c-format msgid "3603 JobId=%u device %s is busy reading.\n" msgstr "" -#: src/stored/reserve.c:838 +#: src/stored/reserve.c:842 #, c-format msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n" msgstr "" -#: src/stored/reserve.c:875 +#: src/stored/reserve.c:884 #, c-format msgid "" "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive " "%s.\n" msgstr "" -#: src/stored/reserve.c:898 +#: src/stored/reserve.c:907 #, c-format msgid "3609 JobId=%u Max concurrent jobs exceeded on drive %s.\n" msgstr "" -#: src/stored/reserve.c:910 +#: src/stored/reserve.c:919 #, c-format msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n" msgstr "" -#: src/stored/reserve.c:962 +#: src/stored/reserve.c:971 #, c-format msgid "3605 JobId=%u wants free drive but device %s is busy.\n" msgstr "" -#: src/stored/reserve.c:971 +#: src/stored/reserve.c:980 #, c-format msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n" msgstr "" -#: src/stored/reserve.c:993 +#: src/stored/reserve.c:1002 #, c-format msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n" msgstr "" -#: src/stored/reserve.c:1048 +#: src/stored/reserve.c:1057 #, c-format msgid "Logic error!!!! JobId=%u Should not get here.\n" msgstr "" -#: src/stored/reserve.c:1049 +#: src/stored/reserve.c:1058 #, c-format msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n" msgstr "" -#: src/stored/reserve.c:1052 +#: src/stored/reserve.c:1061 msgid "Logic error!!!! Should not get here.\n" msgstr "" -#: src/stored/reserve.c:1055 +#: src/stored/reserve.c:1064 #, c-format msgid "3911 JobId=%u failed reserve drive %s.\n" msgstr "" @@ -6543,7 +6586,7 @@ msgstr "" #: src/stored/bls.c:479 src/stored/bextract.c:612 src/stored/bcopy.c:375 -#: src/stored/bscan.c:1370 src/stored/btape.c:3044 +#: src/stored/bscan.c:1370 src/stored/btape.c:3048 #, c-format msgid "Mount Volume \"%s\" on device %s and press return when ready: " msgstr "" @@ -6558,7 +6601,7 @@ msgid "Invalid connection from %s. Len=%d\n" msgstr "" -#: src/stored/dircmd.c:208 src/filed/authenticate.c:206 +#: src/stored/dircmd.c:208 src/filed/authenticate.c:208 msgid "Unable to authenticate Director\n" msgstr "" @@ -6769,7 +6812,7 @@ msgid "3927 Error scanning release command: %s\n" msgstr "" -#: src/stored/dircmd.c:1028 src/filed/job.c:1490 +#: src/stored/dircmd.c:1028 src/filed/job.c:1531 #, c-format msgid "Could not create bootstrap file %s: ERR=%s\n" msgstr "" @@ -6785,7 +6828,7 @@ #: src/stored/dircmd.c:1120 #, c-format -msgid "3908 Error scanning autocharger drives/list/slots command: %s\n" +msgid "3908 Error scanning autochanger drives/list/slots command: %s\n" msgstr "" #: src/stored/dircmd.c:1163 @@ -7045,7 +7088,7 @@ #: src/stored/ansi_label.c:333 #, c-format -msgid "Could not write ANSI VOL1 label. ERR=%s\n" +msgid "Could not write ANSI VOL1 label. Wanted size=%d got=%d ERR=%s\n" msgstr "" #: src/stored/ansi_label.c:371 src/stored/ansi_label.c:400 @@ -7084,7 +7127,7 @@ msgid "NULL Volume name. This shouldn't happen!!!\n" msgstr "" -#: src/stored/append.c:111 src/stored/btape.c:2232 +#: src/stored/append.c:111 src/stored/btape.c:2233 #, c-format msgid "Write session label failed. ERR=%s\n" msgstr "" @@ -7120,18 +7163,18 @@ "Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n" msgstr "" -#: src/stored/append.c:289 src/stored/btape.c:2351 +#: src/stored/append.c:289 src/stored/btape.c:2352 #, c-format msgid "Error writing end session label. ERR=%s\n" msgstr "" -#: src/stored/append.c:305 src/stored/mac.c:127 src/stored/mac.c:246 -#: src/stored/spool.c:301 +#: src/stored/append.c:305 src/stored/mac.c:126 src/stored/mac.c:247 +#: src/stored/spool.c:300 #, c-format msgid "Fatal append error on device %s: ERR=%s\n" msgstr "" -#: src/stored/append.c:307 src/stored/mac.c:129 +#: src/stored/append.c:307 src/stored/mac.c:128 msgid "Set ok=FALSE after write_block_to_device.\n" msgstr "" @@ -7489,7 +7532,7 @@ msgid " Drive %d status unknown.\n" msgstr "" -#: src/stored/status.c:331 src/stored/btape.c:687 +#: src/stored/status.c:331 src/stored/btape.c:688 #, c-format msgid "Configured device capabilities:\n" msgstr "" @@ -7505,7 +7548,7 @@ "\n" msgstr "" -#: src/stored/status.c:371 src/stored/btape.c:719 +#: src/stored/status.c:371 src/stored/btape.c:720 #, c-format msgid "Device parameters:\n" msgstr "" @@ -7697,7 +7740,7 @@ msgstr "" #: src/stored/bextract.c:196 src/stored/bcopy.c:163 src/stored/bscan.c:248 -#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:184 +#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:185 #: src/tools/cats_test.c:321 msgid "Wrong number of arguments: \n" msgstr "" @@ -7728,7 +7771,7 @@ msgstr "" #: src/stored/bextract.c:284 src/stored/bextract.c:290 -#: src/filed/restore.c:1242 +#: src/filed/restore.c:1474 #, c-format msgid "Write error on %s: %s\n" msgstr "" @@ -7737,7 +7780,7 @@ msgid "Logic error output file should be open but is not.\n" msgstr "" -#: src/stored/bextract.c:335 src/filed/restore.c:363 +#: src/stored/bextract.c:335 src/filed/restore.c:566 #, c-format msgid "%s stream not supported on this Client.\n" msgstr "" @@ -7753,7 +7796,7 @@ msgstr "" #: src/stored/bextract.c:429 src/stored/bextract.c:494 -#: src/filed/restore.c:1099 +#: src/filed/restore.c:1329 #, c-format msgid "Seek to %s error on %s: ERR=%s\n" msgstr "" @@ -7763,16 +7806,16 @@ msgid "Uncompression error. ERR=%d\n" msgstr "" -#: src/stored/bextract.c:462 src/filed/restore.c:1212 +#: src/stored/bextract.c:462 src/filed/restore.c:1444 msgid "GZIP data stream found, but GZIP not configured!\n" msgstr "" -#: src/stored/bextract.c:517 src/filed/restore.c:1138 +#: src/stored/bextract.c:517 src/filed/restore.c:1370 #, c-format msgid "Compressed header version error. version=0x%x\n" msgstr "" -#: src/stored/bextract.c:522 src/filed/restore.c:1143 +#: src/stored/bextract.c:522 src/filed/restore.c:1375 #, c-format msgid "Compressed header size error. comp_len=%d, msglen=%d\n" msgstr "" @@ -7782,7 +7825,7 @@ msgid "LZO uncompression error. ERR=%d\n" msgstr "" -#: src/stored/bextract.c:556 src/filed/restore.c:1176 +#: src/stored/bextract.c:556 src/filed/restore.c:1408 #, c-format msgid "Compression algorithm 0x%x found, but not supported!\n" msgstr "" @@ -7791,7 +7834,7 @@ msgid "Got Program Name or Data Stream. Ignored.\n" msgstr "" -#: src/stored/bextract.c:592 src/filed/restore.c:807 +#: src/stored/bextract.c:592 src/filed/restore.c:325 src/filed/restore.c:1027 #, c-format msgid "Unknown stream=%d ignored. This shouldn't happen!\n" msgstr "" @@ -7816,7 +7859,7 @@ "\n" msgstr "" -#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:472 +#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:473 #, c-format msgid "dev open failed: %s\n" msgstr "" @@ -7848,7 +7891,7 @@ msgstr "" #: src/stored/bcopy.c:282 src/stored/bcopy.c:290 src/stored/bcopy.c:318 -#: src/stored/btape.c:2750 +#: src/stored/btape.c:2754 #, c-format msgid "Cannot fixup device error. %s\n" msgstr "" @@ -7986,85 +8029,89 @@ msgid "Unexpected Tape is Off-line\n" msgstr "" -#: src/stored/acquire.c:71 +#: src/stored/acquire.c:70 #, c-format msgid "Acquire read: num_writers=%d not zero. Job %d canceled.\n" msgstr "" -#: src/stored/acquire.c:80 +#: src/stored/acquire.c:79 #, c-format msgid "No volumes specified for reading. Job %s canceled.\n" msgstr "" -#: src/stored/acquire.c:89 +#: src/stored/acquire.c:88 #, c-format msgid "Logic error: no next volume to read. Numvol=%d Curvol=%d\n" msgstr "" -#: src/stored/acquire.c:115 +#: src/stored/acquire.c:95 src/stored/acquire.c:163 src/stored/acquire.c:431 +msgid "generate_plugin_event(bsdEventDeviceOpen) Failed\n" +msgstr "" + +#: src/stored/acquire.c:119 #, c-format msgid "" "Changing read device. Want Media Type=\"%s\" have=\"%s\"\n" " device=%s\n" msgstr "" -#: src/stored/acquire.c:152 +#: src/stored/acquire.c:159 #, c-format msgid "Media Type change. New read device %s chosen.\n" msgstr "" -#: src/stored/acquire.c:165 +#: src/stored/acquire.c:175 #, c-format msgid "No suitable device found to read Volume \"%s\"\n" msgstr "" -#: src/stored/acquire.c:205 +#: src/stored/acquire.c:214 #, c-format msgid "Job %s canceled.\n" msgstr "" -#: src/stored/acquire.c:223 +#: src/stored/acquire.c:232 #, c-format msgid "Read open device %s Volume \"%s\" failed: ERR=%s\n" msgstr "" -#: src/stored/acquire.c:313 +#: src/stored/acquire.c:322 #, c-format msgid "Too many errors trying to mount device %s for reading.\n" msgstr "" -#: src/stored/acquire.c:322 +#: src/stored/acquire.c:330 #, c-format msgid "Ready to read from volume \"%s\" on device %s.\n" msgstr "" -#: src/stored/acquire.c:370 +#: src/stored/acquire.c:383 #, c-format msgid "Want to append, but device %s is busy reading.\n" msgstr "" -#: src/stored/acquire.c:403 +#: src/stored/acquire.c:416 #, c-format msgid "Could not ready device %s for append.\n" msgstr "" -#: src/stored/acquire.c:488 src/stored/spool.c:322 src/stored/block.c:368 +#: src/stored/acquire.c:508 src/stored/spool.c:321 src/stored/block.c:368 #: src/stored/block.c:738 src/stored/block.c:812 #, c-format msgid "Could not create JobMedia record for Volume=\"%s\" Job=%s\n" msgstr "" -#: src/stored/acquire.c:538 +#: src/stored/acquire.c:559 #, c-format msgid "Alert: %s" msgstr "" -#: src/stored/acquire.c:546 +#: src/stored/acquire.c:567 #, c-format msgid "3997 Bad alert command: %s: ERR=%s.\n" msgstr "" -#: src/stored/acquire.c:616 src/stored/dev.c:263 src/stored/dev.c:281 +#: src/stored/acquire.c:637 src/stored/dev.c:263 src/stored/dev.c:281 #: src/stored/dev.c:287 src/stored/dev.c:298 src/lib/openssl.c:122 #: src/lib/openssl.c:181 #, c-format @@ -8170,17 +8217,17 @@ msgid "No Volume names found for restore.\n" msgstr "" -#: src/stored/read.c:121 +#: src/stored/read.c:120 #, c-format msgid ">filed: Error Hdr=%s\n" msgstr "" -#: src/stored/read.c:122 src/stored/read.c:137 +#: src/stored/read.c:121 src/stored/read.c:136 #, c-format msgid "Error sending to File daemon. ERR=%s\n" msgstr "" -#: src/stored/read.c:136 +#: src/stored/read.c:135 #, c-format msgid "Error sending to FD. ERR=%s\n" msgstr "" @@ -8307,12 +8354,12 @@ msgid "3996 Open bpipe failed.\n" msgstr "" -#: src/stored/autochanger.c:621 src/console/console.c:1454 +#: src/stored/autochanger.c:621 src/console/console.c:1458 #, c-format msgid "Autochanger error: ERR=%s\n" msgstr "" -#: src/stored/stored.c:100 +#: src/stored/stored.c:87 #, c-format msgid "" "\n" @@ -8334,66 +8381,66 @@ "\n" msgstr "" -#: src/stored/stored.c:152 src/stored/btape.c:178 +#: src/stored/stored.c:136 src/stored/btape.c:178 #, c-format msgid "Tape block size (%d) not multiple of system size (%d)\n" msgstr "" -#: src/stored/stored.c:156 src/stored/btape.c:182 +#: src/stored/stored.c:140 src/stored/btape.c:182 #, c-format msgid "Tape block size (%d) is not a power of 2\n" msgstr "" -#: src/stored/stored.c:284 +#: src/stored/stored.c:268 msgid "Volume Session Time is ZERO!\n" msgstr "" -#: src/stored/stored.c:305 +#: src/stored/stored.c:277 #, c-format msgid "Unable to create thread. ERR=%s\n" msgstr "" -#: src/stored/stored.c:338 src/stored/bscan.c:262 +#: src/stored/stored.c:310 src/stored/bscan.c:262 #, c-format msgid "No Storage resource defined in %s. Cannot continue.\n" msgstr "" -#: src/stored/stored.c:344 +#: src/stored/stored.c:316 #, c-format msgid "Only one Storage resource permitted in %s\n" msgstr "" -#: src/stored/stored.c:349 +#: src/stored/stored.c:321 #, c-format msgid "No Director resource defined in %s. Cannot continue.\n" msgstr "" -#: src/stored/stored.c:354 +#: src/stored/stored.c:326 #, c-format msgid "No Device resource defined in %s. Cannot continue.\n" msgstr "" -#: src/stored/stored.c:362 +#: src/stored/stored.c:334 #, c-format msgid "No Messages resource defined in %s. Cannot continue.\n" msgstr "" -#: src/stored/stored.c:369 src/stored/bscan.c:270 +#: src/stored/stored.c:341 src/stored/bscan.c:270 #, c-format msgid "No Working Directory defined in %s. Cannot continue.\n" msgstr "" -#: src/stored/stored.c:391 +#: src/stored/stored.c:363 #, c-format msgid "\"TLS Certificate\" file not defined for Storage \"%s\" in %s.\n" msgstr "" -#: src/stored/stored.c:397 +#: src/stored/stored.c:369 #, c-format msgid "\"TLS Key\" file not defined for Storage \"%s\" in %s.\n" msgstr "" -#: src/stored/stored.c:403 +#: src/stored/stored.c:375 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " @@ -8401,17 +8448,17 @@ "using \"TLS Verify Peer\".\n" msgstr "" -#: src/stored/stored.c:539 +#: src/stored/stored.c:511 #, c-format msgid "Could not initialize %s\n" msgstr "" -#: src/stored/stored.c:552 +#: src/stored/stored.c:525 #, c-format msgid "Could not open device %s\n" msgstr "" -#: src/stored/stored.c:566 +#: src/stored/stored.c:539 #, c-format msgid "Could not mount device %s\n" msgstr "" @@ -8451,41 +8498,41 @@ msgid "Unable to open archive %s: ERR=%s\n" msgstr "" -#: src/stored/fd_cmds.c:165 +#: src/stored/fd_cmds.c:166 #, c-format msgid "Command error with FD, hanging up. %s\n" msgstr "" -#: src/stored/fd_cmds.c:168 +#: src/stored/fd_cmds.c:169 msgid "Command error with FD, hanging up.\n" msgstr "" -#: src/stored/fd_cmds.c:179 +#: src/stored/fd_cmds.c:180 #, c-format msgid "FD command not found: %s\n" msgstr "" -#: src/stored/fd_cmds.c:205 +#: src/stored/fd_cmds.c:206 msgid "Append data error.\n" msgstr "" -#: src/stored/fd_cmds.c:210 +#: src/stored/fd_cmds.c:211 msgid "Attempt to append on non-open session.\n" msgstr "" -#: src/stored/fd_cmds.c:222 src/stored/fd_cmds.c:265 +#: src/stored/fd_cmds.c:223 src/stored/fd_cmds.c:266 msgid "Attempt to close non-open session.\n" msgstr "" -#: src/stored/fd_cmds.c:240 +#: src/stored/fd_cmds.c:241 msgid "Attempt to open already open session.\n" msgstr "" -#: src/stored/fd_cmds.c:294 +#: src/stored/fd_cmds.c:295 msgid "Attempt to read on non-open session.\n" msgstr "" -#: src/stored/fd_cmds.c:312 src/stored/fd_cmds.c:321 +#: src/stored/fd_cmds.c:313 src/stored/fd_cmds.c:322 msgid "Attempt to open read on non-open session.\n" msgstr "" @@ -8610,7 +8657,7 @@ "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n" msgstr "" -#: src/stored/mount.c:864 src/stored/btape.c:3116 +#: src/stored/mount.c:864 src/stored/btape.c:3120 #, c-format msgid "Cannot open Dev=%s, Vol=%s\n" msgstr "" @@ -8691,103 +8738,103 @@ msgid "Writing spooled data to Volume. Despooling %s bytes ...\n" msgstr "" -#: src/stored/spool.c:340 +#: src/stored/spool.c:339 #, c-format msgid "" "Despooling elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n" msgstr "" -#: src/stored/spool.c:349 src/stored/spool.c:548 src/stored/spool.c:594 +#: src/stored/spool.c:348 src/stored/spool.c:546 src/stored/spool.c:592 #, c-format msgid "Ftruncate spool file failed: ERR=%s\n" msgstr "" -#: src/stored/spool.c:409 +#: src/stored/spool.c:407 #, c-format msgid "Spool header read error. ERR=%s\n" msgstr "" -#: src/stored/spool.c:412 +#: src/stored/spool.c:410 #, c-format msgid "Spool read error. Wanted %u bytes, got %d\n" msgstr "" -#: src/stored/spool.c:413 +#: src/stored/spool.c:411 #, c-format msgid "Spool header read error. Wanted %u bytes, got %d\n" msgstr "" -#: src/stored/spool.c:420 src/stored/spool.c:421 +#: src/stored/spool.c:418 src/stored/spool.c:419 #, c-format msgid "Spool block too big. Max %u bytes, got %u\n" msgstr "" -#: src/stored/spool.c:427 src/stored/spool.c:428 +#: src/stored/spool.c:425 src/stored/spool.c:426 #, c-format msgid "Spool data read error. Wanted %u bytes, got %d\n" msgstr "" -#: src/stored/spool.c:489 +#: src/stored/spool.c:487 msgid "User specified spool size reached.\n" msgstr "" -#: src/stored/spool.c:491 +#: src/stored/spool.c:489 msgid "Bad return from despool in write_block.\n" msgstr "" -#: src/stored/spool.c:499 +#: src/stored/spool.c:497 msgid "Spooling data again ...\n" msgstr "" -#: src/stored/spool.c:531 +#: src/stored/spool.c:529 #, c-format msgid "Error writing header to spool file. ERR=%s\n" msgstr "" -#: src/stored/spool.c:536 +#: src/stored/spool.c:534 #, c-format msgid "" "Error writing header to spool file. Disk probably full. Attempting recovery. " "Wanted to write=%d got=%d\n" msgstr "" -#: src/stored/spool.c:554 src/stored/spool.c:600 +#: src/stored/spool.c:552 src/stored/spool.c:598 msgid "Fatal despooling error." msgstr "" -#: src/stored/spool.c:562 +#: src/stored/spool.c:560 msgid "Retrying after header spooling error failed.\n" msgstr "" -#: src/stored/spool.c:578 +#: src/stored/spool.c:576 #, c-format msgid "Error writing data to spool file. ERR=%s\n" msgstr "" -#: src/stored/spool.c:611 +#: src/stored/spool.c:609 msgid "Retrying after data spooling error failed.\n" msgstr "" -#: src/stored/spool.c:681 +#: src/stored/spool.c:679 msgid "Network error on BlastAttributes.\n" msgstr "" -#: src/stored/spool.c:705 src/stored/spool.c:729 +#: src/stored/spool.c:703 src/stored/spool.c:727 #, c-format msgid "Fseek on attributes file failed: ERR=%s\n" msgstr "" -#: src/stored/spool.c:717 +#: src/stored/spool.c:715 #, c-format msgid "Truncate on attributes file failed: ERR=%s\n" msgstr "" -#: src/stored/spool.c:742 +#: src/stored/spool.c:739 #, c-format msgid "Sending spooled attrs to the Director. Despooling %s bytes ...\n" msgstr "" -#: src/stored/spool.c:768 +#: src/stored/spool.c:765 #, c-format msgid "fopen attr spool file %s failed: ERR=%s\n" msgstr "" @@ -8827,8 +8874,8 @@ msgid "Warning: unknown resource type %d\n" msgstr "" -#: src/stored/stored_conf.c:552 src/stored/stored_conf.c:642 -#: src/stored/stored_conf.c:677 src/wx-console/console_conf.c:164 +#: src/stored/stored_conf.c:555 src/stored/stored_conf.c:645 +#: src/stored/stored_conf.c:680 src/wx-console/console_conf.c:164 #: src/wx-console/console_conf.c:239 src/wx-console/console_conf.c:284 #: src/wx-console/console_conf.c:311 src/console/console_conf.c:157 #: src/console/console_conf.c:233 src/console/console_conf.c:278 @@ -8840,27 +8887,27 @@ msgid "Unknown resource type %d\n" msgstr "" -#: src/stored/stored_conf.c:581 +#: src/stored/stored_conf.c:584 #, c-format msgid "\"%s\" item is required in \"%s\" resource, but not found.\n" msgstr "" -#: src/stored/stored_conf.c:587 +#: src/stored/stored_conf.c:590 #, c-format msgid "Too many items in \"%s\" resource\n" msgstr "" -#: src/stored/stored_conf.c:621 +#: src/stored/stored_conf.c:624 #, c-format msgid "Cannot find AutoChanger resource %s\n" msgstr "" -#: src/stored/stored_conf.c:637 +#: src/stored/stored_conf.c:640 #, c-format msgid "Unable to init lock: ERR=%s\n" msgstr "" -#: src/stored/stored_conf.c:695 +#: src/stored/stored_conf.c:698 #, c-format msgid "" "Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n" @@ -9012,7 +9059,7 @@ msgid "ioctl MTFSF error on %s. ERR=%s.\n" msgstr "" -#: src/stored/dev.c:1194 src/stored/btape.c:1974 +#: src/stored/dev.c:1194 src/stored/btape.c:1975 #, c-format msgid "read error on %s. ERR=%s.\n" msgstr "" @@ -9161,12 +9208,12 @@ msgstr "" #: src/stored/bscan.c:302 src/tools/bvfs_test.c:215 src/tools/bbatch.c:201 -#: src/tools/bbatch.c:250 src/tools/ing_test.c:190 +#: src/tools/bbatch.c:250 src/tools/ing_test.c:191 msgid "Could not init Bacula database\n" msgstr "" #: src/stored/bscan.c:309 src/tools/bvfs_test.c:224 src/tools/bbatch.c:257 -#: src/tools/ing_test.c:199 +#: src/tools/ing_test.c:200 #, c-format msgid "Using Database: %s, User: %s\n" msgstr "" @@ -9467,21 +9514,21 @@ msgid "Updated MD5/SHA1 record\n" msgstr "" -#: src/stored/job.c:230 +#: src/stored/job.c:231 #, c-format msgid "FD connect failed: Job name not found: %s\n" msgstr "" -#: src/stored/job.c:240 +#: src/stored/job.c:241 #, c-format msgid "Hey!!!! JobId %u Job %s already authenticated.\n" msgstr "" -#: src/stored/job.c:257 +#: src/stored/job.c:258 msgid "Unable to authenticate File daemon\n" msgstr "" -#: src/stored/job.c:386 +#: src/stored/job.c:387 msgid "In free_jcr(), but still attached to device!!!!\n" msgstr "" @@ -9526,140 +9573,140 @@ msgid "btape only works with tape storage.\n" msgstr "" -#: src/stored/btape.c:382 +#: src/stored/btape.c:383 #, c-format msgid "Total Volume bytes=%sB. Total Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:408 +#: src/stored/btape.c:409 #, c-format msgid "Volume bytes=%sB. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:476 +#: src/stored/btape.c:477 #, c-format msgid "open device %s: OK\n" msgstr "" -#: src/stored/btape.c:499 +#: src/stored/btape.c:500 msgid "Enter Volume Name: " msgstr "" -#: src/stored/btape.c:506 +#: src/stored/btape.c:507 #, c-format msgid "Device open failed. ERR=%s\n" msgstr "" -#: src/stored/btape.c:511 +#: src/stored/btape.c:512 #, c-format msgid "Wrote Volume label for volume \"%s\".\n" msgstr "" -#: src/stored/btape.c:525 +#: src/stored/btape.c:526 msgid "Volume has no label.\n" msgstr "" -#: src/stored/btape.c:528 +#: src/stored/btape.c:529 msgid "Volume label read correctly.\n" msgstr "" -#: src/stored/btape.c:531 +#: src/stored/btape.c:532 #, c-format msgid "I/O error on device: ERR=%s" msgstr "" -#: src/stored/btape.c:534 +#: src/stored/btape.c:535 msgid "Volume name error\n" msgstr "" -#: src/stored/btape.c:537 +#: src/stored/btape.c:538 #, c-format msgid "Error creating label. ERR=%s" msgstr "" -#: src/stored/btape.c:540 +#: src/stored/btape.c:541 msgid "Volume version error.\n" msgstr "" -#: src/stored/btape.c:543 +#: src/stored/btape.c:544 msgid "Bad Volume label type.\n" msgstr "" -#: src/stored/btape.c:546 +#: src/stored/btape.c:547 msgid "Unknown error.\n" msgstr "" -#: src/stored/btape.c:564 +#: src/stored/btape.c:565 #, c-format msgid "Bad status from load. ERR=%s\n" msgstr "" -#: src/stored/btape.c:566 +#: src/stored/btape.c:567 #, c-format msgid "Loaded %s\n" msgstr "" -#: src/stored/btape.c:575 src/stored/btape.c:1136 src/stored/btape.c:1209 -#: src/stored/btape.c:1289 src/stored/btape.c:1560 +#: src/stored/btape.c:576 src/stored/btape.c:1137 src/stored/btape.c:1210 +#: src/stored/btape.c:1290 src/stored/btape.c:1561 #, c-format msgid "Bad status from rewind. ERR=%s\n" msgstr "" -#: src/stored/btape.c:578 src/stored/btape.c:1568 +#: src/stored/btape.c:579 src/stored/btape.c:1569 #, c-format msgid "Rewound %s\n" msgstr "" -#: src/stored/btape.c:604 src/stored/btape.c:1572 +#: src/stored/btape.c:605 src/stored/btape.c:1573 #, c-format msgid "Bad status from weof. ERR=%s\n" msgstr "" -#: src/stored/btape.c:608 +#: src/stored/btape.c:609 #, c-format msgid "Wrote 1 EOF to %s\n" msgstr "" -#: src/stored/btape.c:611 +#: src/stored/btape.c:612 #, c-format msgid "Wrote %d EOFs to %s\n" msgstr "" -#: src/stored/btape.c:629 +#: src/stored/btape.c:630 msgid "Moved to end of medium.\n" msgstr "" -#: src/stored/btape.c:656 +#: src/stored/btape.c:657 #, c-format msgid "Bad status from bsf. ERR=%s\n" msgstr "" -#: src/stored/btape.c:658 +#: src/stored/btape.c:659 #, c-format msgid "Backspaced %d file%s.\n" msgstr "" -#: src/stored/btape.c:675 +#: src/stored/btape.c:676 #, c-format msgid "Bad status from bsr. ERR=%s\n" msgstr "" -#: src/stored/btape.c:677 +#: src/stored/btape.c:678 #, c-format msgid "Backspaced %d record%s.\n" msgstr "" -#: src/stored/btape.c:705 +#: src/stored/btape.c:706 #, c-format msgid "Device status:\n" msgstr "" -#: src/stored/btape.c:724 +#: src/stored/btape.c:725 #, c-format msgid "Status:\n" msgstr "" -#: src/stored/btape.c:739 +#: src/stored/btape.c:740 msgid "" "Test writing larger and larger records.\n" "This is a torture test for records.\n" @@ -9668,24 +9715,24 @@ "plus the header exceeds the block size (by default about 64K)\n" msgstr "" -#: src/stored/btape.c:745 +#: src/stored/btape.c:746 msgid "Do you want to continue? (y/n): " msgstr "" -#: src/stored/btape.c:747 src/stored/btape.c:2197 +#: src/stored/btape.c:748 src/stored/btape.c:2198 msgid "Command aborted.\n" msgstr "" -#: src/stored/btape.c:763 +#: src/stored/btape.c:764 #, c-format msgid "Block %d i=%d\n" msgstr "" -#: src/stored/btape.c:789 +#: src/stored/btape.c:790 msgid "Skipping read backwards test because BSR turned off.\n" msgstr "" -#: src/stored/btape.c:793 +#: src/stored/btape.c:794 msgid "" "\n" "=== Write, backup, and re-read test ===\n" @@ -9699,73 +9746,73 @@ "\n" msgstr "" -#: src/stored/btape.c:806 src/stored/btape.c:817 src/stored/btape.c:828 -#: src/stored/btape.c:1146 src/stored/btape.c:1162 src/stored/btape.c:1904 -#: src/stored/btape.c:2817 +#: src/stored/btape.c:807 src/stored/btape.c:818 src/stored/btape.c:829 +#: src/stored/btape.c:1147 src/stored/btape.c:1163 src/stored/btape.c:1905 +#: src/stored/btape.c:2821 msgid "Error writing record to block.\n" msgstr "" -#: src/stored/btape.c:810 src/stored/btape.c:821 src/stored/btape.c:832 -#: src/stored/btape.c:1150 src/stored/btape.c:1166 src/stored/btape.c:1908 -#: src/stored/btape.c:2821 +#: src/stored/btape.c:811 src/stored/btape.c:822 src/stored/btape.c:833 +#: src/stored/btape.c:1151 src/stored/btape.c:1167 src/stored/btape.c:1909 +#: src/stored/btape.c:2825 msgid "Error writing block to device.\n" msgstr "" -#: src/stored/btape.c:813 +#: src/stored/btape.c:814 #, c-format msgid "Wrote first record of %d bytes.\n" msgstr "" -#: src/stored/btape.c:824 +#: src/stored/btape.c:825 #, c-format msgid "Wrote second record of %d bytes.\n" msgstr "" -#: src/stored/btape.c:835 +#: src/stored/btape.c:836 #, c-format msgid "Wrote third record of %d bytes.\n" msgstr "" -#: src/stored/btape.c:842 src/stored/btape.c:847 +#: src/stored/btape.c:843 src/stored/btape.c:848 #, c-format msgid "Backspace file failed! ERR=%s\n" msgstr "" -#: src/stored/btape.c:851 +#: src/stored/btape.c:852 msgid "Backspaced over EOF OK.\n" msgstr "" -#: src/stored/btape.c:853 +#: src/stored/btape.c:854 #, c-format msgid "Backspace record failed! ERR=%s\n" msgstr "" -#: src/stored/btape.c:856 +#: src/stored/btape.c:857 msgid "Backspace record OK.\n" msgstr "" -#: src/stored/btape.c:859 src/stored/btape.c:865 +#: src/stored/btape.c:860 src/stored/btape.c:866 #, c-format msgid "Read block failed! ERR=%s\n" msgstr "" -#: src/stored/btape.c:870 +#: src/stored/btape.c:871 msgid "Bad data in record. Test failed!\n" msgstr "" -#: src/stored/btape.c:874 +#: src/stored/btape.c:875 msgid "" "\n" "Block re-read correct. Test succeeded!\n" msgstr "" -#: src/stored/btape.c:875 +#: src/stored/btape.c:876 msgid "" "=== End Write, backup, and re-read test ===\n" "\n" msgstr "" -#: src/stored/btape.c:882 +#: src/stored/btape.c:883 msgid "" "This is not terribly serious since Bacula only uses\n" "this function to verify the last block written to the\n" @@ -9777,50 +9824,50 @@ "to your Storage daemon's Device resource definition.\n" msgstr "" -#: src/stored/btape.c:904 +#: src/stored/btape.c:905 #, c-format msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:925 src/stored/btape.c:2873 +#: src/stored/btape.c:926 src/stored/btape.c:2877 #, c-format msgid "Write failed at block %u. stat=%d ERR=%s\n" msgstr "" -#: src/stored/btape.c:959 +#: src/stored/btape.c:960 #, c-format msgid "Begin writing %i files of %sB with blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:968 +#: src/stored/btape.c:969 msgid "" "\n" "Error writing record to block.\n" msgstr "" -#: src/stored/btape.c:972 +#: src/stored/btape.c:973 msgid "" "\n" "Error writing block to device.\n" msgstr "" -#: src/stored/btape.c:1027 +#: src/stored/btape.c:1028 msgid "The file_size is too big, stop this test with Ctrl-c.\n" msgstr "" -#: src/stored/btape.c:1055 +#: src/stored/btape.c:1056 msgid "Test with zero data, should give the maximum throughput.\n" msgstr "" -#: src/stored/btape.c:1067 src/stored/btape.c:1093 +#: src/stored/btape.c:1068 src/stored/btape.c:1094 msgid "Test with random data, should give the minimum throughput.\n" msgstr "" -#: src/stored/btape.c:1082 +#: src/stored/btape.c:1083 msgid "Test with zero data and bacula block structure.\n" msgstr "" -#: src/stored/btape.c:1122 +#: src/stored/btape.c:1123 #, c-format msgid "" "\n" @@ -9834,66 +9881,66 @@ "\n" msgstr "" -#: src/stored/btape.c:1154 src/stored/btape.c:1170 +#: src/stored/btape.c:1155 src/stored/btape.c:1171 #, c-format msgid "Wrote %d blocks of %d bytes.\n" msgstr "" -#: src/stored/btape.c:1212 src/stored/btape.c:1292 +#: src/stored/btape.c:1213 src/stored/btape.c:1293 msgid "Rewind OK.\n" msgstr "" -#: src/stored/btape.c:1225 src/stored/btape.c:1344 +#: src/stored/btape.c:1226 src/stored/btape.c:1345 msgid "Got EOF on tape.\n" msgstr "" -#: src/stored/btape.c:1230 +#: src/stored/btape.c:1231 #, c-format msgid "Read block %d failed! ERR=%s\n" msgstr "" -#: src/stored/btape.c:1236 +#: src/stored/btape.c:1237 #, c-format msgid "Read record failed. Block %d! ERR=%s\n" msgstr "" -#: src/stored/btape.c:1242 src/stored/btape.c:1374 +#: src/stored/btape.c:1243 src/stored/btape.c:1375 #, c-format msgid "Bad data in record. Expected %d, got %d at byte %d. Test failed!\n" msgstr "" -#: src/stored/btape.c:1249 +#: src/stored/btape.c:1250 #, c-format msgid "%d blocks re-read correctly.\n" msgstr "" -#: src/stored/btape.c:1252 src/stored/btape.c:1381 +#: src/stored/btape.c:1253 src/stored/btape.c:1382 msgid "" "=== Test Succeeded. End Write, rewind, and re-read test ===\n" "\n" msgstr "" -#: src/stored/btape.c:1280 +#: src/stored/btape.c:1281 msgid "Block position test\n" msgstr "" -#: src/stored/btape.c:1335 +#: src/stored/btape.c:1336 #, c-format msgid "Reposition to file:block %d:%d\n" msgstr "" -#: src/stored/btape.c:1337 +#: src/stored/btape.c:1338 msgid "Reposition error.\n" msgstr "" -#: src/stored/btape.c:1350 +#: src/stored/btape.c:1351 #, c-format msgid "" "Read block %d failed! file=%d blk=%d. ERR=%s\n" "\n" msgstr "" -#: src/stored/btape.c:1352 +#: src/stored/btape.c:1353 msgid "" "This may be because the tape drive block size is not\n" " set to variable blocking as normally used by Bacula.\n" @@ -9907,17 +9954,17 @@ " in your Device resource.\n" msgstr "" -#: src/stored/btape.c:1368 +#: src/stored/btape.c:1369 #, c-format msgid "Read record failed! ERR=%s\n" msgstr "" -#: src/stored/btape.c:1379 +#: src/stored/btape.c:1380 #, c-format msgid "Block %d re-read correctly.\n" msgstr "" -#: src/stored/btape.c:1400 +#: src/stored/btape.c:1401 msgid "" "\n" "\n" @@ -9931,58 +9978,58 @@ "\n" msgstr "" -#: src/stored/btape.c:1424 +#: src/stored/btape.c:1425 msgid "Now moving to end of medium.\n" msgstr "" -#: src/stored/btape.c:1426 src/stored/btape.c:1655 +#: src/stored/btape.c:1427 src/stored/btape.c:1656 #, c-format msgid "We should be in file 3. I am at file %d. %s\n" msgstr "" -#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644 -#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686 +#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645 +#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687 msgid "This is correct!" msgstr "" -#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644 -#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686 +#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645 +#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687 msgid "This is NOT correct!!!!" msgstr "" -#: src/stored/btape.c:1433 +#: src/stored/btape.c:1434 msgid "" "\n" "Now the important part, I am going to attempt to append to the tape.\n" "\n" msgstr "" -#: src/stored/btape.c:1440 +#: src/stored/btape.c:1441 msgid "" "Done appending, there should be no I/O errors\n" "\n" msgstr "" -#: src/stored/btape.c:1441 +#: src/stored/btape.c:1442 msgid "Doing Bacula scan of blocks:\n" msgstr "" -#: src/stored/btape.c:1443 +#: src/stored/btape.c:1444 msgid "End scanning the tape.\n" msgstr "" -#: src/stored/btape.c:1444 src/stored/btape.c:1668 +#: src/stored/btape.c:1445 src/stored/btape.c:1669 #, c-format msgid "We should be in file 4. I am at file %d. %s\n" msgstr "" -#: src/stored/btape.c:1469 +#: src/stored/btape.c:1470 msgid "" "\n" "Autochanger enabled, but no name or no command device specified.\n" msgstr "" -#: src/stored/btape.c:1473 +#: src/stored/btape.c:1474 msgid "" "\n" "Ah, I see you have an autochanger configured.\n" @@ -9990,13 +10037,13 @@ " that I can write on in Slot 1.\n" msgstr "" -#: src/stored/btape.c:1476 +#: src/stored/btape.c:1477 msgid "" "\n" "Do you wish to continue with the Autochanger test? (y/n): " msgstr "" -#: src/stored/btape.c:1483 +#: src/stored/btape.c:1484 msgid "" "\n" "\n" @@ -10004,74 +10051,74 @@ "\n" msgstr "" -#: src/stored/btape.c:1492 +#: src/stored/btape.c:1493 msgid "3301 Issuing autochanger \"loaded\" command.\n" msgstr "" -#: src/stored/btape.c:1501 +#: src/stored/btape.c:1502 #, c-format msgid "3991 Bad autochanger command: %s\n" msgstr "" -#: src/stored/btape.c:1502 +#: src/stored/btape.c:1503 #, c-format msgid "3991 result=\"%s\": ERR=%s\n" msgstr "" -#: src/stored/btape.c:1506 +#: src/stored/btape.c:1507 #, c-format msgid "Slot %d loaded. I am going to unload it.\n" msgstr "" -#: src/stored/btape.c:1508 +#: src/stored/btape.c:1509 msgid "Nothing loaded in the drive. OK.\n" msgstr "" -#: src/stored/btape.c:1515 +#: src/stored/btape.c:1516 #, c-format msgid "3302 Issuing autochanger \"unload %d %d\" command.\n" msgstr "" -#: src/stored/btape.c:1520 +#: src/stored/btape.c:1521 #, c-format msgid "unload status=%s %d\n" msgstr "" -#: src/stored/btape.c:1520 +#: src/stored/btape.c:1521 msgid "Bad" msgstr "" -#: src/stored/btape.c:1523 +#: src/stored/btape.c:1524 #, c-format msgid "3992 Bad autochanger command: %s\n" msgstr "" -#: src/stored/btape.c:1524 +#: src/stored/btape.c:1525 #, c-format msgid "3992 result=\"%s\": ERR=%s\n" msgstr "" -#: src/stored/btape.c:1534 +#: src/stored/btape.c:1535 #, c-format msgid "3303 Issuing autochanger \"load %d %d\" command.\n" msgstr "" -#: src/stored/btape.c:1542 +#: src/stored/btape.c:1543 #, c-format msgid "3303 Autochanger \"load %d %d\" status is OK.\n" msgstr "" -#: src/stored/btape.c:1546 +#: src/stored/btape.c:1547 #, c-format msgid "3993 Bad autochanger command: %s\n" msgstr "" -#: src/stored/btape.c:1547 +#: src/stored/btape.c:1548 #, c-format msgid "3993 result=\"%s\": ERR=%s\n" msgstr "" -#: src/stored/btape.c:1562 +#: src/stored/btape.c:1563 msgid "" "\n" "The test failed, probably because you need to put\n" @@ -10079,12 +10126,12 @@ "Adding a 30 second sleep and trying again ...\n" msgstr "" -#: src/stored/btape.c:1575 +#: src/stored/btape.c:1576 #, c-format msgid "Wrote EOF to %s\n" msgstr "" -#: src/stored/btape.c:1579 +#: src/stored/btape.c:1580 #, c-format msgid "" "\n" @@ -10096,18 +10143,18 @@ "\n" msgstr "" -#: src/stored/btape.c:1584 +#: src/stored/btape.c:1585 msgid "" "\n" "The test autochanger worked!!\n" "\n" msgstr "" -#: src/stored/btape.c:1595 +#: src/stored/btape.c:1596 msgid "You must correct this error or the Autochanger will not work.\n" msgstr "" -#: src/stored/btape.c:1613 +#: src/stored/btape.c:1614 msgid "" "\n" "\n" @@ -10119,30 +10166,30 @@ "\n" msgstr "" -#: src/stored/btape.c:1638 +#: src/stored/btape.c:1639 msgid "Now forward spacing 1 file.\n" msgstr "" -#: src/stored/btape.c:1640 src/stored/btape.c:1652 src/stored/btape.c:1665 -#: src/stored/btape.c:1683 src/stored/btape.c:1859 +#: src/stored/btape.c:1641 src/stored/btape.c:1653 src/stored/btape.c:1666 +#: src/stored/btape.c:1684 src/stored/btape.c:1860 #, c-format msgid "Bad status from fsr. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1643 +#: src/stored/btape.c:1644 #, c-format msgid "We should be in file 1. I am at file %d. %s\n" msgstr "" -#: src/stored/btape.c:1650 +#: src/stored/btape.c:1651 msgid "Now forward spacing 2 files.\n" msgstr "" -#: src/stored/btape.c:1663 +#: src/stored/btape.c:1664 msgid "Now forward spacing 4 files.\n" msgstr "" -#: src/stored/btape.c:1675 +#: src/stored/btape.c:1676 msgid "" "The test worked this time. Please add:\n" "\n" @@ -10151,35 +10198,35 @@ "to your Device resource for this drive.\n" msgstr "" -#: src/stored/btape.c:1681 +#: src/stored/btape.c:1682 msgid "Now forward spacing 1 more file.\n" msgstr "" -#: src/stored/btape.c:1685 +#: src/stored/btape.c:1686 #, c-format msgid "We should be in file 5. I am at file %d. %s\n" msgstr "" -#: src/stored/btape.c:1690 +#: src/stored/btape.c:1691 msgid "" "\n" "=== End Forward space files test ===\n" "\n" msgstr "" -#: src/stored/btape.c:1694 +#: src/stored/btape.c:1695 msgid "" "\n" "The forward space file test failed.\n" msgstr "" -#: src/stored/btape.c:1696 +#: src/stored/btape.c:1697 msgid "" "You have Fast Forward Space File enabled.\n" "I am turning it off then retrying the test.\n" msgstr "" -#: src/stored/btape.c:1702 +#: src/stored/btape.c:1703 msgid "" "You must correct this error or Bacula will not work.\n" "Some systems, e.g. OpenBSD, require you to set\n" @@ -10187,7 +10234,7 @@ "in your device resource. Use with caution.\n" msgstr "" -#: src/stored/btape.c:1736 +#: src/stored/btape.c:1737 msgid "" "\n" "Append test failed. Attempting again.\n" @@ -10197,7 +10244,7 @@ "\n" msgstr "" -#: src/stored/btape.c:1744 +#: src/stored/btape.c:1745 msgid "" "\n" "\n" @@ -10209,14 +10256,14 @@ "to your Device resource in the Storage conf file.\n" msgstr "" -#: src/stored/btape.c:1751 +#: src/stored/btape.c:1752 msgid "" "\n" "\n" "That appears *NOT* to have corrected the problem.\n" msgstr "" -#: src/stored/btape.c:1756 +#: src/stored/btape.c:1757 msgid "" "\n" "\n" @@ -10224,7 +10271,7 @@ "Setting \"BSF at EOM = yes\" and retrying append test.\n" msgstr "" -#: src/stored/btape.c:1761 +#: src/stored/btape.c:1762 msgid "" "\n" "\n" @@ -10237,7 +10284,7 @@ "to your Device resource in the Storage conf file.\n" msgstr "" -#: src/stored/btape.c:1772 +#: src/stored/btape.c:1773 msgid "" "\n" "Append test failed.\n" @@ -10264,7 +10311,7 @@ "in your device resource. Use with caution.\n" msgstr "" -#: src/stored/btape.c:1794 +#: src/stored/btape.c:1795 msgid "" "\n" "The above Bacula scan should have output identical to what follows.\n" @@ -10288,111 +10335,111 @@ "\n" msgstr "" -#: src/stored/btape.c:1837 +#: src/stored/btape.c:1838 #, c-format msgid "Bad status from fsf. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1841 +#: src/stored/btape.c:1842 msgid "Forward spaced 1 file.\n" msgstr "" -#: src/stored/btape.c:1844 +#: src/stored/btape.c:1845 #, c-format msgid "Forward spaced %d files.\n" msgstr "" -#: src/stored/btape.c:1863 +#: src/stored/btape.c:1864 msgid "Forward spaced 1 record.\n" msgstr "" -#: src/stored/btape.c:1866 +#: src/stored/btape.c:1867 #, c-format msgid "Forward spaced %d records.\n" msgstr "" -#: src/stored/btape.c:1911 +#: src/stored/btape.c:1912 #, c-format msgid "Wrote one record of %d bytes.\n" msgstr "" -#: src/stored/btape.c:1913 +#: src/stored/btape.c:1914 msgid "Wrote block to device.\n" msgstr "" -#: src/stored/btape.c:1927 +#: src/stored/btape.c:1928 msgid "Enter length to read: " msgstr "" -#: src/stored/btape.c:1932 +#: src/stored/btape.c:1933 msgid "Bad length entered, using default of 1024 bytes.\n" msgstr "" -#: src/stored/btape.c:1941 +#: src/stored/btape.c:1942 #, c-format msgid "Read of %d bytes gives stat=%d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1964 src/stored/btape.c:2013 +#: src/stored/btape.c:1965 src/stored/btape.c:2014 #, c-format msgid "End of tape\n" msgstr "" -#: src/stored/btape.c:1969 +#: src/stored/btape.c:1970 #, c-format msgid "Starting scan at file %u\n" msgstr "" -#: src/stored/btape.c:1976 +#: src/stored/btape.c:1977 #, c-format msgid "Bad status from read %d. ERR=%s\n" msgstr "" -#: src/stored/btape.c:1979 src/stored/btape.c:1993 src/stored/btape.c:2057 -#: src/stored/btape.c:2069 src/stored/btape.c:2082 src/stored/btape.c:2098 +#: src/stored/btape.c:1980 src/stored/btape.c:1994 src/stored/btape.c:2058 +#: src/stored/btape.c:2070 src/stored/btape.c:2083 src/stored/btape.c:2099 #, c-format msgid "1 block of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:1982 src/stored/btape.c:1996 src/stored/btape.c:2060 -#: src/stored/btape.c:2072 src/stored/btape.c:2085 src/stored/btape.c:2101 +#: src/stored/btape.c:1983 src/stored/btape.c:1997 src/stored/btape.c:2061 +#: src/stored/btape.c:2073 src/stored/btape.c:2086 src/stored/btape.c:2102 #, c-format msgid "%d blocks of %d bytes in file %d\n" msgstr "" -#: src/stored/btape.c:2004 src/stored/btape.c:2076 +#: src/stored/btape.c:2005 src/stored/btape.c:2077 #, c-format msgid "End of File mark.\n" msgstr "" -#: src/stored/btape.c:2025 src/stored/btape.c:2129 +#: src/stored/btape.c:2026 src/stored/btape.c:2130 #, c-format msgid "Total files=%d, blocks=%d, bytes = %s\n" msgstr "" -#: src/stored/btape.c:2089 +#: src/stored/btape.c:2090 #, c-format msgid "Short block read.\n" msgstr "" -#: src/stored/btape.c:2092 +#: src/stored/btape.c:2093 #, c-format msgid "Error reading block. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2116 +#: src/stored/btape.c:2117 #, c-format msgid "" "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s " "rlen=%d\n" msgstr "" -#: src/stored/btape.c:2138 +#: src/stored/btape.c:2139 #, c-format msgid "Device status: %u. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2170 +#: src/stored/btape.c:2171 #, c-format msgid "" "\n" @@ -10418,79 +10465,79 @@ "\n" msgstr "" -#: src/stored/btape.c:2188 +#: src/stored/btape.c:2189 msgid "" "Do you want to run the simplified test (s) with one tape\n" "or the complete multiple tape (m) test: (s/m) " msgstr "" -#: src/stored/btape.c:2191 +#: src/stored/btape.c:2192 msgid "Simple test (single tape) selected.\n" msgstr "" -#: src/stored/btape.c:2194 +#: src/stored/btape.c:2195 msgid "Multiple tape test selected.\n" msgstr "" -#: src/stored/btape.c:2236 +#: src/stored/btape.c:2237 msgid "Wrote Start of Session label.\n" msgstr "" -#: src/stored/btape.c:2255 +#: src/stored/btape.c:2256 #, c-format msgid "%s Begin writing Bacula records to tape ...\n" msgstr "" -#: src/stored/btape.c:2257 +#: src/stored/btape.c:2258 #, c-format msgid "%s Begin writing Bacula records to first tape ...\n" msgstr "" -#: src/stored/btape.c:2283 +#: src/stored/btape.c:2284 msgid "Flush block failed.\n" msgstr "" -#: src/stored/btape.c:2297 +#: src/stored/btape.c:2298 #, c-format msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/btape.c:2308 +#: src/stored/btape.c:2309 #, c-format msgid "%s Flush block, write EOF\n" msgstr "" -#: src/stored/btape.c:2317 +#: src/stored/btape.c:2318 msgid "Wrote 1000 blocks on second tape. Done.\n" msgstr "" -#: src/stored/btape.c:2322 +#: src/stored/btape.c:2323 msgid "Not OK\n" msgstr "" -#: src/stored/btape.c:2346 +#: src/stored/btape.c:2347 msgid "Job canceled.\n" msgstr "" -#: src/stored/btape.c:2357 +#: src/stored/btape.c:2358 msgid "Set ok=false after write_block_to_device.\n" msgstr "" -#: src/stored/btape.c:2361 +#: src/stored/btape.c:2362 msgid "Wrote End of Session label.\n" msgstr "" -#: src/stored/btape.c:2385 +#: src/stored/btape.c:2386 #, c-format msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n" msgstr "" -#: src/stored/btape.c:2389 +#: src/stored/btape.c:2390 #, c-format msgid "Could not create state file: %s ERR=%s\n" msgstr "" -#: src/stored/btape.c:2400 +#: src/stored/btape.c:2401 #, c-format msgid "" "\n" @@ -10498,7 +10545,7 @@ "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n" msgstr "" -#: src/stored/btape.c:2403 +#: src/stored/btape.c:2404 #, c-format msgid "" "\n" @@ -10506,23 +10553,23 @@ "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n" msgstr "" -#: src/stored/btape.c:2409 +#: src/stored/btape.c:2410 msgid "do_unfill failed.\n" msgstr "" -#: src/stored/btape.c:2414 +#: src/stored/btape.c:2415 #, c-format msgid "%s: Error during test.\n" msgstr "" -#: src/stored/btape.c:2449 +#: src/stored/btape.c:2450 msgid "" "\n" "The state file level has changed. You must redo\n" "the fill command.\n" msgstr "" -#: src/stored/btape.c:2456 +#: src/stored/btape.c:2457 #, c-format msgid "" "\n" @@ -10530,95 +10577,95 @@ "You must redo the fill command.\n" msgstr "" -#: src/stored/btape.c:2522 +#: src/stored/btape.c:2523 msgid "Mount first tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2538 +#: src/stored/btape.c:2539 msgid "Rewinding.\n" msgstr "" -#: src/stored/btape.c:2543 +#: src/stored/btape.c:2544 #, c-format msgid "Reading the first 10000 records from %u:%u.\n" msgstr "" -#: src/stored/btape.c:2547 src/stored/btape.c:2615 +#: src/stored/btape.c:2548 src/stored/btape.c:2616 #, c-format msgid "Reposition from %u:%u to %u:%u\n" msgstr "" -#: src/stored/btape.c:2550 src/stored/btape.c:2602 src/stored/btape.c:2618 +#: src/stored/btape.c:2551 src/stored/btape.c:2603 src/stored/btape.c:2619 #, c-format msgid "Reposition error. ERR=%s\n" msgstr "" -#: src/stored/btape.c:2553 +#: src/stored/btape.c:2554 #, c-format msgid "Reading block %u.\n" msgstr "" -#: src/stored/btape.c:2555 src/stored/btape.c:2607 src/stored/btape.c:2623 +#: src/stored/btape.c:2556 src/stored/btape.c:2608 src/stored/btape.c:2624 #, c-format msgid "Error reading block: ERR=%s\n" msgstr "" -#: src/stored/btape.c:2560 +#: src/stored/btape.c:2561 msgid "" "\n" "The last block on the tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2563 +#: src/stored/btape.c:2564 msgid "" "\n" "The last block of the first tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2587 +#: src/stored/btape.c:2588 msgid "Mount second tape. Press enter when ready: " msgstr "" -#: src/stored/btape.c:2600 +#: src/stored/btape.c:2601 #, c-format msgid "Reposition from %u:%u to 0:1\n" msgstr "" -#: src/stored/btape.c:2605 src/stored/btape.c:2621 +#: src/stored/btape.c:2606 src/stored/btape.c:2622 #, c-format msgid "Reading block %d.\n" msgstr "" -#: src/stored/btape.c:2611 +#: src/stored/btape.c:2612 msgid "" "\n" "The first block on the second tape matches.\n" "\n" msgstr "" -#: src/stored/btape.c:2627 +#: src/stored/btape.c:2628 msgid "" "\n" "The last block on the second tape matches. Test succeeded.\n" "\n" msgstr "" -#: src/stored/btape.c:2644 +#: src/stored/btape.c:2645 #, c-format msgid "10000 records read now at %d:%d\n" msgstr "" -#: src/stored/btape.c:2667 src/stored/btape.c:2678 src/stored/btape.c:2723 +#: src/stored/btape.c:2671 src/stored/btape.c:2682 src/stored/btape.c:2727 msgid "Last block written" msgstr "" -#: src/stored/btape.c:2669 src/stored/btape.c:2679 +#: src/stored/btape.c:2673 src/stored/btape.c:2683 msgid "Block read back" msgstr "" -#: src/stored/btape.c:2670 +#: src/stored/btape.c:2674 #, c-format msgid "" "\n" @@ -10626,7 +10673,7 @@ "The blocks differ at byte %u\n" msgstr "" -#: src/stored/btape.c:2671 +#: src/stored/btape.c:2675 msgid "" "\n" "\n" @@ -10636,172 +10683,172 @@ "to write multi-tape Volumes.!!!!\n" msgstr "" -#: src/stored/btape.c:2707 +#: src/stored/btape.c:2711 #, c-format msgid "Last block at: %u:%u this_dev_block_num=%d\n" msgstr "" -#: src/stored/btape.c:2721 +#: src/stored/btape.c:2725 #, c-format msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n" msgstr "" -#: src/stored/btape.c:2725 +#: src/stored/btape.c:2729 msgid "Block not written" msgstr "" -#: src/stored/btape.c:2740 +#: src/stored/btape.c:2744 #, c-format msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n" msgstr "" -#: src/stored/btape.c:2791 +#: src/stored/btape.c:2795 msgid "Test writing blocks of 64512 bytes to tape.\n" msgstr "" -#: src/stored/btape.c:2793 +#: src/stored/btape.c:2797 msgid "How many blocks do you want to write? (1000): " msgstr "" -#: src/stored/btape.c:2810 +#: src/stored/btape.c:2814 #, c-format msgid "Begin writing %d Bacula blocks to tape ...\n" msgstr "" -#: src/stored/btape.c:2853 +#: src/stored/btape.c:2857 #, c-format msgid "Begin writing raw blocks of %u bytes.\n" msgstr "" -#: src/stored/btape.c:2884 +#: src/stored/btape.c:2888 msgid "test autochanger" msgstr "" -#: src/stored/btape.c:2885 +#: src/stored/btape.c:2889 msgid "backspace file" msgstr "" -#: src/stored/btape.c:2886 +#: src/stored/btape.c:2890 msgid "backspace record" msgstr "" -#: src/stored/btape.c:2887 +#: src/stored/btape.c:2891 msgid "list device capabilities" msgstr "" -#: src/stored/btape.c:2888 +#: src/stored/btape.c:2892 msgid "clear tape errors" msgstr "" -#: src/stored/btape.c:2889 +#: src/stored/btape.c:2893 msgid "go to end of Bacula data for append" msgstr "" -#: src/stored/btape.c:2890 +#: src/stored/btape.c:2894 msgid "go to the physical end of medium" msgstr "" -#: src/stored/btape.c:2891 +#: src/stored/btape.c:2895 msgid "fill tape, write onto second volume" msgstr "" -#: src/stored/btape.c:2892 +#: src/stored/btape.c:2896 msgid "read filled tape" msgstr "" -#: src/stored/btape.c:2893 +#: src/stored/btape.c:2897 msgid "forward space a file" msgstr "" -#: src/stored/btape.c:2894 +#: src/stored/btape.c:2898 msgid "forward space a record" msgstr "" -#: src/stored/btape.c:2895 +#: src/stored/btape.c:2899 msgid "print this command" msgstr "" -#: src/stored/btape.c:2896 +#: src/stored/btape.c:2900 msgid "write a Bacula label to the tape" msgstr "" -#: src/stored/btape.c:2897 +#: src/stored/btape.c:2901 msgid "load a tape" msgstr "" -#: src/stored/btape.c:2898 +#: src/stored/btape.c:2902 msgid "quit btape" msgstr "" -#: src/stored/btape.c:2899 +#: src/stored/btape.c:2903 msgid "use write() to fill tape" msgstr "" -#: src/stored/btape.c:2900 +#: src/stored/btape.c:2904 msgid "read and print the Bacula tape label" msgstr "" -#: src/stored/btape.c:2901 +#: src/stored/btape.c:2905 msgid "test record handling functions" msgstr "" -#: src/stored/btape.c:2902 +#: src/stored/btape.c:2906 msgid "rewind the tape" msgstr "" -#: src/stored/btape.c:2903 +#: src/stored/btape.c:2907 msgid "read() tape block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2904 +#: src/stored/btape.c:2908 msgid "Bacula read block by block to EOT and report" msgstr "" -#: src/stored/btape.c:2905 +#: src/stored/btape.c:2909 msgid "" "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report " "drive speed" msgstr "" -#: src/stored/btape.c:2906 +#: src/stored/btape.c:2910 msgid "print tape status" msgstr "" -#: src/stored/btape.c:2907 +#: src/stored/btape.c:2911 msgid "General test Bacula tape functions" msgstr "" -#: src/stored/btape.c:2908 +#: src/stored/btape.c:2912 msgid "write an EOF on the tape" msgstr "" -#: src/stored/btape.c:2909 +#: src/stored/btape.c:2913 msgid "write a single Bacula block" msgstr "" -#: src/stored/btape.c:2910 +#: src/stored/btape.c:2914 msgid "read a single record" msgstr "" -#: src/stored/btape.c:2911 +#: src/stored/btape.c:2915 msgid "read a single Bacula block" msgstr "" -#: src/stored/btape.c:2912 +#: src/stored/btape.c:2916 msgid "quick fill command" msgstr "" -#: src/stored/btape.c:2933 +#: src/stored/btape.c:2937 #, c-format msgid "\"%s\" is an invalid command\n" msgstr "" -#: src/stored/btape.c:2942 +#: src/stored/btape.c:2946 #, c-format msgid "Interactive commands:\n" msgstr "" -#: src/stored/btape.c:2953 +#: src/stored/btape.c:2957 #, c-format msgid "" "\n" @@ -10819,89 +10866,89 @@ "\n" msgstr "" -#: src/stored/btape.c:3041 +#: src/stored/btape.c:3045 #, c-format msgid "Mount second Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3069 +#: src/stored/btape.c:3073 #, c-format msgid "Mount blank Volume on device %s and press return when ready: " msgstr "" -#: src/stored/btape.c:3089 +#: src/stored/btape.c:3093 #, c-format msgid "End of Volume \"%s\" %d records.\n" msgstr "" -#: src/stored/btape.c:3103 +#: src/stored/btape.c:3107 #, c-format msgid "Read block=%u, VolBytes=%s rate=%sB/s\n" msgstr "" -#: src/stored/authenticate.c:63 +#: src/stored/authenticate.c:61 #, c-format msgid "I only authenticate Directors, not %d\n" msgstr "" -#: src/stored/authenticate.c:69 src/filed/authenticate.c:74 +#: src/stored/authenticate.c:67 src/filed/authenticate.c:76 #, c-format msgid "Bad Hello command from Director at %s. Len=%d.\n" msgstr "" -#: src/stored/authenticate.c:80 src/filed/authenticate.c:86 +#: src/stored/authenticate.c:78 src/filed/authenticate.c:88 #, c-format msgid "Bad Hello command from Director at %s: %s\n" msgstr "" -#: src/stored/authenticate.c:93 +#: src/stored/authenticate.c:92 #, c-format msgid "" "Connection from unknown Director %s at %s rejected.\n" "Please see " msgstr "" -#: src/stored/authenticate.c:130 +#: src/stored/authenticate.c:129 msgid "" "Incorrect password given by Director.\n" "Please see " msgstr "" -#: src/stored/authenticate.c:138 src/stored/authenticate.c:249 -#: src/filed/authenticate.c:149 src/filed/authenticate.c:268 +#: src/stored/authenticate.c:137 src/stored/authenticate.c:248 +#: src/filed/authenticate.c:151 src/filed/authenticate.c:270 msgid "" "Authorization problem: Remote server did not advertize required TLS " "support.\n" msgstr "" -#: src/stored/authenticate.c:156 +#: src/stored/authenticate.c:155 #, c-format msgid "TLS negotiation failed with DIR at \"%s:%d\"\n" msgstr "" -#: src/stored/authenticate.c:192 +#: src/stored/authenticate.c:191 #, c-format msgid "Unable to authenticate Director at %s.\n" msgstr "" -#: src/stored/authenticate.c:240 src/stored/authenticate.c:280 +#: src/stored/authenticate.c:239 src/stored/authenticate.c:279 #, c-format msgid "" "Incorrect authorization key from File daemon at %s rejected.\n" "Please see " msgstr "" -#: src/stored/authenticate.c:267 +#: src/stored/authenticate.c:266 #, c-format msgid "TLS negotiation failed with FD at \"%s:%d\"\n" msgstr "" -#: src/stored/wait.c:134 +#: src/stored/wait.c:133 #, c-format msgid "pthread timedwait error. ERR=%s\n" msgstr "" -#: src/stored/wait.c:233 +#: src/stored/wait.c:239 #, c-format msgid "JobId=%s, Job %s waiting to reserve a device.\n" msgstr "" @@ -11057,70 +11104,70 @@ "free_space_errno=%d).\n" msgstr "" -#: src/stored/block.c:963 +#: src/stored/block.c:962 #, c-format msgid "Block buffer size looping problem on device %s\n" msgstr "" -#: src/stored/block.c:975 +#: src/stored/block.c:974 #, c-format msgid "Unable to open device part=%d %s: ERR=%s\n" msgstr "" -#: src/stored/block.c:1001 +#: src/stored/block.c:1000 #, c-format msgid "Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n" msgstr "" -#: src/stored/block.c:1014 +#: src/stored/block.c:1013 #, c-format msgid "Read zero bytes at %u:%u on device %s.\n" msgstr "" -#: src/stored/block.c:1038 +#: src/stored/block.c:1037 #, c-format msgid "" "Volume data error at %u:%u! Very short block of %d bytes on device %s " "discarded.\n" msgstr "" -#: src/stored/block.c:1063 +#: src/stored/block.c:1062 #, c-format msgid "Block length %u is greater than buffer %u. Attempting recovery.\n" msgstr "" -#: src/stored/block.c:1082 +#: src/stored/block.c:1081 #, c-format msgid "Setting block buffer size to %u bytes.\n" msgstr "" -#: src/stored/block.c:1097 +#: src/stored/block.c:1096 #, c-format msgid "" "Volume data error at %u:%u! Short block of %d bytes on device %s discarded.\n" msgstr "" -#: src/lib/plugins.c:111 +#: src/lib/plugins.c:112 #, c-format msgid "Failed to open Plugin directory %s: ERR=%s\n" msgstr "" -#: src/lib/plugins.c:128 +#: src/lib/plugins.c:129 #, c-format msgid "Failed to find any plugins in %s\n" msgstr "" -#: src/lib/plugins.c:161 +#: src/lib/plugins.c:163 #, c-format -msgid "Plugin load %s failed: ERR=%s\n" +msgid "dlopen plugin %s failed: ERR=%s\n" msgstr "" -#: src/lib/plugins.c:172 +#: src/lib/plugins.c:174 #, c-format msgid "Lookup of loadPlugin in plugin %s failed: ERR=%s\n" msgstr "" -#: src/lib/plugins.c:181 +#: src/lib/plugins.c:183 #, c-format msgid "Lookup of unloadPlugin in plugin %s failed: ERR=%s\n" msgstr "" @@ -11463,48 +11510,48 @@ msgid "fcntl F_GETFL error. ERR=%s\n" msgstr "" -#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:822 +#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:829 #, c-format msgid "fcntl F_SETFL error. ERR=%s\n" msgstr "" -#: src/lib/bsock.c:995 src/qt-console/bcomm/dircomm_auth.cpp:112 +#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:112 #, c-format msgid "Director authorization problem at \"%s:%d\"\n" msgstr "" -#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:119 +#: src/lib/bsock.c:1009 src/qt-console/bcomm/dircomm_auth.cpp:119 #, c-format msgid "" "Authorization problem: Remote server at \"%s:%d\" did not advertise required " "TLS support.\n" msgstr "" -#: src/lib/bsock.c:1010 src/qt-console/bcomm/dircomm_auth.cpp:127 +#: src/lib/bsock.c:1017 src/qt-console/bcomm/dircomm_auth.cpp:127 #, c-format msgid "" "Authorization problem with Director at \"%s:%d\": Remote server requires " "TLS.\n" msgstr "" -#: src/lib/bsock.c:1022 src/qt-console/bcomm/dircomm_auth.cpp:138 +#: src/lib/bsock.c:1029 src/qt-console/bcomm/dircomm_auth.cpp:138 #, c-format msgid "TLS negotiation failed with Director at \"%s:%d\"\n" msgstr "" -#: src/lib/bsock.c:1032 src/qt-console/bcomm/dircomm_auth.cpp:150 +#: src/lib/bsock.c:1039 src/qt-console/bcomm/dircomm_auth.cpp:150 #, c-format msgid "" "Bad response to Hello command: ERR=%s\n" "The Director at \"%s:%d\" is probably not running.\n" msgstr "" -#: src/lib/bsock.c:1041 src/qt-console/bcomm/dircomm_auth.cpp:159 +#: src/lib/bsock.c:1048 src/qt-console/bcomm/dircomm_auth.cpp:159 #, c-format msgid "Director at \"%s:%d\" rejected Hello command\n" msgstr "" -#: src/lib/bsock.c:1051 src/qt-console/bcomm/dircomm_auth.cpp:171 +#: src/lib/bsock.c:1058 src/qt-console/bcomm/dircomm_auth.cpp:171 #, c-format msgid "" "Authorization problem with Director at \"%s:%d\"\n" @@ -11560,7 +11607,7 @@ msgid "fopen %s failed: ERR=%s\n" msgstr "" -#: src/lib/message.c:813 +#: src/lib/message.c:835 #, c-format msgid "" "Msg delivery error: Operator mail program terminated in error.\n" @@ -11568,77 +11615,77 @@ "ERR=%s\n" msgstr "" -#: src/lib/message.c:834 +#: src/lib/message.c:856 #, c-format msgid "Msg delivery error: fopen %s failed: ERR=%s\n" msgstr "" -#: src/lib/message.c:1153 +#: src/lib/message.c:1175 #, c-format msgid "%s: ABORTING due to ERROR in %s:%d\n" msgstr "" -#: src/lib/message.c:1157 +#: src/lib/message.c:1179 #, c-format msgid "%s: ERROR TERMINATION at %s:%d\n" msgstr "" -#: src/lib/message.c:1162 +#: src/lib/message.c:1184 #, c-format msgid "%s: Fatal Error because: " msgstr "" -#: src/lib/message.c:1164 +#: src/lib/message.c:1186 #, c-format msgid "%s: Fatal Error at %s:%d because:\n" msgstr "" -#: src/lib/message.c:1168 +#: src/lib/message.c:1190 #, c-format msgid "%s: ERROR: " msgstr "" -#: src/lib/message.c:1170 +#: src/lib/message.c:1192 #, c-format msgid "%s: ERROR in %s:%d " msgstr "" -#: src/lib/message.c:1173 +#: src/lib/message.c:1195 #, c-format msgid "%s: Warning: " msgstr "" -#: src/lib/message.c:1176 +#: src/lib/message.c:1198 #, c-format msgid "%s: Security violation: " msgstr "" -#: src/lib/message.c:1264 +#: src/lib/message.c:1286 #, c-format msgid "%s ABORTING due to ERROR\n" msgstr "" -#: src/lib/message.c:1267 +#: src/lib/message.c:1289 #, c-format msgid "%s ERROR TERMINATION\n" msgstr "" -#: src/lib/message.c:1270 +#: src/lib/message.c:1292 #, c-format msgid "%s JobId %u: Fatal error: " msgstr "" -#: src/lib/message.c:1279 +#: src/lib/message.c:1301 #, c-format msgid "%s JobId %u: Error: " msgstr "" -#: src/lib/message.c:1285 +#: src/lib/message.c:1307 #, c-format msgid "%s JobId %u: Warning: " msgstr "" -#: src/lib/message.c:1291 +#: src/lib/message.c:1313 #, c-format msgid "%s JobId %u: Security violation: " msgstr "" @@ -11717,7 +11764,7 @@ msgstr "" #: src/lib/lockmgr.c:275 src/lib/lockmgr.c:611 src/lib/lockmgr.c:639 -#: src/lib/jcr.c:319 +#: src/lib/jcr.c:321 #, c-format msgid "pthread key create failed: ERR=%s\n" msgstr "" @@ -11891,7 +11938,7 @@ msgid "Unknown error" msgstr "" -#: src/lib/cram-md5.c:110 src/lib/cram-md5.c:138 +#: src/lib/cram-md5.c:109 src/lib/cram-md5.c:137 msgid "1999 Authorization failed.\n" msgstr "" @@ -12084,7 +12131,7 @@ msgid "Unknown term code" msgstr "" -#: src/lib/util.c:359 src/lib/jcr.c:230 +#: src/lib/util.c:359 src/lib/jcr.c:232 msgid "Backup" msgstr "" @@ -12141,7 +12188,7 @@ msgid "Truncate" msgstr "" -#: src/lib/util.c:409 src/filed/restore.c:928 +#: src/lib/util.c:409 src/filed/restore.c:1158 msgid "None" msgstr "" @@ -12191,7 +12238,7 @@ #: src/lib/util.c:753 src/lib/util.c:763 src/lib/util.c:771 src/lib/util.c:778 #: src/lib/util.c:785 src/lib/util.c:799 src/lib/util.c:809 src/lib/util.c:822 -#: src/lib/util.c:833 src/filed/restore.c:944 +#: src/lib/util.c:833 src/filed/restore.c:1174 msgid "*none*" msgstr "" @@ -12283,140 +12330,140 @@ msgid "Error creating new SSL object" msgstr "" -#: src/lib/tls.c:490 src/lib/tls.c:513 +#: src/lib/tls.c:491 src/lib/tls.c:514 msgid "Connect failure" msgstr "" -#: src/lib/tls.c:592 src/lib/tls.c:596 +#: src/lib/tls.c:594 src/lib/tls.c:598 msgid "TLS shutdown failure." msgstr "" -#: src/lib/tls.c:650 src/lib/tls.c:676 +#: src/lib/tls.c:653 src/lib/tls.c:679 msgid "TLS read/write failure." msgstr "" -#: src/lib/jcr.c:232 +#: src/lib/jcr.c:234 msgid "Verifying" msgstr "" -#: src/lib/jcr.c:234 +#: src/lib/jcr.c:236 msgid "Restoring" msgstr "" -#: src/lib/jcr.c:236 +#: src/lib/jcr.c:238 msgid "Archiving" msgstr "" -#: src/lib/jcr.c:238 +#: src/lib/jcr.c:240 msgid "Copying" msgstr "" -#: src/lib/jcr.c:240 +#: src/lib/jcr.c:242 msgid "Migration" msgstr "" -#: src/lib/jcr.c:242 +#: src/lib/jcr.c:244 msgid "Scanning" msgstr "" -#: src/lib/jcr.c:244 +#: src/lib/jcr.c:246 msgid "Unknown operation" msgstr "" -#: src/lib/jcr.c:253 +#: src/lib/jcr.c:255 msgid "backup" msgstr "" -#: src/lib/jcr.c:255 +#: src/lib/jcr.c:257 msgid "verified" msgstr "" -#: src/lib/jcr.c:255 +#: src/lib/jcr.c:257 msgid "verify" msgstr "" -#: src/lib/jcr.c:257 +#: src/lib/jcr.c:259 msgid "restored" msgstr "" -#: src/lib/jcr.c:257 +#: src/lib/jcr.c:259 msgid "restore" msgstr "" -#: src/lib/jcr.c:259 +#: src/lib/jcr.c:261 msgid "archived" msgstr "" -#: src/lib/jcr.c:259 +#: src/lib/jcr.c:261 msgid "archive" msgstr "" -#: src/lib/jcr.c:261 +#: src/lib/jcr.c:263 msgid "copied" msgstr "" -#: src/lib/jcr.c:261 +#: src/lib/jcr.c:263 msgid "copy" msgstr "" -#: src/lib/jcr.c:263 +#: src/lib/jcr.c:265 msgid "migrated" msgstr "" -#: src/lib/jcr.c:263 +#: src/lib/jcr.c:265 msgid "migrate" msgstr "" -#: src/lib/jcr.c:265 +#: src/lib/jcr.c:267 msgid "scanned" msgstr "" -#: src/lib/jcr.c:265 +#: src/lib/jcr.c:267 msgid "scan" msgstr "" -#: src/lib/jcr.c:267 +#: src/lib/jcr.c:269 msgid "unknown action" msgstr "" -#: src/lib/jcr.c:341 +#: src/lib/jcr.c:343 #, c-format msgid "pthread_once failed. ERR=%s\n" msgstr "" -#: src/lib/jcr.c:348 +#: src/lib/jcr.c:350 #, c-format msgid "Could not init msg_queue mutex. ERR=%s\n" msgstr "" -#: src/lib/jcr.c:401 +#: src/lib/jcr.c:403 msgid "NULL jcr.\n" msgstr "" -#: src/lib/jcr.c:507 +#: src/lib/jcr.c:509 #, c-format msgid "JCR use_count=%d JobId=%d\n" msgstr "" -#: src/lib/jcr.c:617 +#: src/lib/jcr.c:619 #, c-format msgid "pthread_setspecific failed: ERR=%s\n" msgstr "" -#: src/lib/jcr.c:1067 +#: src/lib/jcr.c:1097 #, c-format msgid "" "Watchdog sending kill after %d secs to thread stalled reading Storage " "daemon.\n" msgstr "" -#: src/lib/jcr.c:1079 +#: src/lib/jcr.c:1109 #, c-format msgid "" "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n" msgstr "" -#: src/lib/jcr.c:1091 +#: src/lib/jcr.c:1121 #, c-format msgid "" "Watchdog sending kill after %d secs to thread stalled reading Director.\n" @@ -12499,11 +12546,6 @@ msgid "speed" msgstr "" -#: src/lib/parse_conf.c:736 src/lib/parse_conf.c:742 -#, c-format -msgid "expected a time period, got: %s" -msgstr "" - #: src/lib/parse_conf.c:803 #, c-format msgid "Expected a Tape Label keyword, got: %s" @@ -12874,47 +12916,47 @@ msgid "stop_btimer called with NULL btimer_id\n" msgstr "" -#: src/lib/bsys.c:218 src/lib/bsys.c:235 src/lib/bsys.c:259 src/lib/bsys.c:272 +#: src/lib/bsys.c:215 src/lib/bsys.c:232 src/lib/bsys.c:256 src/lib/bsys.c:269 #, c-format msgid "Out of memory: ERR=%s\n" msgstr "" -#: src/lib/bsys.c:314 +#: src/lib/bsys.c:311 msgid "Buffer overflow.\n" msgstr "" -#: src/lib/bsys.c:380 +#: src/lib/bsys.c:377 msgid "Bad errno" msgstr "" -#: src/lib/bsys.c:395 +#: src/lib/bsys.c:392 #, c-format msgid "Memset for %d bytes at %s:%d\n" msgstr "" -#: src/lib/bsys.c:425 +#: src/lib/bsys.c:422 #, c-format msgid "Cannot open pid file. %s ERR=%s\n" msgstr "" -#: src/lib/bsys.c:440 +#: src/lib/bsys.c:437 #, c-format msgid "" "%s is already running. pid=%d\n" "Check file %s\n" msgstr "" -#: src/lib/bsys.c:454 +#: src/lib/bsys.c:451 #, c-format msgid "Could not open pid file. %s ERR=%s\n" msgstr "" -#: src/lib/bsys.c:565 +#: src/lib/bsys.c:562 #, c-format msgid "Could not create state file. %s ERR=%s\n" msgstr "" -#: src/lib/bsys.c:584 +#: src/lib/bsys.c:581 #, c-format msgid "Write final hdr error: ERR=%s\n" msgstr "" @@ -13022,38 +13064,38 @@ msgid "expected a positive integer number, got: %s" msgstr "" -#: src/lib/lex.c:472 +#: src/lib/lex.c:478 msgid "" "This config file appears to be in an unsupported Unicode format (UTF-16be). " "Please resave as UTF-8\n" msgstr "" -#: src/lib/lex.c:611 src/lib/lex.c:639 +#: src/lib/lex.c:617 src/lib/lex.c:645 #, c-format msgid "Cannot open included config file %s: %s\n" msgstr "" -#: src/lib/lex.c:698 src/lib/lex.c:755 +#: src/lib/lex.c:704 src/lib/lex.c:761 #, c-format msgid "expected an integer or a range, got %s: %s" msgstr "" -#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739 +#: src/lib/lex.c:718 src/lib/lex.c:726 src/lib/lex.c:737 src/lib/lex.c:745 #, c-format msgid "expected an integer number, got %s: %s" msgstr "" -#: src/lib/lex.c:769 +#: src/lib/lex.c:775 #, c-format msgid "expected a name, got %s: %s" msgstr "" -#: src/lib/lex.c:773 +#: src/lib/lex.c:779 #, c-format msgid "name %s length %d too long, max is %d\n" msgstr "" -#: src/lib/lex.c:781 +#: src/lib/lex.c:787 #, c-format msgid "expected a string, got %s: %s" msgstr "" @@ -13389,32 +13431,32 @@ msgid "Cannot reset current directory: ERR=%s\n" msgstr "" -#: src/findlib/mkpath.c:53 +#: src/findlib/mkpath.c:137 #, c-format msgid "Cannot create directory %s: ERR=%s\n" msgstr "" -#: src/findlib/mkpath.c:57 src/findlib/mkpath.c:112 +#: src/findlib/mkpath.c:141 src/findlib/mkpath.c:202 #, c-format msgid "%s exists but is not a directory.\n" msgstr "" -#: src/findlib/mkpath.c:74 +#: src/findlib/mkpath.c:164 #, c-format msgid "Cannot change owner and/or group of %s: ERR=%s\n" msgstr "" -#: src/findlib/mkpath.c:79 +#: src/findlib/mkpath.c:169 #, c-format msgid "Cannot change permissions of %s: ERR=%s\n" msgstr "" -#: src/findlib/mkpath.c:149 +#: src/findlib/mkpath.c:239 #, c-format msgid "%c: is not a valid drive.\n" msgstr "" -#: src/findlib/mkpath.c:195 +#: src/findlib/mkpath.c:283 msgid "Too many subdirectories. Some permissions not reset.\n" msgstr "" @@ -13458,83 +13500,83 @@ msgid "AdjustTokenPrivileges set " msgstr "" -#: src/findlib/create_file.c:130 +#: src/findlib/create_file.c:124 #, c-format msgid "File skipped. Not newer: %s\n" msgstr "" -#: src/findlib/create_file.c:137 +#: src/findlib/create_file.c:131 #, c-format msgid "File skipped. Not older: %s\n" msgstr "" -#: src/findlib/create_file.c:143 +#: src/findlib/create_file.c:141 #, c-format msgid "File skipped. Already exists: %s\n" msgstr "" -#: src/findlib/create_file.c:170 +#: src/findlib/create_file.c:167 #, c-format msgid "File %s already exists and could not be replaced. ERR=%s.\n" msgstr "" -#: src/findlib/create_file.c:221 src/findlib/create_file.c:285 -#: src/findlib/create_file.c:381 +#: src/findlib/create_file.c:218 src/findlib/create_file.c:282 +#: src/findlib/create_file.c:378 #, c-format msgid "bpkt already open fid=%d\n" msgstr "" -#: src/findlib/create_file.c:229 src/filed/fd_plugins.c:668 +#: src/findlib/create_file.c:226 src/filed/fd_plugins.c:890 #, c-format msgid "Could not create %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:244 +#: src/findlib/create_file.c:241 #, c-format msgid "Cannot make fifo %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:262 +#: src/findlib/create_file.c:259 #, c-format msgid "Cannot make node %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:307 +#: src/findlib/create_file.c:304 #, c-format msgid "Could not symlink %s -> %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:332 src/findlib/create_file.c:345 +#: src/findlib/create_file.c:329 src/findlib/create_file.c:342 #, c-format msgid "Could not restore file flags for file %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:336 src/findlib/create_file.c:353 +#: src/findlib/create_file.c:333 src/findlib/create_file.c:350 #, c-format msgid "Could not hard link %s -> %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:349 +#: src/findlib/create_file.c:346 #, c-format msgid "Could not reset file flags for file %s: ERR=%s\n" msgstr "" -#: src/findlib/create_file.c:404 +#: src/findlib/create_file.c:401 #, c-format msgid "Original file %s have been deleted: type=%d\n" msgstr "" -#: src/findlib/create_file.c:416 +#: src/findlib/create_file.c:413 #, c-format msgid "Original file %s not saved: type=%d\n" msgstr "" -#: src/findlib/create_file.c:419 +#: src/findlib/create_file.c:416 #, c-format msgid "Unknown file type %d; not restored: %s\n" msgstr "" -#: src/findlib/create_file.c:463 +#: src/findlib/create_file.c:460 #, c-format msgid "Zero length filename: %s\n" msgstr "" @@ -13767,12 +13809,12 @@ msgid "NetBSD Specific Extended attribs" msgstr "" -#: src/findlib/find.c:224 +#: src/findlib/find.c:226 #, c-format msgid "Plugin: \"%s\" not found.\n" msgstr "" -#: src/findlib/match.c:210 src/tools/testfind.c:651 src/filed/job.c:1415 +#: src/findlib/match.c:210 src/tools/testfind.c:654 src/filed/job.c:1456 #, c-format msgid "Unknown include/exclude option: %c\n" msgstr "" @@ -13904,7 +13946,7 @@ #: src/cats/sql_create.c:595 src/cats/sql_get.c:205 src/cats/sql_get.c:258 #: src/cats/sql_get.c:640 src/cats/sql_get.c:722 src/cats/sql_get.c:1041 -#: src/cats/sql.c:339 src/cats/sql.c:346 src/cats/postgresql.c:158 +#: src/cats/sql.c:340 src/cats/sql.c:347 src/cats/postgresql.c:158 #, c-format msgid "error fetching row: %s\n" msgstr "" @@ -14138,50 +14180,50 @@ msgid "Media record for Vol=%s not found in Catalog.\n" msgstr "" -#: src/cats/sql_find.c:95 src/cats/sql_find.c:124 src/cats/sql_find.c:175 +#: src/cats/sql_find.c:98 src/cats/sql_find.c:127 src/cats/sql_find.c:182 #, c-format msgid "" "Query error for start time request: ERR=%s\n" "CMD=%s\n" msgstr "" -#: src/cats/sql_find.c:101 src/cats/sql_find.c:181 +#: src/cats/sql_find.c:104 src/cats/sql_find.c:188 msgid "No prior Full backup Job record found.\n" msgstr "" -#: src/cats/sql_find.c:113 +#: src/cats/sql_find.c:116 #, c-format msgid "Unknown level=%d\n" msgstr "" -#: src/cats/sql_find.c:130 +#: src/cats/sql_find.c:133 #, c-format msgid "" "No Job record found: ERR=%s\n" "CMD=%s\n" msgstr "" -#: src/cats/sql_find.c:282 +#: src/cats/sql_find.c:291 #, c-format msgid "Unknown Job level=%d\n" msgstr "" -#: src/cats/sql_find.c:292 +#: src/cats/sql_find.c:301 #, c-format msgid "No Job found for: %s.\n" msgstr "" -#: src/cats/sql_find.c:303 +#: src/cats/sql_find.c:312 #, c-format msgid "No Job found for: %s\n" msgstr "" -#: src/cats/sql_find.c:384 +#: src/cats/sql_find.c:393 #, c-format msgid "Request for Volume item %d greater than max %d or less than 1\n" msgstr "" -#: src/cats/sql_find.c:399 +#: src/cats/sql_find.c:408 #, c-format msgid "No Volume record found for item %d.\n" msgstr "" @@ -14272,27 +14314,27 @@ msgid "Update failed: affected_rows=%s for %s\n" msgstr "" -#: src/cats/sql.c:313 +#: src/cats/sql.c:314 #, c-format msgid "" "delete %s failed:\n" "%s\n" msgstr "" -#: src/cats/sql.c:407 +#: src/cats/sql.c:408 #, c-format msgid "Path length is zero. File=%s\n" msgstr "" -#: src/cats/sql.c:601 +#: src/cats/sql.c:603 msgid "No results to list.\n" msgstr "" -#: src/cats/sql.c:722 +#: src/cats/sql.c:724 msgid "Could not init database batch connection" msgstr "" -#: src/cats/sql.c:728 +#: src/cats/sql.c:730 #, c-format msgid "Could not open database \"%s\": ERR=%s\n" msgstr "" @@ -14424,7 +14466,7 @@ "incorrect.\n" msgstr "" -#: src/cats/mysql.c:640 +#: src/cats/mysql.c:639 msgid "A user name for MySQL must be supplied.\n" msgstr "" @@ -14445,7 +14487,7 @@ msgid "Director: name=%s address=%s DIRport=%d\n" msgstr "" -#: src/wx-console/authenticate.c:142 src/console/authenticate.c:141 +#: src/wx-console/authenticate.c:142 src/console/authenticate.c:138 msgid "TLS negotiation failed\n" msgstr "" @@ -14453,7 +14495,7 @@ msgid "Bad response to Hello command: ERR=" msgstr "" -#: src/wx-console/authenticate.c:167 src/console/authenticate.c:172 +#: src/wx-console/authenticate.c:167 src/console/authenticate.c:169 msgid "" "Director authorization problem.\n" "Most likely the passwords do not agree.\n" @@ -14577,54 +14619,54 @@ msgid "Enter a period to cancel a command.\n" msgstr "" -#: src/console/console.c:1304 src/qt-console/main.cpp:220 +#: src/console/console.c:1304 src/qt-console/main.cpp:232 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "Director \"%s\" in %s. At least one CA certificate store is required.\n" msgstr "" -#: src/console/console.c:1313 src/qt-console/main.cpp:229 +#: src/console/console.c:1313 src/qt-console/main.cpp:241 #, c-format msgid "" "No Director resource defined in %s\n" "Without that I don't how to speak to the Director :-(\n" msgstr "" -#: src/console/console.c:1333 src/qt-console/main.cpp:250 +#: src/console/console.c:1333 src/qt-console/main.cpp:262 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "Console \"%s\" in %s.\n" msgstr "" -#: src/console/console.c:1357 +#: src/console/console.c:1359 msgid "Too many arguments on input command.\n" msgstr "" -#: src/console/console.c:1361 +#: src/console/console.c:1363 msgid "First argument to input command must be a filename.\n" msgstr "" -#: src/console/console.c:1367 +#: src/console/console.c:1369 #, c-format msgid "Cannot open file %s for input. ERR=%s\n" msgstr "" -#: src/console/console.c:1397 +#: src/console/console.c:1401 msgid "Too many arguments on output/tee command.\n" msgstr "" -#: src/console/console.c:1414 +#: src/console/console.c:1418 #, c-format msgid "Cannot open file %s for output. ERR=%s\n" msgstr "" -#: src/console/console.c:1433 +#: src/console/console.c:1437 msgid "Too many arguments. Enclose command in double quotes.\n" msgstr "" -#: src/console/console.c:1442 +#: src/console/console.c:1446 #, c-format msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n" msgstr "" @@ -14667,27 +14709,27 @@ msgid "Files seen = %d\n" msgstr "" -#: src/tools/testls.c:215 src/tools/testfind.c:319 +#: src/tools/testls.c:215 src/tools/testfind.c:322 #, c-format msgid "Err: Could not access %s: %s\n" msgstr "" -#: src/tools/testls.c:218 src/tools/testfind.c:322 +#: src/tools/testls.c:218 src/tools/testfind.c:325 #, c-format msgid "Err: Could not follow ff->link %s: %s\n" msgstr "" -#: src/tools/testls.c:221 src/tools/testfind.c:325 +#: src/tools/testls.c:221 src/tools/testfind.c:328 #, c-format msgid "Err: Could not stat %s: %s\n" msgstr "" -#: src/tools/testls.c:224 src/tools/testfind.c:328 +#: src/tools/testls.c:224 src/tools/testfind.c:331 #, c-format msgid "Skip: File not saved. No change. %s\n" msgstr "" -#: src/tools/testls.c:227 src/tools/testfind.c:331 +#: src/tools/testls.c:227 src/tools/testfind.c:334 #, c-format msgid "Err: Attempt to backup archive. Not saved. %s\n" msgstr "" @@ -14702,17 +14744,17 @@ msgid "Skip: File system change prohibited. Directory not entered. %s\n" msgstr "" -#: src/tools/testls.c:236 src/tools/testfind.c:334 +#: src/tools/testls.c:236 src/tools/testfind.c:337 #, c-format msgid "Err: Could not open directory %s: %s\n" msgstr "" -#: src/tools/testls.c:239 src/tools/testfind.c:337 +#: src/tools/testls.c:239 src/tools/testfind.c:340 #, c-format msgid "Err: Unknown file ff->type %d: %s\n" msgstr "" -#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:56 +#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:57 #, c-format msgid "" "\n" @@ -14774,19 +14816,19 @@ msgid "Error while inserting file\n" msgstr "" -#: src/tools/ing_test.c:230 src/tools/ing_test.c:263 src/tools/ing_test.c:301 +#: src/tools/ing_test.c:231 src/tools/ing_test.c:264 src/tools/ing_test.c:302 msgid "Stmt went wrong\n" msgstr "" -#: src/tools/ing_test.c:319 +#: src/tools/ing_test.c:320 msgid "CREATE-Stmt went wrong\n" msgstr "" -#: src/tools/ing_test.c:324 +#: src/tools/ing_test.c:325 msgid "DROP-Stmt went wrong\n" msgstr "" -#: src/tools/fstype.c:47 +#: src/tools/fstype.c:48 #, c-format msgid "" "\n" @@ -14800,7 +14842,7 @@ "\n" msgstr "" -#: src/tools/fstype.c:101 src/tools/drivetype.c:78 +#: src/tools/fstype.c:102 src/tools/drivetype.c:78 #, c-format msgid "%s: unknown\n" msgstr "" @@ -14826,7 +14868,7 @@ "\n" msgstr "" -#: src/tools/testfind.c:69 +#: src/tools/testfind.c:70 #, c-format msgid "" "\n" @@ -14847,7 +14889,7 @@ "\n" msgstr "" -#: src/tools/testfind.c:234 +#: src/tools/testfind.c:235 #, c-format msgid "" "\n" @@ -14859,43 +14901,43 @@ "Hard links : %d\n" msgstr "" -#: src/tools/testfind.c:275 +#: src/tools/testfind.c:278 #, c-format msgid "Reg: %s\n" msgstr "" -#: src/tools/testfind.c:297 +#: src/tools/testfind.c:300 msgid "\t[will not descend: recursion turned off]" msgstr "" -#: src/tools/testfind.c:299 +#: src/tools/testfind.c:302 msgid "\t[will not descend: file system change not allowed]" msgstr "" -#: src/tools/testfind.c:301 +#: src/tools/testfind.c:304 msgid "\t[will not descend: disallowed file system]" msgstr "" -#: src/tools/testfind.c:303 +#: src/tools/testfind.c:306 msgid "\t[will not descend: disallowed drive type]" msgstr "" -#: src/tools/testfind.c:387 +#: src/tools/testfind.c:390 #, c-format msgid "===== Filename truncated to 255 chars: %s\n" msgstr "" -#: src/tools/testfind.c:404 +#: src/tools/testfind.c:407 #, c-format msgid "========== Path name truncated to 255 chars: %s\n" msgstr "" -#: src/tools/testfind.c:413 +#: src/tools/testfind.c:416 #, c-format msgid "========== Path length is zero. File=%s\n" msgstr "" -#: src/tools/testfind.c:416 +#: src/tools/testfind.c:419 #, c-format msgid "Path: %s\n" msgstr "" @@ -15196,9 +15238,9 @@ msgstr "" #: src/tools/dbcheck.c:748 src/tools/dbcheck.c:810 src/tools/dbcheck.c:856 -#: src/tools/dbcheck.c:914 src/tools/dbcheck.c:972 src/tools/dbcheck.c:1015 -#: src/tools/dbcheck.c:1057 src/tools/dbcheck.c:1099 src/tools/dbcheck.c:1136 -#: src/tools/dbcheck.c:1169 src/tools/dbcheck.c:1203 src/tools/dbcheck.c:1270 +#: src/tools/dbcheck.c:924 src/tools/dbcheck.c:982 src/tools/dbcheck.c:1025 +#: src/tools/dbcheck.c:1067 src/tools/dbcheck.c:1109 src/tools/dbcheck.c:1146 +#: src/tools/dbcheck.c:1179 src/tools/dbcheck.c:1213 src/tools/dbcheck.c:1280 msgid "Print them? (yes/no): " msgstr "" @@ -15232,179 +15274,184 @@ msgid "Deleting %d orphaned File records.\n" msgstr "" -#: src/tools/dbcheck.c:890 src/tools/dbcheck.c:948 +#: src/tools/dbcheck.c:891 +#, c-format +msgid "Pruning orphaned Path entries isn't possible when using BVFS.\n" +msgstr "" + +#: src/tools/dbcheck.c:900 src/tools/dbcheck.c:958 msgid "Create temporary index? (yes/no): " msgstr "" -#: src/tools/dbcheck.c:902 +#: src/tools/dbcheck.c:912 #, c-format msgid "Checking for orphaned Path entries. This may take some time!\n" msgstr "" -#: src/tools/dbcheck.c:913 +#: src/tools/dbcheck.c:923 #, c-format msgid "Found %d orphaned Path records.\n" msgstr "" -#: src/tools/dbcheck.c:926 +#: src/tools/dbcheck.c:936 #, c-format msgid "Deleting %d orphaned Path records.\n" msgstr "" -#: src/tools/dbcheck.c:960 +#: src/tools/dbcheck.c:970 #, c-format msgid "Checking for orphaned Filename entries. This may take some time!\n" msgstr "" -#: src/tools/dbcheck.c:971 +#: src/tools/dbcheck.c:981 #, c-format msgid "Found %d orphaned Filename records.\n" msgstr "" -#: src/tools/dbcheck.c:984 +#: src/tools/dbcheck.c:994 #, c-format msgid "Deleting %d orphaned Filename records.\n" msgstr "" -#: src/tools/dbcheck.c:1004 +#: src/tools/dbcheck.c:1014 #, c-format msgid "Checking for orphaned FileSet entries. This takes some time!\n" msgstr "" -#: src/tools/dbcheck.c:1014 +#: src/tools/dbcheck.c:1024 #, c-format msgid "Found %d orphaned FileSet records.\n" msgstr "" -#: src/tools/dbcheck.c:1029 +#: src/tools/dbcheck.c:1039 #, c-format msgid "Deleting %d orphaned FileSet records.\n" msgstr "" -#: src/tools/dbcheck.c:1038 +#: src/tools/dbcheck.c:1048 #, c-format msgid "Checking for orphaned Client entries.\n" msgstr "" -#: src/tools/dbcheck.c:1056 +#: src/tools/dbcheck.c:1066 #, c-format msgid "Found %d orphaned Client records.\n" msgstr "" -#: src/tools/dbcheck.c:1071 +#: src/tools/dbcheck.c:1081 #, c-format msgid "Deleting %d orphaned Client records.\n" msgstr "" -#: src/tools/dbcheck.c:1080 +#: src/tools/dbcheck.c:1090 #, c-format msgid "Checking for orphaned Job entries.\n" msgstr "" -#: src/tools/dbcheck.c:1098 +#: src/tools/dbcheck.c:1108 #, c-format msgid "Found %d orphaned Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1113 +#: src/tools/dbcheck.c:1123 #, c-format msgid "Deleting %d orphaned Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1115 +#: src/tools/dbcheck.c:1125 #, c-format msgid "Deleting JobMedia records of orphaned Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1117 +#: src/tools/dbcheck.c:1127 #, c-format msgid "Deleting Log records of orphaned Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1126 +#: src/tools/dbcheck.c:1136 #, c-format msgid "Checking for Admin Job entries.\n" msgstr "" -#: src/tools/dbcheck.c:1135 +#: src/tools/dbcheck.c:1145 #, c-format msgid "Found %d Admin Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1150 +#: src/tools/dbcheck.c:1160 #, c-format msgid "Deleting %d Admin Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1159 +#: src/tools/dbcheck.c:1169 #, c-format msgid "Checking for Restore Job entries.\n" msgstr "" -#: src/tools/dbcheck.c:1168 +#: src/tools/dbcheck.c:1178 #, c-format msgid "Found %d Restore Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1183 +#: src/tools/dbcheck.c:1193 #, c-format msgid "Deleting %d Restore Job records.\n" msgstr "" -#: src/tools/dbcheck.c:1193 +#: src/tools/dbcheck.c:1203 #, c-format msgid "Checking for Filenames with a trailing slash\n" msgstr "" -#: src/tools/dbcheck.c:1202 +#: src/tools/dbcheck.c:1212 #, c-format msgid "Found %d bad Filename records.\n" msgstr "" -#: src/tools/dbcheck.c:1220 src/tools/dbcheck.c:1286 +#: src/tools/dbcheck.c:1230 src/tools/dbcheck.c:1296 #, c-format msgid "Reparing %d bad Filename records.\n" msgstr "" -#: src/tools/dbcheck.c:1260 +#: src/tools/dbcheck.c:1270 #, c-format msgid "Checking for Paths without a trailing slash\n" msgstr "" -#: src/tools/dbcheck.c:1269 +#: src/tools/dbcheck.c:1279 #, c-format msgid "Found %d bad Path records.\n" msgstr "" -#: src/tools/dbcheck.c:1432 +#: src/tools/dbcheck.c:1442 #, c-format msgid "" "Ok. Index over the %s column already exists and dbcheck will work faster.\n" msgstr "" -#: src/tools/dbcheck.c:1435 +#: src/tools/dbcheck.c:1445 #, c-format msgid "" "Note. Index over the %s column not found, that can greatly slow down " "dbcheck.\n" msgstr "" -#: src/tools/dbcheck.c:1450 +#: src/tools/dbcheck.c:1460 #, c-format msgid "Create temporary index... This may take some time!\n" msgstr "" -#: src/tools/dbcheck.c:1458 +#: src/tools/dbcheck.c:1468 #, c-format msgid "Temporary index created.\n" msgstr "" -#: src/tools/dbcheck.c:1473 +#: src/tools/dbcheck.c:1483 #, c-format msgid "Drop temporary index.\n" msgstr "" -#: src/tools/dbcheck.c:1483 +#: src/tools/dbcheck.c:1493 #, c-format msgid "Temporary index %s deleted.\n" msgstr "" @@ -15429,7 +15476,7 @@ msgid " Could not stat %s: ERR=%s\n" msgstr "" -#: src/filed/verify.c:147 src/filed/backup.c:439 +#: src/filed/verify.c:147 src/filed/backup.c:450 #, c-format msgid " Unchanged file skipped: %s\n" msgstr "" @@ -15449,37 +15496,37 @@ msgid " File system change prohibited. Directory skipped: %s\n" msgstr "" -#: src/filed/verify.c:164 +#: src/filed/verify.c:165 #, c-format msgid " Could not open directory %s: ERR=%s\n" msgstr "" -#: src/filed/verify.c:169 +#: src/filed/verify.c:170 #, c-format msgid " Unknown file type %d: %s\n" msgstr "" -#: src/filed/verify.c:213 src/filed/verify_vol.c:206 +#: src/filed/verify.c:214 src/filed/verify_vol.c:206 #, c-format msgid "Network error in send to Director: ERR=%s\n" msgstr "" -#: src/filed/verify.c:246 src/filed/accurate.c:424 src/filed/backup.c:492 +#: src/filed/verify.c:247 src/filed/accurate.c:428 src/filed/backup.c:503 #, c-format msgid "%s digest initialization failed\n" msgstr "" -#: src/filed/verify.c:308 +#: src/filed/verify.c:309 #, c-format msgid " Cannot open %s: ERR=%s.\n" msgstr "" -#: src/filed/verify.c:322 +#: src/filed/verify.c:323 #, c-format msgid " Cannot open resource fork for %s: ERR=%s.\n" msgstr "" -#: src/filed/verify.c:385 +#: src/filed/verify.c:386 #, c-format msgid "Error reading file %s: ERR=%s\n" msgstr "" @@ -15489,12 +15536,12 @@ msgid "Space saved with Base jobs: %lld MB\n" msgstr "" -#: src/filed/accurate.c:395 +#: src/filed/accurate.c:399 #, c-format msgid "Cannot verify checksum for %s\n" msgstr "" -#: src/filed/accurate.c:503 +#: src/filed/accurate.c:507 msgid "2991 Bad accurate command\n" msgstr "" @@ -15578,344 +15625,320 @@ msgid "Bacula Client: Last Job had Warnings" msgstr "" -#: src/filed/xattr.c:92 src/filed/xattr.c:107 src/filed/xattr.c:115 -#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:494 src/filed/acl.c:101 -#: src/filed/acl.c:116 src/filed/acl.c:124 src/filed/backup.c:947 -#: src/filed/backup.c:1143 src/filed/backup.c:1180 src/filed/backup.c:1193 -#: src/filed/backup.c:1269 src/filed/backup.c:1366 +#: src/filed/xattr.c:96 src/filed/xattr.c:111 src/filed/xattr.c:119 +#: src/filed/fd_plugins.c:696 src/filed/fd_plugins.c:710 src/filed/acl.c:105 +#: src/filed/acl.c:120 src/filed/acl.c:128 src/filed/backup.c:993 +#: src/filed/backup.c:1189 src/filed/backup.c:1226 src/filed/backup.c:1239 +#: src/filed/backup.c:1315 src/filed/backup.c:1413 #, c-format msgid "Network send error to SD. ERR=%s\n" msgstr "" -#: src/filed/xattr.c:231 +#: src/filed/xattr.c:244 #, c-format msgid "Illegal xattr stream, no XATTR_MAGIC on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:244 +#: src/filed/xattr.c:258 #, c-format msgid "Illegal xattr stream, xattr name length <= 0 on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:359 src/filed/xattr.c:390 +#: src/filed/xattr.c:376 src/filed/xattr.c:408 #, c-format msgid "llistea error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:452 src/filed/xattr.c:479 +#: src/filed/xattr.c:472 src/filed/xattr.c:500 #, c-format msgid "lgetea error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:496 src/filed/xattr.c:746 src/filed/xattr.c:1146 -#: src/filed/xattr.c:1536 src/filed/xattr.c:1870 src/filed/xattr.c:2606 +#: src/filed/xattr.c:519 src/filed/xattr.c:807 src/filed/xattr.c:1249 +#: src/filed/xattr.c:1702 src/filed/xattr.c:2064 src/filed/xattr.c:2843 #, c-format msgid "Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n" msgstr "" -#: src/filed/xattr.c:524 src/filed/xattr.c:777 src/filed/xattr.c:1174 -#: src/filed/xattr.c:1574 src/filed/xattr.c:1892 +#: src/filed/xattr.c:550 src/filed/xattr.c:841 src/filed/xattr.c:1280 +#: src/filed/xattr.c:1743 src/filed/xattr.c:2089 #, c-format msgid "Failed to serialize extended attributes on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:587 +#: src/filed/xattr.c:624 #, c-format msgid "lsetea error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:655 src/filed/xattr.c:719 src/filed/xattr.c:730 +#: src/filed/xattr.c:710 src/filed/xattr.c:777 src/filed/xattr.c:789 #, c-format msgid "attr_list error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:845 +#: src/filed/xattr.c:916 #, c-format msgid "Received illegal xattr named %s on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:875 src/filed/xattr.c:884 +#: src/filed/xattr.c:947 src/filed/xattr.c:957 #, c-format msgid "attr_set error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:993 src/filed/xattr.c:1023 +#: src/filed/xattr.c:1092 src/filed/xattr.c:1123 #, c-format msgid "llistxattr error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1103 src/filed/xattr.c:1129 +#: src/filed/xattr.c:1204 src/filed/xattr.c:1231 #, c-format msgid "lgetxattr error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1236 +#: src/filed/xattr.c:1350 #, c-format msgid "lsetxattr error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1356 src/filed/xattr.c:1386 +#: src/filed/xattr.c:1507 src/filed/xattr.c:1539 #, c-format msgid "extattr_list_link error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1403 +#: src/filed/xattr.c:1558 #, c-format msgid "Failed to convert %d into namespace on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:1492 src/filed/xattr.c:1518 +#: src/filed/xattr.c:1653 src/filed/xattr.c:1682 #, c-format msgid "extattr_get_link error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1633 +#: src/filed/xattr.c:1809 #, c-format msgid "Failed to split %s into namespace and name part on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:1645 +#: src/filed/xattr.c:1822 #, c-format msgid "Failed to convert %s into namespace on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:1663 +#: src/filed/xattr.c:1841 #, c-format msgid "extattr_set_link error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1753 src/filed/xattr.c:1774 +#: src/filed/xattr.c:1943 src/filed/xattr.c:1965 #, c-format msgid "getproplist error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:1963 +#: src/filed/xattr.c:2169 #, c-format msgid "Unable create proper proplist to restore xattrs on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:1988 +#: src/filed/xattr.c:2196 #, c-format msgid "setproplist error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2274 src/filed/xattr.c:2324 +#: src/filed/xattr.c:2496 src/filed/xattr.c:2547 #, c-format msgid "Unable to get acl on xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2338 +#: src/filed/xattr.c:2562 #, c-format msgid "Unable to get acl text on xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2407 +#: src/filed/xattr.c:2632 #, c-format msgid "Unable to get status on xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2530 +#: src/filed/xattr.c:2763 #, c-format msgid "Unable to open xattr %s on \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2549 +#: src/filed/xattr.c:2784 #, c-format msgid "Unable to read symlin %s on \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2618 +#: src/filed/xattr.c:2859 #, c-format msgid "Unable to read content of xattr %s on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:2654 +#: src/filed/xattr.c:2897 #, c-format msgid "Unable to chdir to xattr space of file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2710 src/filed/xattr.c:2937 +#: src/filed/xattr.c:2953 src/filed/xattr.c:3193 #, c-format msgid "Unable to open file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2735 src/filed/xattr.c:2986 +#: src/filed/xattr.c:2979 src/filed/xattr.c:3246 #, c-format msgid "Unable to open xattr space %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2748 src/filed/xattr.c:2956 +#: src/filed/xattr.c:2993 src/filed/xattr.c:3214 #, c-format msgid "Unable to chdir to xattr space on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2766 +#: src/filed/xattr.c:3012 #, c-format msgid "Unable to list the xattr space on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2855 +#: src/filed/xattr.c:3105 #, c-format msgid "Unable to convert acl from text on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:2862 src/filed/xattr.c:2883 +#: src/filed/xattr.c:3113 src/filed/xattr.c:3135 #, c-format msgid "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2948 +#: src/filed/xattr.c:3205 #, c-format msgid "Unable to open xattr space on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:2972 src/filed/xattr.c:3111 +#: src/filed/xattr.c:3231 src/filed/xattr.c:3379 #, c-format msgid "Unable to open xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3000 +#: src/filed/xattr.c:3261 #, c-format msgid "Unable to chdir to xattr space %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3036 +#: src/filed/xattr.c:3299 #, c-format msgid "Unable to mkfifo xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3050 +#: src/filed/xattr.c:3315 #, c-format msgid "Unable to mknod xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3065 +#: src/filed/xattr.c:3331 #, c-format msgid "Unable to mkdir xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3082 +#: src/filed/xattr.c:3349 #, c-format msgid "Unable to link xattr %s to %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3131 +#: src/filed/xattr.c:3400 #, c-format msgid "" "Unable to restore data of xattr %s on file \"%s\": Not all data available in " "xattr stream\n" msgstr "" -#: src/filed/xattr.c:3141 +#: src/filed/xattr.c:3411 #, c-format msgid "Unable to restore data of xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3161 +#: src/filed/xattr.c:3432 #, c-format msgid "Unable to symlink xattr %s to %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3194 +#: src/filed/xattr.c:3466 #, c-format msgid "Unable to restore owner of xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3219 +#: src/filed/xattr.c:3492 #, c-format msgid "Unable to restore filetimes of xattr %s on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3234 +#: src/filed/xattr.c:3508 #, c-format msgid "Illegal xattr stream, failed to parse xattr stream on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:3291 +#: src/filed/xattr.c:3570 #, c-format msgid "Failed to restore extensible attributes on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:3302 +#: src/filed/xattr.c:3583 #, c-format msgid "Failed to restore extended attributes on file \"%s\"\n" msgstr "" -#: src/filed/xattr.c:3382 src/filed/acl.c:1871 +#: src/filed/xattr.c:3672 src/filed/acl.c:2109 #, c-format msgid "Unable to stat file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/xattr.c:3429 +#: src/filed/xattr.c:3719 #, c-format msgid "" "Can't restore Extended Attributes of %s - incompatible xattr stream " "encountered - %d\n" msgstr "" -#: src/filed/fd_plugins.c:380 +#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:619 #, c-format msgid "Command plugin \"%s\": no type in startBackupFile packet.\n" msgstr "" -#: src/filed/fd_plugins.c:393 +#: src/filed/fd_plugins.c:493 #, c-format msgid "Command plugin \"%s\": no object_name in startBackupFile packet.\n" msgstr "" -#: src/filed/fd_plugins.c:405 +#: src/filed/fd_plugins.c:505 src/filed/fd_plugins.c:626 #, c-format msgid "Command plugin \"%s\": no fname in startBackupFile packet.\n" msgstr "" -#: src/filed/fd_plugins.c:467 +#: src/filed/fd_plugins.c:683 msgid "Plugin save packet not found.\n" msgstr "" -#: src/filed/fd_plugins.c:587 +#: src/filed/fd_plugins.c:806 #, c-format msgid "Plugin=%s not found.\n" msgstr "" -#: src/filed/fd_plugins.c:644 +#: src/filed/fd_plugins.c:863 #, c-format msgid "Plugin createFile call failed. Stat=%d file=%s\n" msgstr "" -#: src/filed/fd_plugins.c:652 +#: src/filed/fd_plugins.c:874 #, c-format msgid "Plugin createFile call failed. Returned CF_ERROR file=%s\n" msgstr "" -#: src/filed/fd_plugins.c:751 -#, c-format -msgid "Loaded plugin: %s\n" -msgstr "" - -#: src/filed/fd_plugins.c:770 -#, c-format -msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n" -msgstr "" - -#: src/filed/fd_plugins.c:778 -#, c-format -msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n" -msgstr "" - -#: src/filed/fd_plugins.c:786 -#, c-format -msgid "Plugin license incompatible. Plugin=%s license=%s\n" -msgstr "" - -#: src/filed/fd_plugins.c:793 -msgid "Plugin size mismatch.\n" -msgstr "" - -#: src/filed/fd_plugins.c:1375 +#: src/filed/fd_plugins.c:1621 msgid "Command plugin: no fname in baculaCheckChanges packet.\n" msgstr "" -#: src/filed/filed.c:75 +#: src/filed/filed.c:76 #, c-format msgid "" "\n" @@ -15937,237 +15960,252 @@ "\n" msgstr "" -#: src/filed/filed.c:198 +#: src/filed/filed.c:199 msgid "-k option has no meaning without -u option.\n" msgstr "" -#: src/filed/filed.c:335 +#: src/filed/filed.c:337 #, c-format msgid "" "No File daemon resource defined in %s\n" "Without that I don't know who I am :-(\n" msgstr "" -#: src/filed/filed.c:340 +#: src/filed/filed.c:342 #, c-format msgid "Only one Client resource permitted in %s\n" msgstr "" -#: src/filed/filed.c:364 +#: src/filed/filed.c:366 #, c-format msgid "" "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for " "File daemon in %s.\n" msgstr "" -#: src/filed/filed.c:388 +#: src/filed/filed.c:390 msgid "PKI encryption/signing enabled but not compiled into Bacula.\n" msgstr "" -#: src/filed/filed.c:399 +#: src/filed/filed.c:401 #, c-format msgid "" "\"PKI Key Pair\" must be defined for File daemon \"%s\" in %s if either " "\"PKI Sign\" or \"PKI Encrypt\" are enabled.\n" msgstr "" -#: src/filed/filed.c:411 src/filed/filed.c:442 src/filed/filed.c:483 +#: src/filed/filed.c:413 src/filed/filed.c:444 src/filed/filed.c:485 msgid "Failed to allocate a new keypair object.\n" msgstr "" -#: src/filed/filed.c:415 +#: src/filed/filed.c:417 #, c-format msgid "Failed to load public certificate for File daemon \"%s\" in %s.\n" msgstr "" -#: src/filed/filed.c:421 +#: src/filed/filed.c:423 #, c-format msgid "Failed to load private key for File daemon \"%s\" in %s.\n" msgstr "" -#: src/filed/filed.c:451 +#: src/filed/filed.c:453 #, c-format msgid "" "Failed to load private key from file %s for File daemon \"%s\" in %s.\n" msgstr "" -#: src/filed/filed.c:458 +#: src/filed/filed.c:460 #, c-format msgid "" "Failed to load trusted signer certificate from file %s for File daemon " "\"%s\" in %s.\n" msgstr "" -#: src/filed/filed.c:489 +#: src/filed/filed.c:491 #, c-format msgid "" "Failed to load master key certificate from file %s for File daemon \"%s\" in " "%s.\n" msgstr "" -#: src/filed/filed.c:505 +#: src/filed/filed.c:507 #, c-format msgid "No Director resource defined in %s\n" msgstr "" -#: src/filed/acl.c:179 src/filed/acl.c:201 +#: src/filed/acl.c:225 src/filed/acl.c:248 #, c-format msgid "aclx_get error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:226 +#: src/filed/acl.c:274 #, c-format msgid "Unknown acl type encountered on file \"%s\": %ld\n" msgstr "" -#: src/filed/acl.c:248 src/filed/acl.c:256 +#: src/filed/acl.c:298 src/filed/acl.c:307 #, c-format msgid "Failed to convert acl into text on file \"%s\"\n" msgstr "" -#: src/filed/acl.c:342 src/filed/acl.c:351 +#: src/filed/acl.c:381 +#, c-format +msgid "" +"Trying to restore POSIX acl on file \"%s\" on filesystem without AIXC acl " +"support\n" +msgstr "" + +#: src/filed/acl.c:389 +#, c-format +msgid "" +"Trying to restore NFSv4 acl on file \"%s\" on filesystem without NFS4 acl " +"support\n" +msgstr "" + +#: src/filed/acl.c:433 src/filed/acl.c:443 #, c-format msgid "aclx_scanStr error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:364 +#: src/filed/acl.c:467 #, c-format msgid "aclx_put error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:692 +#: src/filed/acl.c:809 #, c-format msgid "acl_to_text error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:719 +#: src/filed/acl.c:837 #, c-format msgid "acl_get_file error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:767 +#: src/filed/acl.c:889 #, c-format msgid "" "acl_delete_def_file error on file \"%s\": filesystem doesn't support ACLs\n" msgstr "" -#: src/filed/acl.c:772 +#: src/filed/acl.c:895 #, c-format msgid "acl_delete_def_file error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:780 +#: src/filed/acl.c:904 #, c-format msgid "acl_from_text error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:793 +#: src/filed/acl.c:918 #, c-format msgid "acl_valid error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:822 +#: src/filed/acl.c:948 #, c-format msgid "acl_set_file error on file \"%s\": filesystem doesn't support ACLs\n" msgstr "" -#: src/filed/acl.c:830 +#: src/filed/acl.c:957 #, c-format msgid "acl_set_file error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:919 src/filed/acl.c:944 src/filed/acl.c:1052 -#: src/filed/acl.c:1486 src/filed/acl.c:1582 +#: src/filed/acl.c:1063 src/filed/acl.c:1089 src/filed/acl.c:1201 +#: src/filed/acl.c:1692 src/filed/acl.c:1795 #, c-format msgid "pathconf error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1066 +#: src/filed/acl.c:1216 #, c-format msgid "" "Trying to restore acl on file \"%s\" on filesystem without %s acl support\n" msgstr "" -#: src/filed/acl.c:1306 +#: src/filed/acl.c:1492 #, c-format msgid "getacl error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1337 +#: src/filed/acl.c:1525 #, c-format msgid "acltostr error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1354 src/filed/acl.c:1361 +#: src/filed/acl.c:1546 src/filed/acl.c:1554 #, c-format msgid "strtoacl error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1387 +#: src/filed/acl.c:1582 #, c-format msgid "setacl error on file \"%s\": filesystem doesn't support ACLs\n" msgstr "" -#: src/filed/acl.c:1394 +#: src/filed/acl.c:1590 #, c-format msgid "setacl error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1504 +#: src/filed/acl.c:1711 #, c-format msgid "acl_get error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1574 +#: src/filed/acl.c:1786 #, c-format msgid "" "Trying to restore acl on file \"%s\" on filesystem without acl support\n" msgstr "" -#: src/filed/acl.c:1598 +#: src/filed/acl.c:1812 #, c-format msgid "" -"Trying to restore acl on file \"%s\" on filesystem without aclent acl " +"Trying to restore POSIX acl on file \"%s\" on filesystem without aclent acl " "support\n" msgstr "" -#: src/filed/acl.c:1608 +#: src/filed/acl.c:1823 #, c-format msgid "" -"Trying to restore acl on file \"%s\" on filesystem without ace acl support\n" +"Trying to restore NFSv4 acl on file \"%s\" on filesystem without ace acl " +"support\n" msgstr "" -#: src/filed/acl.c:1623 +#: src/filed/acl.c:1839 #, c-format msgid "acl_fromtext error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1636 src/filed/acl.c:1643 +#: src/filed/acl.c:1853 src/filed/acl.c:1861 #, c-format msgid "wrong encoding of acl type in acl stream on file \"%s\"\n" msgstr "" -#: src/filed/acl.c:1667 +#: src/filed/acl.c:1886 #, c-format msgid "acl_set error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1746 +#: src/filed/acl.c:1971 #, c-format msgid "acltotext error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1764 +#: src/filed/acl.c:1993 #, c-format msgid "aclfromtext error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1781 +#: src/filed/acl.c:2011 #, c-format msgid "acl(SETACL) error on file \"%s\": ERR=%s\n" msgstr "" -#: src/filed/acl.c:1943 +#: src/filed/acl.c:2181 #, c-format msgid "Can't restore ACLs of %s - incompatible acl stream encountered - %d\n" msgstr "" @@ -16176,17 +16214,17 @@ msgid "Storage command not issued before Verify.\n" msgstr "" -#: src/filed/verify_vol.c:97 src/filed/restore.c:282 +#: src/filed/verify_vol.c:97 src/filed/restore.c:483 #, c-format msgid "Record header scan error: %s\n" msgstr "" -#: src/filed/verify_vol.c:106 src/filed/restore.c:294 +#: src/filed/verify_vol.c:106 src/filed/restore.c:495 #, c-format msgid "Data record error. ERR=%s\n" msgstr "" -#: src/filed/verify_vol.c:110 src/filed/restore.c:298 +#: src/filed/verify_vol.c:110 src/filed/restore.c:499 #, c-format msgid "Actual data size %d not same as header %d\n" msgstr "" @@ -16200,628 +16238,621 @@ msgid "Cannot set buffer size FD->SD.\n" msgstr "" -#: src/filed/backup.c:190 +#: src/filed/backup.c:194 #, c-format msgid "Encountered %ld acl errors while doing backup\n" msgstr "" -#: src/filed/backup.c:194 +#: src/filed/backup.c:198 #, c-format msgid "Encountered %ld xattr errors while doing backup\n" msgstr "" -#: src/filed/backup.c:261 src/filed/backup.c:270 +#: src/filed/backup.c:267 src/filed/backup.c:276 msgid "An error occurred while encrypting the stream.\n" msgstr "" -#: src/filed/backup.c:376 +#: src/filed/backup.c:387 #, c-format msgid " Recursion turned off. Will not descend from %s into %s\n" msgstr "" -#: src/filed/backup.c:383 +#: src/filed/backup.c:394 #, c-format msgid "" " %s is a different filesystem. Will not descend from %s into it.\n" msgstr "" -#: src/filed/backup.c:389 +#: src/filed/backup.c:400 #, c-format msgid " Disallowed filesystem. Will not descend from %s into %s\n" msgstr "" -#: src/filed/backup.c:394 +#: src/filed/backup.c:405 #, c-format msgid " Disallowed drive type. Will not descend into %s\n" msgstr "" -#: src/filed/backup.c:405 +#: src/filed/backup.c:416 #, c-format msgid " Socket file skipped: %s\n" msgstr "" -#: src/filed/backup.c:418 +#: src/filed/backup.c:429 #, c-format msgid " Could not access \"%s\": ERR=%s\n" msgstr "" -#: src/filed/backup.c:425 +#: src/filed/backup.c:436 #, c-format msgid " Could not follow link \"%s\": ERR=%s\n" msgstr "" -#: src/filed/backup.c:432 +#: src/filed/backup.c:443 #, c-format msgid " Could not stat \"%s\": ERR=%s\n" msgstr "" -#: src/filed/backup.c:442 +#: src/filed/backup.c:453 #, c-format msgid " Archive file not saved: %s\n" msgstr "" -#: src/filed/backup.c:446 +#: src/filed/backup.c:457 #, c-format msgid " Could not open directory \"%s\": ERR=%s\n" msgstr "" -#: src/filed/backup.c:452 +#: src/filed/backup.c:463 #, c-format msgid " Unknown file type %d; not saved: %s\n" msgstr "" -#: src/filed/backup.c:508 +#: src/filed/backup.c:519 #, c-format msgid "%s signature digest initialization failed\n" msgstr "" -#: src/filed/backup.c:588 +#: src/filed/backup.c:624 #, c-format msgid " Cannot open \"%s\": ERR=%s.\n" msgstr "" -#: src/filed/backup.c:625 +#: src/filed/backup.c:661 #, c-format msgid " Cannot open resource fork for \"%s\": ERR=%s.\n" msgstr "" -#: src/filed/backup.c:717 +#: src/filed/backup.c:757 msgid "Failed to allocate memory for crypto signature.\n" msgstr "" -#: src/filed/backup.c:722 src/filed/backup.c:728 src/filed/backup.c:743 +#: src/filed/backup.c:762 src/filed/backup.c:768 src/filed/backup.c:783 msgid "An error occurred while signing the stream.\n" msgstr "" -#: src/filed/backup.c:767 +#: src/filed/backup.c:807 msgid "An error occurred finalizing signing the stream.\n" msgstr "" -#: src/filed/backup.c:879 +#: src/filed/backup.c:925 #, c-format msgid "Compression deflateParams error: %d\n" msgstr "" -#: src/filed/backup.c:916 +#: src/filed/backup.c:962 msgid "Encrypting sparse or offset data not supported.\n" msgstr "" -#: src/filed/backup.c:923 +#: src/filed/backup.c:969 msgid "Failed to initialize encryption context.\n" msgstr "" -#: src/filed/backup.c:1033 +#: src/filed/backup.c:1079 #, c-format msgid "Compression deflate error: %d\n" msgstr "" -#: src/filed/backup.c:1040 +#: src/filed/backup.c:1086 #, c-format msgid "Compression deflateReset error: %d\n" msgstr "" -#: src/filed/backup.c:1070 +#: src/filed/backup.c:1116 #, c-format msgid "Compression LZO error: %d\n" msgstr "" -#: src/filed/backup.c:1115 src/filed/backup.c:1131 +#: src/filed/backup.c:1161 src/filed/backup.c:1177 msgid "Encryption error\n" msgstr "" -#: src/filed/backup.c:1157 +#: src/filed/backup.c:1203 #, c-format msgid "Read error on file %s. ERR=%s\n" msgstr "" -#: src/filed/backup.c:1160 +#: src/filed/backup.c:1206 #, c-format msgid "Too many errors. JobErrors=%d.\n" msgstr "" -#: src/filed/backup.c:1170 +#: src/filed/backup.c:1216 msgid "Encryption padding error\n" msgstr "" -#: src/filed/backup.c:1234 +#: src/filed/backup.c:1280 msgid "Invalid file flags, no supported data stream type.\n" msgstr "" -#: src/filed/backup.c:1489 +#: src/filed/backup.c:1536 #, c-format msgid "VSS Writer (BackupComplete): %s\n" msgstr "" -#: src/filed/restore.c:116 +#: src/filed/restore.c:114 #, c-format msgid "Size of data or stream of %s not correct. Original %s, restored %s.\n" msgstr "" -#: src/filed/restore.c:136 +#: src/filed/restore.c:134 #, c-format msgid "Invalid length of Finder Info (got %d, not 32)\n" msgstr "" -#: src/filed/restore.c:141 +#: src/filed/restore.c:139 #, c-format msgid "Could not set Finder Info on %s\n" msgstr "" -#: src/filed/restore.c:216 +#: src/filed/restore.c:415 msgid "LZO init failed\n" msgstr "" -#: src/filed/restore.c:451 +#: src/filed/restore.c:657 msgid "Unexpected cryptographic session data stream.\n" msgstr "" -#: src/filed/restore.c:461 +#: src/filed/restore.c:667 msgid "" "No private decryption keys have been defined to decrypt encrypted backup " "data.\n" msgstr "" -#: src/filed/restore.c:472 +#: src/filed/restore.c:678 msgid "Could not create digest.\n" msgstr "" -#: src/filed/restore.c:490 +#: src/filed/restore.c:696 msgid "Missing private key required to decrypt encrypted backup data.\n" msgstr "" -#: src/filed/restore.c:493 +#: src/filed/restore.c:699 msgid "Decrypt of the session key failed.\n" msgstr "" -#: src/filed/restore.c:499 +#: src/filed/restore.c:705 #, c-format msgid "An error occurred while decoding encrypted session data stream: %s\n" msgstr "" -#: src/filed/restore.c:566 src/filed/restore.c:619 +#: src/filed/restore.c:772 src/filed/restore.c:825 #, c-format msgid "Missing encryption session data stream for %s\n" msgstr "" -#: src/filed/restore.c:574 src/filed/restore.c:626 +#: src/filed/restore.c:780 src/filed/restore.c:832 #, c-format msgid "Failed to initialize decryption context for %s\n" msgstr "" -#: src/filed/restore.c:638 +#: src/filed/restore.c:844 #, c-format msgid "Cannot open resource fork for %s.\n" msgstr "" -#: src/filed/restore.c:770 +#: src/filed/restore.c:986 msgid "Unexpected cryptographic signature data stream.\n" msgstr "" -#: src/filed/restore.c:778 +#: src/filed/restore.c:994 #, c-format msgid "Failed to decode message signature for %s\n" msgstr "" -#: src/filed/restore.c:836 +#: src/filed/restore.c:1058 #, c-format msgid "Encountered %ld acl errors while doing restore\n" msgstr "" -#: src/filed/restore.c:840 +#: src/filed/restore.c:1062 #, c-format msgid "Encountered %ld xattr errors while doing restore\n" msgstr "" -#: src/filed/restore.c:844 +#: src/filed/restore.c:1066 #, c-format msgid "" "%d non-supported data streams and %d non-supported attrib streams ignored.\n" msgstr "" -#: src/filed/restore.c:848 +#: src/filed/restore.c:1070 #, c-format msgid "%d non-supported resource fork streams ignored.\n" msgstr "" -#: src/filed/restore.c:851 +#: src/filed/restore.c:1073 #, c-format msgid "%d non-supported Finder Info streams ignored.\n" msgstr "" -#: src/filed/restore.c:854 +#: src/filed/restore.c:1076 #, c-format msgid "%d non-supported acl streams ignored.\n" msgstr "" -#: src/filed/restore.c:857 +#: src/filed/restore.c:1079 #, c-format msgid "%d non-supported crypto streams ignored.\n" msgstr "" -#: src/filed/restore.c:860 +#: src/filed/restore.c:1082 #, c-format msgid "%d non-supported xattr streams ignored.\n" msgstr "" -#: src/filed/restore.c:932 +#: src/filed/restore.c:1162 msgid "Zlib errno" msgstr "" -#: src/filed/restore.c:934 +#: src/filed/restore.c:1164 msgid "Zlib stream error" msgstr "" -#: src/filed/restore.c:936 +#: src/filed/restore.c:1166 msgid "Zlib data error" msgstr "" -#: src/filed/restore.c:938 +#: src/filed/restore.c:1168 msgid "Zlib memory error" msgstr "" -#: src/filed/restore.c:940 +#: src/filed/restore.c:1170 msgid "Zlib buffer error" msgstr "" -#: src/filed/restore.c:942 +#: src/filed/restore.c:1172 msgid "Zlib version error" msgstr "" -#: src/filed/restore.c:982 +#: src/filed/restore.c:1212 #, c-format msgid "Missing cryptographic signature for %s\n" msgstr "" -#: src/filed/restore.c:1015 src/filed/restore.c:1044 +#: src/filed/restore.c:1245 src/filed/restore.c:1274 #, c-format msgid "Signature validation failed for file %s: ERR=%s\n" msgstr "" -#: src/filed/restore.c:1032 +#: src/filed/restore.c:1262 #, c-format msgid "Digest one file failed for file: %s\n" msgstr "" -#: src/filed/restore.c:1071 +#: src/filed/restore.c:1301 #, c-format msgid "Signature validation failed for %s: %s\n" msgstr "" -#: src/filed/restore.c:1166 +#: src/filed/restore.c:1398 #, c-format msgid "LZO uncompression error on file %s. ERR=%d\n" msgstr "" -#: src/filed/restore.c:1203 +#: src/filed/restore.c:1435 #, c-format msgid "Uncompression error on file %s. ERR=%s\n" msgstr "" -#: src/filed/restore.c:1236 +#: src/filed/restore.c:1468 #, c-format msgid "Write error in Win32 Block Decomposition on %s: %s\n" msgstr "" -#: src/filed/restore.c:1295 +#: src/filed/restore.c:1527 msgid "Decryption error\n" msgstr "" -#: src/filed/restore.c:1389 +#: src/filed/restore.c:1620 msgid "Logic error: output file should be open\n" msgstr "" -#: src/filed/restore.c:1420 +#: src/filed/restore.c:1658 msgid "Logic error: output file should not be open\n" msgstr "" -#: src/filed/restore.c:1453 +#: src/filed/restore.c:1692 #, c-format msgid "Decryption error. buf_len=%d decrypt_len=%d on file %s\n" msgstr "" -#: src/filed/restore.c:1574 +#: src/filed/restore.c:1813 msgid "Open File Manager paused\n" msgstr "" -#: src/filed/restore.c:1578 +#: src/filed/restore.c:1817 msgid "FAILED to pause Open File Manager\n" msgstr "" -#: src/filed/restore.c:1586 +#: src/filed/restore.c:1825 #, c-format msgid "Running as '%s'. Privmask=%#08x\n" msgstr "" -#: src/filed/restore.c:1588 +#: src/filed/restore.c:1827 msgid "Failed to retrieve current UserName\n" msgstr "" -#: src/filed/job.c:454 +#: src/filed/job.c:458 #, c-format msgid "2901 Job %s not found.\n" msgstr "" -#: src/filed/job.c:464 +#: src/filed/job.c:468 #, c-format msgid "2001 Job %s marked to be canceled.\n" msgstr "" -#: src/filed/job.c:467 +#: src/filed/job.c:471 msgid "2902 Error scanning cancel command.\n" msgstr "" -#: src/filed/job.c:490 +#: src/filed/job.c:494 #, c-format msgid "2991 Bad setdebug command: %s\n" msgstr "" -#: src/filed/job.c:513 +#: src/filed/job.c:517 #, c-format msgid "Bad estimate command: %s" msgstr "" -#: src/filed/job.c:514 +#: src/filed/job.c:518 msgid "2992 Bad estimate command.\n" msgstr "" -#: src/filed/job.c:537 +#: src/filed/job.c:541 #, c-format msgid "Bad Job Command: %s" msgstr "" -#: src/filed/job.c:563 +#: src/filed/job.c:580 #, c-format msgid "Bad RunBeforeJob command: %s\n" msgstr "" -#: src/filed/job.c:564 src/filed/job.c:582 +#: src/filed/job.c:581 src/filed/job.c:600 msgid "2905 Bad RunBeforeJob command.\n" msgstr "" -#: src/filed/job.c:593 +#: src/filed/job.c:611 msgid "2905 Bad RunBeforeNow command.\n" msgstr "" -#: src/filed/job.c:612 +#: src/filed/job.c:630 #, c-format msgid "Bad RunAfter command: %s\n" msgstr "" -#: src/filed/job.c:613 +#: src/filed/job.c:631 msgid "2905 Bad RunAfterJob command.\n" msgstr "" -#: src/filed/job.c:647 +#: src/filed/job.c:667 #, c-format msgid "Bad RunScript command: %s\n" msgstr "" -#: src/filed/job.c:648 +#: src/filed/job.c:668 msgid "2905 Bad RunScript command.\n" msgstr "" -#: src/filed/job.c:692 +#: src/filed/job.c:722 #, c-format msgid "Bad RestoreObject command: %s\n" msgstr "" -#: src/filed/job.c:753 +#: src/filed/job.c:789 msgid "2909 Bad RestoreObject command.\n" msgstr "" -#: src/filed/job.c:792 +#: src/filed/job.c:828 #, c-format msgid "Plugin Directory not defined. Cannot use plugin: \"%s\"\n" msgstr "" -#: src/filed/job.c:834 +#: src/filed/job.c:870 #, c-format msgid "Error running program: %s. stat=%d: ERR=%s\n" msgstr "" -#: src/filed/job.c:845 +#: src/filed/job.c:881 #, c-format msgid "Cannot open FileSet input file: %s. ERR=%s\n" msgstr "" -#: src/filed/job.c:991 +#: src/filed/job.c:1027 #, c-format msgid "REGEX %s compile error. ERR=%s\n" msgstr "" -#: src/filed/job.c:1137 +#: src/filed/job.c:1178 #, c-format msgid "Invalid FileSet command: %s\n" msgstr "" -#: src/filed/job.c:1607 +#: src/filed/job.c:1651 #, c-format msgid "" "DIR and FD clocks differ by %lld seconds, FD automatically compensating.\n" msgstr "" -#: src/filed/job.c:1616 +#: src/filed/job.c:1660 #, c-format msgid "Unknown backup level: %s\n" msgstr "" -#: src/filed/job.c:1629 +#: src/filed/job.c:1673 #, c-format msgid "Bad level command: %s\n" msgstr "" -#: src/filed/job.c:1651 +#: src/filed/job.c:1695 #, c-format msgid "Bad session command: %s" msgstr "" -#: src/filed/job.c:1712 +#: src/filed/job.c:1756 #, c-format msgid "Bad storage command: %s" msgstr "" -#: src/filed/job.c:1733 +#: src/filed/job.c:1777 #, c-format msgid "Failed to connect to Storage daemon: %s:%d\n" msgstr "" -#: src/filed/job.c:1745 +#: src/filed/job.c:1789 msgid "Failed to authenticate Storage daemon.\n" msgstr "" -#: src/filed/job.c:1792 +#: src/filed/job.c:1836 msgid "ACL support not configured for your machine.\n" msgstr "" -#: src/filed/job.c:1796 +#: src/filed/job.c:1840 msgid "XATTR support not configured for your machine.\n" msgstr "" -#: src/filed/job.c:1805 +#: src/filed/job.c:1849 msgid "Cannot contact Storage daemon\n" msgstr "" -#: src/filed/job.c:1824 +#: src/filed/job.c:1868 #, c-format msgid "Bad response to append open: %s\n" msgstr "" -#: src/filed/job.c:1829 +#: src/filed/job.c:1873 msgid "Bad response from stored to open command\n" msgstr "" -#: src/filed/job.c:1860 +#: src/filed/job.c:1904 #, c-format msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n" msgstr "" -#: src/filed/job.c:1863 -#, c-format -msgid "Generate VSS snapshots failed. ERR=%s\n" +#: src/filed/job.c:1906 +msgid "CreateSGenerate VSS snapshots failed.\n" msgstr "" -#: src/filed/job.c:1869 +#: src/filed/job.c:1912 #, c-format msgid "Generate VSS snapshot of drive \"%c:\\\" failed.\n" msgstr "" -#: src/filed/job.c:1875 +#: src/filed/job.c:1918 #, c-format msgid "VSS Writer (PrepareForBackup): %s\n" msgstr "" -#: src/filed/job.c:1880 +#: src/filed/job.c:1923 msgid "No drive letters found for generating VSS snapshots.\n" msgstr "" -#: src/filed/job.c:1884 -#, c-format -msgid "VSS was not initialized properly. ERR=%s\n" +#: src/filed/job.c:1926 +msgid "VSS was not initialized properly.\n" msgstr "" -#: src/filed/job.c:1934 +#: src/filed/job.c:1976 msgid "Append Close with SD failed.\n" msgstr "" -#: src/filed/job.c:1938 +#: src/filed/job.c:1980 #, c-format msgid "Bad status %d returned from Storage Daemon.\n" msgstr "" -#: src/filed/job.c:1968 +#: src/filed/job.c:2010 #, c-format msgid "2994 Bad verify command: %s\n" msgstr "" -#: src/filed/job.c:1983 src/filed/job.c:2024 +#: src/filed/job.c:2025 src/filed/job.c:2066 #, c-format msgid "2994 Bad verify level: %s\n" msgstr "" -#: src/filed/job.c:2093 +#: src/filed/job.c:2138 #, c-format msgid "Bad replace command. CMD=%s\n" msgstr "" -#: src/filed/job.c:2111 +#: src/filed/job.c:2161 #, c-format msgid "Bad where regexp. where=%s\n" msgstr "" -#: src/filed/job.c:2154 -#, c-format -msgid "VSS Writer (PreRestore): %s\n" -msgstr "" - -#: src/filed/job.c:2165 +#: src/filed/job.c:2199 #, c-format msgid "VSS was not initialized properly. VSS support is disabled. ERR=%s\n" msgstr "" -#: src/filed/job.c:2207 +#: src/filed/job.c:2244 #, c-format msgid "VSS Writer (RestoreComplete): %s\n" msgstr "" -#: src/filed/job.c:2254 +#: src/filed/job.c:2292 msgid "Improper calling sequence.\n" msgstr "" -#: src/filed/job.c:2274 +#: src/filed/job.c:2312 #, c-format msgid "Bad response to SD read open: %s\n" msgstr "" -#: src/filed/job.c:2279 +#: src/filed/job.c:2317 msgid "Bad response from stored to read open command\n" msgstr "" -#: src/filed/job.c:2346 +#: src/filed/job.c:2385 #, c-format msgid "Comm error with SD. bad response to %s. ERR=%s\n" msgstr "" -#: src/filed/job.c:2349 +#: src/filed/job.c:2388 #, c-format msgid "Bad response to %s command. Wanted %s, got %s\n" msgstr "" -#: src/filed/authenticate.c:66 +#: src/filed/authenticate.c:68 #, c-format msgid "I only authenticate directors, not %d\n" msgstr "" -#: src/filed/authenticate.c:98 +#: src/filed/authenticate.c:100 #, c-format msgid "Connection from unknown Director %s at %s rejected.\n" msgstr "" -#: src/filed/authenticate.c:142 +#: src/filed/authenticate.c:144 #, c-format msgid "Incorrect password given by Director at %s.\n" msgstr "" -#: src/filed/authenticate.c:261 +#: src/filed/authenticate.c:263 msgid "" "Authorization key rejected by Storage daemon.\n" "Please see " @@ -17817,7 +17848,7 @@ msgid "Console: name=%s\n" msgstr "" -#: src/qt-console/main.cpp:179 +#: src/qt-console/main.cpp:191 #, c-format msgid "" "\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bash.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bash.po 2012-02-23 07:11:25.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: 2011-12-29 09:11+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: arrayfunc.c:50 msgid "bad array subscript" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bfd.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bfd.po 2012-02-23 07:11:25.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: bfd 2.12.91\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-02 14:25+0100\n" -"PO-Revision-Date: 2011-12-13 16:58+0000\n" +"PO-Revision-Date: 2012-01-27 01:33+0000\n" "Last-Translator: Wang Li \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: 2011-12-29 09:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:29+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: aout-adobe.c:127 msgid "%B: Unknown section type in a.out.adobe file: %x\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/binutils.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/binutils.po 2012-02-23 07:11:25.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: binutils 2.12.91\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-02 14:35+0100\n" -"PO-Revision-Date: 2011-12-13 17:04+0000\n" +"PO-Revision-Date: 2012-01-27 01:49+0000\n" "Last-Translator: Wang Li \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: 2011-12-29 09:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:30+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: addr2line.c:81 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bison.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison.po 2012-02-23 07:11:26.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: 2011-12-29 09:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/complain.c:115 src/complain.c:126 src/complain.c:135 src/complain.c:183 #: src/complain.c:193 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/bison-runtime.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison-runtime.po 2012-02-23 07:11:26.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: 2011-12-29 09:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:33+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: data/glr.c:923 data/yacc.c:727 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/byobu.po 2012-01-02 18:07:43.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/byobu.po 2012-02-23 07:12:04.000000000 +0000 @@ -7,114 +7,193 @@ msgstr "" "Project-Id-Version: byobu\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-24 23:42+0000\n" +"POT-Creation-Date: 2009-11-23 20:48-0600\n" "PO-Revision-Date: 2009-09-29 06:20+0000\n" "Last-Translator: 英华 \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 18:27+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:13+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: usr/lib/byobu/menu:37 usr/bin/byobu-config:121 usr/bin/byobu-config:216 -#: usr/bin/byobu-config:222 +#: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" msgstr "菜单" -#: usr/bin/byobu-export:25 -msgid "" -"\n" -"The byobu-export utility is now deprecated.\n" -"\n" -"To install byobu on a system for which byobu is not packaged, or\n" -"where you are not the root user, simply:\n" -" * Download the latest release (>= 3.0) from:\n" -" https://launchpad.net/byobu/+download\n" -" * And follow the instructions in the README\n" -"\n" -msgstr "" +#: byobu-export:68 byobu-export:71 byobu-select-profile:104 +#: byobu-select-profile:107 +msgid "Choose" +msgstr "选择" -#: usr/bin/byobu-select-profile:84 +#: byobu-export:171 +msgid "File exists" +msgstr "文件存在" + +#: byobu-export:172 +msgid "Remove file? [y/N] " +msgstr "移除文件?[y/N] " + +#: byobu-export:199 +msgid "Select a color: " +msgstr "选择一种颜色: " + +#: byobu-export:240 +msgid "Profile" +msgstr "配置" + +#: byobu-export:241 +msgid "Archive" +msgstr "存档" + +#: byobu-export:243 +msgid "Extract the archive in your home directory on the target system." +msgstr "提取目标系统中您主文件夹中的档案。" + +#: byobu-select-profile:49 +msgid "Error:" +msgstr "错误:" + +#: byobu-select-profile:49 +msgid " file exists, but is not a symlink" +msgstr " 文件存在,但不是一个符号链接" + +#: byobu-select-profile:80 +msgid "Select a screen profile: " +msgstr "选择一个界面配置文件: " + +#: byobu-select-profile:97 msgid "ERROR: Invalid selection" msgstr "错误:无效选择" -#: usr/bin/byobu-select-profile:90 -msgid "Select the foreground color: " -msgstr "" - -#: usr/bin/byobu-select-profile:93 -msgid "Select the background color: " -msgstr "" - -#: usr/bin/byobu-select-profile:107 usr/bin/byobu-select-profile:110 -msgid "Choose" -msgstr "选择" - -#: usr/bin/byobu-select-profile:118 -msgid "Selected" -msgstr "" +#: byobu-select-profile:134 +msgid "" +"If you are using the default set of keybindings, press\\n to activate " +"these changes.\\n\\nOtherwise, exit this screen session and start a new one." +msgstr "如果您使用默认的组合键,按\\n 来使更改生效。\\n\\n否则,退出这个会话界面并启动一个新界面。" + +#: byobu-select-profile:136 +msgid "Run \"byobu\" to activate" +msgstr "运行 \"byobu\" 以生效" -#: usr/bin/byobu-config:88 +#: byobu-config:83 msgid "Byobu currently launches at login (toggle off)" msgstr "Byobu 当前在登录时自动启动(切换到 关闭)" -#: usr/bin/byobu-config:90 +#: byobu-config:85 msgid "Byobu currently does not launch at login (toggle on)" msgstr "Byobu 当前在登录时不自动启动(切换到 自动)" -#: usr/bin/byobu-config:92 -msgid "Help -- Quick Start Guide" -msgstr "" +#: byobu-config:89 +msgid "Help" +msgstr "帮助" + +#: byobu-config:90 +msgid "Change Byobu's colors" +msgstr "改变 Byobu 的颜色" -#: usr/bin/byobu-config:93 usr/bin/byobu-config:197 +#: byobu-config:91 msgid "Toggle status notifications" msgstr "切换 状态通知" -#: usr/bin/byobu-config:94 usr/bin/byobu-config:267 +#: byobu-config:92 +msgid "Change keybinding set" +msgstr "改变按键组合" + +#: byobu-config:93 msgid "Change escape sequence" msgstr "改变转义序列" -#: usr/bin/byobu-config:97 +#: byobu-config:94 +msgid "Create new windows" +msgstr "创建新窗口" + +#: byobu-config:95 +msgid "Manage default windows" +msgstr "管理默认窗口" + +#: byobu-config:99 byobu-config:487 msgid " Byobu Configuration Menu" msgstr " Byobu 配置菜单" -#: usr/bin/byobu-config:106 +#: byobu-config:110 msgid "Okay" msgstr "好" -#: usr/bin/byobu-config:106 usr/bin/byobu-config:196 usr/bin/byobu-config:266 +#: byobu-config:110 byobu-config:144 byobu-config:161 byobu-config:195 +#: byobu-config:335 byobu-config:376 byobu-config:449 msgid "Cancel" msgstr "取消" -#: usr/bin/byobu-config:122 +#: byobu-config:130 msgid "Byobu Help" msgstr "Byobu 帮助" -#: usr/bin/byobu-config:196 usr/bin/byobu-config:266 +#: byobu-config:144 byobu-config:161 byobu-config:195 byobu-config:335 +#: byobu-config:376 byobu-config:449 msgid "Apply" msgstr "应用" -#: usr/bin/byobu-config:215 -msgid "Byobu will not be launched next time you login." -msgstr "" - -#: usr/bin/byobu-config:216 -msgid "Message" -msgstr "消息" +#: byobu-config:146 +msgid "Which profile would you like to use?" +msgstr "您想使用哪个配置文件?" + +#: byobu-config:162 +msgid "Which set of keybindings would you like to use?" +msgstr "您想使用哪套按键组合?" + +#: byobu-config:175 +msgid "Title: " +msgstr "标题: " + +#: byobu-config:177 +msgid "Command: " +msgstr "命令: " + +#: byobu-config:179 +msgid "Presets: " +msgstr "预设: " + +#: byobu-config:193 +msgid "Add to default windows" +msgstr "添加到默认窗口" + +#: byobu-config:197 +msgid "Create new window(s):" +msgstr "创建新窗口:" + +#: byobu-config:336 +msgid "Toggle status notifications:" +msgstr "切换状态通知:" + +#: byobu-config:368 +msgid "Windows:" +msgstr "窗口:" + +#: byobu-config:378 +msgid "Select window(s) to create by default:" +msgstr "选择要默认创建的窗口:" -#: usr/bin/byobu-config:221 +#: byobu-config:398 msgid "Byobu will be launched automatically next time you login." msgstr "Byobu 将在您下次登录时自动启动。" -#: usr/bin/byobu-config:265 +#: byobu-config:406 +msgid "Byobu will not be used next time you login." +msgstr "Byobu 在您下次登录时将不会使用。" + +#: byobu-config:408 +msgid "Message" +msgstr "消息" + +#: byobu-config:448 msgid "Escape key: ctrl-" msgstr "转义键:ctrl-" -#: usr/bin/byobu-config:315 -msgid "Byobu Configuration Menu" -msgstr "" - -#: usr/bin/byobu-config:316 -msgid " between elements | selects | exits" -msgstr "" +#: byobu-config:451 +msgid "Change escape sequence:" +msgstr "转变转义序列:" + +#: byobu-config:488 +msgid "/ between elements | selects | exits" +msgstr "/ 切换项目 | 选择 | 退出" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/checkbox.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/checkbox.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/checkbox.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/checkbox.po 2012-02-23 07:12:01.000000000 +0000 @@ -0,0 +1,3164 @@ +# Simplified Chinese translation for checkbox +# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 +# This file is distributed under the same license as the checkbox package. +# FIRST AUTHOR , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: checkbox\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-16 16:07+0000\n" +"PO-Revision-Date: 2011-09-05 01:20+0000\n" +"Last-Translator: David Gao \n" +"Language-Team: Simplified Chinese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-22 00:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" + +#. Title of the user interface +#: ../gtk/checkbox-gtk.ui.h:1 ../gtk/checkbox-gtk.desktop.in.h:1 +#: ../plugins/user_interface.py:42 +msgid "System Testing" +msgstr "系统测试" + +#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538 +msgid "_Test" +msgstr "测试(_T)" + +#: ../gtk/checkbox-gtk.ui.h:3 +msgid "_Yes" +msgstr "是(_Y)" + +#: ../gtk/checkbox-gtk.ui.h:4 +msgid "_No" +msgstr "否(_N)" + +#: ../gtk/checkbox-gtk.ui.h:5 +msgid "_Skip this test" +msgstr "跳过这个测试(_S)" + +#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:348 +#: ../checkbox_urwid/urwid_interface.py:261 +msgid "Further information:" +msgstr "更多信息:" + +#: ../gtk/checkbox-gtk.ui.h:7 +msgid "_Select All" +msgstr "全部选中(_S)" + +#: ../gtk/checkbox-gtk.ui.h:8 +msgid "_Deselect All" +msgstr "取消全部选中(_D)" + +#: ../gtk/checkbox-gtk.ui.h:9 +msgid "_Previous" +msgstr "上一步(_P)" + +#: ../gtk/checkbox-gtk.ui.h:10 +msgid "Ne_xt" +msgstr "下一步(_X)" + +#: ../gtk/checkbox-gtk.desktop.in.h:2 +msgid "Test your system and submit results to the Ubuntu Friendly project" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:7 +msgid "Test to detect audio devices" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:16 +msgid "" +"PURPOSE:\n" +" This test will check that internal speakers work correctly\n" +"STEPS:\n" +" 1. Make sure that no external speakers or headphones are connected\n" +" If testing a desktop, external speakers are allowed\n" +" 2. Click the Test button to play a brief tone on your audio device\n" +"VERIFICATION:\n" +" Did you hear a tone?" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:33 +msgid "" +"PURPOSE:\n" +" This test will check that headphones connector works correctly\n" +"STEPS:\n" +" 1. Connect a pair of headphones to your audio device\n" +" 2. Click the Test button to play a sound to your audio device\n" +"VERIFICATION:\n" +" Did you hear a sound through the headphones and did the sound play " +"without any distortion, clicks or other strange noises from your headphones?" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:49 +msgid "" +"PURPOSE:\n" +" This test will check that recording sound using the onboard microphone " +"works correctly\n" +"STEPS:\n" +" 1. Disconnect any external microphones that you have plugged in\n" +" 2. Click \"Test\", then speak into your internal microphone\n" +" 3. After a few seconds, your speech will be played back to you.\n" +"VERIFICATION:\n" +" Did you hear your speech played back?" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:66 +msgid "" +"PURPOSE:\n" +" This test will check that recording sound using an external microphone " +"works correctly\n" +"STEPS:\n" +" 1. Connect a microphone to your microphone port\n" +" 2. Click \"Test\", then speak into the external microphone\n" +" 3. After a few seconds, your speech will be played back to you\n" +"VERIFICATION:\n" +" Did you hear your speech played back?" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:82 +msgid "" +"PURPOSE:\n" +" This test will check that a USB audio device works correctly\n" +"STEPS:\n" +" 1. Connect a USB audio device to your system\n" +" 2. Click \"Test\", then speak into the microphone\n" +" 3. After a few seconds, your speech will be played back to you\n" +"VERIFICATION:\n" +" Did you hear your speech played back through the USB headphones?" +msgstr "" + +#. description +#: ../jobs/audio.txt.in:99 +msgid "" +"Play back a sound on the default output and listen for it on the default " +"input. This makes the most sense when the output and input are directly " +"connected, as with a patch cable." +msgstr "" + +#. description +#: ../jobs/autotest.txt.in:6 +msgid "" +"PURPOSE:\n" +" This test will attempt to install and run the Autotest Suite. These " +"tests can be destructive, so this test is blacklisted by default." +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:8 +msgid "" +"Automated test to store bluetooth device information in checkbox report" +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:14 +msgid "" +"PURPOSE:\n" +" This test will check that bluetooth connection works correctly\n" +"STEPS:\n" +" 1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)\n" +" 2. Click on the bluetooth icon in the menu bar\n" +" 3. Select 'Setup new device'\n" +" 4. Look for the device in the list and select it\n" +" 5. In the device write the PIN code automatically chosen by the wizard\n" +" 6. The device should pair with the computer\n" +" 7. Right-click on the bluetooth icon and select browse files\n" +" 8. Authorize the computer to browse the files in the device if needed\n" +" 9. You should be able to browse the files\n" +"VERIFICATION:\n" +" Did all the steps work?" +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:33 +msgid "" +"PURPOSE:\n" +" This test will check that you can transfer information through a " +"bluetooth connection\n" +"STEPS:\n" +" 1. Make sure that you're able to browse the files in your mobile device\n" +" 2. Copy a file from the computer to the mobile device\n" +" 3. Copy a file from the mobile device to the computer\n" +"VERIFICATION:\n" +" Were all files copied correctly?" +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:47 +msgid "" +"PURPOSE:\n" +" This test will check that you can record and hear audio using a " +"bluetooth audio device\n" +"STEPS:\n" +" 1. Enable the bluetooth headset\n" +" 2. Click on the bluetooth icon in the menu bar\n" +" 3. Select 'Setup new device'\n" +" 4. Look for the device in the list and select it\n" +" 5. In the device write the PIN code automatically chosen by the wizard\n" +" 6. The device should pair with the computer\n" +" 7. Click \"Test\" to record for five seconds and reproduce in the " +"bluetooth device\n" +"VERIFICATION:\n" +" Did you hear the sound you recorded in the bluetooth" +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:65 +msgid "" +"PURPOSE:\n" +" This test will check that you can use a bluetooth keyboard\n" +"STEPS:\n" +" 1. Enable the bluetooth keyboard\n" +" 2. Click on the bluetooth icon in the menu bar\n" +" 3. Select 'Setup new device'\n" +" 4. Look for the device in the list and select it\n" +" 5. Click \"Test\"\n" +" 6. Enter some text\n" +"VERIFICATION:\n" +" Were you able to enter some text with the bluetooth keyboard?" +msgstr "" + +#. description +#: ../jobs/bluetooth.txt.in:81 +msgid "" +"PURPOSE:\n" +" This test will check that you can use a bluetooth mouse\n" +"STEPS:\n" +" 1. Enable the bluetooth mouse\n" +" 2. Click on the bluetooth icon in the menu bar\n" +" 3. Select 'Setup new device'\n" +" 4. Look for the device in the list and select it\n" +" 5. Move the mouse around the screen\n" +" 6. Perform some single/double/right click operations\n" +"VERIFICATION:\n" +" Did the mouse work as expected?" +msgstr "" + +#. description +#: ../jobs/camera.txt.in:7 +msgid "This Automated test attempts to detect a camera." +msgstr "" + +#. description +#: ../jobs/camera.txt.in:16 +msgid "" +"PURPOSE:\n" +" This test will check that the built-in camera works\n" +"STEPS:\n" +" 1. Click on Test to display a video capture from the camera for ten " +"seconds.\n" +"VERIFICATION:\n" +" Did you see the video capture?" +msgstr "" + +#. description +#: ../jobs/camera.txt.in:33 +msgid "" +"PURPOSE:\n" +" This test will check that the built-in camera works\n" +"STEPS:\n" +" 1. Click on Test to display a still image from the camera\n" +"VERIFICATION:\n" +" Did you see the image?" +msgstr "" + +#. description +#: ../jobs/codecs.txt.in:7 +msgid "" +"PURPOSE:\n" +" This test will verify your system's ability to play Ogg Vorbis audio " +"files.\n" +"STEPS:\n" +" 1. Click Test to play an Ogg Vorbis file (.ogg)\n" +" 2. Please close the player to proceed.\n" +"VERIFICATION:\n" +" Did the sample play correctly?" +msgstr "" + +#. description +#: ../jobs/codecs.txt.in:22 +msgid "" +"PURPOSE:\n" +" This test will verify your system's ability to play Wave Audio files.\n" +"STEPS:\n" +" 1. Select Test to play a Wave Audio format file (.wav)\n" +" 2. Please close the player to proceed.\n" +"VERIFICATION:\n" +" Did the sample play correctly?" +msgstr "" + +#. description +#: ../jobs/cpu.txt.in:8 +msgid "" +"Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq)." +msgstr "" + +#. description +#: ../jobs/cpu.txt.in:15 +msgid "Test for clock jitter." +msgstr "" + +#. description +#: ../jobs/cpu.txt.in:23 +msgid "Test offlining CPUs in a multicore system." +msgstr "" + +#. description +#: ../jobs/cpu.txt.in:30 +msgid "This test checks cpu topology for accuracy" +msgstr "" + +#. description +#: ../jobs/cpu.txt.in:38 +msgid "This test checks that CPU frequency governors are obeyed when set." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:5 +msgid "Test if the atd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:11 +msgid "Test if the cron daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:17 +msgid "Test if the cupsd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:23 +msgid "Test if the getty daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:29 +msgid "Test if the init daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:35 +msgid "Test if the klogd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:41 +msgid "Test if the nmbd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:47 +msgid "Test if the smbd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:53 +msgid "Test if the syslogd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:61 +msgid "Test if the udevd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/daemons.txt.in:67 +msgid "Test if the winbindd daemon is running when the package is installed." +msgstr "" + +#. description +#: ../jobs/disk.txt.in:4 +msgid "Detects and displays disks attached to the system." +msgstr "" + +#. description +#: ../jobs/disk.txt.in:9 +msgid "Benchmark for each disk" +msgstr "" + +#. description +#: ../jobs/disk.txt.in:23 +msgid "Check stats changes for each disk" +msgstr "" + +#. description +#: ../jobs/disk.txt.in:40 +msgid "SMART test" +msgstr "SMART 测试" + +#. description +#: ../jobs/disk.txt.in:56 +msgid "Maximum disk space used during a default installation test" +msgstr "默认安装测试过程中使用的最大磁盘空间" + +#. description +#: ../jobs/disk.txt.in:71 +msgid "Verify system storage performs at or above baseline performance" +msgstr "" + +#. description +#: ../jobs/disk.txt.in:88 +msgid "" +"Verify that storage devices, such as Fibre Channel and RAID can be detected " +"and perform under stress." +msgstr "" + +#. description +#: ../jobs/fingerprint.txt.in:3 +msgid "" +"PURPOSE:\n" +" This test will verify that a fingerprint reader will work properly for " +"logging into your system.\n" +"PREREQUISITES:\n" +" This test case assumes that there's a testing account from which test " +"cases are run and a personal account that the tester uses to verify the " +"fingerprint reader\n" +"STEPS:\n" +" 1. Click on the user switcher applet.\n" +" 2. Select your user name.\n" +" 3. A window should appear that provides the ability to login either " +"typing your password or using fingerprint authentication.\n" +" 4. Use the fingerprint reader to login.\n" +" 5. Click on the user switcher applet.\n" +" 6. Select the testing account to continue running tests.\n" +"VERIFICATION:\n" +" Did the authentication procedure work correctly?" +msgstr "" + +#. description +#: ../jobs/fingerprint.txt.in:20 +msgid "" +"PURPOSE:\n" +" This test will verify that a fingerprint reader can be used to unlock a " +"locked system.\n" +"STEPS:\n" +" 1. Click on the user switcher applet.\n" +" 2. Select 'Lock screen'.\n" +" 3. Press any key or move the mouse.\n" +" 4. A window should appear that provides the ability to unlock either " +"typing your password or using fingerprint authentication.\n" +" 5. Use the fingerprint reader to unlock.\n" +" 6. Your screen should be unlocked.\n" +"VERIFICATION:\n" +" Did the authentication procedure work correctly?" +msgstr "" + +#. description +#: ../jobs/firewire.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will check the system can detect the insertion of a FireWire " +"HDD\n" +"STEPS:\n" +" 1. Click 'Test' to begin the test. This test will\n" +" timeout and fail if the insertion has not been detected within 10 " +"seconds.\n" +" 2. Plug a FireWire HDD into an available FireWire port.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the " +"automatically\n" +" selected result" +msgstr "" + +#. description +#: ../jobs/firewire.txt.in:19 +msgid "" +"This is an automated test which performs read/write operations on an " +"attached FireWire HDD" +msgstr "" + +#. description +#: ../jobs/firewire.txt.in:27 +msgid "" +" PURPOSE:\n" +" This test will check the system can detect the removal of a FireWire HDD\n" +" STEPS:\n" +" 1. Click 'Test' to begin the test. This test will timeout and fail if\n" +" the removal has not been detected within 10 seconds.\n" +" 2. Remove the previously attached FireWire HDD from the FireWire port.\n" +" VERIFICATION:\n" +" The verification of this test is automated. Do not change the " +"automatically\n" +" selected result" +msgstr "" + +#. description +#: ../jobs/floppy.txt.in:4 +msgid "Floppy test" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:5 +msgid "Test to output the Xorg version" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:12 +msgid "Run gtkperf to make sure that GTK based test cases work" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:18 +msgid "" +"PURPOSE:\n" +" This test will verify that the GUI is usable after manually changing " +"resolution\n" +"STEPS:\n" +" 1. Open the Displays application\n" +" 2. Select a new resolution from the dropdown list\n" +" 3. Click on Apply\n" +" 4. Select the original resolution from the dropdown list\n" +" 5. Click on Apply\n" +"VERIFICATION:\n" +" Did the resolution change as expected?" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:33 +msgid "" +"PURPOSE:\n" +" This test will test display rotation\n" +"STEPS:\n" +" 1. Open the Displays application\n" +" 2. Select a new rotation value from the dropdown list\n" +" 3. Click on Apply\n" +" 4. Click on Restore Previous Configuration\n" +" 5. Click on Apply\n" +" 6. Repeat 2-5 for different rotation values\n" +"VERIFICATION:\n" +" Did the display rotation change as expected?" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:50 +msgid "Test that the X process is running." +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:56 +msgid "Test that the X is not running in failsafe mode." +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:63 +msgid "" +"Test that X does not leak memory when running programs on systems with intel " +"based graphics." +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:70 +msgid "" +"PURPOSE:\n" +" This test will verify the default display resolution\n" +"STEPS:\n" +" 1. This display is using the following resolution:\n" +"INFO:\n" +" $output\n" +"VERIFICATION:\n" +" Is this acceptable for your display?" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:85 +msgid "" +"Ensure the current resolution meets or exceeds the recommended minimum " +"resolution (800x600). See here for details:" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:85 +msgid "https://help.ubuntu.com/community/Installation/SystemRequirements" +msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements" + +#. description +#: ../jobs/graphics.txt.in:95 +msgid "" +"PURPOSE:\n" +" This test will test the default display\n" +"STEPS:\n" +" 1. Click \"Test\" to display a video test.\n" +"VERIFICATION:\n" +" Do you see color bars and static?" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:106 +msgid "Check that VESA drivers are not in use" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:113 +msgid "" +"PURPOSE:\n" +" This test cycles through the detected video modes\n" +"STEPS:\n" +" 1. Click \"Test\" to start cycling through the video modes\n" +"VERIFICATION:\n" +" Did the screen appear to be working for each mode?" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:126 +msgid "Check that hardware is able to run compiz" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:133 +msgid "Check that hardware is able to run Unity 3D" +msgstr "" + +#. description +#: ../jobs/graphics.txt.in:139 +msgid "" +"PURPOSE:\n" +" This test tests the basic 3D capabilities of your video card\n" +"STEPS:\n" +" 1. Click \"Test\" to execute an OpenGL demo. Press ESC at any time to " +"close.\n" +" 2. Verify that the animation is not jerky or slow.\n" +"VERIFICATION:\n" +" 1. Did the 3d animation appear?\n" +" 2. Was the animation free from slowness/jerkiness?" +msgstr "" + +#. description +#: ../jobs/hibernate.txt.in:7 +msgid "" +"PURPOSE:\n" +" This test will check to make sure your system can successfully hibernate " +"(if supported)\n" +"STEPS:\n" +" 1. Click on Test\n" +" 2. The system will hibernate and should wake itself within 5 minutes\n" +" 3. If your system does not wake itself after 5 minutes, please press the " +"power button to wake the system manually\n" +" 4. If the system fails to resume from hibernate, please restart System " +"Testing and mark this test as Failed\n" +"VERIFICATION:\n" +" Did the system successfully hibernate and did it work properly after " +"waking up?" +msgstr "" + +#. description +#: ../jobs/info.txt.in:5 +msgid "Attaches a report of installed codecs for Intel HDA" +msgstr "" + +#. description +#: ../jobs/info.txt.in:10 +msgid "Attaches a report of CPU information" +msgstr "" + +#. description +#: ../jobs/info.txt.in:15 +msgid "Attaches a copy of /var/log/dmesg to the test results" +msgstr "" + +#. description +#: ../jobs/info.txt.in:20 +msgid "Attaches info on DMI" +msgstr "" + +#. description +#: ../jobs/info.txt.in:26 +msgid "Attaches dmidecode output" +msgstr "" + +#. description +#: ../jobs/info.txt.in:31 +msgid "Attaches very verbose lspci output." +msgstr "" + +#. description +#: ../jobs/info.txt.in:40 +msgid "Attaches the contents of the various modprobe conf files." +msgstr "" + +#. description +#: ../jobs/info.txt.in:45 +msgid "Attaches the contents of the /etc/modules file." +msgstr "" + +#. description +#: ../jobs/info.txt.in:50 +msgid "attaches the contents of various sysctl config files." +msgstr "" + +#. description +#: ../jobs/info.txt.in:54 +msgid "Attaches a report of sysfs attributes." +msgstr "" + +#. description +#: ../jobs/info.txt.in:65 +msgid "" +"Attaches a dump of the udev database showing system hardware information." +msgstr "" + +#. description +#: ../jobs/info.txt.in:72 +msgid "Attaches a tarball of gcov data if present." +msgstr "" + +#. description +#: ../jobs/info.txt.in:77 +msgid "Attaches a list of the currently running kernel modules." +msgstr "" + +#. description +#: ../jobs/info.txt.in:85 +msgid "Captures a screenshot." +msgstr "" + +#. description +#: ../jobs/info.txt.in:91 +msgid "Attaches the screenshot captured in info/screenshot." +msgstr "" + +#. description +#: ../jobs/info.txt.in:96 +msgid "Gather log from the Firmware Test Suite run." +msgstr "" + +#. description +#: ../jobs/info.txt.in:103 +msgid "Attaches the contents of /proc/acpi/sleep if it exists." +msgstr "" + +#. description +#: ../jobs/info.txt.in:107 +msgid "Bootchart information." +msgstr "" + +#. description +#: ../jobs/info.txt.in:116 +msgid "SATA/IDE device information." +msgstr "" + +#. description +#: ../jobs/info.txt.in:133 +msgid "Attaches the bootchart png file for bootchart runs" +msgstr "" + +#. description +#: ../jobs/info.txt.in:142 +msgid "Attaches the bootchart log for bootchart test runs." +msgstr "" + +#. description +#: ../jobs/info.txt.in:150 +msgid "installs the installer bootchart tarball if it exists." +msgstr "" + +#. description +#: ../jobs/info.txt.in:155 +msgid "Attaches the installer debug log if it exists." +msgstr "" + +#. description +#: ../jobs/input.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will test your pointing device\n" +"STEPS:\n" +" 1. Move the cursor using the pointing device or touch the screen.\n" +" 2. Perform some single/double/right click operations.\n" +"VERIFICATION:\n" +" Did the pointing device work as expected?" +msgstr "" + +#. description +#: ../jobs/input.txt.in:17 +msgid "" +"PURPOSE:\n" +" This test will test your keyboard\n" +"STEPS:\n" +" 1. Click on Test\n" +" 2. On the open text area, use your keyboard to type something\n" +"VERIFICATION:\n" +" Is your keyboard working properly?" +msgstr "" + +#. description +#: ../jobs/install.txt.in:6 +msgid "" +"Tests to see that apt can access repositories and get updates (does not " +"install updates). This is done to confirm that you could recover from an " +"incomplete or broken update." +msgstr "" + +#. description +#: ../jobs/keys.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will test the brightness key\n" +"STEPS:\n" +" 1. Press the brightness buttons on the keyboard\n" +"VERIFICATION:\n" +" Did the brightness change following to your key presses?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:14 +msgid "" +"PURPOSE:\n" +" This test will test the volume keys\n" +"STEPS:\n" +" 1. Press the volume buttons on the keyboard\n" +"VERIFICATION:\n" +" Did the volume change following to your key presses?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:25 +msgid "" +"PURPOSE:\n" +" This test will test the mute key\n" +"STEPS:\n" +" 1. Press the mute button on the keyboard\n" +"VERIFICATION:\n" +" Did the volume mute following your key presses?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:37 +msgid "" +"PURPOSE:\n" +" This test will test the sleep key\n" +"STEPS:\n" +" 1. Press the sleep key on the keyboard\n" +" 2. Wake your system up by pressing the power button\n" +"VERIFICATION:\n" +" Did the system go to sleep after pressing the sleep key?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:49 +msgid "" +"PURPOSE:\n" +" This test will test the battery information key\n" +"STEPS:\n" +" 1. Press the battery information key on the keyboard\n" +"VERIFICATION:\n" +" Did a notification appear showing the battery status?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:60 +msgid "" +"PURPOSE:\n" +" This test will test the wireless key\n" +"STEPS:\n" +" 1. Press the wireless key on the keyboard\n" +" 2. Press the same key again\n" +"VERIFICATION:\n" +" Did the wireless go off on the first press and on again on the second?" +msgstr "" + +#. description +#: ../jobs/keys.txt.in:74 +msgid "" +"PURPOSE:\n" +" This test will test the media keys of your keyboard\n" +"STEPS:\n" +" 1. Click test to open a window on which to test the media control keys.\n" +" 2. If all the keys work, the test will be marked as passed.\n" +" 3. If your computer has no media control keys, Skip this test.\n" +" VERIFICATION:\n" +" Do the keys work as expected?" +msgstr "" + +#. description +#: ../jobs/local.txt.in:3 +msgid "Audio tests" +msgstr "音频测试" + +#. description +#: ../jobs/local.txt.in:8 +msgid "Autotest Suite tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:13 +msgid "Bluetooth tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:18 +msgid "Camera tests" +msgstr "摄像头测试" + +#. description +#: ../jobs/local.txt.in:23 +msgid "Codec tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:28 +msgid "CPU tests" +msgstr "中央处理器测试" + +#. description +#: ../jobs/local.txt.in:33 +msgid "System Daemon tests" +msgstr "系统守护进程测试" + +#. description +#: ../jobs/local.txt.in:38 +msgid "Disk tests" +msgstr "磁盘测试" + +#. description +#: ../jobs/local.txt.in:43 +msgid "Fingerprint reader tests" +msgstr "指纹阅读器测试" + +#. description +#: ../jobs/local.txt.in:48 +msgid "Firewire disk tests" +msgstr "火线(Firewire)磁盘测试" + +#. description +#: ../jobs/local.txt.in:53 +msgid "Floppy disk tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:58 +msgid "Graphics tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:63 +msgid "Hibernation tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:68 +msgid "Informational tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:73 +msgid "Input Devices tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:78 +msgid "Software Installation tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:83 +msgid "Hotkey tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:88 +msgid "Linux Test Project tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:93 +msgid "Mago Automated Desktop Testing" +msgstr "" + +#. description +#: ../jobs/local.txt.in:98 +msgid "Media Card tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:103 +msgid "Memory tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:108 +msgid "Miscellaneous tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:113 +msgid "Monitor tests" +msgstr "显示器测试" + +#. description +#: ../jobs/local.txt.in:118 +msgid "Networking tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:123 +msgid "Optical Drive tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:128 +msgid "Panel Clock Verification tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:133 +msgid "PCMCIA/PCIX Card tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:138 +msgid "Peripheral tests" +msgstr "外围设备测试" + +#. description +#: ../jobs/local.txt.in:143 +msgid "Phoronix Test Suite tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:148 +msgid "Power Management tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:153 +msgid "QA Regression tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:158 +msgid "Server Services checks" +msgstr "" + +#. description +#: ../jobs/local.txt.in:163 +msgid "Suspend tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:168 +msgid "Unity tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:173 +msgid "USB tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:178 +msgid "User Applications" +msgstr "用户应用程序" + +#. description +#: ../jobs/local.txt.in:183 +msgid "Wireless networking tests" +msgstr "" + +#. description +#: ../jobs/local.txt.in:188 +msgid "Stress tests" +msgstr "压力测试" + +#. description +#: ../jobs/ltp.txt.in:3 +msgid "" +"This test installs and runs Linux Test Project syscalls test. This can be " +"destructive, thus this test is blacklisted by default." +msgstr "" + +#. description +#: ../jobs/mago.txt.in:8 +msgid "" +"PURPOSE:\n" +" This test installs and runs the Mago Automated Desktop Testing suite." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of a Multimedia Card (MMC) media\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an MMC card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:20 +msgid "" +"This test is automated and executes after the mediacard/mmc-insert test is " +"run. It tests reading and writing to the MMC card." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:28 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects\n" +" the removal of the MMC card from the systems card reader.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the MMC card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:43 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of an MMC card after the system has been suspended\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an MMC card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:59 +msgid "" +"This test is automated and executes after the mediacard/mmc-insert-after-" +"suspend test is run. It tests reading and writing to the MMC card after the " +"system has been suspended." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:67 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects the removal\n" +" of an MMC card from the systems card reader after the system has been " +"suspended.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the MMC card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:81 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of a Secure Digital (SD) media card\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an SD card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:97 +msgid "" +"This test is automated and executes after the mediacard/sd-insert test is " +"run. It tests reading and writing to the SD card." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:105 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects\n" +" the removal of an SD card from the systems card reader.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the SD card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:120 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of an SD card after the system has been suspended\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an SD card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:136 +msgid "" +"This test is automated and executes after the mediacard/sd-insert-after-" +"suspend test is run. It tests reading and writing to the SD card after the " +"system has been suspended." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:144 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects\n" +" the removal of an SD card from the systems card reader after the system " +"has been suspended.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the SD card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:158 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of a Secure Digital High-Capacity (SDHC) media " +"card\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an SDHC card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:174 +msgid "" +"This test is automated and executes after the mediacard/sdhc-insert test is " +"run. It tests reading and writing to the SDHC card." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:182 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects\n" +" the removal of an SDHC card from the systems card reader.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the SDHC card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:197 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of an SDHC media card after the system has been " +"suspended\n" +"STEPS:\n" +" 1. Click \"Test\" and insert an SDHC card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:213 +msgid "" +"This test is automated and executes after the mediacard/sdhc-insert-after-" +"suspend test is run. It tests reading and writing to the SDHC card after the " +"system has been suspended." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:221 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects the removal\n" +" of an SDHC card from the systems card reader after the system has been " +"suspended.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the SDHC card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:235 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of a Compact Flash (CF) media card\n" +"STEPS:\n" +" 1. Click \"Test\" and insert a CF card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:251 +msgid "" +"This test is automated and executes after the mediacard/cf-insert test is " +"run. It tests reading and writing to the CF card." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:259 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects\n" +" the removal of a CF card from the systems card reader.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the CF card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:274 +msgid "" +"PURPOSE:\n" +" This test will check that the systems media card reader can\n" +" detect the insertion of a CF card after the system has been suspended\n" +"STEPS:\n" +" 1. Click \"Test\" and insert a CF card into the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:290 +msgid "" +"This test is automated and executes after the mediacard/cf-insert-after-" +"suspend test is run. It tests reading and writing to the CF card after the " +"system has been suspended." +msgstr "" + +#. description +#: ../jobs/mediacard.txt.in:298 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects the removal\n" +" of a CF card from the systems card reader after the system has been " +"suspended.\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the CF card from the reader.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/memory.txt.in:5 +msgid "" +"This test checks the amount of memory which is reporting in meminfo against " +"the size of the memory modules detected by DMI." +msgstr "" + +#. description +#: ../jobs/memory.txt.in:14 +msgid "Test and exercise memory." +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:8 +msgid "" +"PURPOSE:\n" +" This test will check that the system can switch to a virtual terminal " +"and back to X\n" +"STEPS:\n" +" 1. Click \"Test\" to switch to another virtual terminal and then back to " +"X\n" +"VERIFICATION:\n" +" Did your screen change temporarily to a text console and then switch " +"back to your current session?" +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:21 +msgid "Run Firmware Test Suite (fwts) automated tests." +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:31 +msgid "" +"This will run some basic connectivity tests against a BMC, verifying that " +"IPMI works." +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:37 +msgid "" +" Determine if we need to run tests specific to portable computers that may " +"not apply to desktops." +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:45 +msgid "" +"Test that the /var/crash directory doesn't contain anything. Lists the files " +"contained within if it does, or echoes the status of the directory (doesn't " +"exist/is empty)" +msgstr "" + +#. description +#: ../jobs/miscellanea.txt.in:53 +msgid "" +"Test to check that virtualization is supported and the test system has at " +"least a minimal amount of RAM to function as an OpenStack Compute Node" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will check your VGA port. Skip if your system does not have a " +"VGA port.\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the VGA port on your " +"system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:15 +msgid "" +"PURPOSE:\n" +" This test will check your DVI port. Skip if your system does not have a " +"DVI port\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the DVI port on your " +"system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:26 +msgid "" +"PURPOSE:\n" +" This test will check your DisplayPort port. Skip if your system does not " +"have a DisplayPort port\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the DisplayPort port " +"on your system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:37 +msgid "" +"PURPOSE:\n" +" This test will check your HDMI port. Skip if your system does not have a " +"HDMI port\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the HDMI port on your " +"system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:48 +msgid "" +"PURPOSE:\n" +" This test will check your S-VIDEO port. Skip if your system does not " +"have a S-VIDEO port\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the S-VIDEO port on " +"your system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:59 +msgid "" +"PURPOSE:\n" +" This test will check your RCA port. Skip if your system does not have a " +"RCA port\n" +"STEPS:\n" +" 1. Connect a display (if not already connected) to the RCA port on your " +"system\n" +"VERIFICATION:\n" +" Was the desktop displayed correctly on both screens?" +msgstr "" + +#. description +#: ../jobs/monitor.txt.in:70 +msgid "" +"PURPOSE:\n" +" This test will check your monitor power saving capabilities\n" +"STEPS:\n" +" 1. Click \"Test\" to try the power saving capabilities of your monitor\n" +" 2. Press any key or move the mouse to recover\n" +"VERIFICATION:\n" +" Did the the monitor go blank and turn on again?" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:5 +msgid "Test to detect the available network controllers" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:11 +msgid "Tests whether the system has a working Internet connection." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:16 +msgid "Network Information" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:40 +msgid "" +"This is an automated test to gather some info on the current state of your " +"network devices. If no devices are found, the test will exit with an error." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:46 +msgid "" +"PURPOSE:\n" +" This test will check your wired connection\n" +"STEPS:\n" +" 1. Click on the Network icon in the top panel\n" +" 2. Select a network below the \"Wired network\" section\n" +" 3. Click \"Test\" to verify that it's possible to establish a HTTP " +"connection\n" +"VERIFICATION:\n" +" Did a notification show and was the connection correctly established?" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:59 +msgid "" +"PURPOSE:\n" +" This test will check that a DSL modem can be configured and connected.\n" +"STEPS:\n" +" 1. Connect the telephone line to the computer\n" +" 2. Click on the Network icon on the top panel.\n" +" 3. Select \"Edit Connections\"\n" +" 4. Select the \"DSL\" tab\n" +" 5. Click on \"Add\" button\n" +" 6. Configure the connection parameters properly\n" +" 7. Click \"Test\" to verify that it's possible to establish an HTTP " +"connection\n" +"VERIFICATION:\n" +" Did a notification show and was the connection correctly established?" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:76 +msgid "" +"Automated test case to verify availability of some system on the network " +"using ICMP ECHO packets." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37 +msgid "" +"Automated test case to make sure that it's possible to download files " +"through HTTP" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:91 +msgid "Test to see if we can sync local clock to an NTP server" +msgstr "" + +#. description +#: ../jobs/networking.txt.in:97 +msgid "" +"Verify that an installation of checkbox-server on the network can be reached " +"over SSH." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:103 +msgid "Try to enable a remote printer on the network and print a test page." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:108 +msgid "" +"Automated test to walk multiple network cards and test each one in sequence." +msgstr "" + +#. description +#: ../jobs/networking.txt.in:128 +msgid "Test to measure the network bandwidth" +msgstr "" + +#. description +#: ../jobs/optical.txt.in:8 +msgid "Test to detect the optical drives" +msgstr "" + +#. description +#: ../jobs/optical.txt.in:16 +msgid "" +"PURPOSE:\n" +" This test will check your optical devices ability to read CD media\n" +"STEPS:\n" +" 1. Insert appropriate non-blank media into your optical drive(s). Movie " +"and Audio Disks may not work. Self-created data disks have the greatest " +"chance of working.\n" +" 2. If a file browser does not open automatically, open the file browser " +"and access the disk.\n" +" 3. Attempt to open a text file on the disk, or copy a file from the disk " +"to your home directory.\n" +"VERIFICATION:\n" +" Were you able to view files on the disk and either open a file to read " +"or copy a file to your home directory?" +msgstr "" + +#. description +#: ../jobs/optical.txt.in:33 +msgid "" +"PURPOSE:\n" +" This test will check your system's CD writing capabilities. This test " +"requires a blank CD-R. If you do not have a blank CD-R, skip this test.\n" +"STEPS:\n" +" 1. Enter a blank CD-R into your drive\n" +" 2. Click \"Test\" to begin.\n" +" 3. When the CD tray ejects the media after burning, close it (DO NOT " +"remove the disk, it is needed for the second portion of the test). Note, you " +"must close the drive within 10 seconds or the test will time out.\n" +" 4. When the test completes, proceed by clicking \"Next\"\n" +"VERIFICATION:\n" +" This test should automatically select \"Yes\" if it passes, \"No\" if it " +"fails." +msgstr "" + +#. description +#: ../jobs/optical.txt.in:47 +msgid "" +"PURPOSE:\n" +" This test will check your CD audio playback capabilities\n" +"STEPS:\n" +" 1. Insert an audio CD in your optical drive\n" +" 2. Open the Dash (click on the Ubuntu Circle of Friends button on the " +"Launcher)\n" +" 3. Click \"Listen to Music\" to open Banshee\n" +" 4. Select the CD under \"Libraries\" in the left panel of Banshee\n" +" 5. Click the Play button to listen to music\n" +" 6. Stop playing after some time\n" +" 7. Right click on the CD icon under \"Libraries\" and select \"Eject " +"Disc\"\n" +" 8. The CD should be ejected\n" +" 9. Close Banshee\n" +"VERIFICATION:\n" +" Did all the steps work?" +msgstr "" + +#. description +#: ../jobs/optical.txt.in:70 +msgid "" +"PURPOSE:\n" +" This test will check your system's DVD writing capabilities. This test " +"requires a blank DVD-R. If you do not have a blank DVD-R, skip this test.\n" +"STEPS:\n" +" 1. Enter a blank DVD-R into your drive\n" +" 2. Click \"Test\" to begin.\n" +" 3. When the CD tray ejects the media after burning, close it (DO NOT " +"remove the disk, it is needed for the second portion of the test). Note, you " +"must close the drive within 10 seconds or the test will time out.\n" +" 4. When the test completes, proceed by clicking \"Next\"\n" +"VERIFICATION:\n" +" This test should automatically select \"Yes\" if it passes, \"No\" if it " +"fails." +msgstr "" + +#. description +#: ../jobs/optical.txt.in:84 +msgid "" +"PURPOSE:\n" +" This test will check your DVD movie playback capabilities. Note that " +"installation of non-free software (codecs, player, etc) may be required " +"prior to performing this test.\n" +"STEPS:\n" +" 1. Insert a DVD that contains any movie in your optical drive\n" +" 2. Open the Dash (click on the Ubuntu Circle of Friends button on the " +"Launcher)\n" +" 3. Click \"Media Apps\" and then click on \"Movie Player\"\n" +" 4. Play the movie using Movie Player, stop the movie after verifying " +"that it plays\n" +" 6. Eject the DVD\n" +"VERIFICATION:\n" +" Did all the steps work?" +msgstr "" + +#. description +#: ../jobs/optical.txt.in:102 +msgid "" +"PURPOSE:\n" +" This test will check your DVD playback capabilities\n" +"STEPS:\n" +" 1. Insert a DVD that contains any movie in your optical drive\n" +" 2. Click \"Test\" to play the DVD in Totem\n" +"VERIFICATION:\n" +" Did the file play?" +msgstr "" + +#. description +#: ../jobs/panel_clock_test.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will verify that the desktop clock displays the correct date " +"and time\n" +"VERIFICATION:\n" +" Is the clock in the upper right corner of your desktop displaying the " +"correct date and time for your timezone?" +msgstr "" + +#. description +#: ../jobs/panel_clock_test.txt.in:16 +msgid "" +"PURPOSE:\n" +" This test will verify that the desktop clock synchronizes with the system " +"clock.\n" +"STEPS:\n" +" 1. Click the \"Test\" button and verify the clock moves ahead by 1 hour.\n" +" Note: It may take a minute or so for the clock to refresh\n" +" 2. Right click on the clock, then click on \"Time & Date Settings...\"\n" +" 3. Ensure that your clock application is set to manual.\n" +" 4. Change the time 1 hour back\n" +" 5. Close the window and reboot\n" +"VERIFICATION:\n" +" Is your system clock displaying the correct date and time for your " +"timezone?" +msgstr "" + +#. description +#: ../jobs/panel_reboot.txt.in:4 +msgid "" +"PURPOSE:\n" +" This test will verify that you can reboot your system from the desktop " +"menu\n" +"STEPS:\n" +" 1. Click the Gear icon in the upper right corner of the desktop and click " +"on \"Shut Down\"\n" +" 2. Click the \"Restart\" button on the left side of the Shut Down dialog\n" +" 3. After logging back in, restart System Testing and it should resume " +"here\n" +"VERIFICATION:\n" +" Did your system restart and bring up the GUI login cleanly?" +msgstr "" + +#. description +#: ../jobs/pcmcia-pcix.txt.in:3 +msgid "" +"PURPOSE:\n" +" This will verify that a PCMCIA or ExpressCard slot can detect inserted " +"devices\n" +"STEPS:\n" +" 1. Plug a PCMCIA or ExpressCard device into the computer\n" +"VERIFICATION:\n" +" Was the device correctly detected?" +msgstr "" + +#. description +#: ../jobs/peripheral.txt.in:3 +msgid "" +"PURPOSE:\n" +" This test will verify that a network printer is usable\n" +"STEPS:\n" +" 1. Make sure that a printer is available in your network\n" +" 2. Click on the Gear icon in the upper right corner and then click on " +"Printers\n" +" 3. If the printer isn't already listed, click on Add\n" +" 4. The printer should be detected and proper configuration values should " +"be displayed\n" +" 5. Print a test page\n" +"VERIFICATION:\n" +" Were you able to print a test page to the network printer?" +msgstr "" + +#. description +#: ../jobs/peripheral.txt.in:18 +msgid "" +"PURPOSE:\n" +" This test will verify that a USB DLS or Mobile Broadband modem works\n" +"STEPS:\n" +" 1. Connect the USB cable to the computer\n" +" 2. Right click on the Network icon in the panel\n" +" 3. Select 'Edit Connections'\n" +" 4. Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) " +"tab\n" +" 5. Click on add 'Add' button\n" +" 6. Configure the connection parameters properly\n" +" 7. Notify OSD should confirm that the connection has been established\n" +" 8. Select Test to verify that it's possible to establish an HTTP " +"connection\n" +"VERIFICATION:\n" +" Was the connection correctly established?" +msgstr "" + +#. description +#: ../jobs/phoronix.txt.in:9 +msgid "" +"PURPOSE:\n" +" This test will download and install the Phoronix Test Suite and run some " +"selected benchmarking tests." +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:3 +msgid "" +"PURPOSE:\n" +" This test will check your system shutdown/booting cycle\n" +"STEPS:\n" +" 1. Shutdown your machine\n" +" 2. Boot your machine\n" +" 3. Repeat steps 1 and 2 at least 5 times\n" +"VERIFICATION:\n" +" Did the system shutdown and rebooted correctly?" +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:15 +msgid "" +"PURPOSE:\n" +" This test will check your lid sensors\n" +"STEPS:\n" +" 1. Close your laptop lid\n" +"VERIFICATION:\n" +" Does closing your laptop lid cause your system to suspend?" +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:32 +msgid "" +"PURPOSE:\n" +" This test will check your lid sensors\n" +"STEPS:\n" +" 1. Click \"Test\"\n" +" 2. Close and open the lid\n" +"VERIFICATION:\n" +" Did the screen turn off while the lid was closed?" +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:50 +msgid "" +"PURPOSE:\n" +" This test will check your lid sensors\n" +"STEPS:\n" +" 1. Click \"Test\"\n" +" 2. Close the lid\n" +" 3. Wait 5 seconds with the lid closed\n" +" 4. Open the lid\n" +"VERIFICATION:\n" +" Did the system resume when the lid was opened?" +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:66 +msgid "Make sure that the RTC (Real-Time Clock) device exists." +msgstr "确认实时时钟(RTC)设备存在" + +#. description +#: ../jobs/power-management.txt.in:71 +msgid "Test ACPI Wakealarm (fwts wakealarm) " +msgstr "" + +#. description +#: ../jobs/power-management.txt.in:80 +msgid "" +"Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple " +"regression check)" +msgstr "" + +#. description +#: ../jobs/qa_regression.txt.in:7 +msgid "" +"PURPOSE:\n" +" This is to install and run the Ubuntu QA regression tests (destructive)" +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:5 +msgid "Verifies that sshd is running." +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:11 +msgid "Verifies that Print/CUPs server is running." +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:18 +msgid "Verifies that DNS server is running and working." +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:25 +msgid "Verifies that Samba server is running." +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:32 +msgid "Verifies that the LAMP stack is running (Apache, MySQL and PHP)." +msgstr "" + +#. description +#: ../jobs/server-services.txt.in:39 +msgid "Verifies that Tomcat server is running and working." +msgstr "" + +#. description +#: ../jobs/stress.txt.in:8 +msgid "" +"PURPOSE:\n" +" Create jobs that use the CPU as much as possible for two hours. The test " +"is considered passed if the system does not freeze." +msgstr "" + +#. description +#: ../jobs/stress.txt.in:18 +msgid "" +"PURPOSE:\n" +" This test will enter and resume from hibernate for 30 iterations\n" +"STEPS:\n" +" 1. Ensure your system has no power-on or HDD passwords set, and that " +"grub is set to boot Ubuntu by default if you have a multi-boot set-up\n" +" 2. Click \"Test\" to start the test (very lengthy)\n" +" 3. If your system does not wake itself after 2 minutes, you will need to " +"press the power button\n" +" 4. If the system fails to resume from hibernation and must be rebooted, " +"please restart System Testing and mark this test as Failed\n" +"VERIFICATION:\n" +" Did the system successfully hibernate and wake 30 times?" +msgstr "" + +#. description +#: ../jobs/stress.txt.in:35 +msgid "" +"PURPOSE:\n" +" This test will enter and resume from suspend for 30 iterations\n" +"STEPS:\n" +" 1. Click \"Test\" to start the test (very lengthy)\n" +" 2. If the system fails to resume from suspend and must be rebooted, " +"please restart System Testing and mark this test as Failed\n" +"VERIFICATION:\n" +" Did the system successfully suspend and resume 30 times?" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:4 +msgid "Record the current network before suspending." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:9 +msgid "Record the current resolution before suspending." +msgstr "挂起前记录当前分辨率。" + +#. description +#: ../jobs/suspend.txt.in:17 +msgid "Record mixer settings before suspending." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:24 +msgid "Verify that all the CPUs are online before suspending" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:31 +msgid "" +"Dumps memory info to a file for comparison after suspend test has been run" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:49 +msgid "" +"This test disconnects all connections and then connects to the wireless " +"interface. It then checks the connection to confirm it's working as expected." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:83 +msgid "" +"PURPOSE:\n" +" This test will check suspend and resume\n" +"STEPS:\n" +" 1. Click \"Test\" and your system will suspend for about 30 - 60 " +"seconds\n" +" 2. If your system does not wake itself up after 60 seconds, please press " +"the power button momentarily to wake the system manually\n" +" 3. If your system fails to wake at all and must be rebooted, restart " +"System Testing after reboot and mark this test as Failed\n" +"VERIFICATION:\n" +" Did your system suspend and resume correctly?" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:96 +msgid "Test the network after resuming." +msgstr "恢复后测试网络。" + +#. description +#: ../jobs/suspend.txt.in:102 +msgid "" +"Test to see that we have the same resolution after resuming as before." +msgstr "测试恢复后分辨率是否与之前相同。" + +#. description +#: ../jobs/suspend.txt.in:111 +msgid "" +"Verify that mixer settings after suspend are the same as before suspend." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:127 +msgid "Verify that all CPUs are online after resuming." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:144 +msgid "Verify that all memory is available after resuming from suspend." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:153 +msgid "" +"PURPOSE:\n" +" This test will check that the display is correct after suspend and " +"resume\n" +"VERIFICATION:\n" +" Does the display work normally after resuming from suspend?" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:174 +msgid "" +"This test checks that the wireless interface is working after suspending the " +"system. It disconnects all interfaces and then connects to the wireless " +"interface and checks that the connection is working as expected." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:186 +msgid "" +"This test grabs the hardware address of the bluetooth adapter after suspend " +"and compares it to the address grabbed before suspend." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:196 +msgid "" +"This is an automated Bluetooth file transfer test. It sends an image to the " +"device specified by the BTDEVADDR environment variable." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:206 +msgid "" +"PURPOSE:\n" +" This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a " +"specified device\n" +"STEPS:\n" +" 1. Click \"Test\" and you will be prompted to enter the Bluetooth device " +"name of a device that can accept file transfers (It may take a few moments " +"after entering the name for the file to begin sending)\n" +" 2. Accept any prompts that appear on both devices\n" +"VERIFICATION:\n" +" Was the data correctly transferred?" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:220 +msgid "" +"PURPOSE:\n" +" This test will cycle through the detected display modes\n" +"STEPS:\n" +" 1. Click \"Test\" and the display will cycle trough the display modes\n" +"VERIFICATION:\n" +" Did your display look fine in the detected mode?" +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:232 +msgid "" +"This test will check to make sure supported video modes work after a suspend " +"and resume. This is done automatically by taking screenshots and uploading " +"them as an attachment." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:241 +msgid "" +"This attaches screenshots from the " +"suspend/cycle_resolutions_after_suspend_auto test to the results submission." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:251 +msgid "" +"This will check to make sure that your audio device works properly after a " +"suspend and resume. This may work fine with speakers and onboard " +"microphone, however, it works best if used with a cable connecting the audio-" +"out jack to the audio-in jack." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:260 +msgid "This is the automated version of suspend/suspend_advanced." +msgstr "" + +#. description +#: ../jobs/suspend.txt.in:269 +msgid "" +"This automatically tests Wake-on-LAN capability with the aid of a suitably " +"configured server. During this process the system will suspend, then " +"automatically wake up after no more than 5 minutes." +msgstr "" + +#. description +#: ../jobs/unity.txt.in:6 +msgid "" +"Xlib is required for unity testing. This checks for Xlib and installs it if " +"not available." +msgstr "" + +#. description +#: ../jobs/unity.txt.in:13 +msgid "" +"This test will verify that Unity is running and then run the autopilot.py " +"test against the Unity interface." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:5 +msgid "Detects and shows USB devices attached to this system." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:12 +msgid "" +"PURPOSE:\n" +" This test will check that your system detects USB storage devices.\n" +"STEPS:\n" +" 1. Plug in one or more USB keys or hard drives.\n" +" 2. Click on \"Test\".\n" +"INFO:\n" +" $output\n" +"VERIFICATION:\n" +" Were the drives detected?" +msgstr "" + +#. description +#: ../jobs/usb.txt.in:28 +msgid "" +"PURPOSE:\n" +" This test will check your USB connection.\n" +"STEPS:\n" +" 1. Plug a USB keyboard into the computer.\n" +" 2. Click on \"Test\" and enter some text.\n" +"VERIFICATION:\n" +" Does the keyboard work?" +msgstr "" + +#. description +#: ../jobs/usb.txt.in:41 +msgid "" +"PURPOSE:\n" +" This test will check your USB connection.\n" +"STEPS:\n" +" 1. Plug a USB mouse into the computer.\n" +" 2. Perform some single/double/right click operations.\n" +"VERIFICATION:\n" +" Does the mouse work correctly?" +msgstr "" + +#. description +#: ../jobs/usb.txt.in:55 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects the insertion of\n" +" a USB storage device\n" +"STEPS:\n" +" 1. Click \"Test\" and insert a USB storage device (pen-drive/HDD).\n" +" (Note: this test will time-out after 10 seconds.)\n" +" 2. Do not unplug the device after the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:72 +msgid "" +"PURPOSE:\n" +" This test will check that the system correctly detects the removal of\n" +" a USB storage device\n" +"STEPS:\n" +" 1. Click \"Test\" and remove the USB device.\n" +" (Note: this test will time-out after 10 seconds.)\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:88 +msgid "" +"PURPOSE:\n" +" This test will check your USB connection.\n" +"STEPS:\n" +" 1. Plug a USB HDD or thumbdrive into the computer.\n" +" 2. An icon should appear on the Launcher.\n" +" 3. Click \"Test\" to begin the test.\n" +"VERIFICATION:\n" +" The verification of this test is automated. Do not change the\n" +" automatically selected result." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:104 +msgid "This test is automated and executes after the usb/insert test is run." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:111 +msgid "" +"This is an automated version of usb/storage-automated and assumes that the " +"server has usb storage devices plugged in prior to checkbox execution. It " +"is intended for servers and SRU automated testing." +msgstr "" + +#. description +#: ../jobs/usb.txt.in:119 +msgid "" +"PURPOSE:\n" +" This test will check your USB connection.\n" +"STEPS:\n" +" 1. Connect a USB storage device to an external USB slot on this " +"computer.\n" +" 2. An icon should appear on the Launcher.\n" +" 3. Confirm that the icon appears.\n" +" 4. Eject the device.\n" +" 5. Repeat with each external USB slot.\n" +"VERIFICATION:\n" +" Do all USB slots work with the device?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:6 +msgid "" +"PURPOSE:\n" +" This test will check that the update manager can find updates.\n" +"STEPS:\n" +" 1. Click Test to launch update-manager.\n" +" 2. Follow the prompts and if updates are found, install them.\n" +" 3. When Update Manager has finished, please close the app by clicking the " +"Close button in the lower right corner.\n" +"VERIFICATION:\n" +" Did Update manager find and install updates (Pass if no updates are found,\n" +" but Fail if updates are found but not installed)" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:22 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can create a new folder.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. On the menu bar, click File -> Create Folder.\n" +" 3. In the name box for the new folder, enter the name Test Folder and hit " +"Enter.\n" +" 4. Close the File browser.\n" +"VERIFICATION:\n" +" Do you now have a new folder called Test Folder?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:37 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can copy a folder\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Right click on the folder called Test Folder and click on Copy.\n" +" 3. Right Click on any white area in the window and click on Paste.\n" +" 4. Right click on the folder called Test Folder(copy) and click Rename.\n" +" 5. Enter the name Test Data in the name box and hit Enter.\n" +" 6. Close the File browser.\n" +"VERIFICATION:\n" +" Do you now have a folder called Test Data?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:54 +msgid "" +"PURPOSE:\n" +" This test will verify that the file browser can move a folder.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Click and drag the folder called Test Data onto the icon called Test " +"Folder.\n" +" 3. Release the button.\n" +" 4. Double click the folder called Test Folder to open it up.\n" +" 5. Close the File Browser.\n" +"VERIFICATION:\n" +" Was the folder called Test Data successfully moved into the folder called " +"Test Folder?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:70 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can create a new file.\n" +"STEPS:\n" +" 1. Click Select Test to open the File Browser.\n" +" 2. Right click in the white space and click Create Document -> Empty " +"Document.\n" +" 3. Enter the name Test File 1 in the name box and hit Enter.\n" +" 4. Close the File browser.\n" +"VERIFICATION:\n" +" Do you now have a file called Test File 1?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:85 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can copy a file.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Right click on the file called Test File 1 and click Copy.\n" +" 3. Right click in the white space and click Paste.\n" +" 4. Right click on the file called Test File 1(copy) and click Rename.\n" +" 5. Enter the name Test File 2 in the name box and hit Enter.\n" +" 6. Close the File Browser.\n" +"VERIFICATION:\n" +" Do you now have a file called Test File 2?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:102 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can move a file.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Click and drag the file called Test File 2 onto the icon for the folder " +"called Test Data.\n" +" 3. Release the button.\n" +" 4. Double click the icon for Test Data to open that folder up.\n" +" 5. Close the File Browser.\n" +"VERIFICATION:\n" +" Was the file Test File 2 successfully moved into the Test Data folder?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:118 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can delete a file.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Right click on the file called Test File 1 and click on Move To Trash.\n" +" 3. Verify that Test File 1 has been removed.\n" +" 4. Close the File Browser.\n" +"VERIFICATION:\n" +" Is Test File 1 now gone?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:133 +msgid "" +"PURPOSE:\n" +" This test will check that the file browser can delete a folder.\n" +"STEPS:\n" +" 1. Click Test to open the File Browser.\n" +" 2. Right click on the folder called Test Folder and click on Move To " +"Trash.\n" +" 3. Verify that the folder was deleted.\n" +" 4. Close the file browser.\n" +"VERIFICATION:\n" +" Has Test Folder been successfully deleted?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:207 +msgid "Common Document Types Test" +msgstr "常用文档类型测试" + +#. description +#: ../jobs/user_apps.txt.in:228 +msgid "" +"PURPOSE:\n" +" This test will check that Firefox can render a basic web page.\n" +"STEPS:\n" +" 1. Select Test to launch Firefox and view the test web page.\n" +"VERIFICATION:\n" +" Did the Ubuntu Test page load correctly?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:241 +msgid "" +"PURPOSE:\n" +" This test will check that Firefox can run a java applet in a web page. " +"Note:\n" +" this may require installing additional software to complete successfully.\n" +"STEPS:\n" +" 1. Select Test to open Firefox with the Java test page, and follow the " +"instructions there.\n" +"VERIFICATION:\n" +" Did the applet display?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:255 +msgid "" +"PURPOSE:\n" +" This test will check that Firefox can run flash applications. Note: this " +"may\n" +" require installing additional software to successfully complete.\n" +"STEPS:\n" +" 1. Select Test to launch Firefox and view a sample Flash test.\n" +"VERIFICATION:\n" +" Did you see the text?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:269 +msgid "" +"PURPOSE:\n" +" This test will check that Firefox can play a Flash video. Note: this may\n" +" require installing additional software to successfully complete.\n" +"STEPS:\n" +" 1. Select Test to launch Firefox and view a short flash video.\n" +"VERIFICATION:\n" +" Did the video play correctly?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:283 +msgid "" +"PURPOSE:\n" +" This test will check that Firefox can play a Quicktime (.mov) video file.\n" +" Note: this may require installing additional software to successfully\n" +" complete.\n" +"STEPS:\n" +" 1. Select Test to launch Firefox with a sample video.\n" +"VERIFICATION:\n" +" Did the video play using a plugin?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:297 +msgid "" +"PURPOSE:\n" +" This test will check that Empathy messaging client works.\n" +"STEPS:\n" +" 1. Select Test to launch Empathy.\n" +" 2. Configure it to connect to the Facebook Chat service.\n" +" 3. Once you have completed the test, please quit Empathy to continue here.\n" +"VERIFICATION:\n" +" Were you able to connect correctly and send/receive messages?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:311 +msgid "" +"PURPOSE:\n" +" This test will check that Empathy messaging client works.\n" +"STEPS:\n" +" 1. Select Test to launch Empathy.\n" +" 2. Configure it to connect to the Google Talk (gtalk) service.\n" +" 3. Once you have completed the test, please quit Empathy to continue here.\n" +"VERIFICATION:\n" +" Were you able to connect correctly and send/receive messages?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:325 +msgid "" +"PURPOSE:\n" +" This test will check that Empathy messaging client works.\n" +"STEPS:\n" +" 1. Select Test to launch Empathy.\n" +" 2. Configure it to connect to the Jabber service.\n" +" 3. Once you have completed the test, please quit Empathy to continue here.\n" +"VERIFICATION:\n" +" Were you able to connect correctly and send/receive messages?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:339 +msgid "" +"PURPOSE:\n" +" This test will check that Empathy messaging client works.\n" +"STEPS:\n" +" 1. Select Test to launch Empathy.\n" +" 2. Configure it to connect to the AOL Instant Messaging (AIM) service.\n" +" 3. Once you have completed the test, please quit Empathy to continue here.\n" +"VERIFICATION:\n" +" Were you able to connect correctly and send/receive messages?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:353 +msgid "" +"PURPOSE:\n" +" This test will check that Empathy messaging client works.\n" +"STEPS:\n" +" 1. Select Test to launch Empathy.\n" +" 2. Configure it to connect to the Microsoft Network (MSN) service.\n" +" 3. Once you have completed the test, please quit Empathy to continue here.\n" +"VERIFICATION:\n" +" Were you able to connect correctly and send/receive messages?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:367 +msgid "" +"PURPOSE:\n" +" This test will check that Evolution works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to launch Evolution.\n" +" 2. Configure it to connect to a POP3 account.\n" +"VERIFICATION:\n" +" Were you able to receive and read e-mail correctly?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:380 +msgid "" +"PURPOSE:\n" +" This test will check that Evolution works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to launch Evolution.\n" +" 2. Configure it to connect to a IMAP account.\n" +"VERIFICATION:\n" +" Were you able to receive and read e-mail correctly?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:393 +msgid "" +"PURPOSE:\n" +" This test will check that Evolution works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to launch Evolution.\n" +" 2. Configure it to connect to a SMTP account.\n" +"VERIFICATION:\n" +" Were you able to send e-mail without errors?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:406 +msgid "" +"PURPOSE:\n" +" This test checks that gcalctool (Calculator) works.\n" +"STEPS:\n" +" Click the \"Test\" button to open the calculator.\n" +"VERIFICATION:\n" +" Did it launch correctly?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:419 +msgid "" +"PURPOSE:\n" +" This test checks that gcalctool (Calculator) works.\n" +"STEPS:\n" +" Click the \"Test\" button to open the calculator and perform:\n" +" 1. Simple math functions (+,-,/,*)\n" +" 2. Nested math functions ((,))\n" +" 3. Fractional math\n" +" 4. Decimal math\n" +"VERIFICATION:\n" +" Did the functions perform as expected?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:436 +msgid "" +"PURPOSE:\n" +" This test checks that gcalctool (Calculator) works.\n" +"STEPS:\n" +" Click the \"Test\" button to open the calculator and perform:\n" +" 1. Memory set\n" +" 2. Memory reset\n" +" 3. Memory last clear\n" +" 4. Memory clear\n" +"VERIFICATION:\n" +" Did the functions perform as expected?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:453 +msgid "" +"PURPOSE:\n" +" This test checks that gcalctool (Calculator) works.\n" +"STEPS:\n" +" Click the \"Test\" button to open the calculator and perform:\n" +" 1. Cut\n" +" 2. Copy\n" +" 3. Paste\n" +"VERIFICATION:\n" +" Did the functions perform as expected?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:468 +msgid "" +"PURPOSE:\n" +" This test checks that gedit works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to open gedit.\n" +" 2. Enter some text and save the file (make a note of the file name you " +"use), then close gedit.\n" +"VERIFICATION:\n" +" Did this perform as expected?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:482 +msgid "" +"PURPOSE:\n" +" This test checks that gedit works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to open gedit, and re-open the file you " +"created previously.\n" +" 2. Edit then save the file, then close gedit.\n" +"VERIFICATION:\n" +" Did this perform as expected?" +msgstr "" + +#. description +#: ../jobs/user_apps.txt.in:495 +msgid "" +"PURPOSE:\n" +" This test will check that Gnome Terminal works.\n" +"STEPS:\n" +" 1. Click the \"Test\" button to open Terminal.\n" +" 2. Type 'ls' and press enter. You should see a list of files and folder in " +"your home directory.\n" +" 3. Close the terminal window.\n" +"VERIFICATION:\n" +" Did this perform as expected?" +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:6 +msgid "Wireless scanning test. It scans and reports on discovered APs." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:12 +msgid "" +"PURPOSE:\n" +" This test will check your wireless connection.\n" +"STEPS:\n" +" 1. Click on the Network icon in the panel.\n" +" 2. Select a network below the 'Wireless networks' section.\n" +" 3. Click \"Test\" to verify that it's possible to establish an HTTP " +"connection.\n" +"VERIFICATION:\n" +" Did a notification show and was the connection correctly established?" +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:28 +msgid "" +"Tests that the systems wireless hardware can connect to a router using WPA " +"security and the 802.11b/g protocols." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:38 +msgid "" +"Tests that the systems wireless hardware can connect to a router using no " +"security and the 802.11b/g protocols." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:48 +msgid "" +"Tests that the systems wireless hardware can connect to a router using WPA " +"security and the 802.11n protocol." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:58 +msgid "" +"Tests that the systems wireless hardware can connect to a router using no " +"security and the 802.11n protocol." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:70 +msgid "" +"Tests the performance of a systems wireless connection through the iperf " +"tool." +msgstr "" + +#. description +#: ../jobs/wireless.txt.in:81 +msgid "" +"Tests the performance of a systems wireless connection through the iperf " +"tool, using UDP packets." +msgstr "" + +#: ../checkbox/application.py:66 +msgid "Usage: checkbox [OPTIONS]" +msgstr "用法: checkbox [选项]" + +#: ../checkbox/application.py:70 +msgid "Print version information and exit." +msgstr "显示版本信息并退出。" + +#: ../checkbox/application.py:74 +msgid "The file to write the log to." +msgstr "写入到日志的文件。" + +#: ../checkbox/application.py:77 +msgid "One of debug, info, warning, error or critical." +msgstr "调试,信息,警告,错误或者致命错误之一。" + +#: ../checkbox/application.py:82 +msgid "Configuration override parameters." +msgstr "配置覆盖参数。" + +#: ../checkbox/application.py:84 +msgid "Shorthand for --config=.*/jobs_info/blacklist." +msgstr "" + +#: ../checkbox/application.py:86 +msgid "Shorthand for --config=.*/jobs_info/blacklist_file." +msgstr "" + +#: ../checkbox/application.py:88 +msgid "Shorthand for --config=.*/jobs_info/whitelist." +msgstr "" + +#: ../checkbox/application.py:90 +msgid "Shorthand for --config=.*/jobs_info/whitelist_file." +msgstr "" + +#: ../checkbox/application.py:115 +msgid "Missing configuration file as argument.\n" +msgstr "丢失配置文件作为参数。\n" + +#: ../checkbox/job.py:84 +msgid "Command not found." +msgstr "" + +#: ../checkbox/job.py:92 +#, python-format +msgid "Command received signal %s: %s" +msgstr "" + +#: ../checkbox/lib/signal.py:23 +msgid "" +"Hangup detected on controlling terminal or death of controlling process" +msgstr "在控制终端或控制进程死掉时检测到了挂起" + +#: ../checkbox/lib/signal.py:24 +msgid "Interrupt from keyboard" +msgstr "从键盘中断" + +#: ../checkbox/lib/signal.py:25 +msgid "Quit from keyboard" +msgstr "从键盘退出" + +#: ../checkbox/lib/signal.py:26 +msgid "Illegal Instruction" +msgstr "非法指令" + +#: ../checkbox/lib/signal.py:27 +msgid "Abort signal from abort(3)" +msgstr "来自 abort(3) 的取消信号" + +#: ../checkbox/lib/signal.py:28 +msgid "Floating point exception" +msgstr "浮点异常" + +#: ../checkbox/lib/signal.py:29 +msgid "Kill signal" +msgstr "杀死信号" + +#: ../checkbox/lib/signal.py:30 +msgid "Invalid memory reference" +msgstr "无效内存调用" + +#: ../checkbox/lib/signal.py:31 +msgid "Broken pipe: write to pipe with no readers" +msgstr "管道中断:写向管道时没有读入者" + +#: ../checkbox/lib/signal.py:32 +msgid "Timer signal from alarm(2)" +msgstr "来自 alarm(2) 的时间信号" + +#: ../checkbox/lib/signal.py:33 +msgid "Termination signal" +msgstr "终止信号" + +#: ../checkbox/lib/signal.py:34 +msgid "User-defined signal 1" +msgstr "用户定义信号 1" + +#: ../checkbox/lib/signal.py:35 +msgid "User-defined signal 2" +msgstr "用户定义信号 2" + +#: ../checkbox/lib/signal.py:36 +msgid "Child stopped or terminated" +msgstr "子进程停止或被终止" + +#: ../checkbox/lib/signal.py:37 +msgid "Continue if stopped" +msgstr "若已停止就继续" + +#: ../checkbox/lib/signal.py:38 +msgid "Stop process" +msgstr "停止进程" + +#: ../checkbox/lib/signal.py:39 +msgid "Stop typed at tty" +msgstr "在 tty 上输入了 Stop" + +#: ../checkbox/lib/signal.py:40 +msgid "tty input for background process" +msgstr "后台进程的 tty 输入" + +#: ../checkbox/lib/signal.py:41 +msgid "tty output for background process" +msgstr "后台进程的 tty 输出" + +#: ../checkbox/lib/signal.py:77 +msgid "UNKNOWN" +msgstr "未知" + +#: ../checkbox/lib/signal.py:89 +msgid "Unknown signal" +msgstr "未知信号" + +#: ../checkbox_cli/cli_interface.py:31 +#: ../checkbox_urwid/urwid_interface.py:686 +msgid "yes" +msgstr "是" + +#: ../checkbox_cli/cli_interface.py:32 +#: ../checkbox_urwid/urwid_interface.py:687 +msgid "no" +msgstr "否" + +#: ../checkbox_cli/cli_interface.py:33 +#: ../checkbox_urwid/urwid_interface.py:688 +msgid "skip" +msgstr "跳过" + +#: ../checkbox_cli/cli_interface.py:126 +msgid "Press any key to continue..." +msgstr "按下任何一个键继续…" + +#: ../checkbox_cli/cli_interface.py:135 +#, python-format +msgid "Please choose (%s): " +msgstr "请选择 (%s): " + +#: ../checkbox_cli/cli_interface.py:250 ../checkbox_cli/cli_interface.py:281 +msgid "Space when finished" +msgstr "" + +#: ../checkbox_cli/cli_interface.py:280 +msgid "Combine with character above to expand node" +msgstr "" + +#: ../checkbox_cli/cli_interface.py:320 +msgid "test" +msgstr "测试" + +#: ../checkbox_cli/cli_interface.py:344 +msgid "test again" +msgstr "再次测试" + +#: ../checkbox_cli/cli_interface.py:350 +msgid "Please type here and press Ctrl-D when finished:\n" +msgstr "请在这里输入并在结束时按下 Ctrl-D :\n" + +#: ../checkbox_urwid/urwid_interface.py:60 +msgid "Checkbox System Testing" +msgstr "Checkbox 系统测试" + +#: ../checkbox_urwid/urwid_interface.py:99 +msgid "Continue" +msgstr "继续" + +#: ../checkbox_urwid/urwid_interface.py:192 +#: ../checkbox_urwid/urwid_interface.py:268 +#: ../checkbox_urwid/urwid_interface.py:418 +msgid "Previous" +msgstr "上一个" + +#: ../checkbox_urwid/urwid_interface.py:193 +#: ../checkbox_urwid/urwid_interface.py:269 +#: ../checkbox_urwid/urwid_interface.py:419 +msgid "Next" +msgstr "下一个" + +#. Show buttons +#: ../checkbox_urwid/urwid_interface.py:416 +msgid "Select All" +msgstr "选择全部" + +#: ../checkbox_urwid/urwid_interface.py:417 +msgid "Deselect All" +msgstr "取消全部选择" + +#: ../checkbox_urwid/urwid_interface.py:774 +msgid "Test" +msgstr "测试" + +#: ../checkbox_urwid/urwid_interface.py:789 +msgid "Test Again" +msgstr "重新测试" + +#: ../checkbox_gtk/gtk_interface.py:503 +msgid "_Test Again" +msgstr "再次测试(_T)" + +#: ../checkbox_gtk/gtk_interface.py:551 +msgid "Info" +msgstr "信息" + +#: ../checkbox_gtk/gtk_interface.py:575 +msgid "Error" +msgstr "错误" + +#: ../checkbox/user_interface.py:137 +#, python-format +msgid "Unable to start web browser to open %s." +msgstr "无法用浏览器打开 %s。" + +#: ../plugins/apport_prompt.py:83 +msgid "" +"Collecting information about this test.\n" +"This might take a few minutes." +msgstr "" +"正在测试本次测试的信息。\n" +"这将花费几分钟的时间。" + +#: ../plugins/apport_prompt.py:118 +msgid "" +"Collected information is being sent for bug tracking.\n" +"This might take a few minutes." +msgstr "" +"正在发送收集到的信息以用于缺陷跟踪。\n" +"这将花费几分钟的时间。" + +#: ../plugins/apport_prompt.py:227 +#, python-format +msgid "Test %(name)s from suite %(suite)s failed." +msgstr "" + +#: ../plugins/apport_prompt.py:231 +#, python-format +msgid "Test %s failed." +msgstr "" + +#: ../plugins/apport_prompt.py:232 +msgid "Do you want to report a bug?" +msgstr "您想报告缺陷吗?" + +#: ../plugins/apport_prompt.py:249 +#, python-format +msgid "Is a package upgrade in process? Error: %s" +msgstr "是不是正在进行软件升级?错误:%s" + +#: ../plugins/final_prompt.py:33 +msgid "Successfully finished testing!" +msgstr "成功完成测试!" + +#: ../plugins/final_prompt.py:34 +msgid "_Finish" +msgstr "完成(_F)" + +#: ../plugins/gather_prompt.py:35 +msgid "Gathering information from your system..." +msgstr "正在从您的系统上收集信息..." + +#: ../plugins/intro_prompt.py:28 +msgid "" +"Welcome to System Testing!\n" +"\n" +"Checkbox provides tests to confirm that your system is working properly. " +"Once you are finished running the tests, you can view a summary report for " +"your system." +msgstr "" +"欢迎使用系统测试程序!\n" +"\n" +"Checkbox 提供一系列测试来验证您的系统工作正常。当您完成这些测试后,可以察看对系统的总结报告。" + +#: ../plugins/intro_prompt.py:33 +msgid "" +"\n" +"\n" +"Warning: Some tests could cause your system to freeze or become " +"unresponsive. Please save all your work and close all other running " +"applications before beginning the testing process." +msgstr "" + +#: ../plugins/launchpad_exchange.py:136 +#, python-format +msgid "Failed to process form: %s" +msgstr "处理表单失败:%s" + +#: ../plugins/launchpad_exchange.py:151 +#, python-format +msgid "" +"Failed to contact server. Please try\n" +"again or upload the following file name:\n" +"%s\n" +"\n" +"directly to the system database:\n" +"https://launchpad.net/+hwdb/+submit" +msgstr "" +"联结服务器失败。请再试试\n" +"或上载下列文件名:\n" +"%s\n" +"\n" +"直接到系统数据库:\n" +"https://launchpad.net/+hwdb/+submit" + +#: ../plugins/launchpad_exchange.py:160 +msgid "" +"Failed to upload to server,\n" +"please try again later." +msgstr "" +"上载到服务器失败,\n" +"请一会儿重新尝试。" + +#: ../plugins/launchpad_exchange.py:172 +msgid "Information not posted to Launchpad." +msgstr "不会发布到 Launchpad 上的信息。" + +#: ../plugins/launchpad_prompt.py:74 +#, python-format +msgid "" +"The following report has been generated for submission to the Launchpad " +"hardware database:\n" +"\n" +" [[%s|View Report]]\n" +"\n" +"You can submit this information about your system by providing the email " +"address you use to sign in to Launchpad. If you do not have a Launchpad " +"account, please register here:\n" +"\n" +" https://launchpad.net/+login" +msgstr "" + +#: ../plugins/launchpad_prompt.py:93 +msgid "Email address must be in a proper format." +msgstr "电子邮件地址必须有正确的格式。" + +#: ../plugins/launchpad_prompt.py:99 +msgid "Exchanging information with the server..." +msgstr "和服务器交换信息..." + +#: ../plugins/launchpad_report.py:164 +msgid "" +"The generated report seems to have validation errors,\n" +"so it might not be processed by Launchpad." +msgstr "" + +#: ../plugins/lock_prompt.py:63 +msgid "There is another checkbox running. Please close it first." +msgstr "有另一个 Checkbox 正在运行。请先关闭它。" + +#: ../plugins/recover_prompt.py:53 +msgid "Recover" +msgstr "" + +#: ../plugins/recover_prompt.py:54 +msgid "Restart" +msgstr "" + +#: ../plugins/recover_prompt.py:56 +msgid "" +"Checkbox did not finish completely.\n" +"Do you want to recover from the previous run?" +msgstr "" +"Checkbox 没有完成全部测试。\n" +"您想从上次运行的位置恢复吗?" + +#: ../plugins/report_prompt.py:39 +msgid "Building report..." +msgstr "正在创建报告..." + +#: ../plugins/shell_test.py:52 +#, python-format +msgid "Running %s..." +msgstr "正在运行 %s..." + +#. Get results +#: ../plugins/suites_prompt.py:110 +msgid "Select the suites to test" +msgstr "选择套件来测试" + +#: ../scripts/keyboard_test:21 +msgid "Enter text:\n" +msgstr "输入文本:\n" + +#: ../scripts/keyboard_test:41 +msgid "Type Text" +msgstr "键入文本" + +#: ../scripts/internet_test:139 +msgid "No Internet connection" +msgstr "没有互联网连接" + +#: ../scripts/internet_test:142 +msgid "Connection established lost a packet" +msgstr "连接建立但有丢包" + +#: ../scripts/internet_test:145 +msgid "Internet connection fully established" +msgstr "互联网连接完整建立" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/command-not-found.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/command-not-found.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/command-not-found.po 2012-02-23 07:11:53.000000000 +0000 @@ -7,110 +7,63 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-11-22 18:05+0000\n" +"POT-Creation-Date: 2007-03-20 18:10+0100\n" "PO-Revision-Date: 2009-10-26 08:37+0000\n" "Last-Translator: Kyle WANG \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 15:38+0000\n" -"X-Generator: Launchpad (build 14560)\n" - -#: ../CommandNotFound/CommandNotFound.py:133 -#, python-format -msgid "No command '%s' found, but there are %s similar ones" -msgstr "未找到 '%s' 命令,有%s 个相似命令" +"X-Launchpad-Export-Date: 2012-02-21 22:41+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../CommandNotFound/CommandNotFound.py:135 -#, python-format -msgid "No command '%s' found, did you mean:" -msgstr "未找到 '%s' 命令,您要输入的是否是:" - -#: ../CommandNotFound/CommandNotFound.py:137 -#, python-format -msgid " Command '%s' from package '%s' (%s)" -msgstr " 命令 '%s' 来自于包 '%s' (%s)" +msgid "Ubuntu has the following similar programs" +msgstr "Ubuntu 带有以下类似的程序" -#: ../CommandNotFound/CommandNotFound.py:210 -#, python-format -msgid "Command '%(command)s' is available in '%(place)s'" -msgstr "命令 '%(command)s' 可在 '%(place)s' 处找到" - -#: ../CommandNotFound/CommandNotFound.py:212 -#, python-format -msgid "Command '%(command)s' is available in the following places" -msgstr "命令 '%(command)s' 可在以下位置找到" - -#: ../CommandNotFound/CommandNotFound.py:217 -#, python-format -msgid "" -"The command could not be located because '%s' is not included in the PATH " -"environment variable." -msgstr "由于%s 不在PATH 环境变量中,故无法找到该命令。" - -#: ../CommandNotFound/CommandNotFound.py:219 -msgid "" -"This is most likely caused by the lack of administrative privileges " -"associated with your user account." -msgstr "这很可能是由您的用户账户没有管理员权限造成的。" - -#: ../CommandNotFound/CommandNotFound.py:234 +#: ../CommandNotFound/CommandNotFound.py:139 #, python-format msgid "The program '%s' is currently not installed. " msgstr "程序“%s”尚未安装。 " -#: ../CommandNotFound/CommandNotFound.py:236 -#: ../CommandNotFound/CommandNotFound.py:239 +#: ../CommandNotFound/CommandNotFound.py:141 +#: ../CommandNotFound/CommandNotFound.py:144 msgid "You can install it by typing:" msgstr "您可以使用以下命令安装:" -#: ../CommandNotFound/CommandNotFound.py:242 +#: ../CommandNotFound/CommandNotFound.py:147 #, python-format msgid "" "To run '%(command)s' please ask your administrator to install the package " "'%(package)s'" msgstr "如需运行 '%(command)s',请要求管理员安装 '%(package)s' 软件包" -#: ../CommandNotFound/CommandNotFound.py:244 +#: ../CommandNotFound/CommandNotFound.py:149 +#: ../CommandNotFound/CommandNotFound.py:161 #, python-format -msgid "You will have to enable the component called '%s'" -msgstr "您必须启用%s 组件" +msgid "Make sure you have the '%s' component enabled" +msgstr "请您确认组件 '%s' 已被启用" -#: ../CommandNotFound/CommandNotFound.py:247 +#: ../CommandNotFound/CommandNotFound.py:151 #, python-format msgid "The program '%s' can be found in the following packages:" msgstr "程序 '%s' 已包含在下列软件包中:" -#: ../CommandNotFound/CommandNotFound.py:252 -#, python-format -msgid "You will have to enable component called '%s'" -msgstr "您必须启用%s 组件" - -#: ../CommandNotFound/CommandNotFound.py:254 -#: ../CommandNotFound/CommandNotFound.py:256 +#: ../CommandNotFound/CommandNotFound.py:155 +#: ../CommandNotFound/CommandNotFound.py:157 #, python-format msgid "Try: %s " msgstr "请尝试:%s <选定的软件包>" -#: ../CommandNotFound/CommandNotFound.py:258 +#: ../CommandNotFound/CommandNotFound.py:159 msgid "Ask your administrator to install one of them" msgstr "请要求管理员安装其中的一个" -#: ../command-not-found:58 +#: ../command-not-found:18 #, c-format msgid "%prog [options] " msgstr "%prog [选项] <命令>" -#: ../command-not-found:61 +#: ../command-not-found:20 msgid "use this path to locate data fields" msgstr "使用该路径以定位数据域" - -#: ../command-not-found:64 -msgid "ignore local binaries and display the available packages" -msgstr "忽略本地二进制文件并显示可用软件包" - -#: ../command-not-found:71 -#, c-format -msgid "%s: command not found" -msgstr "%s:找不到命令" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/compiz.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/compiz.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/compiz.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/compiz.po 2012-02-23 07:11:53.000000000 +0000 @@ -7,65 +7,55 @@ msgstr "" "Project-Id-Version: Compiz\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 12:40+0000\n" -"PO-Revision-Date: 2011-12-08 18:57+0000\n" +"POT-Creation-Date: 2012-02-17 21:28+0000\n" +"PO-Revision-Date: 2012-02-18 00:14+0000\n" "Last-Translator: Sephinroth \n" "Language-Team: Novell Language \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 15:31+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:34+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -msgid "Desktop" -msgstr "桌面" - -#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -msgid "Window Management" -msgstr "窗口管理" - -#: ../gtk/gnome/compiz.desktop.in.h:1 ../gtk/gnome/compiz-wm.desktop.in.h:1 +#: ../gtk/gnome/compiz.desktop.in.h:1 msgid "Compiz" msgstr "Compiz" #: ../gtk/window-decorator/gwd.schemas.in.h:1 -msgid "Action to take when scrolling the mouse wheel on a window title bar." -msgstr "鼠标滚轮在窗口标题栏上的动作" - -#: ../gtk/window-decorator/gwd.schemas.in.h:2 msgid "Blur type" msgstr "模糊类型" +#: ../gtk/window-decorator/gwd.schemas.in.h:2 +msgid "Type of blur used for window decorations" +msgstr "窗口装饰使用的模糊类型" + #: ../gtk/window-decorator/gwd.schemas.in.h:3 -msgid "Metacity theme active window opacity" -msgstr "Metacity主题活动窗口透明度" +msgid "Use metacity theme" +msgstr "使用metacity主题" #: ../gtk/window-decorator/gwd.schemas.in.h:4 -msgid "Metacity theme active window opacity shade" -msgstr "Metacity 主题活动窗口不透明阴影" +msgid "Use metacity theme when drawing window decorations" +msgstr "绘制窗口装饰时使用metacity主题" #: ../gtk/window-decorator/gwd.schemas.in.h:5 -msgid "Metacity theme opacity" -msgstr "Metacity主题透明度" +msgid "Title bar mouse wheel action" +msgstr "标题栏鼠标滚轮动作" #: ../gtk/window-decorator/gwd.schemas.in.h:6 -msgid "Metacity theme opacity shade" -msgstr "Metacity主题阴影" +msgid "Action to take when scrolling the mouse wheel on a window title bar." +msgstr "鼠标滚轮在窗口标题栏上的动作" #: ../gtk/window-decorator/gwd.schemas.in.h:7 -msgid "Opacity to use for active windows with metacity theme decorations" -msgstr "以Metacity主题为装饰器的活动窗口使用的透明度" +msgid "Metacity theme opacity" +msgstr "Metacity主题透明度" #: ../gtk/window-decorator/gwd.schemas.in.h:8 msgid "Opacity to use for metacity theme decorations" msgstr "metacity主题装饰器使用的透明度" #: ../gtk/window-decorator/gwd.schemas.in.h:9 -msgid "" -"Shade active windows with metacity theme decorations from opaque to " -"translucent" -msgstr "以metacity主题装饰器为活动窗口添加透明渐变效果" +msgid "Metacity theme opacity shade" +msgstr "Metacity主题阴影" #: ../gtk/window-decorator/gwd.schemas.in.h:10 msgid "" @@ -73,449 +63,459 @@ msgstr "以metacity主题装饰器为窗口添加透明渐变效果" #: ../gtk/window-decorator/gwd.schemas.in.h:11 -msgid "Title bar mouse wheel action" -msgstr "标题栏鼠标滚轮动作" +msgid "Metacity theme active window opacity" +msgstr "Metacity主题活动窗口透明度" #: ../gtk/window-decorator/gwd.schemas.in.h:12 -msgid "Type of blur used for window decorations" -msgstr "窗口装饰使用的模糊类型" +msgid "Opacity to use for active windows with metacity theme decorations" +msgstr "以Metacity主题为装饰器的活动窗口使用的透明度" #: ../gtk/window-decorator/gwd.schemas.in.h:13 -msgid "Use metacity theme" -msgstr "使用metacity主题" +msgid "Metacity theme active window opacity shade" +msgstr "Metacity 主题活动窗口不透明阴影" #: ../gtk/window-decorator/gwd.schemas.in.h:14 -msgid "Use metacity theme when drawing window decorations" -msgstr "绘制窗口装饰时使用metacity主题" +msgid "" +"Shade active windows with metacity theme decorations from opaque to " +"translucent" +msgstr "以metacity主题装饰器为活动窗口添加透明渐变效果" + +#: ../gtk/window-decorator/gwd.schemas.in.h:15 +msgid "Use tooltips" +msgstr "" + +#: ../gtk/window-decorator/gwd.schemas.in.h:16 +msgid "Show tooltip windows on decorator functions" +msgstr "" #: ../metadata/core.xml.in.h:1 -msgid "Active Plugins" -msgstr "活动插件" +msgid "General Options" +msgstr "常规选项" #: ../metadata/core.xml.in.h:2 -msgid "Audible Bell" -msgstr "可闻铃声" +msgid "General compiz options" +msgstr "compiz常规选项" #: ../metadata/core.xml.in.h:3 -msgid "Audible system beep" -msgstr "可听见的系统响铃" +msgid "Active Plugins" +msgstr "活动插件" #: ../metadata/core.xml.in.h:4 -msgid "Auto-Raise" -msgstr "自动升起" +msgid "List of currently active plugins" +msgstr "当前活动的插件列表" #: ../metadata/core.xml.in.h:5 -msgid "Auto-Raise Delay" -msgstr "自动升起延迟" +msgid "Audible Bell" +msgstr "可闻铃声" #: ../metadata/core.xml.in.h:6 -msgid "Automatic detection of output devices" -msgstr "自动检测输出设备" +msgid "Audible system beep" +msgstr "可听见的系统响铃" #: ../metadata/core.xml.in.h:7 -msgid "Click To Focus" -msgstr "点击聚焦" +msgid "Ignore Hints When Maximized" +msgstr "最大化时忽略提示" #: ../metadata/core.xml.in.h:8 -msgid "Click on window moves input focus to it" -msgstr "点击窗口将输入焦点移至它" +msgid "Ignore size increment and aspect hints when window is maximized" +msgstr "最大化窗口时忽略尺寸递增和外观提示" #: ../metadata/core.xml.in.h:9 -msgid "Close Window" -msgstr "关闭窗口" +msgid "Hide Skip Taskbar Windows" +msgstr "隐藏跳过任务栏窗口" #: ../metadata/core.xml.in.h:10 -msgid "Close active window" -msgstr "关闭激活的窗口" +msgid "Hide windows not in taskbar when entering show desktop mode" +msgstr "进入显示桌面模式时隐藏不在任务栏中的窗口" #: ../metadata/core.xml.in.h:11 -msgid "Default Icon" -msgstr "默认图标" +msgid "Edge Trigger Delay" +msgstr "边缘触发延迟" #: ../metadata/core.xml.in.h:12 -msgid "Default window icon image" -msgstr "默认窗口图标图像" +msgid "" +"Duration the pointer must rest in a screen edge before an edge action is " +"taken." +msgstr "边缘动作执行前,鼠标指针必须置于屏幕的一个边缘" #: ../metadata/core.xml.in.h:13 -msgid "Desktop Size" -msgstr "桌面尺寸" +msgid "Ping Delay" +msgstr "Ping延迟" #: ../metadata/core.xml.in.h:14 -msgid "Detect Outputs" -msgstr "检测输出" +msgid "Interval between ping messages" +msgstr "ping消息之间的间隔" #: ../metadata/core.xml.in.h:15 -msgid "Display Settings" -msgstr "显示设置" +msgid "Default Icon" +msgstr "默认图标" #: ../metadata/core.xml.in.h:16 -msgid "" -"Duration the pointer must rest in a screen edge before an edge action is " -"taken." -msgstr "边缘动作执行前,鼠标指针必须置于屏幕的一个边缘" +msgid "Default window icon image" +msgstr "默认窗口图标图像" #: ../metadata/core.xml.in.h:17 -msgid "Edge Trigger Delay" -msgstr "边缘触发延迟" +msgid "Save plugin states on unload" +msgstr "" #: ../metadata/core.xml.in.h:18 -msgid "Focus & Raise Behaviour" -msgstr "聚焦与升起行为" +msgid "" +"Save the state of plugins when they are unloaded such they will resume their " +"past internal state when reloaded" +msgstr "" #: ../metadata/core.xml.in.h:19 -msgid "Focus Prevention Level" -msgstr "焦点保护级别" +msgid "Display Settings" +msgstr "显示设置" #: ../metadata/core.xml.in.h:20 -msgid "Focus Prevention Windows" -msgstr "阻碍焦点窗口" +msgid "Overlapping Output Handling" +msgstr "重叠输出处理" #: ../metadata/core.xml.in.h:21 -msgid "Focus prevention windows" -msgstr "阻碍焦点窗口" +msgid "Which one of overlapping output devices should be preferred" +msgstr "哪个重叠输出设备将成为首选" #: ../metadata/core.xml.in.h:22 -msgid "General Options" -msgstr "常规选项" +msgid "Smart mode" +msgstr "智能模式" #: ../metadata/core.xml.in.h:23 -msgid "General compiz options" -msgstr "compiz常规选项" +msgid "Prefer larger output" +msgstr "首选较大的输出" #: ../metadata/core.xml.in.h:24 -msgid "Hide Skip Taskbar Windows" -msgstr "隐藏跳过任务栏窗口" +msgid "Prefer smaller output" +msgstr "首选较小的输出" #: ../metadata/core.xml.in.h:25 -msgid "Hide all windows and focus desktop" -msgstr "隐藏所有窗口并聚焦于桌面" +msgid "Detect Outputs" +msgstr "检测输出" #: ../metadata/core.xml.in.h:26 -msgid "Hide windows not in taskbar when entering show desktop mode" -msgstr "进入显示桌面模式时隐藏不在任务栏中的窗口" +msgid "Automatic detection of output devices" +msgstr "自动检测输出设备" #: ../metadata/core.xml.in.h:27 -msgid "High" -msgstr "高" +msgid "Outputs" +msgstr "输出" #: ../metadata/core.xml.in.h:28 -msgid "Horizontal Virtual Size" -msgstr "水平虚拟尺寸" +msgid "List of strings describing output devices" +msgstr "描述输出设备的字符串列表" #: ../metadata/core.xml.in.h:29 -msgid "Ignore Hints When Maximized" -msgstr "最大化时忽略提示" +msgid "Focus & Raise Behaviour" +msgstr "聚焦与升起行为" #: ../metadata/core.xml.in.h:30 -msgid "Ignore size increment and aspect hints when window is maximized" -msgstr "最大化窗口时忽略尺寸递增和外观提示" +msgid "Click To Focus" +msgstr "点击聚焦" #: ../metadata/core.xml.in.h:31 -msgid "Interval before raising selected windows" -msgstr "升起所选窗口前的时间间隔" +msgid "Click on window moves input focus to it" +msgstr "点击窗口将输入焦点移至它" #: ../metadata/core.xml.in.h:32 -msgid "Interval between ping messages" -msgstr "ping消息之间的间隔" +msgid "Raise On Click" +msgstr "点击时升起" #: ../metadata/core.xml.in.h:33 -msgid "Key bindings" -msgstr "功能键" +msgid "Raise windows when clicked" +msgstr "点击时升起窗口" #: ../metadata/core.xml.in.h:34 -msgid "Level of focus stealing prevention" -msgstr "聚焦预防的级别" +msgid "Auto-Raise" +msgstr "自动升起" #: ../metadata/core.xml.in.h:35 -msgid "List of currently active plugins" -msgstr "当前活动的插件列表" +msgid "Raise selected windows after interval" +msgstr "在间隔一段时间后升起选中窗口" #: ../metadata/core.xml.in.h:36 -msgid "List of strings describing output devices" -msgstr "描述输出设备的字符串列表" +msgid "Auto-Raise Delay" +msgstr "自动升起延迟" #: ../metadata/core.xml.in.h:37 -msgid "Low" -msgstr "低" +msgid "Interval before raising selected windows" +msgstr "升起所选窗口前的时间间隔" #: ../metadata/core.xml.in.h:38 -msgid "Lower Window" -msgstr "降低窗口" +msgid "Focus Prevention Level" +msgstr "焦点保护级别" #: ../metadata/core.xml.in.h:39 -msgid "Lower window beneath other windows" -msgstr "将窗口降到其它窗口以下" +msgid "Level of focus stealing prevention" +msgstr "聚焦预防的级别" #: ../metadata/core.xml.in.h:40 -msgid "Maximize Window" -msgstr "最大化窗口" +msgid "Off" +msgstr "关闭" #: ../metadata/core.xml.in.h:41 -msgid "Maximize Window Horizontally" -msgstr "水平方向最大化窗口" +msgid "Low" +msgstr "低" -#: ../metadata/core.xml.in.h:42 -msgid "Maximize Window Vertically" -msgstr "垂直方向最大化窗口" +#: ../metadata/core.xml.in.h:42 ../plugins/resize/resize.xml.in.h:8 +msgid "Normal" +msgstr "常规" #: ../metadata/core.xml.in.h:43 -msgid "Maximize active window" -msgstr "最大化激活的窗口" +msgid "High" +msgstr "高" #: ../metadata/core.xml.in.h:44 -msgid "Maximize active window horizontally" -msgstr "水平方向最大化激活的窗口" +msgid "Very High" +msgstr "很高" #: ../metadata/core.xml.in.h:45 -msgid "Maximize active window vertically" -msgstr "垂直方向最大化激活的窗口" +msgid "Focus Prevention Windows" +msgstr "阻碍焦点窗口" #: ../metadata/core.xml.in.h:46 -msgid "Minimize Window" -msgstr "最小化窗口" +msgid "Focus prevention windows" +msgstr "阻碍焦点窗口" #: ../metadata/core.xml.in.h:47 -msgid "Minimize active window" -msgstr "最小化激活的窗口" +msgid "Key bindings" +msgstr "功能键" -#: ../metadata/core.xml.in.h:48 ../plugins/resize/resize.xml.in.h:14 -msgid "Normal" -msgstr "常规" +#: ../metadata/core.xml.in.h:48 +msgid "Close Window" +msgstr "关闭窗口" #: ../metadata/core.xml.in.h:49 -msgid "Number of Desktops" -msgstr "桌面数量" +msgid "Close active window" +msgstr "关闭激活的窗口" #: ../metadata/core.xml.in.h:50 -msgid "Number of virtual desktops" -msgstr "虚拟桌面的数量" +msgid "Raise Window" +msgstr "升起窗口" #: ../metadata/core.xml.in.h:51 -msgid "Off" -msgstr "关闭" +msgid "Raise window above other windows" +msgstr "将窗口升起到其它窗口之上" #: ../metadata/core.xml.in.h:52 -msgid "Outputs" -msgstr "输出" +msgid "Lower Window" +msgstr "降低窗口" #: ../metadata/core.xml.in.h:53 -msgid "Overlapping Output Handling" -msgstr "重叠输出处理" +msgid "Lower window beneath other windows" +msgstr "将窗口降到其它窗口以下" #: ../metadata/core.xml.in.h:54 -msgid "Ping Delay" -msgstr "Ping延迟" +msgid "Minimize Window" +msgstr "最小化窗口" #: ../metadata/core.xml.in.h:55 -msgid "Prefer larger output" -msgstr "首选较大的输出" +msgid "Minimize active window" +msgstr "最小化激活的窗口" #: ../metadata/core.xml.in.h:56 -msgid "Prefer smaller output" -msgstr "首选较小的输出" +msgid "Maximize Window" +msgstr "最大化窗口" #: ../metadata/core.xml.in.h:57 -msgid "Raise On Click" -msgstr "点击时升起" +msgid "Maximize active window" +msgstr "最大化激活的窗口" #: ../metadata/core.xml.in.h:58 -msgid "Raise Window" -msgstr "升起窗口" +msgid "Unmaximize Window" +msgstr "恢复窗口" #: ../metadata/core.xml.in.h:59 -msgid "Raise selected windows after interval" -msgstr "在间隔一段时间后升起选中窗口" +msgid "Unmaximize active window" +msgstr "恢复激活的窗口" #: ../metadata/core.xml.in.h:60 -msgid "Raise window above other windows" -msgstr "将窗口升起到其它窗口之上" +msgid "Maximize Window Horizontally" +msgstr "水平方向最大化窗口" #: ../metadata/core.xml.in.h:61 -msgid "Raise windows when clicked" -msgstr "点击时升起窗口" +msgid "Maximize active window horizontally" +msgstr "水平方向最大化激活的窗口" #: ../metadata/core.xml.in.h:62 -msgid "Save plugin states on unload" -msgstr "" +msgid "Maximize Window Vertically" +msgstr "垂直方向最大化窗口" #: ../metadata/core.xml.in.h:63 -msgid "" -"Save the state of plugins when they are unloaded such they will resume their " -"past internal state when reloaded" -msgstr "" +msgid "Maximize active window vertically" +msgstr "垂直方向最大化激活的窗口" #: ../metadata/core.xml.in.h:64 -msgid "Screen size multiplier for horizontal virtual size" -msgstr "水平虚拟尺寸的放大倍数" +msgid "Window Menu" +msgstr "窗口菜单" #: ../metadata/core.xml.in.h:65 -msgid "Screen size multiplier for vertical virtual size" -msgstr "垂直虚拟尺寸的放大倍数" +msgid "Window menu key binding" +msgstr "窗口菜单按键绑定" #: ../metadata/core.xml.in.h:66 -msgid "Show Desktop" -msgstr "显示桌面" +msgid "Window menu button binding" +msgstr "窗口菜单按钮绑定" #: ../metadata/core.xml.in.h:67 -msgid "Smart mode" -msgstr "智能模式" +msgid "Show Desktop" +msgstr "显示桌面" #: ../metadata/core.xml.in.h:68 -msgid "Toggle Window Maximized" -msgstr "切换最大化的窗口" +msgid "Hide all windows and focus desktop" +msgstr "隐藏所有窗口并聚焦于桌面" #: ../metadata/core.xml.in.h:69 -msgid "Toggle Window Maximized Horizontally" -msgstr "将窗口水平方向切换到最大化" +msgid "Toggle Window Maximized" +msgstr "切换最大化的窗口" #: ../metadata/core.xml.in.h:70 -msgid "Toggle Window Maximized Vertically" -msgstr "将窗口垂直方向切换到最大化" +msgid "Toggle active window maximized" +msgstr "将激活的窗口切换到最大化" #: ../metadata/core.xml.in.h:71 -msgid "Toggle Window Shaded" -msgstr "将窗口切换到遮蔽" +msgid "Toggle Window Maximized Horizontally" +msgstr "将窗口水平方向切换到最大化" #: ../metadata/core.xml.in.h:72 -msgid "Toggle active window maximized" -msgstr "将激活的窗口切换到最大化" - -#: ../metadata/core.xml.in.h:73 msgid "Toggle active window maximized horizontally" msgstr "将激活的窗口水平方向切换到最大化" +#: ../metadata/core.xml.in.h:73 +msgid "Toggle Window Maximized Vertically" +msgstr "将窗口垂直方向切换到最大化" + #: ../metadata/core.xml.in.h:74 msgid "Toggle active window maximized vertically" msgstr "将激活的窗口垂直方向切换到最大化" #: ../metadata/core.xml.in.h:75 -msgid "Toggle active window shaded" -msgstr "将激活的窗口切换到遮蔽" +msgid "Toggle Window Shaded" +msgstr "将窗口切换到遮蔽" #: ../metadata/core.xml.in.h:76 -msgid "Unmaximize Window" -msgstr "恢复窗口" +msgid "Toggle active window shaded" +msgstr "将激活的窗口切换到遮蔽" #: ../metadata/core.xml.in.h:77 -msgid "Unmaximize active window" -msgstr "恢复激活的窗口" +msgid "Desktop Size" +msgstr "桌面尺寸" #: ../metadata/core.xml.in.h:78 -msgid "Vertical Virtual Size" -msgstr "垂直虚拟尺寸" +msgid "Horizontal Virtual Size" +msgstr "水平虚拟尺寸" #: ../metadata/core.xml.in.h:79 -msgid "Very High" -msgstr "很高" +msgid "Screen size multiplier for horizontal virtual size" +msgstr "水平虚拟尺寸的放大倍数" #: ../metadata/core.xml.in.h:80 -msgid "Which one of overlapping output devices should be preferred" -msgstr "哪个重叠输出设备将成为首选" +msgid "Vertical Virtual Size" +msgstr "垂直虚拟尺寸" #: ../metadata/core.xml.in.h:81 -msgid "Window Menu" -msgstr "窗口菜单" +msgid "Screen size multiplier for vertical virtual size" +msgstr "垂直虚拟尺寸的放大倍数" #: ../metadata/core.xml.in.h:82 -msgid "Window menu button binding" -msgstr "窗口菜单按钮绑定" +msgid "Number of Desktops" +msgstr "桌面数量" #: ../metadata/core.xml.in.h:83 -msgid "Window menu key binding" -msgstr "窗口菜单按键绑定" +msgid "Number of virtual desktops" +msgstr "虚拟桌面的数量" #: ../plugins/blur/blur.xml.in.h:1 -msgid "4xBilinear" -msgstr "4倍双线性过滤" +msgid "Blur Windows" +msgstr "柔化窗口" #: ../plugins/blur/blur.xml.in.h:2 -msgid "Alpha Blur" -msgstr "Alpha朦胧" +msgid "Blur windows" +msgstr "柔化窗口" #: ../plugins/blur/blur.xml.in.h:3 -msgid "Alpha blur windows" -msgstr "Alpha朦胧窗口" +msgid "Pulse" +msgstr "脉冲" #: ../plugins/blur/blur.xml.in.h:4 -msgid "Blur Filter" -msgstr "朦胧滤镜" +msgid "Pulse effect" +msgstr "脉冲效果" #: ../plugins/blur/blur.xml.in.h:5 -msgid "Blur Occlusion" -msgstr "模糊咬合" +msgid "Blur Speed" +msgstr "柔化速度" #: ../plugins/blur/blur.xml.in.h:6 -msgid "Blur Saturation" -msgstr "柔化饱和度" +msgid "Window blur speed" +msgstr "窗口柔化速度" #: ../plugins/blur/blur.xml.in.h:7 -msgid "Blur Speed" -msgstr "柔化速度" +msgid "Focus blur windows" +msgstr "聚焦柔化窗口" #: ../plugins/blur/blur.xml.in.h:8 -msgid "Blur Windows" -msgstr "柔化窗口" +msgid "Windows that should be affected by focus blur" +msgstr "应被聚焦柔化影响的窗口" #: ../plugins/blur/blur.xml.in.h:9 -msgid "Blur behind translucent parts of windows" -msgstr "柔化半透明窗口后部" +msgid "Focus Blur" +msgstr "焦点柔化" #: ../plugins/blur/blur.xml.in.h:10 -msgid "Blur saturation" -msgstr "柔化饱和度" +msgid "Blur windows that doesn't have focus" +msgstr "对非当前窗口采取柔化" #: ../plugins/blur/blur.xml.in.h:11 -msgid "Blur windows" -msgstr "柔化窗口" +msgid "Alpha blur windows" +msgstr "Alpha朦胧窗口" #: ../plugins/blur/blur.xml.in.h:12 -msgid "Blur windows that doesn't have focus" -msgstr "对非当前窗口采取柔化" +msgid "Windows that should be use alpha blur by default" +msgstr "应该默认使用alpha柔化的窗口" #: ../plugins/blur/blur.xml.in.h:13 -msgid "Disable blurring of screen regions obscured by other windows." -msgstr "不对其它窗口遮挡的屏幕部分进行柔化" +msgid "Alpha Blur" +msgstr "Alpha朦胧" #: ../plugins/blur/blur.xml.in.h:14 -msgid "Filter method used for blurring" -msgstr "过滤用于柔化的方法" +msgid "Blur behind translucent parts of windows" +msgstr "柔化半透明窗口后部" #: ../plugins/blur/blur.xml.in.h:15 -msgid "Focus Blur" -msgstr "焦点柔化" +msgid "Blur Filter" +msgstr "朦胧滤镜" #: ../plugins/blur/blur.xml.in.h:16 -msgid "Focus blur windows" -msgstr "聚焦柔化窗口" +msgid "Filter method used for blurring" +msgstr "过滤用于柔化的方法" #: ../plugins/blur/blur.xml.in.h:17 -msgid "Gaussian" -msgstr "高斯柔化" +msgid "4xBilinear" +msgstr "4倍双线性过滤" #: ../plugins/blur/blur.xml.in.h:18 -msgid "Gaussian Radius" -msgstr "高斯柔化半径" +msgid "Gaussian" +msgstr "高斯柔化" -#: ../plugins/blur/blur.xml.in.h:19 -msgid "Gaussian Strength" -msgstr "高斯柔化力度" +#: ../plugins/blur/blur.xml.in.h:19 ../plugins/decor/decor.xml.in.h:17 +#: ../plugins/switcher/switcher.xml.in.h:25 +msgid "Mipmap" +msgstr "Mipmap" #: ../plugins/blur/blur.xml.in.h:20 -msgid "Gaussian radius" +msgid "Gaussian Radius" msgstr "高斯柔化半径" #: ../plugins/blur/blur.xml.in.h:21 -msgid "Gaussian strength" -msgstr "高斯柔化力度" +msgid "Gaussian radius" +msgstr "高斯柔化半径" #: ../plugins/blur/blur.xml.in.h:22 -msgid "Independent texture fetch" -msgstr "独立纹理取回" +msgid "Gaussian Strength" +msgstr "高斯柔化力度" -#: ../plugins/blur/blur.xml.in.h:23 ../plugins/decor/decor.xml.in.h:10 -#: ../plugins/switcher/switcher.xml.in.h:16 -msgid "Mipmap" -msgstr "Mipmap" +#: ../plugins/blur/blur.xml.in.h:23 +msgid "Gaussian strength" +msgstr "高斯柔化力度" #: ../plugins/blur/blur.xml.in.h:24 msgid "Mipmap LOD" @@ -526,958 +526,966 @@ msgstr "Mipmap细节层次" #: ../plugins/blur/blur.xml.in.h:26 -msgid "Pulse" -msgstr "脉冲" +msgid "Blur Saturation" +msgstr "柔化饱和度" #: ../plugins/blur/blur.xml.in.h:27 -msgid "Pulse effect" -msgstr "脉冲效果" +msgid "Blur saturation" +msgstr "柔化饱和度" #: ../plugins/blur/blur.xml.in.h:28 -msgid "" -"Use the available texture units to do as many as possible independent " -"texture fetches." -msgstr "使用现存的纹理单位尽可能多的进行独立纹理取回" +msgid "Blur Occlusion" +msgstr "模糊咬合" #: ../plugins/blur/blur.xml.in.h:29 -msgid "Window blur speed" -msgstr "窗口柔化速度" +msgid "Disable blurring of screen regions obscured by other windows." +msgstr "不对其它窗口遮挡的屏幕部分进行柔化" #: ../plugins/blur/blur.xml.in.h:30 -msgid "Windows that should be affected by focus blur" -msgstr "应被聚焦柔化影响的窗口" +msgid "Independent texture fetch" +msgstr "独立纹理取回" #: ../plugins/blur/blur.xml.in.h:31 -msgid "Windows that should be use alpha blur by default" -msgstr "应该默认使用alpha柔化的窗口" - -#: ../plugins/commands/commands.xml.in.h:1 msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command0" -msgstr "一个按钮绑定,调用时将运行由command0定义的shell命令" +"Use the available texture units to do as many as possible independent " +"texture fetches." +msgstr "使用现存的纹理单位尽可能多的进行独立纹理取回" + +#: ../plugins/commands/commands.xml.in.h:1 +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7 +msgid "Commands" +msgstr "命令" #: ../plugins/commands/commands.xml.in.h:2 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command1" -msgstr "一个按钮绑定,调用时将运行由command1定义的shell命令" +msgid "Assigns bundings to arbitrary commands" +msgstr "" #: ../plugins/commands/commands.xml.in.h:3 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command10" -msgstr "一个按钮绑定,调用时将运行由command10定义的shell命令" +msgid "Command line 0" +msgstr "命令行0" #: ../plugins/commands/commands.xml.in.h:4 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command11" -msgstr "一个按钮绑定,调用时将运行由command11定义的shell命令" +msgid "Command line to be executed in shell when run_command0 is invoked" +msgstr "调用run_command0时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:5 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command12" -msgstr "" +msgid "Command line 1" +msgstr "命令行1" #: ../plugins/commands/commands.xml.in.h:6 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command13" -msgstr "" +msgid "Command line to be executed in shell when run_command1 is invoked" +msgstr "调用run_command1时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:7 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command14" -msgstr "" +msgid "Command line 2" +msgstr "命令行2" #: ../plugins/commands/commands.xml.in.h:8 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command2" -msgstr "一个按钮绑定,调用时将运行由command2定义的shell命令" +msgid "Command line to be executed in shell when run_command2 is invoked" +msgstr "调用run_command2时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:9 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command3" -msgstr "一个按钮绑定,调用时将运行由command3定义的shell命令" +msgid "Command line 3" +msgstr "命令行3" #: ../plugins/commands/commands.xml.in.h:10 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command4" -msgstr "一个按钮绑定,调用时将运行由command4定义的shell命令" +msgid "Command line to be executed in shell when run_command3 is invoked" +msgstr "调用run_command3时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:11 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command5" -msgstr "一个按钮绑定,调用时将运行由command5定义的shell命令" +msgid "Command line 4" +msgstr "命令行4" #: ../plugins/commands/commands.xml.in.h:12 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command6" -msgstr "一个按钮绑定,调用时将运行由command6定义的shell命令" +msgid "Command line to be executed in shell when run_command4 is invoked" +msgstr "调用run_command4时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:13 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command7" -msgstr "一个按钮绑定,调用时将运行由command7定义的shell命令" +msgid "Command line 5" +msgstr "命令行5" #: ../plugins/commands/commands.xml.in.h:14 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command8" -msgstr "一个按钮绑定,调用时将运行由command8定义的shell命令" +msgid "Command line to be executed in shell when run_command5 is invoked" +msgstr "调用run_command5时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:15 -msgid "" -"A button binding that when invoked, will run the shell command identified by " -"command9" -msgstr "一个按钮绑定,调用时将运行由command9定义的shell命令" +msgid "Command line 6" +msgstr "命令行6" #: ../plugins/commands/commands.xml.in.h:16 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command15" -msgstr "" +msgid "Command line to be executed in shell when run_command6 is invoked" +msgstr "调用run_command6时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:17 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command16" -msgstr "" +msgid "Command line 7" +msgstr "命令行7" #: ../plugins/commands/commands.xml.in.h:18 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command17" -msgstr "" +msgid "Command line to be executed in shell when run_command7 is invoked" +msgstr "调用run_command7时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:19 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command18" -msgstr "" +msgid "Command line 8" +msgstr "命令行8" #: ../plugins/commands/commands.xml.in.h:20 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command19" -msgstr "" +msgid "Command line to be executed in shell when run_command8 is invoked" +msgstr "调用run_command8时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:21 -msgid "" -"A button bunding that when invoked, will run the shell command identified by " -"command20" -msgstr "" +msgid "Command line 9" +msgstr "命令行9" #: ../plugins/commands/commands.xml.in.h:22 -msgid "" -"A edge binding that when invoked, will run the shell command identified by " -"command12" -msgstr "" +msgid "Command line to be executed in shell when run_command9 is invoked" +msgstr "调用run_command9时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:23 -msgid "" -"A edge binding that when invoked, will run the shell command identified by " -"command13" -msgstr "" +msgid "Command line 10" +msgstr "命令行10" #: ../plugins/commands/commands.xml.in.h:24 -msgid "" -"A edge binding that when invoked, will run the shell command identified by " -"command14" -msgstr "" +msgid "Command line to be executed in shell when run_command10 is invoked" +msgstr "调用run_command10时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:25 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command15" -msgstr "" +msgid "Command line 11" +msgstr "命令行11" #: ../plugins/commands/commands.xml.in.h:26 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command16" -msgstr "" +msgid "Command line to be executed in shell when run_command11 is invoked" +msgstr "调用run_command11时要在shell中执行的命令行" #: ../plugins/commands/commands.xml.in.h:27 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command17" -msgstr "" +msgid "Command line 12" +msgstr "命令行12" #: ../plugins/commands/commands.xml.in.h:28 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command18" +msgid "Command line to be executed in shell when run_command12 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:29 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command19" +msgid "Command line 13" msgstr "" #: ../plugins/commands/commands.xml.in.h:30 -msgid "" -"A edge bunding that when invoked, will run the shell command identified by " -"command20" +msgid "Command line to be executed in shell when run_command13 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:31 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command0" -msgstr "一个按钮绑定,调用时将运行由command0定义的shell命令" +msgid "Command line 14" +msgstr "" #: ../plugins/commands/commands.xml.in.h:32 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command1" -msgstr "一个按键绑定,调用时将运行由command1定义的shell命令" +msgid "Command line to be executed in shell when run_command14 is invoked" +msgstr "" #: ../plugins/commands/commands.xml.in.h:33 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command10" -msgstr "一个按键绑定,调用时将运行由command10定义的shell命令" +msgid "Command line 15" +msgstr "" #: ../plugins/commands/commands.xml.in.h:34 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command11" -msgstr "一个按键绑定,调用时将运行由command11定义的shell命令" +msgid "Command line to be executed in shell when run_command15 is invoked" +msgstr "" #: ../plugins/commands/commands.xml.in.h:35 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command12" +msgid "Command line 16" msgstr "" #: ../plugins/commands/commands.xml.in.h:36 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command13" +msgid "Command line to be executed in shell when run_command16 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:37 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command14" +msgid "Command line 17" msgstr "" #: ../plugins/commands/commands.xml.in.h:38 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command15" +msgid "Command line to be executed in shell when run_command17 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:39 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command16" +msgid "Command line 18" msgstr "" #: ../plugins/commands/commands.xml.in.h:40 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command17" +msgid "Command line to be executed in shell when run_command18 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:41 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command18" +msgid "Command line 19" msgstr "" #: ../plugins/commands/commands.xml.in.h:42 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command19" +msgid "Command line to be executed in shell when run_command19 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:43 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command2" -msgstr "一个按键绑定,调用时将运行由command2定义的shell命令" +msgid "Command line 20" +msgstr "" #: ../plugins/commands/commands.xml.in.h:44 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command20" +msgid "Command line to be executed in shell when run_command20 is invoked" msgstr "" #: ../plugins/commands/commands.xml.in.h:45 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command3" -msgstr "一个按键绑定,调用时将运行由command3定义的shell命令" +msgid "Key Bindings" +msgstr "按键绑定" #: ../plugins/commands/commands.xml.in.h:46 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command4" -msgstr "一个按键绑定,调用时将运行由command4定义的shell命令" +msgid "Run command 0" +msgstr "运行命令0" #: ../plugins/commands/commands.xml.in.h:47 msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command5" -msgstr "一个按键绑定,调用时将运行由command5定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command0" +msgstr "" #: ../plugins/commands/commands.xml.in.h:48 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command6" -msgstr "一个按键绑定,调用时将运行由command6定义的shell命令" +msgid "Run command 1" +msgstr "运行命令1" #: ../plugins/commands/commands.xml.in.h:49 msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command7" -msgstr "一个按键绑定,调用时将运行由command7定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command1" +msgstr "" #: ../plugins/commands/commands.xml.in.h:50 -msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command8" -msgstr "一个按键绑定,调用时将运行由command8定义的shell命令" +msgid "Run command 2" +msgstr "运行命令2" #: ../plugins/commands/commands.xml.in.h:51 msgid "" -"A keybinding that when invoked, will run the shell command identified by " -"command9" -msgstr "一个按键绑定,调用时将运行由command9定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command2" +msgstr "" #: ../plugins/commands/commands.xml.in.h:52 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command0" -msgstr "一个边缘绑定,调用时将运行由command0定义的shell命令" +msgid "Run command 3" +msgstr "运行命令3" #: ../plugins/commands/commands.xml.in.h:53 msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command1" -msgstr "一个边缘绑定,调用时将运行由command1定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command3" +msgstr "" #: ../plugins/commands/commands.xml.in.h:54 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command10" -msgstr "一个边缘绑定,调用时将运行由command10定义的shell命令" +msgid "Run command 4" +msgstr "运行命令4" #: ../plugins/commands/commands.xml.in.h:55 msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command11" -msgstr "一个边缘绑定,调用时将运行由command11定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command4" +msgstr "" #: ../plugins/commands/commands.xml.in.h:56 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command2" -msgstr "一个边缘绑定,调用时将运行由command2定义的shell命令" +msgid "Run command 5" +msgstr "运行命令5" #: ../plugins/commands/commands.xml.in.h:57 msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command3" -msgstr "一个边缘绑定,调用时将运行由command3定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command5" +msgstr "" #: ../plugins/commands/commands.xml.in.h:58 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command4" -msgstr "一个边缘绑定,调用时将运行由command4定义的shell命令" +msgid "Run command 6" +msgstr "运行命令6" #: ../plugins/commands/commands.xml.in.h:59 msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command5" -msgstr "一个边缘绑定,调用时将运行由command5定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command6" +msgstr "" #: ../plugins/commands/commands.xml.in.h:60 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command6" -msgstr "一个边缘绑定,调用时将运行由command6定义的shell命令" +msgid "Run command 7" +msgstr "运行命令7" #: ../plugins/commands/commands.xml.in.h:61 msgid "" -"An edge binding that when invoked, will run the shell command identified by " +"A keybunding that when invoked, will run the shell command identified by " "command7" -msgstr "一个边缘绑定,调用时将运行由command7定义的shell命令" +msgstr "" #: ../plugins/commands/commands.xml.in.h:62 -msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command8" -msgstr "一个边缘绑定,调用时将运行由command8定义的shell命令" +msgid "Run command 8" +msgstr "运行命令8" #: ../plugins/commands/commands.xml.in.h:63 msgid "" -"An edge binding that when invoked, will run the shell command identified by " -"command9" -msgstr "一个边缘绑定,调用时将运行由command9定义的shell命令" +"A keybunding that when invoked, will run the shell command identified by " +"command8" +msgstr "" #: ../plugins/commands/commands.xml.in.h:64 -msgid "Assigns bindings to arbitrary commands" -msgstr "为任意命令分配绑定" +msgid "Run command 9" +msgstr "运行命令9" #: ../plugins/commands/commands.xml.in.h:65 -msgid "Button Bindings" -msgstr "按钮绑定" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command9" +msgstr "" #: ../plugins/commands/commands.xml.in.h:66 -msgid "Command line 0" -msgstr "命令行0" +msgid "Run command 10" +msgstr "运行命令10" #: ../plugins/commands/commands.xml.in.h:67 -msgid "Command line 1" -msgstr "命令行1" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command10" +msgstr "" #: ../plugins/commands/commands.xml.in.h:68 -msgid "Command line 10" -msgstr "命令行10" +msgid "Run command 11" +msgstr "运行命令11" #: ../plugins/commands/commands.xml.in.h:69 -msgid "Command line 11" -msgstr "命令行11" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command11" +msgstr "" #: ../plugins/commands/commands.xml.in.h:70 -msgid "Command line 12" -msgstr "命令行12" +msgid "Run command 12" +msgstr "运行命令12" #: ../plugins/commands/commands.xml.in.h:71 -msgid "Command line 13" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command12" msgstr "" #: ../plugins/commands/commands.xml.in.h:72 -msgid "Command line 14" +msgid "Run command 13" msgstr "" #: ../plugins/commands/commands.xml.in.h:73 -msgid "Command line 15" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command13" msgstr "" #: ../plugins/commands/commands.xml.in.h:74 -msgid "Command line 16" +msgid "Run command 14" msgstr "" #: ../plugins/commands/commands.xml.in.h:75 -msgid "Command line 17" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command14" msgstr "" #: ../plugins/commands/commands.xml.in.h:76 -msgid "Command line 18" +msgid "Run command 15" msgstr "" #: ../plugins/commands/commands.xml.in.h:77 -msgid "Command line 19" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command15" msgstr "" #: ../plugins/commands/commands.xml.in.h:78 -msgid "Command line 2" -msgstr "命令行2" +msgid "Run command 16" +msgstr "" #: ../plugins/commands/commands.xml.in.h:79 -msgid "Command line 20" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command16" msgstr "" #: ../plugins/commands/commands.xml.in.h:80 -msgid "Command line 3" -msgstr "命令行3" +msgid "Run command 17" +msgstr "" #: ../plugins/commands/commands.xml.in.h:81 -msgid "Command line 4" -msgstr "命令行4" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command17" +msgstr "" #: ../plugins/commands/commands.xml.in.h:82 -msgid "Command line 5" -msgstr "命令行5" +msgid "Run command 18" +msgstr "" #: ../plugins/commands/commands.xml.in.h:83 -msgid "Command line 6" -msgstr "命令行6" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command18" +msgstr "" #: ../plugins/commands/commands.xml.in.h:84 -msgid "Command line 7" -msgstr "命令行7" +msgid "Run command 19" +msgstr "" #: ../plugins/commands/commands.xml.in.h:85 -msgid "Command line 8" -msgstr "命令行8" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command19" +msgstr "" #: ../plugins/commands/commands.xml.in.h:86 -msgid "Command line 9" -msgstr "命令行9" +msgid "Run command 20" +msgstr "" #: ../plugins/commands/commands.xml.in.h:87 -msgid "Command line to be executed in shell when run_command0 is invoked" -msgstr "调用run_command0时要在shell中执行的命令行" +msgid "" +"A keybunding that when invoked, will run the shell command identified by " +"command20" +msgstr "" #: ../plugins/commands/commands.xml.in.h:88 -msgid "Command line to be executed in shell when run_command1 is invoked" -msgstr "调用run_command1时要在shell中执行的命令行" +msgid "Button Bindings" +msgstr "按钮绑定" #: ../plugins/commands/commands.xml.in.h:89 -msgid "Command line to be executed in shell when run_command10 is invoked" -msgstr "调用run_command10时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command0" +msgstr "" #: ../plugins/commands/commands.xml.in.h:90 -msgid "Command line to be executed in shell when run_command11 is invoked" -msgstr "调用run_command11时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command1" +msgstr "" #: ../plugins/commands/commands.xml.in.h:91 -msgid "Command line to be executed in shell when run_command12 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command2" msgstr "" #: ../plugins/commands/commands.xml.in.h:92 -msgid "Command line to be executed in shell when run_command13 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command3" msgstr "" #: ../plugins/commands/commands.xml.in.h:93 -msgid "Command line to be executed in shell when run_command14 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command4" msgstr "" #: ../plugins/commands/commands.xml.in.h:94 -msgid "Command line to be executed in shell when run_command15 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command5" msgstr "" #: ../plugins/commands/commands.xml.in.h:95 -msgid "Command line to be executed in shell when run_command16 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command6" msgstr "" #: ../plugins/commands/commands.xml.in.h:96 -msgid "Command line to be executed in shell when run_command17 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command7" msgstr "" #: ../plugins/commands/commands.xml.in.h:97 -msgid "Command line to be executed in shell when run_command18 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command8" msgstr "" #: ../plugins/commands/commands.xml.in.h:98 -msgid "Command line to be executed in shell when run_command19 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command9" msgstr "" #: ../plugins/commands/commands.xml.in.h:99 -msgid "Command line to be executed in shell when run_command2 is invoked" -msgstr "调用run_command2时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command10" +msgstr "" #: ../plugins/commands/commands.xml.in.h:100 -msgid "Command line to be executed in shell when run_command20 is invoked" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command11" msgstr "" #: ../plugins/commands/commands.xml.in.h:101 -msgid "Command line to be executed in shell when run_command3 is invoked" -msgstr "调用run_command3时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command12" +msgstr "" #: ../plugins/commands/commands.xml.in.h:102 -msgid "Command line to be executed in shell when run_command4 is invoked" -msgstr "调用run_command4时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command13" +msgstr "" #: ../plugins/commands/commands.xml.in.h:103 -msgid "Command line to be executed in shell when run_command5 is invoked" -msgstr "调用run_command5时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command14" +msgstr "" #: ../plugins/commands/commands.xml.in.h:104 -msgid "Command line to be executed in shell when run_command6 is invoked" -msgstr "调用run_command6时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command15" +msgstr "" #: ../plugins/commands/commands.xml.in.h:105 -msgid "Command line to be executed in shell when run_command7 is invoked" -msgstr "调用run_command7时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command16" +msgstr "" #: ../plugins/commands/commands.xml.in.h:106 -msgid "Command line to be executed in shell when run_command8 is invoked" -msgstr "调用run_command8时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command17" +msgstr "" #: ../plugins/commands/commands.xml.in.h:107 -msgid "Command line to be executed in shell when run_command9 is invoked" -msgstr "调用run_command9时要在shell中执行的命令行" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command18" +msgstr "" #: ../plugins/commands/commands.xml.in.h:108 -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1 -msgid "Commands" -msgstr "命令" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command19" +msgstr "" #: ../plugins/commands/commands.xml.in.h:109 -msgid "Edge Bindings" -msgstr "边缘绑定" +msgid "" +"A button bunding that when invoked, will run the shell command identified by " +"command20" +msgstr "" #: ../plugins/commands/commands.xml.in.h:110 -msgid "Key Bindings" -msgstr "按键绑定" +msgid "Edge Bindings" +msgstr "边缘绑定" #: ../plugins/commands/commands.xml.in.h:111 -msgid "Run command 0" -msgstr "运行命令0" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command0" +msgstr "" #: ../plugins/commands/commands.xml.in.h:112 -msgid "Run command 1" -msgstr "运行命令1" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command1" +msgstr "" #: ../plugins/commands/commands.xml.in.h:113 -msgid "Run command 10" -msgstr "运行命令10" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command2" +msgstr "" #: ../plugins/commands/commands.xml.in.h:114 -msgid "Run command 11" -msgstr "运行命令11" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command3" +msgstr "" #: ../plugins/commands/commands.xml.in.h:115 -msgid "Run command 12" -msgstr "运行命令12" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command4" +msgstr "" #: ../plugins/commands/commands.xml.in.h:116 -msgid "Run command 13" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command5" msgstr "" #: ../plugins/commands/commands.xml.in.h:117 -msgid "Run command 14" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command6" msgstr "" #: ../plugins/commands/commands.xml.in.h:118 -msgid "Run command 15" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command7" msgstr "" #: ../plugins/commands/commands.xml.in.h:119 -msgid "Run command 16" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command8" msgstr "" #: ../plugins/commands/commands.xml.in.h:120 -msgid "Run command 17" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command9" msgstr "" #: ../plugins/commands/commands.xml.in.h:121 -msgid "Run command 18" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command10" msgstr "" #: ../plugins/commands/commands.xml.in.h:122 -msgid "Run command 19" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command11" msgstr "" #: ../plugins/commands/commands.xml.in.h:123 -msgid "Run command 2" -msgstr "运行命令2" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command12" +msgstr "" #: ../plugins/commands/commands.xml.in.h:124 -msgid "Run command 20" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command13" msgstr "" #: ../plugins/commands/commands.xml.in.h:125 -msgid "Run command 3" -msgstr "运行命令3" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command14" +msgstr "" #: ../plugins/commands/commands.xml.in.h:126 -msgid "Run command 4" -msgstr "运行命令4" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command15" +msgstr "" #: ../plugins/commands/commands.xml.in.h:127 -msgid "Run command 5" -msgstr "运行命令5" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command16" +msgstr "" #: ../plugins/commands/commands.xml.in.h:128 -msgid "Run command 6" -msgstr "运行命令6" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command17" +msgstr "" #: ../plugins/commands/commands.xml.in.h:129 -msgid "Run command 7" -msgstr "运行命令7" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command18" +msgstr "" #: ../plugins/commands/commands.xml.in.h:130 -msgid "Run command 8" -msgstr "运行命令8" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command19" +msgstr "" #: ../plugins/commands/commands.xml.in.h:131 -msgid "Run command 9" -msgstr "运行命令9" +msgid "" +"An edge bunding that when invoked, will run the shell command identified by " +"command20" +msgstr "" #: ../plugins/composite/composite.xml.in.h:1 -msgid "" -"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps" -msgstr "允许全屏窗口的绘制不重定向到屏幕外的象素映射" +msgid "Composite" +msgstr "" #: ../plugins/composite/composite.xml.in.h:2 -msgid "Automatic detection of refresh rate" -msgstr "自动检测刷新率" +msgid "Composite plugin" +msgstr "" #: ../plugins/composite/composite.xml.in.h:3 -msgid "Composite" -msgstr "" +msgid "Slow Animations" +msgstr "慢速动画" #: ../plugins/composite/composite.xml.in.h:4 -msgid "Composite plugin" -msgstr "" +msgid "Toggle use of slow animations" +msgstr "切换使用慢速动画" #: ../plugins/composite/composite.xml.in.h:5 msgid "Detect Refresh Rate" msgstr "检测刷新率" #: ../plugins/composite/composite.xml.in.h:6 -msgid "Force independent output painting." -msgstr "强制独立输出绘图" +msgid "Automatic detection of refresh rate" +msgstr "自动检测刷新率" #: ../plugins/composite/composite.xml.in.h:7 -msgid "" -"Paint each output device independly, even if the output devices overlap" -msgstr "单独绘制每个输出设备,即便输出设备重复" - -#: ../plugins/composite/composite.xml.in.h:8 msgid "Refresh Rate" msgstr "刷新率" +#: ../plugins/composite/composite.xml.in.h:8 +msgid "The rate at which the screen is redrawn (times/second)" +msgstr "屏幕重绘速率(次/秒)" + #: ../plugins/composite/composite.xml.in.h:9 -msgid "Slow Animations" -msgstr "慢速动画" +msgid "Unredirect Fullscreen Windows" +msgstr "取消重定向全屏窗口" #: ../plugins/composite/composite.xml.in.h:10 -msgid "The rate at which the screen is redrawn (times/second)" -msgstr "屏幕重绘速率(次/秒)" +msgid "" +"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps" +msgstr "允许全屏窗口的绘制不重定向到屏幕外的象素映射" #: ../plugins/composite/composite.xml.in.h:11 -msgid "Toggle use of slow animations" -msgstr "切换使用慢速动画" +msgid "Force independent output painting." +msgstr "强制独立输出绘图" #: ../plugins/composite/composite.xml.in.h:12 -msgid "Unredirect Fullscreen Windows" -msgstr "取消重定向全屏窗口" +msgid "" +"Paint each output device independly, even if the output devices overlap" +msgstr "单独绘制每个输出设备,即便输出设备重复" #: ../plugins/copytex/copytex.xml.in.h:1 -msgid "Copy pixmap content to texture" +msgid "Copy to texture" msgstr "" #: ../plugins/copytex/copytex.xml.in.h:2 -msgid "Copy to texture" +msgid "Copy pixmap content to texture" msgstr "" #: ../plugins/decor/decor.xml.in.h:1 -msgid "Allow mipmaps to be generated for decoration textures" -msgstr "允许为装饰纹理生成mipmap" +msgid "Window Decoration" +msgstr "窗口装饰" #: ../plugins/decor/decor.xml.in.h:2 -msgid "Command" -msgstr "命令" +msgid "Window decorations" +msgstr "窗口装饰" #: ../plugins/decor/decor.xml.in.h:3 -msgid "Decoration windows" -msgstr "装饰窗口" +msgid "Active Shadow" +msgstr "" #: ../plugins/decor/decor.xml.in.h:4 -msgid "" -"Decorator command line that is executed if no decorator is already running" -msgstr "尚无装饰程序运行时执行的装饰程序命令行" +msgid "Shadow Radius" +msgstr "阴影半径" #: ../plugins/decor/decor.xml.in.h:5 -msgid "Drop shadow X offset" -msgstr "阴影X偏移" +msgid "Drop shadow radius" +msgstr "阴影半径" #: ../plugins/decor/decor.xml.in.h:6 -msgid "Drop shadow Y offset" -msgstr "阴影Y偏移" +msgid "Shadow Opacity" +msgstr "阴影不透明度" #: ../plugins/decor/decor.xml.in.h:7 -msgid "Drop shadow color" -msgstr "阴影颜色" - -#: ../plugins/decor/decor.xml.in.h:8 msgid "Drop shadow opacity" msgstr "阴影不透明度" -#: ../plugins/decor/decor.xml.in.h:9 -msgid "Drop shadow radius" -msgstr "阴影半径" - -#: ../plugins/decor/decor.xml.in.h:11 +#: ../plugins/decor/decor.xml.in.h:8 msgid "Shadow Color" msgstr "阴影颜色" -#: ../plugins/decor/decor.xml.in.h:12 +#: ../plugins/decor/decor.xml.in.h:9 +msgid "Drop shadow color" +msgstr "阴影颜色" + +#: ../plugins/decor/decor.xml.in.h:10 msgid "Shadow Offset X" msgstr "阴影X偏移" -#: ../plugins/decor/decor.xml.in.h:13 +#: ../plugins/decor/decor.xml.in.h:11 +msgid "Drop shadow X offset" +msgstr "阴影X偏移" + +#: ../plugins/decor/decor.xml.in.h:12 msgid "Shadow Offset Y" msgstr "阴影Y偏移" +#: ../plugins/decor/decor.xml.in.h:13 +msgid "Drop shadow Y offset" +msgstr "阴影Y偏移" + #: ../plugins/decor/decor.xml.in.h:14 -msgid "Shadow Opacity" -msgstr "阴影不透明度" +msgid "Inactive Shadow" +msgstr "" #: ../plugins/decor/decor.xml.in.h:15 -msgid "Shadow Radius" -msgstr "阴影半径" +msgid "Command" +msgstr "命令" #: ../plugins/decor/decor.xml.in.h:16 -msgid "Shadow windows" -msgstr "阴影窗口" - -#: ../plugins/decor/decor.xml.in.h:17 -msgid "Window Decoration" -msgstr "窗口装饰" +msgid "" +"Decorator command line that is executed if no decorator is already running" +msgstr "尚无装饰程序运行时执行的装饰程序命令行" #: ../plugins/decor/decor.xml.in.h:18 -msgid "Window decorations" -msgstr "窗口装饰" +msgid "Allow mipmaps to be generated for decoration textures" +msgstr "允许为装饰纹理生成mipmap" #: ../plugins/decor/decor.xml.in.h:19 +msgid "Decoration windows" +msgstr "装饰窗口" + +#: ../plugins/decor/decor.xml.in.h:20 msgid "Windows that should be decorated" msgstr "应装饰的窗口" -#: ../plugins/decor/decor.xml.in.h:20 +#: ../plugins/decor/decor.xml.in.h:21 +msgid "Shadow windows" +msgstr "阴影窗口" + +#: ../plugins/decor/decor.xml.in.h:22 msgid "Windows that should have a shadow" msgstr "应有阴影的窗口" +#: ../plugins/fade/fade.xml.in.h:1 +msgid "Fading Windows" +msgstr "渐隐窗口" + #: ../plugins/fade/fade.xml.in.h:2 -#, no-c-format -msgid "Brightness (in %) of unresponsive windows" -msgstr "未响应窗口的亮度(%)" +msgid "Fade in windows when mapped and fade out windows when unmapped" +msgstr "映射时渐现窗口和不映射时渐弱窗口" #: ../plugins/fade/fade.xml.in.h:3 -msgid "Constant speed" -msgstr "恒定旋转速度" +msgid "Fade Mode" +msgstr "渐隐模式" #: ../plugins/fade/fade.xml.in.h:4 -msgid "Constant time" -msgstr "恒定旋转时间" +msgid "Window fade mode" +msgstr "窗口渐隐模式" #: ../plugins/fade/fade.xml.in.h:5 -msgid "Dim Unresponsive Windows" -msgstr "暗化无反应窗口" +msgid "Constant speed" +msgstr "恒定旋转速度" #: ../plugins/fade/fade.xml.in.h:6 -msgid "Dim windows that are not responding to window manager requests" -msgstr "暗化对窗口管理器请求无反应的窗口" +msgid "Constant time" +msgstr "恒定旋转时间" #: ../plugins/fade/fade.xml.in.h:7 -msgid "Fade Mode" -msgstr "渐隐模式" - -#: ../plugins/fade/fade.xml.in.h:8 msgid "Fade Speed" msgstr "渐隐速度" +#: ../plugins/fade/fade.xml.in.h:8 +msgid "Window fade speed" +msgstr "窗口淡出速度" + #: ../plugins/fade/fade.xml.in.h:9 msgid "Fade Time" msgstr "渐隐时间" #: ../plugins/fade/fade.xml.in.h:10 -msgid "Fade effect on system beep" -msgstr "系统嘟嘟声时使用渐隐效果" +msgid "Window fade time (in ms) in \"Constant time\" mode" +msgstr "窗口渐隐时间(秒)设于恒定时间模式" #: ../plugins/fade/fade.xml.in.h:11 -msgid "Fade in windows when mapped and fade out windows when unmapped" -msgstr "映射时渐现窗口和不映射时渐弱窗口" - -#: ../plugins/fade/fade.xml.in.h:12 msgid "Fade windows" msgstr "渐隐窗口" +#: ../plugins/fade/fade.xml.in.h:12 +msgid "Windows that should be fading" +msgstr "应渐隐的窗口" + #: ../plugins/fade/fade.xml.in.h:13 -msgid "Fading Windows" -msgstr "渐隐窗口" +msgid "Visual Bell" +msgstr "视觉振铃" #: ../plugins/fade/fade.xml.in.h:14 +msgid "Fade effect on system beep" +msgstr "系统嘟嘟声时使用渐隐效果" + +#: ../plugins/fade/fade.xml.in.h:15 msgid "Fullscreen Visual Bell" msgstr "全屏静音" -#: ../plugins/fade/fade.xml.in.h:15 +#: ../plugins/fade/fade.xml.in.h:16 msgid "Fullscreen fade effect on system beep" msgstr "系统嘟嘟声的全屏渐隐效果" #: ../plugins/fade/fade.xml.in.h:17 -#, no-c-format -msgid "Saturation (in %) of unresponsive windows" -msgstr "无反应窗口的饱和度百分比" +msgid "Dim Unresponsive Windows" +msgstr "暗化无反应窗口" #: ../plugins/fade/fade.xml.in.h:18 -msgid "Unresponsive Window Brightness" -msgstr "无反应窗口的亮度" +msgid "Dim windows that are not responding to window manager requests" +msgstr "暗化对窗口管理器请求无反应的窗口" #: ../plugins/fade/fade.xml.in.h:19 -msgid "Unresponsive Window Saturation" -msgstr "无反应窗口的饱和度" - -#: ../plugins/fade/fade.xml.in.h:20 -msgid "Visual Bell" -msgstr "视觉振铃" +msgid "Unresponsive Window Brightness" +msgstr "无反应窗口的亮度" #: ../plugins/fade/fade.xml.in.h:21 -msgid "Window fade mode" -msgstr "窗口渐隐模式" +#, no-c-format +msgid "Brightness (in %) of unresponsive windows" +msgstr "未响应窗口的亮度(%)" #: ../plugins/fade/fade.xml.in.h:22 -msgid "Window fade speed" -msgstr "窗口淡出速度" - -#: ../plugins/fade/fade.xml.in.h:23 -msgid "Window fade time (in ms) in \"Constant time\" mode" -msgstr "窗口渐隐时间(秒)设于恒定时间模式" +msgid "Unresponsive Window Saturation" +msgstr "无反应窗口的饱和度" #: ../plugins/fade/fade.xml.in.h:24 -msgid "Windows that should be fading" -msgstr "应渐隐的窗口" +#, no-c-format +msgid "Saturation (in %) of unresponsive windows" +msgstr "无反应窗口的饱和度百分比" -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2 +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1 msgid "Gnome Compatibility" msgstr "Gnome兼容性" -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:3 -msgid "Open a terminal" -msgstr "打开一个终端窗口" - -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:4 +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2 msgid "Options that keep Compiz compatible to the Gnome desktop environment" msgstr "使Compiz兼容Gnome桌面环境的选项" +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:3 +msgid "Show Main Menu" +msgstr "显示主菜单" + +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:4 +msgid "Show the main menu" +msgstr "显示主菜单" + #: ../plugins/gnomecompat/gnomecompat.xml.in.h:5 msgid "Run Dialog" msgstr "运行对话框" #: ../plugins/gnomecompat/gnomecompat.xml.in.h:6 -msgid "Run terminal command" -msgstr "运行终端命令" +msgid "Show Run Application dialog" +msgstr "显示运行应用程序对话框" -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7 +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8 msgid "Screenshot command line" msgstr "截屏命令行" -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8 -msgid "Show Main Menu" -msgstr "显示主菜单" - #: ../plugins/gnomecompat/gnomecompat.xml.in.h:9 -msgid "Show Run Application dialog" -msgstr "显示运行应用程序对话框" +msgid "Take a screenshot" +msgstr "拍摄截屏" #: ../plugins/gnomecompat/gnomecompat.xml.in.h:10 -msgid "Show the main menu" -msgstr "显示主菜单" +msgid "Window screenshot command line" +msgstr "窗口截屏命令行" #: ../plugins/gnomecompat/gnomecompat.xml.in.h:11 -msgid "Take a screenshot" -msgstr "拍摄截屏" - -#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12 msgid "Take a screenshot of a window" msgstr "拍摄窗口截屏" +#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12 +msgid "Run terminal command" +msgstr "运行终端命令" + #: ../plugins/gnomecompat/gnomecompat.xml.in.h:13 msgid "Terminal command line" msgstr "终端命令行" #: ../plugins/gnomecompat/gnomecompat.xml.in.h:14 -msgid "Window screenshot command line" -msgstr "窗口截屏命令行" +msgid "Open a terminal" +msgstr "打开一个终端窗口" #: ../plugins/imgpng/imgpng.xml.in.h:1 msgid "Png" @@ -1488,28 +1496,20 @@ msgstr "Png图像加载工具" #: ../plugins/imgsvg/imgsvg.xml.in.h:1 -msgid "Set overlay" -msgstr "" - -#: ../plugins/imgsvg/imgsvg.xml.in.h:2 -msgid "Set window overlay" -msgstr "" - -#: ../plugins/imgsvg/imgsvg.xml.in.h:3 msgid "Svg" msgstr "Svg" -#: ../plugins/imgsvg/imgsvg.xml.in.h:4 +#: ../plugins/imgsvg/imgsvg.xml.in.h:2 msgid "Svg image loader" msgstr "Svg图像加载工具" -#: ../plugins/ini/ini.xml.in.h:1 -msgid "Ini" -msgstr "Ini" - -#: ../plugins/ini/ini.xml.in.h:2 -msgid "Ini Flat File Backend" -msgstr "ini纯文本后端" +#: ../plugins/imgsvg/imgsvg.xml.in.h:3 +msgid "Set overlay" +msgstr "" + +#: ../plugins/imgsvg/imgsvg.xml.in.h:4 +msgid "Set window overlay" +msgstr "" #: ../plugins/inotify/inotify.xml.in.h:1 msgid "File Watcher" @@ -1520,279 +1520,279 @@ msgstr "文件修改通知插件" #: ../plugins/move/move.xml.in.h:1 -msgid "Constrain Y" -msgstr "约束 Y" +msgid "Move Window" +msgstr "移动窗口" #: ../plugins/move/move.xml.in.h:2 -msgid "Constrain Y coordinate to workspace area" -msgstr "约束工作空间区域的 Y 坐标" +msgid "Move window" +msgstr "移动窗口" #: ../plugins/move/move.xml.in.h:3 -msgid "" -"Do not update the server-side position of windows until finished moving" -msgstr "结束移动前不更新服务端的位置信息" - -#: ../plugins/move/move.xml.in.h:4 msgid "Initiate Window Move" msgstr "启动窗口移动" -#: ../plugins/move/move.xml.in.h:5 -msgid "Lazy Positioning" -msgstr "懒惰定位" +#: ../plugins/move/move.xml.in.h:4 +msgid "Start moving window" +msgstr "开始移动窗口" + +#: ../plugins/move/move.xml.in.h:5 ../plugins/scale/scale.xml.in.h:12 +#: ../plugins/switcher/switcher.xml.in.h:31 +msgid "Opacity" +msgstr "不透明度" #: ../plugins/move/move.xml.in.h:6 -msgid "Move Window" -msgstr "移动窗口" +msgid "Opacity level of moving windows" +msgstr "移动窗口的不透明度" #: ../plugins/move/move.xml.in.h:7 -msgid "Move window" -msgstr "移动窗口" +msgid "Constrain Y" +msgstr "约束 Y" -#: ../plugins/move/move.xml.in.h:8 ../plugins/scale/scale.xml.in.h:29 -#: ../plugins/switcher/switcher.xml.in.h:23 -msgid "Opacity" -msgstr "不透明度" +#: ../plugins/move/move.xml.in.h:8 +msgid "Constrain Y coordinate to workspace area" +msgstr "约束工作空间区域的 Y 坐标" #: ../plugins/move/move.xml.in.h:9 -msgid "Opacity level of moving windows" -msgstr "移动窗口的不透明度" +msgid "Snapoff maximized windows" +msgstr "删除最大化窗口快照" #: ../plugins/move/move.xml.in.h:10 msgid "Snapoff and auto unmaximized maximized windows when dragging" msgstr "拖动时删除快照并自动取消窗口的最大化" #: ../plugins/move/move.xml.in.h:11 -msgid "Snapoff maximized windows" -msgstr "删除最大化窗口快照" +msgid "Lazy Positioning" +msgstr "懒惰定位" #: ../plugins/move/move.xml.in.h:12 -msgid "Start moving window" -msgstr "开始移动窗口" +msgid "" +"Do not update the server-side position of windows until finished moving" +msgstr "结束移动前不更新服务端的位置信息" #: ../plugins/opengl/opengl.xml.in.h:1 -msgid "Best" -msgstr "最佳" +msgid "OpenGL" +msgstr "" #: ../plugins/opengl/opengl.xml.in.h:2 -msgid "Fast" -msgstr "快速" +msgid "OpenGL Plugin" +msgstr "" #: ../plugins/opengl/opengl.xml.in.h:3 -msgid "Good" -msgstr "好" +msgid "Texture Filter" +msgstr "纹理过滤器" #: ../plugins/opengl/opengl.xml.in.h:4 -msgid "If available use compression for textures converted from images" -msgstr "如果可能,对从图片转换来的纹理进行压缩" +msgid "Texture filtering" +msgstr "纹理过滤" #: ../plugins/opengl/opengl.xml.in.h:5 -msgid "Lighting" -msgstr "光线" +msgid "Fast" +msgstr "快速" #: ../plugins/opengl/opengl.xml.in.h:6 -msgid "Only perform screen updates during vertical blanking period" -msgstr "只在垂直清屏期间执行屏幕更新" +msgid "Good" +msgstr "好" #: ../plugins/opengl/opengl.xml.in.h:7 -msgid "OpenGL" -msgstr "" +msgid "Best" +msgstr "最佳" #: ../plugins/opengl/opengl.xml.in.h:8 -msgid "OpenGL Plugin" -msgstr "" +msgid "Lighting" +msgstr "光线" #: ../plugins/opengl/opengl.xml.in.h:9 -msgid "Sync To VBlank" -msgstr "与VBlank同步" +msgid "Use diffuse light when screen is transformed" +msgstr "转换屏幕时使用漫射光" #: ../plugins/opengl/opengl.xml.in.h:10 -msgid "Texture Compression" -msgstr "纹理压缩" +msgid "Sync To VBlank" +msgstr "与VBlank同步" #: ../plugins/opengl/opengl.xml.in.h:11 -msgid "Texture Filter" -msgstr "纹理过滤器" +msgid "Only perform screen updates during vertical blanking period" +msgstr "只在垂直清屏期间执行屏幕更新" #: ../plugins/opengl/opengl.xml.in.h:12 -msgid "Texture filtering" -msgstr "纹理过滤" +msgid "Texture Compression" +msgstr "纹理压缩" #: ../plugins/opengl/opengl.xml.in.h:13 -msgid "Use diffuse light when screen is transformed" -msgstr "转换屏幕时使用漫射光" +msgid "If available use compression for textures converted from images" +msgstr "如果可能,对从图片转换来的纹理进行压缩" #: ../plugins/place/place.xml.in.h:1 -msgid "Algorithm to use for window placement" -msgstr "放置窗口所用的算法" +msgid "Place Windows" +msgstr "放置窗口" #: ../plugins/place/place.xml.in.h:2 -msgid "Cascade" -msgstr "层叠" +msgid "Place windows at appropriate positions when mapped" +msgstr "映射时将窗口放置在适当位置" #: ../plugins/place/place.xml.in.h:3 -msgid "Centered" -msgstr "居中" +msgid "Workarounds" +msgstr "工作区" #: ../plugins/place/place.xml.in.h:4 -msgid "Fixed Window Placement" -msgstr "固定窗口放置" +msgid "Window placement workarounds" +msgstr "窗口放置工作区" #: ../plugins/place/place.xml.in.h:5 -msgid "Force Placement Windows" -msgstr "强制窗口放置" +msgid "Placement Mode" +msgstr "安置模式" #: ../plugins/place/place.xml.in.h:6 -msgid "Horizontal viewport positions" -msgstr "水平视图位置" +msgid "Algorithm to use for window placement" +msgstr "放置窗口所用的算法" #: ../plugins/place/place.xml.in.h:7 -msgid "Keep In Workarea" -msgstr "保持在工作区" +msgid "Cascade" +msgstr "层叠" #: ../plugins/place/place.xml.in.h:8 -msgid "" -"Keep placed window in work area, even if that means that the position might " -"differ from the specified position" -msgstr "保持设置的窗口在工作区,甚至位置可能不同于那特别位置。" +msgid "Centered" +msgstr "居中" #: ../plugins/place/place.xml.in.h:9 -msgid "Maximize" -msgstr "最大化" +msgid "Smart" +msgstr "灵巧" #: ../plugins/place/place.xml.in.h:10 -msgid "Mode" -msgstr "模式" +msgid "Maximize" +msgstr "最大化" -#: ../plugins/place/place.xml.in.h:11 ../plugins/scale/scale.xml.in.h:25 -msgid "Multi Output Mode" -msgstr "多重输出模式" +#: ../plugins/place/place.xml.in.h:11 +msgid "Random" +msgstr "随机" #: ../plugins/place/place.xml.in.h:12 -msgid "Place Windows" -msgstr "放置窗口" +msgid "Pointer" +msgstr "" -#: ../plugins/place/place.xml.in.h:13 -msgid "Place across all outputs" -msgstr "跨越所有输出放置" +#: ../plugins/place/place.xml.in.h:13 ../plugins/scale/scale.xml.in.h:26 +msgid "Multi Output Mode" +msgstr "多重输出模式" #: ../plugins/place/place.xml.in.h:14 -msgid "Place windows at appropriate positions when mapped" -msgstr "映射时将窗口放置在适当位置" +msgid "" +"Selects how window placement should behave if multiple outputs are selected" +msgstr "选择当选用了多重输出时窗口放置的行为" #: ../plugins/place/place.xml.in.h:15 -msgid "Placement Mode" -msgstr "安置模式" +msgid "Use active output device" +msgstr "使用当前输出设备" #: ../plugins/place/place.xml.in.h:16 -msgid "Pointer" -msgstr "" +msgid "Use output device with pointer" +msgstr "使用指针所指的输出设备" #: ../plugins/place/place.xml.in.h:17 -msgid "Positioned windows" -msgstr "已定位的窗口" +msgid "Use output device of focussed window" +msgstr "使用当前窗口的输出设备" #: ../plugins/place/place.xml.in.h:18 -msgid "Positioning modes" -msgstr "定位模式" +msgid "Place across all outputs" +msgstr "跨越所有输出放置" #: ../plugins/place/place.xml.in.h:19 -msgid "Random" -msgstr "随机" +msgid "Force Placement Windows" +msgstr "强制窗口放置" #: ../plugins/place/place.xml.in.h:20 msgid "" -"Selects how window placement should behave if multiple outputs are selected" -msgstr "选择当选用了多重输出时窗口放置的行为" +"Windows that should forcedly be placed, even if they indicate the window " +"manager should avoid placing them." +msgstr "即便向窗口管理器提出避免放置的请求,仍应强制放置的窗口" #: ../plugins/place/place.xml.in.h:21 -msgid "Smart" -msgstr "灵巧" +msgid "Fixed Window Placement" +msgstr "固定窗口放置" #: ../plugins/place/place.xml.in.h:22 -msgid "Use active output device" -msgstr "使用当前输出设备" +msgid "Windows with fixed positions" +msgstr "位置固定的窗口" #: ../plugins/place/place.xml.in.h:23 -msgid "Use output device of focussed window" -msgstr "使用当前窗口的输出设备" +msgid "Positioned windows" +msgstr "已定位的窗口" #: ../plugins/place/place.xml.in.h:24 -msgid "Use output device with pointer" -msgstr "使用指针所指的输出设备" +msgid "Windows that should be positioned by default" +msgstr "默认应定位的窗口" #: ../plugins/place/place.xml.in.h:25 -msgid "Vertical viewport positions" -msgstr "垂直视图位置" +msgid "X Positions" +msgstr "X位置" #: ../plugins/place/place.xml.in.h:26 -msgid "Viewport positioned windows" -msgstr "视图中的定位窗口" +msgid "X position values" +msgstr "X位置取值" #: ../plugins/place/place.xml.in.h:27 -msgid "Window placement workarounds" -msgstr "窗口放置工作区" +msgid "Y Positions" +msgstr "Y位置" #: ../plugins/place/place.xml.in.h:28 -msgid "Windows" -msgstr "窗口" +msgid "Y position values" +msgstr "Y位置取值" #: ../plugins/place/place.xml.in.h:29 -msgid "Windows that should be positioned by default" -msgstr "默认应定位的窗口" +msgid "Keep In Workarea" +msgstr "保持在工作区" #: ../plugins/place/place.xml.in.h:30 -msgid "Windows that should be positioned in specific viewports by default" -msgstr "指定视图中默认应定位的窗口" +msgid "" +"Keep placed window in work area, even if that means that the position might " +"differ from the specified position" +msgstr "保持设置的窗口在工作区,甚至位置可能不同于那特别位置。" #: ../plugins/place/place.xml.in.h:31 -msgid "" -"Windows that should forcedly be placed, even if they indicate the window " -"manager should avoid placing them." -msgstr "即便向窗口管理器提出避免放置的请求,仍应强制放置的窗口" +msgid "Windows with fixed placement mode" +msgstr "有固定位置模式的窗口" #: ../plugins/place/place.xml.in.h:32 -msgid "Windows that should have a certain positioning mo+de" -msgstr "" +msgid "Windows" +msgstr "窗口" #: ../plugins/place/place.xml.in.h:33 -msgid "Windows with fixed placement mode" -msgstr "有固定位置模式的窗口" +msgid "Windows that should have a certain positioning mo+de" +msgstr "" #: ../plugins/place/place.xml.in.h:34 -msgid "Windows with fixed positions" -msgstr "位置固定的窗口" +msgid "Mode" +msgstr "模式" #: ../plugins/place/place.xml.in.h:35 -msgid "Windows with fixed viewport" -msgstr "视口固定的窗口" +msgid "Positioning modes" +msgstr "定位模式" #: ../plugins/place/place.xml.in.h:36 -msgid "Workarounds" -msgstr "工作区" +msgid "Windows with fixed viewport" +msgstr "视口固定的窗口" #: ../plugins/place/place.xml.in.h:37 -msgid "X Positions" -msgstr "X位置" +msgid "Viewport positioned windows" +msgstr "视图中的定位窗口" #: ../plugins/place/place.xml.in.h:38 -msgid "X Viewport Positions" -msgstr "X视图位置" +msgid "Windows that should be positioned in specific viewports by default" +msgstr "指定视图中默认应定位的窗口" #: ../plugins/place/place.xml.in.h:39 -msgid "X position values" -msgstr "X位置取值" +msgid "X Viewport Positions" +msgstr "X视图位置" #: ../plugins/place/place.xml.in.h:40 -msgid "Y Positions" -msgstr "Y位置" +msgid "Horizontal viewport positions" +msgstr "水平视图位置" #: ../plugins/place/place.xml.in.h:41 msgid "Y Viewport Positions" msgstr "Y视图位置" #: ../plugins/place/place.xml.in.h:42 -msgid "Y position values" -msgstr "Y位置取值" +msgid "Vertical viewport positions" +msgstr "垂直视图位置" #: ../plugins/regex/regex.xml.in.h:1 msgid "Regex Matching" @@ -1803,128 +1803,128 @@ msgstr "正则表达式的窗口匹配" #: ../plugins/resize/resize.xml.in.h:1 -msgid "Additional Modifier Keys" -msgstr "" +msgid "Resize Window" +msgstr "调整窗口大小" #: ../plugins/resize/resize.xml.in.h:2 -msgid "Alt" -msgstr "" +msgid "Resize window" +msgstr "调整窗口大小" -#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:5 -#: ../plugins/switcher/switcher.xml.in.h:6 +#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:30 +#: ../plugins/switcher/switcher.xml.in.h:2 msgid "Bindings" msgstr "绑定" #: ../plugins/resize/resize.xml.in.h:4 -msgid "Border Color" -msgstr "边框颜色" +msgid "Initiate Window Resize" +msgstr "启动窗口大小调整" #: ../plugins/resize/resize.xml.in.h:5 -msgid "Border color used for outline and rectangle resize modes" -msgstr "用于描边和矩形大小调整模式的边颜色" +msgid "Start resizing window" +msgstr "开始调整窗口大小" #: ../plugins/resize/resize.xml.in.h:6 -msgid "Centered Modifier" -msgstr "" - -#: ../plugins/resize/resize.xml.in.h:7 -msgid "Control" -msgstr "" - -#: ../plugins/resize/resize.xml.in.h:8 msgid "Default Resize Mode" msgstr "默认大小调整模式" -#: ../plugins/resize/resize.xml.in.h:9 +#: ../plugins/resize/resize.xml.in.h:7 msgid "Default mode used for window resizing" msgstr "窗口大小调整的默认模式" +#: ../plugins/resize/resize.xml.in.h:9 +msgid "Outline" +msgstr "轮廓" + #: ../plugins/resize/resize.xml.in.h:10 -msgid "Fill Color" -msgstr "填充颜色" +msgid "Rectangle" +msgstr "矩形" #: ../plugins/resize/resize.xml.in.h:11 -msgid "Fill color used for rectangle resize mode" -msgstr "用于矩形大小调整模式的填充颜色" +msgid "Stretch" +msgstr "拉伸" #: ../plugins/resize/resize.xml.in.h:12 -msgid "Initiate Window Resize" -msgstr "启动窗口大小调整" +msgid "Border Color" +msgstr "边框颜色" #: ../plugins/resize/resize.xml.in.h:13 -msgid "Meta" -msgstr "" +msgid "Border color used for outline and rectangle resize modes" +msgstr "用于描边和矩形大小调整模式的边颜色" + +#: ../plugins/resize/resize.xml.in.h:14 +msgid "Fill Color" +msgstr "填充颜色" #: ../plugins/resize/resize.xml.in.h:15 -msgid "Normal Resize Windows" -msgstr "普通窗口大小调整" +msgid "Fill color used for rectangle resize mode" +msgstr "用于矩形大小调整模式的填充颜色" #: ../plugins/resize/resize.xml.in.h:16 -msgid "Outline" -msgstr "轮廓" +msgid "Specific Window Matches" +msgstr "" #: ../plugins/resize/resize.xml.in.h:17 -msgid "Outline Modifier" -msgstr "" +msgid "Normal Resize Windows" +msgstr "普通窗口大小调整" #: ../plugins/resize/resize.xml.in.h:18 -msgid "Outline Resize Windows" -msgstr "窗口外框大小调整" +msgid "Windows that normal resize should be used for" +msgstr "正常调整大小的窗口" #: ../plugins/resize/resize.xml.in.h:19 -msgid "Rectangle" -msgstr "矩形" +msgid "Outline Resize Windows" +msgstr "窗口外框大小调整" #: ../plugins/resize/resize.xml.in.h:20 -msgid "Rectangle Modifier" -msgstr "" +msgid "Windows that outline resize should be used for" +msgstr "框架调整大小的窗口" #: ../plugins/resize/resize.xml.in.h:21 msgid "Rectangle Resize Windows" msgstr "矩形窗口大小调整" #: ../plugins/resize/resize.xml.in.h:22 -msgid "Resize Window" -msgstr "调整窗口大小" +msgid "Windows that rectangle resize should be used for" +msgstr "矩形调整大小的窗口" #: ../plugins/resize/resize.xml.in.h:23 -msgid "Resize window" -msgstr "调整窗口大小" +msgid "Stretch Resize Windows" +msgstr "拉伸调整窗口大小" #: ../plugins/resize/resize.xml.in.h:24 -msgid "Shift" -msgstr "" +msgid "Windows that stretch resize should be used for" +msgstr "拉伸调整大小的窗口" #: ../plugins/resize/resize.xml.in.h:25 -msgid "Specific Window Matches" +msgid "Additional Modifier Keys" msgstr "" #: ../plugins/resize/resize.xml.in.h:26 -msgid "Start resizing window" -msgstr "开始调整窗口大小" +msgid "Outline Modifier" +msgstr "" #: ../plugins/resize/resize.xml.in.h:27 -msgid "Stretch" -msgstr "拉伸" +msgid "Use these bindings to resize with an outline." +msgstr "" #: ../plugins/resize/resize.xml.in.h:28 -msgid "Stretch Modifier" +msgid "Shift" msgstr "" #: ../plugins/resize/resize.xml.in.h:29 -msgid "Stretch Resize Windows" -msgstr "拉伸调整窗口大小" +msgid "Alt" +msgstr "" #: ../plugins/resize/resize.xml.in.h:30 -msgid "Use these bindings to resize by stretching." +msgid "Control" msgstr "" #: ../plugins/resize/resize.xml.in.h:31 -msgid "Use these bindings to resize from the center." +msgid "Meta" msgstr "" #: ../plugins/resize/resize.xml.in.h:32 -msgid "Use these bindings to resize with an outline." +msgid "Rectangle Modifier" msgstr "" #: ../plugins/resize/resize.xml.in.h:33 @@ -1932,468 +1932,422 @@ msgstr "" #: ../plugins/resize/resize.xml.in.h:34 -msgid "Windows that normal resize should be used for" -msgstr "正常调整大小的窗口" +msgid "Stretch Modifier" +msgstr "" #: ../plugins/resize/resize.xml.in.h:35 -msgid "Windows that outline resize should be used for" -msgstr "框架调整大小的窗口" +msgid "Use these bindings to resize by stretching." +msgstr "" #: ../plugins/resize/resize.xml.in.h:36 -msgid "Windows that rectangle resize should be used for" -msgstr "矩形调整大小的窗口" +msgid "Centered Modifier" +msgstr "" #: ../plugins/resize/resize.xml.in.h:37 -msgid "Windows that stretch resize should be used for" -msgstr "拉伸调整大小的窗口" +msgid "Use these bindings to resize from the center." +msgstr "" -#: ../plugins/scale/scale.xml.in.h:1 ../plugins/switcher/switcher.xml.in.h:2 -msgid "Amount of opacity in percent" -msgstr "不透明度百分比" +# 此功能完全不能用调整大小来描述,我找这个功能找了N久,才发现:调整大小! = =; +#: ../plugins/scale/scale.xml.in.h:1 +msgid "Scale" +msgstr "缩放" #: ../plugins/scale/scale.xml.in.h:2 -msgid "Appearance" -msgstr "外观" +msgid "Scale windows" +msgstr "窗口缩放" #: ../plugins/scale/scale.xml.in.h:3 -msgid "Behaviour" -msgstr "特性" +msgid "Appearance" +msgstr "外观" #: ../plugins/scale/scale.xml.in.h:4 -msgid "Big" -msgstr "大" +msgid "Spacing" +msgstr "间距" -#: ../plugins/scale/scale.xml.in.h:6 -msgid "Button Bindings Toggle Scale Mode" -msgstr "由按键绑定触发比例模式" +#: ../plugins/scale/scale.xml.in.h:5 +msgid "Space between windows" +msgstr "窗口之间的间隔" + +#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19 +msgid "Speed" +msgstr "速度" #: ../plugins/scale/scale.xml.in.h:7 -msgid "" -"Button bindings toggle scale mode instead of enabling it when pressed and " -"disabling it when released." -msgstr "由按键绑定触发比例模式,而不是按下时启用之松开时禁用之。" +msgid "Scale speed" +msgstr "缩放速度" -#: ../plugins/scale/scale.xml.in.h:8 -msgid "Click Desktop to Show Desktop" -msgstr "点击桌面以显示桌面" +#: ../plugins/scale/scale.xml.in.h:8 ../plugins/switcher/switcher.xml.in.h:21 +msgid "Timestep" +msgstr "时间步长" #: ../plugins/scale/scale.xml.in.h:9 +msgid "Scale timestep" +msgstr "缩放时间步长" + +#: ../plugins/scale/scale.xml.in.h:10 msgid "Darken Background" msgstr "背景变暗" -#: ../plugins/scale/scale.xml.in.h:10 +#: ../plugins/scale/scale.xml.in.h:11 msgid "Darken background when scaling windows" msgstr "调整窗口大小时背景变暗" -#: ../plugins/scale/scale.xml.in.h:11 -msgid "Drag and Drop Distance" -msgstr "" - -#: ../plugins/scale/scale.xml.in.h:12 -msgid "Drag and Drop Hover Timeout" -msgstr "" - -#: ../plugins/scale/scale.xml.in.h:13 -msgid "Emblem" -msgstr "标志" +#: ../plugins/scale/scale.xml.in.h:13 ../plugins/switcher/switcher.xml.in.h:32 +msgid "Amount of opacity in percent" +msgstr "不透明度百分比" #: ../plugins/scale/scale.xml.in.h:14 -msgid "Enter Show Desktop mode when Desktop is clicked during Scale" -msgstr "在缩放时,点击桌面会进入显示桌面模式" +msgid "Overlay Icon" +msgstr "覆盖图标" #: ../plugins/scale/scale.xml.in.h:15 -msgid "Initiate Window Picker" -msgstr "启动窗口检出器" +msgid "Overlay an icon on windows once they are scaled" +msgstr "缩放窗口时覆盖图标" #: ../plugins/scale/scale.xml.in.h:16 -msgid "Initiate Window Picker For All Windows" -msgstr "启动所有窗口的窗口拾取器" +msgid "None" +msgstr "无" #: ../plugins/scale/scale.xml.in.h:17 -msgid "Initiate Window Picker For Window Group" -msgstr "启动窗口组的窗口拾取器" +msgid "Emblem" +msgstr "标志" #: ../plugins/scale/scale.xml.in.h:18 -msgid "Initiate Window Picker For Windows on Current Output" -msgstr "启动当前输出窗口的窗口拾取器" +msgid "Big" +msgstr "大" #: ../plugins/scale/scale.xml.in.h:19 -msgid "Key Bindings Toggle Scale Mode" -msgstr "由按键绑定触发比例模式" +msgid "Behaviour" +msgstr "特性" #: ../plugins/scale/scale.xml.in.h:20 -msgid "" -"Key bindings toggle scale mode instead of enabling it when pressed and " -"disabling it when released." -msgstr "由按键绑定触发比例模式,而不是按下时启用之松开时禁用之。" +msgid "Scale Windows" +msgstr "窗口缩放" #: ../plugins/scale/scale.xml.in.h:21 -msgid "Layout and start transforming all windows" -msgstr "对所有窗口调整布局并开始转换" +msgid "Windows that should be scaled in scale mode" +msgstr "缩放模式下应缩放的窗口类型" #: ../plugins/scale/scale.xml.in.h:22 -msgid "Layout and start transforming window group" -msgstr "对窗口组调整布局并开始转换" +msgid "Drag and Drop Hover Timeout" +msgstr "" #: ../plugins/scale/scale.xml.in.h:23 -msgid "Layout and start transforming windows" -msgstr "布局和开始转换窗口" +msgid "" +"Time (in ms) before scale mode is terminated when hovering over a window " +"dragging and dropping an item" +msgstr "" #: ../plugins/scale/scale.xml.in.h:24 -msgid "Layout and start transforming windows on current output" -msgstr "对当前输出窗口调整布局并开始转换" +msgid "Drag and Drop Distance" +msgstr "" -#: ../plugins/scale/scale.xml.in.h:26 -msgid "None" -msgstr "无" +#: ../plugins/scale/scale.xml.in.h:25 +msgid "The minimum distance (in px) beyond which the timeout is reset." +msgstr "" #: ../plugins/scale/scale.xml.in.h:27 -msgid "On all output devices" -msgstr "在所有输出设备上" +msgid "Selects where windows are scaled if multiple output devices are used." +msgstr "在使用了多重输出设备的情况下选择何处窗口缩放" #: ../plugins/scale/scale.xml.in.h:28 msgid "On current output device" msgstr "在当前输出设备上" -#: ../plugins/scale/scale.xml.in.h:30 -msgid "Overlay Icon" -msgstr "覆盖图标" +#: ../plugins/scale/scale.xml.in.h:29 +msgid "On all output devices" +msgstr "在所有输出设备上" #: ../plugins/scale/scale.xml.in.h:31 -msgid "Overlay an icon on windows once they are scaled" -msgstr "缩放窗口时覆盖图标" +msgid "Key Bindings Toggle Scale Mode" +msgstr "由按键绑定触发比例模式" -# 此功能完全不能用调整大小来描述,我找这个功能找了N久,才发现:调整大小! = =; #: ../plugins/scale/scale.xml.in.h:32 -msgid "Scale" -msgstr "缩放" +msgid "" +"Key bindings toggle scale mode instead of enabling it when pressed and " +"disabling it when released." +msgstr "由按键绑定触发比例模式,而不是按下时启用之松开时禁用之。" #: ../plugins/scale/scale.xml.in.h:33 -msgid "Scale Windows" -msgstr "窗口缩放" +msgid "Button Bindings Toggle Scale Mode" +msgstr "由按键绑定触发比例模式" #: ../plugins/scale/scale.xml.in.h:34 -msgid "Scale speed" -msgstr "缩放速度" +msgid "" +"Button bindings toggle scale mode instead of enabling it when pressed and " +"disabling it when released." +msgstr "由按键绑定触发比例模式,而不是按下时启用之松开时禁用之。" #: ../plugins/scale/scale.xml.in.h:35 -msgid "Scale timestep" -msgstr "缩放时间步长" +msgid "Initiate Window Picker" +msgstr "启动窗口检出器" #: ../plugins/scale/scale.xml.in.h:36 -msgid "Scale windows" -msgstr "窗口缩放" +msgid "Layout and start transforming windows" +msgstr "布局和开始转换窗口" #: ../plugins/scale/scale.xml.in.h:37 -msgid "Selects where windows are scaled if multiple output devices are used." -msgstr "在使用了多重输出设备的情况下选择何处窗口缩放" +msgid "Initiate Window Picker For All Windows" +msgstr "启动所有窗口的窗口拾取器" #: ../plugins/scale/scale.xml.in.h:38 -msgid "Space between windows" -msgstr "窗口之间的间隔" +msgid "Layout and start transforming all windows" +msgstr "对所有窗口调整布局并开始转换" #: ../plugins/scale/scale.xml.in.h:39 -msgid "Spacing" -msgstr "间距" +msgid "Initiate Window Picker For Window Group" +msgstr "启动窗口组的窗口拾取器" -#: ../plugins/scale/scale.xml.in.h:40 ../plugins/switcher/switcher.xml.in.h:40 -#: ../plugins/zoom/zoom.xml.in.h:3 -msgid "Speed" -msgstr "速度" +#: ../plugins/scale/scale.xml.in.h:40 +msgid "Layout and start transforming window group" +msgstr "对窗口组调整布局并开始转换" #: ../plugins/scale/scale.xml.in.h:41 -msgid "The minimum distance (in px) beyond which the timeout is reset." -msgstr "" +msgid "Initiate Window Picker For Windows on Current Output" +msgstr "启动当前输出窗口的窗口拾取器" #: ../plugins/scale/scale.xml.in.h:42 -msgid "" -"Time (in ms) before scale mode is terminated when hovering over a window " -"dragging and dropping an item" -msgstr "" +msgid "Layout and start transforming windows on current output" +msgstr "对当前输出窗口调整布局并开始转换" -#: ../plugins/scale/scale.xml.in.h:43 ../plugins/switcher/switcher.xml.in.h:44 -#: ../plugins/zoom/zoom.xml.in.h:4 -msgid "Timestep" -msgstr "时间步长" +#: ../plugins/scale/scale.xml.in.h:43 +msgid "Click Desktop to Show Desktop" +msgstr "点击桌面以显示桌面" #: ../plugins/scale/scale.xml.in.h:44 -msgid "Windows that should be scaled in scale mode" -msgstr "缩放模式下应缩放的窗口类型" +msgid "Enter Show Desktop mode when Desktop is clicked during Scale" +msgstr "在缩放时,点击桌面会进入显示桌面模式" #: ../plugins/switcher/switcher.xml.in.h:1 -msgid "Amount of brightness in percent" -msgstr "亮度百分比" +msgid "Application Switcher" +msgstr "应用程序切换条" #: ../plugins/switcher/switcher.xml.in.h:3 -msgid "Amount of saturation in percent" -msgstr "饱和度百分比" +msgid "Next window" +msgstr "下一个窗口" #: ../plugins/switcher/switcher.xml.in.h:4 -msgid "Application Switcher" -msgstr "应用程序切换条" +msgid "Popup switcher if not visible and select next window" +msgstr "不可见时弹出切换程序并选择下一个窗口" #: ../plugins/switcher/switcher.xml.in.h:5 -msgid "Auto Rotate" -msgstr "自动旋转" +msgid "Prev window" +msgstr "上一个窗口" + +#: ../plugins/switcher/switcher.xml.in.h:6 +msgid "Popup switcher if not visible and select previous window" +msgstr "不可见时弹出切换程序并选择上一个窗口" #: ../plugins/switcher/switcher.xml.in.h:7 -msgid "Brightness" -msgstr "亮度" +msgid "Next window (All windows)" +msgstr "下一个窗口(所有)" #: ../plugins/switcher/switcher.xml.in.h:8 -msgid "Bring To Front" -msgstr "置前" +msgid "" +"Popup switcher if not visible and select next window out of all windows" +msgstr "不可见时弹出切换程序并选择所有窗口的下一个窗口" #: ../plugins/switcher/switcher.xml.in.h:9 -msgid "Bring selected window to front" -msgstr "将选中的窗口放在前面" +msgid "Prev window (All windows)" +msgstr "上一个窗口(全部窗口)" #: ../plugins/switcher/switcher.xml.in.h:10 -msgid "Distance desktop should be zoom out while switching windows" -msgstr "切换窗口时应缩小远距离桌面" +msgid "" +"Popup switcher if not visible and select previous window out of all windows" +msgstr "不可见时弹出切换程序并选择所有窗口的上一个窗口" #: ../plugins/switcher/switcher.xml.in.h:11 -msgid "Focus on Switch" -msgstr "" +msgid "Next window (No popup)" +msgstr "下一个窗口(非弹出)" #: ../plugins/switcher/switcher.xml.in.h:12 -msgid "Focus windows when they are visible during the switch" -msgstr "" +msgid "Select next window without showing the popup window." +msgstr "选取下一个窗口,且排除显示弹出窗口。" #: ../plugins/switcher/switcher.xml.in.h:13 -msgid "Generate mipmaps when possible for higher quality scaling" -msgstr "有可能时生成mipmaps用于更高质量的缩放比例" +msgid "Prev window (No popup)" +msgstr "上一个窗口(非弹出)" #: ../plugins/switcher/switcher.xml.in.h:14 -msgid "Icon" -msgstr "图标" +msgid "Select previous window without showing the popup window." +msgstr "选取下一个窗口,且排除显示弹出窗口。" #: ../plugins/switcher/switcher.xml.in.h:15 -msgid "Minimized" -msgstr "最小化" - -#: ../plugins/switcher/switcher.xml.in.h:17 msgid "Next Panel" msgstr "下一个面板" -#: ../plugins/switcher/switcher.xml.in.h:18 -msgid "Next window" -msgstr "下一个窗口" +#: ../plugins/switcher/switcher.xml.in.h:16 +msgid "Select next panel type window." +msgstr "选择下一个面板类型窗口。" -#: ../plugins/switcher/switcher.xml.in.h:19 -msgid "Next window (All windows)" -msgstr "下一个窗口(所有)" +#: ../plugins/switcher/switcher.xml.in.h:17 +msgid "Prev Panel" +msgstr "上一个面板" -#: ../plugins/switcher/switcher.xml.in.h:20 -msgid "Next window (No popup)" -msgstr "下一个窗口(非弹出)" +#: ../plugins/switcher/switcher.xml.in.h:18 +msgid "Select previous panel type window." +msgstr "选择前一个面板类型窗口。" -#: ../plugins/switcher/switcher.xml.in.h:21 -msgid "Only show icon" -msgstr "" +#: ../plugins/switcher/switcher.xml.in.h:20 +msgid "Switcher speed" +msgstr "切换程序速度" #: ../plugins/switcher/switcher.xml.in.h:22 -msgid "Only show the window icon and do not display a thumbnail at all" -msgstr "" +msgid "Switcher timestep" +msgstr "切换程序时间区间" -#: ../plugins/switcher/switcher.xml.in.h:24 -msgid "Popup switcher if not visible and select next window" -msgstr "不可见时弹出切换程序并选择下一个窗口" +#: ../plugins/switcher/switcher.xml.in.h:23 +msgid "Switcher windows" +msgstr "切换程序窗口" -#: ../plugins/switcher/switcher.xml.in.h:25 -msgid "" -"Popup switcher if not visible and select next window out of all windows" -msgstr "不可见时弹出切换程序并选择所有窗口的下一个窗口" +#: ../plugins/switcher/switcher.xml.in.h:24 +msgid "Windows that should be shown in switcher" +msgstr "切换程序中应显示的窗口" #: ../plugins/switcher/switcher.xml.in.h:26 -msgid "Popup switcher if not visible and select previous window" -msgstr "不可见时弹出切换程序并选择上一个窗口" +msgid "Generate mipmaps when possible for higher quality scaling" +msgstr "有可能时生成mipmaps用于更高质量的缩放比例" #: ../plugins/switcher/switcher.xml.in.h:27 -msgid "" -"Popup switcher if not visible and select previous window out of all windows" -msgstr "不可见时弹出切换程序并选择所有窗口的上一个窗口" +msgid "Saturation" +msgstr "饱和度" #: ../plugins/switcher/switcher.xml.in.h:28 -msgid "Prev Panel" -msgstr "上一个面板" +msgid "Amount of saturation in percent" +msgstr "饱和度百分比" #: ../plugins/switcher/switcher.xml.in.h:29 -msgid "Prev window" -msgstr "上一个窗口" +msgid "Brightness" +msgstr "亮度" #: ../plugins/switcher/switcher.xml.in.h:30 -msgid "Prev window (All windows)" -msgstr "上一个窗口(全部窗口)" - -#: ../plugins/switcher/switcher.xml.in.h:31 -msgid "Prev window (No popup)" -msgstr "上一个窗口(非弹出)" - -#: ../plugins/switcher/switcher.xml.in.h:32 -msgid "Rotate to the selected window while switching" -msgstr "切换时转到所选窗口" +msgid "Amount of brightness in percent" +msgstr "亮度百分比" #: ../plugins/switcher/switcher.xml.in.h:33 -msgid "Saturation" -msgstr "饱和度" +msgid "Focus on Switch" +msgstr "" #: ../plugins/switcher/switcher.xml.in.h:34 -msgid "Select next panel type window." -msgstr "选择下一个面板类型窗口。" +msgid "Focus windows when they are visible during the switch" +msgstr "" #: ../plugins/switcher/switcher.xml.in.h:35 -msgid "Select next window without showing the popup window." -msgstr "选取下一个窗口,且排除显示弹出窗口。" +msgid "Bring To Front" +msgstr "置前" #: ../plugins/switcher/switcher.xml.in.h:36 -msgid "Select previous panel type window." -msgstr "选择前一个面板类型窗口。" +msgid "Bring selected window to front" +msgstr "将选中的窗口放在前面" #: ../plugins/switcher/switcher.xml.in.h:37 -msgid "Select previous window without showing the popup window." -msgstr "选取下一个窗口,且排除显示弹出窗口。" +msgid "Zoom" +msgstr "缩放" #: ../plugins/switcher/switcher.xml.in.h:38 -msgid "Show icon next to thumbnail" -msgstr "在缩略图旁边显示图标" +msgid "Distance desktop should be zoom out while switching windows" +msgstr "切换窗口时应缩小远距离桌面" #: ../plugins/switcher/switcher.xml.in.h:39 -msgid "Show minimized windows" -msgstr "显示最小化的窗口" +msgid "Icon" +msgstr "图标" + +#: ../plugins/switcher/switcher.xml.in.h:40 +msgid "Show icon next to thumbnail" +msgstr "在缩略图旁边显示图标" #: ../plugins/switcher/switcher.xml.in.h:41 -msgid "Switcher speed" -msgstr "切换程序速度" +msgid "Only show icon" +msgstr "" #: ../plugins/switcher/switcher.xml.in.h:42 -msgid "Switcher timestep" -msgstr "切换程序时间区间" +msgid "Only show the window icon and do not display a thumbnail at all" +msgstr "" #: ../plugins/switcher/switcher.xml.in.h:43 -msgid "Switcher windows" -msgstr "切换程序窗口" +msgid "Minimized" +msgstr "最小化" + +#: ../plugins/switcher/switcher.xml.in.h:44 +msgid "Show minimized windows" +msgstr "显示最小化的窗口" #: ../plugins/switcher/switcher.xml.in.h:45 -msgid "Windows that should be shown in switcher" -msgstr "切换程序中应显示的窗口" +msgid "Auto Rotate" +msgstr "自动旋转" #: ../plugins/switcher/switcher.xml.in.h:46 -msgid "Zoom" -msgstr "缩放" +msgid "Rotate to the selected window while switching" +msgstr "切换时转到所选窗口" #: ../plugins/water/water.xml.in.h:1 -msgid "Add line" -msgstr "增加线" +msgid "Water Effect" +msgstr "水纹效果" #: ../plugins/water/water.xml.in.h:2 -msgid "Add point" -msgstr "增加点" - -#: ../plugins/water/water.xml.in.h:3 msgid "Adds water effects to different desktop actions" msgstr "将水纹效果添加到不同的桌面操作" -#: ../plugins/water/water.xml.in.h:4 -msgid "Delay (in ms) between each rain-drop" -msgstr "每次降雨效果之间的延时(以毫秒为单位)" +#: ../plugins/water/water.xml.in.h:3 +msgid "Initiate" +msgstr "启动" -#: ../plugins/water/water.xml.in.h:5 +#: ../plugins/water/water.xml.in.h:4 msgid "Enable pointer water effects" msgstr "启用指针水纹效果" -#: ../plugins/water/water.xml.in.h:6 ../plugins/zoom/zoom.xml.in.h:2 -msgid "Initiate" -msgstr "启动" +#: ../plugins/water/water.xml.in.h:5 +msgid "Toggle rain" +msgstr "触发降雨" + +#: ../plugins/water/water.xml.in.h:6 +msgid "Toggle rain effect" +msgstr "触发降雨效果" #: ../plugins/water/water.xml.in.h:7 -msgid "Line" -msgstr "线" +msgid "Toggle wiper" +msgstr "触发雨刷" #: ../plugins/water/water.xml.in.h:8 -msgid "Offset Scale" -msgstr "偏移比例" +msgid "Toggle wiper effect" +msgstr "触发雨刷效果" #: ../plugins/water/water.xml.in.h:9 -msgid "Point" -msgstr "点" +msgid "Offset Scale" +msgstr "偏移比例" #: ../plugins/water/water.xml.in.h:10 -msgid "Rain Delay" -msgstr "降雨延时" +msgid "Water offset scale" +msgstr "水纹偏移比例" #: ../plugins/water/water.xml.in.h:11 -msgid "Title wave" -msgstr "波浪标题" +msgid "Rain Delay" +msgstr "降雨延时" #: ../plugins/water/water.xml.in.h:12 -msgid "Toggle rain" -msgstr "触发降雨" +msgid "Delay (in ms) between each rain-drop" +msgstr "每次降雨效果之间的延时(以毫秒为单位)" #: ../plugins/water/water.xml.in.h:13 -msgid "Toggle rain effect" -msgstr "触发降雨效果" +msgid "Title wave" +msgstr "波浪标题" #: ../plugins/water/water.xml.in.h:14 -msgid "Toggle wiper" -msgstr "触发雨刷" +msgid "Wave effect from window title" +msgstr "窗口标题的波浪效果" #: ../plugins/water/water.xml.in.h:15 -msgid "Toggle wiper effect" -msgstr "触发雨刷效果" +msgid "Point" +msgstr "点" #: ../plugins/water/water.xml.in.h:16 -msgid "Water Effect" -msgstr "水纹效果" +msgid "Add point" +msgstr "增加点" #: ../plugins/water/water.xml.in.h:17 -msgid "Water offset scale" -msgstr "水纹偏移比例" +msgid "Line" +msgstr "线" #: ../plugins/water/water.xml.in.h:18 -msgid "Wave effect from window title" -msgstr "窗口标题的波浪效果" - -#: ../plugins/zoom/zoom.xml.in.h:1 -msgid "Filter Linear" -msgstr "线性过滤器" - -#: ../plugins/zoom/zoom.xml.in.h:5 -msgid "Use linear filter when zoomed in" -msgstr "放大时使用线性过滤器" - -#: ../plugins/zoom/zoom.xml.in.h:6 -msgid "Zoom Desktop" -msgstr "缩放桌面" - -#: ../plugins/zoom/zoom.xml.in.h:7 -msgid "Zoom In" -msgstr "放大" - -#: ../plugins/zoom/zoom.xml.in.h:8 -msgid "Zoom Out" -msgstr "缩小" - -#: ../plugins/zoom/zoom.xml.in.h:9 -msgid "Zoom Pan" -msgstr "缩放盘" - -#: ../plugins/zoom/zoom.xml.in.h:10 -msgid "Zoom Speed" -msgstr "缩放速度" - -#: ../plugins/zoom/zoom.xml.in.h:11 -msgid "Zoom Timestep" -msgstr "缩放时间区间" - -#: ../plugins/zoom/zoom.xml.in.h:12 -msgid "Zoom and pan desktop cube" -msgstr "缩放和桌面立方体" - -#: ../plugins/zoom/zoom.xml.in.h:13 -msgid "Zoom factor" -msgstr "缩放比例" - -#: ../plugins/zoom/zoom.xml.in.h:14 -msgid "Zoom pan" -msgstr "缩放盘" +msgid "Add line" +msgstr "增加线" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/coreutils.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/coreutils.po 2012-02-23 07:11:26.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: 2011-12-29 09:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpio.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpio.po 2012-02-23 07:11:26.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: 2011-12-29 09:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.4.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.4.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.4.po 2012-01-02 18:07:42.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.4.po 2012-02-23 07:12:03.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: 2011-12-29 18:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: charset.c:674 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.5.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.5.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.5.po 2012-01-02 18:07:46.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.5.po 2012-02-23 07:12:06.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: cpplib 4.5.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" "POT-Creation-Date: 2010-04-06 14:10+0000\n" -"PO-Revision-Date: 2011-12-13 05:27+0000\n" +"PO-Revision-Date: 2012-01-30 19:24+0000\n" "Last-Translator: Meng Jie \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: 2011-12-29 19:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:45+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.6.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.6.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2012-01-02 18:07:48.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2012-02-23 07:12:09.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: 2011-06-21 10:26+0000\n" -"PO-Revision-Date: 2011-12-17 23:28+0000\n" +"PO-Revision-Date: 2012-02-17 02:36+0000\n" "Last-Translator: Meng Jie \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: 2011-12-29 19:36+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 02:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cpplib.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib.po 2012-02-23 07:11:53.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: 2011-12-29 15:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: charset.c:654 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cracklib.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cracklib.po 2012-02-23 07:11:26.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: 2011-12-29 09:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/fascist.c:550 msgid "you are not registered in the password file" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2012-01-02 18:07:13.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2012-02-23 07:11: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: 2011-12-29 11:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cryptsetup.po 2012-01-02 18:07:13.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup.po 2012-02-23 07:11: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: 2011-12-29 11:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/libdevmapper.c:120 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/cwidget.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cwidget.po 2012-02-23 07:11:58.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: 2011-12-29 17:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:03+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2012-02-23 07:11: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: 2011-12-29 15:36+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/ifile.c:54 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debconf.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debconf.po 2012-02-23 07:11:26.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: debconf 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-30 12:23-0400\n" -"PO-Revision-Date: 2011-12-08 00:07+0000\n" +"POT-Creation-Date: 2012-02-10 22:59+0000\n" +"PO-Revision-Date: 2012-02-11 02:07+0000\n" "Last-Translator: Ming Hua \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 @@ -194,7 +194,7 @@ "设置文件,这个文件对您来说将会是很熟悉的 -- 它包含一些注释和设定项目。请编辑此文件,更改任何必要的项目,然后保存并离开。同时,debconf " "会读取已修改的文件,并使用您输入的值来配置系统。" -#: ../Debconf/FrontEnd/Gnome.pm:97 ../Debconf/FrontEnd/Kde.pm:100 +#: ../Debconf/FrontEnd/Gnome.pm:144 ../Debconf/FrontEnd/Kde.pm:100 #: ../Debconf/FrontEnd/Kde.pm:104 #, perl-format msgid "Debconf on %s" @@ -255,50 +255,50 @@ msgid "Template #%s in %s does not contain a 'Template:' line\n" msgstr "%2$s 中第 %1$s 模板未包含“Template:”行\n" -#: ../dpkg-preconfigure:121 +#: ../dpkg-preconfigure:125 #, perl-format msgid "must specify some debs to preconfigure" msgstr "必须指定要预设定的 deb 包" -#: ../dpkg-preconfigure:126 +#: ../dpkg-preconfigure:130 msgid "delaying package configuration, since apt-utils is not installed" msgstr "因为并未安装 apt-utils,所以软件包的设定过程将被推迟" -#: ../dpkg-preconfigure:133 +#: ../dpkg-preconfigure:137 #, perl-format msgid "unable to re-open stdin: %s" msgstr "重新开启标准输入失败:%s" -#: ../dpkg-preconfigure:164 ../dpkg-preconfigure:176 +#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180 #, perl-format msgid "apt-extracttemplates failed: %s" msgstr "apt-extracttemplates 失败:%s" -#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180 +#: ../dpkg-preconfigure:172 ../dpkg-preconfigure:184 #, perl-format msgid "Extracting templates from packages: %d%%" msgstr "正在从软件包中解出模板:%d%%" -#: ../dpkg-preconfigure:190 +#: ../dpkg-preconfigure:194 msgid "Preconfiguring packages ...\n" msgstr "正在预设定软件包 ...\n" -#: ../dpkg-preconfigure:202 +#: ../dpkg-preconfigure:206 #, perl-format msgid "template parse error: %s" msgstr "模板解读错误: %s" -#: ../dpkg-preconfigure:216 +#: ../dpkg-preconfigure:220 #, perl-format msgid "debconf: can't chmod: %s" msgstr "debconf:无法改变权限:%s" -#: ../dpkg-preconfigure:227 +#: ../dpkg-preconfigure:231 #, perl-format msgid "%s failed to preconfigure, with exit status %s" msgstr "预设定 %s 失败,退出状态为 %s" -#: ../dpkg-reconfigure:103 +#: ../dpkg-reconfigure:107 msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -a, --all\t\t\tReconfigure all packages.\n" @@ -314,26 +314,26 @@ " --force\t\t\t强迫重配置受损软件包。\n" " --no-reload\t\t不要轻易的重装模板(使用时请慎重考虑)。" -#: ../dpkg-reconfigure:117 +#: ../dpkg-reconfigure:121 #, perl-format msgid "%s must be run as root" msgstr "%s 必须以 root 身份执行" -#: ../dpkg-reconfigure:150 +#: ../dpkg-reconfigure:154 msgid "please specify a package to reconfigure" msgstr "请指定要重新设定的软件包" -#: ../dpkg-reconfigure:171 +#: ../dpkg-reconfigure:175 #, perl-format msgid "%s is not installed" msgstr "%s 未安装" -#: ../dpkg-reconfigure:175 +#: ../dpkg-reconfigure:179 #, perl-format msgid "%s is broken or not fully installed" msgstr "%s 已被损坏或未完成安装" -#: ../dpkg-reconfigure:254 +#: ../dpkg-reconfigure:258 #, perl-format msgid "Cannot read status file: %s" msgstr "不能读取状态文件:%s" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debian-tasks.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debian-tasks.po 2012-02-23 07:11:50.000000000 +0000 @@ -10,14 +10,14 @@ "Project-Id-Version: tasksel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-07-31 21:35-0300\n" -"PO-Revision-Date: 2011-08-10 16:48+0000\n" +"PO-Revision-Date: 2012-01-21 01:18+0000\n" "Last-Translator: YunQiang Su \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/debianutils.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debianutils.po 2012-02-23 07:11:26.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: debianutils\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-01 20:54-0500\n" +"POT-Creation-Date: 2012-01-30 23:31-0500\n" "PO-Revision-Date: 2008-10-19 10:45+0000\n" "Last-Translator: Chen Ming \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po 2012-01-02 18:07:44.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po 2012-02-23 07:12:04.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: 2011-12-29 18:31+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: kcmgtk.desktop:2 msgctxt "Name" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/devscripts.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/devscripts.po 2012-02-23 07:11:26.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: 2011-12-29 09:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:38+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. type: TH #: ../scripts/annotate-output.1:1 @@ -89,7 +89,7 @@ msgstr "" #. type: TP -#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:592 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 +#: ../scripts/annotate-output.1:16 ../scripts/chdist.pl:37 ../scripts/dcontrol.pl:256 ../scripts/dd-list.1:59 ../scripts/debcheckout.pl:93 ../scripts/debsnap.1:57 ../scripts/dget.pl:592 ../scripts/dpkg-depcheck.1:96 ../scripts/getbuildlog.1:25 ../scripts/mk-build-deps.pl:79 ../scripts/rmadison.pl:249 ../doc/suspicious-source.1:35 ../doc/what-patch.1:17 ../doc/wrap-and-sort.1:34 #, no-wrap msgid "B<-h>, B<--help>" msgstr "B<-h>, B<--help>" @@ -4194,7 +4194,7 @@ msgstr "" #. type: TP -#: ../scripts/dcontrol.pl:260 ../scripts/dget.pl:596 ../scripts/getbuildlog.1:28 +#: ../scripts/dcontrol.pl:260 ../scripts/dd-list.1:96 ../scripts/dget.pl:596 ../scripts/getbuildlog.1:28 #, no-wrap msgid "B<-V>, B<--version>" msgstr "" @@ -4271,7 +4271,7 @@ #: ../scripts/dd-list.1:26 msgid "" "B [B<-hiusV>] [B<--help>] [B<--stdin>] [B<--sources " -">I] [B<--dctrl>] [B<--version>] [B<--uploaders>] [I " +">I] [B<--dctrl>] [B<--version>] [B<--uploaders>] [I " "...]" msgstr "" @@ -4327,12 +4327,6 @@ "library version transition happens." msgstr "" -#. type: TP -#: ../scripts/dd-list.1:59 -#, no-wrap -msgid "B<-h>,B<--help>" -msgstr "" - #. type: Plain text #: ../scripts/dd-list.1:62 msgid "Print brief help message." @@ -4341,7 +4335,7 @@ #. type: TP #: ../scripts/dd-list.1:62 #, no-wrap -msgid "B<-i>,B<--stdin>" +msgid "B<-i>, B<--stdin>" msgstr "" #. type: Plain text @@ -4354,7 +4348,7 @@ #. type: TP #: ../scripts/dd-list.1:66 #, no-wrap -msgid "B<-d>,B<--dctrl>" +msgid "B<-d>, B<--dctrl>" msgstr "" #. type: Plain text @@ -4376,27 +4370,27 @@ #. type: TP #: ../scripts/dd-list.1:76 #, no-wrap -msgid "B<-s>,B<--sources> I" +msgid "B<-s>, B<--sources> I" msgstr "" #. type: Plain text #: ../scripts/dd-list.1:80 msgid "" -"Read package information from the specified Is. This can be " +"Read package information from the specified Is. This can be " "given multiple times." msgstr "" #. type: Plain text #: ../scripts/dd-list.1:83 msgid "" -"If no I are specified, any files matching " +"If no Is are specified, any files matching " "I will be used." msgstr "" #. type: TP #: ../scripts/dd-list.1:83 #, no-wrap -msgid "B<-u>,B<--uploaders>" +msgid "B<-u>, B<--uploaders>" msgstr "" #. type: Plain text @@ -4410,7 +4404,7 @@ #. type: TP #: ../scripts/dd-list.1:88 #, no-wrap -msgid "B<-nou>,B<--nouploaders>" +msgid "B<-nou>, B<--nouploaders>" msgstr "" #. type: Plain text @@ -4421,7 +4415,7 @@ #. type: TP #: ../scripts/dd-list.1:91 #, no-wrap -msgid "B<-b>,B<--print-binary>" +msgid "B<-b>, B<--print-binary>" msgstr "" #. type: Plain text @@ -4432,12 +4426,6 @@ "names)." msgstr "" -#. type: TP -#: ../scripts/dd-list.1:96 -#, no-wrap -msgid "B<-V>,B<--version>" -msgstr "" - #. -------------------------------------------------------------------- #. type: Plain text #: ../scripts/dd-list.1:100 @@ -4512,14 +4500,14 @@ "the name of the parent directory once it finds the I file, " "and check that the directory name corresponds to the package name. " "Precisely how it does this is controlled by two configuration file variables " -"DEVSCRIPTS_CHECK_DIRNAME_LEVEL and DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their " -"corresponding command-line options B<--check-dirname-level> and B<--check-" -"dirname-regex>." +"B and B, and " +"their corresponding command-line options B<--check-dirname-level> and B<--" +"check-dirname-regex>." msgstr "" #. type: Plain text -#: ../scripts/debc.1:41 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/uscan.1:296 -msgid "DEVSCRIPTS_CHECK_DIRNAME_LEVEL can take the following values:" +#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:296 +msgid "B can take the following values:" msgstr "" #. type: TP @@ -4562,8 +4550,8 @@ msgid "" "The directory name is checked by testing whether the current directory name " "(as determined by B(1)) matches the regex given by the configuration " -"file option DEVSCRIPTS_CHECK_DIRNAME_REGEX or by the command line option B<--" -"check-dirname-regex> I. Here I is a Perl regex (see " +"file option B or by the command line option " +"B<--check-dirname-regex> I. Here I is a Perl regex (see " "B(3perl)), which will be anchored at the beginning and the end. If " "I contains a '/', then it must match the full directory path. If " "not, then it must match the full directory name. If I contains the " @@ -4574,17 +4562,17 @@ msgstr "" #. type: TP -#: ../scripts/debc.1:71 ../scripts/debi.1:72 ../scripts/debrelease.1:81 ../scripts/debsign.1:90 +#: ../scripts/debc.1:71 ../scripts/debi.1:72 ../scripts/debrelease.1:81 #, no-wrap -msgid "B<--debs-dir> I" +msgid "B<--debs-dir> I" msgstr "" #. type: Plain text #: ../scripts/debc.1:77 msgid "" -"Look for the I<.changes>, I<.deb> and I<.udeb> files in directory I " -"instead of the parent of the source directory. This should either be an " -"absolute path or relative to the top of the source directory." +"Look for the I<.changes>, I<.deb> and I<.udeb> files in I instead " +"of the parent of the source directory. This should either be an absolute " +"path or relative to the top of the source directory." msgstr "" #. type: TP @@ -4594,9 +4582,9 @@ msgstr "" #. type: Plain text -#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 +#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:91 ../scripts/debi.1:95 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:435 ../scripts/uscan.1:439 msgid "" -"See the above section \"Directory name checking\" for an explanation of this " +"See the above section B for an explanation of this " "option." msgstr "" @@ -4640,12 +4628,12 @@ msgstr "" #. type: Plain text -#: ../scripts/debc.1:115 ../scripts/debclean.1:107 ../scripts/debi.1:132 ../scripts/debrelease.1:132 +#: ../scripts/debc.1:115 ../scripts/debclean.1:107 ../scripts/debi.1:132 ../scripts/debrelease.1:132 ../scripts/debuild.1:367 msgid "" -"See the above section \"Directory name checking\" for an explanation of " -"these variables. Note that these are package-wide configuration variables, " -"and will therefore affect all B scripts which check their value, " -"as described in their respective manpages and in B(5)." +"See the above section B for an explanation of these " +"variables. Note that these are package-wide configuration variables, and " +"will therefore affect all B scripts which check their value, as " +"described in their respective manpages and in B(5)." msgstr "" #. type: Plain text @@ -4819,11 +4807,6 @@ msgstr "" #. type: Plain text -#: ../scripts/debchange.1:119 ../scripts/debuild.1:63 -msgid "B can take the following values:" -msgstr "" - -#. type: Plain text #: ../scripts/debchange.1:142 msgid "" "The directory name is checked by testing whether the current directory name " @@ -6016,9 +5999,9 @@ "potential problems, it will examine the name of the parent directory once it " "finds a I file, and check that the directory name " "corresponds to the package name. Precisely how it does this is controlled " -"by two configuration file variables DEVSCRIPTS_CHECK_DIRNAME_LEVEL and " -"DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their corresponding command-line options " -"B<--check-dirname-level> and B<--check-dirname-regex>." +"by two configuration file variables B and " +"B, and their corresponding command-line " +"options B<--check-dirname-level> and B<--check-dirname-regex>." msgstr "" #. type: TP @@ -6978,17 +6961,17 @@ "the name of the parent directory once it finds the I file, " "and check that the directory name corresponds to the package name. " "Precisely how it does this is controlled by two configuration file variables " -"DEVSCRIPTS_CHECK_DIRNAME_LEVEL and DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their " -"corresponding command-line options B<--check-dirname-level> and B<--check-" -"dirname-regex>." +"B and B, and " +"their corresponding command-line options B<--check-dirname-level> and B<--" +"check-dirname-regex>." msgstr "" #. type: Plain text #: ../scripts/debi.1:78 ../scripts/debrelease.1:87 msgid "" -"Look for the I<.changes> and I<.deb> files in directory I instead of " -"the parent of the source directory. This should either be an absolute path " -"or relative to the top of the source directory." +"Look for the I<.changes> and I<.deb> files in I instead of the " +"parent of the source directory. This should either be an absolute path or " +"relative to the top of the source directory." msgstr "" #. type: TP @@ -7031,14 +7014,14 @@ #. type: TP #: ../scripts/debi.1:98 #, no-wrap -msgid "B<--tool> I" +msgid "B<--tool> I" msgstr "" #. type: Plain text #: ../scripts/debi.1:102 msgid "" -"Use the specified tool for installing the dependencies of the package(s) to " -"be installed. By default, B is used." +"Use the specified I for installing the dependencies of the package(s) " +"to be installed. By default, B is used." msgstr "" #. type: Plain text @@ -7164,9 +7147,9 @@ "potential problems, it will examine the name of the parent directory once it " "finds the I file, and check that the directory name " "corresponds to the package name. Precisely how it does this is controlled " -"by two configuration file variables DEVSCRIPTS_CHECK_DIRNAME_LEVEL and " -"DEVSCRIPTS_CHECK_DIRNAME_REGEX, and their corresponding command-line options " -"B<--check-dirname-level> and B<--check-dirname-regex>." +"by two configuration file variables B and " +"B, and their corresponding command-line " +"options B<--check-dirname-level> and B<--check-dirname-regex>." msgstr "" #. type: TP @@ -7831,7 +7814,7 @@ #: ../scripts/debsign.1:52 msgid "" "When B needs to execute GPG to sign it will run I " -"(searching the B if necessary), instead of gpg." +"(searching the B if necessary), instead of B." msgstr "" #. type: TP @@ -7897,6 +7880,12 @@ "is found the user is asked if he or she likes to use the current signature." msgstr "" +#. type: TP +#: ../scripts/debsign.1:90 +#, no-wrap +msgid "B<--debs-dir> I" +msgstr "" + #. type: Plain text #: ../scripts/debsign.1:96 msgid "" @@ -8808,13 +8797,6 @@ msgstr "" #. type: Plain text -#: ../scripts/debuild.1:280 ../scripts/debuild.1:284 ../scripts/uscan.1:435 ../scripts/uscan.1:439 -msgid "" -"See the above section B for an explanation of this " -"option." -msgstr "" - -#. type: Plain text #: ../scripts/debuild.1:287 msgid "Do not run B to check build dependencies." msgstr "" @@ -9009,15 +8991,6 @@ msgstr "" #. type: Plain text -#: ../scripts/debuild.1:367 -msgid "" -"See the above section B for an explanation of these " -"variables. Note that these are package-wide configuration variables, and " -"will therefore affect all B scripts which check their value, as " -"described in their respective manpages and in B(5)." -msgstr "" - -#. type: Plain text #: ../scripts/debuild.1:371 msgid "" "To build your own package, simply run B from inside the source " @@ -9164,13 +9137,13 @@ #. type: Plain text #: ../scripts/dep3changelog.1:4 msgid "" -"dep3changelog - Generate a changelog entry from a DEP3-style patch header" +"dep3changelog - generate a changelog entry from a DEP3-style patch header" msgstr "" #. type: Plain text #: ../scripts/dep3changelog.1:6 msgid "" -"B I [I ...] [I] [-- [I]" +"B I [I ...] [I] [-- [I]]" msgstr "" #. type: Plain text @@ -14251,7 +14224,7 @@ "it to a gzip tar archive, which is still currently required as a member of a " "Debian source package. Does nothing if the downloaded archive is not an lzma " "tar archive, xz tar archive, bzip tar archive or a zip archive (i.e. it " -"doesn't match a .tlz, .tlzm, .tlzma, .tar.lzma, .txz, \\^.tar.xz .tbz, " +"doesn't match a .tlz, .tlzm, .tlzma, .tar.lzma, .txz, \\^.tar.xz, .tbz, " ".tbz2, .tar.bz2 or .zip extension). The unzip package must be installed in " "order to repack .zip archives, the xz-utils package must be installed to " "repack lzma or xz tar archives." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/diffutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/diffutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/diffutils.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/diffutils.po 2012-02-23 07:11: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: 2011-12-29 14:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:56+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/c-stack.c:204 lib/c-stack.c:297 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dnsmasq.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dnsmasq.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dnsmasq.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dnsmasq.po 2012-02-23 07:11: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: 2011-12-29 11:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: cache.c:764 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dpkg-dev.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg-dev.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dpkg-dev.po 2012-01-02 18:07:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg-dev.po 2012-02-23 07:11:27.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: 2011-12-29 09:32+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31 #: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dpkg.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dpkg.po 2012-01-02 18:07:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg.po 2012-02-23 07:11:27.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: 2011-12-29 09:32+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/dpkg/ar.c:66 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dselect.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dselect.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/dselect.po 2012-01-02 18:07:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dselect.po 2012-02-23 07:11:27.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 09:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: dselect/basecmds.cc:125 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/duplicity.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/duplicity.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/duplicity.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/duplicity.po 2012-02-23 07:11:38.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: 2011-12-29 11:34+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../bin/duplicity:98 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE" @@ -94,188 +94,188 @@ msgid "Backup Statistics" msgstr "备份统计" -#: ../bin/duplicity:624 +#: ../bin/duplicity:625 #, python-format msgid "%s not found in archive, no files restored." msgstr "" -#: ../bin/duplicity:628 +#: ../bin/duplicity:629 msgid "No files found in archive - nothing restored." msgstr "压缩包中找不到文件 - 没有进行任何还原。" -#: ../bin/duplicity:661 +#: ../bin/duplicity:662 #, python-format msgid "Processed volume %d of %d" msgstr "" -#: ../bin/duplicity:686 +#: ../bin/duplicity:687 #, python-format msgid "Invalid data - %s hash mismatch for file:" msgstr "" -#: ../bin/duplicity:688 +#: ../bin/duplicity:689 #, python-format msgid "Calculated hash: %s" msgstr "计算 hash 值: %s" -#: ../bin/duplicity:689 +#: ../bin/duplicity:690 #, python-format msgid "Manifest hash: %s" msgstr "清单的 hash 值:%s" -#: ../bin/duplicity:727 +#: ../bin/duplicity:728 #, python-format msgid "Volume was signed by key %s, not %s" msgstr "" -#: ../bin/duplicity:757 +#: ../bin/duplicity:758 #, python-format msgid "Verify complete: %s, %s." msgstr "" -#: ../bin/duplicity:758 +#: ../bin/duplicity:759 #, python-format msgid "%d file compared" msgid_plural "%d files compared" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:760 +#: ../bin/duplicity:761 #, python-format msgid "%d difference found" msgid_plural "%d differences found" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:779 +#: ../bin/duplicity:780 msgid "No extraneous files found, nothing deleted in cleanup." msgstr "" -#: ../bin/duplicity:784 +#: ../bin/duplicity:785 msgid "Deleting this file from backend:" msgid_plural "Deleting these files from backend:" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:796 +#: ../bin/duplicity:797 msgid "Found the following file to delete:" msgid_plural "Found the following files to delete:" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:800 +#: ../bin/duplicity:801 msgid "Run duplicity again with the --force option to actually delete." msgstr "" -#: ../bin/duplicity:839 +#: ../bin/duplicity:840 msgid "There are backup set(s) at time(s):" msgstr "" -#: ../bin/duplicity:841 +#: ../bin/duplicity:842 msgid "Which can't be deleted because newer sets depend on them." msgstr "" -#: ../bin/duplicity:845 +#: ../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:851 +#: ../bin/duplicity:852 msgid "No old backup sets found, nothing deleted." msgstr "" -#: ../bin/duplicity:854 +#: ../bin/duplicity:855 msgid "Deleting backup set at time:" msgid_plural "Deleting backup sets at times:" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:871 +#: ../bin/duplicity:872 msgid "Found old backup set at the following time:" msgid_plural "Found old backup sets at the following times:" msgstr[0] "" msgstr[1] "" -#: ../bin/duplicity:875 +#: ../bin/duplicity:876 msgid "Rerun command with --force option to actually delete." msgstr "" -#: ../bin/duplicity:953 +#: ../bin/duplicity:954 #, python-format msgid "Deleting local %s (not authoritative at backend)." msgstr "" -#: ../bin/duplicity:957 +#: ../bin/duplicity:958 #, python-format msgid "Unable to delete %s: %s" msgstr "" -#: ../bin/duplicity:985 ../duplicity/dup_temp.py:260 +#: ../bin/duplicity:986 ../duplicity/dup_temp.py:260 #, python-format msgid "Failed to read %s: %s" msgstr "" -#: ../bin/duplicity:996 +#: ../bin/duplicity:997 #, python-format msgid "Copying %s to local cache." msgstr "" -#: ../bin/duplicity:1044 +#: ../bin/duplicity:1045 msgid "Local and Remote metadata are synchronized, no sync needed." msgstr "" -#: ../bin/duplicity:1049 +#: ../bin/duplicity:1050 msgid "Synchronizing remote metadata to local cache..." msgstr "" -#: ../bin/duplicity:1062 +#: ../bin/duplicity:1063 msgid "Sync would copy the following from remote to local:" msgstr "" -#: ../bin/duplicity:1065 +#: ../bin/duplicity:1066 msgid "Sync would remove the following spurious local files:" msgstr "" -#: ../bin/duplicity:1108 +#: ../bin/duplicity:1109 msgid "Unable to get free space on temp." msgstr "" -#: ../bin/duplicity:1116 +#: ../bin/duplicity:1117 #, python-format msgid "Temp space has %d available, backup needs approx %d." msgstr "" -#: ../bin/duplicity:1119 +#: ../bin/duplicity:1120 #, python-format msgid "Temp has %d available, backup will use approx %d." msgstr "" -#: ../bin/duplicity:1127 +#: ../bin/duplicity:1128 msgid "Unable to get max open files." msgstr "" -#: ../bin/duplicity:1131 +#: ../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:1180 +#: ../bin/duplicity:1181 msgid "" "RESTART: The first volume failed to upload before termination.\n" " Restart is impossible...starting backup from beginning." msgstr "" -#: ../bin/duplicity:1186 +#: ../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:1193 +#: ../bin/duplicity:1194 #, python-format msgid "" "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n" @@ -284,43 +284,43 @@ " backup then restart the backup from the beginning." msgstr "" -#: ../bin/duplicity:1273 +#: ../bin/duplicity:1274 #, python-format msgid "Last %s backup left a partial set, restarting." msgstr "" -#: ../bin/duplicity:1277 +#: ../bin/duplicity:1278 #, python-format msgid "Cleaning up previous partial %s backup set, restarting." msgstr "" -#: ../bin/duplicity:1288 +#: ../bin/duplicity:1289 msgid "Last full backup date:" msgstr "" -#: ../bin/duplicity:1290 +#: ../bin/duplicity:1291 msgid "Last full backup date: none" msgstr "" -#: ../bin/duplicity:1292 +#: ../bin/duplicity:1293 msgid "Last full backup is too old, forcing full backup" msgstr "" -#: ../bin/duplicity:1390 +#: ../bin/duplicity:1391 msgid "INT intercepted...exiting." msgstr "" -#: ../bin/duplicity:1396 +#: ../bin/duplicity:1397 #, python-format msgid "GPG error detail: %s" msgstr "" -#: ../bin/duplicity:1405 +#: ../bin/duplicity:1406 #, python-format msgid "User error detail: %s" msgstr "" -#: ../bin/duplicity:1414 +#: ../bin/duplicity:1415 #, python-format msgid "Backend error detail: %s" msgstr "" @@ -361,26 +361,26 @@ msgid "task execution done (success: %s)" msgstr "" -#: ../duplicity/backend.py:485 ../duplicity/backend.py:509 +#: ../duplicity/backend.py:487 ../duplicity/backend.py:511 #, python-format msgid "Reading results of '%s'" msgstr "" -#: ../duplicity/backend.py:524 +#: ../duplicity/backend.py:526 #, 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:528 +#: ../duplicity/backend.py:530 #, python-format msgid "" "Error is:\n" "%s" msgstr "" -#: ../duplicity/backend.py:530 +#: ../duplicity/backend.py:532 #, python-format msgid "Giving up trying to execute '%s' after %d attempt" msgid_plural "Giving up trying to execute '%s' after %d attempts" @@ -509,7 +509,7 @@ msgstr[0] "" msgstr[1] "" -#. "cleanup" is a hard-coded command, so do not translate it +#. TRANSL: "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." @@ -615,304 +615,303 @@ "Use of default filenames is strongly suggested." msgstr "" -#: ../duplicity/commandline.py:211 +#: ../duplicity/commandline.py:214 msgid "Unable to load gio module" msgstr "" -#: ../duplicity/commandline.py:233 +#: ../duplicity/commandline.py:236 #, python-format msgid "Error opening file %s" msgstr "" -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. --archive-dir -#: ../duplicity/commandline.py:254 ../duplicity/commandline.py:262 -#: ../duplicity/commandline.py:279 ../duplicity/commandline.py:333 -#: ../duplicity/commandline.py:494 ../duplicity/commandline.py:710 +#: ../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 "" -#. Used in usage help to represent an ID for a GnuPG key. Example: +#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example: #. --encrypt-key -#: ../duplicity/commandline.py:274 ../duplicity/commandline.py:281 -#: ../duplicity/commandline.py:483 ../duplicity/commandline.py:683 +#: ../duplicity/commandline.py:277 ../duplicity/commandline.py:284 +#: ../duplicity/commandline.py:494 ../duplicity/commandline.py:694 msgid "gpg-key-id" msgstr "" -#. Used in usage help to represent a "glob" style pattern for +#. TRANSL: Used in usage help to represent a "glob" style pattern for #. matching one or more files, as described in the documentation. #. Example: #. --exclude -#: ../duplicity/commandline.py:289 ../duplicity/commandline.py:373 -#: ../duplicity/commandline.py:733 +#: ../duplicity/commandline.py:292 ../duplicity/commandline.py:379 +#: ../duplicity/commandline.py:744 msgid "shell_pattern" msgstr "" -#. Used in usage help to represent the name of a file. Example: +#. TRANSL: Used in usage help to represent the name of a file. Example: #. --log-file -#: ../duplicity/commandline.py:295 ../duplicity/commandline.py:302 -#: ../duplicity/commandline.py:307 ../duplicity/commandline.py:375 -#: ../duplicity/commandline.py:380 ../duplicity/commandline.py:391 -#: ../duplicity/commandline.py:679 +#: ../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 "" -#. Used in usage help to represent a regular expression (regexp). -#: ../duplicity/commandline.py:314 ../duplicity/commandline.py:382 +#. TRANSL: Used in usage help to represent a regular expression (regexp). +#: ../duplicity/commandline.py:317 ../duplicity/commandline.py:388 msgid "regular_expression" msgstr "" -#. Used in usage help to represent a time spec for a previous +#. TRANSL: 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:345 ../duplicity/commandline.py:435 -#: ../duplicity/commandline.py:765 +#: ../duplicity/commandline.py:351 ../duplicity/commandline.py:444 +#: ../duplicity/commandline.py:776 msgid "time" msgstr "" -#. Used in usage help. (Should be consistent with the "Options:" +#. TRANSL: Used in usage help. (Should be consistent with the "Options:" #. header.) Example: #. duplicity [full|incremental] [options] source_dir target_url -#: ../duplicity/commandline.py:349 ../duplicity/commandline.py:438 -#: ../duplicity/commandline.py:491 ../duplicity/commandline.py:698 +#: ../duplicity/commandline.py:355 ../duplicity/commandline.py:447 +#: ../duplicity/commandline.py:502 ../duplicity/commandline.py:709 msgid "options" msgstr "" -#: ../duplicity/commandline.py:358 +#: ../duplicity/commandline.py:364 #, python-format msgid "" "Running in 'ignore errors' mode due to %s; please re-consider if this was " "not intended" msgstr "" -#. Used in usage help to represent an imap mailbox -#: ../duplicity/commandline.py:371 +#. TRANSL: Used in usage help to represent an imap mailbox +#: ../duplicity/commandline.py:377 msgid "imap_mailbox" msgstr "" -#: ../duplicity/commandline.py:385 +#: ../duplicity/commandline.py:391 msgid "file_descriptor" msgstr "" -#. Used in usage help (noun) -#: ../duplicity/commandline.py:396 +#. TRANSL: Used in usage help (noun) +#: ../duplicity/commandline.py:402 msgid "backup name" msgstr "" -#. Used in usage help to represent a desired number of +#. TRANSL: Used in usage help to represent a desired number of #. something. Example: #. --num-retries -#: ../duplicity/commandline.py:412 ../duplicity/commandline.py:459 -#: ../duplicity/commandline.py:524 ../duplicity/commandline.py:693 +#: ../duplicity/commandline.py:421 ../duplicity/commandline.py:468 +#: ../duplicity/commandline.py:535 ../duplicity/commandline.py:704 msgid "number" msgstr "" -#. noun -#: ../duplicity/commandline.py:469 ../duplicity/commandline.py:473 -#: ../duplicity/commandline.py:664 +#. TRANSL: noun +#: ../duplicity/commandline.py:675 msgid "command" msgstr "" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. --timeout -#: ../duplicity/commandline.py:499 ../duplicity/commandline.py:727 +#: ../duplicity/commandline.py:510 ../duplicity/commandline.py:738 msgid "seconds" msgstr "" -#. abbreviation for "character" (noun) -#: ../duplicity/commandline.py:505 ../duplicity/commandline.py:661 +#. TRANSL: abbreviation for "character" (noun) +#: ../duplicity/commandline.py:516 ../duplicity/commandline.py:672 msgid "char" msgstr "" -#: ../duplicity/commandline.py:627 +#: ../duplicity/commandline.py:638 #, python-format msgid "Using archive dir: %s" msgstr "" -#: ../duplicity/commandline.py:628 +#: ../duplicity/commandline.py:639 #, python-format msgid "Using backup name: %s" msgstr "" -#: ../duplicity/commandline.py:635 +#: ../duplicity/commandline.py:646 #, python-format msgid "Command line error: %s" msgstr "" -#: ../duplicity/commandline.py:636 +#: ../duplicity/commandline.py:647 msgid "Enter 'duplicity --help' for help screen." msgstr "" -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other_host[:port]//absolute_path -#: ../duplicity/commandline.py:649 +#: ../duplicity/commandline.py:660 msgid "absolute_path" msgstr "" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. tahoe://alias/some_dir -#: ../duplicity/commandline.py:653 +#: ../duplicity/commandline.py:664 msgid "alias" msgstr "" -#. Used in help to represent a "bucket name" for Amazon Web +#. TRANSL: 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:658 +#: ../duplicity/commandline.py:669 msgid "bucket_name" msgstr "" -#. Used in usage help to represent the name of a container in +#. TRANSL: Used in usage help to represent the name of a container in #. Amazon Web Services' Cloudfront. Example: #. cf+http://container_name -#: ../duplicity/commandline.py:669 +#: ../duplicity/commandline.py:680 msgid "container_name" msgstr "" -#. noun -#: ../duplicity/commandline.py:672 +#. TRANSL: noun +#: ../duplicity/commandline.py:683 msgid "count" msgstr "" -#. Used in usage help to represent the name of a file directory -#: ../duplicity/commandline.py:675 +#. TRANSL: Used in usage help to represent the name of a file directory +#: ../duplicity/commandline.py:686 msgid "directory" msgstr "" -#. Used in usage help, e.g. to represent the name of a code +#. TRANSL: 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:688 +#: ../duplicity/commandline.py:699 msgid "module" msgstr "" -#. Used in usage help to represent an internet hostname. Example: +#. TRANSL: Used in usage help to represent an internet hostname. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:702 +#: ../duplicity/commandline.py:713 msgid "other.host" msgstr "" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:706 +#: ../duplicity/commandline.py:717 msgid "password" msgstr "" -#. Used in usage help to represent a TCP port number. Example: +#. TRANSL: Used in usage help to represent a TCP port number. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:714 +#: ../duplicity/commandline.py:725 msgid "port" msgstr "" -#. Used in usage help. This represents a string to be used as a +#. TRANSL: 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:719 +#: ../duplicity/commandline.py:730 msgid "prefix" msgstr "" -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other.host[:port]/relative_path -#: ../duplicity/commandline.py:723 +#: ../duplicity/commandline.py:734 msgid "relative_path" msgstr "" -#. Used in usage help to represent the name of a single file +#. TRANSL: 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:738 +#: ../duplicity/commandline.py:749 msgid "some_dir" msgstr "" -#. Used in usage help to represent the name of a single file +#. TRANSL: 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:744 +#: ../duplicity/commandline.py:755 msgid "source_dir" msgstr "" -#. Used in usage help to represent a URL files will be coming +#. TRANSL: Used in usage help to represent a URL files will be coming #. FROM. Example: #. duplicity [restore] [options] source_url target_dir -#: ../duplicity/commandline.py:749 +#: ../duplicity/commandline.py:760 msgid "source_url" msgstr "" -#. Used in usage help to represent the name of a single file +#. TRANSL: 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:755 +#: ../duplicity/commandline.py:766 msgid "target_dir" msgstr "" -#. Used in usage help to represent a URL files will be going TO. +#. TRANSL: 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:760 +#: ../duplicity/commandline.py:771 msgid "target_url" msgstr "" -#. Used in usage help to represent a user name (i.e. login). +#. TRANSL: Used in usage help to represent a user name (i.e. login). #. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:770 +#: ../duplicity/commandline.py:781 msgid "user" msgstr "" -#. Header in usage help -#: ../duplicity/commandline.py:787 +#. TRANSL: Header in usage help +#: ../duplicity/commandline.py:798 msgid "Backends and their URL formats:" msgstr "" -#. Header in usage help -#: ../duplicity/commandline.py:809 +#. TRANSL: Header in usage help +#: ../duplicity/commandline.py:820 msgid "Commands:" msgstr "" -#: ../duplicity/commandline.py:833 +#: ../duplicity/commandline.py:844 #, python-format msgid "" "Specified archive directory '%s' does not exist, or is not a directory" msgstr "" -#: ../duplicity/commandline.py:842 +#: ../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:902 +#: ../duplicity/commandline.py:913 #, python-format msgid "" "Restore destination directory %s already exists.\n" "Will not overwrite." msgstr "" -#: ../duplicity/commandline.py:907 +#: ../duplicity/commandline.py:918 #, python-format msgid "Verify directory %s does not exist" msgstr "" -#: ../duplicity/commandline.py:913 +#: ../duplicity/commandline.py:924 #, python-format msgid "Backup source directory %s does not exist." msgstr "" -#: ../duplicity/commandline.py:942 +#: ../duplicity/commandline.py:953 #, python-format msgid "Command line warning: %s" msgstr "" -#: ../duplicity/commandline.py:942 +#: ../duplicity/commandline.py:953 msgid "" "Selection options --exclude/--include\n" "currently work only when backing up,not restoring." msgstr "" -#: ../duplicity/commandline.py:990 +#: ../duplicity/commandline.py:1001 #, python-format msgid "" "Bad URL '%s'.\n" @@ -920,7 +919,7 @@ "\"file:///usr/local\". See the man page for more information." msgstr "" -#: ../duplicity/commandline.py:1015 +#: ../duplicity/commandline.py:1026 msgid "Main action: " msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/e2fsprogs.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/e2fsprogs.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/e2fsprogs.po 2012-01-02 18:07:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/e2fsprogs.po 2012-02-23 07:11:26.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: 2011-12-29 09:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:34+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: e2fsck/badblocks.c:22 misc/mke2fs.c:157 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po 2012-02-23 07:11:58.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ecryptfs-utils\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-14 20:26+0000\n" +"POT-Creation-Date: 2012-02-17 03:43+0000\n" "PO-Revision-Date: 2010-02-21 10:26+0000\n" "Last-Translator: Aron Xu \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: 2011-12-29 16:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../src/desktop/ecryptfs-mount-private.desktop.in.h:1 msgid "Access Your Private Data" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/eject.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/eject.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/eject.po 2012-01-02 18:07:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/eject.po 2012-02-23 07:11:27.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: 2011-12-29 09:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:42+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../eject.c:155 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/elfutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/elfutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/elfutils.po 2012-01-02 18:07:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/elfutils.po 2012-02-23 07:11:56.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: 2011-12-29 16:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/xmalloc.c:51 lib/xmalloc.c:65 lib/xmalloc.c:79 src/readelf.c:2829 #: src/readelf.c:3168 src/unstrip.c:2098 src/unstrip.c:2306 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/enscript.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/enscript.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/enscript.po 2012-01-02 18:07:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/enscript.po 2012-02-23 07:11:27.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: 2011-12-29 09:33+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:42+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: compat/getopt.c:628 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/example-content.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/example-content.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/example-content.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/example-content.po 2012-02-23 07:11:52.000000000 +0000 @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: example-content\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-06-22 22:50+0000\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 \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 15:31+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:33+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../data/examples.desktop.in.h:1 -msgid "Example content for Ubuntu" -msgstr "Ubuntu 示例内容" - -#: ../data/examples.desktop.in.h:2 msgid "Examples" msgstr "示例" + +#: ../data/examples.desktop.in.h:2 +msgid "Example content for Ubuntu" +msgstr "Ubuntu 示例内容" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/failsafexinit.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/failsafexinit.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/failsafexinit.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/failsafexinit.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,171 +0,0 @@ -# Chinese (Simplified) translation for xorg -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the xorg package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: xorg\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-04-05 21:41+0000\n" -"PO-Revision-Date: 2010-03-17 02:45+0000\n" -"Last-Translator: Liu Qishuai \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: 2011-12-29 10:38+0000\n" -"X-Generator: Launchpad (build 14560)\n" - -#: debian/local/Failsafe/failsafeXinit:36 -msgid "Ubuntu Failsafe-X" -msgstr "Ubuntu 故障恢复 X 显示系统" - -#: debian/local/Failsafe/failsafeXinit:51 -msgid "What would you like to do?" -msgstr "您想要做什么?" - -#: debian/local/Failsafe/failsafeXinit:52 -#: debian/local/Failsafe/failsafeXinit:71 -#: debian/local/Failsafe/failsafeXinit:84 -msgid "Choice" -msgstr "选择" - -#: debian/local/Failsafe/failsafeXinit:53 -msgid "Run Ubuntu in low-graphics mode for just one session" -msgstr "仅在一次会话中以低画质模式运行 Ubuntu" - -#: debian/local/Failsafe/failsafeXinit:54 -msgid "Reconfigure graphics" -msgstr "重新配置图形" - -#: debian/local/Failsafe/failsafeXinit:55 -msgid "Troubleshoot the error" -msgstr "解决错误" - -#: debian/local/Failsafe/failsafeXinit:56 -msgid "Exit to console login" -msgstr "退出到控制台登录" - -#: debian/local/Failsafe/failsafeXinit:57 -msgid "Restart X" -msgstr "重启 X" - -#: debian/local/Failsafe/failsafeXinit:68 -msgid "Reconfiguration" -msgstr "重新配置" - -#: debian/local/Failsafe/failsafeXinit:69 -msgid "How would you like to reconfigure your display?" -msgstr "您想如何重新配置您的显示?" - -#: debian/local/Failsafe/failsafeXinit:72 -msgid "Use default (generic) configuration" -msgstr "使用默认(通用)配置" - -#: debian/local/Failsafe/failsafeXinit:73 -msgid "Create new configuration for this hardware" -msgstr "为此硬件生成新的配置" - -#: debian/local/Failsafe/failsafeXinit:74 -msgid "Use your backed-up configuration" -msgstr "使用您备份的配置文件" - -#: debian/local/Failsafe/failsafeXinit:81 -msgid "Troubleshooting" -msgstr "故障处理" - -#: debian/local/Failsafe/failsafeXinit:82 -msgid "What information would you like to review?" -msgstr "您想检查什么信息?" - -#: debian/local/Failsafe/failsafeXinit:85 -msgid "Review the xserver log file" -msgstr "查看 xserver 日志文件" - -#: debian/local/Failsafe/failsafeXinit:86 -msgid "Review the startup errors" -msgstr "查看启动错误" - -#: debian/local/Failsafe/failsafeXinit:87 -msgid "Edit configuration file" -msgstr "编辑配置文件" - -#: debian/local/Failsafe/failsafeXinit:88 -msgid "Archive configuration and logs" -msgstr "存档配置和日志文件" - -#: debian/local/Failsafe/failsafeXinit:99 -msgid "" -"A bug report has been written.\\nYou can send it next time you log in." -msgstr "已写入 bug 报告。\\n您可以在下次登录后发送。" - -#: debian/local/Failsafe/failsafeXinit:101 -msgid "Your bug could not be recorded successfully.\\n" -msgstr "您所遇到的 bug 无法被成功记录。\\n" - -#: debian/local/Failsafe/failsafeXinit:104 -#, sh-format -msgid "Cannot file bug: \\$apport_hook is not present." -msgstr "找不到文件:\\$apport_hook 不存在。" - -#: debian/local/Failsafe/failsafeXinit:113 -msgid "" -"Your config could not be backed up.\\nDo you want to continue anyway?\\n" -msgstr "无法备份配置文件。\\n您仍然要继续吗?\\n" - -#: debian/local/Failsafe/failsafeXinit:122 -msgid "" -"Your configuration has been restored to default,\\nand your old " -"configuration backed up.\\nPlease restart.\\n" -msgstr "您的配置已经恢复到默认,\\n旧的配置已备份。\\n请重新启动。\\n" - -#: debian/local/Failsafe/failsafeXinit:124 -msgid "" -"Failure restoring configuration to default.\\nYour config has not been " -"changed." -msgstr "还原默认配置失败。\\n您的配置没有改变。" - -#: debian/local/Failsafe/failsafeXinit:133 -msgid "" -"A new configuration has been generated,\\nand your old configuration backed " -"up.\\nPlease restart.\\n" -msgstr "已经生成新的配置,\\n您的旧配置已备份。\\n请重新启动。\\n" - -#: debian/local/Failsafe/failsafeXinit:135 -msgid "Could not generate a new configuration" -msgstr "无法生成新的配置" - -#: debian/local/Failsafe/failsafeXinit:149 -msgid "Sorry, this option is not implemented yet" -msgstr "抱歉,此选项尚未实现" - -#: debian/local/Failsafe/failsafeXinit:177 -#, sh-format -msgid "Relevant configuration and log files have been saved to:\\n" -msgstr "保存重要的配置和日志文件到:\\n" - -#: debian/local/Failsafe/failsafeXinit:177 -msgid "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\\n" -msgstr "您可以将Bug 报告提交至 http://www.launchpad.net/ubuntu/。\\n" - -#: debian/local/Failsafe/failsafeXinit:184 -msgid "" -"Ubuntu is running in low-graphics mode\\n\\nYour screen, " -"graphics card, and input device settings\\ncould not be detected correctly. " -"You will need to configure these yourself." -msgstr "" -"Ubuntu 正运行于低画质模式。\\n\\n您的显示器、显卡和输入设备的设置不能被正确检测。您需要手动配置它们。" - -#: debian/local/Failsafe/failsafeXinit:186 -msgid "" -"Ubuntu is running in low-graphics mode\\n\\nThe following " -"error was encountered. You may need\\nto update your configuration to solve " -"this.\\n\\n" -msgstr "" -"Ubuntu 正运行在低画质模式\\n\\n发生了以下错误,您可能需要\\n更新您的配置文件来解决这个问题。\\n\\" -"n" - -#: debian/local/Failsafe/failsafeXinit:230 -msgid "Stand by one minute while the display restarts..." -msgstr "请稍候一分钟等待显示系统重启..." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/fetchmail.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fetchmail.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/fetchmail.po 2012-01-02 18:07:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fetchmail.po 2012-02-23 07:11:28.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: 2011-12-29 09:44+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: checkalias.c:179 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/findutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/findutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/findutils.po 2012-01-02 18:07:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/findutils.po 2012-02-23 07:11:28.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: 2011-12-29 09:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: gnulib/lib/argmatch.c:133 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/flex.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/flex.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/flex.po 2012-01-02 18:07:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/flex.po 2012-02-23 07:11:28.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: 2011-12-29 09:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:51+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: dfa.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/fluid.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fluid.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/fluid.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fluid.po 2012-02-23 07:11: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: 2011-12-29 11:36+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: fluid.cxx:1573 msgid "&File" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/FontForge.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/FontForge.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/FontForge.po 2012-01-02 18:07:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/FontForge.po 2012-02-23 07:11:28.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: 2011-12-29 09:49+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" # #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/freetype.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/freetype.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/freetype.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/freetype.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,869 +0,0 @@ -# Simplified Chinese translation for texlive-bin -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the texlive-bin package. -# FIRST AUTHOR , 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: texlive-bin\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2002-11-08 18:11+0000\n" -"PO-Revision-Date: 2009-10-11 08:17+0000\n" -"Last-Translator: Tao Wei \n" -"Language-Team: Simplified Chinese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 15:34+0000\n" -"X-Generator: Launchpad (build 14560)\n" - -#: lib/extend/ftxerr18.c:40 -msgid "" -"Welcome to the translation of the Freetype v.1 library!\n" -"\n" -"This message is not really part of the library (it is bracketed by\n" -" #if 0 / #endif), but is really intended to be the first one in the .po\n" -"file, and the first one that a new translator should see, to give hints.\n" -"\n" -"First, while this .po might seems big, the real interesting part of it\n" -"is only the messages in this file, lib/extend/ftxerr18.c. The other\n" -"messages are part of the demonstration programs, and are more intended\n" -"to help grasping how to use i18n with the Freetype library. So the real\n" -"work is the about 65 first ones. Unfortunately they are the harder ones!\n" -"\n" -"A difficulty is that there are some specialized vocabulary, about\n" -"``faces'', ``glyph'' and similar things. These are typographical things,\n" -"and this should be researched before attempting to translate the whole\n" -"thing. A quick look across the TrueType documentation might help to\n" -"understand many things, too.\n" -"\n" -"Best wiches for your translation!\n" -"Antoine Leca - 2002-11-08" -msgstr "" -"欢迎进入Freetype v.1 库的翻译!\n" -"本信息其实并非这个库的一部分。(因为它被 #if 0 / #endif 括住了。)但它旨在出现在 .po " -"文件的第一部分并给新的看到它的翻译者一些提示。\n" -"首先,本 .po 文件看起来挺大,但真正有趣的部分仅在于 lib/extend/ftxerr18.c 这个文件中。 " -"其它的信息都是演示程序的一部分,旨在帮助领会如何去使用Freetype库。因此,真正的工作只是开初的这大约65个条目。不幸的事,那些偏巧是比较难的。\n" -"困难之一就是有些专有词汇,比如:``faces'', ``glyph'' 诸如此类,动手翻译之前首先要研究这样词汇。快速浏览一下 TrueType " -"文档也许会有所帮助。\n" -"祝你好运!\n" -"Antoine Leca - 2002-11-08\n" -"stone_unix (gaoghy@gmail.com) 2006-07-24" - -#: lib/extend/ftxerr18.c:77 -msgid "Successful function call, no error." -msgstr "函数调用成功,没有错误。" - -#: lib/extend/ftxerr18.c:80 -msgid "Invalid face handle." -msgstr "无效的字脸句柄。" - -#: lib/extend/ftxerr18.c:82 -msgid "Invalid instance handle." -msgstr "无效的实例句柄。" - -#: lib/extend/ftxerr18.c:84 -msgid "Invalid glyph handle." -msgstr "无效的字形句柄。" - -#: lib/extend/ftxerr18.c:86 -msgid "Invalid charmap handle." -msgstr "无效的字图句柄。" - -#: lib/extend/ftxerr18.c:88 -msgid "Invalid result address." -msgstr "无效的结果地址。" - -#: lib/extend/ftxerr18.c:90 -msgid "Invalid glyph index." -msgstr "无效的字形索引。" - -#: lib/extend/ftxerr18.c:92 -msgid "Invalid argument." -msgstr "无效的参数。" - -#: lib/extend/ftxerr18.c:94 -msgid "Could not open file." -msgstr "无法打开文件。" - -#: lib/extend/ftxerr18.c:96 -msgid "File is not a TrueType collection." -msgstr "文件不是一个TrueType集。" - -#: lib/extend/ftxerr18.c:98 -msgid "Mandatory table missing." -msgstr "缺少强制表。" - -#: lib/extend/ftxerr18.c:100 -msgid "Invalid horizontal metrics (hmtx table broken)." -msgstr "无效的横向长度计量(hmtx 表损坏)" - -#: lib/extend/ftxerr18.c:102 -msgid "Invalid charmap format." -msgstr "无效的字符表格式" - -#: lib/extend/ftxerr18.c:104 -msgid "Invalid ppem value." -msgstr "无效的 ppem 值" - -#: lib/extend/ftxerr18.c:106 -msgid "Invalid vertical metrics (vmtx table broken)." -msgstr "无效的纵向长度计量(hmtx 表损坏)" - -#: lib/extend/ftxerr18.c:109 -msgid "Invalid file format." -msgstr "无效的文件格式." - -#: lib/extend/ftxerr18.c:112 -msgid "Invalid engine." -msgstr "非法引擎。" - -#: lib/extend/ftxerr18.c:114 -msgid "Too many extensions." -msgstr "扩展过多。" - -#: lib/extend/ftxerr18.c:116 -msgid "Extensions unsupported." -msgstr "扩展不支持." - -#: lib/extend/ftxerr18.c:118 -msgid "Invalid extension id." -msgstr "无效的扩展 ID." - -#: lib/extend/ftxerr18.c:121 -msgid "No vertical data in font." -msgstr "字体中没有纵向信息" - -#: lib/extend/ftxerr18.c:124 -msgid "Maximum Profile (maxp) table missing." -msgstr "缺少最大轮廓(maxp)表。" - -#: lib/extend/ftxerr18.c:126 -msgid "Font Header (head) table missing." -msgstr "缺少字体头(head)表。" - -#: lib/extend/ftxerr18.c:128 -msgid "Horizontal Header (hhea) table missing." -msgstr "缺少水平头(hhea)表" - -#: lib/extend/ftxerr18.c:130 -msgid "Index to Location (loca) table missing." -msgstr "缺少位置(loca)表索引。" - -#: lib/extend/ftxerr18.c:132 -msgid "Naming (name) table missing." -msgstr "缺少命名(name)表。" - -#: lib/extend/ftxerr18.c:134 -msgid "Character to Glyph Index Mapping (cmap) tables missing." -msgstr "字体的字符列表丢失。" - -#: lib/extend/ftxerr18.c:136 -msgid "Horizontal Metrics (hmtx) table missing." -msgstr "缺少水平尺表(hmtx)。" - -#: lib/extend/ftxerr18.c:138 -msgid "OS/2 table missing." -msgstr "缺少OS/2 表。" - -#: lib/extend/ftxerr18.c:140 -msgid "PostScript (post) table missing." -msgstr "缺少PostScript(post)表。" - -#: lib/extend/ftxerr18.c:142 -msgid "Glyph (glyf) table missing." -msgstr "Glyph (glyf)表缺失。" - -#: lib/extend/ftxerr18.c:147 -msgid "Out of memory." -msgstr "内存不足。" - -#: lib/extend/ftxerr18.c:152 -msgid "Invalid file offset." -msgstr "非法文件偏移。" - -#: lib/extend/ftxerr18.c:154 -msgid "Invalid file read." -msgstr "非法文件读取。" - -#: lib/extend/ftxerr18.c:156 -msgid "Invalid frame access." -msgstr "无效的帧存取。" - -#: lib/extend/ftxerr18.c:161 -msgid "Too many points." -msgstr "太多点。" - -#: lib/extend/ftxerr18.c:163 -msgid "Too many contours." -msgstr "太多轮廓。" - -#: lib/extend/ftxerr18.c:165 -msgid "Invalid composite glyph." -msgstr "无效的符合字体。" - -#: lib/extend/ftxerr18.c:167 -msgid "Too many instructions." -msgstr "指令过多。" - -#: lib/extend/ftxerr18.c:169 -msgid "Too many function definitions (FDEF)." -msgstr "过多的函数定义。" - -#: lib/extend/ftxerr18.c:174 -msgid "Invalid opcode." -msgstr "无效的操作码。" - -#: lib/extend/ftxerr18.c:176 -msgid "Too few arguments." -msgstr "参数过少。" - -#: lib/extend/ftxerr18.c:178 -msgid "Stack overflow." -msgstr "堆栈溢出。" - -#: lib/extend/ftxerr18.c:180 -msgid "Code overflow." -msgstr "编码溢出。" - -#: lib/extend/ftxerr18.c:182 -msgid "Bad argument." -msgstr "参数错误。" - -#: lib/extend/ftxerr18.c:184 -msgid "Divide by zero." -msgstr "被零除。" - -#: lib/extend/ftxerr18.c:186 -msgid "Storage overflow." -msgstr "存储溢出。" - -#: lib/extend/ftxerr18.c:188 -msgid "Control Value (cvt) table overflow." -msgstr "控制值(cvt)表溢出。" - -#: lib/extend/ftxerr18.c:190 -msgid "Invalid reference." -msgstr "无效的引用。" - -#: lib/extend/ftxerr18.c:192 -msgid "Invalid distance." -msgstr "不合法的距离。" - -#: lib/extend/ftxerr18.c:194 -msgid "Interpolate twilight points." -msgstr "" - -#: lib/extend/ftxerr18.c:196 -msgid "`DEBUG' opcode found." -msgstr "发现`DEBUG'操作码。" - -#: lib/extend/ftxerr18.c:198 -msgid "`ENDF' in byte-code stream." -msgstr "在字节流中出现“ENDF”。" - -#: lib/extend/ftxerr18.c:200 -msgid "Out of code ranges." -msgstr "编码溢出" - -#: lib/extend/ftxerr18.c:202 -msgid "Nested function definitions." -msgstr "嵌套函数定义。" - -#: lib/extend/ftxerr18.c:204 -msgid "Invalid code range." -msgstr "无效的编码范围" - -#: lib/extend/ftxerr18.c:206 -msgid "Invalid displacement." -msgstr "无效的取代" - -#: lib/extend/ftxerr18.c:208 -msgid "Endless loop encountered while executing instructions." -msgstr "当执行指令时遇到无限循环。" - -#: lib/extend/ftxerr18.c:213 -msgid "Nested frame access." -msgstr "嵌套的 frame 访问。" - -#: lib/extend/ftxerr18.c:215 -msgid "Invalid cache list." -msgstr "无效的缓存线性表。" - -#: lib/extend/ftxerr18.c:217 -msgid "Could not find context." -msgstr "找不到上下文。" - -#: lib/extend/ftxerr18.c:219 -msgid "Unlisted object." -msgstr "未列出的对象。" - -#: lib/extend/ftxerr18.c:224 -msgid "Raster pool overflow." -msgstr "栅格池溢出。" - -#: lib/extend/ftxerr18.c:226 -msgid "Raster: negative height encountered." -msgstr "Raster:遇到负高度。" - -#: lib/extend/ftxerr18.c:228 -msgid "Raster: invalid value." -msgstr "栅格:非法值。" - -#: lib/extend/ftxerr18.c:230 -msgid "Raster not initialized." -msgstr "栅格没有初始化。" - -#: lib/extend/ftxerr18.c:235 -msgid "Invalid kerning (kern) table format." -msgstr "" - -#: lib/extend/ftxerr18.c:237 -msgid "Invalid kerning (kern) table." -msgstr "" - -#: lib/extend/ftxerr18.c:240 -msgid "Invalid PostScript (post) table format." -msgstr "无效的PostScript(表)格式。" - -#: lib/extend/ftxerr18.c:242 -msgid "Invalid PostScript (post) table." -msgstr "PostScript(post)表不可用" - -#: lib/extend/ftxerr18.c:247 -msgid "Invalid TrueType Open subtable format." -msgstr "" - -#: lib/extend/ftxerr18.c:249 -msgid "Invalid TrueType Open subtable." -msgstr "" - -#: lib/extend/ftxerr18.c:251 -msgid "Glyph(s) not covered by lookup." -msgstr "字体没有预览。" - -#: lib/extend/ftxerr18.c:253 -msgid "Too many nested context substitutions." -msgstr "过多嵌套的上下文替换。" - -#: lib/extend/ftxerr18.c:255 -msgid "No MM (Adobe MultipleMaster) interpreter available." -msgstr "没有可用的 MM (Adobe MultipleMaster) 解释器。" - -#: lib/extend/ftxerr18.c:258 -msgid "Invalid glyph substitution (GSUB) table format." -msgstr "无效的 glyph 替换 (GSUB) 表格式。" - -#: lib/extend/ftxerr18.c:260 -msgid "Invalid glyph substitution (GSUB) table." -msgstr "无效的 glyph 替换 (GSUB) 表。" - -#: lib/extend/ftxerr18.c:263 -msgid "Invalid glyph positioning (GPOS) table format." -msgstr "无效字体位置表(GPOS)格式。" - -#: lib/extend/ftxerr18.c:265 -msgid "Invalid glyph positioning (GPOS) table." -msgstr "无效字体位置表(GPOS)。" - -#: lib/extend/ftxerr18.c:268 -msgid "Invalid glyph definition (GDEF) table format." -msgstr "非法的字形表定义格式(GDFF)" - -#: lib/extend/ftxerr18.c:270 -msgid "Invalid glyph definition (GDEF) table." -msgstr "非法的字形表定义格式(GDEF)" - -#: lib/extend/ftxerr18.c:277 -msgid "Invalid Error Number." -msgstr "非法的错误码" - -#: test/fterror.c:49 -msgid "" -"fterror: test TT_ErrToString18 functionality\n" -"\n" -msgstr "" -"测试 TT_ErrToString18 功能\n" -"\n" - -#: test/fterror.c:50 -msgid "" -" with an optional numerical argument, dumps the associated message.\n" -"\n" -msgstr "" -" 与一个可选的数字参数一起,记录关联的消息.\n" -"\n" - -#: test/fterror.c:73 -msgid "Start of fterror.\n" -msgstr "fterror开始。\n" - -#: test/fterror.c:81 -msgid "End of fterror.\n" -msgstr "fterror结束。\n" - -#: test/fterror.c:96 -#, c-format -msgid "Freetype error code 0x%04lX (%lu): %s\n" -msgstr "Freetype错误代码 0x%04lX (%lu):%s\n" - -#: test/ftdump.c:169 test/ftlint.c:207 test/ftmetric.c:294 -msgid "Could not create glyph container.\n" -msgstr "无法创建字形容器。\n" - -#: test/ftdump.c:179 test/ftlint.c:215 test/ftmetric.c:303 test/ftsbit.c:214 -msgid "Could not create instance.\n" -msgstr "无法创建实例。\n" - -#: test/ftdump.c:188 -msgid "Could not create second instance.\n" -msgstr "无法创建第二个实例。\n" - -#: test/ftdump.c:194 -msgid "Memory footprint statistics:\n" -msgstr "内存使用统计\n" - -#: test/ftdump.c:202 -msgid "face object" -msgstr "" - -#: test/ftdump.c:203 -msgid "glyph object" -msgstr "字形对象" - -#: test/ftdump.c:204 -msgid "instance object" -msgstr "实例对象" - -#: test/ftdump.c:208 -msgid "exec. context object" -msgstr "" - -#: test/ftdump.c:215 -msgid "total memory usage" -msgstr "所有内存使用量" - -#: test/ftdump.c:223 test/ftdump.c:579 test/ftdump.c:789 test/ftdump.c:993 -#: test/ftdump.c:1139 test/ftlint.c:274 test/ftlint.c:287 test/ftmetric.c:390 -#: test/ftsbit.c:286 -#, c-format -msgid "FreeType error message: %s\n" -msgstr "FreeType错误信息:%s\n" - -#: test/ftdump.c:300 -msgid "font name table entries\n" -msgstr "字体列表\n" - -#: test/ftdump.c:310 -#, c-format -msgid "" -"PostScript name: %s\n" -"\n" -msgstr "" -"PostScript名称:%s\n" -"\n" - -#: test/ftdump.c:333 -msgid "character map encodings\n" -msgstr "字符映射编码\n" - -#: test/ftdump.c:340 test/ftdump.c:488 -msgid "The file doesn't seem to have any encoding table.\n" -msgstr "这个文件似乎不包含编码表。\n" - -#: test/ftdump.c:344 test/ftdump.c:492 -#, c-format -msgid "" -"There are %hu encodings:\n" -"\n" -msgstr "" -"有 %hu 种编码\n" -"\n" - -#: test/ftdump.c:349 -#, c-format -msgid "encoding %2u: " -msgstr "编码 %2u: " - -#: test/ftdump.c:376 test/ftdump.c:385 test/ftdump.c:452 -#, c-format -msgid "Unknown value %hu" -msgstr "未知值 %hu" - -#: test/ftdump.c:459 -msgid "Unknown" -msgstr "未知" - -#: test/ftdump.c:481 -msgid "ftxcmap test\n" -msgstr "ftxcmap 测试\n" - -#: test/ftdump.c:498 -#, c-format -msgid "encoding %2u:\n" -msgstr "编码 %2u:\n" - -#: test/ftdump.c:503 -#, c-format -msgid "first: glyph index %hu, character code 0x%lx\n" -msgstr "第一个:glyph 索引 %hu,字符编码 0x%lx\n" - -#: test/ftdump.c:507 -#, c-format -msgid "next: glyph index %hu, character code 0x%lx\n" -msgstr "下一个:glyph 索引 %hu,字符编码 0x%lx\n" - -#: test/ftdump.c:511 -#, c-format -msgid "last: glyph index %hu, character code 0x%lx\n" -msgstr "最后一个:glyph 索引 %hu,字符编码 0x%lx\n" - -#: test/ftdump.c:533 test/ftmetric.c:284 -msgid "Error while retrieving embedded bitmaps table.\n" -msgstr "检索嵌入式位图表时出错。\n" - -#: test/ftdump.c:537 -msgid "embedded bitmap table\n" -msgstr "嵌入式位图表\n" - -#: test/ftdump.c:540 -#, c-format -msgid " version of embedded bitmap table: 0x%lx\n" -msgstr " 嵌入式位图表的版本: 0x%lx\n" - -#: test/ftdump.c:542 -#, c-format -msgid " number of embedded bitmap strikes: %lu\n" -msgstr "" - -#: test/ftdump.c:552 -#, c-format -msgid " bitmap strike %hu/%lu: " -msgstr "" - -#: test/ftdump.c:555 -#, c-format -msgid "%hux%hu pixels, %hu-bit depth, glyphs [%hu..%hu]\n" -msgstr "" - -#: test/ftdump.c:564 -#, c-format -msgid " range format (%hu:%hu) glyphs %hu..%hu\n" -msgstr "" - -#: test/ftdump.c:615 -msgid "Error while loading GSUB table.\n" -msgstr "载入 GSUB表出错.\n" - -#: test/ftdump.c:619 -msgid "GSUB table\n" -msgstr "GSUB 表\n" - -#: test/ftdump.c:626 -msgid "Error while querying GSUB script list.\n" -msgstr "" - -#: test/ftdump.c:639 -#, c-format -msgid "Error while selecting GSUB script `%4.4s'.\n" -msgstr "选择一下 GSUB脚本出错: `%4.4s'\n" - -#: test/ftdump.c:644 test/ftdump.c:848 -#, c-format -msgid " script `%4.4s' (index %hu):\n" -msgstr " 脚本 `%4.4s' (索引 %hu):\n" - -#: test/ftdump.c:652 -#, c-format -msgid "" -"Error while querying GSUB default language system for script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:657 test/ftdump.c:861 -msgid " default language system:\n" -msgstr " 默认语言系统:\n" - -#: test/ftdump.c:670 -#, c-format -msgid "" -"Error while selecting GSUB feature `%4.4s'\n" -"for default language system of script `%4.4s'.\n" -msgstr "" -"选择GSUB特性 `%4.4s'出错\n" -"默认语言系统的脚本 `%4.4s'.\n" - -#: test/ftdump.c:676 test/ftdump.c:757 test/ftdump.c:880 test/ftdump.c:961 -#, c-format -msgid " feature `%4.4s' (index %hu; lookup " -msgstr "" - -#: test/ftdump.c:692 -#, c-format -msgid "Error while querying GSUB language list for script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:709 -#, c-format -msgid "Error while selecting GSUB language `%4.4s' for script `%4.4s'.\n" -msgstr "选择GSUB语言 `%4.4s'错误。为脚本 `%4.4s'.\n" - -#: test/ftdump.c:714 test/ftdump.c:918 -#, c-format -msgid " language `%4.4s' (index %hu):\n" -msgstr " 语言 `%4.4s' (索引 %hu):\n" - -#: test/ftdump.c:719 test/ftdump.c:923 -#, c-format -msgid " required feature index %hu (lookup " -msgstr "" - -#: test/ftdump.c:734 -#, c-format -msgid "" -"Error while querying GSUB feature list\n" -"for script `%4.4s', language `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:751 -#, c-format -msgid "" -"Error while selecting GSUB feature `%4.4s'\n" -"for script `%4.4s', language `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:776 test/ftdump.c:980 -msgid "" -"Lookups:\n" -"\n" -msgstr "" - -#: test/ftdump.c:779 test/ftdump.c:983 -#, c-format -msgid " %hu: type %hu, flag 0x%x\n" -msgstr " %hu: 格式 %hu, 标志 0x%x\n" - -#: test/ftdump.c:819 -msgid "Error while loading GPOS table.\n" -msgstr "载入GPOS表出错。\n" - -#: test/ftdump.c:823 -msgid "GPOS table\n" -msgstr "GPOS 表\n" - -#: test/ftdump.c:830 -msgid "Error while querying GPOS script list.\n" -msgstr "" - -#: test/ftdump.c:843 -#, c-format -msgid "Error while selecting GPOS script `%4.4s'.\n" -msgstr "选择 GPOS 脚本 `%4.4s'出错。\n" - -#: test/ftdump.c:856 -#, c-format -msgid "" -"Error while querying GPOS default language system for script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:874 -#, c-format -msgid "" -"Error while selecting GPOS feature `%4.4s'\n" -"for default language system of script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:896 -#, c-format -msgid "Error while querying GPOS language list for script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:913 -#, c-format -msgid "Error while selecting GPOS language `%4.4s' for script `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:938 -#, c-format -msgid "" -"Error while querying GPOS feature list\n" -"for script `%4.4s', language `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:955 -#, c-format -msgid "" -"Error while selecting GPOS feature `%4.4s'\n" -"for script `%4.4s', language `%4.4s'.\n" -msgstr "" - -#: test/ftdump.c:1018 -msgid "ftdump: Simple TrueType Dumper -- part of the FreeType project" -msgstr "" - -#: test/ftdump.c:1022 -#, c-format -msgid "" -"Usage: %s fontname[.ttf|.ttc]\n" -"\n" -msgstr "" - -#: test/ftdump.c:1054 test/ftlint.c:134 test/ftmetric.c:228 test/ftsbit.c:127 -msgid "Error while initializing engine.\n" -msgstr "" - -#: test/ftdump.c:1061 test/ftmetric.c:236 test/ftsbit.c:134 -msgid "Error while initializing embedded bitmap extension.\n" -msgstr "" - -#: test/ftdump.c:1068 -msgid "Error while initializing GSUB extension.\n" -msgstr "" - -#: test/ftdump.c:1075 -msgid "Error while initializing GPOS extension.\n" -msgstr "" - -#: test/ftdump.c:1091 test/ftlint.c:187 test/ftmetric.c:251 test/ftsbit.c:182 -#, c-format -msgid "Could not find or open %s.\n" -msgstr "" - -#: test/ftdump.c:1094 test/ftlint.c:193 test/ftmetric.c:254 test/ftsbit.c:188 -#, c-format -msgid "Error while opening %s.\n" -msgstr "" - -#: test/ftlint.c:94 -msgid "" -"ftlint: Simple TrueType instruction tester -- part of the FreeType project" -msgstr "" - -#: test/ftlint.c:99 -#, c-format -msgid "" -"Usage: %s ppem fontname[.ttf|.ttc] [fontname2..]\n" -"\n" -msgstr "" - -#: test/ftlint.c:226 test/ftsbit.c:225 -#, c-format -msgid "Could not set point size to %d.\n" -msgstr "" - -#: test/ftlint.c:239 -msgid "" -"Error with\n" -" " -msgstr "" - -#: test/ftlint.c:240 -#, c-format -msgid "glyph %4u: %s\n" -msgstr "" - -#: test/ftlint.c:253 -msgid "1 fail.\n" -msgstr "" - -#: test/ftlint.c:255 -#, c-format -msgid "%d fails.\n" -msgstr "" - -#: test/ftmetric.c:70 -msgid "" -"ftmetric: Simple TTF metrics/glyph dumper -- part of the FreeType project" -msgstr "" - -#: test/ftmetric.c:74 -#, c-format -msgid "" -"Usage: %s [options below] point fontname[.ttf|.ttc]\n" -"\n" -" -B show sbit's metrics (default: none)\n" -" -c C use C'th font index of TrueType collection (default: 0)\n" -" -i index glyph index (default: 0)\n" -" -r R use resolution R dpi (default: 72)\n" -"\n" -msgstr "" - -#: test/ftmetric.c:261 -#, c-format -msgid "There are %d fonts in this collection.\n" -msgstr "" - -#: test/ftmetric.c:266 -#, c-format -msgid "There is no collection with index %d in this font file.\n" -msgstr "" - -#: test/ftmetric.c:280 -msgid "There is no embedded bitmap data in the font.\n" -msgstr "" - -#: test/ftmetric.c:310 -msgid "Could not set device resolutions.\n" -msgstr "" - -#: test/ftmetric.c:317 -msgid "Could not reset instance.\n" -msgstr "" - -#: test/ftmetric.c:323 -#, c-format -msgid "Instance metrics: ppemX %d, ppemY %d\n" -msgstr "" - -#: test/ftmetric.c:333 test/ftsbit.c:234 -msgid "Could not allocate glyph bitmap container.\n" -msgstr "" - -#: test/ftmetric.c:341 test/ftsbit.c:258 -#, c-format -msgid "Can't load bitmap for glyph %d.\n" -msgstr "" - -#: test/ftmetric.c:368 -msgid "Outline's metrics" -msgstr "轮廓尺寸" - -#: test/ftmetric.c:370 -msgid "Outline glyph\n" -msgstr "字形轮廓\n" - -#: test/ftsbit.c:90 -msgid "ftsbit: Simple TrueType `sbit' dumper -- part of the FreeType project" -msgstr "" - -#: test/ftsbit.c:95 -#, c-format -msgid "" -"Usage: %s ppem fontname[.ttf|.ttc] glyph_index [glyph_index2..]\n" -"\n" -msgstr "" -"用法: %s ppem fontname[.ttf|.ttc] glyph_index [glyph_index2..]\n" -"\n" - -#: test/ftsbit.c:200 -msgid "Could not find embedded bitmaps in this font.\n" -msgstr "" - -#: test/ftsbit.c:206 -msgid "Error while loading embedded bitmaps.\n" -msgstr "当读取内嵌位图时出错。\n" - -#: test/ftsbit.c:252 -#, c-format -msgid " no bitmap for glyph %d.\n" -msgstr " 没有字形 %d 的位图\n" - -#: test/ftsbit.c:264 -#, c-format -msgid "glyph index %d = %dx%d pixels, " -msgstr "字形索引 %d = %dx%d 像素, " - -#: test/ftsbit.c:267 -#, c-format -msgid "advance = %ld, minBearing = [%ld,%ld]\n" -msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/friendly-recovery.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/friendly-recovery.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/friendly-recovery.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/friendly-recovery.po 2012-02-23 07:11:58.000000000 +0000 @@ -7,67 +7,187 @@ msgstr "" "Project-Id-Version: friendly-recovery\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-09-07 17:09-0400\n" +"POT-Creation-Date: 2012-02-16 12:08-0500\n" "PO-Revision-Date: 2011-09-29 16:22+0000\n" "Last-Translator: YunQiang Su \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:56+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: ../lib/recovery-mode/recovery-menu:7 +#: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format -msgid "Recovery Menu" -msgstr "恢复菜单" +msgid "Revert to old snapshot and reboot" +msgstr "" -#: ../lib/recovery-mode/recovery-menu:13 +#: ../lib/recovery-mode/options/apt-snapshots:31 #, sh-format -msgid " Resume normal boot" -msgstr " 恢复正常启动" +msgid "Snapshot" +msgstr "" -#: ../lib/recovery-mode/recovery-menu:26 +#: ../lib/recovery-mode/options/clean:6 #, sh-format -msgid "Couldn't find whiptail, starting root shell instead of recovery menu." -msgstr "无法找到 whiptail,将启动 root shell,而不是恢复菜单。" +msgid "Try to make free space" +msgstr "尝试释放空间" -#: ../lib/recovery-mode/options/dpkg:6 +#: ../lib/recovery-mode/options/clean:12 #, sh-format -msgid "Repair broken packages" -msgstr "修复被损坏的包文件" +msgid "" +"Trying to find packages you don't need (apt-get autoremove), please review " +"carefully." +msgstr "" -#: ../lib/recovery-mode/options/dpkg:33 +#: ../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/fsck:8 -#, sh-format -msgid "Reboot into file system check" -msgstr "重启并进行文件系统检查" - -#: ../lib/recovery-mode/options/root:6 +#: ../lib/recovery-mode/options/dpkg:6 #, sh-format -msgid "Drop to root shell prompt" -msgstr "降格为 root 用户的 shell 提示符" +msgid "Repair broken packages" +msgstr "修复被损坏的包文件" #: ../lib/recovery-mode/options/failsafeX:11 #, sh-format msgid "Run in failsafe graphic mode" msgstr "在安全图形模式下运行" -#: ../lib/recovery-mode/options/netroot:6 +#: ../lib/recovery-mode/options/fsck:6 #, sh-format -msgid "Drop to root shell prompt with networking" -msgstr "进入 root 用户的 shell 界面(启用网络连接)" +msgid "Check all file systems" +msgstr "" #: ../lib/recovery-mode/options/grub:6 #, sh-format msgid "Update grub bootloader" msgstr "更新 grub 引导程序" -#: ../lib/recovery-mode/options/clean:6 +#: ../lib/recovery-mode/options/network:6 #, sh-format -msgid "Try to make free space" -msgstr "尝试释放空间" +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:57 +#, 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 "" + +#: ../lib/recovery-mode/options/system-summary:25 +#, sh-format +msgid "IP and DNS configured" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:36 +#, sh-format +msgid "No software RAID detected (mdstat)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:39 +#, sh-format +msgid "=== General information ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:40 +#, sh-format +msgid "System mode:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:41 +#, sh-format +msgid "CPU information:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:42 +#, sh-format +msgid "Network connectivity:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:44 +#, sh-format +msgid "=== Detailed disk usage ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:47 +#, sh-format +msgid "=== Software RAID state ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:50 +#, sh-format +msgid "=== Detailed memory usage ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:53 +#, sh-format +msgid "=== Detailed network configuration ===" +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 "" + +#: ../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 "" + +#: ../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 "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gas.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gas.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gas.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gas.po 2012-02-23 07:11:25.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: 2011-12-29 09:14+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: app.c:488 app.c:502 msgid "end of file in comment" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gawk.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gawk.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gawk.po 2012-01-02 18:07:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gawk.po 2012-02-23 07:11:28.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: 2011-12-29 09:50+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:54+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: array.c:112 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.4.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.4.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.4.po 2012-01-02 18:07:43.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.4.po 2012-02-23 07:12:04.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: 2011-12-29 18:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:11+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Basepath: C:\\MSYS\\source\\gcc-4.4-20081121\\gcc\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.5.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.5.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.5.po 2012-01-02 18:07:46.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.5.po 2012-02-23 07:12:07.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: gcc 4.5.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" "POT-Creation-Date: 2010-04-06 14:11+0000\n" -"PO-Revision-Date: 2011-12-13 06:19+0000\n" +"PO-Revision-Date: 2012-01-30 20:18+0000\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \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: 2011-12-29 19:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:47+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Basepath: C:\\MSYS\\source\\gcc-4.5.0\\gcc\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.6.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.6.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gcc-4.6.po 2012-01-02 18:07:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.6.po 2012-02-23 07:12:10.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: 2011-06-21 10:27+0000\n" -"PO-Revision-Date: 2011-12-18 01:28+0000\n" +"PO-Revision-Date: 2012-02-17 01:51+0000\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \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: 2011-12-29 19:39+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 02:17+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gdb.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gdb.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gdb.po 2012-01-02 18:07:05.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gdb.po 2012-02-23 07:11:28.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: gdb\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-07 22:12+0100\n" +"POT-Creation-Date: 2012-01-24 09:23+0000\n" "PO-Revision-Date: 2010-03-24 07:45+0000\n" "Last-Translator: Jianle Ma \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 09:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ada-exp.y:259 msgid "Invalid conversion" @@ -73,12 +73,12 @@ msgid "Internal error in encoding of renaming declaration" msgstr "在编码重命名声明时发生内部错误" -#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:647 +#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:646 #, possible-c-format msgid "No file or function \"%s\"." msgstr "没有这样的文件或函数:\"%s\"" -#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:658 +#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:657 #, possible-c-format msgid "No function \"%s\" in specified context." msgstr "函数 \"%s\"在指定上下文中没有被发现" @@ -102,9 +102,9 @@ msgid "No definition of \"%s\" found." msgstr "\"%s\"未定义" -#: ada-exp.y:1395 c-exp.y:845 c-exp.y:897 cli/cli-cmds.c:913 f-exp.y:520 -#: linespec.c:1823 linespec.c:2109 objc-exp.y:721 objc-exp.y:775 p-exp.y:717 -#: p-exp.y:786 source.c:179 symtab.c:2858 +#: ada-exp.y:1395 c-exp.y:860 c-exp.y:912 cli/cli-cmds.c:915 f-exp.y:519 +#: linespec.c:2133 linespec.c:2959 objc-exp.y:721 objc-exp.y:775 p-exp.y:716 +#: p-exp.y:785 source.c:177 symtab.c:3030 msgid "No symbol table is loaded. Use the \"file\" command." msgstr "没有符号表被读取。请使用 \"file\" 命令。" @@ -127,119 +127,119 @@ msgid "Invalid use of type." msgstr "使用类型错误。" -#: ada-lang.c:504 +#: ada-lang.c:511 #, possible-c-format msgid "Unable to find field %s in struct %s. Aborting" msgstr "无法找到域 %s 在结构体 %s 中。终止" -#: ada-lang.c:625 +#: ada-lang.c:632 msgid "object size is larger than varsize-limit" msgstr "对象大小超过变量大小限制" -#: ada-lang.c:689 +#: ada-lang.c:696 msgid "Unexpected type in ada_discrete_type_high_bound." msgstr "在 ada_discrete_type_high_bound 中出现未预料的类型" -#: ada-lang.c:709 +#: ada-lang.c:716 msgid "Unexpected type in ada_discrete_type_low_bound." msgstr "在 ada_discrete_type_low_bound 中出现未预料的类型" -#: ada-lang.c:768 +#: ada-lang.c:775 msgid "Invalid address for Ada main program name." msgstr "无效的 Ada 主程序名地址:%s" -#: ada-lang.c:848 +#: ada-lang.c:855 #, possible-c-format msgid "invalid Ada operator name: %s" msgstr "无效的 Ada 操作符名称:%s" -#: ada-lang.c:1507 ada-lang.c:1525 ada-lang.c:1539 ada-lang.c:1607 +#: ada-lang.c:1517 ada-lang.c:1535 ada-lang.c:1549 ada-lang.c:1617 msgid "Bad GNAT array descriptor" msgstr "错误的 GNAT 数组描述" -#: ada-lang.c:1644 +#: ada-lang.c:1654 msgid "Bad GNAT array descriptor bounds" msgstr "错误的 GNAT 数组边界" -#: ada-lang.c:1887 +#: ada-lang.c:1897 msgid "Bounds unavailable for null array pointer." msgstr "边界对空数组指针无效" -#: ada-lang.c:1976 +#: ada-lang.c:1986 msgid "could not understand bit size information on packed array" msgstr "无法理解紧缩数组中的位大小信息" -#: ada-lang.c:2056 +#: ada-lang.c:2066 msgid "could not find bounds information on packed array" msgstr "无法在紧缩数组中找到边界信息" -#: ada-lang.c:2063 +#: ada-lang.c:2073 msgid "could not understand bounds information on packed array" msgstr "无法理解紧缩数组中的边界信息" -#: ada-lang.c:2097 +#: ada-lang.c:2107 msgid "can't unpack array" msgstr "无法解包数组" -#: ada-lang.c:2150 +#: ada-lang.c:2160 msgid "attempt to do packed indexing of something other than a packed array" msgstr "试图打包一个非紧缩数组的索引" -#: ada-lang.c:2160 +#: ada-lang.c:2170 msgid "don't know bounds of array" msgstr "不知道数组界限" -#: ada-lang.c:2166 +#: ada-lang.c:2176 #, possible-c-format msgid "packed array index %ld out of bounds" msgstr "紧缩数组序号 %ld 越界" -#: ada-lang.c:2445 ada-lang.c:8551 valops.c:1217 +#: ada-lang.c:2455 ada-lang.c:8728 valops.c:1218 msgid "Left operand of assignment is not a modifiable lvalue." msgstr "左运算域是个不可修改的值." -#: ada-lang.c:2542 ada-lang.c:2563 +#: ada-lang.c:2552 ada-lang.c:2573 #, possible-c-format msgid "too many subscripts (%d expected)" msgstr "脚本过多(应该为%d个)" -#: ada-lang.c:2694 +#: ada-lang.c:2704 #, possible-c-format msgid "invalid dimension number to '%s" msgstr "对'%s来说维数非法" -#: ada-lang.c:2713 +#: ada-lang.c:2723 msgid "attempt to take bound of something that is not an array" msgstr "试图(像数组一样)取得非数组的边界" -#: ada-lang.c:2833 +#: ada-lang.c:2843 msgid "Could not find operator name for opcode" msgstr "找不到操作码的运算符名称" -#: ada-lang.c:3023 +#: ada-lang.c:3033 msgid "Unexpected operator during name resolution" msgstr "进行名字解析时不是期望的操作符" -#: ada-lang.c:3087 +#: ada-lang.c:3097 #, possible-c-format msgid "No definition found for %s" msgstr "没有找到%s的定义" -#: ada-lang.c:3099 ada-lang.c:3151 +#: ada-lang.c:3109 ada-lang.c:3161 #, possible-c-format msgid "Could not find a match for %s" msgstr "无法找到与%s相匹配的" -#: ada-lang.c:3104 ada-lang.c:3384 +#: ada-lang.c:3114 ada-lang.c:3394 #, possible-c-format msgid "Multiple matches for %s\n" msgstr "与%s有多个匹配\n" -#: ada-lang.c:3472 +#: ada-lang.c:3482 msgid "Request to select 0 symbols!" msgstr "请求选择0个符号!" -#: ada-lang.c:3477 linespec.c:542 +#: ada-lang.c:3487 linespec.c:626 msgid "" "canceled because the command is ambiguous\n" "See set/show multiple-symbol." @@ -247,308 +247,319 @@ "命令不明确导致取销\n" "请参考 set/show multiple-symbol" -#: ada-lang.c:3487 +#: ada-lang.c:3497 msgid "[0] cancel\n" msgstr "[0] 取消\n" -#: ada-lang.c:3489 +#: ada-lang.c:3499 msgid "[1] all\n" msgstr "[1] 全部\n" -#: ada-lang.c:3504 +#: ada-lang.c:3514 #, possible-c-format msgid "[%d] %s at :%d\n" msgstr "[%d] %s at <无可用的源文件>:%d\n" -#: ada-lang.c:3509 ada-lang.c:3523 +#: ada-lang.c:3519 ada-lang.c:3533 #, possible-c-format msgid "[%d] %s at %s:%d\n" msgstr "[%d] %s 在 %s:%d\n" -#: ada-lang.c:3533 +#: ada-lang.c:3543 #, possible-c-format msgid "'(%s) (enumeral)\n" msgstr "'(%s) (枚举)\n" -#: ada-lang.c:3538 +#: ada-lang.c:3548 #, possible-c-format msgid "[%d] %s in %s (enumeral)\n" msgstr "[%d] %s 在 %s 中(枚举型)\n" -#: ada-lang.c:3539 +#: ada-lang.c:3549 #, possible-c-format msgid "[%d] %s at %s:?\n" msgstr "[%d] %s 在 %s:?\n" -#: ada-lang.c:3545 +#: ada-lang.c:3555 #, possible-c-format msgid "[%d] %s (enumeral)\n" msgstr "[%d] %s (枚举型)\n" -#: ada-lang.c:3546 +#: ada-lang.c:3556 #, possible-c-format msgid "[%d] %s at ?\n" msgstr "[%d] %s 在 ?\n" -#: ada-lang.c:3593 ada-lang.c:3607 linespec.c:610 +#: ada-lang.c:3603 ada-lang.c:3617 linespec.c:649 msgid "one or more choice numbers" msgstr "一个或多个选项号" -#: ada-lang.c:3614 +#: ada-lang.c:3624 msgid "Argument must be choice number" msgstr "参数必须是个选项数字" -#: ada-lang.c:3618 +#: ada-lang.c:3628 msgid "cancelled" msgstr "已取消" -#: ada-lang.c:3645 +#: ada-lang.c:3655 #, possible-c-format msgid "Select no more than %d of the above" msgstr "选项不能超过以上 %d 个" #. PNH: Do we ever get here? See ada_search_struct_field, #. find_struct_field. -#: ada-lang.c:6361 +#: ada-lang.c:6540 msgid "Cannot assign this kind of variant record" msgstr "不能分配这种变体类型" -#: ada-lang.c:6458 valops.c:2350 +#: ada-lang.c:6637 valops.c:2350 #, possible-c-format msgid "There is no member named %s." msgstr "没有名为 %s 的成员" -#: ada-lang.c:6464 +#: ada-lang.c:6643 msgid "Attempt to extract a component of a value that is not a record." msgstr "企图从非记录类型的变量中提取元素。" -#: ada-lang.c:6515 +#: ada-lang.c:6694 msgid "Type (null) is not a structure or union type" msgstr "类型 (null) 不是结构体或共用体类型" #. XXX: type_sprint -#: ada-lang.c:6519 ada-lang.c:6598 ada-lang.c:6605 +#: ada-lang.c:6698 ada-lang.c:6777 ada-lang.c:6784 msgid "Type " msgstr "类型 " -#: ada-lang.c:6521 +#: ada-lang.c:6700 msgid " is not a structure or union type" msgstr " 不是结构体或共用体类型" -#: ada-lang.c:6600 +#: ada-lang.c:6779 msgid " has no component named " msgstr " 没有名为 的成分" -#: ada-lang.c:6607 +#: ada-lang.c:6786 #, possible-c-format msgid " has no component named %s" msgstr " 没有名为 %s 的成分" -#: ada-lang.c:6946 +#: ada-lang.c:7125 msgid "unexpected null name on descriptive type" msgstr "" -#: ada-lang.c:7300 +#: ada-lang.c:7479 #, possible-c-format msgid "Invalid type size for `%s' detected: %d." msgstr "无效的类型`%s',检测到: %d." -#: ada-lang.c:7303 +#: ada-lang.c:7482 #, possible-c-format msgid "Invalid type size for detected: %d." msgstr "无效的类型大小:%d" -#: ada-lang.c:7314 +#: ada-lang.c:7493 msgid "record type with dynamic size is larger than varsize-limit" msgstr "动态可变的记录类型超越变量大小限制" -#: ada-lang.c:7627 +#: ada-lang.c:7806 msgid "array type with dynamic size is larger than varsize-limit" msgstr "动态数组大小超过了变量限制" -#: ada-lang.c:7983 +#: ada-lang.c:8162 msgid "'POS only defined on discrete types" msgstr "'POS 只能在析构类型中定义" -#: ada-lang.c:7995 +#: ada-lang.c:8174 msgid "enumeration value is invalid: can't find 'POS" msgstr "无效的枚举型变量: 找不到 'POS" -#: ada-lang.c:8013 +#: ada-lang.c:8192 msgid "'VAL only defined on discrete types" msgstr "'VAL 只能在析构类型中定义" -#: ada-lang.c:8015 +#: ada-lang.c:8194 msgid "'VAL requires integral argument" msgstr "'VAL 需要整形参数" -#: ada-lang.c:8022 +#: ada-lang.c:8201 msgid "argument to 'VAL out of range" msgstr "'VAL 的参数超界" -#: ada-lang.c:8359 +#: ada-lang.c:8538 msgid "Incompatible types in assignment" msgstr "在赋值时使用了不兼容的类型" -#: ada-lang.c:8393 +#: ada-lang.c:8572 #, possible-c-format msgid "second operand of %s must not be zero." msgstr "%s 的第二运算域必须为零" -#: ada-lang.c:8438 +#: ada-lang.c:8617 msgid "Attempt to compare array with non-array" msgstr "尝试将数组于非数组比较" -#: ada-lang.c:8569 +#: ada-lang.c:8746 msgid "Left-hand side must be array or record." msgstr "左边必须是数组或记录形" -#: ada-lang.c:8594 +#: ada-lang.c:8771 msgid "Misplaced 'others' clause" msgstr "'others' 成分错位" -#: ada-lang.c:8599 +#: ada-lang.c:8776 msgid "Internal error: bad aggregate clause" msgstr "内部错误: 错误的集合成分" -#: ada-lang.c:8621 +#: ada-lang.c:8798 msgid "Extra components in aggregate ignored." msgstr "忽略聚合体的多余元素。" -#: ada-lang.c:8688 +#: ada-lang.c:8865 msgid "Invalid record component association." msgstr "记录成员的非法组合。" -#: ada-lang.c:8694 +#: ada-lang.c:8871 #, possible-c-format msgid "Unknown component name: %s." msgstr "未知成员名称: %s。" -#: ada-lang.c:8699 +#: ada-lang.c:8876 msgid "Index in component association out of bounds." msgstr "成员联合中索引越界。" -#: ada-lang.c:8775 +#: ada-lang.c:8952 msgid "Internal error: miscounted aggregate components." msgstr "内部错误: 聚合成员的个数计算错误。" -#: ada-lang.c:9144 +#: ada-lang.c:9321 msgid "Fixed-point values must be assigned to fixed-point variables" msgstr "定点值必须赋给定点变量" -#: ada-lang.c:9161 +#: ada-lang.c:9338 msgid "Operands of fixed-point addition must have the same type" msgstr "定点小数相加的操作数必须相同的类型" -#: ada-lang.c:9183 +#: ada-lang.c:9360 msgid "Operands of fixed-point subtraction must have the same type" msgstr "定点小数相减的操作数必须相同的类型" #. Only encountered when an unresolved symbol occurs in a #. context other than a function call, in which case, it is #. invalid. -#: ada-lang.c:9285 ada-lang.c:9355 +#: ada-lang.c:9462 ada-lang.c:9532 #, possible-c-format msgid "Unexpected unresolved symbol, %s, during evaluation" msgstr "当计算时遇到意外的无法解析的符号, %s" -#: ada-lang.c:9404 +#: ada-lang.c:9581 #, possible-c-format msgid "cannot subscript or call something of type `%s'" msgstr "不能(通过)下标访问或调用类型: '%s'" -#: ada-lang.c:9423 +#: ada-lang.c:9600 msgid "cannot subscript or call a record" msgstr "不能添加下标或者调用记录" -#: ada-lang.c:9425 +#: ada-lang.c:9602 #, possible-c-format msgid "wrong number of subscripts; expecting %d" msgstr "下标数字错误:期望%d" -#: ada-lang.c:9437 ada-lang.c:9451 +#: ada-lang.c:9614 ada-lang.c:9628 msgid "element type of array unknown" msgstr "数组元素类型未知" -#: ada-lang.c:9460 +#: ada-lang.c:9637 msgid "Attempt to index or call something other than an array or function" msgstr "试图使用索引,或者调用的不是数组和函数" -#: ada-lang.c:9490 +#: ada-lang.c:9667 msgid "cannot slice a packed array" msgstr "无法解析紧缩数组" -#: ada-lang.c:9518 valops.c:3682 +#: ada-lang.c:9695 valops.c:3681 msgid "cannot take slice of non-array" msgstr "无法对非数组进行切分" -#: ada-lang.c:9556 +#: ada-lang.c:9734 msgid "Membership test incompletely implemented; always returns true" msgstr "成员测试没有完全实现:总是返回是真" -#: ada-lang.c:9645 +#: ada-lang.c:9823 #, possible-c-format msgid "Invalid operand to '%s" msgstr "对'%s的操作数非法" #. Should never happen. -#: ada-lang.c:9670 ada-lang.c:9695 ada-lang.c:9725 +#: ada-lang.c:9848 ada-lang.c:9873 ada-lang.c:9903 msgid "unexpected attribute encountered" msgstr "遇到了无法预料的属性" -#: ada-lang.c:9703 +#: ada-lang.c:9881 msgid "the 'length attribute applies only to array types" msgstr "length属性只能应用于数组" -#: ada-lang.c:9707 +#: ada-lang.c:9885 msgid "unimplemented type attribute" msgstr "没有实现的类型属性" -#: ada-lang.c:9775 +#: ada-lang.c:9953 msgid "'modulus must be applied to modular type" msgstr "'modulus必须应用于modular类型" -#: ada-lang.c:9871 +#: ada-lang.c:10049 msgid "Attempt to dereference null array pointer." msgstr "试图对数组的指针赋值为null" -#: ada-lang.c:9899 eval.c:2638 eval.c:3052 valops.c:1786 +#: ada-lang.c:10077 eval.c:2639 eval.c:3049 valops.c:1786 msgid "Attempt to take contents of a non-pointer value." msgstr "企图获得非指针变量的内容" -#: ada-lang.c:9967 eval.c:2859 +#: ada-lang.c:10145 eval.c:2856 msgid "Attempt to use a type name as an expression" msgstr "试图使用类型名作为一个表达式" -#: ada-lang.c:9979 +#: ada-lang.c:10157 #, possible-c-format msgid "" "Undefined name, ambiguous name, or renaming used in component association: " "%s." msgstr "名字没有定义或者模糊,或者在相关的组件中被重命名:%s" -#: ada-lang.c:9982 +#: ada-lang.c:10160 msgid "Aggregates only allowed on the right of an assignment" msgstr "聚集只能在进行权限分配时使用" -#: ada-lang.c:9985 +#: ada-lang.c:10163 msgid "aggregate apparently mangled" msgstr "" -#: ada-lang.c:10280 +#: ada-lang.c:10458 msgid "Unknown lower bound, using 1." msgstr "未知下界,使用 1。" -#: ada-lang.c:10299 +#: ada-lang.c:10477 #, possible-c-format msgid "Unknown upper bound, using %ld." msgstr "未知上界,使用 %ld。" -#: ada-lang.c:10527 +#: ada-lang.c:10683 +msgid "" +"Your Ada runtime appears to be missing some debugging information.\n" +"Cannot insert Ada exception catchpoint in this configuration." +msgstr "" + +#: ada-lang.c:10693 +#, possible-c-format +msgid "Symbol \"%s\" is not a function (class = %d)" +msgstr "符号 “%s\" 不是一个函数 (类 = %d)" + +#: ada-lang.c:10736 msgid "Unable to insert catchpoint. Is this an Ada main program?" msgstr "无法加入获取点,这是个 Ada 主程序吗?" -#: ada-lang.c:10535 +#: ada-lang.c:10744 msgid "Unable to insert catchpoint. Try to start the program first." msgstr "不能插入获取点。先启动程序试试。" @@ -558,95 +569,95 @@ #. configurable run time mode, or that a-except as been optimized #. out by the linker... In any case, at this point it is not worth #. supporting this feature. -#: ada-lang.c:10544 -msgid "Cannot insert catchpoints in this configuration." -msgstr "当前配置下无法插入 catchpoint。" +#: ada-lang.c:10753 +msgid "Cannot insert Ada exception catchpoints in this configuration." +msgstr "" -#: ada-lang.c:10713 ada-lang.c:10855 ada-lang.c:10888 ada-lang.c:10917 +#: ada-lang.c:10912 ada-lang.c:11272 ada-lang.c:11316 ada-lang.c:11347 msgid "unexpected catchpoint type" msgstr "意外的获取点类型" -#: ada-lang.c:10739 +#: ada-lang.c:10938 #, possible-c-format msgid "failed to get exception name: %s" msgstr "无法取得异常(exception)的名称: %s" -#: ada-lang.c:10836 +#: ada-lang.c:11052 +#, possible-c-format +msgid "" +"failed to reevaluate internal exception condition for catchpoint %d: %s" +msgstr "" + +#: ada-lang.c:11143 +msgid "Error in testing exception condition:\n" +msgstr "" + +#: ada-lang.c:11253 ada-lang.c:11297 #, possible-c-format msgid "`%s' Ada exception" msgstr "`%s' Ada 例外" -#: ada-lang.c:10871 -#, possible-c-format -msgid "Catchpoint %d: `%s' Ada exception" -msgstr "捕捉点 %d: `%s' 例外的Ada" +#: ada-lang.c:11287 breakpoint.c:9796 +msgid "Temporary catchpoint " +msgstr "" -#: ada-lang.c:10874 -#, possible-c-format -msgid "Catchpoint %d: all Ada exceptions" +#: ada-lang.c:11288 breakpoint.c:9797 +msgid "Catchpoint " msgstr "" -#: ada-lang.c:10879 -#, possible-c-format -msgid "Catchpoint %d: unhandled Ada exceptions" -msgstr "捕捉点 %d: 未处理的Ada表达式" +#: ada-lang.c:11304 +msgid "all Ada exceptions" +msgstr "" -#: ada-lang.c:10884 -#, possible-c-format -msgid "Catchpoint %d: failed Ada assertions" -msgstr "捕捉点 %d: Ada声明失败" +#: ada-lang.c:11308 +msgid "unhandled Ada exceptions" +msgstr "" + +#: ada-lang.c:11312 +msgid "failed Ada assertions" +msgstr "" -#: ada-lang.c:11111 breakpoint.c:613 breakpoint.c:624 +#: ada-lang.c:11573 breakpoint.c:645 breakpoint.c:658 msgid "Junk at end of expression" msgstr "无意义的表达式结尾" -#: ada-lang.c:11156 ada-lang.c:11179 +#: ada-lang.c:11620 ada-lang.c:11643 #, possible-c-format msgid "unexpected catchpoint kind (%d)" msgstr "意外的catchpoint 类型(%d)" -#: ada-lang.c:11287 -#, possible-c-format -msgid "Unable to break on '%s' in this configuration." -msgstr "" - -#: ada-lang.c:11291 -#, possible-c-format -msgid "Symbol \"%s\" is not a function (class = %d)" -msgstr "符号 “%s\" 不是一个函数 (类 = %d)" - -#: ada-lang.c:11360 breakpoint.c:7843 breakpoint.c:9311 breakpoint.c:9440 -#: breakpoint.c:9484 breakpoint.c:9630 breakpoint.c:12185 +#: ada-lang.c:11806 breakpoint.c:7635 breakpoint.c:9544 breakpoint.c:9673 +#: breakpoint.c:9718 breakpoint.c:9861 breakpoint.c:13030 skip.c:191 msgid "Junk at end of arguments." msgstr "" #. XXX: gdb_sprint_host_address, type_sprint -#: ada-lang.c:11541 +#: ada-lang.c:12006 msgid "Type @" msgstr "类型 @" -#: ada-lang.c:11899 +#: ada-lang.c:12366 msgid "\"set ada\" must be followed by the name of a setting.\n" msgstr "" -#: ada-lang.c:11918 +#: ada-lang.c:12428 msgid "Prefix command for changing Ada-specfic settings" msgstr "" -#: ada-lang.c:11922 +#: ada-lang.c:12432 msgid "Generic command for showing Ada-specific settings." msgstr "" -#: ada-lang.c:11926 +#: ada-lang.c:12436 msgid "Enable or disable an optimization trusting PAD types over XVS types" msgstr "" -#: ada-lang.c:11927 +#: ada-lang.c:12437 msgid "" "Show whether an optimization trusting PAD types over XVS types is activated" msgstr "" -#: ada-lang.c:11929 +#: ada-lang.c:12439 msgid "" "This is related to the encoding used by the GNAT compiler. The debugger\n" "should normally trust the contents of PAD types, but certain older versions\n" @@ -658,6 +669,18 @@ "this option to \"off\" unless necessary." msgstr "" +#: ada-lang.c:12449 +msgid "" +"Catch Ada exceptions, when raised.\n" +"With an argument, catch only exceptions with the given name." +msgstr "" + +#: ada-lang.c:12456 +msgid "" +"Catch failed Ada assertions, when raised.\n" +"With an argument, catch only exceptions with the given name." +msgstr "" + #: ada-lex.l:129 ada-lex.l:133 msgid "Based real literals not implemented yet." msgstr "" @@ -671,153 +694,149 @@ msgid "Invalid character '%s' in expression." msgstr "表达式中含有无效字符 '%s'" -#: ada-lex.l:343 +#: ada-lex.l:342 #, possible-c-format msgid "Invalid base: %d." msgstr "" -#: ada-lex.l:354 ada-lex.l:361 +#: ada-lex.l:353 ada-lex.l:360 msgid "Integer literal out of range" msgstr "" -#: ada-lex.l:356 +#: ada-lex.l:355 #, possible-c-format msgid "Invalid digit `%c' in based literal" msgstr "" -#: ada-lex.l:602 +#: ada-lex.l:601 #, possible-c-format msgid "ambiguous attribute name: `%s'" msgstr "不明确的属性名:`%s'" -#: ada-lex.l:605 +#: ada-lex.l:604 #, possible-c-format msgid "unrecognized attribute: `%s'" msgstr "无法辨认的属性: `%s'" -#: ada-tasks.c:59 ada-tasks.c:81 +#: ada-tasks.c:66 ada-tasks.c:88 msgid "Unactivated" msgstr "己禁止" -#: ada-tasks.c:60 ada-tasks.c:82 +#: ada-tasks.c:67 ada-tasks.c:89 msgid "Runnable" msgstr "可运行" -#: ada-tasks.c:61 ada-tasks.c:83 +#: ada-tasks.c:68 ada-tasks.c:90 msgid "Terminated" msgstr "" -#: ada-tasks.c:62 +#: ada-tasks.c:69 msgid "Child Activation Wait" msgstr "" -#: ada-tasks.c:63 +#: ada-tasks.c:70 msgid "Accept or Select Term" msgstr "" -#: ada-tasks.c:64 ada-tasks.c:86 +#: ada-tasks.c:71 ada-tasks.c:93 msgid "Waiting on entry call" msgstr "" -#: ada-tasks.c:65 +#: ada-tasks.c:72 msgid "Async Select Wait" msgstr "" -#: ada-tasks.c:66 ada-tasks.c:88 +#: ada-tasks.c:73 ada-tasks.c:95 msgid "Delay Sleep" msgstr "延时休眠" -#: ada-tasks.c:67 +#: ada-tasks.c:74 msgid "Child Termination Wait" msgstr "子进程终止等待" -#: ada-tasks.c:68 +#: ada-tasks.c:75 msgid "Wait Child in Term Alt" msgstr "" -#: ada-tasks.c:73 ada-tasks.c:95 +#: ada-tasks.c:80 ada-tasks.c:102 msgid "Asynchronous Hold" msgstr "" -#: ada-tasks.c:75 ada-tasks.c:97 +#: ada-tasks.c:82 ada-tasks.c:104 msgid "Activating" msgstr "激活" -#: ada-tasks.c:76 +#: ada-tasks.c:83 msgid "Selective Wait" msgstr "" -#: ada-tasks.c:84 +#: ada-tasks.c:91 msgid "Waiting for child activation" msgstr "" -#: ada-tasks.c:85 +#: ada-tasks.c:92 msgid "Blocked in accept or select with terminate" msgstr "" -#: ada-tasks.c:87 +#: ada-tasks.c:94 msgid "Asynchronous Selective Wait" msgstr "" -#: ada-tasks.c:89 +#: ada-tasks.c:96 msgid "Waiting for children termination" msgstr "" -#: ada-tasks.c:90 +#: ada-tasks.c:97 msgid "Waiting for children in terminate alternative" msgstr "" -#: ada-tasks.c:98 +#: ada-tasks.c:105 msgid "Blocked in selective wait statement" msgstr "" -#: ada-tasks.c:279 +#: ada-tasks.c:414 msgid "Unknown task name format. Aborting" msgstr "" -#: ada-tasks.c:404 +#: ada-tasks.c:488 msgid "Cannot find Ada_Task_Control_Block type. Aborting" msgstr "" -#: ada-tasks.c:417 +#: ada-tasks.c:501 msgid "Cannot find Common_ATCB type. Aborting" msgstr "" -#: ada-tasks.c:419 +#: ada-tasks.c:503 msgid "Cannot find Private_Data type. Aborting" msgstr "" -#: ada-tasks.c:421 +#: ada-tasks.c:505 msgid "Cannot find Entry_Call_Record type. Aborting" msgstr "" -#: ada-tasks.c:695 +#: ada-tasks.c:942 msgid "Cannot inspect Ada tasks when program is not running" msgstr "" -#: ada-tasks.c:703 +#: ada-tasks.c:970 ada-tasks.c:1120 ada-tasks.c:1284 msgid "Your application does not use any Ada tasks.\n" msgstr "" -#: ada-tasks.c:745 +#: ada-tasks.c:1081 #, possible-c-format -msgid " Accepting RV with %-4d" +msgid "Accepting RV with %-4d" msgstr "" -#: ada-tasks.c:748 +#: ada-tasks.c:1087 #, possible-c-format -msgid " Waiting on RV with %-3d" +msgid "Waiting on RV with %-3d" msgstr "" -#: ada-tasks.c:757 -msgid " \n" +#: ada-tasks.c:1097 +msgid "" msgstr "" -#: ada-tasks.c:769 -msgid " ID TID P-ID Pri State Name\n" -msgstr "" - -#: ada-tasks.c:785 ada-tasks.c:898 +#: ada-tasks.c:1125 ada-tasks.c:1236 #, possible-c-format msgid "" "Task ID %d not known. Use the \"info tasks\" command to\n" @@ -825,98 +844,98 @@ msgstr "" #. Print the Ada task ID. -#: ada-tasks.c:790 +#: ada-tasks.c:1130 #, possible-c-format msgid "Ada Task: %s\n" msgstr "" -#: ada-tasks.c:795 +#: ada-tasks.c:1135 #, possible-c-format msgid "Name: %s\n" msgstr "" -#: ada-tasks.c:797 +#: ada-tasks.c:1137 msgid "\n" msgstr "" #. Print the TID and LWP. -#: ada-tasks.c:800 +#: ada-tasks.c:1140 #, possible-c-format msgid "Thread: %#lx\n" msgstr "" -#: ada-tasks.c:801 +#: ada-tasks.c:1141 #, possible-c-format msgid "LWP: %#lx\n" msgstr "" -#: ada-tasks.c:811 +#: ada-tasks.c:1151 #, possible-c-format msgid "Parent: %d" msgstr "" -#: ada-tasks.c:817 +#: ada-tasks.c:1157 msgid "No parent\n" msgstr "" #. Print the base priority. -#: ada-tasks.c:820 +#: ada-tasks.c:1160 #, possible-c-format msgid "Base Priority: %d\n" msgstr "" -#: ada-tasks.c:829 +#: ada-tasks.c:1169 #, possible-c-format msgid "State: Accepting rendezvous with %d" msgstr "" -#: ada-tasks.c:835 +#: ada-tasks.c:1175 #, possible-c-format msgid "State: Waiting on task %d's entry" msgstr "" -#: ada-tasks.c:839 +#: ada-tasks.c:1179 #, possible-c-format msgid "State: %s" msgstr "" -#: ada-tasks.c:883 +#: ada-tasks.c:1220 msgid "[Current task is unknown]\n" msgstr "" -#: ada-tasks.c:885 +#: ada-tasks.c:1222 #, possible-c-format msgid "[Current task is %d]\n" msgstr "" -#: ada-tasks.c:903 +#: ada-tasks.c:1241 #, possible-c-format msgid "Cannot switch to task %d: Task is no longer running" msgstr "" -#: ada-tasks.c:923 +#: ada-tasks.c:1261 #, possible-c-format msgid "" "Unable to compute thread ID for task %d.\n" "Cannot switch to this task." msgstr "" -#: ada-tasks.c:929 +#: ada-tasks.c:1267 #, possible-c-format msgid "[Switching to task %d]\n" msgstr "" -#: ada-tasks.c:961 +#: ada-tasks.c:1303 msgid "" "Task switching not supported when debugging from core files\n" "(use thread support instead)" msgstr "" -#: ada-tasks.c:1013 +#: ada-tasks.c:1401 msgid "Provide information about all known Ada tasks" msgstr "" -#: ada-tasks.c:1015 +#: ada-tasks.c:1403 msgid "" "Use this command to switch between Ada tasks.\n" "Without argument, this command simply prints the current task ID" @@ -926,38 +945,38 @@ msgid "" msgstr "" -#: ada-typeprint.c:651 +#: ada-typeprint.c:655 msgid " end record" msgstr "" -#: ada-typeprint.c:821 +#: ada-typeprint.c:816 #, possible-c-format msgid "<%d-byte integer>" msgstr "<%d-位的整数>" -#: ada-typeprint.c:843 +#: ada-typeprint.c:838 #, possible-c-format msgid "<%d-byte float>" msgstr "<%d-位的浮点数>" -#: ada-typeprint.c:856 +#: ada-typeprint.c:851 msgid "array (?) of ? ()" msgstr "" -#: ada-valprint.c:218 ada-valprint.c:524 c-lang.c:522 +#: ada-valprint.c:217 ada-valprint.c:523 valprint.c:1808 #, possible-c-format msgid " " msgstr "" -#: ada-valprint.c:452 +#: ada-valprint.c:451 msgid "internal error: unhandled type in ada_print_scalar" msgstr "" -#: ada-valprint.c:456 typeprint.c:270 +#: ada-valprint.c:455 typeprint.c:269 msgid "Invalid type code in symbol table." msgstr "" -#: ada-valprint.c:1123 +#: ada-valprint.c:1132 msgid "" msgstr "<被优化或零长度>" @@ -1004,7 +1023,7 @@ msgstr "已完成" #. i18n: Like "Thread-Id %d, [state] unknown" -#: aix-thread.c:563 python/py-auto-load.c:431 +#: aix-thread.c:563 msgid "unknown" msgstr "未知" @@ -1075,44 +1094,85 @@ msgid "Enables debugging output (used to debug GDB)." msgstr "" +#: alphabsd-nat.c:96 alphabsd-nat.c:128 amd64bsd-nat.c:53 amd64bsd-nat.c:87 +#: amd64-linux-nat.c:165 amd64-linux-nat.c:220 hppabsd-nat.c:134 +#: hppabsd-nat.c:164 hppanbsd-nat.c:172 hppanbsd-nat.c:202 i386bsd-nat.c:141 +#: i386bsd-nat.c:192 i386-linux-nat.c:266 i386-linux-nat.c:281 +#: m32r-linux-nat.c:115 m32r-linux-nat.c:164 m68kbsd-nat.c:121 +#: m68kbsd-nat.c:151 m68klinux-nat.c:263 m68klinux-nat.c:278 m88kbsd-nat.c:73 +#: m88kbsd-nat.c:89 mips64obsd-nat.c:87 mips64obsd-nat.c:103 +#: mips-linux-nat.c:235 mips-linux-nat.c:292 mipsnbsd-nat.c:53 +#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:92 ppcnbsd-nat.c:123 ppcobsd-nat.c:82 +#: ppcobsd-nat.c:118 s390-nat.c:247 s390-nat.c:264 shnbsd-nat.c:54 +#: shnbsd-nat.c:75 sparc-nat.c:172 sparc-nat.c:208 vaxbsd-nat.c:73 +#: vaxbsd-nat.c:89 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213 +msgid "Couldn't get registers" +msgstr "无法获取寄存器" + +#: alphabsd-nat.c:110 alphabsd-nat.c:147 amd64bsd-nat.c:66 amd64bsd-nat.c:105 +#: amd64-linux-nat.c:192 amd64-linux-nat.c:255 hppabsd-nat.c:145 +#: hppabsd-nat.c:179 hppanbsd-nat.c:183 hppanbsd-nat.c:217 i386bsd-nat.c:165 +#: i386bsd-nat.c:172 i386bsd-nat.c:228 i386-linux-nat.c:330 +#: i386-linux-nat.c:344 m68kbsd-nat.c:132 m68kbsd-nat.c:166 +#: m68klinux-nat.c:360 m68klinux-nat.c:374 mipsnbsd-nat.c:67 +#: mipsnbsd-nat.c:103 ppcobsd-nat.c:99 ppcobsd-nat.c:139 s390-nat.c:284 +#: s390-nat.c:301 sparc-nat.c:184 +msgid "Couldn't get floating point status" +msgstr "" + +#: alphabsd-nat.c:134 amd64bsd-nat.c:93 amd64-linux-nat.c:225 +#: hppabsd-nat.c:170 hppanbsd-nat.c:208 i386bsd-nat.c:198 i386-linux-nat.c:286 +#: m32r-linux-nat.c:169 m68kbsd-nat.c:157 m68klinux-nat.c:283 m88kbsd-nat.c:95 +#: mips64obsd-nat.c:109 mipsnbsd-nat.c:90 ppcnbsd-nat.c:130 ppcobsd-nat.c:129 +#: s390-nat.c:269 sparc-nat.c:213 vaxbsd-nat.c:95 xtensa-linux-nat.c:221 +msgid "Couldn't write registers" +msgstr "无法写寄存器" + +#: alphabsd-nat.c:153 amd64bsd-nat.c:111 amd64-linux-nat.c:260 +#: hppabsd-nat.c:185 hppanbsd-nat.c:223 i386bsd-nat.c:234 i386-linux-nat.c:349 +#: m68kbsd-nat.c:172 m68klinux-nat.c:379 mipsnbsd-nat.c:109 ppcobsd-nat.c:146 +#: s390-nat.c:306 +msgid "Couldn't write floating point status" +msgstr "" + #: alpha-nat.c:132 #, possible-c-format msgid "Register %s not found in core file." msgstr "在core文件中找不到寄存器%s" -#: alpha-tdep.c:262 +#: alpha-tdep.c:261 msgid "Cannot retrieve value from floating point register" msgstr "" -#: alpha-tdep.c:277 +#: alpha-tdep.c:276 msgid "Cannot store value in floating point register" msgstr "" -#: alpha-tdep.c:504 alpha-tdep.c:528 alpha-tdep.c:574 alpha-tdep.c:599 +#: alpha-tdep.c:503 alpha-tdep.c:527 alpha-tdep.c:573 alpha-tdep.c:598 msgid "unknown floating point width" msgstr "未知的浮点数宽度" #. FIXME: 128-bit long doubles are returned like structures: #. by writing into indirect storage provided by the caller #. as the first argument. -#: alpha-tdep.c:570 alpha-tdep.c:595 +#: alpha-tdep.c:569 alpha-tdep.c:594 msgid "Cannot set a 128-bit long double return value." msgstr "" -#: alpha-tdep.c:1013 +#: alpha-tdep.c:1100 #, possible-c-format msgid "" "Hit beginning of text section without finding enclosing function for address " "%s" msgstr "" -#: alpha-tdep.c:1016 +#: alpha-tdep.c:1103 #, possible-c-format msgid "" "Hit heuristic-fence-post without finding enclosing function for address %s" msgstr "" -#: alpha-tdep.c:1021 +#: alpha-tdep.c:1108 msgid "" "This warning occurs if you are debugging a function without any symbols\n" "(for example, in a stripped executable). In that case, you may wish to\n" @@ -1123,157 +1183,116 @@ "(more likely) you have encountered a bug in GDB.\n" msgstr "" -#: alpha-tdep.c:1793 mips-tdep.c:6552 +#: alpha-tdep.c:1883 mips-tdep.c:6523 msgid "Set the distance searched for the start of a function." msgstr "" -#: alpha-tdep.c:1794 mips-tdep.c:6553 +#: alpha-tdep.c:1884 mips-tdep.c:6524 msgid "Show the distance searched for the start of a function." msgstr "" -#: alpha-tdep.c:1795 mips-tdep.c:6554 +#: alpha-tdep.c:1885 mips-tdep.c:6525 msgid "" "If you are debugging a stripped executable, GDB needs to search through the\n" "program for the start of a function. This command sets the distance of the\n" "search. The only need to set it is when debugging a stripped executable." msgstr "" -#: alphabsd-nat.c:97 alphabsd-nat.c:129 amd64-linux-nat.c:166 -#: amd64-linux-nat.c:221 amd64bsd-nat.c:54 amd64bsd-nat.c:88 hppabsd-nat.c:135 -#: hppabsd-nat.c:165 hppanbsd-nat.c:172 hppanbsd-nat.c:202 -#: i386-linux-nat.c:267 i386-linux-nat.c:282 i386bsd-nat.c:142 -#: i386bsd-nat.c:193 m32r-linux-nat.c:116 m32r-linux-nat.c:165 -#: m68kbsd-nat.c:122 m68kbsd-nat.c:152 m68klinux-nat.c:264 m68klinux-nat.c:279 -#: m88kbsd-nat.c:74 m88kbsd-nat.c:90 mips-linux-nat.c:236 mips-linux-nat.c:293 -#: mips64obsd-nat.c:88 mips64obsd-nat.c:104 mipsnbsd-nat.c:53 -#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:93 ppcnbsd-nat.c:124 ppcobsd-nat.c:83 -#: ppcobsd-nat.c:119 s390-nat.c:148 s390-nat.c:165 shnbsd-nat.c:55 -#: shnbsd-nat.c:76 sparc-nat.c:171 sparc-nat.c:207 vaxbsd-nat.c:74 -#: vaxbsd-nat.c:90 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213 -msgid "Couldn't get registers" -msgstr "无法获取寄存器" - -#: alphabsd-nat.c:111 alphabsd-nat.c:148 amd64-linux-nat.c:193 -#: amd64-linux-nat.c:256 amd64bsd-nat.c:67 amd64bsd-nat.c:106 -#: hppabsd-nat.c:146 hppabsd-nat.c:180 hppanbsd-nat.c:183 hppanbsd-nat.c:217 -#: i386-linux-nat.c:331 i386-linux-nat.c:345 i386bsd-nat.c:166 -#: i386bsd-nat.c:173 i386bsd-nat.c:229 m68kbsd-nat.c:133 m68kbsd-nat.c:167 -#: m68klinux-nat.c:361 m68klinux-nat.c:375 mipsnbsd-nat.c:67 -#: mipsnbsd-nat.c:103 ppcobsd-nat.c:100 ppcobsd-nat.c:140 s390-nat.c:185 -#: s390-nat.c:202 sparc-nat.c:183 -msgid "Couldn't get floating point status" +#: amd64fbsd-nat.c:187 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n" +"Please report this to ." msgstr "" -#: alphabsd-nat.c:135 amd64-linux-nat.c:226 amd64bsd-nat.c:94 -#: hppabsd-nat.c:171 hppanbsd-nat.c:208 i386-linux-nat.c:287 i386bsd-nat.c:199 -#: m32r-linux-nat.c:170 m68kbsd-nat.c:158 m68klinux-nat.c:284 m88kbsd-nat.c:96 -#: mips64obsd-nat.c:110 mipsnbsd-nat.c:90 ppcnbsd-nat.c:131 ppcobsd-nat.c:130 -#: s390-nat.c:170 sparc-nat.c:212 vaxbsd-nat.c:96 xtensa-linux-nat.c:221 -msgid "Couldn't write registers" -msgstr "无法写寄存器" +#: amd64fbsd-nat.c:200 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n" +"Please report this to ." +msgstr "" -#: alphabsd-nat.c:154 amd64-linux-nat.c:261 amd64bsd-nat.c:112 -#: hppabsd-nat.c:186 hppanbsd-nat.c:223 i386-linux-nat.c:350 i386bsd-nat.c:235 -#: m68kbsd-nat.c:173 m68klinux-nat.c:380 mipsnbsd-nat.c:109 ppcobsd-nat.c:147 -#: s390-nat.c:207 -msgid "Couldn't write floating point status" +#: amd64fbsd-nat.c:213 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n" +"Please report this to ." msgstr "" -#: amd64-linux-nat.c:186 amd64-linux-nat.c:245 +#: amd64-linux-nat.c:185 amd64-linux-nat.c:244 msgid "Couldn't get extended state status" msgstr "" -#: amd64-linux-nat.c:251 i386-linux-nat.c:416 +#: amd64-linux-nat.c:250 i386-linux-nat.c:415 msgid "Couldn't write extended state status" msgstr "" -#: amd64-linux-nat.c:290 i386-linux-nat.c:678 +#: amd64-linux-nat.c:283 i386-linux-nat.c:671 msgid "Couldn't read debug register" msgstr "无法读取调试寄存器" -#: amd64-linux-nat.c:313 i386-linux-nat.c:701 mips-linux-nat.c:881 -#: mips-linux-nat.c:899 +#: amd64-linux-nat.c:303 i386-linux-nat.c:691 mips-linux-nat.c:879 +#: mips-linux-nat.c:897 msgid "Couldn't write debug register" msgstr "无法向调试寄存器写入" -#: amd64-linux-nat.c:733 +#: amd64-linux-nat.c:720 msgid "Couldn't get CS register" msgstr "" -#: amd64-linux-tdep.c:1202 i386-linux-tdep.c:434 +#: amd64-linux-tdep.c:1201 i386-linux-tdep.c:433 #, possible-c-format msgid "Process record and replay target doesn't support syscall number %s\n" msgstr "" -#: amd64-tdep.c:188 avr-tdep.c:1344 cris-tdep.c:1852 s390-tdep.c:159 +#: amd64-tdep.c:190 avr-tdep.c:1343 cris-tdep.c:1851 s390-tdep.c:193 #, possible-c-format msgid "Unmapped DWARF Register #%d encountered." msgstr "" #. We shouldn't get here. -#: amd64-tdep.c:1091 +#: amd64-tdep.c:1107 msgid "unable to find free reg" msgstr "" -#: amd64fbsd-nat.c:188 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: amd64fbsd-nat.c:201 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: amd64fbsd-nat.c:214 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: arch-utils.c:215 m32c-tdep.c:2599 m32c-tdep.c:2620 +#: arch-utils.c:214 m32c-tdep.c:2598 m32c-tdep.c:2619 msgid "No virtual frame pointer available" msgstr "" -#: arch-utils.c:278 +#: arch-utils.c:277 msgid "The target endianness is set automatically (currently big endian)\n" msgstr "" -#: arch-utils.c:281 +#: arch-utils.c:280 msgid "" "The target endianness is set automatically (currently little endian)\n" msgstr "" -#: arch-utils.c:286 +#: arch-utils.c:285 msgid "The target is assumed to be big endian\n" msgstr "" -#: arch-utils.c:289 +#: arch-utils.c:288 msgid "The target is assumed to be little endian\n" msgstr "" -#: arch-utils.c:304 +#: arch-utils.c:303 msgid "set_endian: architecture update failed" msgstr "" -#: arch-utils.c:310 +#: arch-utils.c:309 msgid "Little endian target not supported by GDB\n" msgstr "" -#: arch-utils.c:318 +#: arch-utils.c:317 msgid "Big endian target not supported by GDB\n" msgstr "" -#: arch-utils.c:324 +#: arch-utils.c:323 msgid "set_endian: bad value" msgstr "set_endian: 无效的值" -#: arch-utils.c:383 +#: arch-utils.c:382 #, possible-c-format msgid "" "Selected architecture %s is not compatible with reported target architecture " @@ -1282,303 +1301,358 @@ #. We have no idea which one is better. This is a bug, but not #. a critical problem; warn the user. -#: arch-utils.c:407 +#: arch-utils.c:406 #, possible-c-format msgid "" "Selected architecture %s is ambiguous with reported target architecture %s" msgstr "" -#: arch-utils.c:438 +#: arch-utils.c:437 #, possible-c-format msgid "The target architecture is set automatically (currently %s)\n" msgstr "" -#: arch-utils.c:442 +#: arch-utils.c:441 #, possible-c-format msgid "The target architecture is assumed to be %s\n" msgstr "" -#: arch-utils.c:462 +#: arch-utils.c:461 msgid "could not select an architecture automatically" msgstr "" -#: arch-utils.c:469 +#: arch-utils.c:468 msgid "set_architecture: bfd_scan_arch failed" msgstr "" -#: arch-utils.c:473 +#: arch-utils.c:472 #, possible-c-format msgid "Architecture `%s' not recognized.\n" msgstr "" -#: arch-utils.c:558 +#: arch-utils.c:557 msgid "Architecture of file not recognized." msgstr "" -#: arch-utils.c:605 +#: arch-utils.c:604 msgid "initialize_current_architecture: No arch" msgstr "" -#: arch-utils.c:609 +#: arch-utils.c:608 msgid "initialize_current_architecture: Arch not found" msgstr "" -#: arch-utils.c:652 +#: arch-utils.c:651 msgid "" "initialize_current_architecture: Selection of initial architecture failed" msgstr "" -#: arch-utils.c:666 +#: arch-utils.c:665 msgid "Set architecture of target." msgstr "" -#: arch-utils.c:667 +#: arch-utils.c:666 msgid "Show architecture of target." msgstr "" -#: arch-utils.c:799 +#: arch-utils.c:793 +msgid "This architecture has no method to collect a return address." +msgstr "" + +#: arch-utils.c:806 msgid "Set endianness of target." msgstr "" -#: arch-utils.c:800 +#: arch-utils.c:807 msgid "Show endianness of target." msgstr "" -#: arm-linux-nat.c:108 +#: arm-linux-nat.c:107 msgid "Unable to fetch floating point register." msgstr "" -#: arm-linux-nat.c:138 arm-linux-nat.c:167 arm-linux-nat.c:204 +#: arm-linux-nat.c:137 arm-linux-nat.c:166 arm-linux-nat.c:203 msgid "Unable to fetch the floating point registers." msgstr "" -#: arm-linux-nat.c:183 +#: arm-linux-nat.c:182 msgid "Unable to store floating point register." msgstr "" -#: arm-linux-nat.c:220 +#: arm-linux-nat.c:219 msgid "Unable to store floating point registers." msgstr "" -#: arm-linux-nat.c:240 +#: arm-linux-nat.c:239 msgid "Unable to fetch general register." msgstr "" -#: arm-linux-nat.c:282 arm-linux-nat.c:321 arm-linux-nat.c:355 +#: arm-linux-nat.c:281 arm-linux-nat.c:320 arm-linux-nat.c:354 msgid "Unable to fetch general registers." msgstr "" -#: arm-linux-nat.c:337 +#: arm-linux-nat.c:336 msgid "Unable to store general register." msgstr "" -#: arm-linux-nat.c:373 +#: arm-linux-nat.c:372 msgid "Unable to store general registers." msgstr "" -#: arm-linux-nat.c:395 arm-linux-nat.c:424 +#: arm-linux-nat.c:394 arm-linux-nat.c:423 msgid "Unable to fetch WMMX registers." msgstr "" -#: arm-linux-nat.c:450 +#: arm-linux-nat.c:449 msgid "Unable to store WMMX registers." msgstr "" -#: arm-linux-nat.c:472 +#: arm-linux-nat.c:471 msgid "Unable to fetch VFP registers." msgstr "" -#: arm-linux-nat.c:496 +#: arm-linux-nat.c:495 msgid "Unable to fetch VFP registers (for update)." msgstr "" -#: arm-linux-nat.c:511 +#: arm-linux-nat.c:510 msgid "Unable to store VFP registers." msgstr "" -#: arm-linux-nat.c:980 +#: arm-linux-nat.c:979 msgid "Unexpected error setting breakpoint address" msgstr "" -#: arm-linux-nat.c:983 +#: arm-linux-nat.c:982 msgid "Unexpected error setting breakpoint" msgstr "" -#: arm-linux-nat.c:1025 +#: arm-linux-nat.c:1024 msgid "Unexpected error clearing breakpoint" msgstr "" -#: arm-linux-tdep.c:1109 +#: arm-linux-tdep.c:1103 msgid "arm_linux_init_abi: Floating point model not supported" msgstr "" +#: armnbsd-nat.c:88 +msgid "unable to fetch general register" +msgstr "" + +#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227 +msgid "unable to fetch general registers" +msgstr "" + +#: armnbsd-nat.c:159 +msgid "unable to fetch floating-point register" +msgstr "" + +#: armnbsd-nat.c:289 armnbsd-nat.c:372 +#, possible-c-format +msgid "unable to write register %d to inferior" +msgstr "" + +#: armnbsd-nat.c:337 +msgid "unable to store general registers" +msgstr "" + +#: armnbsd-nat.c:351 +msgid "unable to fetch floating-point registers" +msgstr "" + +#: armnbsd-nat.c:394 +msgid "unable to store floating-point registers" +msgstr "" + +#: armnbsd-nat.c:446 +msgid "wrong size of register set in core file" +msgstr "" + +#: armnbsd-nat.c:458 +msgid "wrong size of FPA register set in core file" +msgstr "" + +#: armnbsd-tdep.c:64 arm-tdep.c:10079 +msgid "arm_gdbarch_init: bad byte order for float format" +msgstr "" + #. multiply -#: arm-tdep.c:1579 arm-tdep.c:4623 arm-tdep.c:4644 arm-tdep.c:4759 +#: arm-tdep.c:1574 arm-tdep.c:4608 arm-tdep.c:4629 arm-tdep.c:4744 msgid "Invalid update to pc in instruction" msgstr "" -#: arm-tdep.c:1649 +#: arm-tdep.c:1644 msgid "bad value in switch" msgstr "" -#: arm-tdep.c:3017 +#: arm-tdep.c:3007 #, possible-c-format msgid "Unexpected register %d" msgstr "" #. Should never happen. -#: arm-tdep.c:3284 +#: arm-tdep.c:3274 msgid "unknown type alignment" msgstr "" -#: arm-tdep.c:3345 arm-tdep.c:3367 +#: arm-tdep.c:3335 arm-tdep.c:3357 #, possible-c-format msgid "Invalid VFP CPRC type: %d." msgstr "" -#: arm-tdep.c:3801 +#: arm-tdep.c:3791 #, c-format msgid "Hardware FPU type %d\n" msgstr "" -#: arm-tdep.c:3803 +#: arm-tdep.c:3793 #, c-format msgid "Software FPU type %d\n" msgstr "" #. i18n: [floating point unit] mask -#: arm-tdep.c:3805 +#: arm-tdep.c:3795 msgid "mask: " msgstr "" #. i18n: [floating point unit] flags -#: arm-tdep.c:3808 +#: arm-tdep.c:3798 msgid "flags: " msgstr "" -#: arm-tdep.c:4037 +#: arm-tdep.c:4027 #, possible-c-format msgid "Bad REGNUM %d" msgstr "" -#: arm-tdep.c:4844 +#: arm-tdep.c:4828 msgid "Bad bit-field extraction\n" msgstr "" -#: arm-tdep.c:4865 arm-tdep.c:4871 +#: arm-tdep.c:4849 arm-tdep.c:4855 msgid "Infinite loop detected" msgstr "" #. Unpredictable behaviour. Try to do something sensible (switch to ARM #. mode, align dest to 4 bytes). -#: arm-tdep.c:5440 +#: arm-tdep.c:5425 msgid "Single-stepping BX to non-word-aligned ARM instruction." msgstr "" -#: arm-tdep.c:5502 +#: arm-tdep.c:5487 msgid "Instruction wrote to PC in an unexpected way when single-stepping" msgstr "" -#: arm-tdep.c:5508 +#: arm-tdep.c:5493 msgid "Invalid argument to displaced_write_reg" msgstr "" -#: arm-tdep.c:6099 +#: arm-tdep.c:6454 msgid "copy_extra_ld_st: instruction decode error" msgstr "" -#: arm-tdep.c:6292 +#: arm-tdep.c:6768 msgid "Cannot single-step exception return" msgstr "" -#: arm-tdep.c:6412 +#: arm-tdep.c:6888 #, possible-c-format msgid "displaced: LDM: move loaded register r%d to r%d\n" msgstr "" -#: arm-tdep.c:6417 +#: arm-tdep.c:6893 #, possible-c-format msgid "displaced: LDM: register r%d already in the right place\n" msgstr "" -#: arm-tdep.c:6437 +#: arm-tdep.c:6913 #, possible-c-format msgid "displaced: LDM: restored clobbered register r%d\n" msgstr "" -#: arm-tdep.c:6479 +#: arm-tdep.c:6956 arm-tdep.c:7067 msgid "displaced: Unpredictable LDM or STM with base register r15" msgstr "" -#: arm-tdep.c:6548 +#: arm-tdep.c:7025 arm-tdep.c:7111 #, possible-c-format msgid "" "displaced: LDM r%d%s, {..., pc}: original reg list %.4x, modified list %.4x\n" msgstr "" -#: arm-tdep.c:7076 -msgid "Displaced stepping is only supported in ARM mode" +#: arm-tdep.c:8070 +#, possible-c-format +msgid "" +"displaced: POP {..., pc}: original reg list %.4x, modified list %.4x\n" +msgstr "" + +#: arm-tdep.c:8187 +msgid "thumb_process_displaced_16bit_insn: Instruction decode error" msgstr "" -#: arm-tdep.c:7134 +#: arm-tdep.c:8395 +msgid "thumb_process_displaced_32bit_insn: Instruction decode error" +msgstr "" + +#: arm-tdep.c:8479 msgid "arm_process_displaced_insn: Instruction decode error" msgstr "" -#: arm-tdep.c:7411 +#: arm-tdep.c:8756 msgid "arm_extract_return_value: Floating point model not supported" msgstr "" -#: arm-tdep.c:7602 +#: arm-tdep.c:8947 msgid "arm_store_return_value: Floating point model not supported" msgstr "" -#: arm-tdep.c:7825 +#: arm-tdep.c:9176 msgid "\"set arm\" must be followed by an apporpriate subcommand.\n" msgstr "" -#: arm-tdep.c:7849 rs6000-tdep.c:4204 rs6000-tdep.c:4231 +#: arm-tdep.c:9200 rs6000-tdep.c:4202 rs6000-tdep.c:4229 msgid "could not update architecture" msgstr "" -#: arm-tdep.c:7866 +#: arm-tdep.c:9217 #, possible-c-format msgid "Invalid fp model accepted: %s." msgstr "" -#: arm-tdep.c:7880 +#: arm-tdep.c:9231 #, possible-c-format msgid "" "The current ARM floating point model is \"auto\" (currently \"%s\").\n" msgstr "" -#: arm-tdep.c:7884 +#: arm-tdep.c:9235 #, possible-c-format msgid "The current ARM floating point model is \"%s\".\n" msgstr "" -#: arm-tdep.c:7903 +#: arm-tdep.c:9254 #, possible-c-format msgid "Invalid ABI accepted: %s." msgstr "" -#: arm-tdep.c:7917 +#: arm-tdep.c:9268 #, possible-c-format msgid "The current ARM ABI is \"auto\" (currently \"%s\").\n" msgstr "" -#: arm-tdep.c:7921 +#: arm-tdep.c:9272 #, possible-c-format msgid "The current ARM ABI is \"%s\".\n" msgstr "" -#: arm-tdep.c:7932 +#: arm-tdep.c:9283 #, possible-c-format msgid "" "The current execution mode assumed (when symbols are unavailable) is " "\"%s\".\n" msgstr "" -#: arm-tdep.c:7944 +#: arm-tdep.c:9295 #, possible-c-format msgid "" "The current execution mode assumed (even when symbols are available) is " @@ -1586,61 +1660,57 @@ msgstr "" #. Leave it as "auto". -#: arm-tdep.c:8428 +#: arm-tdep.c:9779 #, possible-c-format msgid "unknown ARM EABI version 0x%x" msgstr "" -#: arm-tdep.c:8728 armnbsd-tdep.c:65 -msgid "arm_gdbarch_init: bad byte order for float format" -msgstr "" - -#: arm-tdep.c:8906 +#: arm-tdep.c:10257 #, possible-c-format msgid "arm_dump_tdep: Lowest pc = 0x%lx" msgstr "" -#: arm-tdep.c:8953 arm-tdep.c:8957 +#: arm-tdep.c:10304 arm-tdep.c:10308 msgid "Various ARM-specific commands." msgstr "" -#: arm-tdep.c:8988 +#: arm-tdep.c:10339 msgid "The valid values are:\n" msgstr "" -#: arm-tdep.c:8990 +#: arm-tdep.c:10341 msgid "The default is \"std\"." msgstr "" -#: arm-tdep.c:8996 +#: arm-tdep.c:10347 msgid "Set the disassembly style." msgstr "" -#: arm-tdep.c:8997 +#: arm-tdep.c:10348 msgid "Show the disassembly style." msgstr "" -#: arm-tdep.c:9005 +#: arm-tdep.c:10356 msgid "Set usage of ARM 32-bit mode." msgstr "" -#: arm-tdep.c:9006 +#: arm-tdep.c:10357 msgid "Show usage of ARM 32-bit mode." msgstr "" -#: arm-tdep.c:9007 +#: arm-tdep.c:10358 msgid "When off, a 26-bit PC will be used." msgstr "" -#: arm-tdep.c:9015 +#: arm-tdep.c:10366 msgid "Set the floating point type." msgstr "" -#: arm-tdep.c:9016 +#: arm-tdep.c:10367 msgid "Show the floating point type." msgstr "" -#: arm-tdep.c:9017 +#: arm-tdep.c:10368 msgid "" "auto - Determine the FP typefrom the OS-ABI.\n" "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" @@ -1649,606 +1719,569 @@ "vfp - VFP co-processor." msgstr "" -#: arm-tdep.c:9027 +#: arm-tdep.c:10378 msgid "Set the ABI." msgstr "" -#: arm-tdep.c:9028 +#: arm-tdep.c:10379 msgid "Show the ABI." msgstr "" -#: arm-tdep.c:9036 +#: arm-tdep.c:10387 msgid "Set the mode assumed when symbols are unavailable." msgstr "" -#: arm-tdep.c:9037 +#: arm-tdep.c:10388 msgid "Show the mode assumed when symbols are unavailable." msgstr "" -#: arm-tdep.c:9042 +#: arm-tdep.c:10393 msgid "Set the mode assumed even when symbols are available." msgstr "" -#: arm-tdep.c:9043 +#: arm-tdep.c:10394 msgid "Show the mode assumed even when symbols are available." msgstr "" -#: arm-tdep.c:9049 +#: arm-tdep.c:10400 msgid "Set ARM debugging." msgstr "" -#: arm-tdep.c:9050 +#: arm-tdep.c:10401 msgid "Show ARM debugging." msgstr "" -#: arm-tdep.c:9051 +#: arm-tdep.c:10402 msgid "When on, arm-specific debugging is enabled." msgstr "" -#: armnbsd-nat.c:88 -msgid "unable to fetch general register" -msgstr "" - -#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227 -msgid "unable to fetch general registers" -msgstr "" - -#: armnbsd-nat.c:159 -msgid "unable to fetch floating-point register" -msgstr "" - -#: armnbsd-nat.c:289 armnbsd-nat.c:372 -#, possible-c-format -msgid "unable to write register %d to inferior" -msgstr "" - -#: armnbsd-nat.c:337 -msgid "unable to store general registers" -msgstr "" - -#: armnbsd-nat.c:351 -msgid "unable to fetch floating-point registers" -msgstr "" - -#: armnbsd-nat.c:394 -msgid "unable to store floating-point registers" -msgstr "" - -#: armnbsd-nat.c:446 -msgid "wrong size of register set in core file" -msgstr "" - -#: armnbsd-nat.c:458 -msgid "wrong size of FPA register set in core file" -msgstr "" - -#: auxv.c:342 +#: auxv.c:419 msgid "End of vector" msgstr "" -#: auxv.c:343 auxv.c:364 +#: auxv.c:420 auxv.c:441 msgid "Entry should be ignored" msgstr "" -#: auxv.c:344 +#: auxv.c:421 msgid "File descriptor of program" msgstr "" -#: auxv.c:345 +#: auxv.c:422 msgid "Program headers for program" msgstr "" -#: auxv.c:346 +#: auxv.c:423 msgid "Size of program header entry" msgstr "" -#: auxv.c:347 +#: auxv.c:424 msgid "Number of program headers" msgstr "" -#: auxv.c:348 +#: auxv.c:425 msgid "System page size" msgstr "" -#: auxv.c:349 +#: auxv.c:426 msgid "Base address of interpreter" msgstr "" -#: auxv.c:350 +#: auxv.c:427 msgid "Flags" msgstr "标记" -#: auxv.c:351 +#: auxv.c:428 msgid "Entry point of program" msgstr "" -#: auxv.c:352 +#: auxv.c:429 msgid "Program is not ELF" msgstr "" -#: auxv.c:353 auxv.c:372 +#: auxv.c:430 auxv.c:449 msgid "Real user ID" msgstr "真正用户id号" -#: auxv.c:354 auxv.c:371 +#: auxv.c:431 auxv.c:448 msgid "Effective user ID" msgstr "" -#: auxv.c:355 auxv.c:374 +#: auxv.c:432 auxv.c:451 msgid "Real group ID" msgstr "" -#: auxv.c:356 auxv.c:373 +#: auxv.c:433 auxv.c:450 msgid "Effective group ID" msgstr "" -#: auxv.c:357 +#: auxv.c:434 msgid "Frequency of times()" msgstr "" -#: auxv.c:358 +#: auxv.c:435 msgid "String identifying platform" msgstr "" -#: auxv.c:359 auxv.c:380 +#: auxv.c:436 auxv.c:457 msgid "Machine-dependent CPU capability hints" msgstr "" -#: auxv.c:360 +#: auxv.c:437 msgid "Used FPU control word" msgstr "" -#: auxv.c:361 +#: auxv.c:438 msgid "Data cache block size" msgstr "" -#: auxv.c:362 +#: auxv.c:439 msgid "Instruction cache block size" msgstr "" -#: auxv.c:363 +#: auxv.c:440 msgid "Unified cache block size" msgstr "" -#: auxv.c:365 +#: auxv.c:442 msgid "String identifying base platform" msgstr "" -#: auxv.c:366 +#: auxv.c:443 msgid "Address of 16 random bytes" msgstr "" -#: auxv.c:367 +#: auxv.c:444 msgid "File name of executable" msgstr "" -#: auxv.c:368 +#: auxv.c:445 msgid "Boolean, was exec setuid-like?" msgstr "" -#: auxv.c:369 +#: auxv.c:446 msgid "Special system info/entry points" msgstr "" -#: auxv.c:370 +#: auxv.c:447 msgid "System-supplied DSO's ELF header" msgstr "" -#: auxv.c:375 +#: auxv.c:452 msgid "Dynamic linker's ELF header" msgstr "" -#: auxv.c:376 +#: auxv.c:453 msgid "Dynamic linker's section headers" msgstr "" -#: auxv.c:377 +#: auxv.c:454 msgid "String giving name of dynamic linker" msgstr "" -#: auxv.c:378 +#: auxv.c:455 msgid "Large pagesize" msgstr "" -#: auxv.c:379 +#: auxv.c:456 msgid "Platform name string" msgstr "" -#: auxv.c:381 +#: auxv.c:458 msgid "Should flush icache?" msgstr "" -#: auxv.c:382 +#: auxv.c:459 msgid "CPU name string" msgstr "" -#: auxv.c:383 +#: auxv.c:460 msgid "COFF entry point address" msgstr "" -#: auxv.c:384 +#: auxv.c:461 msgid "COFF executable file descriptor" msgstr "" -#: auxv.c:386 +#: auxv.c:463 msgid "Canonicalized file name given to execve" msgstr "" -#: auxv.c:387 +#: auxv.c:464 msgid "String for name of MMU module" msgstr "" -#: auxv.c:388 +#: auxv.c:465 msgid "Dynamic linker's data segment address" msgstr "" -#: auxv.c:390 +#: auxv.c:467 msgid "AF_SUN_ flags passed from the kernel" msgstr "" -#: auxv.c:430 +#: auxv.c:505 msgid "The program has no auxiliary information now." msgstr "" -#: auxv.c:436 +#: auxv.c:511 msgid "No auxiliary vector found, or failed reading it." msgstr "" -#: auxv.c:438 +#: auxv.c:513 msgid "Auxiliary vector is empty." msgstr "" -#: auxv.c:449 +#: auxv.c:524 msgid "" "Display the inferior's auxiliary vector.\n" "This is information provided by the operating system at program startup." msgstr "" -#: avr-tdep.c:374 avr-tdep.c:392 i386-tdep.c:276 i386-tdep.c:2624 -#: i386-tdep.c:2714 i386-tdep.c:2783 s390-tdep.c:197 s390-tdep.c:216 -#: s390-tdep.c:279 s390-tdep.c:328 sparc64-tdep.c:320 spu-tdep.c:180 -#: spu-tdep.c:248 spu-tdep.c:309 +#: avr-tdep.c:373 avr-tdep.c:391 i386-tdep.c:277 i386-tdep.c:2790 +#: i386-tdep.c:2894 i386-tdep.c:2977 s390-tdep.c:231 s390-tdep.c:250 +#: s390-tdep.c:313 s390-tdep.c:362 sparc64-tdep.c:339 spu-tdep.c:179 +#: spu-tdep.c:247 spu-tdep.c:308 msgid "invalid regnum" msgstr "" -#: avr-tdep.c:635 +#: avr-tdep.c:634 #, possible-c-format msgid "Num pushes too large: %d\n" msgstr "" -#: avr-tdep.c:1486 +#: avr-tdep.c:1485 msgid "ERR: info io_registers NOT supported by current target\n" msgstr "" -#: avr-tdep.c:1494 +#: avr-tdep.c:1493 msgid "Error fetching number of io registers\n" msgstr "" -#: avr-tdep.c:1503 +#: avr-tdep.c:1502 #, possible-c-format msgid "" "Target has %u io registers:\n" "\n" msgstr "" -#: avr-tdep.c:1552 +#: avr-tdep.c:1551 msgid "query remote avr target for io space register values" msgstr "" -#: ax-gdb.c:508 +#: ax-gdb.c:549 msgid "gen_fetch: strange size" msgstr "" -#: ax-gdb.c:520 +#: ax-gdb.c:561 msgid "gen_fetch: bad type code" msgstr "" -#: ax-gdb.c:637 +#: ax-gdb.c:678 msgid "gen_var_ref: LOC_CONST_BYTES symbols are not supported" msgstr "" -#: ax-gdb.c:669 +#: ax-gdb.c:710 #, possible-c-format msgid "Cannot compute value of typedef `%s'." msgstr "" -#: ax-gdb.c:701 +#: ax-gdb.c:742 #, possible-c-format msgid "Couldn't resolve symbol `%s'." msgstr "" -#: ax-gdb.c:725 +#: ax-gdb.c:766 #, possible-c-format msgid "Cannot find value of botched symbol `%s'." msgstr "" -#: ax-gdb.c:761 +#: ax-gdb.c:802 msgid "Value not scalar: cannot be an rvalue." msgstr "" -#: ax-gdb.c:1006 +#: ax-gdb.c:1047 msgid "Invalid type cast: intended type must be scalar." msgstr "" -#: ax-gdb.c:1029 +#: ax-gdb.c:1070 msgid "Casts to requested type are not yet implemented." msgstr "" -#: ax-gdb.c:1097 +#: ax-gdb.c:1138 msgid "" "First argument of `-' is a pointer, but second argument is neither\n" "an integer nor a pointer of the same type." msgstr "" -#: ax-gdb.c:1150 +#: ax-gdb.c:1191 #, possible-c-format msgid "Invalid combination of types in %s." msgstr "" -#: ax-gdb.c:1167 +#: ax-gdb.c:1208 msgid "Invalid type of operand to `!'." msgstr "" -#: ax-gdb.c:1178 +#: ax-gdb.c:1219 msgid "Invalid type of operand to `~'." msgstr "" -#: ax-gdb.c:1196 +#: ax-gdb.c:1237 msgid "gen_deref: expected a pointer" msgstr "" -#: ax-gdb.c:1205 valops.c:926 +#: ax-gdb.c:1246 valops.c:926 msgid "Attempt to dereference a generic pointer." msgstr "" -#: ax-gdb.c:1226 +#: ax-gdb.c:1267 msgid "Operand of `&' is an rvalue, which has no address." msgstr "" -#: ax-gdb.c:1229 +#: ax-gdb.c:1270 msgid "Operand of `&' is in a register, and has no address." msgstr "" -#: ax-gdb.c:1301 +#: ax-gdb.c:1342 msgid "gen_bitfield_ref: bitfield too wide" msgstr "" -#: ax-gdb.c:1453 ax-gdb.c:1595 +#: ax-gdb.c:1494 ax-gdb.c:1636 #, possible-c-format msgid "static field `%s' has been optimized out, cannot use" msgstr "" -#: ax-gdb.c:1465 +#: ax-gdb.c:1506 msgid "find_field: anonymous unions not supported" msgstr "" -#: ax-gdb.c:1513 +#: ax-gdb.c:1554 #, possible-c-format msgid "The left operand of `%s' is not a %s." msgstr "" -#: ax-gdb.c:1519 +#: ax-gdb.c:1560 msgid "Structure does not live in memory." msgstr "" -#: ax-gdb.c:1525 +#: ax-gdb.c:1566 #, possible-c-format msgid "Couldn't find member named `%s' in struct/union/class `%s'" msgstr "" -#: ax-gdb.c:1583 +#: ax-gdb.c:1624 msgid "non-aggregate type to gen_struct_elt_for_reference" msgstr "" -#: ax-gdb.c:1601 valops.c:3279 +#: ax-gdb.c:1642 valops.c:3298 msgid "pointers to bitfield members not allowed" msgstr "" #. FIXME we need a way to do "want_address" equivalent -#: ax-gdb.c:1605 valops.c:3288 +#: ax-gdb.c:1646 valops.c:3307 #, possible-c-format msgid "Cannot reference non-static field \"%s\"" msgstr "" -#: ax-gdb.c:1626 eval.c:1574 valops.c:3463 +#: ax-gdb.c:1667 eval.c:1593 valops.c:3482 #, possible-c-format msgid "No symbol \"%s\" in namespace \"%s\"." msgstr "标识符 \"%s\" 在名字空间 \"%s\" 中不存在。" -#: ax-gdb.c:1656 ax-gdb.c:1974 ax-gdb.c:2157 +#: ax-gdb.c:1697 ax-gdb.c:2015 ax-gdb.c:2197 #, possible-c-format msgid "`%s' has been optimized out, cannot use" msgstr "" -#: ax-gdb.c:1680 +#: ax-gdb.c:1721 msgid "non-aggregate type in gen_aggregate_elt_ref" msgstr "" -#: ax-gdb.c:1707 +#: ax-gdb.c:1748 msgid "Left operand of `@' must be an object in memory." msgstr "" -#: ax-gdb.c:1715 +#: ax-gdb.c:1756 msgid "Right operand of `@' must be a constant, in agent expressions." msgstr "" -#: ax-gdb.c:1718 +#: ax-gdb.c:1759 msgid "Right operand of `@' must be an integer." msgstr "" -#: ax-gdb.c:1721 +#: ax-gdb.c:1762 msgid "Right operand of `@' must be positive." msgstr "" -#: ax-gdb.c:1900 ax-gdb.c:1936 +#: ax-gdb.c:1941 ax-gdb.c:1977 #, possible-c-format msgid "$%s is not a trace state variable, may not assign to it" msgstr "" -#: ax-gdb.c:1904 ax-gdb.c:1940 +#: ax-gdb.c:1945 ax-gdb.c:1981 msgid "May only assign to trace state variables" msgstr "" -#: ax-gdb.c:1989 tracepoint.c:1370 +#: ax-gdb.c:2030 tracepoint.c:1468 #, possible-c-format msgid "Register $%s not available" msgstr "" -#: ax-gdb.c:1993 +#: ax-gdb.c:2034 #, possible-c-format msgid "'%s' is a user-register; GDB cannot yet trace user-register contents." msgstr "" -#: ax-gdb.c:2019 +#: ax-gdb.c:2060 #, possible-c-format msgid "" "$%s is not a trace state variable; GDB agent expressions cannot use " "convenience variables." msgstr "" -#: ax-gdb.c:2098 +#: ax-gdb.c:2139 msgid "Argument of unary `*' is not a pointer." msgstr "" -#: ax-gdb.c:2134 +#: ax-gdb.c:2175 msgid "gen_expr: unhandled struct case" msgstr "" -#: ax-gdb.c:2152 +#: ax-gdb.c:2192 #, possible-c-format msgid "no `%s' found" msgstr "" -#: ax-gdb.c:2174 eval.c:808 eval.c:2952 +#: ax-gdb.c:2214 eval.c:806 eval.c:2949 #, possible-c-format msgid "There is no field named %s" msgstr "" -#: ax-gdb.c:2180 +#: ax-gdb.c:2220 msgid "Attempt to use a type name as an expression." msgstr "" -#: ax-gdb.c:2183 +#: ax-gdb.c:2223 #, possible-c-format msgid "Unsupported operator %s (%d) in expression." msgstr "" -#: ax-gdb.c:2259 +#: ax-gdb.c:2299 msgid "cannot subscript requested type: cannot call user defined functions" msgstr "" -#: ax-gdb.c:2272 eval.c:2246 eval.c:2301 eval.c:2331 jv-lang.c:981 +#: ax-gdb.c:2312 eval.c:2247 eval.c:2302 eval.c:2332 jv-lang.c:989 #: m2-lang.c:265 #, possible-c-format msgid "cannot subscript something of type `%s'" msgstr "" -#: ax-gdb.c:2275 eval.c:2249 eval.c:2334 jv-lang.c:983 m2-lang.c:268 +#: ax-gdb.c:2315 eval.c:2250 eval.c:2335 jv-lang.c:991 m2-lang.c:268 msgid "cannot subscript requested type" msgstr "" -#: ax-gdb.c:2280 valarith.c:960 +#: ax-gdb.c:2320 valarith.c:952 msgid "Argument to arithmetic operation not a number or boolean." msgstr "" -#: ax-gdb.c:2335 +#: ax-gdb.c:2375 msgid "gen_expr: op case sets don't match" msgstr "" -#: ax-gdb.c:2461 ax-gdb.c:2497 +#: ax-gdb.c:2527 ax-gdb.c:2579 msgid "GDB can't do agent expression translation with overlays." msgstr "" -#: ax-gdb.c:2464 ax-gdb.c:2500 +#: ax-gdb.c:2530 ax-gdb.c:2582 msgid "expression to translate" msgstr "" -#: ax-gdb.c:2524 +#: ax-gdb.c:2606 msgid "Translate an expression into remote agent bytecode for tracing." msgstr "" -#: ax-gdb.c:2529 +#: ax-gdb.c:2611 msgid "Translate an expression into remote agent bytecode for evaluation." msgstr "" -#: ax-general.c:129 +#: ax-general.c:128 msgid "GDB bug: ax-general.c (read_const): incomplete constant" msgstr "" -#: ax-general.c:153 +#: ax-general.c:152 msgid "GDB bug: ax-general.c (ax_pick): stack depth out of range" msgstr "" -#: ax-general.c:166 +#: ax-general.c:165 msgid "GDB bug: ax-general.c (generic_ext): bit count out of range" msgstr "" -#: ax-general.c:169 +#: ax-general.c:168 msgid "GDB bug: ax-general.c (generic_ext): opcode has inadequate range" msgstr "" -#: ax-general.c:200 +#: ax-general.c:199 msgid "" "GDB bug: ax-general.c (ax_trace_quick): size out of range for trace_quick" msgstr "" -#: ax-general.c:236 +#: ax-general.c:235 msgid "GDB bug: ax-general.c (ax_label): label target out of range" msgstr "" #. FIXME: floating-point support not present yet. -#: ax-general.c:282 +#: ax-general.c:281 msgid "GDB bug: ax-general.c (ax_const_d): floating point not supported yet" msgstr "" -#: ax-general.c:296 ax-general.c:410 +#: ax-general.c:295 ax-general.c:409 #, possible-c-format msgid "'%s' is a pseudo-register; GDB cannot yet trace its contents." msgstr "" -#: ax-general.c:300 ax-general.c:414 +#: ax-general.c:299 ax-general.c:413 #, possible-c-format msgid "Trace '%s' failed." msgstr "" -#: ax-general.c:307 +#: ax-general.c:306 msgid "GDB bug: ax-general.c (ax_reg): register number out of range" msgstr "" -#: ax-general.c:325 +#: ax-general.c:324 #, possible-c-format msgid "ax-general.c (ax_tsv): variable number is %d, out of range" msgstr "" -#: ax-general.c:357 +#: ax-general.c:356 #, possible-c-format msgid "Scope: %s\n" msgstr "" -#: ax-general.c:358 +#: ax-general.c:357 msgid "Reg mask:" msgstr "" -#: ax-general.c:360 +#: ax-general.c:359 #, possible-c-format msgid " %02x" msgstr "" -#: ax-general.c:361 darwin-nat-info.c:295 darwin-nat-info.c:588 -#: darwin-nat-info.c:795 darwin-nat.c:531 +#: ax-general.c:360 darwin-nat.c:544 darwin-nat-info.c:294 +#: darwin-nat-info.c:587 darwin-nat-info.c:795 msgid "\n" msgstr "" -#: ax-general.c:367 +#: ax-general.c:366 msgid "GDB bug: ax-general.c (ax_print): opcode map out of sync" msgstr "" -#: ax-general.c:376 +#: ax-general.c:375 #, possible-c-format msgid "%3d \n" msgstr "" -#: ax-general.c:382 +#: ax-general.c:381 #, possible-c-format msgid "%3d \n" msgstr "" @@ -2358,586 +2391,512 @@ msgid " Maximum hash chain length: %3d\n" msgstr "" -#: bfd-target.c:92 +#: bfd-target.c:91 msgid "BFD backed target" msgstr "" -#: bfd-target.c:93 +#: bfd-target.c:92 msgid "You should never see this" msgstr "你应该看不到这些" -#: bfin-tdep.c:454 +#: bfin-tdep.c:453 msgid "" "Function Prologue not recognised; pc will point to ENTRY_POINT of the " "function" msgstr "" -#: bfin-tdep.c:702 bfin-tdep.c:722 xtensa-tdep.c:338 xtensa-tdep.c:643 -#: xtensa-tdep.c:742 +#: bfin-tdep.c:701 bfin-tdep.c:721 xtensa-tdep.c:336 xtensa-tdep.c:641 +#: xtensa-tdep.c:740 #, possible-c-format msgid "invalid register number %d" msgstr "无效寄存器号 %d" -#: breakpoint.c:276 +#: block.c:201 +#, possible-c-format +msgid "" +"DW_OP_GNU_entry_value resolving cannot find DW_TAG_GNU_call_site %s in %s" +msgstr "" + +#: breakpoint.c:309 #, possible-c-format msgid "Debugger's willingness to use watchpoint hardware is %s.\n" msgstr "" -#: breakpoint.c:292 +#: breakpoint.c:325 #, possible-c-format msgid "Debugger's behavior regarding pending breakpoints is %s.\n" msgstr "" -#: breakpoint.c:308 +#: breakpoint.c:341 #, possible-c-format msgid "Automatic usage of hardware breakpoints is %s.\n" msgstr "" -#: breakpoint.c:334 +#: breakpoint.c:367 #, possible-c-format msgid "Always inserted breakpoint mode is %s (currently %s).\n" msgstr "" -#: breakpoint.c:339 +#: breakpoint.c:372 #, possible-c-format msgid "Always inserted breakpoint mode is %s.\n" msgstr "" -#: breakpoint.c:596 +#: breakpoint.c:626 #, possible-c-format msgid "Breakpoint %d now unconditional.\n" msgstr "" -#: breakpoint.c:642 +#: breakpoint.c:676 msgid "breakpoint number" msgstr "断点号" -#: breakpoint.c:647 +#: breakpoint.c:681 #, possible-c-format msgid "Bad breakpoint argument: '%s'" msgstr "" -#: breakpoint.c:658 +#: breakpoint.c:692 msgid "" "Cannot set a condition where a Python 'stop' method has been defined in the " "breakpoint." msgstr "" -#: breakpoint.c:664 breakpoint.c:11289 +#: breakpoint.c:698 breakpoint.c:12114 #, possible-c-format msgid "No breakpoint number %d." msgstr "" -#: breakpoint.c:681 +#: breakpoint.c:715 msgid "The 'while-stepping' command can only be used for tracepoints" msgstr "" -#: breakpoint.c:691 +#: breakpoint.c:725 msgid "The 'collect' command can only be used for tracepoints" msgstr "" -#: breakpoint.c:694 +#: breakpoint.c:728 msgid "The 'teval' command can only be used for tracepoints" msgstr "" -#: breakpoint.c:729 +#: breakpoint.c:769 msgid "The 'while-stepping' command cannot be used for fast tracepoint" msgstr "" -#: breakpoint.c:732 +#: breakpoint.c:772 msgid "The 'while-stepping' command cannot be used for static tracepoint" msgstr "" -#: breakpoint.c:736 +#: breakpoint.c:776 msgid "The 'while-stepping' command can be used only once" msgstr "" -#: breakpoint.c:751 +#: breakpoint.c:791 msgid "The 'while-stepping' command cannot be nested" msgstr "" -#: breakpoint.c:884 +#: breakpoint.c:924 #, possible-c-format msgid "Type commands for breakpoint(s) %s, one per line." msgstr "" -#: breakpoint.c:957 +#: breakpoint.c:997 msgid "No breakpoints specified." msgstr "" -#: breakpoint.c:1075 +#: breakpoint.c:1117 #, possible-c-format msgid "reading through apparently deleted breakpoint #%d?" msgstr "" -#: breakpoint.c:1477 +#: breakpoint.c:1520 +msgid "Target does not support this type of hardware watchpoint." +msgstr "" + +#: breakpoint.c:1523 +msgid "" +"There are not enough available hardware resources for this watchpoint." +msgstr "" + +#: breakpoint.c:1539 +msgid "Expression cannot be implemented with read/access watchpoint." +msgstr "" + +#: breakpoint.c:1573 #, possible-c-format msgid "" "Watchpoint %d deleted because the program has left the block\n" "in which its expression is valid.\n" msgstr "" -#: breakpoint.c:1591 +#: breakpoint.c:1705 msgid "" "Note: automatically using hardware breakpoints for read-only addresses.\n" msgstr "" -#: breakpoint.c:1600 +#: breakpoint.c:1714 #, possible-c-format msgid "cannot set software breakpoint at readonly address %s" msgstr "" -#: breakpoint.c:1630 +#: breakpoint.c:1739 #, possible-c-format msgid "hardware breakpoint %d not supported in overlay!" msgstr "" -#: breakpoint.c:1776 +#: breakpoint.c:1881 #, possible-c-format msgid "" "Error inserting catchpoint %d: Your system does not support this type\n" "of catchpoint." msgstr "" -#: breakpoint.c:1780 +#: breakpoint.c:1885 #, possible-c-format msgid "Error inserting catchpoint %d." msgstr "" -#: breakpoint.c:2496 +#: breakpoint.c:2597 msgid "Cannot detach breakpoints of inferior_ptid" msgstr "" -#: breakpoint.c:2623 +#: breakpoint.c:2717 #, possible-c-format msgid "Could not remove hardware watchpoint %d." msgstr "" -#: breakpoint.c:3298 +#: breakpoint.c:3424 msgid "" msgstr "" +#: breakpoint.c:3471 +msgid "print_bp_stop_message: unrecognized enum value" +msgstr "" + #. Did we stop because the user set the stop_on_solib_events #. variable? (If so, we report this as a generic, "Stopped due #. to shlib event" message.) -#: breakpoint.c:3375 infrun.c:5816 +#: breakpoint.c:3520 breakpoint.c:11123 msgid "Stopped due to shared library event\n" msgstr "" -#. Not sure how we will get here. -#. GDB should not stop for these breakpoints. -#: breakpoint.c:3382 -msgid "Thread Event Breakpoint: gdb should not stop!\n" -msgstr "" - -#. By analogy with the thread event, GDB should not stop for these. -#: breakpoint.c:3388 -msgid "Overlay Event Breakpoint: gdb should not stop!\n" -msgstr "" - -#. These should never be enabled. -#: breakpoint.c:3394 -msgid "Longjmp Master Breakpoint: gdb should not stop!\n" -msgstr "" - -#. These should never be enabled. -#: breakpoint.c:3400 -msgid "std::terminate Master Breakpoint: gdb should not stop!\n" -msgstr "" - -#. These should never be enabled. -#: breakpoint.c:3407 -msgid "Exception Master Breakpoint: gdb should not stop!\n" -msgstr "" - -#: breakpoint.c:3561 -msgid "print_bp_stop_message: unrecognized enum value" -msgstr "" - #. Error from catch_errors. -#: breakpoint.c:4046 +#: breakpoint.c:3962 #, possible-c-format msgid "Watchpoint %d deleted.\n" msgstr "" -#: breakpoint.c:4151 +#: breakpoint.c:4077 msgid "Watchpoint condition cannot be tested in the current scope" msgstr "" -#: breakpoint.c:4522 +#: breakpoint.c:4448 msgid "bpstat_what: tracepoint encountered" msgstr "" -#: breakpoint.c:4535 +#: breakpoint.c:4461 #, possible-c-format msgid "bpstat_what: unhandled bptype %d" msgstr "" -#: breakpoint.c:4754 +#: breakpoint.c:4682 #, possible-c-format msgid "bptypes table does not describe type #%d." msgstr "" -#: breakpoint.c:4845 +#: breakpoint.c:4772 msgid "print_one_breakpoint: bp_none encountered\n" msgstr "" -#: breakpoint.c:5417 +#: breakpoint.c:5359 msgid "Note: breakpoint " msgstr "" #. if (others == ???) -#: breakpoint.c:5419 +#: breakpoint.c:5361 msgid "Note: breakpoints " msgstr "" -#: breakpoint.c:5440 +#: breakpoint.c:5381 msgid "also set at pc " msgstr "" -#: breakpoint.c:5612 +#: breakpoint.c:5561 #, possible-c-format msgid "Breakpoint %d address previously adjusted from %s to %s." msgstr "" -#: breakpoint.c:5615 +#: breakpoint.c:5564 #, possible-c-format msgid "Breakpoint address adjusted from %s to %s." msgstr "" -#: breakpoint.c:5715 +#: breakpoint.c:5664 msgid "unknown breakpoint type" msgstr "" -#: breakpoint.c:6204 +#: breakpoint.c:6166 #, possible-c-format msgid "Temporarily disabling breakpoints for unloaded shared library \"%s\"" msgstr "" -#: breakpoint.c:6250 +#: breakpoint.c:6286 #, possible-c-format -msgid "" -"\n" -"Catchpoint %d (forked process %d), " +msgid "Catchpoint %d (fork)" msgstr "" -#: breakpoint.c:6287 +#: breakpoint.c:6394 #, possible-c-format -msgid "Catchpoint %d (fork)" +msgid "Catchpoint %d (vfork)" msgstr "" -#: breakpoint.c:6349 +#: breakpoint.c:6682 #, possible-c-format -msgid "" -"\n" -"Catchpoint %d (vforked process %d), " +msgid "Catchpoint %d (syscalls" msgstr "" -#: breakpoint.c:6385 +#: breakpoint.c:6684 #, possible-c-format -msgid "Catchpoint %d (vfork)" +msgid "Catchpoint %d (syscall" msgstr "" -#: breakpoint.c:6557 +#: breakpoint.c:6701 #, possible-c-format -msgid "" -"\n" -"Catchpoint %d (call to syscall %s), " +msgid "Catchpoint %d (any syscall)" msgstr "" -#: breakpoint.c:6560 +#: breakpoint.c:6902 #, possible-c-format -msgid "" -"\n" -"Catchpoint %d (returned from syscall %s), " +msgid "Catchpoint %d (exec)" msgstr "" -#: breakpoint.c:6634 -#, possible-c-format -msgid "Catchpoint %d (syscalls" -msgstr "" - -#: breakpoint.c:6636 -#, possible-c-format -msgid "Catchpoint %d (syscall" -msgstr "" - -#: breakpoint.c:6653 -#, possible-c-format -msgid "Catchpoint %d (any syscall)" -msgstr "" - -#: breakpoint.c:6800 -#, possible-c-format -msgid "" -"\n" -"Catchpoint %d (exec'd %s), " -msgstr "" - -#: breakpoint.c:6830 -#, possible-c-format -msgid "Catchpoint %d (exec)" -msgstr "" - -#: breakpoint.c:7116 -#, possible-c-format -msgid "(apparently deleted?) Eventpoint %d: " -msgstr "" - -#: breakpoint.c:7159 -msgid "Temporary breakpoint" -msgstr "" - -#: breakpoint.c:7161 -msgid "Breakpoint" -msgstr "" - -#: breakpoint.c:7162 breakpoint.c:7183 breakpoint.c:7193 breakpoint.c:7203 -#, possible-c-format -msgid " %d" -msgstr "" - -#: breakpoint.c:7164 -msgid " at gnu-indirect-function resolver" -msgstr "" - -#: breakpoint.c:7173 -#, possible-c-format -msgid "Hardware assisted breakpoint %d" -msgstr "" - -#: breakpoint.c:7182 -msgid "Tracepoint" -msgstr "" - -#: breakpoint.c:7192 -msgid "Fast tracepoint" -msgstr "" - -#: breakpoint.c:7202 -msgid "Static tracepoint" -msgstr "" - -#: breakpoint.c:7234 -#, possible-c-format -msgid " (%s) pending." -msgstr "" - -#: breakpoint.c:7357 breakpoint.c:11504 +#: breakpoint.c:7264 breakpoint.c:12318 msgid "No hardware breakpoint support in the target." msgstr "" -#: breakpoint.c:7359 breakpoint.c:8551 breakpoint.c:11506 +#: breakpoint.c:7266 breakpoint.c:8335 breakpoint.c:12320 msgid "Hardware breakpoints used exceeds limit." msgstr "" -#: breakpoint.c:7412 breakpoint.c:7421 +#: breakpoint.c:7317 breakpoint.c:7326 #, possible-c-format msgid "Probed static tracepoint marker \"%s\"\n" msgstr "" -#: breakpoint.c:7426 +#: breakpoint.c:7331 msgid "Couldn't determine the static tracepoint marker to probe" msgstr "" -#: breakpoint.c:7450 +#: breakpoint.c:7350 #, possible-c-format msgid "Garbage %s follows condition" msgstr "" -#: breakpoint.c:7688 +#: breakpoint.c:7502 msgid "No default breakpoint address now." msgstr "" -#: breakpoint.c:7767 +#: breakpoint.c:7567 #, possible-c-format msgid "May not have a fast tracepoint at 0x%s%s" msgstr "" -#: breakpoint.c:7826 +#: breakpoint.c:7618 msgid "Junk after thread keyword." msgstr "" -#: breakpoint.c:7828 breakpoint.c:8888 thread.c:1246 +#: breakpoint.c:7620 breakpoint.c:9098 thread.c:1239 #, possible-c-format msgid "Unknown thread %d." msgstr "" -#: breakpoint.c:7838 +#: breakpoint.c:7630 msgid "Junk after task keyword." msgstr "" -#: breakpoint.c:7840 +#: breakpoint.c:7632 #, possible-c-format msgid "Unknown task %d." msgstr "" -#: breakpoint.c:7871 +#: breakpoint.c:7663 #, possible-c-format msgid "No known static tracepoint marker named %s" msgstr "" -#: breakpoint.c:7976 -msgid "Make breakpoint pending on future shared library load? " +#: breakpoint.c:7766 +#, possible-c-format +msgid "Make %s pending on future shared library load? " msgstr "" -#: breakpoint.c:8153 +#: breakpoint.c:7944 msgid "" "Multiple breakpoints were set.\n" "Use the \"delete\" command to delete unwanted breakpoints." msgstr "" -#: breakpoint.c:8208 +#: breakpoint.c:7998 linespec.c:2429 #, possible-c-format msgid "No line %d in file \"%s\"." msgstr "" -#: breakpoint.c:8282 +#: breakpoint.c:8072 msgid "" "Specify the type of breakpoint to set.\n" "Usage: stop in \n" " stop at \n" msgstr "" -#: breakpoint.c:8315 +#: breakpoint.c:8105 msgid "Usage: stop in \n" msgstr "" -#: breakpoint.c:8347 +#: breakpoint.c:8137 msgid "Usage: stop at \n" msgstr "" -#: breakpoint.c:8468 +#: breakpoint.c:8262 #, possible-c-format msgid "Hardware assisted ranged breakpoint %d from %s to %s." msgstr "" -#: breakpoint.c:8519 breakpoint.c:8613 +#: breakpoint.c:8303 breakpoint.c:8383 msgid "Could not find location of the end of the range." msgstr "" -#: breakpoint.c:8544 +#: breakpoint.c:8328 msgid "This target does not support hardware ranged breakpoints." msgstr "" -#: breakpoint.c:8554 +#: breakpoint.c:8339 msgid "No address range specified." msgstr "" -#: breakpoint.c:8572 +#: breakpoint.c:8349 msgid "Too few arguments." msgstr "" -#: breakpoint.c:8574 +#: breakpoint.c:8351 msgid "Could not find location of the beginning of the range." msgstr "" -#: breakpoint.c:8576 breakpoint.c:8615 +#: breakpoint.c:8357 breakpoint.c:8388 msgid "Cannot create a ranged breakpoint with multiple locations." msgstr "" -#: breakpoint.c:8621 -msgid "Invalid address range, end preceeds start." +#: breakpoint.c:8396 +msgid "Invalid address range, end precedes start." msgstr "" #. Length overflowed. -#: breakpoint.c:8626 +#: breakpoint.c:8401 msgid "Address range too large." msgstr "" -#: breakpoint.c:8884 -#, possible-c-format -msgid "Invalid thread ID specification %s." +#: breakpoint.c:8788 breakpoint.c:8911 breakpoint.c:8967 breakpoint.c:8998 +msgid "Invalid hardware watchpoint type." msgstr "" -#: breakpoint.c:8916 -#, possible-c-format -msgid "Cannot watch constant value `%.*s'." +#: breakpoint.c:8819 +msgid "Invalid watchpoint type." msgstr "" -#: breakpoint.c:8953 -msgid "Junk at end of command." -msgstr "无意义的命令结尾" +#: breakpoint.c:8915 +msgid "" +"\n" +"Check the underlying instruction at PC for the memory\n" +"address and value which triggered this watchpoint.\n" +msgstr "" -#: breakpoint.c:8964 -msgid "Expression cannot be implemented with read/access watchpoint." +#: breakpoint.c:9086 +msgid "You can specify only one thread." msgstr "" -#: breakpoint.c:8972 -msgid "Target does not support this type of hardware watchpoint." +#: breakpoint.c:9094 +#, possible-c-format +msgid "Invalid thread ID specification %s." msgstr "" -#: breakpoint.c:8975 -msgid "Target can only support one kind of HW watchpoint at a time." +#: breakpoint.c:9108 +msgid "You can specify only one mask." msgstr "" -#: breakpoint.c:9305 -msgid "Couldn't get information on specified line." +#: breakpoint.c:9146 +#, possible-c-format +msgid "Cannot watch constant value `%.*s'." msgstr "" -#: breakpoint.c:9457 -msgid "unsupported or unknown fork kind; cannot catch it" +#: breakpoint.c:9167 +msgid "This target does not support masked watchpoints." msgstr "" -#: breakpoint.c:9556 -msgid "Temporary catchpoint " +#: breakpoint.c:9169 +msgid "Invalid mask or memory region." msgstr "" -#: breakpoint.c:9557 -msgid "Catchpoint " +#: breakpoint.c:9195 +msgid "Junk at end of command." +msgstr "无意义的命令结尾" + +#: breakpoint.c:9538 +msgid "Couldn't get information on specified line." +msgstr "" + +#: breakpoint.c:9690 +msgid "unsupported or unknown fork kind; cannot catch it" msgstr "" -#: breakpoint.c:9559 +#: breakpoint.c:9799 msgid " (throw)" msgstr "" -#: breakpoint.c:9560 +#: breakpoint.c:9800 msgid " (catch)" msgstr "" -#: breakpoint.c:9634 +#: breakpoint.c:9865 msgid "Unsupported or unknown exception event; cannot catch it" msgstr "" -#: breakpoint.c:9639 +#: breakpoint.c:9870 msgid "Unsupported with this platform/compiler combination." msgstr "" #. Here we have to issue an error instead of a warning, #. because GDB cannot do anything useful if there's no #. syscall number to be caught. -#: breakpoint.c:9786 +#: breakpoint.c:9966 #, possible-c-format msgid "Unknown syscall name '%s'." msgstr "" -#: breakpoint.c:9810 +#: breakpoint.c:9990 msgid "" "The feature 'catch syscall' is not supported on this architecture yet." msgstr "" -#: breakpoint.c:9862 breakpoint.c:9869 +#: breakpoint.c:10021 breakpoint.c:10028 msgid "Catch requires an event name." msgstr "" -#: breakpoint.c:9901 +#: breakpoint.c:10085 msgid "No source file specified." msgstr "没有指定源文件" -#: breakpoint.c:9986 +#: breakpoint.c:10175 #, possible-c-format msgid "No breakpoint at %s." msgstr "" -#: breakpoint.c:9988 +#: breakpoint.c:10177 msgid "No breakpoint at this line." msgstr "" -#: breakpoint.c:9996 +#: breakpoint.c:10200 msgid "Deleted breakpoint " msgstr "已删除的断点 " -#: breakpoint.c:9998 +#: breakpoint.c:10202 msgid "Deleted breakpoints " msgstr "已删除的多个断点 " @@ -2949,136 +2908,196 @@ #. Note that at this point, old_loc->owner is still #. valid, as delete_breakpoint frees the breakpoint #. only after calling us. -#: breakpoint.c:10277 +#: breakpoint.c:10547 #, possible-c-format msgid "warning: Error removing breakpoint %d\n" msgstr "" -#: breakpoint.c:10382 +#: breakpoint.c:10651 msgid "allegedly permanent breakpoint is not actually inserted" msgstr "" -#: breakpoint.c:10408 +#: breakpoint.c:10683 msgid "another breakpoint was inserted on top of a permanent breakpoint" msgstr "" -#: breakpoint.c:10626 +#: breakpoint.c:10763 +#, possible-c-format +msgid " (%s) pending." +msgstr "" + +#: breakpoint.c:11040 +msgid "Temporary breakpoint" +msgstr "" + +#: breakpoint.c:11042 +msgid "Breakpoint" +msgstr "" + +#: breakpoint.c:11043 breakpoint.c:11261 breakpoint.c:11265 breakpoint.c:11269 +#, possible-c-format +msgid " %d" +msgstr "" + +#: breakpoint.c:11045 +msgid " at gnu-indirect-function resolver" +msgstr "" + +#: breakpoint.c:11048 +#, possible-c-format +msgid "Hardware assisted breakpoint %d" +msgstr "" + +#: breakpoint.c:11069 +#, possible-c-format +msgid "unhandled breakpoint type %d" +msgstr "" + +#. Not sure how we will get here. +#. GDB should not stop for these breakpoints. +#: breakpoint.c:11132 +msgid "Thread Event Breakpoint: gdb should not stop!\n" +msgstr "" + +#. By analogy with the thread event, GDB should not stop for these. +#: breakpoint.c:11137 +msgid "Overlay Event Breakpoint: gdb should not stop!\n" +msgstr "" + +#. These should never be enabled. +#: breakpoint.c:11142 +msgid "Longjmp Master Breakpoint: gdb should not stop!\n" +msgstr "" + +#. These should never be enabled. +#: breakpoint.c:11147 +msgid "std::terminate Master Breakpoint: gdb should not stop!\n" +msgstr "" + +#. These should never be enabled. +#: breakpoint.c:11153 +msgid "Exception Master Breakpoint: gdb should not stop!\n" +msgstr "" + +#: breakpoint.c:11260 +msgid "Tracepoint" +msgstr "" + +#: breakpoint.c:11264 +msgid "Fast tracepoint" +msgstr "" + +#: breakpoint.c:11268 +msgid "Static tracepoint" +msgstr "" + +#: breakpoint.c:11273 breakpoint.c:11292 +#, possible-c-format +msgid "unhandled tracepoint type %d" +msgstr "" + +#: breakpoint.c:11486 msgid "Delete all breakpoints? " msgstr "删除所有断点吗? " -#: breakpoint.c:10742 +#: breakpoint.c:11593 #, possible-c-format msgid "static tracepoint %d changed probed marker from %s to %s" msgstr "" -#: breakpoint.c:10776 +#: breakpoint.c:11628 #, possible-c-format msgid "" "marker for static tracepoint %d (%s) not found at previous line number" msgstr "" -#: breakpoint.c:10874 -#, possible-c-format -msgid "failed to reevaluate condition for breakpoint %d: %s" -msgstr "" - -#: breakpoint.c:10970 +#: breakpoint.c:11726 #, possible-c-format -msgid "marker %s not found" +msgid "Could not reset ranged breakpoint %d: multiple locations found\n" msgstr "" -#: breakpoint.c:11087 +#: breakpoint.c:11766 #, possible-c-format -msgid "attempted to reset apparently deleted breakpoint #%d?" +msgid "failed to reevaluate condition for breakpoint %d: %s" msgstr "" -#: breakpoint.c:11149 +#: breakpoint.c:11857 #, possible-c-format -msgid "Deleting unknown breakpoint type %d\n" +msgid "marker %s not found" msgstr "" -#: breakpoint.c:11264 +#: breakpoint.c:12089 #, possible-c-format msgid "Ignore count ignored for tracepoint %d." msgstr "" -#: breakpoint.c:11273 +#: breakpoint.c:12098 #, possible-c-format msgid "Will stop next time breakpoint %d is reached." msgstr "" -#: breakpoint.c:11277 +#: breakpoint.c:12102 #, possible-c-format msgid "Will ignore next crossing of breakpoint %d." msgstr "" -#: breakpoint.c:11280 +#: breakpoint.c:12105 #, possible-c-format msgid "Will ignore next %d crossings of breakpoint %d." msgstr "" -#: breakpoint.c:11301 +#: breakpoint.c:12126 msgid "a breakpoint number" msgstr "" -#: breakpoint.c:11305 +#: breakpoint.c:12130 #, possible-c-format msgid "bad breakpoint number: '%s'" msgstr "错误的断点号: \"%s\"" -#: breakpoint.c:11307 +#: breakpoint.c:12132 msgid "Second argument (specified ignore-count) is missing." msgstr "" -#: breakpoint.c:11330 +#: breakpoint.c:12155 msgid "one or more breakpoint numbers" msgstr "" -#: breakpoint.c:11343 +#: breakpoint.c:12168 #, possible-c-format msgid "bad breakpoint number at or near '%s'" msgstr "" -#: breakpoint.c:11372 +#: breakpoint.c:12180 #, possible-c-format msgid "No breakpoint number %d.\n" msgstr "" -#: breakpoint.c:11392 breakpoint.c:11401 +#: breakpoint.c:12200 breakpoint.c:12209 #, possible-c-format msgid "Bad breakpoint number '%s'" msgstr "" -#: breakpoint.c:11406 breakpoint.c:11413 +#: breakpoint.c:12214 breakpoint.c:12221 #, possible-c-format msgid "Bad breakpoint location number '%s'" msgstr "" -#: breakpoint.c:11462 -#, possible-c-format -msgid "attempted to disable apparently deleted breakpoint #%d?" -msgstr "" - -#: breakpoint.c:11519 +#: breakpoint.c:12340 #, possible-c-format msgid "Cannot enable watchpoint %d: " msgstr "" -#: breakpoint.c:11564 -#, possible-c-format -msgid "attempted to enable apparently deleted breakpoint #%d?" -msgstr "" - -#: breakpoint.c:11664 symtab.c:4443 +#: breakpoint.c:12507 symtab.c:4681 msgid "Empty line specification." msgstr "" -#: breakpoint.c:11674 symtab.c:4454 +#: breakpoint.c:12515 symtab.c:4691 #, possible-c-format msgid "Junk at end of line specification: %s" msgstr "" -#: breakpoint.c:11756 +#: breakpoint.c:12597 #, possible-c-format msgid "Could not insert single-step breakpoint at %s" msgstr "" @@ -3087,81 +3106,76 @@ #. address. Since there is no way to confirm that the address #. means the same thing as when the trace was started, warn the #. user. -#: breakpoint.c:12007 +#: breakpoint.c:12850 #, possible-c-format msgid "Uploaded tracepoint %d has no source location, using raw address" msgstr "" -#: breakpoint.c:12016 +#: breakpoint.c:12859 #, possible-c-format msgid "Uploaded tracepoint %d condition has no source form, ignoring it" msgstr "" -#: breakpoint.c:12063 +#: breakpoint.c:12906 #, possible-c-format msgid "Uploaded tracepoint %d actions have no source form, ignoring them" msgstr "" -#: breakpoint.c:12134 +#: breakpoint.c:12980 msgid "Delete all tracepoints? " msgstr "" -#: breakpoint.c:12156 +#: breakpoint.c:12999 #, possible-c-format msgid "Setting tracepoint %d's passcount to %d\n" msgstr "" -#: breakpoint.c:12173 +#: breakpoint.c:13016 msgid "passcount command requires an argument (count + optional TP num)" msgstr "" -#: breakpoint.c:12264 +#: breakpoint.c:13114 msgid "tracepoint number" msgstr "" -#: breakpoint.c:12272 +#: breakpoint.c:13122 #, possible-c-format msgid "bad tracepoint number at or near '%s'\n" msgstr "" -#: breakpoint.c:12275 +#: breakpoint.c:13125 msgid "Tracepoint argument missing and no previous tracepoint\n" msgstr "" -#: breakpoint.c:12307 +#: breakpoint.c:13169 msgid "Argument required (file name in which to save)" msgstr "" -#: breakpoint.c:12333 +#: breakpoint.c:13195 msgid "Nothing to save." msgstr "" -#: breakpoint.c:12341 +#: breakpoint.c:13203 #, possible-c-format msgid "Unable to open file '%s' for saving (%s)" msgstr "" -#: breakpoint.c:12387 -#, possible-c-format -msgid "unhandled breakpoint type %d" -msgstr "" - -#: breakpoint.c:12464 +#: breakpoint.c:13273 #, possible-c-format msgid "Saved to file '%s'.\n" msgstr "" -#: breakpoint.c:12564 +#: breakpoint.c:13371 msgid "\"save\" must be followed by the name of a save subcommand.\n" msgstr "" -#: breakpoint.c:12602 +#: breakpoint.c:13598 msgid "" "Set ignore-count of breakpoint number N to COUNT.\n" "Usage is `ignore N COUNT'." msgstr "" -#: breakpoint.c:12608 +#: breakpoint.c:13604 msgid "" "Set commands to be executed when a breakpoint is hit.\n" "Give breakpoint number as argument after \"commands\".\n" @@ -3172,14 +3186,14 @@ "then no output is printed when it is hit, except what the commands print." msgstr "" -#: breakpoint.c:12617 +#: breakpoint.c:13613 msgid "" "Specify breakpoint number N to break only if COND is true.\n" "Usage is `condition N COND', where N is an integer and COND is an\n" "expression to be evaluated whenever breakpoint N is reached." msgstr "" -#: breakpoint.c:12622 +#: breakpoint.c:13618 msgid "" "Set a temporary breakpoint.\n" "Like \"break\" except the breakpoint is only temporary,\n" @@ -3188,7 +3202,7 @@ "\n" msgstr "" -#: breakpoint.c:12631 +#: breakpoint.c:13627 msgid "" "Set a hardware assisted breakpoint.\n" "Like \"break\" except the breakpoint requires hardware support,\n" @@ -3196,7 +3210,7 @@ "\n" msgstr "" -#: breakpoint.c:12639 +#: breakpoint.c:13635 msgid "" "Set a temporary hardware assisted breakpoint.\n" "Like \"hbreak\" except the breakpoint is only temporary,\n" @@ -3204,7 +3218,7 @@ "\n" msgstr "" -#: breakpoint.c:12647 breakpoint.c:12655 +#: breakpoint.c:13643 breakpoint.c:13651 msgid "" "Enable some breakpoints.\n" "Give breakpoint numbers (separated by spaces) as arguments.\n" @@ -3213,7 +3227,7 @@ "With a subcommand you can enable temporarily." msgstr "" -#: breakpoint.c:12664 +#: breakpoint.c:13660 msgid "" "Enable some breakpoints.\n" "Give breakpoint numbers (separated by spaces) as arguments.\n" @@ -3221,36 +3235,36 @@ "May be abbreviated to simply \"enable\".\n" msgstr "" -#: breakpoint.c:12671 breakpoint.c:12686 +#: breakpoint.c:13667 breakpoint.c:13682 msgid "" "Enable breakpoints for one hit. Give breakpoint numbers.\n" "If a breakpoint is hit while enabled in this fashion, it becomes disabled." msgstr "" -#: breakpoint.c:12676 breakpoint.c:12681 +#: breakpoint.c:13672 breakpoint.c:13677 msgid "" "Enable breakpoints and delete when hit. Give breakpoint numbers.\n" "If a breakpoint is hit while enabled in this fashion, it is deleted." msgstr "" -#: breakpoint.c:12691 breakpoint.c:12700 +#: breakpoint.c:13687 breakpoint.c:13696 msgid "" "Disable some breakpoints.\n" "Arguments are breakpoint numbers with spaces in between.\n" "To disable all breakpoints, give no argument.\n" -"A disabled breakpoint is not forgotten, but has no effect until reenabled." +"A disabled breakpoint is not forgotten, but has no effect until re-enabled." msgstr "" -#: breakpoint.c:12706 +#: breakpoint.c:13702 msgid "" "Disable some breakpoints.\n" "Arguments are breakpoint numbers with spaces in between.\n" "To disable all breakpoints, give no argument.\n" -"A disabled breakpoint is not forgotten, but has no effect until reenabled.\n" +"A disabled breakpoint is not forgotten, but has no effect until re-enabled.\n" "This command may be abbreviated \"disable\"." msgstr "" -#: breakpoint.c:12714 +#: breakpoint.c:13710 msgid "" "Delete some breakpoints or auto-display expressions.\n" "Arguments are breakpoint numbers with spaces in between.\n" @@ -3260,14 +3274,14 @@ "The \"unset\" command is also an alias for \"delete\"." msgstr "" -#: breakpoint.c:12725 +#: breakpoint.c:13721 msgid "" "Delete some breakpoints.\n" "Arguments are breakpoint numbers with spaces in between.\n" "To delete all breakpoints, give no argument.\n" msgstr "" -#: breakpoint.c:12730 +#: breakpoint.c:13726 msgid "" "Delete some breakpoints or auto-display expressions.\n" "Arguments are breakpoint numbers with spaces in between.\n" @@ -3275,7 +3289,7 @@ "This command may be abbreviated \"delete\"." msgstr "" -#: breakpoint.c:12737 +#: breakpoint.c:13733 msgid "" "Clear breakpoint at specified line or function.\n" "Argument may be line number, function name, or \"*\" and an address.\n" @@ -3290,23 +3304,23 @@ "See also the \"delete\" command which clears breakpoints by number." msgstr "" -#: breakpoint.c:12750 +#: breakpoint.c:13746 msgid "Set breakpoint at specified line or function.\n" msgstr "" -#: breakpoint.c:12765 +#: breakpoint.c:13761 msgid "Break in function/address or break at a line in the current file." msgstr "" -#: breakpoint.c:12769 +#: breakpoint.c:13765 msgid "Break in function or address." msgstr "" -#: breakpoint.c:12771 +#: breakpoint.c:13767 msgid "Break at a line in the current file." msgstr "" -#: breakpoint.c:12772 breakpoint.c:12808 +#: breakpoint.c:13768 breakpoint.c:13804 msgid "" "Status of user-settable breakpoints, or breakpoint number NUMBER.\n" "The \"Type\" column indicates one of:\n" @@ -3328,7 +3342,7 @@ "breakpoint set." msgstr "" -#: breakpoint.c:12789 +#: breakpoint.c:13785 msgid "" "Status of specified breakpoints (all user-settable breakpoints if no " "argument).\n" @@ -3351,7 +3365,7 @@ "breakpoint set." msgstr "" -#: breakpoint.c:12824 +#: breakpoint.c:13820 msgid "" "Status of all breakpoints, or breakpoint number NUMBER.\n" "The \"Type\" column indicates one of:\n" @@ -3377,42 +3391,42 @@ "breakpoint set." msgstr "" -#: breakpoint.c:12845 +#: breakpoint.c:13841 msgid "Set catchpoints to catch events." msgstr "" #. allow-unknown -#: breakpoint.c:12850 +#: breakpoint.c:13846 msgid "Set temporary catchpoints to catch events." msgstr "" #. allow-unknown #. Add catch and tcatch sub-commands. -#: breakpoint.c:12856 +#: breakpoint.c:13852 msgid "" "Catch an exception, when caught.\n" "With an argument, catch only exceptions with the given name." msgstr "" -#: breakpoint.c:12863 +#: breakpoint.c:13859 msgid "" "Catch an exception, when thrown.\n" "With an argument, catch only exceptions with the given name." msgstr "" -#: breakpoint.c:12870 +#: breakpoint.c:13866 msgid "Catch calls to fork." msgstr "" -#: breakpoint.c:12875 +#: breakpoint.c:13871 msgid "Catch calls to vfork." msgstr "" -#: breakpoint.c:12880 +#: breakpoint.c:13876 msgid "Catch calls to exec." msgstr "" -#: breakpoint.c:12885 +#: breakpoint.c:13881 msgid "" "Catch system calls by their names and/or numbers.\n" "Arguments say which system calls to catch. If no arguments\n" @@ -3421,19 +3435,7 @@ "(if your system supports that), or system call numbers." msgstr "" -#: breakpoint.c:12895 -msgid "" -"Catch Ada exceptions, when raised.\n" -"With an argument, catch only exceptions with the given name." -msgstr "" - -#: breakpoint.c:12902 -msgid "" -"Catch failed Ada assertions, when raised.\n" -"With an argument, catch only exceptions with the given name." -msgstr "" - -#: breakpoint.c:12910 +#: breakpoint.c:13892 msgid "" "Set a watchpoint for an expression.\n" "Usage: watch [-l|-location] EXPRESSION\n" @@ -3443,7 +3445,7 @@ "the memory to which it refers." msgstr "" -#: breakpoint.c:12919 +#: breakpoint.c:13901 msgid "" "Set a read watchpoint for an expression.\n" "Usage: rwatch [-l|-location] EXPRESSION\n" @@ -3453,7 +3455,7 @@ "the memory to which it refers." msgstr "" -#: breakpoint.c:12928 +#: breakpoint.c:13910 msgid "" "Set a watchpoint for an expression.\n" "Usage: awatch [-l|-location] EXPRESSION\n" @@ -3463,19 +3465,19 @@ "the memory to which it refers." msgstr "" -#: breakpoint.c:12937 +#: breakpoint.c:13919 msgid "Status of specified watchpoints (all watchpoints if no argument)." msgstr "" -#: breakpoint.c:12943 +#: breakpoint.c:13925 msgid "Set debugger's willingness to use watchpoint hardware." msgstr "" -#: breakpoint.c:12944 +#: breakpoint.c:13926 msgid "Show debugger's willingness to use watchpoint hardware." msgstr "" -#: breakpoint.c:12945 +#: breakpoint.c:13927 msgid "" "If zero, gdb will not use hardware for new watchpoints, even if\n" "such is available. (However, any hardware watchpoints that were\n" @@ -3484,19 +3486,25 @@ msgstr "" #. Tracepoint manipulation commands. -#: breakpoint.c:12958 +#: breakpoint.c:13940 msgid "" "Set a tracepoint at specified line or function.\n" "\n" msgstr "" -#: breakpoint.c:12970 +#: breakpoint.c:13943 breakpoint.c:13955 +msgid "" +"\n" +"Do \"help tracepoints\" for info on other tracepoint commands." +msgstr "" + +#: breakpoint.c:13952 msgid "" "Set a fast tracepoint at specified line or function.\n" "\n" msgstr "" -#: breakpoint.c:12977 +#: breakpoint.c:13959 msgid "" "Set a static tracepoint at specified line, function or marker.\n" "\n" @@ -3524,35 +3532,35 @@ "Do \"help tracepoints\" for info on other tracepoint commands." msgstr "" -#: breakpoint.c:13003 +#: breakpoint.c:13985 msgid "" "Status of specified tracepoints (all tracepoints if no argument).\n" "Convenience variable \"$tpnum\" contains the number of the\n" "last tracepoint set." msgstr "" -#: breakpoint.c:13010 +#: breakpoint.c:13992 msgid "" "Delete specified tracepoints.\n" "Arguments are tracepoint numbers, separated by spaces.\n" "No argument means delete all tracepoints." msgstr "" -#: breakpoint.c:13016 +#: breakpoint.c:13998 msgid "" "Disable specified tracepoints.\n" "Arguments are tracepoint numbers, separated by spaces.\n" "No argument means disable all tracepoints." msgstr "" -#: breakpoint.c:13023 +#: breakpoint.c:14005 msgid "" "Enable specified tracepoints.\n" "Arguments are tracepoint numbers, separated by spaces.\n" "No argument means enable all tracepoints." msgstr "" -#: breakpoint.c:13030 +#: breakpoint.c:14012 msgid "" "Set the passcount for a tracepoint.\n" "The trace will end when the tracepoint has been passed 'count' times.\n" @@ -3560,12 +3568,12 @@ "if TPNUM is omitted, passcount refers to the last tracepoint defined." msgstr "" -#: breakpoint.c:13037 +#: breakpoint.c:14019 msgid "Save breakpoint definitions as a script." msgstr "" #. allow-unknown -#: breakpoint.c:13041 +#: breakpoint.c:14023 msgid "" "Save current breakpoint definitions as a script.\n" "This includes all types of breakpoints (breakpoints, watchpoints,\n" @@ -3573,29 +3581,29 @@ "session to restore them." msgstr "" -#: breakpoint.c:13049 +#: breakpoint.c:14031 msgid "" "Save current tracepoint definitions as a script.\n" "Use the 'source' command in another debug session to restore them." msgstr "" #. allow-unknown -#: breakpoint.c:13058 breakpoint.c:13064 +#: breakpoint.c:14040 breakpoint.c:14046 msgid "" "Breakpoint specific settings\n" "Configure various breakpoint-specific variables such as\n" "pending breakpoint behavior" msgstr "" -#: breakpoint.c:13072 +#: breakpoint.c:14054 msgid "Set debugger's behavior regarding pending breakpoints." msgstr "" -#: breakpoint.c:13073 +#: breakpoint.c:14055 msgid "Show debugger's behavior regarding pending breakpoints." msgstr "" -#: breakpoint.c:13074 +#: breakpoint.c:14056 msgid "" "If on, an unrecognized breakpoint location will cause gdb to create a\n" "pending breakpoint. If off, an unrecognized breakpoint location results in\n" @@ -3603,15 +3611,15 @@ "user-query to see if a pending breakpoint should be created." msgstr "" -#: breakpoint.c:13087 +#: breakpoint.c:14069 msgid "Set automatic usage of hardware breakpoints." msgstr "" -#: breakpoint.c:13088 +#: breakpoint.c:14070 msgid "Show automatic usage of hardware breakpoints." msgstr "" -#: breakpoint.c:13089 +#: breakpoint.c:14071 msgid "" "If set, the debugger will automatically use hardware breakpoints for\n" "breakpoints set with \"break\" but falling in read-only memory. If not " @@ -3619,15 +3627,15 @@ "a warning will be emitted for such breakpoints." msgstr "" -#: breakpoint.c:13099 +#: breakpoint.c:14081 msgid "Set mode for inserting breakpoints." msgstr "" -#: breakpoint.c:13100 +#: breakpoint.c:14082 msgid "Show mode for inserting breakpoints." msgstr "" -#: breakpoint.c:13101 +#: breakpoint.c:14083 msgid "" "When this mode is off, breakpoints are inserted in inferior when it is\n" "resumed, and removed when execution stops. When this mode is on,\n" @@ -3639,7 +3647,7 @@ "inferior in all-stop mode, gdb behaves as if always-inserted mode is off." msgstr "" -#: breakpoint.c:13115 +#: breakpoint.c:14097 msgid "" "Set a breakpoint for an address range.\n" "break-range START-LOCATION, END-LOCATION\n" @@ -3657,96 +3665,96 @@ "range (including START-LOCATION and END-LOCATION)." msgstr "" -#: bsd-kvm.c:155 +#: bsd-kvm.c:154 #, possible-c-format msgid "\tUsing the kernel crash dump %s.\n" msgstr "" -#: bsd-kvm.c:158 +#: bsd-kvm.c:157 msgid "\tUsing the currently running kernel.\n" msgstr "" #. i18n: PCB == "Process Control Block". -#: bsd-kvm.c:252 +#: bsd-kvm.c:251 msgid "Cannot find a valid PCB" msgstr "" -#: bsd-kvm.c:273 +#: bsd-kvm.c:272 msgid "proc address" msgstr "" -#: bsd-kvm.c:276 bsd-kvm.c:304 +#: bsd-kvm.c:275 bsd-kvm.c:303 msgid "No kernel memory image." msgstr "" #. i18n: PCB == "Process Control Block". -#: bsd-kvm.c:301 +#: bsd-kvm.c:300 msgid "pcb address" msgstr "" -#: bsd-kvm.c:346 +#: bsd-kvm.c:345 msgid "Kernel memory interface" msgstr "" -#: bsd-kvm.c:347 +#: bsd-kvm.c:346 msgid "" "Use a kernel virtual memory image as a target.\n" "Optionally specify the filename of a core dump." msgstr "" -#: bsd-kvm.c:364 +#: bsd-kvm.c:363 msgid "Generic command for manipulating the kernel memory interface." msgstr "" -#: bsd-kvm.c:370 +#: bsd-kvm.c:369 msgid "Set current context from proc address" msgstr "" #. i18n: PCB == "Process Control Block". -#: bsd-kvm.c:374 +#: bsd-kvm.c:373 msgid "Set current context from pcb address" msgstr "" -#: bsd-uthread.c:101 +#: bsd-uthread.c:100 msgid "Bad magic" msgstr "" -#: buildsym.c:329 +#: buildsym.c:324 #, possible-c-format msgid "block end address less than block start address in %s (patched it)" msgstr "" -#: buildsym.c:336 +#: buildsym.c:331 #, possible-c-format msgid "block end address %s less than block start address %s (patched it)" msgstr "" -#: buildsym.c:369 +#: buildsym.c:364 #, possible-c-format msgid "inner block not inside outer block in %s" msgstr "" -#: buildsym.c:375 +#: buildsym.c:370 #, possible-c-format msgid "inner block (%s-%s) not inside outer block (%s-%s)" msgstr "" -#: buildsym.c:514 +#: buildsym.c:509 #, possible-c-format msgid "block at %s out of order" msgstr "" #. We should always be able to find the objfile ... -#: buildsym.c:688 buildsym.c:702 dbxread.c:3094 exec.c:444 exec.c:626 -#: language.c:514 language.c:912 mdebugread.c:3700 minsyms.c:161 monitor.c:327 -#: monitor.c:357 monitor.c:1321 printcmd.c:499 printcmd.c:835 printcmd.c:2663 -#: psymtab.c:673 psymtab.c:691 remote-mips.c:2702 target.c:916 target.c:1001 -#: target.c:1016 target.c:1043 utils.c:2389 utils.c:3283 utils.c:3326 -#: utils.c:3493 valprint.c:634 +#: buildsym.c:683 buildsym.c:697 dbxread.c:3096 exec.c:442 exec.c:624 +#: language.c:513 language.c:911 mdebugread.c:3705 minsyms.c:159 monitor.c:325 +#: monitor.c:355 monitor.c:1321 printcmd.c:495 printcmd.c:831 printcmd.c:2677 +#: psymtab.c:702 psymtab.c:720 remote-mips.c:2700 target.c:960 target.c:1045 +#: target.c:1060 target.c:1087 utils.c:2049 utils.c:2987 utils.c:3030 +#: utils.c:3197 valprint.c:639 msgid "failed internal consistency check" msgstr "" -#: buildsym.c:968 +#: buildsym.c:963 msgid "Context stack not empty in end_symtab" msgstr "" @@ -3754,309 +3762,191 @@ msgid "Undefined string concatenation." msgstr "" -#: c-exp.y:764 m2-exp.y:589 objc-exp.y:649 p-exp.y:668 +#: c-exp.y:764 +#, possible-c-format +msgid "@entry can be used only for function parameters, not for \"%s\"" +msgstr "" + +#: c-exp.y:779 m2-exp.y:589 objc-exp.y:649 p-exp.y:667 #, possible-c-format msgid "No symbol \"%s\" in specified context." msgstr "" -#: c-exp.y:781 c-exp.y:797 objc-exp.y:664 objc-exp.y:678 p-exp.y:683 +#: c-exp.y:796 c-exp.y:812 objc-exp.y:664 objc-exp.y:678 p-exp.y:682 #, possible-c-format msgid "`%s' is not defined as an aggregate type." msgstr "" -#: c-exp.y:816 +#: c-exp.y:831 #, possible-c-format msgid "No type \"%s\" within class or namespace \"%s\"." msgstr "" -#: c-exp.y:847 c-exp.y:899 f-exp.y:522 m2-exp.y:638 objc-exp.y:724 -#: objc-exp.y:778 objc-exp.y:861 p-exp.y:720 p-exp.y:789 printcmd.c:1241 -#: valops.c:2693 +#: c-exp.y:862 c-exp.y:914 f-exp.y:521 m2-exp.y:638 objc-exp.y:724 +#: objc-exp.y:778 objc-exp.y:861 p-exp.y:719 p-exp.y:788 printcmd.c:1237 +#: valops.c:2697 #, possible-c-format msgid "No symbol \"%s\" in current context." msgstr "" -#: c-exp.y:1530 objc-exp.y:1105 p-exp.y:964 +#: c-exp.y:1545 objc-exp.y:1105 p-exp.y:963 msgid "Numeric constant too large." msgstr "" -#: c-exp.y:1630 +#: c-exp.y:1645 msgid "\\x escape without a following hex digit" msgstr "" -#: c-exp.y:1680 +#: c-exp.y:1695 #, possible-c-format msgid "\\%c escape without a following hex digit" msgstr "" -#: c-exp.y:1847 macroexp.c:398 objc-exp.y:1513 p-exp.y:1375 +#: c-exp.y:1862 macroexp.c:397 objc-exp.y:1513 p-exp.y:1374 msgid "Unterminated string in expression." msgstr "" -#: c-exp.y:1849 linespec.c:1019 macroexp.c:344 objc-exp.y:1283 p-exp.y:1204 +#: c-exp.y:1864 linespec.c:1058 macroexp.c:343 objc-exp.y:1283 p-exp.y:1203 msgid "Unmatched single quote." msgstr "" -#: c-exp.y:2221 f-exp.y:1102 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1302 +#: c-exp.y:2236 f-exp.y:1101 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1301 #, possible-c-format msgid "Invalid number \"%s\"." msgstr "" -#: c-exp.y:2264 objc-exp.y:1270 p-exp.y:1191 +#: c-exp.y:2293 objc-exp.y:1270 p-exp.y:1190 msgid "Empty character constant." msgstr "" -#: c-exp.y:2272 objc-exp.y:1288 p-exp.y:1210 +#: c-exp.y:2301 objc-exp.y:1288 p-exp.y:1209 msgid "Invalid character constant." msgstr "" #. We must have come across a bad character (e.g. ';'). -#: c-exp.y:2281 f-exp.y:1136 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1387 +#: c-exp.y:2310 f-exp.y:1135 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1386 #, possible-c-format msgid "Invalid character '%c' in expression." msgstr "" -#: c-exp.y:2661 f-exp.y:1227 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1742 +#: c-exp.y:2690 f-exp.y:1226 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1741 #, possible-c-format msgid "A %s in expression, near `%s'." msgstr "" -#: c-lang.c:68 c-lang.c:1012 -msgid "unhandled c_string_type" +#: charset.c:217 +#, possible-c-format +msgid "The host character set is \"auto; currently %s\".\n" msgstr "" -#: c-lang.c:731 +#: charset.c:220 #, possible-c-format -msgid "Error reading string from inferior: %s" +msgid "The host character set is \"%s\".\n" msgstr "" -#: c-lang.c:765 +#: charset.c:230 #, possible-c-format -msgid "Trying to read string with inappropriate type `%s'." +msgid "The target character set is \"auto; currently %s\".\n" msgstr "" -#: c-lang.c:769 -msgid "Trying to read string with inappropriate type." +#: charset.c:234 +#, possible-c-format +msgid "The target character set is \"%s\".\n" msgstr "" -#: c-lang.c:870 -msgid "Malformed escape sequence" +#: charset.c:247 +#, possible-c-format +msgid "The target wide character set is \"auto; currently %s\".\n" msgstr "" -#: c-lang.c:897 -msgid "\\x used with no following hex digits." +#: charset.c:251 +#, possible-c-format +msgid "The target wide character set is \"%s\".\n" msgstr "" -#: c-lang.c:919 -msgid "\\u used with no following hex digits" +#: charset.c:326 charset.c:332 +#, possible-c-format +msgid "Cannot convert between character sets `%s' and `%s'" msgstr "" -#: c-lang.c:1071 -msgid "Could not convert character constant to target character set" +#: charset.c:488 charset.c:595 +msgid "Converting character sets" msgstr "" -#. To avoid memory corruption. -#: c-lang.c:1097 eval.c:992 -msgid "Too many array elements" +#: charset.c:524 +#, possible-c-format +msgid "Could not convert character to `%s' character set" msgstr "" -#: c-typeprint.c:334 -msgid "type not handled in c_type_print_varspec_prefix()" +#: charset.c:555 charset.c:696 +msgid "Internal error while converting character sets" msgstr "" -#: c-typeprint.c:692 -msgid "type not handled in c_type_print_varspec_suffix()" +#. No valid charset found, generate error here. +#: charset.c:1002 +msgid "Unable to find a vaild charset for string conversions" msgstr "" -#: c-typeprint.c:738 m2-typeprint.c:83 -msgid "" +#: charset.c:1045 +msgid "Set the host and target character sets." msgstr "" -#: c-typeprint.c:766 -msgid "" +#: charset.c:1046 +msgid "Show the host and target character sets." msgstr "" -#: c-typeprint.c:826 -msgid "\n" +#: charset.c:1047 +msgid "" +"The `host character set' is the one used by the system GDB is running on.\n" +"The `target character set' is the one used by the program being debugged.\n" +"You may only use supersets of ASCII for your host character set; GDB does\n" +"not support any others.\n" +"To see a list of the character sets GDB supports, type `set charset '." msgstr "" -#: c-typeprint.c:829 -msgid "\n" +#: charset.c:1061 +msgid "Set the host character set." msgstr "" -#: c-typeprint.c:1052 -#, possible-c-format -msgid " %s;\n" +#: charset.c:1062 +msgid "Show the host character set." msgstr "" -#: c-typeprint.c:1095 -#, possible-c-format -msgid "" +#: charset.c:1063 +msgid "" +"The `host character set' is the one used by the system GDB is running on.\n" +"You may only use supersets of ASCII for your host character set; GDB does\n" +"not support any others.\n" +"To see a list of the character sets GDB supports, type `set host-charset " +"'." msgstr "" -#: c-typeprint.c:1158 -#, possible-c-format -msgid " (Local at %s:%d)\n" +#: charset.c:1073 +msgid "Set the target character set." msgstr "" -#: c-typeprint.c:1217 -msgid "struct " +#: charset.c:1074 +msgid "Show the target character set." msgstr "" -#. This should not occur. -#: c-typeprint.c:1226 -msgid "" +#: charset.c:1075 +msgid "" +"The `target character set' is the one used by the program being debugged.\n" +"GDB translates characters and strings between the host and target\n" +"character sets as needed.\n" +"To see a list of the character sets GDB supports, type `set target-" +"charset'" msgstr "" -#. At least for dump_symtab, it is important that this not -#. be an error (). -#: c-typeprint.c:1248 -#, possible-c-format -msgid "" -msgstr "" - -#: c-valprint.c:177 -msgid "Could not determine the array high bound" -msgstr "" - -#: c-valprint.c:227 -#, possible-c-format -msgid "%d vtable entries" -msgstr "" - -#. This happens (without TYPE_FLAG_STUB set) on systems which -#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a -#. "struct foo *bar" and no complete type for struct foo in that -#. file. -#. This happens (without TYPE_FLAG_STUB set) on systems which don't use -#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar" -#. and no complete type for struct foo in that file. -#: c-valprint.c:597 m2-valprint.c:581 m2-valprint.c:661 valprint.c:361 -msgid "" -msgstr "" - -#: c-valprint.c:626 -#, possible-c-format -msgid "Invalid C/C++ type code %d in symbol table." -msgstr "" - -#: c-valprint.c:743 -msgid " [incomplete object]" -msgstr "" - -#: charset.c:218 -#, possible-c-format -msgid "The host character set is \"auto; currently %s\".\n" -msgstr "" - -#: charset.c:221 -#, possible-c-format -msgid "The host character set is \"%s\".\n" -msgstr "" - -#: charset.c:231 -#, possible-c-format -msgid "The target character set is \"auto; currently %s\".\n" -msgstr "" - -#: charset.c:235 -#, possible-c-format -msgid "The target character set is \"%s\".\n" -msgstr "" - -#: charset.c:248 -#, possible-c-format -msgid "The target wide character set is \"auto; currently %s\".\n" -msgstr "" - -#: charset.c:252 -#, possible-c-format -msgid "The target wide character set is \"%s\".\n" -msgstr "" - -#: charset.c:327 charset.c:333 -#, possible-c-format -msgid "Cannot convert between character sets `%s' and `%s'" -msgstr "" - -#: charset.c:489 charset.c:596 -msgid "Converting character sets" -msgstr "" - -#: charset.c:525 -#, possible-c-format -msgid "Could not convert character to `%s' character set" -msgstr "" - -#: charset.c:556 charset.c:697 -msgid "Internal error while converting character sets" -msgstr "" - -#. No valid charset found, generate error here. -#: charset.c:986 -msgid "Unable to find a vaild charset for string conversions" -msgstr "" - -#: charset.c:1029 -msgid "Set the host and target character sets." -msgstr "" - -#: charset.c:1030 -msgid "Show the host and target character sets." -msgstr "" - -#: charset.c:1031 -msgid "" -"The `host character set' is the one used by the system GDB is running on.\n" -"The `target character set' is the one used by the program being debugged.\n" -"You may only use supersets of ASCII for your host character set; GDB does\n" -"not support any others.\n" -"To see a list of the character sets GDB supports, type `set charset '." -msgstr "" - -#: charset.c:1045 -msgid "Set the host character set." -msgstr "" - -#: charset.c:1046 -msgid "Show the host character set." -msgstr "" - -#: charset.c:1047 -msgid "" -"The `host character set' is the one used by the system GDB is running on.\n" -"You may only use supersets of ASCII for your host character set; GDB does\n" -"not support any others.\n" -"To see a list of the character sets GDB supports, type `set host-charset " -"'." -msgstr "" - -#: charset.c:1057 -msgid "Set the target character set." -msgstr "" - -#: charset.c:1058 -msgid "Show the target character set." -msgstr "" - -#: charset.c:1059 -msgid "" -"The `target character set' is the one used by the program being debugged.\n" -"GDB translates characters and strings between the host and target\n" -"character sets as needed.\n" -"To see a list of the character sets GDB supports, type `set target-" -"charset'" -msgstr "" - -#: charset.c:1070 +#: charset.c:1086 msgid "Set the target wide character set." msgstr "" -#: charset.c:1071 +#: charset.c:1087 msgid "Show the target wide character set." msgstr "" -#: charset.c:1072 +#: charset.c:1088 msgid "" "The `target wide character set' is the one used by the program being " "debugged.\n" @@ -4067,454 +3957,244 @@ "`set target-wide-charset'" msgstr "" -#: cli/cli-utils.c:53 -msgid "History value must have integer type." -msgstr "" - -#: cli/cli-utils.c:74 -msgid "Convenience variable must have integer value.\n" -msgstr "" - -#: cli/cli-utils.c:151 -msgid "inverted range" -msgstr "" - -#: cli/cli-utils.c:165 -msgid "negative value" -msgstr "" - -#: cli/cli-utils.c:207 -msgid "Args must be numbers or '$' variables." -msgstr "" - -#: cli/cli-logging.c:46 -#, possible-c-format -msgid "The current logfile is \"%s\".\n" -msgstr "" - -#: cli/cli-logging.c:56 -#, possible-c-format -msgid "" -"Currently logging to %s. Turn the logging off and on to make the new " -"setting effective." -msgstr "" - -#: cli/cli-logging.c:65 -#, possible-c-format -msgid "Whether logging overwrites or appends to the log file is %s.\n" -msgstr "" - -#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198 -msgid "set logging" -msgstr "" - -#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:492 -msgid "Current output protocol does not support redirection" -msgstr "" - -#: cli/cli-logging.c:143 -#, possible-c-format -msgid "The logging output mode is %s.\n" -msgstr "" - -#: cli/cli-logging.c:262 -msgid "" -"\"set logging\" lets you log output to a file.\n" -"Usage: set logging on [FILENAME]\n" -" set logging off\n" -" set logging file FILENAME\n" -" set logging overwrite [on|off]\n" -" set logging redirect [on|off]\n" -msgstr "" - -#: cli/cli-logging.c:274 -#, possible-c-format -msgid "Currently logging to \"%s\".\n" -msgstr "" - -#: cli/cli-logging.c:277 -#, possible-c-format -msgid "Future logs will be written to %s.\n" -msgstr "" - -#: cli/cli-logging.c:281 -msgid "Logs will overwrite the log file.\n" -msgstr "" - -#: cli/cli-logging.c:283 -msgid "Logs will be appended to the log file.\n" -msgstr "" - -#: cli/cli-logging.c:288 -msgid "Output is being sent only to the log file.\n" -msgstr "" - -#: cli/cli-logging.c:290 -msgid "Output is being logged and displayed.\n" -msgstr "" - -#: cli/cli-logging.c:295 -msgid "Output will be sent only to the log file.\n" -msgstr "" - -#: cli/cli-logging.c:297 -msgid "Output will be logged and displayed.\n" -msgstr "" - -#: cli/cli-logging.c:310 -msgid "Set logging options" -msgstr "" - -#: cli/cli-logging.c:313 -msgid "Show logging options" -msgstr "" - -#: cli/cli-logging.c:315 -msgid "Set whether logging overwrites or appends to the log file." -msgstr "" - -#: cli/cli-logging.c:316 -msgid "Show whether logging overwrites or appends to the log file." -msgstr "" - -#: cli/cli-logging.c:317 -msgid "If set, logging overrides the log file." -msgstr "" - -#: cli/cli-logging.c:322 -msgid "Set the logging output mode." -msgstr "" - -#: cli/cli-logging.c:323 -msgid "Show the logging output mode." -msgstr "" - -#: cli/cli-logging.c:324 -msgid "" -"If redirect is off, output will go to both the screen and the log file.\n" -"If redirect is on, output will go only to the log file." -msgstr "" - -#: cli/cli-logging.c:330 -msgid "Set the current logfile." -msgstr "" - -#: cli/cli-logging.c:331 -msgid "Show the current logfile." -msgstr "" - -#: cli/cli-logging.c:332 -msgid "The logfile is used when directing GDB's output." -msgstr "" - -#: cli/cli-logging.c:338 -msgid "Enable logging." -msgstr "" - -#: cli/cli-logging.c:340 -msgid "Disable logging." -msgstr "" - -#: cli/cli-script.c:91 -msgid "if/while commands require arguments." -msgstr "" - -#: cli/cli-script.c:126 -msgid "Error reading in canned sequence of commands." -msgstr "" - -#: cli/cli-script.c:328 -msgid "Max user call depth exceeded -- command aborted." -msgstr "" - -#: cli/cli-script.c:347 -msgid "Error executing canned sequence of commands." -msgstr "" - -#: cli/cli-script.c:574 -msgid "Invalid control type in canned commands structure." -msgstr "" - -#: cli/cli-script.c:638 -msgid "arg_cleanup called with no user args.\n" +#: c-lang.c:68 c-lang.c:616 +msgid "unhandled c_string_type" msgstr "" -#: cli/cli-script.c:677 +#: c-lang.c:335 #, possible-c-format -msgid "user defined function may only have %d arguments." +msgid "Error reading string from inferior: %s" msgstr "" -#: cli/cli-script.c:776 +#: c-lang.c:369 #, possible-c-format -msgid "Missing argument %d in user function." -msgstr "" - -#: cli/cli-script.c:876 -msgid "Control nesting too deep!" -msgstr "" - -#: cli/cli-script.c:1072 -msgid "Recursed on a simple control type." -msgstr "" - -#: cli/cli-script.c:1075 -msgid "Allocated body is smaller than this command type needs." +msgid "Trying to read string with inappropriate type `%s'." msgstr "" -#: cli/cli-script.c:1370 -msgid "name of command to define" +#: c-lang.c:373 +msgid "Trying to read string with inappropriate type." msgstr "" -#: cli/cli-script.c:1392 -#, possible-c-format -msgid "\"%s\" is not a prefix command." +#: c-lang.c:474 +msgid "Malformed escape sequence" msgstr "" -#: cli/cli-script.c:1403 -#, possible-c-format -msgid "Junk in argument list: \"%s\"" +#: c-lang.c:501 +msgid "\\x used with no following hex digits." msgstr "" -#: cli/cli-script.c:1452 -#, possible-c-format -msgid "Redefine command \"%s\"? " +#: c-lang.c:523 +msgid "\\u used with no following hex digits" msgstr "" -#: cli/cli-script.c:1454 -#, possible-c-format -msgid "Really redefine built-in command \"%s\"? " +#: c-lang.c:675 +msgid "Could not convert character constant to target character set" msgstr "" -#: cli/cli-script.c:1456 -#, possible-c-format -msgid "Command \"%s\" not redefined." +#. To avoid memory corruption. +#: c-lang.c:701 eval.c:1011 +msgid "Too many array elements" msgstr "" -#: cli/cli-script.c:1483 +#: cli/cli-cmds.c:219 #, possible-c-format -msgid "Your new `%s' command does not hook any existing command." +msgid "Argument required (%s)." msgstr "" -#: cli/cli-script.c:1486 -msgid "Proceed? " +#: cli/cli-cmds.c:229 +msgid "\"info\" must be followed by the name of an info command.\n" msgstr "" -#: cli/cli-script.c:1487 cli/cli-cmds.c:341 infcmd.c:1119 infcmd.c:1133 -#: infcmd.c:2236 symfile.c:1104 symfile.c:1269 symfile.c:2359 -#: tracepoint.c:1915 tracepoint.c:1921 +#: cli/cli-cmds.c:336 cli/cli-script.c:1501 infcmd.c:1140 infcmd.c:1154 +#: infcmd.c:2288 symfile.c:1103 symfile.c:1268 symfile.c:2360 +#: tracepoint.c:2165 tracepoint.c:2171 msgid "Not confirmed." msgstr "" -#. Should never come here as hookc would be 0. -#: cli/cli-script.c:1527 complaints.c:305 exceptions.c:153 exceptions.c:170 -#: exceptions.c:197 exceptions.c:263 hppa-tdep.c:3099 hppa-tdep.c:3112 -#: infcall.c:672 infcmd.c:1415 infrun.c:3238 language.c:798 language.c:824 -#: mi/mi-out.c:332 mi/mi-out.c:351 mips-tdep.c:256 mips-tdep.c:313 -#: mips-tdep.c:1427 mips-tdep.c:4118 mips-tdep.c:5105 mn10300-tdep.c:127 -#: reggroups.c:220 remote.c:6408 utils.c:1187 utils.c:1206 -msgid "bad switch" -msgstr "" - -#: cli/cli-script.c:1547 -#, possible-c-format -msgid "Command \"%s\" is built-in." -msgstr "" - -#: cli/cli-script.c:1614 -msgid "called with NULL file pointer!" -msgstr "" - -#: cli/cli-script.c:1642 -#, possible-c-format -msgid "" -"%s:%d: Error in sourced command file:\n" -"%s" -msgstr "" - -#: cli/cli-script.c:1645 -msgid "bad reason" -msgstr "" - -#: cli/cli-decode.c:1297 -#, possible-c-format -msgid "Undefined %scommand: \"%s\". Try \"help%s%.*s\"." -msgstr "" - -#: cli/cli-decode.c:1330 -#, possible-c-format -msgid "Lack of needed %scommand" -msgstr "" - -#: cli/cli-decode.c:1395 -#, possible-c-format -msgid "Ambiguous %scommand \"%s\": %s." -msgstr "" - -#: cli/cli-decode.c:1779 -msgid "Invalid command" -msgstr "" - -#: cli/cli-cmds.c:214 -#, possible-c-format -msgid "Argument required (%s)." -msgstr "" - -#: cli/cli-cmds.c:224 -msgid "\"info\" must be followed by the name of an info command.\n" -msgstr "" - -#: cli/cli-cmds.c:352 +#: cli/cli-cmds.c:347 #, possible-c-format msgid "The \"pwd\" command does not take an argument: %s" msgstr "" -#: cli/cli-cmds.c:354 +#: cli/cli-cmds.c:349 #, possible-c-format msgid "Error finding name of working directory: %s" msgstr "" -#: cli/cli-cmds.c:358 +#: cli/cli-cmds.c:353 #, possible-c-format msgid "" "Working directory %s\n" " (canonically %s).\n" msgstr "" -#: cli/cli-cmds.c:361 +#: cli/cli-cmds.c:356 #, possible-c-format msgid "Working directory %s.\n" msgstr "" -#: cli/cli-cmds.c:377 +#: cli/cli-cmds.c:372 msgid "new working directory" msgstr "" -#: cli/cli-cmds.c:473 +#: cli/cli-cmds.c:468 #, possible-c-format msgid "Script filename extension recognition is \"%s\".\n" msgstr "" -#: cli/cli-cmds.c:575 +#: cli/cli-cmds.c:572 msgid "source command requires file name of file to source." msgstr "" -#: cli/cli-cmds.c:756 +#: cli/cli-cmds.c:757 msgid "Fork failed" msgstr "" -#: cli/cli-cmds.c:782 +#: cli/cli-cmds.c:783 msgid "No default source file yet." msgstr "" -#: cli/cli-cmds.c:808 cli/cli-cmds.c:970 +#: cli/cli-cmds.c:810 cli/cli-cmds.c:975 msgid "Junk at end of line specification." msgstr "" #. FIXME-32x64--assumes sal.pc fits in long. -#: cli/cli-cmds.c:820 cli/cli-cmds.c:989 +#: cli/cli-cmds.c:822 cli/cli-cmds.c:994 #, possible-c-format msgid "No source file for address %s." msgstr "" -#: cli/cli-cmds.c:840 cli/cli-cmds.c:1010 +#: cli/cli-cmds.c:842 cli/cli-cmds.c:1015 #, possible-c-format msgid "No line number known for %s." msgstr "" -#: cli/cli-cmds.c:974 +#: cli/cli-cmds.c:979 msgid "Specified start and end are in different files." msgstr "" -#: cli/cli-cmds.c:976 +#: cli/cli-cmds.c:981 msgid "Two empty args do not say what lines to list." msgstr "" -#: cli/cli-cmds.c:1019 cli/cli-cmds.c:1025 +#: cli/cli-cmds.c:1024 cli/cli-cmds.c:1030 msgid "No default source file yet. Do \"help list\"." msgstr "" #. Assume g++ compiled code; old GDB 4.16 behaviour. -#: cli/cli-cmds.c:1091 dwarf2loc.c:1002 python/py-symbol.c:278 stack.c:1740 -#: stack.c:1748 stack.c:1822 valops.c:1495 +#: cli/cli-cmds.c:1096 dwarf2loc.c:1862 python/py-symbol.c:295 stack.c:2050 +#: stack.c:2058 stack.c:2132 valops.c:1499 msgid "No frame selected." msgstr "" -#: cli/cli-cmds.c:1095 tui/tui-stack.c:383 +#: cli/cli-cmds.c:1100 msgid "No function contains program counter for selected frame." msgstr "" -#: cli/cli-cmds.c:1139 +#: cli/cli-cmds.c:1144 msgid "Missing modifier." msgstr "" -#: cli/cli-cmds.c:1152 -msgid "Invalid disassembly modifier." +#: cli/cli-cmds.c:1157 +msgid "Invalid disassembly modifier." +msgstr "" + +#: cli/cli-cmds.c:1179 +msgid "No function contains specified address." +msgstr "" + +#: cli/cli-cmds.c:1239 +msgid "Not a user command." +msgstr "" + +#: cli/cli-cmds.c:1262 +msgid "REGEXP string is empty" +msgstr "" + +#: cli/cli-cmds.c:1278 +#, possible-c-format +msgid "Error in regular expression: %s" +msgstr "" + +#: cli/cli-cmds.c:1340 +msgid "Usage: alias [-a] [--] ALIAS = COMMAND" +msgstr "" + +#: cli/cli-cmds.c:1379 +#, possible-c-format +msgid "Invalid command name: %s" +msgstr "" + +#: cli/cli-cmds.c:1381 +#, possible-c-format +msgid "Invalid command element name: %s" msgstr "" -#: cli/cli-cmds.c:1174 -msgid "No function contains specified address." +#: cli/cli-cmds.c:1395 +#, possible-c-format +msgid "Invalid command to alias to: %s" msgstr "" -#: cli/cli-cmds.c:1234 -msgid "Not a user command." +#: cli/cli-cmds.c:1402 +#, possible-c-format +msgid "Alias already exists: %s" msgstr "" -#: cli/cli-cmds.c:1257 -msgid "REGEXP string is empty" +#: cli/cli-cmds.c:1427 +msgid "Mismatched command length between ALIAS and COMMAND." msgstr "" -#: cli/cli-cmds.c:1273 -#, possible-c-format -msgid "Error in regular expression: %s" +#: cli/cli-cmds.c:1447 +msgid "ALIAS and COMMAND prefixes do not match." msgstr "" -#: cli/cli-cmds.c:1288 +#: cli/cli-cmds.c:1467 #, possible-c-format msgid "file: \"%s\", line number: %d\n" msgstr "" -#: cli/cli-cmds.c:1295 +#: cli/cli-cmds.c:1553 msgid "\"set debug\" must be followed by the name of a debug subcommand.\n" msgstr "" -#: cli/cli-cmds.c:1342 +#: cli/cli-cmds.c:1601 #, possible-c-format msgid "Verbose printing of informational messages is %s.\n" msgstr "" -#: cli/cli-cmds.c:1345 +#: cli/cli-cmds.c:1604 #, possible-c-format msgid "Verbosity is %s.\n" msgstr "" -#: cli/cli-cmds.c:1352 +#: cli/cli-cmds.c:1611 #, possible-c-format msgid "History expansion on command input is %s.\n" msgstr "" -#: cli/cli-cmds.c:1360 +#: cli/cli-cmds.c:1619 #, possible-c-format msgid "Baud rate for remote serial I/O is %s.\n" msgstr "" -#: cli/cli-cmds.c:1368 +#: cli/cli-cmds.c:1627 #, possible-c-format msgid "Debugging of remote protocol is %s.\n" msgstr "" -#: cli/cli-cmds.c:1377 +#: cli/cli-cmds.c:1636 #, possible-c-format msgid "Timeout limit to wait for target to respond is %s.\n" msgstr "" -#: cli/cli-cmds.c:1386 +#: cli/cli-cmds.c:1645 #, possible-c-format msgid "The max call depth for user-defined commands is %s.\n" msgstr "" #. Define the classes of commands. -#. They will appear in the help list in the reverse of this order. -#: cli/cli-cmds.c:1400 +#. They will appear in the help list in alphabetical order. +#: cli/cli-cmds.c:1659 msgid "" "Maintenance commands.\n" "Some gdb commands are provided just for use by gdb maintainers.\n" @@ -4522,42 +4202,42 @@ "well documented as user commands." msgstr "" -#: cli/cli-cmds.c:1406 +#: cli/cli-cmds.c:1665 msgid "Obscure features." msgstr "" -#: cli/cli-cmds.c:1408 +#: cli/cli-cmds.c:1667 msgid "Aliases of other commands." msgstr "" -#: cli/cli-cmds.c:1409 +#: cli/cli-cmds.c:1668 msgid "" "User-defined commands.\n" "The commands in this class are those defined by the user.\n" "Use the \"define\" command to define a command." msgstr "" -#: cli/cli-cmds.c:1413 +#: cli/cli-cmds.c:1672 msgid "Support facilities." msgstr "" -#: cli/cli-cmds.c:1415 +#: cli/cli-cmds.c:1674 msgid "Status inquiries." msgstr "" -#: cli/cli-cmds.c:1416 +#: cli/cli-cmds.c:1675 msgid "Specifying and examining files." msgstr "" -#: cli/cli-cmds.c:1419 +#: cli/cli-cmds.c:1678 msgid "Making program stop at certain points." msgstr "" -#: cli/cli-cmds.c:1420 +#: cli/cli-cmds.c:1679 msgid "Examining data." msgstr "" -#: cli/cli-cmds.c:1421 +#: cli/cli-cmds.c:1680 msgid "" "Examining the stack.\n" "The stack is made up of stack frames. Gdb assigns numbers to stack frames\n" @@ -4569,23 +4249,23 @@ "The commands below can be used to select other frames by number or address." msgstr "" -#: cli/cli-cmds.c:1430 +#: cli/cli-cmds.c:1689 msgid "Running the program." msgstr "" #. Define general commands. -#: cli/cli-cmds.c:1434 +#: cli/cli-cmds.c:1693 msgid "Print working directory. This is used for your program as well." msgstr "" -#: cli/cli-cmds.c:1437 +#: cli/cli-cmds.c:1696 msgid "" "Set working directory to DIR for debugger and program being debugged.\n" "The change does not take effect for the program being debugged\n" "until the next time it is started." msgstr "" -#: cli/cli-cmds.c:1443 +#: cli/cli-cmds.c:1702 msgid "" "Print a constant string. Give string as argument.\n" "C escape sequences may be used in the argument.\n" @@ -4596,14 +4276,14 @@ "to be printed or after trailing whitespace." msgstr "" -#: cli/cli-cmds.c:1451 +#: cli/cli-cmds.c:1710 msgid "" "Document a user-defined command.\n" "Give command name as argument. Give documentation on following lines.\n" "End with a line of just \"end\"." msgstr "" -#: cli/cli-cmds.c:1455 +#: cli/cli-cmds.c:1714 msgid "" "Define a new command name. Command name is argument.\n" "Definition appears on following lines, one command per line.\n" @@ -4612,7 +4292,7 @@ "Commands defined in this way may have up to ten arguments." msgstr "" -#: cli/cli-cmds.c:1462 +#: cli/cli-cmds.c:1721 #, possible-c-format msgid "" "Read commands from a file named FILE.\n" @@ -4626,15 +4306,15 @@ "when GDB is started." msgstr "" -#: cli/cli-cmds.c:1477 +#: cli/cli-cmds.c:1736 msgid "Set mode for script filename extension recognition." msgstr "" -#: cli/cli-cmds.c:1478 +#: cli/cli-cmds.c:1737 msgid "Show mode for script filename extension recognition." msgstr "" -#: cli/cli-cmds.c:1479 +#: cli/cli-cmds.c:1738 msgid "" "off == no filename extension recognition (all sourced files are GDB " "scripts)\n" @@ -4644,71 +4324,71 @@ "supported" msgstr "" -#: cli/cli-cmds.c:1489 +#: cli/cli-cmds.c:1748 msgid "Exit gdb." msgstr "" -#: cli/cli-cmds.c:1491 +#: cli/cli-cmds.c:1750 msgid "Print list of commands." msgstr "" -#: cli/cli-cmds.c:1496 +#: cli/cli-cmds.c:1755 msgid "Set verbosity." msgstr "" -#: cli/cli-cmds.c:1497 +#: cli/cli-cmds.c:1756 msgid "Show verbosity." msgstr "" -#: cli/cli-cmds.c:1504 +#: cli/cli-cmds.c:1763 msgid "Generic command for setting command history parameters." msgstr "" -#: cli/cli-cmds.c:1507 +#: cli/cli-cmds.c:1766 msgid "Generic command for showing command history parameters." msgstr "" -#: cli/cli-cmds.c:1510 +#: cli/cli-cmds.c:1769 msgid "Set history expansion on command input." msgstr "" -#: cli/cli-cmds.c:1511 +#: cli/cli-cmds.c:1770 msgid "Show history expansion on command input." msgstr "" -#: cli/cli-cmds.c:1512 +#: cli/cli-cmds.c:1771 msgid "Without an argument, history expansion is enabled." msgstr "" -#: cli/cli-cmds.c:1518 +#: cli/cli-cmds.c:1777 msgid "Generic command for showing things about the program being debugged." msgstr "" -#: cli/cli-cmds.c:1525 +#: cli/cli-cmds.c:1784 msgid "List the completions for the rest of the line as a command." msgstr "" -#: cli/cli-cmds.c:1527 +#: cli/cli-cmds.c:1786 msgid "Generic command for showing things about the debugger." msgstr "" #. Another way to get at the same thing. -#: cli/cli-cmds.c:1531 +#: cli/cli-cmds.c:1790 msgid "Show all GDB settings." msgstr "" -#: cli/cli-cmds.c:1533 +#: cli/cli-cmds.c:1792 msgid "" "Show the history of commands you typed.\n" "You can supply a command number to start with, or a `+' to start after\n" "the previous command number shown." msgstr "" -#: cli/cli-cmds.c:1540 +#: cli/cli-cmds.c:1799 msgid "Show what version of GDB this is." msgstr "" -#: cli/cli-cmds.c:1542 +#: cli/cli-cmds.c:1801 msgid "" "Execute nested commands WHILE the conditional expression is non zero.\n" "The conditional expression must follow the word `while' and must in turn be\n" @@ -4716,7 +4396,7 @@ "and should be terminated by the word `end'." msgstr "" -#: cli/cli-cmds.c:1548 +#: cli/cli-cmds.c:1807 msgid "" "Execute nested commands once IF the conditional expression is non zero.\n" "The conditional expression must follow the word `if' and must in turn be\n" @@ -4727,63 +4407,63 @@ #. If target is open when baud changes, it doesn't take effect until #. the next open (I think, not sure). -#: cli/cli-cmds.c:1557 +#: cli/cli-cmds.c:1816 msgid "Set baud rate for remote serial I/O." msgstr "" -#: cli/cli-cmds.c:1558 +#: cli/cli-cmds.c:1817 msgid "Show baud rate for remote serial I/O." msgstr "" -#: cli/cli-cmds.c:1559 +#: cli/cli-cmds.c:1818 msgid "" "This value is used to set the speed of the serial port when debugging\n" "using remote targets." msgstr "" -#: cli/cli-cmds.c:1566 +#: cli/cli-cmds.c:1825 msgid "Set debugging of remote protocol." msgstr "" -#: cli/cli-cmds.c:1567 +#: cli/cli-cmds.c:1826 msgid "Show debugging of remote protocol." msgstr "" -#: cli/cli-cmds.c:1568 +#: cli/cli-cmds.c:1827 msgid "" "When enabled, each packet sent or received with the remote target\n" "is displayed." msgstr "" -#: cli/cli-cmds.c:1575 +#: cli/cli-cmds.c:1834 msgid "Set timeout limit to wait for target to respond." msgstr "" -#: cli/cli-cmds.c:1576 +#: cli/cli-cmds.c:1835 msgid "Show timeout limit to wait for target to respond." msgstr "" -#: cli/cli-cmds.c:1577 +#: cli/cli-cmds.c:1836 msgid "" "This value is used to set the time limit for gdb to wait for a response\n" "from the target." msgstr "" -#: cli/cli-cmds.c:1585 +#: cli/cli-cmds.c:1844 msgid "Generic command for setting gdb debugging flags" msgstr "" -#: cli/cli-cmds.c:1589 +#: cli/cli-cmds.c:1848 msgid "Generic command for showing gdb debugging flags" msgstr "" -#: cli/cli-cmds.c:1592 +#: cli/cli-cmds.c:1851 msgid "" "Execute the rest of the line as a shell command.\n" "With no arguments, run an inferior shell." msgstr "" -#: cli/cli-cmds.c:1597 +#: cli/cli-cmds.c:1856 msgid "" "Edit specified file or function.\n" "With no argument, edits file containing most recent line listed.\n" @@ -4795,7 +4475,7 @@ "Uses EDITOR environment variable contents as editor (or ex as default)." msgstr "" -#: cli/cli-cmds.c:1609 +#: cli/cli-cmds.c:1868 msgid "" "List specified function or line.\n" "With no argument, lists ten more lines after or around previous listing.\n" @@ -4812,7 +4492,7 @@ "arg." msgstr "" -#: cli/cli-cmds.c:1632 +#: cli/cli-cmds.c:1891 msgid "" "Disassemble a specified section of memory.\n" "Default is the function surrounding the pc of the selected frame.\n" @@ -4824,394 +4504,705 @@ " in the form of \"start,end\", or \"start,+length\"." msgstr "" -#: cli/cli-cmds.c:1653 +#: cli/cli-cmds.c:1905 msgid "Run the ``make'' program using the rest of the line as arguments." msgstr "" -#: cli/cli-cmds.c:1656 +#: cli/cli-cmds.c:1908 msgid "" "Show definitions of user defined commands.\n" "Argument is the name of the user defined command.\n" "With no argument, show definitions of all user defined commands." msgstr "" -#: cli/cli-cmds.c:1661 +#: cli/cli-cmds.c:1913 msgid "Search for commands matching a REGEXP" msgstr "" -#: cli/cli-cmds.c:1664 +#: cli/cli-cmds.c:1916 msgid "Set the max call depth for user-defined commands." msgstr "" -#: cli/cli-cmds.c:1665 +#: cli/cli-cmds.c:1917 msgid "Show the max call depth for user-defined commands." msgstr "" -#: cli/cli-cmds.c:1671 -msgid "Set tracing of GDB CLI commands." +#: cli/cli-cmds.c:1923 +msgid "Set tracing of GDB CLI commands." +msgstr "" + +#: cli/cli-cmds.c:1924 +msgid "Show state of GDB CLI command tracing." +msgstr "" + +#: cli/cli-cmds.c:1925 +msgid "When 'on', each command is displayed as it is executed." +msgstr "" + +#: cli/cli-cmds.c:1931 +msgid "" +"Define a new command that is an alias of an existing command.\n" +"Usage: alias [-a] [--] ALIAS = COMMAND\n" +"ALIAS is the name of the alias command to create.\n" +"COMMAND is the command being aliased to.\n" +"If \"-a\" is specified, the command is an abbreviation,\n" +"and will not appear in help command list output.\n" +"\n" +"Examples:\n" +"Make \"spe\" an alias of \"set print elements\":\n" +" alias spe = set print elements\n" +"Make \"elms\" an alias of \"elements\" in the \"set print\" command:\n" +" alias -a set print elms = set print elements" +msgstr "" + +#: cli/cli-decode.c:1330 +#, possible-c-format +msgid "Undefined %scommand: \"%s\". Try \"help%s%.*s\"." +msgstr "" + +#: cli/cli-decode.c:1363 +#, possible-c-format +msgid "Lack of needed %scommand" +msgstr "" + +#: cli/cli-decode.c:1428 +#, possible-c-format +msgid "Ambiguous %scommand \"%s\": %s." +msgstr "" + +#: cli/cli-decode.c:1812 +msgid "Invalid command" +msgstr "" + +#: cli/cli-dump.c:75 +msgid "Missing filename." +msgstr "" + +#: cli/cli-dump.c:116 cli/cli-dump.c:136 +#, possible-c-format +msgid "Failed to open %s: %s." +msgstr "" + +#: cli/cli-dump.c:121 +#, possible-c-format +msgid "'%s' is not a recognized file format." +msgstr "" + +#: cli/cli-dump.c:140 +#, possible-c-format +msgid "bfd_openw_with_cleanup: %s." +msgstr "" + +#. Append to existing file. +#. FIXME -- doesn't work... +#: cli/cli-dump.c:144 +msgid "bfd_openw does not work with append." +msgstr "" + +#: cli/cli-dump.c:147 +#, possible-c-format +msgid "bfd_openw_with_cleanup: unknown mode %s." +msgstr "" + +#: cli/cli-dump.c:163 +msgid "" +"\"dump\" must be followed by a subcommand.\n" +"\n" +msgstr "" + +#: cli/cli-dump.c:170 +msgid "" +"\"append\" must be followed by a subcommand.\n" +"\n" +msgstr "" + +#: cli/cli-dump.c:205 +#, possible-c-format +msgid "writing dump file '%s' (%s)" +msgstr "" + +#: cli/cli-dump.c:226 +msgid "Missing start address." +msgstr "" + +#: cli/cli-dump.c:231 +msgid "Missing stop address." +msgstr "" + +#: cli/cli-dump.c:237 +msgid "Invalid memory address range (start >= end)." +msgstr "" + +#: cli/cli-dump.c:277 +#, possible-c-format +msgid "No value to %s." +msgstr "" + +#: cli/cli-dump.c:280 +msgid "Invalid expression." +msgstr "" + +#: cli/cli-dump.c:299 +msgid "value is not an lval: address assumed to be zero" +msgstr "" + +#. No, no useable data in this section. +#: cli/cli-dump.c:459 +#, possible-c-format +msgid "skipping section %s...\n" +msgstr "" + +#: cli/cli-dump.c:478 +#, possible-c-format +msgid "Failed to read bfd file %s: '%s'." +msgstr "" + +#: cli/cli-dump.c:501 cli/cli-dump.c:553 +#, possible-c-format +msgid "restore: memory write failed (%s)." +msgstr "" + +#: cli/cli-dump.c:524 +#, possible-c-format +msgid "Start address is greater than length of binary file %s." +msgstr "" + +#: cli/cli-dump.c:599 +msgid "Start must be less than end." +msgstr "" + +#: cli/cli-dump.c:668 +msgid "Dump target code/data to a local file." +msgstr "" + +#: cli/cli-dump.c:673 +msgid "Append target code/data to a local file." +msgstr "" + +#: cli/cli-dump.c:689 +msgid "Write target code/data to an srec file." +msgstr "" + +#: cli/cli-dump.c:695 +msgid "Write target code/data to an intel hex file." +msgstr "" + +#: cli/cli-dump.c:701 +msgid "Write target code/data to a tekhex file." +msgstr "" + +#: cli/cli-dump.c:707 +msgid "Write target code/data to a raw binary file." +msgstr "" + +#: cli/cli-dump.c:713 +msgid "Append target code/data to a raw binary file." +msgstr "" + +#: cli/cli-dump.c:718 +msgid "" +"Write contents of memory to an srec file.\n" +"Arguments are FILE START STOP. Writes the contents of memory\n" +"within the range [START .. STOP) to the specified FILE in srec format." +msgstr "" + +#: cli/cli-dump.c:724 +msgid "" +"Write the value of an expression to an srec file.\n" +"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" +"to the specified FILE in srec format." +msgstr "" + +#: cli/cli-dump.c:730 +msgid "" +"Write contents of memory to an ihex file.\n" +"Arguments are FILE START STOP. Writes the contents of memory within\n" +"the range [START .. STOP) to the specified FILE in intel hex format." +msgstr "" + +#: cli/cli-dump.c:736 +msgid "" +"Write the value of an expression to an ihex file.\n" +"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" +"to the specified FILE in intel hex format." +msgstr "" + +#: cli/cli-dump.c:742 +msgid "" +"Write contents of memory to a tekhex file.\n" +"Arguments are FILE START STOP. Writes the contents of memory\n" +"within the range [START .. STOP) to the specified FILE in tekhex format." +msgstr "" + +#: cli/cli-dump.c:748 +msgid "" +"Write the value of an expression to a tekhex file.\n" +"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" +"to the specified FILE in tekhex format." +msgstr "" + +#: cli/cli-dump.c:754 +msgid "" +"Write contents of memory to a raw binary file.\n" +"Arguments are FILE START STOP. Writes the contents of memory\n" +"within the range [START .. STOP) to the specified FILE in binary format." +msgstr "" + +#: cli/cli-dump.c:760 +msgid "" +"Write the value of an expression to a raw binary file.\n" +"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" +"to the specified FILE in raw target ordered bytes." +msgstr "" + +#: cli/cli-dump.c:766 +msgid "" +"Append contents of memory to a raw binary file.\n" +"Arguments are FILE START STOP. Writes the contents of memory within the\n" +"range [START .. STOP) to the specified FILE in raw target ordered bytes." +msgstr "" + +#: cli/cli-dump.c:772 +msgid "" +"Append the value of an expression to a raw binary file.\n" +"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" +"to the specified FILE in raw target ordered bytes." +msgstr "" + +#: cli/cli-dump.c:778 +msgid "" +"Restore the contents of FILE to target memory.\n" +"Arguments are FILE OFFSET START END where all except FILE are optional.\n" +"OFFSET will be added to the base address of the file (default zero).\n" +"If START and END are given, only the file contents within that range\n" +"(file relative) will be restored to target memory." +msgstr "" + +#: cli/cli-logging.c:45 +#, possible-c-format +msgid "The current logfile is \"%s\".\n" +msgstr "" + +#: cli/cli-logging.c:55 +#, possible-c-format +msgid "" +"Currently logging to %s. Turn the logging off and on to make the new " +"setting effective." +msgstr "" + +#: cli/cli-logging.c:64 +#, possible-c-format +msgid "Whether logging overwrites or appends to the log file is %s.\n" +msgstr "" + +#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198 +msgid "set logging" +msgstr "" + +#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:522 +msgid "Current output protocol does not support redirection" +msgstr "" + +#: cli/cli-logging.c:143 +#, possible-c-format +msgid "The logging output mode is %s.\n" +msgstr "" + +#: cli/cli-logging.c:262 +msgid "" +"\"set logging\" lets you log output to a file.\n" +"Usage: set logging on [FILENAME]\n" +" set logging off\n" +" set logging file FILENAME\n" +" set logging overwrite [on|off]\n" +" set logging redirect [on|off]\n" +msgstr "" + +#: cli/cli-logging.c:274 +#, possible-c-format +msgid "Currently logging to \"%s\".\n" +msgstr "" + +#: cli/cli-logging.c:277 +#, possible-c-format +msgid "Future logs will be written to %s.\n" +msgstr "" + +#: cli/cli-logging.c:281 +msgid "Logs will overwrite the log file.\n" +msgstr "" + +#: cli/cli-logging.c:283 +msgid "Logs will be appended to the log file.\n" +msgstr "" + +#: cli/cli-logging.c:288 +msgid "Output is being sent only to the log file.\n" msgstr "" -#: cli/cli-cmds.c:1672 -msgid "Show state of GDB CLI command tracing." +#: cli/cli-logging.c:290 +msgid "Output is being logged and displayed.\n" msgstr "" -#: cli/cli-cmds.c:1673 -msgid "When 'on', each command is displayed as it is executed." +#: cli/cli-logging.c:295 +msgid "Output will be sent only to the log file.\n" msgstr "" -#: cli/cli-dump.c:76 -msgid "Missing filename." +#: cli/cli-logging.c:297 +msgid "Output will be logged and displayed.\n" msgstr "" -#: cli/cli-dump.c:117 cli/cli-dump.c:137 -#, possible-c-format -msgid "Failed to open %s: %s." +#: cli/cli-logging.c:310 +msgid "Set logging options" msgstr "" -#: cli/cli-dump.c:122 -#, possible-c-format -msgid "'%s' is not a recognized file format." +#: cli/cli-logging.c:313 +msgid "Show logging options" msgstr "" -#: cli/cli-dump.c:141 -#, possible-c-format -msgid "bfd_openw_with_cleanup: %s." +#: cli/cli-logging.c:315 +msgid "Set whether logging overwrites or appends to the log file." msgstr "" -#. Append to existing file. -#. FIXME -- doesn't work... -#: cli/cli-dump.c:145 -msgid "bfd_openw does not work with append." +#: cli/cli-logging.c:316 +msgid "Show whether logging overwrites or appends to the log file." msgstr "" -#: cli/cli-dump.c:148 -#, possible-c-format -msgid "bfd_openw_with_cleanup: unknown mode %s." +#: cli/cli-logging.c:317 +msgid "If set, logging overrides the log file." msgstr "" -#: cli/cli-dump.c:164 -msgid "" -"\"dump\" must be followed by a subcommand.\n" -"\n" +#: cli/cli-logging.c:322 +msgid "Set the logging output mode." msgstr "" -#: cli/cli-dump.c:171 -msgid "" -"\"append\" must be followed by a subcommand.\n" -"\n" +#: cli/cli-logging.c:323 +msgid "Show the logging output mode." msgstr "" -#: cli/cli-dump.c:206 -#, possible-c-format -msgid "writing dump file '%s' (%s)" +#: cli/cli-logging.c:324 +msgid "" +"If redirect is off, output will go to both the screen and the log file.\n" +"If redirect is on, output will go only to the log file." msgstr "" -#: cli/cli-dump.c:227 -msgid "Missing start address." +#: cli/cli-logging.c:330 +msgid "Set the current logfile." msgstr "" -#: cli/cli-dump.c:232 -msgid "Missing stop address." +#: cli/cli-logging.c:331 +msgid "Show the current logfile." msgstr "" -#: cli/cli-dump.c:238 -msgid "Invalid memory address range (start >= end)." +#: cli/cli-logging.c:332 +msgid "The logfile is used when directing GDB's output." msgstr "" -#: cli/cli-dump.c:278 -#, possible-c-format -msgid "No value to %s." +#: cli/cli-logging.c:338 +msgid "Enable logging." msgstr "" -#: cli/cli-dump.c:281 -msgid "Invalid expression." +#: cli/cli-logging.c:340 +msgid "Disable logging." msgstr "" -#: cli/cli-dump.c:300 -msgid "value is not an lval: address assumed to be zero" +#: cli/cli-script.c:90 +msgid "if/while commands require arguments." msgstr "" -#. No, no useable data in this section. -#: cli/cli-dump.c:460 -#, possible-c-format -msgid "skipping section %s...\n" +#: cli/cli-script.c:125 +msgid "Error reading in canned sequence of commands." msgstr "" -#: cli/cli-dump.c:479 -#, possible-c-format -msgid "Failed to read bfd file %s: '%s'." +#: cli/cli-script.c:327 +msgid "Max user call depth exceeded -- command aborted." msgstr "" -#: cli/cli-dump.c:502 cli/cli-dump.c:554 -#, possible-c-format -msgid "restore: memory write failed (%s)." +#: cli/cli-script.c:349 +msgid "Error executing canned sequence of commands." msgstr "" -#: cli/cli-dump.c:525 -#, possible-c-format -msgid "Start address is greater than length of binary file %s." +#: cli/cli-script.c:576 +msgid "Invalid control type in canned commands structure." msgstr "" -#: cli/cli-dump.c:600 -msgid "Start must be less than end." +#: cli/cli-script.c:652 +msgid "arg_cleanup called with no user args.\n" msgstr "" -#: cli/cli-dump.c:669 -msgid "Dump target code/data to a local file." +#: cli/cli-script.c:691 +#, possible-c-format +msgid "user defined function may only have %d arguments." msgstr "" -#: cli/cli-dump.c:674 -msgid "Append target code/data to a local file." +#: cli/cli-script.c:790 +#, possible-c-format +msgid "Missing argument %d in user function." msgstr "" -#: cli/cli-dump.c:690 -msgid "Write target code/data to an srec file." +#: cli/cli-script.c:890 +msgid "Control nesting too deep!" msgstr "" -#: cli/cli-dump.c:696 -msgid "Write target code/data to an intel hex file." +#: cli/cli-script.c:1086 +msgid "Recursed on a simple control type." msgstr "" -#: cli/cli-dump.c:702 -msgid "Write target code/data to a tekhex file." +#: cli/cli-script.c:1089 +msgid "Allocated body is smaller than this command type needs." msgstr "" -#: cli/cli-dump.c:708 -msgid "Write target code/data to a raw binary file." +#: cli/cli-script.c:1384 +msgid "name of command to define" msgstr "" -#: cli/cli-dump.c:714 -msgid "Append target code/data to a raw binary file." +#: cli/cli-script.c:1406 +#, possible-c-format +msgid "\"%s\" is not a prefix command." msgstr "" -#: cli/cli-dump.c:719 -msgid "" -"Write contents of memory to an srec file.\n" -"Arguments are FILE START STOP. Writes the contents of memory\n" -"within the range [START .. STOP) to the specifed FILE in srec format." +#: cli/cli-script.c:1417 +#, possible-c-format +msgid "Junk in argument list: \"%s\"" msgstr "" -#: cli/cli-dump.c:725 -msgid "" -"Write the value of an expression to an srec file.\n" -"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" -"to the specified FILE in srec format." +#: cli/cli-script.c:1466 +#, possible-c-format +msgid "Redefine command \"%s\"? " msgstr "" -#: cli/cli-dump.c:731 -msgid "" -"Write contents of memory to an ihex file.\n" -"Arguments are FILE START STOP. Writes the contents of memory within\n" -"the range [START .. STOP) to the specifed FILE in intel hex format." +#: cli/cli-script.c:1468 +#, possible-c-format +msgid "Really redefine built-in command \"%s\"? " msgstr "" -#: cli/cli-dump.c:737 -msgid "" -"Write the value of an expression to an ihex file.\n" -"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" -"to the specified FILE in intel hex format." +#: cli/cli-script.c:1470 +#, possible-c-format +msgid "Command \"%s\" not redefined." msgstr "" -#: cli/cli-dump.c:743 -msgid "" -"Write contents of memory to a tekhex file.\n" -"Arguments are FILE START STOP. Writes the contents of memory\n" -"within the range [START .. STOP) to the specifed FILE in tekhex format." +#: cli/cli-script.c:1497 +#, possible-c-format +msgid "Your new `%s' command does not hook any existing command." msgstr "" -#: cli/cli-dump.c:749 -msgid "" -"Write the value of an expression to a tekhex file.\n" -"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" -"to the specified FILE in tekhex format." +#: cli/cli-script.c:1500 +msgid "Proceed? " msgstr "" -#: cli/cli-dump.c:755 -msgid "" -"Write contents of memory to a raw binary file.\n" -"Arguments are FILE START STOP. Writes the contents of memory\n" -"within the range [START .. STOP) to the specifed FILE in binary format." +#. Should never come here as hookc would be 0. +#: cli/cli-script.c:1541 complaints.c:305 exceptions.c:143 exceptions.c:160 +#: exceptions.c:187 exceptions.c:239 hppa-tdep.c:3098 hppa-tdep.c:3111 +#: infcall.c:671 infcmd.c:1460 infrun.c:3306 language.c:797 language.c:823 +#: mi/mi-out.c:348 mi/mi-out.c:367 mips-tdep.c:254 mips-tdep.c:311 +#: mips-tdep.c:1411 mips-tdep.c:4086 mips-tdep.c:5073 mn10300-tdep.c:126 +#: reggroups.c:219 remote.c:6492 utils.c:987 utils.c:1006 +msgid "bad switch" msgstr "" -#: cli/cli-dump.c:761 -msgid "" -"Write the value of an expression to a raw binary file.\n" -"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" -"to the specified FILE in raw target ordered bytes." +#: cli/cli-script.c:1561 +#, possible-c-format +msgid "Command \"%s\" is built-in." msgstr "" -#: cli/cli-dump.c:767 -msgid "" -"Append contents of memory to a raw binary file.\n" -"Arguments are FILE START STOP. Writes the contents of memory within the\n" -"range [START .. STOP) to the specifed FILE in raw target ordered bytes." +#: cli/cli-script.c:1615 +msgid "called with NULL file pointer!" msgstr "" -#: cli/cli-dump.c:773 +#: cli/cli-script.c:1643 +#, possible-c-format msgid "" -"Append the value of an expression to a raw binary file.\n" -"Arguments are FILE EXPRESSION. Writes the value of EXPRESSION\n" -"to the specified FILE in raw target ordered bytes." +"%s:%d: Error in sourced command file:\n" +"%s" msgstr "" -#: cli/cli-dump.c:779 -msgid "" -"Restore the contents of FILE to target memory.\n" -"Arguments are FILE OFFSET START END where all except FILE are optional.\n" -"OFFSET will be added to the base address of the file (default zero).\n" -"If START and END are given, only the file contents within that range\n" -"(file relative) will be restored to target memory." +#: cli/cli-script.c:1646 +msgid "bad reason" msgstr "" -#: cli/cli-setshow.c:60 +#: cli/cli-setshow.c:59 msgid "\"on\", \"off\" or \"auto\" expected." msgstr "" -#: cli/cli-setshow.c:89 +#: cli/cli-setshow.c:88 msgid "\"on\" or \"off\" expected." msgstr "" -#: cli/cli-setshow.c:193 +#: cli/cli-setshow.c:194 msgid "filename to set it to." msgstr "" -#: cli/cli-setshow.c:214 cli/cli-setshow.c:224 cli/cli-setshow.c:236 -#: cli/cli-setshow.c:241 +#: cli/cli-setshow.c:215 cli/cli-setshow.c:225 cli/cli-setshow.c:237 +#: cli/cli-setshow.c:242 msgid "integer to set it to." msgstr "" -#: cli/cli-setshow.c:229 +#: cli/cli-setshow.c:230 #, possible-c-format msgid "integer %u out of range" msgstr "" -#: cli/cli-setshow.c:272 +#: cli/cli-setshow.c:273 #, possible-c-format msgid "Requires an argument. Valid arguments are %s." msgstr "" -#: cli/cli-setshow.c:301 +#: cli/cli-setshow.c:302 #, possible-c-format msgid "Undefined item: \"%s\"." msgstr "" -#: cli/cli-setshow.c:304 +#: cli/cli-setshow.c:305 #, possible-c-format msgid "Ambiguous item \"%s\"." msgstr "" -#: cli/cli-setshow.c:310 cli/cli-setshow.c:381 +#: cli/cli-setshow.c:311 cli/cli-setshow.c:379 msgid "gdb internal error: bad var_type in do_setshow_command" msgstr "" -#: cli/cli-setshow.c:355 +#: cli/cli-setshow.c:356 msgid "do_setshow_command: invalid var_auto_boolean" msgstr "" -#: cli/cli-setshow.c:405 +#: cli/cli-setshow.c:403 msgid "gdb internal error: bad cmd_type in do_setshow_command" msgstr "" -#: coffread.c:592 +#: cli/cli-utils.c:53 +msgid "History value must have integer type." +msgstr "" + +#: cli/cli-utils.c:74 +msgid "Convenience variable must have integer value.\n" +msgstr "" + +#: cli/cli-utils.c:151 +msgid "inverted range" +msgstr "" + +#: cli/cli-utils.c:165 +msgid "negative value" +msgstr "" + +#: cli/cli-utils.c:207 +msgid "Args must be numbers or '$' variables." +msgstr "" + +#: coffread.c:594 #, possible-c-format msgid "\"%s\": error reading line numbers." msgstr "" -#: coffread.c:600 +#: coffread.c:602 #, possible-c-format msgid "\"%s\": can't get string table" msgstr "" -#: coffread.c:624 +#: coffread.c:626 #, possible-c-format msgid "" "The debugging information in `%s' is corrupted.\n" "The file has a `.stabs' section, but no `.stabstr' section." msgstr "" -#: coffread.c:822 +#: coffread.c:824 #, possible-c-format msgid "Bad n_sclass for symbol %s" msgstr "" -#: coffread.c:989 +#: coffread.c:991 #, possible-c-format msgid "`.bf' symbol %d has no aux entry" msgstr "" -#: coffread.c:1007 +#: coffread.c:1009 msgid "Bad coff function information." msgstr "" -#: coffread.c:1016 +#: coffread.c:1018 #, possible-c-format msgid "" "`.ef' symbol without matching `.bf' symbol ignored starting at symnum %d" msgstr "" -#: coffread.c:1028 +#: coffread.c:1030 #, possible-c-format msgid "Unmatched .ef symbol(s) ignored starting at symnum %d" msgstr "" -#: coffread.c:1037 +#: coffread.c:1039 #, possible-c-format msgid "`.ef' symbol %d has no aux entry" msgstr "" -#: coffread.c:1085 +#: coffread.c:1087 #, possible-c-format msgid "" "`.eb' symbol without matching `.bb' symbol ignored starting at symnum %d" msgstr "" -#: coffread.c:1095 xcoffread.c:173 +#: coffread.c:1097 xcoffread.c:189 #, possible-c-format msgid "Mismatched .eb symbol ignored starting at symnum %d" msgstr "" -#: coffread.c:1156 coffread.c:1163 coffread.c:1173 +#: coffread.c:1158 coffread.c:1165 coffread.c:1175 #, possible-c-format msgid "%s: error reading symbols" msgstr "" -#: coffread.c:1186 +#: coffread.c:1188 #, c-format msgid "thumb symbol %s, class 0x%x\n" msgstr "" -#: coffread.c:1313 +#: coffread.c:1315 msgid "coff file name too long" msgstr "" -#: coffread.c:1400 +#: coffread.c:1402 #, possible-c-format msgid "Line number pointer %ld lower than start of line numbers" msgstr "" -#: coffread.c:1796 +#: coffread.c:1798 #, possible-c-format msgid "Symbol table entry for %s has bad tagndx value" msgstr "" -#: coffread.c:1966 +#: coffread.c:1968 #, possible-c-format msgid "Unexpected type for symbol %s" msgstr "" -#: common/signals.c:352 +#: common/common-utils.c:136 +msgid "vasprintf call failed" +msgstr "" + +#: common/gdb_assert.h:54 +#, possible-c-format +msgid "%s: Assertion `%s' failed." +msgstr "" + +#: common/gdb_assert.h:58 +#, possible-c-format +msgid "Assertion `%s' failed." +msgstr "" + +#: common/signals.c:350 msgid "" "GDB bug: target.c (target_signal_from_host): unrecognized real-time signal" msgstr "" #. The user might be trying to do "signal SIGSAK" where this system #. doesn't have SIGSAK. -#: common/signals.c:647 +#: common/signals.c:645 #, possible-c-format msgid "Signal %s does not exist on this system." msgstr "" -#: common/signals.c:670 +#: common/signals.c:668 msgid "" "Only signals 1-15 are valid as numeric signals.\n" "Use \"info signals\" for a list of symbolic signals." @@ -5238,63 +5229,55 @@ msgid "Various kinds of warranty you do not have." msgstr "" -#: core-regset.c:76 m68klinux-nat.c:533 -msgid "Wrong size gregset in core file." -msgstr "" - -#: core-regset.c:86 m68klinux-nat.c:543 -msgid "Wrong size fpregset in core file." -msgstr "" - -#: corefile.c:77 +#: corefile.c:76 msgid "GDB can't read core files on this machine." msgstr "" -#: corefile.c:191 +#: corefile.c:190 msgid "core file may not match specified executable file." msgstr "" -#: corefile.c:193 +#: corefile.c:192 msgid "exec file is newer than core file." msgstr "" -#: corefile.c:209 +#: corefile.c:208 msgid "" "No executable file specified.\n" "Use the \"file\" or \"exec-file\" command." msgstr "" -#: corefile.c:224 +#: corefile.c:223 #, possible-c-format msgid "Cannot access memory at address %s" msgstr "" -#: corefile.c:228 +#: corefile.c:227 #, possible-c-format msgid "Error accessing memory address %s: %s." msgstr "" -#: corefile.c:422 +#: corefile.c:421 #, possible-c-format msgid "The current BFD target is \"%s\".\n" msgstr "" -#: corefile.c:453 +#: corefile.c:452 msgid "" "Use FILE as core dump for examining memory and registers.\n" "No arg means have no core file. This command has been superseded by the\n" "`target core' and `detach' commands." msgstr "" -#: corefile.c:461 +#: corefile.c:460 msgid "Set the current BFD target." msgstr "" -#: corefile.c:462 +#: corefile.c:461 msgid "Show the current BFD target." msgstr "" -#: corefile.c:463 +#: corefile.c:462 msgid "Use `set gnutarget auto' to specify automatic detection." msgstr "" @@ -5322,7 +5305,7 @@ msgid "\"%s\" is not a core dump: %s" msgstr "" -#: corelow.c:369 record.c:833 +#: corelow.c:369 record.c:849 #, possible-c-format msgid "\"%s\": Can't find sections: %s" msgstr "" @@ -5377,35 +5360,43 @@ msgid "init_core_ops: core target already exists (\"%s\")." msgstr "" -#: cp-abi.c:44 +#: core-regset.c:76 m68klinux-nat.c:532 +msgid "Wrong size gregset in core file." +msgstr "" + +#: core-regset.c:86 m68klinux-nat.c:542 +msgid "Wrong size fpregset in core file." +msgstr "" + +#: cp-abi.c:43 msgid "ABI doesn't define required function is_constructor_name" msgstr "" -#: cp-abi.c:52 +#: cp-abi.c:51 msgid "ABI doesn't define required function is_destructor_name" msgstr "" -#: cp-abi.c:60 +#: cp-abi.c:59 msgid "ABI doesn't define required function is_vtable_name" msgstr "" -#: cp-abi.c:68 +#: cp-abi.c:67 msgid "ABI doesn't define required function is_operator_name" msgstr "" -#: cp-abi.c:91 +#: cp-abi.c:90 msgid "Cannot determine virtual baseclass offset of incomplete object" msgstr "" -#: cp-abi.c:134 cp-abi.c:142 cp-abi.c:151 cp-abi.c:169 +#: cp-abi.c:133 cp-abi.c:141 cp-abi.c:150 cp-abi.c:168 msgid "GDB does not support pointers to methods on this target" msgstr "" -#: cp-abi.c:203 +#: cp-abi.c:202 msgid "Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c" msgstr "" -#: cp-abi.c:221 +#: cp-abi.c:220 #, possible-c-format msgid "Cannot find C++ ABI \"%s\" to set it as auto default." msgstr "" @@ -5415,56 +5406,56 @@ msgid "Could not find \"%s\" in ABI list" msgstr "" -#: cp-abi.c:328 +#: cp-abi.c:330 msgid "" "Set the ABI used for inspecting C++ objects.\n" "\"set cp-abi\" with no arguments will list the available ABIs." msgstr "" -#: cp-abi.c:334 +#: cp-abi.c:336 msgid "Show the ABI used for inspecting C++ objects." msgstr "" -#: cp-name-parser.y:1571 +#: cp-name-parser.y:1570 msgid "empty character constant" msgstr "" -#: cp-name-parser.y:1578 +#: cp-name-parser.y:1577 msgid "invalid character constant" msgstr "" -#: cp-name-parser.y:1702 +#: cp-name-parser.y:1701 msgid "invalid number" msgstr "" #. These can't occur in C++ names. -#: cp-name-parser.y:1778 +#: cp-name-parser.y:1777 msgid "unexpected string literal" msgstr "" #. We must have come across a bad character (e.g. ';'). -#: cp-name-parser.y:1785 +#: cp-name-parser.y:1784 msgid "invalid character" msgstr "" -#: cp-namespace.c:709 +#: cp-namespace.c:719 msgid "cp_lookup_nested_type called on a non-aggregate type." msgstr "" -#: cp-namespace.c:1009 -msgid "Possible namespaces:\n" +#: cp-namespace.c:800 +msgid "The `maint namespace' command was removed.\n" msgstr "" -#: cp-namespace.c:1031 -msgid "Print the list of possible C++ namespaces." +#: cp-namespace.c:813 +msgid "Deprecated placeholder for removed functionality." msgstr "" -#: cp-support.c:985 +#: cp-support.c:1387 #, possible-c-format msgid "RTTI symbol not found for class '%s'" msgstr "" -#: cp-support.c:991 +#: cp-support.c:1393 #, possible-c-format msgid "RTTI symbol for class '%s' is not a type" msgstr "" @@ -5473,1086 +5464,1190 @@ #. symbols for namespaces with the same name as the struct. #. This warning is an indication of a bug in the lookup order #. or a bug in the way that the symbol tables are populated. -#: cp-support.c:1006 +#: cp-support.c:1408 #, possible-c-format msgid "RTTI symbol for class '%s' is a namespace" msgstr "" -#: cp-support.c:1009 +#: cp-support.c:1411 #, possible-c-format msgid "RTTI symbol for class '%s' has bad type" msgstr "" -#: cp-support.c:1021 +#: cp-support.c:1423 msgid "\"maintenance cplus\" must be followed by the name of a command.\n" msgstr "" -#: cp-support.c:1162 +#: cp-support.c:1564 msgid "C++ maintenance commands." msgstr "" -#: cp-support.c:1173 +#: cp-support.c:1575 msgid "Print the first class/namespace component of NAME." msgstr "" -#: cp-valprint.c:47 +#: cp-valprint.c:46 #, possible-c-format msgid "Printing of C++ virtual function tables is %s.\n" msgstr "" -#: cp-valprint.c:59 +#: cp-valprint.c:58 #, possible-c-format msgid "Printing of object's derived type based on vtable info is %s.\n" msgstr "" -#: cp-valprint.c:70 +#: cp-valprint.c:69 #, possible-c-format msgid "Printing of C++ static members is %s.\n" msgstr "" -#: cp-valprint.c:314 jv-valprint.c:408 p-valprint.c:803 valprint.c:282 +#: cp-valprint.c:313 jv-valprint.c:407 p-valprint.c:812 valprint.c:283 msgid "" msgstr "" -#: cp-valprint.c:808 +#: cp-valprint.c:352 mi/mi-cmd-stack.c:302 python/py-prettyprint.c:293 +#: stack.c:286 +#, possible-c-format +msgid "" +msgstr "" + +#: cp-valprint.c:817 msgid "Set printing of C++ static members." msgstr "" -#: cp-valprint.c:809 +#: cp-valprint.c:818 msgid "Show printing of C++ static members." msgstr "" -#: cp-valprint.c:816 +#: cp-valprint.c:825 msgid "Set printing of C++ virtual function tables." msgstr "" -#: cp-valprint.c:817 +#: cp-valprint.c:826 msgid "Show printing of C++ virtual function tables." msgstr "" -#: cp-valprint.c:824 +#: cp-valprint.c:833 msgid "Set printing of object's derived type based on vtable info." msgstr "" -#: cp-valprint.c:825 +#: cp-valprint.c:834 msgid "Show printing of object's derived type based on vtable info." msgstr "" -#: cris-tdep.c:291 i386-linux-tdep.c:341 +#: cris-tdep.c:290 i386-linux-tdep.c:340 msgid "Couldn't recognize signal trampoline." msgstr "" #. Invalid (unimplemented) register. Should not happen as there are #. no unimplemented CRISv32 registers. -#: cris-tdep.c:1698 +#: cris-tdep.c:1697 #, possible-c-format msgid "crisv32_register_type: unknown regno %d" msgstr "" -#: cris-tdep.c:1732 +#: cris-tdep.c:1731 msgid "cris_store_return_value: type length too large." msgstr "" -#: cris-tdep.c:1903 +#: cris-tdep.c:1902 msgid "cris_extract_return_value: type length too large" msgstr "" #. Could not find a target. Things are likely to go downhill #. from here. -#: cris-tdep.c:2146 +#: cris-tdep.c:2145 msgid "CRIS software single step could not find a step target." msgstr "" -#: cris-tdep.c:3932 irix5-nat.c:240 mips-linux-tdep.c:625 +#: cris-tdep.c:3931 irix5-nat.c:239 mips-linux-tdep.c:624 msgid "wrong size gregset struct in core file" msgstr "" -#: cris-tdep.c:3972 +#: cris-tdep.c:3971 msgid "Set the current CRIS version." msgstr "" -#: cris-tdep.c:3973 +#: cris-tdep.c:3972 msgid "Show the current CRIS version." msgstr "" -#: cris-tdep.c:3974 +#: cris-tdep.c:3973 msgid "" "Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n" "Defaults to 10. " msgstr "" -#: cris-tdep.c:3984 +#: cris-tdep.c:3983 msgid "Set the current CRIS mode." msgstr "" -#: cris-tdep.c:3985 +#: cris-tdep.c:3984 msgid "Show the current CRIS mode." msgstr "" -#: cris-tdep.c:3986 +#: cris-tdep.c:3985 msgid "" "Set to CRIS_MODE_GURU when debugging in guru mode.\n" "Makes GDB use the NRP register instead of the ERP register in certain cases." msgstr "" -#: cris-tdep.c:3995 -msgid "Set the usage of Dwarf-2 CFI for CRIS." +#: cris-tdep.c:3994 +msgid "Set the usage of Dwarf-2 CFI for CRIS." +msgstr "" + +#: cris-tdep.c:3995 +msgid "Show the usage of Dwarf-2 CFI for CRIS." +msgstr "" + +#: cris-tdep.c:3996 +msgid "Set this to \"off\" if using gcc-cris < R59." +msgstr "" + +#: cris-tdep.c:4034 cris-tdep.c:4060 +msgid "cris_gdbarch_update: failed to update architecture." +msgstr "" + +#: cris-tdep.c:4119 +msgid "cris_gdbarch_init: big endian byte order in info" +msgstr "" + +#: cris-tdep.c:4124 +msgid "cris_gdbarch_init: unknown byte order in info" +msgstr "" + +#: cris-tdep.c:4154 +msgid "cris_gdbarch_init: unsupported CRIS version" +msgstr "" + +#: cris-tdep.c:4196 +msgid "cris_gdbarch_init: unknown CRIS version" +msgstr "" + +#: c-typeprint.c:333 +msgid "type not handled in c_type_print_varspec_prefix()" +msgstr "" + +#: c-typeprint.c:691 +msgid "type not handled in c_type_print_varspec_suffix()" +msgstr "" + +#: c-typeprint.c:734 m2-typeprint.c:82 +msgid "" +msgstr "" + +#: c-typeprint.c:762 +msgid "" msgstr "" -#: cris-tdep.c:3996 -msgid "Show the usage of Dwarf-2 CFI for CRIS." +#: c-typeprint.c:822 +msgid "\n" msgstr "" -#: cris-tdep.c:3997 -msgid "Set this to \"off\" if using gcc-cris < R59." +#: c-typeprint.c:825 +msgid "\n" msgstr "" -#: cris-tdep.c:4035 cris-tdep.c:4061 -msgid "cris_gdbarch_update: failed to update architecture." +#: c-typeprint.c:1053 +#, possible-c-format +msgid " %s;\n" msgstr "" -#: cris-tdep.c:4120 -msgid "cris_gdbarch_init: big endian byte order in info" +#: c-typeprint.c:1102 +#, possible-c-format +msgid "" msgstr "" -#: cris-tdep.c:4125 -msgid "cris_gdbarch_init: unknown byte order in info" +#: c-typeprint.c:1165 +#, possible-c-format +msgid " (Local at %s:%d)\n" msgstr "" -#: cris-tdep.c:4155 -msgid "cris_gdbarch_init: unsupported CRIS version" +#: c-typeprint.c:1224 +msgid "struct " msgstr "" -#: cris-tdep.c:4197 -msgid "cris_gdbarch_init: unknown CRIS version" +#. This should not occur. +#: c-typeprint.c:1233 +msgid "" msgstr "" -#: darwin-nat-info.c:54 +#. At least for dump_symtab, it is important that this not +#. be an error (). +#: c-typeprint.c:1255 #, possible-c-format -msgid "%s must be specified with 0x..." +msgid "" msgstr "" -#: darwin-nat-info.c:58 -#, possible-c-format -msgid ":\t%#lx\n" +#: c-valprint.c:176 +msgid "Could not determine the array high bound" msgstr "" -#: darwin-nat-info.c:61 +#: c-valprint.c:226 #, possible-c-format -msgid ":\t%u.%06u sec\n" +msgid "%d vtable entries" msgstr "" -#: darwin-nat-info.c:87 -#, possible-c-format -msgid "%d processes:\n" +#. This happens (without TYPE_FLAG_STUB set) on systems which +#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a +#. "struct foo *bar" and no complete type for struct foo in that +#. file. +#. This happens (without TYPE_FLAG_STUB set) on systems which don't use +#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar" +#. and no complete type for struct foo in that file. +#: c-valprint.c:605 m2-valprint.c:581 m2-valprint.c:661 valprint.c:362 +msgid "" msgstr "" -#: darwin-nat-info.c:98 +#: c-valprint.c:634 #, possible-c-format -msgid " %s is %d has task %#x\n" +msgid "Invalid C/C++ type code %d in symbol table." +msgstr "" + +#: c-valprint.c:751 +msgid " [incomplete object]" msgstr "" -#: darwin-nat-info.c:104 +#: darwin-nat.c:186 #, possible-c-format -msgid " %s is %d unknown task port\n" +msgid "[%d inferior]: " msgstr "" -#: darwin-nat-info.c:122 darwin-nat-info.c:814 darwin-nat-info.c:835 -msgid "No inferior running\n" +#: darwin-nat.c:198 +msgid "[UNKNOWN]" msgstr "" -#: darwin-nat-info.c:130 +#: darwin-nat.c:200 #, possible-c-format -msgid "cannot parse task id '%s'\n" +msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)" msgstr "" -#: darwin-nat-info.c:154 -#, possible-c-format -msgid "TASK_BASIC_INFO for 0x%x:\n" +#: darwin-nat.c:232 +#, c-format +msgid "unknown (%d)" msgstr "" -#: darwin-nat-info.c:166 -msgid "" -"\n" -"TASK_EVENTS_INFO:\n" +#: darwin-nat.c:257 +#, possible-c-format +msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n" msgstr "" -#: darwin-nat-info.c:182 -msgid "" -"\n" -"TASK_THREAD_TIMES_INFO:\n" +#: darwin-nat.c:259 +msgid "no error" msgstr "" -#: darwin-nat-info.c:212 +#: darwin-nat.c:325 #, possible-c-format -msgid "Ports for task 0x%x:\n" +msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n" msgstr "" -#: darwin-nat-info.c:213 -msgid "port type\n" +#: darwin-nat.c:484 +msgid "message header:\n" msgstr "" -#: darwin-nat-info.c:233 +#: darwin-nat.c:485 #, possible-c-format -msgid "%04x: %08x " +msgid " bits: 0x%x\n" msgstr "" -#: darwin-nat-info.c:240 +#: darwin-nat.c:486 #, possible-c-format -msgid " %s(" +msgid " size: 0x%x\n" msgstr "" -#: darwin-nat-info.c:243 -msgid "??" +#: darwin-nat.c:487 +#, possible-c-format +msgid " remote-port: 0x%x\n" msgstr "" -#: darwin-nat-info.c:245 +#: darwin-nat.c:488 #, possible-c-format -msgid "%u" +msgid " local-port: 0x%x\n" msgstr "" -#: darwin-nat-info.c:246 -msgid " refs)" +#: darwin-nat.c:489 +#, possible-c-format +msgid " reserved: 0x%x\n" msgstr "" -#: darwin-nat-info.c:252 -msgid " gdb-task" +#: darwin-nat.c:490 +#, possible-c-format +msgid " id: 0x%x\n" msgstr "" -#: darwin-nat-info.c:254 -msgid " host-self" +#: darwin-nat.c:509 +#, possible-c-format +msgid "body: descriptor_count=%u\n" msgstr "" -#: darwin-nat-info.c:256 -msgid " gdb-exception" +#: darwin-nat.c:518 +#, possible-c-format +msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n" msgstr "" -#: darwin-nat-info.c:258 -msgid " gdb-port_set" +#: darwin-nat.c:522 +#, possible-c-format +msgid " descr %d: type=%u\n" msgstr "" -#: darwin-nat-info.c:264 -msgid " inferior-task" +#: darwin-nat.c:532 +#, possible-c-format +msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n" msgstr "" -#: darwin-nat-info.c:266 -msgid " inferior-notify" +#: darwin-nat.c:540 +msgid " data:" msgstr "" -#: darwin-nat-info.c:275 -msgid " inferior-excp-port" +#: darwin-nat.c:682 +#, possible-c-format +msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n" msgstr "" -#: darwin-nat-info.c:287 +#: darwin-nat.c:695 #, possible-c-format -msgid " inferior-thread for 0x%x" +msgid "ptrace THUP: res=%d\n" msgstr "" -#: darwin-nat-info.c:316 +#: darwin-nat.c:702 #, possible-c-format -msgid "Port 0x%lx in task 0x%lx:\n" +msgid "darwin_resume_thread: kill 0x%x %d: %d\n" msgstr "" -#: darwin-nat-info.c:318 +#. Set single step. +#: darwin-nat.c:708 #, possible-c-format -msgid " port set: 0x%x\n" +msgid "darwin_set_sstep (thread=%x, enable=%d)\n" msgstr "" -#: darwin-nat-info.c:319 +#: darwin-nat.c:797 #, possible-c-format -msgid " seqno: 0x%x\n" +msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n" msgstr "" -#: darwin-nat-info.c:320 +#. Should not happen... +#: darwin-nat.c:877 #, possible-c-format -msgid " mscount: 0x%x\n" +msgid "darwin_wait: ill-formatted message (id=%x)\n" msgstr "" -#: darwin-nat-info.c:321 +#: darwin-nat.c:890 #, possible-c-format -msgid " qlimit: 0x%x\n" +msgid "darwin_wait: thread=%x, got %s\n" msgstr "" -#: darwin-nat-info.c:322 +#: darwin-nat.c:913 #, possible-c-format -msgid " msgcount: 0x%x\n" +msgid " (signal %d: %s)\n" msgstr "" -#: darwin-nat-info.c:323 +#: darwin-nat.c:958 #, possible-c-format -msgid " sorights: 0x%x\n" +msgid "wait4: res=%d: %s\n" msgstr "" -#: darwin-nat-info.c:324 +#: darwin-nat.c:974 #, possible-c-format -msgid " srights: 0x%x\n" +msgid "darwin_wait: pid=%d exit, status=%x\n" msgstr "" -#: darwin-nat-info.c:325 +#: darwin-nat.c:984 #, possible-c-format -msgid " pdrequest: 0x%x\n" +msgid "darwin_wait: pid=%d\n" msgstr "" -#: darwin-nat-info.c:326 +#: darwin-nat.c:991 #, possible-c-format -msgid " nsrequest: 0x%x\n" +msgid "Bad local-port: %x\n" msgstr "" -#: darwin-nat-info.c:327 +#: darwin-nat.c:1041 #, possible-c-format -msgid " flags: 0x%x\n" +msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n" msgstr "" -#: darwin-nat-info.c:336 -msgid "Task and port" +#: darwin-nat.c:1075 +#, possible-c-format +msgid "mach_msg: ret=%x\n" msgstr "" -#: darwin-nat-info.c:358 +#: darwin-nat.c:1109 #, possible-c-format -msgid "Threads in task %#x:\n" +msgid "darwin_wait: mach_msg(pending) ret=%x\n" msgstr "" -#: darwin-nat-info.c:361 +#: darwin-nat.c:1127 #, possible-c-format -msgid " %#x\n" +msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n" msgstr "" -#: darwin-nat-info.c:381 -msgid "Thread" +#: darwin-nat.c:1131 +msgid "darwin_wait: unhandled pending message\n" msgstr "" -#: darwin-nat-info.c:384 -msgid "THREAD_BASIC_INFO\n" +#: darwin-nat.c:1255 +#, possible-c-format +msgid "cannot kill: %s" msgstr "" -#: darwin-nat-info.c:435 -msgid "share" +#: darwin-nat.c:1321 +#, possible-c-format +msgid "Failed to kill inferior: ptrace returned %d [%s] (pid=%d)" msgstr "" -#: darwin-nat-info.c:437 -msgid "copy " +#: darwin-nat.c:1370 +#, possible-c-format +msgid "" +"Unable to find Mach task port for process-id %d: %s (0x%lx).\n" +" (please check gdb is codesigned - see taskgated(8))" msgstr "" -#: darwin-nat-info.c:439 -msgid "none " +#: darwin-nat.c:1375 +#, possible-c-format +msgid "inferior task: 0x%x, pid: %d\n" msgstr "" -#: darwin-nat-info.c:441 -msgid "??? " +#: darwin-nat.c:1486 +#, possible-c-format +msgid "unable to create a pipe: %s" msgstr "" -#: darwin-nat-info.c:451 -msgid "cow" +#. Trying to masturbate? +#: darwin-nat.c:1573 gnu-nat.c:2167 inf-ptrace.c:205 inf-ttrace.c:743 +msgid "I refuse to debug myself!" msgstr "" -#: darwin-nat-info.c:453 -msgid "private" +#: darwin-nat.c:1580 inf-ptrace.c:220 inf-ttrace.c:750 +#, possible-c-format +msgid "Attaching to program: %s, %s\n" msgstr "" -#: darwin-nat-info.c:455 -msgid "empty" +#: darwin-nat.c:1583 inf-ptrace.c:223 inf-ttrace.c:753 procfs.c:3303 +#, possible-c-format +msgid "Attaching to %s\n" msgstr "" -#: darwin-nat-info.c:457 -msgid "shared" +#: darwin-nat.c:1590 +#, possible-c-format +msgid "Can't attach to process %d: %s (%d)" msgstr "" -#: darwin-nat-info.c:459 -msgid "true-shrd" +#: darwin-nat.c:1635 inf-ptrace.c:282 inf-ttrace.c:798 procfs.c:3329 +#, possible-c-format +msgid "Detaching from program: %s, %s\n" msgstr "" -#: darwin-nat-info.c:461 -msgid "prv-alias" +#: darwin-nat.c:1651 +#, possible-c-format +msgid "Unable to detach from process-id %d: %s (%d)" msgstr "" -#: darwin-nat-info.c:463 -msgid "shr-alias" +#: darwin-nat.c:1679 +#, c-format +msgid "Thread 0x%lx of process %u" msgstr "" -#: darwin-nat-info.c:465 -msgid "???" +#: darwin-nat.c:1712 +#, possible-c-format +msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n" msgstr "" -#: darwin-nat-info.c:475 darwin-nat-info.c:763 -msgid "default" +#: darwin-nat.c:1721 +#, possible-c-format +msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s" msgstr "" -#: darwin-nat-info.c:477 -msgid "malloc" +#: darwin-nat.c:1753 +#, possible-c-format +msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n" msgstr "" -#: darwin-nat-info.c:479 -msgid "malloc_small" +#: darwin-nat.c:1761 +#, possible-c-format +msgid "" +"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, " +"len=%s\n" msgstr "" -#: darwin-nat-info.c:481 -msgid "malloc_large" +#: darwin-nat.c:1770 +#, possible-c-format +msgid "No memory at %s (vs %s+0x%x). Nothing written" msgstr "" -#: darwin-nat-info.c:483 -msgid "malloc_huge" +#: darwin-nat.c:1788 +#, possible-c-format +msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s" msgstr "" -#: darwin-nat-info.c:485 -msgid "sbrk" +#: darwin-nat.c:1803 +#, possible-c-format +msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s" msgstr "" -#: darwin-nat-info.c:487 -msgid "realloc" +#: darwin-nat.c:1817 +#, possible-c-format +msgid "darwin_read_write_inferior: mach_vm_write failed: %s" msgstr "" -#: darwin-nat-info.c:489 -msgid "malloc_tiny" +#: darwin-nat.c:1865 +#, possible-c-format +msgid "darwin_xfer_memory(%s, %d, %c)\n" msgstr "" -#: darwin-nat-info.c:491 -msgid "analysis_tool" +#: darwin-nat.c:1883 +#, possible-c-format +msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n" msgstr "" -#: darwin-nat-info.c:493 -msgid "mach_msg" +#: darwin-nat.c:2037 +msgid "Darwin child process" msgstr "" -#: darwin-nat-info.c:495 -msgid "iokit" +#: darwin-nat.c:2039 +msgid "Darwin child process (started by the \"run\" command)." msgstr "" -#: darwin-nat-info.c:497 -msgid "stack" +#: darwin-nat.c:2063 +#, possible-c-format +msgid "GDB task: 0x%lx, pid: %d\n" msgstr "" -#: darwin-nat-info.c:499 -msgid "guard" +#: darwin-nat.c:2067 +msgid "Set if printing inferior communication debugging statements." msgstr "" -#: darwin-nat-info.c:501 -msgid "shared_pmap" +#: darwin-nat.c:2068 +msgid "Show if printing inferior communication debugging statements." msgstr "" -#: darwin-nat-info.c:503 -msgid "dylib" +#: darwin-nat.c:2074 +msgid "Set if mach exceptions are caught." msgstr "" -#: darwin-nat-info.c:505 -msgid "appkit" +#: darwin-nat.c:2075 +msgid "Show if mach exceptions are caught." msgstr "" -#: darwin-nat-info.c:507 -msgid "foundation" +#: darwin-nat.c:2076 +msgid "" +"When this mode is on, all low level exceptions are reported before being\n" +"reported by the kernel." msgstr "" -#: darwin-nat-info.c:532 -msgid "No memory regions." +#: darwin-nat-info.c:53 +#, possible-c-format +msgid "%s must be specified with 0x..." msgstr "" -#: darwin-nat-info.c:576 +#: darwin-nat-info.c:57 #, possible-c-format -msgid "%s-%s %s/%s %s %s %s" +msgid ":\t%#lx\n" msgstr "" -#: darwin-nat-info.c:582 -msgid "shrd" +#: darwin-nat-info.c:60 +#, possible-c-format +msgid ":\t%u.%06u sec\n" msgstr "" -#: darwin-nat-info.c:582 -msgid "priv" +#: darwin-nat-info.c:86 +#, possible-c-format +msgid "%d processes:\n" +msgstr "" + +#: darwin-nat-info.c:97 +#, possible-c-format +msgid " %s is %d has task %#x\n" msgstr "" -#: darwin-nat-info.c:583 -msgid "reserved" +#: darwin-nat-info.c:103 +#, possible-c-format +msgid " %s is %d unknown task port\n" msgstr "" -#: darwin-nat-info.c:583 -msgid "not-rsvd" +#: darwin-nat-info.c:121 darwin-nat-info.c:814 darwin-nat-info.c:835 +msgid "No inferior running\n" msgstr "" -#: darwin-nat-info.c:586 +#: darwin-nat-info.c:129 #, possible-c-format -msgid " (%d sub-rgn)" +msgid "cannot parse task id '%s'\n" msgstr "" -#: darwin-nat-info.c:674 -msgid "sm " +#: darwin-nat-info.c:153 +#, possible-c-format +msgid "TASK_BASIC_INFO for 0x%x:\n" msgstr "" -#: darwin-nat-info.c:674 -msgid "obj" +#: darwin-nat-info.c:165 +msgid "" +"\n" +"TASK_EVENTS_INFO:\n" msgstr "" -#: darwin-nat-info.c:743 -msgid "Inferior not available" +#: darwin-nat-info.c:181 +msgid "" +"\n" +"TASK_THREAD_TIMES_INFO:\n" msgstr "" -#: darwin-nat-info.c:754 +#: darwin-nat-info.c:211 #, possible-c-format -msgid "%d exceptions:\n" -msgstr "%d 个异常:\n" +msgid "Ports for task 0x%x:\n" +msgstr "" -#: darwin-nat-info.c:759 +#: darwin-nat-info.c:212 +msgid "port type\n" +msgstr "" + +#: darwin-nat-info.c:232 #, possible-c-format -msgid "port 0x%04x, behavior: " +msgid "%04x: %08x " msgstr "" -#: darwin-nat-info.c:766 -msgid "state" +#: darwin-nat-info.c:239 +#, possible-c-format +msgid " %s(" msgstr "" -#: darwin-nat-info.c:769 -msgid "state-identity" +#: darwin-nat-info.c:242 +msgid "??" msgstr "" -#: darwin-nat-info.c:772 +#: darwin-nat-info.c:244 #, possible-c-format -msgid "0x%x" +msgid "%u" msgstr "" -#: darwin-nat-info.c:774 -msgid ", masks:" +#: darwin-nat-info.c:245 +msgid " refs)" msgstr "" -#: darwin-nat-info.c:776 -msgid " BAD_ACCESS" +#: darwin-nat-info.c:251 +msgid " gdb-task" msgstr "" -#: darwin-nat-info.c:778 -msgid " BAD_INSTRUCTION" +#: darwin-nat-info.c:253 +msgid " host-self" msgstr "" -#: darwin-nat-info.c:780 -msgid " ARITHMETIC" +#: darwin-nat-info.c:255 +msgid " gdb-exception" msgstr "" -#: darwin-nat-info.c:782 -msgid " EMULATION" +#: darwin-nat-info.c:257 +msgid " gdb-port_set" msgstr "" -#: darwin-nat-info.c:784 -msgid " SOFTWARE" +#: darwin-nat-info.c:263 +msgid " inferior-task" msgstr "" -#: darwin-nat-info.c:786 -msgid " BREAKPOINT" +#: darwin-nat-info.c:265 +msgid " inferior-notify" msgstr "" -#: darwin-nat-info.c:788 -msgid " SYSCALL" +#: darwin-nat-info.c:274 +msgid " inferior-excp-port" msgstr "" -#: darwin-nat-info.c:790 -msgid " MACH_SYSCALL" +#: darwin-nat-info.c:286 +#, possible-c-format +msgid " inferior-thread for 0x%x" msgstr "" -#: darwin-nat-info.c:792 -msgid " RPC_ALERT" +#: darwin-nat-info.c:315 +#, possible-c-format +msgid "Port 0x%lx in task 0x%lx:\n" msgstr "" -#: darwin-nat-info.c:794 -msgid " CRASH" +#: darwin-nat-info.c:317 +#, possible-c-format +msgid " port set: 0x%x\n" msgstr "" -#: darwin-nat-info.c:828 -msgid "Parameter is saved, host or none" +#: darwin-nat-info.c:318 +#, possible-c-format +msgid " seqno: 0x%x\n" msgstr "" -#: darwin-nat-info.c:850 -msgid "Get list of tasks in system." +#: darwin-nat-info.c:319 +#, possible-c-format +msgid " mscount: 0x%x\n" msgstr "" -#: darwin-nat-info.c:852 -msgid "Get list of ports in a task." +#: darwin-nat-info.c:320 +#, possible-c-format +msgid " qlimit: 0x%x\n" msgstr "" -#: darwin-nat-info.c:854 -msgid "Get info on a specific port." +#: darwin-nat-info.c:321 +#, possible-c-format +msgid " msgcount: 0x%x\n" msgstr "" -#: darwin-nat-info.c:856 -msgid "Get info on a specific task." +#: darwin-nat-info.c:322 +#, possible-c-format +msgid " sorights: 0x%x\n" msgstr "" -#: darwin-nat-info.c:858 -msgid "Get list of threads in a task." +#: darwin-nat-info.c:323 +#, possible-c-format +msgid " srights: 0x%x\n" msgstr "" -#: darwin-nat-info.c:860 -msgid "Get info on a specific thread." +#: darwin-nat-info.c:324 +#, possible-c-format +msgid " pdrequest: 0x%x\n" msgstr "" -#: darwin-nat-info.c:863 -msgid "Get information on all mach region for the task." +#: darwin-nat-info.c:325 +#, possible-c-format +msgid " nsrequest: 0x%x\n" msgstr "" -#: darwin-nat-info.c:865 -msgid "Get information on all mach sub region for the task." +#: darwin-nat-info.c:326 +#, possible-c-format +msgid " flags: 0x%x\n" msgstr "" -#: darwin-nat-info.c:867 -msgid "Get information on mach region at given address." +#: darwin-nat-info.c:335 +msgid "Task and port" msgstr "" -#: darwin-nat-info.c:870 -msgid "Disp mach exceptions." +#: darwin-nat-info.c:357 +#, possible-c-format +msgid "Threads in task %#x:\n" msgstr "" -#: darwin-nat.c:185 +#: darwin-nat-info.c:360 #, possible-c-format -msgid "[%d inferior]: " +msgid " %#x\n" msgstr "" -#: darwin-nat.c:197 -msgid "[UNKNOWN]" +#: darwin-nat-info.c:380 +msgid "Thread" msgstr "" -#: darwin-nat.c:199 -#, possible-c-format -msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)" +#: darwin-nat-info.c:383 +msgid "THREAD_BASIC_INFO\n" msgstr "" -#: darwin-nat.c:231 -#, c-format -msgid "unknown (%d)" +#: darwin-nat-info.c:434 +msgid "share" msgstr "" -#: darwin-nat.c:244 -#, possible-c-format -msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n" +#: darwin-nat-info.c:436 +msgid "copy " msgstr "" -#: darwin-nat.c:246 -msgid "no error" +#: darwin-nat-info.c:438 +msgid "none " msgstr "" -#: darwin-nat.c:312 -#, possible-c-format -msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n" +#: darwin-nat-info.c:440 +msgid "??? " msgstr "" -#: darwin-nat.c:471 -msgid "message header:\n" +#: darwin-nat-info.c:450 +msgid "cow" msgstr "" -#: darwin-nat.c:472 -#, possible-c-format -msgid " bits: 0x%x\n" +#: darwin-nat-info.c:452 +msgid "private" msgstr "" -#: darwin-nat.c:473 -#, possible-c-format -msgid " size: 0x%x\n" +#: darwin-nat-info.c:454 +msgid "empty" msgstr "" -#: darwin-nat.c:474 -#, possible-c-format -msgid " remote-port: 0x%x\n" +#: darwin-nat-info.c:456 +msgid "shared" msgstr "" -#: darwin-nat.c:475 -#, possible-c-format -msgid " local-port: 0x%x\n" +#: darwin-nat-info.c:458 +msgid "true-shrd" msgstr "" -#: darwin-nat.c:476 -#, possible-c-format -msgid " reserved: 0x%x\n" +#: darwin-nat-info.c:460 +msgid "prv-alias" msgstr "" -#: darwin-nat.c:477 -#, possible-c-format -msgid " id: 0x%x\n" +#: darwin-nat-info.c:462 +msgid "shr-alias" msgstr "" -#: darwin-nat.c:496 -#, possible-c-format -msgid "body: descriptor_count=%u\n" +#: darwin-nat-info.c:464 +msgid "???" msgstr "" -#: darwin-nat.c:505 -#, possible-c-format -msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n" +#: darwin-nat-info.c:474 darwin-nat-info.c:763 +msgid "default" msgstr "" -#: darwin-nat.c:509 -#, possible-c-format -msgid " descr %d: type=%u\n" +#: darwin-nat-info.c:476 +msgid "malloc" msgstr "" -#: darwin-nat.c:519 -#, possible-c-format -msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n" +#: darwin-nat-info.c:478 +msgid "malloc_small" msgstr "" -#: darwin-nat.c:527 -msgid " data:" +#: darwin-nat-info.c:480 +msgid "malloc_large" msgstr "" -#: darwin-nat.c:666 -#, possible-c-format -msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n" +#: darwin-nat-info.c:482 +msgid "malloc_huge" msgstr "" -#: darwin-nat.c:679 -#, possible-c-format -msgid "ptrace THUP: res=%d\n" +#: darwin-nat-info.c:484 +msgid "sbrk" msgstr "" -#: darwin-nat.c:686 -#, possible-c-format -msgid "darwin_resume_thread: kill 0x%x %d: %d\n" +#: darwin-nat-info.c:486 +msgid "realloc" msgstr "" -#. Set single step. -#: darwin-nat.c:692 -#, possible-c-format -msgid "darwin_set_sstep (thread=%x, enable=%d)\n" +#: darwin-nat-info.c:488 +msgid "malloc_tiny" msgstr "" -#: darwin-nat.c:781 -#, possible-c-format -msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n" +#: darwin-nat-info.c:490 +msgid "analysis_tool" msgstr "" -#. Should not happen... -#: darwin-nat.c:861 -#, possible-c-format -msgid "darwin_wait: ill-formatted message (id=%x)\n" +#: darwin-nat-info.c:492 +msgid "mach_msg" msgstr "" -#: darwin-nat.c:874 -#, possible-c-format -msgid "darwin_wait: thread=%x, got %s\n" +#: darwin-nat-info.c:494 +msgid "iokit" msgstr "" -#: darwin-nat.c:897 -#, possible-c-format -msgid " (signal %d: %s)\n" +#: darwin-nat-info.c:496 +msgid "stack" msgstr "" -#: darwin-nat.c:942 -#, possible-c-format -msgid "wait4: res=%d: %s\n" +#: darwin-nat-info.c:498 +msgid "guard" msgstr "" -#: darwin-nat.c:958 -#, possible-c-format -msgid "darwin_wait: pid=%d exit, status=%x\n" +#: darwin-nat-info.c:500 +msgid "shared_pmap" msgstr "" -#: darwin-nat.c:968 -#, possible-c-format -msgid "darwin_wait: pid=%d\n" +#: darwin-nat-info.c:502 +msgid "dylib" msgstr "" -#: darwin-nat.c:975 -#, possible-c-format -msgid "Bad local-port: %x\n" +#: darwin-nat-info.c:504 +msgid "appkit" msgstr "" -#: darwin-nat.c:1025 -#, possible-c-format -msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n" +#: darwin-nat-info.c:506 +msgid "foundation" msgstr "" -#: darwin-nat.c:1059 -#, possible-c-format -msgid "mach_msg: ret=%x\n" +#: darwin-nat-info.c:531 +msgid "No memory regions." msgstr "" -#: darwin-nat.c:1093 +#: darwin-nat-info.c:575 #, possible-c-format -msgid "darwin_wait: mach_msg(pending) ret=%x\n" +msgid "%s-%s %s/%s %s %s %s" msgstr "" -#: darwin-nat.c:1111 -#, possible-c-format -msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n" +#: darwin-nat-info.c:581 +msgid "shrd" msgstr "" -#: darwin-nat.c:1115 -msgid "darwin_wait: unhandled pending message\n" +#: darwin-nat-info.c:581 +msgid "priv" msgstr "" -#: darwin-nat.c:1239 -#, possible-c-format -msgid "cannot kill: %s" +#: darwin-nat-info.c:582 +msgid "reserved" +msgstr "" + +#: darwin-nat-info.c:582 +msgid "not-rsvd" msgstr "" -#: darwin-nat.c:1351 +#: darwin-nat-info.c:585 #, possible-c-format -msgid "" -"Unable to find Mach task port for process-id %d: %s (0x%lx).\n" -" (please check gdb is codesigned - see taskgated(8))" +msgid " (%d sub-rgn)" +msgstr "" + +#: darwin-nat-info.c:674 +msgid "sm " +msgstr "" + +#: darwin-nat-info.c:674 +msgid "obj" msgstr "" -#: darwin-nat.c:1356 -#, possible-c-format -msgid "inferior task: 0x%x, pid: %d\n" +#: darwin-nat-info.c:743 +msgid "Inferior not available" msgstr "" -#: darwin-nat.c:1467 +#: darwin-nat-info.c:754 #, possible-c-format -msgid "unable to create a pipe: %s" +msgid "%d exceptions:\n" +msgstr "%d 个异常:\n" + +#: darwin-nat-info.c:759 +#, possible-c-format +msgid "port 0x%04x, behavior: " msgstr "" -#. Trying to masturbate? -#: darwin-nat.c:1520 gnu-nat.c:2166 inf-ptrace.c:206 inf-ttrace.c:744 -msgid "I refuse to debug myself!" +#: darwin-nat-info.c:766 +msgid "state" msgstr "" -#: darwin-nat.c:1527 inf-ptrace.c:221 inf-ttrace.c:751 -#, possible-c-format -msgid "Attaching to program: %s, %s\n" +#: darwin-nat-info.c:769 +msgid "state-identity" msgstr "" -#: darwin-nat.c:1530 inf-ptrace.c:224 inf-ttrace.c:754 procfs.c:3305 +#: darwin-nat-info.c:772 #, possible-c-format -msgid "Attaching to %s\n" +msgid "0x%x" msgstr "" -#: darwin-nat.c:1537 -#, possible-c-format -msgid "Can't attach to process %d: %s (%d)" +#: darwin-nat-info.c:774 +msgid ", masks:" msgstr "" -#: darwin-nat.c:1582 inf-ptrace.c:283 inf-ttrace.c:799 procfs.c:3331 -#, possible-c-format -msgid "Detaching from program: %s, %s\n" +#: darwin-nat-info.c:776 +msgid " BAD_ACCESS" msgstr "" -#: darwin-nat.c:1598 -#, possible-c-format -msgid "Unable to detach from process-id %d: %s (%d)" +#: darwin-nat-info.c:778 +msgid " BAD_INSTRUCTION" msgstr "" -#: darwin-nat.c:1622 -#, c-format -msgid "Thread 0x%lx of process %u" +#: darwin-nat-info.c:780 +msgid " ARITHMETIC" msgstr "" -#: darwin-nat.c:1655 -#, possible-c-format -msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n" +#: darwin-nat-info.c:782 +msgid " EMULATION" msgstr "" -#: darwin-nat.c:1664 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s" +#: darwin-nat-info.c:784 +msgid " SOFTWARE" msgstr "" -#: darwin-nat.c:1696 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n" +#: darwin-nat-info.c:786 +msgid " BREAKPOINT" msgstr "" -#: darwin-nat.c:1704 -#, possible-c-format -msgid "" -"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, " -"len=%s\n" +#: darwin-nat-info.c:788 +msgid " SYSCALL" msgstr "" -#: darwin-nat.c:1713 -#, possible-c-format -msgid "No memory at %s (vs %s+0x%x). Nothing written" +#: darwin-nat-info.c:790 +msgid " MACH_SYSCALL" msgstr "" -#: darwin-nat.c:1731 -#, possible-c-format -msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s" +#: darwin-nat-info.c:792 +msgid " RPC_ALERT" msgstr "" -#: darwin-nat.c:1746 -#, possible-c-format -msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s" +#: darwin-nat-info.c:794 +msgid " CRASH" msgstr "" -#: darwin-nat.c:1760 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_write failed: %s" +#: darwin-nat-info.c:828 +msgid "Parameter is saved, host or none" msgstr "" -#: darwin-nat.c:1782 -#, possible-c-format -msgid "darwin_xfer_memory(%s, %d, %c)\n" +#: darwin-nat-info.c:850 +msgid "Get list of tasks in system." msgstr "" -#: darwin-nat.c:1800 -#, possible-c-format -msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n" +#: darwin-nat-info.c:852 +msgid "Get list of ports in a task." msgstr "" -#: darwin-nat.c:1943 -msgid "Darwin child process" +#: darwin-nat-info.c:854 +msgid "Get info on a specific port." msgstr "" -#: darwin-nat.c:1945 -msgid "Darwin child process (started by the \"run\" command)." +#: darwin-nat-info.c:856 +msgid "Get info on a specific task." msgstr "" -#: darwin-nat.c:1969 -#, possible-c-format -msgid "GDB task: 0x%lx, pid: %d\n" +#: darwin-nat-info.c:858 +msgid "Get list of threads in a task." msgstr "" -#: darwin-nat.c:1973 -msgid "Set if printing inferior communication debugging statements." +#: darwin-nat-info.c:860 +msgid "Get info on a specific thread." msgstr "" -#: darwin-nat.c:1974 -msgid "Show if printing inferior communication debugging statements." +#: darwin-nat-info.c:863 +msgid "Get information on all mach region for the task." msgstr "" -#: darwin-nat.c:1980 -msgid "Set if mach exceptions are caught." +#: darwin-nat-info.c:865 +msgid "Get information on all mach sub region for the task." msgstr "" -#: darwin-nat.c:1981 -msgid "Show if mach exceptions are caught." +#: darwin-nat-info.c:867 +msgid "Get information on mach region at given address." msgstr "" -#: darwin-nat.c:1982 -msgid "" -"When this mode is on, all low level exceptions are reported before being\n" -"reported by the kernel." +#: darwin-nat-info.c:870 +msgid "Disp mach exceptions." msgstr "" -#: dbxread.c:168 mdebugread.c:3436 +#: dbxread.c:170 mdebugread.c:3441 #, possible-c-format msgid "unknown symbol type %s" msgstr "" -#: dbxread.c:175 +#: dbxread.c:177 #, possible-c-format msgid "N_LBRAC/N_RBRAC symbol mismatch at symtab pos %d" msgstr "" -#: dbxread.c:182 +#: dbxread.c:184 #, possible-c-format msgid "\"repeated\" header file %s not previously seen, at symtab pos %d" msgstr "" -#: dbxread.c:227 +#: dbxread.c:229 msgid "Can't find any code sections in symbol file" msgstr "在符号文件中找不到代码段" -#: dbxread.c:646 +#: dbxread.c:648 msgid "Can't find .text section in symbol file" msgstr "在符号文件中找不到 .text 段" -#: dbxread.c:708 +#: dbxread.c:710 #, possible-c-format msgid "ridiculous string table size (%d bytes)." msgstr "" -#: dbxread.c:833 +#: dbxread.c:835 msgid "Premature end of file reading symbol table" msgstr "" -#: dbxread.c:974 +#: dbxread.c:976 #, possible-c-format msgid "bad string table offset in symbol %d" msgstr "符号 %d 的字符串表偏移量无效" -#: dbxread.c:1178 mdebugread.c:2245 xcoffread.c:2156 +#: dbxread.c:1180 mdebugread.c:2250 xcoffread.c:2182 #, possible-c-format msgid "function `%s' appears to be defined outside of all compilation units" msgstr "函数 `%s' 似乎是在所有编译单元之外定义的" -#: dbxread.c:1429 +#: dbxread.c:1431 #, possible-c-format msgid "string table offset backs up at %d" msgstr "" -#: dbxread.c:1577 +#: dbxread.c:1579 #, possible-c-format msgid "N_BINCL %s not in entries for any file, at symtab pos %d" msgstr "" -#: dbxread.c:2038 mdebugread.c:3371 xcoffread.c:2872 +#: dbxread.c:2040 mdebugread.c:3376 xcoffread.c:2898 #, possible-c-format msgid "unknown symbol descriptor `%c'" msgstr "" -#: dbxread.c:2607 +#: dbxread.c:2609 msgid "First symbol in segment of executable not a source symbol" msgstr "" -#: dbxread.c:2884 +#: dbxread.c:2886 msgid "" "misplaced N_LBRAC entry; discarding local symbols which have no enclosing " "block" msgstr "" -#: dbxread.c:2905 +#: dbxread.c:2907 msgid "block start larger than block end" msgstr "块首大于块尾" -#: dbxread.c:3199 +#: dbxread.c:3201 #, possible-c-format msgid "unmatched N_LBRAC before symtab pos %d" msgstr "" -#: dbxread.c:3357 dbxread.c:3451 dbxread.c:3548 +#: dbxread.c:3359 dbxread.c:3453 dbxread.c:3549 #, possible-c-format msgid "ridiculous string table size: %d bytes" msgstr "" -#: dbxread.c:3524 +#: dbxread.c:3525 #, possible-c-format msgid "" "stabsect_build_psymtabs: Found stabs (%s), but not string section (%s)" msgstr "" -#: dbxread.c:3535 +#: dbxread.c:3536 #, possible-c-format msgid "Can't find %s section in symbol file" msgstr "符号文件中找不到 %s 段" -#: dcache.c:134 +#: dcache.c:140 #, possible-c-format msgid "Deprecated remotecache flag is %s.\n" msgstr "" -#: dcache.c:550 dcache.c:611 +#: dcache.c:570 dcache.c:633 msgid "No data cache available.\n" msgstr "没有可用的数据缓存。\n" -#: dcache.c:565 +#: dcache.c:585 msgid "No such cache line exists.\n" msgstr "缓存中不存在这一行\n" -#: dcache.c:571 dcache.c:627 +#: dcache.c:591 dcache.c:649 #, possible-c-format msgid "Line %d: address %s [%d hits]\n" msgstr "" -#: dcache.c:598 +#: dcache.c:618 msgid "Usage: info dcache [linenumber]\n" msgstr "" -#: dcache.c:606 +#: dcache.c:626 #, possible-c-format -msgid "Dcache line width %d, maximum size %d\n" +msgid "Dcache %u lines of %u bytes each.\n" msgstr "" -#: dcache.c:615 +#: dcache.c:637 #, possible-c-format msgid "Contains data for %s\n" msgstr "" -#: dcache.c:635 +#: dcache.c:657 #, possible-c-format msgid "Cache state: %d active lines, %d hits\n" msgstr "" -#: dcache.c:642 +#: dcache.c:667 +msgid "Dcache size must be greater than 0." +msgstr "" + +#: dcache.c:682 +#, possible-c-format +msgid "Invalid dcache line size: %u (must be power of 2)." +msgstr "" + +#: dcache.c:706 msgid "Set cache use for remote targets." msgstr "" -#: dcache.c:643 +#: dcache.c:707 msgid "Show cache use for remote targets." msgstr "" -#: dcache.c:644 +#: dcache.c:708 msgid "" "This used to enable the data cache for remote targets. The cache\n" "functionality is now controlled by the memory region system and the\n" @@ -6560,7 +6655,7 @@ "exists only for compatibility reasons." msgstr "" -#: dcache.c:654 +#: dcache.c:718 msgid "" "Print information on the dcache performance.\n" "With no arguments, this command prints the cache configuration and a\n" @@ -6568,6 +6663,31 @@ "the contents of a given line." msgstr "" +#: dcache.c:724 +msgid "Use this command to set number of lines in dcache and line-size." +msgstr "" + +#. allow_unknown +#: dcache.c:727 +msgid "Show dcachesettings." +msgstr "" + +#: dcache.c:732 +msgid "Set dcache line size in bytes (must be power of 2)." +msgstr "" + +#: dcache.c:733 +msgid "Show dcache line size." +msgstr "" + +#: dcache.c:740 +msgid "Set number of dcache lines." +msgstr "" + +#: dcache.c:741 +msgid "Show number of dcache lines." +msgstr "" + #: dec-thread.c:355 #, possible-c-format msgid "unable to get thread info, ignoring thread %ld" @@ -6594,36 +6714,62 @@ msgid "Show debugging of DEC threads module." msgstr "" -#: demangle.c:61 +#: demangle.c:54 +#, possible-c-format +msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n" +msgstr "" + +#: demangle.c:67 +#, possible-c-format +msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n" +msgstr "" + +#: demangle.c:86 #, possible-c-format msgid "The current C++ demangling style is \"%s\".\n" msgstr "" -#: demangle.c:114 +#: demangle.c:136 #, possible-c-format msgid "Unknown demangling style `%s'.\n" msgstr "" -#: demangle.c:117 +#: demangle.c:139 msgid "" "The currently understood settings are:\n" "\n" msgstr "" -#: demangle.c:139 +#: demangle.c:161 #, possible-c-format msgid "`%s' style demangling chosen as the default." msgstr "" -#: demangle.c:200 +#: demangle.c:220 +msgid "Set demangling of encoded C++/ObjC names when displaying symbols." +msgstr "" + +#: demangle.c:221 +msgid "Show demangling of encoded C++/ObjC names when displaying symbols." +msgstr "" + +#: demangle.c:227 +msgid "Set demangling of C++/ObjC names in disassembly listings." +msgstr "" + +#: demangle.c:228 +msgid "Show demangling of C++/ObjC names in disassembly listings." +msgstr "" + +#: demangle.c:240 msgid "Set the current C++ demangling style." msgstr "" -#: demangle.c:201 +#: demangle.c:241 msgid "Show the current C++ demangling style." msgstr "" -#: demangle.c:202 +#: demangle.c:242 msgid "" "Use `set demangle-style' without arguments for a list of demangling styles." msgstr "" @@ -6656,11 +6802,11 @@ msgid "Can't read elf symbols from %s: %s" msgstr "" -#: dictionary.c:588 +#: dictionary.c:587 msgid "dict_add_symbol: non-expandable dictionary" msgstr "" -#: doublest.c:806 +#: doublest.c:801 #, possible-c-format msgid "Unrecognized %d-bit floating-point type." msgstr "" @@ -6672,7 +6818,7 @@ #. assumption might be wrong on targets that support #. floating-point types that only differ in endianness for #. example. So we warn instead, and zero out the target buffer. -#: doublest.c:887 +#: doublest.c:882 msgid "Can't convert floating-point number to desired type." msgstr "" @@ -6685,7 +6831,7 @@ msgid "File is not an object file\n" msgstr "" -#: dsrec.c:129 dsrec.c:143 symfile.c:1959 +#: dsrec.c:129 dsrec.c:143 symfile.c:1958 msgid "Canceled the download" msgstr "" @@ -6694,35 +6840,145 @@ msgid "make_srec: Bad address (%s), or bad flags (0x%x)." msgstr "" -#: dummy-frame.c:314 +#: dummy-frame.c:312 msgid "maintenance print dummy-frames" msgstr "" -#: dummy-frame.c:327 +#: dummy-frame.c:325 msgid "Print the contents of the internal dummy-frame stack." msgstr "" -#: dwarf2-frame.c:319 -msgid "Support for DW_OP_fbreg is unimplemented" +#: dwarf2expr.c:80 +#, possible-c-format +msgid "Unsupported address size in DWARF expressions: %d bits" msgstr "" -#: dwarf2-frame.c:328 -msgid "Support for DW_OP_call_frame_cfa is unimplemented" +#: dwarf2expr.c:183 +msgid "dwarf expression stack underflow" msgstr "" -#: dwarf2-frame.c:336 -msgid "Support for DW_OP_GNU_implicit_pointer is unimplemented" +#: dwarf2expr.c:193 dwarf2expr.c:293 +#, possible-c-format +msgid "Asked for position %d of stack, stack only has %d elements on it." +msgstr "" + +#: dwarf2expr.c:207 +msgid "integral type expected in DWARF expression" +msgstr "" + +#: dwarf2expr.c:227 +msgid "no unsigned variant found for type, while evaluating DWARF expression" +msgstr "" + +#: dwarf2expr.c:249 +msgid "no signed variant found for type, while evaluating DWARF expression" +msgstr "" + +#: dwarf2expr.c:386 +msgid "read_uleb128: Corrupted DWARF expression." +msgstr "" + +#: dwarf2expr.c:413 +msgid "read_sleb128: Corrupted DWARF expression." +msgstr "" + +#: dwarf2expr.c:441 +#, possible-c-format +msgid "" +"DWARF-2 expression error: `%s' operations must be used either alone or in " +"conjunction with DW_OP_piece or DW_OP_bit_piece." +msgstr "" + +#: dwarf2expr.c:475 +msgid "Could not find type for DW_OP_GNU_const_type" +msgstr "" + +#: dwarf2expr.c:477 +msgid "DW_OP_GNU_const_type has different sizes for type and data" +msgstr "" + +#: dwarf2expr.c:661 +#, possible-c-format +msgid "DWARF-2 expression error: Loop detected (%d)." +msgstr "" + +#: dwarf2expr.c:824 +msgid "" +"DWARF-2 expression error: DW_OP_reg operations must be used either alone or " +"in conjunction with DW_OP_piece or DW_OP_bit_piece." +msgstr "" + +#: dwarf2expr.c:848 dwarf2loc.c:2595 +msgid "DW_OP_implicit_value: too few bytes available." +msgstr "" + +#: dwarf2expr.c:869 +msgid "" +"DWARF-2 expression error: DW_OP_GNU_implicit_pointer is not allowed in frame " +"context" +msgstr "" + +#: dwarf2expr.c:959 +msgid "Not implemented: computing frame base using explicit value operator" +msgstr "" + +#: dwarf2expr.c:989 +#, possible-c-format +msgid "Not enough elements for DW_OP_swap. Need 2, have %d." +msgstr "" + +#: dwarf2expr.c:1009 +#, possible-c-format +msgid "Not enough elements for DW_OP_rot. Need 3, have %d." +msgstr "" + +#: dwarf2expr.c:1122 +msgid "Incompatible types on DWARF stack" +msgstr "" + +#: dwarf2expr.c:1245 +msgid "Can't be reached." +msgstr "" + +#: dwarf2expr.c:1331 +msgid "" +"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op." msgstr "" -#: dwarf2-frame.c:343 -msgid "Support for DW_OP_GNU_push_tls_address is unimplemented" +#: dwarf2expr.c:1357 +msgid "DW_OP_GNU_entry_value: too few bytes available." msgstr "" -#: dwarf2-frame.c:353 -msgid "Support for DW_OP_call* is invalid in CFI" +#: dwarf2expr.c:1382 +msgid "" +"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single " +"DW_OP_reg* or for DW_OP_breg*(0)+DW_OP_deref*" +msgstr "" + +#: dwarf2expr.c:1444 +msgid "DW_OP_GNU_reinterpret has wrong size" +msgstr "" + +#: dwarf2expr.c:1453 +#, possible-c-format +msgid "Unhandled dwarf expression opcode 0x%x" +msgstr "" + +#: dwarf2expr.c:1479 dwarf2expr.c:1487 dwarf2expr.c:1495 dwarf2expr.c:1503 +#: dwarf2expr.c:1511 +#, possible-c-format +msgid "%s is invalid in this context" +msgstr "" + +#: dwarf2expr.c:1519 +msgid "Support for typed DWARF is not supported in this context" msgstr "" -#: dwarf2-frame.c:377 +#: dwarf2expr.c:1531 +msgid "Support for DW_OP_GNU_entry_value is unimplemented" +msgstr "" + +#: dwarf2-frame.c:336 #, possible-c-format msgid "" "incomplete CFI data; DW_CFA_restore unspecified\n" @@ -6732,716 +6988,863 @@ #. This is actually invalid DWARF, but if we ever do run across #. it somehow, we might as well support it. So, instead, report #. it as unimplemented. -#: dwarf2-frame.c:422 +#: dwarf2-frame.c:392 msgid "" "Not implemented: computing unwound register using explicit value operator" msgstr "" -#: dwarf2-frame.c:550 +#: dwarf2-frame.c:524 #, possible-c-format msgid "bad CFI data; mismatched DW_CFA_restore_state at %s" msgstr "" -#: dwarf2-frame.c:710 +#: dwarf2-frame.c:684 msgid "Unknown CFI encountered." msgstr "" -#: dwarf2-frame.c:926 +#: dwarf2-frame.c:905 msgid "Could not compute CFA; needed to translate this expression" msgstr "" -#: dwarf2-frame.c:956 dwarf2loc.c:1407 +#: dwarf2-frame.c:935 dwarf2loc.c:2331 #, possible-c-format msgid "Unable to access DWARF register number %d" msgstr "" -#: dwarf2-frame.c:980 dwarf2-frame.c:1098 +#: dwarf2-frame.c:959 dwarf2-frame.c:1105 msgid "Unknown CFA rule." msgstr "" -#: dwarf2-frame.c:1153 +#: dwarf2-frame.c:1160 #, possible-c-format msgid "incomplete CFI data; unspecified registers (e.g., %s) at %s" msgstr "" -#: dwarf2-frame.c:1325 +#: dwarf2-frame.c:1354 msgid "Unknown register rule." msgstr "" -#: dwarf2-frame.c:1435 +#: dwarf2-frame.c:1492 msgid "can't compute CFA for this frame" msgstr "" -#: dwarf2-frame.c:1562 +#: dwarf2-frame.c:1619 msgid "Unsupported address size" msgstr "" -#: dwarf2-frame.c:1579 +#: dwarf2-frame.c:1636 msgid "Unsupported encoding: DW_EH_PE_indirect" msgstr "" -#: dwarf2-frame.c:1612 dwarf2-frame.c:1660 +#: dwarf2-frame.c:1669 dwarf2-frame.c:1717 msgid "Invalid or unsupported encoding" msgstr "" -#: dwarf2-frame.c:2152 +#: dwarf2-frame.c:1927 +msgid "Found a CIE when not expecting it." +msgstr "" + +#: dwarf2-frame.c:2096 +msgid "Found an FDE when not expecting it." +msgstr "" + +#: dwarf2-frame.c:2234 #, possible-c-format msgid "Corrupt data in %s:%s; align 4 workaround apparently succeeded" msgstr "" -#: dwarf2-frame.c:2159 +#: dwarf2-frame.c:2241 #, possible-c-format msgid "Corrupt data in %s:%s; align 8 workaround apparently succeeded" msgstr "" -#: dwarf2-frame.c:2167 +#: dwarf2-frame.c:2249 #, possible-c-format msgid "Corrupt data in %s:%s" msgstr "" -#: dwarf2expr.c:122 -msgid "dwarf expression stack underflow" +#: dwarf2-frame.c:2340 +#, possible-c-format +msgid "skipping .eh_frame info of %s: %s" msgstr "" -#: dwarf2expr.c:132 dwarf2expr.c:187 +#: dwarf2-frame.c:2380 #, possible-c-format -msgid "Asked for position %d of stack, stack only has %d elements on it." +msgid "skipping .debug_frame info of %s: %s" msgstr "" -#: dwarf2expr.c:171 -msgid "Unsupported address size.\n" +#: dwarf2loc.c:90 +msgid "dwarf2_find_location_expression: Corrupted DWARF expression." msgstr "" -#: dwarf2expr.c:279 -msgid "read_uleb128: Corrupted DWARF expression." +#: dwarf2loc.c:243 +#, possible-c-format +msgid "Could not find the frame base for \"%s\"." msgstr "" -#: dwarf2expr.c:305 -msgid "read_sleb128: Corrupted DWARF expression." +#: dwarf2loc.c:333 +#, possible-c-format +msgid "Entry values and tail call frames debugging is %s.\n" msgstr "" -#: dwarf2expr.c:332 +#: dwarf2loc.c:362 +#, possible-c-format +msgid "DW_AT_GNU_call_site_target is not specified at %s in %s" +msgstr "" + +#: dwarf2loc.c:374 #, possible-c-format msgid "" -"DWARF-2 expression error: `%s' operations must be used either alone or in " -"conjuction with DW_OP_piece or DW_OP_bit_piece." +"DW_AT_GNU_call_site_target DWARF block resolving requires known frame which " +"is currently not available at %s in %s" msgstr "" -#: dwarf2expr.c:354 +#: dwarf2loc.c:405 #, possible-c-format -msgid "DWARF-2 expression error: Loop detected (%d)." +msgid "Cannot find function \"%s\" for a call site target at %s in %s" msgstr "" -#: dwarf2expr.c:500 -msgid "" -"DWARF-2 expression error: DW_OP_reg operations must be used either alone or " -"in conjuction with DW_OP_piece or DW_OP_bit_piece." +#: dwarf2loc.c:418 +msgid "invalid call site target kind" msgstr "" -#: dwarf2expr.c:522 dwarf2loc.c:1671 -msgid "DW_OP_implicit_value: too few bytes available." +#: dwarf2loc.c:434 +#, possible-c-format +msgid "" +"DW_TAG_GNU_call_site resolving failed to find function name for address %s" msgstr "" -#: dwarf2expr.c:625 -msgid "Not implemented: computing frame base using explicit value operator" +#: dwarf2loc.c:503 +#, possible-c-format +msgid "" +"DW_OP_GNU_entry_value resolving has found function \"%s\" at %s can call " +"itself via tail calls" msgstr "" -#: dwarf2expr.c:654 +#: dwarf2loc.c:669 #, possible-c-format -msgid "Not enough elements for DW_OP_swap. Need 2, have %d." +msgid "Unable to find function for PC %s" msgstr "" -#: dwarf2expr.c:674 +#: dwarf2loc.c:768 #, possible-c-format -msgid "Not enough elements for DW_OP_rot. Need 3, have %d." +msgid "" +"There are no unambiguously determinable intermediate callers or callees " +"between caller function \"%s\" at %s and callee function \"%s\" at %s" msgstr "" -#: dwarf2expr.c:760 dwarf2expr.c:768 valarith.c:1159 valarith.c:1170 -#: valarith.c:1285 valarith.c:1296 -msgid "Division by zero" +#: dwarf2loc.c:845 +#, possible-c-format +msgid "" +"DW_OP_GNU_entry_value resolving callee gdbarch %s (of %s (%s)) does not " +"match caller gdbarch %s" msgstr "" -#: dwarf2expr.c:812 -msgid "Can't be reached." +#: dwarf2loc.c:857 +#, possible-c-format +msgid "DW_OP_GNU_entry_value resolving requires caller of %s (%s)" msgstr "" -#: dwarf2expr.c:890 +#: dwarf2loc.c:873 +#, possible-c-format msgid "" -"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op." +"DW_OP_GNU_entry_value resolving expects callee %s at %s but the called frame " +"is for %s at %s" msgstr "" -#: dwarf2expr.c:916 +#. DW_TAG_GNU_call_site_parameter will be missing just if GCC could not +#. determine its value. +#: dwarf2loc.c:903 #, possible-c-format -msgid "Unhandled dwarf expression opcode 0x%x" +msgid "Cannot find matching parameter at DW_TAG_GNU_call_site %s at %s" msgstr "" -#: dwarf2loc.c:88 -msgid "dwarf2_find_location_expression: Corrupted DWARF expression." +#: dwarf2loc.c:939 dwarf2loc.c:986 +msgid "Cannot resolve DW_AT_GNU_call_site_data_value" msgstr "" -#: dwarf2loc.c:220 -#, possible-c-format -msgid "Could not find the frame base for \"%s\"." +#: dwarf2loc.c:1150 +msgid "" +"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single " +"DW_OP_reg* or for DW_OP_fbreg(*)" msgstr "" -#: dwarf2loc.c:519 +#: dwarf2loc.c:1388 msgid "Should not be able to create a lazy value with an enclosing type" msgstr "" -#: dwarf2loc.c:611 dwarf2loc.c:1159 +#: dwarf2loc.c:1480 dwarf2loc.c:2044 #, possible-c-format msgid "Unable to access DWARF register number %s" msgstr "" -#: dwarf2loc.c:676 dwarf2loc.c:1235 +#: dwarf2loc.c:1537 dwarf2loc.c:2137 msgid "invalid location type" msgstr "" -#: dwarf2loc.c:798 +#: dwarf2loc.c:1659 msgid "" "Can't do read-modify-write to update bitfield; containing word has been " "optimized out" msgstr "" -#: dwarf2loc.c:803 +#: dwarf2loc.c:1664 msgid "" "Can't do read-modify-write to update bitfield; containing word is unavailable" msgstr "" -#: dwarf2loc.c:818 +#: dwarf2loc.c:1679 #, possible-c-format msgid "Unable to write to DWARF register number %s" msgstr "" -#: dwarf2loc.c:996 +#: dwarf2loc.c:1856 msgid "Invalid use of DW_OP_GNU_implicit_pointer" msgstr "" -#: dwarf2loc.c:1059 +#: dwarf2loc.c:1926 msgid "access outside bounds of object referenced via synthetic pointer" msgstr "" -#: dwarf2loc.c:1155 +#: dwarf2loc.c:2039 msgid "cannot use offset on synthetic pointer to register" msgstr "" -#: dwarf2loc.c:1388 +#: dwarf2loc.c:2312 #, possible-c-format msgid "DWARF operator %s cannot be translated to an agent expression" msgstr "" -#: dwarf2loc.c:1391 +#: dwarf2loc.c:2315 #, possible-c-format msgid "" "Unknown DWARF operator 0x%02x cannot be translated to an agent expression" msgstr "" -#: dwarf2loc.c:1673 +#: dwarf2loc.c:2597 #, possible-c-format msgid "Cannot translate DW_OP_implicit_value of %d bytes" msgstr "" -#: dwarf2loc.c:1757 +#: dwarf2loc.c:2681 msgid "No block found for address" msgstr "" -#: dwarf2loc.c:1762 +#: dwarf2loc.c:2686 msgid "No function found for block" msgstr "" #. Note that dwarf_stack_op_name will never return #. NULL here. -#: dwarf2loc.c:1833 +#: dwarf2loc.c:2757 #, possible-c-format msgid "Unsupported size %d in %s" msgstr "" -#: dwarf2loc.c:2021 +#: dwarf2loc.c:2945 msgid "Cannot translate empty pieces to agent expressions" msgstr "" -#: dwarf2loc.c:2034 +#: dwarf2loc.c:2958 msgid "Expression pieces exceed word size" msgstr "" -#: dwarf2loc.c:2120 +#: dwarf2loc.c:3044 msgid "invalid label" msgstr "" -#: dwarf2loc.c:2178 dwarf2loc.c:2188 +#: dwarf2loc.c:3125 dwarf2loc.c:3134 #, possible-c-format msgid "a variable in $%s" msgstr "" -#: dwarf2loc.c:2209 +#: dwarf2loc.c:3155 #, possible-c-format msgid "No block found for address for symbol \"%s\"." msgstr "" -#: dwarf2loc.c:2215 +#: dwarf2loc.c:3161 #, possible-c-format msgid "No function found for block for symbol \"%s\"." msgstr "" -#: dwarf2loc.c:2228 +#: dwarf2loc.c:3174 #, possible-c-format msgid "Unexpected opcode after DW_OP_breg%u for symbol \"%s\"." msgstr "" -#: dwarf2loc.c:2248 +#: dwarf2loc.c:3192 #, possible-c-format msgid "a variable at frame base reg $%s offset %s+%s" msgstr "" -#: dwarf2loc.c:2262 +#: dwarf2loc.c:3204 #, possible-c-format msgid "a variable at offset %s from base reg $%s" msgstr "" -#: dwarf2loc.c:2293 +#: dwarf2loc.c:3235 #, possible-c-format msgid "" "a thread-local variable at offset 0x%s in the thread-local storage for `%s'" msgstr "" -#: dwarf2loc.c:2304 +#: dwarf2loc.c:3246 #, possible-c-format msgid "the constant %d" msgstr "" -#: dwarf2loc.c:2325 -msgid "a complex DWARF expression:\n" -msgstr "" - -#: dwarf2loc.c:2339 +#: dwarf2loc.c:3278 #, possible-c-format msgid "Unrecognized DWARF opcode 0x%02x at %ld" msgstr "" -#: dwarf2loc.c:2603 +#: dwarf2loc.c:3617 msgid ", and " msgstr "" -#: dwarf2loc.c:2636 +#: dwarf2loc.c:3633 +msgid "a complex DWARF expression:\n" +msgstr "" + +#: dwarf2loc.c:3655 #, possible-c-format msgid "an empty %s-byte piece" msgstr "" -#: dwarf2loc.c:2639 +#: dwarf2loc.c:3658 #, possible-c-format msgid " [%s-byte piece]" msgstr "" -#: dwarf2loc.c:2651 +#: dwarf2loc.c:3670 #, possible-c-format msgid "an empty %s-bit piece" msgstr "" -#: dwarf2loc.c:2655 +#: dwarf2loc.c:3674 #, possible-c-format msgid " [%s-bit piece, offset %s bits]" msgstr "" -#: dwarf2loc.c:2667 +#: dwarf2loc.c:3686 #, possible-c-format msgid "Corrupted DWARF2 expression for \"%s\"." msgstr "" -#: dwarf2loc.c:2783 +#: dwarf2loc.c:3823 msgid "multi-location:\n" msgstr "" -#: dwarf2loc.c:2789 +#: dwarf2loc.c:3829 #, possible-c-format msgid "Corrupted DWARF expression for symbol \"%s\"." msgstr "" -#: dwarf2loc.c:2808 +#: dwarf2loc.c:3848 #, possible-c-format msgid " Base address %s" msgstr "" #. (It would improve readability to print only the minimum #. necessary digits of the second number of the range.) -#: dwarf2loc.c:2826 +#: dwarf2loc.c:3866 #, possible-c-format msgid " Range %s-%s: " msgstr "" -#: dwarf2read.c:801 +#: dwarf2loc.c:3914 +msgid "Set entry values and tail call frames debugging." +msgstr "" + +#: dwarf2loc.c:3916 +msgid "Show entry values and tail call frames debugging." +msgstr "" + +#: dwarf2loc.c:3918 +msgid "" +"When non-zero, the process of determining parameter values from function " +"entry point and tail call frames will be printed." +msgstr "" + +#: dwarf2read.c:822 #, possible-c-format msgid "" "The upper bound on the age of cached dwarf2 compilation units is %s.\n" msgstr "" -#: dwarf2read.c:813 +#: dwarf2read.c:834 msgid "statement list doesn't fit in .debug_line section" msgstr "" -#: dwarf2read.c:820 +#: dwarf2read.c:841 msgid ".debug_line section has line data without a file" msgstr "" -#: dwarf2read.c:827 +#: dwarf2read.c:848 msgid ".debug_line section has line program sequence without an end" msgstr "" -#: dwarf2read.c:834 +#: dwarf2read.c:855 msgid "location expression too complex" msgstr "" -#: dwarf2read.c:842 +#: dwarf2read.c:863 #, possible-c-format msgid "const value length mismatch for '%s', got %d, expected %d" msgstr "" -#: dwarf2read.c:850 -msgid "macro info runs off end of `.debug_macinfo' section" +#: dwarf2read.c:871 +#, possible-c-format +msgid "macro info runs off end of `%s' section" msgstr "" -#: dwarf2read.c:857 +#: dwarf2read.c:879 #, possible-c-format msgid "" "macro debug info contains a malformed macro definition:\n" "`%s'" msgstr "" -#: dwarf2read.c:866 +#: dwarf2read.c:888 #, possible-c-format msgid "invalid attribute class or form for '%s' in '%s'" msgstr "" -#: dwarf2read.c:1453 +#: dwarf2read.c:1518 #, possible-c-format msgid "" "Support for zlib-compressed DWARF data (from '%s') is disabled in this copy " "of GDB" msgstr "" -#: dwarf2read.c:1469 dwarf2read.c:1610 +#: dwarf2read.c:1534 dwarf2read.c:1672 #, possible-c-format msgid "Dwarf Error: Can't read DWARF data from '%s'" msgstr "" -#: dwarf2read.c:1476 +#: dwarf2read.c:1541 #, possible-c-format msgid "Dwarf Error: Corrupt DWARF ZLIB header from '%s'" msgstr "" -#: dwarf2read.c:1501 +#: dwarf2read.c:1566 #, possible-c-format msgid "Dwarf Error: setting up DWARF uncompression in '%s': %d" msgstr "" -#: dwarf2read.c:1507 +#: dwarf2read.c:1572 #, possible-c-format msgid "Dwarf Error: zlib error uncompressing from '%s': %d" msgstr "" -#: dwarf2read.c:1514 +#: dwarf2read.c:1579 #, possible-c-format msgid "Dwarf Error: concluding DWARF uncompression in '%s': %d" msgstr "" -#: dwarf2read.c:2461 +#: dwarf2read.c:2621 #, possible-c-format msgid " Number of unread CUs: %d\n" msgstr "" -#: dwarf2read.c:2675 +#: dwarf2read.c:2853 #, possible-c-format msgid "(Internal error: pc %s in read in CU, but not in symtab.)" msgstr "" -#: dwarf2read.c:2834 +#: dwarf2read.c:3016 msgid "read_comp_unit_head: dwarf from non elf file" msgstr "" -#: dwarf2read.c:2850 +#: dwarf2read.c:3043 #, possible-c-format msgid "" "Dwarf Error: wrong version in compilation unit header (is %d, should be 2, " "3, or 4) [in module %s]" msgstr "" -#: dwarf2read.c:2857 +#: dwarf2read.c:3050 #, possible-c-format msgid "" "Dwarf Error: bad offset (0x%lx) in compilation unit header (offset 0x%lx + " "6) [in module %s]" msgstr "" -#: dwarf2read.c:2865 +#: dwarf2read.c:3058 #, possible-c-format msgid "" "Dwarf Error: bad length (0x%lx) in compilation unit header (offset 0x%lx + " "0) [in module %s]" msgstr "" -#: dwarf2read.c:3056 +#: dwarf2read.c:3261 msgid "debug type entry runs off end of `.debug_types' section, ignored" msgstr "" -#: dwarf2read.c:3116 +#: dwarf2read.c:3299 +#, possible-c-format +msgid "" +"debug type entry at offset 0x%x is duplicate to the entry at offset 0x%x, " +"signature 0x%s" +msgstr "" + +#: dwarf2read.c:3341 msgid "missing `.debug_types' section for DW_FORM_ref_sig8 die" msgstr "" -#: dwarf2read.c:3777 +#: dwarf2read.c:4013 #, possible-c-format msgid "unhandled containing DIE tag %d for DIE at %d" msgstr "" -#: dwarf2read.c:4111 dwarf2read.c:9096 +#: dwarf2read.c:4347 dwarf2read.c:9705 msgid "malformed enumerator DIE ignored" msgstr "" -#: dwarf2read.c:4139 +#: dwarf2read.c:4385 #, possible-c-format msgid "Dwarf Error: Could not find abbrev number %d [in module %s]" msgstr "" -#: dwarf2read.c:4190 dwarf2read.c:9312 +#: dwarf2read.c:4436 dwarf2read.c:9921 msgid "ignoring absolute DW_AT_sibling" msgstr "" -#: dwarf2read.c:4266 dwarf2read.c:9746 +#: dwarf2read.c:4512 dwarf2read.c:10366 #, possible-c-format msgid "Dwarf Error: Cannot handle %s in DWARF reader [in module %s]" msgstr "" -#: dwarf2read.c:4312 +#: dwarf2read.c:4558 #, possible-c-format msgid "bug: psymtab for %s is already read in." msgstr "" -#: dwarf2read.c:4319 mdebugread.c:281 +#: dwarf2read.c:4565 mdebugread.c:286 #, possible-c-format msgid "Reading in symbols for %s..." msgstr "" -#: dwarf2read.c:4348 mdebugread.c:294 psymtab.c:102 symfile.c:1156 +#: dwarf2read.c:4594 mdebugread.c:299 psymtab.c:102 symfile.c:1158 msgid "done.\n" msgstr "" -#: dwarf2read.c:4780 +#: dwarf2read.c:5005 #, possible-c-format msgid "Tag '%s' has unexpected children" msgstr "" -#: dwarf2read.c:4970 +#: dwarf2read.c:5195 msgid "template parameter missing DW_AT_type" msgstr "" -#: dwarf2read.c:4986 +#: dwarf2read.c:5211 msgid "template parameter missing DW_AT_const_value" msgstr "" -#: dwarf2read.c:5181 +#: dwarf2read.c:5406 #, possible-c-format msgid "" "Computed physname <%s> does not match demangled <%s> (from linkage <%s>) - " "DIE at 0x%x [in module %s]" msgstr "" -#: dwarf2read.c:5228 +#: dwarf2read.c:5455 dwarf2read.c:5551 #, possible-c-format msgid "Tag '%s' has no DW_AT_import" msgstr "" -#: dwarf2read.c:5527 +#: dwarf2read.c:5542 +#, possible-c-format +msgid "" +"child DW_TAG_imported_declaration expected - DIE at 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:5563 +#, possible-c-format +msgid "" +"child DW_TAG_imported_declaration has unknown imported name - DIE at 0x%x " +"[in module %s]" +msgstr "" + +#: dwarf2read.c:5751 +msgid "CU refers to both DW_AT_GNU_macros and DW_AT_macro_info" +msgstr "" + +#: dwarf2read.c:5841 #, possible-c-format msgid "Dwarf Error: Missing children for type unit [in module %s]" msgstr "" -#: dwarf2read.c:5617 +#: dwarf2read.c:5931 #, possible-c-format msgid "DIE 0x%x and its abstract origin 0x%x have different tags" msgstr "" -#: dwarf2read.c:5660 +#: dwarf2read.c:5974 #, possible-c-format msgid "Child DIE 0x%x and its abstract origin 0x%x have different tags" msgstr "" -#: dwarf2read.c:5665 +#: dwarf2read.c:5979 #, possible-c-format msgid "Child DIE 0x%x and its abstract origin 0x%x have different parents" msgstr "" -#: dwarf2read.c:5678 +#: dwarf2read.c:5992 #, possible-c-format msgid "" "Multiple children of DIE 0x%x refer to DIE 0x%x as their abstract origin" msgstr "" -#: dwarf2read.c:5740 +#: dwarf2read.c:6054 #, possible-c-format msgid "missing name for subprogram DIE at %d" msgstr "" -#: dwarf2read.c:5750 +#: dwarf2read.c:6064 #, possible-c-format msgid "cannot get low and high bounds for subprogram DIE at %d" msgstr "" -#: dwarf2read.c:5977 +#: dwarf2read.c:6279 +#, possible-c-format +msgid "missing DW_AT_low_pc for DW_TAG_GNU_call_site DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6295 +#, possible-c-format +msgid "Duplicate PC %s for DW_TAG_GNU_call_site DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6310 +#, possible-c-format +msgid "" +"Tag %d is not DW_TAG_GNU_call_site_parameter in DW_TAG_GNU_call_site child " +"DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6368 +#, possible-c-format +msgid "" +"Cannot find function owning DW_TAG_GNU_call_site DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6406 +#, possible-c-format +msgid "" +"DW_AT_GNU_call_site_target target DIE has invalid physname, for referencing " +"DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6419 +#, possible-c-format +msgid "" +"DW_AT_GNU_call_site_target target DIE has invalid low pc, for referencing " +"DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6428 +#, possible-c-format +msgid "" +"DW_TAG_GNU_call_site DW_AT_GNU_call_site_target is neither block nor " +"reference, for DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6457 +#, possible-c-format +msgid "" +"No DW_FORM_block* DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in " +"module %s]" +msgstr "" + +#: dwarf2read.c:6470 +#, possible-c-format +msgid "" +"Only single DW_OP_reg or DW_OP_fbreg is supported for DW_FORM_block* " +"DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6481 +#, possible-c-format +msgid "" +"No DW_FORM_block* DW_AT_GNU_call_site_value for DW_TAG_GNU_call_site child " +"DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6499 +#, possible-c-format +msgid "" +"No DW_FORM_block* DW_AT_GNU_call_site_data_value for DW_TAG_GNU_call_site " +"child DIE 0x%x [in module %s]" +msgstr "" + +#: dwarf2read.c:6543 #, possible-c-format msgid "Offset %d out of bounds for DW_AT_ranges attribute" msgstr "" -#: dwarf2read.c:6031 dwarf2read.c:6329 +#: dwarf2read.c:6597 dwarf2read.c:6896 msgid "Invalid .debug_ranges data (no base address)" msgstr "" -#: dwarf2read.c:6039 dwarf2read.c:6338 +#: dwarf2read.c:6605 dwarf2read.c:6905 msgid "Invalid .debug_ranges data (inverted range)" msgstr "" -#: dwarf2read.c:6297 +#: dwarf2read.c:6864 #, possible-c-format msgid "Offset %lu out of bounds for DW_AT_ranges attribute" msgstr "" -#: dwarf2read.c:6765 +#: dwarf2read.c:7332 #, possible-c-format msgid "unsupported accessibility %d" msgstr "" -#: dwarf2read.c:6777 +#: dwarf2read.c:7344 msgid "unexpected virtuality in component of Ada type" msgstr "" -#: dwarf2read.c:6802 +#: dwarf2read.c:7369 msgid "unexpected member function in Ada type" msgstr "" -#: dwarf2read.c:6885 +#: dwarf2read.c:7452 #, possible-c-format msgid "member function type missing for '%s'" msgstr "" -#: dwarf2read.c:6974 +#: dwarf2read.c:7541 #, possible-c-format msgid "" "Member function \"%s\" (offset %d) is virtual but the vtable offset is not " "specified" msgstr "" -#: dwarf2read.c:6994 +#: dwarf2read.c:7561 msgid "unexpected member functions in Ada type" msgstr "" -#: dwarf2read.c:7321 +#: dwarf2read.c:7888 #, possible-c-format msgid "virtual function table pointer not found when defining class '%s'" msgstr "" -#: dwarf2read.c:7643 +#: dwarf2read.c:8234 msgid "" "DW_AT_byte_size for array type smaller than the total size of elements" msgstr "" -#: dwarf2read.c:7863 +#: dwarf2read.c:8454 #, possible-c-format msgid "DW_TAG_module has no name, offset 0x%x" msgstr "" -#: dwarf2read.c:7970 +#: dwarf2read.c:8561 #, possible-c-format msgid "invalid pointer size %d" msgstr "" -#: dwarf2read.c:8342 +#: dwarf2read.c:8933 msgid "DW_AT_name missing from DW_TAG_base_type" msgstr "" -#: dwarf2read.c:8389 +#: dwarf2read.c:8986 #, possible-c-format msgid "unsupported DW_AT_encoding: '%s'" msgstr "" -#: dwarf2read.c:8750 +#: dwarf2read.c:9345 #, possible-c-format msgid "Dwarf Error: could not find abbrev number %d [in module %s]" msgstr "" -#: dwarf2read.c:9364 +#: dwarf2read.c:9689 +#, possible-c-format +msgid "" +"DW_TAG_typedef has childen - GCC PR debug/47510 bug - DIE at 0x%x [in module " +"%s]" +msgstr "" + +#: dwarf2read.c:9973 #, possible-c-format msgid "DW_AT_low_pc %s is zero for DIE at 0x%x [in module %s]" msgstr "" -#: dwarf2read.c:9375 +#: dwarf2read.c:9984 #, possible-c-format msgid "" "DW_AT_low_pc %s is not < DW_AT_high_pc %s for DIE at 0x%x [in module %s]" msgstr "" -#: dwarf2read.c:9474 +#: dwarf2read.c:10083 #, possible-c-format msgid "could not find partial DIE 0x%x in cache [from module %s]\n" msgstr "" -#: dwarf2read.c:9763 +#: dwarf2read.c:10383 #, possible-c-format msgid "Suspicious DW_AT_byte_size value treated as zero instead of %s" msgstr "" -#: dwarf2read.c:9847 +#: dwarf2read.c:10467 #, possible-c-format msgid "read_address: bad switch, signed [in module %s]" msgstr "" -#: dwarf2read.c:9866 +#: dwarf2read.c:10486 #, possible-c-format msgid "read_address: bad switch, unsigned [in module %s]" msgstr "" -#: dwarf2read.c:9960 +#: dwarf2read.c:10580 msgid "intermixed 32-bit and 64-bit DWARF sections" msgstr "" -#: dwarf2read.c:9996 +#: dwarf2read.c:10616 #, possible-c-format msgid "read_offset_1: bad switch [in module %s]" msgstr "" -#: dwarf2read.c:10039 +#: dwarf2read.c:10654 #, possible-c-format msgid "DW_FORM_strp used without .debug_str section [in module %s]" msgstr "" -#: dwarf2read.c:10045 +#: dwarf2read.c:10657 #, possible-c-format msgid "DW_FORM_strp pointing outside of .debug_str section [in module %s]" msgstr "" -#: dwarf2read.c:10372 +#: dwarf2read.c:10992 msgid "missing .debug_line section" msgstr "" -#: dwarf2read.c:10421 +#: dwarf2read.c:11041 msgid "invalid maximum_ops_per_instruction in `.debug_line' section" msgstr "" -#: dwarf2read.c:10472 +#: dwarf2read.c:11092 msgid "line number info header doesn't fit in `.debug_line' section" msgstr "" -#: dwarf2read.c:10519 +#: dwarf2read.c:11139 #, possible-c-format msgid "misplaced first line number at 0x%lx for '%s'" msgstr "" -#: dwarf2read.c:10756 +#: dwarf2read.c:11358 #, possible-c-format msgid ".debug_line address at offset 0x%lx is 0 [in module %s]" msgstr "" -#: dwarf2read.c:10793 dwarf2read.c:10802 +#: dwarf2read.c:11395 dwarf2read.c:11404 msgid "mangled .debug_line section" msgstr "" -#: dwarf2read.c:11159 +#: dwarf2read.c:11795 msgid "file index out of range" msgstr "" @@ -7449,499 +7852,520 @@ #. trash data, but since we must specifically ignore things #. we don't recognize, there is nothing else we should do at #. this point. -#: dwarf2read.c:11429 +#: dwarf2read.c:12057 #, possible-c-format msgid "unsupported tag: '%s'" msgstr "" -#: dwarf2read.c:11597 +#: dwarf2read.c:12225 #, possible-c-format msgid "unsupported const value attribute form: '%s'" msgstr "" -#: dwarf2read.c:11717 +#: dwarf2read.c:12345 #, possible-c-format msgid "" "Dwarf Error: Problem turning containing type into gdb type [in module %s]" msgstr "" -#: dwarf2read.c:11749 dwarf2read.c:13720 +#: dwarf2read.c:12377 dwarf2read.c:14432 #, possible-c-format msgid "" "Dwarf Error: Cannot find signatured DIE referenced from DIE at 0x%x [in " "module %s]" msgstr "" -#: dwarf2read.c:11760 +#: dwarf2read.c:12388 #, possible-c-format msgid "Dwarf Error: Bad type attribute %s [in module %s]" msgstr "" #. read_type_die already issued a complaint. -#: dwarf2read.c:11784 +#: dwarf2read.c:12412 #, possible-c-format msgid "" msgstr "" -#: dwarf2read.c:11886 +#: dwarf2read.c:12514 #, possible-c-format msgid "unexpected tag in read_type_die: '%s'" msgstr "" -#: dwarf2read.c:12061 +#: dwarf2read.c:12730 #, possible-c-format msgid "template param type '%s' defined within parent '%s'" msgstr "" -#: dwarf2read.c:13487 +#: dwarf2read.c:14179 #, possible-c-format msgid "unsupported die ref attribute form: '%s'" msgstr "" -#: dwarf2read.c:13509 +#: dwarf2read.c:14201 #, possible-c-format msgid "Attribute value is not a constant (%s)" msgstr "" -#: dwarf2read.c:13573 +#: dwarf2read.c:14265 #, possible-c-format msgid "Dwarf Error: Expected reference attribute [in module %s]" msgstr "" -#: dwarf2read.c:13641 +#: dwarf2read.c:14333 #, possible-c-format msgid "" "Dwarf Error: Cannot find DIE at 0x%x referenced from DIE at 0x%x [in module " "%s]" msgstr "" -#: dwarf2read.c:13666 +#: dwarf2read.c:14363 #, possible-c-format msgid "Dwarf Error: Cannot find DIE at 0x%x referenced in module %s" msgstr "" -#: dwarf2read.c:13692 +#: dwarf2read.c:14390 #, possible-c-format msgid "" "Dwarf Error: DIE at 0x%x referenced in module %s is neither DW_FORM_block* " "nor DW_FORM_exprloc" msgstr "" -#: dwarf2read.c:13740 +#: dwarf2read.c:14452 #, possible-c-format msgid "" "Dwarf Error: Cannot find signatured DIE at 0x%x referenced from DIE at 0x%x " "[in module %s]" msgstr "" -#: dwarf2read.c:14074 +#: dwarf2read.c:14798 #, possible-c-format msgid "unsupported stack op: '%s'" msgstr "" -#: dwarf2read.c:14077 +#: dwarf2read.c:14801 #, possible-c-format msgid "unsupported stack op: '%02x'" msgstr "" -#: dwarf2read.c:14089 +#: dwarf2read.c:14813 msgid "location description stack overflow" msgstr "" -#: dwarf2read.c:14096 +#: dwarf2read.c:14820 msgid "location description stack underflow" msgstr "" -#: dwarf2read.c:14192 +#: dwarf2read.c:14916 #, possible-c-format msgid "bad file number in macro information (%d)" msgstr "" -#: dwarf2read.c:14247 +#: dwarf2read.c:14971 #, possible-c-format msgid "" "macro definition contains spaces in formal argument list:\n" "`%s'" msgstr "" -#: dwarf2read.c:14414 -msgid "missing .debug_macinfo section" +#: dwarf2read.c:15187 +#, possible-c-format +msgid "invalid form 0x%x in `%s'" +msgstr "" + +#: dwarf2read.c:15216 +#, possible-c-format +msgid "unrecognized DW_MACFINO opcode 0x%x" +msgstr "" + +#: dwarf2read.c:15260 +#, possible-c-format +msgid "unrecognized version `%d' in .debug_macro section" msgstr "" -#: dwarf2read.c:14555 +#: dwarf2read.c:15388 #, possible-c-format msgid "debug info with no main source gives macro %s on line %d: %s" msgstr "" -#: dwarf2read.c:14558 dwarf2read.c:14570 +#: dwarf2read.c:15390 dwarf2read.c:15399 msgid "definition" msgstr "" -#: dwarf2read.c:14560 dwarf2read.c:14572 +#: dwarf2read.c:15390 dwarf2read.c:15399 msgid "undefinition" msgstr "" -#: dwarf2read.c:14561 dwarf2read.c:14573 -msgid "something-or-other" -msgstr "" - -#: dwarf2read.c:14567 +#: dwarf2read.c:15397 #, possible-c-format msgid "debug info gives %s macro %s with %s line %d: %s" msgstr "" -#: dwarf2read.c:14568 dwarf2read.c:14598 +#: dwarf2read.c:15398 dwarf2read.c:15428 msgid "command-line" msgstr "" -#: dwarf2read.c:14568 +#: dwarf2read.c:15398 msgid "in-file" msgstr "" -#: dwarf2read.c:14574 dwarf2read.c:14599 +#: dwarf2read.c:15400 dwarf2read.c:15429 msgid "zero" msgstr "" -#: dwarf2read.c:14574 dwarf2read.c:14599 +#: dwarf2read.c:15400 dwarf2read.c:15429 msgid "non-zero" msgstr "" -#: dwarf2read.c:14596 +#: dwarf2read.c:15426 #, possible-c-format msgid "debug info gives source %d included from %s at %s line %d" msgstr "" -#: dwarf2read.c:14598 +#: dwarf2read.c:15428 msgid "file" msgstr "" -#: dwarf2read.c:14616 +#: dwarf2read.c:15447 msgid "macro debug info has an unmatched `close_file' directive" msgstr "" -#: dwarf2read.c:14642 +#: dwarf2read.c:15473 msgid "no terminating 0-type entry for macros in `.debug_macinfo' section" msgstr "" -#: dwarf2read.c:14765 +#: dwarf2read.c:15540 +#, possible-c-format +msgid "missing %s section" +msgstr "" + +#: dwarf2read.c:15772 msgid "Location list used without specifying the CU base address." msgstr "" -#: dwarf2read.c:14902 +#: dwarf2read.c:15931 #, possible-c-format msgid "" "Dwarf Error: could not find partial DIE containing offset 0x%lx [in module " "%s]" msgstr "" -#: dwarf2read.c:14914 +#: dwarf2read.c:15943 #, possible-c-format msgid "invalid dwarf2 offset %u" msgstr "" -#: dwarf2read.c:14930 +#: dwarf2read.c:15959 #, possible-c-format msgid "no compilation unit with offset %u." msgstr "" -#: dwarf2read.c:15209 +#: dwarf2read.c:16238 #, possible-c-format msgid "A problem internal to GDB: DIE 0x%x has type already set" msgstr "" -#: dwarf2read.c:15853 +#: dwarf2read.c:16896 msgid "Ada is not currently supported by the index" msgstr "" -#: dwarf2read.c:15886 +#: dwarf2read.c:16929 msgid "couldn't data write to file" msgstr "" -#: dwarf2read.c:15976 +#: dwarf2read.c:17012 msgid "Cannot use an index to create the index" msgstr "" -#: dwarf2read.c:15987 +#: dwarf2read.c:17015 +msgid "Cannot make an index when the file has multiple .debug_types sections" +msgstr "" + +#: dwarf2read.c:17026 #, possible-c-format msgid "Can't open `%s' for writing" msgstr "" -#: dwarf2read.c:16210 +#: dwarf2read.c:17184 msgid "usage: save gdb-index DIRECTORY" msgstr "" -#: dwarf2read.c:16231 +#: dwarf2read.c:17205 #, possible-c-format msgid "Error while writing index for `%s': " msgstr "" -#: dwarf2read.c:16246 +#: dwarf2read.c:17220 #, possible-c-format msgid "Whether to always disassemble DWARF expressions is %s.\n" msgstr "" -#: dwarf2read.c:16256 +#: dwarf2read.c:17230 #, possible-c-format msgid "Whether to check \"physname\" is %s.\n" msgstr "" -#: dwarf2read.c:16270 +#: dwarf2read.c:17244 msgid "" "Set DWARF 2 specific variables.\n" "Configure DWARF 2 variables such as the cache size" msgstr "" #. allow-unknown -#: dwarf2read.c:16276 +#: dwarf2read.c:17250 msgid "" "Show DWARF 2 specific variables\n" "Show DWARF 2 variables such as the cache size" msgstr "" -#: dwarf2read.c:16283 +#: dwarf2read.c:17257 msgid "Set the upper bound on the age of cached dwarf2 compilation units." msgstr "" -#: dwarf2read.c:16284 +#: dwarf2read.c:17258 msgid "Show the upper bound on the age of cached dwarf2 compilation units." msgstr "" -#: dwarf2read.c:16285 +#: dwarf2read.c:17259 msgid "" "A higher limit means that cached compilation units will be stored\n" "in memory longer, and more total memory will be used. Zero disables\n" "caching, which can slow down startup." msgstr "" -#: dwarf2read.c:16295 +#: dwarf2read.c:17269 msgid "Set whether `info address' always disassembles DWARF expressions." msgstr "" -#: dwarf2read.c:16296 +#: dwarf2read.c:17270 msgid "Show whether `info address' always disassembles DWARF expressions." msgstr "" -#: dwarf2read.c:16297 +#: dwarf2read.c:17271 msgid "" "When enabled, DWARF expressions are always printed in an assembly-like\n" "syntax. When disabled, expressions will be printed in a more\n" "conversational style, when possible." msgstr "" -#: dwarf2read.c:16306 +#: dwarf2read.c:17280 msgid "Set debugging of the dwarf2 DIE reader." msgstr "" -#: dwarf2read.c:16307 +#: dwarf2read.c:17281 msgid "Show debugging of the dwarf2 DIE reader." msgstr "" -#: dwarf2read.c:16308 +#: dwarf2read.c:17282 msgid "" "When enabled (non-zero), DIEs are dumped after they are read in.\n" "The value is the maximum depth to print." msgstr "" -#: dwarf2read.c:16315 +#: dwarf2read.c:17289 msgid "Set cross-checking of \"physname\" code against demangler." msgstr "" -#: dwarf2read.c:16316 +#: dwarf2read.c:17290 msgid "Show cross-checking of \"physname\" code against demangler." msgstr "" -#: dwarf2read.c:16317 +#: dwarf2read.c:17291 msgid "" "When enabled, GDB's internal \"physname\" code is checked against\n" "the demangler." msgstr "" -#: dwarf2read.c:16324 +#: dwarf2read.c:17298 msgid "" "Save a gdb-index file.\n" "Usage: save gdb-index DIRECTORY" msgstr "" -#: elfread.c:146 +#: elfread.c:144 #, possible-c-format msgid "Loadable segment \"%s\" outside of ELF segments" msgstr "" -#: elfread.c:489 +#: elfread.c:478 #, possible-c-format msgid "elf/stab section information %s without a preceding file symbol" msgstr "" -#: elfread.c:501 +#: elfread.c:490 #, possible-c-format msgid "duplicated elf/stab section information for %s" msgstr "" #. This case indicates buggy inferior program, the resolved address #. should never change. -#: elfread.c:781 +#: elfread.c:770 #, possible-c-format msgid "" "gnu-indirect-function \"%s\" has changed its resolved function_address from " "%s to %s" msgstr "" -#: elfread.c:1036 +#: elfread.c:1025 #, possible-c-format msgid "" "handle_inferior_event: Invalid gnu-indirect-function breakpoint type %d" msgstr "" -#: elfread.c:1098 +#: elfread.c:1087 #, possible-c-format msgid "File \"%s\" has no build-id, file skipped" msgstr "" -#: elfread.c:1101 +#: elfread.c:1090 #, possible-c-format msgid "File \"%s\" has a different build-id, file skipped" msgstr "" -#: elfread.c:1189 +#: elfread.c:1178 #, possible-c-format msgid "\"%s\": separate debug info file has no debug info" msgstr "" -#: elfread.c:1256 elfread.c:1267 elfread.c:1292 machoread.c:637 -#: machoread.c:651 +#: elfread.c:1245 elfread.c:1256 elfread.c:1281 machoread.c:863 +#: machoread.c:882 #, possible-c-format msgid "Can't read symbols from %s: %s" msgstr "" -#: elfread.c:1534 +#: elfread.c:1540 #, possible-c-format msgid "elf/stab section information questionable for %s" msgstr "" -#: elfread.c:1554 +#: elfread.c:1560 #, possible-c-format msgid "elf/stab section information missing for %s" msgstr "" -#: eval.c:371 valops.c:2026 +#: eval.c:369 valops.c:2026 #, possible-c-format msgid "there is no field named %s" msgstr "" -#: eval.c:397 +#: eval.c:395 msgid "too many initializers" msgstr "" -#: eval.c:401 +#: eval.c:399 msgid "don't know which variant you want to set" msgstr "" -#: eval.c:472 +#: eval.c:470 msgid "tuple range index out of range" msgstr "" -#: eval.c:484 +#: eval.c:482 msgid "tuple index out of range" msgstr "" -#: eval.c:878 +#: eval.c:875 +#, possible-c-format +msgid "Symbol \"%s\" does not have any specific entry value" +msgstr "" + +#: eval.c:897 #, possible-c-format msgid "Register $%s not available." msgstr "" -#: eval.c:892 +#: eval.c:911 #, possible-c-format msgid "Value of register %s not available." msgstr "" -#: eval.c:1018 +#: eval.c:1037 msgid "(power)set type with unknown size" msgstr "" #. different element modes. -#: eval.c:1053 +#: eval.c:1072 msgid "POWERSET tuple elements of different mode" msgstr "" -#: eval.c:1057 +#: eval.c:1076 msgid "incompatible POWERSET tuple elements" msgstr "" -#: eval.c:1060 +#: eval.c:1079 msgid "empty POWERSET tuple range" msgstr "" -#: eval.c:1064 +#: eval.c:1083 msgid "POWERSET tuple element out of range" msgstr "" -#: eval.c:1241 +#: eval.c:1260 msgid "no 'respondsTo:' or 'respondsToSelector:' method" msgstr "" -#: eval.c:1250 +#: eval.c:1269 msgid "no 'methodFor:' or 'methodForSelector:' method" msgstr "" -#: eval.c:1269 +#: eval.c:1288 msgid "Target does not respond to this message selector." msgstr "" -#: eval.c:1355 +#: eval.c:1374 msgid "" "method address has symbol information with non-function type; skipping" msgstr "" -#: eval.c:1408 +#: eval.c:1427 msgid "" "Expression of type other than \"method returning ...\" used as a method" msgstr "" -#: eval.c:1474 +#: eval.c:1493 msgid "Non-pointer-to-member value used in pointer-to-member construct" msgstr "" #. For the time being, we don't handle this. -#: eval.c:1714 +#: eval.c:1721 #, possible-c-format msgid "Call to overloaded function %s requires `this' pointer" msgstr "" -#: eval.c:1815 +#: eval.c:1816 msgid "Cannot evaluate function -- may be inlined" msgstr "" -#: eval.c:1840 +#: eval.c:1841 msgid "" "Expression of type other than \"Function returning ...\" used as function" msgstr "" -#: eval.c:1918 +#: eval.c:1919 msgid "Cannot perform substring on this type" msgstr "" -#: eval.c:2053 +#: eval.c:2054 msgid "non-pointer-to-member value used in pointer-to-member construct" msgstr "" -#: eval.c:2225 +#: eval.c:2226 msgid "':' operator used in invalid context" msgstr "" -#: eval.c:2347 +#: eval.c:2348 #, possible-c-format msgid "Too many subscripts for F77 (%d Max)" msgstr "" -#: eval.c:2352 +#: eval.c:2353 msgid "Wrong number of subscripts" msgstr "" -#: eval.c:2546 +#: eval.c:2547 msgid "Non-integral right operand for \"@\" operator." msgstr "" -#: eval.c:2617 +#: eval.c:2618 msgid "Attempt to dereference pointer to member without an object" msgstr "" @@ -7953,143 +8377,132 @@ #. If there are any cases landing here which mean a user error, #. then they should be separate cases, with more descriptive #. error messages. -#: eval.c:2871 +#: eval.c:2868 msgid "GDB does not (yet) know how to evaluate that kind of expression" msgstr "" -#: eval.c:2937 +#: eval.c:2934 msgid "Attempt to take address of register or constant." msgstr "" -#: eval.c:2970 valops.c:1645 valops.c:1660 valops.c:1694 +#: eval.c:2967 valops.c:1645 valops.c:1660 valops.c:1694 msgid "Attempt to take address of value not located in memory." msgstr "" -#: eval.c:3089 +#: eval.c:3086 msgid "Internal error in eval_type." msgstr "" -#: eval.c:3100 +#: eval.c:3097 msgid "Can't get dimensions for a non-array type" msgstr "" #: event-loop.c:552 event-loop.c:561 event-loop.c:625 event-loop.c:704 -#: event-loop.c:810 event-loop.c:876 event-loop.c:950 event-loop.c:1383 +#: event-loop.c:806 event-loop.c:872 event-loop.c:946 event-loop.c:1379 msgid "use_poll without HAVE_POLL" msgstr "" -#: event-loop.c:796 -#, possible-c-format -msgid "Hangup detected on fd %d\n" -msgstr "" - -#: event-loop.c:799 +#: event-loop.c:795 #, possible-c-format msgid "Error detected on fd %d\n" msgstr "" -#: event-loop.c:802 +#: event-loop.c:798 #, possible-c-format msgid "Invalid or non-`poll'able fd %d\n" msgstr "" -#: event-loop.c:817 +#: event-loop.c:813 #, possible-c-format msgid "Exception condition detected on fd %d\n" msgstr "" -#. The prompt stack has not been initialized to "", we are -#. using gdb w/o the --async switch. -#: event-top.c:340 -msgid "Command has same effect as set annotate" -msgstr "" - -#: event-top.c:426 +#: event-top.c:367 msgid "error detected on stdin\n" msgstr "" #. This message is based on ANSI C, section 4.7. Note that integer #. divide by zero causes this, so "float" is a misnomer. -#: event-top.c:1003 +#: event-top.c:951 msgid "Erroneous arithmetic operation." msgstr "" -#: exceptions.c:136 exceptions.c:194 +#: exceptions.c:126 exceptions.c:184 msgid "bad state" msgstr "" -#: exceptions.c:333 +#: exceptions.c:309 msgid "Bad switch." msgstr "" -#: exec.c:80 +#: exec.c:78 #, possible-c-format msgid "Writing into executable and core files is %s.\n" msgstr "" -#: exec.c:178 exec.c:209 +#: exec.c:176 exec.c:207 msgid "No executable file now.\n" msgstr "" -#: exec.c:244 +#: exec.c:242 #, possible-c-format msgid "\"%s\": could not open as an executable file: %s" msgstr "" -#: exec.c:260 +#: exec.c:258 #, possible-c-format msgid "\"%s\": not in executable format: %s" msgstr "" -#: exec.c:276 exec.c:286 +#: exec.c:274 exec.c:284 #, possible-c-format msgid "\"%s\": can't find the file sections: %s" msgstr "" -#: exec.c:327 +#: exec.c:325 msgid "" "A program is being debugged already.\n" "Are you sure you want to change the file? " msgstr "" -#: exec.c:329 +#: exec.c:327 msgid "File not changed." msgstr "" -#: exec.c:345 +#: exec.c:343 msgid "No executable file name was specified" msgstr "" -#: exec.c:707 maint.c:373 maint.c:405 +#: exec.c:705 maint.c:361 maint.c:393 #, possible-c-format msgid "file type %s.\n" msgstr "" -#: exec.c:732 +#: exec.c:730 #, possible-c-format msgid "Cannot find section for the entry point of %s." msgstr "" -#: exec.c:738 +#: exec.c:736 #, possible-c-format msgid "\tEntry point: %s\n" msgstr "" -#: exec.c:773 +#: exec.c:771 #, possible-c-format msgid "\tMapping info for file `%s'.\n" msgstr "" -#: exec.c:806 +#: exec.c:804 msgid "Must specify section name and its virtual address" msgstr "" -#: exec.c:834 +#: exec.c:832 #, possible-c-format msgid "Section %s not found" msgstr "" -#: exec.c:921 +#: exec.c:919 msgid "" "Use FILE as program to be debugged.\n" "It is read for its symbols, for getting the contents of pure memory,\n" @@ -8099,7 +8512,7 @@ "No arg means to have no executable file and no symbols." msgstr "" -#: exec.c:931 +#: exec.c:929 msgid "" "Use FILE as program for getting contents of pure memory.\n" "If FILE cannot be found as specified, your execution directory path\n" @@ -8107,7 +8520,7 @@ "No arg means have no executable file." msgstr "" -#: exec.c:938 +#: exec.c:936 msgid "" "Change the base address of section SECTION of the exec file to ADDR.\n" "This can be used if the exec file does not contain section addresses,\n" @@ -8116,19 +8529,19 @@ "``info files'' command lists all the sections and their addresses." msgstr "" -#: exec.c:945 +#: exec.c:943 msgid "Set writing into executable and core files." msgstr "" -#: exec.c:946 +#: exec.c:944 msgid "Show writing into executable and core files." msgstr "" -#: exec.c:958 +#: exec.c:956 msgid "Can't create a corefile" msgstr "" -#: expprint.c:234 +#: expprint.c:243 msgid "bad selector" msgstr "" @@ -8137,89 +8550,22 @@ #. Not found; don't try to keep going because we don't know how #. to interpret further elements. For example, this happens #. if opcode is OP_TYPE. -#: expprint.c:495 expprint.c:574 +#: expprint.c:504 expprint.c:580 msgid "Invalid expression" msgstr "" -#: f-exp.y:761 m2-exp.y:726 -msgid "Overflow on numeric constant." -msgstr "" - -#: f-lang.c:557 -msgid "Malformed function STAB found in add_common_block()" -msgstr "" - -#: f-lang.c:605 -msgid "Attempt to add COMMON entry with no block open!" -msgstr "" - -#: f-lang.c:798 -msgid "cannot get .bf node off empty list" -msgstr "" - -#: f-typeprint.c:386 -#, possible-c-format -msgid "Invalid type code (%d) in symbol table." -msgstr "" - -#: f-valprint.c:67 -msgid "Lower bound may not be '*' in F77" -msgstr "" - -#: f-valprint.c:230 -#, possible-c-format -msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)" -msgstr "" - -#: f-valprint.c:491 -#, possible-c-format -msgid "Invalid F77 type code %d in symbol table." -msgstr "" - -#: f-valprint.c:504 -msgid "" -"All COMMON blocks visible at this level:\n" -"\n" -msgstr "" - -#. We have been told to display the contents of F77 COMMON -#. block supposedly visible in this function. Let us -#. first make sure that it is visible and if so, let -#. us display its contents. -#: f-valprint.c:533 f-valprint.c:623 -msgid "No frame selected" -msgstr "" - -#. Got no 'funname', code below will fail. -#: f-valprint.c:573 -msgid "No function found for frame." -msgstr "" - -#: f-valprint.c:590 -msgid "Contents of blank COMMON block:\n" -msgstr "" - -#: f-valprint.c:592 +#: expprint.c:514 #, possible-c-format -msgid "Contents of F77 COMMON block '%s':\n" +msgid "" msgstr "" -#: f-valprint.c:604 +#: fbsd-nat.c:108 #, possible-c-format -msgid "Cannot locate the common block %s in function '%s'\n" -msgstr "" - -#: f-valprint.c:621 -msgid "Cannot deal with NULL common name!" -msgstr "" - -#: f-valprint.c:673 f-valprint.c:676 -msgid "Print out the values contained in a Fortran COMMON block." +msgid "Couldn't open %s." msgstr "" -#: fbsd-nat.c:109 -#, possible-c-format -msgid "Couldn't open %s." +#: f-exp.y:760 m2-exp.y:726 +msgid "Overflow on numeric constant." msgstr "" #: filesystem.c:67 @@ -8263,35 +8609,35 @@ msgid "Invalid size granularity." msgstr "" -#: findcmd.c:135 +#: findcmd.c:136 msgid "Empty search range.\n" msgstr "" -#: findcmd.c:139 +#: findcmd.c:140 msgid "Invalid length." msgstr "" -#: findcmd.c:143 +#: findcmd.c:144 msgid "Search space too large." msgstr "" -#: findcmd.c:153 -msgid "Invalid search space, end preceeds start." +#: findcmd.c:154 +msgid "Invalid search space, end precedes start." msgstr "" -#: findcmd.c:159 +#: findcmd.c:160 msgid "Overflow in address range computation, choose smaller range." msgstr "" -#: findcmd.c:226 +#: findcmd.c:227 msgid "Missing search pattern." msgstr "" -#: findcmd.c:231 +#: findcmd.c:232 msgid "Search space too small to contain pattern." msgstr "" -#: findcmd.c:325 +#: findcmd.c:326 msgid "" "Search memory for a sequence of bytes.\n" "Usage:\n" @@ -8309,369 +8655,438 @@ "Convenience variable \"$numfound\" is set to the number of matches." msgstr "" -#: findvar.c:61 findvar.c:96 +#: findvar.c:60 findvar.c:95 #, possible-c-format msgid "That operation is not available on integers of more than %d bytes." msgstr "" -#: findvar.c:177 +#: findvar.c:176 msgid "extract_typed_address: type is not a pointer or reference" msgstr "" -#: findvar.c:250 +#: findvar.c:249 msgid "store_typed_address: type is not a pointer or reference" msgstr "" -#: findvar.c:507 -msgid "Cannot look up value of a typedef" +#: findvar.c:479 findvar.c:492 +#, possible-c-format +msgid "Unknown argument list address for `%s'." +msgstr "" + +#: findvar.c:508 +#, possible-c-format +msgid "Cannot look up value of a typedef `%s'." +msgstr "" + +#: findvar.c:535 findvar.c:546 +#, possible-c-format +msgid "Value of register variable not available for `%s'." +msgstr "" + +#: findvar.c:568 +#, possible-c-format +msgid "No global symbol \"%s\"." +msgstr "" + +#: findvar.c:587 +#, possible-c-format +msgid "Cannot look up value of a botched symbol `%s'." +msgstr "" + +#: f-lang.c:101 +msgid "unrecognized character type" +msgstr "" + +#: f-lang.c:484 +msgid "Malformed function STAB found in add_common_block()" msgstr "" -#: findvar.c:533 findvar.c:543 -msgid "Value of register variable not available." +#: f-lang.c:532 +msgid "Attempt to add COMMON entry with no block open!" msgstr "" -#: findvar.c:586 -msgid "Cannot look up value of a botched symbol." +#: f-lang.c:725 +msgid "cannot get .bf node off empty list" msgstr "" -#: fork-child.c:318 +#: fork-child.c:331 msgid "setpgrp failed in child" msgstr "" -#: fork-child.c:473 +#: fork-child.c:463 #, possible-c-format msgid "During startup program terminated with signal %s, %s." msgstr "" -#: fork-child.c:482 +#: fork-child.c:472 #, possible-c-format msgid "During startup program exited with code %d." msgstr "" -#: fork-child.c:485 +#: fork-child.c:475 msgid "During startup program exited normally." msgstr "" -#: fork-child.c:553 +#: fork-child.c:543 msgid "" "Set a wrapper for running programs.\n" "The wrapper prepares the system and environment for the new program." msgstr "" -#: fork-child.c:556 +#: fork-child.c:546 msgid "Show the wrapper for running programs." msgstr "" -#: fork-child.c:562 +#: fork-child.c:552 msgid "Disable use of an execution wrapper." msgstr "" -#: frame-unwind.c:133 -msgid "frame_unwind_find_by_frame failed" -msgstr "" - -#: frame.c:174 +#: frame.c:173 #, possible-c-format msgid "Frame debugging is %s.\n" msgstr "" -#: frame.c:185 +#: frame.c:184 #, possible-c-format msgid "Whether backtraces should continue past \"main\" is %s.\n" msgstr "" -#: frame.c:195 +#: frame.c:194 #, possible-c-format msgid "" "Whether backtraces should continue past the entry point of a program is %s.\n" msgstr "" -#: frame.c:206 +#: frame.c:205 #, possible-c-format msgid "An upper bound on the number of backtrace levels is %s.\n" msgstr "" -#: frame.c:682 +#: frame.c:681 msgid "No unwind_pc method" msgstr "" -#: frame.c:702 frame.c:770 +#: frame.c:701 frame.c:769 msgid "PC not available" msgstr "" -#: frame.c:816 +#: frame.c:815 msgid "Cannot pop the initial frame." msgstr "" -#: frame.c:917 +#: frame.c:916 #, possible-c-format msgid "Register %d was optimized out" msgstr "" -#: frame.c:920 +#: frame.c:919 #, possible-c-format msgid "Register %d is not available" msgstr "" -#: frame.c:1049 +#: frame.c:1048 msgid "Attempt to assign to a value that was optimized out." msgstr "" -#: frame.c:1066 +#: frame.c:1065 msgid "Attempt to assign to an unmodifiable value." msgstr "" -#: frame.c:1123 +#: frame.c:1122 #, possible-c-format msgid "" "Bad debug information detected: Attempt to read %d bytes from registers." msgstr "" -#: frame.c:1289 ia64-tdep.c:1932 ia64-tdep.c:2309 libunwind-frame.c:335 +#: frame.c:1288 ia64-tdep.c:1931 ia64-tdep.c:2308 libunwind-frame.c:334 msgid "No registers." msgstr "" -#: frame.c:1291 stack.c:1315 stack.c:1928 thread.c:1288 +#: frame.c:1290 stack.c:1655 stack.c:2238 thread.c:1281 msgid "No stack." msgstr "" -#: frame.c:1293 +#: frame.c:1292 msgid "No memory." msgstr "" -#: frame.c:1298 +#: frame.c:1297 msgid "No selected thread." msgstr "" -#: frame.c:1300 infcmd.c:1744 +#: frame.c:1299 infcmd.c:1796 msgid "Invalid selected thread." msgstr "" -#: frame.c:1302 +#: frame.c:1301 msgid "Target is executing." msgstr "" -#: frame.c:2323 +#: frame.c:2328 msgid "Missing unwind SP method" msgstr "" -#: frame.c:2349 -msgid "unwinder did not report frame ID" -msgstr "" - -#: frame.c:2352 -msgid "Not enough registers or memory available to unwind further" -msgstr "" - -#: frame.c:2355 -msgid "previous frame inner to this frame (corrupt stack?)" -msgstr "" - -#: frame.c:2358 -msgid "previous frame identical to this frame (corrupt stack?)" -msgstr "" - -#: frame.c:2361 -msgid "frame did not save the PC" -msgstr "" - -#: frame.c:2439 +#: frame.c:2432 msgid "" "Set backtrace specific variables.\n" "Configure backtrace variables such as the backtrace limit" msgstr "" #. allow-unknown -#: frame.c:2444 +#: frame.c:2437 msgid "" "Show backtrace specific variables\n" "Show backtrace variables such as the backtrace limit" msgstr "" -#: frame.c:2451 +#: frame.c:2444 msgid "Set whether backtraces should continue past \"main\"." msgstr "" -#: frame.c:2452 +#: frame.c:2445 msgid "Show whether backtraces should continue past \"main\"." msgstr "" -#: frame.c:2453 +#: frame.c:2446 msgid "" "Normally the caller of \"main\" is not of interest, so GDB will terminate\n" "the backtrace at \"main\". Set this variable if you need to see the rest\n" "of the stack trace." msgstr "" -#: frame.c:2463 +#: frame.c:2456 msgid "" "Set whether backtraces should continue past the entry point of a program." msgstr "" -#: frame.c:2465 +#: frame.c:2458 msgid "" "Show whether backtraces should continue past the entry point of a program." msgstr "" -#: frame.c:2467 +#: frame.c:2460 msgid "" "Normally there are no callers beyond the entry point of a program, so GDB\n" "will terminate the backtrace there. Set this variable if you need to see\n" "the rest of the stack trace." msgstr "" -#: frame.c:2477 -msgid "Set an upper bound on the number of backtrace levels." +#: frame.c:2470 +msgid "Set an upper bound on the number of backtrace levels." +msgstr "" + +#: frame.c:2471 +msgid "Show the upper bound on the number of backtrace levels." +msgstr "" + +#: frame.c:2472 +msgid "" +"No more than the specified number of frames can be displayed or examined.\n" +"Zero is unlimited." +msgstr "" + +#. Debug this files internals. +#: frame.c:2481 +msgid "Set frame debugging." +msgstr "" + +#: frame.c:2482 +msgid "Show frame debugging." +msgstr "" + +#: frame.c:2483 +msgid "When non-zero, frame specific internal debugging is enabled." +msgstr "" + +#: frame-unwind.c:132 +msgid "frame_unwind_find_by_frame failed" +msgstr "" + +#: frv-linux-tdep.c:210 +msgid "Can't read realtime sigtramp frame." +msgstr "" + +#: frv-linux-tdep.c:217 +msgid "not a signal trampoline" +msgstr "" + +#: frv-tdep.c:427 +#, possible-c-format +msgid "Bad register number %d" +msgstr "" + +#: frv-tdep.c:1145 +#, possible-c-format +msgid "Illegal return value length: %d" +msgstr "" + +#: frv-tdep.c:1350 +#, possible-c-format +msgid "Don't know how to return a %d-byte value." +msgstr "" + +#: f-typeprint.c:381 +#, possible-c-format +msgid "Invalid type code (%d) in symbol table." +msgstr "" + +#: f-valprint.c:67 +msgid "Lower bound may not be '*' in F77" msgstr "" -#: frame.c:2478 -msgid "Show the upper bound on the number of backtrace levels." +#: f-valprint.c:230 +#, possible-c-format +msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)" msgstr "" -#: frame.c:2479 -msgid "" -"No more than the specified number of frames can be displayed or examined.\n" -"Zero is unlimited." +#: f-valprint.c:514 +#, possible-c-format +msgid "Invalid F77 type code %d in symbol table." msgstr "" -#. Debug this files internals. -#: frame.c:2488 -msgid "Set frame debugging." +#: f-valprint.c:527 +msgid "" +"All COMMON blocks visible at this level:\n" +"\n" msgstr "" -#: frame.c:2489 -msgid "Show frame debugging." +#. We have been told to display the contents of F77 COMMON +#. block supposedly visible in this function. Let us +#. first make sure that it is visible and if so, let +#. us display its contents. +#: f-valprint.c:556 f-valprint.c:646 +msgid "No frame selected" msgstr "" -#: frame.c:2490 -msgid "When non-zero, frame specific internal debugging is enabled." +#. Got no 'funname', code below will fail. +#: f-valprint.c:596 +msgid "No function found for frame." msgstr "" -#: frv-linux-tdep.c:211 -msgid "Can't read realtime sigtramp frame." +#: f-valprint.c:613 +msgid "Contents of blank COMMON block:\n" msgstr "" -#: frv-linux-tdep.c:218 -msgid "not a signal trampoline" +#: f-valprint.c:615 +#, possible-c-format +msgid "Contents of F77 COMMON block '%s':\n" msgstr "" -#: frv-tdep.c:428 +#: f-valprint.c:627 #, possible-c-format -msgid "Bad register number %d" +msgid "Cannot locate the common block %s in function '%s'\n" msgstr "" -#: frv-tdep.c:1146 -#, possible-c-format -msgid "Illegal return value length: %d" +#: f-valprint.c:644 +msgid "Cannot deal with NULL common name!" msgstr "" -#: frv-tdep.c:1351 -#, possible-c-format -msgid "Don't know how to return a %d-byte value." +#: f-valprint.c:696 f-valprint.c:699 +msgid "Print out the values contained in a Fortran COMMON block." msgstr "" -#: gcore.c:57 +#: gcore.c:56 #, possible-c-format msgid "Failed to open '%s' for output." msgstr "" -#: gcore.c:85 +#: gcore.c:84 #, possible-c-format msgid "Failed to create 'note' section for corefile: %s" msgstr "" -#: gcore.c:95 +#: gcore.c:94 msgid "gcore: failed to get corefile memory sections from target." msgstr "" -#: gcore.c:101 +#: gcore.c:100 #, possible-c-format msgid "writing note section (%s)" msgstr "" -#: gcore.c:171 +#: gcore.c:170 msgid "Can't find default bfd machine type (need execfile)." msgstr "" -#: gcore.c:185 +#: gcore.c:184 msgid "Can't find bfd architecture for corefile (need execfile)." msgstr "" -#: gcore.c:446 +#: gcore.c:445 #, possible-c-format msgid "Couldn't make gcore segment: %s" msgstr "" -#: gcore.c:540 +#: gcore.c:539 #, possible-c-format msgid "Memory read failed for corefile section, %s bytes at %s." msgstr "" -#: gcore.c:548 +#: gcore.c:547 #, possible-c-format msgid "Failed to write corefile contents (%s)." msgstr "" -#: gcore.c:581 +#: gcore.c:580 msgid "" "Save a core file with the current state of the debugged process.\n" "Argument is optional filename. Default filename is 'core.'." msgstr "" -#: gdb_assert.h:49 -#, possible-c-format -msgid "%s: Assertion `%s' failed." -msgstr "" - -#: gdb_assert.h:53 -#, possible-c-format -msgid "Assertion `%s' failed." -msgstr "" - #: gdbarch.c:67 #, possible-c-format msgid "Architecture debugging is %s.\n" msgstr "" -#: gdbarch.c:711 +#: gdbarch.c:722 #, possible-c-format msgid "verify_gdbarch: the following are invalid ...%s" msgstr "" -#: gdbarch.c:3996 +#: gdbarch.c:4077 msgid "gdbarch_architecture_names: multi-arch unknown" msgstr "" -#: gdbarch.c:4022 +#: gdbarch.c:4103 #, possible-c-format msgid "gdbarch: Attempt to register unknown architecture (%d)" msgstr "" -#: gdbarch.c:4033 +#: gdbarch.c:4114 #, possible-c-format -msgid "gdbarch: Duplicate registraration of architecture (%s)" +msgid "gdbarch: Duplicate registration of architecture (%s)" msgstr "" -#: gdbarch.c:4222 +#: gdbarch.c:4303 msgid "Set architecture debugging." msgstr "" -#: gdbarch.c:4223 +#: gdbarch.c:4304 msgid "Show architecture debugging." msgstr "" -#: gdbarch.c:4224 +#: gdbarch.c:4305 msgid "When non-zero, architecture debugging is enabled." msgstr "" -#: gdbtypes.c:123 +#: gdb-dlfcn.c:82 gdb-dlfcn.c:96 +#, possible-c-format +msgid "Could not load %s: %s" +msgstr "" + +#: gdbserver/thread-db.c:725 +#, possible-c-format +msgid "libthread-db-search-path component too long, ignored: %s." +msgstr "" + +#: gdbtypes.c:121 #, possible-c-format msgid "" "Resolution of opaque struct/class/union types (if set before loading " "symbols) is %s.\n" msgstr "" -#: gdbtypes.c:133 +#: gdbtypes.c:131 #, possible-c-format msgid "Debugging of C++ overloading is %s.\n" msgstr "" @@ -8681,107 +9096,118 @@ msgid "Unknown address space specifier: \"%s\"" msgstr "" -#: gdbtypes.c:1134 +#: gdbtypes.c:1130 +#, possible-c-format +msgid "Invalid anonymous type %s [in module %s], GCC PR debug/47510 bug?" +msgstr "" + +#: gdbtypes.c:1160 #, possible-c-format msgid "No type named %s." msgstr "" -#: gdbtypes.c:1179 objc-lang.c:97 +#: gdbtypes.c:1205 objc-lang.c:96 #, possible-c-format msgid "No struct type named %s." msgstr "" -#: gdbtypes.c:1183 gdbtypes.c:1259 objc-lang.c:104 +#: gdbtypes.c:1209 gdbtypes.c:1285 objc-lang.c:103 #, possible-c-format msgid "This context has class, union or enum %s, not a struct." msgstr "" -#: gdbtypes.c:1201 +#: gdbtypes.c:1227 #, possible-c-format msgid "No union type named %s." msgstr "" #. If we get here, it's not a union. -#: gdbtypes.c:1209 +#: gdbtypes.c:1235 #, possible-c-format msgid "This context has class, struct or enum %s, not a union." msgstr "" -#: gdbtypes.c:1225 +#: gdbtypes.c:1251 #, possible-c-format msgid "No enum type named %s." msgstr "" -#: gdbtypes.c:1229 +#: gdbtypes.c:1255 #, possible-c-format msgid "This context has class, struct or union %s, not an enum." msgstr "" -#: gdbtypes.c:1255 +#: gdbtypes.c:1281 #, possible-c-format msgid "No template type named %s." msgstr "" -#: gdbtypes.c:1297 +#: gdbtypes.c:1323 #, possible-c-format msgid "Type %s is not a structure or union type." msgstr "" -#: gdbtypes.c:1351 +#: gdbtypes.c:1377 #, possible-c-format msgid "Type %s has no component named %s." msgstr "" -#: gdbtypes.c:1413 +#: gdbtypes.c:1439 msgid "stub type has NULL name" msgstr "" -#: gdbtypes.c:1695 +#: gdbtypes.c:1725 #, possible-c-format msgid "Internal: Cannot demangle mangled name `%s'." msgstr "" -#: gdbtypes.c:2801 +#: gdbtypes.c:2841 #, possible-c-format msgid ") length %d\n" msgstr "" -#: gdbtypes.c:2941 +#: gdbtypes.c:2981 msgid " \n" msgstr "" -#: gdbtypes.c:3367 +#: gdbtypes.c:3408 #, possible-c-format msgid "Unexpected type field location kind: %d" msgstr "" -#: gdbtypes.c:3961 +#: gdbtypes.c:4005 msgid "Set debugging of C++ overloading." msgstr "" -#: gdbtypes.c:3962 +#: gdbtypes.c:4006 msgid "Show debugging of C++ overloading." msgstr "" -#: gdbtypes.c:3963 +#: gdbtypes.c:4007 msgid "When enabled, ranking of the functions is displayed." msgstr "" -#: gdbtypes.c:3972 +#: gdbtypes.c:4016 msgid "" "Set resolution of opaque struct/class/union types (if set before loading " "symbols)." msgstr "" -#: gdbtypes.c:3974 +#: gdbtypes.c:4018 msgid "" "Show resolution of opaque struct/class/union types (if set before loading " "symbols)." msgstr "" +#. A helper macro that returns the name of a type or "unnamed type" if the type +#. has no name. +#: gdbtypes.h:1208 +msgid "" +msgstr "" + #. A helper macro that returns the name of an error type. If the type #. has a name, it is used; otherwise, a default is used. -#: gdbtypes.h:1117 +#: gdbtypes.h:1213 msgid "" msgstr "" @@ -8910,105 +9336,105 @@ msgid "ptrace (PTRACE_TRACEME) failed!" msgstr "" -#: gnu-nat.c:2256 +#: gnu-nat.c:2257 msgid "to_stop target function not implemented" msgstr "" -#: gnu-nat.c:2290 +#: gnu-nat.c:2291 #, possible-c-format msgid "Read from inferior faulted: %s" msgstr "" -#: gnu-nat.c:2296 +#: gnu-nat.c:2297 #, possible-c-format msgid "gnu_read_inferior vm_deallocate failed: %s" msgstr "" -#: gnu-nat.c:2382 +#: gnu-nat.c:2383 #, possible-c-format msgid "No memory at 0x%x. Nothing written" msgstr "" -#: gnu-nat.c:2391 +#: gnu-nat.c:2392 #, possible-c-format msgid "Memory at address 0x%x is unwritable. Nothing written" msgstr "" -#: gnu-nat.c:2466 +#: gnu-nat.c:2467 #, possible-c-format msgid "%s: %s" msgstr "" -#: gnu-nat.c:2542 +#: gnu-nat.c:2543 #, possible-c-format msgid "vm_region failed: %s" msgstr "" -#: gnu-nat.c:2697 +#: gnu-nat.c:2698 #, possible-c-format msgid "Illegal argument for \"%s\" command, should be an integer." msgstr "" -#: gnu-nat.c:2709 +#: gnu-nat.c:2710 #, possible-c-format msgid "Illegal argument for \"%s\" command, should be \"%s\" or \"%s\"." msgstr "" -#: gnu-nat.c:2721 +#: gnu-nat.c:2722 #, possible-c-format msgid "Garbage after \"%s\" command: `%s'" msgstr "" -#: gnu-nat.c:2732 +#: gnu-nat.c:2733 msgid "No current thread." msgstr "" -#: gnu-nat.c:2743 +#: gnu-nat.c:2744 msgid "No current process." msgstr "" -#: gnu-nat.c:2857 +#: gnu-nat.c:2858 msgid "No inferior task." msgstr "" -#: gnu-nat.c:2863 +#: gnu-nat.c:2864 #, possible-c-format msgid "Couldn't extract send right %d from inferior: %s" msgstr "" -#: gnu-nat.c:2879 +#: gnu-nat.c:2880 #, possible-c-format msgid "Can't set exception port for %s: %s" msgstr "" -#: gnu-nat.c:2890 +#: gnu-nat.c:2891 msgid "No argument to \"set task exception-port\" command." msgstr "" -#: gnu-nat.c:2916 +#: gnu-nat.c:2917 msgid "" "Illegal argument to \"set signal-thread\" command.\n" "Should be an integer thread ID, or `none'." msgstr "" -#: gnu-nat.c:2926 +#: gnu-nat.c:2927 #, possible-c-format msgid "" "Thread ID %s not known. Use the \"info threads\" command to\n" "see the IDs of currently known threads." msgstr "" -#: gnu-nat.c:3062 +#: gnu-nat.c:3063 #, possible-c-format msgid "%ld: %s." msgstr "" -#: gnu-nat.c:3072 utils.c:1393 +#: gnu-nat.c:3073 utils.c:1193 #, possible-c-format msgid "%s." msgstr "" -#: gnu-nat.c:3112 +#: gnu-nat.c:3113 msgid "" "Set whether the new threads are suspended while gdb has control.\n" "This property normally has no effect because the whole task is\n" @@ -9016,79 +9442,79 @@ "The default value is \"off\"." msgstr "" -#: gnu-nat.c:3118 +#: gnu-nat.c:3119 msgid "Show whether new threads are suspended while gdb has control." msgstr "" -#: gnu-nat.c:3122 +#: gnu-nat.c:3123 msgid "" "Set whether new threads are allowed to run (once gdb has noticed them)." msgstr "" -#: gnu-nat.c:3125 +#: gnu-nat.c:3126 msgid "" "Show whether new threads are allowed to run (once gdb has noticed them)." msgstr "" -#: gnu-nat.c:3130 +#: gnu-nat.c:3131 msgid "Set the default detach-suspend-count value for new threads." msgstr "" -#: gnu-nat.c:3133 +#: gnu-nat.c:3134 msgid "Show the default detach-suspend-count value for new threads." msgstr "" -#: gnu-nat.c:3136 +#: gnu-nat.c:3137 msgid "" "Set whether the inferior process's signals will be intercepted.\n" "Mach exceptions (such as breakpoint traps) are not affected." msgstr "" -#: gnu-nat.c:3141 +#: gnu-nat.c:3142 msgid "Show whether the inferior process's signals will be intercepted." msgstr "" -#: gnu-nat.c:3146 +#: gnu-nat.c:3147 msgid "" "Set the thread that gdb thinks is the libc signal thread.\n" "This thread is run when delivering a signal to a non-stopped process." msgstr "" -#: gnu-nat.c:3151 +#: gnu-nat.c:3152 msgid "Set the thread that gdb thinks is the libc signal thread." msgstr "" -#: gnu-nat.c:3156 +#: gnu-nat.c:3157 msgid "" "Set whether gdb thinks the inferior process is stopped as with SIGSTOP.\n" "Stopped process will be continued by sending them a signal." msgstr "" -#: gnu-nat.c:3160 +#: gnu-nat.c:3161 msgid "" "Show whether gdb thinks the inferior process is stopped as with SIGSTOP." msgstr "" -#: gnu-nat.c:3164 +#: gnu-nat.c:3165 msgid "" "Set whether exceptions in the inferior process will be trapped.\n" "When exceptions are turned off, neither breakpoints nor single-stepping\n" "will work." msgstr "" -#: gnu-nat.c:3171 +#: gnu-nat.c:3172 msgid "Show whether exceptions in the inferior process will be trapped." msgstr "" -#: gnu-nat.c:3176 +#: gnu-nat.c:3177 msgid "Command prefix for setting task attributes." msgstr "" -#: gnu-nat.c:3179 +#: gnu-nat.c:3180 msgid "Command prefix for showing task attributes." msgstr "" -#: gnu-nat.c:3182 +#: gnu-nat.c:3183 msgid "" "Set whether the task is suspended while gdb has control.\n" "A value of \"on\" takes effect immediately, otherwise nothing happens\n" @@ -9097,19 +9523,19 @@ "used to pause individual threads by default instead." msgstr "" -#: gnu-nat.c:3190 +#: gnu-nat.c:3191 msgid "Show whether the task is suspended while gdb has control." msgstr "" -#: gnu-nat.c:3194 +#: gnu-nat.c:3195 msgid "Set the suspend count will leave on the thread when detaching." msgstr "" -#: gnu-nat.c:3197 +#: gnu-nat.c:3198 msgid "Show the suspend count will leave on the thread when detaching." msgstr "" -#: gnu-nat.c:3201 +#: gnu-nat.c:3202 msgid "" "Set the task exception port to which we forward exceptions.\n" "The argument should be the value of the send right in the task." @@ -9117,54 +9543,54 @@ #. A convenient way of turning on all options require to noninvasively #. debug running tasks. -#: gnu-nat.c:3211 +#: gnu-nat.c:3212 msgid "" "Set task options so that we interfere as little as possible.\n" "This is the same as setting `task pause', `exceptions', and\n" "`signals' to the opposite value." msgstr "" -#: gnu-nat.c:3219 +#: gnu-nat.c:3220 msgid "Show information about the task's send rights" msgstr "" -#: gnu-nat.c:3222 +#: gnu-nat.c:3223 msgid "Show information about the task's receive rights" msgstr "" -#: gnu-nat.c:3225 +#: gnu-nat.c:3226 msgid "Show information about the task's port rights" msgstr "" -#: gnu-nat.c:3228 +#: gnu-nat.c:3229 msgid "Show information about the task's port sets" msgstr "" -#: gnu-nat.c:3231 +#: gnu-nat.c:3232 msgid "Show information about the task's dead names" msgstr "" -#: gnu-nat.c:3309 +#: gnu-nat.c:3310 msgid "No argument to \"set thread exception-port\" command." msgstr "" -#: gnu-nat.c:3352 +#: gnu-nat.c:3353 msgid "Command prefix for setting thread properties." msgstr "" -#: gnu-nat.c:3355 +#: gnu-nat.c:3356 msgid "Command prefix for setting default thread properties." msgstr "" -#: gnu-nat.c:3359 +#: gnu-nat.c:3360 msgid "Command prefix for showing thread properties." msgstr "" -#: gnu-nat.c:3362 +#: gnu-nat.c:3363 msgid "Command prefix for showing default thread properties." msgstr "" -#: gnu-nat.c:3366 +#: gnu-nat.c:3367 msgid "" "Set whether the current thread is suspended while gdb has control.\n" "A value of \"on\" takes effect immediately, otherwise nothing happens\n" @@ -9174,90 +9600,90 @@ "The default value is \"off\"." msgstr "" -#: gnu-nat.c:3374 +#: gnu-nat.c:3375 msgid "Show whether the current thread is suspended while gdb has control." msgstr "" -#: gnu-nat.c:3379 +#: gnu-nat.c:3380 msgid "Set whether the current thread is allowed to run." msgstr "" -#: gnu-nat.c:3382 +#: gnu-nat.c:3383 msgid "Show whether the current thread is allowed to run." msgstr "" -#: gnu-nat.c:3385 +#: gnu-nat.c:3386 msgid "" "Set the suspend count will leave on the thread when detaching.\n" "Note that this is relative to suspend count when gdb noticed the thread;\n" "use the `thread takeover-suspend-count' to force it to an absolute value." msgstr "" -#: gnu-nat.c:3390 +#: gnu-nat.c:3391 msgid "" "Show the suspend count will leave on the thread when detaching.\n" "Note that this is relative to suspend count when gdb noticed the thread;\n" "use the `thread takeover-suspend-count' to force it to an absolute value." msgstr "" -#: gnu-nat.c:3396 +#: gnu-nat.c:3397 msgid "" "Set the thread exception port to which we forward exceptions.\n" "This overrides the task exception port.\n" "The argument should be the value of the send right in the task." msgstr "" -#: gnu-nat.c:3405 +#: gnu-nat.c:3406 msgid "" "Force the threads absolute suspend-count to be gdb's.\n" "Prior to giving this command, gdb's thread suspend-counts are relative\n" "to the thread's initial suspend-count when gdb notices the threads." msgstr "" -#: gnu-nat.c:3422 +#: gnu-nat.c:3423 msgid "Set debugging output for the gnu backend." msgstr "" -#: gnu-nat.c:3423 +#: gnu-nat.c:3424 msgid "Show debugging output for the gnu backend." msgstr "" -#: gnu-nat.c:3450 +#: gnu-nat.c:3451 #, possible-c-format msgid "Error flushing inferior's cache : %s" msgstr "" -#: gnu-v2-abi.c:178 +#: gnu-v2-abi.c:179 msgid "I'm confused: virtual function table has bad type" msgstr "" -#: gnu-v2-abi.c:374 +#: gnu-v2-abi.c:375 msgid "Virtual baseclass pointer is not available" msgstr "" -#: gnu-v2-abi.c:396 +#: gnu-v2-abi.c:397 msgid "Baseclass offset not found" msgstr "" -#: gnu-v3-abi.c:317 +#: gnu-v3-abi.c:320 #, possible-c-format msgid "can't find linker symbol for virtual table for `%s' value" msgstr "" -#: gnu-v3-abi.c:320 +#: gnu-v3-abi.c:323 #, possible-c-format msgid " found `%s' instead" msgstr "" -#: gnu-v3-abi.c:390 +#: gnu-v3-abi.c:393 msgid "Only classes can have virtual functions." msgstr "" -#: gnu-v3-abi.c:440 +#: gnu-v3-abi.c:443 msgid "Expected a negative vbase offset (old compiler?)" msgstr "" -#: gnu-v3-abi.c:444 +#: gnu-v3-abi.c:447 msgid "Misaligned vbase offset." msgstr "" @@ -9395,255 +9821,331 @@ "the `info dos ldt' command." msgstr "" -#: h8300-tdep.c:774 h8300-tdep.c:808 +#: h8300-tdep.c:773 h8300-tdep.c:807 msgid "I don't know how this 8 byte value is returned." msgstr "" #. long long, double and long double #. are all defined as 4 byte types so #. far so this shouldn't happen. -#: h8300-tdep.c:872 +#: h8300-tdep.c:871 msgid "I don't know how to return an 8 byte value." msgstr "" -#: h8300-tdep.c:957 +#: h8300-tdep.c:956 #, possible-c-format msgid "h8300_register_name: illegal register number %d" msgstr "" -#: h8300-tdep.c:975 +#: h8300-tdep.c:974 #, possible-c-format msgid "h8300s_register_name: illegal register number %d" msgstr "" -#: h8300-tdep.c:993 +#: h8300-tdep.c:992 #, possible-c-format msgid "h8300sx_register_name: illegal register number %d" msgstr "" -#: h8300-tdep.c:1129 +#: h8300-tdep.c:1128 #, possible-c-format msgid "h8300_register_type: illegal register number %d" msgstr "" -#: hppa-hpux-nat.c:112 hppa-hpux-nat.c:126 +#: hppa-hpux-nat.c:111 hppa-hpux-nat.c:125 #, possible-c-format msgid "Couldn't read register %s (#%d): %s" msgstr "" -#: hppa-hpux-nat.c:198 hppa-hpux-nat.c:212 +#: hppa-hpux-nat.c:197 hppa-hpux-nat.c:211 #, possible-c-format msgid "Couldn't write register %s (#%d): %s" msgstr "" #. Should never happen. -#: hppa-hpux-tdep.c:150 hppa-hpux-tdep.c:281 +#: hppa-hpux-tdep.c:149 hppa-hpux-tdep.c:280 msgid "Unable to find branch in parameter relocation stub." msgstr "" -#: hppa-hpux-tdep.c:426 +#: hppa-hpux-tdep.c:425 msgid "Unable to find branch in linker stub" msgstr "" -#: hppa-hpux-tdep.c:444 +#: hppa-hpux-tdep.c:443 #, possible-c-format msgid "Unable to find ldil X,%%r1 before ble Y(%%sr4,%%r1)." msgstr "" -#: hppa-hpux-tdep.c:481 +#: hppa-hpux-tdep.c:480 #, possible-c-format msgid "Unable to find symbol for 0x%lx" msgstr "" -#: hppa-hpux-tdep.c:489 +#: hppa-hpux-tdep.c:488 #, possible-c-format msgid "Unable to find library symbol for %s." msgstr "" -#: hppa-hpux-tdep.c:522 +#: hppa-hpux-tdep.c:521 #, possible-c-format msgid "Unable to find restore of %%rp before bv (%%rp)." msgstr "" -#: hppa-hpux-tdep.c:871 hppa-hpux-tdep.c:969 +#: hppa-hpux-tdep.c:870 hppa-hpux-tdep.c:968 msgid "Internal error creating objfile private data." msgstr "" -#: hppa-hpux-tdep.c:1122 +#: hppa-hpux-tdep.c:1121 msgid "" "Cannot find suitable address to place dummy breakpoint; nested calls may " "fail." msgstr "" -#: hppa-hpux-tdep.c:1226 +#: hppa-hpux-tdep.c:1225 msgid "" "Cannot call external function not referenced by application (no import " "stub).\n" msgstr "" -#: hppa-hpux-tdep.c:1237 hppa-hpux-tdep.c:1263 +#: hppa-hpux-tdep.c:1236 hppa-hpux-tdep.c:1262 msgid "Cannot make interspace call from here." msgstr "" -#: hppa-hpux-tdep.c:1372 +#: hppa-hpux-tdep.c:1371 msgid "Register set contents too small" msgstr "" -#: hppa-linux-nat.c:158 ia64-linux-nat.c:310 +#: hppa-linux-nat.c:157 ia64-linux-nat.c:309 #, possible-c-format msgid "Invalid register number %d." msgstr "" -#: hppa-linux-nat.c:235 i386-linux-nat.c:166 ia64-linux-nat.c:711 -#: inf-ptrace.c:692 m68klinux-nat.c:122 +#: hppa-linux-nat.c:234 i386-linux-nat.c:165 ia64-linux-nat.c:708 +#: inf-ptrace.c:691 m68klinux-nat.c:121 #, possible-c-format msgid "Couldn't read register %s (#%d): %s." msgstr "" -#: hppa-linux-nat.c:263 i386-linux-nat.c:195 ia64-linux-nat.c:770 -#: inf-ptrace.c:751 m68klinux-nat.c:180 +#: hppa-linux-nat.c:262 i386-linux-nat.c:194 ia64-linux-nat.c:767 +#: inf-ptrace.c:750 m68klinux-nat.c:179 #, possible-c-format msgid "Couldn't write register %s (#%d): %s." msgstr "" -#: hppa-linux-tdep.c:50 hppa-tdep.c:674 +#: hppa-linux-tdep.c:49 hppa-tdep.c:673 #, possible-c-format msgid "Unmapped DWARF DBX Register #%d encountered." msgstr "" -#: hppa-tdep.c:488 +#: hppa-tdep.c:487 msgid "Internal error reading unwind information." msgstr "" -#: hppa-tdep.c:1913 +#: hppa-tdep.c:1912 #, possible-c-format msgid "Cannot read instruction at %s." msgstr "" -#: hppa-tdep.c:2411 +#: hppa-tdep.c:2410 msgid "Requesting registers from null frame." msgstr "" -#: hppa-tdep.c:2940 +#: hppa-tdep.c:2939 #, possible-c-format msgid "Cannot resolve PLT stub at %s." msgstr "" -#: hppa-tdep.c:3047 +#: hppa-tdep.c:3046 #, possible-c-format msgid "Unsupported address size: %d" msgstr "" -#: hppa-tdep.c:3156 +#: hppa-tdep.c:3155 msgid "Print unwind table entry at given address." msgstr "" #. Debug this files internals. -#: hppa-tdep.c:3160 +#: hppa-tdep.c:3159 msgid "" "Set whether hppa target specific debugging information should be displayed." msgstr "" -#: hppa-tdep.c:3162 +#: hppa-tdep.c:3161 msgid "Show whether hppa target specific debugging information is displayed." msgstr "" -#: hppa-tdep.c:3163 +#: hppa-tdep.c:3162 msgid "" "This flag controls whether hppa target specific debugging information is\n" "displayed. This information is particularly useful for debugging frame\n" "unwinding problems." msgstr "" -#: i386-darwin-nat.c:72 i386-darwin-nat.c:116 +#: i386bsd-nat.c:220 +msgid "Couldn't write XMM registers" +msgstr "" + +#: i386bsd-nat.c:273 +msgid "Couldn't get debug registers" +msgstr "" + +#: i386bsd-nat.c:284 +msgid "Couldn't write debug registers" +msgstr "" + +#: i386bsd-nat.c:316 +msgid "Couldn't read debug registers" +msgstr "" + +#: i386bsd-nat.c:363 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n" +"Please report this to ." +msgstr "" + +#: i386bsd-nat.c:376 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n" +"Please report this to ." +msgstr "" + +#: i386bsd-nat.c:389 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n" +"Please report this to ." +msgstr "" + +#: i386-darwin-nat.c:71 i386-darwin-nat.c:115 #, possible-c-format msgid "Error calling thread_get_state for GP registers for thread 0x%ulx" msgstr "" -#: i386-darwin-nat.c:92 i386-darwin-nat.c:141 +#: i386-darwin-nat.c:91 i386-darwin-nat.c:140 #, possible-c-format msgid "Error calling thread_get_state for float registers for thread 0x%ulx" msgstr "" -#: i386-darwin-nat.c:153 +#: i386-darwin-nat.c:152 #, possible-c-format msgid "unknown register %d" msgstr "" -#: i386-darwin-nat.c:304 i386-darwin-nat.c:370 +#: i386-darwin-nat.c:303 i386-darwin-nat.c:369 #, possible-c-format msgid "Error reading debug registers thread 0x%x via thread_get_state\n" msgstr "" -#: i386-darwin-nat.c:343 +#: i386-darwin-nat.c:342 #, possible-c-format msgid "Error writing debug registers thread 0x%x via thread_get_state\n" msgstr "" -#: i386-darwin-nat.c:544 +#: i386-darwin-nat.c:543 #, possible-c-format msgid "darwin_set_sstep: error %x, thread=%x\n" msgstr "" -#: i386-darwin-nat.c:584 +#: i386-darwin-nat.c:583 #, possible-c-format msgid "darwin_set_sstep: unknown flavour: %d" msgstr "" -#: i386-linux-nat.c:387 i386-linux-nat.c:410 +#: i386gnu-nat.c:77 i386gnu-nat.c:185 +#, possible-c-format +msgid "Couldn't fetch floating-point state from %s" +msgstr "" + +#: i386gnu-nat.c:125 +#, possible-c-format +msgid "Can't fetch registers from thread %s: No such thread" +msgstr "" + +#: i386gnu-nat.c:136 +#, possible-c-format +msgid "Couldn't fetch registers from %s" +msgstr "" + +#: i386gnu-nat.c:198 +#, possible-c-format +msgid "Couldn't store floating-point state into %s" +msgstr "" + +#: i386gnu-nat.c:218 +#, possible-c-format +msgid "Couldn't store registers into thread %s: No such thread" +msgstr "" + +#: i386gnu-nat.c:235 +#, possible-c-format +msgid "Couldn't store registers into %s" +msgstr "" + +#: i386gnu-nat.c:256 +#, possible-c-format +msgid "Register %s changed after the thread was aborted" +msgstr "" + +#: i386gnu-nat.c:263 +msgid "... also writing this register! Suspicious..." +msgstr "" + +#: i386-linux-nat.c:386 i386-linux-nat.c:409 msgid "Couldn't read extended state status" msgstr "" -#: i386-linux-nat.c:443 i386-linux-nat.c:470 +#: i386-linux-nat.c:442 i386-linux-nat.c:469 msgid "Couldn't read floating-point and SSE registers" msgstr "" -#: i386-linux-nat.c:476 +#: i386-linux-nat.c:475 msgid "Couldn't write floating-point and SSE registers" msgstr "" -#: i386-linux-nat.c:579 m32r-linux-nat.c:218 m68klinux-nat.c:452 +#: i386-linux-nat.c:578 m32r-linux-nat.c:217 m68klinux-nat.c:451 #, possible-c-format msgid "Got request for bad register number %d." msgstr "" -#: i386-linux-nat.c:648 m32r-linux-nat.c:243 m68klinux-nat.c:500 +#: i386-linux-nat.c:647 m32r-linux-nat.c:242 m68klinux-nat.c:499 #, possible-c-format msgid "Got request to store bad register number %d." msgstr "" -#: i386-linux-tdep.c:606 +#: i386-linux-tdep.c:605 msgid "Couldn't read `xcr0' bytes from `.reg-xstate' section in core file." msgstr "" -#: i386-nat.c:272 +#: i386-nat.c:311 msgid "The i386 doesn't support data-read watchpoints.\n" msgstr "" -#: i386-nat.c:284 +#: i386-nat.c:323 #, possible-c-format msgid "Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n" msgstr "" -#: i386-nat.c:302 +#: i386-nat.c:341 #, possible-c-format msgid "Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n" msgstr "" -#: i386-nat.c:461 +#: i386-nat.c:491 #, possible-c-format msgid "Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n" msgstr "" -#: i386-nat.c:661 +#: i386-nat.c:755 msgid "Set whether to show variables that mirror the x86 debug registers." msgstr "" -#: i386-nat.c:662 +#: i386-nat.c:756 msgid "Show whether to show variables that mirror the x86 debug registers." msgstr "" -#: i386-nat.c:663 mips-linux-nat.c:1058 +#: i386-nat.c:757 mips-linux-nat.c:1056 msgid "" "Use \"on\" to enable, \"off\" to disable.\n" "If enabled, the debug registers values are shown when GDB inserts\n" @@ -9651,43 +10153,43 @@ "triggers a breakpoint or watchpoint." msgstr "" -#: i386-tdep.c:2276 +#: i386-tdep.c:2442 msgid "Cannot find floating-point return value." msgstr "" -#: i386-tdep.c:2307 m68k-tdep.c:313 +#: i386-tdep.c:2473 m68k-tdep.c:311 #, possible-c-format msgid "Cannot extract return value of %d bytes long." msgstr "" -#: i386-tdep.c:2329 +#: i386-tdep.c:2495 msgid "Cannot set floating-point return value." msgstr "" -#: i386-tdep.c:2372 m68k-tdep.c:355 +#: i386-tdep.c:2538 m68k-tdep.c:353 #, possible-c-format msgid "Cannot store return value of %d bytes long." msgstr "" -#: i386-tdep.c:3399 i386-tdep.c:3440 i386-tdep.c:3476 i386-tdep.c:3549 -#: i386-tdep.c:3818 i386-tdep.c:3916 i386-tdep.c:5619 i386-tdep.c:6095 -#: i386-tdep.c:6368 +#: i386-tdep.c:3593 i386-tdep.c:3634 i386-tdep.c:3670 i386-tdep.c:3743 +#: i386-tdep.c:4012 i386-tdep.c:4110 i386-tdep.c:5813 i386-tdep.c:6289 +#: i386-tdep.c:6562 #, possible-c-format msgid "Process record: error reading memory at addr %s len = 1.\n" msgstr "" -#: i386-tdep.c:3461 i386-tdep.c:3488 +#: i386-tdep.c:3655 i386-tdep.c:3682 #, possible-c-format msgid "Process record: error reading memory at addr %s len = 4.\n" msgstr "" -#: i386-tdep.c:3534 i386-tdep.c:3561 +#: i386-tdep.c:3728 i386-tdep.c:3755 #, possible-c-format msgid "Process record: error reading memory at addr %s len = 2.\n" msgstr "" -#: i386-tdep.c:3662 i386-tdep.c:4567 i386-tdep.c:5258 i386-tdep.c:5825 -#: i386-tdep.c:5882 +#: i386-tdep.c:3856 i386-tdep.c:4761 i386-tdep.c:5452 i386-tdep.c:6019 +#: i386-tdep.c:6076 #, possible-c-format msgid "" "Process record ignores the memory change of instruction at address %s\n" @@ -9695,206 +10197,130 @@ "Do you want to stop the program?" msgstr "" -#: i386-tdep.c:4588 +#: i386-tdep.c:4782 #, possible-c-format msgid "Process record: error reading memory at addr 0x%s len = 8.\n" msgstr "" -#: i386-tdep.c:4601 +#: i386-tdep.c:4795 #, possible-c-format msgid "Process record: error reading memory at addr 0x%s len = 4.\n" msgstr "" -#: i386-tdep.c:4614 +#: i386-tdep.c:4808 #, possible-c-format msgid "Process record: error reading memory at addr 0x%s len = 2.\n" msgstr "" -#: i386-tdep.c:5593 +#: i386-tdep.c:5787 #, possible-c-format msgid "Process record: error reading memory at addr 0x%s len = 1.\n" msgstr "" #. XXX #. int3 -#: i386-tdep.c:5605 +#: i386-tdep.c:5799 msgid "Process record does not support instruction int3.\n" msgstr "" -#: i386-tdep.c:5628 +#: i386-tdep.c:5822 #, possible-c-format msgid "Process record does not support instruction int 0x%02x.\n" msgstr "" #. XXX #. into -#: i386-tdep.c:5642 +#: i386-tdep.c:5836 msgid "Process record does not support instruction into.\n" msgstr "" #. bound -#: i386-tdep.c:5653 +#: i386-tdep.c:5847 msgid "Process record does not support instruction bound.\n" msgstr "" #. wrmsr -#: i386-tdep.c:5689 +#: i386-tdep.c:5883 msgid "Process record does not support instruction wrmsr.\n" msgstr "" #. rdmsr -#: i386-tdep.c:5696 +#: i386-tdep.c:5890 msgid "Process record does not support instruction rdmsr.\n" msgstr "" -#: i386-tdep.c:5717 +#: i386-tdep.c:5911 msgid "Process record does not support instruction sysenter.\n" msgstr "" #. sysexit -#: i386-tdep.c:5729 +#: i386-tdep.c:5923 msgid "Process record does not support instruction sysexit.\n" msgstr "" -#: i386-tdep.c:5740 +#: i386-tdep.c:5934 msgid "Process record does not support instruction syscall.\n" msgstr "" #. sysret -#: i386-tdep.c:5752 +#: i386-tdep.c:5946 msgid "Process record does not support instruction sysret.\n" msgstr "" #. hlt -#: i386-tdep.c:5766 +#: i386-tdep.c:5960 msgid "Process record does not support instruction hlt.\n" msgstr "" -#: i386-tdep.c:6902 +#: i386-tdep.c:7096 #, possible-c-format msgid "Process record does not support instruction 0x%02x at address %s.\n" msgstr "" -#: i386-tdep.c:6949 +#: i386-tdep.c:7164 #, possible-c-format msgid "" "; instruction is only %d bytes long, need at least %d bytes for the jump" msgstr "" -#: i386-tdep.c:7338 +#: i386-tdep.c:7560 msgid "Set the disassembly flavor." msgstr "" -#: i386-tdep.c:7339 +#: i386-tdep.c:7561 msgid "Show the disassembly flavor." msgstr "" -#: i386-tdep.c:7340 +#: i386-tdep.c:7562 msgid "" "The valid values are \"att\" and \"intel\", and the default value is \"att\"." msgstr "" -#: i386-tdep.c:7349 +#: i386-tdep.c:7571 msgid "Set the convention for returning small structs." msgstr "" -#: i386-tdep.c:7350 +#: i386-tdep.c:7572 msgid "Show the convention for returning small structs." msgstr "" -#: i386-tdep.c:7351 +#: i386-tdep.c:7573 msgid "" "Valid values are \"default\", \"pcc\" and \"reg\", and the default value\n" "is \"default\"." msgstr "" -#: i386bsd-nat.c:221 -msgid "Couldn't write XMM registers" -msgstr "" - -#: i386bsd-nat.c:274 -msgid "Couldn't get debug registers" -msgstr "" - -#: i386bsd-nat.c:285 -msgid "Couldn't write debug registers" -msgstr "" - -#: i386bsd-nat.c:323 -msgid "Couldn't read debug registers" -msgstr "" - -#: i386bsd-nat.c:373 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: i386bsd-nat.c:386 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: i386bsd-nat.c:399 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n" -"Please report this to ." -msgstr "" - -#: i386gnu-nat.c:77 i386gnu-nat.c:185 -#, possible-c-format -msgid "Couldn't fetch floating-point state from %s" -msgstr "" - -#: i386gnu-nat.c:125 -#, possible-c-format -msgid "Can't fetch registers from thread %s: No such thread" -msgstr "" - -#: i386gnu-nat.c:136 -#, possible-c-format -msgid "Couldn't fetch registers from %s" -msgstr "" - -#: i386gnu-nat.c:198 -#, possible-c-format -msgid "Couldn't store floating-point state into %s" -msgstr "" - -#: i386gnu-nat.c:218 -#, possible-c-format -msgid "Couldn't store registers into thread %s: No such thread" -msgstr "" - -#: i386gnu-nat.c:235 -#, possible-c-format -msgid "Couldn't store registers into %s" -msgstr "" - -#: i386gnu-nat.c:256 -#, possible-c-format -msgid "Register %s changed after the thread was aborted" -msgstr "" - -#: i386gnu-nat.c:263 -msgid "... also writing this register! Suspicious..." -msgstr "" - -#: i387-tdep.c:323 m68k-tdep.c:218 +#: i387-tdep.c:322 m68k-tdep.c:216 msgid "" "Cannot convert floating-point register value to non-floating-point type." msgstr "" -#: i387-tdep.c:354 m68k-tdep.c:250 +#: i387-tdep.c:353 m68k-tdep.c:248 msgid "" "Cannot convert non-floating-point type to floating-point register value." msgstr "" -#: i387-tdep.c:1045 i387-tdep.c:1090 +#: i387-tdep.c:1044 i387-tdep.c:1089 msgid "invalid i387 regclass" msgstr "" @@ -9913,134 +10339,76 @@ msgid "failed to write register value for %s." msgstr "" -#: ia64-tdep.c:536 -msgid "" -"Can't fetch instructions for slot numbers greater than 2.\n" -"Using slot 0 instead" -msgstr "" - -#: ia64-tdep.c:652 ia64-tdep.c:839 -msgid "Can't insert breakpoint for slot numbers greater than 2." -msgstr "" - -#: ia64-tdep.c:685 ia64-tdep.c:867 -msgid "Can't insert breakpoint for non-existing slot X" -msgstr "" - -#: ia64-tdep.c:723 -#, possible-c-format -msgid "Address %s already contains a breakpoint." -msgstr "" - -#: ia64-tdep.c:776 -#, possible-c-format -msgid "" -"Cannot remove breakpoint at address %s from non-existing X-type slot, memory " -"has changed underneath" -msgstr "" - -#: ia64-tdep.c:797 -#, possible-c-format +#: ia64-tdep.c:535 msgid "" -"Cannot remove breakpoint at address %s, no break instruction at such address." -msgstr "" - -#: inf-child.c:80 windows-nat.c:1923 -msgid "Use the \"run\" command to start a Unix child process." -msgstr "" - -#: inf-loop.c:54 -msgid "error detected from target.\n" -msgstr "" - -#: inf-loop.c:140 -msgid "completed.\n" -msgstr "" - -#: inf-loop.c:162 -msgid "Event type not recognized.\n" -msgstr "" - -#: inf-ptrace.c:236 -msgid "This system does not support attaching to a process" -msgstr "" - -#: inf-ptrace.c:300 -msgid "This system does not support detaching from a process" -msgstr "" - -#: inf-ptrace.c:407 rs6000-nat.c:549 -#, possible-c-format -msgid "Child process unexpectedly missing: %s.\n" -msgstr "" - -#: inf-ptrace.c:611 inf-ttrace.c:1244 -#, possible-c-format -msgid "\tUsing the running image of %s %s.\n" -msgstr "" - -#: inf-ttrace.c:465 -#, possible-c-format -msgid "Attaching after fork to child process %ld.\n" +"Can't fetch instructions for slot numbers greater than 2.\n" +"Using slot 0 instead" msgstr "" -#: inf-ttrace.c:475 -#, possible-c-format -msgid "Detaching after fork from child process %ld.\n" +#: ia64-tdep.c:651 ia64-tdep.c:838 +msgid "Can't insert breakpoint for slot numbers greater than 2." msgstr "" -#: inf-ttrace.c:701 -msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed" +#: ia64-tdep.c:684 ia64-tdep.c:866 +msgid "Can't insert breakpoint for non-existing slot X" msgstr "" -#: inf-ttrace.c:722 -msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed" +#: ia64-tdep.c:722 +#, possible-c-format +msgid "Address %s already contains a breakpoint." msgstr "" -#: inf-ttrace.c:1096 linux-nat.c:1302 procfs.c:3911 procfs.c:4049 +#: ia64-tdep.c:775 #, possible-c-format -msgid "[%s exited]\n" +msgid "" +"Cannot remove breakpoint at address %s from non-existing X-type slot, memory " +"has changed underneath" msgstr "" -#: inf-ttrace.c:1112 +#: ia64-tdep.c:796 #, possible-c-format -msgid "[%s has been terminated]\n" +msgid "" +"Cannot remove breakpoint at address %s, no break instruction at such address." msgstr "" -#: infcall.c:81 +#: infcall.c:79 #, possible-c-format msgid "Coercion of floats to doubles when calling functions is %s.\n" msgstr "" -#: infcall.c:99 +#: infcall.c:97 #, possible-c-format msgid "" "Unwinding of stack if a signal is received while in a call dummy is %s.\n" msgstr "" -#: infcall.c:125 +#: infcall.c:123 #, possible-c-format msgid "" "Unwind stack if a C++ exception is unhandled while in a call dummy is %s.\n" msgstr "" -#: infcall.c:318 +#: infcall.c:316 msgid "Invalid data type for function to be called." msgstr "" -#: infcall.c:496 +#: infcall.c:492 msgid "May not call functions while looking at trace frames." msgstr "" -#: infcall.c:502 +#: infcall.c:495 +msgid "Cannot call functions in reverse mode." +msgstr "" + +#: infcall.c:501 msgid "This target does not support function calls." msgstr "" -#: infcall.c:676 +#: infcall.c:675 msgid "Too few arguments in function call." msgstr "" -#: infcall.c:853 +#: infcall.c:852 #, possible-c-format msgid "" "%s\n" @@ -10053,7 +10421,7 @@ #. We could discard the dummy frame here given that the program exited, #. but it will get garbage collected the next time the program is #. run anyway. -#: infcall.c:881 +#: infcall.c:880 #, possible-c-format msgid "" "The program being debugged exited while in a function called from GDB.\n" @@ -10061,7 +10429,7 @@ "(%s) will be abandoned." msgstr "" -#: infcall.c:901 +#: infcall.c:900 #, possible-c-format msgid "" "The program received a signal in another thread while\n" @@ -10071,7 +10439,7 @@ "When the function is done executing, GDB will silently stop." msgstr "" -#: infcall.c:909 +#: infcall.c:908 #, possible-c-format msgid "" "The program stopped in another thread while making a function call from " @@ -10083,7 +10451,7 @@ #. FIXME: Insert a bunch of wrap_here; name can be very #. long if it's a C++ name with arguments and stuff. -#: infcall.c:942 +#: infcall.c:941 #, possible-c-format msgid "" "The program being debugged was signaled while in a function called from " @@ -10096,7 +10464,7 @@ #. FIXME: Insert a bunch of wrap_here; name can be very #. long if it's a C++ name with arguments and stuff. -#: infcall.c:960 +#: infcall.c:959 #, possible-c-format msgid "" "The program being debugged was signaled while in a function called from " @@ -10108,7 +10476,7 @@ "When the function is done executing, GDB will silently stop." msgstr "" -#: infcall.c:981 +#: infcall.c:980 #, possible-c-format msgid "" "The program being debugged entered a std::terminate call, most likely\n" @@ -10128,7 +10496,7 @@ #. someday this will be implemented (it would not be easy). #. FIXME: Insert a bunch of wrap_here; name can be very long if it's #. a C++ name with arguments and stuff. -#: infcall.c:1008 +#: infcall.c:1007 #, possible-c-format msgid "" "The program being debugged stopped while in a function called from GDB.\n" @@ -10138,19 +10506,19 @@ msgstr "" #. The above code errors out, so ... -#: infcall.c:1017 +#: infcall.c:1016 msgid "... should not be here" msgstr "" -#: infcall.c:1080 +#: infcall.c:1079 msgid "Set coercion of floats to doubles when calling functions." msgstr "" -#: infcall.c:1081 +#: infcall.c:1080 msgid "Show coercion of floats to doubles when calling functions" msgstr "" -#: infcall.c:1082 +#: infcall.c:1081 msgid "" "Variables of type float should generally be converted to doubles before\n" "calling an unprototyped function, and left alone when calling a prototyped\n" @@ -10161,16 +10529,16 @@ "The default is to perform the conversion.\n" msgstr "" -#: infcall.c:1095 +#: infcall.c:1094 msgid "Set unwinding of stack if a signal is received while in a call dummy." msgstr "" -#: infcall.c:1096 +#: infcall.c:1095 msgid "" "Show unwinding of stack if a signal is received while in a call dummy." msgstr "" -#: infcall.c:1097 +#: infcall.c:1096 msgid "" "The unwindonsignal lets the user determine what gdb should do if a signal\n" "is received while in a function called from gdb (call dummy). If set, gdb\n" @@ -10179,17 +10547,17 @@ "The default is to stop in the frame where the signal was received." msgstr "" -#: infcall.c:1107 +#: infcall.c:1106 msgid "" "Set unwinding of stack if std::terminate is called while in call dummy." msgstr "" -#: infcall.c:1108 +#: infcall.c:1107 msgid "" "Show unwinding of stack if std::terminate() is called while in a call dummy." msgstr "" -#: infcall.c:1110 +#: infcall.c:1109 msgid "" "The unwind on terminating exception flag lets the user determine\n" "what gdb should do if a std::terminate() call is made from the\n" @@ -10199,281 +10567,287 @@ "The default is to unwind the frame." msgstr "" -#: infcmd.c:127 infcmd.c:2234 infcmd.c:2619 remote-sim.c:886 +#: inf-child.c:79 windows-nat.c:1907 +msgid "Use the \"run\" command to start a Unix child process." +msgstr "" + +#: infcmd.c:128 infcmd.c:2286 infcmd.c:2674 linux-fork.c:658 remote-sim.c:888 msgid "The program is not being run." msgstr "" -#: infcmd.c:206 +#: infcmd.c:207 #, possible-c-format msgid "Terminal for future runs of program being debugged is \"%s\".\n" msgstr "" -#: infcmd.c:342 +#: infcmd.c:343 msgid "can't handle command-line argument containing whitespace" msgstr "" -#: infcmd.c:479 +#: infcmd.c:442 +msgid "" +"platform-specific solib_create_inferior_hook did not load initial shared " +"libraries." +msgstr "" + +#: infcmd.c:488 msgid "" "The program being debugged has been started already.\n" "Start it from the beginning? " msgstr "" -#: infcmd.c:481 +#: infcmd.c:490 msgid "Program not restarted." msgstr "" -#: infcmd.c:525 +#: infcmd.c:535 msgid "The target does not support running in non-stop mode." msgstr "" -#: infcmd.c:547 infcmd.c:720 infcmd.c:863 infcmd.c:1092 infcmd.c:1196 -#: infcmd.c:1332 infcmd.c:1368 infcmd.c:1642 infcmd.c:2463 +#: infcmd.c:557 infcmd.c:730 infcmd.c:873 infcmd.c:1113 infcmd.c:1217 +#: infcmd.c:1366 infcmd.c:1402 infcmd.c:1698 infcmd.c:2518 msgid "Asynchronous execution not supported on this target." msgstr "" -#: infcmd.c:630 +#: infcmd.c:640 msgid "No symbol table loaded. Use the \"file\" command." msgstr "" -#: infcmd.c:662 +#: infcmd.c:672 msgid "Cannot execute this command without a live selected thread." msgstr "" -#: infcmd.c:673 +#: infcmd.c:683 msgid "Cannot execute this command while looking at trace frames." msgstr "" -#: infcmd.c:742 +#: infcmd.c:752 msgid "`-a' is meaningless in all-stop mode." msgstr "" -#: infcmd.c:745 +#: infcmd.c:755 msgid "Can't resume all threads and specify proceed count simultaneously." msgstr "" -#: infcmd.c:791 +#: infcmd.c:801 msgid "Continuing.\n" msgstr "" -#: infcmd.c:1023 +#: infcmd.c:1044 msgid "Cannot find bounds of current function" msgstr "" -#: infcmd.c:1026 +#: infcmd.c:1047 #, possible-c-format msgid "" "Single stepping until exit from function %s,\n" "which has no line number information.\n" msgstr "" -#: infcmd.c:1095 +#: infcmd.c:1116 msgid "starting address" msgstr "" -#: infcmd.c:1100 +#: infcmd.c:1121 msgid "Unreasonable jump request" msgstr "" -#: infcmd.c:1107 +#: infcmd.c:1128 msgid "No source file has been specified." msgstr "" -#: infcmd.c:1116 +#: infcmd.c:1137 #, possible-c-format msgid "Line %d is not in `%s'. Jump anyway? " msgstr "" -#: infcmd.c:1130 +#: infcmd.c:1151 msgid "WARNING!!! Destination is in unmapped overlay! Jump anyway? " msgstr "" -#: infcmd.c:1143 +#: infcmd.c:1164 msgid "Continuing at " msgstr "" -#: infcmd.c:1166 +#: infcmd.c:1187 msgid "Usage: go \n" msgstr "" -#: infcmd.c:1207 +#: infcmd.c:1228 msgid "signal number" msgstr "" -#: infcmd.c:1228 +#: infcmd.c:1249 msgid "Continuing with no signal.\n" msgstr "" -#: infcmd.c:1230 +#: infcmd.c:1251 #, possible-c-format msgid "Continuing with signal %s.\n" msgstr "" -#: infcmd.c:1284 +#: infcmd.c:1313 msgid "Execution is not within a known function." msgstr "" -#: infcmd.c:1359 +#: infcmd.c:1393 msgid "a location" msgstr "" -#: infcmd.c:1482 +#: infcmd.c:1546 msgid "finish_command: function has no target type" msgstr "" -#: infcmd.c:1531 +#: infcmd.c:1595 msgid "Finish: couldn't find function." msgstr "" -#: infcmd.c:1646 -msgid "Asynchronous 'finish' not supported in reverse." -msgstr "" - -#: infcmd.c:1657 +#: infcmd.c:1709 msgid "The \"finish\" command does not take any arguments." msgstr "" #. Finishing from an inline frame is completely different. We don't #. try to show the "return value" - no way to locate it. So we do #. not need a completion. -#: infcmd.c:1659 infcmd.c:1668 +#: infcmd.c:1711 infcmd.c:1720 msgid "No selected frame." msgstr "" -#: infcmd.c:1661 +#: infcmd.c:1713 msgid "\"finish\" not meaningful in the outermost frame." msgstr "" -#: infcmd.c:1689 infcmd.c:1708 +#: infcmd.c:1741 infcmd.c:1760 msgid "Run till exit from " msgstr "" -#: infcmd.c:1706 +#: infcmd.c:1758 msgid "Run back to call of " msgstr "" -#: infcmd.c:1730 +#: infcmd.c:1782 msgid "The program being debugged is not being run.\n" msgstr "" -#: infcmd.c:1746 +#: infcmd.c:1798 infrun.c:6500 msgid "Selected thread is running." msgstr "" -#: infcmd.c:1753 +#: infcmd.c:1805 #, possible-c-format msgid "Program stopped at %s.\n" msgstr "" -#: infcmd.c:1756 +#: infcmd.c:1808 msgid "It stopped after being stepped.\n" msgstr "" -#: infcmd.c:1765 +#: infcmd.c:1817 msgid "It stopped at a breakpoint that has since been deleted.\n" msgstr "" -#: infcmd.c:1769 +#: infcmd.c:1821 #, possible-c-format msgid "It stopped at breakpoint %d.\n" msgstr "" -#: infcmd.c:1775 +#: infcmd.c:1827 #, possible-c-format msgid "It stopped with signal %s, %s.\n" msgstr "" -#: infcmd.c:1782 +#: infcmd.c:1834 msgid "Type \"info stack\" or \"info registers\" for more information.\n" msgstr "" -#: infcmd.c:1827 +#: infcmd.c:1879 msgid "environment variable and value" msgstr "" -#: infcmd.c:1851 +#: infcmd.c:1903 msgid "environment variable to set" msgstr "" -#: infcmd.c:1873 +#: infcmd.c:1925 #, possible-c-format msgid "Setting environment variable \"%s\" to null value.\n" msgstr "" #. If there is no argument, delete all environment variables. #. Ask for confirmation if reading from the terminal. -#: infcmd.c:1890 +#: infcmd.c:1942 msgid "Delete all environment variables? " msgstr "" -#: infcmd.c:2068 infcmd.c:2219 infcmd.c:2739 +#: infcmd.c:2120 infcmd.c:2271 infcmd.c:2795 msgid "The program has no registers now." msgstr "" -#: infcmd.c:2096 +#: infcmd.c:2148 msgid "Missing register name" msgstr "" #. Nothing matched. -#: infcmd.c:2170 +#: infcmd.c:2222 #, possible-c-format msgid "Invalid register `%.*s'" msgstr "" -#: infcmd.c:2235 +#: infcmd.c:2287 msgid "Kill the program being debugged? " msgstr "" -#: infcmd.c:2249 +#: infcmd.c:2301 #, possible-c-format msgid "In %s,\n" msgstr "" -#: infcmd.c:2443 target.c:2428 +#: infcmd.c:2498 target.c:2522 msgid "A program is being debugged already. Kill it? " msgstr "" -#: infcmd.c:2446 +#: infcmd.c:2501 msgid "Not killed." msgstr "" -#: infcmd.c:2454 +#: infcmd.c:2509 msgid "Cannot attach to this target in non-stop mode" msgstr "" -#: infcmd.c:2699 +#: infcmd.c:2755 msgid "-a is meaningless in all-stop mode." msgstr "" -#: infcmd.c:2747 +#: infcmd.c:2803 msgid "\"unset\" must be followed by the name of an unset subcommand.\n" msgstr "" -#: infcmd.c:2759 +#: infcmd.c:2815 msgid "Set terminal for future runs of program being debugged." msgstr "" -#: infcmd.c:2760 +#: infcmd.c:2816 msgid "Show terminal for future runs of program being debugged." msgstr "" -#: infcmd.c:2761 +#: infcmd.c:2817 msgid "Usage: set inferior-tty /dev/pts/1" msgstr "" -#: infcmd.c:2769 +#: infcmd.c:2825 msgid "Set argument list to give program being debugged when it is started." msgstr "" -#: infcmd.c:2770 +#: infcmd.c:2826 msgid "Show argument list to give program being debugged when it is started." msgstr "" -#: infcmd.c:2771 +#: infcmd.c:2827 msgid "" "Follow this command with any number of args, to be passed to the program." msgstr "" -#: infcmd.c:2777 +#: infcmd.c:2833 msgid "" "The environment to give the program, or one variable's value.\n" "With an argument VAR, prints the value of environment variable VAR to\n" @@ -10481,17 +10855,17 @@ "environment to be given to the program." msgstr "" -#: infcmd.c:2785 +#: infcmd.c:2841 msgid "Complement to certain \"set\" commands." msgstr "" -#: infcmd.c:2788 +#: infcmd.c:2844 msgid "" "Cancel environment variable VAR for the program.\n" "This does not affect the program until the next \"run\" command." msgstr "" -#: infcmd.c:2794 +#: infcmd.c:2850 msgid "" "Set environment variable value to give the program.\n" "Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n" @@ -10499,7 +10873,7 @@ "This does not affect the program until the next \"run\" command." msgstr "" -#: infcmd.c:2802 +#: infcmd.c:2858 msgid "" "Add directory DIR(s) to beginning of search path for object files.\n" "$cwd in the path means the current working directory.\n" @@ -10508,7 +10882,7 @@ "fully linked executable files and separately compiled object files as needed." msgstr "" -#: infcmd.c:2811 +#: infcmd.c:2867 msgid "" "Current search path for finding object files.\n" "$cwd in the path means the current working directory.\n" @@ -10517,11 +10891,11 @@ "fully linked executable files and separately compiled object files as needed." msgstr "" -#: infcmd.c:2822 +#: infcmd.c:2878 msgid "Kill execution of program being debugged." msgstr "" -#: infcmd.c:2825 +#: infcmd.c:2881 msgid "" "Attach to a process or file outside of GDB.\n" "This command attaches to another target, of the same type as your last\n" @@ -10536,45 +10910,45 @@ "to specify the program, and to load its symbol table." msgstr "" -#: infcmd.c:2838 +#: infcmd.c:2894 msgid "" "Detach a process or file previously attached.\n" "If a process, it is no longer traced, and it continues its execution. If\n" "you were debugging a file, the file is closed and gdb no longer accesses it." msgstr "" -#: infcmd.c:2844 +#: infcmd.c:2900 msgid "" "Disconnect from a target.\n" "The target will wait for another debugger to connect. Not available for\n" "all targets." msgstr "" -#: infcmd.c:2849 +#: infcmd.c:2905 msgid "" "Continue program giving it signal specified by the argument.\n" "An argument of \"0\" means continue program without giving it a signal." msgstr "" -#: infcmd.c:2853 +#: infcmd.c:2909 msgid "" "Step one instruction exactly.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2859 +#: infcmd.c:2915 msgid "" "Step one instruction, but proceed through subroutine calls.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2865 +#: infcmd.c:2921 msgid "" "Execute until selected stack frame returns.\n" "Upon return, the value returned is printed and put in the value history." msgstr "" -#: infcmd.c:2870 +#: infcmd.c:2926 msgid "" "Step program, proceeding through subroutine calls.\n" "Like the \"step\" command as long as subroutine calls do not happen;\n" @@ -10582,34 +10956,34 @@ "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2880 +#: infcmd.c:2936 msgid "" "Step program until it reaches a different source line.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2886 +#: infcmd.c:2942 msgid "" "Execute until the program reaches a source line greater than the current\n" "or a specified location (same args as break command) within the current " "frame." msgstr "" -#: infcmd.c:2893 +#: infcmd.c:2949 msgid "" "Continue the program up to the given location (same form as args for break " "command).\n" "Execution will also stop upon exit from the current stack frame." msgstr "" -#: infcmd.c:2899 +#: infcmd.c:2955 msgid "" "Continue program being debugged at specified line or address.\n" "Give as argument either LINENUM or *ADDR, where ADDR is an expression\n" "for an address to start at." msgstr "" -#: infcmd.c:2907 +#: infcmd.c:2963 msgid "" "Usage: go \n" "Continue program being debugged, stopping at specified line or \n" @@ -10619,7 +10993,7 @@ "This command is a combination of tbreak and jump." msgstr "" -#: infcmd.c:2920 +#: infcmd.c:2976 msgid "" "Continue program being debugged, after signal or breakpoint.\n" "If proceeding from breakpoint, a number N may be used as an argument,\n" @@ -10632,7 +11006,7 @@ "Specifying -a and an ignore count simultaneously is an error." msgstr "" -#: infcmd.c:2933 +#: infcmd.c:2989 msgid "" "Start debugged program. You may specify arguments to give it.\n" "Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n" @@ -10644,18 +11018,18 @@ "use \"set args\" without arguments." msgstr "" -#: infcmd.c:2946 +#: infcmd.c:3002 msgid "Start debugged program with no arguments." msgstr "" -#: infcmd.c:2948 +#: infcmd.c:3004 msgid "" "Run the debugged program until the beginning of the main procedure.\n" "You may specify arguments to give to your program, just as with the\n" "\"run\" command." msgstr "" -#: infcmd.c:2955 +#: infcmd.c:3011 msgid "" "Interrupt the execution of the debugged program.\n" "If non-stop mode is enabled, interrupt only the current thread,\n" @@ -10663,143 +11037,143 @@ "interrupt all running threads in non-stop mode, use the -a option." msgstr "" -#: infcmd.c:2960 infcmd.c:2966 +#: infcmd.c:3016 infcmd.c:3022 msgid "" "List of integer registers and their contents, for selected stack frame.\n" "Register name as argument means describe only that register." msgstr "" -#: infcmd.c:2969 +#: infcmd.c:3025 msgid "" "List of all registers and their contents, for selected stack frame.\n" "Register name as argument means describe only that register." msgstr "" -#: infcmd.c:2974 +#: infcmd.c:3030 msgid "Execution status of the program." msgstr "" -#: infcmd.c:2977 +#: infcmd.c:3033 msgid "Print the status of the floating point unit\n" msgstr "" -#: infcmd.c:2980 +#: infcmd.c:3036 msgid "Print the status of the vector unit\n" msgstr "" -#: inferior.c:153 +#: inferior.c:154 #, possible-c-format msgid "[New inferior %d]\n" msgstr "" -#: inferior.c:240 inferior.c:296 +#: inferior.c:241 inferior.c:297 #, possible-c-format msgid "[Inferior %d exited]\n" msgstr "" -#: inferior.c:323 +#: inferior.c:324 #, possible-c-format msgid "[Inferior %d detached]\n" msgstr "" -#: inferior.c:597 +#: inferior.c:598 msgid "" "\n" "\tis vfork child of inferior " msgstr "" -#: inferior.c:602 +#: inferior.c:603 msgid "" "\n" "\tis vfork parent of inferior " msgstr "" -#: inferior.c:621 +#: inferior.c:622 msgid "Requires argument (inferior id(s) to detach)" msgstr "" -#: inferior.c:630 inferior.c:666 inferior.c:697 inferior.c:770 inferior.c:914 +#: inferior.c:631 inferior.c:667 inferior.c:698 inferior.c:771 inferior.c:915 #, possible-c-format msgid "Inferior ID %d not known." msgstr "" -#: inferior.c:639 inferior.c:675 +#: inferior.c:640 inferior.c:676 #, possible-c-format msgid "Inferior ID %d has no threads." msgstr "" -#: inferior.c:657 +#: inferior.c:658 msgid "Requires argument (inferior id(s) to kill)" msgstr "" -#: inferior.c:699 +#: inferior.c:700 #, possible-c-format msgid "[Switching to inferior %d [%s] (%s)]\n" msgstr "" -#: inferior.c:704 +#: inferior.c:705 msgid "" msgstr "" -#: inferior.c:714 mi/mi-main.c:374 +#: inferior.c:715 mi/mi-main.c:372 msgid "Inferior has no threads." msgstr "" -#: inferior.c:719 +#: inferior.c:720 #, possible-c-format msgid "[Switching to thread %d (%s)] " msgstr "" -#: inferior.c:760 +#: inferior.c:761 msgid "Requires an argument (inferior id(s) to remove)" msgstr "" -#: inferior.c:776 +#: inferior.c:777 #, possible-c-format msgid "Can not remove current symbol inferior %d." msgstr "" -#: inferior.c:782 +#: inferior.c:783 #, possible-c-format msgid "Can not remove active inferior %d." msgstr "" -#: inferior.c:832 inferior.c:895 +#: inferior.c:833 inferior.c:896 msgid "No argument to -copies" msgstr "" -#: inferior.c:839 +#: inferior.c:840 msgid "No argument to -exec" msgstr "" -#: inferior.c:844 inferior.c:918 +#: inferior.c:845 inferior.c:919 msgid "Invalid argument" msgstr "" -#: inferior.c:854 +#: inferior.c:855 #, possible-c-format msgid "Added inferior %d\n" msgstr "" -#: inferior.c:899 +#: inferior.c:900 msgid "Invalid copies number" msgstr "" -#: inferior.c:945 +#: inferior.c:946 #, possible-c-format msgid "Added inferior %d.\n" msgstr "" -#: inferior.c:960 +#: inferior.c:961 #, possible-c-format msgid "Printing of inferior events is %s.\n" msgstr "" -#: inferior.c:1078 +#: inferior.c:1079 msgid "IDs of specified inferiors (all inferiors if no argument)." msgstr "" -#: inferior.c:1080 +#: inferior.c:1081 msgid "" "Add a new inferior.\n" "Usage: add-inferior [-copies ] [-exec ]\n" @@ -10808,13 +11182,13 @@ "as main program." msgstr "" -#: inferior.c:1087 +#: inferior.c:1088 msgid "" "Remove inferior ID (or list of IDs).\n" "Usage: remove-inferiors ID..." msgstr "" -#: inferior.c:1091 +#: inferior.c:1092 msgid "" "Clone inferior ID.\n" "Usage: clone-inferior [-copies ] [ID]\n" @@ -10824,61 +11198,65 @@ "that is cloned." msgstr "" -#: inferior.c:1099 +#: inferior.c:1100 msgid "Detach from inferior ID (or list of IDS)." msgstr "" -#: inferior.c:1103 +#: inferior.c:1104 msgid "Kill inferior ID (or list of IDs)." msgstr "" -#: inferior.c:1107 +#: inferior.c:1108 msgid "" "Use this command to switch between inferiors.\n" "The new inferior ID must be currently known." msgstr "" -#: inferior.c:1113 +#: inferior.c:1114 msgid "Set printing of inferior events (e.g., inferior start and exit)." msgstr "" -#: inferior.c:1114 +#: inferior.c:1115 msgid "Show printing of inferior events (e.g., inferior start and exit)." msgstr "" -#: inflow.c:575 +#: inf-loop.c:137 +msgid "Event type not recognized.\n" +msgstr "" + +#: inflow.c:573 msgid "This GDB does not control a terminal.\n" msgstr "" -#: inflow.c:585 +#: inflow.c:583 msgid "Inferior's terminal status (currently saved by GDB):\n" msgstr "" #. Mention GDB in warning because it will appear in the inferior's #. terminal instead of GDB's. -#: inflow.c:733 +#: inflow.c:731 #, possible-c-format msgid "GDB: Failed to set controlling terminal: %s" msgstr "" -#: inflow.c:822 +#: inflow.c:820 #, possible-c-format msgid "Failed to create new terminal session: setsid: %s" msgstr "" -#: inflow.c:884 +#: inflow.c:882 msgid "Print inferior's saved terminal status." msgstr "" -#: inflow.c:887 +#: inflow.c:885 msgid "Set whether GDB's standard input is a terminal." msgstr "" -#: inflow.c:888 +#: inflow.c:886 msgid "Show whether GDB's standard input is a terminal." msgstr "" -#: inflow.c:889 +#: inflow.c:887 msgid "" "If on, GDB assumes that standard input is a terminal. In practice, it\n" "means that GDB should wait for the user to answer queries associated to\n" @@ -10888,60 +11266,78 @@ "input settings." msgstr "" -#: infrun.c:120 +#: inf-ptrace.c:235 +msgid "This system does not support attaching to a process" +msgstr "" + +#: inf-ptrace.c:299 +msgid "This system does not support detaching from a process" +msgstr "" + +#: inf-ptrace.c:406 rs6000-nat.c:548 +#, possible-c-format +msgid "Child process unexpectedly missing: %s.\n" +msgstr "" + +#: inf-ptrace.c:610 inf-ttrace.c:1243 +#, possible-c-format +msgid "\tUsing the running image of %s %s.\n" +msgstr "" + +#: infrun.c:117 #, possible-c-format msgid "Mode of the step operation is %s.\n" msgstr "" -#: infrun.c:141 +#: infrun.c:138 #, possible-c-format msgid "Displace stepping debugging is %s.\n" msgstr "" -#: infrun.c:149 +#: infrun.c:146 #, possible-c-format msgid "Inferior debugging is %s.\n" msgstr "" -#: infrun.c:163 +#: infrun.c:160 #, possible-c-format msgid "Disabling randomization of debuggee's virtual address space is %s.\n" msgstr "" -#: infrun.c:167 +#: infrun.c:164 msgid "" "Disabling randomization of debuggee's virtual address space is unsupported " "on\n" "this platform.\n" msgstr "" -#: infrun.c:177 +#: infrun.c:174 msgid "" "Disabling randomization of debuggee's virtual address space is unsupported " "on\n" "this platform." msgstr "" -#: infrun.c:252 infrun.c:6932 target.c:4108 target.c:4156 +#: infrun.c:249 infrun.c:7038 target.c:4273 target.c:4321 msgid "Cannot change this setting while the inferior is running." msgstr "多线程进行时,不能改变这个设置。" -#: infrun.c:278 infrun.c:308 +#: infrun.c:275 infrun.c:305 #, possible-c-format msgid "Observer mode is now %s.\n" msgstr "" -#: infrun.c:286 +#: infrun.c:283 #, possible-c-format msgid "Observer mode is %s.\n" msgstr "" -#: infrun.c:360 +#: infrun.c:357 #, possible-c-format msgid "Stopping for shared library events is %s.\n" msgstr "" -#: infrun.c:407 +#: infrun.c:404 #, possible-c-format msgid "Debugger response to a program call of fork or vfork is \"%s\".\n" msgstr "" @@ -10952,164 +11348,180 @@ #. forked. In that case, the resume command #. issued is most likely not applicable to the #. child, so just warn, and refuse to resume. -#: infrun.c:548 +#: infrun.c:545 msgid "Not resuming: switched threads before following fork child.\n" msgstr "" -#: infrun.c:796 +#: infrun.c:793 #, possible-c-format msgid "Follow exec mode is \"%s\".\n" msgstr "" #. What is this a.out's name? -#: infrun.c:848 +#: infrun.c:845 #, possible-c-format msgid "%s is executing new program: %s\n" msgstr "" -#: infrun.c:1207 +#: infrun.c:1204 #, possible-c-format msgid "" "Debugger's willingness to use displaced stepping to step over breakpoints is " "%s (currently %s).\n" msgstr "" -#: infrun.c:1212 +#: infrun.c:1209 #, possible-c-format msgid "" "Debugger's willingness to use displaced stepping to step over breakpoints is " "%s.\n" msgstr "" -#: infrun.c:1590 +#: infrun.c:1594 #, possible-c-format msgid "Mode for locking scheduler during execution is \"%s\".\n" msgstr "" -#: infrun.c:1601 +#: infrun.c:1605 #, possible-c-format msgid "Target '%s' cannot support this command." msgstr "" -#: infrun.c:1690 +#: infrun.c:1735 msgid "" "The program is stopped at a permanent breakpoint, but GDB does not know\n" "how to step past a permanent breakpoint on this architecture. Try using\n" "a command like `return' or `jump' to continue execution." msgstr "" -#: infrun.c:2629 +#: infrun.c:2654 msgid "Program exited while detaching" msgstr "" -#: infrun.c:3020 +#: infrun.c:2839 +msgid "completed.\n" +msgstr "" + +#: infrun.c:3031 msgid "Cannot execute this command while the selected thread is running." msgstr "" -#: infrun.c:3840 +#: infrun.c:3966 msgid "Cannot step over breakpoint hit in wrong thread" msgstr "" -#: infrun.c:5725 linux-fork.c:375 linux-fork.c:407 +#: infrun.c:5882 linux-fork.c:374 linux-fork.c:406 #, possible-c-format msgid "[Switching to %s]\n" msgstr "" -#: infrun.c:5736 +#: infrun.c:5893 +msgid "No unwaited-for children left.\n" +msgstr "" + +#: infrun.c:5901 msgid "" "Cannot remove breakpoints because program is no longer writable.\n" "Further execution is probably impossible.\n" msgstr "" -#: infrun.c:5847 +#: infrun.c:6001 msgid "Unknown value." msgstr "" -#: infrun.c:6016 +#: infrun.c:6172 msgid "Signal Stop\tPrint\tPass to program\tDescription\n" msgstr "" -#: infrun.c:6053 +#: infrun.c:6209 msgid "signal to handle" msgstr "" #. Not a number and not a recognized flag word => complain. -#: infrun.c:6156 +#: infrun.c:6312 #, possible-c-format msgid "Unrecognized or ambiguous flag word: \"%s\"." msgstr "" -#: infrun.c:6171 +#: infrun.c:6327 #, possible-c-format msgid "" "%s is used by the debugger.\n" "Are you sure you want to change it? " msgstr "" -#: infrun.c:6179 +#: infrun.c:6335 msgid "Not confirmed, unchanged.\n" msgstr "" -#: infrun.c:6226 +#: infrun.c:6382 msgid "xdb command" msgstr "" -#: infrun.c:6277 +#: infrun.c:6433 msgid "Invalid signal handling flag.\n" msgstr "" -#: infrun.c:6324 +#: infrun.c:6480 msgid "" "\n" "Use the \"handle\" command to change these tables.\n" msgstr "" -#: infrun.c:6354 +#: infrun.c:6492 +msgid "No thread selected." +msgstr "" + +#: infrun.c:6496 +msgid "The current thread has terminated" +msgstr "" + +#: infrun.c:6531 msgid "Unable to read siginfo" msgstr "" -#: infrun.c:6373 +#: infrun.c:6552 msgid "Unable to write siginfo" msgstr "" -#: infrun.c:6601 +#: infrun.c:6780 msgid "Unable to restore previously selected frame." msgstr "" -#: infrun.c:6897 +#: infrun.c:7005 msgid "Target does not support this operation." msgstr "" -#: infrun.c:6907 +#: infrun.c:7015 msgid "Forward.\n" msgstr "" -#: infrun.c:6910 +#: infrun.c:7018 msgid "Reverse.\n" msgstr "反转。\n" -#: infrun.c:6914 +#: infrun.c:7022 #, possible-c-format -msgid "Forward (target `%s' does not support exec-direction).\n" +msgid "bogus execution_direction value: %d" msgstr "" -#: infrun.c:6943 +#: infrun.c:7049 #, possible-c-format msgid "Controlling the inferior in non-stop mode is %s.\n" msgstr "" -#: infrun.c:6951 +#: infrun.c:7057 #, possible-c-format msgid "Resuming the execution of threads of all processes is %s.\n" msgstr "" -#: infrun.c:6961 infrun.c:6983 +#: infrun.c:7067 infrun.c:7089 msgid "" "What debugger does when program gets various signals.\n" "Specify a signal as argument to print info on that signal only." msgstr "" -#: infrun.c:6966 +#: infrun.c:7072 msgid "" "Specify how to handle a signal.\n" "Args are signals and actions to apply to those signals.\n" @@ -11127,7 +11539,7 @@ "Pass and Stop may be combined." msgstr "" -#: infrun.c:6986 +#: infrun.c:7092 msgid "" "Specify how to handle a signal.\n" "Args are signals and actions to apply to those signals.\n" @@ -11146,46 +11558,46 @@ "Pass and Stop may be combined." msgstr "" -#: infrun.c:7006 +#: infrun.c:7112 msgid "" "There is no `stop' command, but you can set a hook on `stop'.\n" "This allows you to set a list of commands to be run each time execution\n" "of the program stops." msgstr "" -#: infrun.c:7011 +#: infrun.c:7117 msgid "Set inferior debugging." msgstr "" -#: infrun.c:7012 +#: infrun.c:7118 msgid "Show inferior debugging." msgstr "显示内部调试" -#: infrun.c:7013 +#: infrun.c:7119 msgid "When non-zero, inferior specific debugging is enabled." msgstr "如果是非0时,允许特殊的多线程调试" -#: infrun.c:7020 +#: infrun.c:7126 msgid "Set displaced stepping debugging." msgstr "" -#: infrun.c:7021 +#: infrun.c:7127 msgid "Show displaced stepping debugging." msgstr "" -#: infrun.c:7022 +#: infrun.c:7128 msgid "When non-zero, displaced stepping specific debugging is enabled." msgstr "" -#: infrun.c:7029 +#: infrun.c:7135 msgid "Set whether gdb controls the inferior in non-stop mode." msgstr "设置在非关闭模式中gdb是否控制多线程调试。" -#: infrun.c:7030 +#: infrun.c:7136 msgid "Show whether gdb controls the inferior in non-stop mode." msgstr "显示在非关闭模式中gdb是否控制多线程调试。" -#: infrun.c:7031 +#: infrun.c:7137 msgid "" "When debugging a multi-threaded program and this setting is\n" "off (the default, also called all-stop mode), when one thread stops\n" @@ -11209,30 +11621,30 @@ "在非关闭模式中,如果一个线程停止了,其他线程可以继续运行。你可以独立得调试每一个进程,\n" "根据需要让他停止或继续运行" -#: infrun.c:7103 +#: infrun.c:7209 msgid "Set stopping for shared library events." msgstr "设置是否因共享库事件而停止。" -#: infrun.c:7104 +#: infrun.c:7210 msgid "Show stopping for shared library events." msgstr "显示是否因共享库事件而停止" -#: infrun.c:7105 +#: infrun.c:7211 msgid "" "If nonzero, gdb will give control to the user when the dynamic linker\n" "notifies gdb of shared library events. The most common event of interest\n" "to the user would be loading/unloading of a new library." msgstr "" -#: infrun.c:7115 +#: infrun.c:7221 msgid "Set debugger response to a program call of fork or vfork." msgstr "" -#: infrun.c:7116 +#: infrun.c:7222 msgid "Show debugger response to a program call of fork or vfork." msgstr "" -#: infrun.c:7117 +#: infrun.c:7223 msgid "" "A fork or vfork creates a new process. follow-fork-mode can be:\n" " parent - the original process is debugged after a fork\n" @@ -11241,15 +11653,15 @@ "By default, the debugger will follow the parent process." msgstr "" -#: infrun.c:7129 +#: infrun.c:7235 msgid "Set debugger response to a program call of exec." msgstr "" -#: infrun.c:7130 +#: infrun.c:7236 msgid "Show debugger response to a program call of exec." msgstr "" -#: infrun.c:7131 +#: infrun.c:7237 msgid "" "An exec call replaces the program image of a process.\n" "\n" @@ -11268,15 +11680,15 @@ "By default, the debugger will use the same inferior." msgstr "" -#: infrun.c:7152 +#: infrun.c:7258 msgid "Set mode for locking scheduler during execution." msgstr "" -#: infrun.c:7153 +#: infrun.c:7259 msgid "Show mode for locking scheduler during execution." msgstr "" -#: infrun.c:7154 +#: infrun.c:7260 msgid "" "off == no locking (threads may preempt at any time)\n" "on == full locking (no thread except the current thread may run)\n" @@ -11285,15 +11697,15 @@ "\tOther threads may run while stepping over a function call ('next')." msgstr "" -#: infrun.c:7164 +#: infrun.c:7270 msgid "Set mode for resuming threads of all processes." msgstr "" -#: infrun.c:7165 +#: infrun.c:7271 msgid "Show mode for resuming threads of all processes." msgstr "" -#: infrun.c:7166 +#: infrun.c:7272 msgid "" "When on, execution commands (such as 'continue' or 'next') resume all\n" "threads of all processes. When off (which is the default), execution\n" @@ -11302,30 +11714,30 @@ "mode (see help set scheduler-locking)." msgstr "" -#: infrun.c:7176 +#: infrun.c:7282 msgid "Set mode of the step operation." msgstr "" -#: infrun.c:7177 +#: infrun.c:7283 msgid "Show mode of the step operation." msgstr "" -#: infrun.c:7178 +#: infrun.c:7284 msgid "" "When set, doing a step over a function without debug line information\n" "will stop at the first instruction of that function. Otherwise, the\n" "function is skipped and the step command stops at a different source line." msgstr "" -#: infrun.c:7188 +#: infrun.c:7294 msgid "Set debugger's willingness to use displaced stepping." msgstr "" -#: infrun.c:7189 +#: infrun.c:7295 msgid "Show debugger's willingness to use displaced stepping." msgstr "" -#: infrun.c:7190 +#: infrun.c:7296 msgid "" "If on, gdb will use displaced stepping to step over breakpoints if it is\n" "supported by the target architecture. If off, gdb will not use displaced\n" @@ -11337,57 +11749,57 @@ "use it in all-stop mode (see help set non-stop)." msgstr "" -#: infrun.c:7202 +#: infrun.c:7308 msgid "" "Set direction of execution.\n" "Options are 'forward' or 'reverse'." msgstr "" -#: infrun.c:7204 +#: infrun.c:7310 msgid "Show direction of execution (forward/reverse)." msgstr "" -#: infrun.c:7205 +#: infrun.c:7311 msgid "Tells gdb whether to execute forward or backward." msgstr "" #. Set/show detach-on-fork: user-settable mode. -#: infrun.c:7211 +#: infrun.c:7317 msgid "Set whether gdb will detach the child of a fork." msgstr "" -#: infrun.c:7212 +#: infrun.c:7318 msgid "Show whether gdb will detach the child of a fork." msgstr "" -#: infrun.c:7213 +#: infrun.c:7319 msgid "Tells gdb whether to detach the child of a fork." msgstr "" -#: infrun.c:7220 +#: infrun.c:7326 msgid "Set disabling of debuggee's virtual address space randomization." msgstr "" -#: infrun.c:7221 +#: infrun.c:7327 msgid "Show disabling of debuggee's virtual address space randomization." msgstr "" -#: infrun.c:7222 +#: infrun.c:7328 msgid "" "When this mode is on (which is the default), randomization of the virtual\n" "address space is disabled. Standalone programs run with the randomization\n" "enabled by default on some platforms." msgstr "" -#: infrun.c:7248 +#: infrun.c:7352 msgid "Set whether gdb controls the inferior in observer mode." msgstr "" -#: infrun.c:7249 +#: infrun.c:7353 msgid "Show whether gdb controls the inferior in observer mode." msgstr "" -#: infrun.c:7250 +#: infrun.c:7354 msgid "" "In observer mode, GDB can get data from the inferior, but not\n" "affect its execution. Registers and memory may not be changed,\n" @@ -11395,7 +11807,35 @@ "or signalled." msgstr "" -#: interps.c:158 +#: inf-ttrace.c:464 +#, possible-c-format +msgid "Attaching after fork to child process %ld.\n" +msgstr "" + +#: inf-ttrace.c:474 +#, possible-c-format +msgid "Detaching after fork from child process %ld.\n" +msgstr "" + +#: inf-ttrace.c:700 +msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed" +msgstr "" + +#: inf-ttrace.c:721 +msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed" +msgstr "" + +#: inf-ttrace.c:1095 linux-nat.c:1254 procfs.c:3909 procfs.c:4047 +#, possible-c-format +msgid "[%s exited]\n" +msgstr "" + +#: inf-ttrace.c:1111 +#, possible-c-format +msgid "[%s has been terminated]\n" +msgstr "" + +#: interps.c:157 #, possible-c-format msgid "Could not suspend interpreter \"%s\"." msgstr "" @@ -11405,30 +11845,30 @@ msgid "Failed to initialize new interp \"%s\" %s" msgstr "" -#: interps.c:376 +#: interps.c:392 msgid "interpreter-exec command" msgstr "" -#: interps.c:386 +#: interps.c:402 msgid "usage: interpreter-exec [ ... ]" msgstr "" -#: interps.c:392 +#: interps.c:408 #, possible-c-format msgid "Could not find interpreter \"%s\"." msgstr "" -#: interps.c:399 +#: interps.c:415 #, possible-c-format msgid "Could not switch to interpreter \"%s\"." msgstr "" -#: interps.c:410 +#: interps.c:426 #, possible-c-format msgid "error in command: \"%s\"." msgstr "" -#: interps.c:491 +#: interps.c:507 msgid "" "Execute a command in an interpreter. It takes two arguments:\n" "The first argument is the name of the interpreter to use.\n" @@ -11440,236 +11880,305 @@ msgid "breakpoint_from_pc: invalid breakpoint address 0x%lx" msgstr "" -#: jit.c:54 +#: jit.c:68 #, possible-c-format msgid "JIT debugging is %s.\n" msgstr "" +#: jit.c:154 +#, possible-c-format +msgid "Opening shared object %s.\n" +msgstr "" + +#: jit.c:161 +#, possible-c-format +msgid "Could not locate initialization function: %s." +msgstr "" + +#: jit.c:165 +msgid "Reader not GPL compatible." +msgstr "" + +#: jit.c:169 +msgid "Reader version does not match GDB version." +msgstr "" + +#: jit.c:189 +msgid "No reader name provided." +msgstr "" + #: jit.c:192 +msgid "JIT reader already loaded. Run jit-reader-unload first." +msgstr "" + +#: jit.c:207 +msgid "No JIT reader loaded." +msgstr "" + +#: jit.c:305 msgid "Unable to read JIT descriptor from remote memory!" msgstr "" -#: jit.c:225 +#: jit.c:339 msgid "Unable to read JIT code entry from remote memory!" msgstr "" -#: jit.c:271 +#: jit.c:799 +msgid "Error opening JITed symbol file, ignoring it.\n" +msgstr "" + +#: jit.c:807 msgid "JITed symbol file is not an object file, ignoring it.\n" msgstr "" -#: jit.c:280 +#: jit.c:816 #, possible-c-format msgid "" "JITed object file architecture %s is not compatible with target architecture " "%s." msgstr "" -#: jit.c:421 +#: jit.c:966 +#, possible-c-format +msgid "Could not recognize DWARF regnum %d" +msgstr "" + +#: jit.c:1069 +msgid "Successfully unwound frame using JIT reader.\n" +msgstr "" + +#: jit.c:1074 +msgid "Could not unwind frame using JIT reader.\n" +msgstr "" + +#: jit.c:1217 msgid "Unsupported JIT protocol version in descriptor!" msgstr "" -#: jit.c:531 +#: jit.c:1327 #, possible-c-format msgid "Unable to find JITed code entry at address: %s\n" msgstr "" -#: jit.c:539 +#: jit.c:1335 msgid "Unknown action_flag value in JIT descriptor!" msgstr "" -#: jit.c:552 +#: jit.c:1371 msgid "Set JIT debugging." msgstr "" -#: jit.c:553 +#: jit.c:1372 msgid "Show JIT debugging." msgstr "" -#: jit.c:554 +#: jit.c:1373 msgid "When non-zero, JIT debugging is enabled." msgstr "" -#: jv-exp.y:396 +#: jit.c:1388 +msgid "" +"Load FILE as debug info reader and unwinder for JIT compiled code.\n" +"Usage: jit-reader-load FILE\n" +"Try to load file FILE as a debug info reader (and unwinder) for\n" +"JIT compiled code. The file is loaded from " +msgstr "" + +#: jit.c:1392 +msgid "" +",\n" +"relocated relative to the GDB executable if required." +msgstr "" + +#: jit.c:1394 +msgid "" +"Unload the currently loaded JIT debug info reader.\n" +"Usage: jit-reader-unload FILE\n" +"\n" +"Do \"help jit-reader-load\" for info on loading debug info readers." +msgstr "" + +#: jv-exp.y:395 msgid "FIXME - ClassInstanceCreationExpression" msgstr "" -#: jv-exp.y:415 jv-exp.y:418 +#: jv-exp.y:414 jv-exp.y:417 msgid "FIXME - ArrayCreationExpression" msgstr "" -#: jv-exp.y:464 jv-exp.y:466 +#: jv-exp.y:463 jv-exp.y:465 msgid "Form of method invocation not implemented" msgstr "" -#: jv-exp.y:555 +#: jv-exp.y:554 msgid "Invalid cast expression" msgstr "" -#: jv-exp.y:795 +#: jv-exp.y:794 msgid "Numeric constant too large" msgstr "" -#: jv-exp.y:905 +#: jv-exp.y:904 msgid "Empty character constant" msgstr "" -#: jv-exp.y:918 +#: jv-exp.y:917 msgid "Unmatched single quote" msgstr "" -#: jv-exp.y:923 +#: jv-exp.y:922 msgid "Invalid character constant" msgstr "" -#: jv-exp.y:1008 +#: jv-exp.y:1007 #, possible-c-format msgid "Invalid number \"%s\"" msgstr "" -#: jv-exp.y:1080 +#: jv-exp.y:1079 msgid "Unterminated string in expression" msgstr "" #. We must have come across a bad character (e.g. ';'). -#: jv-exp.y:1092 +#: jv-exp.y:1091 #, possible-c-format msgid "Invalid character '%c' in expression" msgstr "" -#: jv-exp.y:1203 +#: jv-exp.y:1202 #, possible-c-format msgid "%s: near `%s'" msgstr "" -#: jv-exp.y:1205 +#: jv-exp.y:1204 #, possible-c-format msgid "error in expression, near `%s'" msgstr "" -#: jv-exp.y:1214 +#: jv-exp.y:1213 #, possible-c-format msgid "No class named `%s'" msgstr "" -#: jv-exp.y:1352 +#: jv-exp.y:1351 #, possible-c-format msgid "unknown type `%.*s'" msgstr "" -#: jv-exp.y:1395 +#: jv-exp.y:1394 msgid "No symbol table is loaded. Use the \"file\" command" msgstr "" -#: jv-exp.y:1397 +#: jv-exp.y:1396 #, possible-c-format msgid "No symbol \"%s\" in current context" msgstr "" -#: jv-lang.c:609 +#: jv-lang.c:599 msgid "cannot find java.lang.Object" msgstr "" -#: jv-lang.c:679 jv-lang.c:755 +#: jv-lang.c:663 jv-lang.c:739 #, possible-c-format msgid "unknown signature '%c' for primitive type" msgstr "" -#: jv-lang.c:855 +#: jv-lang.c:839 msgid "not implemented - java_value_string" msgstr "" -#: jv-lang.c:968 +#: jv-lang.c:976 #, possible-c-format msgid "array index (%ld) out of bounds (length: %ld)" msgstr "" -#: language.c:132 +#: language.c:131 #, possible-c-format msgid "The current source language is \"auto; currently %s\".\n" msgstr "" -#: language.c:137 +#: language.c:136 #, possible-c-format msgid "The current source language is \"%s\".\n" msgstr "" -#: language.c:217 +#: language.c:216 #, possible-c-format msgid "Type checking is \"auto; currently %s\".\n" msgstr "" -#: language.c:221 +#: language.c:220 #, possible-c-format msgid "Type checking is \"%s\".\n" msgstr "" -#: language.c:225 language.c:259 +#: language.c:224 language.c:258 msgid "the current type check setting does not match the language.\n" msgstr "" -#: language.c:256 +#: language.c:255 #, possible-c-format msgid "Unrecognized type check setting: \"%s\"" msgstr "" -#: language.c:290 +#: language.c:289 #, possible-c-format msgid "Range checking is \"auto; currently %s\".\n" msgstr "" -#: language.c:294 +#: language.c:293 #, possible-c-format msgid "Range checking is \"%s\".\n" msgstr "" -#: language.c:298 language.c:333 +#: language.c:297 language.c:332 msgid "the current range check setting does not match the language.\n" msgstr "" -#: language.c:330 +#: language.c:329 #, possible-c-format msgid "Unrecognized range check setting: \"%s\"" msgstr "" -#: language.c:361 +#: language.c:360 #, possible-c-format msgid "Case sensitivity in name search is \"auto; currently %s\".\n" msgstr "" -#: language.c:367 +#: language.c:366 #, possible-c-format msgid "Case sensitivity in name search is \"%s\".\n" msgstr "" -#: language.c:371 language.c:404 +#: language.c:370 language.c:403 msgid "the current case sensitivity setting does not match the language.\n" msgstr "" -#: language.c:460 +#: language.c:459 #, possible-c-format msgid "Current language: %s\n" msgstr "" -#: language.c:465 +#: language.c:464 #, possible-c-format msgid "Type checking: %s\n" msgstr "" -#: language.c:467 +#: language.c:466 #, possible-c-format msgid "Range checking: %s\n" msgstr "" -#: language.c:469 +#: language.c:468 #, possible-c-format msgid "Case sensitivity: %s\n" msgstr "" -#: language.c:614 typeprint.c:66 +#: language.c:613 typeprint.c:65 msgid "Language not supported." msgstr "" -#: language.c:941 +#: language.c:940 msgid "" "Set the current source language.\n" "The currently understood settings are:\n" @@ -11677,284 +12186,273 @@ "local or auto Automatic setting based on source file\n" msgstr "" -#: language.c:969 +#: language.c:968 msgid "Show the current source language." msgstr "" -#: language.c:1067 +#: language.c:1066 msgid "Getting a string is unsupported in this language." msgstr "" -#: language.c:1081 +#: language.c:1080 msgid "Attempted to parse an expression with unknown language" msgstr "" -#: language.c:1088 +#: language.c:1087 msgid "internal error - unimplemented function unk_lang_emit_char called." msgstr "" -#: language.c:1095 +#: language.c:1094 msgid "internal error - unimplemented function unk_lang_printchar called." msgstr "" -#: language.c:1105 +#: language.c:1104 msgid "internal error - unimplemented function unk_lang_printstr called." msgstr "" -#: language.c:1113 +#: language.c:1112 msgid "internal error - unimplemented function unk_lang_print_type called." msgstr "" -#: language.c:1124 +#: language.c:1123 msgid "internal error - unimplemented function unk_lang_val_print called." msgstr "" -#: language.c:1132 +#: language.c:1131 msgid "internal error - unimplemented function unk_lang_value_print called." msgstr "" -#: language.c:1385 +#: language.c:1390 msgid "Set the status of the type/range checker." msgstr "" -#: language.c:1391 +#: language.c:1396 msgid "Show the status of the type/range checker." msgstr "" -#: language.c:1397 +#: language.c:1402 msgid "Set type checking. (on/warn/off/auto)" msgstr "" -#: language.c:1398 +#: language.c:1403 msgid "Show type checking. (on/warn/off/auto)" msgstr "" -#: language.c:1405 +#: language.c:1410 msgid "Set range checking. (on/warn/off/auto)" msgstr "" -#: language.c:1406 +#: language.c:1411 msgid "Show range checking. (on/warn/off/auto)" msgstr "" -#: language.c:1412 +#: language.c:1417 msgid "Set case sensitivity in name search. (on/off/auto)" msgstr "" -#: language.c:1413 +#: language.c:1418 msgid "Show case sensitivity in name search. (on/off/auto)" msgstr "" -#: language.c:1414 +#: language.c:1419 msgid "" "For Fortran the default is off; for other languages the default is on." msgstr "" -#: libunwind-frame.c:212 +#: libunwind-frame.c:211 msgid "Can't get libunwind sp register." msgstr "" -#: linespec.c:577 +#: linespec.c:637 msgid "" "[0] cancel\n" "[1] all\n" msgstr "" -#: linespec.c:589 -#, possible-c-format -msgid "[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n" -msgstr "" - -#: linespec.c:597 -msgid "?HERE\n" -msgstr "" - -#: linespec.c:621 -msgid "Arguments must be choice numbers." -msgstr "" - -#: linespec.c:626 +#: linespec.c:659 msgid "canceled" msgstr "" -#: linespec.c:649 +#: linespec.c:675 #, possible-c-format msgid "No choice number %d.\n" msgstr "" -#: linespec.c:667 +#: linespec.c:687 #, possible-c-format msgid "duplicate request for %d ignored.\n" msgstr "" -#: linespec.c:1207 linespec.c:1458 +#. The error message doesn't really matter, because this case +#. should only hit during breakpoint reset. +#: linespec.c:1295 +msgid "cannot evaluate expressions while program space is in startup" +msgstr "" + +#: linespec.c:1386 linespec.c:1591 msgid "malformed template specification in command" msgstr "" -#: linespec.c:1314 -#, possible-c-format -msgid "debugging symbol \"%s\" does not match selector; ignoring" +#. End if symbol found. +#. We couldn't find a class, so we're in case 2 above. We check the +#. entire name as a symbol instead. The simplest way to do this is +#. to just throw an exception and let our caller fall through to +#. decode_variable. +#: linespec.c:1726 +msgid "see caller, this text doesn't matter" msgstr "" -#: linespec.c:1771 +#: linespec.c:2135 #, possible-c-format -msgid "the class `%s' does not have any method instance named %s" +msgid "No source file named %s." msgstr "" -#: linespec.c:1825 +#: linespec.c:2432 #, possible-c-format -msgid "No source file named %s." +msgid "No line %d in the current file." msgstr "" -#: linespec.c:1994 +#: linespec.c:2481 msgid "History values used in line specs must have integer values." msgstr "" -#: linespec.c:2019 +#: linespec.c:2509 msgid "Convenience variables used in line specs must have integer values." msgstr "" -#: linespec.c:2110 -#, possible-c-format -msgid "Function \"%s\" not defined." -msgstr "" - -#. NOT_FOUND_ERROR is not correct but it ensures COPY will be -#. searched also as a minimal symbol. -#: linespec.c:2185 +#: linespec.c:2961 #, possible-c-format -msgid "\"%s\" is not a function" +msgid "Function \"%s\" not defined in \"%s\"." msgstr "" -#. This can happen if it is compiled with a compiler which doesn't -#. put out line numbers for variables. -#. FIXME: Shouldn't we just set .line and .symtab to zero -#. and return? For example, "info line foo" could print -#. the address. -#: linespec.c:2205 +#: linespec.c:2964 #, possible-c-format -msgid "Line number not known for symbol \"%s\"" +msgid "Function \"%s\" not defined." msgstr "" -#: linux-fork.c:395 linux-fork.c:540 +#: linux-fork.c:394 linux-fork.c:539 #, possible-c-format msgid "Unable to detach %s" msgstr "" -#: linux-fork.c:489 +#: linux-fork.c:488 msgid "Requires argument (checkpoint id to delete)" msgstr "" -#: linux-fork.c:493 linux-fork.c:533 +#: linux-fork.c:492 linux-fork.c:532 #, possible-c-format msgid "No such checkpoint id, %s" msgstr "" -#: linux-fork.c:496 +#: linux-fork.c:495 msgid "Please switch to another checkpoint before deleting the current one" msgstr "" -#: linux-fork.c:500 +#: linux-fork.c:499 #, possible-c-format msgid "Unable to kill pid %s" msgstr "" -#: linux-fork.c:507 +#: linux-fork.c:506 #, possible-c-format msgid "Killed %s\n" msgstr "" -#: linux-fork.c:519 +#: linux-fork.c:518 #, possible-c-format msgid "Unable to wait pid %s" msgstr "" -#: linux-fork.c:529 +#: linux-fork.c:528 msgid "Requires argument (checkpoint id to detach)" msgstr "" -#: linux-fork.c:536 +#: linux-fork.c:535 msgid "Please switch to another checkpoint before detaching the current one" msgstr "" -#: linux-fork.c:543 +#: linux-fork.c:542 #, possible-c-format msgid "Detached %s\n" msgstr "" -#: linux-fork.c:581 +#: linux-fork.c:580 msgid " (main process)" msgstr "" -#: linux-fork.c:582 +#: linux-fork.c:581 msgid " at " msgstr "" -#: linux-fork.c:587 +#: linux-fork.c:586 #, possible-c-format msgid ", file %s" msgstr "" -#: linux-fork.c:589 +#: linux-fork.c:588 #, possible-c-format msgid ", line %d" msgstr "" -#: linux-fork.c:604 +#: linux-fork.c:603 #, possible-c-format msgid "No checkpoint number %d.\n" msgstr "" -#: linux-fork.c:606 +#: linux-fork.c:605 msgid "No checkpoints.\n" msgstr "" -#: linux-fork.c:639 +#: linux-fork.c:663 +msgid "checkpoint: can't checkpoint multiple threads." +msgstr "" + +#: linux-fork.c:673 msgid "checkpoint: can't find fork function in inferior." msgstr "" #. Probably can't happen. -#: linux-fork.c:651 +#: linux-fork.c:685 msgid "checkpoint: call_function_by_hand returned null." msgstr "" -#: linux-fork.c:659 +#: linux-fork.c:693 #, possible-c-format msgid "checkpoint: fork returned pid %ld.\n" msgstr "" -#: linux-fork.c:666 +#: linux-fork.c:700 #, possible-c-format msgid " gdb says parent = %ld.\n" msgstr "" -#: linux-fork.c:673 +#: linux-fork.c:707 msgid "Failed to find new fork" msgstr "" -#: linux-fork.c:694 +#: linux-fork.c:728 #, possible-c-format msgid "Switching to %s\n" msgstr "" -#: linux-fork.c:707 +#: linux-fork.c:741 msgid "Requires argument (checkpoint id to restart)" msgstr "" -#: linux-fork.c:710 +#: linux-fork.c:744 #, possible-c-format msgid "Not found: checkpoint id %s" msgstr "" #. Checkpoint command: create a fork of the inferior process #. and set it aside for later debugging. -#: linux-fork.c:723 +#: linux-fork.c:757 msgid "Fork a duplicate process (experimental)." msgstr "" #. Restart command: restore the context of a specified checkpoint #. process. -#: linux-fork.c:729 +#: linux-fork.c:763 msgid "" "restart : restore program context from a checkpoint.\n" "Argument 'n' is checkpoint ID, as displayed by 'info checkpoints'." @@ -11962,63 +12460,58 @@ #. Delete checkpoint command: kill the process and remove it from #. the fork list. -#: linux-fork.c:736 +#: linux-fork.c:770 msgid "Delete a checkpoint (experimental)." msgstr "" #. Detach checkpoint command: release the process to run independently, #. and remove it from the fork list. -#: linux-fork.c:743 +#: linux-fork.c:777 msgid "Detach from a checkpoint (experimental)." msgstr "" -#: linux-fork.c:751 +#: linux-fork.c:785 msgid "IDs of currently known checkpoints." msgstr "" -#: linux-nat.c:234 +#: linux-nat.c:199 #, possible-c-format msgid "Debugging of GNU/Linux lwp module is %s.\n" msgstr "" -#: linux-nat.c:244 -#, possible-c-format -msgid "Debugging of GNU/Linux async lwp module is %s.\n" -msgstr "" - -#: linux-nat.c:450 +#: linux-nat.c:405 #, possible-c-format msgid "linux_test_for_tracefork: waitpid: unexpected result %d." msgstr "" -#: linux-nat.c:452 +#: linux-nat.c:407 #, possible-c-format msgid "linux_test_for_tracefork: waitpid: unexpected status %d." msgstr "" -#: linux-nat.c:461 linux-nat.c:513 +#: linux-nat.c:416 linux-nat.c:468 msgid "linux_test_for_tracefork: failed to kill child" msgstr "" -#: linux-nat.c:468 +#: linux-nat.c:423 msgid "linux_test_for_tracefork: failed to wait for killed child" msgstr "" -#: linux-nat.c:471 +#: linux-nat.c:426 #, possible-c-format msgid "" "linux_test_for_tracefork: unexpected wait status 0x%x from killed child" msgstr "" -#: linux-nat.c:485 +#: linux-nat.c:440 msgid "linux_test_for_tracefork: failed to resume child" msgstr "" -#: linux-nat.c:502 +#: linux-nat.c:457 msgid "linux_test_for_tracefork: failed to kill second child" msgstr "" -#: linux-nat.c:508 +#: linux-nat.c:463 #, possible-c-format msgid "" "linux_test_for_tracefork: unexpected result from waitpid (%d, status 0x%x)" @@ -12029,24 +12522,24 @@ #. the parent stays blocked. If we're telling the parent to run #. in the foreground, the user will not be able to ctrl-c to get #. back the terminal, effectively hanging the debug session. -#: linux-nat.c:660 +#: linux-nat.c:613 msgid "" "Can not resume the parent process over vfork in the foreground while\n" "holding the child stopped. Try \"set detach-on-fork\" or \"set schedule-" "multiple\".\n" msgstr "" -#: linux-nat.c:859 +#: linux-nat.c:810 #, possible-c-format msgid "Attaching after process %d vfork to child process %d.\n" msgstr "" -#: linux-nat.c:864 +#: linux-nat.c:815 #, possible-c-format msgid "Attaching after process %d fork to child process %d.\n" msgstr "" -#: linux-nat.c:1412 +#: linux-nat.c:1336 #, possible-c-format msgid "%s is a cloned process" msgstr "" @@ -12056,322 +12549,344 @@ #. creation is interrupted; as of Linux kernel 2.6.19, a #. bug may place threads in the thread list and then fail #. to create them. -#: linux-nat.c:1474 +#: linux-nat.c:1439 #, possible-c-format msgid "Can't attach %s: %s" msgstr "" -#: linux-nat.c:1550 +#: linux-nat.c:1519 #, possible-c-format msgid "Error disabling address space randomization: %s" msgstr "" -#: linux-nat.c:1566 +#: linux-nat.c:1535 #, possible-c-format msgid "Error restoring address space randomization: %s" msgstr "" -#: linux-nat.c:1603 +#: linux-nat.c:1572 msgid "Unable to attach: program exited normally." msgstr "" -#: linux-nat.c:1605 +#: linux-nat.c:1574 #, possible-c-format msgid "Unable to attach: program exited with code %d." msgstr "" -#: linux-nat.c:1616 +#: linux-nat.c:1585 #, possible-c-format msgid "Unable to attach: program terminated with signal %s, %s." msgstr "" -#: linux-nat.c:1623 +#: linux-nat.c:1592 #, possible-c-format msgid "unexpected status %d for PID %ld" msgstr "" -#: linux-nat.c:1760 +#: linux-nat.c:1729 #, possible-c-format msgid "Can't detach %s: %s" msgstr "" -#: linux-nat.c:2192 +#: linux-nat.c:2175 msgid "waiting for new child" msgstr "" -#: linux-nat.c:2195 +#: linux-nat.c:2178 #, possible-c-format msgid "wait returned unexpected PID %d" msgstr "" -#: linux-nat.c:2198 +#: linux-nat.c:2181 #, possible-c-format msgid "wait returned unexpected status 0x%x" msgstr "" -#: linux-nat.c:2371 +#: linux-nat.c:2383 #, possible-c-format msgid "unknown ptrace event %d" msgstr "" -#: linux-nat.c:4178 +#: linux-nat.c:2400 linux-nat.c:4827 linux-nat.c:4907 linux-nat.c:4921 +#: linux-nat.c:5019 +#, possible-c-format +msgid "unable to open /proc file '%s'" +msgstr "" + +#: linux-nat.c:4393 #, possible-c-format msgid "Could not open %s." msgstr "" -#: linux-nat.c:4605 procfs.c:5432 +#: linux-nat.c:4803 +#, possible-c-format +msgid "Too many parameters: %s" +msgstr "" + +#: linux-nat.c:4806 procfs.c:5435 msgid "No current process: you must name one." msgstr "" -#: linux-nat.c:4609 +#: linux-nat.c:4810 #, possible-c-format msgid "No /proc directory: '%s'" msgstr "" -#: linux-nat.c:4611 +#: linux-nat.c:4812 #, possible-c-format msgid "process %ld\n" msgstr "" -#: linux-nat.c:4622 +#: linux-nat.c:4823 #, possible-c-format msgid "unable to read '%s'" msgstr "" -#: linux-nat.c:4626 linux-nat.c:4706 linux-nat.c:4720 linux-nat.c:4818 -#, possible-c-format -msgid "unable to open /proc file '%s'" -msgstr "" - -#: linux-nat.c:4635 linux-nat.c:4644 +#: linux-nat.c:4836 linux-nat.c:4845 #, possible-c-format msgid "unable to read link '%s'" msgstr "" #. No output for summary mode. -#: linux-nat.c:4656 procfs.c:5367 +#: linux-nat.c:4857 procfs.c:5370 msgid "" "Mapped address spaces:\n" "\n" msgstr "" -#: linux-nat.c:4733 +#: linux-nat.c:4934 #, possible-c-format msgid "Process: %d\n" msgstr "" -#: linux-nat.c:4735 +#: linux-nat.c:4936 #, possible-c-format msgid "Exec file: %s\n" msgstr "" -#: linux-nat.c:4737 +#: linux-nat.c:4938 #, possible-c-format msgid "State: %c\n" msgstr "" -#: linux-nat.c:4739 +#: linux-nat.c:4940 #, possible-c-format msgid "Parent process: %d\n" msgstr "" -#: linux-nat.c:4741 +#: linux-nat.c:4942 #, possible-c-format msgid "Process group: %d\n" msgstr "" -#: linux-nat.c:4743 +#: linux-nat.c:4944 #, possible-c-format msgid "Session id: %d\n" msgstr "" -#: linux-nat.c:4745 +#: linux-nat.c:4946 #, possible-c-format msgid "TTY: %d\n" msgstr "" -#: linux-nat.c:4747 +#: linux-nat.c:4948 #, possible-c-format msgid "TTY owner process group: %d\n" msgstr "" -#: linux-nat.c:4749 +#: linux-nat.c:4950 #, possible-c-format msgid "Flags: 0x%lx\n" msgstr "" -#: linux-nat.c:4751 +#: linux-nat.c:4952 #, possible-c-format msgid "Minor faults (no memory page): %lu\n" msgstr "" -#: linux-nat.c:4754 +#: linux-nat.c:4955 #, possible-c-format msgid "Minor faults, children: %lu\n" msgstr "" -#: linux-nat.c:4757 +#: linux-nat.c:4958 #, possible-c-format msgid "Major faults (memory page faults): %lu\n" msgstr "" -#: linux-nat.c:4760 +#: linux-nat.c:4961 #, possible-c-format msgid "Major faults, children: %lu\n" msgstr "" -#: linux-nat.c:4763 +#: linux-nat.c:4964 #, possible-c-format msgid "utime: %ld\n" msgstr "" -#: linux-nat.c:4765 +#: linux-nat.c:4966 #, possible-c-format msgid "stime: %ld\n" msgstr "" -#: linux-nat.c:4767 +#: linux-nat.c:4968 #, possible-c-format msgid "utime, children: %ld\n" msgstr "" -#: linux-nat.c:4769 +#: linux-nat.c:4970 #, possible-c-format msgid "stime, children: %ld\n" msgstr "" -#: linux-nat.c:4771 +#: linux-nat.c:4972 #, possible-c-format msgid "jiffies remaining in current time slice: %ld\n" msgstr "" -#: linux-nat.c:4774 +#: linux-nat.c:4975 #, possible-c-format msgid "'nice' value: %ld\n" msgstr "" -#: linux-nat.c:4776 +#: linux-nat.c:4977 #, possible-c-format msgid "jiffies until next timeout: %lu\n" msgstr "" -#: linux-nat.c:4779 +#: linux-nat.c:4980 #, possible-c-format msgid "jiffies until next SIGALRM: %lu\n" msgstr "" -#: linux-nat.c:4782 +#: linux-nat.c:4983 #, possible-c-format msgid "start time (jiffies since system boot): %ld\n" msgstr "" -#: linux-nat.c:4785 +#: linux-nat.c:4986 #, possible-c-format msgid "Virtual memory size: %lu\n" msgstr "" -#: linux-nat.c:4788 +#: linux-nat.c:4989 #, possible-c-format msgid "Resident set size: %lu\n" msgstr "" -#: linux-nat.c:4791 +#: linux-nat.c:4992 #, possible-c-format msgid "rlim: %lu\n" msgstr "" -#: linux-nat.c:4793 +#: linux-nat.c:4994 #, possible-c-format msgid "Start of text: 0x%lx\n" msgstr "" -#: linux-nat.c:4795 +#: linux-nat.c:4996 #, possible-c-format msgid "End of text: 0x%lx\n" msgstr "" -#: linux-nat.c:4797 +#: linux-nat.c:4998 #, possible-c-format msgid "Start of stack: 0x%lx\n" msgstr "" #. FIXME arch? -#: linux-nat.c:4801 +#: linux-nat.c:5002 #, possible-c-format msgid "Kernel stack pointer: 0x%lx\n" msgstr "" #. FIXME arch? -#: linux-nat.c:4803 +#: linux-nat.c:5004 #, possible-c-format msgid "Kernel instr pointer: 0x%lx\n" msgstr "" -#: linux-nat.c:4805 +#: linux-nat.c:5006 #, possible-c-format msgid "Pending signals bitmap: 0x%lx\n" msgstr "" -#: linux-nat.c:4807 +#: linux-nat.c:5008 #, possible-c-format msgid "Blocked signals bitmap: 0x%lx\n" msgstr "" -#: linux-nat.c:4809 +#: linux-nat.c:5010 #, possible-c-format msgid "Ignored signals bitmap: 0x%lx\n" msgstr "" -#: linux-nat.c:4811 +#: linux-nat.c:5012 #, possible-c-format msgid "Catched signals bitmap: 0x%lx\n" msgstr "" #. FIXME arch? -#: linux-nat.c:4813 +#: linux-nat.c:5014 #, possible-c-format msgid "wchan (system call): 0x%lx\n" msgstr "" -#: linux-nat.c:4972 linux-nat.c:4985 +#: linux-nat.c:5237 linux-nat.c:5250 #, possible-c-format msgid "Could not parse signal set: %s" msgstr "" -#: linux-nat.c:5019 +#: linux-nat.c:5284 #, possible-c-format msgid "Could not open %s" msgstr "" -#: linux-nat.c:5804 +#: linux-nat.c:5883 msgid "" "Show /proc process information about any running process.\n" -"Specify any process id, or use the program being debugged by default.\n" -"Specify any of the following keywords for detailed info:\n" -" mappings -- list of mapped memory regions.\n" -" stat -- list a bunch of random process info.\n" -" status -- list a different bunch of random process info.\n" -" all -- list all available /proc info." +"Specify any process id, or use the program being debugged by default." msgstr "" -#: linux-nat.c:5814 -msgid "Set debugging of GNU/Linux lwp module." +#. allow-unknown +#: linux-nat.c:5889 +msgid "List of mapped memory regions." msgstr "" -#: linux-nat.c:5815 -msgid "Show debugging of GNU/Linux lwp module." +#: linux-nat.c:5893 +msgid "List process info from /proc/PID/stat." msgstr "" -#: linux-nat.c:5816 linux-nat.c:5825 -msgid "Enables printf debugging output." +#: linux-nat.c:5897 +msgid "List process info from /proc/PID/status." +msgstr "" + +#: linux-nat.c:5901 +msgid "List current working directory of the process." +msgstr "" + +#: linux-nat.c:5905 +msgid "List command line arguments of the process." +msgstr "" + +#: linux-nat.c:5909 +msgid "List absolute filename for executable of the process." +msgstr "" + +#: linux-nat.c:5913 +msgid "List all available /proc info." +msgstr "" + +#: linux-nat.c:5918 +msgid "Set debugging of GNU/Linux lwp module." msgstr "" -#: linux-nat.c:5823 -msgid "Set debugging of GNU/Linux async lwp module." +#: linux-nat.c:5919 +msgid "Show debugging of GNU/Linux lwp module." msgstr "" -#: linux-nat.c:5824 -msgid "Show debugging of GNU/Linux async lwp module." +#: linux-nat.c:5920 +msgid "Enables printf debugging output." msgstr "" #: linux-record.c:245 @@ -12430,179 +12945,176 @@ msgid "Process record and replay target doesn't support syscall number %d\n" msgstr "" -#: linux-thread-db.c:86 +#: linux-thread-db.c:97 #, possible-c-format msgid "libthread-db debugging is %s.\n" msgstr "" -#: linux-thread-db.c:388 +#: linux-thread-db.c:398 #, possible-c-format msgid "thread_get_info_callback: cannot get thread info: %s" msgstr "" -#: linux-thread-db.c:434 +#: linux-thread-db.c:447 #, possible-c-format msgid "Cannot find user-level thread for LWP %ld: %s" msgstr "" -#: linux-thread-db.c:493 linux-thread-db.c:1204 +#: linux-thread-db.c:506 linux-thread-db.c:1334 #, possible-c-format msgid "Cannot get thread info: %s" msgstr "" -#: linux-thread-db.c:506 +#: linux-thread-db.c:519 #, possible-c-format msgid "Symbol \"%s\" not found in libthread_db: %s" msgstr "" -#: linux-thread-db.c:580 +#: linux-thread-db.c:593 #, possible-c-format msgid "Unable to set global thread event mask: %s" msgstr "" -#: linux-thread-db.c:594 +#: linux-thread-db.c:607 #, possible-c-format msgid "Unable to get location for thread creation breakpoint: %s" msgstr "" -#: linux-thread-db.c:603 +#: linux-thread-db.c:616 #, possible-c-format msgid "Unable to get location for thread death breakpoint: %s" msgstr "" -#: linux-thread-db.c:663 +#: linux-thread-db.c:676 #, possible-c-format msgid "Cannot initialize libthread_db: %s" msgstr "" -#: linux-thread-db.c:680 +#: linux-thread-db.c:693 #, possible-c-format msgid "td_ta_new failed: %s\n" msgstr "" -#: linux-thread-db.c:694 +#: linux-thread-db.c:707 #, possible-c-format msgid "td_ta_new failed: %s" msgstr "" -#: linux-thread-db.c:728 sol-thread.c:675 +#: linux-thread-db.c:741 sol-thread.c:674 msgid "[Thread debugging using libthread_db enabled]\n" msgstr "" -#: linux-thread-db.c:738 +#: linux-thread-db.c:751 #, possible-c-format msgid "Using host libthread_db library \"%s\".\n" msgstr "" -#: linux-thread-db.c:770 +#: linux-thread-db.c:783 #, possible-c-format msgid "Trying host libthread_db library: %s.\n" msgstr "" -#: linux-thread-db.c:776 +#: linux-thread-db.c:789 #, possible-c-format msgid "dlopen failed: %s.\n" msgstr "" -#: linux-thread-db.c:790 +#: linux-thread-db.c:803 #, possible-c-format msgid "Host %s resolved to: %s.\n" msgstr "" -#: linux-thread-db.c:830 linux-thread-db.c:846 -#, possible-c-format -msgid "libthread_db_search_path component too long, ignored: %s." -msgstr "" - -#: linux-thread-db.c:907 +#: linux-thread-db.c:831 #, possible-c-format msgid "" "Expected absolute pathname for libpthread in the inferior, but got %s." msgstr "" -#: linux-thread-db.c:912 +#: linux-thread-db.c:966 #, possible-c-format -msgid "Unexpected: path to libpthread in the inferior is too long: %s" +msgid "thread_db_load_search returning %d\n" msgstr "" -#: linux-thread-db.c:921 +#: linux-thread-db.c:1013 msgid "" "Unable to find libthread_db matching inferior's thread library, thread " "debugging will not be available." msgstr "" -#: linux-thread-db.c:1080 +#: linux-thread-db.c:1210 #, possible-c-format msgid "Cannot enable thread event reporting for %s: %s" msgstr "" -#: linux-thread-db.c:1198 +#: linux-thread-db.c:1328 #, possible-c-format msgid "Cannot get thread event message: %s" msgstr "" -#: linux-thread-db.c:1220 +#: linux-thread-db.c:1350 msgid "Spurious thread death event." msgstr "" -#: linux-thread-db.c:1227 +#: linux-thread-db.c:1357 msgid "Spurious thread event." msgstr "" -#: linux-thread-db.c:1332 +#: linux-thread-db.c:1462 #, possible-c-format msgid "find_new_threads_callback: cannot get thread info: %s" msgstr "" -#: linux-thread-db.c:1352 +#: linux-thread-db.c:1484 #, possible-c-format msgid "Cannot enable thread event reporting for LWP %d: %s" msgstr "" -#: linux-thread-db.c:1420 +#: linux-thread-db.c:1553 #, possible-c-format msgid "Found %d new threads in iteration %d.\n" msgstr "" -#: linux-thread-db.c:1476 +#: linux-thread-db.c:1595 #, possible-c-format msgid "Cannot find new threads: %s" msgstr "" -#: linux-thread-db.c:1580 +#: linux-thread-db.c:1711 msgid "No TLS library support" msgstr "" -#: linux-thread-db.c:1600 +#: linux-thread-db.c:1731 msgid "TLS not allocated yet" msgstr "" -#: linux-thread-db.c:1621 +#: linux-thread-db.c:1752 msgid "TLS not supported on this target" msgstr "" -#: linux-thread-db.c:1715 +#: linux-thread-db.c:1846 msgid "Set search path for libthread_db." msgstr "" -#: linux-thread-db.c:1716 +#: linux-thread-db.c:1847 msgid "Show the current search path or libthread_db." msgstr "" -#: linux-thread-db.c:1717 +#: linux-thread-db.c:1848 msgid "" -"This path is used to search for libthread_db to be loaded into gdb itself." +"This path is used to search for libthread_db to be loaded into gdb itself.\n" +"Its value is a colon (':') separate list of directories to search.\n" +"Setting the search path to an empty list resets it to its default value." msgstr "" -#: linux-thread-db.c:1725 +#: linux-thread-db.c:1858 msgid "Set libthread-db debugging." msgstr "" -#: linux-thread-db.c:1726 +#: linux-thread-db.c:1859 msgid "Show libthread-db debugging." msgstr "" -#: linux-thread-db.c:1727 +#: linux-thread-db.c:1860 msgid "When non-zero, libthread-db debugging is enabled." msgstr "" @@ -12664,38 +13176,38 @@ msgid "unbounded structure missing _m2_contents field" msgstr "" -#: m2-typeprint.c:118 +#: m2-typeprint.c:117 msgid "method" msgstr "" #. i18n: Do not translate the "struct" part! -#: m2-typeprint.c:138 +#: m2-typeprint.c:137 msgid "undef" msgstr "" -#: m2-typeprint.c:142 +#: m2-typeprint.c:141 msgid "error" msgstr "" -#: m2-typeprint.c:264 +#: m2-typeprint.c:263 msgid "is unknown" msgstr "" -#: m2-typeprint.c:417 +#: m2-typeprint.c:416 msgid "long_set failed to find discrete bounds for its subtype" msgstr "" -#: m2-typeprint.c:420 m2-valprint.c:86 +#: m2-typeprint.c:419 m2-valprint.c:86 msgid "expecting long_set" msgstr "" #. i18n: Do not translate the "SET OF" part! -#: m2-typeprint.c:472 +#: m2-typeprint.c:471 msgid "SET OF " msgstr "" #. i18n: Do not translate "CASE" and "OF". -#: m2-typeprint.c:559 +#: m2-typeprint.c:558 msgid "CASE OF\n" msgstr "" @@ -12716,26 +13228,26 @@ msgid "Invalid m2 type code %d in symbol table." msgstr "" -#: m32c-tdep.c:2251 +#: m32c-tdep.c:2250 msgid "" "The return value is stored in memory at 'mem0', but GDB cannot find\n" "its address." msgstr "" -#: m32c-tdep.c:2283 +#: m32c-tdep.c:2282 msgid "" "The return value is stored in memory at 'mem0', but GDB cannot find\n" " its address." msgstr "" -#: m32c-tdep.c:2464 +#: m32c-tdep.c:2463 #, possible-c-format msgid "" "Cannot convert code address %s to function pointer:\n" "couldn't find a symbol at that address, to find trampoline." msgstr "" -#: m32c-tdep.c:2498 +#: m32c-tdep.c:2497 #, possible-c-format msgid "" "Cannot convert code address %s to function pointer:\n" @@ -12809,198 +13321,253 @@ msgid "Determine the IP address for M32R-EVA target board." msgstr "" -#: m32r-rom.c:618 -msgid "Set IP address for download server (GDB's host computer)." +#: m32r-rom.c:618 +msgid "Set IP address for download server (GDB's host computer)." +msgstr "" + +#: m32r-rom.c:619 +msgid "Show IP address for download server (GDB's host computer)." +msgstr "" + +#: m32r-rom.c:620 +msgid "Determine the IP address for download server (GDB's host computer)." +msgstr "" + +#: m32r-rom.c:628 +msgid "Upload the srec file via the monitor's Ethernet upload capability." +msgstr "" + +#: m32r-rom.c:631 +msgid "test upload command." +msgstr "" + +#: m68hc11-tdep.c:255 +msgid "" +"No frame soft register found in the symbol table.\n" +"Stack backtrace will not work." +msgstr "" + +#: m68hc11-tdep.c:1283 +msgid "return of value > 4 is not supported." +msgstr "" + +#: m68hc11-tdep.c:1321 sh64-tdep.c:1277 sh-tdep.c:1322 +msgid "bad size for return value" +msgstr "" + +#: m68k-tdep.c:179 +#, possible-c-format +msgid "m68k_register_name: illegal register number %d" +msgstr "" + +#: m68k-tdep.c:1029 +msgid "m68k_get_longjmp_target: not implemented" +msgstr "" + +#: machoread.c:221 +msgid "Unexpected empty N_SO stab" +msgstr "" + +#: machoread.c:240 +#, possible-c-format +msgid "%s: Unexpected debug stab outside SO markers" +msgstr "" + +#. Unexpected empty N_SO. +#: machoread.c:257 +msgid "Empty SO section" msgstr "" -#: m32r-rom.c:619 -msgid "Show IP address for download server (GDB's host computer)." +#: machoread.c:268 +msgid "Three SO in a raw" msgstr "" -#: m32r-rom.c:620 -msgid "Determine the IP address for download server (GDB's host computer)." +#: machoread.c:277 +#, possible-c-format +msgid "stabs debugging not supported for %s" msgstr "" -#: m32r-rom.c:628 -msgid "Upload the srec file via the monitor's Ethernet upload capability." +#: machoread.c:290 +msgid "Unexpected stab after SO" msgstr "" -#: m32r-rom.c:631 -msgid "test upload command." +#: machoread.c:307 +msgid "Missing nul SO" msgstr "" -#: m68hc11-tdep.c:256 -msgid "" -"No frame soft register found in the symbol table.\n" -"Stack backtrace will not work." +#: machoread.c:337 +msgid "unhandled stab for dwarf OSO file" msgstr "" -#: m68hc11-tdep.c:1284 -msgid "return of value > 4 is not supported." +#: machoread.c:344 +msgid "non-debugging symbol within SO" msgstr "" -#: m68hc11-tdep.c:1322 sh-tdep.c:1324 sh64-tdep.c:1279 -msgid "bad size for return value" +#: machoread.c:350 +msgid "missing nul SO" msgstr "" -#: m68k-tdep.c:181 +#: machoread.c:438 #, possible-c-format -msgid "m68k_register_name: illegal register number %d" +msgid "can't find symbol '%s' in minsymtab" msgstr "" -#: m68k-tdep.c:1031 -msgid "m68k_get_longjmp_target: not implemented" +#: machoread.c:463 +#, possible-c-format +msgid "Loading debugging symbols from oso: %s\n" msgstr "" -#: machoread.c:322 +#: machoread.c:467 symfile.c:1690 symfile.c:1740 #, possible-c-format -msgid "Loading symbols from oso: %s\n" +msgid "`%s': can't read symbols: %s." msgstr "" -#: machoread.c:326 symfile.c:1691 symfile.c:1741 +#: machoread.c:475 #, possible-c-format -msgid "`%s': can't read symbols: %s." +msgid "`%s': file time stamp mismatch." msgstr "" -#: machoread.c:359 +#: machoread.c:484 #, possible-c-format -msgid "resolve sect %s with %s\n" +msgid "`%s': can't create hash table" msgstr "" -#: machoread.c:365 machoread.c:763 +#: machoread.c:533 #, possible-c-format -msgid "can't find symbol '%s' in minsymtab" +msgid "Duplicated symbol %s in symbol table" msgstr "" -#: machoread.c:376 +#: machoread.c:540 #, possible-c-format -msgid "can't find section '%s' in OSO file %s" +msgid "Adding symbol %s (addr: %s)\n" msgstr "" -#: machoread.c:383 +#: machoread.c:614 #, possible-c-format -msgid " %s: %s\n" +msgid "resolve sect %s with %s (set to %s)\n" msgstr "" -#: machoread.c:457 +#: machoread.c:692 #, possible-c-format msgid "Could not open OSO archive file \"%s\"" msgstr "" -#: machoread.c:464 +#: machoread.c:699 #, possible-c-format msgid "OSO archive file \"%s\" not an archive." msgstr "" -#: machoread.c:474 +#: machoread.c:709 #, possible-c-format msgid "Could not read archive members out of OSO archive \"%s\"" msgstr "" -#: machoread.c:518 +#: machoread.c:753 #, possible-c-format msgid "Could not find specified archive member for OSO name \"%s\"" msgstr "" -#: machoread.c:529 symfile.c:1683 symfile.c:1729 +#: machoread.c:764 symfile.c:1682 symfile.c:1728 #, possible-c-format msgid "`%s': can't open to read symbols: %s." msgstr "" -#: machoread.c:578 machoread.c:601 +#: machoread.c:808 machoread.c:831 #, possible-c-format msgid "can't find UUID in %s" msgstr "" -#: machoread.c:585 +#: machoread.c:815 #, possible-c-format msgid "can't open dsym file %s" msgstr "" -#: machoread.c:593 +#: machoread.c:823 #, possible-c-format msgid "bad dsym file format: %s" msgstr "" -#: machoread.c:609 +#: machoread.c:839 #, possible-c-format msgid "dsym file UUID doesn't match the one in %s" msgstr "" -#: machoread.c:675 +#: machoread.c:907 msgid "dsym file found\n" msgstr "" -#: machoread.c:731 +#: machoread.c:955 #, possible-c-format msgid "Relocate section '%s' of %s\n" msgstr "" -#: machoread.c:862 +#: machoread.c:1045 msgid "Set if printing Mach-O symbols processing." msgstr "" -#: machoread.c:863 +#: machoread.c:1046 msgid "Show if printing Mach-O symbols processing." msgstr "" -#: macrocmd.c:63 +#: macrocmd.c:71 msgid "" "You must follow the `macro expand' command with the expression you\n" "want to expand." msgstr "" -#: macrocmd.c:99 +#: macrocmd.c:105 msgid "" "You must follow the `macro expand-once' command with the expression\n" "you want to expand." msgstr "" -#: macrocmd.c:146 +#: macrocmd.c:227 +#, possible-c-format msgid "" -"You must follow the `info macro' command with the name of the macro\n" -"whose definition you want to see." +"Unrecognized option '%s' to info macro command. Try \"help info macro\"." msgstr "" -#: macrocmd.c:152 -msgid "GDB has no preprocessor macro information for that code." +#: macrocmd.c:237 +msgid "" +"You must follow the `info macro' command with the name of the macro\n" +"whose definition you want to see." msgstr "" -#: macrocmd.c:269 +#: macrocmd.c:370 msgid "usage: macro define NAME[(ARGUMENT-LIST)] [REPLACEMENT-LIST]" msgstr "" -#: macrocmd.c:279 macrocmd.c:354 +#: macrocmd.c:380 macrocmd.c:455 msgid "Invalid macro name." msgstr "" -#: macrocmd.c:307 +#: macrocmd.c:408 msgid "Macro is missing an argument." msgstr "" -#: macrocmd.c:313 +#: macrocmd.c:414 msgid "Two macro arguments with identical names." msgstr "" -#: macrocmd.c:323 +#: macrocmd.c:424 msgid "',' or ')' expected at end of macro arguments." msgstr "" -#: macrocmd.c:349 +#: macrocmd.c:450 msgid "usage: macro undef NAME" msgstr "" -#: macrocmd.c:397 +#: macrocmd.c:498 msgid "Prefix for commands dealing with C preprocessor macros." msgstr "" -#: macrocmd.c:400 +#: macrocmd.c:501 msgid "" "Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n" "Show the expanded expression." msgstr "" -#: macrocmd.c:405 +#: macrocmd.c:506 msgid "" "Expand C/C++ preprocessor macro invocations appearing directly in " "EXPRESSION.\n" @@ -13015,11 +13582,24 @@ "expression work together to yield a pre-processed expression." msgstr "" -#: macrocmd.c:420 -msgid "Show the definition of MACRO, and its source location." +#: macrocmd.c:521 +msgid "" +"Show the definition of MACRO, and it's source location.\n" +"Usage: info macro [-a|-all] [--] MACRO\n" +"Options: \n" +" -a, --all Output all definitions of MACRO in the current compilation " +"unit.\n" +" -- Specify the end of arguments and the beginning of the MACRO." +msgstr "" + +#: macrocmd.c:531 +msgid "" +"Show the definitions of all macros at LINESPEC, or the current source " +"location.\n" +"Usage: info macros [LINESPEC]" msgstr "" -#: macrocmd.c:423 +#: macrocmd.c:536 msgid "" "Define a new C/C++ preprocessor macro.\n" "The GDB command `macro define DEFINITION' is equivalent to placing a\n" @@ -13030,152 +13610,152 @@ " (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))" msgstr "" -#: macrocmd.c:433 +#: macrocmd.c:546 msgid "" "Remove the definition of the C/C++ preprocessor macro with the given name." msgstr "" -#: macrocmd.c:438 +#: macrocmd.c:551 msgid "List all the macros defined using the `macro define' command." msgstr "" -#: macroexp.c:236 +#: macroexp.c:235 msgid "Unterminated comment in macro expansion." msgstr "" -#: macroexp.c:348 +#: macroexp.c:347 msgid "A character constant must contain at least one character." msgstr "" -#: macroexp.c:405 +#: macroexp.c:404 msgid "Newline characters may not appear in string constants." msgstr "" -#: macroexp.c:636 +#: macroexp.c:635 msgid "unable to avoid splicing tokens during macro expansion" msgstr "" -#: macroexp.c:812 +#: macroexp.c:811 #, possible-c-format msgid "Malformed argument list for macro `%s'." msgstr "" -#: macroexp.c:983 +#: macroexp.c:982 msgid "Stringification operator requires an argument." msgstr "" -#: macroexp.c:988 +#: macroexp.c:987 msgid "Argument to stringification operator must name a macro parameter." msgstr "" -#: macroexp.c:1002 +#: macroexp.c:1001 msgid "Stray splicing operator" msgstr "" -#: macroexp.c:1034 +#: macroexp.c:1033 msgid "Splicing operator at end of macro" msgstr "" -#: macroexp.c:1243 +#: macroexp.c:1242 #, possible-c-format msgid "Wrong number of arguments to macro `%s' (expected %d, got %d)." msgstr "" -#: macroexp.c:1277 +#: macroexp.c:1276 msgid "bad macro definition kind" msgstr "" -#: macroexp.c:1409 +#: macroexp.c:1408 msgid "Expand-once not implemented yet." msgstr "" -#: macroscope.c:79 +#: macroscope.c:78 #, possible-c-format msgid "" "symtab found for `%s', but that file\n" "is not covered in the compilation unit's macro information" msgstr "" -#: macrotab.c:474 +#: macrotab.c:473 #, possible-c-format msgid "both `%s' and `%s' allegedly #included at %s:%d" msgstr "" -#: macrotab.c:734 +#: macrotab.c:733 #, possible-c-format msgid "macro `%s' redefined at %s:%d; original definition at %s:%d" msgstr "" -#: macrotab.c:837 +#: macrotab.c:836 #, possible-c-format msgid "macro '%s' is #undefined twice, at %s:%d and %s:%d" msgstr "" -#: macrotab.c:857 +#: macrotab.c:856 #, possible-c-format msgid "no definition for macro `%s' in scope to #undef at %s:%d" msgstr "" -#: main.c:338 +#: main.c:345 #, possible-c-format msgid "%s: warning: error finding working directory: %s\n" msgstr "" -#: main.c:498 +#: main.c:504 #, possible-c-format msgid "%s: TUI mode is not supported\n" msgstr "" -#: main.c:573 +#: main.c:579 #, possible-c-format msgid "%s: unable to load tclcommand file \"%s\"" msgstr "" -#: main.c:621 +#: main.c:627 #, possible-c-format msgid "warning: could not set baud rate to `%s'.\n" msgstr "" -#: main.c:638 +#: main.c:644 #, possible-c-format msgid "warning: could not set timeout limit to `%s'.\n" msgstr "" -#: main.c:647 +#: main.c:653 #, possible-c-format msgid "Use `%s --help' for a complete list of options.\n" msgstr "" -#: main.c:678 +#: main.c:684 #, possible-c-format msgid "%s: `--args' specified but no program specified\n" msgstr "" -#: main.c:715 +#: main.c:721 #, possible-c-format msgid "Excess command line arguments ignored. (%s%s)\n" msgstr "" -#: main.c:771 +#: main.c:777 #, possible-c-format msgid "Interpreter `%s' unrecognized" msgstr "" -#: main.c:802 +#: main.c:808 msgid "" "\n" "warning: " msgstr "" -#: main.c:858 +#: main.c:864 msgid "Can't attach to process and specify a core file at the same time." msgstr "" -#: main.c:891 +#: main.c:897 msgid "warning: " msgstr "" -#: main.c:965 +#: main.c:971 msgid "" "This is the GNU debugger. Usage:\n" "\n" @@ -13186,12 +13766,12 @@ "\n" msgstr "" -#: main.c:971 +#: main.c:977 msgid "" " --args Arguments after executable-file are passed to inferior\n" msgstr "" -#: main.c:974 +#: main.c:980 msgid "" " -b BAUDRATE Set serial port baud rate used for remote debugging.\n" " --batch Exit after processing options.\n" @@ -13208,7 +13788,7 @@ " --pid=PID Attach to running process PID.\n" msgstr "" -#: main.c:989 +#: main.c:995 msgid "" " --dbx DBX compatibility mode.\n" " --directory=DIR Search for source files in DIR.\n" @@ -13218,27 +13798,27 @@ " --help Print this message.\n" msgstr "" -#: main.c:997 +#: main.c:1003 msgid "" " --interpreter=INTERP\n" " Select a specific interpreter / user interface\n" msgstr "" -#: main.c:1001 +#: main.c:1007 msgid "" " -l TIMEOUT Set timeout in seconds for remote debugging.\n" " --nw\t\t Do not use a window interface.\n" " --nx Do not read " msgstr "" -#: main.c:1006 +#: main.c:1012 msgid "" " file.\n" " --quiet Do not print version number on startup.\n" " --readnow Fully read symbol files on first access.\n" msgstr "" -#: main.c:1010 +#: main.c:1016 msgid "" " --se=FILE Use FILE as symbol file and executable file.\n" " --symbols=SYMFILE Read symbols from SYMFILE.\n" @@ -13246,11 +13826,11 @@ "debugged.\n" msgstr "" -#: main.c:1016 +#: main.c:1022 msgid " --tui Use a terminal user interface.\n" msgstr "" -#: main.c:1020 +#: main.c:1026 msgid "" " --version Print version information and then exit.\n" " -w Use a window interface.\n" @@ -13258,35 +13838,35 @@ " --xdb XDB compatibility mode.\n" msgstr "" -#: main.c:1026 +#: main.c:1032 msgid "" "\n" "At startup, GDB reads the following init files and executes their commands:\n" msgstr "" -#: main.c:1030 +#: main.c:1036 #, possible-c-format msgid " * system-wide init file: %s\n" msgstr "" -#: main.c:1034 +#: main.c:1040 #, possible-c-format msgid " * user-specific init file: %s\n" msgstr "" -#: main.c:1038 +#: main.c:1044 #, possible-c-format msgid " * local init file: ./%s\n" msgstr "" -#: main.c:1041 +#: main.c:1047 msgid "" "\n" "For more information, type \"help\" from within GDB, or consult the\n" "GDB manual (available as on-line info or a printed manual).\n" msgstr "" -#: main.c:1046 +#: main.c:1052 #, possible-c-format msgid "Report bugs to \"%s\".\n" msgstr "" @@ -13296,126 +13876,126 @@ msgid "Watchdog timer is %s.\n" msgstr "" -#: maint.c:94 +#: maint.c:82 msgid "" "\"maintenance\" must be followed by the name of a maintenance command.\n" msgstr "" -#: maint.c:103 +#: maint.c:91 msgid "Should GDB dump core? " msgstr "" -#: maint.c:154 +#: maint.c:142 msgid "\"maintenance demangle\" takes an argument to demangle.\n" msgstr "" -#: maint.c:168 +#: maint.c:156 #, possible-c-format msgid "Can't demangle \"%s\"\n" msgstr "" -#: maint.c:177 +#: maint.c:165 msgid "\"maintenance time\" takes a numeric argument.\n" msgstr "" -#: maint.c:198 +#: maint.c:186 msgid "" "\"maintenance info\" must be followed by the name of an info command.\n" msgstr "" -#: maint.c:370 +#: maint.c:358 msgid "Exec file:\n" msgstr "" -#: maint.c:388 +#: maint.c:376 #, possible-c-format msgid " Object file: %s\n" msgstr "" -#: maint.c:402 +#: maint.c:390 msgid "Core file:\n" msgstr "" -#: maint.c:430 regcache.c:1281 +#: maint.c:418 regcache.c:1363 msgid "maintenance print architecture" msgstr "" -#: maint.c:444 +#: maint.c:432 msgid "" "\"maintenance print\" must be followed by the name of a print command.\n" msgstr "" -#: maint.c:464 +#: maint.c:452 msgid "requires argument (address or section + address)" msgstr "" #. End of command? -#: maint.c:474 +#: maint.c:462 msgid "Need to specify and
" msgstr "" -#: maint.c:486 +#: maint.c:474 #, possible-c-format msgid "Unknown section %s." msgstr "" -#: maint.c:515 +#: maint.c:503 #, possible-c-format msgid "%s + %s in section %s of %s\n" msgstr "" -#: maint.c:519 +#: maint.c:507 #, possible-c-format msgid "%s + %s in section %s\n" msgstr "" -#: maint.c:523 +#: maint.c:511 #, possible-c-format msgid "%s + %s\n" msgstr "" -#: maint.c:526 +#: maint.c:514 #, possible-c-format msgid "no symbol at %s:%s\n" msgstr "" -#: maint.c:529 +#: maint.c:517 #, possible-c-format msgid "no symbol at %s\n" msgstr "" -#: maint.c:544 +#: maint.c:532 msgid "" "\"maintenance deprecate\" takes an argument,\n" "the command you want to deprecate, and optionally the replacement command\n" "enclosed in quotes.\n" msgstr "" -#: maint.c:559 +#: maint.c:547 msgid "" "\"maintenance undeprecate\" takes an argument, \n" "the command you want to undeprecate.\n" msgstr "" -#: maint.c:591 +#: maint.c:579 #, possible-c-format msgid "Can't find command '%s' to deprecate.\n" msgstr "" -#: maint.c:658 +#: maint.c:646 msgid "\"maintenance set\" must be followed by the name of a set command.\n" msgstr "" -#: maint.c:676 +#: maint.c:664 #, possible-c-format msgid "Internal profiling is %s.\n" msgstr "" -#: maint.c:738 +#: maint.c:726 msgid "Profiling support is not available on this system." msgstr "" -#: maint.c:745 +#: maint.c:733 msgid "" "Commands for use by GDB maintainers.\n" "Includes commands to dump specific internal GDB structures in\n" @@ -13423,11 +14003,11 @@ "to test internal functions such as the C++/ObjC demangler, etc." msgstr "" -#: maint.c:755 +#: maint.c:743 msgid "Commands for showing internal info about the program being debugged." msgstr "" -#: maint.c:761 +#: maint.c:749 msgid "" "List the BFD sections of the exec and core files. \n" "Arguments may be any combination of:\n" @@ -13440,95 +14020,95 @@ "lists all sections from all object files, including shared libraries." msgstr "" -#: maint.c:774 +#: maint.c:762 msgid "Maintenance command for printing GDB internal state." msgstr "" -#: maint.c:778 +#: maint.c:766 msgid "" "Set GDB internal variables used by the GDB maintainer.\n" "Configure variables internal to GDB that aid in GDB's maintenance" msgstr "" -#: maint.c:785 +#: maint.c:773 msgid "" "Show GDB internal variables used by the GDB maintainer.\n" "Configure variables internal to GDB that aid in GDB's maintenance" msgstr "" -#: maint.c:793 +#: maint.c:781 msgid "" "Get fatal error; make debugger dump its core.\n" "GDB sets its handling of SIGQUIT back to SIG_DFL and then sends\n" "itself a SIGQUIT signal." msgstr "" -#: maint.c:801 +#: maint.c:789 msgid "" "Give GDB an internal error.\n" "Cause GDB to behave as if an internal error was detected." msgstr "" -#: maint.c:807 +#: maint.c:795 msgid "" "Give GDB an internal warning.\n" "Cause GDB to behave as if an internal warning was reported." msgstr "" -#: maint.c:812 +#: maint.c:800 msgid "" "Demangle a C++/ObjC mangled name.\n" "Call internal GDB demangler routine to demangle a C++ link name\n" "and prints the result." msgstr "" -#: maint.c:818 +#: maint.c:806 msgid "" "Set the display of time usage.\n" "If nonzero, will cause the execution time for each command to be\n" "displayed, following the command's output." msgstr "" -#: maint.c:824 +#: maint.c:812 msgid "" "Set the display of space usage.\n" "If nonzero, will cause the execution space for each command to be\n" "displayed, following the command's output." msgstr "" -#: maint.c:830 +#: maint.c:818 msgid "" "Print a type chain for a given symbol.\n" "For each node in a type chain, print the raw data for each member of\n" "the type structure, and the interpretation of the data." msgstr "" -#: maint.c:836 +#: maint.c:824 msgid "" "Print dump of current symbol definitions.\n" "Entries in the full symbol table are dumped to file OUTFILE.\n" "If a SOURCE file is specified, dump only that file's symbols." msgstr "" -#: maint.c:842 +#: maint.c:830 msgid "" "Print dump of current minimal symbol definitions.\n" "Entries in the minimal symbol table are dumped to file OUTFILE.\n" "If a SOURCE file is specified, dump only that file's minimal symbols." msgstr "" -#: maint.c:848 +#: maint.c:836 msgid "" "Print dump of current partial symbol definitions.\n" "Entries in the partial symbol table are dumped to file OUTFILE.\n" "If a SOURCE file is specified, dump only that file's partial symbols." msgstr "" -#: maint.c:855 +#: maint.c:843 msgid "Print dump of current object file definitions." msgstr "" -#: maint.c:858 +#: maint.c:846 msgid "" "List the full symbol tables for all object files.\n" "This does not include information about individual symbols, blocks, or\n" @@ -13536,32 +14116,32 @@ "With an argument REGEXP, list the symbol tables whose names that match that." msgstr "" -#: maint.c:865 +#: maint.c:853 msgid "" "List the partial symbol tables for all object files.\n" "This does not include information about individual partial symbols,\n" "just the symbol table structures themselves." msgstr "" -#: maint.c:872 +#: maint.c:860 msgid "Print statistics about internal gdb state." msgstr "" -#: maint.c:876 +#: maint.c:864 msgid "" "Print the internal architecture configuration.\n" "Takes an optional file parameter." msgstr "" -#: maint.c:882 +#: maint.c:870 msgid "Check consistency of psymtabs and symtabs." msgstr "" -#: maint.c:887 +#: maint.c:875 msgid "Translate a section name and address to a symbol." msgstr "" -#: maint.c:890 +#: maint.c:878 msgid "" "Deprecate a command. Note that this is just in here so the \n" "testsuite can check the command deprecator. You probably shouldn't use " @@ -13571,7 +14151,7 @@ "replacement is optional." msgstr "" -#: maint.c:897 +#: maint.c:885 msgid "" "Undeprecate a command. Note that this is just in here so the \n" "testsuite can check the command deprecator. You probably shouldn't use " @@ -13579,278 +14159,274 @@ "If you decide you want to use it: maintenance undeprecate 'commandname'" msgstr "" -#: maint.c:903 +#: maint.c:891 msgid "Set watchdog timer." msgstr "" -#: maint.c:904 +#: maint.c:892 msgid "Show watchdog timer." msgstr "" -#: maint.c:905 +#: maint.c:893 msgid "" "When non-zero, this timeout is used instead of waiting forever for a target\n" "to finish a low-level step or continue operation. If the specified amount\n" "of time passes without a response from the target, an error occurs." msgstr "" -#: maint.c:914 +#: maint.c:902 msgid "Set internal profiling." msgstr "" -#: maint.c:915 +#: maint.c:903 msgid "Show internal profiling." msgstr "" -#: maint.c:916 +#: maint.c:904 msgid "When enabled GDB is profiled." msgstr "" -#: mdebugread.c:127 +#: mdebugread.c:132 #, possible-c-format msgid "bad aux index at symbol %s" msgstr "" -#: mdebugread.c:133 +#: mdebugread.c:138 #, possible-c-format msgid "unknown external symbol %s" msgstr "" -#: mdebugread.c:139 +#: mdebugread.c:144 #, possible-c-format msgid "cannot map ECOFF basic type 0x%x for %s" msgstr "" -#: mdebugread.c:147 +#: mdebugread.c:152 #, possible-c-format msgid "guessed tag type of %s incorrectly" msgstr "" -#: mdebugread.c:153 +#: mdebugread.c:158 #, possible-c-format msgid "bad rfd entry for %s: file %d, index %d" msgstr "" -#: mdebugread.c:160 +#: mdebugread.c:165 #, possible-c-format msgid "unexpected type code for %s" msgstr "" -#: mdebugread.c:377 +#: mdebugread.c:382 #, possible-c-format msgid "" "\n" "%s not compiled with -g, debugging support is limited.\n" msgstr "" -#: mdebugread.c:380 +#: mdebugread.c:385 msgid "You should compile with -g2 or -g3 for best debugging support.\n" msgstr "" -#: mdebugread.c:725 mdebugread.c:1337 +#: mdebugread.c:730 mdebugread.c:1342 #, possible-c-format msgid "unknown symbol type 0x%x" msgstr "" -#: mdebugread.c:942 +#: mdebugread.c:947 #, possible-c-format msgid "declaration block contains unhandled symbol type %d" msgstr "" -#: mdebugread.c:1225 +#: mdebugread.c:1230 #, possible-c-format msgid "stEnd with storage class %d not handled" msgstr "" -#: mdebugread.c:1602 +#: mdebugread.c:1607 #, possible-c-format msgid "can't handle TIR fBitfield for %s" msgstr "" -#: mdebugread.c:1632 +#: mdebugread.c:1637 #, possible-c-format msgid "unable to cross ref btIndirect for %s" msgstr "" -#: mdebugread.c:1749 +#: mdebugread.c:1754 #, possible-c-format msgid "unable to cross ref btTypedef for %s" msgstr "" -#: mdebugread.c:1796 +#: mdebugread.c:1801 #, possible-c-format msgid "illegal TIR continued for %s" msgstr "" -#: mdebugread.c:1859 +#: mdebugread.c:1864 #, possible-c-format msgid "illegal array index type for %s, assuming int" msgstr "" -#: mdebugread.c:1907 +#: mdebugread.c:1912 #, possible-c-format msgid "unknown type qualifier 0x%x" msgstr "" -#: mdebugread.c:1942 +#: mdebugread.c:1947 #, possible-c-format msgid "can't handle PDR for static proc at 0x%lx" msgstr "" -#: mdebugread.c:2004 +#: mdebugread.c:2009 #, possible-c-format msgid "PDR for %s, but no symbol" msgstr "" -#: mdebugread.c:2129 +#: mdebugread.c:2134 #, possible-c-format msgid "Warning: %s `%s' is undefined (in %s)\n" msgstr "" -#: mdebugread.c:2231 +#: mdebugread.c:2236 #, possible-c-format msgid "guessed size of linetable for %s incorrectly" msgstr "" -#: mdebugread.c:2509 +#: mdebugread.c:2514 #, possible-c-format msgid "bad ifd for external symbol: %d (max %ld)" msgstr "" -#: mdebugread.c:2516 +#: mdebugread.c:2521 #, possible-c-format msgid "bad iss for external symbol: %ld (max %ld)" msgstr "" -#: mdebugread.c:3536 +#: mdebugread.c:3541 #, possible-c-format msgid "bad proc end in aux found from symbol %s" msgstr "" -#: mdebugread.c:3651 +#: mdebugread.c:3656 #, possible-c-format msgid "bad aux index at block symbol %s" msgstr "" #. Both complaints are valid: one gives symbol name, #. the other the offending symbol type. -#: mdebugread.c:3671 +#: mdebugread.c:3676 #, possible-c-format msgid "unknown local symbol %s" msgstr "" -#: mdebugread.c:3673 +#: mdebugread.c:3678 #, possible-c-format msgid "with type %d" msgstr "" -#: mdebugread.c:3836 +#: mdebugread.c:3841 #, possible-c-format msgid "bad file number %ld" msgstr "" -#: mdebugread.c:4148 +#: mdebugread.c:4153 #, possible-c-format msgid "unknown stabs symbol %s" msgstr "" -#: mdebugread.c:4335 +#: mdebugread.c:4347 #, possible-c-format msgid "File %s contains %d unresolved references:" msgstr "" -#: mdebugread.c:4512 +#: mdebugread.c:4524 #, possible-c-format msgid "illegal tq0 in forward typedef for %s" msgstr "" -#: mdebugread.c:4550 +#: mdebugread.c:4562 #, possible-c-format msgid "illegal bt %d in forward typedef for %s" msgstr "" -#: mdebugread.c:4917 +#: mdebugread.c:4930 #, possible-c-format msgid "Error reading ECOFF debugging information: %s" msgstr "" -#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:211 -msgid "Software breakpoints not implemented for this target." -msgstr "" - -#: memattr.c:78 +#: memattr.c:77 msgid "Unknown memory addresses will be treated as inaccessible.\n" msgstr "" -#: memattr.c:81 +#: memattr.c:80 msgid "Unknown memory addresses will be treated as RAM.\n" msgstr "" -#: memattr.c:148 +#: memattr.c:147 msgid "" "Switching to manual control of memory regions; use \"mem auto\" to fetch " "regions from the target again." msgstr "" -#: memattr.c:184 +#: memattr.c:183 msgid "invalid memory region: low >= high\n" msgstr "" -#: memattr.c:213 +#: memattr.c:212 msgid "overlapping memory region\n" msgstr "" -#: memattr.c:324 +#: memattr.c:323 msgid "No mem" msgstr "" -#: memattr.c:346 +#: memattr.c:345 msgid "no lo address" msgstr "" -#: memattr.c:351 +#: memattr.c:350 msgid "no hi address" msgstr "" -#: memattr.c:369 +#: memattr.c:368 msgid "region bounds not 16 bit aligned" msgstr "" -#: memattr.c:375 +#: memattr.c:374 msgid "region bounds not 32 bit aligned" msgstr "" -#: memattr.c:381 +#: memattr.c:380 msgid "region bounds not 64 bit aligned" msgstr "" -#: memattr.c:405 +#: memattr.c:404 #, possible-c-format msgid "unknown attribute: %s" msgstr "" -#: memattr.c:420 +#: memattr.c:419 msgid "Using memory regions provided by the target.\n" msgstr "" -#: memattr.c:422 +#: memattr.c:421 msgid "Using user-defined memory regions.\n" msgstr "" -#: memattr.c:428 +#: memattr.c:427 msgid "There are no memory regions defined.\n" msgstr "" -#: memattr.c:561 memattr.c:608 memattr.c:650 memattr.c:660 +#: memattr.c:560 memattr.c:607 memattr.c:649 memattr.c:659 #, possible-c-format msgid "No memory region number %d.\n" msgstr "" -#: memattr.c:679 +#: memattr.c:678 msgid "Delete all memory regions? " msgstr "" -#: memattr.c:708 +#: memattr.c:707 msgid "" "Define attributes for memory region or reset memory region handling to\n" "target-based.\n" @@ -13861,7 +14437,7 @@ " may be cache or nocache" msgstr "" -#: memattr.c:717 +#: memattr.c:716 msgid "" "Enable memory region.\n" "Arguments are the code numbers of the memory regions to enable.\n" @@ -13869,7 +14445,7 @@ "Do \"info mem\" to see current list of code numbers." msgstr "" -#: memattr.c:723 +#: memattr.c:722 msgid "" "Disable memory region.\n" "Arguments are the code numbers of the memory regions to disable.\n" @@ -13877,7 +14453,7 @@ "Do \"info mem\" to see current list of code numbers." msgstr "" -#: memattr.c:729 +#: memattr.c:728 msgid "" "Delete memory region.\n" "Arguments are the code numbers of the memory regions to delete.\n" @@ -13885,198 +14461,223 @@ "Do \"info mem\" to see current list of code numbers." msgstr "" -#: memattr.c:736 +#: memattr.c:735 msgid "Memory region attributes" msgstr "" #. allow-unknown -#: memattr.c:738 memattr.c:742 +#: memattr.c:737 memattr.c:741 msgid "Memory regions settings" msgstr "" -#: memattr.c:748 +#: memattr.c:747 msgid "Set handling of unknown memory regions." msgstr "" -#: memattr.c:749 +#: memattr.c:748 msgid "Show handling of unknown memory regions." msgstr "" -#: memattr.c:750 +#: memattr.c:749 msgid "" "If on, and some memory map is defined, debugger will emit errors on\n" "accesses to memory not defined in the memory map. If off, accesses to all\n" "memory addresses will be allowed." msgstr "" -#: memory-map.c:38 +#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:210 +msgid "Software breakpoints not implemented for this target." +msgstr "" + +#: memory-map.c:37 msgid "" "Can not parse XML memory map; XML support was disabled at compile time" msgstr "" -#: memory-map.c:90 +#: memory-map.c:89 msgid "Flash block size is not set" msgstr "" -#: memory-map.c:125 +#: memory-map.c:124 #, possible-c-format msgid "Unknown property \"%s\"" msgstr "" -#: memory-map.c:187 +#: memory-map.c:186 msgid "target memory map" msgstr "" #. Return values larger than a single register are returned in #. memory, pointed to by R0. Unfortunately, we can't count on R0 #. pointing to the return buffer, so we raise an error here. -#: mep-tdep.c:2191 mep-tdep.c:2218 +#: mep-tdep.c:2190 mep-tdep.c:2217 msgid "" "GDB cannot set return values larger than four bytes; the Media Processor's\n" "calling conventions do not provide enough information to do this.\n" "Try using the 'return' command with no argument." msgstr "" -#: mep-tdep.c:2434 +#: mep-tdep.c:2433 #, possible-c-format msgid "" "the MeP module '%s' is %s-endian, but the executable\n" "%s is %s-endian." msgstr "" -#: mep-tdep.c:2439 +#: mep-tdep.c:2438 #, possible-c-format msgid "" "the selected MeP module is %s-endian, but the executable\n" "%s is %s-endian." msgstr "" -#. mi_error_message = xstrprintf ("-var-create: Usage: -#. ...."); return MI_CMD_ERROR; -#: mi/mi-cmd-var.c:113 -msgid "-var-create: Usage: NAME FRAME EXPRESSION." +#: mi/mi-cmd-break.c:140 +msgid "-break-insert: Missing " msgstr "" -#: mi/mi-cmd-var.c:133 -msgid "-var-create: name of object must begin with a letter" +#: mi/mi-cmd-break.c:142 +msgid "-break-insert: Garbage following " msgstr "" -#: mi/mi-cmd-var.c:153 -msgid "-var-create: unable to create variable object" +#: mi/mi-cmd-break.c:191 +msgid "Usage: tracepoint-number passcount" msgstr "" -#: mi/mi-cmd-var.c:172 -msgid "-var-delete: Usage: [-c] EXPRESSION." +#: mi/mi-cmd-break.c:204 +#, possible-c-format +msgid "Could not find tracepoint %d" msgstr "" -#: mi/mi-cmd-var.c:184 -msgid "" -"-var-delete: Missing required argument after '-c': variable object name" +#: mi/mi-cmd-break.c:252 +msgid "-break-watch: Missing " msgstr "" -#: mi/mi-cmd-var.c:187 -msgid "-var-delete: Illegal variable object name" +#: mi/mi-cmd-break.c:254 +msgid "-break-watch: Garbage following " msgstr "" -#: mi/mi-cmd-var.c:195 -msgid "-var-delete: Invalid option." +#: mi/mi-cmd-break.c:270 +msgid "-break-watch: Unknown watchpoint type." msgstr "" -#: mi/mi-cmd-var.c:237 -msgid "" -"Must specify the format as: \"natural\", \"binary\", \"decimal\", " -"\"hexadecimal\", or \"octal\"" +#: mi/mi-cmd-break.c:301 +#, possible-c-format +msgid "USAGE: %s [ [...]]" msgstr "" -#: mi/mi-cmd-var.c:249 -msgid "-var-set-format: Usage: NAME FORMAT." +#: mi/mi-cmd-break.c:305 +#, possible-c-format +msgid "breakpoint number argument \"%s\" is not a number." msgstr "" -#: mi/mi-cmd-var.c:274 -msgid "Usage: NAME VISUALIZER_FUNCTION." +#: mi/mi-cmd-break.c:308 +#, possible-c-format +msgid "junk at the end of breakpoint number argument \"%s\"." msgstr "" -#: mi/mi-cmd-var.c:279 varobj.c:704 -msgid "Variable object not found" +#: mi/mi-cmd-break.c:313 +#, possible-c-format +msgid "breakpoint %d not found." msgstr "" -#: mi/mi-cmd-var.c:291 -msgid "-var-set-format: Usage: NAME FROZEN_FLAG." +#: mi/mi-cmd-disas.c:136 +msgid "" +"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s " +"startaddr -e endaddr]) [--] mode." msgstr "" -#: mi/mi-cmd-var.c:300 -msgid "Invalid flag value" +#: mi/mi-cmd-disas.c:140 +msgid "" +"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s " +"startaddr -e endaddr] [--] mode." msgstr "" -#: mi/mi-cmd-var.c:317 -msgid "-var-show-format: Usage: NAME." +#: mi/mi-cmd-disas.c:145 +msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3." msgstr "" -#: mi/mi-cmd-var.c:334 -msgid "-var-info-num-children: Usage: NAME." +#: mi/mi-cmd-disas.c:162 +msgid "-data-disassemble: Invalid filename." +msgstr "" + +#: mi/mi-cmd-disas.c:164 +msgid "-data-disassemble: Invalid line number" +msgstr "" + +#: mi/mi-cmd-disas.c:166 +msgid "-data-disassemble: No function contains specified address" +msgstr "" + +#: mi/mi-cmd-env.c:74 +msgid "-environment-pwd: No arguments required" msgstr "" -#: mi/mi-cmd-var.c:357 +#: mi/mi-cmd-env.c:85 #, possible-c-format -msgid "" -"Unknown value for PRINT_VALUES\n" -"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\"" +msgid "-environment-pwd: error finding name of working directory: %s" msgstr "" -#: mi/mi-cmd-var.c:406 -msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]" +#: mi/mi-cmd-env.c:96 +msgid "-environment-cd: Usage DIRECTORY" msgstr "" -#: mi/mi-cmd-var.c:472 -msgid "-var-info-type: Usage: NAME." +#: mi/mi-cmd-env.c:260 +msgid "-inferior-tty-show: Usage: No args" msgstr "" -#: mi/mi-cmd-var.c:487 -msgid "Usage: NAME." +#: mi/mi-cmd-file.c:39 +msgid "-file-list-exec-source-file: Usage: No args" msgstr "" -#: mi/mi-cmd-var.c:504 -msgid "-var-info-expression: Usage: NAME." +#: mi/mi-cmd-file.c:49 +msgid "-file-list-exec-source-file: No symtab" msgstr "" -#: mi/mi-cmd-var.c:523 -msgid "-var-show-attributes: Usage: NAME." +#: mi/mi-cmd-file.c:90 +msgid "-file-list-exec-source-files: Usage: No args" msgstr "" -#: mi/mi-cmd-var.c:573 -msgid "Cannot specify format more than once" +#: mi/mi-cmd-stack.c:57 +msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]" msgstr "" -#: mi/mi-cmd-var.c:582 -msgid "Usage: [-f FORMAT] NAME" +#: mi/mi-cmd-stack.c:80 +msgid "-stack-list-frames: Not enough frames in stack." msgstr "" -#: mi/mi-cmd-var.c:585 -msgid "Garbage at end of command" +#: mi/mi-cmd-stack.c:107 +msgid "-stack-info-depth: Usage: [MAX_DEPTH]" msgstr "" -#: mi/mi-cmd-var.c:613 -msgid "-var-assign: Usage: NAME EXPRESSION." +#: mi/mi-cmd-stack.c:137 +#, possible-c-format +msgid "" +"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or " +"\"%s\"" msgstr "" -#: mi/mi-cmd-var.c:619 -msgid "-var-assign: Variable object is not editable" +#: mi/mi-cmd-stack.c:151 +msgid "-stack-list-locals: Usage: PRINT_VALUES" msgstr "" -#: mi/mi-cmd-var.c:624 -msgid "-var-assign: Could not assign expression to variable object" +#: mi/mi-cmd-stack.c:173 +msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]" msgstr "" -#: mi/mi-cmd-var.c:675 -msgid "-var-update: Usage: [PRINT_VALUES] NAME." +#: mi/mi-cmd-stack.c:199 +msgid "-stack-list-arguments: Not enough frames in stack." msgstr "" -#: mi/mi-cmd-var.c:822 -msgid "-enable-pretty-printing: no arguments allowed" +#: mi/mi-cmd-stack.c:232 +msgid "Usage: PRINT_VALUES" msgstr "" -#: mi/mi-cmd-var.c:833 -msgid "-var-set-update-range: Usage: VAROBJ FROM TO" +#: mi/mi-cmd-stack.c:440 +msgid "-stack-select-frame: Usage: FRAME_SPEC" +msgstr "" + +#: mi/mi-cmd-stack.c:449 +msgid "-stack-info-frame: No arguments required" msgstr "" #: mi/mi-cmd-target.c:40 @@ -14091,512 +14692,482 @@ msgid "-target-file-delete: Usage: REMOTE_FILE" msgstr "" -#: mi/mi-cmd-stack.c:56 -msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]" +#. mi_error_message = xstrprintf ("-var-create: Usage: +#. ...."); return MI_CMD_ERROR; +#: mi/mi-cmd-var.c:115 +msgid "-var-create: Usage: NAME FRAME EXPRESSION." msgstr "" -#: mi/mi-cmd-stack.c:79 -msgid "-stack-list-frames: Not enough frames in stack." +#: mi/mi-cmd-var.c:135 +msgid "-var-create: name of object must begin with a letter" msgstr "" -#: mi/mi-cmd-stack.c:106 -msgid "-stack-info-depth: Usage: [MAX_DEPTH]" +#: mi/mi-cmd-var.c:155 +msgid "-var-create: unable to create variable object" msgstr "" -#: mi/mi-cmd-stack.c:136 -#, possible-c-format +#: mi/mi-cmd-var.c:175 +msgid "-var-delete: Usage: [-c] EXPRESSION." +msgstr "" + +#: mi/mi-cmd-var.c:187 msgid "" -"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or " -"\"%s\"" +"-var-delete: Missing required argument after '-c': variable object name" msgstr "" -#: mi/mi-cmd-stack.c:150 -msgid "-stack-list-locals: Usage: PRINT_VALUES" +#: mi/mi-cmd-var.c:190 +msgid "-var-delete: Illegal variable object name" msgstr "" -#: mi/mi-cmd-stack.c:171 -msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]" +#: mi/mi-cmd-var.c:198 +msgid "-var-delete: Invalid option." msgstr "" -#: mi/mi-cmd-stack.c:197 -msgid "-stack-list-arguments: Not enough frames in stack." +#: mi/mi-cmd-var.c:240 +msgid "" +"Must specify the format as: \"natural\", \"binary\", \"decimal\", " +"\"hexadecimal\", or \"octal\"" msgstr "" -#: mi/mi-cmd-stack.c:230 -msgid "Usage: PRINT_VALUES" +#: mi/mi-cmd-var.c:253 +msgid "-var-set-format: Usage: NAME FORMAT." msgstr "" -#: mi/mi-cmd-stack.c:354 mi/mi-cmd-stack.c:377 python/py-prettyprint.c:293 -#, possible-c-format -msgid "" +#: mi/mi-cmd-var.c:278 +msgid "Usage: NAME VISUALIZER_FUNCTION." msgstr "" -#: mi/mi-cmd-stack.c:402 -msgid "-stack-select-frame: Usage: FRAME_SPEC" +#: mi/mi-cmd-var.c:283 varobj.c:734 +msgid "Variable object not found" msgstr "" -#: mi/mi-cmd-stack.c:411 -msgid "-stack-info-frame: No arguments required" +#: mi/mi-cmd-var.c:295 +msgid "-var-set-format: Usage: NAME FROZEN_FLAG." msgstr "" -#: mi/mi-cmd-disas.c:136 -msgid "" -"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s " -"startaddr -e endaddr]) [--] mode." +#: mi/mi-cmd-var.c:304 +msgid "Invalid flag value" msgstr "" -#: mi/mi-cmd-disas.c:140 +#: mi/mi-cmd-var.c:322 +msgid "-var-show-format: Usage: NAME." +msgstr "" + +#: mi/mi-cmd-var.c:340 +msgid "-var-info-num-children: Usage: NAME." +msgstr "" + +#: mi/mi-cmd-var.c:363 +#, possible-c-format msgid "" -"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s " -"startaddr -e endaddr] [--] mode." +"Unknown value for PRINT_VALUES\n" +"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\"" msgstr "" -#: mi/mi-cmd-disas.c:145 -msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3." +#: mi/mi-cmd-var.c:413 +msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]" msgstr "" -#: mi/mi-cmd-disas.c:162 -msgid "-data-disassemble: Invalid filename." +#: mi/mi-cmd-var.c:480 +msgid "-var-info-type: Usage: NAME." msgstr "" -#: mi/mi-cmd-disas.c:164 -msgid "-data-disassemble: Invalid line number" +#: mi/mi-cmd-var.c:496 +msgid "Usage: NAME." +msgstr "" + +#: mi/mi-cmd-var.c:514 +msgid "-var-info-expression: Usage: NAME." +msgstr "" + +#: mi/mi-cmd-var.c:534 +msgid "-var-show-attributes: Usage: NAME." +msgstr "" + +#: mi/mi-cmd-var.c:585 +msgid "Cannot specify format more than once" +msgstr "" + +#: mi/mi-cmd-var.c:594 +msgid "Usage: [-f FORMAT] NAME" +msgstr "" + +#: mi/mi-cmd-var.c:597 +msgid "Garbage at end of command" +msgstr "" + +#: mi/mi-cmd-var.c:626 +msgid "-var-assign: Usage: NAME EXPRESSION." +msgstr "" + +#: mi/mi-cmd-var.c:632 +msgid "-var-assign: Variable object is not editable" +msgstr "" + +#: mi/mi-cmd-var.c:637 +msgid "-var-assign: Could not assign expression to variable object" +msgstr "" + +#: mi/mi-cmd-var.c:689 +msgid "-var-update: Usage: [PRINT_VALUES] NAME." msgstr "" -#: mi/mi-cmd-disas.c:166 -msgid "-data-disassemble: No function contains specified address" +#: mi/mi-cmd-var.c:837 +msgid "-enable-pretty-printing: no arguments allowed" msgstr "" -#: mi/mi-cmd-env.c:73 -msgid "-environment-pwd: No arguments required" +#: mi/mi-cmd-var.c:848 +msgid "-var-set-update-range: Usage: VAROBJ FROM TO" msgstr "" -#: mi/mi-cmd-env.c:84 +#: mi/mi-cmds.c:218 #, possible-c-format -msgid "-environment-pwd: error finding name of working directory: %s" +msgid "command `%s' appears to be duplicated" msgstr "" -#: mi/mi-cmd-env.c:95 -msgid "-environment-cd: Usage DIRECTORY" +#: mi/mi-console.c:68 +msgid "mi_console_file_delete: bad magic number" msgstr "" -#: mi/mi-cmd-env.c:257 -msgid "-inferior-tty-show: Usage: No args" +#: mi/mi-console.c:98 +msgid "mi_console_file_transform: bad magic number" +msgstr "" + +#: mi/mi-console.c:126 +msgid "mi_console_file_flush: bad magic number" msgstr "" -#: mi/mi-getopt.c:37 +#: mi/mi-getopt.c:36 msgid "mi_getopt_long: optind out of bounds" msgstr "" -#: mi/mi-getopt.c:63 +#: mi/mi-getopt.c:62 #, possible-c-format msgid "%s: Option %s requires an argument" msgstr "" -#: mi/mi-getopt.c:75 +#: mi/mi-getopt.c:74 #, possible-c-format msgid "%s: Unknown option ``%s''" msgstr "" -#: mi/mi-cmds.c:217 +#: mi/mi-interp.c:219 +msgid "-interpreter-exec: Usage: -interpreter-exec interp command" +msgstr "" + +#: mi/mi-interp.c:224 #, possible-c-format -msgid "command `%s' appears to be duplicated" +msgid "-interpreter-exec: could not find interpreter \"%s\"" msgstr "" -#: mi/mi-main.c:289 mi/mi-main.c:295 reverse.c:54 reverse.c:61 +#: mi/mi-interp.c:228 #, possible-c-format -msgid "Target %s does not support this command." +msgid "" +"-interpreter-exec: interpreter \"%s\" does not support command execution" msgstr "" -#: mi/mi-main.c:292 +#: mi/mi-main.c:290 msgid "Already in reverse mode." msgstr "" -#: mi/mi-main.c:423 +#: mi/mi-main.c:293 reverse.c:57 +#, possible-c-format +msgid "Target %s does not support this command." +msgstr "" + +#: mi/mi-main.c:421 msgid "Usage: -target-detach [pid | thread-group]" msgstr "" -#: mi/mi-main.c:438 +#: mi/mi-main.c:436 #, possible-c-format msgid "Invalid syntax of thread-group id '%s'" msgstr "" -#: mi/mi-main.c:442 +#: mi/mi-main.c:440 #, possible-c-format msgid "Non-existent thread-group id '%d'" msgstr "" -#: mi/mi-main.c:452 +#: mi/mi-main.c:450 #, possible-c-format msgid "Invalid identifier '%s'" msgstr "" -#: mi/mi-main.c:459 +#: mi/mi-main.c:457 msgid "Thread group is empty" msgstr "" -#: mi/mi-main.c:474 +#: mi/mi-main.c:472 msgid "-thread-select: USAGE: threadnum." msgstr "" -#: mi/mi-main.c:492 +#: mi/mi-main.c:490 msgid "-thread-list-ids: No arguments required." msgstr "" -#: mi/mi-main.c:507 +#: mi/mi-main.c:505 mi/mi-main.c:2515 msgid "Invalid MI command" msgstr "" -#: mi/mi-main.c:830 +#: mi/mi-main.c:831 msgid "only '0' and '1' are valid values for the '--recurse' option" msgstr "" -#: mi/mi-main.c:842 mi/mi-main.c:847 +#: mi/mi-main.c:843 mi/mi-main.c:848 #, possible-c-format msgid "invalid syntax of group id '%s'" msgstr "" -#: mi/mi-main.c:868 +#: mi/mi-main.c:869 #, possible-c-format msgid "Non-existent thread group id '%d'" msgstr "" -#: mi/mi-main.c:930 mi/mi-main.c:1007 mi/mi-main.c:1106 mi/mi-main.c:1220 +#: mi/mi-main.c:932 mi/mi-main.c:1010 mi/mi-main.c:1110 mi/mi-main.c:1225 msgid "bad register number" msgstr "" -#: mi/mi-main.c:982 mi/mi-main.c:1001 +#: mi/mi-main.c:985 mi/mi-main.c:1004 msgid "-data-list-changed-registers: Unable to read register contents." msgstr "" -#: mi/mi-main.c:1063 +#: mi/mi-main.c:1067 msgid "" "-data-list-register-values: Usage: -data-list-register-values " "[...]" msgstr "" -#: mi/mi-main.c:1129 +#: mi/mi-main.c:1134 msgid "Optimized out" msgstr "" -#: mi/mi-main.c:1188 +#: mi/mi-main.c:1193 msgid "" "-data-write-register-values: Usage: -data-write-register-values " "[ ... ]" msgstr "" -#: mi/mi-main.c:1194 +#: mi/mi-main.c:1199 msgid "-data-write-register-values: No registers." msgstr "" -#: mi/mi-main.c:1197 +#: mi/mi-main.c:1202 msgid "-data-write-register-values: No regs and values specified." msgstr "" -#: mi/mi-main.c:1200 +#: mi/mi-main.c:1205 msgid "-data-write-register-values: Regs and vals are not in pairs." msgstr "" -#: mi/mi-main.c:1241 +#: mi/mi-main.c:1247 msgid "" "-data-evaluate-expression: Usage: -data-evaluate-expression expression" msgstr "" -#: mi/mi-main.c:1328 +#: mi/mi-main.c:1335 msgid "" "-data-read-memory: Usage: ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS " "[ASCHAR]." msgstr "" -#: mi/mi-main.c:1365 +#: mi/mi-main.c:1372 msgid "-data-read-memory: invalid number of rows." msgstr "" -#: mi/mi-main.c:1370 +#: mi/mi-main.c:1377 msgid "-data-read-memory: invalid number of columns." msgstr "" -#: mi/mi-main.c:1389 mi/mi-main.c:1522 +#: mi/mi-main.c:1396 mi/mi-main.c:1530 msgid "Unable to read memory." msgstr "" -#: mi/mi-main.c:1512 +#: mi/mi-main.c:1520 msgid "Usage: [ -o OFFSET ] ADDR LENGTH." msgstr "" -#: mi/mi-main.c:1614 +#: mi/mi-main.c:1622 msgid "" "-data-write-memory: Usage: [-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE." msgstr "" -#: mi/mi-main.c:1655 +#: mi/mi-main.c:1663 msgid "Usage: ADDR DATA." msgstr "" -#: mi/mi-main.c:1673 +#: mi/mi-main.c:1681 msgid "Could not write memory" msgstr "" -#: mi/mi-main.c:1699 +#: mi/mi-main.c:1707 #, possible-c-format msgid "-enable-timings: Usage: %s {yes|no}" msgstr "" -#: mi/mi-main.c:1723 +#: mi/mi-main.c:1734 msgid "-list-features should be passed no arguments" msgstr "" -#: mi/mi-main.c:1743 +#: mi/mi-main.c:1755 msgid "-list-target-features should be passed no arguments" msgstr "" -#: mi/mi-main.c:1752 +#: mi/mi-main.c:1764 msgid "-add-inferior should be passed no arguments" msgstr "" -#: mi/mi-main.c:1778 +#: mi/mi-main.c:1790 msgid "-remove-inferior should be passed a single argument" msgstr "" -#: mi/mi-main.c:1781 +#: mi/mi-main.c:1793 msgid "the thread group id is syntactically invalid" msgstr "" -#: mi/mi-main.c:1785 +#: mi/mi-main.c:1797 msgid "the specified thread group does not exist" msgstr "" -#: mi/mi-main.c:1788 +#: mi/mi-main.c:1800 msgid "cannot remove an active inferior" msgstr "" -#: mi/mi-main.c:1797 +#: mi/mi-main.c:1809 msgid "Cannot remove last inferior" msgstr "" -#: mi/mi-main.c:2032 +#: mi/mi-main.c:2043 msgid "Cannot specify --thread-group together with --all" msgstr "" -#: mi/mi-main.c:2035 +#: mi/mi-main.c:2046 msgid "Cannot specify --thread together with --all" msgstr "" -#: mi/mi-main.c:2038 +#: mi/mi-main.c:2049 msgid "Cannot specify --thread together with --thread-group" msgstr "" -#: mi/mi-main.c:2041 +#: mi/mi-main.c:2052 msgid "Cannot specify --frame without --thread" msgstr "" -#: mi/mi-main.c:2049 +#: mi/mi-main.c:2060 msgid "Invalid thread group for the --thread-group option" msgstr "" -#: mi/mi-main.c:2067 +#: mi/mi-main.c:2078 #, possible-c-format msgid "Invalid thread id: %d" msgstr "" -#: mi/mi-main.c:2070 +#: mi/mi-main.c:2081 #, possible-c-format msgid "Thread id: %d has terminated" msgstr "" -#: mi/mi-main.c:2085 +#: mi/mi-main.c:2096 #, possible-c-format msgid "Invalid frame id: %d" msgstr "" -#: mi/mi-main.c:2329 +#: mi/mi-main.c:2342 msgid "Usage: -trace-define-variable VARIABLE [VALUE]" msgstr "" -#: mi/mi-main.c:2343 +#: mi/mi-main.c:2356 msgid "Invalid name of trace variable" msgstr "" -#: mi/mi-main.c:2361 +#: mi/mi-main.c:2374 msgid "-trace-list-variables: no arguments are allowed" msgstr "" -#: mi/mi-main.c:2372 +#: mi/mi-main.c:2385 msgid "trace selection mode is required" msgstr "" -#: mi/mi-main.c:2383 tracepoint.c:2084 tracepoint.c:2142 tracepoint.c:2160 -#: tracepoint.c:2199 tracepoint.c:2263 tracepoint.c:2296 +#: mi/mi-main.c:2396 tracepoint.c:2335 tracepoint.c:2393 tracepoint.c:2411 +#: tracepoint.c:2450 tracepoint.c:2514 tracepoint.c:2547 msgid "May not look at trace frames while trace is running." msgstr "" -#: mi/mi-main.c:2388 +#: mi/mi-main.c:2401 msgid "frame number is required" msgstr "" -#: mi/mi-main.c:2394 +#: mi/mi-main.c:2407 msgid "tracepoint number is required" msgstr "" -#: mi/mi-main.c:2400 +#: mi/mi-main.c:2413 msgid "PC is required" msgstr "" -#: mi/mi-main.c:2406 mi/mi-main.c:2413 +#: mi/mi-main.c:2419 mi/mi-main.c:2426 msgid "Start and end PC are required" msgstr "" -#: mi/mi-main.c:2425 +#: mi/mi-main.c:2438 msgid "Line is required" msgstr "" -#: mi/mi-main.c:2433 mi/mi-main.c:2438 +#: mi/mi-main.c:2446 mi/mi-main.c:2451 msgid "Could not find the specified line" msgstr "" -#: mi/mi-main.c:2443 +#: mi/mi-main.c:2456 #, possible-c-format msgid "Invalid mode '%s'" msgstr "" -#: mi/mi-main.c:2458 +#: mi/mi-main.c:2471 msgid "Usage: -trace-save [-r] filename" msgstr "" -#: mi/mi-main.c:2466 +#: mi/mi-main.c:2479 #, possible-c-format msgid "Invalid option: %s" msgstr "" -#: mi/mi-console.c:69 -msgid "mi_console_file_delete: bad magic number" -msgstr "" - -#: mi/mi-console.c:99 -msgid "mi_console_file_transform: bad magic number" -msgstr "" - -#: mi/mi-console.c:127 -msgid "mi_console_file_flush: bad magic number" -msgstr "" - -#: mi/mi-cmd-break.c:140 -msgid "-break-insert: Missing " -msgstr "" - -#: mi/mi-cmd-break.c:142 -msgid "-break-insert: Garbage following " -msgstr "" - -#: mi/mi-cmd-break.c:193 -msgid "Usage: tracepoint-number passcount" -msgstr "" - -#: mi/mi-cmd-break.c:206 -#, possible-c-format -msgid "Cound not find tracepoint %d" -msgstr "" - -#: mi/mi-cmd-break.c:254 -msgid "-break-watch: Missing " -msgstr "" - -#: mi/mi-cmd-break.c:256 -msgid "-break-watch: Garbage following " -msgstr "" - -#: mi/mi-cmd-break.c:272 -msgid "-break-watch: Unknown watchpoint type." -msgstr "" - -#: mi/mi-cmd-break.c:303 -#, possible-c-format -msgid "USAGE: %s [ [...]]" -msgstr "" - -#: mi/mi-cmd-break.c:307 -#, possible-c-format -msgid "breakpoint number argument \"%s\" is not a number." -msgstr "" - -#: mi/mi-cmd-break.c:310 -#, possible-c-format -msgid "junk at the end of breakpoint number argument \"%s\"." -msgstr "" - -#: mi/mi-cmd-break.c:315 -#, possible-c-format -msgid "breakpoint %d not found." -msgstr "" - -#: mi/mi-common.c:54 -msgid "async_reason_string_lookup is inconsistent" -msgstr "" - -#: mi/mi-interp.c:195 -msgid "-interpreter-exec: Usage: -interpreter-exec interp command" -msgstr "" - -#: mi/mi-interp.c:200 -#, possible-c-format -msgid "-interpreter-exec: could not find interpreter \"%s\"" -msgstr "" - -#: mi/mi-interp.c:204 -#, possible-c-format -msgid "" -"-interpreter-exec: interpreter \"%s\" does not support command execution" -msgstr "" - -#: mi/mi-symbol-cmds.c:42 -msgid "-symbol-list-lines: Usage: SOURCE_FILENAME" -msgstr "" - -#: mi/mi-symbol-cmds.c:48 -msgid "-symbol-list-lines: Unknown source file name." -msgstr "" - -#: mi/mi-parse.c:287 +#: mi/mi-parse.c:286 #, possible-c-format msgid "Undefined MI command: %s" msgstr "" -#: mi/mi-parse.c:321 +#: mi/mi-parse.c:320 msgid "Duplicate '--thread-group' option" msgstr "" -#: mi/mi-parse.c:324 +#: mi/mi-parse.c:323 msgid "Invalid thread group id" msgstr "" -#: mi/mi-parse.c:332 +#: mi/mi-parse.c:331 msgid "Duplicate '--thread' option" msgstr "" -#: mi/mi-parse.c:340 +#: mi/mi-parse.c:339 msgid "Duplicate '--frame' option" msgstr "" -#: mi/mi-parse.c:348 +#: mi/mi-parse.c:347 #, possible-c-format msgid "Invalid value for the '%s' option" msgstr "" -#: mi/mi-parse.c:359 +#: mi/mi-parse.c:358 #, possible-c-format msgid "Problem parsing arguments: %s %s" msgstr "" -#: mi/mi-cmd-file.c:39 -msgid "-file-list-exec-source-file: Usage: No args" -msgstr "" - -#: mi/mi-cmd-file.c:49 -msgid "-file-list-exec-source-file: No symtab" +#: mi/mi-symbol-cmds.c:42 +msgid "-symbol-list-lines: Usage: SOURCE_FILENAME" msgstr "" -#: mi/mi-cmd-file.c:87 -msgid "-file-list-exec-source-files: Usage: No args" +#: mi/mi-symbol-cmds.c:48 +msgid "-symbol-list-lines: Unknown source file name." msgstr "" #: microblaze-tdep.c:145 @@ -14623,157 +15194,162 @@ msgid "When non-zero, microblaze specific debugging is enabled." msgstr "" -#: minsyms.c:716 +#: minsyms.c:759 #, possible-c-format msgid "" "GDB cannot resolve STT_GNU_IFUNC symbol at address %s without the ELF " "support compiled in." msgstr "" -#: minsyms.c:727 +#: minsyms.c:770 #, possible-c-format msgid "" "GDB cannot resolve STT_GNU_IFUNC symbol \"%s\" without the ELF support " "compiled in." msgstr "" -#: minsyms.c:738 +#: minsyms.c:781 msgid "elf_gnu_ifunc_resolver_stop cannot be reached." msgstr "" -#: minsyms.c:747 +#: minsyms.c:790 msgid "elf_gnu_ifunc_resolver_return_stop cannot be reached." msgstr "" -#: mips-linux-nat.c:77 mips-linux-nat.c:112 +#: mips-linux-nat.c:76 mips-linux-nat.c:111 #, possible-c-format msgid "Bogon register number %d." msgstr "" -#: mips-linux-nat.c:255 mips-linux-nat.c:307 ppcnbsd-nat.c:105 -#: ppcnbsd-nat.c:140 +#: mips-linux-nat.c:254 mips-linux-nat.c:306 ppcnbsd-nat.c:104 +#: ppcnbsd-nat.c:139 msgid "Couldn't get FP registers" msgstr "" -#: mips-linux-nat.c:298 shnbsd-nat.c:84 +#: mips-linux-nat.c:297 shnbsd-nat.c:83 msgid "Couldn't set registers" msgstr "" -#: mips-linux-nat.c:313 ppcnbsd-nat.c:147 +#: mips-linux-nat.c:312 ppcnbsd-nat.c:146 msgid "Couldn't set FP registers" msgstr "" -#: mips-linux-nat.c:481 mips-linux-nat.c:498 mips-linux-nat.c:515 -#: mips-linux-nat.c:532 mips-linux-nat.c:553 mips-linux-nat.c:570 -#: mips-linux-nat.c:589 +#: mips-linux-nat.c:480 mips-linux-nat.c:497 mips-linux-nat.c:514 +#: mips-linux-nat.c:531 mips-linux-nat.c:552 mips-linux-nat.c:569 +#: mips-linux-nat.c:588 msgid "Unrecognized watch register style" msgstr "" -#: mips-linux-nat.c:1056 +#: mips-linux-nat.c:1054 msgid "Set whether to show variables that mirror the mips debug registers." msgstr "" -#: mips-linux-nat.c:1057 +#: mips-linux-nat.c:1055 msgid "Show whether to show variables that mirror the mips debug registers." msgstr "" -#: mips-linux-tdep.c:648 +#: mips-linux-tdep.c:647 msgid "wrong size fpregset struct in core file" msgstr "" -#: mips-tdep.c:493 +#: mipsread.c:84 +#, possible-c-format +msgid "Error reading symbol table: %s" +msgstr "" + +#: mips-tdep.c:491 #, possible-c-format msgid "mips_register_name: bad register number %d" msgstr "" -#: mips-tdep.c:594 mips-tdep.c:623 mips-tdep.c:663 +#: mips-tdep.c:592 mips-tdep.c:621 mips-tdep.c:661 msgid "bad register size" msgstr "" -#: mips-tdep.c:695 +#: mips-tdep.c:693 msgid "32-bit compatibility mode not supported" msgstr "" -#: mips-tdep.c:778 +#: mips-tdep.c:776 msgid "mips_register_to_value: unrecognized case" msgstr "" -#: mips-tdep.c:826 +#: mips-tdep.c:824 msgid "mips_value_to_register: unrecognized case" msgstr "" -#: mips-tdep.c:954 +#: mips-tdep.c:952 msgid "mips_mask_address_p: bad switch" msgstr "" -#: mips-tdep.c:980 +#: mips-tdep.c:978 msgid "show_mask_address: bad switch" msgstr "" -#: mips-tdep.c:1863 +#: mips-tdep.c:1830 msgid "Invalid number of argument registers encoded in SAVE." msgstr "" -#: mips-tdep.c:1868 +#: mips-tdep.c:1835 msgid "Invalid number of static registers encoded in SAVE." msgstr "" -#: mips-tdep.c:2759 +#: mips-tdep.c:2727 #, possible-c-format msgid "GDB can't find the start of the function at %s." msgstr "" -#: mips-tdep.c:4557 mips-tdep.c:4594 mips-tdep.c:4830 sh64-tdep.c:2056 +#: mips-tdep.c:4525 mips-tdep.c:4562 mips-tdep.c:4798 sh64-tdep.c:2054 #, possible-c-format msgid "can't read register %d (%s)" msgstr "" -#: mips-tdep.c:4603 +#: mips-tdep.c:4571 msgid "mips_read_fp_register_double: bad access to odd-numbered FP register" msgstr "" -#: mips-tdep.c:4866 sh64-tdep.c:2216 sh64-tdep.c:2274 +#: mips-tdep.c:4834 sh64-tdep.c:2214 sh64-tdep.c:2272 msgid "Not a valid register for the current processor type" msgstr "" -#: mips-tdep.c:5136 mips-tdep.c:5150 mips-tdep.c:5164 +#: mips-tdep.c:5104 mips-tdep.c:5118 mips-tdep.c:5132 msgid "set mipsfpu failed" msgstr "" -#: mips-tdep.c:5615 +#: mips-tdep.c:5586 #, possible-c-format msgid "unsupported ABI %s." msgstr "" -#: mips-tdep.c:5629 +#: mips-tdep.c:5600 msgid "unrecognized .gcc_compiled_longXX" msgstr "" -#: mips-tdep.c:5641 +#: mips-tdep.c:5612 msgid "unknown ABI string" msgstr "" -#: mips-tdep.c:6153 mips-tdep.c:6202 +#: mips-tdep.c:6124 mips-tdep.c:6173 msgid "unknown ABI in switch" msgstr "" -#: mips-tdep.c:6481 +#: mips-tdep.c:6452 msgid "mips_abi_strings out of sync" msgstr "" -#: mips-tdep.c:6497 mips-tdep.c:6501 +#: mips-tdep.c:6468 mips-tdep.c:6472 msgid "Various MIPS specific commands." msgstr "" -#: mips-tdep.c:6506 +#: mips-tdep.c:6477 msgid "Set the MIPS ABI used by this program." msgstr "" -#: mips-tdep.c:6507 +#: mips-tdep.c:6478 msgid "Show the MIPS ABI used by this program." msgstr "" -#: mips-tdep.c:6508 +#: mips-tdep.c:6479 msgid "" "This option can be set to one of:\n" " auto - the default ABI associated with the current binary\n" @@ -14785,141 +15361,136 @@ " eabi64" msgstr "" -#: mips-tdep.c:6525 +#: mips-tdep.c:6496 msgid "Set use of MIPS floating-point coprocessor." msgstr "" -#: mips-tdep.c:6528 +#: mips-tdep.c:6499 msgid "Select single-precision MIPS floating-point coprocessor." msgstr "" -#: mips-tdep.c:6531 +#: mips-tdep.c:6502 msgid "Select double-precision MIPS floating-point coprocessor." msgstr "" -#: mips-tdep.c:6537 +#: mips-tdep.c:6508 msgid "Select no MIPS floating-point coprocessor." msgstr "" -#: mips-tdep.c:6542 +#: mips-tdep.c:6513 msgid "Select MIPS floating-point coprocessor automatically." msgstr "" -#: mips-tdep.c:6545 +#: mips-tdep.c:6516 msgid "Show current use of MIPS floating-point coprocessor target." msgstr "" -#: mips-tdep.c:6566 +#: mips-tdep.c:6537 msgid "Set zeroing of upper 32 bits of 64-bit addresses." msgstr "" -#: mips-tdep.c:6567 +#: mips-tdep.c:6538 msgid "Show zeroing of upper 32 bits of 64-bit addresses." msgstr "" -#: mips-tdep.c:6568 +#: mips-tdep.c:6539 msgid "" "Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to\n" "allow GDB to determine the correct value." msgstr "" -#: mips-tdep.c:6577 +#: mips-tdep.c:6548 msgid "" "Set compatibility with 64-bit MIPS target that transfers 32-bit quantities." msgstr "" -#: mips-tdep.c:6579 +#: mips-tdep.c:6550 msgid "" "Show compatibility with 64-bit MIPS target that transfers 32-bit quantities." msgstr "" -#: mips-tdep.c:6581 +#: mips-tdep.c:6552 msgid "" "Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n" "that would transfer 32 bits for some registers (e.g. SR, FSR) and\n" "64 bits for others. Use \"off\" to disable compatibility mode" msgstr "" -#: mips-tdep.c:6593 +#: mips-tdep.c:6564 msgid "Set mips debugging." msgstr "" -#: mips-tdep.c:6594 +#: mips-tdep.c:6565 msgid "Show mips debugging." msgstr "" -#: mips-tdep.c:6595 +#: mips-tdep.c:6566 msgid "When non-zero, mips specific debugging is enabled." msgstr "" -#: mipsread.c:85 -#, possible-c-format -msgid "Error reading symbol table: %s" -msgstr "" - -#: mn10300-tdep.c:195 +#: mn10300-tdep.c:194 #, possible-c-format msgid "Cannot store return value %d bytes long." msgstr "" -#: mn10300-tdep.c:227 +#: mn10300-tdep.c:226 #, possible-c-format msgid "Cannot extract return value %d bytes long." msgstr "" -#: mn10300-tdep.c:1377 +#: mn10300-tdep.c:1376 #, possible-c-format msgid "Bogus register number in debug info: %d" msgstr "" -#: mn10300-tdep.c:1420 +#: mn10300-tdep.c:1419 msgid "mn10300_gdbarch_init: Unknown mn10300 variant" msgstr "" -#: monitor.c:221 +#: monitor.c:219 #, possible-c-format msgid "%s (%s): %s: %s%c" msgstr "" -#: monitor.c:225 +#: monitor.c:223 #, possible-c-format msgid "%s (%s): %s: %s" msgstr "" -#: monitor.c:242 +#: monitor.c:240 #, possible-c-format msgid "Invalid hex digit %d" msgstr "" -#: monitor.c:414 monitor.c:490 +#: monitor.c:412 monitor.c:488 msgid "Timeout reading from remote system." msgstr "" -#: monitor.c:416 monitor.c:492 +#: monitor.c:414 monitor.c:490 msgid "remote-monitor" msgstr "" -#: monitor.c:486 +#: monitor.c:484 msgid "GDB serial timeout has expired. Target detached." msgstr "" -#: monitor.c:704 +#: monitor.c:702 #, possible-c-format msgid "compile_pattern: Can't compile pattern string `%s': %s!" msgstr "" -#: monitor.c:722 +#: monitor.c:720 msgid "Magic number of monitor_ops struct wrong." msgstr "" -#: monitor.c:728 +#: monitor.c:726 #, possible-c-format msgid "" "Use `target %s DEVICE-NAME' to use a serial port, or\n" "`target %s HOST-NAME:PORT-NUMBER' to use a network connection." msgstr "" -#: monitor.c:829 +#: monitor.c:827 #, possible-c-format msgid "Remote target %s connected to %s\n" msgstr "" @@ -14934,7 +15505,7 @@ msgid "monitor_supply_register (%d): bad value from monitor: %s." msgstr "" -#: monitor.c:1033 nto-procfs.c:694 remote-mips.c:2276 remote.c:4770 +#: monitor.c:1033 nto-procfs.c:693 remote.c:4850 remote-mips.c:2274 msgid "" "Interrupted while waiting for the program.\n" "Give up (and stop debugging it)? " @@ -15011,74 +15582,74 @@ msgid "Process record: error reading memory at addr 0x%s len = %d.\n" msgstr "" -#: mt-tdep.c:304 +#: mt-tdep.c:303 #, possible-c-format msgid "mt_register_type: illegal register number %d" msgstr "" -#: nto-procfs.c:102 +#: nto-procfs.c:101 msgid "Lost the QNX node. Debug session probably over." msgstr "" -#: nto-procfs.c:168 +#: nto-procfs.c:167 msgid "Invalid procfs arg" msgstr "" -#: nto-procfs.c:177 nto-procfs.c:195 +#: nto-procfs.c:176 nto-procfs.c:194 msgid "Devctl failed." msgstr "" -#: nto-procfs.c:187 +#: nto-procfs.c:186 msgid "alloca failed." msgstr "" -#: nto-procfs.c:202 +#: nto-procfs.c:201 msgid "Invalid target CPU." msgstr "" -#: nto-procfs.c:626 procfs.c:3295 +#: nto-procfs.c:625 procfs.c:3293 msgid "Attaching GDB to itself is not a good idea..." msgstr "" -#: nto-procfs.c:668 +#: nto-procfs.c:667 #, possible-c-format msgid "Couldn't open proc file %s, error %d (%s)" msgstr "" -#: nto-procfs.c:671 +#: nto-procfs.c:670 msgid "Couldn't stop process" msgstr "" -#: nto-procfs.c:1010 +#: nto-procfs.c:1009 msgid "run error!\n" msgstr "" -#: nto-procfs.c:1184 +#: nto-procfs.c:1183 #, possible-c-format msgid "Error spawning %s: %d (%s)" msgstr "" -#: nto-procfs.c:1453 +#: nto-procfs.c:1452 msgid "pidlist" msgstr "" -#: nto-procfs.c:1454 +#: nto-procfs.c:1453 msgid "memory information" msgstr "" -#: nto-procfs.c:1484 +#: nto-procfs.c:1483 msgid "Failed to set hardware watchpoint" msgstr "" -#: nto-tdep.c:405 +#: nto-tdep.c:404 msgid "Set QNX NTO internal debugging." msgstr "" -#: nto-tdep.c:406 +#: nto-tdep.c:405 msgid "Show QNX NTO internal debugging." msgstr "" -#: nto-tdep.c:407 +#: nto-tdep.c:406 msgid "" "When non-zero, nto specific debug info is\n" "displayed. Different information is displayed\n" @@ -15108,118 +15679,118 @@ msgid "A %s near end of expression." msgstr "" -#: objc-lang.c:129 +#: objc-lang.c:128 msgid "no way to lookup Objective-C classes" msgstr "" -#: objc-lang.c:158 +#: objc-lang.c:157 msgid "no way to lookup Objective-C selectors" msgstr "" -#: objc-lang.c:206 +#: objc-lang.c:205 msgid "NSString: internal error -- no way to create new NSString" msgstr "" -#: objc-lang.c:628 +#: objc-lang.c:629 #, possible-c-format msgid "Can't find selector \"%s\"" msgstr "" -#: objc-lang.c:675 +#: objc-lang.c:676 msgid "internal: compare_selectors(1)" msgstr "" -#: objc-lang.c:680 +#: objc-lang.c:681 msgid "internal: compare_selectors(2)" msgstr "" -#: objc-lang.c:725 objc-lang.c:876 +#: objc-lang.c:726 objc-lang.c:877 #, possible-c-format msgid "Regexp is too long: %s" msgstr "" -#: objc-lang.c:738 objc-lang.c:889 symtab.c:3093 thread.c:1327 +#: objc-lang.c:739 objc-lang.c:890 symtab.c:3283 thread.c:1320 #, possible-c-format msgid "Invalid regexp (%s): %s" msgstr "" -#: objc-lang.c:758 +#: objc-lang.c:759 #, possible-c-format msgid "Bad method name '%s'" msgstr "" -#: objc-lang.c:775 +#: objc-lang.c:776 #, possible-c-format msgid "" "Selectors matching \"%s\":\n" "\n" msgstr "" -#: objc-lang.c:822 +#: objc-lang.c:823 #, possible-c-format msgid "No selectors matching \"%s\"\n" msgstr "" -#: objc-lang.c:841 +#: objc-lang.c:842 msgid "internal: compare_classes(1)" msgstr "" -#: objc-lang.c:913 +#: objc-lang.c:914 #, possible-c-format msgid "" "Classes matching \"%s\":\n" "\n" msgstr "" -#: objc-lang.c:952 +#: objc-lang.c:953 #, possible-c-format msgid "No classes matching \"%s\"\n" msgstr "" -#: objc-lang.c:1469 +#: objc-lang.c:1354 msgid "Unable to locate _NSPrintForDebugger in child process" msgstr "" -#: objc-lang.c:1475 +#: objc-lang.c:1360 msgid "object returns null description" msgstr "" -#: objc-lang.c:1486 +#: objc-lang.c:1371 msgid "" msgstr "" #. INFO SELECTORS command. -#: objc-lang.c:1643 +#: objc-lang.c:1528 msgid "All Objective-C selectors, or those matching REGEXP." msgstr "" #. INFO CLASSES command. -#: objc-lang.c:1645 +#: objc-lang.c:1530 msgid "All Objective-C classes, or those matching REGEXP." msgstr "" -#: objc-lang.c:1647 +#: objc-lang.c:1532 msgid "Ask an Objective-C object to print itself." msgstr "" -#: objfiles.c:231 solib.c:510 symfile.c:2541 +#: objfiles.c:222 solib.c:481 symfile.c:2540 #, possible-c-format msgid "Can't find the file sections in `%s': %s" msgstr "" -#: objfiles.c:353 +#: objfiles.c:340 msgid "Entry point address is not known." msgstr "" -#: objfiles.c:442 +#: objfiles.c:429 msgid "put_objfile_before: before objfile not in list" msgstr "" -#: objfiles.c:494 +#: objfiles.c:481 msgid "unlink_objfile: objfile already unlinked" msgstr "" -#: objfiles.c:1229 +#: objfiles.c:1217 #, possible-c-format msgid "" "unexpected overlap between:\n" @@ -15228,43 +15799,43 @@ "Will ignore section B" msgstr "" -#: objfiles.c:1514 +#: objfiles.c:1502 #, possible-c-format msgid "cannot close \"%s\": %s" msgstr "" -#: objfiles.h:669 +#: objfiles.h:641 msgid "sect_index_data not initialized" msgstr "" -#: objfiles.h:675 +#: objfiles.h:647 msgid "sect_index_rodata not initialized" msgstr "" -#: objfiles.h:681 +#: objfiles.h:653 msgid "sect_index_text not initialized" msgstr "" -#: observer.c:63 +#: observer.c:62 #, possible-c-format msgid "Observer debugging is %s.\n" msgstr "" #. We should never reach this point. However, this should not be #. a very serious error, so simply report a warning to the user. -#: observer.c:155 +#: observer.c:154 msgid "Failed to detach observer" msgstr "" -#: observer.c:209 +#: observer.c:208 msgid "Set observer debugging." msgstr "" -#: observer.c:210 +#: observer.c:209 msgid "Show observer debugging." msgstr "" -#: observer.c:211 +#: observer.c:210 msgid "When non-zero, observer debugging is enabled." msgstr "" @@ -15273,113 +15844,113 @@ msgid "Invalid OpenCL vector size: %d" msgstr "" -#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:446 opencl-lang.c:563 -#: opencl-lang.c:656 opencl-lang.c:875 valarith.c:1418 valarith.c:1774 -#: valarith.c:1810 valops.c:556 valops.c:899 +#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:447 opencl-lang.c:564 +#: opencl-lang.c:657 opencl-lang.c:876 valarith.c:1410 valarith.c:1766 +#: valarith.c:1802 valops.c:554 valops.c:897 msgid "Could not determine the vector bounds" msgstr "" -#: opencl-lang.c:454 +#: opencl-lang.c:455 msgid "Invalid OpenCL vector size" msgstr "" -#: opencl-lang.c:501 opencl-lang.c:521 opencl-lang.c:526 opencl-lang.c:530 -#: opencl-lang.c:540 +#: opencl-lang.c:502 opencl-lang.c:522 opencl-lang.c:527 opencl-lang.c:531 +#: opencl-lang.c:541 #, possible-c-format msgid "Invalid OpenCL vector component accessor %s" msgstr "" -#: opencl-lang.c:625 +#: opencl-lang.c:626 msgid "Attempt to perform an unsupported operation" msgstr "" -#: opencl-lang.c:649 +#: opencl-lang.c:650 msgid "Vector operations are not supported on scalar types" msgstr "" -#: opencl-lang.c:663 opencl-lang.c:882 valarith.c:1428 +#: opencl-lang.c:664 opencl-lang.c:883 valarith.c:1420 msgid "Cannot perform operation on vectors with different types" msgstr "" -#: opencl-lang.c:718 valarith.c:1471 +#: opencl-lang.c:719 valarith.c:1463 msgid "Argument to operation not a number or boolean." msgstr "" #. Throw an error if arg2 or arg3 aren't vectors. -#: opencl-lang.c:865 +#: opencl-lang.c:866 msgid "Cannot perform conditional operation on incompatible types" msgstr "" -#: opencl-lang.c:888 +#: opencl-lang.c:889 msgid "Cannot perform conditional operation on vectors with different sizes" msgstr "" -#: osabi.c:140 +#: osabi.c:139 #, possible-c-format msgid "" "gdbarch_register_osabi: An attempt to register a handler for OS ABI \"%s\" " "for architecture %s was made. The handler will not be registered" msgstr "" -#: osabi.c:158 +#: osabi.c:157 #, possible-c-format msgid "" "gdbarch_register_osabi: A handler for OS ABI \"%s\" has already been " "registered for architecture %s" msgstr "" -#: osabi.c:252 +#: osabi.c:251 #, possible-c-format msgid "" "gdbarch_lookup_osabi: invalid OS ABI (%d) from sniffer for architecture %s " "flavour %d" msgstr "" -#: osabi.c:271 +#: osabi.c:270 #, possible-c-format msgid "" "gdbarch_lookup_osabi: multiple %sspecific OS ABI match for architecture %s " "flavour %d: first match \"%s\", second match \"%s\"" msgstr "" -#: osabi.c:462 +#: osabi.c:461 #, possible-c-format msgid "generic_elf_osabi_sniff_abi_tag_sections: unknown OS number %d" msgstr "" -#: osabi.c:602 +#: osabi.c:597 #, possible-c-format msgid "Invalid OS ABI \"%s\" passed to command handler." msgstr "" -#: osabi.c:610 +#: osabi.c:605 msgid "Updating OS ABI failed." msgstr "" -#: osabi.c:619 +#: osabi.c:614 #, possible-c-format msgid "The current OS ABI is \"auto\" (currently \"%s\").\n" msgstr "" -#: osabi.c:623 +#: osabi.c:618 #, possible-c-format msgid "The current OS ABI is \"%s\".\n" msgstr "" -#: osabi.c:627 +#: osabi.c:622 #, possible-c-format msgid "The default OS ABI is \"%s\".\n" msgstr "" -#: osabi.c:639 +#: osabi.c:634 msgid "_initialize_gdb_osabi: gdb_osabi_names[] is inconsistent" msgstr "" -#: osabi.c:649 +#: osabi.c:644 msgid "Set OS ABI of target." msgstr "" -#: osabi.c:650 +#: osabi.c:645 msgid "Show OS ABI of target." msgstr "" @@ -15407,466 +15978,454 @@ msgid "Can not fetch data now." msgstr "" -#: osdata.c:306 +#: osdata.c:307 msgid "Available types of OS data not reported." msgstr "" -#: osdata.c:372 +#: osdata.c:392 msgid "Show OS data ARG." msgstr "" -#: p-typeprint.c:301 -msgid "type not handled in pascal_type_print_varspec_prefix()" -msgstr "" - -#: p-typeprint.c:420 -msgid "type not handled in pascal_type_print_varspec_suffix()" -msgstr "" - -#: p-valprint.c:566 -#, possible-c-format -msgid "Invalid pascal type code %d in symbol table." -msgstr "" - -#: p-valprint.c:615 -#, possible-c-format -msgid "Printing of pascal static members is %s.\n" -msgstr "" - -#: p-valprint.c:1066 -msgid "Set printing of pascal static members." -msgstr "" - -#: p-valprint.c:1067 -msgid "Show printing of pascal static members." -msgstr "" - -#: parse.c:110 +#: parse.c:109 #, possible-c-format msgid "Expression debugging is %s.\n" msgstr "" -#: parse.c:121 +#: parse.c:120 #, possible-c-format msgid "Parser debugging is %s.\n" msgstr "" -#: parse.c:833 +#: parse.c:832 msgid "?error in operator_length_standard" msgstr "" -#: parse.c:1104 +#: parse.c:1103 msgid "expression to compute" msgstr "" -#: parse.c:1217 +#: parse.c:1216 msgid "Junk after end of expression." msgstr "" -#: parse.c:1653 +#: parse.c:1652 msgid "Set expression debugging." msgstr "" -#: parse.c:1654 +#: parse.c:1653 msgid "Show expression debugging." msgstr "" -#: parse.c:1655 +#: parse.c:1654 msgid "" "When non-zero, the internal representation of expressions will be printed." msgstr "" -#: parse.c:1662 +#: parse.c:1661 msgid "Set parser debugging." msgstr "" -#: parse.c:1663 +#: parse.c:1662 msgid "Show parser debugging." msgstr "" -#: parse.c:1664 +#: parse.c:1663 msgid "When non-zero, expression parser tracing will be enabled." msgstr "" -#: ppc-linux-nat.c:426 ppc-linux-nat.c:894 +#: ppc-linux-nat.c:425 ppc-linux-nat.c:893 msgid "Unable to fetch VSX register" msgstr "" -#: ppc-linux-nat.c:455 ppc-linux-nat.c:924 +#: ppc-linux-nat.c:454 ppc-linux-nat.c:923 msgid "Unable to fetch AltiVec register" msgstr "" #. Anything else needs to be reported. -#: ppc-linux-nat.c:493 ppc-linux-nat.c:2356 +#: ppc-linux-nat.c:492 ppc-linux-nat.c:2428 msgid "Unable to fetch SPE registers" msgstr "" -#: ppc-linux-nat.c:628 +#: ppc-linux-nat.c:627 #, possible-c-format msgid "fetch_register: unexpected byte order: %d" msgstr "" -#: ppc-linux-nat.c:686 ppc-linux-nat.c:2369 +#: ppc-linux-nat.c:685 ppc-linux-nat.c:2441 msgid "Unable to fetch VSX registers" msgstr "" -#: ppc-linux-nat.c:705 ppc-linux-nat.c:2382 +#: ppc-linux-nat.c:704 ppc-linux-nat.c:2454 msgid "Unable to fetch AltiVec registers" msgstr "" -#: ppc-linux-nat.c:732 ppc-linux-nat.c:1206 +#: ppc-linux-nat.c:731 ppc-linux-nat.c:1205 msgid "Couldn't get general-purpose registers." msgstr "" -#: ppc-linux-nat.c:784 ppc-linux-nat.c:1268 +#: ppc-linux-nat.c:783 ppc-linux-nat.c:1267 msgid "Couldn't get floating-point registers." msgstr "" -#: ppc-linux-nat.c:902 +#: ppc-linux-nat.c:901 msgid "Unable to store VSX register" msgstr "" -#: ppc-linux-nat.c:938 +#: ppc-linux-nat.c:937 msgid "Unable to store AltiVec register" msgstr "" #. Anything else needs to be reported. -#: ppc-linux-nat.c:965 +#: ppc-linux-nat.c:964 msgid "Unable to set SPE registers" msgstr "" -#: ppc-linux-nat.c:1152 +#: ppc-linux-nat.c:1151 msgid "Couldn't get VSX registers" msgstr "" -#: ppc-linux-nat.c:1158 +#: ppc-linux-nat.c:1157 msgid "Couldn't write VSX registers" msgstr "" -#: ppc-linux-nat.c:1175 +#: ppc-linux-nat.c:1174 msgid "Couldn't get AltiVec registers" msgstr "" -#: ppc-linux-nat.c:1181 +#: ppc-linux-nat.c:1180 msgid "Couldn't write AltiVec registers" msgstr "" -#: ppc-linux-nat.c:1218 +#: ppc-linux-nat.c:1217 msgid "Couldn't set general-purpose registers." msgstr "" -#: ppc-linux-nat.c:1280 +#: ppc-linux-nat.c:1279 msgid "Couldn't set floating-point registers." msgstr "" -#: ppc-linux-nat.c:1586 +#: ppc-linux-nat.c:1585 msgid "Unexpected error setting breakpoint or watchpoint" msgstr "" -#: ppc-linux-nat.c:1633 +#: ppc-linux-nat.c:1632 msgid "Unexpected error deleting breakpoint or watchpoint" msgstr "" -#: ppc-linux-tdep.c:1068 +#: ppc-linux-nat.c:2290 +msgid "The given mask covers kernel address space and cannot be used.\n" +msgstr "" + +#: ppc-linux-tdep.c:1067 msgid "Cannot find AT_ENTRY auxiliary vector entry." msgstr "" #. Can't happen. -#: ppc-sysv-tdep.c:664 +#: ppc-sysv-tdep.c:672 msgid "Unknown decimal float size." msgstr "" -#: printcmd.c:114 +#: printcmd.c:110 #, possible-c-format msgid "" "The largest offset that will be printed in form is %s.\n" msgstr "" -#: printcmd.c:126 +#: printcmd.c:122 #, possible-c-format msgid "Printing of source filename and line number with is %s.\n" msgstr "" -#: printcmd.c:451 printcmd.c:527 +#: printcmd.c:447 printcmd.c:523 #, possible-c-format msgid "Undefined output size \"%c\"." msgstr "" -#: printcmd.c:549 +#: printcmd.c:545 #, possible-c-format msgid "Undefined output format \"%c\"." msgstr "" -#: printcmd.c:862 +#: printcmd.c:858 #, possible-c-format msgid "Unable to display strings with size '%c', using 'b' instead." msgstr "" -#: printcmd.c:930 +#: printcmd.c:926 #, possible-c-format msgid "Size letters are meaningless in \"%s\" command." msgstr "" -#: printcmd.c:932 +#: printcmd.c:928 #, possible-c-format msgid "Item count other than 1 is meaningless in \"%s\" command." msgstr "" -#: printcmd.c:935 +#: printcmd.c:931 #, possible-c-format msgid "Format letter \"%c\" is meaningless in \"%s\" command." msgstr "" -#: printcmd.c:1102 +#: printcmd.c:1098 msgid "address" msgstr "" -#: printcmd.c:1124 +#: printcmd.c:1120 msgid "mapped" msgstr "" -#: printcmd.c:1124 +#: printcmd.c:1120 msgid "unmapped" msgstr "" -#: printcmd.c:1145 +#: printcmd.c:1141 #, possible-c-format msgid "%s in load address range of %s overlay section %s of %s\n" msgstr "" -#: printcmd.c:1149 +#: printcmd.c:1145 #, possible-c-format msgid "%s in load address range of section %s of %s\n" msgstr "" -#: printcmd.c:1154 +#: printcmd.c:1150 #, possible-c-format msgid "%s in %s overlay section %s of %s\n" msgstr "" -#: printcmd.c:1157 +#: printcmd.c:1153 #, possible-c-format msgid "%s in section %s of %s\n" msgstr "" -#: printcmd.c:1162 +#: printcmd.c:1158 #, possible-c-format msgid "%s in load address range of %s overlay section %s\n" msgstr "" -#: printcmd.c:1166 +#: printcmd.c:1162 #, possible-c-format msgid "%s in load address range of section %s\n" msgstr "" -#: printcmd.c:1170 +#: printcmd.c:1166 #, possible-c-format msgid "%s in %s overlay section %s\n" msgstr "" -#: printcmd.c:1173 +#: printcmd.c:1169 #, possible-c-format msgid "%s in section %s\n" msgstr "" -#: printcmd.c:1180 +#: printcmd.c:1176 #, possible-c-format msgid "No symbol matches %s.\n" msgstr "" -#: printcmd.c:1197 +#: printcmd.c:1193 msgid "Argument required." msgstr "" -#: printcmd.c:1294 +#: printcmd.c:1290 #, possible-c-format msgid "an argument in register %s" msgstr "" -#: printcmd.c:1297 +#: printcmd.c:1293 #, possible-c-format msgid "a variable in register %s" msgstr "" -#: printcmd.c:1302 printcmd.c:1372 +#: printcmd.c:1298 printcmd.c:1368 msgid "static storage at address " msgstr "" -#: printcmd.c:1308 printcmd.c:1345 printcmd.c:1377 +#: printcmd.c:1304 printcmd.c:1341 printcmd.c:1373 msgid "" ",\n" " -- loaded at " msgstr "" -#: printcmd.c:1310 printcmd.c:1347 printcmd.c:1379 +#: printcmd.c:1306 printcmd.c:1343 printcmd.c:1375 #, possible-c-format msgid " in overlay section %s" msgstr "" -#: printcmd.c:1318 +#: printcmd.c:1314 #, possible-c-format msgid "address of an argument in register %s" msgstr "" -#: printcmd.c:1323 +#: printcmd.c:1319 #, possible-c-format msgid "an argument at offset %ld" msgstr "" -#: printcmd.c:1327 +#: printcmd.c:1323 #, possible-c-format msgid "a local variable at frame offset %ld" msgstr "" -#: printcmd.c:1331 +#: printcmd.c:1327 #, possible-c-format msgid "a reference argument at offset %ld" msgstr "" -#: printcmd.c:1335 +#: printcmd.c:1331 msgid "a typedef" msgstr "" -#: printcmd.c:1339 +#: printcmd.c:1335 msgid "a function at address " msgstr "" -#: printcmd.c:1366 +#: printcmd.c:1362 #, possible-c-format msgid "" "a thread-local variable at offset %s in the thread-local storage for `%s'" msgstr "" -#: printcmd.c:1388 +#: printcmd.c:1384 msgid "optimized out" msgstr "" -#: printcmd.c:1392 +#: printcmd.c:1388 msgid "of unknown (botched) type" msgstr "" -#: printcmd.c:1446 +#: printcmd.c:1442 msgid "starting display address" msgstr "" -#: printcmd.c:1605 +#: printcmd.c:1601 msgid "one or more display numbers" msgstr "" -#: printcmd.c:1615 +#: printcmd.c:1611 #, possible-c-format msgid "bad display number at or near '%s'" msgstr "" -#: printcmd.c:1624 printcmd.c:1814 +#: printcmd.c:1620 printcmd.c:1827 #, possible-c-format msgid "No display number %d.\n" msgstr "" -#: printcmd.c:1649 +#: printcmd.c:1645 msgid "Delete all auto-display expressions? " msgstr "" -#: printcmd.c:1699 +#: printcmd.c:1696 #, possible-c-format msgid "Unable to display \"%s\": %s" msgstr "" -#: printcmd.c:1824 +#: printcmd.c:1759 #, possible-c-format -msgid "Disabling display %d to avoid infinite recursion.\n" +msgid "\n" +msgstr "" + +#: printcmd.c:1791 value.c:2118 +#, possible-c-format +msgid "" msgstr "" #: printcmd.c:1837 +#, possible-c-format +msgid "Disabling display %d to avoid infinite recursion.\n" +msgstr "" + +#: printcmd.c:1850 msgid "There are no auto-display expressions now.\n" msgstr "" -#: printcmd.c:1839 +#: printcmd.c:1852 msgid "" "Auto-display expressions now in effect:\n" "Num Enb Expression\n" msgstr "" -#: printcmd.c:1852 +#: printcmd.c:1865 msgid " (cannot be evaluated in the current context)" msgstr "" -#: printcmd.c:1989 +#: printcmd.c:2003 msgid "format-control string and values to print" msgstr "" -#: printcmd.c:1995 +#: printcmd.c:2009 msgid "Bad format string, missing '\"'." msgstr "" -#: printcmd.c:2008 +#: printcmd.c:2022 msgid "Bad format string, non-terminated '\"'." msgstr "" #. ??? TODO: handle other escape sequences. -#: printcmd.c:2042 +#: printcmd.c:2056 #, possible-c-format msgid "Unrecognized escape character \\%c in format string." msgstr "" -#: printcmd.c:2058 +#: printcmd.c:2072 msgid "Invalid argument syntax" msgstr "" -#: printcmd.c:2248 +#: printcmd.c:2262 msgid "`*' not supported for precision or width in printf" msgstr "" -#: printcmd.c:2251 +#: printcmd.c:2265 msgid "Format specifier `n' not supported in printf" msgstr "" -#: printcmd.c:2254 +#: printcmd.c:2268 msgid "Incomplete format specifier at end of format string" msgstr "" -#: printcmd.c:2257 +#: printcmd.c:2271 #, possible-c-format msgid "Unrecognized format specifier '%c' in printf" msgstr "" -#: printcmd.c:2261 +#: printcmd.c:2275 #, possible-c-format msgid "Inappropriate modifiers to format specifier '%c' in printf" msgstr "" -#: printcmd.c:2320 +#: printcmd.c:2334 msgid "Wrong number of arguments for specified format-string" msgstr "" -#: printcmd.c:2416 +#: printcmd.c:2430 #, possible-c-format msgid "expected wchar_t argument for %%lc" msgstr "" -#: printcmd.c:2446 printcmd.c:2463 value.c:2123 +#: printcmd.c:2460 printcmd.c:2477 value.c:2152 msgid "Invalid floating value found in program." msgstr "" -#: printcmd.c:2470 +#: printcmd.c:2484 msgid "long double not supported in printf" msgstr "" -#: printcmd.c:2481 +#: printcmd.c:2495 msgid "long long not supported in printf" msgstr "" -#: printcmd.c:2716 +#: printcmd.c:2730 msgid "Describe where symbol SYM is stored." msgstr "" -#: printcmd.c:2718 +#: printcmd.c:2732 msgid "" "Describe what symbol is at location ADDR.\n" "Only for symbols with fixed locations (global or static scope)." msgstr "" -#: printcmd.c:2722 +#: printcmd.c:2736 msgid "" "Examine memory: x/FMT ADDRESS.\n" "ADDRESS is an expression for the memory address to examine.\n" @@ -15882,15 +16441,15 @@ "with this command or \"print\"." msgstr "" -#: printcmd.c:2737 +#: printcmd.c:2751 msgid "Print line number and file of definition of variable." msgstr "" -#: printcmd.c:2740 +#: printcmd.c:2754 msgid "Expressions to display when program stops, with code numbers." msgstr "" -#: printcmd.c:2743 +#: printcmd.c:2757 msgid "" "Cancel some expressions to be displayed when program stops.\n" "Arguments are the code numbers of the expressions to stop displaying.\n" @@ -15899,7 +16458,7 @@ "Do \"info display\" to see current list of code numbers." msgstr "" -#: printcmd.c:2751 +#: printcmd.c:2765 msgid "" "Print value of expression EXP each time the program stops.\n" "/FMT may be used before EXP as in the \"print\" command.\n" @@ -15911,7 +16470,7 @@ "Use \"undisplay\" to cancel display requests previously made." msgstr "" -#: printcmd.c:2760 +#: printcmd.c:2774 msgid "" "Enable some expressions to be displayed when program stops.\n" "Arguments are the code numbers of the expressions to resume displaying.\n" @@ -15919,7 +16478,7 @@ "Do \"info display\" to see current list of code numbers." msgstr "" -#: printcmd.c:2766 +#: printcmd.c:2780 msgid "" "Disable some expressions to be displayed when program stops.\n" "Arguments are the code numbers of the expressions to stop displaying.\n" @@ -15927,7 +16486,7 @@ "Do \"info display\" to see current list of code numbers." msgstr "" -#: printcmd.c:2772 +#: printcmd.c:2786 msgid "" "Cancel some expressions to be displayed when program stops.\n" "Arguments are the code numbers of the expressions to stop displaying.\n" @@ -15935,19 +16494,19 @@ "Do \"info display\" to see current list of code numbers." msgstr "" -#: printcmd.c:2778 +#: printcmd.c:2792 msgid "" "printf \"printf format string\", arg1, arg2, arg3, ..., argn\n" "This is useful for formatted output in user-defined commands." msgstr "" -#: printcmd.c:2782 +#: printcmd.c:2796 msgid "" "Like \"print\" but don't put in value history and don't print newline.\n" "This is useful in user-defined commands." msgstr "" -#: printcmd.c:2786 printcmd.c:2798 +#: printcmd.c:2800 printcmd.c:2812 msgid "" "Evaluate expression EXP and assign result to variable VAR, using assignment\n" "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n" @@ -15961,7 +16520,7 @@ msgstr "" #. "call" is the same as "set", but handy for dbx users to call fns. -#: printcmd.c:2809 +#: printcmd.c:2823 msgid "" "Call a function in the program.\n" "The argument is the function name and arguments, in the notation of the\n" @@ -15969,7 +16528,7 @@ "history, if it is not void." msgstr "" -#: printcmd.c:2816 +#: printcmd.c:2830 msgid "" "Evaluate expression EXP and assign result to variable VAR, using assignment\n" "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n" @@ -15979,7 +16538,7 @@ "This may usually be abbreviated to simply \"set\"." msgstr "" -#: printcmd.c:2825 +#: printcmd.c:2839 msgid "" "Print value of expression EXP.\n" "Variables accessible are those of the lexical environment of the selected\n" @@ -16005,29 +16564,29 @@ "but no count or size letter (see \"x\" command)." msgstr "" -#: printcmd.c:2850 +#: printcmd.c:2864 msgid "" "Same as \"print\" command, except that if you are running in the epoch\n" "environment, the value is printed in its own window." msgstr "" -#: printcmd.c:2856 +#: printcmd.c:2870 msgid "Set the largest offset that will be printed in form." msgstr "" -#: printcmd.c:2857 +#: printcmd.c:2871 msgid "Show the largest offset that will be printed in form." msgstr "" -#: printcmd.c:2863 +#: printcmd.c:2877 msgid "Set printing of source filename and line number with ." msgstr "" -#: printcmd.c:2864 +#: printcmd.c:2878 msgid "Show printing of source filename and line number with ." msgstr "" -#: printcmd.c:2870 +#: printcmd.c:2884 msgid "" "Convert \"printf format string\", arg1, arg2, arg3, ..., argn to\n" "a command line, and call it." @@ -16049,12 +16608,12 @@ msgid "Show filename for /proc tracefile." msgstr "" -#: procfs.c:490 +#: procfs.c:489 #, possible-c-format msgid "procfs: couldn't find pid %d (kernel thread %d) in procinfo list." msgstr "" -#: procfs.c:494 +#: procfs.c:493 #, possible-c-format msgid "procfs: couldn't find pid %d in procinfo list." msgstr "" @@ -16064,177 +16623,177 @@ msgid "load_syscalls: Can't open /proc/%d/sysent" msgstr "" -#: procfs.c:896 procfs.c:911 +#: procfs.c:897 procfs.c:911 #, possible-c-format msgid "load_syscalls: Error reading /proc/%d/sysent" msgstr "" -#: procfs.c:901 +#: procfs.c:902 #, possible-c-format msgid "load_syscalls: /proc/%d/sysent contains no syscalls!" msgstr "" -#: procfs.c:1444 +#: procfs.c:1442 #, possible-c-format msgid "procfs: modify_flag failed to turn %s %s" msgstr "" -#: procfs.c:1721 +#: procfs.c:1719 msgid "procfs: set_traced_signals failed" msgstr "" -#: procfs.c:2813 +#: procfs.c:2811 #, possible-c-format msgid "procfs_find_LDT_entry: could not find procinfo for %d:%ld." msgstr "" -#: procfs.c:2820 +#: procfs.c:2818 #, possible-c-format msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld." msgstr "" -#: procfs.c:3302 +#: procfs.c:3300 #, possible-c-format msgid "Attaching to program `%s', %s\n" msgstr "" -#: procfs.c:3352 +#: procfs.c:3350 msgid "procfs: out of memory in 'attach'" msgstr "" -#: procfs.c:3441 +#: procfs.c:3439 msgid "Was stopped when attached, make it runnable again? " msgstr "" -#: procfs.c:3484 +#: procfs.c:3482 #, possible-c-format msgid "procfs: fetch_registers failed to find procinfo for %s" msgstr "" -#: procfs.c:3533 +#: procfs.c:3531 #, possible-c-format msgid "procfs: store_registers: failed to find procinfo for %s" msgstr "" -#: procfs.c:3640 +#: procfs.c:3638 msgid "Unable to remove __dbx_link breakpoint." msgstr "" -#: procfs.c:3695 +#: procfs.c:3693 #, possible-c-format msgid "Failed to create a bfd: %s." msgstr "" -#: procfs.c:3716 +#: procfs.c:3714 msgid "Failed to insert dbx_link breakpoint." msgstr "" #. /proc file not found; presumably child has terminated. #. "wait" for the child's exit. #. wrong child? -#: procfs.c:3855 +#: procfs.c:3853 #, possible-c-format msgid "procfs: couldn't stop process %d: wait returned %d." msgstr "" -#: procfs.c:3963 +#: procfs.c:3961 msgid "procfs: trapped on entry to " msgstr "" -#: procfs.c:3973 procfs.c:4076 +#: procfs.c:3971 procfs.c:4074 #, possible-c-format msgid "%ld syscall arguments:\n" msgstr "" -#: procfs.c:4066 +#: procfs.c:4064 msgid "procfs: trapped on exit from " msgstr "" -#: procfs.c:4095 +#: procfs.c:4093 #, possible-c-format msgid "Retry #%d:\n" msgstr "" -#: procfs.c:4171 procfs.c:4179 +#: procfs.c:4169 procfs.c:4177 msgid "child stopped for unknown reason:\n" msgstr "" -#: procfs.c:4173 procfs.c:4181 +#: procfs.c:4171 procfs.c:4179 msgid "... giving up..." msgstr "" -#: procfs.c:4204 +#: procfs.c:4202 msgid "procfs: ...giving up..." msgstr "" -#: procfs.c:4459 +#: procfs.c:4457 msgid "" "resume: target already running. Pretend to resume, and hope for the best!" msgstr "" -#: procfs.c:4495 +#: procfs.c:4493 #, possible-c-format msgid "\tUsing the running image of %s %s via /proc.\n" msgstr "" -#: procfs.c:4631 +#: procfs.c:4629 msgid "procfs: out of memory in 'init_inferior'" msgstr "" -#: procfs.c:4740 +#: procfs.c:4738 msgid "procfs: create_procinfo failed in child." msgstr "" #. Not found. This must be an error rather than merely passing #. the file to execlp(), because execlp() would try all the #. exec()s, causing GDB to get confused. -#: procfs.c:4911 +#: procfs.c:4909 #, possible-c-format msgid "procfs:%d -- Can't find shell %s in PATH" msgstr "" -#: procfs.c:5453 +#: procfs.c:5456 #, possible-c-format msgid "process %d flags:\n" msgstr "" -#: procfs.c:5463 +#: procfs.c:5466 #, possible-c-format msgid "thread %d flags:\n" msgstr "" -#: procfs.c:5523 +#: procfs.c:5526 msgid "you must be debugging a process to use this command." msgstr "" -#: procfs.c:5526 +#: procfs.c:5529 msgid "system call to trace" msgstr "" -#: procfs.c:5567 +#: procfs.c:5570 msgid "" "Show /proc process information about any running process.\n" "Specify process id, or use the program being debugged by default.\n" "Specify keyword 'mappings' for detailed info on memory mappings." msgstr "" -#: procfs.c:5572 +#: procfs.c:5575 msgid "Give a trace of entries into the syscall." msgstr "" -#: procfs.c:5574 +#: procfs.c:5577 msgid "Give a trace of exits from the syscall." msgstr "" -#: procfs.c:5576 +#: procfs.c:5579 msgid "Cancel a trace of entries into the syscall." msgstr "" -#: procfs.c:5578 +#: procfs.c:5581 msgid "Cancel a trace of exits from the syscall." msgstr "" -#: procfs.c:5774 +#: procfs.c:5777 msgid "gcore not implemented for this host." msgstr "" @@ -16247,1023 +16806,1081 @@ msgid "Info about currently known program spaces." msgstr "" -#: psymtab.c:88 symfile.c:1118 +#: psymtab.c:88 symfile.c:1120 #, possible-c-format msgid "Reading symbols from %s..." msgstr "" -#: psymtab.c:98 symfile.c:1147 +#: psymtab.c:98 symfile.c:1149 msgid "(no debugging symbols found)..." msgstr "" -#: psymtab.c:197 -#, possible-c-format -msgid "Internal: readin %s pst for `%s' found when no symtab found." -msgstr "" - #. Might want to error() here (in case symtab is corrupt and #. will cause a core dump), but maybe we can successfully #. continue, so let's not. -#: psymtab.c:366 +#: psymtab.c:394 #, possible-c-format msgid "(Internal error: pc %s in read in psymtab, but not in symtab.)\n" msgstr "" -#: psymtab.c:806 +#: psymtab.c:842 msgid "select_source_symtab: readin pst found and no symtabs." msgstr "" -#: psymtab.c:1002 +#: psymtab.c:1040 #, possible-c-format msgid " Number of psym tables (not yet expanded): %d\n" msgstr "" -#: psymtab.c:1676 +#: psymtab.c:1722 msgid "" "print-psymbols takes an output file name and optional symbol file name" msgstr "" -#: python/py-value.c:132 -msgid "Value object creation takes only 1 argument" +#: p-typeprint.c:300 +msgid "type not handled in pascal_type_print_varspec_prefix()" msgstr "" -#: python/py-value.c:140 -msgid "Could not allocate memory to create Value object." +#: p-typeprint.c:419 +msgid "type not handled in pascal_type_print_varspec_suffix()" msgstr "" -#: python/py-value.c:386 -msgid "Argument must be a type." +#: p-valprint.c:575 +#, possible-c-format +msgid "Invalid pascal type code %d in symbol table." +msgstr "" + +#: p-valprint.c:624 +#, possible-c-format +msgid "Printing of pascal static members is %s.\n" +msgstr "" + +#: p-valprint.c:1075 +msgid "Set printing of pascal static members." +msgstr "" + +#: p-valprint.c:1076 +msgid "Show printing of pascal static members." +msgstr "" + +#: python/py-auto-load.c:260 +#, possible-c-format +msgid "Invalid entry in %s section" +msgstr "" + +#: python/py-auto-load.c:275 +#, possible-c-format +msgid "Non-null-terminated path in %s: %s" +msgstr "" + +#: python/py-auto-load.c:282 +#, possible-c-format +msgid "Empty path in %s" +msgstr "" + +#: python/py-auto-load.c:304 +#, possible-c-format +msgid "" +"Missing auto-load scripts referenced in section %s\n" +"of file %s\n" +"Use `info auto-load-scripts [REGEXP]' to list them." +msgstr "" + +#: python/py-auto-load.c:345 +#, possible-c-format +msgid "Couldn't read %s section of %s" +msgstr "" + +#: python/py-auto-load.c:549 solib.c:882 solib.c:964 xcoffsolib.c:113 +#, possible-c-format +msgid "Invalid regexp: %s" +msgstr "" + +#: python/py-auto-load.c:613 +msgid "Set the debugger's behaviour regarding auto-loaded scripts." +msgstr "" + +#: python/py-auto-load.c:614 +msgid "Show the debugger's behaviour regarding auto-loaded scripts." msgstr "" -#: python/py-value.c:438 python/py-value.c:901 python/py-value.c:938 -msgid "Invalid operation on gdb.Value." +#: python/py-auto-load.c:615 +msgid "" +"If enabled, auto-loaded scripts are loaded when the debugger reads\n" +"an executable or shared library." msgstr "" -#: python/py-value.c:482 -msgid "Cannot subscript requested type." +#: python/py-auto-load.c:624 +msgid "" +"Print the list of automatically loaded scripts.\n" +"Usage: info auto-load-scripts [REGEXP]" msgstr "" -#: python/py-value.c:499 -msgid "Setting of struct elements is not currently supported." +#. Require a valid block. All access to block_object->block should be +#. gated by this call. +#: python/py-block.c:64 +msgid "Block is invalid." msgstr "" -#: python/py-value.c:518 -msgid "Value is not callable (not TYPE_CODE_FUNC)." +#. Require a valid block. This macro is called during block iterator +#. creation, and at each next call. +#: python/py-block.c:76 +msgid "Source block for iterator is invalid." msgstr "" -#: python/py-value.c:980 -msgid "Cannot convert value to int." +#: python/py-block.c:322 +msgid "Symbol is null." msgstr "" -#: python/py-value.c:1005 -msgid "Cannot convert value to long." +#: python/py-block.c:391 python/py-frame.c:239 +msgid "Cannot locate object file for block." msgstr "" -#: python/py-value.c:1031 -msgid "Cannot convert value to float." +#: python/py-breakpoint.c:124 +msgid "Cannot delete `enabled' attribute." msgstr "" -#: python/py-value.c:1171 -#, possible-c-format -msgid "Could not convert Python object: %s." +#: python/py-breakpoint.c:131 +msgid "The value of `enabled' must be a boolean." msgstr "" -#: python/py-param.c:133 -msgid "String required for filename." +#: python/py-breakpoint.c:163 +msgid "Cannot delete `silent' attribute." msgstr "" -#: python/py-param.c:166 -msgid "ENUM arguments must be a string." +#: python/py-breakpoint.c:169 +msgid "The value of `silent' must be a boolean." msgstr "" -#: python/py-param.c:180 -msgid "The value must be member of an enumeration." +#: python/py-breakpoint.c:194 +msgid "Cannot delete `thread' attribute." msgstr "" -#: python/py-param.c:191 -msgid "A boolean argument is required." +#: python/py-breakpoint.c:205 +msgid "Invalid thread ID." msgstr "" -#: python/py-param.c:204 -msgid "A boolean or None is required" +#: python/py-breakpoint.c:214 +msgid "The value of `thread' must be an integer or None." msgstr "" -#: python/py-param.c:232 -msgid "The value must be integer." +#: python/py-breakpoint.c:237 +msgid "Cannot delete `task' attribute." msgstr "" -#: python/py-param.c:257 -msgid "Range exceeded." +#: python/py-breakpoint.c:254 +msgid "Invalid task ID." msgstr "" -#: python/py-param.c:267 -msgid "Unhandled type in parameter value." +#: python/py-breakpoint.c:263 +msgid "The value of `task' must be an integer or None." msgstr "" -#: python/py-param.c:284 -msgid "Cannot delete a parameter's value." +#: python/py-breakpoint.c:308 +msgid "Cannot delete `ignore_count' attribute." msgstr "" -#: python/py-param.c:314 python/py-cmd.c:505 -msgid "This command is not documented." +#: python/py-breakpoint.c:314 +msgid "The value of `ignore_count' must be an integer." msgstr "" -#: python/py-param.c:340 -msgid "Parameter must return a string value." +#: python/py-breakpoint.c:344 +msgid "Cannot delete `hit_count' attribute." msgstr "" -#: python/py-param.c:567 -msgid "An enumeration is required for PARAM_ENUM." +#: python/py-breakpoint.c:357 +msgid "The value of `hit_count' must be zero." msgstr "" -#: python/py-param.c:574 -msgid "The enumeration is not a sequence." +#: python/py-breakpoint.c:439 +msgid "Cannot delete `condition' attribute." msgstr "" -#: python/py-param.c:584 -msgid "The enumeration is empty." +#: python/py-breakpoint.c:642 +msgid "Cannot understand watchpoint access type." msgstr "" -#: python/py-param.c:605 -msgid "The enumeration item not a string." +#: python/py-breakpoint.c:646 +msgid "Do not understand breakpoint type to set." msgstr "" -#: python/py-param.c:667 python/py-cmd.c:441 -msgid "Invalid command class argument." +#: python/py-breakpoint.c:826 +msgid "Error while creating breakpoint from GDB." msgstr "" -#: python/py-param.c:679 -msgid "Invalid parameter class argument." +#: python/py-breakpoint.c:921 +msgid "" +"Cannot set 'stop' method. There is an existing GDB condition attached to " +"the breakpoint." msgstr "" -#: python/py-param.c:686 -msgid "Only PARAM_ENUM accepts a fourth argument." +#: python/py-cmd.c:125 python/py-cmd.c:220 +msgid "Invalid invocation of Python command object." msgstr "" -#: python/py-function.c:48 -msgid "Could not convert value to Python object." +#: python/py-cmd.c:134 +msgid "Python command object missing 'invoke' method." msgstr "" -#: python/py-function.c:73 -msgid "No method named 'invoke' in object." +#: python/py-cmd.c:143 +msgid "Could not convert arguments to Python string." msgstr "" #. An error occurred computing the string representation of the #. error message. This is rare, but we should inform the user. -#: python/py-function.c:99 +#: python/py-cmd.c:171 msgid "" -"An error occurred in a Python convenience function\n" +"An error occurred in a Python command\n" "and then another occurred computing the error message.\n" msgstr "" -#: python/py-function.c:119 +#: python/py-cmd.c:190 #, possible-c-format -msgid "Error occurred in Python convenience function: %s" +msgid "Error occurred in Python command: %s" msgstr "" -#: python/py-function.c:122 -msgid "Error occurred in Python convenience function." +#: python/py-cmd.c:192 +msgid "Error occurred in Python command." msgstr "" -#: python/py-function.c:138 python/py-prettyprint.c:642 python/python.c:187 -#: python/python.c:208 -msgid "Error while executing Python code." +#: python/py-cmd.c:230 python/py-cmd.c:233 +msgid "Could not convert argument to Python string." msgstr "" -#: python/py-function.c:173 -msgid "This function is not documented." +#: python/py-cmd.c:331 +msgid "No command name found." msgstr "" -#. Require a valid symbol. All access to symbol_object->symbol should be -#. gated by this call. -#: python/py-symbol.c:48 -msgid "Symbol is invalid." +#: python/py-cmd.c:363 +#, possible-c-format +msgid "Could not find command prefix %s." msgstr "" -#: python/py-type.c:293 -msgid "Array bound must be an integer" +#: python/py-cmd.c:377 +#, possible-c-format +msgid "'%s' is not a prefix command." msgstr "" -#: python/py-type.c:309 -msgid "Array length must not be negative" +#: python/py-cmd.c:425 +msgid "Command object already initialized." msgstr "" -#: python/py-type.c:355 -msgid "This type does not have a range." +#: python/py-cmd.c:441 python/py-param.c:669 +msgid "Invalid command class argument." msgstr "" -#: python/py-type.c:428 -msgid "Type does not have a target." +#: python/py-cmd.c:448 +msgid "Invalid completion type argument." msgstr "" -#: python/py-type.c:585 -msgid "Null type name." +#: python/py-cmd.c:505 python/py-param.c:314 +msgid "This command is not documented." msgstr "" -#: python/py-type.c:604 -msgid "Type is not a template." +#: python/py-finishbreakpoint.c:190 +msgid "\"FinishBreakpoint\" not meaningful in the outermost frame." msgstr "" -#: python/py-type.c:616 python/py-type.c:669 -#, possible-c-format -msgid "No argument %d in template." +#: python/py-finishbreakpoint.c:196 +msgid "\"FinishBreakpoint\" cannot be set on a dummy frame." msgstr "" -#: python/py-type.c:648 python/py-frame.c:429 -msgid "Second argument must be block." +#: python/py-finishbreakpoint.c:204 python/py-finishbreakpoint.c:305 +msgid "Invalid ID for the `frame' object." msgstr "" -#: python/py-type.c:680 -msgid "Template argument is optimized out" +#: python/py-finishbreakpoint.c:219 +msgid "No thread currently selected." msgstr "" -#: python/py-type.c:1038 -msgid "'block' argument must be a Block." +#: python/py-finishbreakpoint.c:229 +msgid "The value of `internal' must be a boolean." msgstr "" -#. Require a valid symbol table. All access to symtab_object->symtab -#. should be gated by this call. -#: python/py-symtab.c:50 -msgid "Symbol Table is invalid." +#. Require a valid frame. This must be called inside a TRY_CATCH, or +#. another context in which a gdb exception is allowed. +#: python/py-frame.c:54 +msgid "Frame is invalid." msgstr "" -#. Require a valid symbol table and line object. All access to -#. sal_object->sal should be gated by this call. -#: python/py-symtab.c:80 -msgid "Symbol Table and Line is invalid." +#: python/py-frame.c:292 +msgid "Could not allocate frame object." msgstr "" -#: python/py-prettyprint.c:291 valprint.c:393 -msgid "" +#: python/py-frame.c:441 python/py-type.c:859 +msgid "Second argument must be block." msgstr "" -#: python/py-prettyprint.c:815 -msgid "Argument must be a gdb.Value." +#: python/py-frame.c:459 +#, possible-c-format +msgid "Variable '%s' not found." msgstr "" -#: python/py-objfile.c:101 -msgid "Cannot delete the pretty_printers attribute." +#: python/py-frame.c:470 +msgid "Argument must be a symbol or string." msgstr "" -#: python/py-objfile.c:108 -msgid "The pretty_printers attribute must be a list." +#: python/py-frame.c:559 +msgid "Invalid frame stop reason." msgstr "" -#: python/py-auto-load.c:200 -#, possible-c-format -msgid "Invalid entry in %s section" +#: python/py-function.c:86 +msgid "No method named 'invoke' in object." msgstr "" -#: python/py-auto-load.c:215 -#, possible-c-format -msgid "Non-null-terminated path in %s: %s" +#. An error occurred computing the string representation of the +#. error message. This is rare, but we should inform the user. +#: python/py-function.c:113 +msgid "" +"An error occurred in a Python convenience function\n" +"and then another occurred computing the error message.\n" msgstr "" -#: python/py-auto-load.c:222 +#: python/py-function.c:133 #, possible-c-format -msgid "Empty path in %s" +msgid "Error occurred in Python convenience function: %s" msgstr "" -#: python/py-auto-load.c:272 -#, possible-c-format -msgid "%s (referenced in %s): %s" +#: python/py-function.c:136 +msgid "Error occurred in Python convenience function." msgstr "" -#: python/py-auto-load.c:306 -#, possible-c-format -msgid "Couldn't read %s section of %s" +#: python/py-function.c:152 python/py-prettyprint.c:642 python/python.c:252 +#: python/python.c:274 +msgid "Error while executing Python code." msgstr "" -#: python/py-auto-load.c:429 -#, possible-c-format -msgid "Script name: %s\n" +#: python/py-function.c:188 +msgid "This function is not documented." msgstr "" -#: python/py-auto-load.c:430 -#, possible-c-format -msgid " Full name: %s\n" +#. Require that INFERIOR be a valid inferior ID. +#: python/py-inferior.c:75 +msgid "Inferior no longer exists." msgstr "" -#: python/py-auto-load.c:451 solib.c:920 solib.c:1014 xcoffsolib.c:113 -#, possible-c-format -msgid "Invalid regexp: %s" +#: python/py-inferior.c:449 +msgid "Could not allocate memory buffer object." msgstr "" -#: python/py-auto-load.c:453 +#: python/py-inferior.c:526 #, possible-c-format -msgid "Objfile scripts matching %s:\n" +msgid "Memory buffer for address %s, which is %s bytes long." msgstr "" -#: python/py-auto-load.c:458 -msgid "Objfile scripts:\n" +#: python/py-inferior.c:540 +msgid "The memory buffer supports only one segment." msgstr "" -#: python/py-auto-load.c:480 -msgid "Set the debugger's behaviour regarding auto-loaded scripts." +#: python/py-inferior.c:607 +msgid "Search range is empty." msgstr "" -#: python/py-auto-load.c:481 -msgid "Show the debugger's behaviour regarding auto-loaded scripts." +#: python/py-inferior.c:615 +msgid "The search range is too large." msgstr "" -#: python/py-auto-load.c:482 -msgid "" -"If enabled, auto-loaded scripts are loaded when the debugger reads\n" -"an executable or shared library." +#: python/py-inferior.c:626 +msgid "The pattern is not a Python buffer." msgstr "" -#: python/py-auto-load.c:491 -msgid "Print dump of auto-loaded section scripts matching REGEXP." +#. Require that INFERIOR be a valid inferior ID. +#: python/py-infthread.c:34 python/py-infthread.c:91 +msgid "Thread no longer exists." msgstr "" -#: python/python.c:102 -msgid "internal error: Unhandled Python exception" +#: python/py-infthread.c:98 +msgid "Cannot delete `name' attribute." msgstr "" -#: python/python.c:177 -msgid "Invalid \"python\" block structure." +#: python/py-infthread.c:106 +msgid "The value of `name' must be a string." msgstr "" -#: python/python.c:283 -msgid "Programmer error: unhandled type." +#: python/py-lazy-string.c:105 +msgid "Cannot create a value from NULL." msgstr "" -#: python/python.c:310 -#, possible-c-format -msgid "Could not find parameter `%s'." +#: python/py-lazy-string.c:135 +msgid "Cannot create a lazy string with address 0x0, and a non-zero length." msgstr "" -#: python/python.c:314 -#, possible-c-format -msgid "`%s' is not a parameter." +#: python/py-lazy-string.c:143 +msgid "A lazy string's type cannot be NULL." msgstr "" -#: python/python.c:642 -msgid "Posted event is not callable" +#: python/py-objfile.c:101 +msgid "Cannot delete the pretty_printers attribute." msgstr "" -#: python/python.c:889 python/python.c:903 python/python.c:910 -msgid "Python scripting is not supported in this copy of GDB." +#: python/py-objfile.c:108 +msgid "The pretty_printers attribute must be a list." msgstr "" -#: python/python.c:917 -msgid "gdbpy_should_stop called when Python scripting is not supported." +#: python/py-param.c:133 +msgid "String required for filename." msgstr "" -#: python/python.c:925 -msgid "" -"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported." +#: python/py-param.c:166 +msgid "ENUM arguments must be a string." msgstr "" -#: python/python.c:964 -msgid "" -"Evaluate a Python command.\n" -"\n" -"The command can be given as an argument, for instance:\n" -"\n" -" python print 23\n" -"\n" -"If no argument is given, the following lines are read and used\n" -"as the Python commands. Type a line containing \"end\" to indicate\n" -"the end of the command." +#: python/py-param.c:180 +msgid "The value must be member of an enumeration." msgstr "" -#: python/python.c:975 -msgid "" -"Evaluate a Python command.\n" -"\n" -"Python scripting is not supported in this copy of GDB.\n" -"This command is only a placeholder." +#: python/py-param.c:191 +msgid "A boolean argument is required." msgstr "" -#: python/python.c:984 python/python.c:988 -msgid "Prefix command for python maintenance settings." +#: python/py-param.c:204 +msgid "A boolean or None is required" msgstr "" -#: python/python.c:993 -msgid "Enable or disable printing of Python stack dump on error." +#: python/py-param.c:232 +msgid "The value must be integer." msgstr "" -#: python/python.c:994 -msgid "Show whether Python stack will be printed on error." +#: python/py-param.c:257 +msgid "Range exceeded." msgstr "" -#: python/python.c:995 -msgid "Enables or disables printing of Python stack traces." +#: python/py-param.c:267 +msgid "Unhandled type in parameter value." msgstr "" -#. Require that INFERIOR be a valid inferior ID. -#: python/py-inferior.c:74 -msgid "Inferior no longer exists." +#: python/py-param.c:284 +msgid "Cannot delete a parameter's value." msgstr "" -#: python/py-inferior.c:407 -msgid "Could not allocate memory buffer object." +#: python/py-param.c:341 +msgid "Parameter must return a string value." msgstr "" -#: python/py-inferior.c:483 -#, possible-c-format -msgid "Memory buffer for address %s, which is %s bytes long." +#: python/py-param.c:569 +msgid "An enumeration is required for PARAM_ENUM." msgstr "" -#: python/py-inferior.c:497 -msgid "The memory buffer supports only one segment." +#: python/py-param.c:576 +msgid "The enumeration is not a sequence." msgstr "" -#: python/py-inferior.c:564 -msgid "Search range is empty." +#: python/py-param.c:586 +msgid "The enumeration is empty." msgstr "" -#: python/py-inferior.c:572 -msgid "The search range is too large." +#: python/py-param.c:607 +msgid "The enumeration item not a string." +msgstr "" + +#: python/py-param.c:681 +msgid "Invalid parameter class argument." +msgstr "" + +#: python/py-param.c:688 +msgid "Only PARAM_ENUM accepts a fourth argument." +msgstr "" + +#: python/py-prettyprint.c:291 valprint.c:394 +msgid "" +msgstr "" + +#: python/py-prettyprint.c:815 +msgid "Argument must be a gdb.Value." msgstr "" -#: python/py-inferior.c:583 -msgid "The pattern is not a Python buffer." +#. Require a valid symbol. All access to symbol_object->symbol should be +#. gated by this call. +#: python/py-symbol.c:48 +msgid "Symbol is invalid." msgstr "" -#: python/py-utils.c:79 -msgid "Expected a string or unicode object." +#. Require a valid symbol table. All access to symtab_object->symtab +#. should be gated by this call. +#: python/py-symtab.c:50 +msgid "Symbol Table is invalid." msgstr "" -#: python/py-utils.c:322 -msgid "Overflow converting to address." +#. Require a valid symbol table and line object. All access to +#. sal_object->sal should be gated by this call. +#: python/py-symtab.c:80 +msgid "Symbol Table and Line is invalid." msgstr "" -#. Require that INFERIOR be a valid inferior ID. -#: python/py-infthread.c:34 python/py-infthread.c:92 -msgid "Thread no longer exists." +#: python/py-type.c:470 +msgid "Array bound must be an integer" msgstr "" -#: python/py-infthread.c:99 -msgid "Cannot delete `name' attribute." +#: python/py-type.c:486 +msgid "Array length must not be negative" msgstr "" -#: python/py-infthread.c:107 -msgid "The value of `name' must be a string." +#: python/py-type.c:532 +msgid "This type does not have a range." msgstr "" -#. Require a valid frame. This must be called inside a TRY_CATCH, or -#. another context in which a gdb exception is allowed. -#: python/py-frame.c:54 -msgid "Frame is invalid." +#: python/py-type.c:605 +msgid "Type does not have a target." msgstr "" -#: python/py-frame.c:232 python/py-block.c:314 -msgid "Cannot locate object file for block." +#: python/py-type.c:786 +msgid "Null type name." msgstr "" -#: python/py-frame.c:284 -msgid "Could not allocate frame object." +#: python/py-type.c:813 +msgid "Type is not a template." msgstr "" -#: python/py-frame.c:447 +#: python/py-type.c:826 python/py-type.c:880 #, possible-c-format -msgid "Variable '%s' not found." +msgid "No argument %d in template." msgstr "" -#: python/py-frame.c:458 -msgid "Argument must be a symbol or string." +#: python/py-type.c:891 +msgid "Template argument is optimized out" msgstr "" -#: python/py-frame.c:473 +#: python/py-type.c:1044 #, possible-c-format -msgid "Variable cannot be found for symbol '%s'." +msgid "Unsupported field kind %d by check_types_equal" msgstr "" -#: python/py-frame.c:556 -msgid "Invalid frame stop reason." +#: python/py-type.c:1482 +msgid "'block' argument must be a Block." msgstr "" -#. Require a valid block. All access to block_object->block should be -#. gated by this call. -#: python/py-block.c:64 -msgid "Block is invalid." +#: python/py-utils.c:79 +msgid "Expected a string or unicode object." msgstr "" -#. Require a valid block. This macro is called during block iterator -#. creation, and at each next call. -#: python/py-block.c:76 -msgid "Source block for iterator is invalid." +#: python/py-utils.c:322 +msgid "Overflow converting to address." msgstr "" -#: python/py-block.c:251 -msgid "Symbol is null." +#: python/py-value.c:132 +msgid "Value object creation takes only 1 argument" msgstr "" -#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python -#. exception if it is invalid. -#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python -#. exception if it is invalid. This macro is for use in setter functions. -#: python/py-breakpoint.c:64 python/py-breakpoint.c:74 -#, possible-c-format -msgid "Breakpoint %d is invalid." +#: python/py-value.c:140 +msgid "Could not allocate memory to create Value object." msgstr "" -#: python/py-breakpoint.c:159 -msgid "Cannot delete `enabled' attribute." +#: python/py-value.c:391 +msgid "Argument must be a type." msgstr "" -#: python/py-breakpoint.c:166 -msgid "The value of `enabled' must be a boolean." +#: python/py-value.c:443 python/py-value.c:982 python/py-value.c:1019 +msgid "Invalid operation on gdb.Value." msgstr "" -#: python/py-breakpoint.c:192 -msgid "Cannot delete `silent' attribute." +#: python/py-value.c:487 +msgid "Cannot subscript requested type." msgstr "" -#: python/py-breakpoint.c:198 -msgid "The value of `silent' must be a boolean." +#: python/py-value.c:504 +msgid "Setting of struct elements is not currently supported." msgstr "" -#: python/py-breakpoint.c:223 -msgid "Cannot delete `thread' attribute." +#: python/py-value.c:529 +msgid "Value is not callable (not TYPE_CODE_FUNC)." msgstr "" -#: python/py-breakpoint.c:234 -msgid "Invalid thread ID." +#: python/py-value.c:536 +msgid "Inferior arguments must be provided in a tuple." msgstr "" -#: python/py-breakpoint.c:243 -msgid "The value of `thread' must be an integer or None." +#: python/py-value.c:1060 +msgid "Cannot convert value to int." msgstr "" -#: python/py-breakpoint.c:264 -msgid "Cannot delete `task' attribute." +#: python/py-value.c:1083 +msgid "Cannot convert value to long." msgstr "" -#: python/py-breakpoint.c:275 -msgid "Invalid task ID." +#: python/py-value.c:1106 +msgid "Cannot convert value to float." msgstr "" -#: python/py-breakpoint.c:284 -msgid "The value of `task' must be an integer or None." +#: python/py-value.c:1242 +#, possible-c-format +msgid "Could not convert Python object: %s." msgstr "" -#: python/py-breakpoint.c:323 -msgid "Cannot delete `ignore_count' attribute." +#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python +#. exception if it is invalid. +#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python +#. exception if it is invalid. This macro is for use in setter functions. +#: python/python-internal.h:146 python/python-internal.h:156 +#, possible-c-format +msgid "Breakpoint %d is invalid." msgstr "" -#: python/py-breakpoint.c:329 -msgid "The value of `ignore_count' must be an integer." +#: python/python.c:121 +msgid "internal error: Unhandled Python exception" msgstr "" -#: python/py-breakpoint.c:354 -msgid "Cannot delete `hit_count' attribute." +#: python/python.c:195 +#, possible-c-format +msgid "Error while opening file: %s" msgstr "" -#: python/py-breakpoint.c:367 -msgid "The value of `hit_count' must be zero." +#: python/python.c:244 +msgid "Invalid \"python\" block structure." msgstr "" -#: python/py-breakpoint.c:449 -msgid "Cannot delete `condition' attribute." +#: python/python.c:348 +msgid "Programmer error: unhandled type." msgstr "" -#: python/py-breakpoint.c:648 -msgid "Cannot understand watchpoint access type." +#: python/python.c:376 +#, possible-c-format +msgid "Could not find parameter `%s'." msgstr "" -#: python/py-breakpoint.c:652 -msgid "Do not understand breakpoint type to set." +#: python/python.c:380 +#, possible-c-format +msgid "`%s' is not a parameter." msgstr "" -#: python/py-breakpoint.c:825 -msgid "Error while creating breakpoint from GDB." +#: python/python.c:711 +msgid "Posted event is not callable" msgstr "" -#: python/py-breakpoint.c:918 -msgid "" -"Cannot set 'stop' method. There is an existing GDB condition attached to " -"the breakpoint." +#: python/python.c:792 +msgid "Return from prompt_hook must be either a Python string, or None" msgstr "" -#: python/py-lazy-string.c:104 -msgid "Cannot create a value from NULL." +#: python/python.c:931 +msgid "Error occurred computing Python errormessage.\n" msgstr "" -#: python/py-lazy-string.c:129 -msgid "Cannot create a lazy string with address 0x0, and a non-zero length." +#: python/python.c:1064 python/python.c:1078 python/python.c:1085 +msgid "Python scripting is not supported in this copy of GDB." msgstr "" -#: python/py-lazy-string.c:137 -msgid "A lazy string's type cannot be NULL." +#: python/python.c:1092 +msgid "gdbpy_should_stop called when Python scripting is not supported." msgstr "" -#: python/py-cmd.c:126 python/py-cmd.c:220 -msgid "Invalid invocation of Python command object." +#: python/python.c:1100 +msgid "" +"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported." msgstr "" -#: python/py-cmd.c:135 -msgid "Python command object missing 'invoke' method." +#: python/python.c:1152 +#, possible-c-format +msgid "The mode of Python stack printing on error is \"%s\".\n" msgstr "" -#: python/py-cmd.c:144 -msgid "Could not convert arguments to Python string." +#: python/python.c:1195 +msgid "" +"Evaluate a Python command.\n" +"\n" +"The command can be given as an argument, for instance:\n" +"\n" +" python print 23\n" +"\n" +"If no argument is given, the following lines are read and used\n" +"as the Python commands. Type a line containing \"end\" to indicate\n" +"the end of the command." msgstr "" -#. An error occurred computing the string representation of the -#. error message. This is rare, but we should inform the user. -#: python/py-cmd.c:172 +#: python/python.c:1206 msgid "" -"An error occurred in a Python command\n" -"and then another occurred computing the error message.\n" +"Evaluate a Python command.\n" +"\n" +"Python scripting is not supported in this copy of GDB.\n" +"This command is only a placeholder." msgstr "" -#: python/py-cmd.c:191 -#, possible-c-format -msgid "Error occurred in Python command: %s" +#: python/python.c:1215 python/python.c:1219 +msgid "Prefix command for python maintenance settings." msgstr "" -#: python/py-cmd.c:193 -msgid "Error occurred in Python command." +#: python/python.c:1224 +msgid "Enable or disable printing of Python stack dump on error." msgstr "" -#: python/py-cmd.c:230 python/py-cmd.c:233 -msgid "Could not convert argument to Python string." +#: python/python.c:1225 +msgid "Show whether Python stack will be printed on error." msgstr "" -#: python/py-cmd.c:330 -msgid "No command name found." +#: python/python.c:1226 +msgid "Enables or disables printing of Python stack traces." msgstr "" -#: python/py-cmd.c:362 -#, possible-c-format -msgid "Could not find command prefix %s." +#: python/python.c:1244 python/python.c:1249 +msgid "Prefix command for python preference settings." msgstr "" -#: python/py-cmd.c:376 -#, possible-c-format -msgid "'%s' is not a prefix command." +#: python/python.c:1254 +msgid "Set mode for Python stack dump on error." msgstr "" -#: python/py-cmd.c:425 -msgid "Command object already initialized." +#: python/python.c:1255 +msgid "Show the mode of Python stack printing on error." msgstr "" -#: python/py-cmd.c:448 -msgid "Invalid completion type argument." +#: python/python.c:1256 +msgid "" +"none == no stack or message will be printed.\n" +"full == a message and a stack will be printed.\n" +"message == an error message without a stack will be printed." msgstr "" -#: ravenscar-thread.c:393 +#: ravenscar-thread.c:396 msgid "\"set ravenscar\" must be followed by the name of a setting.\n" msgstr "" -#: ravenscar-thread.c:414 +#: ravenscar-thread.c:417 msgid "Support for Ravenscar task/thread switching is enabled\n" msgstr "" -#: ravenscar-thread.c:417 +#: ravenscar-thread.c:420 msgid "Support for Ravenscar task/thread switching is disabled\n" msgstr "" -#: ravenscar-thread.c:437 +#: ravenscar-thread.c:440 msgid "Prefix command for changing Ravenscar-specific settings" msgstr "" -#: ravenscar-thread.c:441 +#: ravenscar-thread.c:444 msgid "Prefix command for showing Ravenscar-specific settings" msgstr "" -#: ravenscar-thread.c:445 +#: ravenscar-thread.c:448 msgid "Enable or disable support for GNAT Ravenscar tasks" msgstr "" -#: ravenscar-thread.c:446 +#: ravenscar-thread.c:449 msgid "Show whether support for GNAT Ravenscar tasks is enabled" msgstr "" -#: ravenscar-thread.c:448 +#: ravenscar-thread.c:451 msgid "" "Enable or disable support for task/thread switching with the GNAT\n" "Ravenscar run-time library for bareboard configuration." msgstr "" -#: record.c:554 +#: record.c:557 msgid "" "Do you want to auto delete previous execution log entries when record/replay " "buffer becomes full (record stop-at-limit)?" msgstr "" -#: record.c:562 +#: record.c:565 msgid "Process record: stopped by user." msgstr "" -#: record.c:632 +#: record.c:635 msgid "Process record: inferior program stopped." msgstr "" -#: record.c:634 record.c:1475 record.c:1484 record.c:1490 +#: record.c:637 record.c:1573 record.c:1582 record.c:1588 msgid "Process record: failed to record execution log." msgstr "" -#: record.c:742 +#: record.c:745 #, possible-c-format msgid "Process record: error reading memory at addr = %s len = %d." msgstr "" -#: record.c:755 +#: record.c:758 #, possible-c-format msgid "Process record: error writing memory at addr = %s len = %d." msgstr "" -#: record.c:851 +#: record.c:867 msgid "Process record: the program is not being run." msgstr "" -#: record.c:853 +#: record.c:869 msgid "" "Process record target can't debug inferior in non-stop mode (non-stop)." msgstr "" -#: record.c:856 -msgid "" -"Process record target can't debug inferior in asynchronous mode (target-" -"async)." -msgstr "" - -#: record.c:860 +#: record.c:873 msgid "" "Process record: the current architecture doesn't support record function." msgstr "" -#: record.c:864 +#: record.c:877 msgid "Could not find 'to_resume' method on the target stack." msgstr "" -#: record.c:866 +#: record.c:879 msgid "Could not find 'to_wait' method on the target stack." msgstr "" -#: record.c:868 +#: record.c:881 msgid "Could not find 'to_store_registers' method on the target stack." msgstr "" -#: record.c:871 +#: record.c:884 msgid "Could not find 'to_insert_breakpoint' method on the target stack." msgstr "" -#: record.c:874 +#: record.c:887 msgid "Could not find 'to_remove_breakpoint' method on the target stack." msgstr "" -#: record.c:877 +#: record.c:890 msgid "Could not find 'to_stopped_by_watchpoint' method on the target stack." msgstr "" -#: record.c:880 +#: record.c:893 msgid "Could not find 'to_stopped_data_address' method on the target stack." msgstr "" -#: record.c:898 +#: record.c:911 msgid "" "Process record target already running. Use \"record stop\" to stop record " "target first." msgstr "" -#: record.c:948 +#: record.c:964 msgid "Could not find 'to_xfer_partial' method on the target stack." msgstr "" -#: record.c:1517 +#: record.c:1615 msgid "" "Because GDB is in replay mode, changing the value of a register will make " "the execution log unusable from this point onward. Change all registers?" msgstr "" -#: record.c:1523 +#: record.c:1621 #, possible-c-format msgid "" "Because GDB is in replay mode, changing the value of a register will make " "the execution log unusable from this point onward. Change register %s?" msgstr "" -#: record.c:1545 record.c:1578 +#: record.c:1643 record.c:1676 msgid "Process record canceled the operation." msgstr "" #. Let user choose if he wants to write memory or not. -#: record.c:1574 +#: record.c:1672 #, possible-c-format msgid "" "Because GDB is in replay mode, writing to memory will make the execution log " "unusable from this point onward. Write memory at address %s?" msgstr "" -#: record.c:1709 reverse.c:275 +#: record.c:1807 reverse.c:271 #, possible-c-format msgid "Unbalanced quotes: %s" msgstr "" -#: record.c:1811 record.c:1898 target.c:526 +#: record.c:1956 record.c:2043 target.c:524 msgid "You can't do that without a process to debug." msgstr "" -#: record.c:1967 +#: record.c:2116 #, possible-c-format msgid "Debugging of process record target is %s.\n" msgstr "" -#: record.c:1989 +#: record.c:2138 msgid "" "Delete the log from this point forward and begin to record the running " "message at current PC?" msgstr "" -#: record.c:1995 +#: record.c:2144 msgid "Already at end of record list.\n" msgstr "" -#: record.c:1999 record.c:2014 +#: record.c:2148 record.c:2163 msgid "Process record is not started.\n" msgstr "" -#: record.c:2010 +#: record.c:2159 msgid "Process record is stopped and all execution logs are deleted.\n" msgstr "" -#: record.c:2039 +#: record.c:2188 msgid "\"set record\" must be followed by an apporpriate subcommand.\n" msgstr "" -#: record.c:2060 +#: record.c:2209 msgid "Replay mode:\n" msgstr "" -#: record.c:2062 +#: record.c:2211 msgid "Record mode:\n" msgstr "" #. Display instruction number for first instruction in the log. -#: record.c:2074 +#: record.c:2223 #, possible-c-format msgid "Lowest recorded instruction number is %s.\n" msgstr "" -#: record.c:2079 +#: record.c:2228 #, possible-c-format msgid "Current instruction number is %s.\n" msgstr "" #. Display instruction number for last instruction in the log. -#: record.c:2083 +#: record.c:2232 #, possible-c-format msgid "Highest recorded instruction number is %s.\n" msgstr "" #. Display log count. -#: record.c:2087 +#: record.c:2236 #, possible-c-format msgid "Log contains %d instructions.\n" msgstr "" -#: record.c:2092 +#: record.c:2241 msgid "No instructions have been logged.\n" msgstr "" -#: record.c:2097 +#: record.c:2246 msgid "target record is not active.\n" msgstr "" #. Display max log size. -#: record.c:2101 +#: record.c:2250 #, possible-c-format msgid "Max logged instructions is %d.\n" msgstr "" -#: record.c:2157 +#: record.c:2306 #, possible-c-format msgid "Failed to read %d bytes from core file %s ('%s')." msgstr "" -#: record.c:2229 +#: record.c:2378 #, possible-c-format msgid "Version mis-match or file format error in core file %s." msgstr "" -#: record.c:2334 +#: record.c:2483 #, possible-c-format msgid "Bad entry type in core file %s." msgstr "" -#: record.c:2355 +#: record.c:2504 #, possible-c-format msgid "Auto increase record/replay buffer limit to %d." msgstr "" #. Succeeded. -#: record.c:2360 +#: record.c:2509 #, possible-c-format msgid "Restored records from core file %s.\n" msgstr "" -#: record.c:2376 +#: record.c:2525 #, possible-c-format msgid "Failed to write %d bytes to core file %s ('%s')." msgstr "" -#: record.c:2421 +#: record.c:2570 msgid "" "This command can only be used with target 'record'.\n" "Use 'target record' first.\n" msgstr "" -#: record.c:2488 +#: record.c:2637 #, possible-c-format msgid "Failed to create 'precord' section for corefile %s: %s" msgstr "" #. Succeeded. -#: record.c:2617 +#: record.c:2766 #, possible-c-format msgid "Saved core file %s with execution log.\n" msgstr "" -#: record.c:2662 +#: record.c:2811 msgid "Command requires an argument (insn number to go to)." msgstr "" -#: record.c:2696 +#: record.c:2845 #, possible-c-format msgid "Target insn '%s' not found." msgstr "" -#: record.c:2698 +#: record.c:2847 #, possible-c-format msgid "Already at insn '%s'." msgstr "" -#: record.c:2701 +#: record.c:2850 #, possible-c-format msgid "Go forward to insn number %s\n" msgstr "" -#: record.c:2707 +#: record.c:2856 #, possible-c-format msgid "Go backward to insn number %s\n" msgstr "" -#: record.c:2732 +#: record.c:2881 msgid "Set debugging of record/replay feature." msgstr "" -#: record.c:2733 +#: record.c:2882 msgid "Show debugging of record/replay feature." msgstr "" -#: record.c:2734 +#: record.c:2883 msgid "" "When enabled, debugging output for record/replay feature is displayed." msgstr "" -#: record.c:2740 +#: record.c:2889 msgid "Abbreviated form of \"target record\" command." msgstr "" -#: record.c:2746 +#: record.c:2895 msgid "Set record options" msgstr "" -#: record.c:2750 +#: record.c:2899 msgid "Show record options" msgstr "" -#: record.c:2754 +#: record.c:2903 msgid "Info record options" msgstr "" -#: record.c:2759 +#: record.c:2908 msgid "" "Save the execution log to a file.\n" "Argument is optional filename.\n" "Default filename is 'gdb_record.'." msgstr "" -#: record.c:2766 +#: record.c:2915 msgid "" "Restore the execution log from a file.\n" "Argument is filename. File must be created with 'record save'." msgstr "" -#: record.c:2772 +#: record.c:2921 msgid "Delete the rest of execution log and start recording it anew." msgstr "" -#: record.c:2778 +#: record.c:2927 msgid "Stop the record/replay target." msgstr "" -#: record.c:2784 +#: record.c:2933 msgid "" "Set whether record/replay stops when record/replay buffer becomes full." msgstr "" -#: record.c:2785 +#: record.c:2934 msgid "" "Show whether record/replay stops when record/replay buffer becomes full." msgstr "" -#: record.c:2787 +#: record.c:2936 msgid "" "Default is ON.\n" "When ON, if the record/replay buffer becomes full, ask user what to do.\n" @@ -17271,1588 +17888,1617 @@ "delete the oldest recorded instruction to make room for each new one." msgstr "" -#: record.c:2795 +#: record.c:2944 msgid "Set record/replay buffer limit." msgstr "" -#: record.c:2796 +#: record.c:2945 msgid "Show record/replay buffer limit." msgstr "" -#: record.c:2796 +#: record.c:2945 msgid "" "Set the maximum number of instructions to be stored in the\n" "record/replay buffer. Zero means unlimited. Default is 200000." msgstr "" -#: record.c:2802 +#: record.c:2951 msgid "" "Restore the program to its state at instruction number N.\n" "Argument is instruction number, as shown by 'info record'." msgstr "" -#: record.c:2808 +#: record.c:2957 msgid "" "Set whether query if PREC cannot record memory change of next instruction." msgstr "" -#: record.c:2810 +#: record.c:2959 msgid "" "Show whether query if PREC cannot record memory change of next instruction." msgstr "" -#: record.c:2812 +#: record.c:2961 msgid "" "Default is OFF.\n" "When ON, query if PREC cannot record memory change of next instruction." msgstr "" -#: regcache.c:993 +#: regcache.c:1057 msgid "PC register is not available" msgstr "" -#: regcache.c:999 +#: regcache.c:1063 msgid "regcache_read_pc: Unable to find PC" msgstr "" -#: regcache.c:1015 +#: regcache.c:1079 msgid "regcache_write_pc: Unable to update PC" msgstr "" -#: regcache.c:1029 +#: regcache.c:1093 msgid "Register cache flushed.\n" msgstr "" -#: regcache.c:1049 +#: regcache.c:1113 msgid "Bad switch" msgstr "" -#: regcache.c:1324 +#: regcache.c:1412 msgid "Force gdb to flush its register cache (maintainer command)" msgstr "" -#: regcache.c:1327 +#: regcache.c:1415 msgid "" "Print the internal register configuration.\n" "Takes an optional file parameter." msgstr "" -#: regcache.c:1331 +#: regcache.c:1419 msgid "" "Print the internal register configuration including raw values.\n" "Takes an optional file parameter." msgstr "" -#: regcache.c:1336 +#: regcache.c:1424 msgid "" "Print the internal register configuration including cooked values.\n" "Takes an optional file parameter." msgstr "" -#: regcache.c:1341 +#: regcache.c:1429 msgid "" "Print the internal register configuration including each register's group.\n" "Takes an optional file parameter." msgstr "" -#: reggroups.c:249 +#: regcache.c:1434 +msgid "" +"Print the internal register configuration including each register's\n" +"remote register number and buffer offset in the g/G packets.\n" +"Takes an optional file parameter." +msgstr "" + +#: reggroups.c:248 msgid "maintenance print reggroups" msgstr "" -#: reggroups.c:290 +#: reggroups.c:289 msgid "" "Print the internal register group names.\n" "Takes an optional file parameter." msgstr "" -#: remote-fileio.c:1460 -msgid "Illegal argument for \"set remote system-call-allowed\" command" +#. malformed packet error +#. general case: +#: remote.c:425 +msgid "remote.c: error in outgoing packet." msgstr "" -#: remote-fileio.c:1467 +#: remote.c:427 #, possible-c-format -msgid "Garbage after \"show remote system-call-allowed\" command: `%s'" +msgid "remote.c: error in outgoing packet at field #%ld." msgstr "" -#: remote-fileio.c:1482 -msgid "Set if the host system(3) call is allowed for the target." +#: remote.c:430 +#, possible-c-format +msgid "trace API error 0x%s." msgstr "" -#: remote-fileio.c:1486 -msgid "Show if the host system(3) call is allowed for the target." +#: remote.c:432 +#, possible-c-format +msgid "Target returns error code '%s'." msgstr "" -#: remote-m32r-sdi.c:331 -msgid "Cannot pass arguments to remote STDEBUG process" +#: remote.c:461 +#, possible-c-format +msgid "invalid qRelocInsn packet: %s" msgstr "" -#: remote-m32r-sdi.c:334 remote-mips.c:2332 -msgid "No executable file specified" +#: remote.c:495 +msgid "warning: relocating instruction: " msgstr "" -#: remote-m32r-sdi.c:393 -msgid "Connection refused." +#: remote.c:761 +msgid "" +"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the " +"execution of the program.\n" msgstr "" -#: remote-m32r-sdi.c:396 remote-m32r-sdi.c:399 -msgid "Cannot connect to SDI target." +#: remote.c:766 +msgid "" +"send a break signal to the remote target to interrupt the execution of the " +"program.\n" msgstr "" -#: remote-m32r-sdi.c:726 remote-m32r-sdi.c:732 remote-m32r-sdi.c:748 -#: remote.c:6673 -msgid "Remote connection closed" +#: remote.c:770 +msgid "" +"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to " +"interrupt the execution of Linux kernel.\n" msgstr "" -#: remote-m32r-sdi.c:1190 -msgid "Too many breakpoints" +#: remote.c:775 remote.c:3148 +#, possible-c-format +msgid "Invalid value for interrupt_sequence_mode: %s." +msgstr "" + +#: remote.c:919 +msgid "Argument required (integer, `fixed' or `limited')." msgstr "" -#: remote-m32r-sdi.c:1259 +#: remote.c:932 #, possible-c-format -msgid "Unknown option `%s'" +msgid "Invalid %s (bad syntax)." msgstr "" -#: remote-m32r-sdi.c:1274 symfile.c:2085 +#: remote.c:939 #, possible-c-format -msgid "\"%s\" is not an object file: %s" +msgid "Invalid %s (too large)." msgstr "" -#: remote-m32r-sdi.c:1325 +#: remote.c:945 #, possible-c-format -msgid "Error while downloading %s section." +msgid "" +"The target may not be able to correctly handle a %s\n" +"of %ld bytes. Change the packet size? " msgstr "" -#: remote-m32r-sdi.c:1444 -msgid "Too many watchpoints" +#: remote.c:948 +msgid "Packet size not changed." msgstr "" -#: remote-m32r-sdi.c:1686 -msgid "Reset SDI connection." +#: remote.c:958 +#, possible-c-format +msgid "The %s is %ld. " msgstr "" -#: remote-m32r-sdi.c:1689 -msgid "Show status of SDI connection." +#: remote.c:960 +#, possible-c-format +msgid "Packets are fixed at %ld bytes.\n" msgstr "" -#: remote-m32r-sdi.c:1692 -msgid "Debug M32R/Chaos." +#: remote.c:963 +#, possible-c-format +msgid "Packets are limited to %ld bytes.\n" msgstr "" -#: remote-m32r-sdi.c:1695 -msgid "Use debug DMA mem access." +#: remote.c:1087 +#, possible-c-format +msgid "Support for the `%s' packet is auto-detected, currently %s.\n" msgstr "" -#: remote-m32r-sdi.c:1697 -msgid "Use mon code mem access." +#: remote.c:1093 +#, possible-c-format +msgid "Support for the `%s' packet is currently %s.\n" msgstr "" -#: remote-m32r-sdi.c:1700 -msgid "Set breakpoints by IB break." +#: remote.c:1188 +msgid "packet_ok: attempt to use a disabled packet" msgstr "" -#: remote-m32r-sdi.c:1702 -msgid "Set breakpoints by dbt." +#. If the stub previously indicated that the packet was +#. supported then there is a protocol error.. +#: remote.c:1202 +#, possible-c-format +msgid "Protocol error: %s (%s) conflicting enabled responses." msgstr "" -#: remote-mips.c:676 -msgid "Watchdog has expired. Target detached." +#. The user set it wrong. +#: remote.c:1206 +#, possible-c-format +msgid "Enabled packet %s (%s) not recognized by stub" msgstr "" -#: remote-mips.c:680 -msgid "End of file from remote" +#: remote.c:1295 remote.c:1316 +#, possible-c-format +msgid "Could not find config for %s" +msgstr "" + +#. Error of some sort. +#. We're out of sync with the target now. Did it continue +#. or not? We can't tell which thread it was in non-stop, +#. so just ignore this. +#. Error of some sort. +#. We're out of sync with the target now. Did it continue or +#. not? Not is more likely, so report a stop. +#: remote.c:1433 remote.c:2827 remote.c:2867 remote.c:2984 remote.c:3886 +#: remote.c:5464 remote.c:5563 remote.c:6783 +#, possible-c-format +msgid "Remote failure reply: %s" msgstr "" -#: remote-mips.c:682 +#: remote.c:1912 #, possible-c-format -msgid "Error reading from remote: %s" +msgid "invalid remote ptid: %s" msgstr "" -#. At this point, about the only thing we can do is abort the command -#. in progress and get back to command level as quickly as possible. -#: remote-mips.c:717 -msgid "Remote board reset, debug protocol re-initialized." +#: remote.c:2243 +msgid "Incomplete response to threadinfo request." msgstr "" -#: remote-mips.c:775 -#, possible-c-format -msgid "Debug protocol failure: more than %d characters before a sync." +#. This is an answer to a different request. +#: remote.c:2246 +msgid "ERROR RMT Thread info mismatch." msgstr "" -#: remote-mips.c:864 -#, possible-c-format -msgid "MIPS protocol data packet too long: %s" +#: remote.c:2260 +msgid "ERROR RMT: threadinfo tag mismatch." msgstr "" -#: remote-mips.c:902 remote-mips.c:1163 remote-mips.c:1204 -#, possible-c-format -msgid "write to target failed: %s" +#: remote.c:2268 +msgid "ERROR RMT: length of threadid is not 16." msgstr "" -#: remote-mips.c:1010 -msgid "Remote did not acknowledge packet" +#: remote.c:2283 +msgid "ERROR RMT: 'exists' length too long." msgstr "" -#: remote-mips.c:1041 remote-mips.c:1081 -msgid "Timed out waiting for remote packet" +#: remote.c:2307 +msgid "ERROR RMT: unknown thread info tag." msgstr "" -#: remote-mips.c:1103 -msgid "Timed out waiting for packet" +#. FIXME: This is a good reason to drop the packet. +#. Possably, there is a duplicate response. +#. Possabilities : +#. retransmit immediatly - race conditions +#. retransmit after timeout - yes +#. exit +#. wait for packet, then exit +#. +#: remote.c:2411 +msgid "HMM: threadlist did not echo arg thread, dropping it." msgstr "" -#: remote-mips.c:1261 -msgid "mips_request: Trying to send command before reply" +#: remote.c:2418 +msgid "RMT ERROR : failed to get remote thread list." msgstr "" -#: remote-mips.c:1281 -msgid "mips_request: Trying to get reply before command" +#: remote.c:2426 +msgid "RMT ERROR: threadlist response longer than requested." msgstr "" -#: remote-mips.c:1292 -msgid "Bad response from remote board" +#: remote.c:2463 +msgid "Remote fetch threadlist -infinite loop-." msgstr "" -#: remote-mips.c:1368 -msgid "Failed to initialize (didn't receive packet)." +#. paranoia +#: remote.c:2628 +msgid "Command can only be used when connected to the remote target." msgstr "" -#: remote-mips.c:1418 -msgid "internal error: mips_initialize called twice" +#: remote.c:2645 +msgid "threads" msgstr "" -#: remote-mips.c:1492 -msgid "Failed to initialize." +#: remote.c:2744 +msgid "remote_threads_extra_info" msgstr "" -#: remote-mips.c:1549 -msgid "" -"To open a MIPS remote debugging connection, you need to specify what\n" -"serial device is attached to the target board (e.g., /dev/ttya).\n" -"If you want to use TFTP to download to the board, specify the name of a\n" -"temporary file to be used by GDB for downloads as the second argument.\n" -"This filename must be in the form host:filename, where host is the name\n" -"of the host running the TFTP server, and the file must be readable by the\n" -"world. If the local name of the temporary file differs from the name as\n" -"seen from the board via TFTP, specify that name as the third parameter.\n" +#: remote.c:3019 remote.c:3046 +#, possible-c-format +msgid "Target reported unsupported offsets: %s" msgstr "" -#: remote-mips.c:1603 -msgid "Unable to open UDP port" +#: remote.c:3044 +#, possible-c-format +msgid "Malformed response to offset query, %s" msgstr "" -#: remote-mips.c:1746 remote.c:4087 -msgid "Argument given to \"detach\" when remotely debugging." +#: remote.c:3092 +msgid "Can not handle qOffsets TextSeg response with this symbol file" msgstr "" -#: remote-mips.c:1853 -#, possible-c-format -msgid "Remote failure: %s" +#: remote.c:3224 +msgid "Non-stop mode requested, but remote does not support non-stop" msgstr "" -#: remote-mips.c:2051 +#: remote.c:3231 #, possible-c-format -msgid "Can't read register %d: %s" +msgid "Remote refused setting non-stop mode with: %s" msgstr "" -#: remote-mips.c:2090 +#: remote.c:3247 #, possible-c-format -msgid "Can't write register %d: %s" +msgid "Remote refused setting all-stop mode with: %s" msgstr "" -#: remote-mips.c:2325 -msgid "Can't pass arguments to remote MIPS board; arguments ignored." +#: remote.c:3259 remote.c:3365 +msgid "The target is not running (try extended-remote?)" msgstr "" -#: remote-mips.c:2584 -#, possible-c-format -msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s" +#: remote.c:3380 +msgid "remote didn't report the current thread in non-stop mode" msgstr "" -#: remote-mips.c:2599 remote-mips.c:2652 remote-mips.c:2724 -#, possible-c-format -msgid "mips_common_breakpoint: Bad response from remote board: %s" +#: remote.c:3407 +msgid "Trace is already running on the target.\n" msgstr "" -#: remote-mips.c:2763 -msgid "Timeout during download." +#: remote.c:3532 +msgid "" +"The remote protocol may be unreliable over UDP.\n" +"Some events may be lost, rendering further debugging impossible." msgstr "" -#: remote-mips.c:2773 +#: remote.c:3568 #, possible-c-format -msgid "Download got unexpected ack char: 0x%x, retrying." +msgid "Remote refused setting permissions with: %s" msgstr "" -#: remote-mips.c:3516 -msgid "mips_load: Couldn't get into monitor mode." +#: remote.c:3605 +#, possible-c-format +msgid "Remote qSupported response supplied an unexpected value for \"%s\"." msgstr "" -#: remote-mips.c:3674 -msgid "Set timeout in seconds for remote MIPS serial I/O." +#: remote.c:3629 +#, possible-c-format +msgid "Remote target reported \"%s\" without a size." msgstr "" -#: remote-mips.c:3675 -msgid "Show timeout in seconds for remote MIPS serial I/O." +#: remote.c:3638 +#, possible-c-format +msgid "Remote target reported \"%s\" with a bad size: \"%s\"." msgstr "" -#: remote-mips.c:3682 -msgid "Set retransmit timeout in seconds for remote MIPS serial I/O." +#: remote.c:3645 +#, possible-c-format +msgid "limiting remote suggested packet size (%d bytes) to %d" msgstr "" -#: remote-mips.c:3683 -msgid "Show retransmit timeout in seconds for remote MIPS serial I/O." +#: remote.c:3916 +msgid "empty item in \"qSupported\" response" msgstr "" -#: remote-mips.c:3684 -msgid "" -"This is the number of seconds to wait for an acknowledgement to a packet\n" -"before resending the packet." +#: remote.c:3947 +#, possible-c-format +msgid "unrecognized item \"%s\" in \"qSupported\" response" msgstr "" -#: remote-mips.c:3692 +#: remote.c:3995 msgid "" -"Set the maximum number of characters to ignore when scanning for a SYN." +"To open a remote debug connection, you need to specify what\n" +"serial device is attached to the remote system\n" +"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)." msgstr "" -#: remote-mips.c:3693 -msgid "" -"Show the maximum number of characters to ignore when scanning for a SYN." +#: remote.c:4010 +msgid "Already connected to a remote target. Disconnect? " msgstr "" -#: remote-mips.c:3694 -msgid "" -"This is the maximum number of characters GDB will ignore when trying to\n" -"synchronize with the remote system. A value of -1 means that there is no\n" -"limit. (Note that these characters are printed out even though they are\n" -"ignored.)" +#: remote.c:4013 +msgid "Still connected." msgstr "" -#: remote-mips.c:3704 -msgid "Set the prompt that GDB expects from the monitor." +#: remote.c:4167 remote-mips.c:1744 +msgid "Argument given to \"detach\" when remotely debugging." msgstr "" -#: remote-mips.c:3705 -msgid "Show the prompt that GDB expects from the monitor." +#: remote.c:4170 +msgid "No process to detach from." msgstr "" -#: remote-mips.c:3712 -msgid "Set printing of monitor warnings." +#: remote.c:4184 +msgid "Remote doesn't know how to detach" msgstr "" -#: remote-mips.c:3713 -msgid "Show printing of monitor warnings." +#: remote.c:4186 +msgid "Can't detach process." msgstr "" -#: remote-mips.c:3714 -msgid "" -"When enabled, monitor warnings about hardware breakpoints will be displayed." +#: remote.c:4191 +#, possible-c-format +msgid "Detached from remote %s.\n" msgstr "" -#: remote-mips.c:3721 -msgid "Send a packet to PMON (must be in debug mode)." +#: remote.c:4196 +msgid "Detached from remote process.\n" msgstr "" -#: remote-mips.c:3723 -msgid "" -"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON " -"targets." +#: remote.c:4198 +msgid "Ending remote debugging.\n" msgstr "" -#: remote-mips.c:3724 -msgid "" -"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON " -"targets." +#: remote.c:4224 +msgid "Argument given to \"disconnect\" when remotely debugging." msgstr "" -#: remote-mips.c:3725 -msgid "Use \"on\" to enable the masking and \"off\" to disable it." +#: remote.c:4251 remote.c:4276 +msgid "This target does not support attaching to a process" msgstr "" -#: remote-sim.c:189 +#: remote.c:4261 #, possible-c-format -msgid "Unable to create simulator instance for inferior %d." +msgid "Attached to %s\n" msgstr "" -#: remote-sim.c:204 +#: remote.c:4271 #, possible-c-format -msgid "" -"Inferior %d and inferior %d would have identical simulator state.\n" -"(This simulator does not support the running of more than one inferior.)" +msgid "Attaching to %s failed with: %s" msgstr "" -#: remote-sim.c:531 -msgid "Register size different to expected" +#: remote.c:4278 +#, possible-c-format +msgid "Attaching to %s failed" msgstr "" -#: remote-sim.c:534 +#: remote.c:4361 #, possible-c-format -msgid "Register %d not updated" +msgid "Reply contains invalid hex digit %d" msgstr "" -#: remote-sim.c:536 +#: remote.c:4577 #, possible-c-format -msgid "Register %s not updated" +msgid "Unexpected vCont reply in non-stop mode: %s" msgstr "" -#: remote-sim.c:575 -msgid "program to load" +#: remote.c:4617 +#, possible-c-format +msgid " - Can't pass signal %d to target in reverse: ignored." msgstr "" -#: remote-sim.c:583 -msgid "GDB sim does not yet support a load offset." +#: remote.c:4622 +msgid "Remote reverse-step not supported." msgstr "" -#: remote-sim.c:592 -msgid "unable to load program" +#: remote.c:4625 +msgid "Remote reverse-continue not supported." msgstr "" -#: remote-sim.c:619 -msgid "No executable file specified." +#: remote.c:4763 +msgid "Remote server does not support stopping threads" msgstr "" -#: remote-sim.c:621 remote-sim.c:1083 -msgid "No program loaded." +#: remote.c:4796 +#, possible-c-format +msgid "Stopping %s failed: %s" msgstr "" -#: remote-sim.c:726 -msgid "unable to create simulator instance" +#: remote.c:5153 +#, possible-c-format +msgid "" +"Malformed packet(a) (missing colon): %s\n" +"Packet: '%s'\n" msgstr "" -#: remote-sim.c:853 +#: remote.c:5209 #, possible-c-format -msgid "gdbsim_resume: pid %d, step %d, signal %d\n" +msgid "" +"Malformed packet(b) (missing colon): %s\n" +"Packet: '%s'\n" msgstr "" -#: remote-sim.c:932 +#: remote.c:5215 #, possible-c-format -msgid "Can't stop pid %d. No inferior found." +msgid "" +"Remote sent bad register number %s: %s\n" +"Packet: '%s'\n" msgstr "" -#: remote-sim.c:989 +#: remote.c:5227 #, possible-c-format -msgid "Unable to wait for pid %d. Inferior not found." +msgid "Remote reply is too short: %s" msgstr "" -#. PREVIOUSLY: The user may give a command before the simulator -#. is opened. [...] (??? assuming of course one wishes to -#. continue to allow commands to be sent to unopened simulators, -#. which isn't entirely unreasonable). -#. The simulator is a builtin abstraction of a remote target. -#. Consistent with that model, access to the simulator, via sim -#. commands, is restricted to the period when the channel to the -#. simulator is open. -#: remote-sim.c:1186 -msgid "Not connected to the simulator target" +#: remote.c:5233 +#, possible-c-format +msgid "" +"Remote register badly formatted: %s\n" +"here: %s" msgstr "" -#: remote-sim.c:1294 -msgid "Send a command to the simulator." +#: remote.c:5295 remote.c:5298 +#, possible-c-format +msgid "unknown stop reply packet: %s" msgstr "" -#. malformed packet error -#. general case: -#: remote.c:418 -msgid "remote.c: error in outgoing packet." +#: remote.c:5305 +#, possible-c-format +msgid "No process or thread specified in stop reply: %s" msgstr "" -#: remote.c:420 +#: remote.c:5470 remote.c:5612 #, possible-c-format -msgid "remote.c: error in outgoing packet at field #%ld." +msgid "Invalid remote reply: %s" msgstr "" -#: remote.c:423 +#: remote.c:5699 #, possible-c-format -msgid "trace API error 0x%s." +msgid "Could not fetch register \"%s\"; remote failure reply '%s'" msgstr "" -#: remote.c:425 +#: remote.c:5718 +msgid "fetch_register_using_p: early buf termination" +msgstr "" + +#: remote.c:5756 #, possible-c-format -msgid "Target returns error code '%s'." +msgid "Remote 'g' packet reply is of odd length: %s" msgstr "" -#: remote.c:454 +#: remote.c:5775 #, possible-c-format -msgid "invalid qRelocInsn packet: %s" +msgid "Remote 'g' packet reply is too long: %s" msgstr "" -#: remote.c:488 -msgid "warning: relocating instruction: " +#: remote.c:5818 remote.c:5836 +msgid "unexpected end of 'g' packet reply" msgstr "" -#: remote.c:719 -msgid "" -"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the " -"execution of the program.\n" +#: remote.c:5877 +msgid "could not set remote traceframe" msgstr "" -#: remote.c:724 -msgid "" -"send a break signal to the remote target to interrupt the execution of the " -"program.\n" +#: remote.c:5985 +#, possible-c-format +msgid "Could not write register \"%s\"; remote failure reply '%s'" msgstr "" -#: remote.c:728 -msgid "" -"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to " -"interrupt the execution of Linux kernel.\n" +#: remote.c:5990 +msgid "Bad result from packet_ok" msgstr "" -#: remote.c:733 remote.c:3116 +#: remote.c:6031 #, possible-c-format -msgid "Invalid value for interrupt_sequence_mode: %s." +msgid "Could not write registers; remote failure reply '%s'" msgstr "" -#: remote.c:877 -msgid "Argument required (integer, `fixed' or `limited')." +#: remote.c:6211 +msgid "Received too much data from remote target; ignoring overflow." msgstr "" -#: remote.c:890 -#, possible-c-format -msgid "Invalid %s (bad syntax)." +#: remote.c:6228 +msgid "Unmatched escape character in target response." msgstr "" -#: remote.c:897 -#, possible-c-format -msgid "Invalid %s (too large)." +#: remote.c:6327 +msgid "remote_write_bytes_aux: bad packet format" msgstr "" -#: remote.c:903 -#, possible-c-format -msgid "" -"The target may not be able to correctly handle a %s\n" -"of %ld bytes. Change the packet size? " +#: remote.c:6374 +msgid "minimum packet size too small to write data" +msgstr "" + +#: remote.c:6490 +msgid "remote_write_bytes: bad internal state" +msgstr "" + +#: remote.c:6640 +msgid "Too long remote packet." +msgstr "" + +#: remote.c:6643 remote.c:8556 +msgid "Communication problem with target." msgstr "" -#: remote.c:906 -msgid "Packet size not changed." +#: remote.c:6682 +msgid "Remote target does not support flash erase" msgstr "" -#: remote.c:916 -#, possible-c-format -msgid "The %s is %ld. " +#: remote.c:6684 +msgid "Error erasing flash with vFlashErase packet" msgstr "" -#: remote.c:918 -#, possible-c-format -msgid "Packets are fixed at %ld bytes.\n" +#: remote.c:6724 +msgid "Remote target does not support vFlashDone" msgstr "" -#: remote.c:921 -#, possible-c-format -msgid "Packets are limited to %ld bytes.\n" +#: remote.c:6726 +msgid "Error finishing flash operation" msgstr "" -#: remote.c:1045 -#, possible-c-format -msgid "Support for the `%s' packet is auto-detected, currently %s.\n" +#: remote.c:6757 remote-m32r-sdi.c:725 remote-m32r-sdi.c:731 +#: remote-m32r-sdi.c:747 +msgid "Remote connection closed" msgstr "" -#: remote.c:1051 -#, possible-c-format -msgid "Support for the `%s' packet is currently %s.\n" +#: remote.c:6761 +msgid "Remote communication error. Target disconnected." msgstr "" -#: remote.c:1146 -msgid "packet_ok: attempt to use a disabled packet" +#: remote.c:6850 +msgid "Cannot execute this command while the target is running." msgstr "" -#. If the stub previously indicated that the packet was -#. supported then there is a protocol error.. -#: remote.c:1160 -#, possible-c-format -msgid "Protocol error: %s (%s) conflicting enabled responses." +#: remote.c:6890 +msgid "putpkt: write failed" msgstr "" -#. The user set it wrong. -#: remote.c:1164 +#: remote.c:7176 #, possible-c-format -msgid "Enabled packet %s (%s) not recognized by stub" +msgid "Invalid run length encoding: %s\n" msgstr "" -#: remote.c:1250 remote.c:1271 -#, possible-c-format -msgid "Could not find config for %s" +#: remote.c:7282 +msgid "Watchdog timeout has expired. Target detached." msgstr "" -#. Error of some sort. -#. We're out of sync with the target now. Did it continue -#. or not? We can't tell which thread it was in non-stop, -#. so just ignore this. -#. Error of some sort. -#. We're out of sync with the target now. Did it continue or -#. not? Not is more likely, so report a stop. -#: remote.c:1388 remote.c:2782 remote.c:2822 remote.c:2939 remote.c:3804 -#: remote.c:5380 remote.c:5479 remote.c:6699 -#, possible-c-format -msgid "Remote failure reply: %s" +#. We have tried hard enough, and just can't receive the +#. packet/notification. Give up. +#: remote.c:7303 +msgid "Ignoring packet error, continuing...\n" msgstr "" -#: remote.c:1867 -#, possible-c-format -msgid "invalid remote ptid: %s" +#: remote.c:7439 +msgid "Can't kill process" msgstr "" -#: remote.c:2198 -msgid "Incomplete response to threadinfo request." +#: remote.c:7547 +msgid "Target does not support QDisableRandomization." msgstr "" -#. This is an answer to a different request. -#: remote.c:2201 -msgid "ERROR RMT Thread info mismatch." +#: remote.c:7549 +#, possible-c-format +msgid "Bogus QDisableRandomization reply from target: %s" msgstr "" -#: remote.c:2215 -msgid "ERROR RMT: threadinfo tag mismatch." +#: remote.c:7567 +msgid "Remote file name too long for run packet" msgstr "" -#: remote.c:2223 -msgid "ERROR RMT: length of threadid is not 16." +#: remote.c:7582 +msgid "Argument list too long for run packet" msgstr "" -#: remote.c:2238 -msgid "ERROR RMT: 'exists' length too long." +#: remote.c:7605 +msgid "" +"Running the default executable on the remote target failed; try \"set remote " +"exec-file\"?" msgstr "" -#: remote.c:2262 -msgid "ERROR RMT: unknown thread info tag." +#: remote.c:7608 +#, possible-c-format +msgid "Running \"%s\" on the remote target failed" msgstr "" -#. FIXME: This is a good reason to drop the packet. -#. Possably, there is a duplicate response. -#. Possabilities : -#. retransmit immediatly - race conditions -#. retransmit after timeout - yes -#. exit -#. wait for packet, then exit -#. -#: remote.c:2366 -msgid "HMM: threadlist did not echo arg thread, dropping it." +#: remote.c:7638 +msgid "Remote target does not support \"set remote exec-file\"" msgstr "" -#: remote.c:2373 -msgid "RMT ERROR : failed to get remote thread list." +#: remote.c:7640 +msgid "Remote target does not support \"set args\" or run " msgstr "" -#: remote.c:2381 -msgid "RMT ERROR: threadlist response longer than requested." +#: remote.c:7772 +#, possible-c-format +msgid "hw_bp_to_z: bad watchpoint type %d" msgstr "" -#: remote.c:2418 -msgid "Remote fetch threadlist -infinite loop-." +#: remote.c:7806 +msgid "remote_insert_watchpoint: reached end of function" msgstr "" -#. paranoia -#: remote.c:2583 -msgid "Command can only be used when connected to the remote target." +#: remote.c:7838 +msgid "remote_remove_watchpoint: reached end of function" msgstr "" -#: remote.c:2600 -msgid "threads" +#: remote.c:7946 +msgid "remote_insert_hw_breakpoint: reached end of function" msgstr "" -#: remote.c:2699 -msgid "remote_threads_extra_info" +#: remote.c:7981 +msgid "remote_remove_hw_breakpoint: reached end of function" msgstr "" -#: remote.c:2974 remote.c:3001 -#, possible-c-format -msgid "Target reported unsupported offsets: %s" +#: remote.c:8038 +msgid "remote target does not support this operation" msgstr "" -#: remote.c:2999 -#, possible-c-format -msgid "Malformed response to offset query, %s" +#: remote.c:8066 +msgid "command cannot be used without an exec file" msgstr "" -#: remote.c:3047 -msgid "Can not handle qOffsets TextSeg response with this symbol file" +#: remote.c:8091 +#, possible-c-format +msgid "target memory fault, section %s, range %s -- %s" msgstr "" -#: remote.c:3193 -msgid "Non-stop mode requested, but remote does not support non-stop" +#: remote.c:8109 +msgid "" +"One or more sections of the remote executable does not match\n" +"the loaded file\n" msgstr "" -#: remote.c:3200 +#: remote.c:8112 #, possible-c-format -msgid "Remote refused setting non-stop mode with: %s" +msgid "No loaded section named '%s'.\n" msgstr "" -#: remote.c:3216 +#: remote.c:8212 #, possible-c-format -msgid "Remote refused setting all-stop mode with: %s" +msgid "Unknown remote qXfer reply: %s" msgstr "" -#: remote.c:3228 remote.c:3323 -msgid "The target is not running (try extended-remote?)" +#: remote.c:8218 +msgid "Remote qXfer reply contained no data." msgstr "" -#: remote.c:3338 -msgid "remote didn't report the current thread in non-stop mode" +#: remote.c:8407 +msgid "remote query is only available after target open" msgstr "" -#: remote.c:3365 -msgid "Trace is already running on the target.\n" +#: remote.c:8498 +msgid "Pattern is too large to transmit to remote target." msgstr "" -#: remote.c:3490 -msgid "" -"The remote protocol may be unreliable over UDP.\n" -"Some events may be lost, rendering further debugging impossible." +#: remote.c:8520 remote.c:8525 +#, possible-c-format +msgid "Unknown qSearch:memory reply: %s" msgstr "" -#: remote.c:3526 -#, possible-c-format -msgid "Remote refused setting permissions with: %s" +#: remote.c:8538 +msgid "remote rcmd is only available after target open" msgstr "" -#: remote.c:3563 +#: remote.c:8550 #, possible-c-format -msgid "Remote qSupported response supplied an unexpected value for \"%s\"." +msgid "\"monitor\" command ``%s'' is too long." msgstr "" -#: remote.c:3587 -#, possible-c-format -msgid "Remote target reported \"%s\" without a size." +#: remote.c:8568 remote.c:9811 remote.c:10084 remote.c:10174 remote.c:10274 +#: remote.c:10321 remote.c:10398 remote.c:10460 remote.c:10488 +msgid "Target does not support this command." msgstr "" -#: remote.c:3596 -#, possible-c-format -msgid "Remote target reported \"%s\" with a bad size: \"%s\"." +#: remote.c:8579 +msgid "Protocol error with Rcmd" msgstr "" -#: remote.c:3603 -#, possible-c-format -msgid "limiting remote suggested packet size (%d bytes) to %d" +#: remote.c:8615 remote.c:9514 remote.c:9602 remote.c:9653 +msgid "command can only be used with remote target" msgstr "" -#: remote.c:3834 -msgid "empty item in \"qSupported\" response" +#: remote.c:8618 +msgid "remote-packet command requires packet text as argument" msgstr "" -#: remote.c:3865 -#, possible-c-format -msgid "unrecognized item \"%s\" in \"qSupported\" response" +#: remote.c:8659 +msgid "Remote threadset test\n" msgstr "" -#: remote.c:3913 -msgid "" -"To open a remote debug connection, you need to specify what\n" -"serial device is attached to the remote system\n" -"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)." +#: remote.c:8765 +msgid "Fetch and print the remote list of thread identifiers, one pkt only" msgstr "" -#: remote.c:3928 -msgid "Already connected to a remote target. Disconnect? " +#: remote.c:8768 +msgid "Fetch and display info about one thread" msgstr "" -#: remote.c:3931 -msgid "Still connected." +#: remote.c:8770 +msgid "Test setting to a different thread" msgstr "" -#: remote.c:4090 -msgid "No process to detach from." +#: remote.c:8772 +msgid "Iterate through updating all remote thread info" msgstr "" -#: remote.c:4104 -msgid "Remote doesn't know how to detach" +#: remote.c:8774 +msgid " Remote thread alive test " msgstr "" -#: remote.c:4106 -msgid "Can't detach process." +#: remote.c:8859 +msgid "Remote target doesn't support qGetTLSAddr packet" msgstr "" -#: remote.c:4111 -#, possible-c-format -msgid "Detached from remote %s.\n" +#: remote.c:8862 +msgid "Remote target failed to process qGetTLSAddr request" msgstr "" -#: remote.c:4116 -msgid "Detached from remote process.\n" +#: remote.c:8866 +msgid "TLS not supported or disabled on this target" msgstr "" -#: remote.c:4118 -msgid "Ending remote debugging.\n" +#: remote.c:8903 +msgid "Remote target doesn't support qGetTIBAddr packet" msgstr "" -#: remote.c:4144 -msgid "Argument given to \"disconnect\" when remotely debugging." +#: remote.c:8905 +msgid "Remote target failed to process qGetTIBAddr request" msgstr "" -#: remote.c:4171 remote.c:4196 -msgid "This target does not support attaching to a process" +#: remote.c:8908 +msgid "qGetTIBAddr not supported or disabled on this target" msgstr "" -#: remote.c:4181 +#: remote.c:8956 #, possible-c-format -msgid "Attached to %s\n" +msgid "Duplicate g packet description added for size %d" msgstr "" -#: remote.c:4191 -#, possible-c-format -msgid "Attaching to %s failed with: %s" +#: remote.c:9023 remote.c:9044 remote.c:9066 +msgid "Packet too long for target." msgstr "" -#: remote.c:4198 +#: remote.c:9298 #, possible-c-format -msgid "Attaching to %s failed" +msgid "Read returned %d, but %d bytes." msgstr "" -#: remote.c:4281 +#: remote.c:9397 #, possible-c-format -msgid "Reply contains invalid hex digit %d" +msgid "Unknown remote I/O error %d" msgstr "" -#: remote.c:4497 +#: remote.c:9399 #, possible-c-format -msgid "Unexpected vCont reply in non-stop mode: %s" +msgid "Remote I/O error: %s" msgstr "" -#: remote.c:4537 +#: remote.c:9548 #, possible-c-format -msgid " - Can't pass signal %d to target in reverse: ignored." +msgid "Error reading %s." msgstr "" -#: remote.c:4542 -msgid "Remote reverse-step not supported." +#: remote.c:9571 +#, possible-c-format +msgid "Remote write of %d bytes returned 0!" msgstr "" -#: remote.c:4545 -msgid "Remote reverse-continue not supported." +#: remote.c:9588 +#, possible-c-format +msgid "Successfully sent file \"%s\".\n" msgstr "" -#: remote.c:4683 -msgid "Remote server does not support stopping threads" +#: remote.c:9643 +#, possible-c-format +msgid "Successfully fetched file \"%s\".\n" msgstr "" -#: remote.c:4716 +#: remote.c:9660 #, possible-c-format -msgid "Stopping %s failed: %s" +msgid "Successfully deleted file \"%s\".\n" msgstr "" -#: remote.c:5069 -#, possible-c-format -msgid "" -"Malformed packet(a) (missing colon): %s\n" -"Packet: '%s'\n" +#: remote.c:9670 +msgid "file to put" msgstr "" -#: remote.c:5125 -#, possible-c-format -msgid "" -"Malformed packet(b) (missing colon): %s\n" -"Packet: '%s'\n" +#: remote.c:9675 +msgid "Invalid parameters to remote put" msgstr "" -#: remote.c:5131 -#, possible-c-format -msgid "" -"Remote sent bad register number %s: %s\n" -"Packet: '%s'\n" +#: remote.c:9689 +msgid "file to get" msgstr "" -#: remote.c:5143 -#, possible-c-format -msgid "Remote reply is too short: %s" +#: remote.c:9694 +msgid "Invalid parameters to remote get" msgstr "" -#: remote.c:5149 -#, possible-c-format -msgid "" -"Remote register badly formatted: %s\n" -"here: %s" +#: remote.c:9708 +msgid "file to delete" msgstr "" -#: remote.c:5211 remote.c:5214 -#, possible-c-format -msgid "unknown stop reply packet: %s" +#: remote.c:9713 +msgid "Invalid parameters to remote delete" msgstr "" -#: remote.c:5221 -#, possible-c-format -msgid "No process or thread specified in stop reply: %s" +#: remote.c:9856 remote.c:9871 remote.c:10030 remote.c:10041 +msgid "Target does not support source download." msgstr "" -#: remote.c:5386 remote.c:5528 -#, possible-c-format -msgid "Invalid remote reply: %s" +#: remote.c:9923 +msgid "Fast tracepoint not valid during download" msgstr "" -#: remote.c:5615 +#. Fast tracepoints are functionally identical to regular +#. tracepoints, so don't take lack of support as a reason to +#. give up on the trace run. +#: remote.c:9930 #, possible-c-format -msgid "Could not fetch register \"%s\"; remote failure reply '%s'" +msgid "" +"Target does not support fast tracepoints, downloading %d as regular " +"tracepoint" msgstr "" -#: remote.c:5634 -msgid "fetch_register_using_p: early buf termination" +#: remote.c:9944 +msgid "Static tracepoint not valid during download" msgstr "" -#: remote.c:5672 -#, possible-c-format -msgid "Remote 'g' packet reply is of odd length: %s" +#. Fast tracepoints are functionally identical to regular +#. tracepoints, so don't take lack of support as a reason +#. to give up on the trace run. +#: remote.c:9950 +msgid "Target does not support static tracepoints" msgstr "" -#: remote.c:5691 +#: remote.c:9970 #, possible-c-format -msgid "Remote 'g' packet reply is too long: %s" -msgstr "" - -#: remote.c:5734 remote.c:5752 -msgid "unexpected end of 'g' packet reply" +msgid "Target does not support conditional tracepoints, ignoring tp %d cond" msgstr "" -#: remote.c:5793 -msgid "could not set remote traceframe" +#: remote.c:9979 +msgid "Target does not support tracepoints." msgstr "" -#: remote.c:5901 -#, possible-c-format -msgid "Could not write register \"%s\"; remote failure reply '%s'" +#: remote.c:9996 remote.c:10013 +msgid "Error on target while setting tracepoints." msgstr "" -#: remote.c:5906 -msgid "Bad result from packet_ok" +#: remote.c:10078 +msgid "Trace state variable name too long for tsv definition packet" msgstr "" -#: remote.c:5947 -#, possible-c-format -msgid "Could not write registers; remote failure reply '%s'" +#: remote.c:10086 +msgid "Error on target while downloading trace state variable." msgstr "" -#: remote.c:6127 -msgid "Received too much data from remote target; ignoring overflow." +#: remote.c:10100 +msgid "" +"Target does not support enabling tracepoints while a trace run is ongoing." msgstr "" -#: remote.c:6144 -msgid "Unmatched escape character in target response." +#: remote.c:10102 +msgid "Error on target while enabling tracepoint." msgstr "" -#: remote.c:6243 -msgid "remote_write_bytes_aux: bad packet format" +#: remote.c:10116 +msgid "" +"Target does not support disabling tracepoints while a trace run is ongoing." msgstr "" -#: remote.c:6290 -msgid "minumum packet size too small to write data" +#: remote.c:10118 +msgid "Error on target while disabling tracepoint." msgstr "" -#: remote.c:6406 -msgid "remote_write_bytes: bad internal state" +#: remote.c:10154 +msgid "Too many sections for read-only sections definition packet." msgstr "" -#: remote.c:6556 -msgid "Too long remote packet." +#: remote.c:10176 remote.c:10276 remote.c:10346 remote.c:10349 remote.c:10400 +#: remote.c:10462 remote.c:10490 remote.c:10579 +#, possible-c-format +msgid "Bogus reply from target: %s" msgstr "" -#: remote.c:6559 remote.c:8441 -msgid "Communication problem with target." +#: remote.c:10216 +#, possible-c-format +msgid "Bogus trace status reply from target: %s" msgstr "" -#: remote.c:6598 -msgid "Remote target does not support flash erase" +#: remote.c:10315 +#, possible-c-format +msgid "Unknown trace find type %d" msgstr "" -#: remote.c:6600 -msgid "Error erasing flash with vFlashErase packet" +#: remote.c:10330 +msgid "Unable to parse trace frame number" msgstr "" -#: remote.c:6640 -msgid "Remote target does not support vFlashDone" +#: remote.c:10340 +msgid "Unable to parse tracepoint number" msgstr "" -#: remote.c:6642 -msgid "Error finishing flash operation" +#: remote.c:10392 +msgid "Remote file name too long for trace save packet" msgstr "" -#: remote.c:6677 -msgid "Remote communication error. Target disconnected." +#: remote.c:10465 +msgid "Target does not support disconnected tracing." msgstr "" -#: remote.c:6766 -msgid "Cannot execute this command while the target is running." +#. set/show remote ... +#. allow-unknown +#: remote.c:10918 remote.c:10924 +msgid "" +"Remote protocol specific variables\n" +"Configure various remote-protocol specific variables such as\n" +"the packets being used" msgstr "" -#: remote.c:6806 -msgid "putpkt: write failed" +#. allow-unknown +#: remote.c:10931 +msgid "" +"Compare section data on target to the exec file.\n" +"Argument is a single section name (default: all loaded sections)." msgstr "" -#: remote.c:7092 -#, possible-c-format -msgid "Invalid run length encoding: %s\n" +#: remote.c:10936 +msgid "" +"Send an arbitrary packet to a remote target.\n" +" maintenance packet TEXT\n" +"If GDB is talking to an inferior via the GDB serial protocol, then\n" +"this command sends the string TEXT to the inferior, and displays the\n" +"response packet. GDB supplies the initial `$' character, and the\n" +"terminating `#' character and checksum." msgstr "" -#: remote.c:7198 -msgid "Watchdog timeout has expired. Target detached." +#: remote.c:10945 +msgid "Set whether to send break if interrupted." msgstr "" -#. We have tried hard enough, and just can't receive the -#. packet/notification. Give up. -#: remote.c:7219 -msgid "Ignoring packet error, continuing...\n" +#: remote.c:10946 +msgid "Show whether to send break if interrupted." msgstr "" -#: remote.c:7347 -msgid "Can't kill process" +#: remote.c:10947 +msgid "If set, a break, instead of a cntrl-c, is sent to the remote target." msgstr "" -#: remote.c:7455 -msgid "Target does not support QDisableRandomization." +#: remote.c:10960 +msgid "Set interrupt sequence to remote target." msgstr "" -#: remote.c:7457 -#, possible-c-format -msgid "Bogus QDisableRandomization reply from target: %s" +#: remote.c:10961 +msgid "Show interrupt sequence to remote target." msgstr "" -#: remote.c:7475 -msgid "Remote file name too long for run packet" +#: remote.c:10962 +msgid "" +"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-" +"C\"." msgstr "" -#: remote.c:7490 -msgid "Argument list too long for run packet" +#: remote.c:10969 +msgid "" +"Set whether interrupt-sequence is sent to remote target when gdb connects to." msgstr "" -#: remote.c:7513 +#: remote.c:10970 msgid "" -"Running the default executable on the remote target failed; try \"set remote " -"exec-file\"?" +"\t\tShow whether interrupt-sequence is sent to remote target when gdb " +"connects to." msgstr "" -#: remote.c:7516 -#, possible-c-format -msgid "Running \"%s\" on the remote target failed" +#: remote.c:10971 +msgid "\t\tIf set, interrupt sequence is sent to remote target." msgstr "" -#: remote.c:7546 -msgid "Remote target does not support \"set remote exec-file\"" +#. Install commands for configuring memory read/write packets. +#: remote.c:10978 +msgid "Set the maximum number of bytes per memory write packet (deprecated)." msgstr "" -#: remote.c:7548 -msgid "Remote target does not support \"set args\" or run " +#: remote.c:10981 +msgid "" +"Show the maximum number of bytes per memory write packet (deprecated)." msgstr "" -#: remote.c:7680 -#, possible-c-format -msgid "hw_bp_to_z: bad watchpoint type %d" +#: remote.c:10985 +msgid "" +"Set the maximum number of bytes per memory-write packet.\n" +"Specify the number of bytes in a packet or 0 (zero) for the\n" +"default packet size. The actual limit is further reduced\n" +"dependent on the target. Specify ``fixed'' to disable the\n" +"further restriction and ``limit'' to enable that restriction." msgstr "" -#: remote.c:7714 -msgid "remote_insert_watchpoint: reached end of function" +#: remote.c:10993 +msgid "" +"Set the maximum number of bytes per memory-read packet.\n" +"Specify the number of bytes in a packet or 0 (zero) for the\n" +"default packet size. The actual limit is further reduced\n" +"dependent on the target. Specify ``fixed'' to disable the\n" +"further restriction and ``limit'' to enable that restriction." msgstr "" -#: remote.c:7746 -msgid "remote_remove_watchpoint: reached end of function" +#: remote.c:11002 +msgid "Show the maximum number of bytes per memory-write packet." msgstr "" -#: remote.c:7840 -msgid "remote_insert_hw_breakpoint: reached end of function" +#: remote.c:11006 +msgid "Show the maximum number of bytes per memory-read packet." msgstr "" -#: remote.c:7875 -msgid "remote_remove_hw_breakpoint: reached end of function" +#: remote.c:11010 +msgid "Set the maximum number of target hardware watchpoints." msgstr "" -#: remote.c:7932 -msgid "remote target does not support this operation" +#: remote.c:11011 +msgid "Show the maximum number of target hardware watchpoints." msgstr "" -#: remote.c:7960 -msgid "command cannot be used without an exec file" +#: remote.c:11012 remote.c:11021 remote.c:11030 +msgid "Specify a negative limit for unlimited." msgstr "" -#: remote.c:7985 -#, possible-c-format -msgid "target memory fault, section %s, range %s -- %s" +#: remote.c:11019 +msgid "Set the maximum length (in bytes) of a target hardware watchpoint." msgstr "" -#: remote.c:8003 -msgid "" -"One or more sections of the remote executable does not match\n" -"the loaded file\n" +#: remote.c:11020 +msgid "Show the maximum length (in bytes) of a target hardware watchpoint." msgstr "" -#: remote.c:8006 -#, possible-c-format -msgid "No loaded section named '%s'.\n" +#: remote.c:11028 +msgid "Set the maximum number of target hardware breakpoints." msgstr "" -#: remote.c:8106 -#, possible-c-format -msgid "Unknown remote qXfer reply: %s" +#: remote.c:11029 +msgid "Show the maximum number of target hardware breakpoints." msgstr "" -#: remote.c:8112 -msgid "Remote qXfer reply contained no data." +#: remote.c:11038 +msgid "Set the maximum size of the address (in bits) in a memory packet." msgstr "" -#: remote.c:8292 -msgid "remote query is only available after target open" +#: remote.c:11039 +msgid "Show the maximum size of the address (in bits) in a memory packet." msgstr "" -#: remote.c:8383 -msgid "Pattern is too large to transmit to remote target." +#: remote.c:11197 +msgid "Set use of remote protocol `Z' packets" msgstr "" -#: remote.c:8405 remote.c:8410 -#, possible-c-format -msgid "Unknown qSearch:memory reply: %s" +#: remote.c:11198 +msgid "Show use of remote protocol `Z' packets " msgstr "" -#: remote.c:8423 -msgid "remote rcmd is only available after target open" +#: remote.c:11199 +msgid "" +"When set, GDB will attempt to use the remote breakpoint and watchpoint\n" +"packets." msgstr "" -#: remote.c:8435 -#, possible-c-format -msgid "\"monitor\" command ``%s'' is too long." +#: remote.c:11208 +msgid "" +"Manipulate files on the remote system\n" +"Transfer files to and from the remote target system." msgstr "" -#: remote.c:8453 remote.c:9672 remote.c:9931 remote.c:9989 remote.c:10044 -#: remote.c:10091 remote.c:10168 remote.c:10230 remote.c:10258 -msgid "Target does not support this command." +#: remote.c:11215 +msgid "Copy a local file to the remote system." msgstr "" -#: remote.c:8464 -msgid "Protocol error with Rcmd" +#: remote.c:11219 +msgid "Copy a remote file to the local system." msgstr "" -#: remote.c:8500 remote.c:9399 remote.c:9487 remote.c:9538 -msgid "command can only be used with remote target" +#: remote.c:11223 +msgid "Delete a remote file." msgstr "" -#: remote.c:8503 -msgid "remote-packet command requires packet text as argument" +#: remote.c:11228 +msgid "Set the remote pathname for \"run\"" msgstr "" -#: remote.c:8544 -msgid "Remote threadset test\n" +#: remote.c:11229 +msgid "Show the remote pathname for \"run\"" msgstr "" -#: remote.c:8650 -msgid "Fetch and print the remote list of thread identifiers, one pkt only" +#: remote-fileio.c:1451 +msgid "Illegal argument for \"set remote system-call-allowed\" command" msgstr "" -#: remote.c:8653 -msgid "Fetch and display info about one thread" +#: remote-fileio.c:1458 +#, possible-c-format +msgid "Garbage after \"show remote system-call-allowed\" command: `%s'" msgstr "" -#: remote.c:8655 -msgid "Test setting to a different thread" +#: remote-fileio.c:1473 +msgid "Set if the host system(3) call is allowed for the target." msgstr "" -#: remote.c:8657 -msgid "Iterate through updating all remote thread info" +#: remote-fileio.c:1477 +msgid "Show if the host system(3) call is allowed for the target." msgstr "" -#: remote.c:8659 -msgid " Remote thread alive test " +#: remote-m32r-sdi.c:330 +msgid "Cannot pass arguments to remote STDEBUG process" msgstr "" -#: remote.c:8744 -msgid "Remote target doesn't support qGetTLSAddr packet" +#: remote-m32r-sdi.c:333 remote-mips.c:2330 +msgid "No executable file specified" msgstr "" -#: remote.c:8747 -msgid "Remote target failed to process qGetTLSAddr request" +#: remote-m32r-sdi.c:392 +msgid "Connection refused." msgstr "" -#: remote.c:8751 -msgid "TLS not supported or disabled on this target" +#: remote-m32r-sdi.c:395 remote-m32r-sdi.c:398 +msgid "Cannot connect to SDI target." msgstr "" -#: remote.c:8788 -msgid "Remote target doesn't support qGetTIBAddr packet" +#: remote-m32r-sdi.c:1189 +msgid "Too many breakpoints" msgstr "" -#: remote.c:8790 -msgid "Remote target failed to process qGetTIBAddr request" +#: remote-m32r-sdi.c:1258 +#, possible-c-format +msgid "Unknown option `%s'" msgstr "" -#: remote.c:8793 -msgid "qGetTIBAddr not supported or disabled on this target" +#: remote-m32r-sdi.c:1273 symfile.c:2085 +#, possible-c-format +msgid "\"%s\" is not an object file: %s" msgstr "" -#: remote.c:8841 +#: remote-m32r-sdi.c:1324 #, possible-c-format -msgid "Duplicate g packet description added for size %d" +msgid "Error while downloading %s section." msgstr "" -#: remote.c:8908 remote.c:8929 remote.c:8951 -msgid "Packet too long for target." +#: remote-m32r-sdi.c:1443 +msgid "Too many watchpoints" msgstr "" -#: remote.c:9183 -#, possible-c-format -msgid "Read returned %d, but %d bytes." +#: remote-m32r-sdi.c:1685 +msgid "Reset SDI connection." msgstr "" -#: remote.c:9282 -#, possible-c-format -msgid "Unknown remote I/O error %d" +#: remote-m32r-sdi.c:1688 +msgid "Show status of SDI connection." msgstr "" -#: remote.c:9284 -#, possible-c-format -msgid "Remote I/O error: %s" +#: remote-m32r-sdi.c:1691 +msgid "Debug M32R/Chaos." msgstr "" -#: remote.c:9433 -#, possible-c-format -msgid "Error reading %s." +#: remote-m32r-sdi.c:1694 +msgid "Use debug DMA mem access." msgstr "" -#: remote.c:9456 -#, possible-c-format -msgid "Remote write of %d bytes returned 0!" +#: remote-m32r-sdi.c:1696 +msgid "Use mon code mem access." msgstr "" -#: remote.c:9473 -#, possible-c-format -msgid "Successfully sent file \"%s\".\n" +#: remote-m32r-sdi.c:1699 +msgid "Set breakpoints by IB break." msgstr "" -#: remote.c:9528 -#, possible-c-format -msgid "Successfully fetched file \"%s\".\n" +#: remote-m32r-sdi.c:1701 +msgid "Set breakpoints by dbt." msgstr "" -#: remote.c:9545 -#, possible-c-format -msgid "Successfully deleted file \"%s\".\n" +#: remote-mips.c:674 +msgid "Watchdog has expired. Target detached." msgstr "" -#: remote.c:9555 -msgid "file to put" +#: remote-mips.c:678 +msgid "End of file from remote" msgstr "" -#: remote.c:9560 -msgid "Invalid parameters to remote put" +#: remote-mips.c:680 +#, possible-c-format +msgid "Error reading from remote: %s" msgstr "" -#: remote.c:9574 -msgid "file to get" +#. At this point, about the only thing we can do is abort the command +#. in progress and get back to command level as quickly as possible. +#: remote-mips.c:715 +msgid "Remote board reset, debug protocol re-initialized." msgstr "" -#: remote.c:9579 -msgid "Invalid parameters to remote get" +#: remote-mips.c:773 +#, possible-c-format +msgid "Debug protocol failure: more than %d characters before a sync." msgstr "" -#: remote.c:9593 -msgid "file to delete" +#: remote-mips.c:862 +#, possible-c-format +msgid "MIPS protocol data packet too long: %s" msgstr "" -#: remote.c:9598 -msgid "Invalid parameters to remote delete" +#: remote-mips.c:900 remote-mips.c:1161 remote-mips.c:1202 +#, possible-c-format +msgid "write to target failed: %s" msgstr "" -#: remote.c:9717 remote.c:9732 remote.c:9894 remote.c:9905 -msgid "Target does not support source download." +#: remote-mips.c:1008 +msgid "Remote did not acknowledge packet" msgstr "" -#: remote.c:9787 -msgid "Fast tracepoint not valid during download" +#: remote-mips.c:1039 remote-mips.c:1079 +msgid "Timed out waiting for remote packet" msgstr "" -#. Fast tracepoints are functionally identical to regular -#. tracepoints, so don't take lack of support as a reason to -#. give up on the trace run. -#: remote.c:9794 -#, possible-c-format -msgid "" -"Target does not support fast tracepoints, downloading %d as regular " -"tracepoint" +#: remote-mips.c:1101 +msgid "Timed out waiting for packet" msgstr "" -#: remote.c:9808 -msgid "Static tracepoint not valid during download" +#: remote-mips.c:1259 +msgid "mips_request: Trying to send command before reply" msgstr "" -#. Fast tracepoints are functionally identical to regular -#. tracepoints, so don't take lack of support as a reason -#. to give up on the trace run. -#: remote.c:9814 -msgid "Target does not support static tracepoints" +#: remote-mips.c:1279 +msgid "mips_request: Trying to get reply before command" msgstr "" -#: remote.c:9834 -#, possible-c-format -msgid "Target does not support conditional tracepoints, ignoring tp %d cond" +#: remote-mips.c:1290 +msgid "Bad response from remote board" msgstr "" -#: remote.c:9843 -msgid "Target does not support tracepoints." +#: remote-mips.c:1366 +msgid "Failed to initialize (didn't receive packet)." msgstr "" -#: remote.c:9860 remote.c:9877 -msgid "Error on target while setting tracepoints." +#: remote-mips.c:1416 +msgid "internal error: mips_initialize called twice" msgstr "" -#: remote.c:9925 -msgid "Trace state variable name too long for tsv definition packet" +#: remote-mips.c:1490 +msgid "Failed to initialize." msgstr "" -#: remote.c:9933 -msgid "Error on target while downloading trace state variable." +#: remote-mips.c:1547 +msgid "" +"To open a MIPS remote debugging connection, you need to specify what\n" +"serial device is attached to the target board (e.g., /dev/ttya).\n" +"If you want to use TFTP to download to the board, specify the name of a\n" +"temporary file to be used by GDB for downloads as the second argument.\n" +"This filename must be in the form host:filename, where host is the name\n" +"of the host running the TFTP server, and the file must be readable by the\n" +"world. If the local name of the temporary file differs from the name as\n" +"seen from the board via TFTP, specify that name as the third parameter.\n" msgstr "" -#: remote.c:9969 -msgid "Too many sections for read-only sections definition packet." +#: remote-mips.c:1601 +msgid "Unable to open UDP port" msgstr "" -#: remote.c:9991 remote.c:10046 remote.c:10116 remote.c:10119 remote.c:10170 -#: remote.c:10232 remote.c:10260 +#: remote-mips.c:1851 #, possible-c-format -msgid "Bogus reply from target: %s" +msgid "Remote failure: %s" msgstr "" -#: remote.c:10031 +#: remote-mips.c:2049 #, possible-c-format -msgid "Bogus trace status reply from target: %s" +msgid "Can't read register %d: %s" msgstr "" -#: remote.c:10085 +#: remote-mips.c:2088 #, possible-c-format -msgid "Unknown trace find type %d" +msgid "Can't write register %d: %s" msgstr "" -#: remote.c:10100 -msgid "Unable to parse trace frame number" +#: remote-mips.c:2323 +msgid "Can't pass arguments to remote MIPS board; arguments ignored." msgstr "" -#: remote.c:10110 -msgid "Unable to parse tracepoint number" +#: remote-mips.c:2582 +#, possible-c-format +msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s" msgstr "" -#: remote.c:10162 -msgid "Remote file name too long for trace save packet" +#: remote-mips.c:2597 remote-mips.c:2650 remote-mips.c:2722 +#, possible-c-format +msgid "mips_common_breakpoint: Bad response from remote board: %s" msgstr "" -#: remote.c:10235 -msgid "Target does not support disconnected tracing." +#: remote-mips.c:2761 +msgid "Timeout during download." msgstr "" -#: remote.c:10460 -msgid "Calling remote_async when async is masked" +#: remote-mips.c:2771 +#, possible-c-format +msgid "Download got unexpected ack char: 0x%x, retrying." msgstr "" -#. set/show remote ... -#. allow-unknown -#: remote.c:10620 remote.c:10626 -msgid "" -"Remote protocol specific variables\n" -"Configure various remote-protocol specific variables such as\n" -"the packets being used" +#: remote-mips.c:3520 +msgid "mips_load: Couldn't get into monitor mode." msgstr "" -#. allow-unknown -#: remote.c:10633 -msgid "" -"Compare section data on target to the exec file.\n" -"Argument is a single section name (default: all loaded sections)." +#: remote-mips.c:3678 +msgid "Set timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:10638 -msgid "" -"Send an arbitrary packet to a remote target.\n" -" maintenance packet TEXT\n" -"If GDB is talking to an inferior via the GDB serial protocol, then\n" -"this command sends the string TEXT to the inferior, and displays the\n" -"response packet. GDB supplies the initial `$' character, and the\n" -"terminating `#' character and checksum." +#: remote-mips.c:3679 +msgid "Show timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:10647 -msgid "Set whether to send break if interrupted." +#: remote-mips.c:3686 +msgid "Set retransmit timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:10648 -msgid "Show whether to send break if interrupted." +#: remote-mips.c:3687 +msgid "Show retransmit timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:10649 -msgid "If set, a break, instead of a cntrl-c, is sent to the remote target." +#: remote-mips.c:3688 +msgid "" +"This is the number of seconds to wait for an acknowledgement to a packet\n" +"before resending the packet." msgstr "" -#: remote.c:10662 -msgid "Set interrupt sequence to remote target." +#: remote-mips.c:3696 +msgid "" +"Set the maximum number of characters to ignore when scanning for a SYN." msgstr "" -#: remote.c:10663 -msgid "Show interrupt sequence to remote target." +#: remote-mips.c:3697 +msgid "" +"Show the maximum number of characters to ignore when scanning for a SYN." msgstr "" -#: remote.c:10664 +#: remote-mips.c:3698 msgid "" -"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-" -"C\"." +"This is the maximum number of characters GDB will ignore when trying to\n" +"synchronize with the remote system. A value of -1 means that there is no\n" +"limit. (Note that these characters are printed out even though they are\n" +"ignored.)" msgstr "" -#: remote.c:10671 -msgid "" -"Set whether interrupt-sequence is sent to remote target when gdb connects to." +#: remote-mips.c:3708 +msgid "Set the prompt that GDB expects from the monitor." msgstr "" -#: remote.c:10672 -msgid "" -"\t\tShow whether interrupt-sequence is sent to remote target when gdb " -"connects to." +#: remote-mips.c:3709 +msgid "Show the prompt that GDB expects from the monitor." msgstr "" -#: remote.c:10673 -msgid "\t\tIf set, interrupt sequence is sent to remote target." +#: remote-mips.c:3716 +msgid "Set printing of monitor warnings." msgstr "" -#. Install commands for configuring memory read/write packets. -#: remote.c:10680 -msgid "Set the maximum number of bytes per memory write packet (deprecated)." +#: remote-mips.c:3717 +msgid "Show printing of monitor warnings." msgstr "" -#: remote.c:10683 +#: remote-mips.c:3718 msgid "" -"Show the maximum number of bytes per memory write packet (deprecated)." +"When enabled, monitor warnings about hardware breakpoints will be displayed." msgstr "" -#: remote.c:10687 -msgid "" -"Set the maximum number of bytes per memory-write packet.\n" -"Specify the number of bytes in a packet or 0 (zero) for the\n" -"default packet size. The actual limit is further reduced\n" -"dependent on the target. Specify ``fixed'' to disable the\n" -"further restriction and ``limit'' to enable that restriction." +#: remote-mips.c:3725 +msgid "Send a packet to PMON (must be in debug mode)." msgstr "" -#: remote.c:10695 +#: remote-mips.c:3727 msgid "" -"Set the maximum number of bytes per memory-read packet.\n" -"Specify the number of bytes in a packet or 0 (zero) for the\n" -"default packet size. The actual limit is further reduced\n" -"dependent on the target. Specify ``fixed'' to disable the\n" -"further restriction and ``limit'' to enable that restriction." +"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON " +"targets." msgstr "" -#: remote.c:10704 -msgid "Show the maximum number of bytes per memory-write packet." +#: remote-mips.c:3728 +msgid "" +"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON " +"targets." msgstr "" -#: remote.c:10708 -msgid "Show the maximum number of bytes per memory-read packet." +#: remote-mips.c:3729 +msgid "Use \"on\" to enable the masking and \"off\" to disable it." msgstr "" -#: remote.c:10712 -msgid "Set the maximum number of target hardware watchpoints." +#: remote-sim.c:187 +#, possible-c-format +msgid "Unable to create simulator instance for inferior %d." msgstr "" -#: remote.c:10713 -msgid "Show the maximum number of target hardware watchpoints." +#: remote-sim.c:202 +#, possible-c-format +msgid "" +"Inferior %d and inferior %d would have identical simulator state.\n" +"(This simulator does not support the running of more than one inferior.)" msgstr "" -#: remote.c:10714 remote.c:10723 -msgid "Specify a negative limit for unlimited." +#: remote-sim.c:529 +msgid "Register size different to expected" msgstr "" -#: remote.c:10721 -msgid "Set the maximum number of target hardware breakpoints." +#: remote-sim.c:532 +#, possible-c-format +msgid "Register %d not updated" msgstr "" -#: remote.c:10722 -msgid "Show the maximum number of target hardware breakpoints." +#: remote-sim.c:534 +#, possible-c-format +msgid "Register %s not updated" msgstr "" -#: remote.c:10731 -msgid "Set the maximum size of the address (in bits) in a memory packet." +#: remote-sim.c:573 +msgid "program to load" msgstr "" -#: remote.c:10732 -msgid "Show the maximum size of the address (in bits) in a memory packet." +#: remote-sim.c:581 +msgid "GDB sim does not yet support a load offset." msgstr "" -#: remote.c:10881 -msgid "Set use of remote protocol `Z' packets" +#: remote-sim.c:590 +msgid "unable to load program" msgstr "" -#: remote.c:10882 -msgid "Show use of remote protocol `Z' packets " +#: remote-sim.c:617 +msgid "No executable file specified." msgstr "" -#: remote.c:10883 -msgid "" -"When set, GDB will attempt to use the remote breakpoint and watchpoint\n" -"packets." +#: remote-sim.c:619 remote-sim.c:1085 +msgid "No program loaded." msgstr "" -#: remote.c:10892 -msgid "" -"Manipulate files on the remote system\n" -"Transfer files to and from the remote target system." +#: remote-sim.c:728 +msgid "unable to create simulator instance" msgstr "" -#: remote.c:10899 -msgid "Copy a local file to the remote system." +#: remote-sim.c:855 +#, possible-c-format +msgid "gdbsim_resume: pid %d, step %d, signal %d\n" msgstr "" -#: remote.c:10903 -msgid "Copy a remote file to the local system." +#: remote-sim.c:934 +#, possible-c-format +msgid "Can't stop pid %d. No inferior found." msgstr "" -#: remote.c:10907 -msgid "Delete a remote file." +#: remote-sim.c:991 +#, possible-c-format +msgid "Unable to wait for pid %d. Inferior not found." msgstr "" -#: remote.c:10912 -msgid "Set the remote pathname for \"run\"" +#. PREVIOUSLY: The user may give a command before the simulator +#. is opened. [...] (??? assuming of course one wishes to +#. continue to allow commands to be sent to unopened simulators, +#. which isn't entirely unreasonable). +#. The simulator is a builtin abstraction of a remote target. +#. Consistent with that model, access to the simulator, via sim +#. commands, is restricted to the period when the channel to the +#. simulator is open. +#: remote-sim.c:1188 +msgid "Not connected to the simulator target" msgstr "" -#: remote.c:10913 -msgid "Show the remote pathname for \"run\"" +#: remote-sim.c:1310 +msgid "Send a command to the simulator." msgstr "" -#: reverse.c:57 +#: reverse.c:53 #, possible-c-format msgid "Already in reverse mode. Use '%s' or 'set exec-dir forward'." msgstr "" -#: reverse.c:146 +#: reverse.c:142 msgid "target_get_bookmark failed." msgstr "" -#: reverse.c:170 +#: reverse.c:166 #, possible-c-format msgid "Saved bookmark %d at %s\n" msgstr "" -#: reverse.c:229 +#: reverse.c:225 msgid "No bookmarks." msgstr "" -#: reverse.c:235 +#: reverse.c:231 msgid "Delete all bookmarks? " msgstr "" #. Not found. -#: reverse.c:247 +#: reverse.c:243 #, possible-c-format msgid "No bookmark #%d." msgstr "" -#: reverse.c:260 thread.c:1323 +#: reverse.c:256 thread.c:1316 msgid "Command requires an argument." msgstr "" #. Not found. -#: reverse.c:293 +#: reverse.c:289 #, possible-c-format msgid "goto-bookmark: no bookmark found for '%s'." msgstr "" -#: reverse.c:329 +#: reverse.c:325 msgid "No bookmarks.\n" msgstr "" -#: reverse.c:352 +#: reverse.c:348 msgid "" "Step program backward until it reaches the beginning of another source " "line.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: reverse.c:358 +#: reverse.c:354 msgid "" "Step program backward, proceeding through subroutine calls.\n" "Like the \"reverse-step\" command as long as subroutine calls do not " @@ -18861,19 +19507,19 @@ "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: reverse.c:366 +#: reverse.c:362 msgid "" "Step backward exactly one instruction.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: reverse.c:372 +#: reverse.c:368 msgid "" "Step backward one instruction, but proceed through called subroutines.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: reverse.c:378 +#: reverse.c:374 msgid "" "Continue program being debugged but run it in reverse.\n" "If proceeding from breakpoint, a number N may be used as an argument,\n" @@ -18881,18 +19527,18 @@ "the breakpoint won't break until the Nth time it is reached)." msgstr "" -#: reverse.c:385 +#: reverse.c:381 msgid "Execute backward until just before selected stack frame is called." msgstr "" -#: reverse.c:388 +#: reverse.c:384 msgid "" "Set a bookmark in the program's execution history.\n" "A bookmark represents a point in the execution history \n" "that can be returned to at a later point in the debug session." msgstr "" -#: reverse.c:392 +#: reverse.c:388 msgid "" "Status of user-settable bookmarks.\n" "Bookmarks are user-settable markers representing a point in the \n" @@ -18900,14 +19546,14 @@ "session." msgstr "" -#: reverse.c:397 +#: reverse.c:393 msgid "" "Delete a bookmark from the bookmark list.\n" "Argument is a bookmark number or numbers,\n" " or no argument to delete all bookmarks.\n" msgstr "" -#: reverse.c:402 +#: reverse.c:398 msgid "" "Go to an earlier-bookmarked point in the program's execution history.\n" "Argument is the bookmark number of a bookmark saved earlier by using \n" @@ -18917,34 +19563,34 @@ msgstr "" #. FIXME: this happens 3 times at the start of each 64-bit program. -#: rs6000-nat.c:262 +#: rs6000-nat.c:261 msgid "ptrace read" msgstr "" -#: rs6000-nat.c:330 +#: rs6000-nat.c:329 msgid "ptrace write" msgstr "" -#: rs6000-nat.c:613 +#: rs6000-nat.c:612 msgid "pt_continue" msgstr "" -#: rs6000-nat.c:757 solib.c:403 +#: rs6000-nat.c:756 solib.c:390 #, possible-c-format msgid "Could not open `%s' as an executable file: %s" msgstr "" -#: rs6000-nat.c:777 +#: rs6000-nat.c:776 #, possible-c-format msgid "\"%s\": member \"%s\" missing." msgstr "" -#: rs6000-nat.c:784 +#: rs6000-nat.c:783 #, possible-c-format msgid "\"%s\": member \"%s\" not in executable format: %s." msgstr "" -#: rs6000-nat.c:795 +#: rs6000-nat.c:794 #, possible-c-format msgid "\"%s\": not in executable format: %s." msgstr "" @@ -18952,17 +19598,17 @@ #. The kernel sets ld_info to -1, if the process is still using the #. object, and the object is removed. Keep the symbol info for the #. removed object and issue a warning. -#: rs6000-nat.c:839 +#: rs6000-nat.c:838 #, possible-c-format msgid "%s (fd=%d) has disappeared, keeping its symbols" msgstr "" -#: rs6000-nat.c:868 +#: rs6000-nat.c:867 #, possible-c-format msgid "Unable to stat %s, keeping its symbols" msgstr "" -#: rs6000-nat.c:917 +#: rs6000-nat.c:916 #, possible-c-format msgid "" "Symbol file %s\n" @@ -18973,78 +19619,78 @@ "symbols to the proper address)." msgstr "" -#: rs6000-nat.c:951 +#: rs6000-nat.c:950 msgid "vmap_exec: vmap or table->sections == 0." msgstr "" -#: rs6000-nat.c:1025 +#: rs6000-nat.c:1024 msgid "rs6000_create_inferior: failed to select architecture" msgstr "" -#: rs6000-nat.c:1072 +#: rs6000-nat.c:1071 msgid "ptrace ldinfo" msgstr "" -#: rs6000-nat.c:1214 +#: rs6000-nat.c:1213 #, possible-c-format msgid "Unable to find TOC entry for pc %s." msgstr "" -#: rs6000-tdep.c:2804 +#: rs6000-tdep.c:2802 #, possible-c-format msgid "rs6000_pseudo_register_read: called on unexpected register '%s' (%d)" msgstr "" -#: rs6000-tdep.c:2829 +#: rs6000-tdep.c:2827 #, possible-c-format msgid "rs6000_pseudo_register_write: called on unexpected register '%s' (%d)" msgstr "" -#: rs6000-tdep.c:4184 +#: rs6000-tdep.c:4182 msgid "\"set powerpc\" must be followed by an appropriate subcommand.\n" msgstr "" -#: rs6000-tdep.c:4225 +#: rs6000-tdep.c:4223 #, possible-c-format msgid "Invalid vector ABI accepted: %s." msgstr "" -#: rs6000-tdep.c:4241 +#: rs6000-tdep.c:4239 #, possible-c-format msgid "Use of exact watchpoints is %s.\n" msgstr "" -#: rs6000-tdep.c:4279 rs6000-tdep.c:4283 +#: rs6000-tdep.c:4277 rs6000-tdep.c:4281 msgid "Various PowerPC-specific commands." msgstr "" -#: rs6000-tdep.c:4289 +#: rs6000-tdep.c:4287 msgid "Set whether to use a soft-float ABI." msgstr "" -#: rs6000-tdep.c:4290 +#: rs6000-tdep.c:4288 msgid "Show whether to use a soft-float ABI." msgstr "" -#: rs6000-tdep.c:4297 +#: rs6000-tdep.c:4295 msgid "Set the vector ABI." msgstr "" -#: rs6000-tdep.c:4298 +#: rs6000-tdep.c:4296 msgid "Show the vector ABI." msgstr "" -#: rs6000-tdep.c:4304 +#: rs6000-tdep.c:4302 msgid "" "Set whether to use just one debug register for watchpoints on scalars." msgstr "" -#: rs6000-tdep.c:4306 +#: rs6000-tdep.c:4304 msgid "" "Show whether to use just one debug register for watchpoints on scalars." msgstr "" -#: rs6000-tdep.c:4308 +#: rs6000-tdep.c:4306 msgid "" "If true, GDB will use only one debug register when watching a variable of\n" "scalar type, thus assuming that the variable is accessed through the " @@ -19052,49 +19698,57 @@ "of its first byte." msgstr "" -#: s390-nat.c:277 s390-nat.c:318 +#: s390-nat.c:325 s390-nat.c:347 +msgid "Couldn't get register set" +msgstr "" + +#: s390-nat.c:353 +msgid "Couldn't set register set" +msgstr "" + +#: s390-nat.c:458 s390-nat.c:499 msgid "Couldn't retrieve watchpoint status" msgstr "" -#: s390-nat.c:287 +#: s390-nat.c:468 msgid "Couldn't clear watchpoint status" msgstr "" -#: s390-nat.c:334 +#: s390-nat.c:515 msgid "Couldn't modify watchpoint status" msgstr "" -#: s390-tdep.c:2408 +#: s390-tdep.c:2644 msgid "Stack overflow" msgstr "" -#: s390-tdep.c:2511 +#: s390-tdep.c:2747 msgid "unknown argument type" msgstr "" -#: s390-tdep.c:2610 s390-tdep.c:2643 +#: s390-tdep.c:2857 s390-tdep.c:2890 msgid "invalid return type" msgstr "" -#: s390-tdep.c:2614 spu-tdep.c:1484 +#: s390-tdep.c:2861 spu-tdep.c:1491 msgid "Cannot set function return value." msgstr "" -#: s390-tdep.c:2647 spu-tdep.c:1500 +#: s390-tdep.c:2894 spu-tdep.c:1507 msgid "Function return value unknown." msgstr "" -#: score-tdep.c:160 score-tdep.c:253 score-tdep.c:323 score-tdep.c:832 +#: score-tdep.c:159 score-tdep.c:252 score-tdep.c:322 score-tdep.c:831 #, possible-c-format msgid "Error: target_read_memory in file:%s, line:%d!" msgstr "" -#: score-tdep.c:441 +#: score-tdep.c:440 #, possible-c-format msgid "Error: score_xfer_register in file:%s, line:%d!" msgstr "" -#: score-tdep.c:820 +#: score-tdep.c:819 #, possible-c-format msgid "Error: malloc size < 0 in file:%s, line:%d!" msgstr "" @@ -19102,7 +19756,7 @@ #. The sentinel frame is used as a starting point for creating the #. previous (inner most) frame. That frame's THIS_ID method will be #. called to determine the inner most frame's ID. Not this one. -#: sentinel-frame.c:81 +#: sentinel-frame.c:66 msgid "sentinel_frame_this_id called" msgstr "" @@ -19178,60 +19832,120 @@ msgid "Print DOS serial port status." msgstr "" -#: ser-mingw.c:175 +#: serial.c:389 +msgid "serial_readchar: blocking read in async mode" +msgstr "" + +#: serial.c:568 +msgid "serial: FD not valid" +msgstr "" + +#: serial.c:701 serial.c:739 +msgid "connect" +msgstr "" + +#: serial.c:774 +msgid "" +"Connect the terminal directly up to the command monitor.\n" +"Use ~. or ~^D to break out." +msgstr "" + +#: serial.c:779 +msgid "Set default serial/parallel port configuration." +msgstr "" + +#: serial.c:785 +msgid "Show default serial/parallel port configuration." +msgstr "" + +#: serial.c:791 +msgid "Set filename for remote session recording." +msgstr "" + +#: serial.c:792 +msgid "Show filename for remote session recording." +msgstr "" + +#: serial.c:793 +msgid "" +"This file is used to record the remote session for future playback\n" +"by gdbserver." +msgstr "" + +#: serial.c:801 +msgid "Set numerical base for remote session logging" +msgstr "" + +#: serial.c:802 +msgid "Show numerical base for remote session logging" +msgstr "" + +#: serial.c:809 +msgid "Set serial debugging." +msgstr "" + +#: serial.c:810 +msgid "Show serial debugging." +msgstr "" + +#: serial.c:811 +msgid "When non-zero, serial port debugging is enabled." +msgstr "" + +#: ser-mingw.c:174 msgid "SetCommState failed" msgstr "" -#: ser-mingw.c:268 +#: ser-mingw.c:267 msgid "ser_windows_wait_handle: reseting mask failed" msgstr "" -#: ser-mingw.c:271 +#: ser-mingw.c:270 msgid "ser_windows_wait_handle: reseting mask failed (2)" msgstr "" -#: ser-mingw.c:846 +#: ser-mingw.c:845 msgid "child command" msgstr "" -#: ser-mingw.c:852 +#: ser-mingw.c:851 msgid "missing child command" msgstr "" -#: ser-mingw.c:879 +#: ser-mingw.c:878 #, possible-c-format msgid "error starting child process '%s': %s: %s" msgstr "" -#: ser-mingw.c:882 +#: ser-mingw.c:881 #, possible-c-format msgid "error starting child process '%s': %s" msgstr "" -#: ser-tcp.c:181 +#: ser-tcp.c:183 msgid "net_open: No colon in host name!" msgstr "" #. allow-unknown -#: ser-tcp.c:406 ser-tcp.c:411 +#: ser-tcp.c:408 ser-tcp.c:413 msgid "" "TCP protocol specific variables\n" "Configure variables specific to remote TCP connections" msgstr "" -#: ser-tcp.c:418 +#: ser-tcp.c:420 msgid "Set auto-retry on socket connect" msgstr "" -#: ser-tcp.c:419 +#: ser-tcp.c:421 msgid "Show auto-retry on socket connect" msgstr "" -#: ser-tcp.c:425 +#: ser-tcp.c:427 msgid "Set timeout limit for socket connection" msgstr "" -#: ser-tcp.c:426 +#: ser-tcp.c:428 msgid "Show timeout limit for socket connection" msgstr "" @@ -19270,311 +19984,449 @@ "when debugging using remote targets." msgstr "" -#: serial.c:391 -msgid "serial_readchar: blocking read in async mode" +#: sh64-tdep.c:1591 +msgid "sh64_register_convert_to_virtual called with non DR register number" msgstr "" -#: serial.c:570 -msgid "serial: FD not valid" +#: sh64-tdep.c:1616 +msgid "sh64_register_convert_to_raw called with non DR register number" msgstr "" -#: serial.c:703 serial.c:741 -msgid "connect" +#: sh64-tdep.c:2096 +#, possible-c-format +msgid "Invalid pseudo register number %d\n" +msgstr "" + +#: sh64-tdep.c:2191 +#, possible-c-format +msgid "Invalid register number %d\n" +msgstr "" + +#: sh64-tdep.c:2275 +msgid "Not a valid register for the current processor mode." +msgstr "" + +#: sh-tdep.c:2276 +msgid "sh_register_convert_to_raw called with non DR register number" +msgstr "" + +#: sh-tdep.c:3097 +msgid "Print all registers" +msgstr "" + +#: sh-tdep.c:3106 +msgid "Set calling convention used when calling target functions from GDB." +msgstr "" + +#: sh-tdep.c:3108 +msgid "Show calling convention used when calling target functions from GDB." msgstr "" -#: serial.c:776 +#: sh-tdep.c:3110 msgid "" -"Connect the terminal directly up to the command monitor.\n" -"Use ~. or ~^D to break out." +"gcc - Use GCC calling convention (default).\n" +"renesas - Enforce Renesas calling convention." msgstr "" -#: serial.c:781 -msgid "Set default serial/parallel port configuration." +#: skip.c:99 +msgid "No default file now." msgstr "" -#: serial.c:787 -msgid "Show default serial/parallel port configuration." +#: skip.c:108 +#, possible-c-format +msgid "No source file named %s.\n" msgstr "" -#: serial.c:793 -msgid "Set filename for remote session recording." +#: skip.c:109 +msgid "Ignore file pending future shared library load? " +msgstr "" + +#: skip.c:129 +#, possible-c-format +msgid "File %s will be skipped when stepping.\n" +msgstr "" + +#: skip.c:143 +msgid "No default function now." +msgstr "" + +#: skip.c:148 +#, possible-c-format +msgid "No function found containing current program point %s." +msgstr "" + +#: skip.c:176 +#, possible-c-format +msgid "No function found named %s.\n" +msgstr "" + +#: skip.c:178 +msgid "Ignore function pending future shared library load? " +msgstr "" + +#: skip.c:189 +msgid "Specify just one function at a time." +msgstr "" + +#: skip.c:204 +#, possible-c-format +msgid "No function found containing program point %s." msgstr "" -#: serial.c:794 -msgid "Show filename for remote session recording." +#: skip.c:237 +msgid "Not skipping any files or functions.\n" msgstr "" -#: serial.c:795 -msgid "" -"This file is used to record the remote session for future playback\n" -"by gdbserver." +#: skip.c:241 +#, possible-c-format +msgid "No skiplist entries found with number %s.\n" msgstr "" -#: serial.c:803 -msgid "Set numerical base for remote session logging" +#: skip.c:284 +msgid "Skiplist entry should have either a filename or a function name." msgstr "" -#: serial.c:804 -msgid "Show numerical base for remote session logging" +#: skip.c:347 skip.c:364 skip.c:393 +#, possible-c-format +msgid "No skiplist entries found with number %s." msgstr "" -#: serial.c:811 -msgid "Set serial debugging." +#: skip.c:414 +#, possible-c-format +msgid "Function %s at %s will be skipped when stepping.\n" msgstr "" -#: serial.c:812 -msgid "Show serial debugging." +#: skip.c:417 +#, possible-c-format +msgid "" +"Function %s will be skipped when stepping, pending shared library load.\n" msgstr "" -#: serial.c:813 -msgid "When non-zero, serial port debugging is enabled." +#: skip.c:553 +msgid "" +"Ignore a function while stepping.\n" +"Usage: skip [FUNCTION NAME]\n" +"If no function name is given, ignore the current function." msgstr "" -#: sh-tdep.c:2278 -msgid "sh_register_convert_to_raw called with non DR register number" +#: skip.c:559 +msgid "" +"Ignore a file while stepping.\n" +"Usage: skip file [FILENAME]\n" +"If no filename is given, ignore the current file." msgstr "" -#: sh-tdep.c:3099 -msgid "Print all registers" +#: skip.c:566 +msgid "" +"Ignore a function while stepping.\n" +"Usage: skip function [FUNCTION NAME]\n" +"If no function name is given, skip the current function." msgstr "" -#: sh-tdep.c:3108 -msgid "Set calling convention used when calling target functions from GDB." +#: skip.c:573 +msgid "" +"Enable skip entries. You can specify numbers (e.g. \"skip enable 1 3\"), " +"ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n" +"\n" +"If you don't specify any numbers or ranges, we'll enable all skip entries.\n" +"\n" +"Usage: skip enable [NUMBERS AND/OR RANGES]" msgstr "" -#: sh-tdep.c:3110 -msgid "Show calling convention used when calling target functions from GDB." +#: skip.c:580 +msgid "" +"Disable skip entries. You can specify numbers (e.g. \"skip disable 1 3\"), " +"ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-" +"8\").\n" +"\n" +"If you don't specify any numbers or ranges, we'll disable all skip entries.\n" +"\n" +"Usage: skip disable [NUMBERS AND/OR RANGES]" msgstr "" -#: sh-tdep.c:3112 +#: skip.c:587 msgid "" -"gcc - Use GCC calling convention (default).\n" -"renesas - Enforce Renesas calling convention." +"Delete skip entries. You can specify numbers (e.g. \"skip delete 1 3\"), " +"ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n" +"\n" +"If you don't specify any numbers or ranges, we'll delete all skip entries.\n" +"\n" +"Usage: skip delete [NUMBERS AND/OR RANGES]" msgstr "" -#: sh64-tdep.c:1593 -msgid "sh64_register_convert_to_virtual called with non DR register number" +#: skip.c:594 +msgid "" +"Display the status of skips. You can specify numbers (e.g. \"skip info 1 " +"3\"), ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-" +"8\").\n" +"\n" +"If you don't specify any numbers or ranges, we'll show all skips.\n" +"\n" +"Usage: skip info [NUMBERS AND/OR RANGES]\n" +"The \"Type\" column indicates one of:\n" +"\tfile - ignored file\n" +"\tfunction - ignored function" msgstr "" -#: sh64-tdep.c:1618 -msgid "sh64_register_convert_to_raw called with non DR register number" +#: solib.c:103 +#, possible-c-format +msgid "" +"The search path for loading non-absolute shared library symbol files is %s.\n" msgstr "" -#: sh64-tdep.c:2098 +#: solib.c:427 #, possible-c-format -msgid "Invalid pseudo register number %d\n" +msgid "`%s': not in executable format: %s" msgstr "" -#: sh64-tdep.c:2193 +#: solib.c:434 #, possible-c-format -msgid "Invalid register number %d\n" +msgid "" +"`%s': Shared library architecture %s is not compatible with target " +"architecture %s." msgstr "" -#: sh64-tdep.c:2277 -msgid "Not a valid register for the current processor mode." +#: solib.c:476 +msgid "Shared library file name is too long." msgstr "" -#: sol-thread.c:261 +#: solib.c:619 #, possible-c-format -msgid "thread_to_lwp: td_ta_map_id2thr %s" +msgid "Error while reading shared library symbols for %s:\n" msgstr "" -#: sol-thread.c:267 +#: solib.c:625 #, possible-c-format -msgid "thread_to_lwp: td_thr_get_info: %s" +msgid "Loaded symbols for %s\n" msgstr "" -#: sol-thread.c:273 -#, possible-c-format -msgid "thread_to_lwp: thread state not active: %s" +#: solib.c:810 solib.c:1261 +msgid "Error while mapping shared library sections:\n" msgstr "" -#: sol-thread.c:304 +#: solib.c:826 #, possible-c-format -msgid "lwp_to_thread: td_ta_map_lwp2thr: %s." +msgid "" +"Could not load shared library symbols for %s.\n" +"Do you need \"set solib-search-path\" or \"set sysroot\"?" msgstr "" -#: sol-thread.c:310 +#: solib.c:831 #, possible-c-format -msgid "lwp_to_thread: td_thr_validate: %s." +msgid "" +"Could not load shared library symbols for %d libraries, e.g. %s.\n" +"Use the \"info sharedlibrary\" command to see the complete listing.\n" +"Do you need \"set solib-search-path\" or \"set sysroot\"?" msgstr "" -#: sol-thread.c:316 +#: solib.c:915 #, possible-c-format -msgid "lwp_to_thread: td_thr_get_info: %s." +msgid "Symbols already loaded for %s\n" msgstr "" -#. Inactive thread. -#: sol-thread.c:368 sol-thread.c:404 -msgid "This version of Solaris can't start inactive threads." +#: solib.c:1044 +msgid "No shared libraries matched.\n" msgstr "" -#: sol-thread.c:370 sol-thread.c:406 -#, possible-c-format -msgid "Specified thread %ld seems to have terminated" +#: solib.c:1047 +msgid "No shared libraries loaded at this time.\n" msgstr "" -#: sol-thread.c:464 -msgid "sol_thread_fetch_registers: thread == 0" +#: solib.c:1053 +msgid "(*): Shared library is missing debugging information.\n" msgstr "" -#: sol-thread.c:468 +#: solib.c:1333 #, possible-c-format -msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s" +msgid "Autoloading of shared library symbols is %s.\n" msgstr "" -#: sol-thread.c:475 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getgregs %s" +#: solib.c:1458 xcoffsolib.c:165 +msgid "Load shared object library symbols for files matching REGEXP." msgstr "" -#: sol-thread.c:485 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getfpregs %s" +#: solib.c:1460 +msgid "Status of loaded shared object libraries." msgstr "" -#: sol-thread.c:499 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getxregsize %s" +#: solib.c:1462 +msgid "Unload all shared object library symbols." msgstr "" -#: sol-thread.c:507 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getxregs %s" +#: solib.c:1465 xcoffsolib.c:170 +msgid "Set autoloading of shared library symbols." msgstr "" -#: sol-thread.c:541 -#, possible-c-format -msgid "sol_thread_store_registers: td_ta_map_id2thr %s" +#: solib.c:1466 xcoffsolib.c:171 +msgid "Show autoloading of shared library symbols." msgstr "" -#: sol-thread.c:554 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getgregs %s" +#: solib.c:1467 xcoffsolib.c:172 +msgid "" +"If \"on\", symbols from all shared object libraries will be loaded\n" +"automatically when the inferior begins execution, when the dynamic linker\n" +"informs gdb that a new library has been loaded, or when attaching to the\n" +"inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'." msgstr "" -#: sol-thread.c:558 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getfpregs %s" +#: solib.c:1478 +msgid "Set an alternate system root." msgstr "" -#: sol-thread.c:568 sol-thread.c:598 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getxregsize %s" +#: solib.c:1479 +msgid "Show the current system root." msgstr "" -#: sol-thread.c:576 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getxregs %s" +#: solib.c:1480 +msgid "" +"The system root is used to load absolute shared library symbol files.\n" +"For other (relative) files, you can add directories using\n" +"`set solib-search-path'." msgstr "" -#: sol-thread.c:587 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_setgregs %s" +#: solib.c:1494 +msgid "" +"Set the search path for loading non-absolute shared library symbol files." msgstr "" -#: sol-thread.c:591 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_setfpregs %s" +#: solib.c:1496 +msgid "" +"Show the search path for loading non-absolute shared library symbol files." +msgstr "" + +#: solib.c:1498 +msgid "" +"This takes precedence over the environment variables PATH and " +"LD_LIBRARY_PATH." msgstr "" -#: sol-thread.c:662 +#: solib-darwin.c:456 #, possible-c-format -msgid "sol_thread_new_objfile: td_init: %s" +msgid "`%s': not a shared-library: %s" msgstr "" -#: sol-thread.c:690 +#: solib-dsbt.c:207 #, possible-c-format -msgid "Cannot initialize thread debugging library: %s" +msgid "Unsupported map version: %d\n" msgstr "" -#: sol-thread.c:1275 -msgid "info sol-thread: failed to get info for thread." +#: solib-dsbt.c:303 +msgid "Error reading DSBT exec loadmap" msgstr "" -#: sol-thread.c:1388 -msgid "Show info on Solaris user threads." +#: solib-dsbt.c:313 +msgid "Error reading DSBT interp loadmap" msgstr "" -#: solib-darwin.c:436 -#, possible-c-format -msgid "`%s': not a shared-library: %s" +#: solib-dsbt.c:679 +msgid "" +"dsbt_current_sos: Unable to read link map entry. Shared object chain may be " +"incomplete." msgstr "" -#: solib-frv.c:479 +#: solib-dsbt.c:693 msgid "" -"frv_current_sos: Unable to read link map entry. Shared object chain may be " +"dsbt_current_sos: Unable to read dsbt index. Shared object chain may be " "incomplete." msgstr "" -#: solib-frv.c:506 +#: solib-dsbt.c:714 msgid "" -"frv_current_sos: Unable to fetch load map. Shared object chain may be " +"dsbt_current_sos: Unable to fetch load map. Shared object chain may be " "incomplete." msgstr "" -#: solib-frv.c:528 +#: solib-dsbt.c:730 solib-frv.c:409 #, possible-c-format msgid "Can't read pathname for link map entry: %s." msgstr "" -#: solib-frv.c:599 solib-svr4.c:1589 +#: solib-dsbt.c:780 solib-frv.c:480 solib-svr4.c:1680 msgid "" "Unable to find dynamic linker breakpoint function.\n" "GDB will be unable to debug shared library initializers\n" "and track explicitly loaded dynamic code." msgstr "" -#: solib-frv.c:698 -msgid "Unable to determine dynamic linker loadmap address." -msgstr "" - -#: solib-frv.c:712 -#, possible-c-format -msgid "Unable to load dynamic linker loadmap at address %s." -msgstr "" - -#: solib-frv.c:745 +#: solib-dsbt.c:901 solib-frv.c:623 msgid "Could not find symbol _dl_debug_addr in dynamic linker" msgstr "" -#: solib-frv.c:769 +#: solib-dsbt.c:922 solib-frv.c:647 #, possible-c-format msgid "" "Unable to fetch contents of _dl_debug_addr (at address %s) from dynamic " "linker" msgstr "" -#: solib-frv.c:795 +#: solib-dsbt.c:948 solib-frv.c:673 #, possible-c-format msgid "" "Unable to fetch _dl_debug_addr->r_brk (at address %s) from dynamic linker" msgstr "" -#: solib-frv.c:807 +#: solib-dsbt.c:1110 solib-frv.c:863 solib-irix.c:408 solib-sunos.c:654 +msgid "shared library handler failed to enable breakpoint" +msgstr "" + +#: solib-dsbt.c:1164 +#, possible-c-format +msgid "solib-dsbt debugging is %s.\n" +msgstr "" + +#: solib-dsbt.c:1190 +msgid "Set internal debugging of shared library code for DSBT ELF." +msgstr "" + +#: solib-dsbt.c:1191 +msgid "Show internal debugging of shared library code for DSBT ELF." +msgstr "" + +#: solib-dsbt.c:1192 +msgid "When non-zero, DSBT solib specific internal debugging is enabled." +msgstr "" + +#: solib-frv.c:360 +msgid "" +"frv_current_sos: Unable to read link map entry. Shared object chain may be " +"incomplete." +msgstr "" + +#: solib-frv.c:387 +msgid "" +"frv_current_sos: Unable to fetch load map. Shared object chain may be " +"incomplete." +msgstr "" + +#: solib-frv.c:575 +msgid "Unable to determine dynamic linker loadmap address." +msgstr "" + +#: solib-frv.c:589 +#, possible-c-format +msgid "Unable to load dynamic linker loadmap at address %s." +msgstr "" + +#: solib-frv.c:685 #, possible-c-format msgid "" "Unable to fetch _dl_debug_addr->.r_brk entry point (at address %s) from " "dynamic linker" msgstr "" -#: solib-frv.c:934 +#: solib-frv.c:796 msgid "Unable to load the executable's loadmap." msgstr "" -#: solib-frv.c:1017 solib-irix.c:459 solib-sunos.c:758 -msgid "shared library handler failed to enable breakpoint" -msgstr "" - -#: solib-frv.c:1343 +#: solib-frv.c:1189 msgid "Set internal debugging of shared library code for FR-V." msgstr "" -#: solib-frv.c:1344 +#: solib-frv.c:1190 msgid "Show internal debugging of shared library code for FR-V." msgstr "" -#: solib-frv.c:1345 +#: solib-frv.c:1191 msgid "When non-zero, FR-V solib specific internal debugging is enabled." msgstr "" @@ -19633,26 +20485,26 @@ msgid "Unable to fetch shared library obj_info or obj_list info." msgstr "" -#: solib-irix.c:489 solib-sunos.c:805 +#: solib-irix.c:438 solib-sunos.c:701 msgid "shared library handler failed to disable breakpoint" msgstr "" -#: solib-irix.c:575 +#: solib-irix.c:507 #, possible-c-format msgid "current_sos: truncating name of %d characters to only %d characters" msgstr "" -#: solib-irix.c:583 solib-som.c:605 solib-sunos.c:444 solib-svr4.c:1178 +#: solib-irix.c:515 solib-som.c:604 solib-sunos.c:405 solib-svr4.c:1224 #, possible-c-format msgid "Can't read pathname for load map: %s." msgstr "" -#: solib-irix.c:642 solib-osf.c:589 solib-pa64.c:532 solib-som.c:702 -#: solib-svr4.c:1012 +#: solib-irix.c:559 solib-osf.c:589 solib-pa64.c:495 solib-som.c:701 +#: solib-svr4.c:898 msgid "Attempt to reload symbols from process? " msgstr "" -#: solib-irix.c:665 solib-som.c:724 solib-svr4.c:1043 +#: solib-irix.c:582 solib-som.c:723 solib-svr4.c:938 #, possible-c-format msgid "failed to read exec filename from attached file: %s" msgstr "" @@ -19662,31 +20514,31 @@ msgid "unable to read shared sec name at 0x%lx" msgstr "" -#: solib-pa64.c:144 +#: solib-pa64.c:143 msgid "No object file symbols." msgstr "" -#: solib-pa64.c:154 +#: solib-pa64.c:153 msgid "Unable to read in .dynamic section information." msgstr "" -#: solib-pa64.c:163 +#: solib-pa64.c:162 msgid "Error while reading in load map pointer." msgstr "" -#: solib-pa64.c:178 +#: solib-pa64.c:177 msgid "Error trying to get information about dynamic linker." msgstr "" -#: solib-pa64.c:234 solib-pa64.c:248 +#: solib-pa64.c:233 solib-pa64.c:247 msgid "Error while reading in .dynamic section of the program." msgstr "" -#: solib-pa64.c:356 +#: solib-pa64.c:318 msgid "Unable to read the .dynamic section." msgstr "" -#: solib-pa64.c:361 solib-som.c:323 +#: solib-pa64.c:323 solib-som.c:322 msgid "" "Private mapping of shared library text was not specified\n" "by the executable; setting a breakpoint in a shared library which\n" @@ -19694,74 +20546,74 @@ "manpage for methods to privately map shared library text." msgstr "" -#: solib-pa64.c:373 +#: solib-pa64.c:335 msgid "Unable to modify dynamic linker flags." msgstr "" -#: solib-pa64.c:410 +#: solib-pa64.c:372 #, possible-c-format msgid "Unable to grok dynamic linker %s as an object file" msgstr "" #. For a SOM-only target, there is no pa64 solib support. This is needed #. for hppa-hpux-tdep.c to build. -#: solib-pa64.c:690 +#: solib-pa64.c:653 msgid "Cannot select pa64 solib support for this configuration." msgstr "" -#: solib-som.c:226 +#: solib-som.c:225 msgid "" "Unable to write __d_pid.\n" "Suggest linking with /opt/langtools/lib/end.o.\n" "GDB will be unable to track shl_load/shl_unload calls" msgstr "" -#: solib-som.c:247 +#: solib-som.c:246 msgid "" "Unable to find _DLD_HOOK symbol in object file.\n" "Suggest linking with /opt/langtools/lib/end.o.\n" "GDB will be unable to track shl_load/shl_unload calls" msgstr "" -#: solib-som.c:270 +#: solib-som.c:269 msgid "" "Unable to find __dld_hook symbol in object file.\n" "Suggest linking with /opt/langtools/lib/end.o.\n" "GDB will be unable to track shl_load/shl_unload calls" msgstr "" -#: solib-som.c:284 +#: solib-som.c:283 msgid "" "Unable to find __dld_d_trap symbol in object file.\n" "Suggest linking with /opt/langtools/lib/end.o.\n" "GDB will be unable to track shl_load/shl_unload calls" msgstr "" -#: solib-som.c:304 solib-som.c:535 +#: solib-som.c:303 solib-som.c:534 msgid "Unable to find __dld_flags symbol in object file." msgstr "" -#: solib-som.c:312 +#: solib-som.c:311 msgid "Unable to read __dld_flags." msgstr "" -#: solib-som.c:337 +#: solib-som.c:336 msgid "Unable to write __dld_flags." msgstr "" -#: solib-som.c:350 +#: solib-som.c:349 msgid "Unable to find _start symbol in object file." msgstr "" -#: solib-som.c:540 +#: solib-som.c:539 msgid "__dld_list is not valid according to __dld_flags." msgstr "" -#: solib-som.c:550 +#: solib-som.c:549 msgid "Unable to find dynamic library list." msgstr "" -#: solib-som.c:856 +#: solib-som.c:855 msgid "Unable to find $PRIVATE$ in shared library!" msgstr "" @@ -19770,344 +20622,353 @@ msgid "Cannot read SPE executable at %s" msgstr "" -#: solib-sunos.c:543 +#: solib-sunos.c:492 msgid "stopped at unknown breakpoint while handling shared libraries" msgstr "" -#: solib-svr4.c:246 +#: solib-svr4.c:156 +#, possible-c-format +msgid "Error reading shared library list entry at %s" +msgstr "" + +#: solib-svr4.c:264 #, possible-c-format msgid "" "Using PIC (Position Independent Code) prelink displacement %s for \"%s\".\n" msgstr "" -#: solib-svr4.c:252 +#. There is no way to verify the library file matches. prelink +#. can during prelinking of an unprelinked file (or unprelinking +#. of a prelinked file) shift the DYNAMIC segment by arbitrary +#. offset without any page size alignment. There is no way to +#. find out the ELF header and/or Program Headers for a limited +#. verification if it they match. One could do a verification +#. of the DYNAMIC segment. Still the found address is the best +#. one GDB could find. +#: solib-svr4.c:280 #, possible-c-format msgid "" ".dynamic section for \"%s\" is not at the expected address (wrong library or " "version mismatch?)" msgstr "" -#: solib-svr4.c:1154 -msgid "Corrupted shared library list" +#: solib-svr4.c:1033 +#, possible-c-format +msgid "SVR4 Library list has unsupported version \"%s\"" +msgstr "" + +#: solib-svr4.c:1090 solib-target.c:232 +msgid "target library list" +msgstr "" + +#: solib-svr4.c:1198 +#, possible-c-format +msgid "Corrupted shared library list: %s != %s" msgstr "" #. It can be printed repeatedly as there is no easy way to check #. the executable symbols/file has been already relocated to #. displacement. -#: solib-svr4.c:2038 +#: solib-svr4.c:2107 #, possible-c-format msgid "" "Using PIE (Position Independent Executable) displacement %s for \"%s\".\n" msgstr "" -#: solib-target.c:69 +#: solib-target.c:67 msgid "" "Can not parse XML library list; XML support was disabled at compile time" msgstr "" -#: solib-target.c:94 solib-target.c:111 +#: solib-target.c:92 solib-target.c:109 msgid "Library list with both segments and sections" msgstr "" -#: solib-target.c:142 +#: solib-target.c:140 msgid "No segment or section bases defined" msgstr "" -#: solib-target.c:157 +#: solib-target.c:155 #, possible-c-format msgid "Library list has unsupported version \"%s\"" msgstr "" -#: solib-target.c:234 -msgid "target library list" -msgstr "" - -#: solib-target.c:356 +#: solib-target.c:354 #, possible-c-format msgid "" "Could not relocate shared library \"%s\": wrong number of ALLOC sections" msgstr "" -#: solib-target.c:405 +#: solib-target.c:403 #, possible-c-format msgid "Could not relocate shared library \"%s\": no segments" msgstr "" -#: solib-target.c:421 +#: solib-target.c:419 #, possible-c-format msgid "Could not relocate shared library \"%s\": bad offsets" msgstr "" -#: solib.c:105 +#: sol-thread.c:260 #, possible-c-format -msgid "" -"The search path for loading non-absolute shared library symbol files is %s.\n" +msgid "thread_to_lwp: td_ta_map_id2thr %s" msgstr "" -#: solib.c:440 +#: sol-thread.c:266 #, possible-c-format -msgid "`%s': not in executable format: %s" +msgid "thread_to_lwp: td_thr_get_info: %s" msgstr "" -#: solib.c:447 +#: sol-thread.c:272 #, possible-c-format -msgid "" -"`%s': Shared library architecture %s is not compatible with target " -"architecture %s." +msgid "thread_to_lwp: thread state not active: %s" msgstr "" -#: solib.c:505 -msgid "Shared library file name is too long." +#: sol-thread.c:303 +#, possible-c-format +msgid "lwp_to_thread: td_ta_map_lwp2thr: %s." msgstr "" -#: solib.c:657 +#: sol-thread.c:309 #, possible-c-format -msgid "Error while reading shared library symbols for %s:\n" +msgid "lwp_to_thread: td_thr_validate: %s." msgstr "" -#: solib.c:663 +#: sol-thread.c:315 #, possible-c-format -msgid "Loaded symbols for %s\n" +msgid "lwp_to_thread: td_thr_get_info: %s." msgstr "" -#: solib.c:839 solib.c:1363 -msgid "Error while mapping shared library sections:\n" +#. Inactive thread. +#: sol-thread.c:367 sol-thread.c:403 +msgid "This version of Solaris can't start inactive threads." msgstr "" -#: solib.c:855 +#: sol-thread.c:369 sol-thread.c:405 #, possible-c-format -msgid "" -"Could not load shared library symbols for %s.\n" -"Do you need \"set solib-search-path\" or \"set sysroot\"?" +msgid "Specified thread %ld seems to have terminated" msgstr "" -#: solib.c:860 -#, possible-c-format -msgid "" -"Could not load shared library symbols for %d libraries, e.g. %s.\n" -"Use the \"info sharedlibrary\" command to see the complete listing.\n" -"Do you need \"set solib-search-path\" or \"set sysroot\"?" +#: sol-thread.c:463 +msgid "sol_thread_fetch_registers: thread == 0" msgstr "" -#: solib.c:953 +#: sol-thread.c:467 #, possible-c-format -msgid "Symbols already loaded for %s\n" -msgstr "" - -#: solib.c:1094 -msgid "No shared libraries matched.\n" +msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s" msgstr "" -#: solib.c:1097 -msgid "No shared libraries loaded at this time.\n" +#: sol-thread.c:474 +#, possible-c-format +msgid "sol_thread_fetch_registers: td_thr_getgregs %s" msgstr "" -#: solib.c:1103 -msgid "(*): Shared library is missing debugging information.\n" +#: sol-thread.c:484 +#, possible-c-format +msgid "sol_thread_fetch_registers: td_thr_getfpregs %s" msgstr "" -#: solib.c:1435 +#: sol-thread.c:498 #, possible-c-format -msgid "Autoloading of shared library symbols is %s.\n" +msgid "sol_thread_fetch_registers: td_thr_getxregsize %s" msgstr "" -#: solib.c:1464 xcoffsolib.c:165 -msgid "Load shared object library symbols for files matching REGEXP." +#: sol-thread.c:506 +#, possible-c-format +msgid "sol_thread_fetch_registers: td_thr_getxregs %s" msgstr "" -#: solib.c:1466 -msgid "Status of loaded shared object libraries." +#: sol-thread.c:540 +#, possible-c-format +msgid "sol_thread_store_registers: td_ta_map_id2thr %s" msgstr "" -#: solib.c:1468 -msgid "Unload all shared object library symbols." +#: sol-thread.c:553 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_getgregs %s" msgstr "" -#: solib.c:1471 xcoffsolib.c:170 -msgid "Set autoloading of shared library symbols." +#: sol-thread.c:557 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_getfpregs %s" msgstr "" -#: solib.c:1472 xcoffsolib.c:171 -msgid "Show autoloading of shared library symbols." +#: sol-thread.c:567 sol-thread.c:597 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_getxregsize %s" msgstr "" -#: solib.c:1473 xcoffsolib.c:172 -msgid "" -"If \"on\", symbols from all shared object libraries will be loaded\n" -"automatically when the inferior begins execution, when the dynamic linker\n" -"informs gdb that a new library has been loaded, or when attaching to the\n" -"inferior. Otherwise, symbols must be loaded manually, using `sharedlibrary'." +#: sol-thread.c:575 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_getxregs %s" msgstr "" -#: solib.c:1484 -msgid "Set an alternate system root." +#: sol-thread.c:586 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_setgregs %s" msgstr "" -#: solib.c:1485 -msgid "Show the current system root." +#: sol-thread.c:590 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_setfpregs %s" msgstr "" -#: solib.c:1486 -msgid "" -"The system root is used to load absolute shared library symbol files.\n" -"For other (relative) files, you can add directories using\n" -"`set solib-search-path'." +#: sol-thread.c:661 +#, possible-c-format +msgid "sol_thread_new_objfile: td_init: %s" msgstr "" -#: solib.c:1500 -msgid "" -"Set the search path for loading non-absolute shared library symbol files." +#: sol-thread.c:689 +#, possible-c-format +msgid "Cannot initialize thread debugging library: %s" msgstr "" -#: solib.c:1502 -msgid "" -"Show the search path for loading non-absolute shared library symbol files." +#: sol-thread.c:1274 +msgid "info sol-thread: failed to get info for thread." msgstr "" -#: solib.c:1504 -msgid "" -"This takes precedence over the environment variables PATH and " -"LD_LIBRARY_PATH." +#: sol-thread.c:1387 +msgid "Show info on Solaris user threads." msgstr "" -#: somread.c:86 +#: somread.c:74 msgid "Couldn't read symbol dictionary!" msgstr "" -#: somread.c:97 +#: somread.c:85 msgid "Can't read in HP string table." msgstr "" -#: somread.c:281 +#: somread.c:269 #, possible-c-format msgid "Invalid symbol data; bad HP string table offset: %d" msgstr "" -#: source.c:109 +#: source.c:107 #, possible-c-format msgid "Number of source lines gdb will list by default is %s.\n" msgstr "" -#: source.c:292 +#: source.c:290 msgid "Can't find a default source file" msgstr "" -#: source.c:392 +#: source.c:400 msgid "Reinitialize source path to empty? " msgstr "" -#: source.c:562 +#: source.c:570 #, possible-c-format msgid "%s is not a directory." msgstr "" -#: source.c:637 +#: source.c:645 msgid "No current source file.\n" msgstr "" -#: source.c:640 +#: source.c:648 #, possible-c-format msgid "Current source file is %s\n" msgstr "" -#: source.c:642 +#: source.c:650 #, possible-c-format msgid "Compilation directory is %s\n" msgstr "" -#: source.c:644 +#: source.c:652 #, possible-c-format msgid "Located in %s\n" msgstr "" -#: source.c:646 +#: source.c:654 #, possible-c-format msgid "Contains %d line%s.\n" msgstr "" -#: source.c:649 +#: source.c:657 #, possible-c-format msgid "Source language is %s.\n" msgstr "" -#: source.c:650 +#: source.c:658 #, possible-c-format msgid "Compiled with %s debugging format.\n" msgstr "" -#: source.c:651 +#: source.c:659 #, possible-c-format msgid "%s preprocessor macro info.\n" msgstr "" -#: source.c:1146 +#: source.c:1159 msgid "Source file is more recent than executable." msgstr "" -#: source.c:1389 +#: source.c:1341 #, possible-c-format msgid "Line number %d out of range; %s has %d lines." msgstr "" -#: source.c:1493 +#: source.c:1451 msgid "No line number information available" msgstr "" #. Is there any case in which we get here, and have an address #. which the user would want to see? If we have debugging symbols #. and no line numbers? -#: source.c:1550 +#: source.c:1508 #, possible-c-format msgid "Line number %d is out of range for \"%s\".\n" msgstr "" -#: source.c:1586 source.c:1675 +#: source.c:1544 source.c:1633 msgid "Expression not found" msgstr "" -#: source.c:1643 source.c:1726 +#: source.c:1601 source.c:1684 msgid "Expression not found\n" msgstr "" -#: source.c:1836 +#: source.c:1794 msgid "Too many arguments in command" msgstr "" -#: source.c:1845 +#: source.c:1803 #, possible-c-format msgid "Source path substitution rule matching `%s':\n" msgstr "" -#: source.c:1847 +#: source.c:1805 msgid "List of all source path substitution rules:\n" msgstr "" -#: source.c:1871 source.c:1924 +#: source.c:1829 source.c:1882 msgid "Incorrect usage, too many arguments in command" msgstr "" -#: source.c:1881 +#: source.c:1839 msgid "Delete all source path substitution rules? " msgstr "" -#: source.c:1882 +#: source.c:1840 msgid "Canceled" msgstr "" -#: source.c:1904 +#: source.c:1862 #, possible-c-format msgid "No substitution rule defined for `%s'" msgstr "" -#: source.c:1921 +#: source.c:1879 msgid "Incorrect usage, too few arguments in command" msgstr "" -#: source.c:1927 +#: source.c:1885 msgid "First argument must be at least one character long" msgstr "" -#: source.c:1962 +#: source.c:1920 msgid "" "Add directory DIR to beginning of search path for source files.\n" "Forget cached info on source file locations and line positions.\n" @@ -20116,15 +20977,15 @@ "With no argument, reset the search path to $cdir:$cwd, the default." msgstr "" -#: source.c:1978 +#: source.c:1936 msgid "Set the search path for finding source files." msgstr "" -#: source.c:1980 +#: source.c:1938 msgid "Show the search path for finding source files." msgstr "" -#: source.c:1982 +#: source.c:1940 msgid "" "$cwd in the path means the current working directory.\n" "$cdir in the path means the compilation directory of the source file.\n" @@ -20133,18 +20994,18 @@ "Setting the value to an empty string sets it to $cdir:$cwd, the default." msgstr "" -#: source.c:1995 +#: source.c:1953 msgid "" "Current search path for finding source files.\n" "$cwd in the path means the current working directory.\n" "$cdir in the path means the compilation directory of the source file." msgstr "" -#: source.c:2003 +#: source.c:1961 msgid "Information about the current source file." msgstr "" -#: source.c:2005 +#: source.c:1963 msgid "" "Core addresses of the code for a source line.\n" "Line can be specified as\n" @@ -20159,28 +21020,28 @@ "The address is also stored as the value of \"$_\"." msgstr "" -#: source.c:2017 +#: source.c:1975 msgid "" "Search for regular expression (see regex(3)) from last line listed.\n" "The matching line number is also stored as the value of \"$_\"." msgstr "" -#: source.c:2022 +#: source.c:1980 msgid "" "Search backward for regular expression (see regex(3)) from last line " "listed.\n" "The matching line number is also stored as the value of \"$_\"." msgstr "" -#: source.c:2033 +#: source.c:1991 msgid "Set number of source lines gdb will list by default." msgstr "" -#: source.c:2034 +#: source.c:1992 msgid "Show number of source lines gdb will list by default." msgstr "" -#: source.c:2041 +#: source.c:1999 msgid "" "Usage: set substitute-path FROM TO\n" "Add a substitution rule replacing FROM into TO in source file names.\n" @@ -20188,7 +21049,7 @@ "is replaced by the new one." msgstr "" -#: source.c:2049 +#: source.c:2007 msgid "" "Usage: unset substitute-path [FROM]\n" "Delete the rule for substituting FROM in source file names. If FROM\n" @@ -20196,329 +21057,329 @@ "If the debugger cannot find a rule for FROM, it will display a warning." msgstr "" -#: source.c:2057 +#: source.c:2015 msgid "" "Usage: show substitute-path [FROM]\n" "Print the rule for substituting FROM in source file names. If FROM\n" "is not specified, print all substitution rules." msgstr "" -#: sparc-nat.c:233 +#: sparc-nat.c:234 msgid "Couldn't get floating-point registers" msgstr "" -#: sparc-nat.c:246 +#: sparc-nat.c:247 msgid "Couldn't write floating-point registers" msgstr "" -#: sparc-nat.c:294 +#: sparc-nat.c:295 msgid "Couldn't get StackGhost cookie" msgstr "" -#: spu-linux-nat.c:460 +#: spu-linux-nat.c:459 #, possible-c-format msgid "Child process unexpectedly missing: %s" msgstr "" -#: spu-tdep.c:1607 spu-tdep.c:1611 +#: spu-tdep.c:1614 spu-tdep.c:1618 msgid "Could not determine address of single-step breakpoint." msgstr "" -#: spu-tdep.c:2029 spu-tdep.c:2086 spu-tdep.c:2207 spu-tdep.c:2448 -#: spu-tdep.c:2527 +#: spu-tdep.c:2036 spu-tdep.c:2093 spu-tdep.c:2214 spu-tdep.c:2456 +#: spu-tdep.c:2535 msgid "\"info spu\" is only supported on the SPU architecture." msgstr "" -#: spu-tdep.c:2037 +#: spu-tdep.c:2044 msgid "Could not read event_status." msgstr "" -#: spu-tdep.c:2045 +#: spu-tdep.c:2052 msgid "Could not read event_mask." msgstr "" -#: spu-tdep.c:2060 +#: spu-tdep.c:2067 #, possible-c-format msgid "Event Status 0x%s\n" msgstr "" -#: spu-tdep.c:2061 +#: spu-tdep.c:2068 #, possible-c-format msgid "Event Mask 0x%s\n" msgstr "" -#: spu-tdep.c:2093 +#: spu-tdep.c:2100 msgid "Could not read signal1." msgstr "" -#: spu-tdep.c:2104 +#: spu-tdep.c:2111 msgid "Could not read signal1_type." msgstr "" -#: spu-tdep.c:2111 +#: spu-tdep.c:2118 msgid "Could not read signal2." msgstr "" -#: spu-tdep.c:2122 +#: spu-tdep.c:2129 msgid "Could not read signal2_type." msgstr "" -#: spu-tdep.c:2140 +#: spu-tdep.c:2147 #, possible-c-format msgid "Signal 1 control word 0x%s " msgstr "" -#: spu-tdep.c:2142 +#: spu-tdep.c:2149 msgid "Signal 1 not pending " msgstr "" -#: spu-tdep.c:2145 spu-tdep.c:2155 +#: spu-tdep.c:2152 spu-tdep.c:2162 msgid "(Type Or)\n" msgstr "" -#: spu-tdep.c:2147 spu-tdep.c:2157 +#: spu-tdep.c:2154 spu-tdep.c:2164 msgid "(Type Overwrite)\n" msgstr "" -#: spu-tdep.c:2150 +#: spu-tdep.c:2157 #, possible-c-format msgid "Signal 2 control word 0x%s " msgstr "" -#: spu-tdep.c:2152 +#: spu-tdep.c:2159 msgid "Signal 2 not pending " msgstr "" -#: spu-tdep.c:2217 +#: spu-tdep.c:2224 msgid "Could not read mbox_info." msgstr "" -#: spu-tdep.c:2226 +#: spu-tdep.c:2233 msgid "Could not read ibox_info." msgstr "" -#: spu-tdep.c:2235 +#: spu-tdep.c:2242 msgid "Could not read wbox_info." msgstr "" -#: spu-tdep.c:2456 +#: spu-tdep.c:2464 msgid "Could not read dma_info." msgstr "" -#: spu-tdep.c:2486 spu-tdep.c:2558 +#: spu-tdep.c:2494 spu-tdep.c:2567 msgid "no query pending" msgstr "" -#: spu-tdep.c:2491 spu-tdep.c:2559 +#: spu-tdep.c:2499 spu-tdep.c:2568 msgid "'any' query pending" msgstr "" -#: spu-tdep.c:2492 spu-tdep.c:2560 +#: spu-tdep.c:2500 spu-tdep.c:2569 msgid "'all' query pending" msgstr "" -#: spu-tdep.c:2493 spu-tdep.c:2561 +#: spu-tdep.c:2501 spu-tdep.c:2570 msgid "undefined query type" msgstr "" -#: spu-tdep.c:2496 spu-tdep.c:2564 +#: spu-tdep.c:2504 spu-tdep.c:2573 #, possible-c-format msgid "Tag-Group Status 0x%s\n" msgstr "" -#: spu-tdep.c:2498 spu-tdep.c:2566 +#: spu-tdep.c:2506 spu-tdep.c:2575 #, possible-c-format msgid "Tag-Group Mask 0x%s (%s)\n" msgstr "" -#: spu-tdep.c:2500 +#: spu-tdep.c:2508 #, possible-c-format msgid "Stall-and-Notify 0x%s\n" msgstr "" -#: spu-tdep.c:2502 +#: spu-tdep.c:2510 #, possible-c-format msgid "Atomic Cmd Status 0x%s\n" msgstr "" -#: spu-tdep.c:2535 +#: spu-tdep.c:2543 msgid "Could not read proxydma_info." msgstr "" -#: spu-tdep.c:2578 +#: spu-tdep.c:2587 msgid "\"info spu\" must be followed by the name of an SPU facility.\n" msgstr "" -#: spu-tdep.c:2602 +#: spu-tdep.c:2611 #, possible-c-format msgid "Stopping for new SPE threads is %s.\n" msgstr "" -#: spu-tdep.c:2610 +#: spu-tdep.c:2619 #, possible-c-format msgid "Automatic software-cache flush is %s.\n" msgstr "" -#: spu-tdep.c:2751 spu-tdep.c:2754 spu-tdep.c:2789 +#: spu-tdep.c:2760 spu-tdep.c:2763 spu-tdep.c:2798 msgid "Various SPU specific commands." msgstr "" -#: spu-tdep.c:2760 +#: spu-tdep.c:2769 msgid "Set whether to stop for new SPE threads." msgstr "" -#: spu-tdep.c:2762 +#: spu-tdep.c:2771 msgid "Show whether to stop for new SPE threads." msgstr "" -#: spu-tdep.c:2764 +#: spu-tdep.c:2773 msgid "" "Use \"on\" to give control to the user when a new SPE thread\n" "enters its \"main\" function.\n" "Use \"off\" to disable stopping for new SPE threads." msgstr "" -#: spu-tdep.c:2775 +#: spu-tdep.c:2784 msgid "Set whether to automatically flush the software-managed cache." msgstr "" -#: spu-tdep.c:2777 +#: spu-tdep.c:2786 msgid "Show whether to automatically flush the software-managed cache." msgstr "" -#: spu-tdep.c:2779 +#: spu-tdep.c:2788 msgid "" "Use \"on\" to automatically flush the software-managed cache\n" "whenever SPE execution stops.\n" "Use \"off\" to never automatically flush the software-managed cache." msgstr "" -#: spu-tdep.c:2794 +#: spu-tdep.c:2803 msgid "Display SPU event facility status.\n" msgstr "" -#: spu-tdep.c:2797 +#: spu-tdep.c:2806 msgid "Display SPU signal notification facility status.\n" msgstr "" -#: spu-tdep.c:2800 +#: spu-tdep.c:2809 msgid "Display SPU mailbox facility status.\n" msgstr "" -#: spu-tdep.c:2803 +#: spu-tdep.c:2812 msgid "Display MFC DMA status.\n" msgstr "" -#: spu-tdep.c:2806 +#: spu-tdep.c:2815 msgid "Display MFC Proxy-DMA status.\n" msgstr "" -#: stabsread.c:167 +#: stabsread.c:166 #, possible-c-format msgid "invalid C++ abbreviation `%s'" msgstr "" -#: stabsread.c:174 +#: stabsread.c:173 #, possible-c-format msgid "register number %d too large (max %d) in symbol %s" msgstr "" -#: stabsread.c:236 +#: stabsread.c:235 #, possible-c-format msgid "" "Invalid symbol data: type number (%d,%d) out of range at symtab pos %d." msgstr "" -#: stabsread.c:288 +#: stabsread.c:287 msgid "GDB internal error: bad real_filenum" msgstr "" -#: stabsread.c:642 +#: stabsread.c:641 #, possible-c-format msgid "Bad stabs string '%s'" msgstr "" -#: stabsread.c:706 +#: stabsread.c:705 #, possible-c-format msgid "Unknown C++ symbol name `%s'" msgstr "" -#: stabsread.c:1477 +#: stabsread.c:1476 msgid "couldn't parse type; debugger out of date?" msgstr "" -#: stabsread.c:1598 +#: stabsread.c:1597 #, possible-c-format msgid "Unrecognized cross-reference type `%c'" msgstr "" -#: stabsread.c:1826 +#: stabsread.c:1825 #, possible-c-format msgid "" "Prototyped function type didn't end arguments with `#':\n" "%s" msgstr "" -#: stabsread.c:1939 +#: stabsread.c:1938 #, possible-c-format msgid "invalid (minimal) member type data format at symtab pos %d." msgstr "" -#: stabsread.c:2045 +#: stabsread.c:2044 msgid "GDB internal error, type is NULL in stabsread.c." msgstr "" -#: stabsread.c:2073 +#: stabsread.c:2072 #, possible-c-format msgid "Unknown builtin type %d" msgstr "" -#: stabsread.c:2248 +#: stabsread.c:2247 #, possible-c-format msgid "Method has bad physname %s\n" msgstr "" -#: stabsread.c:2447 +#: stabsread.c:2446 #, possible-c-format msgid "const/volatile indicator missing, got '%c'" msgstr "" -#: stabsread.c:2531 +#: stabsread.c:2530 #, possible-c-format msgid "member function type missing, got '%c'" msgstr "" -#: stabsread.c:2800 +#: stabsread.c:2799 #, possible-c-format msgid "C++ abbreviated type name unknown at symtab pos %d" msgstr "" -#: stabsread.c:3161 +#: stabsread.c:3160 #, possible-c-format msgid "Unknown virtual character `%c' for baseclass" msgstr "" -#: stabsread.c:3179 +#: stabsread.c:3178 #, possible-c-format msgid "Unknown visibility `%c' for baseclass" msgstr "" -#: stabsread.c:3288 +#: stabsread.c:3287 #, possible-c-format msgid "virtual function table pointer not found when defining class `%s'" msgstr "" -#: stabsread.c:3401 +#: stabsread.c:3400 #, possible-c-format msgid "Unknown visibility `%c' for field" msgstr "" -#: stabsread.c:3443 +#: stabsread.c:3442 #, possible-c-format msgid "struct/union type gets multiply defined: %s%s" msgstr "" -#: stabsread.c:4246 +#: stabsread.c:4245 #, possible-c-format msgid "base type %d of range type is not defined" msgstr "" @@ -20527,102 +21388,102 @@ #. output contained `(0,41),(0,42)=@s8;-16;,(0,43),(0,1);' where should #. have been present ";-16,(0,43)" reference instead. This way the #. excessive ";" marker prematurely stops the parameters parsing. -#: stabsread.c:4286 +#: stabsread.c:4285 msgid "Invalid (empty) method arguments" msgstr "" -#: stabsread.c:4330 +#: stabsread.c:4329 msgid "Invalid symbol data: common block within common block" msgstr "" -#: stabsread.c:4356 +#: stabsread.c:4355 msgid "ECOMM symbol unmatched by BCOMM" msgstr "" -#: stabsread.c:4560 +#: stabsread.c:4559 msgid "need a type name" msgstr "" -#: stabsread.c:4587 +#: stabsread.c:4586 #, possible-c-format msgid "forward-referenced types left unresolved, type code %d." msgstr "" -#: stabsread.c:4738 +#: stabsread.c:4737 #, possible-c-format msgid "%s: common block `%s' from global_sym_chain unresolved" msgstr "" -#: stabsread.c:4819 stabsread.c:4824 +#: stabsread.c:4818 stabsread.c:4823 #, possible-c-format msgid "invalid symbol name \"%s\"" msgstr "" -#: stack.c:470 +#: stack.c:717 #, possible-c-format msgid "Debugger's willingness to use disassemble-next-line is %s.\n" msgstr "" -#: stack.c:927 stack.c:1007 +#: stack.c:1265 stack.c:1345 msgid "Too many args in frame specification" msgstr "" -#: stack.c:1094 +#: stack.c:1432 #, possible-c-format msgid "Stack level %d, frame at " msgstr "" -#: stack.c:1099 +#: stack.c:1437 msgid "Stack frame at " msgstr "" -#: stack.c:1134 +#: stack.c:1472 #, possible-c-format msgid " Outermost frame: %s\n" msgstr "" -#: stack.c:1392 +#: stack.c:1732 msgid "(More stack frames follow...)\n" msgstr "" -#: stack.c:1402 +#: stack.c:1742 #, possible-c-format msgid "Backtrace stopped: %s\n" msgstr "" -#: stack.c:1637 +#: stack.c:1947 msgid "PC unavailable, cannot determine locals.\n" msgstr "" -#: stack.c:1658 +#: stack.c:1968 msgid "No locals.\n" msgstr "" -#: stack.c:1694 +#: stack.c:2004 msgid "blockvector blotch" msgstr "" -#: stack.c:1696 +#: stack.c:2006 msgid "blockvector botch" msgstr "" -#: stack.c:1733 +#: stack.c:2043 msgid "No catches.\n" msgstr "" -#: stack.c:1796 +#: stack.c:2106 msgid "PC unavailable, cannot determine args.\n" msgstr "" -#: stack.c:1803 +#: stack.c:2113 msgid "No symbol table info available.\n" msgstr "" -#: stack.c:1816 +#: stack.c:2126 msgid "No arguments.\n" msgstr "" -#: stack.c:1945 +#: stack.c:2255 msgid "Initial frame selected; you cannot go up." msgstr "" @@ -20630,40 +21491,40 @@ #. "down" means to really go down (and let me know if that is #. impossible), but "down 9999" can be used to mean go all the #. way down without getting an error. -#: stack.c:1982 +#: stack.c:2292 msgid "Bottom (innermost) frame selected; you cannot go down." msgstr "" -#: stack.c:2016 +#: stack.c:2326 msgid "Can not force return from an inlined function." msgstr "" -#: stack.c:2039 +#: stack.c:2349 msgid "" "Return value type not available for selected stack frame.\n" "Please use an explicit cast of the value to return." msgstr "" -#: stack.c:2080 +#: stack.c:2390 #, possible-c-format msgid "%sMake selected stack frame return now? " msgstr "" -#: stack.c:2083 +#: stack.c:2393 #, possible-c-format msgid "%sMake %s return now? " msgstr "" -#: stack.c:2086 +#: stack.c:2396 msgid "Not confirmed" msgstr "" -#: stack.c:2172 +#: stack.c:2486 #, possible-c-format msgid "'%s' not within current stack frame.\n" msgstr "" -#: stack.c:2226 +#: stack.c:2540 msgid "" "Make selected stack frame return to its caller.\n" "Control remains in the debugger, but when you continue\n" @@ -20671,31 +21532,31 @@ "If an argument is given, it is an expression for the value to return." msgstr "" -#: stack.c:2232 +#: stack.c:2546 msgid "" "Select and print stack frame that called this one.\n" "An argument says how many frames up to go." msgstr "" -#: stack.c:2235 +#: stack.c:2549 msgid "" "Same as the `up' command, but does not print anything.\n" "This is useful in command scripts." msgstr "" -#: stack.c:2239 +#: stack.c:2553 msgid "" "Select and print stack frame called by this one.\n" "An argument says how many frames down to go." msgstr "" -#: stack.c:2244 +#: stack.c:2558 msgid "" "Same as the `down' command, but does not print anything.\n" "This is useful in command scripts." msgstr "" -#: stack.c:2248 +#: stack.c:2562 msgid "" "Select and print a stack frame.\n" "With no argument, print the selected stack frame. (See also \"info " @@ -20706,25 +21567,25 @@ "a command file or a user-defined command." msgstr "" -#: stack.c:2261 +#: stack.c:2575 msgid "Print the current stack frame.\n" msgstr "" -#: stack.c:2264 +#: stack.c:2578 msgid "" "Select a stack frame without printing anything.\n" "An argument specifies the frame to select.\n" "It can be a stack frame number or the address of the frame.\n" msgstr "" -#: stack.c:2269 +#: stack.c:2583 msgid "" "Print backtrace of all stack frames, or innermost COUNT frames.\n" "With a negative argument, print outermost -COUNT frames.\n" "Use of the 'full' qualifier also prints the values of the local variables.\n" msgstr "" -#: stack.c:2277 +#: stack.c:2591 msgid "" "Print backtrace of all stack frames, or innermost COUNT frames\n" "and the values of the local variables.\n" @@ -20732,55 +21593,55 @@ "Usage: T \n" msgstr "" -#: stack.c:2286 +#: stack.c:2600 msgid "Backtrace of the stack, or innermost COUNT frames." msgstr "" -#: stack.c:2289 +#: stack.c:2603 msgid "All about selected stack frame, or frame at ADDR." msgstr "" -#: stack.c:2292 +#: stack.c:2606 msgid "Local variables of current stack frame." msgstr "" -#: stack.c:2294 +#: stack.c:2608 msgid "Argument variables of current stack frame." msgstr "" -#: stack.c:2297 +#: stack.c:2611 msgid "Argument and local variables of current stack frame." msgstr "" -#: stack.c:2300 +#: stack.c:2614 msgid "" "Select the stack frame that contains .\n" "Usage: func \n" msgstr "" -#: stack.c:2305 +#: stack.c:2619 msgid "Exceptions that can be caught in the current stack frame." msgstr "" -#: stack.c:2309 +#: stack.c:2623 msgid "Set printing of non-scalar frame arguments" msgstr "" -#: stack.c:2310 +#: stack.c:2624 msgid "Show printing of non-scalar frame arguments" msgstr "" -#: stack.c:2314 +#: stack.c:2628 msgid "" "Set whether to disassemble next source line or insn when execution stops." msgstr "" -#: stack.c:2316 +#: stack.c:2630 msgid "" "Show whether to disassemble next source line or insn when execution stops." msgstr "" -#: stack.c:2318 +#: stack.c:2632 msgid "" "If ON, GDB will display disassembly of the next source line, in addition\n" "to displaying the source line itself. If the next source line cannot\n" @@ -20793,121 +21654,104 @@ "source line." msgstr "" -#: std-regs.c:83 -msgid "Standard register ``$sp'' is not available for this target" -msgstr "" - -#: std-regs.c:93 -msgid "Standard register ``$ps'' is not available for this target" -msgstr "" - -#: symfile-mem.c:77 -msgid "add-symbol-file-from-memory not supported for this target" -msgstr "" - -#: symfile-mem.c:82 -msgid "Failed to read a valid object file image from memory." -msgstr "" - -#: symfile-mem.c:95 -#, possible-c-format -msgid "Got object file from memory but can't read symbols: %s." +#: stack.c:2649 +msgid "Set printing of function arguments at function entry" msgstr "" -#: symfile-mem.c:128 -msgid "add-symbol-file-from-memory requires an expression argument" +#: stack.c:2651 +msgid "Show printing of function arguments at function entry" msgstr "" -#: symfile-mem.c:138 -msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory." +#: stack.c:2653 +msgid "" +"GDB can sometimes determine the values of function arguments at entry,\n" +"in addition to their current values. This option tells GDB whether\n" +"to print the current value, the value at entry (marked as val@entry),\n" +"or both. Note that one or both of these values may be ." msgstr "" -#: symfile-mem.c:193 -msgid "" -"Could not load vsyscall page because no executable was specified\n" -"try using the \"file\" command first." +#: std-regs.c:82 +msgid "Standard register ``$sp'' is not available for this target" msgstr "" -#: symfile-mem.c:221 -msgid "" -"Load the symbols out of memory from a dynamically loaded object file.\n" -"Give an expression for the address of the file's shared object file header." +#: std-regs.c:92 +msgid "Standard register ``$ps'' is not available for this target" msgstr "" -#: symfile.c:163 +#: symfile.c:162 #, possible-c-format msgid "Dynamic symbol table reloading multiple times in one run is %s.\n" msgstr "" -#: symfile.c:618 +#: symfile.c:614 #, possible-c-format msgid "no loadable sections found in added symbol-file %s" msgstr "" -#: symfile.c:733 +#: symfile.c:729 #, possible-c-format msgid "section %s not found in %s" msgstr "" -#: symfile.c:1103 +#: symfile.c:1102 #, possible-c-format msgid "Load new symbol table from \"%s\"? " msgstr "" -#: symfile.c:1135 +#: symfile.c:1137 msgid "expanding to full symbols..." msgstr "" -#: symfile.c:1266 +#: symfile.c:1265 #, possible-c-format msgid "Discard symbol table from `%s'? " msgstr "" -#: symfile.c:1268 +#: symfile.c:1267 msgid "Discard symbol table? " msgstr "" -#: symfile.c:1279 +#: symfile.c:1278 msgid "No symbol file now.\n" msgstr "" -#: symfile.c:1323 symfile.c:1336 +#: symfile.c:1322 symfile.c:1335 #, possible-c-format msgid "Problem reading \"%s\" for CRC: %s" msgstr "" -#: symfile.c:1420 +#: symfile.c:1419 #, possible-c-format msgid "" "the debug information found in \"%s\" does not match \"%s\" (CRC mismatch).\n" msgstr "" -#: symfile.c:1436 +#: symfile.c:1435 #, possible-c-format msgid "" "The directory where separate debug symbols are searched for is \"%s\".\n" msgstr "" -#: symfile.c:1597 tracepoint.c:2863 +#: symfile.c:1596 tracepoint.c:3127 #, possible-c-format msgid "unknown option `%s'" msgstr "" -#: symfile.c:1608 +#: symfile.c:1607 msgid "no symbol file name was specified" msgstr "" -#: symfile.c:1796 +#: symfile.c:1795 #, possible-c-format msgid "I'm sorry, Dave, I can't do that. Symbol format `%s' unknown." msgstr "" -#: symfile.c:1943 +#: symfile.c:1942 #, possible-c-format msgid "Download verify read failed at %s" msgstr "" -#: symfile.c:1946 +#: symfile.c:1945 #, possible-c-format msgid "Download verify compare failed at %s" msgstr "" @@ -20929,17 +21773,17 @@ msgid "Load failed" msgstr "" -#: symfile.c:2246 +#: symfile.c:2247 msgid "add-symbol-file takes a file name and an address" msgstr "" -#: symfile.c:2313 +#: symfile.c:2314 msgid "" -"USAGE: add-symbol-file [-mapped] [-readnow] [-s " -" ]*" +"USAGE: add-symbol-file [-readnow] [-s " +"]*" msgstr "" -#: symfile.c:2324 +#: symfile.c:2325 #, possible-c-format msgid "The address where %s has been loaded is missing" msgstr "" @@ -20949,125 +21793,125 @@ #. functions. We have to split this up into separate print #. statements because hex_string returns a local static #. string. -#: symfile.c:2332 +#: symfile.c:2333 #, possible-c-format msgid "add symbol table from file \"%s\" at\n" msgstr "" #. FIXME, should use print_sys_errmsg but it's not filtered. -#: symfile.c:2408 +#: symfile.c:2409 #, possible-c-format msgid "`%s' has disappeared; keeping its symbols.\n" msgstr "" -#: symfile.c:2420 +#: symfile.c:2421 #, possible-c-format msgid "`%s' has changed; re-reading symbols.\n" msgstr "" -#: symfile.c:2451 +#: symfile.c:2475 #, possible-c-format msgid "Can't close BFD for %s: %s" msgstr "" -#: symfile.c:2455 +#: symfile.c:2479 #, possible-c-format msgid "Can't open %s to read symbols." msgstr "" -#: symfile.c:2460 +#: symfile.c:2484 #, possible-c-format msgid "Can't read symbols from %s: %s." msgstr "" -#: symfile.c:2577 +#: symfile.c:2576 msgid "(no debugging symbols found)\n" msgstr "" -#: symfile.c:2647 +#: symfile.c:2646 #, possible-c-format msgid "Mapping between filename extension and source language is \"%s\".\n" msgstr "" -#: symfile.c:2661 +#: symfile.c:2660 #, possible-c-format msgid "'%s': Filename extension must begin with '.'" msgstr "" -#: symfile.c:2668 symfile.c:2680 +#: symfile.c:2667 symfile.c:2679 #, possible-c-format msgid "'%s': two arguments required -- filename extension and language" msgstr "" -#: symfile.c:2716 +#: symfile.c:2715 msgid "Filename extensions and the languages they represent:" msgstr "" -#: symfile.c:3197 +#: symfile.c:3196 msgid "No sections are mapped.\n" msgstr "" -#: symfile.c:3210 symfile.c:3255 +#: symfile.c:3209 symfile.c:3254 msgid "" "Overlay debugging not enabled. Use either the 'overlay auto' or\n" "the 'overlay manual' command." msgstr "" -#: symfile.c:3215 symfile.c:3260 +#: symfile.c:3214 symfile.c:3259 msgid "Argument required: name of an overlay section" msgstr "" -#: symfile.c:3234 +#: symfile.c:3233 #, possible-c-format msgid "Note: section %s unmapped by overlap\n" msgstr "" -#: symfile.c:3241 symfile.c:3271 +#: symfile.c:3240 symfile.c:3270 #, possible-c-format msgid "No overlay section called %s" msgstr "" -#: symfile.c:3267 +#: symfile.c:3266 #, possible-c-format msgid "Section %s is not mapped" msgstr "" -#: symfile.c:3284 +#: symfile.c:3283 msgid "Automatic overlay debugging enabled." msgstr "" -#: symfile.c:3297 +#: symfile.c:3296 msgid "Overlay debugging enabled." msgstr "" -#: symfile.c:3310 +#: symfile.c:3309 msgid "Overlay debugging disabled." msgstr "" -#: symfile.c:3321 +#: symfile.c:3320 msgid "This target does not know how to read its overlay state." msgstr "" -#: symfile.c:3421 +#: symfile.c:3420 msgid "" "Error reading inferior's overlay table: couldn't find `_novlys' variable\n" "in inferior. Use `overlay manual' mode." msgstr "" -#: symfile.c:3430 symfile.c:3516 +#: symfile.c:3429 symfile.c:3515 msgid "" "Error reading inferior's overlay table: couldn't find `_ovly_table' array\n" "in inferior. Use `overlay manual' mode." msgstr "" -#: symfile.c:3735 +#: symfile.c:3734 msgid "" "Load symbol table from executable file FILE.\n" "The `file' command can also load symbol tables, as well as setting the file\n" "to execute." msgstr "" -#: symfile.c:3741 +#: symfile.c:3740 msgid "" "Load symbols from FILE, assuming FILE has been dynamically loaded.\n" "Usage: add-symbol-file FILE ADDR [-s -s " @@ -21078,179 +21922,219 @@ "with the text. SECT is a section name to be loaded at SECT_ADDR." msgstr "" -#: symfile.c:3751 +#: symfile.c:3750 msgid "" "Dynamically load FILE into the running program, and record its symbols\n" "for access from GDB.\n" "A load OFFSET may also be given." msgstr "" -#: symfile.c:3758 +#: symfile.c:3757 msgid "Set dynamic symbol table reloading multiple times in one run." msgstr "" -#: symfile.c:3759 +#: symfile.c:3758 msgid "Show dynamic symbol table reloading multiple times in one run." msgstr "" -#: symfile.c:3766 +#: symfile.c:3765 msgid "Commands for debugging overlays." msgstr "" -#: symfile.c:3773 +#: symfile.c:3772 msgid "Assert that an overlay section is mapped." msgstr "" -#: symfile.c:3776 +#: symfile.c:3775 msgid "Assert that an overlay section is unmapped." msgstr "" -#: symfile.c:3779 +#: symfile.c:3778 msgid "List mappings of overlay sections." msgstr "" -#: symfile.c:3782 +#: symfile.c:3781 msgid "Enable overlay debugging." msgstr "" -#: symfile.c:3784 +#: symfile.c:3783 msgid "Disable overlay debugging." msgstr "" -#: symfile.c:3786 +#: symfile.c:3785 msgid "Enable automatic overlay debugging." msgstr "" -#: symfile.c:3788 +#: symfile.c:3787 msgid "Read the overlay mapping state from the target." msgstr "" -#: symfile.c:3793 +#: symfile.c:3792 msgid "Set mapping between filename extension and source language." msgstr "" -#: symfile.c:3794 +#: symfile.c:3793 msgid "Show mapping between filename extension and source language." msgstr "" -#: symfile.c:3795 +#: symfile.c:3794 msgid "Usage: set extension-language .foo bar" msgstr "" -#: symfile.c:3802 +#: symfile.c:3801 msgid "All filename extensions associated with a source language." msgstr "" -#: symfile.c:3805 +#: symfile.c:3804 msgid "Set the directories where separate debug symbols are searched for." msgstr "" -#: symfile.c:3806 +#: symfile.c:3805 msgid "Show the directories where separate debug symbols are searched for." msgstr "" -#: symfile.c:3807 +#: symfile.c:3806 msgid "" "Separate debug symbols are first searched for in the same\n" "directory as the binary, then in the `" msgstr "" -#: symmisc.c:133 +#: symfile.c:3808 +msgid "" +"' subdirectory,\n" +"and lastly at the path of the directory of the binary with\n" +"each global debug-file-directory component prepended." +msgstr "" + +#: symfile-mem.c:77 +msgid "add-symbol-file-from-memory not supported for this target" +msgstr "" + +#: symfile-mem.c:82 +msgid "Failed to read a valid object file image from memory." +msgstr "" + +#: symfile-mem.c:95 +#, possible-c-format +msgid "Got object file from memory but can't read symbols: %s." +msgstr "" + +#: symfile-mem.c:129 +msgid "add-symbol-file-from-memory requires an expression argument" +msgstr "" + +#: symfile-mem.c:139 +msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory." +msgstr "" + +#: symfile-mem.c:194 +msgid "" +"Could not load vsyscall page because no executable was specified\n" +"try using the \"file\" command first." +msgstr "" + +#: symfile-mem.c:222 +msgid "" +"Load the symbols out of memory from a dynamically loaded object file.\n" +"Give an expression for the address of the file's shared object file header." +msgstr "" + +#: symmisc.c:92 #, possible-c-format msgid "Byte cache statistics for '%s':\n" msgstr "" -#: symmisc.c:154 +#: symmisc.c:113 #, possible-c-format msgid "Statistics for '%s':\n" msgstr "" -#: symmisc.c:156 +#: symmisc.c:115 #, possible-c-format msgid " Number of \"stab\" symbols read: %d\n" msgstr "" -#: symmisc.c:159 +#: symmisc.c:118 #, possible-c-format msgid " Number of \"minimal\" symbols read: %d\n" msgstr "" -#: symmisc.c:162 +#: symmisc.c:121 #, possible-c-format msgid " Number of \"partial\" symbols read: %d\n" msgstr "" -#: symmisc.c:165 +#: symmisc.c:124 #, possible-c-format msgid " Number of \"full\" symbols read: %d\n" msgstr "" -#: symmisc.c:168 +#: symmisc.c:127 #, possible-c-format msgid " Number of \"types\" defined: %d\n" msgstr "" -#: symmisc.c:181 +#: symmisc.c:140 #, possible-c-format msgid " Number of symbol tables: %d\n" msgstr "" -#: symmisc.c:182 +#: symmisc.c:141 #, possible-c-format msgid " Number of symbol tables with line tables: %d\n" msgstr "" -#: symmisc.c:184 +#: symmisc.c:143 #, possible-c-format msgid " Number of symbol tables with blockvectors: %d\n" msgstr "" -#: symmisc.c:188 +#: symmisc.c:147 #, possible-c-format msgid " Space used by a.out string tables: %d\n" msgstr "" -#: symmisc.c:190 +#: symmisc.c:149 #, possible-c-format msgid " Total memory used for objfile obstack: %d\n" msgstr "" -#: symmisc.c:192 +#: symmisc.c:151 #, possible-c-format msgid " Total memory used for psymbol cache: %d\n" msgstr "" -#: symmisc.c:195 +#: symmisc.c:154 #, possible-c-format msgid " Total memory used for macro cache: %d\n" msgstr "" -#: symmisc.c:197 +#: symmisc.c:156 #, possible-c-format msgid " Total memory used for file name cache: %d\n" msgstr "" -#: symmisc.c:315 +#: symmisc.c:274 #, possible-c-format msgid "internal error: minimal symbol count %d != %d" msgstr "" -#: symmisc.c:456 +#: symmisc.c:415 msgid "" "Arguments missing: an output file name and an optional symbol file name" msgstr "" -#: symmisc.c:676 +#: symmisc.c:635 msgid "" "print-msymbols takes an output file name and optional symbol file name" msgstr "" -#: symtab.c:1156 +#: symtab.c:1249 #, possible-c-format msgid "Internal error: `%s' is not an aggregate" msgstr "" -#: symtab.c:1408 +#: symtab.c:1501 #, possible-c-format msgid "" "Internal: %s symbol `%s' found in %s psymtab but not in symtab.\n" @@ -21259,7 +22143,7 @@ msgstr "" #. FIXME; error is wrong in one case. -#: symtab.c:1577 +#: symtab.c:1670 #, possible-c-format msgid "" "Internal: global symbol `%s' found in %s psymtab but not in symtab.\n" @@ -21267,181 +22151,104 @@ "(if a template, try specifying an instantiation: %s)." msgstr "" -#: symtab.c:2672 +#: symtab.c:2844 msgid "mismatched quoting on brackets, try 'operator\\[\\]'" msgstr "" -#: symtab.c:2680 +#: symtab.c:2852 msgid "nothing is allowed between '[' and ']'" msgstr "" -#: symtab.c:2736 +#: symtab.c:2908 msgid "`operator ()' must be specified without whitespace in `()'" msgstr "" -#: symtab.c:2742 +#: symtab.c:2914 msgid "`operator ?:' must be specified without whitespace in `?:'" msgstr "" -#: symtab.c:2748 +#: symtab.c:2920 msgid "`operator []' must be specified without whitespace in `[]'" msgstr "" -#: symtab.c:2753 +#: symtab.c:2925 #, possible-c-format msgid "`operator %s' not supported" msgstr "" -#: symtab.c:3046 -msgid "must search on specific domain" -msgstr "" - -#: symtab.c:4774 symtab.c:4777 symtab.c:4804 +#: symtab.c:4805 symtab.c:4808 symtab.c:4835 msgid "All global and static variable names, or those matching REGEXP." msgstr "" -#: symtab.c:4781 +#: symtab.c:4812 msgid "All function names, or those matching REGEXP." msgstr "" -#: symtab.c:4792 +#: symtab.c:4823 msgid "All type names, or those matching REGEXP." msgstr "" -#: symtab.c:4795 +#: symtab.c:4826 msgid "Source files in the program." msgstr "" -#: symtab.c:4798 +#: symtab.c:4829 msgid "Set a breakpoint for all functions matching REGEXP." msgstr "" -#: symtab.c:4803 +#: symtab.c:4834 msgid "Source files in the program" msgstr "" -#: symtab.c:4810 +#: symtab.c:4841 msgid "" "Set the debugger behavior when more than one symbol are possible matches\n" "in an expression." msgstr "" -#: symtab.c:4812 +#: symtab.c:4843 msgid "Show how the debugger handles ambiguities in expressions." msgstr "" -#: symtab.c:4813 +#: symtab.c:4844 msgid "" "Valid values are \"ask\", \"all\", \"cancel\", and the default is \"all\"." msgstr "" -#: symtab.h:734 -msgid "Section index is uninitialized" -msgstr "" - -#: target-descriptions.c:307 -msgid "Architecture rejected target-supplied description" -msgstr "" - -#: target-descriptions.c:315 -msgid "" -"Target-supplied registers are not supported by the current architecture" -msgstr "" - -#: target-descriptions.c:342 -msgid "Could not remove target-supplied description" -msgstr "" - -#: target-descriptions.c:933 target-descriptions.c:955 -#, possible-c-format -msgid "Register \"%s\" has an unsupported size (%d bits)" -msgstr "" - -#: target-descriptions.c:1446 -#, possible-c-format -msgid "Attempted to add duplicate compatible architecture \"%s\"" -msgstr "" - -#: target-descriptions.c:1466 -#, possible-c-format -msgid "Attempted to add duplicate property \"%s\"" -msgstr "" - -#: target-descriptions.c:1524 -#, possible-c-format -msgid "The target description will be read from \"%s\".\n" -msgstr "" - -#: target-descriptions.c:1527 -msgid "The target description will be read from the target.\n" -msgstr "" - -#: target-descriptions.c:1561 -msgid "There is no target description to print." -msgstr "" - -#: target-descriptions.c:1564 -msgid "The current target description did not come from an XML file." -msgstr "" - -#: target-descriptions.c:1680 -#, possible-c-format -msgid "C output is not supported type \"%s\"." -msgstr "" - -#: target-descriptions.c:1713 -msgid "Set target description specific variables." -msgstr "" - -#. allow-unknown -#: target-descriptions.c:1717 -msgid "Show target description specific variables." -msgstr "" - -#. allow-unknown -#: target-descriptions.c:1721 -msgid "Unset target description specific variables." -msgstr "" - -#: target-descriptions.c:1728 -msgid "Set the file to read for an XML target description" -msgstr "" - -#: target-descriptions.c:1729 -msgid "Show the file to read for an XML target description" +#: symtab.c:4849 +msgid "Set whether a source file may have multiple base names." msgstr "" -#: target-descriptions.c:1730 -msgid "" -"When set, GDB will read the target description from a local\n" -"file instead of querying the remote target." +#: symtab.c:4850 +msgid "Show whether a source file may have multiple base names." msgstr "" -#: target-descriptions.c:1737 +#: symtab.c:4851 msgid "" -"Unset the file to read for an XML target description. When unset,\n" -"GDB will read the description from the target." -msgstr "" - -#: target-descriptions.c:1742 -msgid "Print the current target description as a C source file." +"(A \"base name\" is the name of a file with the directory part removed.\n" +"Example: The base name of \"/home/user/hello.c\" is \"hello.c\".)\n" +"If set, GDB will canonicalize file names (e.g., expand symlinks)\n" +"before comparing them. Canonicalization is an expensive operation,\n" +"but it allows the same file be known by more than one base name.\n" +"If not set (the default), all source files are assumed to have just\n" +"one base name, and gdb will do file name comparisons more efficiently." msgstr "" -#: target-memory.c:431 -msgid "Error writing data to flash" +#: symtab.h:747 +msgid "Section index is uninitialized" msgstr "" -#: target.c:214 +#: target.c:212 #, possible-c-format msgid "Target debugging is %s.\n" msgstr "" -#: target.c:245 +#: target.c:243 #, possible-c-format msgid "Cache use for stack accesses is %s.\n" msgstr "" -#: target.c:428 +#: target.c:426 msgid "" "Connect to a target machine or process.\n" "The first argument is the type or protocol of the target machine.\n" @@ -21450,42 +22257,42 @@ "`help target ' followed by the protocol name." msgstr "" -#: target.c:490 +#: target.c:488 msgid "could not find a target to create inferior" msgstr "" -#: target.c:519 +#: target.c:517 #, possible-c-format msgid "You can't do that when your target is `%s'" msgstr "" -#: target.c:532 +#: target.c:530 msgid "No saved terminal information.\n" msgstr "" -#: target.c:958 +#: target.c:1002 msgid "Attempt to unpush the dummy target" msgstr "" -#: target.c:1085 +#: target.c:1129 msgid "TLS load module not found" msgstr "" -#: target.c:1099 +#: target.c:1143 msgid "Cannot find thread-local variables in this thread library." msgstr "" -#: target.c:1104 +#: target.c:1148 #, possible-c-format msgid "Cannot find shared library `%s' in dynamic linker's load module list" msgstr "" -#: target.c:1107 +#: target.c:1151 #, possible-c-format msgid "Cannot find executable file `%s' in dynamic linker's load module list" msgstr "" -#: target.c:1112 +#: target.c:1156 #, possible-c-format msgid "" "The inferior has not yet allocated storage for thread-local variables in\n" @@ -21493,7 +22300,7 @@ "for %s" msgstr "" -#: target.c:1118 +#: target.c:1162 #, possible-c-format msgid "" "The inferior has not yet allocated storage for thread-local variables in\n" @@ -21501,90 +22308,90 @@ "for %s" msgstr "" -#: target.c:1126 +#: target.c:1170 #, possible-c-format msgid "" "Cannot find thread-local storage for %s, shared library %s:\n" "%s" msgstr "" -#: target.c:1131 +#: target.c:1175 #, possible-c-format msgid "" "Cannot find thread-local storage for %s, executable file %s:\n" "%s" msgstr "" -#: target.c:1145 +#: target.c:1189 msgid "Cannot find thread-local variables on this target" msgstr "" -#: target.c:1475 +#: target.c:1515 msgid "Writing to flash memory forbidden in this context" msgstr "" -#: target.c:1592 +#: target.c:1667 #, possible-c-format msgid "Writing to memory is not allowed (addr %s, len %s)" msgstr "" -#: target.c:1756 +#: target.c:1850 msgid "Overlapping regions in memory map: ignoring" msgstr "" -#: target.c:1806 +#: target.c:1900 #, possible-c-format msgid "Mode for reading from readonly sections is %s.\n" msgstr "" -#: target.c:2266 +#: target.c:2360 #, possible-c-format msgid "target object %d, annex %s, contained unexpected null characters" msgstr "" -#: target.c:2305 +#: target.c:2399 msgid "May not insert breakpoints" msgstr "" -#: target.c:2322 +#: target.c:2416 msgid "May not remove breakpoints" msgstr "" -#: target.c:2336 +#: target.c:2430 #, possible-c-format msgid "Symbols from \"%s\".\n" msgstr "" -#: target.c:2346 +#: target.c:2440 msgid "\tWhile running this, GDB does not access memory from...\n" msgstr "" -#: target.c:2431 +#: target.c:2525 msgid "Program not killed." msgstr "" -#: target.c:2473 +#: target.c:2567 msgid "could not find a target to detach" msgstr "" -#: target.c:2639 +#: target.c:2733 msgid "could not find a target to follow fork" msgstr "" -#: target.c:2665 +#: target.c:2759 msgid "could not find a target to follow mourn inferior" msgstr "" -#: target.c:2716 +#: target.c:2810 msgid "Unable to allocate memory to perform the search." msgstr "" -#: target.c:2724 target.c:2778 +#: target.c:2818 target.c:2872 #, possible-c-format msgid "Unable to access target memory at %s, halting search." msgstr "" -#: target.c:2867 +#: target.c:2961 #, possible-c-format msgid "" "The \"%s\" target does not support \"run\". Try \"help target\" or " @@ -21594,297 +22401,389 @@ #. This function is only called if the target is running. In that #. case there should have been a process_stratum target and it #. should either know how to create inferiors, or not... -#: target.c:2875 +#: target.c:2969 msgid "No targets found" msgstr "" -#: target.c:2907 +#: target.c:3001 #, possible-c-format msgid "Don't know how to %s. Try \"help target\"." msgstr "" -#: target.c:3062 +#: target.c:3156 #, possible-c-format msgid "Can't determine the current address space of thread %s\n" msgstr "" -#: target.c:3213 target.c:3221 +#: target.c:3307 target.c:3315 msgid "Command not implemented for this target." msgstr "" -#: target.c:3315 +#: target.c:3409 msgid "could not find a target to attach" msgstr "" -#: target.c:3364 +#: target.c:3458 msgid "May not interrupt or stop the target, ignoring attempt" msgstr "" -#: target.c:3481 +#: target.c:3577 #, possible-c-format msgid "Writing to registers is not allowed (regno %d)" msgstr "" -#: target.c:4075 +#: target.c:4240 msgid "\"monitor\" command not supported by this target." msgstr "" -#: target.c:4086 +#: target.c:4251 msgid "The current target stack is:\n" msgstr "" -#: target.c:4120 +#: target.c:4285 #, possible-c-format msgid "Controlling the inferior in asynchronous mode is %s.\n" msgstr "" -#: target.c:4189 +#: target.c:4354 msgid "Set target debugging." msgstr "" -#: target.c:4190 +#: target.c:4355 msgid "Show target debugging." msgstr "" -#: target.c:4191 +#: target.c:4356 msgid "" "When non-zero, target debugging is enabled. Higher numbers are more\n" "verbose. Changes do not take effect until the next \"run\" or \"target\"\n" "command." msgstr "" -#: target.c:4200 +#: target.c:4365 msgid "Set mode for reading from readonly sections." msgstr "" -#: target.c:4201 +#: target.c:4366 msgid "Show mode for reading from readonly sections." msgstr "" -#: target.c:4202 +#: target.c:4367 msgid "" "When this mode is on, memory reads from readonly sections (such as .text)\n" "will be read from the object file instead of from the target. This will\n" "result in significant performance improvement for remote targets." msgstr "" -#: target.c:4211 +#: target.c:4376 msgid "Send a command to the remote monitor (remote targets only)." msgstr "" -#: target.c:4214 +#: target.c:4379 msgid "Print the name of each layer of the internal target stack." msgstr "" -#: target.c:4218 +#: target.c:4383 msgid "Set whether gdb controls the inferior in asynchronous mode." msgstr "" -#: target.c:4219 +#: target.c:4384 msgid "Show whether gdb controls the inferior in asynchronous mode." msgstr "" -#: target.c:4220 +#: target.c:4385 msgid "Tells gdb whether to control the inferior in asynchronous mode." msgstr "" -#: target.c:4228 +#: target.c:4393 msgid "Set cache use for stack access." msgstr "" -#: target.c:4229 +#: target.c:4394 msgid "Show cache use for stack access." msgstr "" -#: target.c:4230 +#: target.c:4395 msgid "" "When on, use the data cache for all stack access, regardless of any\n" "configured memory regions. This improves remote performance significantly.\n" "By default, caching for stack access is on." msgstr "" -#: target.c:4239 +#: target.c:4404 msgid "Set permission to write into registers." msgstr "" -#: target.c:4240 +#: target.c:4405 msgid "Show permission to write into registers." msgstr "" -#: target.c:4241 +#: target.c:4406 msgid "" "When this permission is on, GDB may write into the target's registers.\n" "Otherwise, any sort of write attempt will result in an error." msgstr "" -#: target.c:4248 +#: target.c:4413 msgid "Set permission to write into target memory." msgstr "" -#: target.c:4249 +#: target.c:4414 msgid "Show permission to write into target memory." msgstr "" -#: target.c:4250 +#: target.c:4415 msgid "" "When this permission is on, GDB may write into the target's memory.\n" "Otherwise, any sort of write attempt will result in an error." msgstr "" -#: target.c:4257 +#: target.c:4422 msgid "Set permission to insert breakpoints in the target." msgstr "" -#: target.c:4258 +#: target.c:4423 msgid "Show permission to insert breakpoints in the target." msgstr "" -#: target.c:4259 +#: target.c:4424 msgid "" "When this permission is on, GDB may insert breakpoints in the program.\n" "Otherwise, any sort of insertion attempt will result in an error." msgstr "" -#: target.c:4266 +#: target.c:4431 msgid "Set permission to insert tracepoints in the target." msgstr "" -#: target.c:4267 +#: target.c:4432 msgid "Show permission to insert tracepoints in the target." msgstr "" -#: target.c:4268 +#: target.c:4433 msgid "" "When this permission is on, GDB may insert tracepoints in the program.\n" "Otherwise, any sort of insertion attempt will result in an error." msgstr "" -#: target.c:4275 -msgid "Set permission to insert fast tracepoints in the target." +#: target.c:4440 +msgid "Set permission to insert fast tracepoints in the target." +msgstr "" + +#: target.c:4441 +msgid "Show permission to insert fast tracepoints in the target." +msgstr "" + +#: target.c:4442 +msgid "" +"When this permission is on, GDB may insert fast tracepoints.\n" +"Otherwise, any sort of insertion attempt will result in an error." +msgstr "" + +#: target.c:4449 +msgid "Set permission to interrupt or signal the target." +msgstr "" + +#: target.c:4450 +msgid "Show permission to interrupt or signal the target." +msgstr "" + +#: target.c:4451 +msgid "" +"When this permission is on, GDB may interrupt/stop the target's execution.\n" +"Otherwise, any attempt to interrupt or stop will be ignored." +msgstr "" + +#: target-descriptions.c:306 +msgid "Architecture rejected target-supplied description" +msgstr "" + +#: target-descriptions.c:314 +msgid "" +"Target-supplied registers are not supported by the current architecture" +msgstr "" + +#: target-descriptions.c:341 +msgid "Could not remove target-supplied description" +msgstr "" + +#: target-descriptions.c:932 target-descriptions.c:954 +#, possible-c-format +msgid "Register \"%s\" has an unsupported size (%d bits)" +msgstr "" + +#: target-descriptions.c:1445 +#, possible-c-format +msgid "Attempted to add duplicate compatible architecture \"%s\"" +msgstr "" + +#: target-descriptions.c:1465 +#, possible-c-format +msgid "Attempted to add duplicate property \"%s\"" +msgstr "" + +#: target-descriptions.c:1523 +#, possible-c-format +msgid "The target description will be read from \"%s\".\n" +msgstr "" + +#: target-descriptions.c:1526 +msgid "The target description will be read from the target.\n" +msgstr "" + +#: target-descriptions.c:1560 +msgid "There is no target description to print." +msgstr "" + +#: target-descriptions.c:1563 +msgid "The current target description did not come from an XML file." +msgstr "" + +#: target-descriptions.c:1679 +#, possible-c-format +msgid "C output is not supported type \"%s\"." +msgstr "" + +#: target-descriptions.c:1712 +msgid "Set target description specific variables." +msgstr "" + +#. allow-unknown +#: target-descriptions.c:1716 +msgid "Show target description specific variables." +msgstr "" + +#. allow-unknown +#: target-descriptions.c:1720 +msgid "Unset target description specific variables." +msgstr "" + +#: target-descriptions.c:1727 +msgid "Set the file to read for an XML target description" msgstr "" -#: target.c:4276 -msgid "Show permission to insert fast tracepoints in the target." +#: target-descriptions.c:1728 +msgid "Show the file to read for an XML target description" msgstr "" -#: target.c:4277 +#: target-descriptions.c:1729 msgid "" -"When this permission is on, GDB may insert fast tracepoints.\n" -"Otherwise, any sort of insertion attempt will result in an error." +"When set, GDB will read the target description from a local\n" +"file instead of querying the remote target." msgstr "" -#: target.c:4284 -msgid "Set permission to interrupt or signal the target." +#: target-descriptions.c:1736 +msgid "" +"Unset the file to read for an XML target description. When unset,\n" +"GDB will read the description from the target." msgstr "" -#: target.c:4285 -msgid "Show permission to interrupt or signal the target." +#: target-descriptions.c:1741 +msgid "Print the current target description as a C source file." msgstr "" -#: target.c:4286 -msgid "" -"When this permission is on, GDB may interrupt/stop the target's execution.\n" -"Otherwise, any attempt to interrupt or stop will be ignored." +#: target-memory.c:430 +msgid "Error writing data to flash" msgstr "" -#: thread.c:250 +#: thread.c:239 #, possible-c-format msgid "[New %s]\n" msgstr "" -#: thread.c:810 +#: thread.c:803 msgid "No threads.\n" msgstr "" -#: thread.c:812 +#: thread.c:805 #, possible-c-format msgid "No threads match '%s'.\n" msgstr "" -#: thread.c:838 +#: thread.c:831 msgid "Requested thread not found in requested process" msgstr "" -#: thread.c:1065 +#: thread.c:1058 #, possible-c-format msgid "Couldn't restore frame #%d in current thread, at reparsed frame #0\n" msgstr "" -#: thread.c:1186 thread.c:1225 +#: thread.c:1179 thread.c:1218 msgid "Please specify a command following the thread ID list" msgstr "" -#: thread.c:1201 thread.c:1253 +#: thread.c:1194 thread.c:1246 #, possible-c-format msgid "" "\n" "Thread %d (%s):\n" msgstr "" -#: thread.c:1220 +#: thread.c:1213 msgid "Please specify a thread ID list" msgstr "" -#: thread.c:1248 +#: thread.c:1241 #, possible-c-format msgid "Thread %d has terminated." msgstr "" -#: thread.c:1274 thread.c:1303 +#: thread.c:1267 thread.c:1296 msgid "No thread selected" msgstr "" -#: thread.c:1279 +#: thread.c:1272 #, possible-c-format msgid "[Current thread is %d (%s) (exited)]\n" msgstr "" -#: thread.c:1283 +#: thread.c:1276 #, possible-c-format msgid "[Current thread is %d (%s)]\n" msgstr "" -#: thread.c:1334 +#: thread.c:1327 #, possible-c-format msgid "Thread %d has name '%s'\n" msgstr "" -#: thread.c:1342 +#: thread.c:1335 #, possible-c-format msgid "Thread %d has target name '%s'\n" msgstr "" -#: thread.c:1350 +#: thread.c:1343 #, possible-c-format msgid "Thread %d has target id '%s'\n" msgstr "" -#: thread.c:1358 +#: thread.c:1351 #, possible-c-format msgid "Thread %d has extra info '%s'\n" msgstr "" -#: thread.c:1364 +#: thread.c:1357 #, possible-c-format msgid "No threads match '%s'\n" msgstr "" -#: thread.c:1374 +#: thread.c:1367 #, possible-c-format msgid "Printing of thread events is %s.\n" msgstr "" -#: thread.c:1389 windows-tdep.c:373 +#: thread.c:1382 windows-tdep.c:373 #, possible-c-format msgid "Thread ID %d not known." msgstr "" -#: thread.c:1392 windows-tdep.c:376 +#: thread.c:1385 windows-tdep.c:376 #, possible-c-format msgid "Thread ID %d has terminated." msgstr "" -#: thread.c:1458 +#: thread.c:1451 msgid "" "Display currently known threads.\n" "Usage: info threads [ID]...\n" @@ -21892,139 +22791,154 @@ "If no arguments, all threads are displayed." msgstr "" -#: thread.c:1463 +#: thread.c:1456 msgid "" "Use this command to switch between threads.\n" "The new thread ID must be currently known." msgstr "" -#: thread.c:1469 +#: thread.c:1462 msgid "Apply a command to a list of threads." msgstr "" -#: thread.c:1473 +#: thread.c:1466 msgid "Apply a command to all threads." msgstr "" -#: thread.c:1476 +#: thread.c:1469 msgid "" "Set the current thread's name.\n" "Usage: thread name [NAME]\n" "If NAME is not given, then any existing name is removed." msgstr "" -#: thread.c:1480 +#: thread.c:1473 msgid "" "Find threads that match a regular expression.\n" "Usage: thread find REGEXP\n" "Will display thread ids whose name, target ID, or extra info matches REGEXP." msgstr "" -#: thread.c:1490 +#: thread.c:1483 msgid "Set printing of thread events (such as thread start and exit)." msgstr "" -#: thread.c:1491 +#: thread.c:1484 msgid "Show printing of thread events (such as thread start and exit)." msgstr "" -#: top.c:105 +#: tic6x-tdep.c:894 +#, possible-c-format +msgid "unexpected length %d of type" +msgstr "" + +#: tic6x-tdep.c:1152 +#, possible-c-format +msgid "unexpected type %d of arg %d" +msgstr "" + +#: tic6x-tdep.c:1157 +#, possible-c-format +msgid "unexpected length %d of arg %d" +msgstr "" + +#: top.c:108 #, possible-c-format msgid "Whether to confirm potentially dangerous operations is %s.\n" msgstr "" -#: top.c:424 +#: top.c:437 msgid "That is not a command, just a help topic." msgstr "" -#: top.c:660 +#: top.c:693 #, possible-c-format msgid "Saving of the history record on exit is %s.\n" msgstr "" -#: top.c:669 +#: top.c:702 #, possible-c-format msgid "The size of the command history is %s.\n" msgstr "" -#: top.c:678 +#: top.c:711 #, possible-c-format msgid "The filename in which to record the command history is \"%s\".\n" msgstr "" -#: top.c:1107 +#: top.c:1139 msgid "" "\n" "For bug reporting instructions, please see:\n" msgstr "" -#: top.c:1182 +#: top.c:1219 #, possible-c-format msgid "\tInferior %d [%s] will be detached.\n" msgstr "" -#: top.c:1186 +#: top.c:1223 #, possible-c-format msgid "\tInferior %d [%s] will be killed.\n" msgstr "" -#: top.c:1215 +#: top.c:1252 msgid "" "A debugging session is active.\n" "Do you still want to close the debugger?" msgstr "" -#: top.c:1219 +#: top.c:1256 msgid "" "A debugging session is active.\n" "\n" msgstr "" -#: top.c:1221 +#: top.c:1258 msgid "" "\n" "Quit anyway? " msgstr "" -#: top.c:1400 +#: top.c:1438 msgid "History size must be non-negative" msgstr "" -#: top.c:1407 +#: top.c:1445 msgid "" "\"set history\" must be followed by the name of a history subcommand.\n" msgstr "" -#: top.c:1484 +#: top.c:1522 #, possible-c-format msgid "Gdb's prompt is \"%s\".\n" msgstr "" -#: top.c:1491 +#: top.c:1529 #, possible-c-format msgid "Editing of command lines as they are typed is %s.\n" msgstr "" -#: top.c:1500 +#: top.c:1538 #, possible-c-format msgid "Annotation_level is %s.\n" msgstr "" -#: top.c:1507 +#: top.c:1545 #, possible-c-format msgid "" "Notification of completion for asynchronous execution commands is %s.\n" msgstr "" -#: top.c:1551 +#: top.c:1579 msgid "Set gdb's prompt" msgstr "" -#: top.c:1552 +#: top.c:1580 msgid "Show gdb's prompt" msgstr "" -#: top.c:1557 +#: top.c:1585 msgid "" "Don't repeat this command.\n" "Primarily used inside of user-defined commands that should not be repeated " @@ -22032,620 +22946,668 @@ "hitting return." msgstr "" -#: top.c:1563 +#: top.c:1591 msgid "Set editing of command lines as they are typed." msgstr "" -#: top.c:1564 +#: top.c:1592 msgid "Show editing of command lines as they are typed." msgstr "" -#: top.c:1565 +#: top.c:1593 msgid "" "Use \"on\" to enable the editing, and \"off\" to disable it.\n" "Without an argument, command line editing is enabled. To edit, use\n" "EMACS-like or VI-like commands like control-P or ESC." msgstr "" -#: top.c:1573 +#: top.c:1601 msgid "Set saving of the history record on exit." msgstr "" -#: top.c:1574 +#: top.c:1602 msgid "Show saving of the history record on exit." msgstr "" -#: top.c:1575 +#: top.c:1603 msgid "" "Use \"on\" to enable the saving, and \"off\" to disable it.\n" "Without an argument, saving is enabled." msgstr "" -#: top.c:1582 +#: top.c:1610 msgid "Set the size of the command history," msgstr "" -#: top.c:1583 +#: top.c:1611 msgid "Show the size of the command history," msgstr "" -#: top.c:1584 +#: top.c:1612 msgid "ie. the number of previous commands to keep a record of." msgstr "" -#: top.c:1590 +#: top.c:1618 msgid "Set the filename in which to record the command history" msgstr "" -#: top.c:1591 +#: top.c:1619 msgid "Show the filename in which to record the command history" msgstr "" -#: top.c:1592 +#: top.c:1620 msgid "(the list of previous commands of which a record is kept)." msgstr "" -#: top.c:1598 +#: top.c:1626 msgid "Set whether to confirm potentially dangerous operations." msgstr "" -#: top.c:1599 +#: top.c:1627 msgid "Show whether to confirm potentially dangerous operations." msgstr "" -#: top.c:1605 +#: top.c:1633 msgid "Set annotation_level." msgstr "" -#: top.c:1606 +#: top.c:1634 msgid "Show annotation_level." msgstr "" -#: top.c:1607 +#: top.c:1635 msgid "" "0 == normal; 1 == fullname (for use when running under emacs)\n" "2 == output annotated suitably for use by programs that control GDB." msgstr "" -#: top.c:1615 +#: top.c:1643 msgid "Set notification of completion for asynchronous execution commands." msgstr "" -#: top.c:1616 +#: top.c:1644 msgid "Show notification of completion for asynchronous execution commands." msgstr "" -#: top.c:1617 +#: top.c:1645 msgid "Use \"on\" to enable the notification, and \"off\" to disable it." msgstr "" -#: top.c:1624 +#: top.c:1652 msgid "Set GDB's data directory." msgstr "" -#: top.c:1625 +#: top.c:1653 msgid "Show GDB's data directory." msgstr "" -#: top.c:1626 +#: top.c:1654 msgid "When set, GDB uses the specified path to search for data files." msgstr "" -#: tracepoint.c:354 +#: tracepoint.c:364 #, possible-c-format msgid "No trace variable named \"$%s\", not deleting" msgstr "" -#: tracepoint.c:370 +#: tracepoint.c:380 msgid "trace state variable name" msgstr "" -#: tracepoint.c:377 +#: tracepoint.c:387 msgid "No expression?" msgstr "" -#: tracepoint.c:391 +#: tracepoint.c:401 msgid "Syntax must be $NAME [ = EXPR ]" msgstr "" -#: tracepoint.c:394 +#: tracepoint.c:404 msgid "No name given" msgstr "" -#: tracepoint.c:397 +#: tracepoint.c:407 msgid "Must supply a non-empty variable name" msgstr "" -#: tracepoint.c:404 +#: tracepoint.c:414 #, possible-c-format msgid "Trace state variable $%s now has initial value %s.\n" msgstr "" -#: tracepoint.c:415 +#: tracepoint.c:425 #, possible-c-format msgid "Trace state variable $%s created, with initial value %s.\n" msgstr "" -#: tracepoint.c:431 +#: tracepoint.c:441 msgid "Delete all trace state variables? " msgstr "" -#: tracepoint.c:445 +#: tracepoint.c:455 #, possible-c-format msgid "Name \"%s\" not prefixed with '$', ignoring" msgstr "" -#: tracepoint.c:463 +#: tracepoint.c:474 msgid "No trace state variables.\n" msgstr "" -#: tracepoint.c:555 +#: tracepoint.c:566 msgid "This command cannot be used at the top level." msgstr "" -#: tracepoint.c:561 tracepoint.c:567 tracepoint.c:573 +#: tracepoint.c:572 tracepoint.c:578 tracepoint.c:584 msgid "This command can only be used in a tracepoint actions list." msgstr "" -#: tracepoint.c:608 +#: tracepoint.c:617 +msgid "Target does not support \"/s\" option for string tracing." +msgstr "" + +#: tracepoint.c:620 +#, possible-c-format +msgid "Undefined collection format \"%c\"." +msgstr "" + +#: tracepoint.c:659 msgid "expression is malformed" msgstr "" -#: tracepoint.c:614 +#: tracepoint.c:665 msgid "expression has min height < 0" msgstr "" -#: tracepoint.c:623 tracepoint.c:707 tracepoint.c:742 +#: tracepoint.c:674 tracepoint.c:764 tracepoint.c:799 msgid "Expression is too complicated." msgstr "" -#: tracepoint.c:653 +#: tracepoint.c:705 #, possible-c-format msgid "`%s' is not a tracepoint action, or is ambiguous." msgstr "" -#: tracepoint.c:686 +#: tracepoint.c:743 #, possible-c-format msgid "constant `%s' (value %ld) will not be collected." msgstr "" -#: tracepoint.c:694 +#: tracepoint.c:751 #, possible-c-format msgid "`%s' is optimized away and cannot be collected." msgstr "" -#: tracepoint.c:762 +#: tracepoint.c:819 #, possible-c-format msgid "while-stepping step count `%s' is malformed." msgstr "" -#: tracepoint.c:769 +#: tracepoint.c:826 #, possible-c-format msgid "`%s' is not a supported tracepoint action." msgstr "" -#: tracepoint.c:868 +#: tracepoint.c:925 #, possible-c-format msgid "Internal: register number %d too large for tracepoint" msgstr "" -#: tracepoint.c:1111 +#: tracepoint.c:1168 msgid "Can't collect locals; no symbol table info available.\n" msgstr "" -#: tracepoint.c:1118 +#: tracepoint.c:1175 msgid "No locals found in scope." msgstr "" -#: tracepoint.c:1126 +#: tracepoint.c:1183 msgid "Can't collect args; no symbol table info available." msgstr "" -#: tracepoint.c:1132 +#: tracepoint.c:1189 msgid "No args found in scope." msgstr "" -#: tracepoint.c:1309 tracepoint.c:2512 +#: tracepoint.c:1366 tracepoint.c:2763 #, possible-c-format msgid "Bad action list item: %s" msgstr "" -#: tracepoint.c:1477 +#: tracepoint.c:1575 #, possible-c-format msgid "Invalid tracepoint command '%s'" msgstr "" -#: tracepoint.c:1572 +#: tracepoint.c:1692 +msgid "Pending tracepoints will not be resolved while GDB is disconnected\n" +msgstr "" + +#: tracepoint.c:1713 msgid "No tracepoints defined, not starting trace" msgstr "" -#: tracepoint.c:1585 +#: tracepoint.c:1728 #, possible-c-format msgid "May not insert %stracepoints, skipping tracepoint %d" msgstr "" -#: tracepoint.c:1593 +#: tracepoint.c:1735 +msgid "No tracepoints enabled" +msgstr "" + +#: tracepoint.c:1741 msgid "No tracepoints enabled, not starting trace" msgstr "" -#: tracepoint.c:1599 +#: tracepoint.c:1748 msgid "No tracepoints that may be downloaded, not starting trace" msgstr "" -#: tracepoint.c:1655 +#: tracepoint.c:1828 msgid "A trace is running already. Start a new run? " msgstr "" -#: tracepoint.c:1656 +#: tracepoint.c:1829 msgid "New trace run not started." msgstr "" -#: tracepoint.c:1667 +#: tracepoint.c:1844 msgid "Trace is not running." msgstr "" -#: tracepoint.c:1692 +#: tracepoint.c:1881 msgid "Using a trace file.\n" msgstr "" -#: tracepoint.c:1695 +#: tracepoint.c:1884 msgid "Trace can not be run on this target.\n" msgstr "" -#: tracepoint.c:1702 +#: tracepoint.c:1891 msgid "Run/stop status is unknown.\n" msgstr "" -#: tracepoint.c:1706 +#: tracepoint.c:1895 msgid "Trace is running on the target.\n" msgstr "" -#: tracepoint.c:1713 +#: tracepoint.c:1902 msgid "No trace has been run on the target.\n" msgstr "" -#: tracepoint.c:1716 +#: tracepoint.c:1906 +#, possible-c-format +msgid "Trace stopped by a tstop command (%s).\n" +msgstr "" + +#: tracepoint.c:1909 msgid "Trace stopped by a tstop command.\n" msgstr "" -#: tracepoint.c:1719 +#: tracepoint.c:1912 msgid "Trace stopped because the buffer was full.\n" msgstr "" -#: tracepoint.c:1722 +#: tracepoint.c:1915 msgid "Trace stopped because of disconnection.\n" msgstr "" -#: tracepoint.c:1725 +#: tracepoint.c:1918 #, possible-c-format msgid "Trace stopped by tracepoint %d.\n" msgstr "" -#: tracepoint.c:1730 +#: tracepoint.c:1923 #, possible-c-format msgid "Trace stopped by an error (%s, tracepoint %d).\n" msgstr "" -#: tracepoint.c:1734 +#: tracepoint.c:1927 #, possible-c-format msgid "Trace stopped by an error (%s).\n" msgstr "" -#: tracepoint.c:1738 +#: tracepoint.c:1931 msgid "Trace stopped for an unknown reason.\n" msgstr "" -#: tracepoint.c:1741 +#: tracepoint.c:1934 #, possible-c-format msgid "Trace stopped for some other reason (%d).\n" msgstr "" -#: tracepoint.c:1750 +#: tracepoint.c:1943 #, possible-c-format msgid "Buffer contains %d trace frames (of %d created total).\n" msgstr "" -#: tracepoint.c:1756 +#: tracepoint.c:1949 #, possible-c-format msgid "Collected %d trace frames.\n" msgstr "" -#: tracepoint.c:1764 +#: tracepoint.c:1957 #, possible-c-format msgid "Trace buffer has %d bytes of %d bytes free" msgstr "" -#: tracepoint.c:1767 +#: tracepoint.c:1960 #, possible-c-format msgid " (%d%% full)" msgstr "" -#: tracepoint.c:1771 +#: tracepoint.c:1964 msgid ".\n" msgstr "" -#: tracepoint.c:1774 +#: tracepoint.c:1967 #, possible-c-format msgid "Trace buffer has %d bytes free.\n" msgstr "" -#: tracepoint.c:1779 +#: tracepoint.c:1972 msgid "Trace will continue if GDB disconnects.\n" msgstr "" -#: tracepoint.c:1781 +#: tracepoint.c:1974 msgid "Trace will stop if GDB disconnects.\n" msgstr "" -#: tracepoint.c:1784 +#: tracepoint.c:1977 msgid "Trace buffer is circular.\n" msgstr "" -#: tracepoint.c:1788 +#: tracepoint.c:1980 +#, possible-c-format +msgid "Trace user is %s.\n" +msgstr "" + +#: tracepoint.c:1983 +#, possible-c-format +msgid "Trace notes: %s.\n" +msgstr "" + +#: tracepoint.c:1987 #, possible-c-format msgid "Looking at trace frame %d, tracepoint %d.\n" msgstr "" -#: tracepoint.c:1791 +#: tracepoint.c:1990 msgid "Not looking at any trace frame.\n" msgstr "" -#: tracepoint.c:1913 +#. Reporting a run time is more readable than two long numbers. +#: tracepoint.c:2000 +#, possible-c-format +msgid "Trace started at %ld.%06ld secs, stopped %ld.%06ld secs later.\n" +msgstr "" + +#: tracepoint.c:2007 +#, possible-c-format +msgid "Trace started at %ld.%06ld secs.\n" +msgstr "" + +#: tracepoint.c:2012 +#, possible-c-format +msgid "Trace stopped at %ld.%06ld secs.\n" +msgstr "" + +#: tracepoint.c:2163 msgid "Trace is running and will continue after detach; detach anyway? " msgstr "" -#: tracepoint.c:1919 +#: tracepoint.c:2169 msgid "Trace is running but will stop on detach; detach anyway? " msgstr "" -#: tracepoint.c:1986 +#: tracepoint.c:2237 msgid "Target failed to find requested trace frame." msgstr "" -#: tracepoint.c:2024 +#: tracepoint.c:2275 #, possible-c-format msgid "Found trace frame %d, tracepoint %d\n" msgstr "" -#: tracepoint.c:2033 +#: tracepoint.c:2284 msgid "No longer looking at any trace frame\n" msgstr "" #. This case may never occur, check. -#: tracepoint.c:2035 +#: tracepoint.c:2286 msgid "No trace frame found\n" msgstr "" -#: tracepoint.c:2096 +#: tracepoint.c:2347 msgid "not debugging trace buffer" msgstr "" -#: tracepoint.c:2098 +#: tracepoint.c:2349 msgid "already at start of trace buffer" msgstr "" -#: tracepoint.c:2109 +#: tracepoint.c:2360 #, possible-c-format msgid "invalid input (%d is less than zero)" msgstr "" -#: tracepoint.c:2165 +#: tracepoint.c:2416 msgid "No current tracepoint -- please supply an argument." msgstr "" -#: tracepoint.c:2217 +#: tracepoint.c:2468 msgid "No line number information available." msgstr "" -#: tracepoint.c:2237 +#: tracepoint.c:2488 msgid "Cannot find a good line." msgstr "" #. Is there any case in which we get here, and have an address #. which the user would want to see? If we have debugging #. symbols and no line numbers? -#: tracepoint.c:2244 +#: tracepoint.c:2495 #, possible-c-format msgid "Line number %d is out of range for \"%s\"." msgstr "" -#: tracepoint.c:2336 +#: tracepoint.c:2587 msgid "requires an argument (function, line or *addr) to define a scope" msgstr "" -#: tracepoint.c:2584 +#: tracepoint.c:2840 msgid "No current trace frame." msgstr "" -#: tracepoint.c:2591 +#: tracepoint.c:2847 #, possible-c-format msgid "No known tracepoint matches 'current' tracepoint #%d." msgstr "" -#: tracepoint.c:2647 +#: tracepoint.c:2903 msgid "Buffer too small for source encoding" msgstr "" -#: tracepoint.c:2652 +#: tracepoint.c:2908 msgid "Source string too long for buffer" msgstr "" -#: tracepoint.c:2687 +#: tracepoint.c:2943 #, possible-c-format msgid "Target failed to save trace data to '%s'." msgstr "" -#: tracepoint.c:2701 +#: tracepoint.c:2957 #, possible-c-format msgid "Unable to open file '%s' for saving trace data (%s)" msgstr "" -#: tracepoint.c:2826 +#: tracepoint.c:3090 msgid "Failure to get requested trace buffer data" msgstr "" -#: tracepoint.c:2853 tracepoint.c:2869 +#: tracepoint.c:3117 tracepoint.c:3133 msgid "file in which to save trace data" msgstr "" -#: tracepoint.c:2874 +#: tracepoint.c:3138 #, possible-c-format msgid "Trace data saved to file '%s'.\n" msgstr "" -#: tracepoint.c:2950 +#: tracepoint.c:3244 msgid "could not change traceframe" msgstr "" -#: tracepoint.c:3127 +#: tracepoint.c:3443 #, possible-c-format msgid "Assuming tracepoint %d is same as target's tracepoint %d at %s.\n" msgstr "" -#: tracepoint.c:3135 +#: tracepoint.c:3452 #, possible-c-format msgid "Created tracepoint %d for target's tracepoint %d at %s.\n" msgstr "" -#: tracepoint.c:3140 +#: tracepoint.c:3457 #, possible-c-format msgid "" "Failed to create tracepoint for target's tracepoint %d at %s, skipping it.\n" msgstr "" -#: tracepoint.c:3221 +#: tracepoint.c:3546 #, possible-c-format msgid "Assuming trace state variable $%s is same as target's variable %d.\n" msgstr "" -#: tracepoint.c:3229 +#: tracepoint.c:3554 #, possible-c-format msgid "Created trace state variable $%s for target's variable %d.\n" msgstr "" -#: tracepoint.c:3287 +#: tracepoint.c:3612 msgid "Premature end of file while reading trace file" msgstr "" -#: tracepoint.c:3308 +#: tracepoint.c:3633 msgid "No trace file specified." msgstr "" -#: tracepoint.c:3341 +#: tracepoint.c:3666 msgid "File is not a valid trace file." msgstr "" -#: tracepoint.c:3381 +#: tracepoint.c:3706 msgid "Excessively long lines in trace file" msgstr "" -#: tracepoint.c:3390 +#: tracepoint.c:3715 msgid "No register block size recorded in trace file" msgstr "" -#: tracepoint.c:3404 +#: tracepoint.c:3729 msgid "No traceframes present in this file." msgstr "" -#: tracepoint.c:3447 +#: tracepoint.c:3772 #, possible-c-format msgid "Ignoring trace file definition \"%s\"" msgstr "" -#: tracepoint.c:3475 +#: tracepoint.c:3806 #, possible-c-format msgid "" "Malformed trace status, at %s\n" "Status line: '%s'\n" msgstr "" -#: tracepoint.c:3622 +#: tracepoint.c:4015 #, possible-c-format msgid "Unrecognized char '%c' in tracepoint definition, skipping rest" msgstr "" #. Don't error out, the target might be sending us optional #. info that we don't care about. -#: tracepoint.c:3670 +#: tracepoint.c:4069 #, possible-c-format msgid "Unrecognized tracepoint piece '%c', ignoring" msgstr "" -#: tracepoint.c:3793 +#: tracepoint.c:4199 msgid "could not set tfile's traceframe" msgstr "" -#: tracepoint.c:3868 +#: tracepoint.c:4274 msgid "unknown tfind type" msgstr "" -#: tracepoint.c:3956 +#: tracepoint.c:4362 #, possible-c-format msgid "Unknown block type '%c' (0x%x) in trace frame" msgstr "" -#: tracepoint.c:4044 +#: tracepoint.c:4450 #, possible-c-format msgid "Tracepoint %d has multiple locations, cannot infer $pc" msgstr "" -#: tracepoint.c:4052 +#: tracepoint.c:4458 #, possible-c-format msgid "Tracepoint %d does while-stepping, cannot infer $pc" msgstr "" -#: tracepoint.c:4076 +#: tracepoint.c:4482 msgid "tfile_xfer_partial: trace file is read-only" msgstr "" -#: tracepoint.c:4251 +#: tracepoint.c:4657 #, possible-c-format msgid "" "Unhandled trace block type (%d) '%c ' while building trace frame info." msgstr "" -#: tracepoint.c:4317 +#: tracepoint.c:4724 #, possible-c-format msgid "bad marker definition: %s" msgstr "" -#: tracepoint.c:4430 +#: tracepoint.c:4838 msgid "Data: \"" msgstr "" -#: tracepoint.c:4444 +#: tracepoint.c:4852 msgid "Probed by static tracepoints: " msgstr "" -#: tracepoint.c:4553 +#: tracepoint.c:4962 msgid "" "Can not parse XML trace frame info; XML support was disabled at compile time" msgstr "" -#: tracepoint.c:4624 +#: tracepoint.c:5033 msgid "trace frame info" msgstr "" -#: tracepoint.c:4740 +#: tracepoint.c:5149 msgid "List the variables local to a scope" msgstr "" -#: tracepoint.c:4743 +#: tracepoint.c:5152 msgid "Tracing of program execution without stopping the program." msgstr "" -#: tracepoint.c:4747 +#: tracepoint.c:5156 msgid "Print everything collected at the current tracepoint." msgstr "" -#: tracepoint.c:4749 +#: tracepoint.c:5158 msgid "" "Save the trace data to a file.\n" "Use the '-r' option to direct the target to save directly to the file,\n" "using its own filesystem." msgstr "" -#: tracepoint.c:4754 +#: tracepoint.c:5163 msgid "" "Define a trace state variable.\n" "Argument is a $-prefixed name, optionally followed\n" @@ -22653,7 +23615,7 @@ "at the start of tracing." msgstr "" -#: tracepoint.c:4761 +#: tracepoint.c:5170 msgid "" "Delete one or more trace state variables.\n" "Arguments are the names of the variables to delete.\n" @@ -22661,33 +23623,33 @@ msgstr "" #. FIXME add a trace variable completer. -#: tracepoint.c:4767 +#: tracepoint.c:5176 msgid "Status of trace state variables and their values.\n" msgstr "" -#: tracepoint.c:4772 +#: tracepoint.c:5181 msgid "List target static tracepoints markers.\n" msgstr "" -#: tracepoint.c:4776 +#: tracepoint.c:5185 msgid "" "Select a trace frame;\n" "No argument means forward by one frame; '-' means backward by one frame." msgstr "" -#: tracepoint.c:4781 +#: tracepoint.c:5190 msgid "" "Select a trace frame whose PC is outside the given range (exclusive).\n" "Usage: tfind outside addr1, addr2" msgstr "" -#: tracepoint.c:4786 +#: tracepoint.c:5195 msgid "" "Select a trace frame whose PC is in the given range (inclusive).\n" "Usage: tfind range addr1,addr2" msgstr "" -#: tracepoint.c:4791 +#: tracepoint.c:5200 msgid "" "Select a trace frame by source line.\n" "Argument can be a line number (with optional source file),\n" @@ -22695,45 +23657,53 @@ "Default argument is 'the next source line that was traced'." msgstr "" -#: tracepoint.c:4798 +#: tracepoint.c:5207 msgid "" "Select a trace frame by tracepoint number.\n" "Default is the tracepoint for the current trace frame." msgstr "" -#: tracepoint.c:4803 +#: tracepoint.c:5212 msgid "" "Select a trace frame by PC.\n" "Default is the current PC, or the PC of the current trace frame." msgstr "" -#: tracepoint.c:4808 +#: tracepoint.c:5217 msgid "" "Synonym for 'none'.\n" "De-select any trace frame and resume 'live' debugging." msgstr "" -#: tracepoint.c:4814 +#: tracepoint.c:5223 msgid "De-select any trace frame and resume 'live' debugging." msgstr "" -#: tracepoint.c:4818 +#: tracepoint.c:5227 msgid "Select the first trace frame in the trace buffer." msgstr "" -#: tracepoint.c:4822 +#: tracepoint.c:5231 msgid "Display the status of the current trace data collection." msgstr "" -#: tracepoint.c:4825 -msgid "Stop trace data collection." +#: tracepoint.c:5233 +msgid "" +"Stop trace data collection.\n" +"Usage: tstop [ ... ]\n" +"Any arguments supplied are recorded with the trace as a stop reason and\n" +"reported by tstatus (if the target supports trace notes)." msgstr "" -#: tracepoint.c:4828 -msgid "Start trace data collection." +#: tracepoint.c:5239 +msgid "" +"Start trace data collection.\n" +"Usage: tstart [ ... ]\n" +"Any arguments supplied are recorded with the trace as a note and\n" +"reported by tstatus (if the target supports trace notes)." msgstr "" -#: tracepoint.c:4830 +#: tracepoint.c:5245 msgid "" "Ends a list of commands or actions.\n" "Several GDB commands allow you to enter a list of commands or actions.\n" @@ -22743,7 +23713,7 @@ "Note: the \"end\" command cannot be used at the gdb prompt." msgstr "" -#: tracepoint.c:4837 +#: tracepoint.c:5252 msgid "" "Specify single-stepping behavior at a tracepoint.\n" "Argument is number of instructions to trace in single-step mode\n" @@ -22754,7 +23724,7 @@ "Note: this command can only be used in a tracepoint \"actions\" list." msgstr "" -#: tracepoint.c:4848 +#: tracepoint.c:5263 msgid "" "Specify one or more data items to be collected at a tracepoint.\n" "Accepts a comma-separated list of (one or more) expressions. GDB will\n" @@ -22767,7 +23737,7 @@ "Note: this command can only be used in a tracepoint \"actions\" list." msgstr "" -#: tracepoint.c:4859 +#: tracepoint.c:5274 msgid "" "Specify one or more expressions to be evaluated at a tracepoint.\n" "Accepts a comma-separated list of (one or more) expressions.\n" @@ -22775,7 +23745,7 @@ "Note: this command can only be used in a tracepoint \"actions\" list." msgstr "" -#: tracepoint.c:4865 +#: tracepoint.c:5280 msgid "" "Specify the actions to be taken at a tracepoint.\n" "Tracepoint actions may include collecting of specified data,\n" @@ -22783,49 +23753,109 @@ "depending on target's capabilities." msgstr "" -#: tracepoint.c:4873 +#: tracepoint.c:5288 msgid "Set the list of expressions to collect by default" msgstr "" -#: tracepoint.c:4874 +#: tracepoint.c:5289 msgid "Show the list of expressions to collect by default" msgstr "" -#: tracepoint.c:4880 +#: tracepoint.c:5295 msgid "Set whether tracing continues after GDB disconnects." msgstr "" -#: tracepoint.c:4881 +#: tracepoint.c:5296 msgid "Show whether tracing continues after GDB disconnects." msgstr "" -#: tracepoint.c:4882 +#: tracepoint.c:5297 msgid "" "Use this to continue a tracing run even if GDB disconnects\n" "or detaches from the target. You can reconnect later and look at\n" "trace data collected in the meantime." msgstr "" -#: tracepoint.c:4892 +#: tracepoint.c:5307 msgid "Set target's use of circular trace buffer." msgstr "" -#: tracepoint.c:4893 +#: tracepoint.c:5308 msgid "Show target's use of circular trace buffer." msgstr "" -#: tracepoint.c:4894 +#: tracepoint.c:5309 msgid "" "Use this to make the trace buffer into a circular buffer,\n" "which will discard traceframes (oldest first) instead of filling\n" "up and stopping the trace run." msgstr "" -#: tui/tui.c:369 -msgid "TUI mode not allowed" +#: tracepoint.c:5319 +msgid "Set the user name to use for current and future trace runs" +msgstr "" + +#: tracepoint.c:5320 +msgid "Show the user name to use for current and future trace runs" +msgstr "" + +#: tracepoint.c:5326 +msgid "Set notes string to use for current and future trace runs" +msgstr "" + +#: tracepoint.c:5327 +msgid "Show the notes string to use for current and future trace runs" +msgstr "" + +#: tracepoint.c:5333 +msgid "Set notes string to use for future tstop commands" +msgstr "" + +#: tracepoint.c:5334 +msgid "Show the notes string to use for future tstop commands" +msgstr "" + +#: tui/tui-file.c:80 +msgid "tui_file_delete: bad magic number" msgstr "" -#: tui/tui-layout.c:389 +#: tui/tui-file.c:130 +msgid "tui_file_isatty: bad magic number" +msgstr "" + +#: tui/tui-file.c:144 +msgid "tui_file_rewind: bad magic number" +msgstr "" + +#: tui/tui-file.c:157 +msgid "tui_file_put: bad magic number" +msgstr "" + +#: tui/tui-file.c:194 +msgid "tui_file_get_strbuf: bad magic number" +msgstr "" + +#: tui/tui-file.c:209 +msgid "tui_file_adjust_strbuf: bad magic number" +msgstr "" + +#: tui/tui-file.c:237 +msgid "tui_file_flush: bad magic number" +msgstr "" + +#: tui/tui-hooks.c:80 +msgid "(y or n) " +msgstr "" + +#: tui/tui-hooks.c:113 +msgid "Please answer y or n.\n" +msgstr "" + +#: tui/tui-interp.c:140 +msgid "tui_exec called" +msgstr "" + +#: tui/tui-layout.c:388 msgid "" "Change the layout of windows.\n" "Usage: layout prev | next | \n" @@ -22841,108 +23871,120 @@ " the window that has current logical focus.\n" msgstr "" -#: tui/tui-layout.c:404 +#: tui/tui-layout.c:403 msgid "Toggle between Source/Command and Disassembly/Command layouts.\n" msgstr "" -#: tui/tui-layout.c:406 +#: tui/tui-layout.c:405 msgid "" "Toggle between Source/Command or Disassembly/Command and \n" "Source/Disassembly/Command layouts.\n" msgstr "" -#: tui/tui-layout.c:441 +#: tui/tui-layout.c:440 msgid "Ambiguous command input." msgstr "" -#: tui/tui-layout.c:614 +#: tui/tui-layout.c:613 #, possible-c-format msgid "" "Invalid layout specified.\n" "%s" msgstr "" -#: tui/tui-stack.c:360 valprint.c:305 -msgid "" +#: tui/tui-regs.c:624 +msgid "\"tui reg\" must be followed by the name of a tui reg command.\n" msgstr "" -#: tui/tui-stack.c:452 -msgid "" -"Update the source window and locator to display the current execution " -"point.\n" +#: tui/tui-regs.c:640 +msgid "TUI commands to control the register window." msgstr "" -#: tui/tui-file.c:81 -msgid "tui_file_delete: bad magic number" +#: tui/tui-regs.c:645 +msgid "Display only floating point registers." msgstr "" -#: tui/tui-file.c:131 -msgid "tui_file_isatty: bad magic number" +#: tui/tui-regs.c:648 +msgid "Display only general registers." msgstr "" -#: tui/tui-file.c:145 -msgid "tui_file_rewind: bad magic number" +#: tui/tui-regs.c:651 +msgid "Display only system registers." msgstr "" -#: tui/tui-file.c:158 -msgid "tui_file_put: bad magic number" +#: tui/tui-regs.c:654 +msgid "Display next register group." msgstr "" -#: tui/tui-file.c:195 -msgid "tui_file_get_strbuf: bad magic number" +#: tui/tui-regs.c:660 +msgid "Display only floating point registers\n" msgstr "" -#: tui/tui-file.c:210 -msgid "tui_file_adjust_strbuf: bad magic number" +#: tui/tui-regs.c:662 +msgid "Display only general registers\n" msgstr "" -#: tui/tui-file.c:238 -msgid "tui_file_flush: bad magic number" +#: tui/tui-regs.c:664 +msgid "Display only special registers\n" msgstr "" -#: tui/tui-interp.c:132 -msgid "tui_exec called" +#: tui/tui-regs.c:666 +msgid "Scroll the registers window forward\n" +msgstr "" + +#: tui/tui-regs.c:668 +msgid "Scroll the register window backward\n" +msgstr "" + +#: tui/tui-stack.c:360 valprint.c:306 +msgid "" +msgstr "" + +#: tui/tui-stack.c:455 +msgid "" +"Update the source window and locator to display the current execution " +"point.\n" msgstr "" -#: tui/tui-win.c:212 +#: tui/tui-win.c:211 #, possible-c-format msgid "" "The attribute mode to use for the active TUI window border is \"%s\".\n" msgstr "" -#: tui/tui-win.c:224 +#: tui/tui-win.c:223 #, possible-c-format msgid "The attribute mode to use for the TUI window borders is \"%s\".\n" msgstr "" -#: tui/tui-win.c:236 +#: tui/tui-win.c:235 #, possible-c-format msgid "The kind of border for TUI windows is \"%s\".\n" msgstr "" -#: tui/tui-win.c:335 +#: tui/tui-win.c:334 msgid "\"tui\" must be followed by the name of a tui command.\n" msgstr "" -#: tui/tui-win.c:345 +#: tui/tui-win.c:344 msgid "Text User Interface commands." msgstr "" -#: tui/tui-win.c:365 tui/tui-win.c:369 +#: tui/tui-win.c:364 tui/tui-win.c:368 msgid "TUI configuration variables" msgstr "" -#: tui/tui-win.c:374 +#: tui/tui-win.c:373 msgid "Refresh the terminal display.\n" msgstr "" -#: tui/tui-win.c:377 +#: tui/tui-win.c:376 msgid "" "Set the width (in characters) of tab stops.\n" "Usage: tabset \n" msgstr "" -#: tui/tui-win.c:380 +#: tui/tui-win.c:379 msgid "" "Set the height of a specified window.\n" "Usage: winheight [+ | -] <#lines>\n" @@ -22953,11 +23995,11 @@ "regs : the register display\n" msgstr "" -#: tui/tui-win.c:390 +#: tui/tui-win.c:389 msgid "List of all displayed windows.\n" msgstr "" -#: tui/tui-win.c:391 +#: tui/tui-win.c:390 msgid "" "Set focus to named window or next/prev window.\n" "Usage: focus { | next | prev}\n" @@ -22968,45 +24010,45 @@ "cmd : the command window\n" msgstr "" -#: tui/tui-win.c:400 +#: tui/tui-win.c:399 msgid "" "Scroll window forward.\n" "Usage: + [win] [n]\n" msgstr "" -#: tui/tui-win.c:403 +#: tui/tui-win.c:402 msgid "" "Scroll window backward.\n" "Usage: - [win] [n]\n" msgstr "" -#: tui/tui-win.c:406 +#: tui/tui-win.c:405 msgid "" "Scroll window forward.\n" "Usage: < [win] [n]\n" msgstr "" -#: tui/tui-win.c:409 +#: tui/tui-win.c:408 msgid "" "Scroll window backward.\n" "Usage: > [win] [n]\n" msgstr "" -#: tui/tui-win.c:413 +#: tui/tui-win.c:412 msgid "" "XDB compatibility command for setting the height of a command window.\n" "Usage: w <#lines>\n" msgstr "" -#: tui/tui-win.c:419 +#: tui/tui-win.c:418 msgid "Set the kind of border for TUI windows." msgstr "" -#: tui/tui-win.c:420 +#: tui/tui-win.c:419 msgid "Show the kind of border for TUI windows." msgstr "" -#: tui/tui-win.c:421 +#: tui/tui-win.c:420 msgid "" "This variable controls the border of TUI windows:\n" "space use a white space\n" @@ -23014,15 +24056,15 @@ "acs use the Alternate Character Set" msgstr "" -#: tui/tui-win.c:431 +#: tui/tui-win.c:430 msgid "Set the attribute mode to use for the TUI window borders." msgstr "" -#: tui/tui-win.c:432 +#: tui/tui-win.c:431 msgid "Show the attribute mode to use for the TUI window borders." msgstr "" -#: tui/tui-win.c:433 +#: tui/tui-win.c:432 msgid "" "This variable controls the attributes to use for the window borders:\n" "normal normal display\n" @@ -23034,15 +24076,15 @@ "bold-standout use extra bright or bold with standout mode" msgstr "" -#: tui/tui-win.c:447 +#: tui/tui-win.c:446 msgid "Set the attribute mode to use for the active TUI window border." msgstr "" -#: tui/tui-win.c:448 +#: tui/tui-win.c:447 msgid "Show the attribute mode to use for the active TUI window border." msgstr "" -#: tui/tui-win.c:449 +#: tui/tui-win.c:448 msgid "" "This variable controls the attributes to use for the active window border:\n" "normal normal display\n" @@ -23054,165 +24096,120 @@ "bold-standout use extra bright or bold with standout mode" msgstr "" -#: tui/tui-win.c:930 tui/tui-win.c:1036 tui/tui-win.c:1598 +#: tui/tui-win.c:929 tui/tui-win.c:1035 tui/tui-win.c:1597 msgid "" "Invalid window specified. \n" "The window name specified must be valid and visible.\n" msgstr "" -#: tui/tui-win.c:941 +#: tui/tui-win.c:940 #, possible-c-format msgid "Focus set to %s window.\n" msgstr "" -#: tui/tui-win.c:946 +#: tui/tui-win.c:945 #, possible-c-format msgid "" "Incorrect Number of Arguments.\n" "%s" msgstr "" -#: tui/tui-win.c:1004 +#: tui/tui-win.c:1003 msgid "Tab widths greater than 0 must be specified." msgstr "" -#: tui/tui-win.c:1071 tui/tui-win.c:1077 tui/tui-win.c:1121 tui/tui-win.c:1125 -#: tui/tui-win.c:1129 +#: tui/tui-win.c:1070 tui/tui-win.c:1076 tui/tui-win.c:1120 tui/tui-win.c:1124 +#: tui/tui-win.c:1128 #, possible-c-format msgid "" "Invalid window height specified.\n" "%s" msgstr "" -#: tui/tui-regs.c:625 -msgid "\"tui reg\" must be followed by the name of a tui reg command.\n" -msgstr "" - -#: tui/tui-regs.c:641 -msgid "TUI commands to control the register window." -msgstr "" - -#: tui/tui-regs.c:646 -msgid "Display only floating point registers." -msgstr "" - -#: tui/tui-regs.c:649 -msgid "Display only general registers." -msgstr "" - -#: tui/tui-regs.c:652 -msgid "Display only system registers." -msgstr "" - -#: tui/tui-regs.c:655 -msgid "Display next register group." -msgstr "" - -#: tui/tui-regs.c:661 -msgid "Display only floating point registers\n" -msgstr "" - -#: tui/tui-regs.c:663 -msgid "Display only general registers\n" -msgstr "" - -#: tui/tui-regs.c:665 -msgid "Display only special registers\n" -msgstr "" - -#: tui/tui-regs.c:667 -msgid "Scroll the registers window forward\n" -msgstr "" - -#: tui/tui-regs.c:669 -msgid "Scroll the register window backward\n" -msgstr "" - -#: tui/tui-hooks.c:81 -msgid "(y or n) " -msgstr "" - -#: tui/tui-hooks.c:114 -msgid "Please answer y or n.\n" +#: tui/tui.c:368 +msgid "TUI mode not allowed" msgstr "" -#: typeprint.c:266 +#: typeprint.c:265 msgid "internal error: unhandled type in print_type_scalar" msgstr "" -#: typeprint.c:315 +#: typeprint.c:314 msgid "" "Print definition of type TYPE.\n" "Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n" "or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n" -"The selected stack frame's lexical context is used to look up the name." +"The selected stack frame's lexical context is used to look up the name.\n" +"Contrary to \"whatis\", \"ptype\" always unrolls any typedefs." msgstr "" #: typeprint.c:322 -msgid "Print data type of expression EXP." +msgid "" +"Print data type of expression EXP.\n" +"Only one level of typedefs is unrolled. See also \"ptype\"." msgstr "" -#: ui-file.c:168 +#: ui-file.c:178 msgid "ui_file_data: bad magic number" msgstr "" -#: ui-file.c:368 +#: ui-file.c:393 msgid "mem_file_delete: bad magic number" msgstr "" -#: ui-file.c:387 +#: ui-file.c:412 msgid "mem_file_rewind: bad magic number" msgstr "" -#: ui-file.c:400 +#: ui-file.c:425 msgid "mem_file_put: bad magic number" msgstr "" -#: ui-file.c:414 +#: ui-file.c:439 msgid "mem_file_write: bad magic number" msgstr "" -#: ui-file.c:481 +#: ui-file.c:512 msgid "stdio_file_delete: bad magic number" msgstr "" -#: ui-file.c:496 +#: ui-file.c:527 msgid "stdio_file_flush: bad magic number" msgstr "" -#: ui-file.c:507 +#: ui-file.c:538 msgid "stdio_file_read: bad magic number" msgstr "" -#: ui-file.c:532 +#: ui-file.c:561 msgid "stdio_file_write: bad magic number" msgstr "" -#: ui-file.c:545 +#: ui-file.c:596 msgid "stdio_file_fputs: bad magic number" msgstr "" -#: ui-file.c:558 +#: ui-file.c:609 msgid "stdio_file_isatty: bad magic number" msgstr "" -#: ui-file.c:624 +#: ui-file.c:675 msgid "tee_file_delete: bad magic number" msgstr "" -#: ui-file.c:640 +#: ui-file.c:691 msgid "tee_file_flush: bad magic number" msgstr "" -#: ui-file.c:652 +#: ui-file.c:703 msgid "tee_file_write: bad magic number" msgstr "" -#: ui-file.c:664 +#: ui-file.c:715 msgid "tee_file_fputs: bad magic number" msgstr "" -#: ui-file.c:676 +#: ui-file.c:727 msgid "tee_file_isatty: bad magic number" msgstr "" @@ -23251,65 +24248,55 @@ "table_body." msgstr "" -#: ui-out.c:1088 +#: ui-out.c:1090 msgid "" "table_body missing; table fields must be specified after table_body and " "inside a list." msgstr "" -#: ui-out.c:1105 +#: ui-out.c:1107 msgid "ui-out internal error in handling headers." msgstr "" -#: utils.c:147 -#, possible-c-format -msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n" -msgstr "" - -#: utils.c:162 -#, possible-c-format -msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n" -msgstr "" - -#: utils.c:176 +#: utils.c:148 #, possible-c-format msgid "Printing of 8-bit characters in strings as \\nnn is %s.\n" msgstr "" -#: utils.c:198 +#: utils.c:170 #, possible-c-format msgid "State of pagination is %s.\n" msgstr "" -#: utils.c:325 +#: utils.c:309 msgid "Cannot restore redirection of the current output protocol" msgstr "" -#: utils.c:575 +#: utils.c:628 msgid "free_current_contents: NULL pointer" msgstr "" -#: utils.c:646 +#: utils.c:705 #, possible-c-format -msgid "Startup time: %ld.%06ld\n" +msgid "Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n" msgstr "" -#: utils.c:647 +#: utils.c:706 #, possible-c-format -msgid "Command execution time: %ld.%06ld\n" +msgid "Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n" msgstr "" -#: utils.c:660 +#: utils.c:721 #, possible-c-format msgid "Space used: %ld (%s%ld during startup)\n" msgstr "" -#: utils.c:661 +#: utils.c:722 #, possible-c-format msgid "Space used: %ld (%s%ld for this command)\n" msgstr "" -#: utils.c:1072 +#: utils.c:872 #, possible-c-format msgid "" "%s\n" @@ -23317,7 +24304,7 @@ "time.\n" msgstr "" -#: utils.c:1180 +#: utils.c:980 #, possible-c-format msgid "" "%s\n" @@ -23327,74 +24314,70 @@ #. Default (yes/batch case) is to dump core. This leaves a GDB #. `dropping' so that it is easier to see that something went #. wrong in GDB. -#: utils.c:1198 +#: utils.c:998 #, possible-c-format msgid "" "%s\n" "Create a core file of GDB? " msgstr "" -#: utils.c:1310 +#: utils.c:1110 #, possible-c-format msgid "Configure what GDB does when %s is detected." msgstr "" -#: utils.c:1313 +#: utils.c:1113 #, possible-c-format msgid "Show what GDB does when %s is detected." msgstr "" #. allow-unknown -#: utils.c:1330 +#: utils.c:1130 #, possible-c-format msgid "Set whether GDB should quit when an %s is detected" msgstr "" -#: utils.c:1333 +#: utils.c:1133 #, possible-c-format msgid "Show whether GDB will quit when an %s is detected" msgstr "" -#: utils.c:1350 +#: utils.c:1150 #, possible-c-format msgid "Set whether GDB should create a core file of GDB when %s is detected" msgstr "" -#: utils.c:1353 +#: utils.c:1153 #, possible-c-format msgid "Show whether GDB will create a core file of GDB when %s is detected" msgstr "" -#: utils.c:1447 +#: utils.c:1247 #, possible-c-format msgid "virtual memory exhausted: can't allocate %ld bytes." msgstr "" -#: utils.c:1452 +#: utils.c:1252 msgid "virtual memory exhausted." msgstr "" -#: utils.c:1578 -msgid "vasprintf call failed" -msgstr "" - -#: utils.c:1738 +#: utils.c:1398 #, possible-c-format msgid "(%s or %s) [answered %c; input not from terminal]\n" msgstr "" -#: utils.c:1763 +#: utils.c:1423 #, possible-c-format msgid "(%s or %s) " msgstr "" #. Invalid entries are not defaulted and require another selection. -#: utils.c:1827 +#: utils.c:1487 #, possible-c-format msgid "Please answer %s or %s.\n" msgstr "" -#: utils.c:2004 +#: utils.c:1664 #, possible-c-format msgid "" "The escape sequence `\\%c' is equivalent to plain `%c', which has no " @@ -23402,410 +24385,393 @@ "in the `%s' character set." msgstr "" -#: utils.c:2109 +#: utils.c:1769 #, possible-c-format msgid "Number of lines gdb thinks are in a page is %s.\n" msgstr "" -#: utils.c:2120 +#: utils.c:1780 #, possible-c-format msgid "Number of characters gdb thinks are in a line is %s.\n" msgstr "" -#: utils.c:3116 +#: utils.c:2813 #, possible-c-format msgid "Timestamping debugging messages is %s.\n" msgstr "" -#: utils.c:3124 +#: utils.c:2821 msgid "Set number of characters gdb thinks are in a line." msgstr "" -#: utils.c:3125 +#: utils.c:2822 msgid "Show number of characters gdb thinks are in a line." msgstr "" -#: utils.c:3131 +#: utils.c:2828 msgid "Set number of lines gdb thinks are in a page." msgstr "" -#: utils.c:3132 +#: utils.c:2829 msgid "Show number of lines gdb thinks are in a page." msgstr "" -#: utils.c:3140 -msgid "Set demangling of encoded C++/ObjC names when displaying symbols." -msgstr "" - -#: utils.c:3141 -msgid "Show demangling of encoded C++/ObjC names when displaying symbols." -msgstr "" - -#: utils.c:3148 +#: utils.c:2838 msgid "Set state of pagination." msgstr "" -#: utils.c:3149 +#: utils.c:2839 msgid "Show state of pagination." msgstr "" -#: utils.c:3158 +#: utils.c:2848 msgid "Enable pagination" msgstr "" -#: utils.c:3160 +#: utils.c:2850 msgid "Disable pagination" msgstr "" -#: utils.c:3164 +#: utils.c:2854 msgid "Set printing of 8-bit characters in strings as \\nnn." msgstr "" -#: utils.c:3165 +#: utils.c:2855 msgid "Show printing of 8-bit characters in strings as \\nnn." msgstr "" -#: utils.c:3171 -msgid "Set demangling of C++/ObjC names in disassembly listings." -msgstr "" - -#: utils.c:3172 -msgid "Show demangling of C++/ObjC names in disassembly listings." -msgstr "" - -#: utils.c:3179 +#: utils.c:2862 msgid "Set timestamping of debugging messages." msgstr "" -#: utils.c:3180 +#: utils.c:2863 msgid "Show timestamping of debugging messages." msgstr "" -#: utils.c:3181 +#: utils.c:2864 msgid "" "When set, debugging messages will be marked with seconds and microseconds." msgstr "" -#: utils.c:3441 +#: utils.c:3145 msgid "hex_string_custom: insufficient space to store result" msgstr "" -#: utils.c:3536 +#: utils.c:3240 #, possible-c-format msgid "invalid hex \"%s\"" msgstr "" -#: utils.c:3549 +#: utils.c:3253 #, possible-c-format msgid "invalid decimal \"%s\"" msgstr "" -#: utils.c:3998 +#: utils.c:3713 msgid "process-id to attach" msgstr "" -#: utils.c:4004 +#: utils.c:3719 #, possible-c-format msgid "Illegal process-id: %s." msgstr "" -#: valarith.c:74 +#: valarith.c:73 msgid "" "Cannot perform pointer math on incomplete types, try casting to a known " "type, or void *." msgstr "" -#: valarith.c:77 +#: valarith.c:76 #, possible-c-format msgid "" "Cannot perform pointer math on incomplete type \"%s\", try casting to a " "known type, or void *." msgstr "" -#: valarith.c:124 +#: valarith.c:123 msgid "" "First argument of `-' is a pointer and second argument is neither\n" "an integer nor a pointer of the same type." msgstr "" -#: valarith.c:131 +#: valarith.c:130 msgid "" "Type size unknown, assuming 1. Try casting to a known type, or void *." msgstr "" -#: valarith.c:176 +#: valarith.c:175 msgid "array or string index out of range" msgstr "" -#: valarith.c:188 +#: valarith.c:187 msgid "not an array or string" msgstr "" -#: valarith.c:206 +#: valarith.c:205 msgid "no such vector element" msgstr "" -#: valarith.c:243 +#: valarith.c:242 msgid "bitstring index out of range" msgstr "" -#: valarith.c:363 +#: valarith.c:355 #, possible-c-format msgid "Could not find %s." msgstr "" -#: valarith.c:409 +#: valarith.c:401 msgid "Can't do that binary op on that type" msgstr "" -#: valarith.c:495 valarith.c:521 +#: valarith.c:487 valarith.c:513 msgid "Invalid binary operation specified." msgstr "" -#: valarith.c:546 valarith.c:650 +#: valarith.c:538 valarith.c:642 #, possible-c-format msgid "member function %s not found" msgstr "" -#: valarith.c:573 +#: valarith.c:565 msgid "Can't do that unary op on that type" msgstr "" -#: valarith.c:625 +#: valarith.c:617 msgid "Invalid unary operation specified." msgstr "" -#: valarith.c:749 +#: valarith.c:741 msgid "unimplemented support for bitstring/boolean repeats" msgstr "" -#: valarith.c:753 +#: valarith.c:745 msgid "can't repeat values of that type" msgstr "" -#: valarith.c:763 +#: valarith.c:755 msgid "Strings can only be concatenated with other strings." msgstr "" -#: valarith.c:798 +#: valarith.c:790 msgid "" "Bitstrings or booleans can only be concatenated with other bitstrings or " "booleans." msgstr "" -#: valarith.c:801 +#: valarith.c:793 msgid "unimplemented support for bitstring/boolean concatenation." msgstr "" #. We don't know how to concatenate these operands. -#: valarith.c:806 +#: valarith.c:798 msgid "illegal operands for concatenation." msgstr "" -#: valarith.c:820 valarith.c:851 +#: valarith.c:812 valarith.c:843 msgid "Attempt to raise 0 to negative power." msgstr "" #. The DFP extension to the C language does not allow mixing of #. * decimal float types with other float types in expressions #. * (see WDTR 24732, page 12). -#: valarith.c:894 +#: valarith.c:886 msgid "" "Mixing decimal floating types with other floating types is not allowed." msgstr "" -#: valarith.c:913 valarith.c:932 +#: valarith.c:905 valarith.c:924 #, possible-c-format msgid "Don't know how to convert from %s to %s." msgstr "" -#: valarith.c:1000 +#: valarith.c:992 msgid "Operation not valid for decimal floating point number." msgstr "" -#: valarith.c:1038 +#: valarith.c:1030 #, possible-c-format msgid "Cannot perform exponentiation: %s" msgstr "" -#: valarith.c:1051 +#: valarith.c:1043 msgid "Integer-only operation on floating point number." msgstr "" -#: valarith.c:1099 +#: valarith.c:1091 msgid "Invalid operation on booleans." msgstr "" -#: valarith.c:1249 valarith.c:1379 +#: valarith.c:1151 valarith.c:1162 valarith.c:1277 valarith.c:1288 +msgid "Division by zero" +msgstr "" + +#: valarith.c:1241 valarith.c:1371 msgid "Invalid binary operation on numbers." msgstr "" -#: valarith.c:1414 +#: valarith.c:1406 msgid "Vector operations are only supported among vectors" msgstr "" -#: valarith.c:1616 +#: valarith.c:1608 msgid "Invalid type combination in equality test." msgstr "" -#: valarith.c:1698 +#: valarith.c:1690 msgid "Invalid type combination in ordering comparison." msgstr "" -#: valarith.c:1731 +#: valarith.c:1723 msgid "Argument to positive operation not a number." msgstr "" -#: valarith.c:1786 +#: valarith.c:1778 msgid "Argument to negate operation not a number." msgstr "" -#: valarith.c:1821 +#: valarith.c:1813 msgid "Argument to complement operation not an integer, boolean." msgstr "" -#: valarith.c:1862 +#: valarith.c:1854 msgid "Second argument of 'IN' has wrong type" msgstr "" -#: valarith.c:1867 +#: valarith.c:1859 msgid "First argument of 'IN' has wrong type" msgstr "" -#: valarith.c:1871 +#: valarith.c:1863 msgid "First argument of 'IN' not in range" msgstr "" -#: valops.c:125 +#: valops.c:123 #, possible-c-format msgid "Overload resolution in evaluating C++ functions is %s.\n" msgstr "" -#: valops.c:144 +#: valops.c:142 #, possible-c-format msgid "\"%s\" exists in this program but is not a function." msgstr "" -#: valops.c:178 +#: valops.c:176 msgid "" "evaluation of this expression requires the target program to be active" msgstr "" -#: valops.c:181 +#: valops.c:179 #, possible-c-format msgid "" "evaluation of this expression requires the program to have a function \"%s\"." msgstr "" -#: valops.c:205 +#: valops.c:203 msgid "" "No memory available to program now: you need to start the target first" msgstr "" -#: valops.c:208 +#: valops.c:206 msgid "No memory available to program: call to malloc failed" msgstr "" -#: valops.c:413 +#: valops.c:411 msgid "array element type size does not divide object size in cast" msgstr "" -#: valops.c:528 +#: valops.c:526 msgid "value truncated" msgstr "" -#: valops.c:589 +#: valops.c:587 msgid "Invalid cast." msgstr "" -#: valops.c:640 +#: valops.c:638 msgid "Invalid reinterpret_cast" msgstr "" -#: valops.c:754 +#: valops.c:752 msgid "Argument to dynamic_cast must be a pointer or reference type" msgstr "" -#: valops.c:757 +#: valops.c:755 msgid "Argument to dynamic_cast must be pointer to class or `void *'" msgstr "" -#: valops.c:765 +#: valops.c:763 msgid "Argument to dynamic_cast does not have pointer type" msgstr "" -#: valops.c:770 +#: valops.c:768 msgid "Argument to dynamic_cast does not have pointer to class type" msgstr "" -#: valops.c:783 +#: valops.c:781 msgid "Argument to dynamic_cast does not have class type" msgstr "" -#: valops.c:796 +#: valops.c:794 msgid "Ambiguous dynamic_cast" msgstr "" -#: valops.c:801 +#: valops.c:799 msgid "Couldn't determine value's most derived type for dynamic_cast" msgstr "" -#: valops.c:853 +#: valops.c:851 msgid "dynamic_cast failed" msgstr "" -#: valops.c:911 +#: valops.c:909 msgid "Not a numeric type." msgstr "" -#: valops.c:998 valops.c:1351 value.c:813 +#: valops.c:998 valops.c:1352 value.c:826 msgid "value has been optimized out" msgstr "" -#: valops.c:1116 +#: valops.c:1117 msgid "Unexpected lazy value type." msgstr "" -#: valops.c:1281 valops.c:1342 +#: valops.c:1282 valops.c:1343 #, possible-c-format msgid "Can't handle bitfields which don't fit in a %d bit word." msgstr "" -#: valops.c:1314 +#: valops.c:1315 msgid "Value being assigned to is no longer active." msgstr "" -#: valops.c:1354 value.c:820 +#: valops.c:1355 value.c:833 msgid "value is not available" msgstr "" -#: valops.c:1387 +#: valops.c:1392 msgid "Left operand of assignment is not an lvalue." msgstr "" -#: valops.c:1470 +#: valops.c:1475 msgid "Only values in memory can be extended with '@'." msgstr "" -#: valops.c:1472 +#: valops.c:1477 #, possible-c-format msgid "Invalid number %d of repetitions." msgstr "" -#: valops.c:1503 +#: valops.c:1507 #, possible-c-format msgid "No frame is currently executing in block %s." msgstr "" -#: valops.c:1506 +#: valops.c:1510 msgid "No frame is currently executing in specified block" msgstr "" -#: valops.c:1512 -#, possible-c-format -msgid "Address of symbol \"%s\" is unknown." -msgstr "" - #: valops.c:1551 #, possible-c-format msgid "Address requested for identifier \"%s\" which is in register $%s" @@ -23875,7 +24841,7 @@ "Attempt to extract a component of a value that is not a struct or union" msgstr "" -#: valops.c:2599 +#: valops.c:2601 #, possible-c-format msgid "Couldn't find method %s%s%s" msgstr "" @@ -23884,97 +24850,91 @@ #. FIXME: GDB does not support the general ambiguous case. #. All candidates should be collected and presented the #. user. -#: valops.c:2707 +#: valops.c:2711 msgid "Ambiguous overload resolution" msgstr "" #. Incomparable top contenders. #. This is an error incompatible candidates #. should not have been proposed. -#: valops.c:2712 +#: valops.c:2716 msgid "Internal error: incompatible overload candidates proposed" msgstr "" -#: valops.c:2724 +#: valops.c:2728 msgid "Internal error: unexpected overload comparison result" msgstr "" -#: valops.c:2740 +#: valops.c:2744 #, possible-c-format msgid "Cannot resolve method %s%s%s to any overloaded instance" msgstr "" -#: valops.c:2745 +#: valops.c:2749 #, possible-c-format msgid "Cannot resolve function %s to any overloaded instance" msgstr "" -#: valops.c:2751 +#: valops.c:2755 #, possible-c-format msgid "" "Using non-standard conversion to match method %s%s%s to supplied arguments" msgstr "" -#: valops.c:2757 +#: valops.c:2761 #, possible-c-format msgid "" "Using non-standard conversion to match function %s to supplied arguments" msgstr "" -#: valops.c:3117 +#: valops.c:3136 msgid "name of destructor must equal name of class" msgstr "" -#: valops.c:3183 +#: valops.c:3202 msgid "non-aggregate type in value_aggregate_elt" msgstr "" -#: valops.c:3259 +#: valops.c:3278 msgid "Internal error: non-aggregate type to value_struct_elt_for_reference" msgstr "" -#: valops.c:3272 +#: valops.c:3291 #, possible-c-format msgid "static field %s has been optimized out" msgstr "" -#: valops.c:3334 +#: valops.c:3353 msgid "no member function matches that type instantiation" msgstr "" -#: valops.c:3360 +#: valops.c:3379 #, possible-c-format msgid "non-unique member `%s' requires type instantiation" msgstr "" -#: valops.c:3367 +#: valops.c:3386 msgid "no matching member function" msgstr "" -#: valops.c:3398 +#: valops.c:3417 #, possible-c-format msgid "Cannot reference virtual member function \"%s\"" msgstr "" -#: valops.c:3576 +#: valops.c:3602 #, possible-c-format msgid "" "Couldn't retrieve complete object of RTTI type %s; object may be in " "register(s)." msgstr "" -#: valops.c:3610 -msgid "no frame selected" -msgstr "" - -#: valops.c:3622 -#, possible-c-format -msgid "no `%s' in nameless context" +#: valops.c:3634 +msgid "no `this' in current language" msgstr "" -#: valops.c:3631 -#, possible-c-format -msgid "no args, no `%s'" +#: valops.c:3636 +msgid "no frame selected" msgstr "" #: valops.c:3642 @@ -23982,240 +24942,235 @@ msgid "current stack frame does not contain a variable named `%s'" msgstr "" -#: valops.c:3650 -#, possible-c-format -msgid "`%s' argument unreadable" -msgstr "" - -#: valops.c:3686 +#: valops.c:3685 msgid "slice from bad array or bitstring" msgstr "" -#: valops.c:3690 +#: valops.c:3689 msgid "slice out of range" msgstr "" -#: valops.c:3714 +#: valops.c:3713 msgid "internal error accessing bitstring" msgstr "" -#: valops.c:3808 +#: valops.c:3807 msgid "cannot cast non-number to complex" msgstr "" -#: valops.c:3815 +#: valops.c:3814 msgid "Set overload resolution in evaluating C++ functions." msgstr "" -#: valops.c:3816 +#: valops.c:3815 msgid "Show overload resolution in evaluating C++ functions." msgstr "" -#: valprint.c:121 +#: valprint.c:122 #, possible-c-format msgid "Limit on string chars or array elements to print is %s.\n" msgstr "" -#: valprint.c:135 +#: valprint.c:136 #, possible-c-format msgid "Default input radix for entering numbers is %s.\n" msgstr "" -#: valprint.c:145 +#: valprint.c:146 #, possible-c-format msgid "Default output radix for printing of values is %s.\n" msgstr "" -#: valprint.c:156 +#: valprint.c:157 #, possible-c-format msgid "Printing of array indexes is %s.\n" msgstr "" -#: valprint.c:167 +#: valprint.c:168 #, possible-c-format msgid "Threshold for repeated print elements is %s.\n" msgstr "" -#: valprint.c:178 +#: valprint.c:179 #, possible-c-format msgid "Printing of char arrays to stop at first null char is %s.\n" msgstr "" -#: valprint.c:189 +#: valprint.c:190 #, possible-c-format msgid "Prettyprinting of structures is %s.\n" msgstr "" -#: valprint.c:198 +#: valprint.c:199 #, possible-c-format msgid "Prettyprinting of arrays is %s.\n" msgstr "" -#: valprint.c:209 +#: valprint.c:210 #, possible-c-format msgid "Printing of unions interior to structures is %s.\n" msgstr "" -#: valprint.c:219 +#: valprint.c:220 #, possible-c-format msgid "Printing of addresses is %s.\n" msgstr "" -#: valprint.c:299 +#: valprint.c:300 msgid "" msgstr "" -#: valprint.c:311 +#: valprint.c:312 msgid "" msgstr "" -#: valprint.c:407 +#: valprint.c:409 msgid "
" msgstr "" -#: valprint.c:419 +#: valprint.c:424 #, possible-c-format msgid "" msgstr "" -#: valprint.c:656 +#: valprint.c:661 msgid "Value out of range." msgstr "" -#: valprint.c:899 valprint.c:949 +#: valprint.c:904 valprint.c:954 msgid "Internal error in octal conversion;" msgstr "" -#: valprint.c:1223 +#: valprint.c:1228 msgid "unable to get bounds of array, assuming null array" msgstr "" -#: valprint.c:1605 +#: valprint.c:2054 #, possible-c-format msgid "Nonsense input radix ``decimal %u''; input radix unchanged." msgstr "" -#: valprint.c:1611 +#: valprint.c:2060 #, possible-c-format msgid "Input radix now set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1647 +#: valprint.c:2096 #, possible-c-format msgid "Unsupported output radix ``decimal %u''; output radix unchanged." msgstr "" -#: valprint.c:1654 +#: valprint.c:2103 #, possible-c-format msgid "Output radix now set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1678 +#: valprint.c:2127 #, possible-c-format msgid "Input and output radices now set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1693 +#: valprint.c:2142 #, possible-c-format msgid "Input and output radices set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1699 +#: valprint.c:2148 #, possible-c-format msgid "Input radix set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1702 +#: valprint.c:2151 #, possible-c-format msgid "Output radix set to decimal %u, hex %x, octal %o.\n" msgstr "" -#: valprint.c:1728 +#: valprint.c:2177 msgid "Generic command for setting how things print." msgstr "" -#: valprint.c:1735 +#: valprint.c:2184 msgid "Generic command for showing print settings." msgstr "" -#: valprint.c:1741 +#: valprint.c:2190 msgid "Set limit on string chars or array elements to print." msgstr "" -#: valprint.c:1742 +#: valprint.c:2191 msgid "Show limit on string chars or array elements to print." msgstr "" -#: valprint.c:1743 +#: valprint.c:2192 msgid "\"set print elements 0\" causes there to be no limit." msgstr "" -#: valprint.c:1750 +#: valprint.c:2199 msgid "Set printing of char arrays to stop at first null char." msgstr "" -#: valprint.c:1751 +#: valprint.c:2200 msgid "Show printing of char arrays to stop at first null char." msgstr "" -#: valprint.c:1758 +#: valprint.c:2207 msgid "Set threshold for repeated print elements." msgstr "" -#: valprint.c:1759 +#: valprint.c:2208 msgid "Show threshold for repeated print elements." msgstr "" -#: valprint.c:1760 +#: valprint.c:2209 msgid "" "\"set print repeats 0\" causes all elements to be individually printed." msgstr "" -#: valprint.c:1767 +#: valprint.c:2216 msgid "Set prettyprinting of structures." msgstr "" -#: valprint.c:1768 +#: valprint.c:2217 msgid "Show prettyprinting of structures." msgstr "" -#: valprint.c:1775 +#: valprint.c:2224 msgid "Set printing of unions interior to structures." msgstr "" -#: valprint.c:1776 +#: valprint.c:2225 msgid "Show printing of unions interior to structures." msgstr "" -#: valprint.c:1783 +#: valprint.c:2232 msgid "Set prettyprinting of arrays." msgstr "" -#: valprint.c:1784 +#: valprint.c:2233 msgid "Show prettyprinting of arrays." msgstr "" -#: valprint.c:1791 +#: valprint.c:2240 msgid "Set printing of addresses." msgstr "" -#: valprint.c:1792 +#: valprint.c:2241 msgid "Show printing of addresses." msgstr "" -#: valprint.c:1799 +#: valprint.c:2248 msgid "Set default input radix for entering numbers." msgstr "" -#: valprint.c:1800 +#: valprint.c:2249 msgid "Show default input radix for entering numbers." msgstr "" -#: valprint.c:1807 +#: valprint.c:2256 msgid "Set default output radix for printing of values." msgstr "" -#: valprint.c:1808 +#: valprint.c:2257 msgid "Show default output radix for printing of values." msgstr "" @@ -24226,104 +25181,104 @@ #. add_show_from_set() commands aren't really appropriate. #. FIXME: i18n: With the new add_setshow_integer command, that is no #. longer true - show can display anything. -#: valprint.c:1821 +#: valprint.c:2270 msgid "" "Set default input and output number radices.\n" "Use 'set input-radix' or 'set output-radix' to independently set each.\n" "Without an argument, sets both radices back to the default value of 10." msgstr "" -#: valprint.c:1826 +#: valprint.c:2275 msgid "" "Show the default input and output number radices.\n" "Use 'show input-radix' or 'show output-radix' to independently show each." msgstr "" -#: valprint.c:1832 +#: valprint.c:2281 msgid "Set printing of array indexes." msgstr "" -#: valprint.c:1833 +#: valprint.c:2282 msgid "Show printing of array indexes" msgstr "" -#: value.c:1420 +#: value.c:1439 msgid "The history is empty." msgstr "" -#: value.c:1422 +#: value.c:1441 msgid "There is only one value in the history." msgstr "" -#: value.c:1424 +#: value.c:1443 #, possible-c-format msgid "History does not go back to $$%d." msgstr "" -#: value.c:1427 +#: value.c:1446 #, possible-c-format msgid "History has not yet reached $%d." msgstr "" -#: value.c:1576 +#: value.c:1595 msgid "Init-if-undefined requires an assignment expression." msgstr "" -#: value.c:1581 +#: value.c:1600 msgid "The first parameter to init-if-undefined should be a GDB variable." msgstr "" -#: value.c:1720 +#: value.c:1739 msgid "bad kind" msgstr "" #. We can never get a component of any other kind. -#: value.c:1809 +#: value.c:1828 msgid "set_internalvar_component" msgstr "" -#: value.c:1820 +#: value.c:1839 #, possible-c-format msgid "Cannot overwrite convenience function %s" msgstr "" -#: value.c:2093 +#: value.c:2122 msgid "" "No debugger convenience variables now defined.\n" "Convenience variables have names starting with \"$\";\n" "use \"set\" as in \"set $foo = 5\" to define them.\n" msgstr "" -#: value.c:2287 +#: value.c:2316 msgid "Value can't be converted to integer." msgstr "" #. FIXME: would like to include fieldval in the message, but #. we don't have a sprintf_longest. -#: value.c:2814 +#: value.c:2846 #, possible-c-format msgid "Value does not fit in %d bits." msgstr "" -#: value.c:2865 +#: value.c:2897 #, possible-c-format msgid "Unexpected type (%d) encountered for integer constant." msgstr "" -#: value.c:2901 +#: value.c:2933 #, possible-c-format msgid "Unexpected type (%d) encountered for unsigned integer constant." msgstr "" -#: value.c:2980 +#: value.c:3025 msgid "Unexpected type encountered for floating constant." msgstr "" -#: value.c:3092 +#: value.c:3161 msgid "Function return type unknown." msgstr "" -#: value.c:3124 +#: value.c:3193 msgid "" "Debugger convenience (\"$foo\") variables.\n" "These variables are created when you assign them values;\n" @@ -24334,11 +25289,11 @@ "\"$__\" holds the contents of the last address examined with \"x\"." msgstr "" -#: value.c:3134 +#: value.c:3203 msgid "Elements of value history around item number IDX (or last ten)." msgstr "" -#: value.c:3138 +#: value.c:3207 msgid "" "Initialize a convenience variable if necessary.\n" "init-if-undefined VARIABLE = EXPRESSION\n" @@ -24347,103 +25302,103 @@ "VARIABLE is already initialized." msgstr "" -#: value.c:3145 +#: value.c:3214 msgid "Placeholder command for showing help on convenience functions." msgstr "" -#: varobj.c:53 +#: varobj.c:52 #, possible-c-format msgid "Varobj debugging is %s.\n" msgstr "" -#: varobj.c:612 +#: varobj.c:642 msgid "Failed to find the specified frame" msgstr "" -#: varobj.c:764 +#: varobj.c:794 #, possible-c-format msgid "varobj_delete: assertion failed - mycount(=%d) <> 0" msgstr "" -#: varobj.c:1000 +#: varobj.c:1030 msgid "Null value returned for children" msgstr "" -#: varobj.c:1006 +#: varobj.c:1036 msgid "Returned value is not iterable" msgstr "" -#: varobj.c:1013 +#: varobj.c:1043 msgid "Could not get children iterator" msgstr "" -#: varobj.c:1098 +#: varobj.c:1128 msgid "Invalid item from the child list" msgstr "" -#: varobj.c:1414 +#: varobj.c:1444 msgid "Cannot instantiate printer for default visualizer" msgstr "" -#: varobj.c:1714 +#: varobj.c:1744 #, possible-c-format msgid "Could not evaluate visualizer expression: %s" msgstr "" -#: varobj.c:1726 +#: varobj.c:1756 msgid "Python support required" msgstr "" -#: varobj.c:2037 +#: varobj.c:2067 msgid "Duplicate variable object name" msgstr "" -#: varobj.c:2120 +#: varobj.c:2150 #, possible-c-format msgid "Assertion failed: Could not find varobj \"%s\" in root list" msgstr "" -#: varobj.c:3622 +#: varobj.c:3725 msgid "Set varobj debugging." msgstr "" -#: varobj.c:3623 +#: varobj.c:3726 msgid "Show varobj debugging." msgstr "" -#: varobj.c:3624 +#: varobj.c:3727 msgid "When non-zero, varobj debugging is enabled." msgstr "" -#: vax-nat.c:81 +#: vax-nat.c:80 msgid "Unable to determine location of registers" msgstr "" -#: windows-nat.c:315 +#: windows-nat.c:299 #, possible-c-format msgid "SuspendThread failed. (winerr %d)" msgstr "" -#: windows-nat.c:562 +#: windows-nat.c:546 msgid "Can't get module info" msgstr "" -#: windows-nat.c:572 +#: windows-nat.c:556 #, possible-c-format msgid "Error getting dll name: %lu." msgstr "" -#: windows-nat.c:575 +#: windows-nat.c:559 #, possible-c-format msgid "Error converting dll name to POSIX: %d." msgstr "" -#: windows-nat.c:580 +#: windows-nat.c:564 #, possible-c-format msgid "Error getting dll name: %u." msgstr "" -#: windows-nat.c:739 +#: windows-nat.c:723 msgid "dll path too long" msgstr "" @@ -24454,147 +25409,147 @@ #. 4 mysterious UNLOAD_DLL_DEBUG_EVENTs during the startup phase (these #. events are apparently caused by the WOW layer, the interface between #. 32bit and 64bit worlds). -#: windows-nat.c:893 +#: windows-nat.c:877 #, possible-c-format msgid "dll starting at %s not found." msgstr "" -#: windows-nat.c:915 +#: windows-nat.c:899 msgid "dll-symbols requires a file name" msgstr "" -#: windows-nat.c:1293 +#: windows-nat.c:1277 #, possible-c-format msgid "OpenProcess call failed, GetLastError = %lud" msgstr "" -#: windows-nat.c:1418 +#: windows-nat.c:1402 msgid "Could not interrupt program. Press Ctrl-c in the program console." msgstr "" -#: windows-nat.c:1526 +#: windows-nat.c:1510 #, possible-c-format msgid "During startup program exited with code 0x%x." msgstr "" -#: windows-nat.c:1829 +#: windows-nat.c:1813 msgid "Can't attach to process." msgstr "" -#: windows-nat.c:1861 +#: windows-nat.c:1845 #, possible-c-format msgid "Can't detach process %lu (error %lu)" msgstr "" -#: windows-nat.c:2004 +#: windows-nat.c:2030 msgid "No executable specified, use `target exec'." msgstr "" -#: windows-nat.c:2021 windows-nat.c:2026 +#: windows-nat.c:2047 windows-nat.c:2052 #, possible-c-format msgid "Error starting executable: %d" msgstr "" -#: windows-nat.c:2039 +#: windows-nat.c:2065 #, possible-c-format msgid "Error starting executable via shell: %d" msgstr "" -#: windows-nat.c:2133 +#: windows-nat.c:2186 #, possible-c-format msgid "Warning: Failed to open TTY %s, error %#x." msgstr "" -#: windows-nat.c:2160 +#: windows-nat.c:2238 #, possible-c-format msgid "Error creating process %s, (error %d)." msgstr "" -#: windows-nat.c:2446 +#: windows-nat.c:2524 msgid "Load dll library symbols from FILE." msgstr "" -#: windows-nat.c:2456 +#: windows-nat.c:2534 msgid "Set use of shell to start subprocess." msgstr "" -#: windows-nat.c:2457 +#: windows-nat.c:2535 msgid "Show use of shell to start subprocess." msgstr "" -#: windows-nat.c:2464 +#: windows-nat.c:2542 msgid "Break when an exception is detected in the Cygwin DLL itself." msgstr "" -#: windows-nat.c:2465 +#: windows-nat.c:2543 msgid "Show whether gdb breaks on exceptions in the Cygwin DLL itself." msgstr "" -#: windows-nat.c:2472 +#: windows-nat.c:2550 msgid "Set creation of new console when creating child process." msgstr "" -#: windows-nat.c:2473 +#: windows-nat.c:2551 msgid "Show creation of new console when creating child process." msgstr "" -#: windows-nat.c:2479 +#: windows-nat.c:2557 msgid "Set creation of new group when creating child process." msgstr "" -#: windows-nat.c:2480 +#: windows-nat.c:2558 msgid "Show creation of new group when creating child process." msgstr "" -#: windows-nat.c:2486 +#: windows-nat.c:2564 msgid "Set whether to display execution in child process." msgstr "" -#: windows-nat.c:2487 +#: windows-nat.c:2565 msgid "Show whether to display execution in child process." msgstr "" -#: windows-nat.c:2493 +#: windows-nat.c:2571 msgid "Set whether to display kernel events in child process." msgstr "" -#: windows-nat.c:2494 +#: windows-nat.c:2572 msgid "Show whether to display kernel events in child process." msgstr "" -#: windows-nat.c:2500 +#: windows-nat.c:2578 msgid "Set whether to display memory accesses in child process." msgstr "" -#: windows-nat.c:2501 +#: windows-nat.c:2579 msgid "Show whether to display memory accesses in child process." msgstr "" -#: windows-nat.c:2508 +#: windows-nat.c:2586 msgid "Set whether to display kernel exceptions in child process." msgstr "" -#: windows-nat.c:2509 +#: windows-nat.c:2587 msgid "Show whether to display kernel exceptions in child process." msgstr "" -#: windows-nat.c:2518 +#: windows-nat.c:2596 msgid "Display selectors infos." msgstr "" -#: windows-nat.c:2534 +#: windows-nat.c:2612 #, possible-c-format msgid "Invalid register %d in cygwin_set_dr.\n" msgstr "" -#: windows-nat.c:2599 +#: windows-nat.c:2677 #, possible-c-format msgid "obsolete '%s' found. Rename to '%s'." msgstr "" #. This will probably fail on Windows 9x/Me. Let the user know #. that we're missing some functionality. -#: windows-nat.c:2726 +#: windows-nat.c:2804 msgid "" "cannot automatically find executable file or library to read symbols.\n" "Use \"file\" or \"dll\" command to load executable/libraries directly." @@ -24663,11 +25618,11 @@ "even if their meaning is unknown." msgstr "" -#: xcoffread.c:159 +#: xcoffread.c:175 msgid "line numbers off, `.bf' symbol not found" msgstr "" -#: xcoffread.c:166 +#: xcoffread.c:182 #, possible-c-format msgid "Mismatched .ef symbol ignored starting at symnum %d" msgstr "" @@ -24677,70 +25632,70 @@ #. This can happen with old versions of GCC. #. GCC 2.3.3-930426 does not exhibit this on a test case which #. a user said produced the message for him. -#: xcoffread.c:500 +#: xcoffread.c:516 msgid "Nested C_BINCL symbols" msgstr "" -#: xcoffread.c:517 +#: xcoffread.c:533 msgid "Mismatched C_BINCL/C_EINCL pair" msgstr "" -#: xcoffread.c:803 +#: xcoffread.c:823 msgid "Bad line table offset in C_EINCL directive" msgstr "" -#: xcoffread.c:910 xcoffread.c:926 +#: xcoffread.c:930 xcoffread.c:946 msgid "Unexpected symbol continuation" msgstr "" -#: xcoffread.c:1373 +#: xcoffread.c:1393 #, possible-c-format msgid "Unrecognized storage class %d." msgstr "" -#: xcoffread.c:1558 +#: xcoffread.c:1578 #, possible-c-format msgid "Unexpected storage class: %d" msgstr "" -#: xcoffread.c:1642 +#: xcoffread.c:1666 msgid "Invalid symbol offset" msgstr "" -#: xcoffread.c:1924 +#: xcoffread.c:1950 #, possible-c-format msgid "cannot seek to string table in %s: %s" msgstr "" -#: xcoffread.c:1952 +#: xcoffread.c:1978 #, possible-c-format msgid "cannot read string table from %s: %s" msgstr "" -#: xcoffread.c:1955 +#: xcoffread.c:1981 msgid "bad symbol file: string table does not end with null character" msgstr "" -#: xcoffread.c:2339 +#: xcoffread.c:2365 msgid "More than one XMC_TC0 symbol found." msgstr "" -#: xcoffread.c:2492 +#: xcoffread.c:2518 #, possible-c-format msgid "Storage class %d not recognized during scan" msgstr "" -#: xcoffread.c:2967 +#: xcoffread.c:2993 #, possible-c-format msgid "Error reading .debug section of `%s': %s" msgstr "" -#: xcoffread.c:2982 +#: xcoffread.c:3008 #, possible-c-format msgid "Error reading symbols from %s: %s" msgstr "" -#: xcoffread.c:2995 +#: xcoffread.c:3021 msgid "reading symbol table" msgstr "" @@ -24748,136 +25703,136 @@ msgid "Status of loaded shared object libraries" msgstr "" -#: xml-support.c:196 +#: xml-support.c:195 #, possible-c-format msgid "Entering element <%s>" msgstr "" -#: xml-support.c:223 +#: xml-support.c:222 #, possible-c-format msgid "Element <%s> unknown" msgstr "" -#: xml-support.c:228 +#: xml-support.c:227 #, possible-c-format msgid "Element <%s> only expected once" msgstr "" -#: xml-support.c:252 +#: xml-support.c:251 #, possible-c-format msgid "Attribute \"%s\" missing a value" msgstr "" -#: xml-support.c:259 +#: xml-support.c:258 #, possible-c-format msgid "Required attribute \"%s\" of <%s> not specified" msgstr "" -#: xml-support.c:268 +#: xml-support.c:267 #, possible-c-format msgid "Parsing attribute %s=\"%s\"" msgstr "" -#: xml-support.c:295 +#: xml-support.c:294 #, possible-c-format msgid "Ignoring unknown attribute %s" msgstr "" -#: xml-support.c:348 +#: xml-support.c:347 #, possible-c-format msgid "Leaving element <%s>" msgstr "" -#: xml-support.c:355 +#: xml-support.c:354 #, possible-c-format msgid "Required element <%s> is missing" msgstr "" -#: xml-support.c:521 +#: xml-support.c:520 #, possible-c-format msgid "could not locate built-in DTD %s" msgstr "" -#: xml-support.c:566 +#: xml-support.c:565 #, possible-c-format msgid "XML_UseForeignDTD failed: %s" msgstr "" -#: xml-support.c:583 +#: xml-support.c:582 #, possible-c-format msgid "" "Starting:\n" "%s" msgstr "" -#: xml-support.c:609 +#: xml-support.c:608 #, possible-c-format msgid "while parsing %s (at line %d): %s" msgstr "" -#: xml-support.c:612 +#: xml-support.c:611 #, possible-c-format msgid "while parsing %s: %s" msgstr "" -#: xml-support.c:669 +#: xml-support.c:668 #, possible-c-format msgid "Can't convert \"%s\" to an integer" msgstr "" -#: xml-support.c:685 +#: xml-support.c:684 #, possible-c-format msgid "Can't convert %s=\"%s\" to an integer" msgstr "" -#: xml-support.c:719 +#: xml-support.c:718 #, possible-c-format msgid "Unknown attribute value %s=\"%s\"" msgstr "" -#: xml-support.c:781 +#: xml-support.c:780 #, possible-c-format msgid "Processing XInclude of \"%s\"" msgstr "" -#: xml-support.c:784 +#: xml-support.c:783 #, possible-c-format msgid "Maximum XInclude depth (%d) exceeded" msgstr "" -#: xml-support.c:789 +#: xml-support.c:788 #, possible-c-format msgid "Could not load XML document \"%s\"" msgstr "" -#: xml-support.c:796 +#: xml-support.c:795 #, possible-c-format msgid "Parsing \"%s\" failed" msgstr "" -#: xml-support.c:929 +#: xml-support.c:928 msgid "XInclude processing succeeded." msgstr "" -#: xml-support.c:990 +#: xml-support.c:989 #, possible-c-format msgid "XML debugging is %s.\n" msgstr "" -#: xml-support.c:1135 +#: xml-support.c:1072 #, possible-c-format msgid "Read error from \"%s\"" msgstr "" -#: xml-support.c:1162 +#: xml-support.c:1099 msgid "Set XML parser debugging." msgstr "" -#: xml-support.c:1163 +#: xml-support.c:1100 msgid "Show XML parser debugging." msgstr "" -#: xml-support.c:1164 +#: xml-support.c:1101 msgid "When set, debugging messages for XML parsers are displayed." msgstr "" @@ -25000,7 +25955,7 @@ msgid "Could not open \"%s\"" msgstr "" -#: xstormy16-tdep.c:117 +#: xstormy16-tdep.c:116 #, possible-c-format msgid "xstormy16_register_name: illegal register number %d" msgstr "" @@ -25013,128 +25968,128 @@ msgid "Couldn't write extended registers" msgstr "不能写入扩展寄存器" -#: xtensa-tdep.c:255 +#: xtensa-tdep.c:254 #, possible-c-format msgid "invalid register %d" msgstr "无效寄存器 %d" -#: xtensa-tdep.c:362 +#: xtensa-tdep.c:360 #, possible-c-format msgid "invalid dwarf/stabs register number %d" msgstr "" -#: xtensa-tdep.c:425 xtensa-tdep.c:504 +#: xtensa-tdep.c:423 xtensa-tdep.c:502 msgid "size of all masks is larger than the register" msgstr "所有的掩码大小都大于寄存器" -#: xtensa-tdep.c:610 +#: xtensa-tdep.c:608 #, possible-c-format msgid "cannot read register %s" msgstr "无法读取寄存器 %s" -#: xtensa-tdep.c:622 xtensa-tdep.c:629 +#: xtensa-tdep.c:620 xtensa-tdep.c:627 msgid "cannot read register" msgstr "无法读寄存器" -#: xtensa-tdep.c:705 +#: xtensa-tdep.c:703 #, possible-c-format msgid "cannot write register %s" msgstr "无法写入寄存器 %s" -#: xtensa-tdep.c:717 xtensa-tdep.c:725 +#: xtensa-tdep.c:715 xtensa-tdep.c:723 msgid "cannot write register" msgstr "无法写寄存器" -#: xtensa-tdep.c:1436 +#: xtensa-tdep.c:1435 msgid "" "\n" "Unrecognised function prologue. Stack trace cannot be resolved. This message " "will not be repeated in this session.\n" msgstr "" -#: xtensa-tdep.c:1603 +#: xtensa-tdep.c:1602 #, possible-c-format msgid "cannot extract return value of %d bytes long" msgstr "无法确切地返回一个 %d 字节的长整型" -#: xtensa-tdep.c:1658 +#: xtensa-tdep.c:1657 #, possible-c-format msgid "unimplemented for this length: %d" msgstr "本长度未实现: %d" -#: xtensa-tdep.c:2463 +#: xtensa-tdep.c:2462 msgid "Unable to read target memory ..." msgstr "" -#: xtensa-tdep.c:2961 +#: xtensa-tdep.c:2960 msgid "Unable to decode Xtensa Window Interrupt Handler's code." msgstr "" -#: xtensa-tdep.c:2992 +#: xtensa-tdep.c:2991 msgid "Unable to read Xtensa register EPC1" msgstr "" -#: xtensa-tdep.c:3095 +#: xtensa-tdep.c:3094 #, possible-c-format msgid "" "\n" "\tnum_aregs: Number of AR registers (%d) is not a power of two!" msgstr "" -#: xtensa-tdep.c:3102 +#: xtensa-tdep.c:3101 msgid "" "\n" "\tpc_regnum: No PC register" msgstr "" -#: xtensa-tdep.c:3104 +#: xtensa-tdep.c:3103 msgid "" "\n" "\tps_regnum: No PS register" msgstr "" -#: xtensa-tdep.c:3109 +#: xtensa-tdep.c:3108 msgid "" "\n" "\twb_regnum: No WB register" msgstr "" -#: xtensa-tdep.c:3111 +#: xtensa-tdep.c:3110 msgid "" "\n" "\tws_regnum: No WS register" msgstr "" -#: xtensa-tdep.c:3113 +#: xtensa-tdep.c:3112 msgid "" "\n" "\tar_base: No AR registers" msgstr "" -#: xtensa-tdep.c:3117 +#: xtensa-tdep.c:3116 msgid "" "\n" "\ta0_base: No Ax registers" msgstr "" -#: xtensa-tdep.c:3123 +#: xtensa-tdep.c:3122 #, possible-c-format msgid "the following are invalid: %s" msgstr "以下值均无效: %s" -#: xtensa-tdep.c:3300 +#: xtensa-tdep.c:3299 msgid "xtensa_dump_tdep(): not implemented" msgstr "" -#: xtensa-tdep.c:3317 +#: xtensa-tdep.c:3316 msgid "Set Xtensa debugging." msgstr "" -#: xtensa-tdep.c:3318 +#: xtensa-tdep.c:3317 msgid "Show Xtensa debugging." msgstr "" -#: xtensa-tdep.c:3318 +#: xtensa-tdep.c:3317 msgid "" "When non-zero, Xtensa-specific debugging is enabled. Can be 1, 2, 3, or 4 " "indicating the level of debugging." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gettext-runtime.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-runtime.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gettext-runtime.po 2012-01-02 18:07:05.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-runtime.po 2012-02-23 07:11:29.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: 2011-12-29 09:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: gnulib-lib/closeout.c:66 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gettext-tools.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-tools.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gettext-tools.po 2012-01-02 18:07:05.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-tools.po 2012-02-23 07:11:29.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: 2011-12-29 09:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: gnulib-lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ggz-config.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggz-config.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ggz-config.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggz-config.po 2012-02-23 07:11: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: 2011-12-29 11:36+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../../ggz-config/ggz-config.c:97 msgid "Query GGZCONFDIR - location of configuration directory" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ggzcore.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggzcore.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ggzcore.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggzcore.po 2012-02-23 07:11:38.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: 2011-12-29 11:36+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../../ggzcore/server.c:872 msgid "Unknown negotation" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/git-gui.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/git-gui.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/git-gui.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/git-gui.po 2012-02-23 07:11:38.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: 2011-12-29 11:37+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:17+0000\n" +"X-Generator: Launchpad (build 14838)\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-12.04+20111229/data/zh_CN/LC_MESSAGES/gnupg2.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg2.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gnupg2.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg2.po 2012-02-23 07:11:38.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: 2011-12-29 11:42+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:20+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" "X-Poedit-SourceCharset: iso-8859-1\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gnupg.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gnupg.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg.po 2012-02-23 07:11:31.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: 2011-12-29 10:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:19+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" "X-Poedit-SourceCharset: iso-8859-1\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gODBCConfig.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gODBCConfig.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gODBCConfig.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gODBCConfig.po 2012-02-23 07:11: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: 2011-12-29 10:27+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:23+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/main.c:25 msgid "gODBCConfig - ODBC Data Source Administrator" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gold.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gold.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gold.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gold.po 2012-02-23 07:11:25.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: 2011-12-29 09:14+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: archive.cc:119 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gprof.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gprof.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gprof.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gprof.po 2012-02-23 07:11:25.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: 2011-12-29 09:15+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: alpha.c:102 mips.c:54 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/grep.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grep.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/grep.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grep.po 2012-02-23 07:11: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: 2011-12-29 10:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:19+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/grub.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grub.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/grub.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grub.po 2012-02-23 07:11:38.000000000 +0000 @@ -17,79 +17,73 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:43+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:22+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: grub-core/commands/acpi.c:40 +#: commands/acpi.c:40 msgid "Don't load host tables specified by comma-separated list." msgstr "不载入指定的主机表(多个表用逗号分隔)。" -#: grub-core/commands/acpi.c:43 +#: commands/acpi.c:43 msgid "Load only tables specified by comma-separated list." msgstr "只载入指定的主机表(多个表用逗号分隔)。" -#: grub-core/commands/acpi.c:44 +#: commands/acpi.c:44 msgid "Expose v1 tables." msgstr "显示 v1 表。" -#: grub-core/commands/acpi.c:45 +#: commands/acpi.c:45 msgid "Expose v2 and v3 tables." msgstr "显示 v2 和 v3 表。" -#: grub-core/commands/acpi.c:46 +#: commands/acpi.c:46 msgid "Set OEMID of RSDP, XSDT and RSDT." msgstr "设置 RSDP,XSDT 和 RSDT 中的 OEMID。" -#: grub-core/commands/acpi.c:48 +#: commands/acpi.c:48 msgid "Set OEMTABLE ID of RSDP, XSDT and RSDT." msgstr "设置 RSDP,XSDT 和 RSDT 中的 OEMTABLE ID。" -#: grub-core/commands/acpi.c:50 +#: commands/acpi.c:50 msgid "Set OEMTABLE revision of RSDP, XSDT and RSDT." msgstr "设置 RSDP,XSDT 和 RSDT 中的 OEMTABLE 版本信息。" -#: grub-core/commands/acpi.c:52 +#: commands/acpi.c:52 msgid "Set creator field of RSDP, XSDT and RSDT." msgstr "设置 RSDP,XSDT 和 RSDT 中的制造商信息。" -#: grub-core/commands/acpi.c:54 +#: commands/acpi.c:54 msgid "Set creator revision of RSDP, XSDT and RSDT." msgstr "设置 RSDP,XSDT 和 RSDT 中的制造商版本信息。" -#: grub-core/commands/acpi.c:55 +#: commands/acpi.c:55 msgid "" "Don't update EBDA. May fix failures or hangs on some. BIOSes but makes it " "ineffective with OS not receiving RSDP from GRUB." msgstr "不更新 EBDA。有些时候能解决引导失败和挂起的问题。但因为 BIOS 的原因,对不从 GRUB 接收 RSDP 的操作系统无效。" -#: grub-core/commands/acpi.c:763 +#: commands/acpi.c:763 msgid "" "[-1|-2] [--exclude=TABLE1,TABLE2|--load-only=table1,table2] FILE1 [FILE2] " "[...]" msgstr "[-1|-2] [--exclude=表1,表2|--load-on=表1,表2] 文件1 [文件2] [...]" -#: grub-core/commands/acpi.c:766 +#: commands/acpi.c:766 msgid "Load host ACPI tables and tables specified by arguments." msgstr "载入主机 ACPI 表和参数指定的表。" -#: grub-core/commands/blocklist.c:116 grub-core/commands/cat.c:97 -#: grub-core/commands/configfile.c:65 grub-core/commands/configfile.c:68 -#: grub-core/commands/configfile.c:74 grub-core/commands/configfile.c:80 -#: grub-core/commands/configfile.c:86 grub-core/commands/hashsum.c:33 -#: grub-core/commands/legacycfg.c:763 grub-core/commands/legacycfg.c:768 -#: grub-core/commands/legacycfg.c:773 grub-core/commands/legacycfg.c:778 -#: grub-core/commands/minicmd.c:204 grub-core/commands/testload.c:150 -#: grub-core/efiemu/main.c:318 grub-core/loader/i386/bsd.c:1947 -#: grub-core/loader/i386/bsd.c:1950 grub-core/loader/i386/bsd.c:1953 -#: util/grub-setup.c:686 util/grub-setup.c:688 util/grub-setup.c:692 +#: commands/blocklist.c:114 commands/cat.c:82 commands/configfile.c:57 +#: commands/configfile.c:60 commands/configfile.c:65 commands/crc.c:64 +#: commands/minicmd.c:357 loader/i386/bsd.c:1297 loader/i386/bsd.c:1301 +#: loader/i386/bsd.c:1305 msgid "FILE" msgstr "文件" -#: grub-core/commands/blocklist.c:116 +#: commands/blocklist.c:114 msgid "Print a block list." msgstr "显示块列表。" -#: grub-core/commands/boot.c:192 +#: commands/boot.c:190 msgid "Boot an operating system." msgstr "引导操作系统。" @@ -97,23 +91,23 @@ msgid "Accept DOS-style CR/NL line endings." msgstr "接受 DOS 风格的 CR/NL 行结尾。" -#: grub-core/commands/cat.c:97 grub-core/commands/minicmd.c:204 +#: commands/cat.c:82 commands/minicmd.c:357 msgid "Show the contents of a file." msgstr "显示文件内容。" -#: grub-core/commands/cmp.c:114 +#: commands/cmp.c:113 msgid "FILE1 FILE2" msgstr "文件1 文件2" -#: grub-core/commands/cmp.c:114 +#: commands/cmp.c:113 msgid "Compare two files." msgstr "比较两个文件。" -#: grub-core/commands/configfile.c:65 +#: commands/configfile.c:57 msgid "Load another config file." msgstr "载入另外的配置文件。" -#: grub-core/commands/configfile.c:69 grub-core/commands/configfile.c:87 +#: commands/configfile.c:61 commands/configfile.c:66 msgid "Load another config file without changing context." msgstr "载入另外的配置文件(不改变环境)。" @@ -122,43 +116,43 @@ "Load another config file without changing context but take only menuentries." msgstr "载入另外的配置文件(不改变环境,仅载入菜单项)。" -#: grub-core/commands/date.c:141 +#: commands/date.c:139 msgid "[[year-]month-day] [hour:minute[:second]]" msgstr "[[年-]月-日] [时:分[:秒]]" -#: grub-core/commands/date.c:142 +#: commands/date.c:140 msgid "Command to display/set current datetime." msgstr "显示/设置时间的命令" -#: grub-core/commands/echo.c:30 +#: commands/echo.c:27 msgid "Do not output the trailing newline." msgstr "末尾不输出额外空行。" -#: grub-core/commands/echo.c:31 +#: commands/echo.c:28 msgid "Enable interpretation of backslash escapes." msgstr "启用反斜杠转义" -#: grub-core/commands/echo.c:134 +#: commands/echo.c:117 msgid "[-e|-n] STRING" msgstr "[-e|-n] 字符串" -#: grub-core/commands/echo.c:134 +#: commands/echo.c:117 msgid "Display a line of text." msgstr "显示文本" -#: grub-core/commands/efi/fixvideo.c:105 +#: commands/efi/fixvideo.c:103 msgid "Fix video problem." msgstr "修正显示问题" -#: grub-core/commands/efi/loadbios.c:209 +#: commands/efi/loadbios.c:207 msgid "Fake BIOS." msgstr "BIOS 伪装。" -#: grub-core/commands/efi/loadbios.c:213 +#: commands/efi/loadbios.c:211 msgid "Load BIOS dump." msgstr "载入 BIOS 转储。" -#: grub-core/commands/gptsync.c:246 +#: commands/gptsync.c:244 msgid "DEVICE [PARTITION[+/-[TYPE]]] ..." msgstr "设备 [分区[+/-[类型]]] ..." @@ -171,7 +165,7 @@ "重写指定 GPT 设备的混合 MBR,指定的分区会成为混合 MBR 的一部分(不超过三个)。类型指 MBR 类型,+ " "代表该分区是活动分区(只能有一个活动分区)。" -#: grub-core/commands/halt.c:41 +#: commands/halt.c:39 msgid "" "Halts the computer. This command does not work on all firmware " "implementations." @@ -217,7 +211,7 @@ msgid "[-c FILE [-p PREFIX]] [FILE1 [FILE2 ...]]" msgstr "[-c 文件 [-p 前缀]] [文件1 [文件2 ...]]" -#: grub-core/commands/hdparm.c:32 +#: commands/hdparm.c:30 msgid "" "Set Advanced Power Management\n" "(1=low, ..., 254=high, 255=off)." @@ -225,19 +219,19 @@ "设置高级电源管理模式\n" "(1=最低,...,254=最高,255=关闭)。" -#: grub-core/commands/hdparm.c:35 +#: commands/hdparm.c:33 msgid "Check power mode." msgstr "检查电源模式。" -#: grub-core/commands/hdparm.c:36 +#: commands/hdparm.c:34 msgid "Freeze ATA security settings until reset." msgstr "禁止更改 ATA 安全设置直到此设置被重置。" -#: grub-core/commands/hdparm.c:38 +#: commands/hdparm.c:36 msgid "Check SMART health status." msgstr "检查 SMART 健康状态。" -#: grub-core/commands/hdparm.c:39 +#: commands/hdparm.c:37 msgid "" "Set Automatic Acoustic Management\n" "(0=off, 128=quiet, ..., 254=fast)." @@ -245,7 +239,7 @@ "设置硬盘声音管理模式\n" "(0=关闭,128=静音,...,254=高速)。" -#: grub-core/commands/hdparm.c:42 +#: commands/hdparm.c:40 msgid "" "Set standby timeout\n" "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)." @@ -253,99 +247,99 @@ "设置等待时间\n" "(0=关闭,1=5秒,2=10秒,...,240=20分,241=30分,...)。" -#: grub-core/commands/hdparm.c:45 +#: commands/hdparm.c:43 msgid "Set drive to standby mode." msgstr "设置驱动器为等待模式。" -#: grub-core/commands/hdparm.c:46 +#: commands/hdparm.c:44 msgid "Set drive to sleep mode." msgstr "设置驱动器为休眠模式。" -#: grub-core/commands/hdparm.c:47 +#: commands/hdparm.c:45 msgid "Print drive identity and settings." msgstr "显示硬盘识别信息和设置。" -#: grub-core/commands/hdparm.c:49 +#: commands/hdparm.c:47 msgid "Dump contents of ATA IDENTIFY sector." msgstr "转储 ATA IDENTIFY 扇区内容。" -#: grub-core/commands/hdparm.c:51 +#: commands/hdparm.c:49 msgid "Disable/enable SMART (0/1)." msgstr "禁用/启用 SMART (0/1)。" -#: grub-core/commands/hdparm.c:52 +#: commands/hdparm.c:50 msgid "Do not print messages." msgstr "安静模式。" -#: grub-core/commands/hdparm.c:415 +#: commands/hdparm.c:414 msgid "[OPTIONS] DISK" msgstr "[选项] 磁盘" -#: grub-core/commands/hdparm.c:416 +#: commands/hdparm.c:415 msgid "Get/set ATA disk parameters." msgstr "获取或设定 ATA 磁盘参数。" -#: grub-core/commands/help.c:120 grub-core/lib/arg.c:110 +#: commands/help.c:103 lib/arg.c:110 msgid "Usage:" msgstr "用法:" -#: grub-core/commands/help.c:136 +#: commands/help.c:136 msgid "[PATTERN ...]" msgstr "[模式 ...]" -#: grub-core/commands/help.c:137 +#: commands/help.c:137 msgid "Show a help message." msgstr "显示帮助消息。" -#: grub-core/commands/hexdump.c:31 +#: commands/hexdump.c:30 msgid "Skip offset bytes from the beginning of file." msgstr "跳过文件头部偏移字节。" -#: grub-core/commands/hexdump.c:33 +#: commands/hexdump.c:32 msgid "Read only LENGTH bytes." msgstr "读取指定长度(字节)。" -#: grub-core/commands/hexdump.c:125 +#: commands/hexdump.c:125 msgid "[OPTIONS] FILE_OR_DEVICE" msgstr "[选项] 文件或设备" -#: grub-core/commands/hexdump.c:126 +#: commands/hexdump.c:126 msgid "Dump the contents of a file or memory." msgstr "显示文件或内存内容。" -#: grub-core/commands/i386/cpuid.c:39 +#: commands/i386/cpuid.c:37 msgid "Check for long mode flag (default)." msgstr "检查长模式标志(默认)。" -#: grub-core/commands/i386/cpuid.c:94 +#: commands/i386/cpuid.c:92 msgid "Check for CPU features." msgstr "检查 CPU 特性。" -#: grub-core/commands/i386/pc/drivemap.c:39 +#: commands/i386/pc/drivemap.c:37 msgid "Show the current mappings." msgstr "显示当前映射。" -#: grub-core/commands/i386/pc/drivemap.c:40 +#: commands/i386/pc/drivemap.c:38 msgid "Reset all mappings to the default values." msgstr "重置所有映射为默认值。" -#: grub-core/commands/i386/pc/drivemap.c:41 +#: commands/i386/pc/drivemap.c:39 msgid "Perform both direct and reverse mappings." msgstr "同时进行直接和保留映射。" -#: grub-core/commands/i386/pc/drivemap.c:407 +#: commands/i386/pc/drivemap.c:407 msgid "-l | -r | [-s] grubdev osdisk." msgstr "-l | -r | [-s] grub设备 系统磁盘" -#: grub-core/commands/i386/pc/drivemap.c:408 +#: commands/i386/pc/drivemap.c:408 msgid "Manage the BIOS drive mappings." msgstr "管理 BIOS 设备映射。" -#: grub-core/commands/i386/pc/halt.c:31 +#: commands/i386/pc/halt.c:27 msgid "Do not use APM to halt the computer." msgstr "不使用 APM 关闭计算机。" -#: grub-core/commands/i386/pc/halt.c:120 +#: commands/i386/pc/halt.c:51 msgid "Halt the system, if possible using APM." msgstr "优先使用 APM 关闭计算机。" @@ -353,23 +347,23 @@ msgid "Show APM information." msgstr "显示 APM 信息。" -#: grub-core/commands/i386/pc/play.c:268 +#: commands/i386/pc/play.c:262 msgid "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... " msgstr "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... " -#: grub-core/commands/i386/pc/play.c:269 +#: commands/i386/pc/play.c:263 msgid "Play a tune." msgstr "播放测试声音。" -#: grub-core/commands/i386/pc/pxecmd.c:48 +#: commands/i386/pc/pxecmd.c:46 msgid "Unload PXE environment." msgstr "卸载 PXE 环境。" -#: grub-core/commands/ieee1275/suspend.c:45 +#: commands/ieee1275/suspend.c:43 msgid "Return to Open Firmware prompt." msgstr "返回 Open Firmware 界面。" -#: grub-core/commands/iorw.c:34 grub-core/commands/memrw.c:33 +#: commands/memrw.c:31 msgid "Save read value into variable VARNAME." msgstr "将读取的值存入变量 VARNAME。" @@ -406,8 +400,7 @@ msgid "Write word VALUE to PORT." msgstr "向指定端口写入字类型值。" -#: grub-core/commands/iorw.c:140 grub-core/commands/memrw.c:134 -#: grub-core/commands/memrw.c:137 grub-core/commands/memrw.c:140 +#: commands/memrw.c:132 commands/memrw.c:135 commands/memrw.c:138 msgid "ADDR VALUE [MASK]" msgstr "地址 值 [掩码]" @@ -419,23 +412,23 @@ msgid "Load a keyboard layout." msgstr "载入一个键盘布局。" -#: grub-core/commands/keystatus.c:30 +#: commands/keystatus.c:28 msgid "Check Shift key." msgstr "检查 Shift 键。" -#: grub-core/commands/keystatus.c:31 +#: commands/keystatus.c:29 msgid "Check Control key." msgstr "检查 Ctrl 键。" -#: grub-core/commands/keystatus.c:32 +#: commands/keystatus.c:30 msgid "Check Alt key." msgstr "检查 Alt 键。" -#: grub-core/commands/keystatus.c:102 +#: commands/keystatus.c:85 msgid "[--shift] [--ctrl] [--alt]" msgstr "[--shift] [--ctrl] [--alt]" -#: grub-core/commands/keystatus.c:103 +#: commands/keystatus.c:86 msgid "Check key modifier status." msgstr "检查修饰键状态。" @@ -487,39 +480,39 @@ msgid "Simulate grub-legacy password command in menuentry mode" msgstr "在菜单项模式下模拟 grub-legacy 口令命令" -#: grub-core/commands/loadenv.c:35 +#: commands/loadenv.c:33 msgid "Specify filename." msgstr "指定文件名。" -#: grub-core/commands/loadenv.c:380 grub-core/commands/loadenv.c:384 +#: commands/loadenv.c:383 commands/loadenv.c:389 msgid "[-f FILE]" msgstr "[-f 文件]" -#: grub-core/commands/loadenv.c:381 +#: commands/loadenv.c:384 msgid "Load variables from environment block file." msgstr "载入环境变量文件。" -#: grub-core/commands/loadenv.c:385 +#: commands/loadenv.c:390 msgid "List variables from environment block file." msgstr "显示环境变量文件内容。" -#: grub-core/commands/loadenv.c:389 +#: commands/loadenv.c:395 msgid "[-f FILE] variable_name [...]" msgstr "[-f 文件] 变量名 [...]" -#: grub-core/commands/loadenv.c:390 +#: commands/loadenv.c:396 msgid "Save variables to environment block file." msgstr "保存变量到文件。" -#: grub-core/commands/ls.c:39 +#: commands/ls.c:37 msgid "Show a long list with more detailed information." msgstr "列出详细信息。" -#: grub-core/commands/ls.c:40 +#: commands/ls.c:38 msgid "Print sizes in a human readable format." msgstr "使用易读的格式显示文件大小。" -#: grub-core/commands/ls.c:41 +#: commands/ls.c:39 msgid "List all files." msgstr "列出全部文件。" @@ -527,7 +520,7 @@ msgid "[-l|-h|-a] [FILE ...]" msgstr "[-l|-h|-a] [文件 ...]" -#: grub-core/commands/ls.c:276 +#: commands/ls.c:270 msgid "List devices and files." msgstr "列出设备和文件。" @@ -547,40 +540,40 @@ msgid "Show ACPI information." msgstr "显示 ACPI 信息。" -#: grub-core/commands/lsmmap.c:68 +#: commands/lsmmap.c:47 msgid "List memory map provided by firmware." msgstr "列出默认的内存映射。" -#: grub-core/commands/lspci.c:230 +#: commands/lspci.c:228 msgid "List PCI devices." msgstr "列出 PCI 设备。" -#: grub-core/commands/memrw.c:125 grub-core/commands/memrw.c:128 -#: grub-core/commands/memrw.c:131 grub-core/commands/minicmd.c:210 +#: commands/memrw.c:123 commands/memrw.c:126 commands/memrw.c:129 +#: commands/minicmd.c:366 msgid "ADDR" msgstr "地址" -#: grub-core/commands/memrw.c:125 +#: commands/memrw.c:123 msgid "Read byte from ADDR." msgstr "从指定地址读取字节" -#: grub-core/commands/memrw.c:128 +#: commands/memrw.c:126 msgid "Read word from ADDR." msgstr "从指定地址读取字。" -#: grub-core/commands/memrw.c:131 +#: commands/memrw.c:129 msgid "Read dword from ADDR." msgstr "从指定地址读取双字。" -#: grub-core/commands/memrw.c:134 +#: commands/memrw.c:132 msgid "Write byte VALUE to ADDR." msgstr "向指定地址写入 byte 类型值。" -#: grub-core/commands/memrw.c:137 +#: commands/memrw.c:135 msgid "Write word VALUE to ADDR." msgstr "向指定地址写入 word 类型值。" -#: grub-core/commands/memrw.c:140 +#: commands/memrw.c:138 msgid "Write dword VALUE to ADDR." msgstr "向指定地址写入 dword 类型值。" @@ -613,39 +606,39 @@ msgid "Define a submenu." msgstr "定义一个子菜单。" -#: grub-core/commands/minicmd.c:207 +#: commands/minicmd.c:360 msgid "Show this message." msgstr "显示此消息。" -#: grub-core/commands/minicmd.c:210 +#: commands/minicmd.c:366 msgid "Dump memory." msgstr "转储内存。" -#: grub-core/commands/minicmd.c:213 grub-core/kern/corecmd.c:193 +#: commands/minicmd.c:369 msgid "MODULE" msgstr "模块" -#: grub-core/commands/minicmd.c:213 +#: commands/minicmd.c:369 msgid "Remove a module." msgstr "删除模块。" -#: grub-core/commands/minicmd.c:216 +#: commands/minicmd.c:372 msgid "Show loaded modules." msgstr "显示已加载的模块。" -#: grub-core/commands/minicmd.c:219 +#: commands/minicmd.c:375 msgid "Exit from GRUB." msgstr "退出 GRUB。" -#: grub-core/commands/parttool.c:326 +#: commands/parttool.c:325 msgid "PARTITION COMMANDS" msgstr "分区 命令" -#: grub-core/commands/password.c:85 +#: commands/password.c:78 msgid "USER PASSWORD" msgstr "用户 口令" -#: grub-core/commands/password.c:86 +#: commands/password.c:79 msgid "Set user password (plaintext). Unrecommended and insecure." msgstr "设置用户口令(纯文本)(不推荐且不安全)。" @@ -657,48 +650,47 @@ msgid "Set user password (PBKDF2). " msgstr "设置用户命令(PBKDF2)。 " -#: grub-core/commands/probe.c:40 +#: commands/probe.c:38 msgid "Set a variable to return value." msgstr "设置用于返回值的变量。" -#: grub-core/commands/probe.c:41 +#: commands/probe.c:39 msgid "Determine driver." msgstr "指定驱动。" -#: grub-core/commands/probe.c:42 +#: commands/probe.c:40 msgid "Determine partition map type." msgstr "指定分区表类型。" -#: grub-core/commands/probe.c:43 +#: commands/probe.c:41 msgid "Determine filesystem type." msgstr "指定文件系统类型" -#: grub-core/commands/probe.c:44 +#: commands/probe.c:42 msgid "Determine filesystem UUID." msgstr "指定文件系统 UUID。" -#: grub-core/commands/probe.c:45 +#: commands/probe.c:43 msgid "Determine filesystem label." msgstr "指定文件系统卷标。" -#: grub-core/commands/probe.c:155 grub-core/loader/i386/bsd.c:159 -#: util/grub-setup.c:840 +#: loader/i386/bsd.c:124 msgid "DEVICE" msgstr "设备" -#: grub-core/commands/probe.c:156 +#: commands/probe.c:155 msgid "Retrieve device info." msgstr "获取设备信息。" -#: grub-core/commands/read.c:85 +#: commands/read.c:83 msgid "[ENVVAR]" msgstr "[环境变量]" -#: grub-core/commands/read.c:86 +#: commands/read.c:84 msgid "Set variable with user input." msgstr "将用户输入值保存到变量。" -#: grub-core/commands/reboot.c:41 +#: commands/reboot.c:39 msgid "Reboot the computer." msgstr "重新启动计算机。" @@ -722,19 +714,19 @@ msgid "NAME [VARIABLE] [HINTS]" msgstr "名称 [变量] [提示]" -#: grub-core/commands/search_file.c:5 +#: commands/search_file.c:5 msgid "" "Search devices by file. If VARIABLE is specified, the first device found is " "set to a variable." msgstr "搜索含有指定文件的设备。如果指定了变量,找到的第一个设备会被保存到变量中。" -#: grub-core/commands/search_label.c:5 +#: commands/search_label.c:5 msgid "" "Search devices by label. If VARIABLE is specified, the first device found is " "set to a variable." msgstr "按卷标搜索。如果指定了变量,找到的第一个设备会被保存到变量中。" -#: grub-core/commands/search_uuid.c:5 +#: commands/search_uuid.c:5 msgid "" "Search devices by UUID. If VARIABLE is specified, the first device found is " "set to a variable." @@ -788,19 +780,19 @@ msgid "Manipulate PCI devices." msgstr "操作 PCI 设备。" -#: grub-core/commands/sleep.c:32 +#: commands/sleep.c:31 msgid "Verbose countdown." msgstr "显示倒计时。" -#: grub-core/commands/sleep.c:33 +#: commands/sleep.c:32 msgid "Interruptible with ESC." msgstr "可用 ESC 键中断。" -#: grub-core/commands/sleep.c:106 +#: commands/sleep.c:106 msgid "NUMBER_OF_SECONDS" msgstr "秒数" -#: grub-core/commands/sleep.c:107 +#: commands/sleep.c:107 msgid "Wait for a specified number of seconds." msgstr "等待指定时间(秒)。" @@ -836,15 +828,15 @@ msgid "List or select an output terminal." msgstr "列出或选择一个输出终端。" -#: grub-core/commands/test.c:427 +#: commands/test.c:424 msgid "EXPRESSION ]" msgstr "表达式 ]" -#: grub-core/commands/test.c:427 grub-core/commands/test.c:430 +#: commands/test.c:424 commands/test.c:426 msgid "Evaluate an expression." msgstr "执行该表达式。" -#: grub-core/commands/test.c:430 +#: commands/test.c:426 msgid "EXPRESSION" msgstr "表达式" @@ -852,15 +844,15 @@ msgid "Load the same file in multiple ways." msgstr "以多种方式载入同一个文件。" -#: grub-core/commands/true.c:49 +#: commands/true.c:47 msgid "Do nothing, successfully." msgstr "未进行操作,成功。" -#: grub-core/commands/true.c:52 +#: commands/true.c:50 msgid "Do nothing, unsuccessfully." msgstr "未进行操作,失败。" -#: grub-core/commands/usbtest.c:212 +#: commands/usbtest.c:199 msgid "Test USB support." msgstr "测试 USB 支持。" @@ -874,19 +866,19 @@ msgid "Test video subsystem in mode WxH." msgstr "在 WxH 模似下测试显示子系统。" -#: grub-core/commands/videotest.c:208 +#: commands/videotest.c:180 msgid "Test video subsystem." msgstr "测试显示子系统。" -#: grub-core/commands/xnu_uuid.c:94 +#: commands/xnu_uuid.c:92 msgid "GRUBUUID [VARNAME]" msgstr "GRUBUUID [变量]" -#: grub-core/commands/xnu_uuid.c:95 +#: commands/xnu_uuid.c:93 msgid "Transform 64-bit UUID to format suitable for XNU." msgstr "将 64 位的 UUID 转换成 XNU 的格式。" -#: grub-core/disk/loopback.c:41 +#: disk/loopback.c:40 msgid "Delete the loopback device entry." msgstr "删除回环设备项。" @@ -894,7 +886,7 @@ msgid "[-d] DEVICENAME FILE." msgstr "" -#: grub-core/disk/loopback.c:224 +#: disk/loopback.c:250 msgid "Make a device of a file." msgstr "将一个文件模拟成设备。" @@ -930,7 +922,7 @@ msgid "Translates the string with the current settings." msgstr "使用当前设置翻译字符串。" -#: grub-core/gfxmenu/gui_progress_bar.c:281 grub-core/normal/menu_text.c:365 +#: normal/menu_text.c:363 #, c-format msgid "The highlighted entry will be executed automatically in %ds." msgstr "高亮显示的启动项将在 %d 秒后自动执行。" @@ -951,7 +943,7 @@ msgid "%ds" msgstr "%d 秒" -#: grub-core/hello/hello.c:45 +#: hello/hello.c:43 msgid "Say \"Hello World\"." msgstr "显示“Hello World”。" @@ -983,7 +975,7 @@ msgid "Insert a module." msgstr "插入一个模块。" -#: grub-core/kern/emu/hostdisk.c:1015 util/grub-setup.c:662 +#: util/i386/pc/grub-setup.c:562 #, c-format msgid "cannot open `%s'" msgstr "无法打开“%s”" @@ -1012,85 +1004,79 @@ msgid "error: %s.\n" msgstr "错误:%s。\n" -#: grub-core/lib/arg.c:34 +#: lib/arg.c:34 msgid "Display this help and exit." msgstr "显示此帮助并退出。" -#: grub-core/lib/arg.c:36 +#: lib/arg.c:36 msgid "Display the usage of this command and exit." msgstr "显示此命令的用法并退出。" -#: grub-core/loader/efi/appleloader.c:223 +#: loader/efi/appleloader.c:325 msgid "Boot legacy system." msgstr "引导老版本系统。" -#: grub-core/loader/efi/chainloader.c:348 -#: grub-core/loader/i386/pc/chainloader.c:170 +#: loader/efi/chainloader.c:340 loader/i386/pc/chainloader.c:153 msgid "Load another boot loader." msgstr "载入其他引导程序。" -#: grub-core/loader/i386/bsd.c:97 +#: loader/i386/bsd.c:65 msgid "Display output on all consoles." msgstr "在所有控制台显示输出。" -#: grub-core/loader/i386/bsd.c:98 grub-core/loader/i386/bsd.c:132 -#: grub-core/loader/i386/bsd.c:161 +#: loader/i386/bsd.c:66 msgid "Use serial console." msgstr "使用串行终端。" -#: grub-core/loader/i386/bsd.c:99 grub-core/loader/i386/bsd.c:125 -#: grub-core/loader/i386/bsd.c:149 +#: loader/i386/bsd.c:67 loader/i386/bsd.c:93 loader/i386/bsd.c:114 msgid "Ask for file name to reboot from." msgstr "从指定文件重新启动。" -#: grub-core/loader/i386/bsd.c:100 +#: loader/i386/bsd.c:68 msgid "Use CDROM as root." msgstr "使用 CDROM 作为根。" -#: grub-core/loader/i386/bsd.c:101 +#: loader/i386/bsd.c:69 msgid "Invoke user configuration routing." msgstr "使用用户配置路径。" -#: grub-core/loader/i386/bsd.c:102 grub-core/loader/i386/bsd.c:129 -#: grub-core/loader/i386/bsd.c:152 +#: loader/i386/bsd.c:70 loader/i386/bsd.c:97 loader/i386/bsd.c:117 msgid "Enter in KDB on boot." msgstr "启动后进入 KDB。" -#: grub-core/loader/i386/bsd.c:103 +#: loader/i386/bsd.c:71 msgid "Use GDB remote debugger instead of DDB." msgstr "使用 GDB 远程调试工具替代 DDB。" -#: grub-core/loader/i386/bsd.c:104 +#: loader/i386/bsd.c:72 msgid "Disable all boot output." msgstr "禁用所有引导输出。" -#: grub-core/loader/i386/bsd.c:106 +#: loader/i386/bsd.c:74 msgid "Wait for keypress after every line of output." msgstr "每输出一行后暂停(按任意键继续)。" -#: grub-core/loader/i386/bsd.c:108 +#: loader/i386/bsd.c:76 msgid "Use compiled-in rootdev." msgstr "使用内置根设备" -#: grub-core/loader/i386/bsd.c:109 grub-core/loader/i386/bsd.c:128 -#: grub-core/loader/i386/bsd.c:155 +#: loader/i386/bsd.c:77 loader/i386/bsd.c:96 loader/i386/bsd.c:120 msgid "Boot into single mode." msgstr "以单用户模式启动" -#: grub-core/loader/i386/bsd.c:110 grub-core/loader/i386/bsd.c:156 +#: loader/i386/bsd.c:78 loader/i386/bsd.c:121 msgid "Boot with verbose messages." msgstr "启动时显示完整信息。" -#: grub-core/loader/i386/bsd.c:126 grub-core/loader/i386/bsd.c:150 +#: loader/i386/bsd.c:94 loader/i386/bsd.c:115 msgid "Don't reboot, just halt." msgstr "直接关机。" -#: grub-core/loader/i386/bsd.c:127 grub-core/loader/i386/bsd.c:151 +#: loader/i386/bsd.c:95 loader/i386/bsd.c:116 msgid "Change configured devices." msgstr "更改此前配置的设备。" -#: grub-core/loader/i386/bsd.c:130 grub-core/loader/i386/bsd.c:159 -#: util/grub-fstest.c:364 +#: loader/i386/bsd.c:98 loader/i386/bsd.c:124 msgid "Set root device." msgstr "设置根设备。" @@ -1098,23 +1084,23 @@ msgid "comUNIT[,SPEED]" msgstr "" -#: grub-core/loader/i386/bsd.c:147 +#: loader/i386/bsd.c:112 msgid "Disable SMP." msgstr "禁用 SMP。" -#: grub-core/loader/i386/bsd.c:148 +#: loader/i386/bsd.c:113 msgid "Disable ACPI." msgstr "禁用 ACPI。" -#: grub-core/loader/i386/bsd.c:154 +#: loader/i386/bsd.c:119 msgid "Don't display boot diagnostic messages." msgstr "不显示引导对话消息。" -#: grub-core/loader/i386/bsd.c:157 +#: loader/i386/bsd.c:122 msgid "Boot with debug messages." msgstr "显示调试信息。" -#: grub-core/loader/i386/bsd.c:158 +#: loader/i386/bsd.c:123 msgid "Supress normal output (warnings remain)." msgstr "不显示普通输出(显示警告)。" @@ -1122,23 +1108,23 @@ msgid "[ADDR|comUNIT][,SPEED]" msgstr "" -#: grub-core/loader/i386/bsd.c:1947 +#: loader/i386/bsd.c:1297 msgid "Load kernel of FreeBSD." msgstr "载入 FreeBSD 内核。" -#: grub-core/loader/i386/bsd.c:1950 +#: loader/i386/bsd.c:1301 msgid "Load kernel of OpenBSD." msgstr "载入 OpenBSD 内核。" -#: grub-core/loader/i386/bsd.c:1953 +#: loader/i386/bsd.c:1305 msgid "Load kernel of NetBSD." msgstr "载入 NetBSD 内核。" -#: grub-core/loader/i386/bsd.c:1957 +#: loader/i386/bsd.c:1309 msgid "Load FreeBSD env." msgstr "载入 FreeBSD 环境。" -#: grub-core/loader/i386/bsd.c:1960 +#: loader/i386/bsd.c:1312 msgid "Load FreeBSD kernel module." msgstr "载入 FreeBSD 内核模块。" @@ -1150,21 +1136,19 @@ msgid "Load NetBSD kernel module (ELF)." msgstr "载入 NetBSD 内核模块(ELF)。" -#: grub-core/loader/i386/bsd.c:1969 +#: loader/i386/bsd.c:1315 msgid "Load FreeBSD kernel module (ELF)." msgstr "载入 FreeBSD 内核模块(ELF)。" -#: grub-core/loader/i386/linux.c:1006 grub-core/loader/i386/pc/linux.c:439 -#: grub-core/loader/mips/linux.c:433 -#: grub-core/loader/powerpc/ieee1275/linux.c:375 -#: grub-core/loader/sparc64/ieee1275/linux.c:515 +#: loader/i386/efi/linux.c:1011 loader/i386/ieee1275/linux.c:301 +#: loader/i386/linux.c:1012 loader/i386/pc/linux.c:399 +#: loader/powerpc/ieee1275/linux.c:353 loader/sparc64/ieee1275/linux.c:514 msgid "Load Linux." msgstr "载入 Linux。" -#: grub-core/loader/i386/linux.c:1008 grub-core/loader/i386/pc/linux.c:442 -#: grub-core/loader/mips/linux.c:435 -#: grub-core/loader/powerpc/ieee1275/linux.c:377 -#: grub-core/loader/sparc64/ieee1275/linux.c:517 +#: loader/i386/efi/linux.c:1013 loader/i386/ieee1275/linux.c:303 +#: loader/i386/linux.c:1014 loader/i386/pc/linux.c:402 +#: loader/powerpc/ieee1275/linux.c:355 loader/sparc64/ieee1275/linux.c:516 msgid "Load initrd." msgstr "载入 initrd。" @@ -1172,11 +1156,11 @@ msgid "Load NTLDR or BootMGR." msgstr "载入 NTLDR 或 BootMGR。" -#: grub-core/loader/i386/xnu.c:1130 +#: loader/i386/xnu.c:1032 msgid "Load device-properties dump." msgstr "载入设备特性转储。" -#: grub-core/loader/multiboot.c:339 +#: loader/multiboot_loader.c:133 msgid "Load a multiboot 2 kernel." msgstr "载入 multiboot 2 内核。" @@ -1184,43 +1168,43 @@ msgid "Load a multiboot 2 module." msgstr "载入 multiboot 2 模块。" -#: grub-core/loader/multiboot.c:345 +#: loader/multiboot_loader.c:136 msgid "Load a multiboot kernel." msgstr "载入 multiboot 内核。" -#: grub-core/loader/multiboot.c:348 +#: loader/multiboot_loader.c:141 msgid "Load a multiboot module." msgstr "载入 multiboot 模块。" -#: grub-core/loader/xnu.c:1456 +#: loader/xnu.c:1428 msgid "Load XNU image." msgstr "载入 XNU 内核镜像。" -#: grub-core/loader/xnu.c:1458 +#: loader/xnu.c:1430 msgid "Load 64-bit XNU image." msgstr "载入 64 位 XNU 镜像。" -#: grub-core/loader/xnu.c:1460 +#: loader/xnu.c:1432 msgid "Load XNU extension package." msgstr "载入 XNU 扩展包。" -#: grub-core/loader/xnu.c:1462 +#: loader/xnu.c:1434 msgid "Load XNU extension." msgstr "载入 XNU 扩展。" -#: grub-core/loader/xnu.c:1464 +#: loader/xnu.c:1436 msgid "DIRECTORY [OSBundleRequired]" msgstr "目录 [OSBundleRequired]" -#: grub-core/loader/xnu.c:1465 +#: loader/xnu.c:1437 msgid "Load XNU extension directory." msgstr "载入 XNU 扩展目录。" -#: grub-core/loader/xnu.c:1471 +#: loader/xnu.c:1444 msgid "Load a splash image for XNU." msgstr "载入引导画面。" -#: grub-core/loader/xnu.c:1476 +#: loader/xnu.c:1449 msgid "Load XNU hibernate image." msgstr "载入休眠镜像。" @@ -1240,11 +1224,11 @@ msgid "Remove any memory regions in specified range." msgstr "" -#: grub-core/normal/auth.c:216 +#: normal/auth.c:233 msgid "Enter username: " msgstr "输入用户名: " -#: grub-core/normal/auth.c:221 +#: normal/auth.c:238 msgid "Enter password: " msgstr "输入口令: " @@ -1256,41 +1240,41 @@ msgid "Authenticate users" msgstr "认证用户" -#: grub-core/normal/cmdline.c:174 grub-core/normal/menu_entry.c:1074 +#: normal/menu_entry.c:1060 msgid "Possible commands are:" msgstr "可用命令:" -#: grub-core/normal/cmdline.c:177 grub-core/normal/menu_entry.c:1078 +#: normal/menu_entry.c:1064 msgid "Possible devices are:" msgstr "可用设备:" -#: grub-core/normal/cmdline.c:180 grub-core/normal/menu_entry.c:1082 +#: normal/menu_entry.c:1068 msgid "Possible files are:" msgstr "可用文件:" -#: grub-core/normal/cmdline.c:183 grub-core/normal/menu_entry.c:1086 +#: normal/menu_entry.c:1072 msgid "Possible partitions are:" msgstr "可用分区:" -#: grub-core/normal/cmdline.c:186 grub-core/normal/menu_entry.c:1090 +#: normal/menu_entry.c:1076 msgid "Possible arguments are:" msgstr "可用参数:" -#: grub-core/normal/cmdline.c:189 grub-core/normal/menu_entry.c:1094 +#: normal/menu_entry.c:1080 msgid "Possible things are:" msgstr "可用事物:" -#: grub-core/normal/color.c:81 +#: normal/color.c:80 #, c-format msgid "Warning: syntax error (missing slash) in `%s'\n" msgstr "警告:%s 中有语法错误(缺少斜杠)\n" -#: grub-core/normal/color.c:90 +#: normal/color.c:89 #, c-format msgid "Warning: invalid foreground color `%s'\n" msgstr "警告:无效的前景色 `%s'\n" -#: grub-core/normal/color.c:96 +#: normal/color.c:95 #, c-format msgid "Warning: invalid background color `%s'\n" msgstr "警告:无效的背景色 `%s'\n" @@ -1303,16 +1287,16 @@ msgid "Export variables." msgstr "导出变量。" -#: grub-core/normal/dyncmd.c:159 +#: normal/dyncmd.c:147 msgid "not loaded" msgstr "未加载" -#: grub-core/normal/main.c:214 +#: normal/main.c:408 #, c-format msgid "GNU GRUB version %s" msgstr "GNU GRUB %s 版" -#: grub-core/normal/main.c:359 +#: normal/main.c:539 #, c-format msgid "" "Minimal BASH-like line editing is supported. For the first word, TAB lists " @@ -1320,11 +1304,11 @@ "file completions. %s" msgstr "支持最小化的类 Bash 行编辑。对于第一个单词 Tab 列出可用的命令名补全;对于其他位置 Tab 列出可能的设备或文件。%s" -#: grub-core/normal/main.c:362 +#: normal/main.c:542 msgid "ESC at any time exits." msgstr "任何时候按下 ESC 均可退出。" -#: grub-core/normal/main.c:496 +#: commands/minicmd.c:378 msgid "Clear the screen." msgstr "清屏。" @@ -1336,7 +1320,7 @@ msgid "Exit from normal mode." msgstr "退出普通模式。" -#: grub-core/normal/menu.c:50 grub-core/normal/menu_entry.c:1445 +#: normal/menu_entry.c:1397 msgid "Press any key to continue..." msgstr "按任意键继续..." @@ -1354,7 +1338,7 @@ msgid "Failed to boot both default and fallback entries.\n" msgstr "引导默认启动项和会滚启动想均失败。\n" -#: grub-core/normal/menu_entry.c:1199 +#: normal/menu_entry.c:1184 msgid "Booting a command list" msgstr "正在按照命令列表进行引导" @@ -1367,48 +1351,48 @@ "支持最小化的类 Emacs 屏幕编辑。Tab 列出可补全项,Ctrl-x 或 F10 进行引导,Ctrl-c 或 F2 进入命令行,ESC " "放弃编辑并返回菜单。" -#: grub-core/normal/menu_text.c:159 +#: normal/menu_text.c:186 #, c-format msgid "Use the %C and %C keys to select which entry is highlighted.\n" msgstr "使用 %C 键和 %C 键选择要高亮的启动项。\n" -#: grub-core/normal/menu_text.c:179 +#: normal/menu_text.c:203 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.\n" msgstr "按回车引导选定的操作系统,按 e 编辑引导命令,按 c 进入命令行,按 ESC 返回上一级菜单。\n" -#: grub-core/normal/menu_text.c:187 +#: normal/menu_text.c:211 msgid "" "Press enter to boot the selected OS, 'e' to edit the commands before booting " "or 'c' for a command-line.\n" msgstr "按回车引导选定的操作系统,按 e 编辑引导命令,按 c 进入命令行。\n" -#: grub-core/normal/misc.c:42 +#: normal/misc.c:41 #, c-format msgid "Partition %s:" msgstr "分区 %s:" -#: grub-core/normal/misc.c:47 +#: normal/misc.c:46 #, c-format msgid "Device %s:" msgstr "设备 %s:" -#: grub-core/normal/misc.c:53 +#: normal/misc.c:52 msgid "Filesystem cannot be accessed" msgstr "无法访问文件系统" -#: grub-core/normal/misc.c:64 +#: normal/misc.c:63 #, c-format msgid "Filesystem type %s" msgstr "文件系统类型 %s" -#: grub-core/normal/misc.c:74 +#: normal/misc.c:73 #, c-format msgid "- Label \"%s\"" msgstr "- 卷标 %s" -#: grub-core/normal/misc.c:89 +#: normal/misc.c:88 #, c-format msgid "- Last modification time %d-%02d-%02d %02d:%02d:%02d %s" msgstr "- 最近更改 %d-%02d-%02d %02d:%02d:%02d %s" @@ -1464,27 +1448,27 @@ msgid "Load background image for active terminal." msgstr "为活动终端加载背景图像。" -#: grub-core/term/serial.c:37 +#: term/serial.c:46 msgid "Set the serial unit." msgstr "设置串行单元。" -#: grub-core/term/serial.c:38 +#: term/serial.c:47 msgid "Set the serial port address." msgstr "设置串行端口地址。" -#: grub-core/term/serial.c:39 +#: term/serial.c:48 msgid "Set the serial port speed." msgstr "设置串行端口速度。" -#: grub-core/term/serial.c:40 +#: term/serial.c:49 msgid "Set the serial port word length." msgstr "设置串行端口字长。" -#: grub-core/term/serial.c:41 +#: term/serial.c:50 msgid "Set the serial port parity." msgstr "设置串行端口奇偶校验。" -#: grub-core/term/serial.c:42 +#: term/serial.c:51 msgid "Set the serial port stop bits." msgstr "设置串行端口停止位。" @@ -1753,33 +1737,33 @@ msgid "Debug tool for filesystem driver." msgstr "文件系统驱动调试工具。" -#: util/grub-mkimage.c:494 util/grub-mkimage.c:535 +#: util/grub-mkrawimage.c:69 msgid "the core image is too small" msgstr "核心镜像太小" -#: util/grub-mkimage.c:505 util/grub-mkimage.c:539 util/grub-mkimage.c:557 +#: util/grub-mkrawimage.c:81 msgid "cannot compress the kernel image" msgstr "无法压缩内核镜像" -#: util/grub-mkimage.c:672 +#: util/grub-mkrawimage.c:156 msgid "prefix is too long" msgstr "前缀太长" -#: util/grub-mkimage.c:836 +#: util/grub-mkrawimage.c:330 #, c-format msgid "core image is too big (%p > %p)" msgstr "核心镜像太大(%p > %p)" -#: util/grub-mkimage.c:842 +#: util/grub-mkrawimage.c:242 msgid "the core image is too big" msgstr "核心镜像太大" -#: util/grub-mkimage.c:861 +#: util/grub-mkrawimage.c:247 #, c-format msgid "diskboot.img size must be %u bytes" msgstr "diskboot.img 的大小必须为 %u 字节" -#: util/grub-mkimage.c:1402 +#: util/grub-mkrawimage.c:434 util/i386/pc/grub-setup.c:602 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "请尝试运行“%s --help”以获得更多信息。\n" @@ -1808,34 +1792,34 @@ "Report bugs to <%s>.\n" msgstr "" -#: util/grub-mkimage.c:1577 +#: util/grub-mkrawimage.c:580 #, c-format msgid "cannot open %s" msgstr "无法打开 %s" -#: util/grub-setup.c:215 +#: util/i386/pc/grub-setup.c:160 msgid "the first sector of the core file is not sector-aligned" msgstr "核心文件的第一扇区未对齐" -#: util/grub-setup.c:229 +#: util/i386/pc/grub-setup.c:174 msgid "non-sector-aligned data is found in the core file" msgstr "核心文件中发现未对齐的扇区" -#: util/grub-setup.c:245 +#: util/i386/pc/grub-setup.c:188 msgid "the sectors of the core file are too fragmented" msgstr "核心文件的扇区碎片太多" -#: util/grub-setup.c:258 +#: util/i386/pc/grub-setup.c:199 #, c-format msgid "the size of `%s' is not %u" msgstr "“%s”的大小不是 %u" -#: util/grub-setup.c:268 +#: util/i386/pc/grub-setup.c:216 #, c-format msgid "the size of `%s' is too small" msgstr "“%s”的尺寸太小" -#: util/grub-setup.c:271 +#: util/i386/pc/grub-setup.c:218 #, c-format msgid "the size of `%s' is too large" msgstr "“%s”的尺寸太大" @@ -1846,13 +1830,13 @@ "partition label and filesystem. This is not supported yet." msgstr "正在试图将 GRUB 安装至有多个分区标签的磁盘,或同时有分区标签和文件系统的磁盘。这样的操作尚未被支持。" -#: util/grub-setup.c:379 +#: util/i386/pc/grub-setup.c:255 #, c-format msgid "" "unable to identify a filesystem in %s; safety check can't be performed" msgstr "无法在 %s 中识别文件系统,无法执行安全性检测" -#: util/grub-setup.c:382 +#: util/i386/pc/grub-setup.c:259 #, c-format msgid "" "%s appears to contain a %s filesystem which isn't known to reserve space for " @@ -1880,7 +1864,7 @@ "is a BAD idea." msgstr "正在试图将 GRUB 安装至未分区的磁盘或一个分区。这是一个坏主意。" -#: util/grub-setup.c:499 +#: util/i386/pc/grub-setup.c:419 msgid "" "embedding is not possible, but this is required when the root device is on a " "RAID array or LVM volume" @@ -1902,30 +1886,30 @@ msgid "will not proceed with blocklists" msgstr "" -#: util/grub-setup.c:529 +#: util/i386/pc/grub-setup.c:445 #, c-format msgid "attempting to read the core image `%s' from GRUB" msgstr "正在尝试从 GRUB 读取核心镜像“%s”" -#: util/grub-setup.c:530 +#: util/i386/pc/grub-setup.c:446 #, c-format msgid "attempting to read the core image `%s' from GRUB again" msgstr "正在尝试再次从 GRUB 读取核心镜像“%s”" -#: util/grub-setup.c:589 +#: util/i386/pc/grub-setup.c:513 #, c-format msgid "cannot read `%s' correctly" msgstr "无法正确读取“%s”" -#: util/grub-setup.c:604 +#: util/i386/pc/grub-setup.c:526 msgid "no terminator in the core image" msgstr "核心镜像中没有终止符" -#: util/grub-setup.c:616 +#: util/i386/pc/grub-setup.c:537 msgid "failed to read the first sector of the core image" msgstr "读取核心镜像的第一扇区失败" -#: util/grub-setup.c:622 +#: util/i386/pc/grub-setup.c:543 msgid "failed to read the rest sectors of the core image" msgstr "读取核心镜像的其他扇区失败" @@ -1975,12 +1959,13 @@ "on some BIOSes." msgstr "" -#: util/grub-setup.c:822 +#: util/i386/pc/grub-setup.c:740 #, c-format msgid "Unknown extra argument `%s'.\n" msgstr "未知的额外参数“%s”。\n" -#: util/grub-setup.c:828 +#: util/i386/pc/grub-setup.c:734 +#, c-format msgid "No device is specified.\n" msgstr "没有指定设备。\n" @@ -1995,17 +1980,17 @@ msgid "DEVICE must be an OS device (e.g. /dev/sda)." msgstr "指定的设备必须是一个操作系统设备(例如 /dev/sda)。" -#: util/grub-setup.c:915 +#: util/i386/pc/grub-setup.c:757 #, c-format msgid "Invalid device `%s'.\n" msgstr "无效的设备“%s”。\n" -#: util/grub-setup.c:935 +#: util/i386/pc/grub-setup.c:770 #, c-format msgid "invalid root device `%s'" msgstr "无效的根设备“%s”" -#: util/grub-setup.c:949 +#: util/i386/pc/grub-setup.c:783 msgid "cannot guess the root device. Specify the option `--root-device'" msgstr "无法猜测根设备。请使用“--root-device”参数指定。" @@ -2021,27 +2006,27 @@ msgid "%s, with kFreeBSD %s (recovery mode)" msgstr "%s,kFreeBSd %s (恢复模式)" -#: util/grub.d/10_kfreebsd.in:76 +#: util/grub.d/10_kfreebsd.in:47 msgid "%s, with kFreeBSD %s" msgstr "%s,kFreeBSD %s" -#: util/grub.d/10_kfreebsd.in:87 +#: util/grub.d/10_kfreebsd.in:55 msgid "Loading kernel of FreeBSD %s ..." msgstr "载入 FreeBSD 内核 %s ..." -#: util/grub.d/10_linux.in:69 +#: util/grub.d/10_linux.in:60 msgid "%s, with Linux %s (recovery mode)" msgstr "%s,Linux %s (恢复模式)" -#: util/grub.d/10_linux.in:71 +#: util/grub.d/10_linux.in:62 msgid "%s, with Linux %s" msgstr "%s,Linux %s" -#: util/grub.d/10_linux.in:116 util/grub.d/20_linux_xen.in:85 +#: util/grub.d/10_linux.in:87 msgid "Loading Linux %s ..." msgstr "载入 Linux %s ..." -#: util/grub.d/10_linux.in:122 util/grub.d/20_linux_xen.in:93 +#: util/grub.d/10_linux.in:92 msgid "Loading initial ramdisk ..." msgstr "载入初始化内存盘..." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gutenprint.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gutenprint.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/gutenprint.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gutenprint.po 2012-02-23 07:11:52.000000000 +0000 @@ -1,21 +1,22 @@ -# Chinese (China) translation for gutenprint -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 +# Chinese (simplified) translation for gutenprint. +# Copyright (C) 2011 Robert L. Krawitz (rlk@alum.mit.edu) and Mike Sweet (mike@easysw.com) # This file is distributed under the same license as the gutenprint package. -# FIRST AUTHOR , 2006. +# Wylmer Wang , 2011. # msgid "" msgstr "" -"Project-Id-Version: gutenprint\n" -"Report-Msgid-Bugs-To: FULL NAME \n" +"Project-Id-Version: gutenprint 20110308\n" +"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-01 21:33-0400\n" -"PO-Revision-Date: 2010-04-15 10:16+0000\n" -"Last-Translator: Heling Yao \n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2012-02-15 08:07+0000\n" +"Last-Translator: 英华 \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: 2011-12-29 15:28+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:31+0000\n" +"X-Generator: Launchpad (build 14838)\n" +"Language: \n" #: src/main/dither-main.c:44 src/main/print-color.c:49 #: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872 @@ -65,11 +66,11 @@ #: src/main/dither-main.c:66 msgid "Fast" -msgstr "快速" +msgstr "快" #: src/main/dither-main.c:67 msgid "Very Fast" -msgstr "非常快" +msgstr "很快" #: src/main/dither-main.c:68 msgid "Hybrid Floyd-Steinberg" @@ -134,37 +135,37 @@ #: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74 msgid "Page Size" -msgstr "页面大小" +msgstr "页面尺寸" #: src/main/print-canon.c:203 src/main/print-escp2.c:169 #: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75 msgid "Size of the paper being printed to" -msgstr "打印纸张的大小" +msgstr "打印纸张的尺寸" #: src/main/print-canon.c:208 src/main/print-escp2.c:174 #: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869 #: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384 msgid "Media Type" -msgstr "介质类型" +msgstr "媒质类型" #: src/main/print-canon.c:209 src/main/print-escp2.c:175 #: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870 #: src/main/print-pcl.c:1353 msgid "Type of media (plain paper, photo paper, etc.)" -msgstr "纸张类型(普通纸,相片纸,等等)" +msgstr "媒质类型(普通纸、相片纸等)" #: src/main/print-canon.c:214 src/main/print-escp2.c:180 #: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875 #: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403 msgid "Media Source" -msgstr "介质来源" +msgstr "媒质来源" #: src/main/print-canon.c:215 src/main/print-escp2.c:181 #: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876 #: src/main/print-pcl.c:1359 msgid "Source (input slot) of the media" -msgstr "纸张来源(输入插槽)" +msgstr "媒质来源(进纸槽)" #: src/main/print-canon.c:220 src/main/print-escp2.c:192 msgid "CD Hub Size" @@ -176,7 +177,7 @@ #: src/main/print-canon.c:226 src/main/print-escp2.c:198 msgid "CD Size (Custom)" -msgstr "CD 容量 (自定义)" +msgstr "CD 尺寸(自定义)" #: src/main/print-canon.c:227 src/main/print-escp2.c:199 msgid "Variable adjustment for the outer diameter of CD" @@ -207,7 +208,7 @@ #: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881 #: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439 msgid "Resolution" -msgstr "清晰度" +msgstr "分辨率" #: src/main/print-canon.c:251 src/main/print-lexmark.c:285 #: src/main/print-olympus.c:1882 @@ -261,7 +262,7 @@ #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365 #: src/main/generic-options.c:62 src/main/generic-options.c:63 msgid "Print Quality" -msgstr "打印品质" +msgstr "打印质量" #: src/main/print-canon.c:303 src/main/print-escp2.c:454 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417 @@ -331,7 +332,7 @@ #: src/main/print-canon.c:372 src/main/print-escp2.c:2505 #: src/main/print-pcl.c:1684 msgid "Long Edge (Standard)" -msgstr "长边(标准)" +msgstr "长边(标准)" #: src/main/print-canon.c:373 src/main/print-pcl.c:1685 msgid "Short Edge (Flip)" @@ -340,17 +341,17 @@ #: src/main/print-canon.c:666 src/main/print-escp2.c:2216 #: src/xml/xmli18n-tmp.h:6613 msgid "CD - 5 inch" -msgstr "CD - 5英寸" +msgstr "CD - 5 英寸" #: src/main/print-canon.c:668 src/main/print-escp2.c:2218 #: src/xml/xmli18n-tmp.h:6614 msgid "CD - 3 inch" -msgstr "CD - 3英寸" +msgstr "CD - 3 英寸" #: src/main/print-canon.c:670 src/main/print-escp2.c:2220 #: src/xml/xmli18n-tmp.h:6615 msgid "CD - Custom" -msgstr "CD -自定义" +msgstr "CD - 自定义" #: src/main/print-canon.c:693 src/main/print-escp2.c:2254 #: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371 @@ -368,13 +369,13 @@ #: src/main/print-ps.c:329 src/main/print-raw.c:135 #: src/gutenprintui2/panel.c:291 msgid "Color" -msgstr "色彩" +msgstr "颜色" #: src/main/print-canon.c:812 src/main/print-escp2.c:2671 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999 #: src/main/print-ps.c:331 src/main/print-raw.c:137 msgid "Black and White" -msgstr "黑和百" +msgstr "黑白" #: src/main/print-canon.c:851 src/main/print-escp2.c:2309 #: src/main/print-pcl.c:1890 src/main/generic-options.c:213 @@ -602,7 +603,7 @@ #: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527 #: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542 msgid "Black" -msgstr "黑色" +msgstr "黑" #: src/main/print-color.c:50 msgid "High Accuracy" @@ -639,7 +640,7 @@ #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292 #: src/cups/genppd.c:1266 src/cups/genppd.c:2354 msgid "Grayscale" -msgstr "灰度级" +msgstr "灰度" #: src/main/print-color.c:123 msgid "Whitescale" @@ -651,15 +652,15 @@ #: src/main/print-color.c:127 msgid "CMY" -msgstr "减色系统" +msgstr "CMY" #: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361 msgid "CMYK" -msgstr "绿红黄黑标准颜色" +msgstr "CMYK" #: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362 msgid "KCMY" -msgstr "" +msgstr "KCMY" #: src/main/print-color.c:165 src/main/print-color.c:454 msgid "Channel " diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hello-debhelper.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello-debhelper.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hello-debhelper.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello-debhelper.po 2012-02-23 07:11: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: 2011-12-29 11:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: src/hello.c:100 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hello.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hello.po 2012-01-02 18:07:14.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello.po 2012-02-23 07:11: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: 2011-12-29 11:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: src/hello.c:100 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/help2man.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/help2man.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/help2man.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/help2man.po 2012-02-23 07:11: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: 2011-12-29 10:28+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: help2man:69 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/human-theme.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/human-theme.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/human-theme.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/human-theme.po 2012-02-23 07:11: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: 2011-12-29 15:37+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:40+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../index.theme.in.h:1 msgid "Ubuntu default theme" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hunspell.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hunspell.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/hunspell.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hunspell.po 2012-02-23 07:11: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: 2011-12-29 14:59+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:59+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/tools/hunspell.cxx:205 src/tools/hunspell.cxx:313 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-anthy.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-anthy.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-anthy.po 2012-01-02 18:07:41.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-anthy.po 2012-02-23 07:12:02.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: 2011-12-29 18:08+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: ../engine/engine.py:187 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-chewing.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-chewing.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-chewing.po 2012-01-02 18:07:42.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-chewing.po 2012-02-23 07:12:03.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: 2011-12-29 18:22+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: ../src/IBusChewingEngine.gob:331 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-hangul.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-hangul.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-hangul.po 2012-01-02 18:07:41.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-hangul.po 2012-02-23 07:12:02.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: 2011-12-29 18:06+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:56+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../setup/keycapturedialog.py:15 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-pinyin.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-pinyin.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-pinyin.po 2012-01-02 18:07:41.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-pinyin.po 2012-02-23 07:12:02.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: 2011-12-29 18:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: engine/pydict.py:358 setup/pydict.py:358 msgid "MSPY" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-table.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-table.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-table.po 2012-01-02 18:07:41.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-table.po 2012-02-23 07:12:02.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: 2011-12-29 18:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: engine/table.py:985 msgid "CN" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-unikey.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-unikey.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ibus-unikey.po 2012-01-02 18:07:45.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-unikey.po 2012-02-23 07:12:06.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: 2011-12-29 18:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/engine.cpp:680 msgid "Enable spell check" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/indent.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/indent.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/indent.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/indent.po 2012-02-23 07:11: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: 2011-12-29 10:28+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Basepath: d:\\msys\\source\\indent-2.2.9\n" #: src/args.c:611 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/isoquery.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/isoquery.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/isoquery.po 2012-01-02 18:07:39.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/isoquery.po 2012-02-23 07:11:59.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: 2011-12-29 17:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: isoquery/cmdline_parser.py:30 msgid "Usage: %prog [options] [ISO codes]" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/JabberBot.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/JabberBot.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/JabberBot.po 2012-02-23 07:11: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: 2011-12-29 11:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" #, python-format msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/jade.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jade.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/jade.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jade.po 2012-02-23 07:11: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: 2011-12-29 10:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n" +"X-Generator: Launchpad (build 14838)\n" msgid "cannot open output file %1 (%2)" msgstr "无法打开输出文件 %1 (%2)" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/jockey.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jockey.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/jockey.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jockey.po 2012-02-23 07:11:59.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: 2011-12-29 17:14+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: ../text/jockey-text.py:72 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kbd.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kbd.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kbd.po 2012-01-02 18:07:15.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kbd.po 2012-02-23 07:11:39.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: kbd-1.15\n" "Report-Msgid-Bugs-To: Alexey Gladkov \n" "POT-Creation-Date: 2010-04-11 01:15+0400\n" -"PO-Revision-Date: 2011-05-13 14:36+0000\n" +"PO-Revision-Date: 2012-02-13 11:35+0000\n" "Last-Translator: Jarod Wang \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: 2011-12-29 11:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 19:28+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/chvt.c:28 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kcm_gtk.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kcm_gtk.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kcm_gtk.po 2012-01-02 18:07:44.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kcm_gtk.po 2012-02-23 07:12:04.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: gtkqtengine\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2011-08-18 16:55+0000\n" -"PO-Revision-Date: 2011-08-18 22:13+0000\n" +"PO-Revision-Date: 2012-02-14 14:17+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: 简体中文 \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: kcmgtk.cpp:67 msgid "kcm_gtk" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kerneloops.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kerneloops.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kerneloops.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kerneloops.po 2012-02-23 07:11:59.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: 2011-12-29 17:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: kerneloops-applet.c:170 kerneloops-applet.c:212 msgid "Always" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po 2012-02-23 07:11: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: 2011-12-29 15:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:02+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../kubuntu-docs.desktop.in.h:1 msgid "Kubuntu System Documentation Index" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/language-selector.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/language-selector.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/language-selector.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/language-selector.po 2012-02-23 07:11:50.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: language-selector\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 09:41+0000\n" +"POT-Creation-Date: 2012-02-15 06:50+0000\n" "PO-Revision-Date: 2011-07-16 06:17+0000\n" "Last-Translator: TeliuTe \n" "Language-Team: Chinese (China) \n" @@ -15,95 +15,93 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2011-12-29 14:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:55+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #. Hack for Chinese langpack split #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically. -#: ../LanguageSelector/LocaleInfo.py:51 +#: ../LanguageSelector/LocaleInfo.py:50 msgid "Chinese (simplified)" msgstr "中文(简体)" #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically. -#: ../LanguageSelector/LocaleInfo.py:53 +#: ../LanguageSelector/LocaleInfo.py:52 msgid "Chinese (traditional)" msgstr "中文(繁体)" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:229 -#: ../LanguageSelector/qt/QtLanguageSelector.py:84 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:225 +#: ../LanguageSelector/qt/QtLanguageSelector.py:85 msgid "No language information available" msgstr "没有可用的语言信息" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230 -#: ../LanguageSelector/qt/QtLanguageSelector.py:85 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:226 +#: ../LanguageSelector/qt/QtLanguageSelector.py:86 msgid "" "The system does not have information about the available languages yet. Do " "you want to perform a network update to get them now? " msgstr "此系统没有任何有关可用语言的信息,您希望现在执行网络更新来获取它们吗? " -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:234 -#: ../LanguageSelector/qt/QtLanguageSelector.py:79 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230 +#: ../LanguageSelector/qt/QtLanguageSelector.py:80 msgid "_Update" msgstr "更新(_U)" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:319 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:357 -#: ../data/LanguageSelector.ui.h:24 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:314 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:351 +#: ../data/LanguageSelector.ui.h:23 msgid "Language" msgstr "语言" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:326 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:321 msgid "Installed" msgstr "已安装" #. print "%(INSTALL)d to install, %(REMOVE)d to remove" % (countInstall, countRemove) #. Translators: %(INSTALL)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "INSTALL". -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:395 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:389 #, python-format msgid "%(INSTALL)d to install" msgid_plural "%(INSTALL)d to install" msgstr[0] "将安装 %(INSTALL)d 个" #. Translators: %(REMOVE)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "REMOVE". -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:397 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:391 #, python-format msgid "%(REMOVE)d to remove" msgid_plural "%(REMOVE)d to remove" msgstr[0] "将移除 %(REMOVE)d 个" #. Translators: this string will concatenate the "%n to install" and "%n to remove" strings, you can replace the comma if you need to. -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:406 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:400 #, python-format msgid "%s, %s" msgstr "%s,%s" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:468 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:462 msgid "none" msgstr "无" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:518 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:714 -#: ../LanguageSelector/qt/QtLanguageSelector.py:68 -#: ../LanguageSelector/qt/QtLanguageSelector.py:337 -#: ../check-language-support:52 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:512 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:716 +#: ../LanguageSelector/qt/QtLanguageSelector.py:69 +#: ../LanguageSelector/qt/QtLanguageSelector.py:328 msgid "Software database is broken" msgstr "软件数据库损坏" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:519 -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:715 -#: ../check-language-support:53 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:513 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:717 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\" 来修正这个问题。" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:564 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:554 msgid "Could not install the selected language support" msgstr "不能安装选定的语言支持" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:565 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:555 msgid "" "This is perhaps a bug of this application. Please file a bug report at " "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug" @@ -111,11 +109,13 @@ "这也许是该应用程序的一个问题。 请在 https://bugs.launchpad.net/ubuntu/+source/language-" "selector/+filebug?no-redirect 上报告这个问题。" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:589 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:579 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:614 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:618 msgid "Could not install the full language support" msgstr "无法安装完整的语言支持" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:590 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:580 msgid "" "Usually this is related to an error in your software archive or software " "manager. Check your preferences in Software Sources (click the icon at the " @@ -123,41 +123,45 @@ "Sources\")." msgstr "" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671 -#: ../LanguageSelector/qt/QtLanguageSelector.py:161 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:615 +msgid "Failed to authorize to install packages." +msgstr "" + +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673 +#: ../LanguageSelector/qt/QtLanguageSelector.py:162 msgid "The language support is not installed completely" msgstr "语言支持没有安装完整" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:672 -#: ../LanguageSelector/qt/QtLanguageSelector.py:162 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674 +#: ../LanguageSelector/qt/QtLanguageSelector.py:163 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:675 -#: ../LanguageSelector/qt/QtLanguageSelector.py:80 -#: ../LanguageSelector/qt/QtLanguageSelector.py:157 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:677 +#: ../LanguageSelector/qt/QtLanguageSelector.py:81 +#: ../LanguageSelector/qt/QtLanguageSelector.py:158 msgid "_Remind Me Later" msgstr "稍后提醒(_R)" #. FIXME: add "details" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:676 -#: ../LanguageSelector/qt/QtLanguageSelector.py:156 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:678 +#: ../LanguageSelector/qt/QtLanguageSelector.py:157 msgid "_Install" msgstr "安装(_I)" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:679 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:681 msgid "Details" msgstr "详细信息" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:937 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935 #, python-format msgid "Failed to apply the '%s' format choice:" msgstr "应用“%s”格式选项失败:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:69 -#: ../LanguageSelector/qt/QtLanguageSelector.py:338 +#: ../LanguageSelector/qt/QtLanguageSelector.py:70 +#: ../LanguageSelector/qt/QtLanguageSelector.py:329 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Adept\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -165,114 +169,114 @@ msgstr "" "无法安装或移除任何软件包。请先使用软件包管理器“Adept”或者在终端中运行“sudo apt-get install -f”来修复这个问题。" -#: ../LanguageSelector/qt/QtLanguageSelector.py:113 +#: ../LanguageSelector/qt/QtLanguageSelector.py:114 msgid "Set System Language" msgstr "设定系统语言" -#: ../LanguageSelector/qt/QtLanguageSelector.py:114 +#: ../LanguageSelector/qt/QtLanguageSelector.py:115 msgid "Default system language:" msgstr "默认系统语言:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:115 +#: ../LanguageSelector/qt/QtLanguageSelector.py:116 msgid "Keyboard input method:" msgstr "输入法:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:116 +#: ../LanguageSelector/qt/QtLanguageSelector.py:117 msgid "Select language to install:" msgstr "选择要安装的语言:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:117 +#: ../LanguageSelector/qt/QtLanguageSelector.py:118 msgid "Select language to uninstall:" msgstr "选择要卸载的语言:" -#: ../LanguageSelector/qt/QtLanguageSelector.py:118 +#: ../LanguageSelector/qt/QtLanguageSelector.py:119 msgid "Translations" msgstr "翻译" -#: ../LanguageSelector/qt/QtLanguageSelector.py:119 +#: ../LanguageSelector/qt/QtLanguageSelector.py:120 msgid "Input methods" msgstr "输入法" -#: ../LanguageSelector/qt/QtLanguageSelector.py:120 +#: ../LanguageSelector/qt/QtLanguageSelector.py:121 msgid "Spellchecking and writing aids" msgstr "拼写检查和写作指南" -#: ../LanguageSelector/qt/QtLanguageSelector.py:121 +#: ../LanguageSelector/qt/QtLanguageSelector.py:122 msgid "Extra fonts" msgstr "附加字体" -#: ../LanguageSelector/qt/QtLanguageSelector.py:122 +#: ../LanguageSelector/qt/QtLanguageSelector.py:123 msgid "Components:" msgstr "组件:" #. not sure how to unset all flags, but this disables the item -#: ../LanguageSelector/qt/QtLanguageSelector.py:201 +#: ../LanguageSelector/qt/QtLanguageSelector.py:202 msgid "Already installed" msgstr "已经安装" -#: ../LanguageSelector/qt/QtLanguageSelector.py:204 +#: ../LanguageSelector/qt/QtLanguageSelector.py:205 msgid "Partially Installed" msgstr "部分安装" #. not sure how to unset all flags, but this disables the item -#: ../LanguageSelector/qt/QtLanguageSelector.py:207 +#: ../LanguageSelector/qt/QtLanguageSelector.py:208 msgid "Not installed" msgstr "未安装" -#: ../LanguageSelector/qt/QtLanguageSelector.py:246 +#: ../LanguageSelector/qt/QtLanguageSelector.py:243 msgid "Component already installed" msgstr "组件已经安装" -#: ../LanguageSelector/qt/QtLanguageSelector.py:248 +#: ../LanguageSelector/qt/QtLanguageSelector.py:245 msgid "Component not available" msgstr "组件不可用" -#: ../LanguageSelector/qt/QtLanguageSelector.py:250 +#: ../LanguageSelector/qt/QtLanguageSelector.py:247 msgid "Component not installed" msgstr "组件未安装" -#: ../LanguageSelector/qt/QtLanguageSelector.py:292 +#: ../LanguageSelector/qt/QtLanguageSelector.py:288 #, python-format msgid "Default system Language now set to %s." msgstr "默认系统语言现在设定为 %s。" -#: ../LanguageSelector/qt/QtLanguageSelector.py:292 +#: ../LanguageSelector/qt/QtLanguageSelector.py:288 msgid "Language Set" msgstr "语言设定" -#: ../LanguageSelector/qt/QtLanguageSelector.py:363 +#: ../LanguageSelector/qt/QtLanguageSelector.py:354 #, python-format msgid "" "All selected components have now been installed for %s. Select them from " "Country/Region & Language." msgstr "已经安装 %s 全部选择的组件。请从“国家/区域和语言”中选择它们。" -#: ../LanguageSelector/qt/QtLanguageSelector.py:363 +#: ../LanguageSelector/qt/QtLanguageSelector.py:354 msgid "Language Installed" msgstr "已安装的语言" -#: ../LanguageSelector/qt/QtLanguageSelector.py:365 +#: ../LanguageSelector/qt/QtLanguageSelector.py:356 #, python-format msgid "Translations and support have now been uninstalled for %s." msgstr "已经卸载 %s 的翻译和语言支持" -#: ../LanguageSelector/qt/QtLanguageSelector.py:365 +#: ../LanguageSelector/qt/QtLanguageSelector.py:356 msgid "Language Uninstalled" msgstr "已卸载的语言" -#: ../LanguageSelector/qt/QtLanguageSelector.py:373 +#: ../LanguageSelector/qt/QtLanguageSelector.py:364 msgid "Failed to set system language." msgstr "设定系统语言失败。" -#: ../LanguageSelector/qt/QtLanguageSelector.py:373 +#: ../LanguageSelector/qt/QtLanguageSelector.py:364 msgid "Language Not Set" msgstr "未设定语言" -#: ../LanguageSelector/qt/QtLanguageSelector.py:442 +#: ../LanguageSelector/qt/QtLanguageSelector.py:433 msgid "Please run this software with administrative rights." msgstr "请以管理员权限运行此软件。" -#: ../LanguageSelector/qt/QtLanguageSelector.py:442 +#: ../LanguageSelector/qt/QtLanguageSelector.py:433 msgid "Not Root User" msgstr "非 Root 用户" @@ -341,21 +345,19 @@ #: ../data/LanguageSelector.ui.h:16 msgid "" -"Use the same language choices for startup and the login screen.\n" -"Changes take effect only after a restart of the system." +"Use the same language choices for startup and the login " +"screen." msgstr "" -"为启动和登录界面使用相同的语言。\n" -"重新启动系统后会应用修改。" -#: ../data/LanguageSelector.ui.h:18 +#: ../data/LanguageSelector.ui.h:17 msgid "Install / Remove Languages..." msgstr "添加或删除语言..." -#: ../data/LanguageSelector.ui.h:19 +#: ../data/LanguageSelector.ui.h:18 msgid "Keyboard input method system:" msgstr "键盘输入方式系统:" -#: ../data/LanguageSelector.ui.h:20 +#: ../data/LanguageSelector.ui.h:19 msgid "" "If you need to type in languages, which require more complex input methods " "than just a simple key to letter mapping, you may want to enable this " @@ -371,11 +373,11 @@ "对于 Ubuntu 系统,推荐的值是“ibus”。\n" "如果您想要使用其他的输入法系统,请先安装相应的软件包,然后在这里选择希望使用的系统。" -#: ../data/LanguageSelector.ui.h:25 +#: ../data/LanguageSelector.ui.h:24 msgid "Display numbers, dates and currency amounts in the usual format for:" msgstr "通常显示数字,日期和货币数额的格式:" -#: ../data/LanguageSelector.ui.h:26 +#: ../data/LanguageSelector.ui.h:25 msgid "" "This will set the system environment like shown below and will also affect " "the preferred paper format and other region specific settings.\n" @@ -388,35 +390,32 @@ "如果您希望桌面显示不同的语言,请点击“语言”标签。\n" "因此,您应该按照您的地区设置一个合理的值。" -#: ../data/LanguageSelector.ui.h:29 +#: ../data/LanguageSelector.ui.h:28 msgid "Changes take effect next time you log in." msgstr "更改将会在您下次登录时生效。" -#: ../data/LanguageSelector.ui.h:30 +#: ../data/LanguageSelector.ui.h:29 msgid "" -"Use the same format choice for startup and the login screen.\n" -"Changes take effect only after a restart of the system." +"Use the same format choice for startup and the login screen." msgstr "" -"为启动和登录界面使用相同的格式。\n" -"重新启动系统后会应用修改。" -#: ../data/LanguageSelector.ui.h:32 +#: ../data/LanguageSelector.ui.h:30 msgid "Number:" msgstr "号码:" -#: ../data/LanguageSelector.ui.h:33 +#: ../data/LanguageSelector.ui.h:31 msgid "Date:" msgstr "日期:" -#: ../data/LanguageSelector.ui.h:34 +#: ../data/LanguageSelector.ui.h:32 msgid "Currency:" msgstr "货币:" -#: ../data/LanguageSelector.ui.h:35 +#: ../data/LanguageSelector.ui.h:33 msgid "Example" msgstr "范例" -#: ../data/LanguageSelector.ui.h:36 +#: ../data/LanguageSelector.ui.h:34 msgid "Regional Formats" msgstr "地区格式" @@ -479,72 +478,72 @@ msgid "System policy prevented setting default language" msgstr "" -#: ../gnome-language-selector:20 +#: ../gnome-language-selector:17 msgid "don't verify installed language support" msgstr "不要验证已安装的语言支持" -#: ../gnome-language-selector:23 ../check-language-support:22 +#: ../gnome-language-selector:20 ../check-language-support:25 msgid "alternative datadir" msgstr "可选的数据文件夹" -#: ../fontconfig-voodoo:18 +#: ../fontconfig-voodoo:17 msgid "Aborting" msgstr "正在中止" -#: ../fontconfig-voodoo:26 +#: ../fontconfig-voodoo:25 msgid "Force even when a configuration exists" msgstr "当配置已存在时强制执行" -#: ../fontconfig-voodoo:28 +#: ../fontconfig-voodoo:27 msgid "Set fontconfig voodoo for the selected language" msgstr "为选择的语言设置 fontconfig voodoo" -#: ../fontconfig-voodoo:32 +#: ../fontconfig-voodoo:31 msgid "" "Guess a configuration based on the LANGUAGE environment. Sets the config to " "'none' if nothing suitable was found" msgstr "配置会根据 LANGUAGE 环境变量自动生成,如果找不到合适的变量,请将设定改为“none”。" -#: ../fontconfig-voodoo:37 +#: ../fontconfig-voodoo:36 msgid "List the available fontconfig-voodoo configs" msgstr "列出可用的 fontconfig-voodoo 设置" -#: ../fontconfig-voodoo:40 +#: ../fontconfig-voodoo:39 msgid "Show the current fontconfig-voodoo config" msgstr "显示当前 fontconfig-voodoo 设置" -#: ../fontconfig-voodoo:43 +#: ../fontconfig-voodoo:42 msgid "Remove the current fontconfig-voodoo config" msgstr "移除当前的 fontconfig-voodoo 配置" -#: ../fontconfig-voodoo:65 +#: ../fontconfig-voodoo:64 msgid "Unconfigured" msgstr "未配置" -#: ../fontconfig-voodoo:81 +#: ../fontconfig-voodoo:80 msgid "A configuration exists already. Use '--force' to overwrite it. " msgstr "配置文件已经存在。使用“--force”覆盖。 " -#: ../fontconfig-voodoo:90 +#: ../fontconfig-voodoo:89 msgid "No fontconfig-voodoo configuration found for the current LANGUAGE" msgstr "未找到对应于当前 LANGUAGE 的 fontconfig-voodoo 配置" -#: ../fontconfig-voodoo:97 +#: ../fontconfig-voodoo:96 msgid "No fontconfig-voodoo configuration found for the selected locale" msgstr "选择的位置没有发现 fontconfig-voodoo 配置设置" -#: ../check-language-support:19 +#: ../check-language-support:22 msgid "target language code" msgstr "目标语言代号" -#: ../check-language-support:23 +#: ../check-language-support:26 msgid "check for the given package(s) only -- separate packagenames by comma" msgstr "仅检查给定的软件包 -- 用英文逗号分隔包名" -#: ../check-language-support:25 -msgid "check all available languages" -msgstr "检查可用语言" - #: ../check-language-support:28 +msgid "output all available language support packages for all languages" +msgstr "" + +#: ../check-language-support:31 msgid "show installed packages as well as missing ones" msgstr "同时显示已安装的和缺失的软件包" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/launchpad-integration.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/launchpad-integration.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/launchpad-integration.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/launchpad-integration.po 2012-02-23 07:11: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: 2011-12-29 15:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:03+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/launchpad-integration.c:71 msgid "The Launchpad helper application failed" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ldm.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ldm.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ldm.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ldm.po 2012-02-23 07:11:58.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: 2011-12-29 17:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:04+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../src/plugin.c:20 msgid "Username" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ld.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ld.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ld.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ld.po 2012-02-23 07:11:25.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: ld 2.15.96\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-02 14:30+0100\n" -"PO-Revision-Date: 2011-12-13 17:20+0000\n" +"PO-Revision-Date: 2012-01-27 01:24+0000\n" "Last-Translator: Meng Jie \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: 2011-12-29 09:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: emultempl/armcoff.em:73 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lftp.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lftp.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lftp.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lftp.po 2012-02-23 07:11: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: 2011-12-29 10:34+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" "X-Poedit-SourceCharset: utf-8\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-inst1.3.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-inst1.3.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-inst1.3.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-inst1.3.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,297 +0,0 @@ -# Chinese/Simplified translation of apt. -# This file is put in the public domain. -# Deng Xiyue , 2007, 2008. -# Tchaikov , 2005, 2007. -# Carlos Z.F. Liu , 2004, 2006. -# Aron Xu , 2009, 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: apt 0.8.0~pre1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-29 19:46+0000\n" -"PO-Revision-Date: 2011-12-06 08:39+0000\n" -"Last-Translator: Aron Xu \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: 2011-12-29 09:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" -"Language: \n" - -#: apt-inst/contrib/extracttar.cc:114 -msgid "Failed to create pipes" -msgstr "无法创建管道" - -#: apt-inst/contrib/extracttar.cc:141 -msgid "Failed to exec gzip " -msgstr "无法执行 gzip " - -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 -msgid "Corrupted archive" -msgstr "包文件已被损坏" - -#: apt-inst/contrib/extracttar.cc:193 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar 的校验和不符,文件已损坏" - -#: apt-inst/contrib/extracttar.cc:300 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "未知的 TAR 数据头类型 %u,成员 %s" - -#: apt-inst/contrib/arfile.cc:70 -msgid "Invalid archive signature" -msgstr "无效的归档签名" - -#: apt-inst/contrib/arfile.cc:78 -msgid "Error reading archive member header" -msgstr "读取归档成员文件头出错" - -#: apt-inst/contrib/arfile.cc:90 -#, c-format -msgid "Invalid archive member header %s" -msgstr "归档文件中成员文件头 %s 无效" - -#: apt-inst/contrib/arfile.cc:102 -msgid "Invalid archive member header" -msgstr "归档文件中成员文件头无效" - -#: apt-inst/contrib/arfile.cc:128 -msgid "Archive is too short" -msgstr "归档文件太短" - -#: apt-inst/contrib/arfile.cc:132 -msgid "Failed to read the archive headers" -msgstr "无法读取归档文件的数据头" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "把 DropNode 用在了仍在链表中的节点上" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "无法定位哈希表元素!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "无法分配转移项" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "内部错误,出现在 AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "尝试覆盖一个转移项,%s -> %s 和 %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "添加了两个转移项 %s-> %s" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "重复的配置文件 %s/%s" - -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed to write file %s" -msgstr "无法写入文件 %s" - -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 -#, c-format -msgid "Failed to close file %s" -msgstr "无法关闭文件 %s" - -#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 -#, c-format -msgid "The path %s is too long" -msgstr "路径名 %s 太长" - -#: apt-inst/extract.cc:124 -#, c-format -msgid "Unpacking %s more than once" -msgstr "%s 被解包了不只一次" - -#: apt-inst/extract.cc:134 -#, c-format -msgid "The directory %s is diverted" -msgstr "目录 %s 已被转移" - -#: apt-inst/extract.cc:144 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "该软件包正尝试写入转移对象 %s/%s" - -#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 -msgid "The diversion path is too long" -msgstr "该转移路径太长" - -#: apt-inst/extract.cc:178 apt-inst/extract.cc:190 apt-inst/extract.cc:207 -#: apt-inst/deb/dpkgdb.cc:117 -#, c-format -msgid "Failed to stat %s" -msgstr "无法获得 %s 的状态" - -#: apt-inst/extract.cc:185 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "无法将 %s 重命名为 %s" - -#: apt-inst/extract.cc:240 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "目录 %s 要被一个非目录的文件替换" - -#: apt-inst/extract.cc:280 -msgid "Failed to locate node in its hash bucket" -msgstr "无法在其散列桶中分配节点" - -#: apt-inst/extract.cc:284 -msgid "The path is too long" -msgstr "路径名太长" - -#: apt-inst/extract.cc:412 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "用来覆盖的软件包不属于 %s 的任何版本" - -#: apt-inst/extract.cc:429 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" - -#: apt-inst/extract.cc:462 -#, c-format -msgid "Unable to read %s" -msgstr "无法读取 %s" - -#: apt-inst/extract.cc:489 -#, c-format -msgid "Unable to stat %s" -msgstr "无法读取 %s 的状态" - -#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 -#, c-format -msgid "Failed to remove %s" -msgstr "无法卸载 %s" - -#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 -#, c-format -msgid "Unable to create %s" -msgstr "无法创建 %s" - -#: apt-inst/deb/dpkgdb.cc:114 -#, c-format -msgid "Failed to stat %sinfo" -msgstr "无法读取 %sinfo 的状态" - -#: apt-inst/deb/dpkgdb.cc:119 -msgid "The info and temp directories need to be on the same filesystem" -msgstr "info 和 temp 目录要求处于同一文件系统之下" - -#: apt-inst/deb/dpkgdb.cc:135 -msgid "Reading package lists" -msgstr "正在读取软件包列表" - -#: apt-inst/deb/dpkgdb.cc:176 -#, c-format -msgid "Failed to change to the admin dir %sinfo" -msgstr "无法切换工作目录到 admin 目录 %sinfo" - -#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 -#: apt-inst/deb/dpkgdb.cc:444 -msgid "Internal error getting a package name" -msgstr "在获取软件包名字时出现内部错误" - -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 -msgid "Reading file listing" -msgstr "正在读取文件列表" - -#: apt-inst/deb/dpkgdb.cc:212 -#, c-format -msgid "" -"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " -"then make it empty and immediately re-install the same version of the " -"package!" -msgstr "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马上重新安装相同版本的这个软件包!" - -#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 -#, c-format -msgid "Failed reading the list file %sinfo/%s" -msgstr "无法读取列表文件 %sinfo/%s" - -#: apt-inst/deb/dpkgdb.cc:262 -msgid "Internal error getting a node" -msgstr "获得一个节点时出现内部错误" - -#: apt-inst/deb/dpkgdb.cc:305 -#, c-format -msgid "Failed to open the diversions file %sdiversions" -msgstr "无法打开转移配置文件 %sdiversions" - -#: apt-inst/deb/dpkgdb.cc:320 -msgid "The diversion file is corrupted" -msgstr "该转移配置文件被损坏了" - -#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 -#: apt-inst/deb/dpkgdb.cc:337 -#, c-format -msgid "Invalid line in the diversion file: %s" -msgstr "转移配置文件中有一行是无效的:%s" - -#: apt-inst/deb/dpkgdb.cc:358 -msgid "Internal error adding a diversion" -msgstr "添加转移配置时出现内部错误" - -#: apt-inst/deb/dpkgdb.cc:379 -msgid "The pkg cache must be initialized first" -msgstr "必须首先初始化软件包缓存" - -#: apt-inst/deb/dpkgdb.cc:439 -#, c-format -msgid "Failed to find a Package: header, offset %lu" -msgstr "无法找到某个软件包:包头,于偏移位置 %lu" - -#: apt-inst/deb/dpkgdb.cc:461 -#, c-format -msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" - -#: apt-inst/deb/dpkgdb.cc:466 -#, c-format -msgid "Error parsing MD5. Offset %lu" -msgstr "解析 MD5 出错。文件内偏移量为 %lu" - -#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”" - -#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain -#: apt-inst/deb/debfile.cc:53 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”" - -#: apt-inst/deb/debfile.cc:113 -#, c-format -msgid "Couldn't change to %s" -msgstr "无法切换工作目录到 %s" - -#: apt-inst/deb/debfile.cc:154 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "内部错误,无法定位包内文件 %s" - -#: apt-inst/deb/debfile.cc:189 -msgid "Failed to locate a valid control file" -msgstr "无法在归档文件中找到有效的主控文件" - -#: apt-inst/deb/debfile.cc:274 -msgid "Unparsable control file" -msgstr "不能解析的主控文件" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po 2012-02-23 07:11:24.000000000 +0000 @@ -0,0 +1,297 @@ +# Chinese/Simplified translation of apt. +# This file is put in the public domain. +# Deng Xiyue , 2007, 2008. +# Tchaikov , 2005, 2007. +# Carlos Z.F. Liu , 2004, 2006. +# Aron Xu , 2009, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: apt 0.8.0~pre1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-14 10:00+0000\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Aron Xu \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: 2012-02-21 17:26+0000\n" +"X-Generator: Launchpad (build 14838)\n" +"Language: \n" + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "无法创建管道" + +#: apt-inst/contrib/extracttar.cc:144 +msgid "Failed to exec gzip " +msgstr "无法执行 gzip " + +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +msgid "Corrupted archive" +msgstr "包文件已被损坏" + +#: apt-inst/contrib/extracttar.cc:196 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar 的校验和不符,文件已损坏" + +#: apt-inst/contrib/extracttar.cc:303 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "未知的 TAR 数据头类型 %u,成员 %s" + +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "无效的归档签名" + +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "读取归档成员文件头出错" + +#: apt-inst/contrib/arfile.cc:94 +#, c-format +msgid "Invalid archive member header %s" +msgstr "归档文件中成员文件头 %s 无效" + +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "归档文件中成员文件头无效" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Archive is too short" +msgstr "归档文件太短" + +#: apt-inst/contrib/arfile.cc:136 +msgid "Failed to read the archive headers" +msgstr "无法读取归档文件的数据头" + +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "把 DropNode 用在了仍在链表中的节点上" + +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "无法定位哈希表元素!" + +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "无法分配转移项" + +#: apt-inst/filelist.cc:466 +msgid "Internal error in AddDiversion" +msgstr "内部错误,出现在 AddDiversion" + +#: apt-inst/filelist.cc:479 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "尝试覆盖一个转移项,%s -> %s 和 %s/%s" + +#: apt-inst/filelist.cc:508 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "添加了两个转移项 %s-> %s" + +#: apt-inst/filelist.cc:551 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "重复的配置文件 %s/%s" + +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55 +#, c-format +msgid "Failed to write file %s" +msgstr "无法写入文件 %s" + +#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108 +#, c-format +msgid "Failed to close file %s" +msgstr "无法关闭文件 %s" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "路径名 %s 太长" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "%s 被解包了不只一次" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "目录 %s 已被转移" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "该软件包正尝试写入转移对象 %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "该转移路径太长" + +#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210 +#: apt-inst/deb/dpkgdb.cc:121 +#, c-format +msgid "Failed to stat %s" +msgstr "无法获得 %s 的状态" + +#: apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "无法将 %s 重命名为 %s" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "目录 %s 要被一个非目录的文件替换" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "无法在其散列桶中分配节点" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "路径名太长" + +#: apt-inst/extract.cc:415 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "用来覆盖的软件包不属于 %s 的任何版本" + +#: apt-inst/extract.cc:432 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" + +#: apt-inst/extract.cc:465 +#, c-format +msgid "Unable to read %s" +msgstr "无法读取 %s" + +#: apt-inst/extract.cc:492 +#, c-format +msgid "Unable to stat %s" +msgstr "无法读取 %s 的状态" + +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#, c-format +msgid "Failed to remove %s" +msgstr "无法卸载 %s" + +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#, c-format +msgid "Unable to create %s" +msgstr "无法创建 %s" + +#: apt-inst/deb/dpkgdb.cc:118 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "无法读取 %sinfo 的状态" + +#: apt-inst/deb/dpkgdb.cc:123 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "info 和 temp 目录要求处于同一文件系统之下" + +#: apt-inst/deb/dpkgdb.cc:139 +msgid "Reading package lists" +msgstr "正在读取软件包列表" + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "无法切换工作目录到 admin 目录 %sinfo" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 +msgid "Internal error getting a package name" +msgstr "在获取软件包名字时出现内部错误" + +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +msgid "Reading file listing" +msgstr "正在读取文件列表" + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件,那么就清空该文件并马上重新安装相同版本的这个软件包!" + +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "无法读取列表文件 %sinfo/%s" + +#: apt-inst/deb/dpkgdb.cc:266 +msgid "Internal error getting a node" +msgstr "获得一个节点时出现内部错误" + +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "无法打开转移配置文件 %sdiversions" + +#: apt-inst/deb/dpkgdb.cc:324 +msgid "The diversion file is corrupted" +msgstr "该转移配置文件被损坏了" + +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "转移配置文件中有一行是无效的:%s" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal error adding a diversion" +msgstr "添加转移配置时出现内部错误" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "必须首先初始化软件包缓存" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "无法找到某个软件包:包头,于偏移位置 %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "解析 MD5 出错。文件内偏移量为 %lu" + +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”" + +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:56 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”,“%s”或者“%s”" + +#: apt-inst/deb/debfile.cc:116 +#, c-format +msgid "Couldn't change to %s" +msgstr "无法切换工作目录到 %s" + +#: apt-inst/deb/debfile.cc:157 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "内部错误,无法定位包内文件 %s" + +#: apt-inst/deb/debfile.cc:192 +msgid "Failed to locate a valid control file" +msgstr "无法在归档文件中找到有效的主控文件" + +#: apt-inst/deb/debfile.cc:277 +msgid "Unparsable control file" +msgstr "不能解析的主控文件" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-pkg4.11.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-pkg4.11.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-pkg4.11.po 2012-01-02 18:07:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-pkg4.11.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,1613 +0,0 @@ -# Chinese/Simplified translation of apt. -# This file is put in the public domain. -# Deng Xiyue , 2007, 2008. -# Tchaikov , 2005, 2007. -# Carlos Z.F. Liu , 2004, 2006. -# Aron Xu , 2009, 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: apt 0.8.0~pre1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-29 19:46+0000\n" -"PO-Revision-Date: 2011-12-06 07:58+0000\n" -"Last-Translator: Aron Xu \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: 2011-12-29 09:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" -"Language: \n" - -#: methods/bzip2.cc:60 methods/gzip.cc:52 -msgid "Empty files can't be valid archives" -msgstr "" - -#: methods/bzip2.cc:64 -#, c-format -msgid "Couldn't open pipe for %s" -msgstr "无法为 %s 开启管道" - -#: methods/bzip2.cc:108 -#, c-format -msgid "Read error from %s process" -msgstr "从 %s 进程读取数据出错" - -#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527 -#: methods/rred.cc:536 -msgid "Failed to stat" -msgstr "无法读取状态" - -#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:533 -msgid "Failed to set modification time" -msgstr "无法设置文件的修改日期" - -#: methods/cdrom.cc:200 -#, c-format -msgid "Unable to read the cdrom database %s" -msgstr "无法读取盘片数据库 %s" - -#: methods/cdrom.cc:209 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来加入新的盘片。" - -#: methods/cdrom.cc:219 -msgid "Wrong CD-ROM" -msgstr "错误的 CD-ROM" - -#: methods/cdrom.cc:246 -#, c-format -msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "无法卸载现在挂载于 %s 的 CD-ROM,它可能正在使用中。" - -#: methods/cdrom.cc:251 -msgid "Disk not found." -msgstr "找不到盘片。" - -#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 -msgid "File not found" -msgstr "无法找到该文件" - -#: methods/file.cc:44 -msgid "Invalid URI, local URIS must not start with //" -msgstr "无效的 URI,本地的 URI 不能以 // 开头" - -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:169 -msgid "Logging in" -msgstr "正在登录" - -#: methods/ftp.cc:175 -msgid "Unable to determine the peer name" -msgstr "无法获知对方主机名" - -#: methods/ftp.cc:180 -msgid "Unable to determine the local name" -msgstr "无法获知本地主机名" - -#: methods/ftp.cc:211 methods/ftp.cc:239 -#, c-format -msgid "The server refused the connection and said: %s" -msgstr "服务器拒绝了我们的连接,响应信息为:%s" - -#: methods/ftp.cc:217 -#, c-format -msgid "USER failed, server said: %s" -msgstr "USER 指令出错,服务器响应信息为:%s" - -#: methods/ftp.cc:224 -#, c-format -msgid "PASS failed, server said: %s" -msgstr "PASS 指令出错,服务器响应信息为:%s" - -#: methods/ftp.cc:244 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。" - -#: methods/ftp.cc:272 -#, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s" - -#: methods/ftp.cc:298 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "TYPE 指令出错,服务器响应信息为:%s" - -#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227 -msgid "Connection timeout" -msgstr "连接超时" - -#: methods/ftp.cc:342 -msgid "Server closed the connection" -msgstr "服务器关闭了连接" - -#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191 -msgid "Read error" -msgstr "读错误" - -#: methods/ftp.cc:352 methods/rsh.cc:198 -msgid "A response overflowed the buffer." -msgstr "回应超出了缓存区大小。" - -#: methods/ftp.cc:369 methods/ftp.cc:381 -msgid "Protocol corruption" -msgstr "协议有误" - -#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 -msgid "Write error" -msgstr "写出错" - -#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 -msgid "Could not create a socket" -msgstr "无法创建套接字" - -#: methods/ftp.cc:704 -msgid "Could not connect data socket, connection timed out" -msgstr "无法连接上数据套接字,连接超时" - -#: methods/ftp.cc:708 methods/connect.cc:111 -msgid "Failed" -msgstr "失败" - -#: methods/ftp.cc:710 -msgid "Could not connect passive socket." -msgstr "无法连接被动模式的套接字。" - -#: methods/ftp.cc:728 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo 无法得到监听套接字" - -#: methods/ftp.cc:742 -msgid "Could not bind a socket" -msgstr "无法绑定套接字" - -#: methods/ftp.cc:746 -msgid "Could not listen on the socket" -msgstr "无法在套接字上监听" - -#: methods/ftp.cc:753 -msgid "Could not determine the socket's name" -msgstr "无法确定套接字的名字" - -#: methods/ftp.cc:785 -msgid "Unable to send PORT command" -msgstr "无法发出 PORT 指令" - -#: methods/ftp.cc:795 -#, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "无法识别的地址族 %u (AF_*)" - -#: methods/ftp.cc:804 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "EPRT 指令出错,服务器响应信息为:%s" - -#: methods/ftp.cc:824 -msgid "Data socket connect timed out" -msgstr "数据套接字连接超时" - -#: methods/ftp.cc:831 -msgid "Unable to accept connection" -msgstr "无法接受连接" - -#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 -msgid "Problem hashing file" -msgstr "把文件加入哈希表时出错" - -#: methods/ftp.cc:883 -#, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "无法获取文件,服务器响应信息为“%s”" - -#: methods/ftp.cc:898 methods/rsh.cc:322 -msgid "Data socket timed out" -msgstr "数据套接字超时" - -#: methods/ftp.cc:928 -#, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "数据传送出错,服务器响应信息为“%s”" - -#. Get the files information -#: methods/ftp.cc:1005 -msgid "Query" -msgstr "查询" - -#: methods/ftp.cc:1117 -msgid "Unable to invoke " -msgstr "无法调用 " - -#: methods/connect.cc:71 -#, c-format -msgid "Connecting to %s (%s)" -msgstr "正在连接 %s (%s)" - -#: methods/connect.cc:82 -#, c-format -msgid "[IP: %s %s]" -msgstr "[IP: %s %s]" - -#: methods/connect.cc:89 -#, c-format -msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" - -#: methods/connect.cc:95 -#, c-format -msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "无法发起与 %s:%s (%s) 的连接" - -#: methods/connect.cc:103 -#, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "无法连接上 %s:%s (%s),连接超时" - -#: methods/connect.cc:121 -#, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "无法连接上 %s:%s (%s)。" - -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:149 methods/rsh.cc:425 -#, c-format -msgid "Connecting to %s" -msgstr "正在连接 %s" - -#: methods/connect.cc:168 methods/connect.cc:187 -#, c-format -msgid "Could not resolve '%s'" -msgstr "无法解析域名“%s”" - -#: methods/connect.cc:193 -#, c-format -msgid "Temporary failure resolving '%s'" -msgstr "暂时不能解析域名“%s”" - -#: methods/connect.cc:196 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)" - -#: methods/connect.cc:243 -#, c-format -msgid "Unable to connect to %s:%s:" -msgstr "不能连接到 %s:%s:" - -#: methods/gpgv.cc:166 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!" - -#: methods/gpgv.cc:171 -msgid "At least one invalid signature was encountered." -msgstr "至少发现一个无效的签名。" - -#: methods/gpgv.cc:175 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" -msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)" - -#: methods/gpgv.cc:180 -msgid "Unknown error executing gpgv" -msgstr "运行 gpgv 时发生未知错误" - -#: methods/gpgv.cc:214 methods/gpgv.cc:221 -msgid "The following signatures were invalid:\n" -msgstr "下列签名无效:\n" - -#: methods/gpgv.cc:228 -msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" -msgstr "由于没有公钥,无法验证下列签名:\n" - -#: methods/http.cc:385 -msgid "Waiting for headers" -msgstr "正在等待报头" - -#: methods/http.cc:531 -#, c-format -msgid "Got a single header line over %u chars" -msgstr "接收到一行报头行,它的长度超过了 %u 个字符" - -#: methods/http.cc:539 -msgid "Bad header line" -msgstr "错误的报头行" - -#: methods/http.cc:564 methods/http.cc:571 -msgid "The HTTP server sent an invalid reply header" -msgstr "该 HTTP 服务器发送了一个无效的应答报头" - -#: methods/http.cc:600 -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" - -#: methods/http.cc:615 -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" - -#: methods/http.cc:617 -msgid "This HTTP server has broken range support" -msgstr "该 HTTP 服务器的 range 支持不正常" - -#: methods/http.cc:641 -msgid "Unknown date format" -msgstr "无法识别的日期格式" - -#: methods/http.cc:800 -msgid "Select failed" -msgstr "select 调用出错" - -#: methods/http.cc:805 -msgid "Connection timed out" -msgstr "连接超时" - -#: methods/http.cc:828 -msgid "Error writing to output file" -msgstr "写输出文件时出错" - -#: methods/http.cc:859 -msgid "Error writing to file" -msgstr "写入文件出错" - -#: methods/http.cc:887 -msgid "Error writing to the file" -msgstr "写入文件出错" - -#: methods/http.cc:901 -msgid "Error reading from server. Remote end closed connection" -msgstr "从服务器读取数据时出错,对方关闭了连接" - -#: methods/http.cc:903 -msgid "Error reading from server" -msgstr "从服务器读取数据出错" - -#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 -msgid "Failed to truncate file" -msgstr "无法截断文件" - -#: methods/http.cc:1183 -msgid "Bad header data" -msgstr "错误的报头数据" - -#: methods/http.cc:1200 methods/http.cc:1255 -msgid "Connection failed" -msgstr "连接失败" - -#: methods/http.cc:1347 -msgid "Internal error" -msgstr "内部错误" - -#: apt-pkg/contrib/mmap.cc:77 -msgid "Can't mmap an empty file" -msgstr "无法 mmap 一个空文件" - -#: apt-pkg/contrib/mmap.cc:89 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "无法为复制文件描述符 %i" - -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "无法 mmap %lu 字节的数据" - -#: apt-pkg/contrib/mmap.cc:124 -msgid "Unable to close mmap" -msgstr "无法关闭 mmap" - -#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 -msgid "Unable to synchronize mmap" -msgstr "无法同步 mmap" - -#: apt-pkg/contrib/mmap.cc:310 -#, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 apt.conf)" - -#: apt-pkg/contrib/mmap.cc:409 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "无法增加 MMap 的大小,因为已经达到 %lu 字节的限制。" - -#: apt-pkg/contrib/mmap.cc:412 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。" - -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:371 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li天 %li小时 %li分 %li秒" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li小时 %li分 %li秒" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 -#, c-format -msgid "%limin %lis" -msgstr "%li分 %li秒" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:390 -#, c-format -msgid "%lis" -msgstr "%li秒" - -#: apt-pkg/contrib/strutl.cc:1138 -#, c-format -msgid "Selection %s not found" -msgstr "找不到您选则的 %s" - -#: apt-pkg/contrib/configuration.cc:465 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "无法识别的类型缩写:“%c”" - -#: apt-pkg/contrib/configuration.cc:523 -#, c-format -msgid "Opening configuration file %s" -msgstr "正在打开配置文件 %s" - -#: apt-pkg/contrib/configuration.cc:691 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "语法错误 %s:%u:配置小节没有以名字开头" - -#: apt-pkg/contrib/configuration.cc:710 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "语法错误 %s:%u:标签格式有误" - -#: apt-pkg/contrib/configuration.cc:727 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "语法错误 %s:%u:配置值后有多余的无意义数据" - -#: apt-pkg/contrib/configuration.cc:767 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示" - -#: apt-pkg/contrib/configuration.cc:774 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "语法错误 %s:%u:太多的嵌套 include 命令" - -#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "语法错误 %s:%u:Included from here" - -#: apt-pkg/contrib/configuration.cc:787 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "语法错误 %s:%u:不支持的指令“%s”" - -#: apt-pkg/contrib/configuration.cc:790 -#, c-format -msgid "" -"Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数" - -#: apt-pkg/contrib/configuration.cc:840 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据" - -#: apt-pkg/contrib/progress.cc:144 -#, c-format -msgid "%c%s... Error!" -msgstr "%c%s... 有错误!" - -#: apt-pkg/contrib/progress.cc:146 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... 完成" - -#: apt-pkg/contrib/cmndline.cc:77 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "未知的命令行选项“%c” [来自 %s]" - -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 -#, c-format -msgid "Command line option %s is not understood" -msgstr "无法识别命令行选项 %s" - -#: apt-pkg/contrib/cmndline.cc:124 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "命令行选项 %s 不是布尔值" - -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 -#, c-format -msgid "Option %s requires an argument." -msgstr "选项 %s 要求有一个参数" - -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定" - -#: apt-pkg/contrib/cmndline.cc:236 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”" - -#: apt-pkg/contrib/cmndline.cc:267 -#, c-format -msgid "Option '%s' is too long" -msgstr "选项“%s”太长" - -#: apt-pkg/contrib/cmndline.cc:300 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "不能识别参数 %s,请用 true 或 false" - -#: apt-pkg/contrib/cmndline.cc:350 -#, c-format -msgid "Invalid operation %s" -msgstr "无效的操作 %s" - -#: apt-pkg/contrib/cdromutl.cc:52 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "无法读取文件系统挂载点 %s 的状态" - -#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:98 -#, c-format -msgid "Unable to change to %s" -msgstr "无法切换工作目录到 %s" - -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/fileutl.cc:343 -#: apt-pkg/sourcelist.cc:204 apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 -#: apt-pkg/init.cc:108 apt-pkg/init.cc:116 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:356 methods/mirror.cc:92 -#, c-format -msgid "Unable to read %s" -msgstr "无法读取 %s" - -#: apt-pkg/contrib/cdromutl.cc:220 -msgid "Failed to stat the cdrom" -msgstr "无法读取盘片的状态" - -#: apt-pkg/contrib/fileutl.cc:168 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "由于文件系统为只读,因而无法使用文件锁 %s" - -#: apt-pkg/contrib/fileutl.cc:173 -#, c-format -msgid "Could not open lock file %s" -msgstr "无法打开锁文件 %s" - -#: apt-pkg/contrib/fileutl.cc:191 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "无法在 nfs 文件系统上使用文件锁 %s" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not get lock %s" -msgstr "无法获得锁 %s" - -#: apt-pkg/contrib/fileutl.cc:335 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:362 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:380 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:389 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:690 -#, c-format -msgid "Waited for %s but it wasn't there" -msgstr "等待子进程 %s 的退出,但是它并不存在" - -#: apt-pkg/contrib/fileutl.cc:702 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "子进程 %s 发生了段错误" - -#: apt-pkg/contrib/fileutl.cc:704 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "子进程 %s 收到信号 %u。" - -#: apt-pkg/contrib/fileutl.cc:708 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "子进程 %s 返回了一个错误号 (%u)" - -#: apt-pkg/contrib/fileutl.cc:710 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "子进程 %s 异常退出" - -#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673 -#, c-format -msgid "Could not open file %s" -msgstr "无法打开文件 %s" - -#: apt-pkg/contrib/fileutl.cc:792 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "无法打开文件描述符 %d" - -#: apt-pkg/contrib/fileutl.cc:852 -#, c-format -msgid "read, still have %lu to read but none left" -msgstr "读取文件出错,还剩 %lu 字节没有读出" - -#: apt-pkg/contrib/fileutl.cc:885 -#, c-format -msgid "write, still have %lu to write but couldn't" -msgstr "写入文件出错,还剩 %lu 字节没有保存" - -#: apt-pkg/contrib/fileutl.cc:1021 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "关闭 gzip %s 文件出错" - -#: apt-pkg/contrib/fileutl.cc:1024 -#, c-format -msgid "Problem closing the file %s" -msgstr "关闭文件 %s 出错" - -#: apt-pkg/contrib/fileutl.cc:1029 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "重命名文件 %s 为 %s 出错" - -#: apt-pkg/contrib/fileutl.cc:1040 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "用 unlink 删除文件 %s 出错" - -#: apt-pkg/contrib/fileutl.cc:1053 -msgid "Problem syncing the file" -msgstr "同步文件出错" - -#: apt-pkg/pkgcache.cc:147 -msgid "Empty package cache" -msgstr "软件包缓存区是空的" - -#: apt-pkg/pkgcache.cc:153 -msgid "The package cache file is corrupted" -msgstr "软件包缓存文件损坏了" - -#: apt-pkg/pkgcache.cc:158 -msgid "The package cache file is an incompatible version" -msgstr "软件包缓存区文件的版本不兼容" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted, it is too small" -msgstr "" - -#: apt-pkg/pkgcache.cc:166 -#, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "本程序目前不支持“%s”版本系统" - -#: apt-pkg/pkgcache.cc:171 -msgid "The package cache was built for a different architecture" -msgstr "软件包缓存区是为其它架构的硬件构建的" - -#: apt-pkg/pkgcache.cc:304 -msgid "Depends" -msgstr "依赖" - -#: apt-pkg/pkgcache.cc:304 -msgid "PreDepends" -msgstr "预依赖" - -#: apt-pkg/pkgcache.cc:304 -msgid "Suggests" -msgstr "建议" - -#: apt-pkg/pkgcache.cc:305 -msgid "Recommends" -msgstr "推荐" - -#: apt-pkg/pkgcache.cc:305 -msgid "Conflicts" -msgstr "冲突" - -#: apt-pkg/pkgcache.cc:305 -msgid "Replaces" -msgstr "替换" - -#: apt-pkg/pkgcache.cc:306 -msgid "Obsoletes" -msgstr "废弃" - -#: apt-pkg/pkgcache.cc:306 -msgid "Breaks" -msgstr "破坏" - -#: apt-pkg/pkgcache.cc:306 -msgid "Enhances" -msgstr "增强" - -#: apt-pkg/pkgcache.cc:317 -msgid "important" -msgstr "重要" - -#: apt-pkg/pkgcache.cc:317 -msgid "required" -msgstr "必需" - -#: apt-pkg/pkgcache.cc:317 -msgid "standard" -msgstr "标准" - -#: apt-pkg/pkgcache.cc:318 -msgid "optional" -msgstr "可选" - -#: apt-pkg/pkgcache.cc:318 -msgid "extra" -msgstr "额外" - -#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154 -msgid "Building dependency tree" -msgstr "正在分析软件包的依赖关系树" - -#: apt-pkg/depcache.cc:126 -msgid "Candidate versions" -msgstr "候选版本" - -#: apt-pkg/depcache.cc:155 -msgid "Dependency generation" -msgstr "生成依赖关系" - -#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212 -msgid "Reading state information" -msgstr "正在读取状态信息" - -#: apt-pkg/depcache.cc:237 -#, c-format -msgid "Failed to open StateFile %s" -msgstr "无法打开状态文件 %s" - -#: apt-pkg/depcache.cc:243 -#, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "无法写入临时状态文件 %s" - -#: apt-pkg/tagfile.cc:123 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "无法解析软件包文件 %s (1)" - -#: apt-pkg/tagfile.cc:210 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "无法解析软件包文件 %s (2)" - -#: apt-pkg/sourcelist.cc:92 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" - -#: apt-pkg/sourcelist.cc:95 -#, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" - -#: apt-pkg/sourcelist.cc:106 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" - -#: apt-pkg/sourcelist.cc:112 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" - -#: apt-pkg/sourcelist.cc:115 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" - -#: apt-pkg/sourcelist.cc:128 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" - -#: apt-pkg/sourcelist.cc:130 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" - -#: apt-pkg/sourcelist.cc:133 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" - -#: apt-pkg/sourcelist.cc:139 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" - -#: apt-pkg/sourcelist.cc:146 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" - -#: apt-pkg/sourcelist.cc:244 -#, c-format -msgid "Opening %s" -msgstr "正在打开 %s" - -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "源列表 %2$s 的第 %1$u 行太长了。" - -#: apt-pkg/sourcelist.cc:281 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" - -#: apt-pkg/sourcelist.cc:285 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”" - -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 -#, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure (%d)" - -#: apt-pkg/packagemanager.cc:456 -#, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可少的软件包 " -"%s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::Force-LoopBreak 选项。" - -#: apt-pkg/packagemanager.cc:501 -#, c-format -msgid "" -"Could not perform immediate configuration on already unpacked '%s'. Please " -"see man 5 apt.conf under APT::Immediate-Configure for details." -msgstr "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure。" - -#: apt-pkg/pkgrecords.cc:32 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "不支持索引文件类型“%s”" - -#: apt-pkg/algorithms.cc:250 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。" - -#: apt-pkg/algorithms.cc:1186 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的缘故。" - -#: apt-pkg/algorithms.cc:1188 -msgid "Unable to correct problems, you have held broken packages." -msgstr "无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关系。" - -#: apt-pkg/algorithms.cc:1481 -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "无法下载 %s %s\n" - -#: apt-pkg/algorithms.cc:1507 apt-pkg/algorithms.cc:1509 -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" - -#: apt-pkg/acquire.cc:79 -#, c-format -msgid "List directory %spartial is missing." -msgstr "软件包列表的目录 %spartial 缺失。" - -#: apt-pkg/acquire.cc:83 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "仓库目录 %spartial 确实。" - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Unable to lock directory %s" -msgstr "无法对目录 %s 加锁" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:858 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)" - -#: apt-pkg/acquire.cc:860 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "正在下载第 %li 个文件,共 %li 个" - -#: apt-pkg/acquire-worker.cc:110 -#, c-format -msgid "The method driver %s could not be found." -msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" - -#: apt-pkg/acquire-worker.cc:159 -#, c-format -msgid "Method %s did not start correctly" -msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" - -#: apt-pkg/acquire-worker.cc:423 -#, c-format -msgid "" -"Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" - -#: apt-pkg/init.cc:151 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "不支持“%s”打包系统" - -#: apt-pkg/init.cc:167 -msgid "Unable to determine a suitable packaging system type" -msgstr "无法确定适合的打包系统类型" - -#: apt-pkg/clean.cc:56 -#, c-format -msgid "Unable to stat %s." -msgstr "无法读取 %s 的状态。" - -#: apt-pkg/srcrecords.cc:44 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" - -#: apt-pkg/cachefile.cc:84 -msgid "The package lists or status file could not be parsed or opened." -msgstr "无法解析或打开软件包的列表或是状态文件。" - -#: apt-pkg/cachefile.cc:88 -msgid "You may want to run apt-get update to correct these problems" -msgstr "您可能需要运行 apt-get update 来解决这些问题" - -#: apt-pkg/cachefile.cc:106 -msgid "The list of sources could not be read." -msgstr "无法读取源列表。" - -#: apt-pkg/policy.cc:71 -#, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" - -#: apt-pkg/policy.cc:393 -#, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头" - -#: apt-pkg/policy.cc:415 -#, c-format -msgid "Did not understand pin type %s" -msgstr "无法识别锁定的类型 %s" - -#: apt-pkg/policy.cc:423 -msgid "No priority (or zero) specified for pin" -msgstr "没有为版本锁定指定优先级(或为零)" - -#: apt-pkg/pkgcachegen.cc:83 -msgid "Cache has an incompatible versioning system" -msgstr "软件包暂存区使用的是不兼容的版本控制系统" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275 -#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353 -#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388 -#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:439 -#: apt-pkg/pkgcachegen.cc:470 apt-pkg/pkgcachegen.cc:484 -#, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:232 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "哇,软件包数量超出了本 APT 的处理能力。" - -#: apt-pkg/pkgcachegen.cc:235 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "哇,软件包版本数量超出了本 APT 的处理能力。" - -#: apt-pkg/pkgcachegen.cc:238 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "哇,软件包说明数量超出了本 APT 的处理能力。" - -#: apt-pkg/pkgcachegen.cc:241 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "哇,依赖关系数量超出了本 APT 的处理能力。" - -#: apt-pkg/pkgcachegen.cc:491 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "当处理文件依赖关系时,无法找到软件包 %s %s" - -#: apt-pkg/pkgcachegen.cc:1057 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "无法获取源软件包列表 %s 的状态" - -#: apt-pkg/pkgcachegen.cc:1145 apt-pkg/pkgcachegen.cc:1249 -#: apt-pkg/pkgcachegen.cc:1255 apt-pkg/pkgcachegen.cc:1417 -msgid "Reading package lists" -msgstr "正在读取软件包列表" - -#: apt-pkg/pkgcachegen.cc:1162 -msgid "Collecting File Provides" -msgstr "正在收集文件所提供的软件包" - -#: apt-pkg/pkgcachegen.cc:1246 -#, c-format -msgid "Unable to write to %s" -msgstr "无法写入 %s" - -#: apt-pkg/pkgcachegen.cc:1356 apt-pkg/pkgcachegen.cc:1363 -msgid "IO Error saving source cache" -msgstr "无法读取或写入软件源缓存" - -#: apt-pkg/acquire-item.cc:135 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "无法重命名文件,%s (%s -> %s)。" - -#: apt-pkg/acquire-item.cc:636 -msgid "MD5Sum mismatch" -msgstr "MD5 校验和不符" - -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1851 -#: apt-pkg/acquire-item.cc:1994 -msgid "Hash Sum mismatch" -msgstr "Hash 校验和不符" - -#: apt-pkg/acquire-item.cc:1387 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" - -#: apt-pkg/acquire-item.cc:1403 -#, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "" - -#: apt-pkg/acquire-item.cc:1438 -msgid "There is no public key available for the following key IDs:\n" -msgstr "以下 ID 的密钥没有可用的公钥:\n" - -#: apt-pkg/acquire-item.cc:1476 -#, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" - -#: apt-pkg/acquire-item.cc:1498 -#, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "冲突的发行版:%s (期望 %s 但得到 %s)" - -#: apt-pkg/acquire-item.cc:1531 -#, c-format -msgid "" -"A error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" -msgstr "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n" - -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 -#, c-format -msgid "GPG error: %s: %s" -msgstr "GPG 错误:%s: %s" - -#: apt-pkg/acquire-item.cc:1638 -#, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "无法找到 %s 软件包的一个文件。这可能意味着您需要手动修复该软件包。(由于缺失的体系)" - -#: apt-pkg/acquire-item.cc:1697 -#, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package." -msgstr "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" - -#: apt-pkg/acquire-item.cc:1756 -#, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" - -#: apt-pkg/acquire-item.cc:1843 -msgid "Size mismatch" -msgstr "大小不符" - -#: apt-pkg/indexrecords.cc:53 -#, c-format -msgid "Unable to parse Release file %s" -msgstr "无法解析软件包仓库 Release 文件 %s" - -#: apt-pkg/indexrecords.cc:63 -#, c-format -msgid "No sections in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" - -#: apt-pkg/indexrecords.cc:97 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内无哈希条目" - -#: apt-pkg/indexrecords.cc:110 -#, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" - -#: apt-pkg/indexrecords.cc:129 -#, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" - -#: apt-pkg/vendorlist.cc:71 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "软件提供者数据块内 %s 没有包含指纹信息" - -#: apt-pkg/cdrom.cc:525 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"现把 %s 作为了 CD-ROM 的挂载点\n" -"正在挂载 CD-ROM\n" - -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 -msgid "Identifying.. " -msgstr "正在鉴别.. " - -#: apt-pkg/cdrom.cc:562 -#, c-format -msgid "Stored label: %s\n" -msgstr "已归档文件的标签:%s\n" - -#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM...\n" - -#: apt-pkg/cdrom.cc:591 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" - -#: apt-pkg/cdrom.cc:609 -msgid "Unmounting CD-ROM\n" -msgstr "正在卸载 CD-ROM 文件系统\n" - -#: apt-pkg/cdrom.cc:614 -msgid "Waiting for disc...\n" -msgstr "等待插入盘片……\n" - -#: apt-pkg/cdrom.cc:623 -msgid "Mounting CD-ROM...\n" -msgstr "正在挂载 CD-ROM 文件系统……\n" - -#: apt-pkg/cdrom.cc:642 -msgid "Scanning disc for index files..\n" -msgstr "正在盘片中查找索引文件..\n" - -#: apt-pkg/cdrom.cc:684 -#, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签名\n" - -#: apt-pkg/cdrom.cc:695 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构架。" - -#: apt-pkg/cdrom.cc:722 -#, c-format -msgid "Found label '%s'\n" -msgstr "找到标签 '%s'\n" - -#: apt-pkg/cdrom.cc:751 -msgid "That is not a valid name, try again.\n" -msgstr "这不是一个有效的名字,请重试。\n" - -#: apt-pkg/cdrom.cc:768 -#, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" -"这张盘片现在的名字是:\n" -"“%s”\n" - -#: apt-pkg/cdrom.cc:770 -msgid "Copying package lists..." -msgstr "正在复制软件包列表……" - -#: apt-pkg/cdrom.cc:797 -msgid "Writing new source list\n" -msgstr "正在写入新的源列表\n" - -#: apt-pkg/cdrom.cc:805 -msgid "Source list entries for this disc are:\n" -msgstr "对应于该盘片的软件源设置项是:\n" - -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 -#, c-format -msgid "Wrote %i records.\n" -msgstr "已写入 %i 条记录。\n" - -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n" - -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n" - -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n" - -#: apt-pkg/indexcopy.cc:537 -#, c-format -msgid "Skipping nonexistent file %s" -msgstr "跳过不存在的文件 %s" - -#: apt-pkg/indexcopy.cc:543 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "无法找到认证记录:%s" - -#: apt-pkg/indexcopy.cc:549 -#, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash 校验和不符:%s" - -#: apt-pkg/indexcopy.cc:677 -#, c-format -msgid "File %s doesn't start with a clearsigned message" -msgstr "" - -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:708 -#, c-format -msgid "No keyring installed in %s." -msgstr "%s 中没有安装密钥环。" - -#: apt-pkg/cachefilter.cc:29 -#, c-format -msgid "Regex compilation error - %s" -msgstr "编译正则表达式时出错 - %s" - -#: apt-pkg/cacheset.cc:337 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”发布版本" - -#: apt-pkg/cacheset.cc:340 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”版本" - -#: apt-pkg/cacheset.cc:440 -#, c-format -msgid "Unable to locate package %s" -msgstr "未发现软件包 %s" - -#: apt-pkg/cacheset.cc:447 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "无法找到任务 %s" - -#: apt-pkg/cacheset.cc:454 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "无法按照正则表达式 %s 找到任何软件包" - -#: apt-pkg/cacheset.cc:467 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "无法从完全虚拟的软件包 %s 中选择版本" - -#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择" - -#: apt-pkg/cacheset.cc:491 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版" - -#: apt-pkg/cacheset.cc:499 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "因为软件包 %s 没有候选版本,无法进行选择" - -#: apt-pkg/cacheset.cc:507 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本" - -#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52 -msgid "Send scenario to solver" -msgstr "" - -#: apt-pkg/edsp.cc:204 -msgid "Send request to solver" -msgstr "" - -#: apt-pkg/edsp.cc:272 -msgid "Prepare for receiving solution" -msgstr "" - -#: apt-pkg/edsp.cc:279 -msgid "External solver failed without a proper error message" -msgstr "" - -#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558 -msgid "Execute external solver" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:68 -#, c-format -msgid "Installing %s" -msgstr "正在安装 %s" - -#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:863 -#, c-format -msgid "Configuring %s" -msgstr "正在配置 %s" - -#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:870 -#, c-format -msgid "Removing %s" -msgstr "正在删除 %s" - -#: apt-pkg/deb/dpkgpm.cc:71 -#, c-format -msgid "Completely removing %s" -msgstr "完全删除 %s" - -#: apt-pkg/deb/dpkgpm.cc:72 -#, c-format -msgid "Noting disappearance of %s" -msgstr "注意到 %s 已经消失" - -#: apt-pkg/deb/dpkgpm.cc:73 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "执行安装后执行的触发器 %s" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:669 -#, c-format -msgid "Directory '%s' missing" -msgstr "目录 %s 缺失" - -#: apt-pkg/deb/dpkgpm.cc:684 apt-pkg/deb/dpkgpm.cc:704 -#, c-format -msgid "Could not open file '%s'" -msgstr "无法打开文件 %s" - -#: apt-pkg/deb/dpkgpm.cc:856 -#, c-format -msgid "Preparing %s" -msgstr "正在准备 %s" - -#: apt-pkg/deb/dpkgpm.cc:857 -#, c-format -msgid "Unpacking %s" -msgstr "正在解压缩 %s" - -#: apt-pkg/deb/dpkgpm.cc:862 -#, c-format -msgid "Preparing to configure %s" -msgstr "正在准备配置 %s" - -#: apt-pkg/deb/dpkgpm.cc:864 -#, c-format -msgid "Installed %s" -msgstr "已安装 %s" - -#: apt-pkg/deb/dpkgpm.cc:869 -#, c-format -msgid "Preparing for removal of %s" -msgstr "正在准备 %s 的删除操作" - -#: apt-pkg/deb/dpkgpm.cc:871 -#, c-format -msgid "Removed %s" -msgstr "已删除 %s" - -#: apt-pkg/deb/dpkgpm.cc:876 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "正在准备完全删除 %s" - -#: apt-pkg/deb/dpkgpm.cc:877 -#, c-format -msgid "Completely removed %s" -msgstr "完全删除了 %s" - -#: apt-pkg/deb/dpkgpm.cc:1097 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n" - -#: apt-pkg/deb/dpkgpm.cc:1128 -msgid "Running dpkg" -msgstr "正在运行 dpkg" - -#: apt-pkg/deb/dpkgpm.cc:1353 -msgid "No apport report written because MaxReports is reached already" -msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。" - -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1358 -msgid "dependency problems - leaving unconfigured" -msgstr "依赖问题 - 保持未配置" - -#: apt-pkg/deb/dpkgpm.cc:1360 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。" - -#: apt-pkg/deb/dpkgpm.cc:1366 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。" - -#: apt-pkg/deb/dpkgpm.cc:1373 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。" - -#: apt-pkg/deb/dpkgpm.cc:1380 apt-pkg/deb/dpkgpm.cc:1386 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1407 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。" - -#: apt-pkg/deb/debsystem.cc:79 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?" - -#: apt-pkg/deb/debsystem.cc:82 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?" - -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:98 -#, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。 " - -#: apt-pkg/deb/debsystem.cc:116 -msgid "Not locked" -msgstr "未锁定" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:276 -#, c-format -msgid "No mirror file '%s' found " -msgstr "没有找到镜像文件 %s " - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:283 -#, c-format -msgid "Can not read mirror file '%s'" -msgstr "" - -#: methods/mirror.cc:438 -#, c-format -msgid "[Mirror: %s]" -msgstr "[镜像:%s]" - -#: methods/rred.cc:506 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" - -#: methods/rred.cc:511 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" - -#: methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "无法为子进程创建 IPC 管道" - -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "连接被过早地关闭了" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po 2012-02-23 07:11:24.000000000 +0000 @@ -0,0 +1,1630 @@ +# Chinese/Simplified translation of apt. +# This file is put in the public domain. +# Deng Xiyue , 2007, 2008. +# Tchaikov , 2005, 2007. +# Carlos Z.F. Liu , 2004, 2006. +# Aron Xu , 2009, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: apt 0.8.0~pre1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-14 10:00+0000\n" +"PO-Revision-Date: 2012-02-14 13:44+0000\n" +"Last-Translator: Aron Xu \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: 2012-02-21 17:26+0000\n" +"X-Generator: Launchpad (build 14838)\n" +"Language: \n" + +#: methods/bzip2.cc:63 methods/gzip.cc:54 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/bzip2.cc:67 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "无法为 %s 开启管道" + +#: methods/bzip2.cc:111 +#, c-format +msgid "Read error from %s process" +msgstr "从 %s 进程读取数据出错" + +#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 +#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:498 +#: methods/rred.cc:507 +msgid "Failed to stat" +msgstr "无法读取状态" + +#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 +#: methods/rred.cc:504 +msgid "Failed to set modification time" +msgstr "无法设置文件的修改日期" + +#: methods/cdrom.cc:203 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "无法读取盘片数据库 %s" + +#: methods/cdrom.cc:212 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "请使用 apt-cdrom,通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来加入新的盘片。" + +#: methods/cdrom.cc:222 +msgid "Wrong CD-ROM" +msgstr "错误的 CD-ROM" + +#: methods/cdrom.cc:249 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "无法卸载现在挂载于 %s 的 CD-ROM,它可能正在使用中。" + +#: methods/cdrom.cc:254 +msgid "Disk not found." +msgstr "找不到盘片。" + +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 +msgid "File not found" +msgstr "无法找到该文件" + +#: methods/file.cc:47 +msgid "Invalid URI, local URIS must not start with //" +msgstr "无效的 URI,本地的 URI 不能以 // 开头" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:172 +msgid "Logging in" +msgstr "正在登录" + +#: methods/ftp.cc:178 +msgid "Unable to determine the peer name" +msgstr "无法获知对方主机名" + +#: methods/ftp.cc:183 +msgid "Unable to determine the local name" +msgstr "无法获知本地主机名" + +#: methods/ftp.cc:214 methods/ftp.cc:242 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "服务器拒绝了我们的连接,响应信息为:%s" + +#: methods/ftp.cc:220 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER 指令出错,服务器响应信息为:%s" + +#: methods/ftp.cc:227 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS 指令出错,服务器响应信息为:%s" + +#: methods/ftp.cc:247 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "您指定了代理服务器,但是没有登陆脚本,Acquire::ftp::ProxyLogin 设置为空。" + +#: methods/ftp.cc:275 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "登录脚本命令“%s”出错,服务器响应信息为:%s" + +#: methods/ftp.cc:301 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE 指令出错,服务器响应信息为:%s" + +#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233 +msgid "Connection timeout" +msgstr "连接超时" + +#: methods/ftp.cc:345 +msgid "Server closed the connection" +msgstr "服务器关闭了连接" + +#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1077 +#: apt-pkg/contrib/fileutl.cc:1080 methods/rsh.cc:197 +msgid "Read error" +msgstr "读错误" + +#: methods/ftp.cc:355 methods/rsh.cc:204 +msgid "A response overflowed the buffer." +msgstr "回应超出了缓存区大小。" + +#: methods/ftp.cc:372 methods/ftp.cc:384 +msgid "Protocol corruption" +msgstr "协议有误" + +#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:239 +msgid "Write error" +msgstr "写出错" + +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738 +msgid "Could not create a socket" +msgstr "无法创建套接字" + +#: methods/ftp.cc:707 +msgid "Could not connect data socket, connection timed out" +msgstr "无法连接上数据套接字,连接超时" + +#: methods/ftp.cc:711 methods/connect.cc:115 +msgid "Failed" +msgstr "失败" + +#: methods/ftp.cc:713 +msgid "Could not connect passive socket." +msgstr "无法连接被动模式的套接字。" + +#: methods/ftp.cc:731 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo 无法得到监听套接字" + +#: methods/ftp.cc:745 +msgid "Could not bind a socket" +msgstr "无法绑定套接字" + +#: methods/ftp.cc:749 +msgid "Could not listen on the socket" +msgstr "无法在套接字上监听" + +#: methods/ftp.cc:756 +msgid "Could not determine the socket's name" +msgstr "无法确定套接字的名字" + +#: methods/ftp.cc:788 +msgid "Unable to send PORT command" +msgstr "无法发出 PORT 指令" + +#: methods/ftp.cc:798 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "无法识别的地址族 %u (AF_*)" + +#: methods/ftp.cc:807 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT 指令出错,服务器响应信息为:%s" + +#: methods/ftp.cc:827 +msgid "Data socket connect timed out" +msgstr "数据套接字连接超时" + +#: methods/ftp.cc:834 +msgid "Unable to accept connection" +msgstr "无法接受连接" + +#: methods/ftp.cc:873 methods/http.cc:1034 methods/rsh.cc:309 +msgid "Problem hashing file" +msgstr "把文件加入哈希表时出错" + +#: methods/ftp.cc:886 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "无法获取文件,服务器响应信息为“%s”" + +#: methods/ftp.cc:901 methods/rsh.cc:328 +msgid "Data socket timed out" +msgstr "数据套接字超时" + +#: methods/ftp.cc:931 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "数据传送出错,服务器响应信息为“%s”" + +#. Get the files information +#: methods/ftp.cc:1008 +msgid "Query" +msgstr "查询" + +#: methods/ftp.cc:1120 +msgid "Unable to invoke " +msgstr "无法调用 " + +#: methods/connect.cc:75 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "正在连接 %s (%s)" + +#: methods/connect.cc:86 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:93 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" + +#: methods/connect.cc:99 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "无法发起与 %s:%s (%s) 的连接" + +#: methods/connect.cc:107 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "无法连接上 %s:%s (%s),连接超时" + +#: methods/connect.cc:125 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "无法连接上 %s:%s (%s)。" + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:153 methods/rsh.cc:431 +#, c-format +msgid "Connecting to %s" +msgstr "正在连接 %s" + +#: methods/connect.cc:172 methods/connect.cc:191 +#, c-format +msgid "Could not resolve '%s'" +msgstr "无法解析域名“%s”" + +#: methods/connect.cc:197 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "暂时不能解析域名“%s”" + +#: methods/connect.cc:200 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" +msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)" + +#: methods/connect.cc:247 +#, c-format +msgid "Unable to connect to %s:%s:" +msgstr "不能连接到 %s:%s:" + +#: methods/gpgv.cc:180 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!" + +#: methods/gpgv.cc:185 +msgid "At least one invalid signature was encountered." +msgstr "至少发现一个无效的签名。" + +#: methods/gpgv.cc:189 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)" + +#: methods/gpgv.cc:194 +msgid "Unknown error executing gpgv" +msgstr "运行 gpgv 时发生未知错误" + +#: methods/gpgv.cc:228 methods/gpgv.cc:235 +msgid "The following signatures were invalid:\n" +msgstr "下列签名无效:\n" + +#: methods/gpgv.cc:242 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "由于没有公钥,无法验证下列签名:\n" + +#: methods/http.cc:393 +msgid "Waiting for headers" +msgstr "正在等待报头" + +#: methods/http.cc:539 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "接收到一行报头行,它的长度超过了 %u 个字符" + +#: methods/http.cc:547 +msgid "Bad header line" +msgstr "错误的报头行" + +#: methods/http.cc:572 methods/http.cc:579 +msgid "The HTTP server sent an invalid reply header" +msgstr "该 HTTP 服务器发送了一个无效的应答报头" + +#: methods/http.cc:608 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" + +#: methods/http.cc:623 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" + +#: methods/http.cc:625 +msgid "This HTTP server has broken range support" +msgstr "该 HTTP 服务器的 range 支持不正常" + +#: methods/http.cc:649 +msgid "Unknown date format" +msgstr "无法识别的日期格式" + +#: methods/http.cc:820 +msgid "Select failed" +msgstr "select 调用出错" + +#: methods/http.cc:825 +msgid "Connection timed out" +msgstr "连接超时" + +#: methods/http.cc:848 +msgid "Error writing to output file" +msgstr "写输出文件时出错" + +#: methods/http.cc:879 +msgid "Error writing to file" +msgstr "写入文件出错" + +#: methods/http.cc:907 +msgid "Error writing to the file" +msgstr "写入文件出错" + +#: methods/http.cc:921 +msgid "Error reading from server. Remote end closed connection" +msgstr "从服务器读取数据时出错,对方关闭了连接" + +#: methods/http.cc:923 +msgid "Error reading from server" +msgstr "从服务器读取数据出错" + +#: methods/http.cc:1193 +msgid "Bad header data" +msgstr "错误的报头数据" + +#: methods/http.cc:1210 methods/http.cc:1265 +msgid "Connection failed" +msgstr "连接失败" + +#: methods/http.cc:1357 +msgid "Internal error" +msgstr "内部错误" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "无法 mmap 一个空文件" + +#: apt-pkg/contrib/mmap.cc:109 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "无法为复制文件描述符 %i" + +#: apt-pkg/contrib/mmap.cc:117 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:144 +msgid "Unable to close mmap" +msgstr "无法关闭 mmap" + +#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200 +msgid "Unable to synchronize mmap" +msgstr "无法同步 mmap" + +#: apt-pkg/contrib/mmap.cc:278 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "无法 mmap %lu 字节的数据" + +#: apt-pkg/contrib/mmap.cc:311 +msgid "Failed to truncate file" +msgstr "无法截断文件" + +#: apt-pkg/contrib/mmap.cc:330 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值:%lu。(man 5 apt.conf)" + +#: apt-pkg/contrib/mmap.cc:429 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "无法增加 MMap 的大小,因为已经达到 %lu 字节的限制。" + +#: apt-pkg/contrib/mmap.cc:432 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:371 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%li天 %li小时 %li分 %li秒" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:378 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li小时 %li分 %li秒" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:385 +#, c-format +msgid "%limin %lis" +msgstr "%li分 %li秒" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:390 +#, c-format +msgid "%lis" +msgstr "%li秒" + +#: apt-pkg/contrib/strutl.cc:1165 +#, c-format +msgid "Selection %s not found" +msgstr "找不到您选则的 %s" + +#: apt-pkg/contrib/configuration.cc:474 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "无法识别的类型缩写:“%c”" + +#: apt-pkg/contrib/configuration.cc:532 +#, c-format +msgid "Opening configuration file %s" +msgstr "正在打开配置文件 %s" + +#: apt-pkg/contrib/configuration.cc:700 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "语法错误 %s:%u:配置小节没有以名字开头" + +#: apt-pkg/contrib/configuration.cc:719 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "语法错误 %s:%u:标签格式有误" + +#: apt-pkg/contrib/configuration.cc:736 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "语法错误 %s:%u:配置值后有多余的无意义数据" + +#: apt-pkg/contrib/configuration.cc:776 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示" + +#: apt-pkg/contrib/configuration.cc:783 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "语法错误 %s:%u:太多的嵌套 include 命令" + +#: apt-pkg/contrib/configuration.cc:787 apt-pkg/contrib/configuration.cc:792 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "语法错误 %s:%u:Included from here" + +#: apt-pkg/contrib/configuration.cc:796 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "语法错误 %s:%u:不支持的指令“%s”" + +#: apt-pkg/contrib/configuration.cc:799 +#, c-format +msgid "" +"Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数" + +#: apt-pkg/contrib/configuration.cc:849 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据" + +#: apt-pkg/contrib/progress.cc:146 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... 有错误!" + +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... 完成" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "未知的命令行选项“%c” [来自 %s]" + +#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112 +#: apt-pkg/contrib/cmndline.cc:120 +#, c-format +msgid "Command line option %s is not understood" +msgstr "无法识别命令行选项 %s" + +#: apt-pkg/contrib/cmndline.cc:125 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "命令行选项 %s 不是布尔值" + +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#, c-format +msgid "Option %s requires an argument." +msgstr "选项 %s 要求有一个参数" + +#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定" + +#: apt-pkg/contrib/cmndline.cc:235 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”" + +#: apt-pkg/contrib/cmndline.cc:266 +#, c-format +msgid "Option '%s' is too long" +msgstr "选项“%s”太长" + +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "不能识别参数 %s,请用 true 或 false" + +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "无效的操作 %s" + +#: apt-pkg/contrib/cdromutl.cc:56 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "无法读取文件系统挂载点 %s 的状态" + +#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213 +#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42 +#: methods/mirror.cc:101 +#, c-format +msgid "Unable to change to %s" +msgstr "无法切换工作目录到 %s" + +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:372 +#: apt-pkg/sourcelist.cc:208 apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 +#: apt-pkg/init.cc:109 apt-pkg/init.cc:117 apt-pkg/clean.cc:36 +#: apt-pkg/policy.cc:359 methods/mirror.cc:95 +#, c-format +msgid "Unable to read %s" +msgstr "无法读取 %s" + +#: apt-pkg/contrib/cdromutl.cc:224 +msgid "Failed to stat the cdrom" +msgstr "无法读取盘片的状态" + +#: apt-pkg/contrib/fileutl.cc:197 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "由于文件系统为只读,因而无法使用文件锁 %s" + +#: apt-pkg/contrib/fileutl.cc:202 +#, c-format +msgid "Could not open lock file %s" +msgstr "无法打开锁文件 %s" + +#: apt-pkg/contrib/fileutl.cc:220 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "无法在 nfs 文件系统上使用文件锁 %s" + +#: apt-pkg/contrib/fileutl.cc:224 +#, c-format +msgid "Could not get lock %s" +msgstr "无法获得锁 %s" + +#: apt-pkg/contrib/fileutl.cc:364 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:391 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:409 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:418 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:996 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "等待子进程 %s 的退出,但是它并不存在" + +#: apt-pkg/contrib/fileutl.cc:731 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "子进程 %s 发生了段错误" + +#: apt-pkg/contrib/fileutl.cc:733 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "子进程 %s 收到信号 %u。" + +#: apt-pkg/contrib/fileutl.cc:737 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "子进程 %s 返回了一个错误号 (%u)" + +#: apt-pkg/contrib/fileutl.cc:739 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "子进程 %s 异常退出" + +#: apt-pkg/contrib/fileutl.cc:878 apt-pkg/indexcopy.cc:655 +#, c-format +msgid "Could not open file %s" +msgstr "无法打开文件 %s" + +#: apt-pkg/contrib/fileutl.cc:929 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "无法打开文件描述符 %d" + +#: apt-pkg/contrib/fileutl.cc:975 +msgid "Failed to create subprocess IPC" +msgstr "无法创建子进程的 IPC 管道" + +#: apt-pkg/contrib/fileutl.cc:1024 +msgid "Failed to exec compressor " +msgstr "无法执行压缩程序 " + +#: apt-pkg/contrib/fileutl.cc:1102 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1167 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1427 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "关闭 gzip %s 文件出错" + +#: apt-pkg/contrib/fileutl.cc:1431 +#, c-format +msgid "Problem closing the file %s" +msgstr "关闭文件 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1436 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "重命名文件 %s 为 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1447 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "用 unlink 删除文件 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1467 +msgid "Problem syncing the file" +msgstr "同步文件出错" + +#: apt-pkg/pkgcache.cc:148 +msgid "Empty package cache" +msgstr "软件包缓存区是空的" + +#: apt-pkg/pkgcache.cc:154 +msgid "The package cache file is corrupted" +msgstr "软件包缓存文件损坏了" + +#: apt-pkg/pkgcache.cc:159 +msgid "The package cache file is an incompatible version" +msgstr "软件包缓存区文件的版本不兼容" + +#: apt-pkg/pkgcache.cc:162 +msgid "The package cache file is corrupted, it is too small" +msgstr "" + +#: apt-pkg/pkgcache.cc:167 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "本程序目前不支持“%s”版本系统" + +#: apt-pkg/pkgcache.cc:172 +msgid "The package cache was built for a different architecture" +msgstr "软件包缓存区是为其它架构的硬件构建的" + +#: apt-pkg/pkgcache.cc:305 +msgid "Depends" +msgstr "依赖" + +#: apt-pkg/pkgcache.cc:305 +msgid "PreDepends" +msgstr "预依赖" + +#: apt-pkg/pkgcache.cc:305 +msgid "Suggests" +msgstr "建议" + +#: apt-pkg/pkgcache.cc:306 +msgid "Recommends" +msgstr "推荐" + +#: apt-pkg/pkgcache.cc:306 +msgid "Conflicts" +msgstr "冲突" + +#: apt-pkg/pkgcache.cc:306 +msgid "Replaces" +msgstr "替换" + +#: apt-pkg/pkgcache.cc:307 +msgid "Obsoletes" +msgstr "废弃" + +#: apt-pkg/pkgcache.cc:307 +msgid "Breaks" +msgstr "破坏" + +#: apt-pkg/pkgcache.cc:307 +msgid "Enhances" +msgstr "增强" + +#: apt-pkg/pkgcache.cc:318 +msgid "important" +msgstr "重要" + +#: apt-pkg/pkgcache.cc:318 +msgid "required" +msgstr "必需" + +#: apt-pkg/pkgcache.cc:318 +msgid "standard" +msgstr "标准" + +#: apt-pkg/pkgcache.cc:319 +msgid "optional" +msgstr "可选" + +#: apt-pkg/pkgcache.cc:319 +msgid "extra" +msgstr "额外" + +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 +msgid "Building dependency tree" +msgstr "正在分析软件包的依赖关系树" + +#: apt-pkg/depcache.cc:133 +msgid "Candidate versions" +msgstr "候选版本" + +#: apt-pkg/depcache.cc:162 +msgid "Dependency generation" +msgstr "生成依赖关系" + +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 +msgid "Reading state information" +msgstr "正在读取状态信息" + +#: apt-pkg/depcache.cc:244 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "无法打开状态文件 %s" + +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "无法写入临时状态文件 %s" + +#: apt-pkg/tagfile.cc:126 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "无法解析软件包文件 %s (1)" + +#: apt-pkg/tagfile.cc:213 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "无法解析软件包文件 %s (2)" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" + +#: apt-pkg/sourcelist.cc:110 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" + +#: apt-pkg/sourcelist.cc:116 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" + +#: apt-pkg/sourcelist.cc:119 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)" + +#: apt-pkg/sourcelist.cc:132 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" + +#: apt-pkg/sourcelist.cc:134 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" + +#: apt-pkg/sourcelist.cc:137 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" + +#: apt-pkg/sourcelist.cc:143 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" + +#: apt-pkg/sourcelist.cc:150 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" + +#: apt-pkg/sourcelist.cc:248 +#, c-format +msgid "Opening %s" +msgstr "正在打开 %s" + +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "源列表 %2$s 的第 %1$u 行太长了。" + +#: apt-pkg/sourcelist.cc:285 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" + +#: apt-pkg/sourcelist.cc:289 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”" + +#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:780 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure (%d)" + +#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467 +#, c-format +msgid "Could not configure '%s'. " +msgstr "" + +#: apt-pkg/packagemanager.cc:507 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"由于这次安装存在着一个 Conflicts/Pre-Depends 循环,因而需要暂时删除一个必不可少的软件包 " +"%s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::Force-LoopBreak 选项。" + +#: apt-pkg/pkgrecords.cc:34 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "不支持索引文件类型“%s”" + +#: apt-pkg/algorithms.cc:255 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。" + +#: apt-pkg/algorithms.cc:1190 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的缘故。" + +#: apt-pkg/algorithms.cc:1192 +msgid "Unable to correct problems, you have held broken packages." +msgstr "无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关系。" + +#: apt-pkg/algorithms.cc:1491 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "无法下载 %s %s\n" + +#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519 +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" + +#: apt-pkg/acquire.cc:81 +#, c-format +msgid "List directory %spartial is missing." +msgstr "软件包列表的目录 %spartial 缺失。" + +#: apt-pkg/acquire.cc:85 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "仓库目录 %spartial 确实。" + +#: apt-pkg/acquire.cc:93 +#, c-format +msgid "Unable to lock directory %s" +msgstr "无法对目录 %s 加锁" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:864 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)" + +#: apt-pkg/acquire.cc:866 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "正在下载第 %li 个文件,共 %li 个" + +#: apt-pkg/acquire-worker.cc:112 +#, c-format +msgid "The method driver %s could not be found." +msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" + +#: apt-pkg/acquire-worker.cc:161 +#, c-format +msgid "Method %s did not start correctly" +msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" + +#: apt-pkg/acquire-worker.cc:425 +#, c-format +msgid "" +"Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" + +#: apt-pkg/init.cc:152 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "不支持“%s”打包系统" + +#: apt-pkg/init.cc:168 +msgid "Unable to determine a suitable packaging system type" +msgstr "无法确定适合的打包系统类型" + +#: apt-pkg/clean.cc:59 +#, c-format +msgid "Unable to stat %s." +msgstr "无法读取 %s 的状态。" + +#: apt-pkg/srcrecords.cc:47 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" + +#: apt-pkg/cachefile.cc:87 +msgid "The package lists or status file could not be parsed or opened." +msgstr "无法解析或打开软件包的列表或是状态文件。" + +#: apt-pkg/cachefile.cc:91 +msgid "You may want to run apt-get update to correct these problems" +msgstr "您可能需要运行 apt-get update 来解决这些问题" + +#: apt-pkg/cachefile.cc:109 +msgid "The list of sources could not be read." +msgstr "无法读取源列表。" + +#: apt-pkg/policy.cc:74 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" + +#: apt-pkg/policy.cc:396 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头" + +#: apt-pkg/policy.cc:418 +#, c-format +msgid "Did not understand pin type %s" +msgstr "无法识别锁定的类型 %s" + +#: apt-pkg/policy.cc:426 +msgid "No priority (or zero) specified for pin" +msgstr "没有为版本锁定指定优先级(或为零)" + +#: apt-pkg/pkgcachegen.cc:85 +msgid "Cache has an incompatible versioning system" +msgstr "软件包暂存区使用的是不兼容的版本控制系统" + +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 +#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355 +#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390 +#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465 +#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:234 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "哇,软件包数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:237 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "哇,软件包版本数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:240 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "哇,软件包说明数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:243 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "哇,依赖关系数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:517 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "当处理文件依赖关系时,无法找到软件包 %s %s" + +#: apt-pkg/pkgcachegen.cc:1082 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "无法获取源软件包列表 %s 的状态" + +#: apt-pkg/pkgcachegen.cc:1170 apt-pkg/pkgcachegen.cc:1274 +#: apt-pkg/pkgcachegen.cc:1280 apt-pkg/pkgcachegen.cc:1436 +msgid "Reading package lists" +msgstr "正在读取软件包列表" + +#: apt-pkg/pkgcachegen.cc:1187 +msgid "Collecting File Provides" +msgstr "正在收集文件所提供的软件包" + +#: apt-pkg/pkgcachegen.cc:1271 +#, c-format +msgid "Unable to write to %s" +msgstr "无法写入 %s" + +#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385 +msgid "IO Error saving source cache" +msgstr "无法读取或写入软件源缓存" + +#: apt-pkg/acquire-item.cc:139 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "无法重命名文件,%s (%s -> %s)。" + +#: apt-pkg/acquire-item.cc:640 +msgid "MD5Sum mismatch" +msgstr "MD5 校验和不符" + +#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 +#: apt-pkg/acquire-item.cc:2006 +msgid "Hash Sum mismatch" +msgstr "Hash 校验和不符" + +#: apt-pkg/acquire-item.cc:1399 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1415 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" + +#: apt-pkg/acquire-item.cc:1450 +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下 ID 的密钥没有可用的公钥:\n" + +#: apt-pkg/acquire-item.cc:1488 +#, c-format +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" + +#: apt-pkg/acquire-item.cc:1510 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "冲突的发行版:%s (期望 %s 但得到 %s)" + +#: apt-pkg/acquire-item.cc:1543 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used. GPG error: %s: %s\n" +msgstr "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558 +#, c-format +msgid "GPG error: %s: %s" +msgstr "GPG 错误:%s: %s" + +#: apt-pkg/acquire-item.cc:1650 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "无法找到 %s 软件包的一个文件。这可能意味着您需要手动修复该软件包。(由于缺失的体系)" + +#: apt-pkg/acquire-item.cc:1709 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package." +msgstr "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" + +#: apt-pkg/acquire-item.cc:1768 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" + +#: apt-pkg/acquire-item.cc:1855 +msgid "Size mismatch" +msgstr "大小不符" + +#: apt-pkg/indexrecords.cc:61 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "无法解析软件包仓库 Release 文件 %s" + +#: apt-pkg/indexrecords.cc:71 +#, c-format +msgid "No sections in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" + +#: apt-pkg/indexrecords.cc:105 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内无哈希条目" + +#: apt-pkg/indexrecords.cc:118 +#, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" + +#: apt-pkg/indexrecords.cc:137 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" + +#: apt-pkg/vendorlist.cc:78 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "软件提供者数据块内 %s 没有包含指纹信息" + +#: apt-pkg/cdrom.cc:566 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"现把 %s 作为了 CD-ROM 的挂载点\n" +"正在挂载 CD-ROM\n" + +#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672 +msgid "Identifying.. " +msgstr "正在鉴别.. " + +#: apt-pkg/cdrom.cc:603 +#, c-format +msgid "Stored label: %s\n" +msgstr "已归档文件的标签:%s\n" + +#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" + +#: apt-pkg/cdrom.cc:632 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" + +#: apt-pkg/cdrom.cc:650 +msgid "Unmounting CD-ROM\n" +msgstr "正在卸载 CD-ROM 文件系统\n" + +#: apt-pkg/cdrom.cc:655 +msgid "Waiting for disc...\n" +msgstr "等待插入盘片……\n" + +#: apt-pkg/cdrom.cc:664 +msgid "Mounting CD-ROM...\n" +msgstr "正在挂载 CD-ROM 文件系统……\n" + +#: apt-pkg/cdrom.cc:683 +msgid "Scanning disc for index files..\n" +msgstr "正在盘片中查找索引文件..\n" + +#: apt-pkg/cdrom.cc:731 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签名\n" + +#: apt-pkg/cdrom.cc:742 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "无法确定任何包文件的位置,可能这不是一张 Debian 盘片或者是选择了错误的硬件构架。" + +#: apt-pkg/cdrom.cc:769 +#, c-format +msgid "Found label '%s'\n" +msgstr "找到标签 '%s'\n" + +#: apt-pkg/cdrom.cc:798 +msgid "That is not a valid name, try again.\n" +msgstr "这不是一个有效的名字,请重试。\n" + +#: apt-pkg/cdrom.cc:815 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"这张盘片现在的名字是:\n" +"“%s”\n" + +#: apt-pkg/cdrom.cc:817 +msgid "Copying package lists..." +msgstr "正在复制软件包列表……" + +#: apt-pkg/cdrom.cc:844 +msgid "Writing new source list\n" +msgstr "正在写入新的源列表\n" + +#: apt-pkg/cdrom.cc:852 +msgid "Source list entries for this disc are:\n" +msgstr "对应于该盘片的软件源设置项是:\n" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873 +#, c-format +msgid "Wrote %i records.\n" +msgstr "已写入 %i 条记录。\n" + +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n" + +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n" + +#: apt-pkg/indexcopy.cc:503 +#, c-format +msgid "Skipping nonexistent file %s" +msgstr "跳过不存在的文件 %s" + +#: apt-pkg/indexcopy.cc:509 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "无法找到认证记录:%s" + +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash 校验和不符:%s" + +#: apt-pkg/indexcopy.cc:659 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:690 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s 中没有安装密钥环。" + +#: apt-pkg/cachefilter.cc:31 +#, c-format +msgid "Regex compilation error - %s" +msgstr "编译正则表达式时出错 - %s" + +#: apt-pkg/cacheset.cc:352 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "未找到“%2$s”的“%1$s”发布版本" + +#: apt-pkg/cacheset.cc:355 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "未找到“%2$s”的“%1$s”版本" + +#: apt-pkg/cacheset.cc:459 +#, c-format +msgid "Unable to locate package %s" +msgstr "未发现软件包 %s" + +#: apt-pkg/cacheset.cc:466 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "无法找到任务 %s" + +#: apt-pkg/cacheset.cc:472 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "无法按照正则表达式 %s 找到任何软件包" + +#: apt-pkg/cacheset.cc:483 +#, c-format +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "无法从完全虚拟的软件包 %s 中选择版本" + +#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择" + +#: apt-pkg/cacheset.cc:504 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版" + +#: apt-pkg/cacheset.cc:512 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "因为软件包 %s 没有候选版本,无法进行选择" + +#: apt-pkg/cacheset.cc:520 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本" + +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:213 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:281 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:288 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:70 +#, c-format +msgid "Installing %s" +msgstr "正在安装 %s" + +#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:946 +#, c-format +msgid "Configuring %s" +msgstr "正在配置 %s" + +#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:953 +#, c-format +msgid "Removing %s" +msgstr "正在删除 %s" + +#: apt-pkg/deb/dpkgpm.cc:73 +#, c-format +msgid "Completely removing %s" +msgstr "完全删除 %s" + +#: apt-pkg/deb/dpkgpm.cc:74 +#, c-format +msgid "Noting disappearance of %s" +msgstr "注意到 %s 已经消失" + +#: apt-pkg/deb/dpkgpm.cc:75 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "执行安装后执行的触发器 %s" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:702 +#, c-format +msgid "Directory '%s' missing" +msgstr "目录 %s 缺失" + +#: apt-pkg/deb/dpkgpm.cc:717 apt-pkg/deb/dpkgpm.cc:737 +#, c-format +msgid "Could not open file '%s'" +msgstr "无法打开文件 %s" + +#: apt-pkg/deb/dpkgpm.cc:939 +#, c-format +msgid "Preparing %s" +msgstr "正在准备 %s" + +#: apt-pkg/deb/dpkgpm.cc:940 +#, c-format +msgid "Unpacking %s" +msgstr "正在解压缩 %s" + +#: apt-pkg/deb/dpkgpm.cc:945 +#, c-format +msgid "Preparing to configure %s" +msgstr "正在准备配置 %s" + +#: apt-pkg/deb/dpkgpm.cc:947 +#, c-format +msgid "Installed %s" +msgstr "已安装 %s" + +#: apt-pkg/deb/dpkgpm.cc:952 +#, c-format +msgid "Preparing for removal of %s" +msgstr "正在准备 %s 的删除操作" + +#: apt-pkg/deb/dpkgpm.cc:954 +#, c-format +msgid "Removed %s" +msgstr "已删除 %s" + +#: apt-pkg/deb/dpkgpm.cc:959 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "正在准备完全删除 %s" + +#: apt-pkg/deb/dpkgpm.cc:960 +#, c-format +msgid "Completely removed %s" +msgstr "完全删除了 %s" + +#: apt-pkg/deb/dpkgpm.cc:1202 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n" + +#: apt-pkg/deb/dpkgpm.cc:1232 +msgid "Running dpkg" +msgstr "正在运行 dpkg" + +#: apt-pkg/deb/dpkgpm.cc:1404 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1461 +msgid "No apport report written because MaxReports is reached already" +msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1466 +msgid "dependency problems - leaving unconfigured" +msgstr "依赖问题 - 保持未配置" + +#: apt-pkg/deb/dpkgpm.cc:1468 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。" + +#: apt-pkg/deb/dpkgpm.cc:1474 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。" + +#: apt-pkg/deb/dpkgpm.cc:1481 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。" + +#: apt-pkg/deb/dpkgpm.cc:1488 apt-pkg/deb/dpkgpm.cc:1494 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1515 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。" + +#: apt-pkg/deb/debsystem.cc:84 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?" + +#: apt-pkg/deb/debsystem.cc:87 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:103 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。 " + +#: apt-pkg/deb/debsystem.cc:121 +msgid "Not locked" +msgstr "未锁定" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:279 +#, c-format +msgid "No mirror file '%s' found " +msgstr "没有找到镜像文件 %s " + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:286 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:441 +#, c-format +msgid "[Mirror: %s]" +msgstr "[镜像:%s]" + +#: methods/rred.cc:477 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。" + +#: methods/rred.cc:482 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" + +#: methods/rsh.cc:97 +msgid "Failed to create IPC pipe to subprocess" +msgstr "无法为子进程创建 IPC 管道" + +#: methods/rsh.cc:336 +msgid "Connection closed prematurely" +msgstr "连接被过早地关闭了" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libc.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libc.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libc.po 2012-01-02 18:07:43.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libc.po 2012-02-23 07:12:04.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: glibc\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-02-06 12:40-0800\n" -"PO-Revision-Date: 2011-12-15 10:37+0000\n" +"POT-Creation-Date: 2011-05-31 00:06-0400\n" +"PO-Revision-Date: 2012-02-10 01:40+0000\n" "Last-Translator: LI Daobing \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 18:28+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: argp/argp-help.c:228 #, c-format @@ -93,15 +93,17 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(程序错误) 选项应该可识别!?" -#: assert/assert-perr.c:57 +#: assert/assert-perr.c:37 #, c-format msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n" msgstr "%s%s%s:%u:%s%s意外的错误:%s。\n" -#: assert/assert.c:57 +#: assert/assert.c:105 #, c-format -msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n" -msgstr "%s%s%s:%u:%s%s断言“%s”失败。\n" +msgid "" +"%s%s%s:%u: %s%sAssertion `%s' failed.\n" +"%n" +msgstr "" #: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61 msgid "NAME" @@ -137,14 +139,13 @@ "[输出文件 [输入文件]...]" #: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58 -#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sprof.c:360 -#: iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 locale/programs/locale.c:278 -#: locale/programs/localedef.c:371 login/programs/pt_chown.c:88 -#: malloc/memusage.sh:65 malloc/memusagestat.c:533 nscd/nscd.c:415 -#: nss/getent.c:842 nss/makedb.c:231 posix/getconf.c:1030 -#: sunrpc/rpc_main.c:1494 sunrpc/rpcinfo.c:699 +#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49 +#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 +#: locale/programs/locale.c:278 locale/programs/localedef.c:371 +#: login/programs/pt_chown.c:92 malloc/memusage.sh:65 +#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231 +#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691 #: sysdeps/unix/sysv/linux/lddlibc4.c:62 -#, c-format msgid "" "For bug reporting instructions, please see:\n" ".\n" @@ -153,11 +154,11 @@ ".\n" #: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66 -#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sprof.c:375 +#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386 #: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293 -#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59 -#: malloc/memusage.sh:73 malloc/memusagestat.c:551 nscd/nscd.c:429 -#: nss/getent.c:81 nss/makedb.c:245 posix/getconf.c:1012 +#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63 +#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429 +#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104 #: sysdeps/unix/sysv/linux/lddlibc4.c:69 #, c-format msgid "" @@ -169,11 +170,11 @@ "这是自由软件;请参考原始码的版权声明。本软件不提供任何担保,甚至不会包括可售性或适用于任何特定目的的担保。\n" #: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70 -#: elf/ldconfig.c:321 elf/sprof.c:381 iconv/iconv_prog.c:428 +#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428 #: iconv/iconvconfig.c:400 locale/programs/locale.c:298 #: locale/programs/localedef.c:392 malloc/memusage.sh:77 -#: malloc/memusagestat.c:556 nscd/nscd.c:434 nss/getent.c:86 nss/makedb.c:250 -#: posix/getconf.c:1017 +#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250 +#: posix/getconf.c:1109 #, c-format msgid "Written by %s.\n" msgstr "由 %s 编写。\n" @@ -293,13 +294,13 @@ msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n" msgstr "用法:xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n" -#: debug/xtrace.sh:33 -msgid "Try \\`xtrace --help' for more information.\\n" -msgstr "试用“xtrace --help”以获取更多信息。\\n" +#: debug/xtrace.sh:33 malloc/memusage.sh:27 +msgid "Try \\`%s --help' or `%s --usage' for more information.\\n" +msgstr "" #: debug/xtrace.sh:39 -msgid "xtrace: option \\`$1' requires an argument.\\n" -msgstr "xtrace: 选项“$1”需要一个参数\\n" +msgid "%s: option '%s' requires an argument.\\n" +msgstr "" #: debug/xtrace.sh:46 msgid "" @@ -369,7 +370,7 @@ msgid ", OS ABI: %s %d.%d.%d" msgstr ", OS ABI: %s %d.%d.%d" -#: elf/cache.c:134 elf/ldconfig.c:1289 +#: elf/cache.c:134 elf/ldconfig.c:1305 #, c-format msgid "Can't open cache file %s\n" msgstr "无法打开缓冲文件 %s\n" @@ -409,11 +410,11 @@ msgid "Renaming of %s to %s failed" msgstr "将 %s 改名为 %s 失败" -#: elf/dl-close.c:378 elf/dl-open.c:460 +#: elf/dl-close.c:387 elf/dl-open.c:397 msgid "cannot create scope list" msgstr "无法创建范围列表" -#: elf/dl-close.c:725 +#: elf/dl-close.c:767 msgid "shared object not open" msgstr "共享库未打开" @@ -421,7 +422,7 @@ msgid "DST not allowed in SUID/SGID programs" msgstr "在 SUID/SGID 程序中不允许 DST" -#: elf/dl-deps.c:127 elf/dl-open.c:282 +#: elf/dl-deps.c:127 msgid "empty dynamic string token substitution" msgstr "空动态字符串替换" @@ -436,11 +437,11 @@ msgid "cannot allocate dependency list" msgstr "无法分配倚赖列表" -#: elf/dl-deps.c:510 elf/dl-deps.c:565 +#: elf/dl-deps.c:514 elf/dl-deps.c:574 msgid "cannot allocate symbol search list" msgstr "无法分配符号搜索列表" -#: elf/dl-deps.c:550 +#: elf/dl-deps.c:554 msgid "Filters not supported with LD_TRACE_PRELINKING" msgstr "" @@ -464,205 +465,213 @@ msgid "internal error: symidx out of range of fptr table" msgstr "内部错误: symidx 超出 fptr 表的范围" -#: elf/dl-load.c:372 +#: elf/dl-load.c:471 msgid "cannot allocate name record" msgstr "无法分配名记录" -#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780 +#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862 msgid "cannot create cache for search path" msgstr "无法创建搜索路径缓冲器" -#: elf/dl-load.c:565 +#: elf/dl-load.c:639 msgid "cannot create RUNPATH/RPATH copy" msgstr "无法创建 RUNPATH/RPATH 的副本" -#: elf/dl-load.c:653 +#: elf/dl-load.c:735 msgid "cannot create search path array" msgstr "无法创建搜索路径数组" -#: elf/dl-load.c:864 +#: elf/dl-load.c:931 msgid "cannot stat shared object" msgstr "无法对共享目标进行 stat 操作" -#: elf/dl-load.c:934 +#: elf/dl-load.c:1009 msgid "cannot open zero fill device" msgstr "无法打开零填充设备" -#: elf/dl-load.c:979 elf/dl-load.c:2215 +#: elf/dl-load.c:1055 elf/dl-load.c:2313 msgid "cannot create shared object descriptor" msgstr "无法创建共享对象描述符" -#: elf/dl-load.c:998 elf/dl-load.c:1647 elf/dl-load.c:1739 +#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833 msgid "cannot read file data" msgstr "无法读入文件数据" -#: elf/dl-load.c:1042 +#: elf/dl-load.c:1120 msgid "ELF load command alignment not page-aligned" msgstr "ELF 加载命令对齐不是按页对齐的" -#: elf/dl-load.c:1049 +#: elf/dl-load.c:1127 msgid "ELF load command address/offset not properly aligned" msgstr "ELF 装入命令的地址/偏移量没有正确地对齐" -#: elf/dl-load.c:1132 +#: elf/dl-load.c:1210 msgid "cannot allocate TLS data structures for initial thread" msgstr "不能为初始线程分配转址旁路缓存(TLS)数据结构" -#: elf/dl-load.c:1155 +#: elf/dl-load.c:1233 msgid "cannot handle TLS data" msgstr "无法处理 TLS 数据" -#: elf/dl-load.c:1174 +#: elf/dl-load.c:1252 msgid "object file has no loadable segments" msgstr "目标文件没有可加载段" -#: elf/dl-load.c:1210 +#: elf/dl-load.c:1288 msgid "failed to map segment from shared object" msgstr "无法从共享目标中映射段" -#: elf/dl-load.c:1236 +#: elf/dl-load.c:1314 msgid "cannot dynamically load executable" msgstr "无法动态装入可执行文件" -#: elf/dl-load.c:1298 +#: elf/dl-load.c:1376 msgid "cannot change memory protections" msgstr "无法改变内存保护" -#: elf/dl-load.c:1317 +#: elf/dl-load.c:1395 msgid "cannot map zero-fill pages" msgstr "无法映射用零填充的页" -#: elf/dl-load.c:1331 +#: elf/dl-load.c:1409 msgid "object file has no dynamic section" msgstr "目标文件没有动态节" -#: elf/dl-load.c:1354 +#: elf/dl-load.c:1432 msgid "shared object cannot be dlopen()ed" msgstr "无法用 dlopen() 打开共享库" -#: elf/dl-load.c:1367 +#: elf/dl-load.c:1445 msgid "cannot allocate memory for program header" msgstr "无法为程序头分配内存" -#: elf/dl-load.c:1384 elf/dl-open.c:218 +#: elf/dl-load.c:1462 elf/dl-open.c:180 msgid "invalid caller" msgstr "无效的调用者" -#: elf/dl-load.c:1423 +#: elf/dl-load.c:1501 msgid "cannot enable executable stack as shared object requires" msgstr "无法启用共享目标需要的执行栈" -#: elf/dl-load.c:1436 +#: elf/dl-load.c:1514 msgid "cannot close file descriptor" msgstr "无法关闭文件描述符" -#: elf/dl-load.c:1647 +#: elf/dl-load.c:1730 msgid "file too short" msgstr "文件过短" -#: elf/dl-load.c:1676 +#: elf/dl-load.c:1766 msgid "invalid ELF header" msgstr "无效的 ELF 头" -#: elf/dl-load.c:1688 +#: elf/dl-load.c:1778 msgid "ELF file data encoding not big-endian" msgstr "ELF 文件数据编码不是 big-endian" -#: elf/dl-load.c:1690 +#: elf/dl-load.c:1780 msgid "ELF file data encoding not little-endian" msgstr "ELF 文件数据编码不是 little-endian" -#: elf/dl-load.c:1694 +#: elf/dl-load.c:1784 msgid "ELF file version ident does not match current one" msgstr "ELF 文件版本描述与当前不匹配" -#: elf/dl-load.c:1698 +#: elf/dl-load.c:1788 msgid "ELF file OS ABI invalid" msgstr "ELF 文件 OS ABI 无效" -#: elf/dl-load.c:1700 +#: elf/dl-load.c:1791 msgid "ELF file ABI version invalid" msgstr "ELF 文件 ABI 版本无效" -#: elf/dl-load.c:1703 +#: elf/dl-load.c:1794 +msgid "nonzero padding in e_ident" +msgstr "" + +#: elf/dl-load.c:1797 msgid "internal error" msgstr "内部错误" -#: elf/dl-load.c:1710 +#: elf/dl-load.c:1804 msgid "ELF file version does not match current one" msgstr "ELF 文件版本与当前版本不匹配" -#: elf/dl-load.c:1718 +#: elf/dl-load.c:1812 msgid "only ET_DYN and ET_EXEC can be loaded" msgstr "" -#: elf/dl-load.c:1724 +#: elf/dl-load.c:1818 msgid "ELF file's phentsize not the expected size" msgstr "" -#: elf/dl-load.c:2231 +#: elf/dl-load.c:2332 msgid "wrong ELF class: ELFCLASS64" msgstr "错误 ELF 类: ELFCLASS64" -#: elf/dl-load.c:2232 +#: elf/dl-load.c:2333 msgid "wrong ELF class: ELFCLASS32" msgstr "错误 ELF 类: ELFCLASS32" -#: elf/dl-load.c:2235 +#: elf/dl-load.c:2336 msgid "cannot open shared object file" msgstr "无法打开共享对象文件" -#: elf/dl-lookup.c:356 +#: elf/dl-lookup.c:757 msgid "relocation error" msgstr "重定位错误" -#: elf/dl-lookup.c:384 +#: elf/dl-lookup.c:785 msgid "symbol lookup error" msgstr "符号查询错误" -#: elf/dl-open.c:114 +#: elf/dl-open.c:115 msgid "cannot extend global scope" msgstr "无法扩展全局范围" -#: elf/dl-open.c:512 +#: elf/dl-open.c:440 msgid "TLS generation counter wrapped! Please report this." msgstr "" -#: elf/dl-open.c:549 +#: elf/dl-open.c:462 +msgid "cannot load any more object with static TLS" +msgstr "" + +#: elf/dl-open.c:511 msgid "invalid mode for dlopen()" msgstr "无效的 dlopen() 模式" -#: elf/dl-open.c:566 +#: elf/dl-open.c:528 msgid "no more namespaces available for dlmopen()" msgstr "dlmopen() 的命名空间已满" -#: elf/dl-open.c:579 +#: elf/dl-open.c:547 msgid "invalid target namespace in dlmopen()" msgstr "dlmopen() 中无效的目标名字空间" -#: elf/dl-reloc.c:121 +#: elf/dl-reloc.c:120 msgid "cannot allocate memory in static TLS block" msgstr "无法在静态 TLS 块中分配内存" -#: elf/dl-reloc.c:211 +#: elf/dl-reloc.c:212 msgid "cannot make segment writable for relocation" msgstr "" -#: elf/dl-reloc.c:277 +#: elf/dl-reloc.c:275 #, c-format msgid "%s: no PLTREL found in object %s\n" msgstr "" -#: elf/dl-reloc.c:288 +#: elf/dl-reloc.c:286 #, c-format msgid "%s: out of memory to store relocation results for %s\n" msgstr "" -#: elf/dl-reloc.c:304 +#: elf/dl-reloc.c:302 msgid "cannot restore segment prot after reloc" msgstr "重定位后无法恢复段 prot" -#: elf/dl-reloc.c:329 +#: elf/dl-reloc.c:331 msgid "cannot apply additional memory protection after relocation" msgstr "无法在重定位后应用额外的内存保护" @@ -670,14 +679,18 @@ msgid "RTLD_NEXT used in code not dynamically loaded" msgstr "" -#: elf/dl-sysdep.c:481 elf/dl-sysdep.c:493 +#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500 msgid "cannot create capability list" msgstr "无法创建功能列表" -#: elf/dl-tls.c:864 +#: elf/dl-tls.c:861 msgid "cannot create TLS data structures" msgstr "无法创建 TLS 数据结构" +#: elf/dl-version.c:172 +msgid "version lookup error" +msgstr "" + #: elf/dl-version.c:303 msgid "cannot allocate version reference table" msgstr "无法分配版本引用表格" @@ -757,147 +770,147 @@ msgid "%s is not a known library type" msgstr "%s 不是已知类型的库" -#: elf/ldconfig.c:404 +#: elf/ldconfig.c:407 #, c-format msgid "Can't stat %s" msgstr "无法对 %s 进行 stat 操作" -#: elf/ldconfig.c:478 +#: elf/ldconfig.c:481 #, c-format msgid "Can't stat %s\n" msgstr "无法对 %s 进行 stat 操作\n" -#: elf/ldconfig.c:488 +#: elf/ldconfig.c:491 #, c-format msgid "%s is not a symbolic link\n" msgstr "%s 不是符号连接\n" -#: elf/ldconfig.c:507 +#: elf/ldconfig.c:510 #, c-format msgid "Can't unlink %s" msgstr "不能删除 %s" -#: elf/ldconfig.c:513 +#: elf/ldconfig.c:516 #, c-format msgid "Can't link %s to %s" msgstr "无法将 %s 连接到 %s" -#: elf/ldconfig.c:519 +#: elf/ldconfig.c:522 msgid " (changed)\n" msgstr " (改变)\n" -#: elf/ldconfig.c:521 +#: elf/ldconfig.c:524 msgid " (SKIPPED)\n" msgstr " (跳过)\n" -#: elf/ldconfig.c:576 +#: elf/ldconfig.c:579 #, c-format msgid "Can't find %s" msgstr "无法找到 %s" -#: elf/ldconfig.c:592 elf/ldconfig.c:765 elf/ldconfig.c:813 elf/ldconfig.c:847 +#: elf/ldconfig.c:595 elf/ldconfig.c:768 elf/ldconfig.c:827 elf/ldconfig.c:861 #, c-format msgid "Cannot lstat %s" msgstr "无法对 %s 进行 lstat 操作" -#: elf/ldconfig.c:599 +#: elf/ldconfig.c:602 #, c-format msgid "Ignored file %s since it is not a regular file." msgstr "由于不是一个普通文件,忽略文件 %s" -#: elf/ldconfig.c:608 +#: elf/ldconfig.c:611 #, c-format msgid "No link created since soname could not be found for %s" msgstr "未创建链接,因为 %s 无法找到 soname" -#: elf/ldconfig.c:691 +#: elf/ldconfig.c:694 #, c-format msgid "Can't open directory %s" msgstr "无法打开目录 %s" -#: elf/ldconfig.c:779 -#, c-format -msgid "Cannot stat %s" -msgstr "无法对 %s 进行 stat 操作" - -#: elf/ldconfig.c:834 elf/readlib.c:91 +#: elf/ldconfig.c:786 elf/ldconfig.c:848 elf/readlib.c:91 #, c-format msgid "Input file %s not found.\n" msgstr "未找到输入文件 %s。\n" -#: elf/ldconfig.c:908 +#: elf/ldconfig.c:793 +#, c-format +msgid "Cannot stat %s" +msgstr "无法对 %s 进行 stat 操作" + +#: elf/ldconfig.c:922 #, c-format msgid "libc5 library %s in wrong directory" msgstr "libc5 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:911 +#: elf/ldconfig.c:925 #, c-format msgid "libc6 library %s in wrong directory" msgstr "libc5 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:914 +#: elf/ldconfig.c:928 #, c-format msgid "libc4 library %s in wrong directory" msgstr "libc4 的库 %s 处于错误的目录中" -#: elf/ldconfig.c:942 +#: elf/ldconfig.c:956 #, c-format msgid "" "libraries %s and %s in directory %s have same soname but different type." msgstr "目录 %3$s 中的 %1$s 和 %2$s 的 so 名称相同但类型不同。" -#: elf/ldconfig.c:1051 +#: elf/ldconfig.c:1065 #, c-format msgid "Can't open configuration file %s" msgstr "无法打开配置文件 %s" -#: elf/ldconfig.c:1115 +#: elf/ldconfig.c:1129 #, c-format msgid "%s:%u: bad syntax in hwcap line" msgstr "" -#: elf/ldconfig.c:1121 +#: elf/ldconfig.c:1135 #, c-format msgid "%s:%u: hwcap index %lu above maximum %u" msgstr "" -#: elf/ldconfig.c:1128 elf/ldconfig.c:1136 +#: elf/ldconfig.c:1142 elf/ldconfig.c:1150 #, c-format msgid "%s:%u: hwcap index %lu already defined as %s" msgstr "" -#: elf/ldconfig.c:1139 +#: elf/ldconfig.c:1153 #, c-format msgid "%s:%u: duplicate hwcap %lu %s" msgstr "" -#: elf/ldconfig.c:1161 +#: elf/ldconfig.c:1175 #, c-format msgid "need absolute file name for configuration file when using -r" msgstr "" -#: elf/ldconfig.c:1168 locale/programs/xmalloc.c:70 malloc/obstack.c:434 -#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1177 +#: elf/ldconfig.c:1182 locale/programs/xmalloc.c:70 malloc/obstack.c:434 +#: malloc/obstack.c:436 posix/getconf.c:1077 posix/getconf.c:1297 #, c-format msgid "memory exhausted" msgstr "内存耗尽" -#: elf/ldconfig.c:1198 +#: elf/ldconfig.c:1214 #, c-format msgid "%s:%u: cannot read directory %s" msgstr "%s:%u: 无法读取目录 %s" -#: elf/ldconfig.c:1242 +#: elf/ldconfig.c:1258 #, c-format msgid "relative path `%s' used to build cache" msgstr "" -#: elf/ldconfig.c:1268 +#: elf/ldconfig.c:1284 #, c-format msgid "Can't chdir to /" msgstr "无法改变目录到 /" -#: elf/ldconfig.c:1310 +#: elf/ldconfig.c:1325 #, c-format msgid "Can't open cache file directory %s\n" msgstr "无法打开缓冲文件目录 %s\n" @@ -940,7 +953,7 @@ msgid "No such file or directory" msgstr "没有那个文件或目录" -#: elf/ldd.bash.in:153 inet/rcmd.c:483 +#: elf/ldd.bash.in:153 inet/rcmd.c:488 msgid "not regular file" msgstr "不是普通文件" @@ -1052,6 +1065,55 @@ msgid "Invalid link from \"%s\" to \"%s\": %s\n" msgstr "\"%s\" 到 \"%s\" 的连接无效 : %s\n" +#: elf/sotruss.ksh:33 +#, sh-format +msgid "" +"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n" +" -F, --from FROMLIST trace calls from objects on FORMLIST\n" +" -T, --to TOLIST trace calls to objects on TOLIST\n" +"\n" +" -e, --exit also show exits from the function calls\n" +" -f, --follow trace child processes\n" +" -o, --output FILENAME write output to FILENAME (or FILENAME.$PID in " +"case\n" +"\t\t\t -f is also used) instead of standard error\n" +"\n" +" --help print this help and exit\n" +" --version print version information and exit" +msgstr "" + +#: elf/sotruss.ksh:46 +msgid "" +"Mandatory arguments to long options are also mandatory for any " +"corresponding\\nshort options.\\n" +msgstr "" + +#: elf/sotruss.ksh:56 +msgid "%s: option requires an argument -- '%s'\\n" +msgstr "" + +#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134 +msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n" +msgstr "" + +#: elf/sotruss.ksh:62 +msgid "%s: option is ambiguous; possibilities:" +msgstr "" + +#: elf/sotruss.ksh:80 +msgid "Written by %s.\\n" +msgstr "" + +#: elf/sotruss.ksh:87 +msgid "" +"Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n" +"\t [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n" +msgstr "" + +#: elf/sotruss.ksh:133 +msgid "%s: unrecognized option '%c%s'\\n" +msgstr "" + #: elf/sprof.c:77 msgid "Output selection:" msgstr "输出选择:" @@ -1076,92 +1138,92 @@ msgid "SHOBJ [PROFDATA]" msgstr "SHOBJ [PROFDATA]" -#: elf/sprof.c:420 +#: elf/sprof.c:431 #, c-format msgid "failed to load shared object `%s'" msgstr "装入共享目标文件“%s”失败" -#: elf/sprof.c:429 +#: elf/sprof.c:440 #, c-format msgid "cannot create internal descriptors" msgstr "无法创建内部描述符" -#: elf/sprof.c:548 +#: elf/sprof.c:559 #, c-format msgid "Reopening shared object `%s' failed" msgstr "重现打开共享对象“%s”失败" -#: elf/sprof.c:555 elf/sprof.c:649 +#: elf/sprof.c:566 elf/sprof.c:660 #, c-format msgid "reading of section headers failed" msgstr "读取节头部失败" -#: elf/sprof.c:563 elf/sprof.c:657 +#: elf/sprof.c:574 elf/sprof.c:668 #, c-format msgid "reading of section header string table failed" msgstr "读取节头部字符串表失败" -#: elf/sprof.c:589 +#: elf/sprof.c:600 #, c-format msgid "*** Cannot read debuginfo file name: %m\n" msgstr "*** 无法读取调试信息文件名: %m\n" -#: elf/sprof.c:609 +#: elf/sprof.c:620 #, c-format msgid "cannot determine file name" msgstr "无法确定文件名" -#: elf/sprof.c:642 +#: elf/sprof.c:653 #, c-format msgid "reading of ELF header failed" msgstr "读取 ELF 头部失败" -#: elf/sprof.c:678 +#: elf/sprof.c:689 #, c-format msgid "*** The file `%s' is stripped: no detailed analysis possible\n" msgstr "*** 文件“%s”已剥离:不可能进行细节分析\n" -#: elf/sprof.c:708 +#: elf/sprof.c:719 #, c-format msgid "failed to load symbol data" msgstr "装入符号数据失败" -#: elf/sprof.c:775 +#: elf/sprof.c:784 #, c-format msgid "cannot load profiling data" msgstr "无法加载 profile 数据" -#: elf/sprof.c:784 +#: elf/sprof.c:793 #, c-format msgid "while stat'ing profiling data file" msgstr "当分析 profile 数据文件" -#: elf/sprof.c:792 +#: elf/sprof.c:801 #, c-format msgid "profiling data file `%s' does not match shared object `%s'" msgstr "" -#: elf/sprof.c:803 +#: elf/sprof.c:812 #, c-format msgid "failed to mmap the profiling data file" msgstr "" -#: elf/sprof.c:811 +#: elf/sprof.c:820 #, c-format msgid "error while closing the profiling data file" msgstr "" -#: elf/sprof.c:820 elf/sprof.c:890 +#: elf/sprof.c:829 elf/sprof.c:927 #, c-format msgid "cannot create internal descriptor" msgstr "无法创建内部描述符" -#: elf/sprof.c:866 +#: elf/sprof.c:903 #, c-format msgid "`%s' is no correct profile data file for `%s'" msgstr "" -#: elf/sprof.c:1047 elf/sprof.c:1105 +#: elf/sprof.c:1084 elf/sprof.c:1142 #, c-format msgid "cannot allocate symbol data" msgstr "无法分配符号数据" @@ -1353,68 +1415,68 @@ msgid "cannot generate output file" msgstr "无法生成输出文件" -#: inet/rcmd.c:157 +#: inet/rcmd.c:163 msgid "rcmd: Cannot allocate memory\n" msgstr "rcmd:无法分配内存\n" -#: inet/rcmd.c:172 +#: inet/rcmd.c:178 msgid "rcmd: socket: All ports in use\n" msgstr "rcmd:socket:所有端口都已在使用了\n" -#: inet/rcmd.c:200 +#: inet/rcmd.c:206 #, c-format msgid "connect to address %s: " msgstr "连接到地址 %s: " -#: inet/rcmd.c:213 +#: inet/rcmd.c:219 #, c-format msgid "Trying %s...\n" msgstr "正在尝试 %s...\n" -#: inet/rcmd.c:249 +#: inet/rcmd.c:255 #, c-format msgid "rcmd: write (setting up stderr): %m\n" msgstr "" -#: inet/rcmd.c:265 +#: inet/rcmd.c:271 #, c-format msgid "rcmd: poll (setting up stderr): %m\n" msgstr "" -#: inet/rcmd.c:268 +#: inet/rcmd.c:274 msgid "poll: protocol failure in circuit setup\n" msgstr "" -#: inet/rcmd.c:301 +#: inet/rcmd.c:306 msgid "socket: protocol failure in circuit setup\n" msgstr "" -#: inet/rcmd.c:325 +#: inet/rcmd.c:330 #, c-format msgid "rcmd: %s: short read" msgstr "" -#: inet/rcmd.c:481 +#: inet/rcmd.c:486 msgid "lstat failed" msgstr "lstat 操作失败" -#: inet/rcmd.c:488 +#: inet/rcmd.c:493 msgid "cannot open" msgstr "无法打开" -#: inet/rcmd.c:490 +#: inet/rcmd.c:495 msgid "fstat failed" msgstr "fstat 失败" -#: inet/rcmd.c:492 +#: inet/rcmd.c:497 msgid "bad owner" msgstr "错误的拥有者" -#: inet/rcmd.c:494 +#: inet/rcmd.c:499 msgid "writeable by other than owner" msgstr "可由除所有者之外的人写入" -#: inet/rcmd.c:496 +#: inet/rcmd.c:501 msgid "hard linked somewhere" msgstr "某处的硬连接" @@ -1535,8 +1597,8 @@ msgstr "没有为范围的结束给出符号化的名称" #: locale/programs/charmap.c:610 locale/programs/ld-address.c:602 -#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924 -#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984 +#: locale/programs/ld-collate.c:2769 locale/programs/ld-collate.c:3927 +#: locale/programs/ld-ctype.c:2257 locale/programs/ld-ctype.c:3009 #: locale/programs/ld-identification.c:452 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307 @@ -1562,8 +1624,8 @@ msgstr "%s:状态机出错" #: locale/programs/charmap.c:850 locale/programs/ld-address.c:618 -#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4117 -#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001 +#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:4120 +#: locale/programs/ld-ctype.c:2254 locale/programs/ld-ctype.c:3026 #: locale/programs/ld-identification.c:468 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323 @@ -1586,7 +1648,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:3046 #: locale/programs/repertoire.c:419 msgid "invalid names for character range" msgstr "无效的字符范围的名字" @@ -1608,8 +1670,8 @@ msgid "resulting bytes for range not representable." msgstr "范围的结果字节不具代表性" -#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1556 -#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133 +#: 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-measurement.c:94 locale/programs/ld-messages.c:97 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94 #: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91 @@ -1673,7 +1735,7 @@ 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:2608 +#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2633 #: locale/programs/ld-identification.c:364 #: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301 #: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736 @@ -1695,8 +1757,8 @@ msgid "%s: unknown character in field `%s'" msgstr "%s:域“%s”中含有未知字符" -#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3922 -#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449 +#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3925 +#: locale/programs/ld-ctype.c:3006 locale/programs/ld-identification.c:449 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305 #: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239 @@ -1705,12 +1767,12 @@ msgid "%s: incomplete `END' line" msgstr "%s:不完整的“END”行" -#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:542 -#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890 -#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733 -#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4107 -#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219 -#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992 +#: 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:2735 +#: locale/programs/ld-collate.c:2756 locale/programs/ld-collate.c:4110 +#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2244 +#: locale/programs/ld-ctype.c:2831 locale/programs/ld-ctype.c:3017 #: locale/programs/ld-identification.c:459 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314 @@ -1720,487 +1782,487 @@ msgid "%s: syntax error" msgstr "%s:语法错误" -#: locale/programs/ld-collate.c:417 +#: locale/programs/ld-collate.c:419 #, c-format msgid "`%.*s' already defined in charmap" msgstr "已经在字符映射表中定义了“%.*s”" -#: locale/programs/ld-collate.c:426 +#: locale/programs/ld-collate.c:428 #, c-format msgid "`%.*s' already defined in repertoire" msgstr "已经在指令表中定义了“%.*s”" -#: locale/programs/ld-collate.c:433 +#: locale/programs/ld-collate.c:435 #, c-format msgid "`%.*s' already defined as collating symbol" msgstr "" -#: locale/programs/ld-collate.c:440 +#: locale/programs/ld-collate.c:442 #, c-format msgid "`%.*s' already defined as collating element" msgstr "" -#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497 +#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499 #, c-format msgid "%s: `forward' and `backward' are mutually excluding each other" msgstr "%s:“forward”和“backward”是互斥的" -#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507 -#: locale/programs/ld-collate.c:523 +#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509 +#: locale/programs/ld-collate.c:525 #, c-format msgid "%s: `%s' mentioned more than once in definition of weight %d" msgstr "" -#: locale/programs/ld-collate.c:579 +#: locale/programs/ld-collate.c:581 #, c-format msgid "%s: too many rules; first entry only had %d" msgstr "%s:规则过多;第一个条目只含有 %d" -#: locale/programs/ld-collate.c:615 +#: locale/programs/ld-collate.c:617 #, c-format msgid "%s: not enough sorting rules" msgstr "%s:排序规则不足" -#: locale/programs/ld-collate.c:780 +#: locale/programs/ld-collate.c:782 #, c-format msgid "%s: empty weight string not allowed" msgstr "%s:不允许空权字符串" -#: locale/programs/ld-collate.c:875 +#: locale/programs/ld-collate.c:877 #, c-format msgid "%s: weights must use the same ellipsis symbol as the name" msgstr "" -#: locale/programs/ld-collate.c:931 +#: locale/programs/ld-collate.c:933 #, c-format msgid "%s: too many values" msgstr "%s:值过多" -#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226 +#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228 #, c-format msgid "order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1101 +#: locale/programs/ld-collate.c:1103 #, c-format msgid "%s: the start and the end symbol of a range must stand for characters" msgstr "" -#: locale/programs/ld-collate.c:1128 +#: locale/programs/ld-collate.c:1130 #, c-format msgid "" "%s: byte sequences of first and last character must have the same length" msgstr "%s:字节序列的第一个和最后一个字符的长度必须相同" -#: locale/programs/ld-collate.c:1170 +#: locale/programs/ld-collate.c:1172 #, 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:1295 +#: locale/programs/ld-collate.c:1297 #, c-format msgid "%s: symbolic range ellipsis must not directly follow `order_start'" msgstr "" -#: locale/programs/ld-collate.c:1299 +#: locale/programs/ld-collate.c:1301 #, c-format msgid "" "%s: symbolic range ellipsis must not be directly followed by `order_end'" msgstr "" -#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477 +#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502 #, c-format msgid "`%s' and `%.*s' are not valid names for symbolic range" msgstr "“%s”和“%.*s”是无效的符号范围名" -#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858 +#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3861 #, c-format msgid "%s: order for `%.*s' already defined at %s:%Zu" msgstr "" -#: locale/programs/ld-collate.c:1378 +#: locale/programs/ld-collate.c:1380 #, c-format msgid "%s: `%s' must be a character" msgstr "%s:“%s”必须是一个字符" -#: locale/programs/ld-collate.c:1573 +#: locale/programs/ld-collate.c:1575 #, c-format msgid "" "%s: `position' must be used for a specific level in all sections or none" msgstr "" -#: locale/programs/ld-collate.c:1598 +#: locale/programs/ld-collate.c:1600 #, c-format msgid "symbol `%s' not defined" msgstr "符号“%s”未定义" -#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780 +#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782 #, c-format msgid "symbol `%s' has the same encoding as" msgstr "" -#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784 +#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786 #, c-format msgid "symbol `%s'" msgstr "符号“%s”" -#: locale/programs/ld-collate.c:1826 +#: locale/programs/ld-collate.c:1828 #, c-format msgid "no definition of `UNDEFINED'" msgstr "没有关于“UNDEFINIED”的定义" -#: locale/programs/ld-collate.c:1855 +#: locale/programs/ld-collate.c:1857 #, c-format msgid "too many errors; giving up" msgstr "错误过多;放弃" -#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4046 +#: locale/programs/ld-collate.c:2661 locale/programs/ld-collate.c:4049 #, c-format msgid "%s: nested conditionals not supported" msgstr "%s: 不支持嵌套条件" -#: locale/programs/ld-collate.c:2677 +#: locale/programs/ld-collate.c:2679 #, c-format msgid "%s: more then one 'else'" msgstr "%s: 多于一个'else'" -#: locale/programs/ld-collate.c:2852 +#: locale/programs/ld-collate.c:2854 #, c-format msgid "%s: duplicate definition of `%s'" msgstr "%s:重复定义“%s”" -#: locale/programs/ld-collate.c:2888 +#: locale/programs/ld-collate.c:2890 #, c-format msgid "%s: duplicate declaration of section `%s'" msgstr "%s:重复声明节“%s”" -#: locale/programs/ld-collate.c:3024 +#: locale/programs/ld-collate.c:3026 #, c-format msgid "%s: unknown character in collating symbol name" msgstr "" -#: locale/programs/ld-collate.c:3153 +#: locale/programs/ld-collate.c:3155 #, c-format msgid "%s: unknown character in equivalent definition name" msgstr "%s:等价定义名中未知的字符" -#: locale/programs/ld-collate.c:3164 +#: locale/programs/ld-collate.c:3166 #, c-format msgid "%s: unknown character in equivalent definition value" msgstr "%s:等价定义值中未知的字符" -#: locale/programs/ld-collate.c:3174 +#: locale/programs/ld-collate.c:3176 #, c-format msgid "%s: unknown symbol `%s' in equivalent definition" msgstr "%s:等价定义中未知的符号“%s”" -#: locale/programs/ld-collate.c:3183 +#: locale/programs/ld-collate.c:3185 msgid "error while adding equivalent collating symbol" msgstr "" -#: locale/programs/ld-collate.c:3221 +#: locale/programs/ld-collate.c:3223 #, c-format msgid "duplicate definition of script `%s'" msgstr "重复定义脚本“%s”" -#: locale/programs/ld-collate.c:3269 +#: locale/programs/ld-collate.c:3271 #, c-format msgid "%s: unknown section name `%.*s'" msgstr "%s:未知的节名“%.*s”" -#: locale/programs/ld-collate.c:3298 +#: locale/programs/ld-collate.c:3300 #, c-format msgid "%s: multiple order definitions for section `%s'" msgstr "%s:关于“%s”节出现多个顺序定义" -#: locale/programs/ld-collate.c:3326 +#: locale/programs/ld-collate.c:3328 #, c-format msgid "%s: invalid number of sorting rules" msgstr "%s:排序规则的数量无效" -#: locale/programs/ld-collate.c:3353 +#: locale/programs/ld-collate.c:3355 #, c-format msgid "%s: multiple order definitions for unnamed section" msgstr "%s:关于未命名节出现多个顺序定义" -#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537 -#: locale/programs/ld-collate.c:3900 +#: locale/programs/ld-collate.c:3410 locale/programs/ld-collate.c:3540 +#: locale/programs/ld-collate.c:3903 #, c-format msgid "%s: missing `order_end' keyword" msgstr "%s:遗漏关键字“order_end”" -#: locale/programs/ld-collate.c:3470 +#: locale/programs/ld-collate.c:3473 #, c-format msgid "%s: order for collating symbol %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3488 +#: locale/programs/ld-collate.c:3491 #, c-format msgid "%s: order for collating element %.*s not yet defined" msgstr "" -#: locale/programs/ld-collate.c:3499 +#: locale/programs/ld-collate.c:3502 #, c-format msgid "%s: cannot reorder after %.*s: symbol not known" msgstr "" -#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912 +#: locale/programs/ld-collate.c:3554 locale/programs/ld-collate.c:3915 #, c-format msgid "%s: missing `reorder-end' keyword" msgstr "%s:以后关键字“reorder-end”" -#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783 +#: locale/programs/ld-collate.c:3588 locale/programs/ld-collate.c:3786 #, c-format msgid "%s: section `%.*s' not known" msgstr "%s:未知的节“%.*s”" -#: locale/programs/ld-collate.c:3650 +#: locale/programs/ld-collate.c:3653 #, c-format msgid "%s: bad symbol <%.*s>" msgstr "" -#: locale/programs/ld-collate.c:3846 +#: locale/programs/ld-collate.c:3849 #, c-format msgid "%s: cannot have `%s' as end of ellipsis range" msgstr "" -#: locale/programs/ld-collate.c:3896 +#: locale/programs/ld-collate.c:3899 #, c-format msgid "%s: empty category description not allowed" msgstr "%s:不允许空范畴描述" -#: locale/programs/ld-collate.c:3915 +#: locale/programs/ld-collate.c:3918 #, c-format msgid "%s: missing `reorder-sections-end' keyword" msgstr "%s:遗漏关键字“reorder-sections-end”" -#: locale/programs/ld-collate.c:4079 +#: locale/programs/ld-collate.c:4082 #, c-format msgid "%s: '%s' without matching 'ifdef' or 'ifndef'" msgstr "" -#: locale/programs/ld-collate.c:4097 +#: locale/programs/ld-collate.c:4100 #, c-format msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'" msgstr "" -#: locale/programs/ld-ctype.c:439 +#: locale/programs/ld-ctype.c:440 #, c-format msgid "No character set name specified in charmap" msgstr "字符映射表中未给出字符集名称" -#: locale/programs/ld-ctype.c:468 +#: locale/programs/ld-ctype.c:469 #, 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:483 +#: locale/programs/ld-ctype.c:484 #, c-format msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'" msgstr "" -#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555 +#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556 #, c-format msgid "internal error in %s, line %u" msgstr "在 %s 的第 %u 行出现内部错误" -#: locale/programs/ld-ctype.c:526 +#: locale/programs/ld-ctype.c:527 #, 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:542 +#: locale/programs/ld-ctype.c:543 #, 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:572 locale/programs/ld-ctype.c:610 +#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611 #, c-format msgid " character not in class `%s'" msgstr "字符 不在类“%s”中" -#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621 +#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622 #, c-format msgid " character must not be in class `%s'" msgstr "字符 不能属于类“%s”" -#: locale/programs/ld-ctype.c:599 +#: locale/programs/ld-ctype.c:600 #, c-format msgid "character not defined in character map" msgstr "字符映射中未定义字符 " -#: locale/programs/ld-ctype.c:714 +#: locale/programs/ld-ctype.c:736 #, c-format msgid "`digit' category has not entries in groups of ten" msgstr "" -#: locale/programs/ld-ctype.c:763 +#: locale/programs/ld-ctype.c:785 #, c-format msgid "no input digits defined and none of the standard names in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:828 +#: locale/programs/ld-ctype.c:850 #, c-format msgid "not all characters used in `outdigit' are available in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:845 +#: locale/programs/ld-ctype.c:867 #, c-format msgid "not all characters used in `outdigit' are available in the repertoire" msgstr "" -#: locale/programs/ld-ctype.c:1245 +#: locale/programs/ld-ctype.c:1270 #, c-format msgid "character class `%s' already defined" msgstr "字符类“%s”已定义" -#: locale/programs/ld-ctype.c:1251 +#: locale/programs/ld-ctype.c:1276 #, c-format msgid "implementation limit: no more than %Zd character classes allowed" msgstr "" -#: locale/programs/ld-ctype.c:1277 +#: locale/programs/ld-ctype.c:1302 #, c-format msgid "character map `%s' already defined" msgstr "" -#: locale/programs/ld-ctype.c:1283 +#: locale/programs/ld-ctype.c:1308 #, c-format msgid "implementation limit: no more than %d character maps allowed" msgstr "实现限制:不得多于 %d 个字符映射表" -#: locale/programs/ld-ctype.c:1548 locale/programs/ld-ctype.c:1673 -#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471 -#: locale/programs/ld-ctype.c:3467 +#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698 +#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2496 +#: locale/programs/ld-ctype.c:3492 #, c-format msgid "%s: field `%s' does not contain exactly ten entries" msgstr "%s:域“%s”含有条目的个数不是十个" -#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150 +#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175 #, c-format msgid "to-value of range is smaller than from-value " msgstr "" -#: locale/programs/ld-ctype.c:1703 +#: locale/programs/ld-ctype.c:1728 msgid "start and end character sequence of range must have the same length" msgstr "范围的起始和终止字符序列必须具有相同的长度" -#: locale/programs/ld-ctype.c:1710 +#: locale/programs/ld-ctype.c:1735 msgid "to-value character sequence is smaller than from-value sequence" msgstr "" -#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121 +#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146 msgid "premature end of `translit_ignore' definition" msgstr "" -#: locale/programs/ld-ctype.c:2076 locale/programs/ld-ctype.c:2127 -#: locale/programs/ld-ctype.c:2169 +#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152 +#: locale/programs/ld-ctype.c:2194 msgid "syntax error" msgstr "语法错误" -#: locale/programs/ld-ctype.c:2303 +#: locale/programs/ld-ctype.c:2328 #, c-format msgid "%s: syntax error in definition of new character class" msgstr "%s:在定义新字符集合中出现语法错误" -#: locale/programs/ld-ctype.c:2318 +#: locale/programs/ld-ctype.c:2343 #, c-format msgid "%s: syntax error in definition of new character map" msgstr "%s:在新字符映射中出现语法错误" -#: locale/programs/ld-ctype.c:2493 +#: locale/programs/ld-ctype.c:2518 msgid "ellipsis range must be marked by two operands of same type" msgstr "" -#: locale/programs/ld-ctype.c:2502 +#: locale/programs/ld-ctype.c:2527 msgid "" "with symbolic name range values the absolute ellipsis `...' must not be used" msgstr "" -#: locale/programs/ld-ctype.c:2517 +#: locale/programs/ld-ctype.c:2542 msgid "" "with UCS range values one must use the hexadecimal symbolic ellipsis `..'" msgstr "" -#: locale/programs/ld-ctype.c:2531 +#: locale/programs/ld-ctype.c:2556 msgid "" "with character code range values one must use the absolute ellipsis `...'" msgstr "" -#: locale/programs/ld-ctype.c:2682 +#: locale/programs/ld-ctype.c:2707 #, c-format msgid "duplicated definition for mapping `%s'" msgstr "重复定义映射“%s”" -#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912 +#: locale/programs/ld-ctype.c:2793 locale/programs/ld-ctype.c:2937 #, c-format msgid "%s: `translit_start' section does not end with `translit_end'" msgstr "%s:“translit_start”节不以“translit_end”结束" -#: locale/programs/ld-ctype.c:2863 +#: locale/programs/ld-ctype.c:2888 #, c-format msgid "%s: duplicate `default_missing' definition" msgstr "%s:重复定义“default_missing”" -#: locale/programs/ld-ctype.c:2868 +#: locale/programs/ld-ctype.c:2893 msgid "previous definition was here" msgstr "前一个定义在这里" -#: locale/programs/ld-ctype.c:2890 +#: locale/programs/ld-ctype.c:2915 #, c-format msgid "%s: no representable `default_missing' definition found" msgstr "" -#: locale/programs/ld-ctype.c:3043 locale/programs/ld-ctype.c:3127 -#: locale/programs/ld-ctype.c:3147 locale/programs/ld-ctype.c:3168 -#: locale/programs/ld-ctype.c:3189 locale/programs/ld-ctype.c:3210 -#: locale/programs/ld-ctype.c:3231 locale/programs/ld-ctype.c:3271 -#: locale/programs/ld-ctype.c:3292 locale/programs/ld-ctype.c:3359 -#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426 +#: locale/programs/ld-ctype.c:3068 locale/programs/ld-ctype.c:3152 +#: locale/programs/ld-ctype.c:3172 locale/programs/ld-ctype.c:3193 +#: locale/programs/ld-ctype.c:3214 locale/programs/ld-ctype.c:3235 +#: locale/programs/ld-ctype.c:3256 locale/programs/ld-ctype.c:3296 +#: locale/programs/ld-ctype.c:3317 locale/programs/ld-ctype.c:3384 +#: locale/programs/ld-ctype.c:3426 locale/programs/ld-ctype.c:3451 #, c-format msgid "%s: character `%s' not defined while needed as default value" msgstr "" -#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3132 -#: locale/programs/ld-ctype.c:3152 locale/programs/ld-ctype.c:3173 -#: locale/programs/ld-ctype.c:3194 locale/programs/ld-ctype.c:3215 -#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3276 -#: locale/programs/ld-ctype.c:3297 locale/programs/ld-ctype.c:3364 +#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3157 +#: locale/programs/ld-ctype.c:3177 locale/programs/ld-ctype.c:3198 +#: locale/programs/ld-ctype.c:3219 locale/programs/ld-ctype.c:3240 +#: locale/programs/ld-ctype.c:3261 locale/programs/ld-ctype.c:3301 +#: locale/programs/ld-ctype.c:3322 locale/programs/ld-ctype.c:3389 #, c-format msgid "%s: character `%s' in charmap not representable with one byte" msgstr "" -#: locale/programs/ld-ctype.c:3408 locale/programs/ld-ctype.c:3433 +#: locale/programs/ld-ctype.c:3433 locale/programs/ld-ctype.c:3458 #, c-format msgid "" "%s: character `%s' needed as default value not representable with one byte" msgstr "%s:需要作为默认值的字符“%s”无法以单个字节来表示" -#: locale/programs/ld-ctype.c:3489 +#: locale/programs/ld-ctype.c:3514 #, c-format msgid "" "no output digits defined and none of the standard names in the charmap" msgstr "" -#: locale/programs/ld-ctype.c:3780 +#: locale/programs/ld-ctype.c:3805 #, c-format msgid "%s: transliteration data from locale `%s' not available" msgstr "" -#: locale/programs/ld-ctype.c:3881 +#: locale/programs/ld-ctype.c:3906 #, c-format msgid "%s: table for class \"%s\": %lu bytes\n" msgstr "" -#: locale/programs/ld-ctype.c:3950 +#: locale/programs/ld-ctype.c:3975 #, c-format msgid "%s: table for map \"%s\": %lu bytes\n" msgstr "" -#: locale/programs/ld-ctype.c:4083 +#: locale/programs/ld-ctype.c:4108 #, c-format msgid "%s: table for width: %lu bytes\n" msgstr "" @@ -2397,6 +2459,11 @@ msgid "symbol `%.*s' not in repertoire map" msgstr "" +#: locale/programs/locale-spec.c:131 +#, c-format +msgid "unknown name \"%s\"" +msgstr "" + #: locale/programs/locale.c:74 msgid "System information:" msgstr "系统信息:" @@ -2567,8 +2634,8 @@ #, c-format msgid "" "System's directory for character maps : %s\n" -" repertoire maps: %s\n" -" locale path : %s\n" +"\t\t repertoire maps: %s\n" +"\t\t locale path : %s\n" "%s" msgstr "" @@ -2582,130 +2649,135 @@ msgid "cannot add already read locale `%s' a second time" msgstr "无法再次添加已经读入的“%s”" -#: locale/programs/locarchive.c:88 locale/programs/locarchive.c:261 +#: locale/programs/locarchive.c:92 locale/programs/locarchive.c:338 #, c-format msgid "cannot create temporary file" msgstr "无法创建临时文件" -#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:307 +#: locale/programs/locarchive.c:122 locale/programs/locarchive.c:384 #, c-format msgid "cannot initialize archive file" msgstr "无法初始化归档文件" -#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:314 +#: locale/programs/locarchive.c:129 locale/programs/locarchive.c:391 #, c-format msgid "cannot resize archive file" msgstr "无法改变归档文件的大小" -#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:323 -#: locale/programs/locarchive.c:527 +#: locale/programs/locarchive.c:152 locale/programs/locarchive.c:414 +#: locale/programs/locarchive.c:633 #, c-format msgid "cannot map archive header" msgstr "无法映射归档文件头" -#: locale/programs/locarchive.c:156 +#: locale/programs/locarchive.c:174 #, c-format msgid "failed to create new locale archive" msgstr "无法创建新区域归档文件" -#: locale/programs/locarchive.c:168 +#: locale/programs/locarchive.c:186 #, c-format msgid "cannot change mode of new locale archive" msgstr "无法改变新归档文件的模式" -#: locale/programs/locarchive.c:255 +#: locale/programs/locarchive.c:285 +#, c-format +msgid "cannot read data from locale archive" +msgstr "" + +#: locale/programs/locarchive.c:318 #, c-format msgid "cannot map locale archive file" msgstr "无法映射区域归档文件" -#: locale/programs/locarchive.c:331 +#: locale/programs/locarchive.c:422 #, c-format msgid "cannot lock new archive" msgstr "无法锁定新归档文件" -#: locale/programs/locarchive.c:396 +#: locale/programs/locarchive.c:488 #, c-format msgid "cannot extend locale archive file" msgstr "无法扩展区域归档文件" -#: locale/programs/locarchive.c:405 +#: locale/programs/locarchive.c:497 #, c-format msgid "cannot change mode of resized locale archive" msgstr "无法改变过大小的区域归档文件的模式" -#: locale/programs/locarchive.c:413 +#: locale/programs/locarchive.c:505 #, c-format msgid "cannot rename new archive" msgstr "无法改变新归档文件的名称" -#: locale/programs/locarchive.c:466 +#: locale/programs/locarchive.c:558 #, c-format msgid "cannot open locale archive \"%s\"" msgstr "无法打开区域归档文件“%s”" -#: locale/programs/locarchive.c:471 +#: locale/programs/locarchive.c:563 #, c-format msgid "cannot stat locale archive \"%s\"" msgstr "无法对区域归档文件“%s”进行 stat() 操作" -#: locale/programs/locarchive.c:490 +#: locale/programs/locarchive.c:582 #, c-format msgid "cannot lock locale archive \"%s\"" msgstr "无法锁定区域归档文件“%s”" -#: locale/programs/locarchive.c:513 +#: locale/programs/locarchive.c:605 #, c-format msgid "cannot read archive header" msgstr "无法读入归档文件头" -#: locale/programs/locarchive.c:573 +#: locale/programs/locarchive.c:680 #, c-format msgid "locale '%s' already exists" msgstr "区域“%s”已存在" -#: locale/programs/locarchive.c:804 locale/programs/locarchive.c:819 -#: locale/programs/locarchive.c:831 locale/programs/locarchive.c:843 +#: locale/programs/locarchive.c:942 locale/programs/locarchive.c:957 +#: locale/programs/locarchive.c:969 locale/programs/locarchive.c:981 #: locale/programs/locfile.c:344 #, c-format msgid "cannot add to locale archive" msgstr "无法添加到区域归档文件" -#: locale/programs/locarchive.c:998 +#: locale/programs/locarchive.c:1139 #, c-format msgid "locale alias file `%s' not found" msgstr "找不到区域别名文件“%s”" -#: locale/programs/locarchive.c:1142 +#: locale/programs/locarchive.c:1289 #, c-format msgid "Adding %s\n" msgstr "正在添加 %s\n" -#: locale/programs/locarchive.c:1148 +#: locale/programs/locarchive.c:1295 #, c-format msgid "stat of \"%s\" failed: %s: ignored" msgstr "无法对“%s”运行 stat:%s:忽略" -#: locale/programs/locarchive.c:1154 +#: locale/programs/locarchive.c:1301 #, c-format msgid "\"%s\" is no directory; ignored" msgstr "“%s”不是目录;忽略" -#: locale/programs/locarchive.c:1161 +#: locale/programs/locarchive.c:1308 #, c-format msgid "cannot open directory \"%s\": %s: ignored" msgstr "无法打开目录“%s”:%s:忽略" -#: locale/programs/locarchive.c:1233 +#: locale/programs/locarchive.c:1380 #, c-format msgid "incomplete set of locale files in \"%s\"" msgstr "“%s”中的区域文件不完整" -#: locale/programs/locarchive.c:1297 +#: locale/programs/locarchive.c:1444 #, c-format msgid "cannot read all files in \"%s\": ignored" msgstr "无法读入“%s”中的所有文件:忽略" -#: locale/programs/locarchive.c:1367 +#: locale/programs/locarchive.c:1514 #, c-format msgid "locale \"%s\" not in archive" msgstr "区域“%s”在归档文件中" @@ -2771,7 +2843,7 @@ msgid "repertoire map file `%s' not found" msgstr "" -#: login/programs/pt_chown.c:74 +#: login/programs/pt_chown.c:78 #, c-format msgid "" "Set the owner, group and access permission of the slave pseudo terminal " @@ -2780,7 +2852,7 @@ "to be run directly from the command line.\n" msgstr "" -#: login/programs/pt_chown.c:84 +#: login/programs/pt_chown.c:88 #, c-format msgid "" "The owner is set to the current user, the group is set to `%s', and the " @@ -2789,43 +2861,39 @@ "%s" msgstr "" -#: login/programs/pt_chown.c:161 +#: login/programs/pt_chown.c:192 #, c-format msgid "too many arguments" msgstr "选项过多" -#: login/programs/pt_chown.c:169 +#: login/programs/pt_chown.c:200 #, c-format msgid "needs to be installed setuid `root'" msgstr "" -#: malloc/mcheck.c:330 +#: malloc/mcheck.c:350 msgid "memory is consistent, library is buggy\n" msgstr "内存不一致,库有错误\n" -#: malloc/mcheck.c:333 +#: malloc/mcheck.c:353 msgid "memory clobbered before allocated block\n" msgstr "" -#: malloc/mcheck.c:336 +#: malloc/mcheck.c:356 msgid "memory clobbered past end of allocated block\n" msgstr "" -#: malloc/mcheck.c:339 +#: malloc/mcheck.c:359 msgid "block freed twice\n" msgstr "块释放了两次\n" -#: malloc/mcheck.c:342 +#: malloc/mcheck.c:362 msgid "bogus mcheck_status, library is buggy\n" msgstr "" -#: malloc/memusage.sh:27 -msgid "Try \\`memusage --help' for more information." -msgstr "试用“memusage --help”以获取更多信息。" - #: malloc/memusage.sh:33 -msgid "memusage: option \\`$1' requires an argument" -msgstr "memusage:选项“$1”需要一个参数" +msgid "%s: option '%s' requires an argument\\n" +msgstr "" #: malloc/memusage.sh:39 msgid "" @@ -2862,9 +2930,9 @@ msgid "" "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--" "unbuffered]\n" -" [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n" -" [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n" -" PROGRAM [PROGRAMOPTION]..." +"\t [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n" +"\t [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n" +"\t PROGRAM [PROGRAMOPTION]..." msgstr "" #: malloc/memusage.sh:193 @@ -2921,7 +2989,7 @@ msgid "unable to free arguments" msgstr "无法释放参数" -#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:133 +#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132 #: sysdeps/gnu/errlist.c:20 msgid "Success" msgstr "成功" @@ -3554,12 +3622,12 @@ msgid "yp_update: cannot get server address\n" msgstr "yp_update:无法获取服务器地址\n" -#: nscd/aicache.c:82 nscd/hstcache.c:481 +#: nscd/aicache.c:83 nscd/hstcache.c:492 #, c-format msgid "Haven't found \"%s\" in hosts cache!" msgstr "无法在主机缓冲区中找到“%s”!" -#: nscd/aicache.c:84 nscd/hstcache.c:483 +#: nscd/aicache.c:85 nscd/hstcache.c:494 #, c-format msgid "Reloading \"%s\" in hosts cache!" msgstr "在主机缓冲区中重新加载“%s”!" @@ -3573,266 +3641,266 @@ msgid " (first)" msgstr "" -#: nscd/cache.c:286 nscd/connections.c:866 +#: nscd/cache.c:276 nscd/connections.c:861 #, c-format msgid "cannot stat() file `%s': %s" msgstr "无法对文件“%s”进行 stat() 操作:%s" -#: nscd/cache.c:328 +#: nscd/cache.c:318 #, c-format msgid "pruning %s cache; time %ld" msgstr "" -#: nscd/cache.c:357 +#: nscd/cache.c:347 #, c-format msgid "considering %s entry \"%s\", timeout %" msgstr "" -#: nscd/connections.c:570 +#: nscd/connections.c:565 #, c-format msgid "invalid persistent database file \"%s\": %s" msgstr "" -#: nscd/connections.c:578 +#: nscd/connections.c:573 msgid "uninitialized header" msgstr "" -#: nscd/connections.c:583 +#: nscd/connections.c:578 msgid "header size does not match" msgstr "文件头大小不匹配" -#: nscd/connections.c:593 +#: nscd/connections.c:588 msgid "file size does not match" msgstr "文件大小不匹配" -#: nscd/connections.c:610 +#: nscd/connections.c:605 msgid "verification failed" msgstr "验证失败" -#: nscd/connections.c:624 +#: nscd/connections.c:619 #, c-format msgid "" "suggested size of table for database %s larger than the persistent " "database's table" msgstr "" -#: nscd/connections.c:635 nscd/connections.c:720 +#: nscd/connections.c:630 nscd/connections.c:715 #, c-format msgid "cannot create read-only descriptor for \"%s\"; no mmap" msgstr "无法为“%s”创建只读描述符;没有 mmap" -#: nscd/connections.c:651 +#: nscd/connections.c:646 #, c-format msgid "cannot access '%s'" msgstr "" -#: nscd/connections.c:699 +#: nscd/connections.c:694 #, c-format msgid "" "database for %s corrupted or simultaneously used; remove %s manually if " "necessary and restart" msgstr "" -#: nscd/connections.c:706 +#: nscd/connections.c:701 #, c-format msgid "cannot create %s; no persistent database used" msgstr "无法创建 %s; 不使用持久数据库" -#: nscd/connections.c:709 +#: nscd/connections.c:704 #, c-format msgid "cannot create %s; no sharing possible" msgstr "无法创建 %s; 无法共享" -#: nscd/connections.c:780 +#: nscd/connections.c:775 #, c-format msgid "cannot write to database file %s: %s" msgstr "无法写入数据库文件 %s: %s" -#: nscd/connections.c:819 +#: nscd/connections.c:814 #, c-format msgid "cannot set socket to close on exec: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:902 +#: nscd/connections.c:897 #, c-format msgid "cannot open socket: %s" msgstr "无法打开套接字:%s" -#: nscd/connections.c:922 +#: nscd/connections.c:917 #, c-format msgid "cannot change socket to nonblocking mode: %s" msgstr "无法转换套接字到非堵塞模式: %s" -#: nscd/connections.c:930 +#: nscd/connections.c:925 #, c-format msgid "cannot set socket to close on exec: %s" msgstr "无法设定套接字为 exec 时关闭: %s" -#: nscd/connections.c:943 +#: nscd/connections.c:938 #, c-format msgid "cannot enable socket to accept connections: %s" msgstr "无法启用套接字以接受连接:%s" -#: nscd/connections.c:1043 +#: nscd/connections.c:1039 #, c-format msgid "provide access to FD %d, for %s" msgstr "" -#: nscd/connections.c:1055 +#: nscd/connections.c:1051 #, c-format msgid "cannot handle old request version %d; current version is %d" msgstr "无法处理旧请求版本 %d;当前版本为 %d" -#: nscd/connections.c:1077 +#: nscd/connections.c:1073 #, c-format msgid "request from %ld not handled due to missing permission" msgstr "" -#: nscd/connections.c:1082 +#: nscd/connections.c:1078 #, c-format msgid "request from '%s' [%ld] not handled due to missing permission" msgstr "" -#: nscd/connections.c:1087 +#: nscd/connections.c:1083 msgid "request not handled due to missing permission" msgstr "" -#: nscd/connections.c:1125 nscd/connections.c:1178 +#: nscd/connections.c:1121 nscd/connections.c:1174 #, c-format msgid "cannot write result: %s" msgstr "无法写入结果:“%s”" -#: nscd/connections.c:1261 +#: nscd/connections.c:1257 #, c-format msgid "error getting caller's id: %s" msgstr "" -#: nscd/connections.c:1320 +#: nscd/connections.c:1316 #, c-format msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1334 +#: nscd/connections.c:1330 #, c-format msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1374 +#: nscd/connections.c:1370 #, c-format msgid "cannot change to old UID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1384 +#: nscd/connections.c:1380 #, c-format msgid "cannot change to old GID: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1397 +#: nscd/connections.c:1393 #, c-format msgid "cannot change to old working directory: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1429 +#: nscd/connections.c:1439 #, c-format msgid "re-exec failed: %s; disabling paranoia mode" msgstr "" -#: nscd/connections.c:1438 +#: nscd/connections.c:1448 #, c-format msgid "cannot change current working directory to \"/\": %s" msgstr "" -#: nscd/connections.c:1644 +#: nscd/connections.c:1641 #, c-format msgid "short read while reading request: %s" msgstr "读取请求时没有读入足够的数据:%s" -#: nscd/connections.c:1677 +#: nscd/connections.c:1674 #, c-format msgid "key length in request too long: %d" msgstr "请求中的键过长:%d" -#: nscd/connections.c:1690 +#: nscd/connections.c:1687 #, c-format msgid "short read while reading request key: %s" msgstr "读入请求键的时候没有读入足够的数据:%s" -#: nscd/connections.c:1699 +#: nscd/connections.c:1696 #, c-format msgid "handle_request: request received (Version = %d) from PID %ld" msgstr "处理请求:已从进程ID %2$ld 收到请求 (版本 = %1$d)" -#: nscd/connections.c:1704 +#: nscd/connections.c:1701 #, c-format msgid "handle_request: request received (Version = %d)" msgstr "处理请求:已收到请求 (版本 = %d)" -#: nscd/connections.c:1903 nscd/connections.c:2101 +#: nscd/connections.c:1901 nscd/connections.c:2099 #, c-format msgid "disabled inotify after read error %d" msgstr "" -#: nscd/connections.c:2230 +#: nscd/connections.c:2228 msgid "could not initialize conditional variable" msgstr "" -#: nscd/connections.c:2238 +#: nscd/connections.c:2236 msgid "could not start clean-up thread; terminating" msgstr "" -#: nscd/connections.c:2252 +#: nscd/connections.c:2250 msgid "could not start any worker thread; terminating" msgstr "" -#: nscd/connections.c:2303 nscd/connections.c:2304 nscd/connections.c:2321 -#: nscd/connections.c:2330 nscd/connections.c:2348 nscd/connections.c:2359 -#: nscd/connections.c:2370 +#: nscd/connections.c:2301 nscd/connections.c:2302 nscd/connections.c:2319 +#: nscd/connections.c:2328 nscd/connections.c:2346 nscd/connections.c:2357 +#: nscd/connections.c:2368 #, c-format msgid "Failed to run nscd as user '%s'" msgstr "" -#: nscd/connections.c:2322 +#: nscd/connections.c:2320 #, c-format msgid "initial getgrouplist failed" msgstr "初始化 getgrouplist 失败" -#: nscd/connections.c:2331 +#: nscd/connections.c:2329 #, c-format msgid "getgrouplist failed" msgstr "getgrouplist 失败" -#: nscd/connections.c:2349 +#: nscd/connections.c:2347 #, c-format msgid "setgroups failed" msgstr "setgroups 失败" -#: nscd/grpcache.c:395 nscd/hstcache.c:430 nscd/initgrcache.c:416 -#: nscd/pwdcache.c:400 nscd/servicescache.c:343 +#: nscd/grpcache.c:383 nscd/hstcache.c:439 nscd/initgrcache.c:406 +#: nscd/pwdcache.c:378 nscd/servicescache.c:332 #, c-format msgid "short write in %s: %s" msgstr "" -#: nscd/grpcache.c:438 nscd/initgrcache.c:78 +#: nscd/grpcache.c:428 nscd/initgrcache.c:78 #, c-format msgid "Haven't found \"%s\" in group cache!" msgstr "无法在组缓冲区中找到“%s”!" -#: nscd/grpcache.c:440 nscd/initgrcache.c:80 +#: nscd/grpcache.c:430 nscd/initgrcache.c:80 #, c-format msgid "Reloading \"%s\" in group cache!" msgstr "在组缓冲区中重新加载“%s”!" -#: nscd/grpcache.c:517 +#: nscd/grpcache.c:509 #, c-format msgid "Invalid numeric gid \"%s\"!" msgstr "" -#: nscd/mem.c:457 +#: nscd/mem.c:431 #, c-format msgid "freed %zu bytes in %s cache" msgstr "" -#: nscd/mem.c:594 +#: nscd/mem.c:574 #, c-format msgid "no more memory for database '%s'" msgstr "" @@ -3881,7 +3949,7 @@ msgid "Name Service Cache Daemon." msgstr "" -#: nscd/nscd.c:147 nss/getent.c:876 nss/makedb.c:123 +#: nscd/nscd.c:147 nss/getent.c:952 nss/makedb.c:123 #, c-format msgid "wrong number of arguments" msgstr "参数个数错误" @@ -3910,7 +3978,7 @@ msgid "Could not create log file" msgstr "无法创建日志文件" -#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:172 +#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:174 #, c-format msgid "Only root is allowed to use this option!" msgstr "只有根用户允许使用本选项!" @@ -3920,7 +3988,7 @@ msgid "'%s' is not a known database" msgstr "" -#: nscd/nscd.c:370 nscd/nscd_stat.c:191 +#: nscd/nscd.c:370 nscd/nscd_stat.c:193 #, c-format msgid "write incomplete" msgstr "写入不完整" @@ -3985,35 +4053,35 @@ msgid "maximum file size for %s database too small" msgstr "" -#: nscd/nscd_stat.c:141 +#: nscd/nscd_stat.c:143 #, c-format msgid "cannot write statistics: %s" msgstr "无法写入统计:%s" -#: nscd/nscd_stat.c:156 +#: nscd/nscd_stat.c:158 msgid "yes" msgstr "是" -#: nscd/nscd_stat.c:157 +#: nscd/nscd_stat.c:159 msgid "no" msgstr "否" -#: nscd/nscd_stat.c:168 +#: nscd/nscd_stat.c:170 #, c-format msgid "Only root or %s is allowed to use this option!" msgstr "只有根用户或 %s 允许使用本选项!" -#: nscd/nscd_stat.c:179 +#: nscd/nscd_stat.c:181 #, c-format msgid "nscd not running!\n" msgstr "nscd 未运行!\n" -#: nscd/nscd_stat.c:203 +#: nscd/nscd_stat.c:205 #, c-format msgid "cannot read statistics data" msgstr "无法读入统计数据" -#: nscd/nscd_stat.c:206 +#: nscd/nscd_stat.c:208 #, c-format msgid "" "nscd configuration:\n" @@ -4024,27 +4092,27 @@ "\n" "%15d 服务器调试级别\n" -#: nscd/nscd_stat.c:230 +#: nscd/nscd_stat.c:232 #, c-format msgid "%3ud %2uh %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:233 +#: nscd/nscd_stat.c:235 #, c-format msgid " %2uh %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:235 +#: nscd/nscd_stat.c:237 #, c-format msgid " %2um %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:237 +#: nscd/nscd_stat.c:239 #, c-format msgid " %2lus server runtime\n" msgstr "" -#: nscd/nscd_stat.c:239 +#: nscd/nscd_stat.c:241 #, c-format msgid "" "%15d current number of threads\n" @@ -4052,9 +4120,10 @@ "%15lu number of times clients had to wait\n" "%15s paranoia mode enabled\n" "%15lu restart internal\n" +"%15u reload count\n" msgstr "" -#: nscd/nscd_stat.c:273 +#: nscd/nscd_stat.c:276 #, c-format msgid "" "\n" @@ -4082,17 +4151,17 @@ "%15s check /etc/%s for changes\n" msgstr "" -#: nscd/pwdcache.c:443 +#: nscd/pwdcache.c:423 #, c-format msgid "Haven't found \"%s\" in password cache!" msgstr "无法在口令缓冲区中找到“%s”!" -#: nscd/pwdcache.c:445 +#: nscd/pwdcache.c:425 #, c-format msgid "Reloading \"%s\" in password cache!" msgstr "在口令缓冲区中重新加载“%s”!" -#: nscd/pwdcache.c:523 +#: nscd/pwdcache.c:506 #, c-format msgid "Invalid numeric uid \"%s\"!" msgstr "" @@ -4188,43 +4257,47 @@ "%15u CAV misses\n" msgstr "" -#: nscd/servicescache.c:390 +#: nscd/servicescache.c:381 #, c-format msgid "Haven't found \"%s\" in services cache!" msgstr "无法在服务缓冲区中找到“%s”!" -#: nscd/servicescache.c:392 +#: nscd/servicescache.c:383 #, c-format msgid "Reloading \"%s\" in services cache!" msgstr "在服务缓冲区中重新加载“%s”!" -#: nss/getent.c:52 +#: nss/getent.c:54 msgid "database [key ...]" msgstr "数据库 [键 ...]" -#: nss/getent.c:57 +#: nss/getent.c:59 msgid "Service configuration to be used" msgstr "要使用的服务配置" -#: nss/getent.c:62 +#: nss/getent.c:60 +msgid "disable IDN encoding" +msgstr "" + +#: nss/getent.c:65 msgid "Get entries from administrative database." msgstr "" -#: nss/getent.c:143 nss/getent.c:408 +#: nss/getent.c:149 nss/getent.c:479 #, c-format msgid "Enumeration not supported on %s\n" msgstr "%s 不支持枚举\n" -#: nss/getent.c:794 +#: nss/getent.c:866 #, c-format msgid "Unknown database name" msgstr "未知的数据库名" -#: nss/getent.c:820 +#: nss/getent.c:896 msgid "Supported databases:\n" msgstr "支持的数据库:\n" -#: nss/getent.c:886 +#: nss/getent.c:962 #, c-format msgid "Unknown database: %s\n" msgstr "未知的数据库:%s\n" @@ -4288,17 +4361,17 @@ msgid "while reading database" msgstr "当读数据库" -#: posix/getconf.c:945 +#: posix/getconf.c:1036 #, c-format msgid "Usage: %s [-v specification] variable_name [pathname]\n" msgstr "用法:%s [-v 规范] 变量名 [路径名]\n" -#: posix/getconf.c:948 +#: posix/getconf.c:1039 #, c-format msgid " %s -a [pathname]\n" msgstr "" -#: posix/getconf.c:1023 +#: posix/getconf.c:1115 #, c-format msgid "" "Usage: getconf [-v SPEC] VAR\n" @@ -4310,142 +4383,146 @@ "\n" msgstr "" -#: posix/getconf.c:1081 +#: posix/getconf.c:1173 #, c-format msgid "unknown specification \"%s\"" msgstr "未知的规范“%s”" -#: posix/getconf.c:1109 +#: posix/getconf.c:1225 #, c-format msgid "Couldn't execute %s" msgstr "不能执行 %s" -#: posix/getconf.c:1149 posix/getconf.c:1165 +#: posix/getconf.c:1269 posix/getconf.c:1285 msgid "undefined" msgstr "未定义" -#: posix/getconf.c:1187 +#: posix/getconf.c:1307 #, c-format msgid "Unrecognized variable `%s'" msgstr "不可识别的变量“%s”" -#: posix/getopt.c:570 posix/getopt.c:586 +#: posix/getopt.c:594 posix/getopt.c:623 #, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s:选项“%s”具有二义性\n" +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "" -#: posix/getopt.c:619 posix/getopt.c:623 +#: posix/getopt.c:664 posix/getopt.c:668 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s:选项“--%s”不接受任何参数\n" -#: posix/getopt.c:632 posix/getopt.c:637 +#: posix/getopt.c:677 posix/getopt.c:682 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s:选项“%c%s”不接受参数\n" -#: posix/getopt.c:680 posix/getopt.c:699 posix/getopt.c:1002 -#: posix/getopt.c:1021 +#: posix/getopt.c:725 posix/getopt.c:744 #, c-format -msgid "%s: option '%s' requires an argument\n" -msgstr "%s:选项“%s”需要一个参数\n" +msgid "%s: option '--%s' requires an argument\n" +msgstr "" -#: posix/getopt.c:737 posix/getopt.c:740 +#: posix/getopt.c:782 posix/getopt.c:785 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s:无法识别的选项“--%s”\n" -#: posix/getopt.c:748 posix/getopt.c:751 +#: posix/getopt.c:793 posix/getopt.c:796 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s:无法识别的选项“%c%s”\n" -#: posix/getopt.c:800 posix/getopt.c:803 +#: posix/getopt.c:845 posix/getopt.c:848 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s:无效选项 -- %c\n" -#: posix/getopt.c:853 posix/getopt.c:870 posix/getopt.c:1073 -#: posix/getopt.c:1091 +#: posix/getopt.c:898 posix/getopt.c:915 posix/getopt.c:1123 +#: posix/getopt.c:1141 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s:选项需要一个参数 -- %c\n" -#: posix/getopt.c:923 posix/getopt.c:939 +#: posix/getopt.c:971 posix/getopt.c:987 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s:选项“-W %s”具有二义性\n" -#: posix/getopt.c:963 posix/getopt.c:981 +#: posix/getopt.c:1011 posix/getopt.c:1029 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s:选项“-W %s”不接受参数\n" -#: posix/regcomp.c:136 +#: posix/getopt.c:1050 posix/getopt.c:1068 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "" + +#: posix/regcomp.c:135 msgid "No match" msgstr "没有匹配" -#: posix/regcomp.c:139 +#: posix/regcomp.c:138 msgid "Invalid regular expression" msgstr "无效的常规表达式" -#: posix/regcomp.c:142 +#: posix/regcomp.c:141 msgid "Invalid collation character" msgstr "" -#: posix/regcomp.c:145 +#: posix/regcomp.c:144 msgid "Invalid character class name" msgstr "无效的字符类名" -#: posix/regcomp.c:148 +#: posix/regcomp.c:147 msgid "Trailing backslash" msgstr "末尾的反斜杠" -#: posix/regcomp.c:151 +#: posix/regcomp.c:150 msgid "Invalid back reference" msgstr "无效的向后引用" -#: posix/regcomp.c:154 +#: posix/regcomp.c:153 msgid "Unmatched [ or [^" msgstr "不匹配的 [ 或 [^" -#: posix/regcomp.c:157 +#: posix/regcomp.c:156 msgid "Unmatched ( or \\(" msgstr "不匹配的 ( 或 \\(" -#: posix/regcomp.c:160 +#: posix/regcomp.c:159 msgid "Unmatched \\{" msgstr "不匹配的 \\{" -#: posix/regcomp.c:163 +#: posix/regcomp.c:162 msgid "Invalid content of \\{\\}" msgstr "无效的 \\{\\} 的内容" -#: posix/regcomp.c:166 +#: posix/regcomp.c:165 msgid "Invalid range end" msgstr "无效的范围结束符" -#: posix/regcomp.c:169 +#: posix/regcomp.c:168 msgid "Memory exhausted" msgstr "内存耗尽" -#: posix/regcomp.c:172 +#: posix/regcomp.c:171 msgid "Invalid preceding regular expression" msgstr "无效的前导常规表达式" -#: posix/regcomp.c:175 +#: posix/regcomp.c:174 msgid "Premature end of regular expression" msgstr "常规表达式非正常结束" -#: posix/regcomp.c:178 +#: posix/regcomp.c:177 msgid "Regular expression too big" msgstr "常规表达式过大" -#: posix/regcomp.c:181 +#: posix/regcomp.c:180 msgid "Unmatched ) or \\)" msgstr "不匹配的 ) 或 \\)" -#: posix/regcomp.c:681 +#: posix/regcomp.c:680 msgid "No previous regular expression" msgstr "没有前一个常规表达式" @@ -4506,6 +4583,189 @@ msgid "%s: line %d: ignoring trailing garbage `%s'\n" msgstr "" +#: stdio-common/psiginfo-data.h:2 +msgid "Illegal opcode" +msgstr "" + +#: stdio-common/psiginfo-data.h:3 +msgid "Illegal operand" +msgstr "" + +#: stdio-common/psiginfo-data.h:4 +msgid "Illegal addressing mode" +msgstr "" + +#: stdio-common/psiginfo-data.h:5 +msgid "Illegal trap" +msgstr "" + +#: stdio-common/psiginfo-data.h:6 +msgid "Privileged opcode" +msgstr "" + +#: stdio-common/psiginfo-data.h:7 +msgid "Privileged register" +msgstr "" + +#: stdio-common/psiginfo-data.h:8 +msgid "Coprocessor error" +msgstr "" + +#: stdio-common/psiginfo-data.h:9 +msgid "Internal stack error" +msgstr "" + +#: stdio-common/psiginfo-data.h:12 +msgid "Integer divide by zero" +msgstr "" + +#: stdio-common/psiginfo-data.h:13 +msgid "Integer overflow" +msgstr "" + +#: stdio-common/psiginfo-data.h:14 +msgid "Floating-point divide by zero" +msgstr "" + +#: stdio-common/psiginfo-data.h:15 +msgid "Floating-point overflow" +msgstr "" + +#: stdio-common/psiginfo-data.h:16 +msgid "Floating-point underflow" +msgstr "" + +#: stdio-common/psiginfo-data.h:17 +msgid "Floating-poing inexact result" +msgstr "" + +#: stdio-common/psiginfo-data.h:18 +msgid "Invalid floating-point operation" +msgstr "" + +#: stdio-common/psiginfo-data.h:19 +msgid "Subscript out of range" +msgstr "" + +#: stdio-common/psiginfo-data.h:22 +msgid "Address not mapped to object" +msgstr "" + +#: stdio-common/psiginfo-data.h:23 +msgid "Invalid permissions for mapped object" +msgstr "" + +#: stdio-common/psiginfo-data.h:26 +msgid "Invalid address alignment" +msgstr "" + +#: stdio-common/psiginfo-data.h:27 +msgid "Nonexisting physical address" +msgstr "" + +#: stdio-common/psiginfo-data.h:28 +msgid "Object-specific hardware error" +msgstr "" + +#: stdio-common/psiginfo-data.h:31 +msgid "Process breakpoint" +msgstr "" + +#: stdio-common/psiginfo-data.h:32 +msgid "Process trace trap" +msgstr "" + +#: stdio-common/psiginfo-data.h:35 +msgid "Child has exited" +msgstr "" + +#: stdio-common/psiginfo-data.h:36 +msgid "Child has terminated abnormally and did not create a core file" +msgstr "" + +#: stdio-common/psiginfo-data.h:37 +msgid "Child hat terminated abnormally and created a core file" +msgstr "" + +#: stdio-common/psiginfo-data.h:38 +msgid "Traced child has trapped" +msgstr "" + +#: stdio-common/psiginfo-data.h:39 +msgid "Child has stopped" +msgstr "" + +#: stdio-common/psiginfo-data.h:40 +msgid "Stopped child has continued" +msgstr "" + +#: stdio-common/psiginfo-data.h:43 +msgid "Data input available" +msgstr "" + +#: stdio-common/psiginfo-data.h:44 +msgid "Output buffers available" +msgstr "" + +#: stdio-common/psiginfo-data.h:45 +msgid "Input message available" +msgstr "" + +#: stdio-common/psiginfo-data.h:46 +msgid "I/O error" +msgstr "I/O 错误" + +#: stdio-common/psiginfo-data.h:47 +msgid "High priority input available" +msgstr "" + +#: stdio-common/psiginfo-data.h:48 +msgid "Device disconnected" +msgstr "" + +#: stdio-common/psiginfo.c:145 +msgid "Signal sent by kill()" +msgstr "" + +#: stdio-common/psiginfo.c:148 +msgid "Signal sent by sigqueue()" +msgstr "" + +#: stdio-common/psiginfo.c:151 +msgid "Signal generated by the expiration of a timer" +msgstr "" + +#: stdio-common/psiginfo.c:154 +msgid "Signal generated by the completion of an asynchronous I/O request" +msgstr "" + +#: stdio-common/psiginfo.c:158 +msgid "" +"Signal generated by the arrival of a message on an empty message queue" +msgstr "" + +#: stdio-common/psiginfo.c:163 +msgid "Signal sent by tkill()" +msgstr "" + +#: stdio-common/psiginfo.c:168 +msgid "" +"Signal generated by the completion of an asynchronous name lookup request" +msgstr "" + +#: stdio-common/psiginfo.c:174 +msgid "Signal generated by the completion of an I/O request" +msgstr "" + +#: stdio-common/psiginfo.c:180 +msgid "Signal sent by the kernel" +msgstr "" + +#: stdio-common/psiginfo.c:204 +#, c-format +msgid "Unknown signal %d\n" +msgstr "" + #: stdio-common/psignal.c:51 #, c-format msgid "%s%sUnknown signal %d\n" @@ -4515,7 +4775,7 @@ msgid "Unknown signal" msgstr "未知信号" -#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87 +#: string/_strerror.c:47 sysdeps/mach/_strerror.c:87 msgid "Unknown error " msgstr "未知的错误 " @@ -4533,598 +4793,598 @@ msgid "Unknown signal %d" msgstr "未知信号 %d" -#: sunrpc/auth_unix.c:114 sunrpc/clnt_tcp.c:131 sunrpc/clnt_udp.c:143 -#: sunrpc/clnt_unix.c:128 sunrpc/svc_tcp.c:179 sunrpc/svc_tcp.c:218 -#: sunrpc/svc_udp.c:153 sunrpc/svc_unix.c:176 sunrpc/svc_unix.c:215 -#: sunrpc/xdr.c:566 sunrpc/xdr.c:718 sunrpc/xdr_array.c:106 -#: sunrpc/xdr_rec.c:156 sunrpc/xdr_ref.c:85 +#: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:125 sunrpc/clnt_udp.c:136 +#: sunrpc/clnt_unix.c:126 sunrpc/svc_tcp.c:173 sunrpc/svc_tcp.c:218 +#: sunrpc/svc_udp.c:147 sunrpc/svc_unix.c:174 sunrpc/svc_unix.c:215 +#: sunrpc/xdr.c:632 sunrpc/xdr.c:792 sunrpc/xdr_array.c:100 +#: sunrpc/xdr_rec.c:154 sunrpc/xdr_ref.c:79 msgid "out of memory\n" msgstr "" -#: sunrpc/auth_unix.c:350 +#: sunrpc/auth_unix.c:351 msgid "auth_unix.c: Fatal marshalling problem" msgstr "" -#: sunrpc/clnt_perr.c:105 sunrpc/clnt_perr.c:121 +#: sunrpc/clnt_perr.c:98 sunrpc/clnt_perr.c:114 #, c-format msgid "%s: %s; low version = %lu, high version = %lu" msgstr "" -#: sunrpc/clnt_perr.c:112 +#: sunrpc/clnt_perr.c:105 #, c-format msgid "%s: %s; why = %s\n" msgstr "" -#: sunrpc/clnt_perr.c:114 +#: sunrpc/clnt_perr.c:107 #, c-format msgid "%s: %s; why = (unknown authentication error - %d)\n" msgstr "" -#: sunrpc/clnt_perr.c:159 +#: sunrpc/clnt_perr.c:156 msgid "RPC: Success" msgstr "RPC:成功" -#: sunrpc/clnt_perr.c:162 +#: sunrpc/clnt_perr.c:159 msgid "RPC: Can't encode arguments" msgstr "RPC:无法对参数进行编码" -#: sunrpc/clnt_perr.c:166 +#: sunrpc/clnt_perr.c:163 msgid "RPC: Can't decode result" msgstr "RPC:无法对结果进行解码" -#: sunrpc/clnt_perr.c:170 +#: sunrpc/clnt_perr.c:167 msgid "RPC: Unable to send" msgstr "RPC:无法发送" -#: sunrpc/clnt_perr.c:174 +#: sunrpc/clnt_perr.c:171 msgid "RPC: Unable to receive" msgstr "RPC:无法接收" -#: sunrpc/clnt_perr.c:178 +#: sunrpc/clnt_perr.c:175 msgid "RPC: Timed out" msgstr "RPC:超时" -#: sunrpc/clnt_perr.c:182 +#: sunrpc/clnt_perr.c:179 msgid "RPC: Incompatible versions of RPC" msgstr "RPC:RPC 版本不兼容" -#: sunrpc/clnt_perr.c:186 +#: sunrpc/clnt_perr.c:183 msgid "RPC: Authentication error" msgstr "RPC:认证错误" -#: sunrpc/clnt_perr.c:190 +#: sunrpc/clnt_perr.c:187 msgid "RPC: Program unavailable" msgstr "RPC:程序不可用" -#: sunrpc/clnt_perr.c:194 +#: sunrpc/clnt_perr.c:191 msgid "RPC: Program/version mismatch" msgstr "RPC:程序/版本不匹配" -#: sunrpc/clnt_perr.c:198 +#: sunrpc/clnt_perr.c:195 msgid "RPC: Procedure unavailable" msgstr "RPC:过程不可用" -#: sunrpc/clnt_perr.c:202 +#: sunrpc/clnt_perr.c:199 msgid "RPC: Server can't decode arguments" msgstr "RPC:服务器无法对参数进行解码" -#: sunrpc/clnt_perr.c:206 +#: sunrpc/clnt_perr.c:203 msgid "RPC: Remote system error" msgstr "RPC:远程系统错误" -#: sunrpc/clnt_perr.c:210 +#: sunrpc/clnt_perr.c:207 msgid "RPC: Unknown host" msgstr "RPC:未知主机" -#: sunrpc/clnt_perr.c:214 +#: sunrpc/clnt_perr.c:211 msgid "RPC: Unknown protocol" msgstr "RPC:未知协议" -#: sunrpc/clnt_perr.c:218 +#: sunrpc/clnt_perr.c:215 msgid "RPC: Port mapper failure" msgstr "RPC:端口映射失败" -#: sunrpc/clnt_perr.c:222 +#: sunrpc/clnt_perr.c:219 msgid "RPC: Program not registered" msgstr "RPC:程序未注册" -#: sunrpc/clnt_perr.c:226 +#: sunrpc/clnt_perr.c:223 msgid "RPC: Failed (unspecified error)" msgstr "RPC:失败 (未指明的错误)" -#: sunrpc/clnt_perr.c:267 +#: sunrpc/clnt_perr.c:264 msgid "RPC: (unknown error code)" msgstr "RPC:(未知的错误码)" -#: sunrpc/clnt_perr.c:330 +#: sunrpc/clnt_perr.c:336 msgid "Authentication OK" msgstr "认证成功" -#: sunrpc/clnt_perr.c:333 +#: sunrpc/clnt_perr.c:339 msgid "Invalid client credential" msgstr "无效的客户证书" -#: sunrpc/clnt_perr.c:337 +#: sunrpc/clnt_perr.c:343 msgid "Server rejected credential" msgstr "服务器拒绝证书" -#: sunrpc/clnt_perr.c:341 +#: sunrpc/clnt_perr.c:347 msgid "Invalid client verifier" msgstr "无效的客户校验" -#: sunrpc/clnt_perr.c:345 +#: sunrpc/clnt_perr.c:351 msgid "Server rejected verifier" msgstr "服务器拒绝校验" -#: sunrpc/clnt_perr.c:349 +#: sunrpc/clnt_perr.c:355 msgid "Client credential too weak" msgstr "客户证书太弱" -#: sunrpc/clnt_perr.c:353 +#: sunrpc/clnt_perr.c:359 msgid "Invalid server verifier" msgstr "无效的服务器校验" -#: sunrpc/clnt_perr.c:357 +#: sunrpc/clnt_perr.c:363 msgid "Failed (unspecified error)" msgstr "失败 (未指明的错误)" -#: sunrpc/clnt_raw.c:117 +#: sunrpc/clnt_raw.c:115 msgid "clnt_raw.c: fatal header serialization error" msgstr "clnt_raw.c: 致命的头编序错误。" -#: sunrpc/pm_getmaps.c:83 +#: sunrpc/pm_getmaps.c:77 msgid "pmap_getmaps.c: rpc problem" msgstr "" -#: sunrpc/pmap_clnt.c:129 +#: sunrpc/pmap_clnt.c:127 msgid "Cannot register service" msgstr "无法注册服务" -#: sunrpc/pmap_rmt.c:248 +#: sunrpc/pmap_rmt.c:243 msgid "Cannot create socket for broadcast rpc" msgstr "无法为广播 rpc 创建套接字" -#: sunrpc/pmap_rmt.c:255 +#: sunrpc/pmap_rmt.c:250 msgid "Cannot set socket option SO_BROADCAST" msgstr "无法设置套接字选项 SO_BROADCAST" -#: sunrpc/pmap_rmt.c:307 +#: sunrpc/pmap_rmt.c:302 msgid "Cannot send broadcast packet" msgstr "无法发送广播包" -#: sunrpc/pmap_rmt.c:332 +#: sunrpc/pmap_rmt.c:327 msgid "Broadcast poll problem" msgstr "" -#: sunrpc/pmap_rmt.c:345 +#: sunrpc/pmap_rmt.c:340 msgid "Cannot receive reply to broadcast" msgstr "无法接收对广播的应答" -#: sunrpc/rpc_main.c:290 +#: sunrpc/rpc_main.c:288 #, c-format msgid "%s: output would overwrite %s\n" msgstr "%s:输出将覆盖 %s\n" -#: sunrpc/rpc_main.c:297 +#: sunrpc/rpc_main.c:295 #, c-format msgid "%s: unable to open %s: %m\n" msgstr "%s:无法打开 %s:%m\n" -#: sunrpc/rpc_main.c:309 +#: sunrpc/rpc_main.c:307 #, c-format msgid "%s: while writing output %s: %m" msgstr "%s:写入输出 %s 时:%m" -#: sunrpc/rpc_main.c:344 +#: sunrpc/rpc_main.c:342 #, c-format msgid "cannot find C preprocessor: %s \n" msgstr "无法找到 C 预处理器:%s \n" -#: sunrpc/rpc_main.c:352 +#: sunrpc/rpc_main.c:350 msgid "cannot find any C preprocessor (cpp)\n" msgstr "无法找到任何 C 预处理器 (cpp)\n" -#: sunrpc/rpc_main.c:421 +#: sunrpc/rpc_main.c:419 #, c-format msgid "%s: C preprocessor failed with signal %d\n" msgstr "%s:C 预处理器因信号 %d 而失败\n" -#: sunrpc/rpc_main.c:424 +#: sunrpc/rpc_main.c:422 #, c-format msgid "%s: C preprocessor failed with exit code %d\n" msgstr "%s:C 预处理器失败,返回 %d\n" -#: sunrpc/rpc_main.c:464 +#: sunrpc/rpc_main.c:462 #, c-format msgid "illegal nettype: `%s'\n" msgstr "非法网络类型:“%s”\n" -#: sunrpc/rpc_main.c:1130 +#: sunrpc/rpc_main.c:1128 #, c-format msgid "rpcgen: too many defines\n" msgstr "rpcgen:定义过多\n" -#: sunrpc/rpc_main.c:1142 +#: sunrpc/rpc_main.c:1140 #, c-format msgid "rpcgen: arglist coding error\n" msgstr "" #. TRANS: the file will not be removed; this is an #. TRANS: informative message. -#: sunrpc/rpc_main.c:1175 +#: sunrpc/rpc_main.c:1173 #, c-format msgid "file `%s' already exists and may be overwritten\n" msgstr "文件“%s”已存在并可能被覆盖\n" -#: sunrpc/rpc_main.c:1220 +#: sunrpc/rpc_main.c:1218 #, c-format msgid "Cannot specify more than one input file!\n" msgstr "无法指定多个输入文件!\n" -#: sunrpc/rpc_main.c:1394 +#: sunrpc/rpc_main.c:1392 #, c-format msgid "This implementation doesn't support newstyle or MT-safe code!\n" msgstr "" -#: sunrpc/rpc_main.c:1403 +#: sunrpc/rpc_main.c:1401 #, c-format msgid "Cannot use netid flag with inetd flag!\n" msgstr "无法在使用 inetd 标志的同时使用 netid 标志!\n" -#: sunrpc/rpc_main.c:1415 +#: sunrpc/rpc_main.c:1413 #, c-format msgid "Cannot use netid flag without TIRPC!\n" msgstr "无法在未使用 TIRPC 的时候使用 netid 标志!\n" -#: sunrpc/rpc_main.c:1422 +#: sunrpc/rpc_main.c:1420 #, c-format msgid "Cannot use table flags with newstyle!\n" msgstr "无法以新风格使用表格标志!\n" -#: sunrpc/rpc_main.c:1441 +#: sunrpc/rpc_main.c:1439 #, c-format msgid "\"infile\" is required for template generation flags.\n" msgstr "“输入文件”对模板生成标志来说是必须的。\n" -#: sunrpc/rpc_main.c:1446 +#: sunrpc/rpc_main.c:1444 #, c-format msgid "Cannot have more than one file generation flag!\n" msgstr "无法使用多于一个的文件生成标志!\n" -#: sunrpc/rpc_main.c:1455 +#: sunrpc/rpc_main.c:1453 #, c-format msgid "usage: %s infile\n" msgstr "用法:%s 输入文件\n" -#: sunrpc/rpc_main.c:1456 +#: sunrpc/rpc_main.c:1454 #, c-format msgid "" "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] " "infile\n" msgstr "\t%s [-abkCLNTM][-D名字[=值]] [-i 大小] [-I [-K 秒数]] [-Y 路径] 输入文件\n" -#: sunrpc/rpc_main.c:1458 +#: sunrpc/rpc_main.c:1456 #, c-format msgid "" "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n" msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o 输出文件] [输入文件]\n" -#: sunrpc/rpc_main.c:1460 +#: sunrpc/rpc_main.c:1458 #, c-format msgid "\t%s [-s nettype]* [-o outfile] [infile]\n" msgstr "\t%s [-s 网络类型]* [-o 输出文件] [输入文件]\n" -#: sunrpc/rpc_main.c:1461 +#: sunrpc/rpc_main.c:1459 #, c-format msgid "\t%s [-n netid]* [-o outfile] [infile]\n" msgstr "\t%s [-n 网络 id]* [-o 输出文件] [输入文件]\n" -#: sunrpc/rpc_main.c:1469 +#: sunrpc/rpc_main.c:1467 #, c-format msgid "options:\n" msgstr "" -#: sunrpc/rpc_main.c:1470 +#: sunrpc/rpc_main.c:1468 #, c-format msgid "-a\t\tgenerate all files, including samples\n" msgstr "" -#: sunrpc/rpc_main.c:1471 +#: sunrpc/rpc_main.c:1469 #, c-format msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n" msgstr "" -#: sunrpc/rpc_main.c:1472 +#: sunrpc/rpc_main.c:1470 #, c-format msgid "-c\t\tgenerate XDR routines\n" msgstr "" -#: sunrpc/rpc_main.c:1473 +#: sunrpc/rpc_main.c:1471 #, c-format msgid "-C\t\tANSI C mode\n" msgstr "" -#: sunrpc/rpc_main.c:1474 +#: sunrpc/rpc_main.c:1472 #, c-format msgid "-Dname[=value]\tdefine a symbol (same as #define)\n" msgstr "" -#: sunrpc/rpc_main.c:1475 +#: sunrpc/rpc_main.c:1473 #, c-format msgid "-h\t\tgenerate header file\n" msgstr "" -#: sunrpc/rpc_main.c:1476 +#: sunrpc/rpc_main.c:1474 #, c-format msgid "-i size\t\tsize at which to start generating inline code\n" msgstr "" -#: sunrpc/rpc_main.c:1477 +#: sunrpc/rpc_main.c:1475 #, c-format msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n" msgstr "" -#: sunrpc/rpc_main.c:1478 +#: sunrpc/rpc_main.c:1476 #, c-format msgid "-K seconds\tserver exits after K seconds of inactivity\n" msgstr "" -#: sunrpc/rpc_main.c:1479 +#: sunrpc/rpc_main.c:1477 #, c-format msgid "-l\t\tgenerate client side stubs\n" msgstr "" -#: sunrpc/rpc_main.c:1480 +#: sunrpc/rpc_main.c:1478 #, c-format msgid "-L\t\tserver errors will be printed to syslog\n" msgstr "" -#: sunrpc/rpc_main.c:1481 +#: sunrpc/rpc_main.c:1479 #, c-format msgid "-m\t\tgenerate server side stubs\n" msgstr "" -#: sunrpc/rpc_main.c:1482 +#: sunrpc/rpc_main.c:1480 #, c-format msgid "-M\t\tgenerate MT-safe code\n" msgstr "" -#: sunrpc/rpc_main.c:1483 +#: sunrpc/rpc_main.c:1481 #, c-format msgid "-n netid\tgenerate server code that supports named netid\n" msgstr "" -#: sunrpc/rpc_main.c:1484 +#: sunrpc/rpc_main.c:1482 #, c-format msgid "-N\t\tsupports multiple arguments and call-by-value\n" msgstr "" -#: sunrpc/rpc_main.c:1485 +#: sunrpc/rpc_main.c:1483 #, c-format msgid "-o outfile\tname of the output file\n" msgstr "" -#: sunrpc/rpc_main.c:1486 +#: sunrpc/rpc_main.c:1484 #, c-format msgid "-s nettype\tgenerate server code that supports named nettype\n" msgstr "" -#: sunrpc/rpc_main.c:1487 +#: sunrpc/rpc_main.c:1485 #, c-format msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n" msgstr "" -#: sunrpc/rpc_main.c:1488 +#: sunrpc/rpc_main.c:1486 #, c-format msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n" msgstr "" -#: sunrpc/rpc_main.c:1489 +#: sunrpc/rpc_main.c:1487 #, c-format msgid "-Sm \t\tgenerate makefile template \n" msgstr "" -#: sunrpc/rpc_main.c:1490 +#: sunrpc/rpc_main.c:1488 #, c-format msgid "-t\t\tgenerate RPC dispatch table\n" msgstr "" -#: sunrpc/rpc_main.c:1491 +#: sunrpc/rpc_main.c:1489 #, c-format msgid "-T\t\tgenerate code to support RPC dispatch tables\n" msgstr "" -#: sunrpc/rpc_main.c:1492 +#: sunrpc/rpc_main.c:1490 #, c-format msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n" msgstr "" -#: sunrpc/rpc_scan.c:114 +#: sunrpc/rpc_scan.c:112 msgid "constant or identifier expected" msgstr "应为常量或标识符" -#: sunrpc/rpc_scan.c:310 +#: sunrpc/rpc_scan.c:308 msgid "illegal character in file: " msgstr "文件中的非法字符: " -#: sunrpc/rpc_scan.c:349 sunrpc/rpc_scan.c:375 +#: sunrpc/rpc_scan.c:347 sunrpc/rpc_scan.c:373 msgid "unterminated string constant" msgstr "未终止的字符串常量" -#: sunrpc/rpc_scan.c:381 +#: sunrpc/rpc_scan.c:379 msgid "empty char string" msgstr "空字符串" -#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533 +#: sunrpc/rpc_scan.c:521 sunrpc/rpc_scan.c:531 msgid "preprocessor error" msgstr "预处理错误" -#: sunrpc/rpcinfo.c:254 sunrpc/rpcinfo.c:400 +#: sunrpc/rpcinfo.c:246 sunrpc/rpcinfo.c:392 #, c-format msgid "program %lu is not available\n" msgstr "程序 %lu 不可用\n" -#: sunrpc/rpcinfo.c:281 sunrpc/rpcinfo.c:327 sunrpc/rpcinfo.c:350 -#: sunrpc/rpcinfo.c:424 sunrpc/rpcinfo.c:470 sunrpc/rpcinfo.c:493 -#: sunrpc/rpcinfo.c:527 +#: sunrpc/rpcinfo.c:273 sunrpc/rpcinfo.c:319 sunrpc/rpcinfo.c:342 +#: sunrpc/rpcinfo.c:416 sunrpc/rpcinfo.c:462 sunrpc/rpcinfo.c:485 +#: sunrpc/rpcinfo.c:519 #, c-format msgid "program %lu version %lu is not available\n" msgstr "程序 %lu 版本 %lu 不可用\n" -#: sunrpc/rpcinfo.c:532 +#: sunrpc/rpcinfo.c:524 #, c-format msgid "program %lu version %lu ready and waiting\n" msgstr "程序 %lu 版本 %lu 就绪并等待\n" -#: sunrpc/rpcinfo.c:573 sunrpc/rpcinfo.c:580 +#: sunrpc/rpcinfo.c:565 sunrpc/rpcinfo.c:572 msgid "rpcinfo: can't contact portmapper" msgstr "rpcinfo:无法同 portmapper 交互" -#: sunrpc/rpcinfo.c:587 +#: sunrpc/rpcinfo.c:579 msgid "No remote programs registered.\n" msgstr "没有注册的远程程序。\n" -#: sunrpc/rpcinfo.c:591 +#: sunrpc/rpcinfo.c:583 msgid " program vers proto port\n" msgstr " 程序 版本 协议 端口\n" -#: sunrpc/rpcinfo.c:630 +#: sunrpc/rpcinfo.c:622 msgid "(unknown)" msgstr "(未知)" -#: sunrpc/rpcinfo.c:654 +#: sunrpc/rpcinfo.c:646 #, c-format msgid "rpcinfo: broadcast failed: %s\n" msgstr "rpcinfo:广播失败:%s\n" -#: sunrpc/rpcinfo.c:675 +#: sunrpc/rpcinfo.c:667 msgid "Sorry. You are not root\n" msgstr "抱歉。您不是根用户\n" -#: sunrpc/rpcinfo.c:682 +#: sunrpc/rpcinfo.c:674 #, c-format msgid "rpcinfo: Could not delete registration for prog %s version %s\n" msgstr "rpcinfo:无法删除程序 %s 版本 %s 的注册\n" -#: sunrpc/rpcinfo.c:691 +#: sunrpc/rpcinfo.c:683 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n" msgstr "用法:rpcinfo [ -n 端口号 ] -u 主机名 程序号 [ 版本号 ]\n" -#: sunrpc/rpcinfo.c:693 +#: sunrpc/rpcinfo.c:685 msgid " rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n" msgstr " rpcinfo [ -n 端口号 ] -t 主机 程序号 [ 版本号 ]\n" -#: sunrpc/rpcinfo.c:695 +#: sunrpc/rpcinfo.c:687 msgid " rpcinfo -p [ host ]\n" msgstr " rpcinfo -p [ 主机 ]\n" -#: sunrpc/rpcinfo.c:696 +#: sunrpc/rpcinfo.c:688 msgid " rpcinfo -b prognum versnum\n" msgstr " rpcinfo -b 程序号 版本号\n" -#: sunrpc/rpcinfo.c:697 +#: sunrpc/rpcinfo.c:689 msgid " rpcinfo -d prognum versnum\n" msgstr " rpcinfo -d 程序号 版本号\n" -#: sunrpc/rpcinfo.c:722 +#: sunrpc/rpcinfo.c:714 #, c-format msgid "rpcinfo: %s is unknown service\n" msgstr "rpcinfo:%s 是未知的服务\n" -#: sunrpc/rpcinfo.c:759 +#: sunrpc/rpcinfo.c:751 #, c-format msgid "rpcinfo: %s is unknown host\n" msgstr "rpcinfo:%s 是未知的主机\n" -#: sunrpc/svc_run.c:70 +#: sunrpc/svc_run.c:71 msgid "svc_run: - out of memory" msgstr "svc_run: - 内存不足" -#: sunrpc/svc_run.c:90 +#: sunrpc/svc_run.c:91 msgid "svc_run: - poll failed" msgstr "svc_run:- poll 失败" -#: sunrpc/svc_simple.c:87 +#: sunrpc/svc_simple.c:81 #, c-format msgid "can't reassign procedure number %ld\n" msgstr "无法重新指定进程编号 %ld\n" -#: sunrpc/svc_simple.c:97 +#: sunrpc/svc_simple.c:91 msgid "couldn't create an rpc server\n" msgstr "无法创建 rpc 服务器\n" -#: sunrpc/svc_simple.c:105 +#: sunrpc/svc_simple.c:99 #, c-format msgid "couldn't register prog %ld vers %ld\n" msgstr "无法注册程序 %ld 版本 %ld\n" -#: sunrpc/svc_simple.c:113 +#: sunrpc/svc_simple.c:107 msgid "registerrpc: out of memory\n" msgstr "registerrpc:内存不足\n" -#: sunrpc/svc_simple.c:173 +#: sunrpc/svc_simple.c:168 #, c-format msgid "trouble replying to prog %d\n" msgstr "" -#: sunrpc/svc_simple.c:182 +#: sunrpc/svc_simple.c:177 #, c-format msgid "never registered prog %d\n" msgstr "从未注册的程序 %d\n" -#: sunrpc/svc_tcp.c:155 +#: sunrpc/svc_tcp.c:149 msgid "svc_tcp.c - tcp socket creation problem" msgstr "svc_tcp.c - tcp 套接字创建问题" -#: sunrpc/svc_tcp.c:170 +#: sunrpc/svc_tcp.c:164 msgid "svc_tcp.c - cannot getsockname or listen" msgstr "svc_tcp.c - 无法进行 getsockname 或 listen 操作" -#: sunrpc/svc_udp.c:128 +#: sunrpc/svc_udp.c:122 msgid "svcudp_create: socket creation problem" msgstr "svcudp_create: 套接字创建问题" -#: sunrpc/svc_udp.c:142 +#: sunrpc/svc_udp.c:136 msgid "svcudp_create - cannot getsockname" msgstr "svcudp_create - 无法调用 getsockname" -#: sunrpc/svc_udp.c:175 +#: sunrpc/svc_udp.c:168 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n" msgstr "svcudp_create:xp_pad 对 IP_PKTINFO 来说太小\n" -#: sunrpc/svc_udp.c:475 +#: sunrpc/svc_udp.c:476 msgid "enablecache: cache already enabled" msgstr "enablecache:缓冲区已经启用" -#: sunrpc/svc_udp.c:481 +#: sunrpc/svc_udp.c:482 msgid "enablecache: could not allocate cache" msgstr "enablecache:无法分配缓冲区" -#: sunrpc/svc_udp.c:490 +#: sunrpc/svc_udp.c:491 msgid "enablecache: could not allocate cache data" msgstr "enablecache:无法分配缓冲区数据" -#: sunrpc/svc_udp.c:498 +#: sunrpc/svc_udp.c:499 msgid "enablecache: could not allocate cache fifo" msgstr "" -#: sunrpc/svc_udp.c:533 +#: sunrpc/svc_udp.c:535 msgid "cache_set: victim not found" msgstr "cache_set:找不到 victim" -#: sunrpc/svc_udp.c:544 +#: sunrpc/svc_udp.c:546 msgid "cache_set: victim alloc failed" msgstr "cache_set:分配 victim 失败" -#: sunrpc/svc_udp.c:551 +#: sunrpc/svc_udp.c:553 msgid "cache_set: could not allocate new rpc_buffer" msgstr "cache_set:无法分配新的 rpc_buffer" -#: sunrpc/svc_unix.c:150 +#: sunrpc/svc_unix.c:148 msgid "svc_unix.c - AF_UNIX socket creation problem" msgstr "svc_unix.c - AF_UNIX 套接字创建问题" -#: sunrpc/svc_unix.c:166 +#: sunrpc/svc_unix.c:164 msgid "svc_unix.c - cannot getsockname or listen" msgstr "svc_unix.c - 无法进行 getsockname 或 listen 操作" @@ -6099,6 +6359,10 @@ msgid "State not recoverable" msgstr "状态不可恢复" +#: sysdeps/gnu/errlist.c:1461 +msgid "Operation not possible due to RF-kill" +msgstr "" + #: sysdeps/mach/_strerror.c:57 msgid "Error in unknown error system: " msgstr "未知的错误系统中出错: " @@ -6206,43 +6470,46 @@ msgid "cannot read header from `%s'" msgstr "无法从“%s”中读入头" -#: timezone/zdump.c:210 +#: timezone/zdump.c:215 msgid "lacks alphabetic at start" msgstr "在开头缺少字母" -#: timezone/zdump.c:212 +#: timezone/zdump.c:217 msgid "has fewer than 3 alphabetics" msgstr "少于3个字母" -#: timezone/zdump.c:214 +#: timezone/zdump.c:219 msgid "has more than 6 alphabetics" msgstr "超过6个字母" -#: timezone/zdump.c:222 +#: timezone/zdump.c:227 msgid "differs from POSIX standard" msgstr "与 POSIX 标准的不同" -#: timezone/zdump.c:228 +#: timezone/zdump.c:233 #, c-format msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n" msgstr "" -#: timezone/zdump.c:279 +#: timezone/zdump.c:242 #, c-format msgid "" -"%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n" -msgstr "%s:用法为 %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] 区域名 ...\n" +"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] " +"zonename ...\n" +"\n" +"Report bugs to tz@elsie.nci.nih.gov.\n" +msgstr "" -#: timezone/zdump.c:296 +#: timezone/zdump.c:311 #, c-format msgid "%s: wild -c argument %s\n" msgstr "%s: 怪异的 -c 选项 %s\n" -#: timezone/zdump.c:387 +#: timezone/zdump.c:398 msgid "Error writing to standard output" msgstr "写入标准输出出错" -#: timezone/zdump.c:410 +#: timezone/zdump.c:421 #, c-format msgid "" "%s: use of -v on system with floating time_t other than float or double\n" @@ -6270,344 +6537,345 @@ #: timezone/zic.c:459 #, c-format msgid "" -"%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n" +"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p " +"posixrules ] \\\n" "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n" +"\n" +"Report bugs to tz@elsie.nci.nih.gov.\n" msgstr "" -"%s:用法为 %s [ --version ] [ -v ] [ -l 本地时间 ] [ -p posix 规则 ] \\\n" -"\t[ -d 目录 ] [ -L leapseconds ] [ -y yearistype ] [ 文件名 ... ]\n" -#: timezone/zic.c:494 +#: timezone/zic.c:496 msgid "wild compilation-time specification of zic_t" msgstr "" -#: timezone/zic.c:511 +#: timezone/zic.c:515 #, c-format msgid "%s: More than one -d option specified\n" msgstr "%s:给出了多个 -d 选项\n" -#: timezone/zic.c:521 +#: timezone/zic.c:525 #, c-format msgid "%s: More than one -l option specified\n" msgstr "%s:给出了多个 -l 选项\n" -#: timezone/zic.c:531 +#: timezone/zic.c:535 #, c-format msgid "%s: More than one -p option specified\n" msgstr "%s:给出了多个 -p 选项\n" -#: timezone/zic.c:541 +#: timezone/zic.c:545 #, c-format msgid "%s: More than one -y option specified\n" msgstr "%s:给出了多个 -y 选项\n" -#: timezone/zic.c:551 +#: timezone/zic.c:555 #, c-format msgid "%s: More than one -L option specified\n" msgstr "%s:给出了多个 -L 选项\n" -#: timezone/zic.c:600 +#: timezone/zic.c:604 msgid "link to link" msgstr "链接到链接" -#: timezone/zic.c:665 +#: timezone/zic.c:669 msgid "hard link failed, symbolic link used" msgstr "硬连接失败,使用符号连接" -#: timezone/zic.c:673 +#: timezone/zic.c:677 #, c-format msgid "%s: Can't link from %s to %s: %s\n" msgstr "%s:无法从 %s 连接到 %s:%s\n" -#: timezone/zic.c:745 timezone/zic.c:747 +#: timezone/zic.c:749 timezone/zic.c:751 msgid "same rule name in multiple files" msgstr "多个文件中的相同规则名" -#: timezone/zic.c:788 +#: timezone/zic.c:792 msgid "unruly zone" msgstr "" -#: timezone/zic.c:795 +#: timezone/zic.c:799 #, c-format msgid "%s in ruleless zone" msgstr "" -#: timezone/zic.c:816 +#: timezone/zic.c:820 msgid "standard input" msgstr "标准输入" -#: timezone/zic.c:821 +#: timezone/zic.c:825 #, c-format msgid "%s: Can't open %s: %s\n" msgstr "%s:无法打开 %s:%s\n" -#: timezone/zic.c:832 +#: timezone/zic.c:836 msgid "line too long" msgstr "行过长" -#: timezone/zic.c:852 +#: timezone/zic.c:856 msgid "input line of unknown type" msgstr "未知类型的输入行" -#: timezone/zic.c:868 +#: timezone/zic.c:872 #, c-format msgid "%s: Leap line in non leap seconds file %s\n" msgstr "" -#: timezone/zic.c:875 timezone/zic.c:1312 timezone/zic.c:1334 +#: timezone/zic.c:879 timezone/zic.c:1316 timezone/zic.c:1338 #, c-format msgid "%s: panic: Invalid l_value %d\n" msgstr "" -#: timezone/zic.c:883 +#: timezone/zic.c:887 #, c-format msgid "%s: Error reading %s\n" msgstr "%s:读 %s 错误\n" -#: timezone/zic.c:890 +#: timezone/zic.c:894 #, c-format msgid "%s: Error closing %s: %s\n" msgstr "%s:关闭 %s 错误:%s\n" -#: timezone/zic.c:895 +#: timezone/zic.c:899 msgid "expected continuation line not found" msgstr "找不到应该出现的续行" -#: timezone/zic.c:939 timezone/zic.c:2476 timezone/zic.c:2495 +#: timezone/zic.c:943 timezone/zic.c:2480 timezone/zic.c:2499 msgid "time overflow" msgstr "时间溢出" -#: timezone/zic.c:943 +#: timezone/zic.c:947 msgid "24:00 not handled by pre-1998 versions of zic" msgstr "" -#: timezone/zic.c:946 +#: timezone/zic.c:950 msgid "values over 24 hours not handled by pre-2007 versions of zic" msgstr "" -#: timezone/zic.c:959 +#: timezone/zic.c:963 msgid "wrong number of fields on Rule line" msgstr "规则行中域的个数错误" -#: timezone/zic.c:963 +#: timezone/zic.c:967 msgid "nameless rule" msgstr "无名规则" -#: timezone/zic.c:968 +#: timezone/zic.c:972 msgid "invalid saved time" msgstr "" -#: timezone/zic.c:989 +#: timezone/zic.c:993 msgid "wrong number of fields on Zone line" msgstr "区域行中域的个数错误" -#: timezone/zic.c:995 +#: timezone/zic.c:999 #, c-format msgid "\"Zone %s\" line and -l option are mutually exclusive" msgstr "" -#: timezone/zic.c:1003 +#: timezone/zic.c:1007 #, c-format msgid "\"Zone %s\" line and -p option are mutually exclusive" msgstr "" -#: timezone/zic.c:1015 +#: timezone/zic.c:1019 #, c-format msgid "duplicate zone name %s (file \"%s\", line %d)" msgstr "重复的区域名 %s (文件“%s”,行 %d)" -#: timezone/zic.c:1031 +#: timezone/zic.c:1035 msgid "wrong number of fields on Zone continuation line" msgstr "" -#: timezone/zic.c:1071 +#: timezone/zic.c:1075 msgid "invalid UTC offset" msgstr "无效的 UTC 偏移量" -#: timezone/zic.c:1074 +#: timezone/zic.c:1078 msgid "invalid abbreviation format" msgstr "无效的缩略格式" -#: timezone/zic.c:1103 +#: timezone/zic.c:1107 msgid "" "Zone continuation line end time is not after end time of previous line" msgstr "" -#: timezone/zic.c:1131 +#: timezone/zic.c:1135 msgid "wrong number of fields on Leap line" msgstr "" -#: timezone/zic.c:1140 +#: timezone/zic.c:1144 msgid "invalid leaping year" msgstr "无效的闰年" -#: timezone/zic.c:1160 timezone/zic.c:1266 +#: timezone/zic.c:1164 timezone/zic.c:1270 msgid "invalid month name" msgstr "无效的月名称" -#: timezone/zic.c:1173 timezone/zic.c:1379 timezone/zic.c:1393 +#: timezone/zic.c:1177 timezone/zic.c:1383 timezone/zic.c:1397 msgid "invalid day of month" msgstr "无效的日" -#: timezone/zic.c:1178 +#: timezone/zic.c:1182 msgid "time before zero" msgstr "" -#: timezone/zic.c:1182 +#: timezone/zic.c:1186 msgid "time too small" msgstr "时间太小" -#: timezone/zic.c:1186 +#: timezone/zic.c:1190 msgid "time too large" msgstr "时间过大" -#: timezone/zic.c:1190 timezone/zic.c:1295 +#: timezone/zic.c:1194 timezone/zic.c:1299 msgid "invalid time of day" msgstr "无效的时间" -#: timezone/zic.c:1209 +#: timezone/zic.c:1213 msgid "illegal CORRECTION field on Leap line" msgstr "" -#: timezone/zic.c:1214 +#: timezone/zic.c:1218 msgid "illegal Rolling/Stationary field on Leap line" msgstr "" -#: timezone/zic.c:1230 +#: timezone/zic.c:1234 msgid "wrong number of fields on Link line" msgstr "连接行中域的个数错误" -#: timezone/zic.c:1234 +#: timezone/zic.c:1238 msgid "blank FROM field on Link line" msgstr "Link 行中空白的 FROM 域" -#: timezone/zic.c:1238 +#: timezone/zic.c:1242 msgid "blank TO field on Link line" msgstr "Link 行中空白的 TO 域" -#: timezone/zic.c:1316 +#: timezone/zic.c:1320 msgid "invalid starting year" msgstr "无效的起始年份" -#: timezone/zic.c:1338 +#: timezone/zic.c:1342 msgid "invalid ending year" msgstr "无效的终止年份" -#: timezone/zic.c:1342 +#: timezone/zic.c:1346 msgid "starting year greater than ending year" msgstr "起始年份大于终止年份" -#: timezone/zic.c:1349 +#: timezone/zic.c:1353 msgid "typed single year" msgstr "" -#: timezone/zic.c:1384 +#: timezone/zic.c:1388 msgid "invalid weekday name" msgstr "无效的星期名" -#: timezone/zic.c:1562 +#: timezone/zic.c:1566 #, c-format msgid "%s: Can't remove %s: %s\n" msgstr "%s:无法删除 %s:%s\n" -#: timezone/zic.c:1572 +#: timezone/zic.c:1576 #, c-format msgid "%s: Can't create %s: %s\n" msgstr "%s:无法创建 %s:%s\n" -#: timezone/zic.c:1722 +#: timezone/zic.c:1726 #, c-format msgid "%s: Error writing %s\n" msgstr "%s:写 %s 错误\n" -#: timezone/zic.c:2015 +#: timezone/zic.c:2019 msgid "no POSIX environment variable for zone" msgstr "" -#: timezone/zic.c:2172 +#: timezone/zic.c:2176 msgid "can't determine time zone abbreviation to use just after until time" msgstr "" -#: timezone/zic.c:2218 +#: timezone/zic.c:2222 msgid "too many transitions?!" msgstr "" -#: timezone/zic.c:2237 +#: timezone/zic.c:2241 msgid "internal error - addtype called with bad isdst" msgstr "内部错误 - 以错误的 isdst 调用 addtype" -#: timezone/zic.c:2241 +#: timezone/zic.c:2245 msgid "internal error - addtype called with bad ttisstd" msgstr "内部错误 - 以错误的 ttisstd 调用 addtype" -#: timezone/zic.c:2245 +#: timezone/zic.c:2249 msgid "internal error - addtype called with bad ttisgmt" msgstr "内部错误 - 以错误的 ttisgmt 调用 addtype" -#: timezone/zic.c:2264 +#: timezone/zic.c:2268 msgid "too many local time types" msgstr "过多的本地时间类型" -#: timezone/zic.c:2268 +#: timezone/zic.c:2272 msgid "UTC offset out of range" msgstr "UTC 偏移值超出范围" -#: timezone/zic.c:2296 +#: timezone/zic.c:2300 msgid "too many leap seconds" msgstr "太多润秒" -#: timezone/zic.c:2302 +#: timezone/zic.c:2306 msgid "repeated leap second moment" msgstr "" -#: timezone/zic.c:2354 +#: timezone/zic.c:2358 msgid "Wild result from command execution" msgstr "" -#: timezone/zic.c:2355 +#: timezone/zic.c:2359 #, c-format msgid "%s: command was '%s', result was %d\n" msgstr "%s:命令为“%s”,结果为 %d\n" -#: timezone/zic.c:2453 +#: timezone/zic.c:2457 msgid "Odd number of quotation marks" msgstr "奇数个引号" -#: timezone/zic.c:2542 +#: timezone/zic.c:2546 msgid "use of 2/29 in non leap-year" msgstr "" -#: timezone/zic.c:2577 +#: timezone/zic.c:2581 msgid "" "rule goes past start/end of month--will not work with pre-2004 versions of " "zic" msgstr "" -#: timezone/zic.c:2609 +#: timezone/zic.c:2613 msgid "time zone abbreviation lacks alphabetic at start" msgstr "" -#: timezone/zic.c:2611 +#: timezone/zic.c:2615 msgid "time zone abbreviation has more than 3 alphabetics" msgstr "" -#: timezone/zic.c:2613 +#: timezone/zic.c:2617 msgid "time zone abbreviation has too many alphabetics" msgstr "" -#: timezone/zic.c:2623 +#: timezone/zic.c:2627 msgid "time zone abbreviation differs from POSIX standard" msgstr "" -#: timezone/zic.c:2635 +#: timezone/zic.c:2639 msgid "too many, or too long, time zone abbreviations" msgstr "过多或过长的时区缩写" -#: timezone/zic.c:2676 +#: timezone/zic.c:2680 #, c-format msgid "%s: Can't create directory %s: %s\n" msgstr "%s:无法创建目录 %s:%s\n" -#: timezone/zic.c:2698 +#: timezone/zic.c:2702 #, c-format msgid "%s: %d did not sign extend correctly\n" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libelf.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libelf.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libelf.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libelf.po 2012-02-23 07:11: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: 2011-12-29 10:38+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:31+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../lib/errors.h:25 msgid "no error" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libexif-12.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libexif-12.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libexif-12.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libexif-12.po 2012-02-23 07:11: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: 2011-12-29 10:38+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:32+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35 #: libexif/olympus/mnote-olympus-entry.c:37 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgnutls.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgnutls.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgnutls.po 2012-01-02 18:07:39.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgnutls.po 2012-02-23 07:11:59.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: 2011-11-08 08:17+0100\n" +"POT-Creation-Date: 2012-01-25 03:35+0000\n" "PO-Revision-Date: 2010-11-19 08:51+0000\n" "Last-Translator: Aron Xu \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: 2011-12-29 17:17+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:15+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: gnutls_errors.c:54 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgpg-error.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgpg-error.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgpg-error.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgpg-error.po 2012-02-23 07:11:32.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: 2011-12-29 10:43+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:36+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/err-sources.h:28 msgid "Unspecified source" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgphoto2-2.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2-2.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgphoto2-2.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2-2.po 2012-02-23 07:11:32.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: 2011-12-29 10:44+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: camlibs/adc65/adc65.c:243 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po 2012-01-02 18:07:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po 2012-02-23 07:11:32.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: 2011-12-29 10:45+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: libgphoto2_port/gphoto2-port-info-list.c:213 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libiconv.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libiconv.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libiconv.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libiconv.po 2012-02-23 07:11:59.000000000 +0000 @@ -7,15 +7,15 @@ "Project-Id-Version: libiconv 1.9.1\n" "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n" "POT-Creation-Date: 2007-10-25 00:19+0200\n" -"PO-Revision-Date: 2011-10-05 10:35+0000\n" +"PO-Revision-Date: 2012-01-03 14:43+0000\n" "Last-Translator: Wang Jian \n" "Language-Team: Chinese (simplified) \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: 2011-12-29 17:14+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. TRANSLATORS: The first line of the short usage message. #: src/iconv.c:105 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libidn.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libidn.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libidn.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libidn.po 2012-02-23 07:11:33.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: 2011-12-29 10:46+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:38+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvirt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvirt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvirt.po 2012-01-02 18:07:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvirt.po 2012-02-23 07:11:56.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: libvirt\n" "Report-Msgid-Bugs-To: libvir-list@redhat.com\n" -"POT-Creation-Date: 2011-11-08 14:40+0800\n" +"POT-Creation-Date: 2011-12-08 14:59+0800\n" "PO-Revision-Date: 2011-01-16 22:17+0000\n" "Last-Translator: Tony Fu \n" "Language-Team: Chinese (China) " @@ -20,60 +20,60 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:21+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:21+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" -#: daemon/libvirtd.c:252 +#: daemon/libvirtd.c:256 #, c-format msgid "" "%s: error: %s. Check /var/log/messages or run without --daemon for more " "info.\n" msgstr "" -#: daemon/libvirtd.c:2758 daemon/libvirtd.c:2767 +#: daemon/libvirtd.c:446 daemon/libvirtd.c:451 #, c-format msgid "Failed to parse mode '%s'" msgstr "解析模式 '%s' 失败" -#: daemon/libvirtd.c:2429 daemon/libvirtd.c:2448 +#: daemon/libvirtd.c:590 daemon/libvirtd.c:609 #, c-format msgid "failed to allocate memory for %s config list" msgstr "为 %s 配置列表分配内存失败" -#: daemon/libvirtd.c:2435 daemon/libvirtd.c:2465 +#: daemon/libvirtd.c:596 daemon/libvirtd.c:626 #, c-format msgid "failed to allocate memory for %s config list value" msgstr "为 %s 配置列表值分配内存失败" -#: daemon/libvirtd.c:610 daemon/libvirtd.c:633 +#: daemon/libvirtd.c:614 daemon/libvirtd.c:637 #, c-format msgid "remoteReadConfigFile: %s: %s: must be a string or list of strings" msgstr "" -#: daemon/libvirtd.c:649 +#: daemon/libvirtd.c:653 #, c-format msgid "remoteReadConfigFile: %s: %s: invalid type: got %s; expected %s" msgstr "" -#: daemon/libvirtd.c:710 +#: daemon/libvirtd.c:714 #, c-format msgid "remoteReadConfigFile: %s: %s: unsupported auth %s" msgstr "" -#: daemon/libvirtd.c:1088 +#: daemon/libvirtd.c:1100 msgid "additional privileges are required" msgstr "" -#: daemon/libvirtd.c:1094 +#: daemon/libvirtd.c:1106 msgid "failed to set reduced privileges" msgstr "" -#: daemon/libvirtd.c:1145 +#: daemon/libvirtd.c:1157 msgid "Driver state initialization failed" msgstr "" -#: daemon/libvirtd.c:1173 +#: daemon/libvirtd.c:1185 #, c-format msgid "" "\n" @@ -92,7 +92,7 @@ "libvirt management daemon:\n" msgstr "" -#: daemon/libvirtd.c:1190 +#: daemon/libvirtd.c:1202 #, c-format msgid "" "\n" @@ -115,7 +115,7 @@ "\n" msgstr "" -#: daemon/libvirtd.c:1217 +#: daemon/libvirtd.c:1229 msgid "" "\n" " Default paths:\n" @@ -136,287 +136,408 @@ "\n" msgstr "" -#: daemon/libvirtd.c:1278 src/lxc/lxc_controller.c:1306 +#: 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 "" -#: daemon/libvirtd.c:1315 +#: daemon/libvirtd.c:1327 msgid "Invalid value for timeout" msgstr "" -#: daemon/libvirtd.c:1323 daemon/libvirtd.c:1331 +#: daemon/libvirtd.c:1335 daemon/libvirtd.c:1343 msgid "Can't allocate memory" msgstr "" -#: daemon/libvirtd.c:1345 +#: daemon/libvirtd.c:1357 #, c-format msgid "%s: internal error: unknown flag: %c" msgstr "" -#: daemon/libvirtd.c:1352 +#: daemon/libvirtd.c:1364 msgid "Can't create initial configuration" msgstr "" -#: daemon/libvirtd.c:1361 +#: daemon/libvirtd.c:1373 msgid "Can't determine config path" msgstr "" -#: daemon/libvirtd.c:1369 +#: daemon/libvirtd.c:1381 #, c-format msgid "Can't load config file '%s'" msgstr "" -#: daemon/libvirtd.c:1375 +#: daemon/libvirtd.c:1387 #, c-format msgid "invalid host UUID: %s" msgstr "" -#: daemon/libvirtd.c:1380 +#: daemon/libvirtd.c:1392 msgid "Can't initialize logging" msgstr "" -#: daemon/libvirtd.c:1387 +#: daemon/libvirtd.c:1399 msgid "Can't determine pid file path." msgstr "" -#: daemon/libvirtd.c:1395 +#: daemon/libvirtd.c:1407 msgid "Can't determine socket paths" msgstr "" -#: src/util/util.c:526 +#: daemon/libvirtd.c:1415 #, c-format msgid "cannot change to root directory: %s" msgstr "无法更改到根目录:%s" -#: daemon/libvirtd.c:3059 +#: daemon/libvirtd.c:1421 #, c-format msgid "Failed to fork as daemon: %s" msgstr "用 fork 作为守护进程失败:%s" -#: daemon/libvirtd.c:1422 +#: daemon/libvirtd.c:1434 msgid "Can't determine user directory" msgstr "" -#: daemon/libvirtd.c:3086 +#: daemon/libvirtd.c:1448 #, c-format msgid "unable to create rundir %s: %s" msgstr "无法生成 rundir %s:%s" -#: daemon/remote.c:173 +#: 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:64 src/remote/remote_driver.c:57 +#: daemon/remote.c:63 src/remote/remote_driver.c:57 #, c-format msgid "conversion from hyper to %s overflowed" msgstr "" -#: daemon/remote.c:142 +#: daemon/remote.c:599 msgid "connection already open" msgstr "连接已经打开" -#: daemon/remote.c:730 daemon/remote.c:808 src/remote/remote_driver.c:1298 -#: src/remote/remote_driver.c:1369 +#: daemon/remote.c:605 +msgid "keepalive support is required to connect" +msgstr "" + +#: 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 "" -#: daemon/remote.c:501 daemon/remote.c:585 +#: 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 过大" -#: src/remote/remote_driver.c:3196 +#: daemon/remote.c:798 src/remote/remote_driver.c:1376 #, c-format msgid "Parameter %s too big for destination" msgstr "" -#: daemon/remote.c:725 +#: daemon/remote.c:988 msgid "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX" msgstr "" -#: daemon/remote.c:794 daemon/remote.c:843 +#: daemon/remote.c:1059 daemon/remote.c:1186 msgid "size > maximum buffer size" msgstr "大小 > 最大缓冲大小" -#: daemon/remote.c:1290 +#: daemon/remote.c:1328 msgid "ncpumaps > REMOTE_VCPUINFO_MAX" msgstr "" -#: daemon/remote.c:1331 +#: daemon/remote.c:1334 daemon/remote.c:1405 msgid "maxinfo * maplen > REMOTE_CPUMAPS_MAX" msgstr "maxinfo * maplen > REMOTE_CPUMAPS_MAX" -#: daemon/remote.c:1325 +#: daemon/remote.c:1399 msgid "maxinfo > REMOTE_VCPUINFO_MAX" msgstr "maxinfo > REMOTE_VCPUINFO_MAX" -#: daemon/remote.c:2864 +#: daemon/remote.c:2047 msgid "client tried invalid SASL init request" msgstr "客户端尝试无效 SASL 初始化请求" -#: src/util/virterror.c:989 +#: 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:3022 +#: daemon/remote.c:2120 #, c-format msgid "negotiated SSF %d was not strong enough" msgstr "协商 SSF %d 不够强大" -#: daemon/remote.c:3119 daemon/remote.c:3207 +#: daemon/remote.c:2176 daemon/remote.c:2274 msgid "client tried invalid SASL start request" msgstr "客户端尝试无效 SASL 启动请求" -#: daemon/remote.c:3141 +#: daemon/remote.c:2194 #, c-format msgid "sasl start reply data too long %d" msgstr "sasl 启动回应数据过长 %d" -#: daemon/remote.c:3229 +#: daemon/remote.c:2291 #, c-format msgid "sasl step reply data too long %d" msgstr "sasl 步骤回应数据过长 %d" -#: daemon/remote.c:3356 daemon/remote.c:3425 +#: daemon/remote.c:2430 daemon/remote.c:2527 msgid "client tried invalid PolicyKit init request" msgstr "客户端尝试无效 PolicyKit 初始请求" -#: daemon/remote.c:3369 +#: daemon/remote.c:2442 #, c-format msgid "Caller PID was too large %d" msgstr "调用程序 PID 过大 %d" -#: daemon/remote.c:2343 daemon/remote.c:2433 +#: daemon/remote.c:2448 daemon/remote.c:2538 #, c-format msgid "Caller identity was too large %d:%d" msgstr "" -#: daemon/remote.c:3374 +#: daemon/remote.c:2453 #, c-format msgid "Cannot invoke %s" msgstr "无法调用 %s" -#: daemon/remote.c:2353 +#: daemon/remote.c:2458 #, c-format msgid "Policy kit denied action %s from pid %d, uid %d: %s" msgstr "" -#: daemon/remote.c:3361 daemon/remote.c:3430 +#: daemon/remote.c:2532 msgid "cannot get peer socket identity" msgstr "无法获得同级套接字身份" -#: daemon/remote.c:3438 +#: daemon/remote.c:2546 #, c-format msgid "Failed to lookup policy kit caller: %s" msgstr "检查策略套件调用程序失败:%s" -#: daemon/remote.c:2448 +#: daemon/remote.c:2553 #, c-format msgid "Failed to create polkit action %s" msgstr "" -#: daemon/remote.c:2458 +#: daemon/remote.c:2563 #, c-format msgid "Failed to create polkit context %s" msgstr "" -#: daemon/remote.c:3473 +#: daemon/remote.c:2581 #, c-format msgid "Policy kit failed to check authorization %d %s" msgstr "策略套件无法检查验证 %d %s" -#: daemon/remote.c:2490 +#: daemon/remote.c:2595 #, c-format msgid "Policy kit denied action %s from pid %d, uid %d, result: %s" msgstr "" -#: daemon/remote.c:3518 +#: daemon/remote.c:2642 msgid "client tried unsupported PolicyKit init request" msgstr "客户端尝试不支持的 PolicyKit 初始请求" -#: daemon/remote.c:2625 daemon/remote.c:2820 +#: daemon/remote.c:2730 daemon/remote.c:2925 #, c-format msgid "domain event %d already registered" msgstr "" -#: daemon/remote.c:2666 daemon/remote.c:2870 +#: daemon/remote.c:2771 daemon/remote.c:2975 #, c-format msgid "domain event %d not registered" msgstr "" -#: daemon/remote.c:2815 daemon/remote.c:2864 +#: daemon/remote.c:2920 daemon/remote.c:2969 #, c-format msgid "unsupported event ID %d" msgstr "" -#: daemon/remote_dispatch.h:5153 daemon/remote_dispatch.h:5228 +#: daemon/remote_dispatch.h:5293 daemon/remote_dispatch.h:5368 msgid "maxnames > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX" msgstr "" -#: daemon/remote.c:1621 +#: daemon/remote_dispatch.h:6980 msgid "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX" msgstr "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX" -#: daemon/remote.c:2586 +#: daemon/remote_dispatch.h:7044 msgid "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX" msgstr "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX" -#: daemon/remote.c:2080 daemon/remote.c:2147 daemon/remote.c:3542 +#: daemon/remote_dispatch.h:7108 daemon/remote_dispatch.h:7364 msgid "maxnames > REMOTE_NETWORK_NAME_LIST_MAX" msgstr "maxnames > REMOTE_NETWORK_NAME_LIST_MAX" -#: daemon/remote.c:3576 +#: daemon/remote_dispatch.h:7172 daemon/remote_dispatch.h:7556 msgid "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX" msgstr "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX" -#: daemon/remote.c:2114 +#: daemon/remote_dispatch.h:7236 msgid "maxids > REMOTE_DOMAIN_ID_LIST_MAX" msgstr "maxids > REMOTE_DOMAIN_ID_LIST_MAX" -#: daemon/remote.c:2533 +#: daemon/remote_dispatch.h:7300 msgid "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX" msgstr "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX" -#: daemon/remote_dispatch.h:7288 +#: daemon/remote_dispatch.h:7428 msgid "maxnames > REMOTE_NWFILTER_NAME_LIST_MAX" msgstr "" -#: daemon/remote.c:4885 +#: daemon/remote_dispatch.h:7492 msgid "maxuuids > REMOTE_SECRET_UUID_LIST_MAX" msgstr "maxuuids > REMOTE_SECRET_UUID_LIST_MAX" -#: daemon/remote_dispatch.h:8411 +#: daemon/remote_dispatch.h:8551 msgid "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX" msgstr "" -#: daemon/remote_dispatch.h:8692 +#: daemon/remote_dispatch.h:8832 msgid "maxcells > REMOTE_NODE_MAX_CELLS" msgstr "" -#: daemon/remote.c:4429 daemon/remote.c:4600 +#: daemon/remote_dispatch.h:9065 msgid "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX" msgstr "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX" -#: daemon/remote.c:4062 +#: daemon/remote_dispatch.h:10929 msgid "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX" msgstr "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX" -#: daemon/stream.c:113 +#: daemon/stream.c:237 msgid "stream had unexpected termination" msgstr "" -#: daemon/stream.c:115 +#: daemon/stream.c:240 msgid "stream had I/O failure" msgstr "流出现 I/O 失败" -#: daemon/stream.c:468 +#: daemon/stream.c:622 msgid "stream aborted at client request" msgstr "" -#: daemon/stream.c:471 +#: daemon/stream.c:626 #, c-format msgid "stream aborted with unexpected status %d" msgstr "" @@ -499,1972 +620,2034 @@ msgid "Unknown error" msgstr "未知错误" -#: src/conf/cpu_conf.c:126 +#: src/conf/cpu_conf.c:132 msgid "XML does not contain expected 'cpu' element" msgstr "" -#: src/conf/cpu_conf.c:139 +#: src/conf/cpu_conf.c:145 msgid "" "'arch' element element cannot be used inside 'cpu' element with 'match' " "attribute'" msgstr "" -#: src/conf/cpu_conf.c:98 +#: src/conf/cpu_conf.c:169 msgid "Invalid match attribute for CPU specification" msgstr "" -#: src/conf/cpu_conf.c:107 +#: src/conf/cpu_conf.c:179 msgid "Missing CPU architecture" msgstr "" -#: src/conf/cpu_conf.c:114 src/cpu/cpu_x86.c:602 +#: src/conf/cpu_conf.c:187 src/cpu/cpu_x86.c:949 msgid "Missing CPU model name" msgstr "" -#: src/conf/cpu_conf.c:188 +#: src/conf/cpu_conf.c:194 msgid "CPU vendor specified without CPU model" msgstr "" -#: src/conf/cpu_conf.c:126 +#: src/conf/cpu_conf.c:206 msgid "Missing 'sockets' attribute in CPU topology" msgstr "" -#: src/conf/cpu_conf.c:135 +#: src/conf/cpu_conf.c:215 msgid "Missing 'cores' attribute in CPU topology" msgstr "" -#: src/conf/cpu_conf.c:144 +#: src/conf/cpu_conf.c:224 msgid "Missing 'threads' attribute in CPU topology" msgstr "" -#: src/conf/cpu_conf.c:151 +#: src/conf/cpu_conf.c:231 msgid "Invalid CPU topology" msgstr "" -#: src/conf/cpu_conf.c:237 src/conf/cpu_conf.c:372 +#: src/conf/cpu_conf.c:243 src/conf/cpu_conf.c:433 msgid "Non-empty feature list specified without CPU model" msgstr "" -#: src/conf/cpu_conf.c:180 +#: src/conf/cpu_conf.c:270 msgid "Invalid CPU feature policy" msgstr "" -#: src/conf/cpu_conf.c:190 +#: src/conf/cpu_conf.c:280 msgid "Invalid CPU feature name" msgstr "" -#: src/conf/cpu_conf.c:197 src/conf/cpu_conf.c:345 +#: src/conf/cpu_conf.c:287 src/conf/cpu_conf.c:502 #, c-format msgid "CPU feature `%s' specified more than once" msgstr "" -#: src/conf/cpu_conf.c:277 +#: src/conf/cpu_conf.c:303 +msgid "NUMA topology defined without NUMA cells" +msgstr "" + +#: src/conf/cpu_conf.c:322 +msgid "Missing 'cpus' attribute in NUMA cell" +msgstr "" + +#: src/conf/cpu_conf.c:339 +msgid "Missing 'memory' attribute in NUMA cell" +msgstr "" + +#: src/conf/cpu_conf.c:346 +msgid "Invalid 'memory' attribute in NUMA cell" +msgstr "" + +#: src/conf/cpu_conf.c:400 #, c-format msgid "Unexpected CPU match policy %d" msgstr "" -#: src/conf/cpu_conf.c:305 src/cpu/cpu_x86.c:289 +#: src/conf/cpu_conf.c:457 src/cpu/cpu_x86.c:669 msgid "Missing CPU feature name" msgstr "" -#: src/conf/cpu_conf.c:315 +#: src/conf/cpu_conf.c:467 #, c-format msgid "Unexpected CPU feature policy %d" msgstr "" -#: src/conf/cpu_conf.c:468 +#: src/conf/cpu_conf.c:539 msgid "Target CPU does not match source" msgstr "" -#: src/conf/cpu_conf.c:474 +#: src/conf/cpu_conf.c:545 #, c-format msgid "Target CPU type %s does not match source %s" msgstr "" -#: src/conf/cpu_conf.c:482 +#: src/conf/cpu_conf.c:553 #, c-format msgid "Target CPU arch %s does not match source %s" msgstr "" -#: src/conf/cpu_conf.c:489 +#: src/conf/cpu_conf.c:560 #, c-format msgid "Target CPU model %s does not match source %s" msgstr "" -#: src/conf/cpu_conf.c:496 +#: src/conf/cpu_conf.c:567 #, c-format msgid "Target CPU vendor %s does not match source %s" msgstr "" -#: src/conf/cpu_conf.c:503 +#: src/conf/cpu_conf.c:574 #, c-format msgid "Target CPU sockets %d does not match source %d" msgstr "" -#: src/conf/cpu_conf.c:510 +#: src/conf/cpu_conf.c:581 #, c-format msgid "Target CPU cores %d does not match source %d" msgstr "" -#: src/conf/cpu_conf.c:517 +#: src/conf/cpu_conf.c:588 #, c-format msgid "Target CPU threads %d does not match source %d" msgstr "" -#: src/conf/cpu_conf.c:524 +#: src/conf/cpu_conf.c:595 #, c-format msgid "Target CPU feature count %zu does not match source %zu" msgstr "" -#: src/conf/cpu_conf.c:532 +#: src/conf/cpu_conf.c:603 #, c-format msgid "Target CPU feature %s does not match source %s" msgstr "" -#: src/conf/cpu_conf.c:539 +#: src/conf/cpu_conf.c:610 #, c-format msgid "Target CPU feature policy %s does not match source %s" msgstr "" -#: daemon/libvirtd.c:831 daemon/libvirtd.c:1329 src/conf/domain_conf.c:667 -#: src/conf/interface_conf.c:1373 src/conf/network_conf.c:175 -#: src/conf/node_device_conf.c:196 src/conf/storage_conf.c:1460 -#: src/openvz/openvz_conf.c:465 src/qemu/qemu_driver.c:961 -#: src/remote/remote_driver.c:978 src/remote/remote_driver.c:7171 -#: src/remote/remote_driver.c:7350 src/remote/remote_driver.c:7562 -#: src/test/test_driver.c:509 src/test/test_driver.c:754 +#: src/conf/domain_conf.c:643 +#, c-format +msgid "could not parse weight %s" +msgstr "" + +#: src/conf/domain_conf.c:656 +msgid "missing per-device path" +msgstr "" + +#: 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 "无法初始化 mutex" -#: src/conf/domain_conf.c:1724 +#: src/conf/domain_conf.c:1914 #, c-format msgid "unknown address type '%d'" msgstr "" -#: src/conf/domain_conf.c:1752 +#: src/conf/domain_conf.c:1942 msgid "Cannot parse
'domain' attribute" msgstr "" -#: src/conf/domain_conf.c:1759 src/conf/domain_conf.c:1826 -#: src/conf/domain_conf.c:1878 src/conf/domain_conf.c:1968 +#: 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
'bus' attribute" msgstr "" -#: src/conf/domain_conf.c:1766 src/conf/domain_conf.c:1927 +#: src/conf/domain_conf.c:1956 src/conf/domain_conf.c:2117 msgid "Cannot parse
'slot' attribute" msgstr "" -#: src/conf/domain_conf.c:1773 +#: src/conf/domain_conf.c:1963 msgid "Cannot parse
'function' attribute" msgstr "" -#: src/conf/domain_conf.c:1780 +#: src/conf/domain_conf.c:1970 #, c-format msgid "Unknown value '%s' for
'multifunction' attribute" msgstr "" -#: src/conf/domain_conf.c:1787 +#: src/conf/domain_conf.c:1977 msgid "Insufficient specification for PCI address" msgstr "" -#: src/conf/domain_conf.c:1819 src/conf/domain_conf.c:1871 -#: src/conf/domain_conf.c:1920 +#: src/conf/domain_conf.c:2009 src/conf/domain_conf.c:2061 +#: src/conf/domain_conf.c:2110 msgid "Cannot parse
'controller' attribute" msgstr "" -#: src/conf/domain_conf.c:1833 +#: src/conf/domain_conf.c:2023 msgid "Cannot parse
'unit' attribute" msgstr "" -#: src/conf/domain_conf.c:1839 +#: src/conf/domain_conf.c:2029 msgid "Insufficient specification for drive address" msgstr "" -#: src/conf/domain_conf.c:1885 src/conf/domain_conf.c:1958 +#: src/conf/domain_conf.c:2075 src/conf/domain_conf.c:2148 msgid "Cannot parse
'port' attribute" msgstr "" -#: src/conf/domain_conf.c:1891 +#: src/conf/domain_conf.c:2081 msgid "Insufficient specification for virtio serial address" msgstr "" -#: src/conf/domain_conf.c:1994 +#: src/conf/domain_conf.c:2184 msgid "Cannot parse 'startport' attribute" msgstr "" -#: src/conf/domain_conf.c:2057 +#: src/conf/domain_conf.c:2247 #, c-format msgid "unknown address type '%s'" msgstr "" -#: src/conf/domain_conf.c:2062 +#: src/conf/domain_conf.c:2252 msgid "No type specified for device address" msgstr "" -#: src/conf/domain_conf.c:2096 +#: src/conf/domain_conf.c:2286 msgid "Unknown device address type" msgstr "" -#: src/conf/domain_conf.c:2121 +#: src/conf/domain_conf.c:2311 msgid "missing boot order attribute" msgstr "" -#: src/conf/domain_conf.c:2126 +#: src/conf/domain_conf.c:2316 #, c-format msgid "incorrect boot order '%s', expecting positive integer" msgstr "" -#: src/conf/domain_conf.c:2135 +#: src/conf/domain_conf.c:2325 msgid "boot orders have to be contiguous and starting from 1" msgstr "" -#: src/conf/domain_conf.c:2139 +#: src/conf/domain_conf.c:2329 #, c-format msgid "boot order %d used for more than one device" msgstr "" -#: src/conf/domain_conf.c:2278 +#: src/conf/domain_conf.c:2468 msgid "Missing 'key' element for lease" msgstr "" -#: src/conf/domain_conf.c:2283 +#: src/conf/domain_conf.c:2473 msgid "Missing 'target' element for lease" msgstr "" -#: src/conf/domain_conf.c:2290 +#: src/conf/domain_conf.c:2480 #, c-format msgid "Malformed lease target offset %s" msgstr "" -#: src/conf/domain_conf.c:764 +#: src/conf/domain_conf.c:2554 #, c-format msgid "unknown disk type '%s'" msgstr "未知磁盘类型 '%s'" -#: src/conf/domain_conf.c:2390 +#: src/conf/domain_conf.c:2584 msgid "missing protocol type" msgstr "" -#: src/conf/domain_conf.c:2396 +#: src/conf/domain_conf.c:2590 #, c-format msgid "unknown protocol type '%s'" msgstr "" -#: src/conf/domain_conf.c:2403 +#: src/conf/domain_conf.c:2597 msgid "missing name for disk source" msgstr "" -#: src/conf/domain_conf.c:2421 +#: src/conf/domain_conf.c:2615 msgid "missing name for host" msgstr "" -#: src/conf/domain_conf.c:2427 +#: src/conf/domain_conf.c:2621 msgid "missing port for host" msgstr "" -#: src/conf/domain_conf.c:789 src/conf/domain_conf.c:3930 +#: src/conf/domain_conf.c:2630 src/conf/domain_conf.c:9800 #, c-format msgid "unexpected disk type %s" msgstr "" -#: src/conf/domain_conf.c:2472 +#: src/conf/domain_conf.c:2666 msgid "missing username for auth" msgstr "" -#: src/conf/domain_conf.c:2484 +#: src/conf/domain_conf.c:2678 msgid "missing type for secret" msgstr "" -#: src/conf/domain_conf.c:2490 +#: src/conf/domain_conf.c:2684 #, c-format msgid "invalid secret type %s" msgstr "" -#: src/conf/domain_conf.c:2500 +#: src/conf/domain_conf.c:2694 msgid "only one of uuid and usage can be specfied" msgstr "" -#: src/conf/domain_conf.c:2508 +#: src/conf/domain_conf.c:2702 #, c-format msgid "malformed uuid %s" msgstr "" -#: src/conf/domain_conf.c:841 +#: src/conf/domain_conf.c:2756 +msgid "total and read/write bytes_sec cannot be set at the same time" +msgstr "" + +#: src/conf/domain_conf.c:2766 +msgid "total and read/write iops_sec cannot be set at the same time" +msgstr "" + +#: src/conf/domain_conf.c:2802 #, c-format msgid "unknown disk device '%s'" msgstr "未知磁盘设备 '%s'" -#: src/conf/domain_conf.c:867 +#: src/conf/domain_conf.c:2828 #, c-format msgid "Invalid floppy device name: %s" msgstr "无效软盘设备名称:%s" -#: src/conf/domain_conf.c:882 +#: src/conf/domain_conf.c:2843 #, c-format msgid "Invalid harddisk device name: %s" msgstr "无效硬盘设备名称:%s" -#: src/conf/domain_conf.c:2601 src/conf/domain_conf.c:11889 +#: src/conf/domain_conf.c:2851 src/conf/domain_conf.c:12255 #, c-format msgid "unknown disk snapshot setting '%s'" msgstr "" -#: src/conf/domain_conf.c:889 +#: src/conf/domain_conf.c:2862 #, c-format msgid "unknown disk bus type '%s'" msgstr "未知磁盘总线类型 '%s'" -#: src/conf/domain_conf.c:914 +#: src/conf/domain_conf.c:2887 #, c-format msgid "Invalid bus type '%s' for floppy disk" msgstr "软盘的无效总线类型 '%s'" -#: src/conf/domain_conf.c:920 +#: src/conf/domain_conf.c:2893 #, c-format msgid "Invalid bus type '%s' for disk" msgstr "软盘的无效总线类型 '%s'" -#: src/conf/domain_conf.c:927 +#: src/conf/domain_conf.c:2900 #, c-format msgid "unknown disk cache mode '%s'" msgstr "未知磁盘缓存模式类型 '%s'" -#: src/conf/domain_conf.c:2657 +#: src/conf/domain_conf.c:2907 #, c-format msgid "unknown disk error policy '%s'" msgstr "" -#: src/conf/domain_conf.c:2666 +#: src/conf/domain_conf.c:2916 #, c-format msgid "unknown disk read error policy '%s'" msgstr "" -#: src/conf/domain_conf.c:2675 +#: src/conf/domain_conf.c:2925 #, c-format msgid "unknown disk io mode '%s'" msgstr "" -#: src/conf/domain_conf.c:2683 +#: src/conf/domain_conf.c:2933 msgid "disk ioeventfd mode supported only for virtio bus" msgstr "" -#: src/conf/domain_conf.c:2691 +#: src/conf/domain_conf.c:2941 #, c-format msgid "unknown disk ioeventfd mode '%s'" msgstr "" -#: src/conf/domain_conf.c:2701 +#: src/conf/domain_conf.c:2951 msgid "disk event_idx mode supported only for virtio bus" msgstr "" -#: src/conf/domain_conf.c:2709 +#: src/conf/domain_conf.c:2959 #, c-format msgid "unknown disk event_idx mode '%s'" msgstr "" -#: src/conf/domain_conf.c:937 src/conf/domain_conf.c:1182 -#: src/conf/domain_conf.c:2396 +#: 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:2735 +#: src/conf/domain_conf.c:2985 #, c-format msgid "unknown startupPolicy value '%s'" msgstr "" -#: src/conf/domain_conf.c:2743 +#: src/conf/domain_conf.c:2993 #, c-format msgid "Setting disk %s is allowed only for cdrom or floppy" msgstr "" -#: src/conf/domain_conf.c:2859 +#: src/conf/domain_conf.c:3110 #, c-format msgid "Unknown controller type '%s'" msgstr "" -#: src/conf/domain_conf.c:2868 +#: src/conf/domain_conf.c:3119 #, c-format msgid "Cannot parse controller index %s" msgstr "" -#: src/conf/domain_conf.c:2877 +#: src/conf/domain_conf.c:3128 #, c-format msgid "Unknown model type '%s'" msgstr "" -#: src/conf/domain_conf.c:2895 +#: src/conf/domain_conf.c:3146 #, c-format msgid "Invalid ports: %s" msgstr "" -#: src/conf/domain_conf.c:2910 +#: src/conf/domain_conf.c:3161 #, c-format msgid "Invalid vectors: %s" msgstr "" -#: src/conf/domain_conf.c:2928 +#: src/conf/domain_conf.c:3179 msgid "Controllers must use the 'pci' address type" msgstr "" -#: src/conf/domain_conf.c:999 +#: src/conf/domain_conf.c:3219 #, c-format msgid "unknown filesystem type '%s'" msgstr "未知文件系统类型 '%s'" -#: src/conf/domain_conf.c:2979 +#: src/conf/domain_conf.c:3230 #, c-format msgid "unknown accessmode '%s'" msgstr "" -#: src/conf/domain_conf.c:3015 +#: src/conf/domain_conf.c:3266 #, c-format msgid "unknown fs driver type '%s'" msgstr "" -#: src/conf/domain_conf.c:3077 +#: src/conf/domain_conf.c:3328 msgid "missing type attribute in interface's element" msgstr "" -#: src/conf/domain_conf.c:3082 +#: src/conf/domain_conf.c:3333 #, c-format msgid "unknown type '%s' in interface's element" msgstr "" -#: src/conf/domain_conf.c:3089 +#: src/conf/domain_conf.c:3340 #, c-format msgid "unsupported type '%s' in interface's element" msgstr "" -#: src/conf/domain_conf.c:3106 +#: src/conf/domain_conf.c:3357 #, c-format msgid "Unkown mode '%s' in interface element" msgstr "" -#: src/conf/domain_conf.c:1098 +#: src/conf/domain_conf.c:3438 #, c-format msgid "unknown interface type '%s'" msgstr "未知接口类型 '%s'" -#: src/conf/domain_conf.c:1168 src/qemu/qemu_conf.c:3426 +#: 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:3318 +#: src/conf/domain_conf.c:3568 msgid "Network interfaces must use 'pci' address type" msgstr "" -#: src/conf/domain_conf.c:1202 +#: src/conf/domain_conf.c:3576 msgid "" "No 'network' attribute specified with " msgstr "没有使用 指定 ‘networking’属性" -#: src/conf/domain_conf.c:1228 +#: src/conf/domain_conf.c:3608 msgid "" "No 'bridge' attribute specified with " msgstr "没有 指定的 'bridge' 属性" -#: src/conf/domain_conf.c:1248 +#: src/conf/domain_conf.c:3628 msgid "No 'port' attribute specified with socket interface" msgstr "没有使用套接字接口指定 ‘port’属性" -#: src/conf/domain_conf.c:1253 +#: src/conf/domain_conf.c:3633 msgid "Cannot parse 'port' attribute with socket interface" msgstr "无法使用套接自接口解析 'port' 属性" -#: src/conf/domain_conf.c:1261 +#: src/conf/domain_conf.c:3641 msgid "No 'address' attribute specified with socket interface" msgstr "没有使用套接自接口指定的 'address' 属性" -#: src/conf/domain_conf.c:1273 +#: src/conf/domain_conf.c:3653 msgid "" "No 'name' attribute specified with " msgstr "没有指定为 'name' 属性" -#: src/conf/domain_conf.c:3413 +#: src/conf/domain_conf.c:3663 msgid "No 'dev' attribute specified with " msgstr "" -#: src/conf/domain_conf.c:3421 +#: src/conf/domain_conf.c:3671 msgid "Unkown mode has been specified" msgstr "" -#: src/conf/domain_conf.c:1297 +#: src/conf/domain_conf.c:3709 msgid "Model name contains invalid characters" msgstr "模块名称中含有无效字符" -#: src/conf/domain_conf.c:3473 +#: src/conf/domain_conf.c:3723 #, c-format msgid "Unknown interface has been specified" msgstr "" -#: src/conf/domain_conf.c:3485 +#: src/conf/domain_conf.c:3735 #, c-format msgid "Unknown interface has been specified" msgstr "" -#: src/conf/domain_conf.c:3496 +#: src/conf/domain_conf.c:3746 #, c-format msgid "unknown interface ioeventfd mode '%s'" msgstr "" -#: src/conf/domain_conf.c:3506 +#: src/conf/domain_conf.c:3756 #, c-format msgid "unknown interface event_idx mode '%s'" msgstr "" -#: src/conf/domain_conf.c:3518 +#: src/conf/domain_conf.c:3768 #, c-format msgid "unknown interface link state '%s'" msgstr "" -#: src/conf/domain_conf.c:3544 +#: src/conf/domain_conf.c:3794 msgid "sndbuf must be a positive integer" msgstr "" -#: src/conf/domain_conf.c:3592 +#: src/conf/domain_conf.c:3842 #, c-format msgid "target type must be specified for %s device" msgstr "" -#: src/conf/domain_conf.c:3599 +#: src/conf/domain_conf.c:3849 msgid "Driver does not have a default console type set" msgstr "" -#: src/conf/domain_conf.c:1503 +#: src/conf/domain_conf.c:3928 msgid "guestfwd channel does not define a target address" msgstr "guestfwd 频道没有定义目标地址" -#: src/conf/domain_conf.c:1521 +#: src/conf/domain_conf.c:3943 msgid "guestfwd channel only supports IPv4 addresses" msgstr "guestfwd 频道只支持 IPv2 地址" -#: src/conf/domain_conf.c:1528 +#: src/conf/domain_conf.c:3950 msgid "guestfwd channel does not define a target port" msgstr "guestfwd 频道没有定义目标端口" -#: src/conf/domain_conf.c:1491 src/conf/domain_conf.c:1534 +#: 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:1445 +#: src/conf/domain_conf.c:4053 #, c-format msgid "Unknown source mode '%s'" msgstr "未知的来源模式类型 '%s'" -#: src/conf/domain_conf.c:1567 src/conf/domain_conf.c:1651 +#: 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:1584 src/conf/domain_conf.c:1601 +#: 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:1589 src/conf/domain_conf.c:1606 -#: src/conf/domain_conf.c:1633 +#: 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:1624 +#: src/conf/domain_conf.c:4142 #, c-format msgid "Unknown protocol '%s'" msgstr "未知的协议 '%s'" -#: src/conf/domain_conf.c:4022 src/conf/domain_conf.c:4166 +#: 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 "" -#: src/conf/domain_conf.c:4030 +#: src/conf/domain_conf.c:4280 #, c-format msgid "unknown character device type: %s" msgstr "" -#: src/conf/domain_conf.c:4059 +#: src/conf/domain_conf.c:4309 msgid "spicevmc device type only supports virtio" msgstr "" -#: src/conf/domain_conf.c:4099 +#: src/conf/domain_conf.c:4349 msgid "missing smartcard device mode" msgstr "" -#: src/conf/domain_conf.c:4104 +#: src/conf/domain_conf.c:4354 #, c-format msgid "unknown smartcard device mode: %s" msgstr "" -#: src/conf/domain_conf.c:4121 src/conf/domain_conf.c:4150 +#: 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:4141 +#: src/conf/domain_conf.c:4391 #, c-format msgid "expecting absolute path: %s" msgstr "" -#: src/conf/domain_conf.c:4160 +#: src/conf/domain_conf.c:4410 msgid "passthrough mode requires a character device type attribute" msgstr "" -#: src/conf/domain_conf.c:4184 +#: src/conf/domain_conf.c:4434 msgid "unknown smartcard mode" msgstr "" -#: src/conf/domain_conf.c:4193 +#: src/conf/domain_conf.c:4443 msgid "Controllers must use the 'ccid' address type" msgstr "" -#: src/conf/domain_conf.c:1707 +#: src/conf/domain_conf.c:4479 msgid "missing input device type" msgstr "缺少输入设备类型" -#: src/conf/domain_conf.c:1713 +#: src/conf/domain_conf.c:4485 #, c-format msgid "unknown input device type '%s'" msgstr "未知输入设备类型 '%s'" -#: src/conf/domain_conf.c:1720 +#: src/conf/domain_conf.c:4492 #, c-format msgid "unknown input bus type '%s'" msgstr "未知输入总线类型 '%s'" -#: src/conf/domain_conf.c:1728 +#: 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:1734 src/conf/domain_conf.c:1741 +#: 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:1746 +#: 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:4291 src/conf/domain_conf.c:5834 +#: src/conf/domain_conf.c:4541 src/conf/domain_conf.c:6084 msgid "Invalid address for a USB device" msgstr "" -#: src/conf/domain_conf.c:4324 +#: src/conf/domain_conf.c:4574 msgid "missing hub device type" msgstr "" -#: src/conf/domain_conf.c:4330 +#: src/conf/domain_conf.c:4580 #, c-format msgid "unknown hub device type '%s'" msgstr "" -#: src/conf/domain_conf.c:4375 +#: src/conf/domain_conf.c:4625 msgid "missing timer name" msgstr "" -#: src/conf/domain_conf.c:4380 +#: src/conf/domain_conf.c:4630 #, c-format msgid "unknown timer name '%s'" msgstr "" -#: src/conf/domain_conf.c:4392 +#: src/conf/domain_conf.c:4642 #, c-format msgid "unknown timer present value '%s'" msgstr "" -#: src/conf/domain_conf.c:4402 +#: src/conf/domain_conf.c:4652 #, c-format msgid "unknown timer tickpolicy '%s'" msgstr "" -#: src/conf/domain_conf.c:4412 +#: src/conf/domain_conf.c:4662 #, c-format msgid "unknown timer track '%s'" msgstr "" -#: src/conf/domain_conf.c:4422 +#: src/conf/domain_conf.c:4672 msgid "invalid timer frequency" msgstr "" -#: src/conf/domain_conf.c:4431 +#: src/conf/domain_conf.c:4681 #, c-format msgid "unknown timer mode '%s'" msgstr "" -#: src/conf/domain_conf.c:4444 +#: src/conf/domain_conf.c:4694 msgid "invalid catchup threshold" msgstr "" -#: src/conf/domain_conf.c:4453 +#: src/conf/domain_conf.c:4703 msgid "invalid catchup slew" msgstr "" -#: src/conf/domain_conf.c:4462 +#: src/conf/domain_conf.c:4712 msgid "invalid catchup limit" msgstr "" -#: src/conf/domain_conf.c:4515 +#: src/conf/domain_conf.c:4765 #, c-format msgid "cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS" msgstr "" -#: src/conf/domain_conf.c:4534 +#: src/conf/domain_conf.c:4784 #, c-format msgid "unknown connected value %s" msgstr "" -#: src/conf/domain_conf.c:4545 +#: src/conf/domain_conf.c:4795 msgid "VNC supports connected='keep' only" msgstr "" -#: src/conf/domain_conf.c:4567 +#: src/conf/domain_conf.c:4817 msgid "graphics listen type must be specified" msgstr "" -#: src/conf/domain_conf.c:4573 +#: src/conf/domain_conf.c:4823 #, c-format msgid "unknown graphics listen type '%s'" msgstr "" -#: src/conf/domain_conf.c:4593 +#: src/conf/domain_conf.c:4843 msgid "network attribute not allowed when listen type is not network" msgstr "" -#: src/conf/domain_conf.c:1791 +#: src/conf/domain_conf.c:4885 msgid "missing graphics device type" msgstr "缺少图形设备类型" -#: src/conf/domain_conf.c:1797 +#: src/conf/domain_conf.c:4891 #, c-format msgid "unknown graphics device type '%s'" msgstr "未知图形设备类型 '%s'" -#: src/conf/domain_conf.c:4708 +#: src/conf/domain_conf.c:4958 #, c-format msgid "" "graphics listen attribute %s must match address attribute of first listen " "element (found %s)" msgstr "" -#: src/conf/domain_conf.c:1808 +#: src/conf/domain_conf.c:4974 #, c-format msgid "cannot parse vnc port %s" msgstr "无法解析 vnc 端口 %s" -#: src/conf/domain_conf.c:1846 src/conf/domain_conf.c:1908 +#: 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:1864 +#: src/conf/domain_conf.c:5033 #, c-format msgid "cannot parse rdp port %s" msgstr "无法解析 rdp 端口 %s" -#: src/conf/domain_conf.c:4844 +#: src/conf/domain_conf.c:5094 #, c-format msgid "cannot parse spice port %s" msgstr "" -#: src/conf/domain_conf.c:4857 +#: src/conf/domain_conf.c:5107 #, c-format msgid "cannot parse spice tlsPort %s" msgstr "" -#: src/conf/domain_conf.c:4894 +#: src/conf/domain_conf.c:5144 msgid "spice channel missing name/mode" msgstr "" -#: src/conf/domain_conf.c:4902 +#: src/conf/domain_conf.c:5152 #, c-format msgid "unknown spice channel name %s" msgstr "" -#: src/conf/domain_conf.c:4910 +#: src/conf/domain_conf.c:5160 #, c-format msgid "unknown spice channel mode %s" msgstr "" -#: src/conf/domain_conf.c:4926 +#: src/conf/domain_conf.c:5176 msgid "spice image missing compression" msgstr "" -#: src/conf/domain_conf.c:4933 +#: src/conf/domain_conf.c:5183 #, c-format msgid "unknown spice image compression %s" msgstr "" -#: src/conf/domain_conf.c:4947 +#: src/conf/domain_conf.c:5197 msgid "spice jpeg missing compression" msgstr "" -#: src/conf/domain_conf.c:4954 +#: src/conf/domain_conf.c:5204 #, c-format msgid "unknown spice jpeg compression %s" msgstr "" -#: src/conf/domain_conf.c:4968 +#: src/conf/domain_conf.c:5218 msgid "spice zlib missing compression" msgstr "" -#: src/conf/domain_conf.c:4975 +#: src/conf/domain_conf.c:5225 #, c-format msgid "unknown spice zlib compression %s" msgstr "" -#: src/conf/domain_conf.c:4989 +#: src/conf/domain_conf.c:5239 msgid "spice playback missing compression" msgstr "" -#: src/conf/domain_conf.c:4996 +#: src/conf/domain_conf.c:5246 msgid "unknown spice playback compression" msgstr "" -#: src/conf/domain_conf.c:5010 +#: src/conf/domain_conf.c:5260 msgid "spice streaming missing mode" msgstr "" -#: src/conf/domain_conf.c:5016 +#: src/conf/domain_conf.c:5266 msgid "unknown spice streaming mode" msgstr "" -#: src/conf/domain_conf.c:5030 +#: src/conf/domain_conf.c:5280 msgid "spice clipboard missing copypaste" msgstr "" -#: src/conf/domain_conf.c:5037 +#: src/conf/domain_conf.c:5287 #, c-format msgid "unknown copypaste value '%s'" msgstr "" -#: src/conf/domain_conf.c:1947 +#: src/conf/domain_conf.c:5330 #, c-format msgid "unknown sound model '%s'" msgstr "未知声音模式类型 '%s'" -#: src/conf/domain_conf.c:1980 +#: src/conf/domain_conf.c:5366 msgid "watchdog must contain model name" msgstr "计时器必须包含模型名称" -#: src/conf/domain_conf.c:1986 +#: src/conf/domain_conf.c:5372 #, c-format msgid "unknown watchdog model '%s'" msgstr "未知监视器模型 '%s'" -#: src/conf/domain_conf.c:1997 +#: src/conf/domain_conf.c:5383 #, c-format msgid "unknown watchdog action '%s'" msgstr "未知监视器动作 '%s'" -#: src/conf/domain_conf.c:5169 +#: src/conf/domain_conf.c:5419 msgid "balloon memory must contain model name" msgstr "" -#: src/conf/domain_conf.c:5174 +#: src/conf/domain_conf.c:5424 #, c-format msgid "unknown memory balloon model '%s'" msgstr "" -#: src/conf/domain_conf.c:5201 +#: src/conf/domain_conf.c:5451 msgid "XML does not contain expected 'sysinfo' element" msgstr "" -#: src/conf/domain_conf.c:5213 +#: src/conf/domain_conf.c:5463 msgid "sysinfo must contain a type attribute" msgstr "" -#: src/conf/domain_conf.c:5218 +#: src/conf/domain_conf.c:5468 #, c-format msgid "unknown sysinfo type '%s'" msgstr "" -#: src/conf/domain_conf.c:2143 +#: src/conf/domain_conf.c:5646 #, c-format msgid "unknown video model '%s'" msgstr "未知视频模型 '%s'" -#: src/conf/domain_conf.c:2149 +#: src/conf/domain_conf.c:5652 msgid "missing video model and cannot determine default" msgstr "缺少视频模式且无法确定默认模式" -#: src/conf/domain_conf.c:2157 +#: src/conf/domain_conf.c:5660 #, c-format msgid "cannot parse video ram '%s'" msgstr "无法解析显存 '%s'" -#: src/conf/domain_conf.c:2167 +#: src/conf/domain_conf.c:5670 #, c-format msgid "cannot parse video heads '%s'" msgstr "无法解析影像头 '%s'" -#: src/conf/domain_conf.c:2214 +#: src/conf/domain_conf.c:5719 #, c-format msgid "cannot parse vendor id %s" msgstr "无法解析零售商 id %s" -#: src/conf/domain_conf.c:2221 +#: src/conf/domain_conf.c:5726 msgid "usb vendor needs id" msgstr "usb 零售商需要 id" -#: src/conf/domain_conf.c:2232 +#: src/conf/domain_conf.c:5737 #, c-format msgid "cannot parse product %s" msgstr "无法解析产品 %s" -#: src/conf/domain_conf.c:2240 +#: src/conf/domain_conf.c:5745 msgid "usb product needs id" msgstr "usb 产品需要 id" -#: src/conf/domain_conf.c:2251 src/conf/domain_conf.c:2343 +#: src/conf/domain_conf.c:5756 #, c-format msgid "cannot parse bus %s" msgstr "无法解析总线 %s" -#: src/conf/domain_conf.c:2258 +#: src/conf/domain_conf.c:5763 msgid "usb address needs bus id" msgstr "usb 地址需要总线 id" -#: src/conf/domain_conf.c:2267 +#: src/conf/domain_conf.c:5772 #, c-format msgid "cannot parse device %s" msgstr "无法解析设备 %s" -#: src/conf/domain_conf.c:2275 +#: src/conf/domain_conf.c:5780 msgid "usb address needs device id" msgstr "usb 地址需要设备 id" -#: src/conf/domain_conf.c:2280 +#: src/conf/domain_conf.c:5785 #, c-format msgid "unknown usb source type '%s'" msgstr "未知 usb 源类型 '%s'" -#: src/conf/domain_conf.c:2290 +#: src/conf/domain_conf.c:5795 msgid "vendor cannot be 0." msgstr "零售商不可为 0。" -#: src/conf/domain_conf.c:2296 +#: src/conf/domain_conf.c:5801 msgid "missing vendor" msgstr "缺少经销商" -#: src/conf/domain_conf.c:2301 +#: src/conf/domain_conf.c:5806 msgid "missing product" msgstr "缺少产品" -#: src/conf/domain_conf.c:5590 +#: src/conf/domain_conf.c:5840 #, c-format msgid "unsupported element '%s' of 'origstates'" msgstr "" -#: src/conf/domain_conf.c:2403 +#: src/conf/domain_conf.c:5889 #, c-format msgid "unknown pci source type '%s'" msgstr "未知 pci 源类型 '%s'" -#: src/conf/domain_conf.c:2436 +#: src/conf/domain_conf.c:5921 #, c-format msgid "unknown hostdev mode '%s'" msgstr "未知 hostdev 模式 '%s'" -#: src/conf/domain_conf.c:2447 +#: src/conf/domain_conf.c:5932 #, c-format msgid "unknown host device type '%s'" msgstr "未知主机设备类型 '%s'" -#: src/conf/domain_conf.c:2452 +#: src/conf/domain_conf.c:5937 msgid "missing type in hostdev" msgstr "hostdev 中缺少类型" -#: src/conf/domain_conf.c:5724 +#: src/conf/domain_conf.c:5974 msgid "missing rom bar attribute" msgstr "" -#: src/conf/domain_conf.c:5729 +#: src/conf/domain_conf.c:5979 #, c-format msgid "unknown rom bar value '%s'" msgstr "" -#: src/conf/domain_conf.c:2480 +#: src/conf/domain_conf.c:5986 #, c-format msgid "unknown node %s" msgstr "未知节点 %s" -#: src/conf/domain_conf.c:5753 +#: src/conf/domain_conf.c:6003 msgid "PCI host devices must use 'pci' address type" msgstr "" -#: src/conf/domain_conf.c:5789 +#: src/conf/domain_conf.c:6039 #, c-format msgid "unknown redirdev bus '%s'" msgstr "" -#: src/conf/domain_conf.c:5800 +#: src/conf/domain_conf.c:6050 #, c-format msgid "unknown redirdev character device type '%s'" msgstr "" -#: src/conf/domain_conf.c:5805 +#: src/conf/domain_conf.c:6055 msgid "missing type in redirdev" msgstr "" -#: src/conf/domain_conf.c:2511 +#: src/conf/domain_conf.c:6113 #, c-format msgid "unknown lifecycle action %s" msgstr "未知周期动作 %s" -#: src/conf/domain_conf.c:2535 +#: src/conf/domain_conf.c:6136 msgid "missing security type" msgstr "缺少安全性类型" -#: src/conf/domain_conf.c:2542 +#: src/conf/domain_conf.c:6143 msgid "invalid security type" msgstr "无效安全性类型 %s" -#: src/conf/domain_conf.c:5905 +#: src/conf/domain_conf.c:6155 #, c-format msgid "invalid security relabel value %s" msgstr "" -#: src/conf/domain_conf.c:5913 +#: src/conf/domain_conf.c:6163 msgid "dynamic label type must use resource relabeling" msgstr "" -#: src/conf/domain_conf.c:2564 +#: src/conf/domain_conf.c:6182 msgid "security label is missing" msgstr "缺少安全性标签" -#: src/conf/domain_conf.c:2578 +#: src/conf/domain_conf.c:6196 msgid "security imagelabel is missing" msgstr "缺少安全性映像标签" -#: src/conf/domain_conf.c:2555 +#: src/conf/domain_conf.c:6220 msgid "missing security model" msgstr "缺少安全性模式" -#: src/conf/domain_conf.c:5993 +#: src/conf/domain_conf.c:6243 tools/virsh.c:12067 msgid "(device_definition)" msgstr "" -#: src/conf/domain_conf.c:2656 +#: src/conf/domain_conf.c:6311 msgid "unknown device type" msgstr "未知设备类型" -#: src/conf/domain_conf.c:2737 +#: src/conf/domain_conf.c:6653 msgid "unknown virt type" msgstr "未知 virt 类型" -#: src/conf/domain_conf.c:2748 +#: 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:6442 +#: src/conf/domain_conf.c:6692 msgid "cannot count boot devices" msgstr "" -#: src/conf/domain_conf.c:6453 +#: src/conf/domain_conf.c:6703 msgid "" "per-device boot elements cannot be used together with os/boot elements" msgstr "" -#: src/conf/domain_conf.c:2995 +#: src/conf/domain_conf.c:6713 msgid "missing boot device" msgstr "缺少引导设备" -#: src/conf/domain_conf.c:3000 +#: src/conf/domain_conf.c:6718 #, c-format msgid "unknown boot device '%s'" msgstr "未知引导设备 '%s'" -#: src/conf/domain_conf.c:6496 +#: src/conf/domain_conf.c:6746 msgid "need at least one serial port for useserial" msgstr "" -#: src/conf/domain_conf.c:6537 +#: src/conf/domain_conf.c:6787 msgid "vcpu id must be an unsigned integer" msgstr "" -#: src/conf/domain_conf.c:6541 +#: src/conf/domain_conf.c:6791 msgid "can't parse vcpupin node" msgstr "" -#: src/conf/domain_conf.c:6547 +#: src/conf/domain_conf.c:6797 msgid "vcpu id must be less than maxvcpus" msgstr "" -#: src/conf/domain_conf.c:6570 +#: src/conf/domain_conf.c:6819 msgid "missing cpuset for vcpupin" msgstr "" -#: src/conf/domain_conf.c:2783 +#: src/conf/domain_conf.c:6863 msgid "missing domain type attribute" msgstr "缺少域类型属性" -#: src/conf/domain_conf.c:2789 +#: src/conf/domain_conf.c:6869 #, c-format msgid "invalid domain type %s" msgstr "无效域类型 %s" -#: src/conf/domain_conf.c:6628 +#: src/conf/domain_conf.c:6877 #, c-format msgid "unexpected domain type %s, expecting %s" msgstr "" -#: src/conf/domain_conf.c:6653 +#: src/conf/domain_conf.c:6902 #, c-format msgid "unexpected domain type %s, expecting one of these: %s" msgstr "" -#: src/conf/domain_conf.c:2805 src/conf/network_conf.c:415 -#: src/conf/secret_conf.c:165 +#: 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:2811 src/conf/network_conf.c:422 -#: src/conf/secret_conf.c:171 src/conf/storage_conf.c:655 +#: 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:2823 +#: src/conf/domain_conf.c:6946 msgid "missing memory element" msgstr "缺少内存元素" -#: src/conf/domain_conf.c:6734 +#: src/conf/domain_conf.c:6965 +msgid "cannot extract blkiotune nodes" +msgstr "" + +#: src/conf/domain_conf.c:6981 +#, c-format +msgid "duplicate device weight path '%s'" +msgstr "" + +#: src/conf/domain_conf.c:7009 msgid "maximum vcpus must be an integer" msgstr "" -#: src/conf/domain_conf.c:6742 +#: src/conf/domain_conf.c:7017 #, c-format msgid "invalid maxvcpus %lu" msgstr "" -#: src/conf/domain_conf.c:6750 +#: src/conf/domain_conf.c:7025 msgid "current vcpus must be an integer" msgstr "" -#: src/conf/domain_conf.c:6758 +#: src/conf/domain_conf.c:7033 #, c-format msgid "invalid current vcpus %lu" msgstr "" -#: src/conf/domain_conf.c:6764 +#: src/conf/domain_conf.c:7039 #, c-format msgid "maxvcpus must not be less than current vcpus (%d < %lu)" msgstr "" -#: src/conf/domain_conf.c:6806 +#: src/conf/domain_conf.c:7080 msgid "vcpupin nodes must be less than maxvcpus" msgstr "" -#: src/conf/domain_conf.c:6821 +#: src/conf/domain_conf.c:7095 msgid "duplicate vcpupin for same vcpu" msgstr "" -#: src/conf/domain_conf.c:6833 +#: src/conf/domain_conf.c:7107 msgid "cannot extract numatune nodes" msgstr "" -#: src/conf/domain_conf.c:6855 +#: src/conf/domain_conf.c:7128 msgid "nodeset for NUMA memory tuning must be set" msgstr "" -#: src/conf/domain_conf.c:6864 +#: src/conf/domain_conf.c:7137 #, c-format msgid "Unsupported NUMA memory tuning mode '%s'" msgstr "" -#: src/conf/domain_conf.c:2860 +#: src/conf/domain_conf.c:7155 #, c-format msgid "unexpected feature %s" msgstr "非期望的特性 %s" -#: src/conf/domain_conf.c:6911 +#: src/conf/domain_conf.c:7184 #, c-format msgid "unknown clock offset '%s'" msgstr "" -#: src/conf/domain_conf.c:6929 +#: src/conf/domain_conf.c:7202 msgid "missing 'timezone' attribute for clock with offset='timezone'" msgstr "" -#: src/conf/domain_conf.c:2900 +#: src/conf/domain_conf.c:7235 msgid "no OS type" msgstr "没有操作系统类型" -#: src/conf/domain_conf.c:2928 +#: src/conf/domain_conf.c:7262 #, c-format msgid "os type '%s' & arch '%s' combination is not supported" msgstr "不支持 os 类型 '%s' 和 arch '%s' 组合" -#: src/conf/domain_conf.c:2936 src/xen/xm_internal.c:709 +#: 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:7038 +#: src/conf/domain_conf.c:7311 msgid "init binary must be specified" msgstr "" -#: src/conf/domain_conf.c:7106 +#: src/conf/domain_conf.c:7380 msgid "cannot extract device leases" msgstr "" -#: src/conf/domain_conf.c:7231 +#: src/conf/domain_conf.c:7505 msgid "cannot extract console devices" msgstr "" -#: src/conf/domain_conf.c:7265 +#: src/conf/domain_conf.c:7542 msgid "Only the first console can be a serial port" msgstr "" -#: src/conf/domain_conf.c:3307 +#: src/conf/domain_conf.c:7735 msgid "cannot determine default video type" msgstr "无法确定默认视频类型" -#: src/conf/domain_conf.c:3348 +#: src/conf/domain_conf.c:7772 msgid "only a single watchdog device is supported" msgstr "只支持单一监视器设备" -#: src/conf/domain_conf.c:7506 +#: src/conf/domain_conf.c:7792 msgid "only a single memory balloon device is supported" msgstr "" -#: src/conf/domain_conf.c:7596 +#: src/conf/domain_conf.c:7864 +msgid "Number of CPUs in exceeds the count" +msgstr "" + +#: src/conf/domain_conf.c:7889 msgid "UUID mismatch between and " msgstr "" -#: src/conf/domain_conf.c:7608 +#: src/conf/domain_conf.c:7901 #, c-format msgid "unknown smbios mode '%s'" msgstr "" -#: src/conf/domain_conf.c:3404 +#: src/conf/domain_conf.c:7963 msgid "no domain config" msgstr "节点域配置" -#: src/conf/domain_conf.c:3418 +#: src/conf/domain_conf.c:7977 msgid "missing domain state" msgstr "缺失域状态" -#: src/conf/domain_conf.c:3423 +#: src/conf/domain_conf.c:7982 #, c-format msgid "invalid domain state '%s'" msgstr "无效的域状态 '%s'" -#: src/conf/domain_conf.c:7698 +#: src/conf/domain_conf.c:7991 #, c-format msgid "invalid domain state reason '%s'" msgstr "" -#: src/conf/domain_conf.c:3431 +#: src/conf/domain_conf.c:8002 msgid "invalid pid" msgstr "无效 pid" -#: src/conf/domain_conf.c:7723 +#: src/conf/domain_conf.c:8016 #, c-format msgid "Unknown taint flag %s" msgstr "" -#: src/conf/domain_conf.c:7757 src/security/virt-aa-helper.c:641 -#: tools/virsh.c:1357 tools/virsh.c:1504 tools/virsh.c:1713 -#: tools/virsh.c:10938 tools/virsh.c:11006 tools/virsh.c:11478 -#: tools/virsh.c:11945 +#: 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 "" -#: src/conf/domain_conf.c:3563 src/conf/domain_conf.c:3634 -#: src/conf/interface_conf.c:870 src/conf/network_conf.c:622 -#: src/conf/node_device_conf.c:1223 src/conf/secret_conf.c:117 -msgid "incorrect root element" -msgstr "不正确的根元素" +#: src/conf/domain_conf.c:8087 +#, c-format +msgid "unexpected root element <%s>, expecting " +msgstr "" + +#: src/conf/domain_conf.c:8120 +#, c-format +msgid "unexpected root element <%s>, expecting " +msgstr "" -#: src/conf/domain_conf.c:7871 +#: src/conf/domain_conf.c:8168 #, c-format msgid "Target timer %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:7879 +#: src/conf/domain_conf.c:8176 #, c-format msgid "Target timer presence %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:7887 +#: src/conf/domain_conf.c:8184 #, c-format msgid "Target TSC frequency %lu does not match source %lu" msgstr "" -#: src/conf/domain_conf.c:7894 +#: src/conf/domain_conf.c:8191 #, c-format msgid "Target TSC mode %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:7915 +#: src/conf/domain_conf.c:8212 #, c-format msgid "Target device address type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:7928 +#: 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 "" -#: src/conf/domain_conf.c:7942 +#: src/conf/domain_conf.c:8239 #, c-format msgid "Target device drive address %d:%d:%d does not match source %d:%d:%d" msgstr "" -#: src/conf/domain_conf.c:7956 +#: 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 "" -#: src/conf/domain_conf.c:7969 +#: src/conf/domain_conf.c:8266 #, c-format msgid "Target device ccid address %d:%d does not match source %d:%d" msgstr "" -#: src/conf/domain_conf.c:7993 +#: src/conf/domain_conf.c:8290 #, c-format msgid "Target disk device %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8001 +#: src/conf/domain_conf.c:8298 #, c-format msgid "Target disk bus %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8009 +#: src/conf/domain_conf.c:8306 #, c-format msgid "Target disk %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8016 +#: src/conf/domain_conf.c:8313 #, c-format msgid "Target disk serial %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8023 +#: src/conf/domain_conf.c:8320 msgid "Target disk access mode does not match source" msgstr "" -#: src/conf/domain_conf.c:8044 +#: src/conf/domain_conf.c:8341 #, c-format msgid "Target controller type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8052 +#: src/conf/domain_conf.c:8349 #, c-format msgid "Target controller index %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8059 +#: src/conf/domain_conf.c:8356 #, c-format msgid "Target controller model %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8067 +#: src/conf/domain_conf.c:8364 #, c-format msgid "Target controller ports %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8074 +#: src/conf/domain_conf.c:8371 #, c-format msgid "Target controller vectors %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8097 +#: src/conf/domain_conf.c:8394 #, c-format msgid "Target filesystem guest target %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8104 +#: src/conf/domain_conf.c:8401 msgid "Target filesystem access mode does not match source" msgstr "" -#: src/conf/domain_conf.c:8125 +#: src/conf/domain_conf.c:8422 #, c-format msgid "" "Target network card mac %02x:%02x:%02x:%02x:%02x:%02xdoes not match source " "%02x:%02x:%02x:%02x:%02x:%02x" msgstr "" -#: src/conf/domain_conf.c:8136 +#: src/conf/domain_conf.c:8433 #, c-format msgid "Target network card model %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8158 +#: src/conf/domain_conf.c:8455 #, c-format msgid "Target input device type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8166 +#: src/conf/domain_conf.c:8463 #, c-format msgid "Target input device bus %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8189 +#: src/conf/domain_conf.c:8486 #, c-format msgid "Target sound card model %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8212 +#: src/conf/domain_conf.c:8509 #, c-format msgid "Target video card model %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8220 +#: src/conf/domain_conf.c:8517 #, c-format msgid "Target video card vram %u does not match source %u" msgstr "" -#: src/conf/domain_conf.c:8227 +#: src/conf/domain_conf.c:8524 #, c-format msgid "Target video card heads %u does not match source %u" msgstr "" -#: src/conf/domain_conf.c:8235 +#: src/conf/domain_conf.c:8532 msgid "Target video card acceleration does not match source" msgstr "" -#: src/conf/domain_conf.c:8242 +#: src/conf/domain_conf.c:8539 #, c-format msgid "Target video card 2d accel %u does not match source %u" msgstr "" -#: src/conf/domain_conf.c:8249 +#: src/conf/domain_conf.c:8546 #, c-format msgid "Target video card 3d accel %u does not match source %u" msgstr "" -#: src/conf/domain_conf.c:8272 +#: src/conf/domain_conf.c:8569 #, c-format msgid "Target host device mode %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8281 +#: src/conf/domain_conf.c:8578 #, c-format msgid "Target host device subsystem %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8320 src/conf/domain_conf.c:8342 +#: 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 "" -#: src/conf/domain_conf.c:8364 +#: src/conf/domain_conf.c:8661 #, c-format msgid "Target channel type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8374 +#: src/conf/domain_conf.c:8671 #, c-format msgid "Target channel name %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8385 +#: src/conf/domain_conf.c:8682 #, c-format msgid "Target channel addr %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8411 +#: src/conf/domain_conf.c:8708 #, c-format msgid "Target console type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8434 +#: src/conf/domain_conf.c:8731 #, c-format msgid "Target watchdog model %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8457 +#: src/conf/domain_conf.c:8754 #, c-format msgid "Target balloon model %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8480 +#: src/conf/domain_conf.c:8777 #, c-format msgid "Target hub device type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8508 +#: src/conf/domain_conf.c:8805 #, c-format msgid "Target domain virt type %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8520 +#: src/conf/domain_conf.c:8817 #, c-format msgid "Target domain uuid %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8527 +#: src/conf/domain_conf.c:8824 #, c-format msgid "Target domain max memory %ld does not match source %ld" msgstr "" -#: src/conf/domain_conf.c:8533 +#: src/conf/domain_conf.c:8830 #, c-format msgid "Target domain current memory %ld does not match source %ld" msgstr "" -#: src/conf/domain_conf.c:8539 +#: src/conf/domain_conf.c:8836 #, c-format msgid "Target domain huge page backing %ld does not match source %ld" msgstr "" -#: src/conf/domain_conf.c:8547 +#: src/conf/domain_conf.c:8844 #, c-format msgid "Target domain vpu count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8553 +#: src/conf/domain_conf.c:8850 #, c-format msgid "Target domain vpu max %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8560 src/conf/domain_conf.c:8572 +#: 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 "" -#: src/conf/domain_conf.c:8566 +#: src/conf/domain_conf.c:8863 #, c-format msgid "Target domain architecture %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8579 +#: src/conf/domain_conf.c:8876 #, c-format msgid "Target domain SMBIOS mode %s does not match source %s" msgstr "" -#: src/conf/domain_conf.c:8587 +#: src/conf/domain_conf.c:8884 #, c-format msgid "Target domain features %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8594 +#: src/conf/domain_conf.c:8891 msgid "Target domain timers do not match source" msgstr "" -#: src/conf/domain_conf.c:8611 +#: src/conf/domain_conf.c:8908 #, c-format msgid "Target domain disk count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8622 +#: src/conf/domain_conf.c:8919 #, c-format msgid "Target domain disk controller count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8633 +#: src/conf/domain_conf.c:8930 #, c-format msgid "Target domain filesystem count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8644 +#: src/conf/domain_conf.c:8941 #, c-format msgid "Target domain net card count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8655 +#: src/conf/domain_conf.c:8952 #, c-format msgid "Target domain input device count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8666 +#: src/conf/domain_conf.c:8963 #, c-format msgid "Target domain sound card count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8677 +#: src/conf/domain_conf.c:8974 #, c-format msgid "Target domain video card count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8688 +#: src/conf/domain_conf.c:8985 #, c-format msgid "Target domain host device count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8699 +#: src/conf/domain_conf.c:8996 #, c-format msgid "Target domain smartcard count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8710 +#: src/conf/domain_conf.c:9007 #, c-format msgid "Target domain serial port count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8721 +#: src/conf/domain_conf.c:9018 #, c-format msgid "Target domain parallel port count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8732 +#: src/conf/domain_conf.c:9029 #, c-format msgid "Target domain channel count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8743 +#: src/conf/domain_conf.c:9040 #, c-format msgid "Target domain console count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8754 +#: src/conf/domain_conf.c:9051 #, c-format msgid "Target domain hub device count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8767 +#: src/conf/domain_conf.c:9064 #, c-format msgid "Target domain watchdog count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:8779 +#: src/conf/domain_conf.c:9076 #, c-format msgid "Target domain memory balloon count %d does not match source %d" msgstr "" -#: src/conf/domain_conf.c:3845 +#: src/conf/domain_conf.c:9466 msgid "topology cpuset syntax error" msgstr "拓扑 cpu 组语法错误" -#: src/conf/domain_conf.c:3859 +#: src/conf/domain_conf.c:9639 #, c-format msgid "unexpected lifecycle type %d" msgstr "意外的周期类型 %d" -#: src/conf/domain_conf.c:3882 +#: src/conf/domain_conf.c:9685 #, c-format msgid "unexpected disk type %d" msgstr "意外的磁盘类型 %d" -#: src/conf/domain_conf.c:3887 +#: src/conf/domain_conf.c:9690 #, c-format msgid "unexpected disk device %d" msgstr "意外的磁盘设备 %d" -#: src/conf/domain_conf.c:3892 +#: src/conf/domain_conf.c:9695 #, c-format msgid "unexpected disk bus %d" msgstr "意外的磁盘总线 %d" -#: src/conf/domain_conf.c:3897 +#: src/conf/domain_conf.c:9700 #, c-format msgid "unexpected disk cache mode %d" msgstr "意外的磁盘缓存模式 %d" -#: src/conf/domain_conf.c:9410 +#: src/conf/domain_conf.c:9705 #, c-format msgid "unexpected disk io mode %d" msgstr "" -#: src/conf/domain_conf.c:9560 +#: src/conf/domain_conf.c:9897 #, c-format msgid "unexpected controller type %d" msgstr "" -#: src/conf/domain_conf.c:9569 +#: src/conf/domain_conf.c:9906 #, c-format msgid "unexpected model type %d" msgstr "" -#: src/conf/domain_conf.c:3974 +#: src/conf/domain_conf.c:9958 #, c-format msgid "unexpected filesystem type %d" msgstr "意外的文件系统类型 %d" -#: src/conf/domain_conf.c:9627 +#: src/conf/domain_conf.c:9964 #, c-format msgid "unexpected accessmode %d" msgstr "" -#: src/conf/domain_conf.c:4026 src/conf/domain_conf.c:4392 +#: 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:9699 +#: src/conf/domain_conf.c:10036 #, c-format msgid "unexpected net type %s" msgstr "" -#: src/conf/domain_conf.c:9719 +#: src/conf/domain_conf.c:10056 #, c-format msgid "unexpected source mode %d" msgstr "" -#: src/conf/domain_conf.c:4138 +#: src/conf/domain_conf.c:10251 #, c-format msgid "unexpected char type %d" msgstr "意外的字符类型 %d" -#: src/conf/domain_conf.c:10012 +#: src/conf/domain_conf.c:10352 #, c-format msgid "unexpected char device type %d" msgstr "" -#: src/conf/domain_conf.c:10031 +#: src/conf/domain_conf.c:10371 msgid "Could not format channel target type" msgstr "" -#: src/conf/domain_conf.c:4233 +#: src/conf/domain_conf.c:10381 msgid "Unable to format guestfwd port" msgstr "无法格式化 guestfwd 端口" -#: src/conf/domain_conf.c:10101 src/conf/domain_conf.c:10132 -#: src/qemu/qemu_command.c:4369 +#: 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 "" -#: src/conf/domain_conf.c:4273 src/xen/xend_internal.c:5672 +#: 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:10178 +#: src/conf/domain_conf.c:10518 #, c-format msgid "unexpected memballoon model %d" msgstr "" -#: src/conf/domain_conf.c:4294 +#: src/conf/domain_conf.c:10558 #, c-format msgid "unexpected watchdog model %d" msgstr "意外监视器模型 %d" -#: src/conf/domain_conf.c:4300 +#: src/conf/domain_conf.c:10564 #, c-format msgid "unexpected watchdog action %d" msgstr "意外监视器动作 %d" -#: src/conf/domain_conf.c:4332 +#: src/conf/domain_conf.c:10605 #, c-format msgid "unexpected video model %d" msgstr "意外视频模型 %d" -#: src/conf/domain_conf.c:4366 src/xen/xend_internal.c:5699 +#: 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:4371 +#: src/conf/domain_conf.c:10647 #, c-format msgid "unexpected input bus type %d" msgstr "意外输入总线类型 %d" -#: src/conf/domain_conf.c:10335 +#: src/conf/domain_conf.c:10675 #, c-format msgid "unexpected timer name %d" msgstr "" -#: src/conf/domain_conf.c:10351 +#: src/conf/domain_conf.c:10691 #, c-format msgid "unexpected timer tickpolicy %d" msgstr "" -#: src/conf/domain_conf.c:10365 +#: src/conf/domain_conf.c:10705 #, c-format msgid "unexpected timer track %d" msgstr "" -#: src/conf/domain_conf.c:10383 +#: src/conf/domain_conf.c:10723 #, c-format msgid "unexpected timer mode %d" msgstr "" -#: src/conf/domain_conf.c:4488 +#: src/conf/domain_conf.c:11007 #, c-format msgid "unexpected hostdev mode %d" msgstr "意外的 hostdev 模式 %d" -#: src/conf/domain_conf.c:4495 +#: src/conf/domain_conf.c:11016 #, c-format msgid "unexpected hostdev type %d" msgstr "意外的 hostdev 类型 %d" -#: src/conf/domain_conf.c:10733 +#: src/conf/domain_conf.c:11073 #, c-format msgid "unexpected rom bar value %d" msgstr "" -#: src/conf/domain_conf.c:10773 +#: src/conf/domain_conf.c:11113 #, c-format msgid "unexpected hub type %d" msgstr "" -#: src/conf/domain_conf.c:4552 +#: src/conf/domain_conf.c:11165 #, c-format msgid "unexpected domain type %d" msgstr "意外的域类型 %d" -#: src/conf/domain_conf.c:10932 +#: src/conf/domain_conf.c:11298 msgid "failed to format cpuset for vcpupin" msgstr "" -#: src/conf/domain_conf.c:10954 +#: src/conf/domain_conf.c:11320 msgid "failed to format nodeset for NUMA memory tuning" msgstr "" -#: src/conf/domain_conf.c:4648 +#: src/conf/domain_conf.c:11378 #, c-format msgid "unexpected boot device type %d" msgstr "意外的引导设备类型 %d" -#: src/conf/domain_conf.c:11040 +#: src/conf/domain_conf.c:11406 #, c-format msgid "unexpected smbios mode %d" msgstr "" -#: src/conf/domain_conf.c:4666 +#: src/conf/domain_conf.c:11422 #, c-format msgid "unexpected feature %d" msgstr "意外的特性 %d" -#: src/conf/domain_conf.c:4864 src/conf/network_conf.c:752 +#: 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:5018 +#: src/conf/domain_conf.c:11850 #, c-format msgid "unexpected domain %s already exists" msgstr "意外目标 %s 已存在" -#: src/conf/domain_conf.c:5059 src/conf/network_conf.c:878 -#: src/conf/storage_conf.c:1537 +#: 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:5124 +#: src/conf/domain_conf.c:11954 #, c-format msgid "cannot remove config %s" msgstr "无法为删除配置 %s" -#: src/conf/domain_conf.c:5231 src/xen/xm_internal.c:2671 +#: 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:5240 +#: src/conf/domain_conf.c:12069 #, c-format msgid "domain is already active as '%s'" msgstr "域已经激活为 '%s'" -#: src/conf/domain_conf.c:5254 +#: 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:11880 +#: src/conf/domain_conf.c:12246 msgid "missing name from disk snapshot element" msgstr "" -#: src/conf/domain_conf.c:11941 tools/virsh.c:13246 tools/virsh.c:13573 +#: src/conf/domain_conf.c:12307 tools/virsh.c:14325 tools/virsh.c:14652 msgid "(domain_snapshot)" msgstr "" -#: src/conf/domain_conf.c:11952 +#: src/conf/domain_conf.c:12318 msgid "domainsnapshot" msgstr "" -#: src/conf/domain_conf.c:11962 +#: src/conf/domain_conf.c:12328 msgid "a redefined snapshot must have a name" msgstr "" -#: src/conf/domain_conf.c:11981 +#: src/conf/domain_conf.c:12347 msgid "missing creationTime from existing snapshot" msgstr "" -#: src/conf/domain_conf.c:11993 +#: src/conf/domain_conf.c:12359 msgid "missing state from existing snapshot" msgstr "" -#: src/conf/domain_conf.c:11999 +#: src/conf/domain_conf.c:12365 #, c-format msgid "Invalid state '%s' in domain snapshot XML" msgstr "" -#: src/conf/domain_conf.c:12014 src/conf/domain_conf.c:12105 +#: src/conf/domain_conf.c:12380 src/conf/domain_conf.c:12471 msgid "missing domain in snapshot" msgstr "" -#: src/conf/domain_conf.c:12047 +#: src/conf/domain_conf.c:12413 msgid "unable to handle disk requests in snapshot" msgstr "" -#: src/conf/domain_conf.c:12054 +#: src/conf/domain_conf.c:12420 msgid "Could not find 'active' element" msgstr "" -#: src/conf/domain_conf.c:12111 +#: src/conf/domain_conf.c:12477 msgid "too many disk snapshot requests for domain" msgstr "" -#: src/conf/domain_conf.c:12134 +#: src/conf/domain_conf.c:12500 #, c-format msgid "no disk named '%s'" msgstr "" -#: src/conf/domain_conf.c:12141 +#: src/conf/domain_conf.c:12507 #, c-format msgid "disk '%s' specified twice" msgstr "" -#: src/conf/domain_conf.c:12155 +#: src/conf/domain_conf.c:12521 #, c-format msgid "disk '%s' must use snapshot mode '%s'" msgstr "" -#: src/conf/domain_conf.c:12162 +#: src/conf/domain_conf.c:12528 #, c-format msgid "file '%s' for disk '%s' requires use of external snapshot mode" msgstr "" -#: src/conf/domain_conf.c:12214 +#: src/conf/domain_conf.c:12582 +#, c-format +msgid "cannot generate external snapshot name for disk '%s' without source" +msgstr "" + +#: src/conf/domain_conf.c:12589 #, c-format -msgid "cannot generate external backup name for disk '%s' without source" +msgid "" +"source for disk '%s' is not a regular file; refusing to generate external " +"snapshot name" msgstr "" -#: src/conf/domain_conf.c:12226 +#: src/conf/domain_conf.c:12603 msgid "integer overflow" msgstr "" -#: src/conf/domain_conf.c:12359 +#: src/conf/domain_conf.c:12736 #, c-format msgid "unexpected domain snapshot %s already exists" msgstr "" -#: src/conf/domain_conf.c:12832 +#: src/conf/domain_conf.c:13209 #, c-format msgid "unknown disk format '%s' for %s" msgstr "" -#: src/conf/domain_conf.c:12841 src/qemu/qemu_driver.c:7695 +#: 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 "" -#: src/conf/domain_conf.c:12858 +#: src/conf/domain_conf.c:13235 #, c-format msgid "backing store for %s is self-referential" msgstr "" -#: src/conf/domain_conf.c:12871 +#: src/conf/domain_conf.c:13248 #, c-format msgid "unable to open disk path %s" msgstr "" -#: src/conf/domain_conf.c:12884 +#: src/conf/domain_conf.c:13261 #, c-format msgid "could not close file %s" msgstr "" -#: src/conf/domain_conf.c:12970 +#: src/conf/domain_conf.c:13347 #, c-format msgid "invalid domain state: %d" msgstr "" @@ -2493,726 +2676,873 @@ msgid "event queue is empty, nothing to pop" msgstr "" -#: src/conf/interface_conf.c:133 src/conf/interface_conf.c:515 +#: src/conf/interface_conf.c:126 msgid "interface has no name" msgstr "接口无名称" -#: src/conf/interface_conf.c:141 +#: src/conf/interface_conf.c:142 msgid "interface mtu value is improper" msgstr "接口 mtu 值不恰当" -#: src/conf/interface_conf.c:165 +#: src/conf/interface_conf.c:166 #, c-format msgid "unknown interface startmode %s" msgstr "未知的网络接口起始模式 %s" -#: src/conf/interface_conf.c:197 +#: src/conf/interface_conf.c:198 #, c-format msgid "unknown bonding mode %s" msgstr "未知的绑定模式类型 %s" -#: src/conf/interface_conf.c:218 +#: src/conf/interface_conf.c:219 #, c-format msgid "unknown mii bonding carrier %s" msgstr "未知 mii 绑定载体 %s" -#: src/conf/interface_conf.c:241 +#: src/conf/interface_conf.c:242 #, c-format msgid "unknown arp bonding validate %s" msgstr "未知 arp 绑定确认 %s" -#: src/conf/interface_conf.c:267 +#: src/conf/interface_conf.c:268 #, c-format msgid "unknown dhcp peerdns value %s" msgstr "未知 dhcp peerdns 值 %s" -#: src/conf/interface_conf.c:293 +#: src/conf/interface_conf.c:294 msgid "Invalid ip address prefix value" msgstr "无效的 MAC 地址前缀" -#: src/conf/interface_conf.c:446 +#: src/conf/interface_conf.c:454 msgid "protocol misses the family attribute" msgstr "协议缺少 family 属性" -#: src/conf/interface_conf.c:465 +#: src/conf/interface_conf.c:473 #, c-format msgid "unsupported protocol family '%s'" msgstr "不支持的协议 family %s" -#: src/conf/interface_conf.c:602 +#: src/conf/interface_conf.c:547 msgid "bond has no interfaces" msgstr "绑定未指定网络接口" -#: src/conf/interface_conf.c:652 +#: src/conf/interface_conf.c:596 msgid "bond interface miimon freq missing or invalid" msgstr "绑定接口 miimon freq 缺失或者无效" -#: src/conf/interface_conf.c:660 +#: src/conf/interface_conf.c:604 msgid "bond interface miimon downdelay invalid" msgstr "绑定接口 miimon downdelay 无效" -#: src/conf/interface_conf.c:669 +#: src/conf/interface_conf.c:613 msgid "bond interface miimon updelay invalid" msgstr "绑定接口 miimon updelay 无效" -#: src/conf/interface_conf.c:688 +#: src/conf/interface_conf.c:632 msgid "bond interface arpmon interval missing or invalid" msgstr "绑定接口 arpmon interval 缺失或者无效" -#: src/conf/interface_conf.c:697 +#: src/conf/interface_conf.c:641 msgid "bond interface arpmon target missing" msgstr "绑定接口 arpmon 目标缺失" -#: src/conf/interface_conf.c:718 +#: src/conf/interface_conf.c:662 msgid "vlan interface misses the tag attribute" msgstr "vlan 接口缺少 tag 属性" -#: src/conf/interface_conf.c:726 +#: src/conf/interface_conf.c:670 msgid "vlan interface misses name attribute" msgstr "vlan 接口缺少 name 属性" -#: src/conf/interface_conf.c:743 +#: src/conf/interface_conf.c:687 msgid "interface misses the type attribute" msgstr "网络接口类型属性缺失" -#: src/conf/interface_conf.c:749 +#: src/conf/interface_conf.c:693 #, c-format msgid "unknown interface type %s" msgstr "未知的网络接口类型 %s" -#: src/conf/interface_conf.c:508 +#: src/conf/interface_conf.c:714 #, c-format msgid "interface has unsupported type '%s'" msgstr "接口中有不支持的类型 %s" -#: src/conf/interface_conf.c:785 +#: src/conf/interface_conf.c:751 msgid "bridge interface misses the bridge element" msgstr "bridge 接口缺少 bridge 元素" -#: src/conf/interface_conf.c:797 +#: 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:820 +#: src/conf/interface_conf.c:793 msgid "bond interface misses the bond element" msgstr "绑定接口缺少绑定元素" -#: src/conf/interface_conf.c:841 +#: src/conf/interface_conf.c:814 msgid "vlan interface misses the vlan element" msgstr "vlan 接口缺少 vlan 元素" -#: src/conf/interface_conf.c:867 +#: src/conf/interface_conf.c:842 +#, c-format +msgid "unexpected root element <%s>, expecting " +msgstr "" + +#: src/conf/interface_conf.c:869 msgid "(interface_definition)" msgstr "" -#: src/conf/interface_conf.c:1096 +#: src/conf/interface_conf.c:950 msgid "bond arp monitoring has no target" msgstr "绑定 arp 监视没有目标" -#: src/conf/interface_conf.c:1123 +#: src/conf/interface_conf.c:978 msgid "vlan misses the tag name" msgstr "vlan 缺少标签名" -#: src/conf/interface_conf.c:1200 +#: src/conf/interface_conf.c:1060 msgid "virInterfaceDefFormat unknown startmode" msgstr "virInterfaceDefFormat 未知启动模式" -#: src/conf/interface_conf.c:1072 +#: src/conf/interface_conf.c:1074 msgid "virInterfaceDefFormat NULL def" msgstr "" -#: src/conf/interface_conf.c:1078 +#: src/conf/interface_conf.c:1080 msgid "virInterfaceDefFormat missing interface name" msgstr "" -#: src/conf/interface_conf.c:1222 +#: src/conf/interface_conf.c:1086 #, c-format msgid "unexpected interface type %d" msgstr "意外接口类型 %d" -#: src/conf/network_conf.c:389 +#: src/conf/netdev_bandwidth_conf.c:46 src/conf/netdev_bandwidth_conf.c:113 +msgid "invalid argument supplied" +msgstr "" + +#: src/conf/netdev_bandwidth_conf.c:57 src/conf/netdev_bandwidth_conf.c:69 +#: src/conf/netdev_bandwidth_conf.c:76 +#, c-format +msgid "could not convert %s" +msgstr "" + +#: src/conf/netdev_bandwidth_conf.c:63 +msgid "Missing mandatory average attribute" +msgstr "" + +#: src/conf/netdev_bandwidth_conf.c:122 +msgid "Only one child element allowed" +msgstr "" + +#: src/conf/netdev_bandwidth_conf.c:130 +msgid "Only one child element allowed" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:61 +msgid "missing virtualportprofile type" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:67 +#, c-format +msgid "unknown virtualportprofile type %s" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:94 +msgid "cannot parse value of managerid parameter" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:100 +msgid "value of managerid out of range" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:108 +msgid "cannot parse value of typeid parameter" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:114 +msgid "value for typeid out of range" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:122 +msgid "cannot parse value of typeidversion parameter" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:128 +msgid "value of typeidversion out of range" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:138 +msgid "cannot parse instanceid parameter as a uuid" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:144 +msgid "cannot generate a random uuid for instanceid" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:153 +msgid "a parameter is missing for 802.1Qbg description" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:165 +msgid "profileid parameter too long" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:170 +msgid "profileid parameter is missing for 802.1Qbh description" +msgstr "" + +#: src/conf/netdev_vport_profile_conf.c:177 +#: src/conf/netdev_vport_profile_conf.c:230 +#, c-format +msgid "unexpected virtualport type %d" +msgstr "" + +#: src/conf/network_conf.c:390 #, c-format msgid "Invalid dhcp range '%s' to '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:415 +#: src/conf/network_conf.c:416 #, c-format msgid "Cannot parse MAC address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:422 +#: src/conf/network_conf.c:423 #, c-format msgid "Cannot use name address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:431 +#: src/conf/network_conf.c:432 #, c-format msgid "" "Static host definition in network '%s' must have mac or name attribute" msgstr "" -#: src/conf/network_conf.c:439 +#: src/conf/network_conf.c:440 #, c-format msgid "Missing IP address in static host definition for network '%s'" msgstr "" -#: src/conf/network_conf.c:509 +#: src/conf/network_conf.c:510 msgid "Missing IP address in DNS host definition" msgstr "" -#: src/conf/network_conf.c:575 +#: src/conf/network_conf.c:576 msgid "Missing required name attribute in dns txt record" msgstr "" -#: src/conf/network_conf.c:580 +#: src/conf/network_conf.c:581 #, c-format msgid "Missing required value attribute in dns txt record '%s'" msgstr "" -#: src/conf/network_conf.c:586 +#: src/conf/network_conf.c:587 #, c-format msgid "spaces are not allowed in DNS TXT record names (name is '%s')" msgstr "" -#: src/conf/network_conf.c:654 +#: src/conf/network_conf.c:655 #, c-format msgid "Bad address '%s' in definition of network '%s'" msgstr "" -#: src/conf/network_conf.c:666 +#: src/conf/network_conf.c:667 #, c-format msgid "no family specified for non-IPv4 address address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:673 +#: src/conf/network_conf.c:674 #, c-format msgid "family 'ipv4' specified for non-IPv4 address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:680 +#: src/conf/network_conf.c:681 #, c-format msgid "family 'ipv6' specified for non-IPv6 address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:686 +#: src/conf/network_conf.c:687 #, c-format msgid "Unrecognized family '%s' in definition of network '%s'" msgstr "" -#: src/conf/network_conf.c:696 +#: src/conf/network_conf.c:697 #, c-format msgid "netmask specified without address in network '%s'" msgstr "" -#: src/conf/network_conf.c:703 +#: src/conf/network_conf.c:704 #, c-format msgid "netmask not supported for address '%s' in network '%s' (IPv4 only)" msgstr "" -#: src/conf/network_conf.c:711 +#: src/conf/network_conf.c:712 #, c-format msgid "network '%s' cannot have both prefix='%u' and a netmask" msgstr "" -#: src/conf/network_conf.c:721 +#: src/conf/network_conf.c:722 #, c-format msgid "" "network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)" msgstr "" -#: src/conf/network_conf.c:880 +#: src/conf/network_conf.c:879 #, c-format msgid "Invalid bridge mac address '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:489 +#: src/conf/network_conf.c:955 #, c-format msgid "unknown forwarding type '%s'" msgstr "未知转发类型 '%s'" -#: src/conf/network_conf.c:995 +#: src/conf/network_conf.c:992 #, c-format msgid "" "Missing required dev attribute in network '%s' forward interface element" msgstr "" -#: src/conf/network_conf.c:1005 +#: src/conf/network_conf.c:1002 #, c-format msgid "" "forward dev '%s' must match first interface element dev '%s' in network '%s'" msgstr "" -#: src/conf/network_conf.c:1030 +#: src/conf/network_conf.c:1027 #, c-format msgid "%s forwarding requested, but no IP address provided for network '%s'" msgstr "" -#: src/conf/network_conf.c:1037 +#: src/conf/network_conf.c:1034 #, c-format msgid "" "multiple forwarding interfaces specified for network '%s', only one is " "supported" msgstr "" -#: src/conf/network_conf.c:1048 +#: src/conf/network_conf.c:1045 #, c-format msgid "bridge name not allowed in %s mode (network '%s'" msgstr "" -#: src/conf/network_conf.c:1057 +#: 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 "" -#: src/conf/network_conf.c:1087 +#: src/conf/network_conf.c:1084 msgid "(network_definition)" msgstr "" -#: src/conf/network_conf.c:1297 +#: src/conf/network_conf.c:1111 +#, c-format +msgid "unexpected root element <%s>, expecting " +msgstr "" + +#: src/conf/network_conf.c:1298 #, c-format msgid "Unknown forward type %d in network '%s'" msgstr "" -#: src/conf/network_conf.c:836 +#: 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:927 +#: 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:1001 +#: src/conf/network_conf.c:1624 #, c-format msgid "Bridge generation exceeded max id %d" msgstr "桥接生成超过最大 id %d" -#: src/conf/network_conf.c:1020 +#: src/conf/network_conf.c:1642 #, c-format msgid "bridge name '%s' already in use." msgstr "桥接名称 '%s' 已在使用。" -#: src/conf/network_conf.c:1694 +#: src/conf/network_conf.c:1697 #, c-format msgid "network '%s' is already defined with uuid %s" msgstr "" -#: src/conf/network_conf.c:1703 +#: src/conf/network_conf.c:1706 #, c-format msgid "network is already active as '%s'" msgstr "" -#: src/conf/network_conf.c:1717 +#: src/conf/network_conf.c:1720 #, c-format msgid "network '%s' already exists with uuid %s" msgstr "" -#: src/conf/node_device_conf.c:565 +#: 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:588 +#: src/conf/node_device_conf.c:584 #, c-format msgid "missing storage capability type for '%s'" msgstr "缺少 '%s' 的存储能力类型" -#: src/conf/node_device_conf.c:610 +#: 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:611 +#: 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:621 +#: 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:633 +#: src/conf/node_device_conf.c:629 #, c-format msgid "no size supplied for '%s'" msgstr "没有为 '%s' 提供大小" -#: src/conf/node_device_conf.c:634 +#: src/conf/node_device_conf.c:630 #, c-format msgid "invalid size supplied for '%s'" msgstr "为 '%s' 提供的无效大小" -#: src/conf/node_device_conf.c:661 src/conf/node_device_conf.c:739 +#: 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:662 src/conf/node_device_conf.c:740 +#: 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:667 +#: 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:668 +#: 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:673 +#: 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:674 +#: 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:679 +#: 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:680 +#: 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:708 +#: src/conf/node_device_conf.c:702 #, c-format msgid "no target name supplied for '%s'" msgstr "没有为 '%s' 提供目标名称" -#: src/conf/node_device_conf.c:756 +#: src/conf/node_device_conf.c:746 #, c-format msgid "missing SCSI host capability type for '%s'" msgstr "缺少 '%s' 的 SCSI 主机功能类型" -#: src/conf/node_device_conf.c:778 +#: src/conf/node_device_conf.c:768 #, c-format msgid "no WWNN supplied for '%s'" msgstr "没有为 '%s' 提供 WWNN" -#: src/conf/node_device_conf.c:786 +#: src/conf/node_device_conf.c:776 #, c-format msgid "no WWPN supplied for '%s'" msgstr "没有为 '%s' 提供 WWPN" -#: src/conf/node_device_conf.c:794 +#: 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:828 +#: src/conf/node_device_conf.c:818 #, c-format msgid "no network interface supplied for '%s'" msgstr "没有为 '%s' 提供网络接口" -#: src/conf/node_device_conf.c:843 +#: src/conf/node_device_conf.c:833 #, c-format msgid "invalid network type supplied for '%s'" msgstr "'%s' 的无效网络类型" -#: src/conf/node_device_conf.c:871 +#: 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:872 +#: 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:877 +#: 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:878 +#: 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:883 +#: 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:884 +#: 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:889 +#: 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:890 +#: 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:940 +#: 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:941 +#: 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:946 +#: 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:947 +#: 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:952 +#: 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:953 +#: 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:958 +#: 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:959 +#: src/conf/node_device_conf.c:946 #, c-format msgid "invalid USB product ID supplied for '%s'" msgstr "'%s' 的无效 USB 产品 ID" -#: src/conf/node_device_conf.c:986 +#: 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:987 +#: 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:992 +#: 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:993 +#: 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:998 +#: 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:999 +#: 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:1004 +#: 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:1005 +#: 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:1010 +#: 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:1011 +#: 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:1016 +#: 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:1017 +#: 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:1052 +#: 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:1058 +#: src/conf/node_device_conf.c:1043 #, c-format msgid "malformed uuid element for '%s'" msgstr "'%s' 的畸形 uuid 元素" -#: src/conf/node_device_conf.c:1093 +#: src/conf/node_device_conf.c:1077 msgid "missing capability type" msgstr "缺少能力类型" -#: src/conf/node_device_conf.c:1099 +#: src/conf/node_device_conf.c:1083 #, c-format msgid "unknown capability type '%s'" msgstr "未知能力类型 '%s'" -#: src/conf/node_device_conf.c:1136 +#: 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:1188 +#: src/conf/node_device_conf.c:1176 #, c-format msgid "no device capabilities for '%s'" msgstr "'%s' 没有设备容量" -#: src/conf/node_device_conf.c:1234 +#: src/conf/node_device_conf.c:1210 +#, c-format +msgid "unexpected root element <%s> expecting " +msgstr "" + +#: src/conf/node_device_conf.c:1238 msgid "(node_device_definition)" msgstr "" -#: src/conf/node_device_conf.c:1356 +#: src/conf/node_device_conf.c:1285 msgid "Device is not a fibre channel HBA" msgstr "设备不是光纤 HBA" -#: src/conf/node_device_conf.c:1310 +#: src/conf/node_device_conf.c:1314 #, c-format msgid "Could not find parent device for '%s'" msgstr "" -#: src/conf/node_device_conf.c:1330 +#: src/conf/node_device_conf.c:1334 #, c-format msgid "Parent device %s is not capable of vport operations" msgstr "" -#: src/conf/nwfilter_conf.c:1663 +#: src/conf/nwfilter_conf.c:1914 #, c-format msgid "%s has illegal value %s" msgstr "" -#: src/conf/nwfilter_conf.c:1698 src/conf/nwfilter_conf.c:1911 +#: src/conf/nwfilter_conf.c:1949 src/conf/nwfilter_conf.c:2194 msgid "rule node requires action attribute" msgstr "" -#: src/conf/nwfilter_conf.c:1918 +#: src/conf/nwfilter_conf.c:2201 msgid "unknown rule action attribute value" msgstr "" -#: src/conf/nwfilter_conf.c:1925 +#: src/conf/nwfilter_conf.c:2208 msgid "rule node requires direction attribute" msgstr "" -#: src/conf/nwfilter_conf.c:1932 +#: src/conf/nwfilter_conf.c:2215 msgid "unknown rule direction attribute value" msgstr "" -#: src/conf/nwfilter_conf.c:2020 +#: src/conf/nwfilter_conf.c:2292 +#, c-format +msgid "Name of chain is longer than %u characters" +msgstr "" + +#: src/conf/nwfilter_conf.c:2300 +msgid "Chain name contains invalid characters" +msgstr "" + +#: 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 "" + +#: src/conf/nwfilter_conf.c:2385 msgid "filter has no name" msgstr "" -#: src/conf/nwfilter_conf.c:2030 +#: src/conf/nwfilter_conf.c:2393 +#, c-format +msgid "Could not parse chain priority '%s'" +msgstr "" + +#: src/conf/nwfilter_conf.c:2400 #, c-format -msgid "unknown chain suffix '%s'" +msgid "Priority '%d' is outside valid range of [%d,%d]" msgstr "" -#: src/conf/storage_conf.c:649 src/storage/storage_backend.c:353 +#: 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:2100 +#: src/conf/nwfilter_conf.c:2505 msgid "unknown root element for nw filter" msgstr "" -#: src/conf/nwfilter_conf.c:2126 +#: src/conf/nwfilter_conf.c:2531 msgid "(nwfilter_definition" msgstr "" -#: src/conf/nwfilter_conf.c:2396 +#: src/conf/nwfilter_conf.c:2801 #, c-format msgid "filter with same UUID but different name ('%s') already exists" msgstr "" -#: src/conf/nwfilter_conf.c:2407 +#: src/conf/nwfilter_conf.c:2812 msgid "filter would introduce a loop" msgstr "" -#: src/conf/nwfilter_conf.c:2475 +#: src/conf/nwfilter_conf.c:2880 #, c-format msgid "network filter config filename '%s' does not match name '%s'" msgstr "" -#: src/conf/storage_conf.c:1595 +#: src/conf/nwfilter_conf.c:2957 src/conf/storage_conf.c:1536 #, c-format msgid "cannot create config directory %s" msgstr "无法生成配置目录 %s" -#: src/conf/storage_conf.c:1628 +#: src/conf/nwfilter_conf.c:2970 src/conf/storage_conf.c:1555 msgid "failed to generate XML" msgstr "创建 XML 失败" -#: src/conf/storage_conf.c:1672 +#: src/conf/nwfilter_conf.c:2986 src/conf/storage_conf.c:1569 #, c-format msgid "no config file for %s" msgstr "%s 没有配置文件" -#: src/conf/storage_conf.c:1678 +#: 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:2660 +#: src/conf/nwfilter_conf.c:3065 #, c-format msgid "formatter for %s %s reported error" msgstr "" -#: src/conf/nwfilter_params.c:177 +#: src/conf/nwfilter_params.c:114 +msgid "Variable value contains invalid character" +msgstr "" + +#: src/conf/nwfilter_params.c:321 src/conf/nwfilter_params.c:462 +#, c-format +msgid "Could not find value for variable '%s'" +msgstr "" + +#: src/conf/nwfilter_params.c:333 +msgid "" +"Cardinality of list items must be the same for processing them in parallel" +msgstr "" + +#: src/conf/nwfilter_params.c:394 +#, c-format +msgid "Could not find iterator with id %u" +msgstr "" + +#: src/conf/nwfilter_params.c:454 +#, c-format +msgid "Could not find variable '%s' in iterator" +msgstr "" + +#: src/conf/nwfilter_params.c:470 +#, c-format +msgid "Could not get nth (%u) value of variable '%s'" +msgstr "" + +#: src/conf/nwfilter_params.c:619 #, c-format msgid "Could not put variable '%s' into hashmap" msgstr "" -#: src/conf/nwfilter_params.c:281 +#: src/conf/nwfilter_params.c:746 msgid "missing filter parameter table" msgstr "" -#: src/conf/secret_conf.c:56 src/conf/secret_conf.c:100 -#: src/conf/secret_conf.c:274 src/conf/secret_conf.c:291 +#: 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:72 +#: src/conf/secret_conf.c:77 msgid "unknown secret usage type" msgstr "未知 secret 用法类型" -#: src/conf/secret_conf.c:78 +#: src/conf/secret_conf.c:83 #, c-format msgid "unknown secret usage type %s" msgstr "未知 secret 用法类型 %s" -#: src/conf/secret_conf.c:93 +#: src/conf/secret_conf.c:97 msgid "volume usage specified, but volume path is missing" msgstr "指定卷用量,但缺少卷路径" @@ -3220,41 +3550,46 @@ msgid "Ceph usage specified, but name is missing" msgstr "" -#: src/conf/secret_conf.c:141 +#: src/conf/secret_conf.c:130 +#, c-format +msgid "unexpected root element <%s>, expecting " +msgstr "" + +#: src/conf/secret_conf.c:156 msgid "invalid value of 'ephemeral'" msgstr "无效 'ephemeral' 值" -#: src/conf/secret_conf.c:155 +#: src/conf/secret_conf.c:170 msgid "invalid value of 'private'" msgstr "无效的 'private' 值" -#: src/conf/secret_conf.c:212 +#: src/conf/secret_conf.c:214 msgid "(definition_of_secret)" msgstr "" -#: src/conf/storage_conf.c:225 src/storage/storage_backend.c:768 +#: src/conf/storage_conf.c:226 src/storage/storage_backend.c:998 #, c-format msgid "missing backend for pool type %d" msgstr "缺少池类型 %d 后端" -#: src/conf/storage_conf.c:372 +#: src/conf/storage_conf.c:383 msgid "missing auth host attribute" msgstr "缺少 auth 主机属性" -#: src/conf/storage_conf.c:379 +#: src/conf/storage_conf.c:390 msgid "missing auth passwd attribute" msgstr "缺少 auth 密码属性" -#: src/conf/storage_conf.c:416 +#: src/conf/storage_conf.c:427 #, c-format msgid "unknown pool format type %s" msgstr "未知池格式类型 %s" -#: src/conf/storage_conf.c:438 +#: src/conf/storage_conf.c:464 msgid "missing storage pool source device path" msgstr "缺少存储池源设备路径" -#: src/conf/storage_conf.c:457 +#: src/conf/storage_conf.c:483 #, c-format msgid "unknown auth type '%s'" msgstr "未知 auth 类型 '%s'" @@ -3263,41 +3598,41 @@ msgid "(storage_source_specification)" msgstr "" -#: src/conf/storage_conf.c:511 +#: src/conf/storage_conf.c:528 msgid "root element was not source" msgstr "root 元素不是源" -#: src/conf/storage_conf.c:563 +#: src/conf/storage_conf.c:578 msgid "malformed octal mode" msgstr "畸形的八进制模式" -#: src/conf/storage_conf.c:574 +#: src/conf/storage_conf.c:589 msgid "malformed owner element" msgstr "畸形的拥有者元素" -#: src/conf/storage_conf.c:585 +#: src/conf/storage_conf.c:600 msgid "malformed group element" msgstr "畸形的组群元素" -#: src/conf/storage_conf.c:617 src/storage/storage_driver.c:446 -#: src/test/test_driver.c:3729 +#: 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:641 +#: src/conf/storage_conf.c:656 msgid "missing pool source name element" msgstr "缺少池源名称元素" -#: src/conf/storage_conf.c:665 +#: src/conf/storage_conf.c:680 msgid "missing storage pool source host name" msgstr "缺少存储池源主机名称" -#: src/conf/storage_conf.c:673 +#: src/conf/storage_conf.c:688 msgid "missing storage pool source path" msgstr "缺少存储池源路径" -#: src/conf/storage_conf.c:691 +#: src/conf/storage_conf.c:706 msgid "missing storage pool source adapter name" msgstr "缺少存储池源适配器名称" @@ -3305,11 +3640,11 @@ msgid "missing storage pool source device name" msgstr "" -#: src/conf/storage_conf.c:698 +#: src/conf/storage_conf.c:722 msgid "missing storage pool target path" msgstr "缺少存储池目标路径" -#: src/conf/storage_conf.c:745 +#: src/conf/storage_conf.c:752 msgid "unknown root element for storage pool" msgstr "未知存储池的根元素" @@ -3317,42 +3652,42 @@ msgid "(storage_pool_definition)" msgstr "" -#: src/conf/storage_conf.c:876 +#: src/conf/storage_conf.c:850 #, c-format msgid "unknown pool format number %d" msgstr "不支持的池格式号 %d" -#: src/conf/storage_conf.c:909 src/conf/storage_conf.c:1723 +#: src/conf/storage_conf.c:891 src/conf/storage_conf.c:1613 msgid "unexpected pool type" msgstr "意外的池类型" -#: src/conf/storage_conf.c:1007 +#: src/conf/storage_conf.c:988 #, c-format msgid "unknown size units '%s'" msgstr "未知大小的单元 '%s'" -#: src/conf/storage_conf.c:1014 +#: src/conf/storage_conf.c:995 msgid "malformed capacity element" msgstr "畸形容量元素" -#: src/conf/storage_conf.c:1019 +#: src/conf/storage_conf.c:1000 msgid "capacity element value too large" msgstr "容量元素值过大" -#: src/conf/storage_conf.c:1051 +#: src/conf/storage_conf.c:1031 msgid "missing volume name element" msgstr "缺少卷名称元素" -#: src/conf/storage_conf.c:1062 +#: src/conf/storage_conf.c:1042 msgid "missing capacity element" msgstr "缺少容量元素" -#: src/conf/storage_conf.c:1091 src/conf/storage_conf.c:1122 +#: src/conf/storage_conf.c:1071 src/conf/storage_conf.c:1102 #, c-format msgid "unknown volume format type %s" msgstr "未知卷格式类型 %s" -#: src/conf/storage_conf.c:1153 +#: src/conf/storage_conf.c:1132 msgid "unknown root element for storage vol" msgstr "未知存储卷的根元素" @@ -3360,7 +3695,7 @@ msgid "(storage_volume_definition)" msgstr "" -#: src/conf/storage_conf.c:1258 +#: src/conf/storage_conf.c:1192 #, c-format msgid "unknown volume format number %d" msgstr "未知卷格式号 %d" @@ -3390,126 +3725,126 @@ msgid "Storage source conflict with pool: '%s'" msgstr "" -#: src/conf/storage_encryption_conf.c:93 +#: src/conf/storage_encryption_conf.c:92 msgid "unknown volume encryption secret type" msgstr "未知加密 secret 类型" -#: src/conf/storage_encryption_conf.c:99 +#: 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:111 +#: src/conf/storage_encryption_conf.c:110 #, c-format msgid "malformed volume encryption uuid '%s'" msgstr "畸形卷加密 uuid '%s'" -#: src/conf/storage_encryption_conf.c:118 +#: src/conf/storage_encryption_conf.c:117 msgid "missing volume encryption uuid" msgstr "缺少卷加密 uuid" -#: src/conf/storage_encryption_conf.c:147 +#: src/conf/storage_encryption_conf.c:146 msgid "unknown volume encryption format" msgstr "未知卷加密格式" -#: src/conf/storage_encryption_conf.c:153 +#: src/conf/storage_encryption_conf.c:152 #, c-format msgid "unknown volume encryption format type %s" msgstr "未知卷加密格式类型 %s" -#: src/conf/storage_encryption_conf.c:196 +#: src/conf/storage_encryption_conf.c:192 msgid "unknown root element for volume encryption information" msgstr "未知卷加密信息的根元素" -#: src/conf/storage_encryption_conf.c:228 +#: src/conf/storage_encryption_conf.c:222 msgid "unexpected volume encryption secret type" msgstr "意外卷加密 secret 类型" -#: src/conf/storage_encryption_conf.c:248 +#: src/conf/storage_encryption_conf.c:242 msgid "unexpected encryption format" msgstr "意外加密格式" -#: src/conf/storage_encryption_conf.c:275 +#: src/conf/storage_encryption_conf.c:269 msgid "Cannot open /dev/urandom" msgstr "无法打开 /dev/urandom" -#: src/conf/storage_encryption_conf.c:286 +#: src/conf/storage_encryption_conf.c:280 msgid "Cannot read from /dev/urandom" msgstr "无法读取 /dev/urandom" -#: src/cpu/cpu.c:51 src/cpu/cpu_map.c:82 +#: src/cpu/cpu.c:54 src/cpu/cpu_map.c:90 msgid "undefined hardware architecture" msgstr "" -#: src/cpu/cpu.c:79 src/cpu/cpu.c:307 +#: src/cpu/cpu.c:81 src/cpu/cpu.c:309 msgid "(CPU_definition)" msgstr "" -#: src/cpu/cpu.c:88 +#: src/cpu/cpu.c:90 msgid "no CPU model specified" msgstr "" -#: src/cpu/cpu.c:113 +#: src/cpu/cpu.c:118 #, c-format msgid "cannot compare CPUs of %s architecture" msgstr "" -#: src/cpu/cpu.c:144 src/cpu/cpu.c:377 +#: src/cpu/cpu.c:146 src/cpu/cpu.c:379 msgid "nonzero nmodels doesn't match with NULL models" msgstr "" -#: src/cpu/cpu.c:133 +#: src/cpu/cpu.c:152 msgid "invalid CPU definition" msgstr "" -#: src/cpu/cpu.c:142 +#: src/cpu/cpu.c:161 #, c-format msgid "cannot decode CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:168 +#: src/cpu/cpu.c:192 #, c-format msgid "cannot encode CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:193 +#: src/cpu/cpu.c:218 #, c-format msgid "cannot free CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:213 +#: src/cpu/cpu.c:239 #, c-format msgid "cannot get node CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:235 +#: src/cpu/cpu.c:262 #, c-format msgid "cannot compute guest CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:294 +#: src/cpu/cpu.c:296 msgid "nonzero ncpus doesn't match with NULL xmlCPUs" msgstr "" -#: src/cpu/cpu.c:299 src/cpu/cpu.c:371 +#: src/cpu/cpu.c:301 src/cpu/cpu.c:373 msgid "No CPUs given" msgstr "" -#: src/cpu/cpu.c:366 +#: src/cpu/cpu.c:368 msgid "nonzero ncpus doesn't match with NULL cpus" msgstr "" -#: src/cpu/cpu.c:386 +#: src/cpu/cpu.c:388 #, c-format msgid "cannot compute baseline CPU of %s architecture" msgstr "" -#: src/cpu/cpu.c:408 +#: src/cpu/cpu.c:410 #, c-format msgid "cannot update guest CPU data for %s architecture" msgstr "" -#: src/cpu/cpu.c:431 +#: src/cpu/cpu.c:433 #, c-format msgid "cannot check guest CPU data for %s architecture" msgstr "" @@ -3533,17 +3868,17 @@ msgid "no callback provided" msgstr "" -#: src/cpu/cpu_map.c:88 +#: src/cpu/cpu_map.c:102 #, c-format msgid "cannot parse CPU map file: %s" msgstr "" -#: src/cpu/cpu_map.c:106 +#: src/cpu/cpu_map.c:120 #, c-format msgid "cannot find CPU map for %s architecture" msgstr "" -#: src/cpu/cpu_map.c:113 +#: src/cpu/cpu_map.c:127 #, c-format msgid "cannot parse CPU map for %s architecture" msgstr "" @@ -3567,32 +3902,32 @@ msgid "Invalid CPU vendor string '%s'" msgstr "" -#: src/cpu/cpu_x86.c:295 +#: src/cpu/cpu_x86.c:675 #, c-format msgid "CPU feature %s already defined" msgstr "" -#: src/cpu/cpu_x86.c:325 +#: src/cpu/cpu_x86.c:699 #, c-format msgid "Invalid cpuid[%d] in %s feature" msgstr "" -#: src/cpu/cpu_x86.c:494 +#: src/cpu/cpu_x86.c:812 src/cpu/cpu_x86.c:862 #, c-format msgid "Unknown CPU model %s" msgstr "" -#: src/cpu/cpu_x86.c:513 +#: 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 "" -#: src/cpu/cpu_x86.c:613 +#: src/cpu/cpu_x86.c:960 #, c-format msgid "Missing ancestor's name in CPU model %s" msgstr "" -#: src/cpu/cpu_x86.c:620 +#: src/cpu/cpu_x86.c:967 #, c-format msgid "Ancestor model %s not found for CPU model %s" msgstr "" @@ -3607,17 +3942,17 @@ msgid "Unknown vendor %s referenced by CPU model %s" msgstr "" -#: src/cpu/cpu_x86.c:646 +#: src/cpu/cpu_x86.c:1008 #, c-format msgid "Missing feature name for CPU model %s" msgstr "" -#: src/cpu/cpu_x86.c:652 +#: src/cpu/cpu_x86.c:1014 #, c-format msgid "Feature %s required by CPU model %s not found" msgstr "" -#: src/cpu/cpu_x86.c:933 +#: src/cpu/cpu_x86.c:1346 msgid "Cannot find suitable CPU model for given data" msgstr "" @@ -3760,8 +4095,8 @@ "value '%s' has unexpected value '%c', expecting '0' or '1'" msgstr "" -#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4422 -#: src/esx/esx_driver.c:4515 src/esx/esx_storage_driver.c:669 +#: 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 @@ -3934,9 +4269,9 @@ msgstr "" #: src/esx/esx_driver.c:2590 src/esx/esx_driver.c:2674 -#: src/phyp/phyp_driver.c:1430 src/phyp/phyp_driver.c:3703 -#: src/vbox/vbox_tmpl.c:2076 src/vbox/vbox_tmpl.c:2134 -#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1290 +#: 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 "" @@ -4031,7 +4366,7 @@ "(normal) or -3 (high)" msgstr "" -#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4837 +#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4854 #, c-format msgid "Unknown field '%s'" msgstr "" @@ -4079,42 +4414,42 @@ msgid "Could not retrieve memory usage of resource pool" msgstr "" -#: src/esx/esx_driver.c:4261 src/vbox/vbox_tmpl.c:5883 +#: src/esx/esx_driver.c:4278 src/vbox/vbox_tmpl.c:5888 msgid "disk snapshots not supported yet" msgstr "" -#: src/esx/esx_driver.c:4278 +#: src/esx/esx_driver.c:4295 #, c-format msgid "Snapshot '%s' already exists" msgstr "" -#: src/esx/esx_driver.c:4294 +#: src/esx/esx_driver.c:4311 #, c-format msgid "Could not create snapshot: %s" msgstr "" -#: src/esx/esx_driver.c:4638 src/qemu/qemu_driver.c:9751 -#: src/vbox/vbox_tmpl.c:6328 +#: 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 "" -#: src/esx/esx_driver.c:4717 +#: src/esx/esx_driver.c:4734 #, c-format msgid "Could not revert to snapshot '%s': %s" msgstr "" -#: src/esx/esx_driver.c:4783 +#: src/esx/esx_driver.c:4800 #, c-format msgid "Could not delete snapshot '%s': %s" msgstr "" -#: src/esx/esx_driver.c:4854 +#: src/esx/esx_driver.c:4871 #, c-format msgid "Could not change memory parameters: %s" msgstr "" -#: daemon/remote.c:596 +#: src/esx/esx_driver.c:4923 #, c-format msgid "Field %s too big for destination" msgstr "过大的目的字段 %s" @@ -4243,7 +4578,7 @@ #: src/esx/esx_util.c:387 #, c-format -msgid "Formating IP address for host '%s' failed: %s" +msgid "Formatting IP address for host '%s' failed: %s" msgstr "" #: src/esx/esx_util.c:407 src/esx/esx_vi.c:2369 src/hyperv/hyperv_driver.c:909 @@ -4667,7 +5002,7 @@ #: src/esx/esx_vi.c:3957 msgid "" -"Cancelable task is blocked by an unanswered question but cancelation failed" +"Cancelable task is blocked by an unanswered question but cancellation failed" msgstr "" #: src/esx/esx_vi.c:3962 @@ -4780,20 +5115,20 @@ msgid "ManagedObjectReference is missing 'type' property" msgstr "" -#: src/qemu/qemu_driver.c:6554 src/qemu/qemu_driver.c:6591 -#: src/qemu/qemu_driver.c:6657 src/qemu/qemu_driver.c:6773 +#: 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/qemu/qemu_driver.c:6561 src/qemu/qemu_driver.c:6598 +#: src/fdstream.c:82 src/fdstream.c:118 msgid "stream does not have a callback registered" msgstr "" -#: src/qemu/qemu_driver.c:6664 +#: src/fdstream.c:199 msgid "stream already has a callback registered" msgstr "" -#: src/qemu/qemu_driver.c:6674 +#: src/fdstream.c:209 msgid "cannot register file watch on stream" msgstr "" @@ -4810,7 +5145,7 @@ msgid "Too many bytes to write to stream" msgstr "" -#: src/qemu/qemu_driver.c:6789 +#: src/fdstream.c:311 src/fdstream.c:330 msgid "cannot write to stream" msgstr "" @@ -4822,7 +5157,7 @@ msgid "cannot read from stream" msgstr "" -#: src/fdstream.c:428 src/rpc/virnetsocket.c:138 src/util/event_poll.c:670 +#: src/fdstream.c:428 src/rpc/virnetsocket.c:139 src/util/event_poll.c:671 msgid "Unable to initialize mutex" msgstr "" @@ -4854,7 +5189,7 @@ msgid "%s: Cannot request read and write flags together" msgstr "" -#: src/fdstream.c:568 src/lxc/lxc_driver.c:1739 +#: src/fdstream.c:568 src/lxc/lxc_driver.c:1837 msgid "Unable to create pipe" msgstr "" @@ -4905,7 +5240,7 @@ msgid "Domain is not paused" msgstr "" -#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1176 +#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1193 msgid "Domain is not active or is in state transition" msgstr "" @@ -4920,11 +5255,11 @@ msgid "Domain is already active or is in state transition" msgstr "" -#: src/hyperv/hyperv_driver.c:1231 +#: src/hyperv/hyperv_driver.c:1248 msgid "Domain has no managed save image" msgstr "" -#: src/hyperv/hyperv_driver.c:1290 +#: src/hyperv/hyperv_driver.c:1308 #, c-format msgid "openwsman error: %s" msgstr "" @@ -5046,7 +5381,10 @@ msgid "System is not available" msgstr "" -#: tools/virsh.c:4378 +#: 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 "内存溢出" @@ -5120,7 +5458,7 @@ msgid "couldn't find interface with MAC address '%s'" msgstr "" -#: src/interface/netcf_driver.c:316 +#: src/interface/netcf_driver.c:326 msgid "multiple interfaces with matching MAC address" msgstr "与 MAC 地址匹配的多个接口" @@ -5169,36 +5507,36 @@ msgid "%s: unsupported flags (0x%lx)" msgstr "" -#: src/libvirt.c:584 src/libvirt.c:617 src/libvirt.c:650 src/libvirt.c:683 -#: src/libvirt.c:716 src/libvirt.c:749 src/libvirt.c:785 src/libvirt.c:825 +#: 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 "" -#: src/libvirt.c:792 +#: src/libvirt.c:794 msgid "Tried to register an internal Xen driver" msgstr "" -#: src/libvirt.c:851 +#: src/libvirt.c:853 #, c-format msgid "Initialization of %s state driver failed" msgstr "" -#: src/libvirt.c:997 +#: src/libvirt.c:1002 msgid "Expected a list for 'uri_aliases' config parameter" msgstr "" -#: src/libvirt.c:1009 +#: src/libvirt.c:1014 msgid "Expected a string for 'uri_aliases' config parameter list entry" msgstr "" -#: src/libvirt.c:1015 +#: src/libvirt.c:1020 #, c-format msgid "" "Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'" msgstr "" -#: src/libvirt.c:1023 +#: src/libvirt.c:1028 #, c-format msgid "" "Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, " @@ -5225,7 +5563,7 @@ msgstr "" #: src/libvirt.c:2565 src/libvirt.c:2709 src/libvirt.c:2863 -#: src/libvirt.c:15778 src/libvirt.c:16607 +#: src/libvirt.c:16017 src/libvirt.c:16846 msgid "running and paused flags are mutually exclusive" msgstr "" @@ -5253,97 +5591,117 @@ msgid "could not build absolute core file path" msgstr "" -#: src/libvirt.c:2886 +#: src/libvirt.c:3603 +#, c-format +msgid "string parameter name '%.*s' too long" +msgstr "" + +#: src/libvirt.c:3613 +#, c-format +msgid "NULL string parameter '%s'" +msgstr "" + +#: src/libvirt.c:3620 +#, c-format +msgid "string parameter '%s' unsupported" +msgstr "" + +#: src/libvirt.c:4092 msgid "virDomainGetXMLDesc with secure flag" msgstr "带安全标志的 virDomainGetXMLDesc" -#: src/libvirt.c:3050 +#: src/libvirt.c:4278 msgid "domainMigratePrepare did not set uri" msgstr "domainMigratePrepare 没有设定 uri" -#: src/libvirt.c:3136 src/qemu/qemu_driver.c:7475 +#: src/libvirt.c:4390 src/qemu/qemu_migration.c:1944 msgid "domainMigratePrepare2 did not set uri" msgstr "domainMigratePrepare2 没有设定 uri" -#: src/libvirt.c:4466 src/qemu/qemu_migration.c:2070 +#: src/libvirt.c:4536 src/qemu/qemu_migration.c:2082 msgid "domainMigratePrepare3 did not set uri" msgstr "" -#: src/libvirt.c:4642 src/libvirt.c:4714 src/libvirt.c:5094 src/libvirt.c:5106 +#: 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 "" -#: src/libvirt.c:4647 +#: src/libvirt.c:4717 msgid "Unable to override peer2peer migration URI" msgstr "" -#: src/libvirt.c:4868 src/libvirt.c:5069 +#: src/libvirt.c:4938 src/libvirt.c:5139 msgid "cannot enforce change protection" msgstr "" -#: src/libvirt.c:3357 +#: src/libvirt.c:4944 src/libvirt.c:5145 msgid "cannot perform tunnelled migration without using peer2peer flag" msgstr "无法在不使用 peer2peer 标签的情况下执行隧道迁移" -#: src/libvirt.c:4306 -msgid "path is NULL" -msgstr "路径为 NULL" +#: src/libvirt.c:7090 src/libvirt.c:7166 src/libvirt.c:17055 +#: src/libvirt.c:17111 src/libvirt.c:17179 src/libvirt.c:17250 +msgid "disk is NULL" +msgstr "" -#: src/libvirt.c:4319 +#: src/libvirt.c:7097 msgid "buffer is NULL" msgstr "缓冲为 NULL" -#: src/libvirt.c:7044 +#: src/libvirt.c:7268 msgid "" "flags parameter must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL" msgstr "" -#: src/libvirt.c:4427 +#: src/libvirt.c:7275 msgid "buffer is NULL but size is non-zero" msgstr "缓冲为 NULL 但大小是非零数" -#: src/libvirt.c:10151 +#: src/libvirt.c:14269 msgid "data sources cannot be used for non-blocking streams" msgstr "不能为非块流使用数据源" -#: src/libvirt.c:10248 +#: src/libvirt.c:14371 msgid "data sinks cannot be used for non-blocking streams" msgstr "不能为非块流使用数据漏" -#: src/libvirt.c:16050 +#: src/libvirt.c:16289 msgid "use of current flag requires redefine flag" msgstr "" -#: src/libvirt.c:16056 +#: src/libvirt.c:16295 msgid "redefine and no metadata flags are mutually exclusive" msgstr "" -#: src/libvirt.c:16062 +#: src/libvirt.c:16301 msgid "redefine and halt flags are mutually exclusive" msgstr "" -#: src/libvirt.c:16115 +#: src/libvirt.c:16354 msgid "virDomainSnapshotGetXMLDesc with secure flag" msgstr "" -#: src/libvirt.c:16674 +#: src/libvirt.c:16913 msgid "children and children_only flags are mutually exclusive" msgstr "" -#: src/libvirt.c:16864 +#: src/libvirt.c:17117 msgid "info is NULL" msgstr "" -#: src/libvirt.c:17051 +#: src/libvirt.c:17318 #, c-format msgid "Unable to access file descriptor %d" msgstr "" -#: src/libvirt.c:17057 +#: src/libvirt.c:17324 #, c-format msgid "File descriptor %d must be a socket" msgstr "" +#: src/libvirt.c:17394 +msgid "negative or zero interval make no sense" +msgstr "" + #: src/locking/lock_driver_sanlock.c:95 #, c-format msgid "Unable to access config file %s" @@ -5560,42 +5918,42 @@ msgid "this platform is missing dlopen" msgstr "" -#: src/lxc/lxc_container.c:128 +#: src/lxc/lxc_container.c:147 msgid "setsid failed" msgstr "setsid 失败" -#: src/lxc/lxc_container.c:134 +#: src/lxc/lxc_container.c:153 msgid "ioctl(TIOCSTTY) failed" msgstr "ioctl(TIOCSTTY) 失败" -#: src/lxc/lxc_container.c:147 +#: src/lxc/lxc_container.c:168 msgid "dup2(stdin) failed" msgstr "dup2(stdin) 失败" -#: src/lxc/lxc_container.c:153 +#: src/lxc/lxc_container.c:174 msgid "dup2(stdout) failed" msgstr "dup2(stdout) 失败" -#: src/lxc/lxc_container.c:159 +#: src/lxc/lxc_container.c:180 msgid "dup2(stderr) failed" msgstr "dup2(stderr) 失败" -#: src/lxc/lxc_container.c:311 +#: src/lxc/lxc_container.c:333 msgid "Failed to make root private" msgstr "使 root 成为专用失败" -#: src/lxc/lxc_container.c:322 src/lxc/lxc_container.c:344 -#: src/lxc/lxc_container.c:515 +#: 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:331 +#: src/lxc/lxc_container.c:353 #, c-format msgid "Failed to mount empty tmpfs at %s" msgstr "在 %s 挂载空 tmpfs 失败" -#: src/lxc/lxc_container.c:352 +#: src/lxc/lxc_container.c:374 #, c-format msgid "Failed to bind new root %s into tmpfs" msgstr "将新 root %s 绑定到 tmpfs 失败" @@ -5605,16 +5963,16 @@ msgid "Failed to make new root %s readonly" msgstr "" -#: src/lxc/lxc_container.c:361 +#: src/lxc/lxc_container.c:392 #, c-format msgid "Failed to chroot into %s" msgstr "chroot 到 %s 失败" -#: src/lxc/lxc_container.c:369 +#: src/lxc/lxc_container.c:400 msgid "Failed to pivot root" msgstr "pivot root 失败" -#: src/lxc/lxc_container.c:412 +#: src/lxc/lxc_container.c:459 #, c-format msgid "Failed to mkdir %s" msgstr "新建文件夹 %s 失败" @@ -5624,20 +5982,20 @@ msgid "Failed to mount %s on %s type %s" msgstr "" -#: src/lxc/lxc_container.c:426 +#: src/lxc/lxc_container.c:511 msgid "Cannot create /dev/pts" msgstr "无法创建 /dev/pts" -#: src/lxc/lxc_container.c:433 +#: src/lxc/lxc_container.c:518 msgid "Failed to mount /dev/pts in container" msgstr "将 /dev/pts 挂载到容器失败" -#: src/lxc/lxc_container.c:468 +#: src/lxc/lxc_container.c:552 #, c-format msgid "Failed to make device %s" msgstr "生成设备 %s 失败" -#: src/lxc/lxc_container.c:485 +#: src/lxc/lxc_container.c:562 msgid "Failed to make device /dev/ptmx" msgstr "生成设备 /dev/ptmx 失败" @@ -5729,7 +6087,7 @@ msgid "Cannot mount filesystem type %s" msgstr "" -#: src/lxc/lxc_container.c:545 +#: src/lxc/lxc_container.c:984 msgid "Failed to read /proc/mounts" msgstr "读取 /proc/mounts 失败" @@ -5743,25 +6101,25 @@ msgid "Failed to unmount '%s' and could not unmount old root '%s'" msgstr "" -#: src/lxc/lxc_container.c:624 +#: src/lxc/lxc_container.c:1098 msgid "Failed to make / slave" msgstr "生成 / 从设备失败" -#: src/lxc/lxc_container.c:687 +#: src/lxc/lxc_container.c:1148 #, c-format msgid "Failed to remove capabilities: %d" msgstr "删除容量失败:%d" -#: src/lxc/lxc_container.c:693 +#: src/lxc/lxc_container.c:1154 #, c-format msgid "Failed to apply capabilities: %d" msgstr "应用容量失败:%d" -#: src/lxc/lxc_container.c:732 +#: src/lxc/lxc_container.c:1195 msgid "lxcChild() passed invalid vm definition" msgstr "lxcChild() 传递无效 vm 定义" -#: src/lxc/lxc_container.c:753 +#: src/lxc/lxc_container.c:1228 #, c-format msgid "Failed to open tty %s" msgstr "打开 tty %s 失败" @@ -5771,7 +6129,7 @@ msgid "cannot find init path '%s' relative to container root" msgstr "" -#: src/lxc/lxc_container.c:216 +#: src/lxc/lxc_container.c:1246 msgid "Failed to read the container continue message" msgstr "读取容器继续信息失败" @@ -5779,628 +6137,852 @@ msgid "failed to send continue signal to controller" msgstr "" -#: src/lxc/lxc_container.c:836 +#: src/lxc/lxc_container.c:1372 msgid "Failed to run clone container" msgstr "运行克隆容器失败" -#: src/lxc/lxc_conf.c:76 src/qemu/qemu_driver.c:260 src/uml/uml_conf.c:87 +#: 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 "" -#: src/lxc/lxc_controller.c:85 +#: src/lxc/lxc_controller.c:93 msgid "Unable to read /dev" msgstr "" -#: src/qemu/qemu_driver.c:2819 +#: 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/lxc/lxc_controller.c:112 +#: src/lxc/lxc_controller.c:120 #, c-format msgid "Unable to get loop status on %s" msgstr "" -#: src/lxc/lxc_controller.c:123 +#: src/lxc/lxc_controller.c:131 msgid "Unable to find a free loop device in /dev" msgstr "" -#: src/lxc/lxc_controller.c:160 +#: src/lxc/lxc_controller.c:168 #, c-format msgid "Unable to attach %s to loop device" msgstr "" -#: src/lxc/lxc_controller.c:167 +#: src/lxc/lxc_controller.c:175 msgid "Unable to mark loop device as autoclear" msgstr "" -#: src/lxc/lxc_controller.c:92 -msgid "Unable to get cgroup for driver" -msgstr "无法为驱动程序获得 cgroup" +#: src/lxc/lxc_controller.c:252 src/qemu/qemu_process.c:1386 +msgid "Host kernel is not aware of NUMA." +msgstr "" -#: src/lxc/lxc_controller.c:99 +#: src/lxc/lxc_controller.c:264 src/qemu/qemu_process.c:1398 #, c-format -msgid "Unable to create cgroup for domain %s" -msgstr "无法为域 %s 生成 cgroup" +msgid "Host cannot support NUMA node %d" +msgstr "" + +#: src/lxc/lxc_controller.c:293 src/qemu/qemu_process.c:1427 +msgid "NUMA memory tuning in 'preferred' mode only supports single node" +msgstr "" -#: src/lxc/lxc_controller.c:274 +#: src/lxc/lxc_controller.c:304 #, c-format -msgid "Unable to set Blkio weight for domain %s" +msgid "Unable to set NUMA policy %s" +msgstr "" + +#: src/lxc/lxc_controller.c:319 +msgid "NUMA policy is not available on this platform" +msgstr "" + +#: src/lxc/lxc_controller.c:392 src/qemu/qemu_cgroup.c:382 +#, c-format +msgid "Unable to set io cpu shares for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:284 +#: src/lxc/lxc_controller.c:401 #, c-format -msgid "Unable to set cpu shares for domain %s" +msgid "Unable to set io cpu quota for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:107 +#: src/lxc/lxc_controller.c:410 +#, c-format +msgid "Unable to set io cpu period for domain %s" +msgstr "" + +#: src/lxc/lxc_controller.c:429 +#, c-format +msgid "Unable to set Blkio weight for domain %s" +msgstr "" + +#: src/lxc/lxc_controller.c:449 #, c-format msgid "Unable to set memory limit for domain %s" msgstr "无法为域设定内存限制 %s" -#: src/lxc/lxc_controller.c:302 src/qemu/qemu_cgroup.c:323 +#: src/lxc/lxc_controller.c:458 src/qemu/qemu_cgroup.c:347 #, c-format msgid "Unable to set memory hard limit for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:312 src/qemu/qemu_cgroup.c:332 +#: src/lxc/lxc_controller.c:468 src/qemu/qemu_cgroup.c:356 #, c-format msgid "Unable to set memory soft limit for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:322 src/qemu/qemu_cgroup.c:342 +#: src/lxc/lxc_controller.c:478 src/qemu/qemu_cgroup.c:366 #, c-format msgid "Unable to set swap hard limit for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:115 +#: src/lxc/lxc_controller.c:508 #, c-format msgid "Unable to deny devices for domain %s" msgstr "无法为域 %s 拒绝设备" -#: src/lxc/lxc_controller.c:128 +#: src/lxc/lxc_controller.c:522 #, c-format msgid "Unable to allow device %c:%d:%d for domain %s" msgstr "无法允许设备 %c:%d:%d 在域 %s 中" -#: src/lxc/lxc_controller.c:362 +#: src/lxc/lxc_controller.c:539 #, c-format msgid "Unable to allow device %s for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:372 +#: src/lxc/lxc_controller.c:549 #, c-format msgid "Unable to allow PTY devices for domain %s" msgstr "" -#: src/lxc/lxc_controller.c:145 +#: src/lxc/lxc_controller.c:588 +msgid "Unable to get cgroup for driver" +msgstr "无法为驱动程序获得 cgroup" + +#: src/lxc/lxc_controller.c:595 +#, c-format +msgid "Unable to create cgroup for domain %s" +msgstr "无法为域 %s 生成 cgroup" + +#: src/lxc/lxc_controller.c:615 #, c-format msgid "Unable to add task %d to cgroup for domain %s" msgstr "无法添加任务 %d 到域 %s 的 cgroup 中" -#: src/lxc/lxc_controller.c:173 +#: src/lxc/lxc_controller.c:643 #, c-format msgid "failed to create server socket '%s'" msgstr "创建服务器套接字 '%s' 失败" -#: src/lxc/lxc_controller.c:183 +#: src/lxc/lxc_controller.c:653 #, c-format msgid "Socket path %s too long for destination" msgstr "过长的目的套接字路径 %s" -#: src/lxc/lxc_controller.c:189 +#: src/lxc/lxc_controller.c:659 #, c-format msgid "failed to bind server socket '%s'" msgstr "绑定服务器套接字 '%s' 失败" -#: src/lxc/lxc_controller.c:195 +#: src/lxc/lxc_controller.c:665 #, c-format msgid "failed to listen server socket %s" msgstr "侦听服务器套接字 %s 失败" -#: src/lxc/lxc_controller.c:257 +#: src/lxc/lxc_controller.c:687 #, c-format msgid "failed to apply capabilities: %d" msgstr "应用容量失败:%d" -#: src/lxc/lxc_controller.c:543 +#: src/lxc/lxc_controller.c:778 msgid "Unable to read from monitor client" msgstr "" -#: src/lxc/lxc_controller.c:572 +#: src/lxc/lxc_controller.c:807 msgid "Unable to accept monitor client" msgstr "" -#: src/lxc/lxc_controller.c:589 src/lxc/lxc_controller.c:861 +#: src/lxc/lxc_controller.c:824 src/lxc/lxc_controller.c:1096 msgid "Unable to watch client socket" msgstr "" -#: src/lxc/lxc_controller.c:635 +#: src/lxc/lxc_controller.c:870 msgid "Unable to create epoll fd" msgstr "" -#: src/lxc/lxc_controller.c:643 +#: src/lxc/lxc_controller.c:878 msgid "Unable to add epoll fd" msgstr "" -#: src/lxc/lxc_controller.c:653 +#: src/lxc/lxc_controller.c:888 msgid "Unable to wait on epoll" msgstr "" -#: src/lxc/lxc_controller.c:725 +#: src/lxc/lxc_controller.c:960 msgid "Unable to read container pty" msgstr "" -#: src/lxc/lxc_controller.c:753 +#: src/lxc/lxc_controller.c:988 msgid "Unable to write to container pty" msgstr "" -#: src/lxc/lxc_controller.c:820 +#: src/lxc/lxc_controller.c:1055 msgid "Cannot create signal pipe" msgstr "" -#: src/lxc/lxc_controller.c:830 +#: src/lxc/lxc_controller.c:1065 msgid "Unable to watch signal pipe" msgstr "" -#: src/lxc/lxc_controller.c:836 +#: src/lxc/lxc_controller.c:1071 msgid "Cannot install signal handler" msgstr "" -#: src/lxc/lxc_controller.c:850 +#: src/lxc/lxc_controller.c:1085 msgid "Unable to watch monitor socket" msgstr "" -#: src/lxc/lxc_controller.c:880 src/lxc/lxc_controller.c:890 +#: src/lxc/lxc_controller.c:1115 src/lxc/lxc_controller.c:1125 msgid "Unable to watch host console PTY" msgstr "" -#: src/lxc/lxc_controller.c:973 +#: src/lxc/lxc_controller.c:1208 #, c-format msgid "Unable to request personality for %s on %s" msgstr "" -#: src/lxc/lxc_controller.c:513 +#: src/lxc/lxc_controller.c:1302 msgid "sockpair failed" msgstr "sockpair 失败" -#: src/lxc/lxc_controller.c:1073 +#: src/lxc/lxc_controller.c:1308 msgid "socketpair failed" msgstr "" -#: src/lxc/lxc_controller.c:1110 +#: src/lxc/lxc_controller.c:1345 #, c-format msgid "root source %s does not exist" msgstr "" -#: src/lxc/lxc_controller.c:543 +#: src/lxc/lxc_controller.c:1352 msgid "Cannot unshare mount namespace" msgstr "无法取消共享挂载名称空间" -#: src/lxc/lxc_controller.c:549 +#: src/lxc/lxc_controller.c:1358 msgid "Failed to switch root mount into slave mode" msgstr "将 root 挂载切换到从属模式失败" -#: src/lxc/lxc_controller.c:561 +#: src/lxc/lxc_controller.c:1370 #, c-format msgid "Failed to make path %s" msgstr "生成路径 %s 失败" -#: src/lxc/lxc_controller.c:569 +#: src/lxc/lxc_controller.c:1381 #, c-format msgid "Failed to mount devpts on %s" msgstr "挂载 devpts 到 %s 失败" -#: src/lxc/lxc_controller.c:1158 +#: src/lxc/lxc_controller.c:1393 msgid "Expected exactly one TTY fd" msgstr "" -#: src/lxc/lxc_controller.c:587 src/lxc/lxc_controller.c:596 -#: src/lxc/lxc_driver.c:1212 +#: 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_container.c:187 +#: src/lxc/lxc_controller.c:1439 msgid "Unable to send container continue message" msgstr "无法发送容器继续信息" -#: src/lxc/lxc_controller.c:1210 +#: src/lxc/lxc_controller.c:1445 msgid "error receiving signal from container" msgstr "" -#: src/lxc/lxc_controller.c:1227 +#: src/lxc/lxc_controller.c:1462 msgid "error sending continue signal to parent" msgstr "" -#: src/lxc/lxc_controller.c:1235 src/lxc/lxc_controller.c:1242 +#: src/lxc/lxc_controller.c:1470 src/lxc/lxc_controller.c:1477 msgid "Unable to set file descriptor non blocking" msgstr "" -#: src/lxc/lxc_controller.c:773 +#: 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:787 +#: src/lxc/lxc_controller.c:1678 msgid "Unable to change to root dir" msgstr "不能更改 root 目录" -#: src/lxc/lxc_controller.c:793 +#: src/lxc/lxc_controller.c:1684 msgid "Unable to become session leader" msgstr "无法成为会话引导者" -#: src/lxc/lxc_controller.c:804 +#: src/lxc/lxc_controller.c:1695 msgid "Failed to accept a connection from driver" msgstr "从驱动程序接受连接失败" -#: src/lxc/lxc_driver.c:131 +#: 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:139 +#: src/lxc/lxc_driver.c:167 msgid "lxc state driver is not active" msgstr "lxc 状态驱动程序未激活" -#: src/lxc/lxc_driver.c:229 +#: src/lxc/lxc_driver.c:238 #, c-format msgid "No domain with matching id %d" msgstr "" -#: src/lxc/lxc_driver.c:561 src/lxc/lxc_driver.c:586 src/lxc/lxc_driver.c:618 -#: src/lxc/lxc_driver.c:2030 src/lxc/lxc_driver.c:2084 -#: src/lxc/lxc_driver.c:2111 src/lxc/lxc_driver.c:2280 -#: src/lxc/lxc_driver.c:2345 +#: 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/lxc/lxc_driver.c:284 +#: src/lxc/lxc_driver.c:293 #, c-format msgid "No domain with matching name '%s'" msgstr "" -#: src/lxc/lxc_driver.c:378 src/lxc/lxc_driver.c:1315 -#: src/lxc/lxc_driver.c:1365 +#: 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:439 +#: src/lxc/lxc_driver.c:508 msgid "Cannot undefine transient domain" msgstr "无法取消定义瞬时域" -#: src/lxc/lxc_driver.c:491 +#: src/lxc/lxc_driver.c:571 src/lxc/lxc_driver.c:762 src/lxc/lxc_driver.c:916 #, c-format msgid "Unable to get cgroup for %s" msgstr "无法为 %s 中获得 cgroup" -#: src/lxc/lxc_driver.c:497 +#: src/lxc/lxc_driver.c:577 msgid "Cannot read cputime for domain" msgstr "无法为域读取 cputime" -#: src/lxc/lxc_driver.c:502 +#: src/lxc/lxc_driver.c:582 msgid "Cannot read memory usage for domain" msgstr "无法为域读取内存用量" -#: src/lxc/lxc_driver.c:592 +#: src/lxc/lxc_driver.c:712 msgid "Cannot set max memory lower than current memory" msgstr "无法将最大内存设置为低于当前内存" -#: src/lxc/lxc_driver.c:624 +#: src/lxc/lxc_driver.c:744 msgid "Cannot set memory higher than max memory" msgstr "无法将内存设置为高于最大内存" -#: src/lxc/lxc_driver.c:2036 src/lxc/lxc_driver.c:2286 -#: src/lxc/lxc_driver.c:2351 +#: 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:747 +#: src/lxc/lxc_driver.c:756 msgid "cgroups must be configured on the host" msgstr "" -#: src/lxc/lxc_driver.c:637 +#: src/lxc/lxc_driver.c:768 msgid "Failed to set memory for domain" msgstr "为域设定内存失败" -#: src/qemu/qemu_driver.c:6009 src/qemu/qemu_driver.c:6080 +#: src/lxc/lxc_driver.c:808 src/lxc/lxc_driver.c:2831 +#: src/lxc/lxc_driver.c:3032 src/lxc/lxc_driver.c:3158 +#: src/lxc/lxc_driver.c:3307 src/qemu/qemu_driver.c:6054 +#: src/qemu/qemu_driver.c:6273 src/qemu/qemu_driver.c:6482 +#: src/qemu/qemu_driver.c:6644 src/qemu/qemu_driver.c:6960 +#: src/qemu/qemu_driver.c:7232 #, c-format msgid "cannot find cgroup for domain %s" msgstr "" -#: src/lxc/lxc_driver.c:811 src/qemu/qemu_driver.c:6240 +#: src/lxc/lxc_driver.c:820 src/qemu/qemu_driver.c:6505 msgid "invalid type for memory hard_limit tunable, expected a 'ullong'" msgstr "" -#: src/lxc/lxc_driver.c:819 src/qemu/qemu_driver.c:6249 +#: src/lxc/lxc_driver.c:828 src/qemu/qemu_driver.c:6514 msgid "unable to set memory hard_limit tunable" msgstr "" -#: src/lxc/lxc_driver.c:826 src/qemu/qemu_driver.c:6261 +#: src/lxc/lxc_driver.c:835 src/qemu/qemu_driver.c:6526 msgid "invalid type for memory soft_limit tunable, expected a 'ullong'" msgstr "" -#: src/lxc/lxc_driver.c:834 src/qemu/qemu_driver.c:6270 +#: src/lxc/lxc_driver.c:843 src/qemu/qemu_driver.c:6535 msgid "unable to set memory soft_limit tunable" msgstr "" -#: src/lxc/lxc_driver.c:841 src/qemu/qemu_driver.c:6282 +#: src/lxc/lxc_driver.c:850 src/qemu/qemu_driver.c:6547 msgid "invalid type for swap_hard_limit tunable, expected a 'ullong'" msgstr "" -#: src/lxc/lxc_driver.c:849 src/qemu/qemu_driver.c:6291 +#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:6556 msgid "unable to set swap_hard_limit tunable" msgstr "" -#: src/lxc/lxc_driver.c:854 src/qemu/qemu_driver.c:6300 +#: src/lxc/lxc_driver.c:863 src/qemu/qemu_driver.c:6565 #, c-format msgid "Memory tunable `%s' not implemented" msgstr "" -#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:5982 -#: src/qemu/qemu_driver.c:6011 src/qemu/qemu_driver.c:6305 +#: src/lxc/lxc_driver.c:867 src/lxc/lxc_driver.c:3202 +#: src/lxc/lxc_driver.c:3231 src/qemu/qemu_driver.c:6137 +#: src/qemu/qemu_driver.c:6192 src/qemu/qemu_driver.c:6570 #, c-format msgid "Parameter `%s' not supported" msgstr "" -#: src/lxc/lxc_driver.c:922 src/qemu/qemu_driver.c:6457 +#: src/lxc/lxc_driver.c:931 src/qemu/qemu_driver.c:6726 msgid "unable to get memory hard limit" msgstr "" -#: src/lxc/lxc_driver.c:927 +#: src/lxc/lxc_driver.c:936 msgid "Field memory hard limit too long for destination" msgstr "" -#: src/lxc/lxc_driver.c:937 src/qemu/qemu_driver.c:6473 +#: src/lxc/lxc_driver.c:946 src/qemu/qemu_driver.c:6742 msgid "unable to get memory soft limit" msgstr "" -#: src/lxc/lxc_driver.c:942 +#: src/lxc/lxc_driver.c:951 msgid "Field memory soft limit too long for destination" msgstr "" -#: src/lxc/lxc_driver.c:952 src/qemu/qemu_driver.c:6489 +#: src/lxc/lxc_driver.c:961 src/qemu/qemu_driver.c:6758 msgid "unable to get swap hard limit" msgstr "" -#: src/lxc/lxc_driver.c:957 +#: src/lxc/lxc_driver.c:966 msgid "Field swap hard limit too long for destination" msgstr "" -#: src/lxc/lxc_driver.c:1202 -msgid "Unable to initialize bridging" +#: 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 "" -#: src/lxc/lxc_driver.c:805 -msgid "Failed to get bridge for interface" -msgstr "为接口获得桥接失败" +#: src/lxc/lxc_driver.c:1262 +msgid "Unable to set network bandwidth on direct interfaces" +msgstr "" -#: src/lxc/lxc_driver.c:850 -#, c-format -msgid "Failed to add %s device to %s" -msgstr "在 %s 中添加 %s 设备失败" +#: src/lxc/lxc_driver.c:1276 +msgid "Unable to set port profile on direct interfaces" +msgstr "" + +#: src/lxc/lxc_driver.c:1366 +msgid "No bridge name specified" +msgstr "" -#: src/lxc/lxc_driver.c:1293 src/network/bridge_driver.c:1815 -#: src/qemu/qemu_command.c:330 src/util/macvtap.c:369 +#: src/lxc/lxc_driver.c:1394 #, c-format -msgid "cannot set bandwidth limits on %s" +msgid "Unsupported network type %s" msgstr "" -#: src/lxc/lxc_driver.c:888 +#: src/lxc/lxc_driver.c:1428 msgid "Failed to create client socket" msgstr "创建客户端套接字失败" -#: src/lxc/lxc_driver.c:896 +#: src/lxc/lxc_driver.c:1436 #, c-format msgid "Socket path %s too big for destination" msgstr "过长的目的套接字路径 %s" -#: src/lxc/lxc_driver.c:902 +#: src/lxc/lxc_driver.c:1442 msgid "Failed to connect to client socket" msgstr "连接到客户端套接字失败" -#: src/lxc/lxc_driver.c:927 +#: src/lxc/lxc_driver.c:1465 #, c-format msgid "Invalid PID %d for container" msgstr "容器的无效 PID %d" -#: src/lxc/lxc_driver.c:1375 +#: src/lxc/lxc_driver.c:1473 msgid "Failed to kill container PIDs" msgstr "" -#: src/lxc/lxc_driver.c:1381 +#: src/lxc/lxc_driver.c:1479 msgid "Some container PIDs refused to die" msgstr "" -#: src/lxc/lxc_driver.c:1547 +#: src/lxc/lxc_driver.c:1645 #, c-format msgid "failed to open logfile %s" msgstr "" -#: src/lxc/lxc_driver.c:1563 src/qemu/qemu_domain.c:1268 +#: 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 "" -#: src/lxc/lxc_driver.c:1567 src/qemu/qemu_domain.c:1272 +#: 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 "" -#: src/lxc/lxc_driver.c:1584 +#: src/lxc/lxc_driver.c:1682 msgid "Failure while reading guest log output" msgstr "" -#: src/lxc/lxc_driver.c:1642 +#: src/lxc/lxc_driver.c:1740 msgid "" "The 'cpuacct', 'devices' & 'memory' cgroups controllers must be mounted" msgstr "" -#: src/lxc/lxc_driver.c:1649 +#: src/lxc/lxc_driver.c:1747 msgid "Unable to find 'cpuacct' cgroups controller mount" msgstr "" -#: src/lxc/lxc_driver.c:1655 +#: src/lxc/lxc_driver.c:1753 msgid "Unable to find 'devices' cgroups controller mount" msgstr "" -#: src/lxc/lxc_driver.c:1661 +#: src/lxc/lxc_driver.c:1759 msgid "Unable to find 'memory' cgroups controller mount" msgstr "" -#: src/lxc/lxc_driver.c:1198 +#: src/lxc/lxc_driver.c:1765 #, c-format msgid "Cannot create log directory '%s'" msgstr "无法生成日志目录 '%s'" -#: src/lxc/lxc_driver.c:1702 +#: src/lxc/lxc_driver.c:1800 msgid "Only PTY console types are supported" msgstr "" -#: src/lxc/lxc_driver.c:1233 +#: src/lxc/lxc_driver.c:1830 #, c-format msgid "Failed to open '%s'" msgstr "打开 '%s' 失败" -#: src/lxc/lxc_driver.c:1774 +#: src/lxc/lxc_driver.c:1872 msgid "could not close handshake fd" msgstr "" -#: src/lxc/lxc_driver.c:1253 +#: 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_driver.c:1800 +#: src/lxc/lxc_driver.c:1898 #, c-format msgid "guest failed to start: %s" msgstr "" -#: src/lxc/lxc_driver.c:1839 +#: src/lxc/lxc_driver.c:1937 msgid "could not close logfile" msgstr "" -#: src/lxc/lxc_driver.c:1906 src/libxl/libxl_driver.c:2711 +#: 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/uml/uml_driver.c:163 +#: 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 "" -#: src/lxc/lxc_driver.c:1884 +#: src/lxc/lxc_driver.c:2600 #, c-format msgid "Unknown release: %s" msgstr "未知发布:%s" -#: src/lxc/lxc_driver.c:1946 src/qemu/qemu_driver.c:6032 -#, c-format -msgid "Invalid parameter `%s'" -msgstr "无效参数 `%s'" +#: 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 "" -#: src/lxc/lxc_driver.c:1937 -msgid "Invalid type for cpu_shares tunable, expected a 'ullong'" -msgstr "可调 cpu_shares 的无效类型,需要的是 'ullong'" +#: src/lxc/lxc_driver.c:2702 src/qemu/qemu_driver.c:6828 +#: src/qemu/qemu_driver.c:7080 +msgid "unable to get cpu bandwidth period tunable" +msgstr "" -#: src/lxc/lxc_driver.c:2572 -#, c-format -msgid "failed to set cpu_shares=%llu" +#: src/lxc/lxc_driver.c:2709 src/qemu/qemu_driver.c:6821 +#: src/qemu/qemu_driver.c:7087 +msgid "unable to get cpu bandwidth tunable" msgstr "" -#: src/lxc/lxc_driver.c:1996 -msgid "Field cpu_shares too big for destination" -msgstr "过大的目的字段 cpu_shares" +#: src/lxc/lxc_driver.c:2731 src/qemu/qemu_cgroup.c:418 +msgid "Unable to get cpu bandwidth period" +msgstr "" -#: src/lxc/lxc_driver.c:2053 -#, c-format -msgid "Invalid path, '%s' is not a known interface" -msgstr "无效路径,'%s' 是已知接口" +#: src/lxc/lxc_driver.c:2738 src/qemu/qemu_cgroup.c:425 +msgid "Unable to set cpu bandwidth period" +msgstr "" -#: src/lxc/lxc_driver.c:2117 +#: src/lxc/lxc_driver.c:2747 src/qemu/qemu_cgroup.c:434 +msgid "Unable to set cpu bandwidth quota" +msgstr "" + +#: src/lxc/lxc_driver.c:2759 src/qemu/qemu_cgroup.c:446 +#: src/qemu/qemu_cgroup.c:481 src/qemu/qemu_driver.c:6808 +#: src/xenapi/xenapi_utils.c:391 src/xenapi/xenapi_utils.c:395 +#, c-format +msgid "%s" +msgstr "" + +#: src/lxc/lxc_driver.c:2791 src/lxc/lxc_driver.c:2974 +#: src/lxc/lxc_driver.c:3131 src/lxc/lxc_driver.c:3273 +#: src/qemu/qemu_driver.c:6027 src/qemu/qemu_driver.c:6239 +#: src/qemu/qemu_driver.c:6454 src/qemu/qemu_driver.c:6616 +#: src/qemu/qemu_driver.c:6920 src/qemu/qemu_driver.c:7174 +#, c-format +msgid "No such domain %s" +msgstr "没有域 %s" + +#: 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/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/lxc/lxc_driver.c:2843 src/qemu/qemu_driver.c:6972 +msgid "invalid type for cpu_shares tunable, expected a 'ullong'" +msgstr "" + +#: src/lxc/lxc_driver.c:2851 src/qemu/qemu_driver.c:6980 +msgid "unable to set cpu shares tunable" +msgstr "" + +#: src/lxc/lxc_driver.c:2864 src/qemu/qemu_driver.c:6993 +msgid "invalid type for vcpu_period tunable, expected a 'ullong'" +msgstr "" + +#: src/lxc/lxc_driver.c:2884 src/qemu/qemu_driver.c:7013 +msgid "invalid type for vcpu_quota tunable, expected a 'llong'" +msgstr "" + +#: src/lxc/lxc_driver.c:2903 src/qemu/qemu_driver.c:7032 +#, c-format +msgid "Invalid parameter `%s'" +msgstr "无效参数 `%s'" + +#: src/lxc/lxc_driver.c:2990 src/qemu/qemu_driver.c:7190 +msgid "cannot query persistent config of a transient domain" +msgstr "" + +#: src/lxc/lxc_driver.c:3000 src/qemu/qemu_driver.c:7200 +msgid "can't get persistentDef" +msgstr "" + +#: src/lxc/lxc_driver.c:3039 src/qemu/qemu_driver.c:7239 +msgid "unable to get cpu shares tunable" +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 "" + +#: 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 "" + +#: src/lxc/lxc_driver.c:3182 src/lxc/lxc_driver.c:3216 +#: src/qemu/qemu_driver.c:6078 src/qemu/qemu_driver.c:6155 +msgid "invalid type for blkio weight tunable, expected a 'unsigned int'" +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 "" + +#: src/lxc/lxc_driver.c:3197 src/qemu/qemu_driver.c:6093 +msgid "unable to set blkio weight tunable" +msgstr "" + +#: src/lxc/lxc_driver.c:3334 src/qemu/qemu_driver.c:6300 +msgid "unable to get blkio weight" +msgstr "" + +#: src/lxc/lxc_driver.c:3432 +#, c-format +msgid "Invalid path, '%s' is not a known interface" +msgstr "无效路径,'%s' 是已知接口" + +#: src/lxc/lxc_driver.c:3497 msgid "Cannot set autostart for transient domain" msgstr "无法为瞬时域设定自动启动" -#: src/lxc/lxc_driver.c:2142 +#: src/lxc/lxc_driver.c:3520 #, c-format msgid "Cannot create autostart directory %s" msgstr "无法生成自动启动目录 %s" -#: src/lxc/lxc_driver.c:2149 src/qemu/qemu_driver.c:5930 -#: src/uml/uml_driver.c:1752 +#: 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:2156 src/network/bridge_driver.c:1538 -#: src/qemu/qemu_driver.c:5937 src/storage/storage_driver.c:1036 -#: src/uml/uml_driver.c:1759 +#: 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:2293 +#: src/lxc/lxc_driver.c:3672 msgid "Suspend operation failed" msgstr "挂起操作失败" -#: src/lxc/lxc_driver.c:2358 +#: src/lxc/lxc_driver.c:3737 msgid "Resume operation failed" msgstr "恢复操作失败" -#: src/qemu/qemu_driver.c:2986 src/qemu/qemu_driver.c:3180 -#: src/qemu/qemu_driver.c:3236 src/qemu/qemu_driver.c:3295 -#: src/qemu/qemu_driver.c:3336 src/qemu/qemu_driver.c:3388 -#: src/qemu/qemu_driver.c:3415 src/qemu/qemu_driver.c:3440 -#: src/qemu/qemu_driver.c:3472 src/qemu/qemu_driver.c:3529 -#: src/qemu/qemu_driver.c:3661 src/qemu/qemu_driver.c:3826 -#: src/qemu/qemu_driver.c:3956 src/qemu/qemu_driver.c:4023 -#: src/qemu/qemu_driver.c:4088 src/qemu/qemu_driver.c:4172 -#: src/qemu/qemu_driver.c:4207 src/qemu/qemu_driver.c:4466 -#: src/qemu/qemu_driver.c:4701 src/qemu/qemu_driver.c:4907 -#: src/qemu/qemu_driver.c:5414 src/qemu/qemu_driver.c:5808 -#: src/qemu/qemu_driver.c:5873 src/qemu/qemu_driver.c:5900 -#: src/qemu/qemu_driver.c:6131 src/qemu/qemu_driver.c:6202 -#: src/qemu/qemu_driver.c:6260 src/qemu/qemu_driver.c:6299 -#: src/qemu/qemu_driver.c:6372 src/qemu/qemu_driver.c:7569 -#: src/uml/uml_driver.c:1402 src/uml/uml_driver.c:1427 -#: src/uml/uml_driver.c:1460 +#: 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/opennebula/one_driver.c:577 src/qemu/qemu_driver.c:3188 -#: src/qemu/qemu_driver.c:3245 src/qemu/qemu_driver.c:3304 -#: src/qemu/qemu_driver.c:3345 src/qemu/qemu_driver.c:3670 -#: src/qemu/qemu_driver.c:3835 src/qemu/qemu_driver.c:6140 -#: src/qemu/qemu_driver.c:6208 src/qemu/qemu_driver.c:6271 -#: src/qemu/qemu_driver.c:6387 src/qemu/qemu_driver.c:7578 -#: src/xen/xen_hypervisor.c:1097 src/xen/xen_hypervisor.c:1181 -#: src/xen/xen_hypervisor.c:1290 -msgid "domain is not running" -msgstr "域没有在运行" - -#: src/lxc/lxc_driver.c:3076 src/uml/uml_driver.c:2430 +#: src/lxc/lxc_driver.c:3808 src/uml/uml_driver.c:2416 #, c-format msgid "cannot find console device '%s'" msgstr "" -#: src/lxc/lxc_driver.c:3077 src/uml/uml_driver.c:2431 +#: src/lxc/lxc_driver.c:3809 src/uml/uml_driver.c:2417 msgid "default" msgstr "" -#: src/lxc/lxc_driver.c:3083 src/qemu/qemu_driver.c:10551 -#: src/uml/uml_driver.c:2437 src/xen/xen_driver.c:2152 +#: 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 "" -#: src/lxc/veth.c:231 -#, c-format -msgid "Failed to enable '%s'" -msgstr "" - -#: tools/virsh.c:354 +#: 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 "未知错误" @@ -6417,7 +6999,7 @@ msgid "machine type %s too big for destination" msgstr "" -#: src/qemu/qemu_driver.c:4308 +#: src/libxl/libxl_driver.c:245 msgid "cannot read domain image" msgstr "无法读取域映像" @@ -6425,21 +7007,21 @@ msgid "failed to read libxl header" msgstr "" -#: src/qemu/qemu_driver.c:4320 +#: src/libxl/libxl_driver.c:256 src/qemu/qemu_driver.c:3965 msgid "image magic is incorrect" msgstr "image magic 不正确" -#: src/qemu/qemu_driver.c:4326 +#: 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:269 src/qemu/qemu_driver.c:3999 +#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3998 #, c-format msgid "invalid XML length: %d" msgstr "" -#: src/qemu/qemu_driver.c:4338 +#: src/libxl/libxl_driver.c:279 src/qemu/qemu_driver.c:4009 msgid "failed to read XML" msgstr "读取 XML 失败" @@ -6453,7 +7035,7 @@ msgid "Failed to pin vcpu '%d' with libxenlight" msgstr "" -#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4381 +#: 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' " @@ -6484,24 +7066,24 @@ msgid "Failed to create log dir '%s': %s" msgstr "" -#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:509 +#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:512 #, c-format msgid "Failed to create state dir '%s': %s" msgstr "" -#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:515 +#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:518 #, c-format msgid "Failed to create lib dir '%s': %s" msgstr "" -#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:527 -#: src/qemu/qemu_driver.c:533 +#: 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 "" -#: src/qemu/qemu_driver.c:511 src/qemu/qemu_driver.c:543 -#: src/uml/uml_driver.c:859 +#: 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 失败" @@ -6514,7 +7096,7 @@ msgid "libxenlight state driver is not active" msgstr "" -#: src/xen/xen_driver.c:265 +#: src/libxl/libxl_driver.c:1101 src/xen/xen_driver.c:289 #, c-format msgid "unexpected Xen URI path '%s', try xen:///" msgstr "" @@ -6545,16 +7127,30 @@ msgid "Failed to destroy domain '%d'" msgstr "" -#: src/opennebula/one_driver.c:283 src/opennebula/one_driver.c:314 -#: src/opennebula/one_driver.c:389 src/openvz/openvz_driver.c:395 -#: src/openvz/openvz_driver.c:478 src/openvz/openvz_driver.c:522 -#: src/openvz/openvz_driver.c:559 src/openvz/openvz_driver.c:1015 -#: src/openvz/openvz_driver.c:1057 src/openvz/openvz_driver.c:1088 -#: src/openvz/openvz_driver.c:1161 src/uml/uml_driver.c:1374 -#: src/uml/uml_driver.c:1497 src/uml/uml_driver.c:1537 -#: src/uml/uml_driver.c:1587 src/uml/uml_driver.c:1652 -#: src/uml/uml_driver.c:1696 src/uml/uml_driver.c:1722 -#: src/uml/uml_driver.c:1796 +#: 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 匹配的域" @@ -6562,20 +7158,13 @@ msgid "cannot set memory on an inactive domain" msgstr "" -#: src/libxl/libxl_driver.c:1684 src/libxl/libxl_driver.c:2276 -#: src/qemu/qemu_driver.c:1841 src/qemu/qemu_driver.c:3322 -#: src/qemu/qemu_driver.c:3458 src/qemu/qemu_driver.c:5946 -#: src/qemu/qemu_driver.c:6093 src/qemu/qemu_driver.c:6225 -#: src/qemu/qemu_driver.c:6383 src/qemu/qemu_driver.c:6667 -msgid "cannot change persistent config of a transient domain" -msgstr "" - #: src/libxl/libxl_driver.c:1698 #, c-format msgid "Failed to set maximum memory for domain '%d' with libxenlight" msgstr "" -#: src/qemu/qemu_driver.c:3478 src/uml/uml_driver.c:1472 +#: 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 "无法将内存设置为高于最大内存" @@ -6617,8 +7206,8 @@ msgstr "" #: src/libxl/libxl_driver.c:1928 src/libxl/libxl_driver.c:1977 -#: src/test/test_driver.c:1742 src/test/test_driver.c:1855 -#: src/xen/xen_driver.c:1043 src/xen/xen_driver.c:1067 +#: 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 "" @@ -6637,13 +7226,13 @@ msgid "After dumping core, failed to resume domain '%d' with libxenlight" msgstr "" -#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2754 +#: 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:2250 src/libxl/libxl_driver.c:2397 -#: src/qemu/qemu_driver.c:3792 src/test/test_driver.c:2128 -#: src/test/test_driver.c:2184 src/xen/xen_driver.c:1109 +#: 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 "" @@ -6656,11 +7245,13 @@ msgid "cannot set vcpus on an inactive domain" msgstr "" -#: src/qemu/qemu_driver.c:3978 +#: 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/qemu/qemu_driver.c:3984 +#: 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" @@ -6671,12 +7262,12 @@ msgid "Failed to set vcpus for domain '%d' with libxenlight" msgstr "" -#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3806 -#: src/test/test_driver.c:2144 +#: 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/qemu/qemu_driver.c:4029 src/test/test_driver.c:2191 +#: src/libxl/libxl_driver.c:2446 src/test/test_driver.c:2378 msgid "cannot pin vcpus on an inactive domain" msgstr "无法在活跃的域中 pin vcpu" @@ -6689,8 +7280,9 @@ msgid "Failed to list vcpus for domain '%d' with libxenlight" msgstr "" -#: src/qemu/qemu_driver.c:4516 src/qemu/qemu_driver.c:4554 -#: src/xen/xen_driver.c:1182 src/xen/xen_driver.c:1221 +#: 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 "" @@ -6703,21 +7295,21 @@ msgid "parsing xm config failed" msgstr "" -#: src/opennebula/one_driver.c:289 src/qemu/qemu_driver.c:4919 -#: src/uml/uml_driver.c:1664 +#: 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:2819 src/qemu/qemu_driver.c:4998 +#: 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:2824 src/qemu/qemu_driver.c:5004 -#: tools/virsh.c:2033 +#: 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/qemu/qemu_driver.c:5016 +#: 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' 的设备" @@ -6732,12 +7324,15 @@ msgid "libxenlight failed to change media for disk '%s'" msgstr "" -#: src/qemu/qemu_driver.c:5087 src/qemu/qemu_driver.c:5123 +#: 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/qemu/qemu_driver.c:5130 +#: 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 "" @@ -6746,17 +7341,19 @@ msgid "libxenlight failed to attach disk '%s'" msgstr "" -#: src/qemu/qemu_driver.c:5482 +#: 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/qemu/qemu_driver.c:5490 +#: 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/qemu/qemu_driver.c:5549 +#: 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" @@ -6776,74 +7373,75 @@ msgid "device type '%s' cannot hot unplugged" msgstr "" -#: src/qemu/qemu_driver.c:5504 +#: 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/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5364 +#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5363 #, c-format msgid "target %s already exists." msgstr "" -#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5415 +#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5414 msgid "persistent attach of device is not supported" msgstr "" -#: src/libxl/libxl_driver.c:3099 src/qemu/qemu_driver.c:5215 -#: src/xen/xm_internal.c:1548 +#: src/libxl/libxl_driver.c:3099 src/xen/xm_internal.c:1547 #, c-format msgid "device type '%s' cannot be detached" msgstr "" -#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5435 +#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5434 #, c-format msgid "no target device %s" msgstr "" -#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5464 +#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5463 msgid "persistent detach of device is not supported" msgstr "" -#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5306 +#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5305 #, c-format msgid "disk bus '%s' cannot be updated." msgstr "" -#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5343 +#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5342 #, c-format msgid "device type '%s' cannot be updated" msgstr "" -#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5484 +#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5483 #, c-format msgid "target %s doesn't exist." msgstr "" -#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5491 +#: 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:3205 src/qemu/qemu_driver.c:5536 +#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5535 msgid "persistent update of device is not supported" msgstr "" -#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5600 +#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5599 msgid "cannot modify device on transient domain" msgstr "" #: src/libxl/libxl_driver.c:3290 src/libxl/libxl_driver.c:3314 -#: src/qemu/qemu_driver.c:5626 src/qemu/qemu_driver.c:5656 +#: src/qemu/qemu_driver.c:5625 src/qemu/qemu_driver.c:5655 #, c-format msgid "unknown domain modify action %d" msgstr "" -#: src/qemu/qemu_driver.c:5906 src/uml/uml_driver.c:1728 +#: 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/qemu/qemu_driver.c:5923 src/storage/storage_driver.c:1021 -#: src/uml/uml_driver.c:1745 +#: 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" @@ -6863,21 +7461,6 @@ msgid "Failed to get scheduler parameters for domain '%d' with libxenlight" msgstr "" -#: src/libxl/libxl_driver.c:3646 src/libxl/libxl_driver.c:3657 -#: src/qemu/qemu_driver.c:6117 src/qemu/qemu_driver.c:6140 -#: src/qemu/qemu_driver.c:6408 src/qemu/qemu_driver.c:6418 -#: src/qemu/qemu_driver.c:6428 src/qemu/qemu_driver.c:6462 -#: src/qemu/qemu_driver.c:6478 src/qemu/qemu_driver.c:6494 -#: src/qemu/qemu_driver.c:6988 src/qemu/qemu_driver.c:7002 -#: src/qemu/qemu_driver.c:7015 src/qemu/qemu_driver.c:7232 -#: src/qemu/qemu_driver.c:7246 src/qemu/qemu_driver.c:7260 -#: src/qemu/qemu_driver.c:7274 src/qemu/qemu_driver.c:7288 -#: src/qemu/qemu_driver.c:7302 src/qemu/qemu_driver.c:7316 -#: src/qemu/qemu_driver.c:7330 src/test/test_driver.c:2721 -#, c-format -msgid "Field name '%s' too long" -msgstr "" - #: src/libxl/libxl_driver.c:3738 msgid "invalid type for weight tunable, expected a 'uint'" msgstr "" @@ -6914,11 +7497,11 @@ msgid "libxenlight does not support transient disks" msgstr "" -#: src/qemu/qemu_driver.c:2395 +#: src/libxl/libxl_conf.c:693 src/qemu/qemu_process.c:2974 msgid "Unable to find an unused VNC port" msgstr "无法找到没有使用的 VNC 端口" -#: src/xen/xend_internal.c:5287 +#: src/libxl/libxl_conf.c:775 src/xenxs/xen_sxpr.c:1564 msgid "unexpected chr device type" msgstr "意外的字符设备类型" @@ -6930,302 +7513,266 @@ msgid "Failed to get version info from libxenlight" msgstr "" -#: src/network/bridge_driver.c:246 src/qemu/qemu_conf.c:1404 -#: src/uml/uml_conf.c:114 -msgid "cannot initialize bridge support" -msgstr "无法初始化桥接支持" - -#: src/network/bridge_driver.c:544 src/network/bridge_driver.c:550 +#: 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:775 +#: src/network/bridge_driver.c:765 #, c-format msgid "Cannot find %s - Possibly the package isn't installed" msgstr "" -#: src/network/bridge_driver.c:821 +#: src/network/bridge_driver.c:811 #, c-format msgid "bridge '%s' has an invalid prefix" msgstr "" -#: src/network/bridge_driver.c:857 +#: src/network/bridge_driver.c:847 #, c-format msgid "couldn't write radvd config file '%s'" msgstr "" -#: src/network/bridge_driver.c:907 src/network/bridge_driver.c:1081 +#: src/network/bridge_driver.c:897 src/network/bridge_driver.c:1071 #, c-format msgid "Invalid prefix or netmask for '%s'" msgstr "" -#: src/network/bridge_driver.c:603 +#: 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.c:614 +#: 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.c:969 +#: src/network/bridge_driver.c:959 #, c-format msgid "failed to add iptables rule to enable masquerading to %s" msgstr "" -#: src/network/bridge_driver.c:970 +#: src/network/bridge_driver.c:960 msgid "failed to add iptables rule to enable masquerading" msgstr "" -#: src/network/bridge_driver.c:983 +#: src/network/bridge_driver.c:973 #, c-format msgid "failed to add iptables rule to enable UDP masquerading to %s" msgstr "" -#: src/network/bridge_driver.c:984 +#: src/network/bridge_driver.c:974 msgid "failed to add iptables rule to enable UDP masquerading" msgstr "" -#: src/network/bridge_driver.c:997 +#: src/network/bridge_driver.c:987 #, c-format msgid "failed to add iptables rule to enable TCP masquerading to %s" msgstr "" -#: src/network/bridge_driver.c:998 +#: src/network/bridge_driver.c:988 msgid "failed to add iptables rule to enable TCP masquerading" msgstr "" -#: src/network/bridge_driver.c:656 +#: 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.c:667 +#: 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.c:1159 +#: src/network/bridge_driver.c:1149 #, c-format msgid "failed to add ip6tables rule to block outbound traffic from '%s'" msgstr "" -#: src/network/bridge_driver.c:1167 +#: src/network/bridge_driver.c:1157 #, c-format msgid "failed to add ip6tables rule to block inbound traffic to '%s'" msgstr "" -#: src/network/bridge_driver.c:1176 +#: src/network/bridge_driver.c:1166 #, c-format msgid "failed to add ip6tables rule to allow cross bridge traffic on '%s'" msgstr "" -#: src/network/bridge_driver.c:1185 src/network/bridge_driver.c:1193 +#: 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 "" -#: src/network/bridge_driver.c:693 src/network/bridge_driver.c:700 +#: 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 失败" -#: src/network/bridge_driver.c:708 src/network/bridge_driver.c:715 +#: 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.c:1295 +#: src/network/bridge_driver.c:1285 #, c-format msgid "failed to add iptables rule to allow TFTP requests from '%s'" msgstr "" -#: src/network/bridge_driver.c:725 +#: 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.c:732 +#: 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.c:740 +#: src/network/bridge_driver.c:1312 #, c-format msgid "failed to add iptables rule to allow cross bridge traffic on '%s'" msgstr "添加路由表规则允许从 '%s' 中的跨桥接流量失败" -#: src/network/bridge_driver.c:1533 +#: src/network/bridge_driver.c:1523 #, c-format msgid "cannot write to %s to disable IPv6 on bridge %s" msgstr "" -#: src/network/bridge_driver.c:871 +#: 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:1664 +#: src/network/bridge_driver.c:1654 #, c-format msgid "Network is already in use by interface %s" msgstr "" -#: src/network/bridge_driver.c:1686 +#: src/network/bridge_driver.c:1675 #, c-format msgid "bridge '%s' has an invalid netmask or IP address" msgstr "" -#: src/network/bridge_driver.c:1694 -#, c-format -msgid "cannot set IP address on bridge '%s'" -msgstr "" - -#: src/network/bridge_driver.c:906 -#, c-format -msgid "cannot create bridge '%s'" -msgstr "无法创建桥接 '%s'" - -#: src/network/bridge_driver.c:1739 -#, c-format -msgid "cannot create dummy tap device '%s' to set mac address on bridge '%s'" -msgstr "" - -#: src/network/bridge_driver.c:1751 -#, c-format -msgid "cannot set forward delay on bridge '%s'" -msgstr "" - -#: src/network/bridge_driver.c:1759 -#, c-format -msgid "cannot set STP '%s' on bridge '%s'" -msgstr "" - -#: src/network/bridge_driver.c:938 -#, c-format -msgid "failed to bring the bridge '%s' up" -msgstr "停止桥接 '%s' 失败" - -#: src/network/bridge_driver.c:949 +#: src/network/bridge_driver.c:1765 msgid "failed to enable IP forwarding" msgstr "启动 IP 转发失败" -#: src/network/bridge_driver.c:900 +#: src/network/bridge_driver.c:1914 msgid "network is already active" msgstr "网络已经激活" -#: src/network/bridge_driver.c:1058 src/network/bridge_driver.c:1327 -#: src/network/bridge_driver.c:1365 src/network/bridge_driver.c:1388 -#: src/network/bridge_driver.c:1423 src/network/bridge_driver.c:1478 -#: src/network/bridge_driver.c:1503 +#: 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:1081 +#: 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:2367 +#: src/network/bridge_driver.c:2289 msgid "" "Multiple dhcp sections found. dhcp is supported only for a single IPv4 " "address on each network" msgstr "" -#: src/network/bridge_driver.c:1333 +#: src/network/bridge_driver.c:2350 msgid "network is still active" msgstr "网络仍活跃" -#: src/network/bridge_driver.c:1394 +#: src/network/bridge_driver.c:2460 msgid "network is not active" msgstr "网络接口 %s 未激活" -#: src/network/bridge_driver.c:1446 +#: src/network/bridge_driver.c:2516 msgid "no network with matching id" msgstr "没有带匹配 id 的网络" -#: src/network/bridge_driver.c:1452 src/test/test_driver.c:3061 +#: 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:1509 +#: src/network/bridge_driver.c:2579 msgid "cannot set autostart for transient network" msgstr "无法为瞬时域设定自动启动" -#: src/network/bridge_driver.c:1524 +#: src/network/bridge_driver.c:2594 #, c-format msgid "cannot create autostart directory '%s'" msgstr "无法生成自动启动目录 '%s'" -#: src/network/bridge_driver.c:1531 src/storage/storage_driver.c:1028 +#: 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:2887 src/network/bridge_driver.c:3000 -#: src/network/bridge_driver.c:3101 +#: 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 "" -#: src/network/bridge_driver.c:2925 +#: src/network/bridge_driver.c:2860 #, c-format msgid "" "network '%s' requires exclusive access to interfaces, but none are available" msgstr "" -#: src/network/bridge_driver.c:2993 src/network/bridge_driver.c:3094 +#: 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 "" -#: src/network/bridge_driver.c:3018 src/network/bridge_driver.c:3117 +#: 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 "" -#: src/network/bridge_driver.c:3034 +#: src/network/bridge_driver.c:2969 #, c-format msgid "network '%s' claims dev='%s' is already in use by a different domain" msgstr "" -#: src/network/bridge_driver.c:3187 +#: src/network/bridge_driver.c:3122 #, c-format msgid "network '%s' doesn't have an IPv4 address" msgstr "" -#: src/network/bridge_driver.c:3209 +#: src/network/bridge_driver.c:3144 #, c-format msgid "network '%s' has no associated interface or bridge" msgstr "" -#: src/network/bridge_driver.c:3218 -#, c-format -msgid "Failed to get IP address for '%s' (network '%s')" -msgstr "" - -#: src/node_device/node_device_driver.c:101 +#: 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:280 -#: src/node_device/node_device_driver.c:309 -#: src/node_device/node_device_driver.c:344 -#: src/node_device/node_device_driver.c:375 src/test/test_driver.c:4811 -#: src/test/test_driver.c:4837 src/test/test_driver.c:4873 -#: src/test/test_driver.c:4904 +#: 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:320 src/test/test_driver.c:4848 +#: 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:421 +#: src/node_device/node_device_driver.c:418 #, c-format msgid "Invalid vport operation (%d)" msgstr "无效的 vport 操作 (%d)" @@ -7235,16 +7782,16 @@ msgid "No vport operation path found for host%d" msgstr "" -#: src/node_device/node_device_driver.c:452 +#: 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/node_device/node_device_driver.c:461 +#: src/node_device/node_device_driver.c:478 msgid "Vport operation complete" msgstr "Vport 操作完成" -#: src/node_device/node_device_driver.c:474 +#: src/node_device/node_device_driver.c:491 msgid "Could not get current time" msgstr "无法获得当前时间" @@ -7276,13 +7823,13 @@ msgid "libhal_get_all_devices failed" msgstr "" -#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:879 -#: src/qemu/qemu_migration.c:902 src/qemu/qemu_migration.c:908 +#: 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 "" -#: src/node_device/node_device_linux_sysfs.c:57 +#: src/node_device/node_device_linux_sysfs.c:59 #, c-format msgid "Failed to open WWN path '%s' for reading" msgstr "打开用来读取的 WWN 路径 '%s' 失败" @@ -7297,6 +7844,11 @@ msgid "Failed to read WWNN for host%d" msgstr "为主机 %d 读取 WWNN 失败" +#: src/node_device/node_device_linux_sysfs.c:155 +#, c-format +msgid "Failed to read fabric WWN for host%d" +msgstr "" + #: src/node_device/node_device_udev.c:64 #, c-format msgid "Failed to convert '%s' to unsigned long long" @@ -7391,8 +7943,9 @@ msgid "udev_monitor_new_from_netlink returned NULL" msgstr "" -#: src/nodeinfo.c:159 src/uml/uml_driver.c:1821 src/util/pci.c:1082 -#: src/util/util.c:353 +#: 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" @@ -7407,11 +7960,11 @@ msgid "could not convert '%s' to an integer" msgstr "" -#: src/nodeinfo.c:82 +#: src/nodeinfo.c:230 msgid "parsing cpuinfo processor" msgstr "正在解析 cpuinfo 处理器" -#: src/nodeinfo.c:94 +#: src/nodeinfo.c:245 src/nodeinfo.c:277 msgid "parsing cpuinfo cpu MHz" msgstr "正在解析 cpuinfo cpu MHz" @@ -7425,7 +7978,7 @@ msgid "parsing number of processors %c" msgstr "" -#: src/nodeinfo.c:121 +#: src/nodeinfo.c:314 msgid "no cpus found" msgstr "没有找到 cpus" @@ -7447,7 +8000,8 @@ msgid "no threads found" msgstr "" -#: src/lxc/lxc_driver.c:1975 src/qemu/qemu_driver.c:6066 +#: src/nodeinfo.c:417 src/xen/xen_hypervisor.c:1270 +#: src/xen/xend_internal.c:3609 msgid "Invalid parameter count" msgstr "无效参数计数" @@ -7475,7 +8029,7 @@ msgid "no available memory line found" msgstr "" -#: src/nodeinfo.c:175 +#: src/nodeinfo.c:633 msgid "node info not implemented on this platform" msgstr "这个平台中没有使用节点" @@ -7483,7 +8037,7 @@ msgid "node CPU stats not implemented on this platform" msgstr "" -#: src/nodeinfo.c:257 src/nodeinfo.c:294 +#: src/nodeinfo.c:692 src/nodeinfo.c:822 src/nodeinfo.c:860 msgid "NUMA not supported on this host" msgstr "在这台主机中不支持 NUMA" @@ -7495,7 +8049,7 @@ msgid "node memory stats not implemented on this platform" msgstr "" -#: src/nodeinfo.c:263 +#: src/nodeinfo.c:828 #, c-format msgid "start cell %d out of range (0-%d)" msgstr "启动单元 %d 溢出(0 - %d)" @@ -7505,11 +8059,11 @@ msgid "Failed to query NUMA free memory for node: %d" msgstr "" -#: src/nodeinfo.c:275 src/nodeinfo.c:302 +#: src/nodeinfo.c:868 msgid "Failed to query NUMA free memory" msgstr "查询 NUMA 可用内存失败" -#: src/nodeinfo.c:323 src/nodeinfo.c:330 +#: src/nodeinfo.c:889 src/nodeinfo.c:896 msgid "NUMA memory information not available on this platform" msgstr "NUMA 内存信息在这个平台中不可用" @@ -7527,137 +8081,129 @@ msgid "nwfilter is in use" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:163 -#, c-format -msgid "cannot find value for '%s'" -msgstr "" - -#: src/nwfilter/nwfilter_ebiptables_driver.c:170 +#: src/nwfilter/nwfilter_ebiptables_driver.c:241 #, c-format msgid "Buffer to small to print MAC address '%s' into" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:204 +#: src/nwfilter/nwfilter_ebiptables_driver.c:275 msgid "buffer too small for IP address" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:218 +#: src/nwfilter/nwfilter_ebiptables_driver.c:289 msgid "buffer too small for IPv6 address" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:229 +#: src/nwfilter/nwfilter_ebiptables_driver.c:300 msgid "Buffer too small for MAC address" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:241 -#: src/nwfilter/nwfilter_ebiptables_driver.c:261 +#: src/nwfilter/nwfilter_ebiptables_driver.c:312 +#: src/nwfilter/nwfilter_ebiptables_driver.c:342 msgid "Buffer too small for uint8 type" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:251 +#: src/nwfilter/nwfilter_ebiptables_driver.c:322 +msgid "Buffer too small for uint32 type" +msgstr "" + +#: src/nwfilter/nwfilter_ebiptables_driver.c:332 msgid "Buffer too small for uint16 type" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:268 +#: src/nwfilter/nwfilter_ebiptables_driver.c:349 #, c-format msgid "Unhandled datatype %x" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:1172 +#: src/nwfilter/nwfilter_ebiptables_driver.c:1224 #, c-format msgid "cannot create rule since %s tool is missing." msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:1897 +#: src/nwfilter/nwfilter_ebiptables_driver.c:1942 msgid "cannot create rule since ebtables tool is missing." msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:2448 -msgid "illegal protocol type" -msgstr "" - -#: src/nwfilter/nwfilter_ebiptables_driver.c:2513 -msgid "cannot create temporary file" -msgstr "" - -#: src/nwfilter/nwfilter_ebiptables_driver.c:2520 -msgid "cannot change permissions on temp. file" +#: src/nwfilter/nwfilter_ebiptables_driver.c:2043 +#, c-format +msgid "" +"STP filtering in %s direction with source MAC address set is not supported" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:2529 -#: src/nwfilter/nwfilter_ebiptables_driver.c:2538 -msgid "cannot write string to file" +#: src/nwfilter/nwfilter_ebiptables_driver.c:2598 +msgid "illegal protocol type" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:2994 -#: src/nwfilter/nwfilter_ebiptables_driver.c:3086 -#: src/nwfilter/nwfilter_ebiptables_driver.c:3197 +#: 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 "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:3052 -#: src/nwfilter/nwfilter_ebiptables_driver.c:3170 -#: src/nwfilter/nwfilter_ebiptables_driver.c:3241 +#: 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:3310 +#: src/nwfilter/nwfilter_ebiptables_driver.c:3474 #, c-format msgid "To enable ip%stables filtering for the VM do 'echo 1 > %s'" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:3514 +#: src/nwfilter/nwfilter_ebiptables_driver.c:3796 #, c-format -msgid "Some rules could not be created for interface %s." +msgid "Some rules could not be created for interface %s%s%s" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:3634 +#: src/nwfilter/nwfilter_ebiptables_driver.c:3936 msgid "error while executing CLI commands" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:3769 +#: src/nwfilter/nwfilter_ebiptables_driver.c:4077 msgid "essential tools to support ip(6)tables firewalls could not be located" msgstr "" -#: src/nwfilter/nwfilter_ebiptables_driver.c:3778 +#: src/nwfilter/nwfilter_ebiptables_driver.c:4086 msgid "firewall tools were not found or cannot be used" msgstr "" -#: src/nwfilter/nwfilter_gentech_driver.c:155 +#: src/nwfilter/nwfilter_gentech_driver.c:160 msgid "Could not add variable 'MAC' to hashmap" msgstr "" -#: src/nwfilter/nwfilter_gentech_driver.c:165 +#: src/nwfilter/nwfilter_gentech_driver.c:174 msgid "Could not add variable 'IP' to hashmap" msgstr "" -#: src/nwfilter/nwfilter_gentech_driver.c:422 -#: src/nwfilter/nwfilter_gentech_driver.c:513 -#: src/nwfilter/nwfilter_gentech_driver.c:805 +#: 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 "" -#: src/nwfilter/nwfilter_gentech_driver.c:471 -#: src/nwfilter/nwfilter_gentech_driver.c:557 +#: src/nwfilter/nwfilter_gentech_driver.c:474 +#: src/nwfilter/nwfilter_gentech_driver.c:566 #, c-format msgid "referenced filter '%s' is missing" msgstr "" -#: src/nwfilter/nwfilter_gentech_driver.c:744 +#: src/nwfilter/nwfilter_gentech_driver.c:750 #, c-format msgid "Cannot instantiate filter due to unresolvable variables: %s" msgstr "" -#: src/nwfilter/nwfilter_gentech_driver.c:787 -#: src/nwfilter/nwfilter_gentech_driver.c:1017 -#: src/nwfilter/nwfilter_gentech_driver.c:1043 -#: src/nwfilter/nwfilter_gentech_driver.c:1067 +#: 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 "" -#: src/nwfilter/nwfilter_gentech_driver.c:798 +#: src/nwfilter/nwfilter_gentech_driver.c:803 #, c-format msgid "Could not find filter '%s'" msgstr "" @@ -7671,34 +8217,39 @@ msgid "interface name %s does not fit into buffer " msgstr "" -#: src/nwfilter/nwfilter_learnipaddr.c:651 +#: src/nwfilter/nwfilter_learnipaddr.c:706 +#, c-format +msgid "Failed to add IP address %s to IP address cache for interface %s" +msgstr "" + +#: src/nwfilter/nwfilter_learnipaddr.c:724 #, c-format msgid "encountered an error on interface %s index %d" msgstr "" -#: src/nwfilter/nwfilter_learnipaddr.c:715 +#: 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" msgstr "" -#: src/nwfilter/nwfilter_learnipaddr.c:743 +#: src/nwfilter/nwfilter_learnipaddr.c:816 #, c-format msgid "Destination buffer for ifname ('%s') not large enough" msgstr "" -#: src/nwfilter/nwfilter_learnipaddr.c:751 +#: src/nwfilter/nwfilter_learnipaddr.c:824 #, c-format msgid "Destination buffer for linkdev ('%s') not large enough" msgstr "" -#: src/nwfilter/nwfilter_learnipaddr.c:803 +#: src/nwfilter/nwfilter_learnipaddr.c:876 msgid "" "IP parameter must be given since libvirt was not compiled with IP address " "learning support" msgstr "" -#: src/openvz/openvz_conf.c:131 +#: src/openvz/openvz_conf.c:124 msgid "Could not extract vzctl version" msgstr "无法提取 vzctl 版本" @@ -7743,25 +8294,26 @@ msgid "Wrong MAC address" msgstr "错误 MAC 地址" -#: src/openvz/openvz_conf.c:371 +#: 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:385 +#: src/openvz/openvz_conf.c:387 #, c-format msgid "Could not read 'VE_PRIVATE' from config for container %d" msgstr "无法为容器 %d 在 config 中读取 'VE_PRIVATE'" -#: src/openvz/openvz_conf.c:456 src/openvz/openvz_driver.c:154 +#: 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:494 +#: src/openvz/openvz_conf.c:511 msgid "UUID in config file malformed" msgstr "配置文件中的 UUID 很奇怪" -#: src/openvz/openvz_conf.c:506 +#: src/openvz/openvz_conf.c:523 #, c-format msgid "Could not read config for container %d" msgstr "无法为容器 %d 在 config 中读取" @@ -7775,143 +8327,145 @@ msgid "Failed to scan configuration directory" msgstr "" -#: src/openvz/openvz_driver.c:119 +#: src/openvz/openvz_driver.c:110 msgid "Container is not defined" msgstr "没有定义容器" -#: src/openvz/openvz_driver.c:192 src/openvz/openvz_driver.c:745 +#: src/openvz/openvz_driver.c:155 src/openvz/openvz_driver.c:849 #, c-format msgid "Could not put argument to %s" msgstr "无法将参数设为 %s" -#: src/openvz/openvz_driver.c:215 +#: src/openvz/openvz_driver.c:173 msgid "only one filesystem supported" msgstr "只支持一个文件系统" -#: src/openvz/openvz_driver.c:224 +#: src/openvz/openvz_driver.c:182 msgid "filesystem is not of type 'template' or 'mount'" msgstr "filesyste 不是 'template' 或者 'mount' 类型" -#: src/openvz/openvz_driver.c:235 +#: src/openvz/openvz_driver.c:193 msgid "Could not convert domain name to VEID" msgstr "无法将域名转换为域 VEID" -#: src/openvz/openvz_driver.c:241 +#: src/openvz/openvz_driver.c:199 msgid "Could not copy default config" msgstr "无法复制默认 config" -#: src/openvz/openvz_driver.c:247 +#: src/openvz/openvz_driver.c:205 msgid "Could not set the source dir for the filesystem" msgstr "无法为文件系统设置源目录" -#: src/openvz/openvz_driver.c:255 +#: src/openvz/openvz_driver.c:212 msgid "Error creating command for container" msgstr "为容器生成命令出错" -#: src/openvz/openvz_driver.c:406 +#: src/openvz/openvz_driver.c:364 #, c-format msgid "cannot read cputime for domain %d" msgstr "无法为域 %d 读取 cputime" -#: src/openvz/openvz_driver.c:529 src/openvz/openvz_driver.c:566 +#: 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:646 +#: src/openvz/openvz_driver.c:749 msgid "Container ID is not specified" msgstr "没有指定容器 ID" -#: src/openvz/openvz_driver.c:679 +#: src/openvz/openvz_driver.c:785 msgid "Could not generate eth name for container" msgstr "无法为容器生成 eth 名称" -#: src/openvz/openvz_driver.c:690 +#: src/openvz/openvz_driver.c:797 msgid "Could not generate veth name" msgstr "无法生成 veth 名称" -#: src/openvz/openvz_driver.c:774 +#: src/openvz/openvz_driver.c:878 msgid "Could not configure network" msgstr "无法配置网络" -#: src/openvz/openvz_driver.c:785 +#: src/openvz/openvz_driver.c:889 msgid "cannot replace NETIF config" msgstr "无法替换 NETIF 配置" -#: src/openvz/openvz_driver.c:823 +#: 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:835 src/openvz/openvz_driver.c:917 +#: src/openvz/openvz_driver.c:932 src/openvz/openvz_driver.c:1014 msgid "Error creating initial configuration" msgstr "生成初始配置时出错" -#: src/openvz/openvz_driver.c:843 src/openvz/openvz_driver.c:923 +#: src/openvz/openvz_driver.c:940 src/openvz/openvz_driver.c:1020 msgid "Could not set UUID" msgstr "无法设置 UUID" -#: src/openvz/openvz_driver.c:951 src/vbox/vbox_tmpl.c:5049 +#: src/openvz/openvz_driver.c:949 src/vbox/vbox_tmpl.c:5054 msgid "current vcpu count must equal maximum" msgstr "" -#: src/openvz/openvz_driver.c:853 src/openvz/openvz_driver.c:945 +#: src/openvz/openvz_driver.c:955 src/openvz/openvz_driver.c:1040 msgid "Could not set number of virtual cpu" msgstr "无法设置虚拟 CPU 数" -#: src/openvz/openvz_driver.c:861 +#: src/openvz/openvz_driver.c:963 msgid "Could not set memory size" msgstr "无法设定内存大小" -#: src/openvz/openvz_driver.c:903 +#: 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:976 +#: src/openvz/openvz_driver.c:1074 msgid "no domain with matching id" msgstr "没有匹配 id 的域" -#: src/openvz/openvz_driver.c:982 +#: 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:1094 +#: src/openvz/openvz_driver.c:1211 msgid "Could not read container config" msgstr "无法读取容器配置" -#: src/openvz/openvz_driver.c:1115 src/qemu/qemu_driver.c:2846 +#: 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:1246 src/openvz/openvz_driver.c:1290 +#: src/openvz/openvz_driver.c:1244 src/openvz/openvz_driver.c:1288 #, c-format msgid "unsupported flags (0x%x)" msgstr "" -#: src/openvz/openvz_driver.c:1167 +#: src/openvz/openvz_driver.c:1304 msgid "VCPUs should be >= 1" msgstr "VCPUs 应该 >= 1" -#: src/openvz/openvz_driver.c:1212 +#: 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:1219 +#: src/openvz/openvz_driver.c:1364 msgid "OpenVZ control file /proc/vz does not exist" msgstr "OpenVZ 控制的文件 /proc/vz 不存在" -#: src/openvz/openvz_driver.c:1225 +#: src/openvz/openvz_driver.c:1370 msgid "OpenVZ control file /proc/vz is not accessible" msgstr "OpenVZ 控制的文件 /proc/vz 无法访问" -#: src/openvz/openvz_driver.c:1317 src/openvz/openvz_driver.c:1363 +#: 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:1472 src/openvz/openvz_driver.c:1531 +#: src/openvz/openvz_driver.c:1476 src/openvz/openvz_driver.c:1535 msgid "failed to close file" msgstr "" @@ -7938,179 +8492,179 @@ msgid "Unable to determine number of domains." msgstr "" -#: src/phyp/phyp_driver.c:347 +#: src/phyp/phyp_driver.c:1005 src/phyp/phyp_driver.c:1086 msgid "No authentication callback provided." msgstr "没有验证提供的回叫。" -#: src/phyp/phyp_driver.c:280 +#: src/phyp/phyp_driver.c:1026 #, c-format msgid "Error while getting %s address info" msgstr "获取 %s 地址信息时出错" -#: src/phyp/phyp_driver.c:297 +#: src/phyp/phyp_driver.c:1043 #, c-format msgid "Failed to connect to %s" msgstr "连接到 %s 失败" -#: src/phyp/phyp_driver.c:317 +#: src/phyp/phyp_driver.c:1063 msgid "Failure establishing SSH session." msgstr "建立 SSH 会话失败" -#: src/phyp/phyp_driver.c:386 +#: src/phyp/phyp_driver.c:1105 msgid "Authentication failed" msgstr "验证失败" -#: src/phyp/phyp_driver.c:94 +#: src/phyp/phyp_driver.c:1160 msgid "Missing server name in phyp:// URI" msgstr "在 phyp:// URI 缺少服务器名" -#: src/phyp/phyp_driver.c:153 +#: src/phyp/phyp_driver.c:1202 msgid "Error parsing 'path'. Invalid characters." msgstr "解析 'path' 出错。无效字符。" -#: src/phyp/phyp_driver.c:159 +#: src/phyp/phyp_driver.c:1209 msgid "Error while opening SSH session." msgstr "打开 SSH 会话时出错。" -#: src/phyp/phyp_driver.c:1573 src/phyp/phyp_driver.c:1618 -#: src/phyp/phyp_driver.c:1796 +#: 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 "" -#: src/phyp/phyp_driver.c:1613 src/phyp/phyp_driver.c:1761 +#: src/phyp/phyp_driver.c:1630 src/phyp/phyp_driver.c:1778 msgid "Unable to get VIOS name" msgstr "" -#: src/phyp/phyp_driver.c:1623 +#: src/phyp/phyp_driver.c:1640 msgid "Unable to get free slot number" msgstr "" -#: src/phyp/phyp_driver.c:1771 src/phyp/phyp_driver.c:1775 +#: 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:1855 +#: 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 "" -#: src/phyp/phyp_driver.c:1986 +#: src/phyp/phyp_driver.c:2003 #, c-format msgid "Unable to create Volume: %s" msgstr "" -#: src/phyp/phyp_driver.c:2037 src/phyp/phyp_driver.c:2290 -#: src/phyp/phyp_driver.c:2739 +#: 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:2042 src/phyp/phyp_driver.c:2744 +#: src/phyp/phyp_driver.c:2059 src/phyp/phyp_driver.c:2761 msgid "Unable to determine storage pool's uuid." msgstr "" -#: src/phyp/phyp_driver.c:2048 src/phyp/phyp_driver.c:2750 +#: 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:2061 src/phyp/phyp_driver.c:2763 +#: 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:2066 +#: src/phyp/phyp_driver.c:2083 msgid "Error parsing volume XML." msgstr "" -#: src/phyp/phyp_driver.c:2072 +#: src/phyp/phyp_driver.c:2089 msgid "StoragePool name already exists." msgstr "" -#: src/phyp/phyp_driver.c:2080 +#: src/phyp/phyp_driver.c:2097 msgid "Key must be empty, Power Hypervisor will create one for you." msgstr "" -#: src/phyp/phyp_driver.c:2085 +#: src/phyp/phyp_driver.c:2102 msgid "Capacity cannot be empty." msgstr "" -#: src/phyp/phyp_driver.c:2261 +#: src/phyp/phyp_driver.c:2278 msgid "Unable to determine storage sp's name." msgstr "" -#: src/phyp/phyp_driver.c:2266 +#: src/phyp/phyp_driver.c:2283 msgid "Unable to determine storage sp's uuid." msgstr "" -#: src/phyp/phyp_driver.c:2271 +#: src/phyp/phyp_driver.c:2288 msgid "Unable to determine storage sps's size." msgstr "" -#: src/phyp/phyp_driver.c:2283 +#: src/phyp/phyp_driver.c:2300 msgid "Unable to determine storage sps's source adapter." msgstr "" -#: src/phyp/phyp_driver.c:2490 +#: src/phyp/phyp_driver.c:2507 #, c-format msgid "Unable to destroy Storage Pool: %s" msgstr "" -#: src/phyp/phyp_driver.c:2529 +#: src/phyp/phyp_driver.c:2546 #, c-format msgid "Unable to create Storage Pool: %s" msgstr "" -#: src/phyp/phyp_driver.c:3340 +#: src/phyp/phyp_driver.c:3357 msgid "Unable to determine domain's name." msgstr "" -#: src/phyp/phyp_driver.c:3345 +#: src/phyp/phyp_driver.c:3362 msgid "Unable to generate random uuid." msgstr "" -#: src/phyp/phyp_driver.c:3351 +#: src/phyp/phyp_driver.c:3368 msgid "Unable to determine domain's max memory." msgstr "" -#: src/phyp/phyp_driver.c:3357 +#: src/phyp/phyp_driver.c:3374 msgid "Unable to determine domain's memory." msgstr "" -#: src/phyp/phyp_driver.c:3363 +#: src/phyp/phyp_driver.c:3380 msgid "Unable to determine domain's CPU." msgstr "" -#: src/phyp/phyp_driver.c:3566 +#: src/phyp/phyp_driver.c:3583 msgid "" "Field on the domain XML file is missing or has invalid value." msgstr "" -#: src/phyp/phyp_driver.c:3573 +#: src/phyp/phyp_driver.c:3590 msgid "" "Field on the domain XML file is missing or has invalid value." msgstr "" -#: src/phyp/phyp_driver.c:3580 +#: src/phyp/phyp_driver.c:3597 msgid "Domain XML must contain at least one element." msgstr "" -#: src/phyp/phyp_driver.c:3586 +#: src/phyp/phyp_driver.c:3603 msgid "Field under on the domain XML file is missing." msgstr "" -#: src/phyp/phyp_driver.c:3602 +#: src/phyp/phyp_driver.c:3619 #, c-format msgid "Unable to create LPAR. Reason: '%s'" msgstr "" -#: src/phyp/phyp_driver.c:3607 +#: src/phyp/phyp_driver.c:3624 msgid "Unable to add LPAR to the table" msgstr "" -#: src/phyp/phyp_driver.c:3711 +#: src/phyp/phyp_driver.c:3728 msgid "You are trying to set a number of CPUs bigger than the max possible." msgstr "" -#: src/phyp/phyp_driver.c:3735 +#: 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." @@ -8126,23 +8680,23 @@ msgid "cannot filter mac addresses on bridge '%s'" msgstr "" -#: src/qemu/qemu_bridge_filter.c:80 src/qemu/qemu_bridge_filter.c:102 +#: 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 "" -#: src/qemu/qemu_conf.c:1355 src/qemu/qemu_driver.c:2419 -#: src/qemu/qemu_driver.c:4604 +#: 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:1193 +#: src/qemu/qemu_capabilities.c:1202 #, c-format msgid "cannot parse %s version number in '%s'" msgstr "" -#: src/qemu/qemu_capabilities.c:1398 +#: src/qemu/qemu_capabilities.c:1407 #, c-format msgid "Cannot find suitable emulator for %s" msgstr "" @@ -8157,7 +8711,7 @@ msgid "Unable to deny access for disk path %s" msgstr "" -#: src/qemu/qemu_driver.c:1956 +#: src/qemu/qemu_cgroup.c:164 src/qemu/qemu_migration.c:2873 #, c-format msgid "Unable to allow device %s for %s" msgstr "" @@ -8167,25 +8721,25 @@ msgid "Unable to allow device %s" msgstr "" -#: src/qemu/qemu_driver.c:1929 +#: src/qemu/qemu_cgroup.c:211 #, c-format msgid "Unable to create cgroup for %s" msgstr "" -#: src/qemu/qemu_driver.c:1943 +#: src/qemu/qemu_cgroup.c:227 #, c-format msgid "Unable to deny all devices for %s" msgstr "" -#: src/qemu/qemu_driver.c:1965 +#: src/qemu/qemu_cgroup.c:242 msgid "unable to allow /dev/pts/ devices" msgstr "" -#: src/qemu/qemu_driver.c:1973 +#: src/qemu/qemu_cgroup.c:257 msgid "unable to allow /dev/snd/ devices" msgstr "" -#: src/qemu/qemu_driver.c:1984 src/qemu/qemu_driver.c:5450 +#: src/qemu/qemu_cgroup.c:269 #, c-format msgid "unable to allow device %s" msgstr "" @@ -8195,860 +8749,827 @@ msgid "Unable to set io weight for domain %s" msgstr "" -#: src/qemu/qemu_cgroup.c:311 +#: src/qemu/qemu_cgroup.c:311 src/qemu/qemu_cgroup.c:334 msgid "Block I/O tuning is not available on this host" msgstr "" -#: src/qemu/qemu_cgroup.c:349 -msgid "Memory cgroup is not available on this host" -msgstr "" - -#: src/qemu/qemu_cgroup.c:358 +#: src/qemu/qemu_cgroup.c:326 #, c-format -msgid "Unable to set io cpu shares for domain %s" -msgstr "" - -#: src/qemu/qemu_cgroup.c:364 -msgid "CPU tuning is not available on this host" -msgstr "" - -#: src/qemu/qemu_cgroup.c:394 -msgid "Unable to get cpu bandwidth period" -msgstr "" - -#: src/qemu/qemu_cgroup.c:401 -msgid "Unable to set cpu bandwidth period" +msgid "Unable to set io device weight for domain %s" msgstr "" -#: src/qemu/qemu_cgroup.c:410 -msgid "Unable to set cpu bandwidth quota" +#: src/qemu/qemu_cgroup.c:373 +msgid "Memory cgroup is not available on this host" msgstr "" -#: src/qemu/qemu_cgroup.c:422 src/qemu/qemu_cgroup.c:457 -#: src/qemu/qemu_driver.c:6539 src/xenapi/xenapi_utils.c:391 -#: src/xenapi/xenapi_utils.c:395 -#, c-format -msgid "%s" +#: src/qemu/qemu_cgroup.c:388 +msgid "CPU tuning is not available on this host" msgstr "" -#: src/qemu/qemu_cgroup.c:446 src/qemu/qemu_cgroup.c:537 -#: src/qemu/qemu_driver.c:5068 src/qemu/qemu_driver.c:5289 +#: src/qemu/qemu_cgroup.c:470 src/qemu/qemu_cgroup.c:561 +#: src/qemu/qemu_driver.c:5067 src/qemu/qemu_driver.c:5288 #: src/qemu/qemu_hotplug.c:1047 src/qemu/qemu_hotplug.c:1521 -#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2860 +#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2861 #, c-format msgid "Unable to find cgroup for %s" msgstr "" -#: src/qemu/qemu_cgroup.c:483 +#: src/qemu/qemu_cgroup.c:507 #, c-format msgid "Unable to create vcpu cgroup for %s(vcpu: %d)" msgstr "" -#: src/qemu/qemu_cgroup.c:493 +#: src/qemu/qemu_cgroup.c:517 #, c-format msgid "unable to add vcpu %d task %d to cgroup" msgstr "" -#: src/qemu/qemu_driver.c:2042 +#: src/qemu/qemu_cgroup.c:584 #, c-format msgid "unable to find cgroup for domain %s" msgstr "" -#: src/qemu/qemu_driver.c:2050 +#: src/qemu/qemu_cgroup.c:592 #, c-format msgid "unable to add domain %s task %d to cgroup" msgstr "" -#: src/qemu/qemu_conf.c:1448 -#, c-format -msgid "failed to add ebtables rule to allow MAC address on '%s'" -msgstr "" - -#: src/qemu/qemu_command.c:197 -msgid "No support for macvtap device" -msgstr "" - -#: src/qemu/qemu_command.c:233 +#: src/qemu/qemu_command.c:200 #, c-format msgid "Network '%s' is not active." msgstr "" -#: src/qemu/qemu_conf.c:1398 +#: src/qemu/qemu_command.c:226 #, c-format msgid "Network type %d is not supported" msgstr "不支持网络类型 %d" -#: src/qemu/qemu_conf.c:1429 src/uml/uml_conf.c:133 -#, c-format -msgid "Failed to add tap interface to bridge. %s is not a bridge device" -msgstr "在桥接中添加 tap 接口失败。%s 不是桥接设备" - -#: src/qemu/qemu_command.c:300 src/uml/uml_conf.c:161 -msgid "" -"Failed to add tap interface to bridge. Your kernel is missing the 'tun' " -"module or CONFIG_TUN, or you need to add the /dev/net/tun device node." -msgstr "" - -#: src/qemu/qemu_conf.c:1433 src/uml/uml_conf.c:137 -#, c-format -msgid "Failed to add tap interface to bridge '%s'" -msgstr "" - -#: src/qemu/qemu_conf.c:1437 src/uml/uml_conf.c:141 +#: src/qemu/qemu_command.c:261 #, c-format -msgid "Failed to add tap interface '%s' to bridge '%s'" +msgid "failed to add ebtables rule to allow MAC address on '%s'" msgstr "" -#: src/qemu/qemu_command.c:372 +#: src/qemu/qemu_command.c:312 msgid "vhost-net is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:383 +#: src/qemu/qemu_command.c:323 msgid "vhost-net is only supported for virtio network interfaces" msgstr "" -#: src/qemu/qemu_command.c:399 +#: src/qemu/qemu_command.c:339 msgid "vhost-net was requested for an interface, but is unavailable" msgstr "" -#: src/qemu/qemu_driver.c:4954 +#: src/qemu/qemu_command.c:420 #, c-format msgid "cannot convert disk '%s' to bus/device index" msgstr "无法将磁盘 '%s' 转换为总线/设备索引" -#: src/qemu/qemu_driver.c:4980 +#: src/qemu/qemu_command.c:449 #, c-format msgid "Unsupported disk name mapping for bus '%s'" msgstr "不支持总线 '%s' 的磁盘名称映射" -#: src/qemu/qemu_command.c:573 +#: src/qemu/qemu_command.c:513 msgid "Unable to determine device index for network device" msgstr "" -#: src/qemu/qemu_command.c:600 +#: src/qemu/qemu_command.c:540 msgid "Unable to determine device index for hostdev device" msgstr "" -#: src/qemu/qemu_command.c:627 +#: src/qemu/qemu_command.c:567 msgid "Unable to determine device index for redirected device" msgstr "" -#: src/qemu/qemu_command.c:763 +#: src/qemu/qemu_command.c:703 msgid "Only PCI domain 0 and bus 0 are available" msgstr "" -#: src/qemu/qemu_command.c:797 +#: src/qemu/qemu_command.c:737 #, c-format msgid "" "Attempted double use of PCI Address '%s' (may need \"multifunction='on'\" " "for device on function 0" msgstr "" -#: src/qemu/qemu_command.c:802 +#: src/qemu/qemu_command.c:742 #, c-format msgid "Attempted double use of PCI Address '%s'" msgstr "" -#: src/qemu/qemu_command.c:826 +#: src/qemu/qemu_command.c:766 #, c-format msgid "" "Attempted double use of PCI Address '%s'(need \"multifunction='off'\" for " "device on function 0)" msgstr "" -#: src/qemu/qemu_command.c:946 +#: src/qemu/qemu_command.c:886 #, c-format msgid "unable to reserve PCI address %s" msgstr "" -#: src/qemu/qemu_command.c:1007 +#: src/qemu/qemu_command.c:947 msgid "Only PCI device addresses with function=0 are supported" msgstr "" -#: src/qemu/qemu_command.c:1135 +#: src/qemu/qemu_command.c:1075 msgid "No more available PCI addresses" msgstr "" -#: src/qemu/qemu_command.c:1195 +#: src/qemu/qemu_command.c:1135 msgid "Primary IDE controller must have PCI address 0:0:1.1" msgstr "" -#: src/qemu/qemu_command.c:1218 +#: src/qemu/qemu_command.c:1158 msgid "PIIX3 USB controller must have PCI address 0:0:1.2" msgstr "" -#: src/qemu/qemu_command.c:1253 +#: src/qemu/qemu_command.c:1193 msgid "Primary video card must have PCI address 0:0:2.0" msgstr "" -#: src/qemu/qemu_command.c:1333 +#: src/qemu/qemu_command.c:1273 msgid "virtio only support device address type 'PCI'" msgstr "" -#: src/qemu/qemu_command.c:1415 +#: src/qemu/qemu_command.c:1355 msgid "Only PCI device addresses with domain=0 are supported" msgstr "" -#: src/qemu/qemu_command.c:1420 +#: src/qemu/qemu_command.c:1360 msgid "Only PCI device addresses with bus=0 are supported" msgstr "" -#: src/qemu/qemu_command.c:1426 +#: src/qemu/qemu_command.c:1366 msgid "The function of PCI device addresses must less than 8" msgstr "" -#: src/qemu/qemu_command.c:1433 +#: src/qemu/qemu_command.c:1373 msgid "" "Only PCI device addresses with function=0 are supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:1439 +#: src/qemu/qemu_command.c:1379 msgid "'multifunction=on' is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_conf.c:1876 +#: src/qemu/qemu_command.c:1430 #, c-format msgid "driver serial '%s' contains unsafe characters" msgstr "" -#: src/qemu/qemu_conf.c:2296 src/qemu/qemu_conf.c:2410 src/uml/uml_conf.c:475 +#: src/qemu/qemu_command.c:1471 +#, c-format +msgid "could not get the value of the secret for username %s" +msgstr "" + +#: src/qemu/qemu_command.c:1486 +#, c-format +msgid "rbd username '%s' specified but secret not found" +msgstr "" + +#: 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:1520 +#: src/qemu/qemu_command.c:1643 msgid "unexpected address type for scsi disk" msgstr "" -#: src/qemu/qemu_command.c:1529 +#: src/qemu/qemu_command.c:1652 msgid "SCSI controller only supports 1 bus" msgstr "" -#: src/qemu/qemu_command.c:1539 +#: src/qemu/qemu_command.c:1662 msgid "unexpected address type for ide disk" msgstr "" -#: src/qemu/qemu_command.c:1545 src/qemu/qemu_command.c:1561 +#: src/qemu/qemu_command.c:1668 src/qemu/qemu_command.c:1684 #, c-format msgid "Only 1 %s controller is supported" msgstr "" -#: src/qemu/qemu_command.c:1555 +#: src/qemu/qemu_command.c:1678 msgid "unexpected address type for fdc disk" msgstr "" -#: src/qemu/qemu_command.c:1567 +#: src/qemu/qemu_command.c:1690 #, c-format msgid "Only 1 %s bus is supported" msgstr "" -#: src/qemu/qemu_conf.c:2321 src/qemu/qemu_conf.c:2420 +#: src/qemu/qemu_command.c:1715 src/qemu/qemu_command.c:4232 #, c-format msgid "unsupported disk driver type for '%s'" msgstr "" -#: src/qemu/qemu_conf.c:2327 src/qemu/qemu_conf.c:2426 +#: src/qemu/qemu_command.c:1721 src/qemu/qemu_command.c:4238 msgid "cannot create virtual FAT disks in read-write mode" msgstr "" -#: src/qemu/qemu_command.c:1610 src/qemu/qemu_command.c:4058 +#: src/qemu/qemu_command.c:1733 src/qemu/qemu_command.c:4254 msgid "NBD accepts only one host" msgstr "" -#: src/qemu/qemu_command.c:1665 src/xenxs/xen_sxpr.c:1748 +#: 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:1688 +#: src/qemu/qemu_command.c:1813 msgid "disk cache mode 'directsync' is not supported by this QEMU" msgstr "" -#: src/qemu/qemu_command.c:1694 +#: src/qemu/qemu_command.c:1819 msgid "disk cache mode 'unsafe' is not supported by this QEMU" msgstr "" -#: src/qemu/qemu_command.c:1738 +#: src/qemu/qemu_command.c:1863 msgid "disk aio mode not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:1808 +#: src/qemu/qemu_command.c:1964 #, c-format msgid "unsupported disk bus '%s' with device setup" msgstr "" -#: src/qemu/qemu_command.c:1837 +#: src/qemu/qemu_command.c:1993 msgid "only supports mount filesystem type" msgstr "" -#: src/qemu/qemu_command.c:1843 +#: src/qemu/qemu_command.c:1999 msgid "Filesystem driver type not supported" msgstr "" -#: src/qemu/qemu_command.c:1879 +#: src/qemu/qemu_command.c:2035 msgid "can only passthrough directories" msgstr "" -#: src/qemu/qemu_command.c:1946 +#: src/qemu/qemu_command.c:2102 #, c-format msgid "%s not supported in this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:2016 +#: src/qemu/qemu_command.c:2172 #, c-format msgid "Unknown controller type: %s" msgstr "" -#: src/qemu/qemu_command.c:2098 +#: src/qemu/qemu_command.c:2254 msgid "unrecognized virtio-net-pci 'tx' option" msgstr "" -#: src/qemu/qemu_command.c:2103 +#: src/qemu/qemu_command.c:2259 msgid "virtio-net-pci 'tx' option not supported in this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:2253 src/qemu/qemu_command.c:5047 +#: src/qemu/qemu_command.c:2409 src/qemu/qemu_command.c:5231 msgid "missing watchdog model" msgstr "" -#: src/qemu/qemu_conf.c:2802 +#: src/qemu/qemu_command.c:2489 src/qemu/qemu_command.c:5193 msgid "invalid sound model" msgstr "无效的声音模块" -#: src/qemu/qemu_command.c:2392 +#: src/qemu/qemu_command.c:2548 msgid "invalid video model" msgstr "" -#: src/qemu/qemu_command.c:2401 src/qemu/qemu_command.c:4883 +#: src/qemu/qemu_command.c:2557 src/qemu/qemu_command.c:5067 #, c-format msgid "value for 'vram' must be less than '%u'" msgstr "" -#: src/qemu/qemu_command.c:2444 +#: src/qemu/qemu_command.c:2600 #, c-format msgid "Failed opening %s" msgstr "" -#: src/qemu/qemu_command.c:2473 +#: src/qemu/qemu_command.c:2629 msgid "rombar not supported in this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:2525 +#: src/qemu/qemu_command.c:2681 #, c-format msgid "Redirection bus %s is not supported by QEMU" msgstr "" -#: src/qemu/qemu_command.c:2532 +#: src/qemu/qemu_command.c:2688 msgid "USB redirection is not supported by this version of QEMU" msgstr "" -#: src/qemu/qemu_command.c:2565 src/qemu/qemu_command.c:2635 +#: src/qemu/qemu_command.c:2721 src/qemu/qemu_command.c:2791 msgid "USB host device is missing bus/device information" msgstr "" -#: src/qemu/qemu_command.c:2598 +#: src/qemu/qemu_command.c:2754 #, c-format msgid "hub type %s not supported" msgstr "" -#: src/qemu/qemu_command.c:2605 +#: src/qemu/qemu_command.c:2761 msgid "usb-hub not supported by QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:2733 +#: src/qemu/qemu_command.c:2889 msgid "spicevmc not supported in this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:2742 +#: src/qemu/qemu_command.c:2898 #, c-format msgid "unsupported chardev '%s'" msgstr "" -#: src/qemu/qemu_command.c:2870 +#: src/qemu/qemu_command.c:3026 msgid "Cannot use virtio serial for parallel/serial devices" msgstr "" -#: src/qemu/qemu_command.c:2880 +#: src/qemu/qemu_command.c:3036 msgid "virtio serial device has invalid address type" msgstr "" -#: src/qemu/qemu_command.c:2898 +#: src/qemu/qemu_command.c:3054 #, c-format msgid "Unsupported spicevmc target name '%s'" msgstr "" -#: src/qemu/qemu_command.c:3042 src/qemu/qemu_command.c:3597 -#: src/xenxs/xen_sxpr.c:2114 src/xenxs/xen_xm.c:1577 +#: 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 "" -#: src/qemu/qemu_command.c:3056 +#: src/qemu/qemu_command.c:3212 #, c-format msgid "unsupported rtc timer track '%s'" msgstr "" -#: src/qemu/qemu_command.c:3080 +#: src/qemu/qemu_command.c:3236 #, c-format msgid "unsupported rtc timer tickpolicy '%s'" msgstr "" -#: src/qemu/qemu_command.c:3129 +#: src/qemu/qemu_command.c:3285 msgid "CPU specification not supported by hypervisor" msgstr "" -#: src/qemu/qemu_conf.c:1803 +#: src/qemu/qemu_command.c:3299 msgid "guest CPU is not compatible with host CPU" msgstr "" -#: src/qemu/qemu_command.c:3255 +#: src/qemu/qemu_command.c:3411 msgid "" "setting current vcpu count less than maximum is not supported with this QEMU " "binary" msgstr "" -#: src/qemu/qemu_command.c:3337 +#: src/qemu/qemu_command.c:3551 #, c-format msgid "the QEMU binary %s does not support kqemu" msgstr "" -#: src/qemu/qemu_command.c:3350 +#: src/qemu/qemu_command.c:3564 #, c-format msgid "the QEMU binary %s does not support kvm" msgstr "" -#: src/qemu/qemu_command.c:3361 +#: src/qemu/qemu_command.c:3575 #, c-format msgid "the QEMU binary %s does not support %s" msgstr "" -#: src/qemu/qemu_conf.c:2095 +#: src/qemu/qemu_command.c:3622 msgid "hugetlbfs filesystem is not mounted" msgstr "" -#: src/qemu/qemu_conf.c:2100 +#: src/qemu/qemu_command.c:3627 msgid "hugepages are disabled by administrator config" msgstr "" -#: src/qemu/qemu_conf.c:2105 +#: src/qemu/qemu_command.c:3632 #, c-format msgid "hugepage backing not supported by '%s'" msgstr "" -#: src/qemu/qemu_conf.c:2135 +#: src/qemu/qemu_command.c:3674 #, c-format msgid "qemu emulator '%s' does not support xen" msgstr "" -#: src/qemu/qemu_command.c:3469 +#: src/qemu/qemu_command.c:3687 #, c-format msgid "the QEMU binary %s does not support smbios settings" msgstr "" -#: src/qemu/qemu_command.c:3478 src/qemu/qemu_driver.c:977 +#: src/qemu/qemu_command.c:3696 src/qemu/qemu_driver.c:983 msgid "Host SMBIOS information is not available" msgstr "" -#: src/qemu/qemu_command.c:3487 +#: src/qemu/qemu_command.c:3705 #, c-format msgid "Domain '%s' sysinfo are not available" msgstr "" -#: src/qemu/qemu_command.c:3532 +#: src/qemu/qemu_command.c:3750 msgid "qemu does not support -device" msgstr "" -#: src/qemu/qemu_command.c:3537 +#: src/qemu/qemu_command.c:3755 msgid "qemu does not support SGA" msgstr "" -#: src/qemu/qemu_command.c:3542 +#: src/qemu/qemu_command.c:3760 msgid "need at least one serial port to use SGA" msgstr "" -#: src/qemu/qemu_command.c:3613 +#: src/qemu/qemu_command.c:3831 #, c-format msgid "unsupported timer type (name) '%s'" msgstr "" -#: src/qemu/qemu_command.c:3633 src/qemu/qemu_command.c:3644 +#: src/qemu/qemu_command.c:3851 src/qemu/qemu_command.c:3862 #, c-format msgid "unsupported rtc tickpolicy '%s'" msgstr "" -#: src/qemu/qemu_command.c:3668 src/qemu/qemu_command.c:3677 +#: src/qemu/qemu_command.c:3886 src/qemu/qemu_command.c:3895 #, c-format msgid "unsupported pit tickpolicy '%s'" msgstr "" -#: src/qemu/qemu_command.c:3699 +#: src/qemu/qemu_command.c:3917 msgid "pit timer is not supported" msgstr "" -#: src/qemu/qemu_command.c:3732 +#: src/qemu/qemu_command.c:3950 msgid "hypervisor lacks deviceboot feature" msgstr "" -#: src/qemu/qemu_conf.c:2246 +#: 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:3819 +#: src/qemu/qemu_command.c:4037 msgid "SATA is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:3836 +#: src/qemu/qemu_command.c:4054 msgid "Multiple legacy USB controller not supported" msgstr "" -#: src/qemu/qemu_conf.c:2286 src/qemu/qemu_conf.c:2391 +#: 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:4136 +#: src/qemu/qemu_command.c:4320 msgid "filesystem passthrough not supported by this QEMU" msgstr "" -#: src/qemu/qemu_command.c:4289 +#: src/qemu/qemu_command.c:4473 msgid "this QEMU binary lacks multiple smartcard support" msgstr "" -#: src/qemu/qemu_command.c:4300 src/qemu/qemu_command.c:4312 +#: src/qemu/qemu_command.c:4484 src/qemu/qemu_command.c:4496 msgid "this QEMU binary lacks smartcard host mode support" msgstr "" -#: src/qemu/qemu_command.c:4322 +#: src/qemu/qemu_command.c:4506 #, c-format msgid "invalid certificate name: %s" msgstr "" -#: src/qemu/qemu_command.c:4333 +#: src/qemu/qemu_command.c:4517 #, c-format msgid "invalid database name: %s" msgstr "" -#: src/qemu/qemu_command.c:4348 +#: src/qemu/qemu_command.c:4532 msgid "this QEMU binary lacks smartcard passthrough mode support" msgstr "" -#: src/qemu/qemu_command.c:4457 +#: src/qemu/qemu_command.c:4641 msgid "guestfwd requires QEMU to support -chardev & -device" msgstr "" -#: src/qemu/qemu_command.c:4485 src/qemu/qemu_command.c:4524 +#: src/qemu/qemu_command.c:4669 src/qemu/qemu_command.c:4708 msgid "virtio channel requires QEMU to support -device" msgstr "" -#: src/qemu/qemu_command.c:4549 +#: src/qemu/qemu_command.c:4733 #, c-format msgid "unsupported console target type %s" msgstr "" -#: src/qemu/qemu_command.c:4590 +#: src/qemu/qemu_command.c:4774 msgid "only 1 graphics device is supported" msgstr "" -#: src/qemu/qemu_command.c:4629 src/qemu/qemu_command.c:4771 +#: 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:4635 src/qemu/qemu_command.c:4777 +#: src/qemu/qemu_command.c:4819 src/qemu/qemu_command.c:4961 #, c-format msgid "listen network '%s' had no usable address" msgstr "" -#: src/qemu/qemu_command.c:4713 +#: src/qemu/qemu_command.c:4897 #, c-format msgid "sdl not supported by '%s'" msgstr "" -#: src/qemu/qemu_command.c:4750 +#: src/qemu/qemu_command.c:4934 msgid "spice graphics are not supported with this QEMU" msgstr "" -#: src/qemu/qemu_command.c:4851 +#: src/qemu/qemu_command.c:5035 #, c-format msgid "unsupported graphics type '%s'" msgstr "" -#: src/qemu/qemu_command.c:4864 +#: src/qemu/qemu_command.c:5048 msgid "This QEMU does not support QXL graphics adapters" msgstr "" -#: src/qemu/qemu_conf.c:2756 src/qemu/qemu_conf.c:2782 +#: src/qemu/qemu_command.c:5055 #, c-format msgid "video type %s is not supported with QEMU" msgstr "" -#: src/qemu/qemu_command.c:4917 +#: src/qemu/qemu_command.c:5101 #, c-format msgid "video type %s is not supported with this QEMU" msgstr "" -#: src/qemu/qemu_command.c:4929 +#: src/qemu/qemu_command.c:5113 #, c-format msgid "video type %s is only valid as primary video card" msgstr "" -#: src/qemu/qemu_conf.c:2745 +#: src/qemu/qemu_command.c:5128 msgid "only one video card is currently supported" msgstr "" -#: src/qemu/qemu_command.c:4980 src/qemu/qemu_command.c:5016 +#: src/qemu/qemu_command.c:5164 src/qemu/qemu_command.c:5200 msgid "this QEMU binary lacks hda support" msgstr "" -#: src/qemu/qemu_conf.c:2829 +#: src/qemu/qemu_command.c:5247 msgid "invalid watchdog action" msgstr "" -#: src/qemu/qemu_command.c:5104 +#: src/qemu/qemu_command.c:5288 msgid "booting from assigned devices is only supported for PCI devices" msgstr "" -#: src/qemu/qemu_command.c:5109 +#: src/qemu/qemu_command.c:5293 msgid "" "booting from assigned PCI devices is not supported with this version of qemu" msgstr "" -#: src/qemu/qemu_conf.c:2869 src/qemu/qemu_monitor_text.c:1377 +#: 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 "" -#: src/qemu/qemu_conf.c:1927 +#: src/qemu/qemu_command.c:5364 msgid "TCP migration is not supported with this QEMU binary" msgstr "在此 QEMU 二进制中不支持 TCP 迁移" -#: src/qemu/qemu_conf.c:1935 src/qemu/qemu_conf.c:1941 +#: src/qemu/qemu_command.c:5381 msgid "STDIO migration is not supported with this QEMU binary" msgstr "在此 QEMU 二进制中不支持 STDIO 迁移" -#: src/qemu/qemu_command.c:5204 +#: src/qemu/qemu_command.c:5388 msgid "EXEC migration is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:5212 +#: src/qemu/qemu_command.c:5396 msgid "FD migration is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:5221 +#: src/qemu/qemu_command.c:5405 msgid "UNIX migration is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_command.c:5228 +#: src/qemu/qemu_command.c:5412 msgid "unknown migration protocol" msgstr "" -#: src/qemu/qemu_command.c:5243 +#: src/qemu/qemu_command.c:5427 #, c-format msgid "" "Memory balloon device type '%s' is not supported by this version of qemu" msgstr "" -#: src/qemu/qemu_conf.c:3084 +#: src/qemu/qemu_command.c:5645 #, c-format msgid "malformed keyword arguments in '%s'" msgstr "" -#: src/qemu/qemu_command.c:5566 src/qemu/qemu_command.c:6704 +#: src/qemu/qemu_command.c:5748 src/qemu/qemu_command.c:6890 #, c-format msgid "cannot parse nbd filename '%s'" msgstr "" -#: src/qemu/qemu_command.c:5622 src/qemu/qemu_command.c:6731 +#: src/qemu/qemu_command.c:5807 src/qemu/qemu_command.c:6919 #, c-format msgid "cannot parse sheepdog filename '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3218 +#: src/qemu/qemu_command.c:5894 #, c-format msgid "cannot parse drive index '%s'" msgstr "" -#: src/qemu/qemu_command.c:5717 +#: src/qemu/qemu_command.c:5902 #, c-format msgid "cannot parse drive bus '%s'" msgstr "" -#: src/qemu/qemu_command.c:5725 +#: src/qemu/qemu_command.c:5910 #, c-format msgid "cannot parse drive unit '%s'" msgstr "" -#: src/qemu/qemu_command.c:5734 +#: src/qemu/qemu_command.c:5919 #, c-format msgid "cannot parse io mode '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3227 +#: src/qemu/qemu_command.c:5931 #, c-format msgid "missing file parameter in drive '%s'" msgstr "" -#: src/qemu/qemu_command.c:5759 +#: src/qemu/qemu_command.c:5944 #, c-format msgid "missing index/unit/bus parameter in drive '%s'" msgstr "" -#: src/qemu/qemu_command.c:5808 +#: src/qemu/qemu_command.c:5993 #, c-format msgid "invalid device name '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3294 +#: src/qemu/qemu_command.c:6029 #, c-format msgid "cannot parse NIC vlan in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3306 +#: src/qemu/qemu_command.c:6041 #, c-format msgid "cannot find NIC definition for vlan %d" msgstr "" -#: src/qemu/qemu_conf.c:3365 +#: src/qemu/qemu_command.c:6098 #, c-format msgid "cannot parse vlan in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3395 +#: src/qemu/qemu_command.c:6128 #, c-format msgid "cannot parse NIC definition '%s'" msgstr "" -#: src/qemu/qemu_command.c:5991 +#: src/qemu/qemu_command.c:6176 #, c-format msgid "cannot parse sndbuf size in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3466 src/qemu/qemu_conf.c:3524 +#: src/qemu/qemu_command.c:6212 #, c-format msgid "unknown PCI device syntax '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3474 src/qemu/qemu_conf.c:3547 +#: src/qemu/qemu_command.c:6220 #, c-format msgid "cannot extract PCI device bus '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3481 +#: src/qemu/qemu_command.c:6227 #, c-format msgid "cannot extract PCI device slot '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3488 +#: src/qemu/qemu_command.c:6234 #, c-format msgid "cannot extract PCI device function '%s'" msgstr "" -#: src/qemu/qemu_command.c:6084 +#: src/qemu/qemu_command.c:6269 #, c-format msgid "unknown USB device syntax '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3533 +#: src/qemu/qemu_command.c:6278 #, c-format msgid "cannot extract USB device vendor '%s'" msgstr "" -#: src/qemu/qemu_command.c:6100 +#: src/qemu/qemu_command.c:6285 #, c-format msgid "cannot extract USB device product '%s'" msgstr "" -#: src/qemu/qemu_command.c:6107 +#: src/qemu/qemu_command.c:6292 #, c-format msgid "cannot extract USB device bus '%s'" msgstr "" -#: src/qemu/qemu_command.c:6114 +#: src/qemu/qemu_command.c:6299 #, c-format msgid "cannot extract USB device address '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3667 +#: src/qemu/qemu_command.c:6408 #, c-format msgid "cannot find port number in character device %s" msgstr "" -#: src/qemu/qemu_conf.c:3707 +#: src/qemu/qemu_command.c:6448 #, c-format msgid "unknown character device syntax %s" msgstr "" -#: src/qemu/qemu_conf.c:3782 +#: src/qemu/qemu_command.c:6541 #, c-format msgid "unknown CPU syntax '%s'" msgstr "" -#: src/qemu/qemu_command.c:6435 +#: src/qemu/qemu_command.c:6620 #, c-format msgid "cannot parse CPU topology '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3814 +#: src/qemu/qemu_command.c:6661 msgid "no emulator path found" msgstr "" -#: src/qemu/qemu_command.c:6488 +#: src/qemu/qemu_command.c:6674 msgid "failed to generate uuid" msgstr "生成 uuid 失败" -#: src/qemu/qemu_conf.c:3866 +#: src/qemu/qemu_command.c:6723 #, c-format msgid "missing value for %s argument" msgstr "" -#: src/qemu/qemu_command.c:6597 +#: src/qemu/qemu_command.c:6783 #, c-format msgid "missing VNC port number in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3911 +#: src/qemu/qemu_command.c:6790 #, c-format msgid "cannot parse VNC port '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3935 +#: src/qemu/qemu_command.c:6817 #, c-format msgid "cannot parse memory level '%s'" msgstr "" -#: src/qemu/qemu_conf.c:3952 +#: src/qemu/qemu_command.c:6829 #, c-format msgid "cannot parse UUID '%s'" msgstr "" -#: src/qemu/qemu_conf.c:4217 +#: src/qemu/qemu_command.c:7193 #, c-format msgid "unknown video adapter type '%s'" msgstr "" -#: src/qemu/qemu_command.c:7073 +#: src/qemu/qemu_command.c:7260 msgid "CEPH_ARGS was set without an rbd disk" msgstr "" -#: src/qemu/qemu_command.c:7080 +#: src/qemu/qemu_command.c:7267 #, c-format msgid "could not parse CEPH_ARGS '%s'" msgstr "" -#: src/qemu/qemu_command.c:7115 +#: src/qemu/qemu_command.c:7302 #, c-format msgid "found no rbd hosts in CEPH_ARGS '%s'" msgstr "" -#: src/qemu/qemu_command.c:7325 +#: src/qemu/qemu_command.c:7511 #, c-format msgid "Unable to resolve %s for pid %u" msgstr "" -#: src/qemu/qemu_conf.c:123 +#: src/qemu/qemu_conf.c:108 msgid "unable to find hugetlbfs mountpoint" msgstr "" -#: src/qemu/qemu_conf.c:250 +#: src/qemu/qemu_conf.c:292 msgid "cgroup_controllers must be a list of strings" msgstr "" @@ -9057,965 +9578,949 @@ msgid "Unknown cgroup controller '%s'" msgstr "" -#: src/qemu/qemu_conf.c:288 +#: src/qemu/qemu_conf.c:333 msgid "cgroup_device_acl must be a list of strings" msgstr "" -#: src/qemu/qemu_conf.c:406 +#: src/qemu/qemu_conf.c:407 #, c-format msgid "failed to enable mac filter in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:338 +#: src/qemu/qemu_conf.c:415 #, c-format msgid "failed to add rule to drop all frames in '%s'" msgstr "" -#: src/qemu/qemu_conf.c:457 +#: src/qemu/qemu_conf.c:458 #, c-format msgid "Failed to load lock manager %s" msgstr "" -#: src/qemu/qemu_domain.c:239 +#: src/qemu/qemu_domain.c:244 msgid "Unexpected QEMU monitor still active during domain deletion" msgstr "" -#: src/qemu/qemu_driver.c:213 +#: src/qemu/qemu_domain.c:335 msgid "no monitor path" msgstr "没有监视器路径" -#: src/qemu/qemu_driver.c:240 +#: src/qemu/qemu_domain.c:362 #, c-format msgid "unsupported monitor type '%s'" msgstr "不支持的显示器类型 '%s'" -#: src/qemu/qemu_domain.c:388 +#: src/qemu/qemu_domain.c:393 msgid "failed to parse qemu capabilities flags" msgstr "" -#: src/qemu/qemu_domain.c:401 +#: src/qemu/qemu_domain.c:406 #, c-format msgid "Unknown qemu capabilities flag %s" msgstr "" -#: src/qemu/qemu_domain.c:421 +#: src/qemu/qemu_domain.c:426 #, c-format msgid "Unknown job type %s" msgstr "" -#: src/qemu/qemu_domain.c:434 +#: src/qemu/qemu_domain.c:439 #, c-format msgid "Unknown async job type %s" msgstr "" -#: src/qemu/qemu_domain.c:445 +#: src/qemu/qemu_domain.c:450 #, c-format msgid "Unknown job phase %s" msgstr "" -#: src/qemu/qemu_domain.c:500 +#: src/qemu/qemu_domain.c:505 #, c-format msgid "Failed to register xml namespace '%s'" msgstr "" -#: src/qemu/qemu_domain.c:523 +#: src/qemu/qemu_domain.c:528 msgid "No qemu command-line argument specified" msgstr "" -#: src/qemu/qemu_domain.c:549 +#: src/qemu/qemu_domain.c:554 msgid "No qemu environment name specified" msgstr "" -#: src/qemu/qemu_domain.c:554 +#: src/qemu/qemu_domain.c:559 msgid "Empty qemu environment name specified" msgstr "" -#: src/qemu/qemu_domain.c:559 +#: src/qemu/qemu_domain.c:564 msgid "Invalid environment name, it must begin with a letter or underscore" msgstr "" -#: src/qemu/qemu_domain.c:564 +#: src/qemu/qemu_domain.c:569 msgid "" "Invalid environment name, it must contain only alphanumerics and underscore" msgstr "" -#: src/qemu/qemu_driver.c:313 src/qemu/qemu_driver.c:356 +#: src/qemu/qemu_domain.c:789 msgid "cannot acquire state change lock" msgstr "" -#: src/qemu/qemu_domain.c:788 +#: src/qemu/qemu_domain.c:793 msgid "cannot acquire state change lock due to max_queued limit" msgstr "" -#: src/qemu/qemu_driver.c:316 src/qemu/qemu_driver.c:359 +#: src/qemu/qemu_domain.c:797 msgid "cannot acquire job mutex" msgstr "" -#: src/qemu/qemu_domain.c:845 +#: src/qemu/qemu_domain.c:850 msgid "Attempt to start invalid job" msgstr "" -#: src/qemu/qemu_domain.c:915 +#: src/qemu/qemu_domain.c:920 #, c-format msgid "unepxected async job %d" msgstr "" -#: src/qemu/qemu_domain.c:924 +#: src/qemu/qemu_domain.c:929 msgid "domain is no longer running" msgstr "" -#: src/qemu/qemu_driver.c:7907 +#: src/qemu/qemu_domain.c:1086 src/qemu/qemu_driver.c:8875 msgid "cannot get host CPU capabilities" msgstr "" -#: src/qemu/qemu_domain.c:1218 +#: src/qemu/qemu_domain.c:1223 #, c-format msgid "failed to set close-on-exec flag on %s" msgstr "" -#: src/qemu/qemu_domain.c:1302 +#: src/qemu/qemu_domain.c:1307 #, c-format msgid "Unable to write to domain logfile %s" msgstr "" -#: src/storage/storage_backend.c:589 +#: src/qemu/qemu_domain.c:1334 src/storage/storage_backend.c:783 msgid "unable to find kvm-img or qemu-img" msgstr "" -#: src/qemu/qemu_domain.c:1360 +#: src/qemu/qemu_domain.c:1365 #, c-format msgid "cannot create snapshot directory '%s'" msgstr "" -#: src/qemu/qemu_domain.c:1433 +#: src/qemu/qemu_domain.c:1438 #, c-format msgid "Disk device '%s' does not support snapshotting" msgstr "" -#: src/qemu/qemu_domain.c:1630 src/qemu/qemu_domain.c:1638 +#: src/qemu/qemu_domain.c:1635 src/qemu/qemu_domain.c:1643 #, c-format msgid "cannot access file '%s'" msgstr "" -#: src/qemu/qemu_driver.c:155 +#: src/qemu/qemu_driver.c:158 #, c-format msgid "Failed to start job on VM '%s': %s" msgstr "" -#: src/qemu/qemu_driver.c:229 +#: src/qemu/qemu_driver.c:232 msgid "Failed to initialize security drivers" msgstr "" -#: src/qemu/qemu_driver.c:310 +#: src/qemu/qemu_driver.c:313 #, c-format msgid "Failed to allocate memory for snapshot directory for domain %s" msgstr "" -#: src/qemu/qemu_driver.c:320 +#: src/qemu/qemu_driver.c:323 #, c-format msgid "Failed to open snapshot directory %s for domain %s: %s" msgstr "" -#: src/qemu/qemu_driver.c:335 +#: src/qemu/qemu_driver.c:338 msgid "Failed to allocate memory for path" msgstr "" -#: src/qemu/qemu_driver.c:342 +#: src/qemu/qemu_driver.c:345 #, c-format msgid "Failed to read snapshot file %s: %s" msgstr "" -#: src/qemu/qemu_driver.c:353 +#: src/qemu/qemu_driver.c:356 #, c-format msgid "Failed to parse snapshot XML from file '%s'" msgstr "" -#: src/qemu/qemu_driver.c:374 +#: src/qemu/qemu_driver.c:377 #, c-format msgid "Too many snapshots claiming to be current for domain %s" msgstr "" -#: src/qemu/qemu_driver.c:380 +#: src/qemu/qemu_driver.c:383 #, c-format msgid "Snapshots have inconsistent relations for domain %s" msgstr "" -#: src/qemu/qemu_driver.c:521 +#: src/qemu/qemu_driver.c:524 #, c-format msgid "Failed to create cache dir '%s': %s" msgstr "" -#: src/qemu/qemu_driver.c:539 +#: src/qemu/qemu_driver.c:542 #, c-format msgid "Failed to create dump dir '%s': %s" msgstr "" -#: src/qemu/qemu_driver.c:570 +#: src/qemu/qemu_driver.c:573 msgid "Missing lock manager implementation" msgstr "" -#: src/qemu/qemu_driver.c:1088 src/qemu/qemu_driver.c:3726 -#: src/qemu/qemu_driver.c:3761 src/qemu/qemu_driver.c:3856 -#: src/qemu/qemu_driver.c:3891 +#: src/qemu/qemu_driver.c:590 #, c-format msgid "unable to set ownership of '%s' to user %d:%d" msgstr "" -#: src/qemu/qemu_driver.c:1094 +#: 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 "" -#: src/qemu/qemu_driver.c:1119 +#: src/qemu/qemu_driver.c:629 #, c-format msgid "unable to create hugepage path %s" msgstr "" -#: src/qemu/qemu_driver.c:1126 +#: src/qemu/qemu_driver.c:636 #, c-format msgid "unable to set ownership on %s to %d:%d" msgstr "" -#: src/qemu/qemu_driver.c:2733 +#: src/qemu/qemu_driver.c:863 msgid "qemu state driver is not active" msgstr "" -#: src/qemu/qemu_driver.c:2739 +#: src/qemu/qemu_driver.c:869 #, c-format msgid "no QEMU URI path given, try %s" msgstr "" -#: src/qemu/qemu_driver.c:2750 +#: src/qemu/qemu_driver.c:880 #, c-format msgid "unexpected QEMU URI path '%s', try qemu:///system" msgstr "" -#: src/qemu/qemu_driver.c:2757 +#: src/qemu/qemu_driver.c:887 #, c-format msgid "unexpected QEMU URI path '%s', try qemu:///session" msgstr "" -#: src/opennebula/one_driver.c:580 src/opennebula/one_driver.c:613 -#: src/qemu/qemu_driver.c:2959 src/uml/uml_driver.c:1314 -#: src/uml/uml_driver.c:1344 src/vbox/vbox_tmpl.c:1032 +#: 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:3011 src/qemu/qemu_driver.c:7679 +#: 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 "" -#: src/qemu/qemu_driver.c:2569 src/qemu/qemu_driver.c:3255 -#: src/qemu/qemu_driver.c:7731 +#: 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:1570 +#: src/qemu/qemu_driver.c:1576 msgid "Reboot is not supported with this QEMU binary" msgstr "" -#: src/qemu/qemu_driver.c:1595 +#: src/qemu/qemu_driver.c:1601 msgid "Reboot is not supported without the JSON monitor" msgstr "" -#: src/qemu/qemu_driver.c:1853 +#: src/qemu/qemu_driver.c:1859 msgid "cannot resize the maximum memory on an active domain" msgstr "" -#: src/qemu/qemu_driver.c:3496 src/uml/uml_driver.c:1466 +#: src/qemu/qemu_driver.c:1896 src/uml/uml_driver.c:1701 msgid "cannot set memory of an active domain" msgstr "无法在活跃域中设定内存" -#: src/qemu/qemu_driver.c:2001 +#: src/qemu/qemu_driver.c:2007 #, c-format msgid "cannot translate keycode %u of %s codeset to rfb keycode" msgstr "" -#: src/uml/uml_driver.c:1508 +#: 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:2282 +#: src/qemu/qemu_driver.c:2288 #, c-format msgid "failed to write header to domain save file '%s'" msgstr "" -#: src/qemu/qemu_driver.c:2290 src/qemu/qemu_driver.c:4335 +#: src/qemu/qemu_driver.c:2296 src/qemu/qemu_driver.c:4334 #, c-format msgid "failed to write xml to '%s'" msgstr "" -#: src/qemu/qemu_driver.c:2341 +#: src/qemu/qemu_driver.c:2347 #, c-format msgid "unable to open %s" msgstr "" -#: src/qemu/qemu_driver.c:2356 src/qemu/qemu_driver.c:2380 +#: src/qemu/qemu_driver.c:2362 src/qemu/qemu_driver.c:2386 #, c-format msgid "Failed to create file '%s'" msgstr "" -#: src/qemu/qemu_driver.c:2371 +#: src/qemu/qemu_driver.c:2377 #, c-format msgid "Failed to create file '%s': couldn't determine fs type" msgstr "" -#: src/qemu/qemu_driver.c:2392 +#: src/qemu/qemu_driver.c:2398 #, c-format msgid "Error from child process creating '%s'" msgstr "" -#: src/qemu/qemu_driver.c:2442 src/qemu/qemu_driver.c:9277 -#: src/qemu/qemu_migration.c:798 +#: 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:2470 src/qemu/qemu_driver.c:2980 -#: src/qemu/qemu_driver.c:8873 src/qemu/qemu_driver.c:9155 -#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10070 +#: 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:1613 src/qemu/qemu_migration.c:1925 -#: src/qemu/qemu_migration.c:2245 src/qemu/qemu_migration.c:2601 -#: src/qemu/qemu_process.c:383 src/qemu/qemu_process.c:396 +#: 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:3691 src/qemu/qemu_driver.c:7529 +#: src/qemu/qemu_driver.c:2510 msgid "failed to get domain xml" msgstr "获得域 xml 失败" -#: src/qemu/qemu_driver.c:2533 src/qemu/qemu_driver.c:2863 -#: src/qemu/qemu_driver.c:3948 +#: 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:2564 src/qemu/qemu_driver.c:2584 -#: src/qemu/qemu_driver.c:3107 src/vbox/vbox_tmpl.c:9091 +#: 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 "" -#: src/qemu/qemu_driver.c:2574 +#: src/qemu/qemu_driver.c:2580 #, c-format msgid "unable to seek %s" msgstr "" -#: src/qemu/qemu_driver.c:2580 +#: src/qemu/qemu_driver.c:2586 #, c-format msgid "unable to write %s" msgstr "" -#: src/qemu/qemu_driver.c:3649 +#: src/qemu/qemu_driver.c:2673 msgid "Invalid save image format specified in configuration file" msgstr "" -#: src/qemu/qemu_driver.c:2673 +#: src/qemu/qemu_driver.c:2679 msgid "" "Compression program for image format in configuration file isn't available" msgstr "" -#: src/qemu/qemu_driver.c:3717 src/qemu/qemu_driver.c:3848 +#: src/qemu/qemu_driver.c:2891 #, c-format msgid "unable to save file %s" msgstr "无法保存文件 %s" -#: src/qemu/qemu_driver.c:2917 +#: src/qemu/qemu_driver.c:2923 msgid "Invalid dump image format specified in configuration file, using raw" msgstr "" -#: src/qemu/qemu_driver.c:2922 +#: src/qemu/qemu_driver.c:2928 msgid "" "Compression program for dump image format in configuration file isn't " "available, using raw" msgstr "" -#: src/qemu/qemu_driver.c:3917 +#: src/qemu/qemu_driver.c:3024 msgid "resuming after dump failed" msgstr "" -#: src/qemu/qemu_driver.c:3062 +#: src/qemu/qemu_driver.c:3068 src/qemu/qemu_driver.c:7352 #, c-format msgid "no domain matching uuid '%s'" msgstr "" -#: src/qemu/qemu_driver.c:3081 +#: src/qemu/qemu_driver.c:3087 msgid "currently is supported only taking screenshots of screen ID 0" msgstr "" -#: src/qemu/qemu_driver.c:6399 +#: src/qemu/qemu_driver.c:3098 src/qemu/qemu_driver.c:7925 +#: src/vbox/vbox_tmpl.c:9048 #, c-format msgid "mkstemp(\"%s\") failed" msgstr "mkstemp(\"%s\") 失败" -#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9097 +#: src/qemu/qemu_driver.c:3119 src/vbox/vbox_tmpl.c:9102 msgid "unable to open stream" msgstr "" -#: src/qemu/qemu_driver.c:3174 +#: src/qemu/qemu_driver.c:3180 msgid "Dump failed" msgstr "" -#: src/qemu/qemu_driver.c:3182 +#: src/qemu/qemu_driver.c:3188 msgid "Resuming after dump failed" msgstr "" -#: src/qemu/qemu_driver.c:3253 +#: src/qemu/qemu_driver.c:3259 msgid "cannot change vcpu count of this domain" msgstr "" -#: src/qemu/qemu_driver.c:3277 src/test/test_driver.c:2189 -#: src/xen/xen_driver.c:1114 +#: 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 "" -#: src/qemu/qemu_driver.c:3310 +#: src/qemu/qemu_driver.c:3316 msgid "cannot adjust maximum on running domain" msgstr "" -#: src/qemu/qemu_driver.c:3971 src/qemu/qemu_driver.c:4178 -#: src/qemu/qemu_driver.c:4213 +#: 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/qemu/qemu_driver.c:3441 +#: src/qemu/qemu_driver.c:3447 msgid "a domain is inactive; can change only persistent config" msgstr "" -#: src/qemu/qemu_driver.c:4037 +#: 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:4056 +#: 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:3496 +#: src/qemu/qemu_driver.c:3502 msgid "failed to delete vcpupin xml of a running domain" msgstr "" -#: src/qemu/qemu_driver.c:3503 +#: src/qemu/qemu_driver.c:3509 msgid "failed to update or add vcpupin xml of a running domain" msgstr "" -#: src/qemu/qemu_driver.c:3518 +#: src/qemu/qemu_driver.c:3524 msgid "failed to delete vcpupin xml of a persistent domain" msgstr "" -#: src/qemu/qemu_driver.c:3525 +#: src/qemu/qemu_driver.c:3531 msgid "failed to update or add vcpupin xml of a persistent domain" msgstr "" -#: src/qemu/qemu_driver.c:3577 -msgid "cannot get live and persistent info concurrently" -msgstr "" - -#: src/qemu/qemu_driver.c:3613 +#: src/qemu/qemu_driver.c:3612 msgid "cannot get persistent config of a transient domain" msgstr "" -#: src/qemu/qemu_driver.c:4095 +#: src/qemu/qemu_driver.c:3693 msgid "cannot list vcpu pinning for an inactive domain" msgstr "" -#: src/qemu/qemu_driver.c:4126 +#: src/qemu/qemu_driver.c:3724 msgid "cannot get vCPU placement & pCPU time" msgstr "" -#: src/qemu/qemu_driver.c:4144 +#: src/qemu/qemu_driver.c:3742 msgid "cpu affinity is not available" msgstr "cpu 亲和性不可用" -#: src/qemu/qemu_driver.c:3799 src/test/test_driver.c:2137 +#: 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/qemu/qemu_driver.c:4236 +#: src/qemu/qemu_driver.c:3870 msgid "Failed to get security label" msgstr "获得安全性标签失败" -#: src/qemu/qemu_driver.c:4267 +#: src/qemu/qemu_driver.c:3902 #, c-format msgid "security model string exceeds max %d bytes" msgstr "安全性模式超过最大的 %d 字节" -#: src/qemu/qemu_driver.c:4277 +#: src/qemu/qemu_driver.c:3912 #, c-format msgid "security DOI string exceeds max %d bytes" msgstr "安全性 DOI 超过最大的 %d 字节" -#: src/qemu/qemu_driver.c:4314 +#: src/qemu/qemu_driver.c:3960 msgid "failed to read qemu header" msgstr "读取 qemu 标题失败" -#: src/qemu/qemu_driver.c:3970 +#: src/qemu/qemu_driver.c:3969 msgid "save image is incomplete" msgstr "" -#: src/qemu/qemu_driver.c:3974 +#: src/qemu/qemu_driver.c:3973 #, c-format msgid "cannot remove corrupt file: %s" msgstr "" -#: src/qemu/qemu_driver.c:4018 src/qemu/qemu_driver.c:4122 +#: src/qemu/qemu_driver.c:4017 src/qemu/qemu_driver.c:4121 #, c-format msgid "cannot close file: %s" msgstr "" -#: src/qemu/qemu_driver.c:4371 +#: src/qemu/qemu_driver.c:4078 #, c-format msgid "Invalid compressed save format %d" msgstr "" -#: src/qemu/qemu_driver.c:4383 +#: src/qemu/qemu_driver.c:4093 #, c-format msgid "Failed to start decompression binary %s" msgstr "" -#: src/qemu/qemu_driver.c:4421 +#: src/qemu/qemu_driver.c:4145 msgid "failed to resume domain" msgstr "恢复域失败" -#: src/qemu/qemu_driver.c:4320 +#: src/qemu/qemu_driver.c:4319 msgid "new xml too large to fit in file" msgstr "" -#: src/qemu/qemu_driver.c:4329 +#: src/qemu/qemu_driver.c:4328 #, c-format msgid "cannot seek in '%s'" msgstr "" -#: src/qemu/qemu_driver.c:4688 +#: src/qemu/qemu_driver.c:4687 #, c-format msgid "cannot remove managed save file %s" msgstr "" -#: src/qemu/qemu_driver.c:4710 +#: src/qemu/qemu_driver.c:4757 msgid "domain is already running" msgstr "" -#: src/qemu/qemu_driver.c:4981 +#: src/qemu/qemu_driver.c:4980 #, c-format msgid "cannot delete inactive domain with %d snapshots" msgstr "" -#: src/qemu/qemu_driver.c:5125 +#: src/qemu/qemu_driver.c:5124 #, c-format msgid "disk controller bus '%s' cannot be hotplugged." msgstr "" -#: src/qemu/qemu_driver.c:5211 src/uml/uml_driver.c:2191 +#: 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_driver.c:5236 +#: src/qemu/qemu_driver.c:5214 +#, c-format +msgid "disk device type '%s' cannot be detached" +msgstr "" + +#: src/qemu/qemu_driver.c:5235 #, c-format msgid "disk controller bus '%s' cannot be hotunplugged." msgstr "" -#: src/qemu/qemu_driver.c:5268 src/uml/uml_driver.c:2195 +#: src/qemu/qemu_driver.c:5267 src/uml/uml_driver.c:2181 msgid "This type of device cannot be hot unplugged" msgstr "" -#: src/qemu/qemu_driver.c:5386 +#: src/qemu/qemu_driver.c:5385 #, c-format msgid "mac %s already exists" msgstr "" -#: src/qemu/qemu_driver.c:5402 +#: src/qemu/qemu_driver.c:5401 #, c-format msgid "Lease %s in lockspace %s already exists" msgstr "" -#: src/qemu/qemu_driver.c:5447 +#: src/qemu/qemu_driver.c:5446 #, c-format msgid "no nic of mac %s" msgstr "" -#: src/qemu/qemu_driver.c:5456 src/qemu/qemu_hotplug.c:2263 +#: src/qemu/qemu_driver.c:5455 src/qemu/qemu_hotplug.c:2262 #, c-format msgid "Lease %s in lockspace %s does not exist" msgstr "" -#: src/qemu/qemu_driver.c:5521 +#: src/qemu/qemu_driver.c:5520 #, c-format msgid "mac %s doesn't exist" msgstr "" -#: src/qemu/qemu_driver.c:5592 +#: src/qemu/qemu_driver.c:5591 msgid "cannot do live update a device on inactive domain" msgstr "" -#: src/qemu/qemu_driver.c:5867 src/qemu/qemu_driver.c:6686 -#: src/qemu/qemu_driver.c:6960 -msgid "cgroup CPU controller is not mounted" -msgstr "" - -#: src/lxc/lxc_driver.c:1926 src/lxc/lxc_driver.c:1984 -#: src/qemu/qemu_driver.c:6003 src/qemu/qemu_driver.c:6074 +#: src/qemu/qemu_driver.c:5964 #, c-format -msgid "No such domain %s" -msgstr "没有域 %s" - -#: src/qemu/qemu_driver.c:5932 src/qemu/qemu_driver.c:6079 -msgid "blkio cgroup isn't mounted" -msgstr "" - -#: src/qemu/qemu_driver.c:5962 src/qemu/qemu_driver.c:5996 -msgid "invalid type for blkio weight tunable, expected a 'unsigned int'" -msgstr "" - -#: src/qemu/qemu_driver.c:5969 src/qemu/qemu_driver.c:6003 -msgid "out of blkio weight range." +msgid "unable to parse %s" msgstr "" -#: src/qemu/qemu_driver.c:5977 -msgid "unable to set blkio weight tunable" +#: src/qemu/qemu_driver.c:6101 src/qemu/qemu_driver.c:6173 +msgid "invalid type for device_weight tunable, expected a 'char *'" msgstr "" -#: src/qemu/qemu_driver.c:6112 -msgid "unable to get blkio weight" +#: src/qemu/qemu_driver.c:6119 +#, c-format +msgid "Unable to set io device weight for path %s" msgstr "" -#: src/qemu/qemu_driver.c:6211 src/qemu/qemu_driver.c:6369 +#: src/qemu/qemu_driver.c:6476 src/qemu/qemu_driver.c:6638 msgid "cgroup memory controller is not mounted" msgstr "" -#: src/qemu/qemu_driver.c:6552 src/qemu/qemu_driver.c:6818 -msgid "unable to get cpu bandwidth tunable" -msgstr "" - -#: src/qemu/qemu_driver.c:6559 src/qemu/qemu_driver.c:6811 -msgid "unable to get cpu bandwidth period tunable" -msgstr "" - -#: src/qemu/qemu_driver.c:6602 +#: src/qemu/qemu_driver.c:6871 #, c-format msgid "Unable to find vcpu cgroup for %s(vcpu: %d)" msgstr "" -#: src/qemu/qemu_driver.c:6020 -msgid "invalid type for cpu_shares tunable, expected a 'ullong'" -msgstr "" - -#: src/qemu/qemu_driver.c:6027 -msgid "unable to set cpu shares tunable" -msgstr "" - -#: src/qemu/qemu_driver.c:6724 -msgid "invalid type for vcpu_period tunable, expected a 'ullong'" -msgstr "" - -#: src/qemu/qemu_driver.c:6744 -msgid "invalid type for vcpu_quota tunable, expected a 'llong'" -msgstr "" - -#: src/qemu/qemu_driver.c:6850 +#: src/qemu/qemu_driver.c:7119 #, c-format msgid "Unable to find vcpu cgroup for %s(vcpu: 0)" msgstr "" -#: src/qemu/qemu_driver.c:6893 -msgid "cannot query live and config together" -msgstr "" - -#: src/qemu/qemu_driver.c:6924 -msgid "cannot query persistent config of a transient domain" -msgstr "" - -#: src/qemu/qemu_driver.c:6934 -msgid "can't get persistentDef" +#: src/qemu/qemu_driver.c:7333 +msgid "empty path" msgstr "" -#: src/qemu/qemu_driver.c:6087 -msgid "unable to get cpu shares tunable" +#: src/qemu/qemu_driver.c:7339 +#, c-format +msgid "size must be less than %llu" msgstr "" -#: src/qemu/qemu_driver.c:6153 src/test/test_driver.c:2602 +#: 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:7091 src/qemu/qemu_driver.c:7180 +#: 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 "" -#: src/qemu/qemu_driver.c:6225 src/test/test_driver.c:2657 +#: 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' 是未知接口" -#: src/qemu/qemu_driver.c:7410 +#: src/qemu/qemu_driver.c:7757 msgid "interface stats not implemented on this platform" msgstr "" -#: src/qemu/qemu_driver.c:6305 src/uml/uml_driver.c:1802 +#: 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:7496 src/uml/uml_driver.c:2349 +#: src/qemu/qemu_driver.c:7843 src/uml/uml_driver.c:2335 #, c-format msgid "invalid path '%s'" msgstr "" -#: src/qemu/qemu_driver.c:6324 +#: src/qemu/qemu_driver.c:7852 #, c-format msgid "%s: failed to open" msgstr "%s:打开文件失败" -#: src/qemu/qemu_driver.c:6335 +#: src/qemu/qemu_driver.c:7863 #, c-format msgid "%s: failed to seek or read" msgstr "%s:查找并读取失败" -#: src/libvirt.c:4420 src/qemu/qemu_driver.c:6378 +#: 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:6421 +#: 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:7661 +#: src/qemu/qemu_driver.c:8008 #, c-format msgid "invalid path %s not assigned to domain" msgstr "" -#: src/qemu/qemu_driver.c:7667 +#: src/qemu/qemu_driver.c:8014 #, c-format msgid "disk %s does not currently have a source assigned" msgstr "" -#: src/qemu/qemu_driver.c:7677 +#: src/qemu/qemu_driver.c:8024 #, c-format msgid "failed to open path '%s'" msgstr "" -#: src/qemu/qemu_driver.c:7685 +#: src/qemu/qemu_driver.c:8032 #, c-format msgid "unknown disk format %s for %s" msgstr "" -#: src/storage/storage_backend.c:846 +#: 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:7736 +#: src/qemu/qemu_driver.c:8083 #, c-format msgid "failed to seek to end of %s" msgstr "" -#: src/qemu/qemu_driver.c:6833 src/qemu/qemu_driver.c:7001 +#: 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_driver.c:6838 +#: src/qemu/qemu_driver.c:8241 src/qemu/qemu_driver.c:8581 msgid "PrepareTunnel called but no TUNNELLED flag set" msgstr "" -#: src/qemu/qemu_driver.c:6843 +#: src/qemu/qemu_driver.c:8246 src/qemu/qemu_driver.c:8586 msgid "tunnelled migration requested but NULL stream passed" msgstr "" -#: src/qemu/qemu_driver.c:7905 src/qemu/qemu_driver.c:7945 -#: src/qemu/qemu_driver.c:8000 +#: 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 "" -#: src/qemu/qemu_driver.c:6995 +#: src/qemu/qemu_driver.c:8302 src/qemu/qemu_driver.c:8535 msgid "Tunnelled migration requested but invalid RPC method called" msgstr "" -#: src/qemu/qemu_driver.c:8136 src/qemu/qemu_migration.c:1199 +#: src/qemu/qemu_driver.c:8483 src/qemu/qemu_migration.c:1207 msgid "domain disappeared" msgstr "" -#: src/qemu/qemu_driver.c:7811 src/xen/xen_driver.c:1705 +#: 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:8636 +#: src/qemu/qemu_driver.c:8983 msgid "no job is active on the domain" msgstr "" -#: src/qemu/qemu_driver.c:8640 +#: src/qemu/qemu_driver.c:8987 msgid "cannot abort incoming migration; use virDomainDestroy instead" msgstr "" -#: src/qemu/qemu_driver.c:8698 +#: src/qemu/qemu_driver.c:9045 msgid "domain is not being migrated" msgstr "" -#: src/qemu/qemu_driver.c:8821 +#: src/qemu/qemu_driver.c:9168 #, c-format msgid "Disk '%s' does not support snapshotting" msgstr "" -#: src/qemu/qemu_driver.c:8907 src/qemu/qemu_driver.c:9214 +#: src/qemu/qemu_driver.c:9254 src/qemu/qemu_driver.c:9561 msgid "resuming after snapshot failed" msgstr "" -#: src/qemu/qemu_driver.c:8937 +#: src/qemu/qemu_driver.c:9284 #, c-format msgid "" "active qemu domains require external disk snapshots; disk %s requested " "internal" msgstr "" -#: src/qemu/qemu_driver.c:8945 +#: src/qemu/qemu_driver.c:9292 #, c-format msgid "internal snapshot for disk %s unsupported for storage type %s" msgstr "" -#: src/qemu/qemu_driver.c:8963 +#: src/qemu/qemu_driver.c:9310 #, c-format msgid "external snapshot format for disk %s is unsupported: %s" msgstr "" -#: src/qemu/qemu_driver.c:8971 +#: src/qemu/qemu_driver.c:9318 #, c-format msgid "unable to stat for disk %s: %s" msgstr "" -#: src/qemu/qemu_driver.c:8977 +#: 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 "" -#: src/qemu/qemu_driver.c:8991 src/qemu/qemu_driver.c:9031 +#: src/qemu/qemu_driver.c:9338 src/qemu/qemu_driver.c:9378 msgid "unexpected code path" msgstr "" -#: src/qemu/qemu_driver.c:8998 +#: src/qemu/qemu_driver.c:9345 msgid "disk snapshots require at least one disk to be selected for snapshot" msgstr "" -#: src/qemu/qemu_driver.c:9282 +#: src/qemu/qemu_driver.c:9629 msgid "cannot halt after transient domain snapshot" msgstr "" -#: src/qemu/qemu_driver.c:9296 +#: src/qemu/qemu_driver.c:9643 #, c-format msgid "cannot set snapshot %s as its own parent" msgstr "" -#: src/qemu/qemu_driver.c:9303 +#: src/qemu/qemu_driver.c:9650 #, c-format msgid "parent %s for snapshot %s not found" msgstr "" -#: src/qemu/qemu_driver.c:9310 +#: src/qemu/qemu_driver.c:9657 #, c-format msgid "parent %s would create cycle to %s" msgstr "" -#: src/qemu/qemu_driver.c:9328 +#: src/qemu/qemu_driver.c:9675 #, c-format msgid "definition for snapshot %s must use uuid %s" msgstr "" -#: src/qemu/qemu_driver.c:9339 +#: src/qemu/qemu_driver.c:9686 #, c-format msgid "" "cannot change between online and offline snapshot state in snapshot %s" msgstr "" -#: src/qemu/qemu_driver.c:9347 +#: src/qemu/qemu_driver.c:9694 #, c-format msgid "" "cannot change between disk snapshot and system checkpoint in snapshot %s" msgstr "" -#: src/qemu/qemu_driver.c:9447 +#: src/qemu/qemu_driver.c:9794 msgid "disk snapshots of inactive domains not implemented yet" msgstr "" -#: src/qemu/qemu_driver.c:9597 src/qemu/qemu_driver.c:9637 -#: src/qemu/qemu_driver.c:9744 src/qemu/qemu_driver.c:9822 -#: src/qemu/qemu_driver.c:9892 src/qemu/qemu_driver.c:10253 +#: 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 "" -#: src/qemu/qemu_driver.c:9679 +#: src/qemu/qemu_driver.c:10026 #, c-format msgid "no snapshot with matching name '%s'" msgstr "" -#: src/qemu/qemu_driver.c:9786 +#: src/qemu/qemu_driver.c:10133 msgid "the domain does not have a current snapshot" msgstr "" -#: src/qemu/qemu_driver.c:9903 +#: 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:9909 +#: src/qemu/qemu_driver.c:10256 msgid "revert to external disk snapshot not supported yet" msgstr "" -#: src/qemu/qemu_driver.c:9916 +#: src/qemu/qemu_driver.c:10263 #, c-format msgid "snapshot '%s' lacks domain '%s' rollback info" msgstr "" -#: src/qemu/qemu_driver.c:9926 +#: src/qemu/qemu_driver.c:10273 msgid "must respawn qemu to start inactive snapshot" msgstr "" -#: src/qemu/qemu_driver.c:10268 +#: src/qemu/qemu_driver.c:10615 #, c-format msgid "deletion of %d external disk snapshots not supported yet" msgstr "" -#: src/qemu/qemu_driver.c:10295 +#: src/qemu/qemu_driver.c:10642 #, c-format msgid "failed to set snapshot '%s' as current" msgstr "" -#: src/qemu/qemu_driver.c:10427 +#: src/qemu/qemu_driver.c:10774 #, c-format msgid "No monitor connection for pid %u" msgstr "" -#: src/qemu/qemu_driver.c:10433 +#: src/qemu/qemu_driver.c:10780 #, c-format msgid "Cannot connect to monitor connection of type '%s' for pid %u" msgstr "" -#: src/qemu/qemu_driver.c:10544 +#: src/qemu/qemu_driver.c:10891 #, c-format msgid "cannot find character device %s" msgstr "" -#: src/qemu/qemu_driver.c:10594 +#: src/qemu/qemu_driver.c:10942 msgid "No device found for specified path" msgstr "" -#: src/qemu/qemu_driver.c:10730 +#: src/qemu/qemu_driver.c:11078 #, c-format msgid "No graphics backend with index %d" msgstr "" -#: src/qemu/qemu_driver.c:10742 +#: src/qemu/qemu_driver.c:11090 #, c-format msgid "Can only open VNC or SPICE graphics backends, not %s" msgstr "" +#: src/qemu/qemu_driver.c:11187 +#, c-format +msgid "expected unsigned long long for parameter %s" +msgstr "" + +#: src/qemu/qemu_driver.c:11211 +#, c-format +msgid "Unrecognized parameter %s" +msgstr "" + +#: src/qemu/qemu_driver.c:11220 +msgid "total and read/write of bytes_sec cannot be set at the same time" +msgstr "" + +#: src/qemu/qemu_driver.c:11227 +msgid "total and read/write of iops_sec cannot be set at the same time" +msgstr "" + +#: src/qemu/qemu_driver.c:11246 +msgid "Write to config file failed" +msgstr "" + #: src/qemu/qemu_hostdev.c:189 #, c-format msgid "PCI device %s is not assignable" @@ -10065,7 +10570,7 @@ msgid "SCSI controller %d was missing its PCI address" msgstr "" -#: src/qemu/qemu_driver.c:5165 +#: src/qemu/qemu_hotplug.c:658 msgid "installed qemu version does not support host_net_add" msgstr "" @@ -10085,12 +10590,12 @@ msgid "guest unexpectedly quit during hotplug" msgstr "" -#: src/qemu/qemu_driver.c:5375 src/qemu/qemu_driver.c:5769 +#: src/qemu/qemu_hotplug.c:1092 src/qemu/qemu_hotplug.c:2145 #, c-format msgid "hostdev mode '%s' not supported" msgstr "" -#: src/qemu/qemu_driver.c:5393 src/qemu/qemu_driver.c:5780 +#: src/qemu/qemu_hotplug.c:1133 src/qemu/qemu_hotplug.c:2159 #, c-format msgid "hostdev subsys type '%s' not supported" msgstr "" @@ -10175,13 +10680,13 @@ msgstr "" #: src/qemu/qemu_hotplug.c:1513 src/qemu/qemu_hotplug.c:1760 -#: src/qemu/qemu_hotplug.c:1996 +#: src/qemu/qemu_hotplug.c:1995 #, c-format msgid "cannot hot unplug multifunction PCI device: %s" msgstr "" #: src/qemu/qemu_hotplug.c:1530 src/qemu/qemu_hotplug.c:1754 -#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2004 +#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2003 msgid "device cannot be detached without a PCI address" msgstr "" @@ -10199,7 +10704,7 @@ msgid "device cannot be detached: device is busy" msgstr "" -#: src/qemu/qemu_driver.c:5612 +#: src/qemu/qemu_hotplug.c:1839 #, c-format msgid "network device %02x:%02x:%02x:%02x:%02x:%02x not found" msgstr "" @@ -10213,316 +10718,320 @@ msgid "unable to determine original VLAN" msgstr "" -#: src/qemu/qemu_driver.c:5646 +#: src/qemu/qemu_hotplug.c:1927 #, c-format msgid "failed to remove ebtables rule on '%s'" msgstr "" -#: src/qemu/qemu_driver.c:5699 +#: src/qemu/qemu_hotplug.c:1985 #, c-format msgid "host pci device %.4x:%.2x:%.2x.%.1x not found" msgstr "" -#: src/qemu/qemu_hotplug.c:2094 +#: src/qemu/qemu_hotplug.c:2093 #, c-format msgid "host usb device %03d.%03d not found" msgstr "" -#: src/qemu/qemu_hotplug.c:2102 +#: src/qemu/qemu_hotplug.c:2101 msgid "device cannot be detached without a device alias" msgstr "" -#: src/qemu/qemu_hotplug.c:2108 +#: src/qemu/qemu_hotplug.c:2107 msgid "device cannot be detached with this QEMU version" msgstr "" -#: src/qemu/qemu_hotplug.c:2200 +#: src/qemu/qemu_hotplug.c:2199 msgid "Graphics password only supported for VNC" msgstr "" -#: src/qemu/qemu_hotplug.c:2226 +#: src/qemu/qemu_hotplug.c:2225 msgid "Expiry of passwords is not supported" msgstr "" -#: src/qemu/qemu_migration.c:163 +#: src/qemu/qemu_migration.c:164 #, c-format msgid "unable to read server cert %s" msgstr "" -#: src/qemu/qemu_migration.c:170 +#: src/qemu/qemu_migration.c:171 #, c-format msgid "cannot initialize cert object: %s" msgstr "" -#: src/qemu/qemu_migration.c:181 +#: src/qemu/qemu_migration.c:182 #, c-format msgid "cannot load cert data from %s: %s" msgstr "" -#: src/qemu/qemu_migration.c:276 +#: src/qemu/qemu_migration.c:277 msgid "Unable to obtain host UUID" msgstr "" -#: src/qemu/qemu_migration.c:297 +#: src/qemu/qemu_migration.c:298 msgid "Migration graphics data already present" msgstr "" -#: src/qemu/qemu_migration.c:323 +#: src/qemu/qemu_migration.c:324 msgid "Migration lockstate data already present" msgstr "" -#: src/qemu/qemu_migration.c:354 +#: src/qemu/qemu_migration.c:355 msgid "Migration persistent data already present" msgstr "" -#: src/qemu/qemu_migration.c:469 +#: src/qemu/qemu_migration.c:470 msgid "missing type attribute in migration data" msgstr "" -#: src/qemu/qemu_migration.c:474 +#: src/qemu/qemu_migration.c:475 #, c-format msgid "unknown graphics type %s" msgstr "" -#: src/qemu/qemu_migration.c:481 +#: src/qemu/qemu_migration.c:482 msgid "missing port attribute in migration data" msgstr "" -#: src/qemu/qemu_migration.c:487 +#: src/qemu/qemu_migration.c:488 msgid "missing tlsPort attribute in migration data" msgstr "" -#: src/qemu/qemu_migration.c:493 +#: src/qemu/qemu_migration.c:494 msgid "missing listen attribute in migration data" msgstr "" -#: src/qemu/qemu_migration.c:530 +#: src/qemu/qemu_migration.c:531 msgid "missing name element in migration data" msgstr "" -#: src/qemu/qemu_migration.c:535 +#: src/qemu/qemu_migration.c:536 #, c-format msgid "Incoming cookie data had unexpected name %s vs %s" msgstr "" -#: src/qemu/qemu_migration.c:545 +#: src/qemu/qemu_migration.c:546 msgid "missing uuid element in migration data" msgstr "" -#: src/qemu/qemu_migration.c:551 +#: src/qemu/qemu_migration.c:552 #, c-format msgid "Incoming cookie data had unexpected UUID %s vs %s" msgstr "" -#: src/qemu/qemu_migration.c:559 +#: src/qemu/qemu_migration.c:560 msgid "missing hostname element in migration data" msgstr "" -#: src/qemu/qemu_migration.c:564 src/qemu/qemu_migration.c:581 +#: 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 "" -#: src/qemu/qemu_migration.c:571 +#: src/qemu/qemu_migration.c:572 msgid "missing hostuuid element in migration data" msgstr "" -#: src/qemu/qemu_migration.c:576 +#: src/qemu/qemu_migration.c:577 msgid "malformed hostuuid element in migration data" msgstr "" -#: src/qemu/qemu_migration.c:597 +#: src/qemu/qemu_migration.c:598 msgid "missing feature name" msgstr "" -#: src/qemu/qemu_migration.c:603 +#: src/qemu/qemu_migration.c:604 #, c-format msgid "Unknown migration cookie feature %s" msgstr "" -#: src/qemu/qemu_migration.c:611 +#: src/qemu/qemu_migration.c:612 #, c-format msgid "Unsupported migration cookie feature %s" msgstr "" -#: src/qemu/qemu_migration.c:629 +#: src/qemu/qemu_migration.c:630 msgid "Missing lock driver name in migration cookie" msgstr "" -#: src/qemu/qemu_migration.c:641 +#: src/qemu/qemu_migration.c:642 #, c-format msgid "Too many domain elements in migration cookie: %d" msgstr "" -#: src/qemu/qemu_migration.c:677 +#: src/qemu/qemu_migration.c:678 msgid "(qemu_migration_cookie)" msgstr "" -#: src/qemu/qemu_migration.c:739 +#: src/qemu/qemu_migration.c:740 msgid "Migration cookie was not NULL terminated" msgstr "" -#: src/qemu/qemu_migration.c:759 +#: src/qemu/qemu_migration.c:760 #, c-format msgid "Missing %s lock state for migration cookie" msgstr "" -#: src/qemu/qemu_migration.c:766 +#: src/qemu/qemu_migration.c:767 #, c-format msgid "Source host lock driver %s different from target %s" msgstr "" -#: src/qemu/qemu_migration.c:803 +#: src/qemu/qemu_migration.c:804 #, c-format msgid "cannot migrate domain with %d snapshots" msgstr "" -#: src/qemu/qemu_migration.c:812 +#: src/qemu/qemu_migration.c:813 msgid "Domain with assigned host devices cannot be migrated" msgstr "" -#: src/qemu/qemu_migration.c:879 +#: src/qemu/qemu_migration.c:880 msgid "is not active" msgstr "" -#: src/qemu/qemu_migration.c:902 +#: src/qemu/qemu_migration.c:903 msgid "unexpectedly failed" msgstr "" -#: src/qemu/qemu_migration.c:908 +#: src/qemu/qemu_migration.c:909 msgid "canceled by client" msgstr "" -#: src/qemu/qemu_migration.c:925 src/qemu/qemu_migration.c:1625 +#: src/qemu/qemu_migration.c:927 src/qemu/qemu_migration.c:1634 msgid "migration job" msgstr "" -#: src/qemu/qemu_migration.c:928 +#: src/qemu/qemu_migration.c:930 msgid "domain save job" msgstr "" -#: src/qemu/qemu_migration.c:931 +#: src/qemu/qemu_migration.c:933 msgid "domain core dump job" msgstr "" -#: src/qemu/qemu_migration.c:934 +#: src/qemu/qemu_migration.c:936 msgid "job" msgstr "" -#: src/qemu/qemu_migration.c:1044 +#: src/qemu/qemu_migration.c:950 +msgid "Lost connection to destination host" +msgstr "" + +#: src/qemu/qemu_migration.c:1052 msgid "target domain name doesn't match source name nor destination name" msgstr "" -#: src/qemu/qemu_migration.c:1141 src/qemu/qemu_migration.c:1817 +#: 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:1161 +#: src/qemu/qemu_migration.c:1169 msgid "cannot pass pipe for tunnelled migration" msgstr "" -#: src/qemu/qemu_migration.c:1307 +#: src/qemu/qemu_migration.c:1315 msgid "" "hostname on destination resolved to localhost, but migration requires an FQDN" msgstr "" -#: src/qemu/qemu_driver.c:7042 +#: src/qemu/qemu_migration.c:1337 msgid "only tcp URIs are supported for KVM/QEMU migrations" msgstr "" -#: src/qemu/qemu_driver.c:7065 +#: src/qemu/qemu_migration.c:1361 msgid "URI ended with incorrect ':port'" msgstr "" -#: src/qemu/qemu_driver.c:7233 +#: src/qemu/qemu_migration.c:1449 msgid "tunnelled migration failed to read from qemu" msgstr "" -#: src/qemu/qemu_migration.c:1487 +#: src/qemu/qemu_migration.c:1495 msgid "Unable to create migration thread" msgstr "" -#: src/qemu/qemu_migration.c:1544 +#: src/qemu/qemu_migration.c:1553 #, c-format msgid "Migration with lock driver %s requires cookie support" msgstr "" -#: src/qemu/qemu_migration.c:1633 +#: src/qemu/qemu_migration.c:1642 msgid "failed to accept connection from qemu" msgstr "" -#: src/qemu/qemu_driver.c:7177 +#: src/qemu/qemu_migration.c:1737 #, c-format msgid "cannot parse URI %s" msgstr "" -#: src/qemu/qemu_driver.c:7337 +#: src/qemu/qemu_migration.c:1807 msgid "Source qemu is too old to support tunnelled migration" msgstr "" -#: src/qemu/qemu_driver.c:7516 +#: src/qemu/qemu_migration.c:2233 #, c-format msgid "Failed to connect to remote libvirt URI %s" msgstr "" -#: src/qemu/qemu_driver.c:7522 +#: src/qemu/qemu_migration.c:2254 msgid "Destination libvirt does not support peer-to-peer migration protocol" msgstr "" -#: src/qemu/qemu_migration.c:2352 src/qemu/qemu_migration.c:2425 +#: src/qemu/qemu_migration.c:2368 src/qemu/qemu_migration.c:2441 #, c-format msgid "Failed to resume guest %s after failure" msgstr "" -#: src/qemu/qemu_migration.c:2486 +#: src/qemu/qemu_migration.c:2502 msgid "received unexpected cookie with P2P migration" msgstr "" -#: src/qemu/qemu_migration.c:2497 +#: src/qemu/qemu_migration.c:2513 msgid "Unexpected dconnuri parameter with non-peer2peer migration" msgstr "" -#: src/qemu/qemu_migration.c:2639 +#: src/qemu/qemu_migration.c:2650 msgid "can't get vmdef" msgstr "" -#: src/qemu/qemu_migration.c:2913 +#: src/qemu/qemu_migration.c:2914 msgid "Unable to set cloexec flag" msgstr "" -#: src/qemu/qemu_migration.c:3007 +#: src/qemu/qemu_migration.c:3001 #, c-format msgid "migration protocol going backwards %s => %s" msgstr "" -#: src/qemu/qemu_migration.c:3041 +#: src/qemu/qemu_migration.c:3035 #, c-format msgid "domain '%s' is not processing incoming migration" msgstr "" -#: src/qemu/qemu_migration.c:3043 +#: src/qemu/qemu_migration.c:3037 #, c-format msgid "domain '%s' is not being migrated" msgstr "" -#: src/qemu/qemu_monitor.c:236 +#: src/qemu/qemu_monitor.c:226 msgid "failed to create socket" msgstr "" -#: src/qemu/qemu_monitor.c:244 +#: src/qemu/qemu_monitor.c:234 #, c-format msgid "Monitor path %s too big for destination" msgstr "" -#: src/qemu/qemu_monitor.c:261 +#: src/qemu/qemu_monitor.c:252 msgid "failed to connect to monitor socket" msgstr "" -#: src/qemu/qemu_monitor.c:268 +#: src/qemu/qemu_monitor.c:259 msgid "monitor socket did not show up." msgstr "" -#: src/qemu/qemu_monitor.c:286 +#: src/qemu/qemu_monitor.c:277 #, c-format msgid "Unable to open monitor path %s" msgstr "无法打开监控器路径 %s" @@ -10566,32 +11075,32 @@ msgid "Error while processing monitor IO" msgstr "" -#: src/qemu/qemu_monitor.c:573 +#: src/qemu/qemu_monitor.c:646 msgid "EOF notify callback must be supplied" msgstr "" -#: src/qemu/qemu_monitor.c:584 +#: src/qemu/qemu_monitor.c:657 msgid "cannot initialize monitor mutex" msgstr "" -#: src/qemu/qemu_monitor.c:590 +#: src/qemu/qemu_monitor.c:663 msgid "cannot initialize monitor condition" msgstr "" -#: src/qemu/qemu_monitor.c:614 +#: src/qemu/qemu_monitor.c:687 #, c-format msgid "unable to handle monitor type: %s" msgstr "" -#: src/qemu/qemu_monitor.c:623 +#: src/qemu/qemu_monitor.c:696 msgid "Unable to set monitor close-on-exec flag" msgstr "无法为监视器设定 close-on-exec 标签" -#: src/qemu/qemu_monitor.c:628 +#: src/qemu/qemu_monitor.c:701 msgid "Unable to put monitor into non-blocking mode" msgstr "无法将监视器置于无阻塞模式" -#: src/qemu/qemu_monitor.c:640 +#: src/qemu/qemu_monitor.c:713 msgid "unable to register monitor events" msgstr "" @@ -10605,29 +11114,29 @@ #: 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:1320 src/qemu/qemu_monitor.c:1366 -#: src/qemu/qemu_monitor.c:1398 src/qemu/qemu_monitor.c:1420 -#: src/qemu/qemu_monitor.c:1439 src/qemu/qemu_monitor.c:1460 -#: src/qemu/qemu_monitor.c:1483 src/qemu/qemu_monitor.c:1506 -#: src/qemu/qemu_monitor.c:1528 src/qemu/qemu_monitor.c:1548 -#: src/qemu/qemu_monitor.c:1568 src/qemu/qemu_monitor.c:1591 -#: src/qemu/qemu_monitor.c:1619 src/qemu/qemu_monitor.c:1652 -#: src/qemu/qemu_monitor.c:1684 src/qemu/qemu_monitor.c:1726 -#: src/qemu/qemu_monitor.c:1791 src/qemu/qemu_monitor.c:1816 -#: src/qemu/qemu_monitor.c:1866 src/qemu/qemu_monitor.c:1887 -#: src/qemu/qemu_monitor.c:1908 src/qemu/qemu_monitor.c:1931 -#: src/qemu/qemu_monitor.c:1954 src/qemu/qemu_monitor.c:1975 -#: src/qemu/qemu_monitor.c:1997 src/qemu/qemu_monitor.c:2019 -#: src/qemu/qemu_monitor.c:2057 src/qemu/qemu_monitor.c:2088 -#: src/qemu/qemu_monitor.c:2127 src/qemu/qemu_monitor.c:2152 -#: src/qemu/qemu_monitor.c:2189 src/qemu/qemu_monitor.c:2210 -#: src/qemu/qemu_monitor.c:2231 src/qemu/qemu_monitor.c:2257 -#: src/qemu/qemu_monitor.c:2277 src/qemu/qemu_monitor.c:2296 -#: src/qemu/qemu_monitor.c:2315 src/qemu/qemu_monitor.c:2338 -#: src/qemu/qemu_monitor.c:2372 src/qemu/qemu_monitor.c:2393 -#: src/qemu/qemu_monitor.c:2412 src/qemu/qemu_monitor.c:2431 -#: src/qemu/qemu_monitor.c:2450 src/qemu/qemu_monitor.c:2474 -#: src/qemu/qemu_monitor.c:2541 src/qemu/qemu_monitor.c:2633 +#: 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 "" @@ -10639,21 +11148,21 @@ msgid "monitor || name must not be NULL" msgstr "" -#: src/qemu/qemu_monitor.c:1343 +#: src/qemu/qemu_monitor.c:1358 #, c-format msgid "unsupported protocol type %s" msgstr "" -#: src/qemu/qemu_monitor.c:1732 +#: src/qemu/qemu_monitor.c:1747 #, c-format msgid "file offset must be a multiple of %llu" msgstr "" -#: src/qemu/qemu_monitor.c:2025 +#: src/qemu/qemu_monitor.c:2040 msgid "fd must be valid" msgstr "" -#: src/qemu/qemu_monitor.c:2031 +#: src/qemu/qemu_monitor.c:2046 #, c-format msgid "qemu is not using a unix socket monitor, cannot send fd %s" msgstr "" @@ -10691,12 +11200,12 @@ msgid "unable to execute QEMU command '%s': %s" msgstr "" -#: src/qemu/qemu_monitor_json.c:384 +#: src/qemu/qemu_monitor_json.c:388 #, c-format msgid "argument key '%s' is too short, missing type prefix" msgstr "" -#: src/qemu/qemu_monitor_json.c:433 +#: src/qemu/qemu_monitor_json.c:442 #, c-format msgid "unsupported data type '%c' for arg '%s'" msgstr "" @@ -10730,7 +11239,7 @@ msgid "cpu information was empty" msgstr "" -#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2557 +#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2589 msgid "character device information was missing array element" msgstr "" @@ -10805,25 +11314,32 @@ msgid "cannot find info for device '%s'" msgstr "" -#: src/qemu/qemu_monitor_json.c:649 +#: 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:659 src/qemu/qemu_monitor_json.c:665 +#: 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:676 +#: 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:682 src/qemu/qemu_monitor_json.c:688 -#: src/qemu/qemu_monitor_json.c:694 src/qemu/qemu_monitor_json.c:700 +#: 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 "" -#: src/qemu/qemu_monitor_json.c:708 +#: src/qemu/qemu_monitor_json.c:1599 src/qemu/qemu_monitor_json.c:1767 #, c-format msgid "cannot find statistics for device '%s'" msgstr "" @@ -10832,176 +11348,222 @@ msgid "blockstats parent entry was not in expected format" msgstr "" -#: src/qemu/qemu_monitor_json.c:923 +#: src/qemu/qemu_monitor_json.c:2147 msgid "info migration reply was missing return data" msgstr "" -#: src/qemu/qemu_monitor_json.c:929 +#: src/qemu/qemu_monitor_json.c:2153 msgid "info migration reply was missing return status" msgstr "" -#: src/qemu/qemu_monitor_json.c:935 src/qemu/qemu_monitor_text.c:969 +#: 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 "" -#: src/qemu/qemu_monitor_json.c:943 +#: src/qemu/qemu_monitor_json.c:2167 msgid "migration was active, but no RAM info was set" msgstr "" -#: src/qemu/qemu_monitor_json.c:949 +#: src/qemu/qemu_monitor_json.c:2174 msgid "migration was active, but RAM 'transferred' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:954 +#: src/qemu/qemu_monitor_json.c:2180 msgid "migration was active, but RAM 'remaining' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:959 +#: src/qemu/qemu_monitor_json.c:2186 msgid "migration was active, but RAM 'total' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:2166 +#: src/qemu/qemu_monitor_json.c:2198 msgid "disk migration was active, but 'transferred' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:2173 +#: src/qemu/qemu_monitor_json.c:2205 msgid "disk migration was active, but 'remaining' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:2180 +#: src/qemu/qemu_monitor_json.c:2212 msgid "disk migration was active, but 'total' data was missing" msgstr "" -#: src/qemu/qemu_monitor_json.c:2309 src/qemu/qemu_monitor_json.c:2319 -#: src/qemu/qemu_monitor_json.c:2329 +#: src/qemu/qemu_monitor_json.c:2341 src/qemu/qemu_monitor_json.c:2351 +#: src/qemu/qemu_monitor_json.c:2361 msgid "usb_add not suppported in JSON mode" msgstr "" -#: src/qemu/qemu_monitor_json.c:2339 src/qemu/qemu_monitor_json.c:2350 -#: src/qemu/qemu_monitor_json.c:2360 src/qemu/qemu_monitor_json.c:2626 +#: src/qemu/qemu_monitor_json.c:2371 src/qemu/qemu_monitor_json.c:2382 +#: src/qemu/qemu_monitor_json.c:2392 src/qemu/qemu_monitor_json.c:2658 msgid "pci_add not suppported in JSON mode" msgstr "" -#: src/qemu/qemu_monitor_json.c:2369 +#: src/qemu/qemu_monitor_json.c:2401 msgid "pci_del not suppported in JSON mode" msgstr "" -#: src/qemu/qemu_monitor_json.c:2541 +#: src/qemu/qemu_monitor_json.c:2573 msgid "character device reply was missing return data" msgstr "" -#: src/qemu/qemu_monitor_json.c:2547 +#: src/qemu/qemu_monitor_json.c:2579 msgid "character device information was not an array" msgstr "" -#: src/qemu/qemu_monitor_json.c:2563 src/qemu/qemu_monitor_json.c:2569 +#: 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_text.c:1744 +#: src/qemu/qemu_monitor_json.c:2614 src/qemu/qemu_monitor_text.c:2398 #, c-format msgid "failed to save chardev path '%s'" msgstr "" -#: src/qemu/qemu_monitor_json.c:2640 +#: src/qemu/qemu_monitor_json.c:2672 msgid "drive_add reply was missing device address" msgstr "" -#: src/qemu/qemu_monitor_json.c:2646 +#: src/qemu/qemu_monitor_json.c:2678 msgid "drive_add reply was missing device bus number" msgstr "" -#: src/qemu/qemu_monitor_json.c:2652 +#: src/qemu/qemu_monitor_json.c:2684 msgid "drive_add reply was missing device unit number" msgstr "" -#: src/qemu/qemu_monitor_json.c:2703 +#: src/qemu/qemu_monitor_json.c:2735 msgid "query-pci not suppported in JSON mode" msgstr "" -#: src/qemu/qemu_monitor_json.c:2822 +#: src/qemu/qemu_monitor_json.c:2854 msgid "" "deleting disk is not supported. This may leak data if disk is reassigned" msgstr "" -#: src/qemu/qemu_monitor_json.c:3007 +#: src/qemu/qemu_monitor_json.c:3039 msgid "" "HMP passthrough is not supported by qemu process; only QMP commands can be " "used" msgstr "" -#: src/qemu/qemu_monitor_json.c:3107 +#: src/qemu/qemu_monitor_json.c:3139 msgid "entry was missing 'device'" msgstr "" -#: src/qemu/qemu_monitor_json.c:3116 +#: src/qemu/qemu_monitor_json.c:3148 msgid "entry was missing 'type'" msgstr "" -#: src/qemu/qemu_monitor_json.c:3126 +#: src/qemu/qemu_monitor_json.c:3158 msgid "entry was missing 'speed'" msgstr "" -#: src/qemu/qemu_monitor_json.c:3133 +#: src/qemu/qemu_monitor_json.c:3165 msgid "entry was missing 'offset'" msgstr "" -#: src/qemu/qemu_monitor_json.c:3139 +#: src/qemu/qemu_monitor_json.c:3171 msgid "entry was missing 'len'" msgstr "" -#: src/qemu/qemu_monitor_json.c:3161 +#: src/qemu/qemu_monitor_json.c:3193 msgid "reply was missing return data" msgstr "" -#: src/qemu/qemu_monitor_json.c:3167 +#: src/qemu/qemu_monitor_json.c:3199 msgid "urecognized format of block job information" msgstr "" -#: src/qemu/qemu_monitor_json.c:3173 +#: src/qemu/qemu_monitor_json.c:3205 msgid "unable to determine array size" msgstr "" -#: src/qemu/qemu_monitor_json.c:3181 +#: src/qemu/qemu_monitor_json.c:3213 msgid "missing array element" msgstr "" -#: src/qemu/qemu_monitor_json.c:3229 src/qemu/qemu_monitor_text.c:3316 +#: 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 "" -#: src/qemu/qemu_monitor_json.c:3232 src/qemu/qemu_monitor_text.c:3308 +#: src/qemu/qemu_monitor_json.c:3264 src/qemu/qemu_monitor_text.c:3341 #, c-format msgid "Device %s in use" msgstr "" -#: src/qemu/qemu_monitor_json.c:3235 src/qemu/qemu_monitor_text.c:3328 +#: 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 "" -#: src/qemu/qemu_monitor_json.c:3238 src/qemu/qemu_monitor_text.c:3388 +#: 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 "" -#: src/qemu/qemu_monitor_json.c:3241 +#: 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 "" -#: src/qemu/qemu_monitor_text.c:173 -msgid "Password request seen, but no handler available" +#: src/qemu/qemu_monitor_json.c:3327 +msgid " block_io_throttle reply was missing device list" msgstr "" -#: src/qemu/qemu_monitor_text.c:321 -#, c-format -msgid "Unable to extract disk path from %s" +#: src/qemu/qemu_monitor_json.c:3338 src/qemu/qemu_monitor_json.c:3344 +msgid "block io throttle device entry was not in expected format" msgstr "" -#: src/qemu/qemu_monitor_text.c:354 -msgid "cannot stop CPU execution" +#: src/qemu/qemu_monitor_json.c:3358 +msgid "block io throttle inserted entry was not in expected format" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3364 +msgid "cannot read total_bytes_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3370 +msgid "cannot read read_bytes_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3376 +msgid "cannot read write_bytes_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3382 +msgid "cannot read total_iops_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3388 +msgid "cannot read read_iops_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3394 +msgid "cannot read write_iops_sec" +msgstr "" + +#: src/qemu/qemu_monitor_json.c:3402 +#, c-format +msgid "cannot find throttling info for device '%s'" +msgstr "" + +#: src/qemu/qemu_monitor_text.c:173 +msgid "Password request seen, but no handler available" +msgstr "" + +#: src/qemu/qemu_monitor_text.c:321 +#, c-format +msgid "Unable to extract disk path from %s" +msgstr "" + +#: src/qemu/qemu_monitor_text.c:389 +msgid "cannot stop CPU execution" msgstr "" #: src/qemu/qemu_monitor_text.c:410 @@ -11013,7 +11575,7 @@ msgid "unexpected reply from info status: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:367 +#: src/qemu/qemu_monitor_text.c:450 msgid "system shutdown operation failed" msgstr "" @@ -11033,7 +11595,7 @@ msgid "system reset operation failed" msgstr "" -#: src/qemu/qemu_monitor_text.c:386 +#: src/qemu/qemu_monitor_text.c:528 msgid "cannot run monitor command to fetch CPU thread info" msgstr "无法运行监视器命令提取 CPU 线程信息" @@ -11041,7 +11603,7 @@ msgid "could not query kvm status" msgstr "" -#: src/qemu/qemu_monitor_text.c:534 +#: src/qemu/qemu_monitor_text.c:716 msgid "could not query memory balloon allocation" msgstr "无法查询内存布尔值分配" @@ -11050,7 +11612,7 @@ msgid "unexpected balloon information '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:571 +#: src/qemu/qemu_monitor_text.c:760 msgid "could not query memory balloon statistics" msgstr "" @@ -11067,15 +11629,15 @@ msgid "no info for device '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:602 +#: src/qemu/qemu_monitor_text.c:884 src/qemu/qemu_monitor_text.c:1011 msgid "'info blockstats' command failed" msgstr "'info blockstats' 命令失败" -#: src/qemu/qemu_monitor_text.c:614 +#: 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:678 +#: src/qemu/qemu_monitor_text.c:994 #, c-format msgid "no stats found for device %s" msgstr "" @@ -11084,855 +11646,876 @@ msgid "unable to query block extent with this QEMU" msgstr "" -#: src/qemu/qemu_monitor_text.c:725 +#: src/qemu/qemu_monitor_text.c:1095 +msgid "failed to resize block" +msgstr "" + +#: src/qemu/qemu_monitor_text.c:1151 msgid "setting VNC password failed" msgstr "设定 VNC 密码失败" -#: src/qemu/qemu_monitor_text.c:1143 +#: src/qemu/qemu_monitor_text.c:1176 msgid "setting password failed" msgstr "" -#: src/qemu/qemu_monitor_text.c:1177 +#: src/qemu/qemu_monitor_text.c:1210 msgid "expiring password failed" msgstr "" -#: src/qemu/qemu_monitor_text.c:754 +#: src/qemu/qemu_monitor_text.c:1249 msgid "could not balloon memory allocation" msgstr "无法进行内存布尔值分配" -#: src/qemu/qemu_monitor_text.c:1253 +#: src/qemu/qemu_monitor_text.c:1286 msgid "could not change CPU online status" msgstr "" -#: src/qemu/qemu_monitor_text.c:787 src/qemu/qemu_monitor_text.c:831 +#: src/qemu/qemu_monitor_text.c:1321 #, c-format msgid "could not eject media on %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:796 src/qemu/qemu_monitor_text.c:840 +#: src/qemu/qemu_monitor_text.c:1330 #, c-format msgid "could not eject media on %s: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1332 +#: src/qemu/qemu_monitor_text.c:1365 #, c-format msgid "could not change media on %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1341 src/qemu/qemu_monitor_text.c:1348 +#: 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 "" -#: src/qemu/qemu_monitor_text.c:1384 +#: src/qemu/qemu_monitor_text.c:1417 #, c-format msgid "could not save memory region to '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:1431 +#: src/qemu/qemu_monitor_text.c:1464 msgid "could not restrict migration speed" msgstr "" -#: src/qemu/qemu_monitor_text.c:1458 +#: src/qemu/qemu_monitor_text.c:1491 msgid "could not set maximum migration downtime" msgstr "" -#: src/qemu/qemu_monitor_text.c:958 +#: src/qemu/qemu_monitor_text.c:1532 msgid "cannot query migration status" msgstr "" -#: src/qemu/qemu_monitor_text.c:982 +#: src/qemu/qemu_monitor_text.c:1561 #, c-format msgid "cannot parse migration data transferred statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:993 +#: src/qemu/qemu_monitor_text.c:1574 #, c-format msgid "cannot parse migration data remaining statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1004 +#: src/qemu/qemu_monitor_text.c:1587 #, c-format msgid "cannot parse migration data total statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1570 +#: src/qemu/qemu_monitor_text.c:1603 #, c-format msgid "cannot parse disk migration data transferred statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1583 +#: src/qemu/qemu_monitor_text.c:1616 #, c-format msgid "cannot parse disk migration data remaining statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1596 +#: src/qemu/qemu_monitor_text.c:1629 #, c-format msgid "cannot parse disk migration data total statistic %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1048 +#: src/qemu/qemu_monitor_text.c:1683 #, c-format msgid "unable to start migration to %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1055 +#: src/qemu/qemu_monitor_text.c:1690 #, c-format msgid "migration to '%s' failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1062 +#: src/qemu/qemu_monitor_text.c:1697 #, c-format msgid "migration to '%s' not supported by this qemu: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1159 +#: src/qemu/qemu_monitor_text.c:1718 msgid "cannot run monitor command to cancel migration" msgstr "" -#: src/qemu/qemu_monitor_text.c:1714 +#: src/qemu/qemu_monitor_text.c:1747 msgid "cannot run monitor command to relocate graphics client" msgstr "" -#: src/qemu/qemu_monitor_text.c:1188 +#: src/qemu/qemu_monitor_text.c:1778 msgid "cannot run monitor command to add usb disk" msgstr "" -#: src/qemu/qemu_monitor_text.c:1196 +#: src/qemu/qemu_monitor_text.c:1786 #, c-format msgid "unable to add USB disk %s: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1223 +#: src/qemu/qemu_monitor_text.c:1814 msgid "cannot attach usb device" msgstr "无法附加 usb 设备" -#: src/qemu/qemu_monitor_text.c:1231 +#: src/qemu/qemu_monitor_text.c:1822 msgid "adding usb device failed" msgstr "添加 usb 设备失败" -#: src/qemu/qemu_monitor_text.c:1371 +#: src/qemu/qemu_monitor_text.c:1955 msgid "cannot attach host pci device" msgstr "" -#: src/qemu/qemu_monitor_text.c:1386 src/qemu/qemu_monitor_text.c:1478 +#: src/qemu/qemu_monitor_text.c:1967 src/qemu/qemu_monitor_text.c:2054 #, c-format msgid "parsing pci_add reply failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1426 +#: src/qemu/qemu_monitor_text.c:2006 #, c-format msgid "cannot attach %s disk %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1440 +#: src/qemu/qemu_monitor_text.c:2019 #, c-format msgid "adding %s disk failed %s: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1471 +#: src/qemu/qemu_monitor_text.c:2048 #, c-format msgid "failed to add NIC with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:1517 +#: src/qemu/qemu_monitor_text.c:2092 msgid "failed to remove PCI device" msgstr "" -#: src/qemu/qemu_monitor_text.c:1536 +#: src/qemu/qemu_monitor_text.c:2111 #, c-format msgid "failed to detach PCI device, invalid address %.4x:%.2x:%.2x: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1565 +#: src/qemu/qemu_monitor_text.c:2140 #, c-format msgid "failed to pass fd to qemu with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:1573 +#: src/qemu/qemu_monitor_text.c:2148 #, c-format msgid "qemu does not support sending of file handles: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2122 +#: src/qemu/qemu_monitor_text.c:2155 #, c-format msgid "unable to send file handle '%s': %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1601 src/qemu/qemu_monitor_text.c:1637 +#: src/qemu/qemu_monitor_text.c:2183 #, c-format msgid "failed to close fd in qemu with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:1609 +#: src/qemu/qemu_monitor_text.c:2191 #, c-format msgid "qemu does not support closing of file handles: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2186 +#: src/qemu/qemu_monitor_text.c:2219 #, c-format msgid "failed to add host net with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2192 +#: src/qemu/qemu_monitor_text.c:2225 #, c-format msgid "unable to add host net: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:1667 +#: src/qemu/qemu_monitor_text.c:2254 #, c-format msgid "failed to remove host network in qemu with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2250 +#: src/qemu/qemu_monitor_text.c:2283 #, c-format msgid "failed to add netdev with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2279 +#: src/qemu/qemu_monitor_text.c:2312 #, c-format msgid "failed to remove netdev in qemu with '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2314 +#: src/qemu/qemu_monitor_text.c:2347 msgid "failed to retrieve chardev info in qemu with 'info chardev'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2399 +#: src/qemu/qemu_monitor_text.c:2432 #, c-format msgid "cannot attach %s disk controller" msgstr "" -#: src/qemu/qemu_monitor_text.c:2412 +#: src/qemu/qemu_monitor_text.c:2445 #, c-format msgid "adding %s disk controller failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2498 +#: src/qemu/qemu_monitor_text.c:2531 #, c-format msgid "failed to attach drive '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2504 src/qemu/qemu_monitor_text.c:2781 +#: 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:2516 +#: src/qemu/qemu_monitor_text.c:2549 #, c-format msgid "adding %s disk failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2571 +#: src/qemu/qemu_monitor_text.c:2604 #, c-format msgid "cannot parse value for %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2589 +#: src/qemu/qemu_monitor_text.c:2622 msgid "cannot query PCI addresses" msgstr "" -#: src/qemu/qemu_monitor_text.c:2682 +#: src/qemu/qemu_monitor_text.c:2715 #, c-format msgid "cannot detach %s device" msgstr "" -#: src/qemu/qemu_monitor_text.c:2688 +#: src/qemu/qemu_monitor_text.c:2721 #, c-format msgid "detaching %s device failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2722 +#: src/qemu/qemu_monitor_text.c:2755 #, c-format msgid "cannot attach %s device" msgstr "" -#: src/qemu/qemu_monitor_text.c:2738 +#: src/qemu/qemu_monitor_text.c:2771 #, c-format msgid "adding %s device failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2775 +#: src/qemu/qemu_monitor_text.c:2808 #, c-format msgid "failed to add drive '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2787 +#: src/qemu/qemu_monitor_text.c:2820 msgid "open disk image file failed" msgstr "" -#: src/qemu/qemu_monitor_text.c:2823 +#: src/qemu/qemu_monitor_text.c:2856 #, c-format msgid "cannot delete %s drive" msgstr "" -#: src/qemu/qemu_monitor_text.c:2828 +#: 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:2840 +#: src/qemu/qemu_monitor_text.c:2873 #, c-format msgid "deleting %s drive failed: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2876 +#: src/qemu/qemu_monitor_text.c:2909 msgid "failed to set disk password" msgstr "" -#: src/qemu/qemu_monitor_text.c:2882 +#: src/qemu/qemu_monitor_text.c:2915 msgid "setting disk password is not supported" msgstr "" -#: src/qemu/qemu_monitor_text.c:2886 +#: src/qemu/qemu_monitor_text.c:2919 msgid "the disk password is incorrect" msgstr "" -#: src/qemu/qemu_monitor_text.c:2914 src/qemu/qemu_monitor_text.c:3066 +#: src/qemu/qemu_monitor_text.c:2947 src/qemu/qemu_monitor_text.c:3099 #, c-format msgid "failed to take snapshot using command '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2920 src/qemu/qemu_monitor_text.c:3073 +#: src/qemu/qemu_monitor_text.c:2953 src/qemu/qemu_monitor_text.c:3106 #, c-format msgid "Failed to take snapshot: %s" msgstr "" -#: src/qemu/qemu_monitor_text.c:2925 +#: 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:2962 +#: src/qemu/qemu_monitor_text.c:2995 #, c-format msgid "failed to restore snapshot using command '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:2969 +#: 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:2974 +#: src/qemu/qemu_monitor_text.c:3007 #, c-format msgid "the snapshot '%s' does not exist, and was not loaded" msgstr "" -#: src/qemu/qemu_monitor_text.c:3020 +#: src/qemu/qemu_monitor_text.c:3053 #, c-format msgid "failed to delete snapshot using command '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:3027 +#: 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:3104 +#: src/qemu/qemu_monitor_text.c:3137 #, c-format msgid "failed to run cmd '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:3134 +#: src/qemu/qemu_monitor_text.c:3167 #, c-format msgid "failed to inject NMI using command '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:3156 +#: src/qemu/qemu_monitor_text.c:3189 #, c-format msgid "keycode %d is invalid: 0x%X" msgstr "" -#: src/qemu/qemu_monitor_text.c:3178 +#: src/qemu/qemu_monitor_text.c:3211 #, c-format msgid "failed to send key using command '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:3185 +#: src/qemu/qemu_monitor_text.c:3218 #, c-format msgid "failed to send key '%s'" msgstr "" -#: src/qemu/qemu_monitor_text.c:3211 +#: src/qemu/qemu_monitor_text.c:3244 msgid "taking screenshot failed" msgstr "" -#: src/qemu/qemu_monitor_text.c:3302 +#: src/qemu/qemu_monitor_text.c:3335 msgid "Device not found" msgstr "" -#: src/qemu/qemu_monitor_text.c:3381 +#: src/qemu/qemu_monitor_text.c:3414 src/qemu/qemu_monitor_text.c:3490 +#: src/qemu/qemu_monitor_text.c:3596 msgid "cannot run monitor command" msgstr "" -#: src/qemu/qemu_monitor_text.c:3418 +#: src/qemu/qemu_monitor_text.c:3451 msgid "adding graphics client failed" msgstr "" -#: src/qemu/qemu_process.c:201 +#: src/qemu/qemu_monitor_text.c:3580 +#, c-format +msgid "No info for device '%s'" +msgstr "" + +#: src/qemu/qemu_process.c:202 #, c-format msgid "no disk found with path %s" msgstr "" -#: src/qemu/qemu_process.c:224 +#: src/qemu/qemu_process.c:225 #, c-format msgid "no disk found with alias %s" msgstr "" -#: src/qemu/qemu_process.c:244 +#: src/qemu/qemu_process.c:245 #, c-format msgid "disk %s does not have any encryption information" msgstr "" -#: src/qemu/qemu_driver.c:737 +#: src/qemu/qemu_process.c:253 msgid "cannot find secrets without a connection" msgstr "" -#: src/qemu/qemu_driver.c:745 src/storage/storage_backend.c:387 +#: src/qemu/qemu_process.c:261 src/storage/storage_backend.c:465 msgid "secret storage not supported" msgstr "" -#: src/qemu/qemu_driver.c:758 +#: src/qemu/qemu_process.c:270 #, c-format msgid "invalid for volume %s" msgstr "" -#: src/qemu/qemu_driver.c:776 +#: src/qemu/qemu_process.c:288 #, c-format msgid "format='qcow' passphrase for %s must not contain a '\\0'" msgstr "" -#: src/qemu/qemu_process.c:452 +#: src/qemu/qemu_process.c:447 msgid "Failed to create reboot thread, killing domain" msgstr "" -#: src/qemu/qemu_process.c:843 +#: src/qemu/qemu_process.c:877 #, c-format msgid "Failed to set security context for monitor for %s" msgstr "" -#: src/qemu/qemu_process.c:876 +#: src/qemu/qemu_process.c:910 #, c-format msgid "Failed to clear security context for monitor for %s" msgstr "" -#: src/qemu/qemu_driver.c:1326 +#: src/qemu/qemu_process.c:976 #, c-format msgid "Failure while reading %s log output" msgstr "读取 %s 日志输出失败" -#: src/qemu/qemu_process.c:964 +#: src/qemu/qemu_process.c:998 #, c-format msgid "Out of space while reading %s log output: %s" msgstr "" -#: src/qemu/qemu_process.c:971 +#: src/qemu/qemu_process.c:1005 #, c-format msgid "Process exited while reading %s log output: %s" msgstr "" -#: src/qemu/qemu_process.c:986 +#: src/qemu/qemu_process.c:1020 #, c-format msgid "Timed out while reading %s log output: %s" msgstr "" -#: src/qemu/qemu_driver.c:1432 +#: src/qemu/qemu_process.c:1107 #, c-format msgid "no assigned pty for device %s" msgstr "" -#: src/qemu/qemu_process.c:1255 +#: src/qemu/qemu_process.c:1300 #, c-format msgid "process exited while connecting to monitor: %s" msgstr "" -#: src/qemu/qemu_driver.c:1593 +#: src/qemu/qemu_process.c:1350 #, c-format msgid "got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d" msgstr "" -#: src/qemu/qemu_process.c:1341 -msgid "Host kernel is not aware of NUMA." -msgstr "" - -#: src/qemu/qemu_process.c:1353 -#, c-format -msgid "Host cannot support NUMA node %d" -msgstr "" - -#: src/qemu/qemu_process.c:1382 -msgid "NUMA memory tuning in 'preferred' mode only supports single node" -msgstr "" - -#: src/qemu/qemu_process.c:1396 +#: src/qemu/qemu_process.c:1441 msgid "Invalid mode for memory NUMA tuning." msgstr "" -#: src/qemu/qemu_process.c:1411 +#: src/qemu/qemu_process.c:1456 msgid "libvirt is compiled without NUMA tuning support" msgstr "" -#: src/qemu/qemu_process.c:1492 +#: src/qemu/qemu_process.c:1537 msgid "Setting of link state is not supported by this qemu" msgstr "" -#: src/qemu/qemu_process.c:1501 +#: src/qemu/qemu_process.c:1546 #, c-format msgid "Couldn't set link state on interface: %s" msgstr "" -#: src/qemu/qemu_process.c:1902 +#: src/qemu/qemu_process.c:1947 #, c-format msgid "cannot find PCI address for VirtIO disk %s" msgstr "" -#: src/qemu/qemu_process.c:1916 +#: src/qemu/qemu_process.c:1961 #, c-format msgid "cannot find PCI address for %s NIC" msgstr "" -#: src/qemu/qemu_process.c:1930 +#: src/qemu/qemu_process.c:1975 #, c-format msgid "cannot find PCI address for controller %s" msgstr "" -#: src/qemu/qemu_process.c:1944 +#: src/qemu/qemu_process.c:1989 #, c-format msgid "cannot find PCI address for video adapter %s" msgstr "" -#: src/qemu/qemu_process.c:1958 +#: src/qemu/qemu_process.c:2003 #, c-format msgid "cannot find PCI address for sound adapter %s" msgstr "" -#: src/qemu/qemu_process.c:1971 +#: src/qemu/qemu_process.c:2016 #, c-format msgid "cannot find PCI address for watchdog %s" msgstr "" -#: src/qemu/qemu_process.c:1983 +#: src/qemu/qemu_process.c:2028 #, c-format msgid "cannot find PCI address for balloon %s" msgstr "" -#: src/qemu/qemu_process.c:2102 +#: src/qemu/qemu_process.c:2147 #, c-format msgid "Unable to pre-create chardev file '%s'" msgstr "" -#: src/qemu/qemu_process.c:2122 +#: src/qemu/qemu_process.c:2167 #, c-format msgid "cannot limit number of processes to %d" msgstr "" -#: src/qemu/qemu_process.c:2773 +#: src/qemu/qemu_process.c:2843 msgid "Could not create thread. QEMU initialization might be incomplete" msgstr "" -#: src/qemu/qemu_driver.c:2374 src/uml/uml_driver.c:823 +#: 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 已经激活" -#: src/qemu/qemu_process.c:2914 +#: src/qemu/qemu_process.c:2984 msgid "Unable to find an unused SPICE port" msgstr "" -#: src/qemu/qemu_process.c:2922 +#: src/qemu/qemu_process.c:2992 msgid "Unable to find an unused SPICE TLS port" msgstr "" -#: src/qemu/qemu_driver.c:2403 src/uml/uml_driver.c:845 +#: 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" -#: src/qemu/qemu_driver.c:2459 +#: src/qemu/qemu_process.c:3054 msgid "Failed to build pidfile path." msgstr "" -#: src/qemu/qemu_process.c:2991 +#: src/qemu/qemu_process.c:3061 #, c-format msgid "Cannot remove stale PID file %s" msgstr "" -#: src/qemu/qemu_process.c:3086 +#: src/qemu/qemu_process.c:3156 #, c-format msgid "Domain %s didn't show up" msgstr "" -#: src/qemu/qemu_process.c:3133 +#: src/qemu/qemu_process.c:3203 #, c-format msgid "cannot stat fd %d" msgstr "" -#: src/qemu/qemu_driver.c:2635 +#: src/qemu/qemu_process.c:3426 #, c-format msgid "failed to remove ebtables rule to allow MAC address on '%s'" msgstr "" -#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1192 -#: src/remote/remote_client_bodies.h:1231 -#: src/remote/remote_client_bodies.h:1299 -#: src/remote/remote_client_bodies.h:1471 -#: src/remote/remote_client_bodies.h:1505 -#: src/remote/remote_client_bodies.h:1841 -#: src/remote/remote_client_bodies.h:4882 +#: 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 "" -#: src/remote/remote_client_bodies.h:2319 -#: src/remote/remote_client_bodies.h:2338 -#: src/remote/remote_client_bodies.h:2382 -#: src/remote/remote_client_bodies.h:2401 -#: src/remote/remote_client_bodies.h:3126 -#: src/remote/remote_client_bodies.h:3143 -#: src/remote/remote_client_bodies.h:3187 -#: src/remote/remote_client_bodies.h:3204 -#: src/remote/remote_client_bodies.h:3248 -#: src/remote/remote_client_bodies.h:3265 -#: src/remote/remote_client_bodies.h:3309 -#: src/remote/remote_client_bodies.h:3326 -#: src/remote/remote_client_bodies.h:3370 -#: src/remote/remote_client_bodies.h:3387 -#: src/remote/remote_client_bodies.h:3431 -#: src/remote/remote_client_bodies.h:3448 -#: src/remote/remote_client_bodies.h:3492 -#: src/remote/remote_client_bodies.h:3509 -#: src/remote/remote_client_bodies.h:3553 -#: src/remote/remote_client_bodies.h:3570 -#: src/remote/remote_client_bodies.h:3614 -#: src/remote/remote_client_bodies.h:3631 -#: src/remote/remote_client_bodies.h:4130 -#: src/remote/remote_client_bodies.h:4148 -#: src/remote/remote_client_bodies.h:4303 -#: src/remote/remote_client_bodies.h:4322 -#: src/remote/remote_client_bodies.h:5240 -#: src/remote/remote_client_bodies.h:5258 +#: 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 "" -#: src/remote/remote_driver.c:349 +#: src/remote/remote_driver.c:354 #, c-format msgid "using unix socket and remote server '%s' is not supported." msgstr "" -#: src/remote/remote_driver.c:411 +#: src/remote/remote_driver.c:369 msgid "" "remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp)" msgstr "remote_open:URL 中的传输无法识别(应该是 tls|unix|ssh|ext|tcp)" -#: src/remote/remote_driver.c:569 +#: src/remote/remote_driver.c:539 msgid "remote_open: for 'ext' transport, command is required" msgstr "remote_open:'ext' 传输需要命令" -#: src/remote/remote_driver.c:816 +#: src/remote/remote_driver.c:596 +msgid "Unable to locate libvirtd daemon in $PATH" +msgstr "" + +#: 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:1050 +#: src/remote/remote_driver.c:1078 msgid "remoteNodeGetCPUStats: returned number of stats exceeds limit" msgstr "" -#: src/remote/remote_driver.c:1069 src/remote/remote_driver.c:1133 +#: src/remote/remote_driver.c:1097 src/remote/remote_driver.c:1161 #, c-format msgid "Stats %s too big for destination" msgstr "" -#: src/remote/remote_driver.c:1114 +#: src/remote/remote_driver.c:1142 msgid "remoteNodeGetMemoryStats: returned number of stats exceeds limit" msgstr "" -#: src/remote/remote_driver.c:1760 +#: src/remote/remote_driver.c:1194 #, c-format msgid "too many NUMA cells: %d > %d" msgstr "NUMA 单元过多:%d > %d" -#: src/remote/remote_driver.c:1823 src/remote/remote_driver.c:1837 +#: src/remote/remote_driver.c:1233 src/remote/remote_driver.c:1247 #, c-format msgid "too many remote domain IDs: %d > %d" msgstr "远程域 ID 过多:%d > %d" -#: src/remote/remote_driver.c:1327 +#: src/remote/remote_driver.c:1365 msgid "returned number of parameters exceeds limit" msgstr "" -#: src/remote/remote_driver.c:1410 +#: src/remote/remote_driver.c:1462 msgid "remoteDomainBlockStatsFlags: returned number of stats exceeds limit" msgstr "" -#: src/remote/remote_driver.c:2428 +#: 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:2434 +#: 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:2451 +#: 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:2457 +#: 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:2532 +#: src/remote/remote_driver.c:1762 #, c-format msgid "security label exceeds maximum: %zd" msgstr "安全性标签超过最大值:%zd" -#: src/remote/remote_driver.c:2567 +#: src/remote/remote_driver.c:1833 #, c-format msgid "security model exceeds maximum: %zd" msgstr "安全性模式超过最大值:%zd" -#: src/remote/remote_driver.c:2576 +#: src/remote/remote_driver.c:1842 #, c-format msgid "security doi exceeds maximum: %zd" msgstr "安全性 doi 超过最大值:%zd" -#: src/remote/remote_driver.c:1876 +#: src/remote/remote_driver.c:1928 msgid "caller ignores cookie or cookielen" msgstr "" -#: src/remote/remote_driver.c:1885 src/remote/remote_driver.c:3881 +#: src/remote/remote_driver.c:1937 src/remote/remote_driver.c:3988 msgid "caller ignores uri_out" msgstr "" -#: src/remote/remote_driver.c:3384 +#: src/remote/remote_driver.c:2040 #, c-format msgid "too many memory stats requested: %d > %d" msgstr "" -#: src/remote/remote_driver.c:3428 +#: 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:3449 src/remote/remote_driver.c:3500 +#: 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:3480 +#: 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:6027 +#: src/remote/remote_driver.c:2556 #, c-format msgid "unknown authentication type %s" msgstr "未知验证类型 %s" -#: src/remote/remote_driver.c:6037 +#: src/remote/remote_driver.c:2565 #, c-format msgid "requested authentication type %s rejected" msgstr "请求的验证类型 %s 被拒绝" -#: src/remote/remote_driver.c:6078 +#: src/remote/remote_driver.c:2604 #, c-format msgid "unsupported authentication type %d" msgstr "不支持的验证类型 %d" -#: src/remote/remote_driver.c:6425 +#: src/remote/remote_driver.c:2859 #, c-format msgid "SASL mechanism %s not supported by server" msgstr "服务器不支持 SASL 机制 %s" -#: src/remote/remote_driver.c:6462 src/remote/remote_driver.c:6540 +#: src/remote/remote_driver.c:2886 src/remote/remote_driver.c:2956 msgid "Failed to make auth credentials" msgstr "生成验证证书失败" -#: src/remote/remote_driver.c:2800 +#: src/remote/remote_driver.c:2907 #, c-format msgid "SASL negotiation data too long: %zu bytes" msgstr "" -#: src/remote/remote_driver.c:6686 +#: src/remote/remote_driver.c:2965 src/remote/remote_driver.c:3092 msgid "Failed to collect auth credentials" msgstr "收集验证证书失败" -#: src/remote/remote_driver.c:2860 +#: src/remote/remote_driver.c:2967 msgid "No authentication callback available" msgstr "" -#: src/remote/remote_driver.c:6610 +#: src/remote/remote_driver.c:3019 #, c-format msgid "negotiation SSF %d was not strong enough" msgstr "协商 SSF %d 不够强大" -#: src/remote/remote_driver.c:6721 +#: src/remote/remote_driver.c:3127 src/remote/remote_driver.c:3767 msgid "no event support" msgstr "没有事件支持" -#: src/remote/remote_driver.c:6726 +#: src/remote/remote_driver.c:3133 src/remote/remote_driver.c:3775 msgid "adding cb to list" msgstr "在列表中添加 cb" -#: src/remote/remote_driver.c:3396 +#: src/remote/remote_driver.c:3503 msgid "no internalFlags support" msgstr "" -#: src/remote/remote_driver.c:3710 +#: src/remote/remote_driver.c:3817 #, c-format msgid "unable to find callback ID %d" msgstr "" -#: src/remote/remote_driver.c:3813 src/remote/remote_driver.c:3872 -#: src/remote/remote_driver.c:3954 src/remote/remote_driver.c:4015 -#: src/remote/remote_driver.c:4074 +#: 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 "" -#: src/remote/remote_driver.c:831 +#: src/remote/remote_driver.c:4275 +msgid "" +"the caller doesn't support keepalive protocol; perhaps it's missing event " +"loop implementation" +msgstr "" + +#: src/rpc/virkeepalive.c:337 +msgid "keepalive interval already set" +msgstr "" + +#: src/rpc/virnetclient.c:280 msgid "unable to make pipe" msgstr "无法生成管道" -#: src/rpc/virnetclient.c:426 +#: src/rpc/virnetclient.c:540 src/rpc/virnetclient.c:1556 +msgid "failed to wake up polling thread" +msgstr "" + +#: src/rpc/virnetclient.c:645 msgid "Unable to read TLS confirmation" msgstr "" -#: src/rpc/virnetclient.c:431 +#: src/rpc/virnetclient.c:650 msgid "server verification (of our certificate or IP address) failed" msgstr "" -#: src/rpc/virnetclient.c:568 +#: src/rpc/virnetclient.c:801 #, c-format msgid "no call waiting for reply with prog %d vers %d serial %d" msgstr "" -#: src/rpc/virnetclient.c:716 +#: src/rpc/virnetclient.c:954 #, c-format msgid "got unexpected RPC call prog %d vers %d proc %d type %d" msgstr "" -#: src/rpc/virnetclient.c:985 +#: src/rpc/virnetclient.c:1382 msgid "read on wakeup fd failed" msgstr "" -#: src/remote/remote_driver.c:8307 +#: src/rpc/virnetclient.c:1402 msgid "poll on socket failed" msgstr "poll on 套接字失败" -#: src/remote/remote_driver.c:8368 +#: src/rpc/virnetclient.c:1450 msgid "received hangup / error event on socket" msgstr "在套接字中收到 hangup / error 事件" -#: src/rpc/virnetclient.c:1139 -msgid "failed to wake up polling thread" -msgstr "" - -#: src/remote/remote_driver.c:8462 +#: src/rpc/virnetclient.c:1565 msgid "failed to wait on condition" msgstr "等待命令失败:%s" -#: src/rpc/virnetclient.c:1269 +#: src/rpc/virnetclient.c:1691 msgid "Attempt to send an asynchronous message with a synchronous reply" msgstr "" -#: daemon/libvirtd.c:836 +#: src/rpc/virnetclient.c:1697 +msgid "Attempt to send a non-blocking message with a synchronous reply" +msgstr "" + +#: src/rpc/virnetclient.c:1710 +msgid "client socket is closed" +msgstr "" + +#: src/rpc/virnetclient.c:1716 msgid "cannot initialize condition variable" msgstr "无法初始化条件变量" @@ -11992,11 +12575,11 @@ msgid "Unexpected message status %d" msgstr "" -#: src/rpc/virnetclientstream.c:455 +#: src/rpc/virnetclientstream.c:456 msgid "multiple stream callbacks not supported" msgstr "" -#: src/rpc/virnetclientstream.c:491 src/rpc/virnetclientstream.c:513 +#: src/rpc/virnetclientstream.c:492 src/rpc/virnetclientstream.c:514 msgid "no stream callback registered" msgstr "" @@ -12076,7 +12659,7 @@ msgid "Unable to duplicate FD %d" msgstr "" -#: src/remote/remote_driver.c:6320 +#: src/rpc/virnetsaslcontext.c:61 src/rpc/virnetsaslcontext.c:91 #, c-format msgid "failed to initialize SASL library: %d (%s)" msgstr "初始化 SASL 程序库验证失败:%d(%s)" @@ -12092,7 +12675,7 @@ msgid "Malformed TLS whitelist regular expression '%s'" msgstr "" -#: daemon/remote.c:3088 +#: src/rpc/virnetsaslcontext.c:146 #, c-format msgid "SASL client %s not allowed in whitelist" msgstr "在白名单中不允许 SASL 客户端 %s" @@ -12101,31 +12684,31 @@ msgid "Client's username is not on the list of allowed clients" msgstr "" -#: src/remote/remote_driver.c:6364 +#: 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/remote/remote_driver.c:6387 +#: src/rpc/virnetsaslcontext.c:293 #, c-format msgid "cannot set external SSF %d (%s)" msgstr "无法设定外部 SSF %d(%s)" -#: daemon/remote.c:3051 +#: src/rpc/virnetsaslcontext.c:314 #, c-format msgid "cannot query SASL username on connection %d (%s)" msgstr "在连接到 %d(%s)时不能查询 SASL 用户名" -#: daemon/remote.c:3059 +#: src/rpc/virnetsaslcontext.c:321 msgid "no client username was found" msgstr "没有找到客户端用户名" -#: daemon/remote.c:3012 src/remote/remote_driver.c:6601 +#: src/rpc/virnetsaslcontext.c:342 #, c-format msgid "cannot query SASL ssf on connection %d (%s)" msgstr "无法在连接 %d(%s)是查询 SASL" -#: src/remote/remote_driver.c:6406 +#: src/rpc/virnetsaslcontext.c:378 #, c-format msgid "cannot set security props %d (%s)" msgstr "无法设定安全支持 %d(%s)" @@ -12135,12 +12718,13 @@ msgid "cannot get security props %d (%s)" msgstr "" -#: daemon/remote.c:2972 +#: src/rpc/virnetsaslcontext.c:430 #, c-format msgid "cannot list SASL mechanisms %d (%s)" msgstr "无法列出 SASL 机制 %d(%s)" -#: src/remote/remote_driver.c:6444 +#: 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)" @@ -12165,184 +12749,188 @@ msgid "failed to decode SASL data: %d (%s)" msgstr "" -#: src/rpc/virnetsocket.c:122 +#: src/rpc/virnetsocket.c:123 msgid "Unable to set close-on-exec flag" msgstr "" -#: src/rpc/virnetsocket.c:127 +#: src/rpc/virnetsocket.c:128 msgid "Unable to enable non-blocking flag" msgstr "" -#: src/rpc/virnetsocket.c:159 +#: src/rpc/virnetsocket.c:160 msgid "Unable to disable nagle algorithm" msgstr "" -#: src/rpc/virnetsocket.c:212 src/rpc/virnetsocket.c:409 +#: src/rpc/virnetsocket.c:213 src/rpc/virnetsocket.c:410 #, c-format msgid "Unable to resolve address '%s' service '%s': %s" msgstr "" -#: src/rpc/virnetsocket.c:225 src/rpc/virnetsocket.c:420 +#: src/rpc/virnetsocket.c:226 src/rpc/virnetsocket.c:421 msgid "Unable to create socket" msgstr "" -#: src/rpc/virnetsocket.c:231 +#: src/rpc/virnetsocket.c:232 msgid "Unable to enable port reuse" msgstr "" -#: src/rpc/virnetsocket.c:248 +#: src/rpc/virnetsocket.c:249 msgid "Unable to force bind to IPv6 only" msgstr "" -#: src/rpc/virnetsocket.c:256 src/rpc/virnetsocket.c:286 +#: src/rpc/virnetsocket.c:257 src/rpc/virnetsocket.c:287 msgid "Unable to bind to port" msgstr "" -#: src/rpc/virnetsocket.c:267 src/rpc/virnetsocket.c:443 -#: src/rpc/virnetsocket.c:516 src/rpc/virnetsocket.c:1251 +#: 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:324 src/rpc/virnetsocket.c:484 +#: src/rpc/virnetsocket.c:325 src/rpc/virnetsocket.c:491 msgid "Failed to create socket" msgstr "" -#: daemon/libvirtd.c:552 +#: 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:344 +#: src/rpc/virnetsocket.c:345 #, c-format msgid "Failed to bind socket to '%s'" msgstr "" -#: src/rpc/virnetsocket.c:355 +#: src/rpc/virnetsocket.c:356 #, c-format msgid "Failed to change ownership of '%s' to %d:%d" msgstr "" -#: src/rpc/virnetsocket.c:379 src/rpc/virnetsocket.c:536 +#: src/rpc/virnetsocket.c:380 src/rpc/virnetsocket.c:543 msgid "UNIX sockets are not supported on this platform" msgstr "" -#: src/rpc/virnetsocket.c:436 +#: src/rpc/virnetsocket.c:437 #, c-format msgid "unable to connect to server at '%s:%s'" msgstr "" -#: src/rpc/virnetsocket.c:449 +#: src/rpc/virnetsocket.c:450 msgid "Unable to get remote socket name" msgstr "" -#: src/rpc/virnetsocket.c:509 +#: src/rpc/virnetsocket.c:486 +msgid "Auto-spawn of daemon requested, but no binary specified" +msgstr "" + +#: src/rpc/virnetsocket.c:516 #, c-format msgid "Failed to connect socket to '%s'" msgstr "" -#: src/remote/remote_driver.c:792 +#: src/rpc/virnetsocket.c:565 src/rpc/virnetsocket.c:571 msgid "unable to create socket pair" msgstr "无法创建套接字对" -#: src/rpc/virnetsocket.c:602 +#: src/rpc/virnetsocket.c:609 msgid "Tunnelling sockets not supported on this platform" msgstr "" -#: src/rpc/virnetsocket.c:779 +#: src/rpc/virnetsocket.c:787 msgid "Unable to copy socket file handle" msgstr "" -#: src/rpc/virnetsocket.c:829 +#: src/rpc/virnetsocket.c:837 msgid "Failed to get client socket identity" msgstr "" -#: src/rpc/virnetsocket.c:847 +#: src/rpc/virnetsocket.c:855 msgid "Client socket identity not available" msgstr "" -#: src/rpc/virnetsocket.c:964 +#: src/rpc/virnetsocket.c:985 #, c-format msgid "Cannot recv data: %s" msgstr "" -#: src/rpc/virnetsocket.c:967 +#: src/rpc/virnetsocket.c:988 msgid "Cannot recv data" msgstr "" -#: src/rpc/virnetsocket.c:972 +#: src/rpc/virnetsocket.c:993 #, c-format msgid "End of file while reading data: %s" msgstr "" -#: src/rpc/virnetsocket.c:975 +#: src/rpc/virnetsocket.c:996 msgid "End of file while reading data" msgstr "" -#: src/rpc/virnetsocket.c:1002 +#: src/rpc/virnetsocket.c:1023 msgid "Cannot write data" msgstr "" -#: src/rpc/virnetsocket.c:1007 +#: src/rpc/virnetsocket.c:1028 msgid "End of file while writing data" msgstr "" -#: src/rpc/virnetsocket.c:1153 +#: src/rpc/virnetsocket.c:1174 msgid "Sending file descriptors is not supported on this socket" msgstr "" -#: src/rpc/virnetsocket.c:1164 +#: src/rpc/virnetsocket.c:1185 #, c-format msgid "Failed to send file descriptor %d" msgstr "" -#: src/rpc/virnetsocket.c:1187 +#: src/rpc/virnetsocket.c:1208 msgid "Receiving file descriptors is not supported on this socket" msgstr "" -#: src/rpc/virnetsocket.c:1197 +#: src/rpc/virnetsocket.c:1218 msgid "Failed to recv file descriptor" msgstr "" -#: src/rpc/virnetsocket.c:1214 +#: src/rpc/virnetsocket.c:1235 msgid "Unable to listen on socket" msgstr "" -#: src/rpc/virnetsocket.c:1245 +#: src/rpc/virnetsocket.c:1266 msgid "Unable to accept client" msgstr "" -#: src/rpc/virnetserver.c:241 +#: src/rpc/virnetserver.c:245 #, c-format msgid "Too many active clients (%zu), dropping connection from %s" msgstr "" -#: daemon/libvirtd.c:954 +#: src/rpc/virnetserver.c:366 #, c-format msgid "Failed to connect to system bus for PolicyKit auth: %s" msgstr "为 PolicyKit auth: %s 连接到系统总线失败" -#: src/rpc/virnetserver.c:476 +#: src/rpc/virnetserver.c:489 msgid "Failed to read from signal pipe" msgstr "" -#: src/rpc/virnetserver.c:493 +#: src/rpc/virnetserver.c:506 #, c-format msgid "Unexpected signal received: %d" msgstr "" -#: src/rpc/virnetserver.c:508 +#: src/rpc/virnetserver.c:521 msgid "Unable to create signal pipe" msgstr "" -#: src/rpc/virnetserver.c:517 +#: src/rpc/virnetserver.c:530 msgid "Failed to add signal handle watch" msgstr "" -#: daemon/libvirtd.c:2236 +#: src/rpc/virnetserver.c:708 msgid "Failed to register shutdown timeout" msgstr "注册关机超时失败" -#: src/rpc/virnetserverclient.c:750 src/rpc/virnetserverclient.c:909 +#: src/rpc/virnetserverclient.c:788 src/rpc/virnetserverclient.c:947 #, c-format msgid "unexpected zero/negative length request %lld" msgstr "" @@ -12352,7 +12940,7 @@ msgid "Failed to add watch for fd %d events %d" msgstr "" -#: src/rpc/virnetservermdns.c:344 +#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:247 msgid "Unable to get current time" msgstr "" @@ -12371,12 +12959,12 @@ msgid "Cannot find program %d version %d" msgstr "" -#: daemon/dispatch.c:375 +#: src/rpc/virnetserverprogram.c:274 #, c-format msgid "program mismatch (actual %x, expected %x)" msgstr "程序不匹配(实际是 %x,想要的是 %x)" -#: daemon/dispatch.c:381 +#: src/rpc/virnetserverprogram.c:281 #, c-format msgid "version mismatch (actual %x, expected %x)" msgstr "版本不匹配(实际是 %x,想要的是 %x)" @@ -12391,12 +12979,12 @@ msgid "Unexpected message status %u" msgstr "" -#: daemon/dispatch.c:475 +#: src/rpc/virnetserverprogram.c:376 #, c-format msgid "unknown procedure: %d" msgstr "未知过程:%d" -#: daemon/dispatch.c:467 +#: src/rpc/virnetserverprogram.c:390 msgid "authentication required" msgstr "需要验证" @@ -12405,7 +12993,7 @@ msgid "Cannot read %s '%s'" msgstr "" -#: src/remote/remote_driver.c:1296 +#: src/rpc/virnettlscontext.c:114 msgid "cannot get current time" msgstr "无法获得当前时间" @@ -12524,23 +13112,23 @@ msgid "Unable to verify client certificate %s against CA certificate %s" msgstr "" -#: src/remote/remote_driver.c:1301 +#: src/rpc/virnettlscontext.c:453 src/rpc/virnettlscontext.c:964 msgid "Invalid certificate" msgstr "无效证书" -#: src/remote/remote_driver.c:1304 +#: src/rpc/virnettlscontext.c:456 src/rpc/virnettlscontext.c:967 msgid "The certificate is not trusted." msgstr "该证书不可信。" -#: src/remote/remote_driver.c:1307 +#: src/rpc/virnettlscontext.c:459 src/rpc/virnettlscontext.c:970 msgid "The certificate hasn't got a known issuer." msgstr "该证书没有公认发行人。" -#: src/remote/remote_driver.c:1310 +#: src/rpc/virnettlscontext.c:462 src/rpc/virnettlscontext.c:973 msgid "The certificate has been revoked." msgstr "证书已撤销。" -#: src/remote/remote_driver.c:1314 +#: src/rpc/virnettlscontext.c:466 src/rpc/virnettlscontext.c:977 msgid "The certificate uses an insecure algorithm" msgstr "该证书使用不安全的算法" @@ -12644,66 +13232,66 @@ msgid "TLS handshake failed %s" msgstr "" -#: src/remote/remote_driver.c:6377 +#: src/rpc/virnettlscontext.c:1388 msgid "invalid cipher size for TLS session" msgstr "对 TLS 会话无效的密码大小" -#: src/secret/secret_driver.c:170 +#: src/secret/secret_driver.c:176 #, c-format msgid "mkstemp('%s') failed" msgstr "" -#: src/secret/secret_driver.c:174 +#: src/secret/secret_driver.c:180 #, c-format msgid "fchmod('%s') failed" msgstr "" -#: src/secret/secret_driver.c:180 +#: src/secret/secret_driver.c:186 #, c-format msgid "error writing to '%s'" msgstr "" -#: src/secret/secret_driver.c:185 +#: src/secret/secret_driver.c:191 #, c-format msgid "error closing '%s'" msgstr "" -#: src/secret/secret_driver.c:191 +#: src/secret/secret_driver.c:197 #, c-format msgid "rename(%s, %s) failed" msgstr "" -#: src/secret/secret_driver.c:242 +#: src/secret/secret_driver.c:247 #, c-format msgid "cannot create '%s'" msgstr "" -#: src/secret/secret_driver.c:349 +#: src/secret/secret_driver.c:354 #, c-format msgid " does not match secret file name '%s'" msgstr "" -#: src/secret/secret_driver.c:376 src/secret/secret_driver.c:485 +#: src/secret/secret_driver.c:381 src/secret/secret_driver.c:488 #, c-format msgid "cannot open '%s'" msgstr "" -#: src/secret/secret_driver.c:380 +#: src/secret/secret_driver.c:385 #, c-format msgid "cannot stat '%s'" msgstr "" -#: src/secret/secret_driver.c:385 +#: src/secret/secret_driver.c:390 #, c-format msgid "'%s' file does not fit in memory" msgstr "" -#: src/secret/secret_driver.c:394 +#: src/secret/secret_driver.c:399 #, c-format msgid "cannot read '%s'" msgstr "" -#: src/secret/secret_driver.c:402 +#: src/secret/secret_driver.c:406 #, c-format msgid "invalid base64 in '%s'" msgstr "" @@ -12713,130 +13301,129 @@ msgid "Error reading secret: %s" msgstr "" -#: src/secret/secret_driver.c:634 src/secret/secret_driver.c:802 -#: src/secret/secret_driver.c:836 src/secret/secret_driver.c:888 -#: src/secret/secret_driver.c:934 +#: 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 "" -#: src/secret/secret_driver.c:661 +#: src/secret/secret_driver.c:664 #, c-format msgid "no secret with matching usage '%s'" msgstr "" -#: src/secret/secret_driver.c:701 +#: src/secret/secret_driver.c:706 #, c-format msgid "a secret with UUID %s already defined for use with %s" msgstr "" -#: src/secret/secret_driver.c:721 +#: src/secret/secret_driver.c:726 #, c-format msgid "a secret with UUID %s is already defined for use with %s" msgstr "" -#: src/secret/secret_driver.c:728 +#: src/secret/secret_driver.c:733 msgid "cannot change private flag on existing secret" msgstr "" -#: src/secret/secret_driver.c:776 +#: src/secret/secret_driver.c:781 msgid "list of secrets is inconsistent" msgstr "" -#: src/secret/secret_driver.c:896 +#: src/secret/secret_driver.c:908 #, c-format msgid "secret '%s' does not have a value" msgstr "" -#: src/secret/secret_driver.c:903 +#: src/secret/secret_driver.c:915 msgid "secret is private" msgstr "" -#: src/secret/secret_driver.c:1026 +#: src/secret/secret_driver.c:1038 msgid "Out of memory initializing secrets" msgstr "" -#: src/security/security_apparmor.c:75 +#: src/security/security_apparmor.c:85 #, c-format msgid "Failed to read AppArmor profiles list '%s'" msgstr "" -#: src/security/security_apparmor.c:124 +#: src/security/security_apparmor.c:134 #, c-format msgid "Failed to read '%s'" msgstr "" -#: src/security/security_apparmor.c:268 +#: src/security/security_apparmor.c:242 msgid "could not find libvirtd" msgstr "" -#: src/security/security_apparmor.c:497 src/security/security_apparmor.c:538 +#: 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 "" -#: src/security/security_apparmor.c:298 +#: src/security/security_apparmor.c:348 #, c-format msgid "template '%s' does not exist" msgstr "" -#: src/security/security_apparmor.c:403 +#: src/security/security_apparmor.c:404 msgid "Cannot set a base label with AppArmour" msgstr "" -#: src/security/security_apparmor.c:334 src/security/security_selinux.c:172 +#: 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:441 +#: src/security/security_apparmor.c:442 #, c-format msgid "cannot load AppArmor profile '%s'" msgstr "" -#: src/security/security_apparmor.c:402 +#: src/security/security_apparmor.c:493 msgid "error copying profile name" msgstr "" -#: src/security/security_apparmor.c:408 +#: src/security/security_apparmor.c:499 msgid "error calling profile_status()" msgstr "" -#: src/security/security_apparmor.c:431 +#: src/security/security_apparmor.c:538 #, c-format msgid "could not remove profile for '%s'" msgstr "" -#: src/security/security_apparmor.c:457 src/security/security_selinux.c:672 +#: 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 "" -#: src/security/security_apparmor.c:467 +#: src/security/security_apparmor.c:570 msgid "error calling aa_change_profile()" msgstr "" -#: src/security/security_apparmor.c:527 +#: src/security/security_apparmor.c:631 #, c-format msgid "'%s' does not exist" msgstr "" -#: src/security/security_apparmor.c:561 +#: src/security/security_apparmor.c:667 #, c-format msgid "Invalid security label '%s'" msgstr "" -#: src/security/security_apparmor.c:795 -msgid "could not find path for descriptor" -msgstr "" - #: src/security/security_dac.c:124 #, c-format msgid "unable to set user and group to '%d:%d' on '%s'" msgstr "" -#: src/security/security_selinux.c:361 +#: src/security/security_dac.c:143 #, c-format msgid "cannot resolve symlink %s" msgstr "无法解析系统链接 %s" @@ -12846,22 +13433,22 @@ msgid "Security driver %s not found" msgstr "" -#: src/security/security_selinux.c:114 +#: src/security/security_selinux.c:119 #, c-format msgid "cannot open SELinux virtual domain context file '%s'" msgstr "" -#: src/security/security_selinux.c:121 +#: src/security/security_selinux.c:126 #, c-format msgid "cannot read SELinux virtual domain context file %s" msgstr "" -#: src/security/security_selinux.c:133 +#: src/security/security_selinux.c:138 #, c-format msgid "cannot open SELinux virtual image context file %s" msgstr "" -#: src/security/security_selinux.c:140 +#: src/security/security_selinux.c:145 #, c-format msgid "cannot read SELinux virtual image context file %s" msgstr "" @@ -12884,26 +13471,26 @@ msgid "unable to allocate socket security context '%s'" msgstr "" -#: src/security/security_selinux.c:193 src/security/security_selinux.c:199 +#: src/security/security_selinux.c:246 src/security/security_selinux.c:253 #, c-format msgid "cannot generate selinux context for %s" msgstr "无法为 %s 生成 selinux 上下文" -#: src/security/security_selinux.c:230 src/security/security_selinux.c:282 +#: src/security/security_selinux.c:302 src/security/security_selinux.c:370 #, c-format msgid "unable to get PID %d security context" msgstr "" -#: src/security/security_selinux.c:289 +#: src/security/security_selinux.c:377 #, c-format msgid "security label exceeds maximum length: %d" msgstr "" -#: src/security/security_selinux.c:301 +#: src/security/security_selinux.c:390 msgid "error calling security_getenforce()" msgstr "" -#: src/security/security_selinux.c:335 +#: src/security/security_selinux.c:424 #, c-format msgid "unable to set security context '%s' on '%s'" msgstr "" @@ -12925,12 +13512,12 @@ msgid "unknown smartcard type %d" msgstr "" -#: src/security/security_selinux.c:654 +#: src/security/security_selinux.c:1052 #, c-format msgid "Invalid security label %s" msgstr "无效安全性标签 %s" -#: src/security/security_selinux.c:682 +#: src/security/security_selinux.c:1081 #, c-format msgid "unable to set security context '%s'" msgstr "" @@ -13110,6 +13697,10 @@ msgid "Could not find " msgstr "" +#: src/security/virt-aa-helper.c:647 +msgid "unexpected root element, expecting " +msgstr "" + #: src/security/virt-aa-helper.c:657 msgid "os.type is not 'hvm'" msgstr "" @@ -13118,7 +13709,7 @@ #: 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:1250 +#: src/security/virt-aa-helper.c:1254 msgid "could not allocate memory" msgstr "" @@ -13198,11 +13789,11 @@ msgid "could not parse arguments" msgstr "" -#: src/security/virt-aa-helper.c:1229 +#: src/security/virt-aa-helper.c:1233 msgid "failed to allocate buffer" msgstr "分配缓冲失败" -#: src/security/virt-aa-helper.c:1260 +#: src/security/virt-aa-helper.c:1264 msgid "could not create profile" msgstr "" @@ -13221,22 +13812,22 @@ msgid "unable to access disk %s\n" msgstr "" -#: src/storage/storage_backend.c:134 +#: src/storage/storage_backend.c:141 #, c-format msgid "could not open input path '%s'" msgstr "" -#: src/storage/storage_backend.c:156 +#: src/storage/storage_backend.c:179 #, c-format msgid "failed reading from file '%s'" msgstr "" -#: src/storage/storage_backend.c:172 src/storage/storage_backend.c:278 +#: 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:178 +#: src/storage/storage_backend.c:203 #, c-format msgid "failed writing to file '%s'" msgstr "" @@ -13246,51 +13837,51 @@ msgid "cannot sync data to file '%s'" msgstr "" -#: src/storage/storage_backend.c:188 src/storage/storage_backend.c:234 -#: src/storage/storage_backend.c:328 src/storage/storage_backend_fs.c:835 -#: src/storage/storage_backend_logical.c:638 +#: 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:218 src/storage/storage_backend.c:269 -#: src/storage/storage_backend_fs.c:511 src/storage/storage_backend_fs.c:752 +#: 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:272 src/util/util.c:759 src/util/util.c:803 -#: src/util/util.c:1036 +#: 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 "" -#: src/storage/storage_backend.c:281 src/util/util.c:766 src/util/util.c:809 +#: 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 "" #: src/storage/storage_backend.c:287 src/storage/storage_backend.c:601 -#: src/util/util.c:776 src/util/util.c:817 src/util/util.c:1049 +#: 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 "" -#: src/storage/storage_backend.c:308 src/storage/storage_backend.c:319 +#: 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:261 src/storage/storage_backend_disk.c:560 -#: src/storage/storage_backend_logical.c:584 +#: 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:364 +#: src/storage/storage_backend.c:442 msgid "too many conflicts when generating an uuid" msgstr "" -#: src/storage/storage_backend.c:394 +#: src/storage/storage_backend.c:472 msgid "secrets already defined" msgstr "" @@ -13309,7 +13900,7 @@ msgid "unable to parse qemu-img output '%s'" msgstr "" -#: src/storage/storage_backend.c:513 src/storage/storage_backend.c:519 +#: src/storage/storage_backend.c:688 src/storage/storage_backend.c:694 #, c-format msgid "unknown storage vol type %d" msgstr "未知存储卷类型 %d" @@ -13318,121 +13909,120 @@ msgid "a different backing store cannot be specified." msgstr "" -#: src/storage/storage_backend.c:541 +#: src/storage/storage_backend.c:718 #, c-format msgid "unknown storage vol backing store type %d" msgstr "未知存储后端存储类型 %d" -#: src/storage/storage_backend.c:547 +#: src/storage/storage_backend.c:737 #, c-format msgid "inaccessible backing store volume %s" msgstr "无法访问的后端存储卷 %s" -#: src/storage/storage_backend.c:559 +#: src/storage/storage_backend.c:749 #, c-format msgid "qcow volume encryption unsupported with volume format %s" msgstr "" -#: src/storage/storage_backend.c:567 +#: src/storage/storage_backend.c:757 #, c-format msgid "unsupported volume encryption format %d" msgstr "" -#: src/storage/storage_backend.c:573 +#: src/storage/storage_backend.c:763 msgid "too many secrets for qcow encryption" msgstr "" -#: src/storage/storage_backend.c:644 +#: src/storage/storage_backend.c:877 msgid "cannot copy from volume with qcow-create" msgstr "" -#: src/storage/storage_backend.c:650 +#: src/storage/storage_backend.c:883 #, c-format msgid "unsupported storage vol type %d" msgstr "不支持的存储卷类型 %d" -#: src/storage/storage_backend.c:656 +#: 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:662 +#: src/storage/storage_backend.c:895 msgid "encrypted volumes not supported with qcow-create" msgstr "" -#: src/storage/storage_backend.c:696 +#: src/storage/storage_backend.c:927 #, c-format msgid "Unknown file create tool type '%d'." msgstr "" -#: src/storage/storage_backend.c:745 +#: src/storage/storage_backend.c:975 msgid "creation of non-raw file images is not supported without qemu-img." msgstr "" -#: src/storage/storage_backend.c:783 src/storage/storage_backend_fs.c:67 -#: src/storage/storage_backend_mpath.c:52 -#: src/storage/storage_backend_scsi.c:147 +#: src/storage/storage_backend.c:1039 #, c-format msgid "cannot open volume '%s'" msgstr "无法打开卷 '%s'" -#: src/storage/storage_backend.c:1060 +#: src/storage/storage_backend.c:1075 #, c-format msgid "unexpected storage mode for '%s'" msgstr "" -#: src/storage/storage_backend.c:879 +#: src/storage/storage_backend.c:1199 #, c-format msgid "cannot seek to end of file '%s'" msgstr "无法查找文件 '%s' 的结尾" -#: src/storage/storage_backend.c:900 +#: src/storage/storage_backend.c:1220 #, c-format msgid "cannot get file context of '%s'" msgstr "无法获得 '%s' 的文件上下文" -#: src/storage/storage_backend.c:971 src/storage/storage_backend_scsi.c:165 +#: src/storage/storage_backend.c:1290 #, c-format msgid "cannot seek to beginning of file '%s'" msgstr "无法查找文件 '%s' 的开始" -#: src/storage/storage_backend.c:978 src/storage/storage_backend_scsi.c:172 +#: src/storage/storage_backend.c:1297 #, c-format msgid "cannot read beginning of file '%s'" msgstr "无法读取文件 '%s' 的开始" -#: src/storage/storage_backend.c:1044 +#: src/storage/storage_backend.c:1362 #, c-format msgid "cannot read dir '%s'" msgstr "无法读取目录 '%s'" -#: src/storage/storage_backend.c:1131 +#: src/storage/storage_backend.c:1447 +#: src/storage/storage_backend_logical.c:209 #, c-format msgid "Failed to compile regex %s" msgstr "编译表达式 %s 失败" -#: src/storage/storage_backend.c:1163 src/storage/storage_backend.c:1297 +#: src/storage/storage_backend.c:1478 msgid "cannot read fd" msgstr "无法读取 fd" -#: src/storage/storage_backend.c:1578 +#: src/storage/storage_backend.c:1593 msgid "cannot open file using fd" msgstr "" -#: src/storage/storage_backend.c:1330 +#: src/storage/storage_backend.c:1624 #, c-format msgid "read error on pipe to '%s'" msgstr "pipe 到 '%s' 时出现读取错误" -#: src/storage/storage_backend.c:1385 src/storage/storage_backend.c:1397 +#: 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:109 +#: src/storage/storage_backend_disk.c:110 msgid "cannot parse device start location" msgstr "无法解析设备起始位置" -#: src/storage/storage_backend_disk.c:116 +#: src/storage/storage_backend_disk.c:117 msgid "cannot parse device end location" msgstr "无法解析设备终止位置" @@ -13441,37 +14031,49 @@ msgid "device path '%s' doesn't exist" msgstr "" -#: src/storage/storage_backend_disk.c:398 +#: src/storage/storage_backend_disk.c:398 src/storage/storage_backend_fs.c:740 +msgid "Overwrite and no overwrite flags are mutually exclusive" +msgstr "" + +#: src/storage/storage_backend_disk.c:414 +msgid "Error checking for disk label" +msgstr "" + +#: src/storage/storage_backend_disk.c:417 +msgid "Disk label already present" +msgstr "" + +#: src/storage/storage_backend_disk.c:466 msgid "Invalid partition type" msgstr "" -#: src/storage/storage_backend_disk.c:406 +#: src/storage/storage_backend_disk.c:475 msgid "extended partition already exists" msgstr "" -#: src/storage/storage_backend_disk.c:430 +#: src/storage/storage_backend_disk.c:510 msgid "no extended partition found and no primary partition available" msgstr "" -#: src/storage/storage_backend_disk.c:452 +#: src/storage/storage_backend_disk.c:516 msgid "unknown partition type" msgstr "" -#: src/storage/storage_backend_disk.c:515 +#: src/storage/storage_backend_disk.c:600 msgid "no large enough free extent" msgstr "没有足够的可用扩展" -#: src/storage/storage_backend_disk.c:629 +#: 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:640 +#: 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:649 +#: src/storage/storage_backend_disk.c:754 #, c-format msgid "cannot parse partition number from target '%s'" msgstr "无法从目标 '%s' 中解析分区号码" @@ -13481,36 +14083,38 @@ msgid "cannot probe backing volume format: %s" msgstr "" -#: src/storage/storage_backend_fs.c:154 +#: src/storage/storage_backend_fs.c:196 #, c-format msgid "invalid netfs path (no /): %s" msgstr "无效 netfs 路径(没有 /):%s" -#: src/storage/storage_backend_fs.c:160 +#: 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:265 +#: src/storage/storage_backend_fs.c:304 #, c-format msgid "cannot read mount list '%s'" msgstr "无法读取挂载列表 '%s'" -#: src/storage/storage_backend_fs.c:357 src/storage/storage_backend_fs.c:433 -#: src/storage/storage_backend_iscsi.c:276 +#: 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:362 +#: src/storage/storage_backend_fs.c:397 msgid "missing source path" msgstr "缺少源路径" -#: src/storage/storage_backend_fs.c:368 src/storage/storage_backend_fs.c:444 -#: src/storage/storage_backend_iscsi.c:283 +#: 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 "缺少源设备" -#: src/storage/storage_backend_fs.c:438 +#: src/storage/storage_backend_fs.c:462 msgid "missing source dir" msgstr "缺少源目录" @@ -13559,16 +14163,12 @@ msgid "Source device does not exist when formatting pool '%s'" msgstr "" -#: src/storage/storage_backend_fs.c:740 -msgid "Overwrite and no overwrite flags are mutually exclusive" -msgstr "" - #: src/storage/storage_backend_fs.c:751 #, c-format msgid "path '%s' is not absolute" msgstr "" -#: src/storage/storage_backend_fs.c:535 +#: src/storage/storage_backend_fs.c:821 #, c-format msgid "cannot open path '%s'" msgstr "无法打开路径 '%s'" @@ -13578,213 +14178,210 @@ msgid "cannot probe backing volume info: %s" msgstr "" -#: src/storage/storage_backend_fs.c:631 +#: src/storage/storage_backend_fs.c:905 #, c-format msgid "cannot statvfs path '%s'" msgstr "无法 statvfs 路径 '%s'" -#: src/storage/storage_backend_fs.c:698 +#: src/storage/storage_backend_fs.c:974 #, c-format msgid "failed to remove pool '%s'" msgstr "" -#: src/storage/storage_backend_fs.c:746 +#: src/storage/storage_backend_fs.c:1028 msgid "cannot copy from volume to a directory volume" msgstr "" -#: src/storage/storage_backend_fs.c:772 +#: 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:792 +#: 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:878 +#: src/storage/storage_backend_fs.c:1134 #, c-format msgid "cannot unlink file '%s'" msgstr "无法取消链接文件 '%s'" -#: src/storage/storage_backend_iscsi.c:65 +#: src/storage/storage_backend_iscsi.c:66 #, c-format msgid "host lookup failed %s" msgstr "查找主机失败 %s" -#: src/storage/storage_backend_iscsi.c:72 +#: src/storage/storage_backend_iscsi.c:73 #, c-format msgid "no IP address for target %s" msgstr "没有适合目标 %s 的 IP 地址" -#: src/storage/storage_backend_iscsi.c:81 +#: src/storage/storage_backend_iscsi.c:82 #, c-format msgid "cannot format ip addr for %s" msgstr "无法为 %s 格式化 ip 地址" -#: src/storage/storage_backend_iscsi.c:149 +#: src/storage/storage_backend_iscsi.c:168 msgid "cannot find session" msgstr "无法找到会话" -#: src/storage/storage_backend_iscsi.c:193 +#: src/storage/storage_backend_iscsi.c:192 #, c-format msgid "Could not allocate memory for output of '%s'" msgstr "" -#: src/storage/storage_backend_iscsi.c:208 +#: src/storage/storage_backend_iscsi.c:207 #, c-format msgid "" "Failed to open stream for file descriptor when reading output from '%s': '%s'" msgstr "" -#: src/storage/storage_backend_iscsi.c:220 +#: src/storage/storage_backend_iscsi.c:219 #, c-format msgid "Unexpected line > %d characters when parsing output of '%s'" msgstr "" -#: src/storage/storage_backend_iscsi.c:238 +#: src/storage/storage_backend_iscsi.c:237 #, c-format msgid "Missing space when parsing output of '%s'" msgstr "" -#: src/storage/storage_backend_iscsi.c:289 +#: src/storage/storage_backend_iscsi.c:288 msgid "Failed to initialize random generator when creating iscsi interface" msgstr "" -#: src/storage/storage_backend_iscsi.c:306 +#: src/storage/storage_backend_iscsi.c:305 #, c-format msgid "Failed to run command '%s' to create new iscsi interface" msgstr "" -#: src/storage/storage_backend_iscsi.c:316 +#: src/storage/storage_backend_iscsi.c:315 #, c-format msgid "Failed to run command '%s' to update iscsi interface with IQN '%s'" msgstr "" -#: src/storage/storage_backend_iscsi.c:188 +#: 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:196 +#: src/storage/storage_backend_iscsi.c:416 #, c-format msgid "Failed to find LUs on host %u" msgstr "在直接 %u 中查找 LUs 失败" -#: src/storage/storage_backend_logical.c:147 +#: src/storage/storage_backend_logical.c:154 msgid "malformed volume extent stripes value" msgstr "" -#: src/storage/storage_backend_logical.c:159 +#: src/storage/storage_backend_logical.c:168 msgid "malformed volume extent length value" msgstr "畸形的卷扩展长度值" -#: src/storage/storage_backend_logical.c:164 +#: src/storage/storage_backend_logical.c:173 msgid "malformed volume extent size value" msgstr "畸形的卷扩展大小值" -#: src/storage/storage_backend_logical.c:209 +#: src/storage/storage_backend_logical.c:216 msgid "malformed volume extent devices value" msgstr "" -#: src/storage/storage_backend_logical.c:154 +#: src/storage/storage_backend_logical.c:245 msgid "malformed volume extent offset value" msgstr "畸形的卷扩展补偿值" -#: src/storage/storage_backend_logical.c:355 +#: src/storage/storage_backend_logical.c:434 msgid "failed to get source from sourceList" msgstr "从 sourceList 获得源失败" -#: src/storage/storage_backend_logical.c:410 +#: src/storage/storage_backend_logical.c:511 #, c-format msgid "cannot open device '%s'" msgstr "无法打开设备 '%s'" -#: src/storage/storage_backend_logical.c:416 +#: src/storage/storage_backend_logical.c:517 #, c-format msgid "cannot clear device header of '%s'" msgstr "无法清除设备标题 '%s'" -#: src/storage/storage_backend_logical.c:517 +#: src/storage/storage_backend_logical.c:524 #, c-format msgid "cannot flush header of device'%s'" msgstr "" -#: src/storage/storage_backend_logical.c:423 +#: src/storage/storage_backend_logical.c:531 #, c-format msgid "cannot close device '%s'" msgstr "无法关闭设备 '%s'" -#: src/storage/storage_backend_fs.c:811 -#: src/storage/storage_backend_logical.c:624 +#: src/storage/storage_backend_logical.c:720 #, c-format msgid "cannot set file owner '%s'" msgstr "无法设定文件拥有者 '%s'" -#: src/storage/storage_backend_fs.c:819 -#: src/storage/storage_backend_logical.c:631 +#: src/storage/storage_backend_logical.c:727 #, c-format msgid "cannot set file mode '%s'" msgstr "无法设定文件模式 '%s'" -#: src/storage/storage_backend_logical.c:647 +#: src/storage/storage_backend_logical.c:743 #, c-format msgid "cannot find newly created volume '%s'" msgstr "无法找到新生成的卷 '%s'" -#: src/storage/storage_backend_mpath.c:233 +#: src/storage/storage_backend_mpath.c:232 #, c-format msgid "Failed to get %s minor number" msgstr "" -#: 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_mpath.c:123 -#: src/storage/storage_backend_scsi.c:260 +#: src/storage/storage_backend_scsi.c:270 #, c-format msgid "Failed to update volume for '%s'" msgstr "为 '%s' 更新卷失败" -#: src/storage/storage_backend_scsi.c:316 -#: src/storage/storage_backend_scsi.c:407 +#: 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:364 +#: src/storage/storage_backend_scsi.c:369 #, c-format msgid "Failed to parse block name %s" msgstr "解析块名称 %s 失败" -#: src/storage/storage_backend_scsi.c:456 +#: 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:523 +#: 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/storage/storage_backend_scsi.c:610 +#: src/storage/storage_backend_scsi.c:609 #, c-format msgid "Could not open '%s' to trigger host scan" msgstr "" -#: src/storage/storage_backend_scsi.c:621 +#: src/storage/storage_backend_scsi.c:620 #, c-format msgid "Write to '%s' to trigger host scan failed" msgstr "" @@ -13809,39 +14406,40 @@ msgid "Failed to autostart storage pool '%s': %s" msgstr "" -#: src/storage/storage_driver.c:275 src/storage/storage_driver.c:974 -#: src/storage/storage_driver.c:1003 +#: src/storage/storage_driver.c:280 src/storage/storage_driver.c:1003 +#: src/storage/storage_driver.c:1032 msgid "no pool with matching uuid" msgstr "没有带匹配 uuid 的池" -#: src/storage/storage_driver.c:300 +#: src/storage/storage_driver.c:305 #, c-format msgid "no pool with matching name '%s'" msgstr "" -#: src/storage/storage_driver.c:456 src/test/test_driver.c:3761 +#: src/storage/storage_driver.c:464 src/test/test_driver.c:4092 #, c-format msgid "pool type '%s' does not support source discovery" msgstr "" -#: src/storage/storage_driver.c:616 src/storage/storage_driver.c:670 -#: src/storage/storage_driver.c:715 src/storage/storage_driver.c:752 -#: src/storage/storage_driver.c:808 src/storage/storage_driver.c:857 -#: src/storage/storage_driver.c:913 src/storage/storage_driver.c:949 -#: src/storage/storage_driver.c:1065 src/storage/storage_driver.c:1098 -#: src/storage/storage_driver.c:1143 src/storage/storage_driver.c:1269 -#: src/storage/storage_driver.c:1390 src/storage/storage_driver.c:1543 -#: src/storage/storage_driver.c:1622 src/storage/storage_driver.c:1675 -#: src/storage/storage_driver.c:1722 +#: 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/storage/storage_driver.c:622 +#: src/storage/storage_driver.c:638 msgid "pool is still active" msgstr "池仍是激活的" -#: src/storage/storage_driver.c:628 src/storage/storage_driver.c:767 -#: src/storage/storage_driver.c:823 src/storage/storage_driver.c:872 +#: 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 "" @@ -13851,24 +14449,26 @@ msgid "Failed to delete autostart link '%s': %s" msgstr "" -#: src/storage/storage_driver.c:679 +#: src/storage/storage_driver.c:699 msgid "pool already active" msgstr "池已经激活" -#: src/storage/storage_driver.c:724 +#: src/storage/storage_driver.c:745 msgid "storage pool is already active" msgstr "存储池已经激活" -#: src/storage/storage_driver.c:761 src/storage/storage_driver.c:866 -#: src/storage/storage_driver.c:1071 src/storage/storage_driver.c:1104 -#: src/storage/storage_driver.c:1149 src/storage/storage_driver.c:1275 -#: src/storage/storage_driver.c:1403 src/storage/storage_driver.c:1409 -#: src/storage/storage_driver.c:1549 src/storage/storage_driver.c:1628 -#: src/storage/storage_driver.c:1681 src/storage/storage_driver.c:1728 +#: 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/storage/storage_driver.c:817 +#: src/storage/storage_driver.c:839 msgid "storage pool is still active" msgstr "存储池仍然激活" @@ -13876,52 +14476,56 @@ msgid "pool does not support pool deletion" msgstr "" -#: src/storage/storage_driver.c:1009 src/test/test_driver.c:4119 +#: src/storage/storage_driver.c:1038 src/test/test_driver.c:4468 msgid "pool has no config file" msgstr "池没有配置文件" -#: src/storage/storage_driver.c:1157 src/storage/storage_driver.c:1419 -#: src/storage/storage_driver.c:1560 src/storage/storage_driver.c:1636 -#: src/storage/storage_driver.c:1689 src/storage/storage_driver.c:1736 -#: src/test/test_driver.c:4241 src/test/test_driver.c:4442 -#: src/test/test_driver.c:4518 src/test/test_driver.c:4596 -#: src/test/test_driver.c:4641 src/test/test_driver.c:4681 +#: 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/storage/storage_driver.c:1197 +#: src/storage/storage_driver.c:1224 msgid "no storage vol with matching key" msgstr "没有带匹配密钥的存储卷" -#: src/storage/storage_driver.c:1244 +#: src/storage/storage_driver.c:1275 msgid "no storage vol with matching path" msgstr "没有带匹配路径的存储卷" -#: src/storage/storage_driver.c:1288 src/test/test_driver.c:4354 -#: src/test/test_driver.c:4435 +#: 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/storage/storage_driver.c:1300 +#: src/storage/storage_driver.c:1334 msgid "storage pool does not support volume creation" msgstr "存储池不支持卷创建" -#: src/storage/storage_driver.c:1396 +#: src/storage/storage_driver.c:1439 #, c-format msgid "no storage pool with matching name '%s'" msgstr "" -#: src/storage/storage_driver.c:1430 +#: src/storage/storage_driver.c:1473 #, c-format msgid "storage volume name '%s' already in use." msgstr "" -#: src/storage/storage_driver.c:1446 +#: src/storage/storage_driver.c:1489 msgid "storage pool does not support volume creation from an existing volume" msgstr "" -#: src/storage/storage_driver.c:1452 src/storage/storage_driver.c:1567 +#: 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 "" @@ -13961,20 +14565,20 @@ msgid "Failed to stat storage volume with path '%s'" msgstr "" -#: src/storage/storage_driver.c:1574 +#: src/storage/storage_driver.c:1960 msgid "storage pool does not support vol deletion" msgstr "存储池不支持卷删除" -#: src/test/test_driver.c:337 +#: src/test/test_driver.c:347 #, c-format msgid "Exceeded max iface limit %d" msgstr "" -#: src/test/test_driver.c:684 +#: src/test/test_driver.c:693 msgid "resolving volume filename" msgstr "" -#: src/test/test_driver.c:788 +#: src/test/test_driver.c:786 msgid "Root element is not 'node'" msgstr "" @@ -14002,7 +14606,7 @@ msgid "invalid node cpu mhz value" msgstr "" -#: src/test/test_driver.c:863 src/xen/xm_internal.c:1072 +#: src/test/test_driver.c:859 src/xenxs/xen_xm.c:655 #, c-format msgid "Model %s too big for destination" msgstr "" @@ -14011,356 +14615,336 @@ msgid "invalid node memory value" msgstr "" -#: src/test/test_driver.c:891 +#: src/test/test_driver.c:887 msgid "resolving domain filename" msgstr "解析域文件名" -#: src/test/test_driver.c:934 +#: src/test/test_driver.c:931 msgid "resolving network filename" msgstr "解析网络文件名" -#: src/test/test_driver.c:970 +#: src/test/test_driver.c:966 msgid "resolving interface filename" msgstr "" -#: src/test/test_driver.c:1008 +#: src/test/test_driver.c:1003 msgid "resolving pool filename" msgstr "正在解析池文件名" -#: src/test/test_driver.c:1061 +#: src/test/test_driver.c:1055 msgid "resolving device filename" msgstr "" -#: src/test/test_driver.c:1129 +#: src/test/test_driver.c:1125 msgid "testOpen: supply a path or use test:///default" msgstr "testOpen:提供一个路径或者默认使用 test:///" -#: src/test/test_driver.c:1480 +#: src/test/test_driver.c:1482 #, c-format msgid "domain '%s' not paused" msgstr "域 '%s' 未中断" -#: src/test/test_driver.c:1522 src/test/test_driver.c:1563 +#: src/test/test_driver.c:1525 src/test/test_driver.c:1566 #, c-format msgid "domain '%s' not running" msgstr "域 '%s' 没有在运行" -#: src/opennebula/one_driver.c:320 src/test/test_driver.c:519 -#: src/test/test_driver.c:1672 src/test/test_driver.c:2113 -#: src/test/test_driver.c:2608 src/test/test_driver.c:2663 +#: 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:1717 +#: 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:1724 +#: src/test/test_driver.c:1772 #, c-format msgid "saving domain '%s' to '%s': open failed" msgstr "将域 '%s' 保存到 '%s':打开失败" -#: src/test/test_driver.c:1731 src/test/test_driver.c:1737 -#: src/test/test_driver.c:1743 src/test/test_driver.c:1750 +#: 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:1802 +#: src/test/test_driver.c:1866 #, c-format msgid "cannot read domain image '%s'" msgstr "无法读取域映像 '%s'" -#: src/test/test_driver.c:1808 +#: src/test/test_driver.c:1872 #, c-format msgid "incomplete save header in '%s'" msgstr "没有完成在 '%s' 中保存标题" -#: src/test/test_driver.c:1814 +#: src/test/test_driver.c:1878 msgid "mismatched header magic" msgstr "错误匹配的 header magic" -#: src/test/test_driver.c:1819 +#: src/test/test_driver.c:1883 #, c-format msgid "failed to read metadata length in '%s'" msgstr "在 '%s' 中读取元数据长度失败" -#: src/test/test_driver.c:1825 +#: src/test/test_driver.c:1889 msgid "length of metadata out of range" msgstr "元数据长度超出范围" -#: src/test/test_driver.c:1834 +#: src/test/test_driver.c:1898 #, c-format msgid "incomplete metdata in '%s'" msgstr "'%s' 中不完整的元数据" -#: src/test/test_driver.c:1897 +#: 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:1903 +#: 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:1909 +#: src/test/test_driver.c:1982 #, c-format msgid "domain '%s' coredump: write failed: %s" msgstr "域 '%s' coredump:写入失败:%s" -#: src/test/test_driver.c:2055 +#: src/test/test_driver.c:2209 msgid "cannot hotplug vcpus for an inactive domain" msgstr "" -#: src/test/test_driver.c:2105 +#: src/test/test_driver.c:2292 msgid "cannot list vcpus for an inactive domain" msgstr "" -#: src/test/test_driver.c:2197 +#: src/test/test_driver.c:2384 msgid "requested vcpu is higher than allocated vcpus" msgstr "" -#: src/test/test_driver.c:2336 +#: src/test/test_driver.c:2525 msgid "Range exceeds available cells" msgstr "范围超出可用单元" -#: src/test/test_driver.c:2370 +#: src/test/test_driver.c:2561 #, c-format msgid "Domain '%s' is already running" msgstr "域 '%s' 已经运行" -#: src/test/test_driver.c:2946 +#: src/test/test_driver.c:3172 #, c-format msgid "Network '%s' is still running" msgstr "网络 '%s' 仍在运行" -#: src/test/test_driver.c:2979 +#: src/test/test_driver.c:3205 #, c-format msgid "Network '%s' is already running" msgstr "网络 '%s' 已经运行" -#: src/test/test_driver.c:3562 +#: src/test/test_driver.c:3560 msgid "there is another transaction running." msgstr "" -#: src/test/test_driver.c:3589 +#: src/test/test_driver.c:3587 msgid "no transaction running, nothing to be commited." msgstr "" -#: src/test/test_driver.c:3616 +#: src/test/test_driver.c:3614 msgid "no transaction running, nothing to rollback." msgstr "" -#: src/test/test_driver.c:3703 src/test/test_driver.c:3867 -#: src/test/test_driver.c:3900 src/test/test_driver.c:3968 +#: 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/storage/storage_driver.c:531 src/test/test_driver.c:3788 +#: src/test/test_driver.c:4122 msgid "storage pool already exists" msgstr "存储池已存在" -#: src/test/test_driver.c:3929 src/test/test_driver.c:4000 -#: src/test/test_driver.c:4152 src/test/test_driver.c:4187 -#: src/test/test_driver.c:4233 src/test/test_driver.c:4344 -#: src/test/test_driver.c:4425 src/test/test_driver.c:4525 -#: src/test/test_driver.c:4603 src/test/test_driver.c:4648 -#: src/test/test_driver.c:4688 +#: 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/test/test_driver.c:4284 +#: src/test/test_driver.c:4633 #, c-format msgid "no storage vol with matching key '%s'" msgstr "没有带匹配密钥 '%s' 的存储卷" -#: src/test/test_driver.c:4318 +#: src/test/test_driver.c:4667 #, c-format msgid "no storage vol with matching path '%s'" msgstr "没有带匹配路径 '%s' 的存储卷" -#: src/test/test_driver.c:4362 src/test/test_driver.c:4451 +#: 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' 的足够可用空间" -#: src/uml/uml_conf.c:183 -msgid "IP address not supported for ethernet inteface" +#: src/uml/uml_conf.c:191 +msgid "IP address not supported for ethernet interface" msgstr "" -#: src/uml/uml_conf.c:188 -msgid "script execution not supported for ethernet inteface" +#: src/uml/uml_conf.c:196 +msgid "script execution not supported for ethernet interface" msgstr "" -#: src/uml/uml_conf.c:195 +#: src/uml/uml_conf.c:203 msgid "TCP server networking type not supported" msgstr "" -#: src/uml/uml_conf.c:200 +#: src/uml/uml_conf.c:208 msgid "TCP client networking type not supported" msgstr "" -#: src/uml/uml_conf.c:215 +#: src/uml/uml_conf.c:223 #, c-format msgid "Network '%s' not found" msgstr "未找到网络 '%s'" -#: src/uml/uml_conf.c:245 +#: src/uml/uml_conf.c:253 msgid "internal networking type not supported" msgstr "" -#: src/uml/uml_conf.c:289 +#: src/uml/uml_conf.c:258 msgid "direct networking type not supported" 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:376 +#: src/uml/uml_conf.c:345 #, c-format msgid "failed to open chardev file: %s" msgstr "" -#: src/uml/uml_conf.c:331 +#: src/uml/uml_conf.c:366 #, c-format msgid "unsupported chr device type %d" msgstr "不支持字符设备类型 %d" -#: src/uml/uml_driver.c:418 +#: src/uml/uml_driver.c:471 msgid "cannot initialize inotify" msgstr "无法初始化 inotify" -#: src/uml/uml_driver.c:424 +#: src/uml/uml_driver.c:477 #, c-format msgid "Failed to create monitor directory %s: %s" msgstr "创建监视器目录 %s 失败:%s" -#: src/uml/uml_driver.c:457 +#: src/uml/uml_driver.c:514 msgid "umlStartup: out of memory" msgstr "" -#: src/uml/uml_driver.c:604 +#: src/uml/uml_driver.c:776 #, c-format msgid "failed to read pid: %s" msgstr "读取 pid 失败:%s" -#: src/uml/uml_driver.c:627 +#: src/uml/uml_driver.c:798 #, c-format msgid "Unix path %s too long for destination" msgstr "" -#: src/uml/uml_driver.c:658 +#: src/uml/uml_driver.c:828 msgid "cannot open socket" msgstr "无法打开套接字" -#: src/uml/uml_driver.c:667 +#: src/uml/uml_driver.c:838 msgid "cannot bind socket" msgstr "无法绑定套接字" -#: src/uml/uml_driver.c:723 +#: 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:729 +#: src/uml/uml_driver.c:898 #, c-format msgid "Command %s too long for destination" msgstr "" -#: src/uml/uml_driver.c:736 +#: src/uml/uml_driver.c:905 #, c-format msgid "cannot send command %s" msgstr "无法发送命令 %s" -#: src/uml/uml_driver.c:746 +#: src/uml/uml_driver.c:918 #, c-format msgid "cannot read reply %s" msgstr "无法读取回复 %s" -#: src/uml/uml_driver.c:926 +#: src/uml/uml_driver.c:924 #, c-format msgid "incomplete reply %s" msgstr "" -#: src/uml/uml_driver.c:963 -msgid "Cleanup tap" -msgstr "" - -#: src/uml/uml_driver.c:974 -#, c-format -msgid "Cleanup '%s'" -msgstr "" - -#: src/uml/uml_driver.c:977 -#, c-format -msgid "Cleanup failed %d" -msgstr "" - -#: src/uml/uml_driver.c:981 -msgid "Cleanup tap done" -msgstr "" - -#: src/uml/uml_driver.c:829 +#: src/uml/uml_driver.c:989 msgid "no kernel specified" msgstr "没有指定内核" -#: src/uml/uml_driver.c:838 +#: src/uml/uml_driver.c:998 #, c-format msgid "Cannot find UML kernel %s" msgstr "无法找到 UML 内核 %s" -#: src/qemu/qemu_driver.c:517 src/qemu/qemu_driver.c:549 -#: src/uml/uml_driver.c:868 +#: 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:997 +#: src/uml/uml_driver.c:1167 #, c-format msgid "unexpected UML URI path '%s', try uml:///system" msgstr "" -#: src/uml/uml_driver.c:1004 +#: src/uml/uml_driver.c:1174 #, c-format msgid "unexpected UML URI path '%s', try uml:///session" msgstr "" -#: src/uml/uml_driver.c:1013 +#: src/uml/uml_driver.c:1183 msgid "uml state driver is not active" msgstr "" -#: src/uml/uml_driver.c:1230 +#: src/uml/uml_driver.c:1435 #, c-format msgid "cannot parse version %s" msgstr "无法解析版本 %s" -#: src/uml/uml_driver.c:1321 +#: src/uml/uml_driver.c:1538 msgid "shutdown operation failed" msgstr "关闭操作失败" -#: src/qemu/qemu_driver.c:3446 src/uml/uml_driver.c:1433 +#: src/uml/uml_driver.c:1668 msgid "cannot set max memory lower than current memory" msgstr "无法将最大内存设置为低于当前内存" -#: src/qemu/qemu_driver.c:5423 +#: src/uml/uml_driver.c:2044 msgid "cannot attach device on inactive domain" msgstr "无法在非活跃的域中附加设备" -#: src/uml/uml_driver.c:2104 src/uml/uml_driver.c:2216 -#: src/vbox/vbox_tmpl.c:5533 src/vbox/vbox_tmpl.c:5548 -#: src/vbox/vbox_tmpl.c:5704 +#: 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/qemu/qemu_driver.c:5817 +#: src/uml/uml_driver.c:2162 msgid "cannot detach device on inactive domain" msgstr "无法在非活跃的域中分离设备" -#: src/uml/uml_driver.c:1832 +#: src/uml/uml_driver.c:2355 tools/virsh.c:10107 #, c-format msgid "cannot read %s" msgstr "无法读取 %s" @@ -14443,15 +15027,15 @@ msgid "cannot clear process capabilities %d" msgstr "" -#: src/util/util.c:347 +#: src/util/command.c:167 msgid "cannot block signals" msgstr "无法阻断信号" -#: src/util/util.c:418 src/util/util.c:533 +#: src/util/command.c:186 src/util/command.c:492 msgid "cannot fork child process" msgstr "无法分开子进程" -#: src/util/util.c:437 src/util/util.c:474 +#: src/util/command.c:198 src/util/command.c:243 msgid "cannot unblock signals" msgstr "无法取消信号阻断" @@ -14460,15 +15044,15 @@ msgid "Cannot find '%s' in path" msgstr "" -#: src/util/util.c:362 +#: src/util/command.c:345 msgid "cannot create pipe" msgstr "无法创建管道" -#: src/util/util.c:369 src/util/util.c:398 +#: src/util/command.c:352 src/util/command.c:377 msgid "Failed to set non-blocking file descriptor flag" msgstr "设定非块文件描述符标记失败" -#: src/util/util.c:391 +#: src/util/command.c:370 msgid "Failed to create pipe" msgstr "创建管道失败" @@ -14477,19 +15061,19 @@ msgid "failed to preserve fd %d" msgstr "" -#: src/util/util.c:490 +#: src/util/command.c:444 msgid "failed to setup stdin file handle" msgstr "设置 stdin 文件处理失败" -#: src/util/util.c:496 +#: src/util/command.c:449 msgid "failed to setup stdout file handle" msgstr "设置 stdout 文件处理失败" -#: src/util/util.c:502 +#: src/util/command.c:454 msgid "failed to setup stderr file handle" msgstr "设置 stderr 文件处理失败" -#: src/util/util.c:520 +#: src/util/command.c:479 msgid "cannot become session leader" msgstr "无法成为会话领导者" @@ -14497,7 +15081,7 @@ msgid "cannot change to root directory" msgstr "" -#: src/util/util.c:543 +#: src/util/command.c:502 #, c-format msgid "could not write pidfile %s for %d" msgstr "" @@ -14510,7 +15094,7 @@ msgid "Could not re-enable SIGPIPE" msgstr "" -#: src/util/util.c:567 +#: src/util/command.c:554 #, c-format msgid "cannot execute binary %s" msgstr "无法执行二进制文件 %s" @@ -14523,199 +15107,199 @@ msgid "virExec is not implemented for WIN32" msgstr "" -#: src/util/command.c:1515 src/util/command.c:1734 src/util/command.c:1782 -#: src/util/command.c:2010 src/util/command.c:2156 src/util/command.c:2345 -#: src/util/command.c:2404 +#: 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 "" -#: src/util/command.c:1552 +#: src/util/command.c:1563 #, c-format msgid "exit status %d" msgstr "" -#: src/util/command.c:1555 +#: src/util/command.c:1566 #, c-format msgid "fatal signal %d" msgstr "" -#: src/util/command.c:1558 +#: src/util/command.c:1569 #, c-format msgid "invalid value %d" msgstr "" -#: src/util/command.c:1632 +#: src/util/command.c:1643 msgid "unable to poll on child" msgstr "" -#: src/util/command.c:1659 +#: src/util/command.c:1670 msgid "unable to read child stdout" msgstr "" -#: src/util/command.c:1660 +#: src/util/command.c:1671 msgid "unable to read child stderr" msgstr "" -#: src/util/command.c:1688 +#: src/util/command.c:1699 msgid "unable to write to child input" msgstr "" -#: src/util/command.c:1748 +#: src/util/command.c:1759 msgid "Executing new processes is not supported on Win32 platform" msgstr "" -#: src/util/command.c:1804 +#: src/util/command.c:1815 msgid "cannot mix caller fds with blocking execution" msgstr "" -#: src/util/command.c:1810 +#: src/util/command.c:1821 msgid "cannot mix string I/O with daemon" msgstr "" -#: src/util/command.c:1820 +#: src/util/command.c:1831 msgid "unable to open pipe" msgstr "" -#: src/util/command.c:1927 +#: src/util/command.c:1938 #, c-format msgid "Unable to change to %s" msgstr "" -#: src/util/command.c:1935 +#: src/util/command.c:1946 msgid "Unable to notify parent process" msgstr "" -#: src/util/command.c:1945 +#: src/util/command.c:1956 msgid "Unknown failure during hook execution" msgstr "" -#: src/util/command.c:1948 +#: src/util/command.c:1959 msgid "Unable to send error to parent process" msgstr "" -#: src/util/command.c:1957 +#: src/util/command.c:1968 msgid "Unable to wait on parent process" msgstr "" -#: src/util/command.c:1959 +#: src/util/command.c:1970 msgid "libvirtd quit during handshake" msgstr "" -#: src/util/command.c:1963 +#: src/util/command.c:1974 #, c-format msgid "Unexpected confirm code '%c' from parent process" msgstr "" -#: src/util/command.c:2022 +#: src/util/command.c:2033 msgid "cannot mix string I/O with asynchronous command" msgstr "" -#: src/util/command.c:2028 +#: src/util/command.c:2039 #, c-format msgid "command is already running as pid %d" msgstr "" -#: src/util/command.c:2035 +#: src/util/command.c:2046 msgid "daemonized command cannot use virCommandRunAsync" msgstr "" -#: src/util/command.c:2040 +#: src/util/command.c:2051 #, c-format msgid "daemonized command cannot set working directory %s" msgstr "" -#: src/util/command.c:2046 +#: src/util/command.c:2057 msgid "creation of pid file requires daemonized command" msgstr "" -#: src/util/command.c:2104 src/util/command.c:2113 +#: src/util/command.c:2115 src/util/command.c:2124 #, c-format msgid "unable to wait for process %d" msgstr "" -#: src/util/command.c:2121 +#: src/util/command.c:2132 #, c-format msgid "Child process (%d) status unexpected: %s" msgstr "" -#: src/util/command.c:2162 +#: src/util/command.c:2173 msgid "command is not yet running" msgstr "" -#: src/util/command.c:2180 +#: src/util/command.c:2191 #, c-format msgid "Child process (%s) status unexpected: %s" msgstr "" -#: src/util/command.c:2351 src/util/command.c:2410 +#: src/util/command.c:2362 src/util/command.c:2421 msgid "Handshake is already complete" msgstr "" -#: src/util/command.c:2358 +#: src/util/command.c:2369 msgid "Unable to wait for child process" msgstr "" -#: src/util/command.c:2360 +#: src/util/command.c:2371 msgid "Child process quit during startup handshake" msgstr "" -#: src/util/command.c:2375 +#: src/util/command.c:2386 msgid "No error message from child failure" msgstr "" -#: src/util/command.c:2416 +#: src/util/command.c:2427 msgid "Unable to notify child process" msgstr "" -#: src/util/conf.c:354 +#: src/util/conf.c:355 msgid "unterminated number" msgstr "未终止的数" -#: src/util/conf.c:387 src/util/conf.c:407 src/util/conf.c:422 +#: src/util/conf.c:388 src/util/conf.c:412 src/util/conf.c:427 msgid "unterminated string" msgstr "未终止的字符串" -#: src/util/conf.c:453 src/util/conf.c:516 +#: src/util/conf.c:458 src/util/conf.c:528 msgid "expecting a value" msgstr "需要一个值" -#: src/util/conf.c:464 +#: src/util/conf.c:469 msgid "lists not allowed in VMX format" msgstr "VMX格式下不允许使用列表" -#: src/util/conf.c:478 +#: src/util/conf.c:490 msgid "expecting a separator in list" msgstr "在列表中需要一个分隔符" -#: src/util/conf.c:501 +#: src/util/conf.c:513 msgid "list is not closed with ]" msgstr "列表没有使用 ] 结尾" -#: src/util/conf.c:508 +#: src/util/conf.c:520 msgid "numbers not allowed in VMX format" msgstr "VMX 格式中不允许有数字" -#: src/util/conf.c:551 +#: src/util/conf.c:563 msgid "expecting a name" msgstr "需要一个名称" -#: src/util/conf.c:615 +#: src/util/conf.c:627 msgid "expecting a separator" msgstr "需要一个分隔符" -#: src/util/conf.c:646 +#: src/util/conf.c:658 msgid "expecting an assignment" msgstr "需要一个参数" -#: src/util/conf.c:941 +#: src/util/conf.c:953 msgid "failed to open file" msgstr "打开文件失败" -#: src/util/conf.c:951 +#: src/util/conf.c:963 msgid "failed to save content" msgstr "保存内容失败" -#: src/conf/domain_conf.c:4881 src/conf/network_conf.c:769 +#: src/util/dnsmasq.c:251 src/util/dnsmasq.c:417 #, c-format msgid "cannot write config file '%s'" msgstr "无法写入配置文件 '%s'" @@ -14725,15 +15309,15 @@ msgid "Failed to make dnsmasq (PID: %d) reload config files." msgstr "" -#: src/util/event_poll.c:626 +#: src/util/event_poll.c:627 msgid "Unable to poll on file handles" msgstr "" -#: src/util/event_poll.c:676 +#: src/util/event_poll.c:677 msgid "Unable to setup wakeup pipe" msgstr "" -#: src/util/event_poll.c:684 +#: src/util/event_poll.c:685 #, c-format msgid "Unable to add handle %d to event loop" msgstr "" @@ -14876,842 +15460,889 @@ msgid "%s: unknown failure with %s\n" msgstr "" -#: src/util/interface.c:122 -msgid "ifaceGetFlags is not supported on non-linux platforms" +#: src/util/iptables.c:297 +msgid "Only IPv4 or IPv6 addresses can be used with iptables" msgstr "" -#: src/util/interface.c:131 -msgid "ifaceIsUp is not supported on non-linux platforms" +#: src/util/iptables.c:303 +msgid "Failure to mask address" msgstr "" -#: src/util/interface.c:245 src/util/interface.c:322 +#: src/util/iptables.c:767 #, c-format -msgid "invalid interface name %s" +msgid "Attempted to NAT '%s'. NAT is only supported for IPv4." msgstr "" -#: src/util/interface.c:254 -#, c-format -msgid "coud not get MAC address of interface %s" +#: src/util/json.c:927 +msgid "Unable to create JSON parser" msgstr "" -#: src/util/interface.c:333 +#: src/util/json.c:939 #, c-format -msgid "interface %s does not exist" +msgid "cannot parse json %s: %s" msgstr "" -#: src/util/interface.c:353 -msgid "ifaceGetIndex is not supported on non-linux platforms" +#: src/util/json.c:1051 +msgid "Unable to create JSON formatter" msgstr "" -#: src/util/interface.c:398 -msgid "ifaceGetVlanID is not supported on non-linux platforms" +#: src/util/json.c:1081 src/util/json.c:1087 +msgid "No JSON parser implementation is available" msgstr "" -#: src/util/interface.c:684 -#, c-format -msgid "error creating %s type of interface" +#: src/util/netlink.c:81 +msgid "cannot allocate nlhandle for netlink" msgstr "" -#: src/util/interface.c:708 src/util/interface.c:822 src/util/interface.c:966 -#: src/util/macvtap.c:741 -msgid "malformed netlink response message" +#: src/util/netlink.c:87 +msgid "cannot connect to netlink socket" msgstr "" -#: src/util/interface.c:716 src/util/interface.c:830 src/util/interface.c:974 -#: src/util/macvtap.c:749 -msgid "allocated netlink buffer is too small" +#: src/util/netlink.c:99 +msgid "cannot send to netlink socket" msgstr "" -#: src/util/interface.c:733 -msgid "" -"ifaceMacvtapLinkAdd is not supported since the include files were too old" +#: src/util/netlink.c:113 +msgid "error in select call" msgstr "" -#: src/util/interface.c:736 -msgid "ifaceMacvtapLinkAdd is not supported on non-linux platforms" +#: src/util/netlink.c:116 +msgid "no valid netlink response was received" msgstr "" -#: src/util/interface.c:798 -#, c-format -msgid "error destroying %s interface" +#: src/util/netlink.c:124 +msgid "nl_recv failed" msgstr "" -#: src/util/interface.c:841 -msgid "ifaceLinkDel is not supported since the include files were too old" +#: src/util/netlink.c:147 +msgid "nlComm is not supported since libnl was not available" msgstr "" -#: src/util/interface.c:844 -msgid "ifaceLinkDel is not supported on non-linux platforms" +#: src/util/netlink.c:149 +msgid "nlComm is not supported on non-linux platforms" msgstr "" -#: src/util/interface.c:936 +#: src/util/pci.c:624 #, c-format -msgid "error dumping %s (%d) interface" +msgid "Active %s devices on bus with %s, not doing bus reset" msgstr "" -#: src/util/interface.c:990 -msgid "" -"ifaceMacvtapLinkDump is not supported since the include files were too old" +#: src/util/pci.c:634 src/util/pci.c:1678 +#, c-format +msgid "Failed to find parent device for %s" msgstr "" -#: src/util/interface.c:993 -msgid "ifaceMacvtapLinkDump is not supported on non-linux platforms" +#: src/util/pci.c:647 src/util/pci.c:693 +#, c-format +msgid "Failed to read PCI config space for %s" msgstr "" -#: src/util/interface.c:1047 -msgid "buffer for root interface name is too small" +#: src/util/pci.c:667 src/util/pci.c:713 +#, c-format +msgid "Failed to restore PCI config space for %s" msgstr "" -#: src/util/interface.c:1082 -msgid "" -"ifaceGetNthParent is not supported since the include files were too old" -msgstr "" +#: src/util/pci.c:728 +#, c-format +msgid "Failed to open config space file '%s'" +msgstr "打开 config 空间文件 '%s' 失败" -#: src/util/interface.c:1085 -msgid "ifaceGetNthParent is not supported on non-linux platforms" +#: src/util/pci.c:753 +#, c-format +msgid "Not resetting active device %s" msgstr "" -#: src/util/interface.c:1113 +#: src/util/pci.c:780 #, c-format -msgid "" -"Getting MAC address from '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed." +msgid "Unable to reset PCI device %s: %s" msgstr "" -#: src/util/interface.c:1130 -#, c-format -msgid "Unable to preserve mac for %s" +#: src/util/pci.c:782 +msgid "no FLR, PM reset or bus reset available" msgstr "" -#: src/util/interface.c:1139 src/util/interface.c:1190 +#: src/util/pci.c:906 #, c-format -msgid "" -"Setting MAC address on '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed." +msgid "Failed to unbind PCI device '%s' from %s" msgstr "" -#: src/util/interface.c:1180 +#: src/util/pci.c:924 #, c-format -msgid "Cannot parse MAC address from '%s'" +msgid "Failed to remove slot for PCI device '%s' from %s" msgstr "" -#: src/util/interface.c:1323 -msgid "ifaceIsVirtualFunction is not supported on non-linux platforms" -msgstr "" +#: src/util/pci.c:948 +#, c-format +msgid "Failed to trigger a re-probe for PCI device '%s'" +msgstr "为 PCI 设备 '%s' 激发重新探测失败" -#: src/util/interface.c:1334 -msgid "ifaceGetVirtualFunctionIndex is not supported on non-linux platforms" -msgstr "" +#: src/util/pci.c:1006 +#, c-format +msgid "Failed to add PCI device ID '%s' to %s" +msgstr "将 PCI 设备 ID '%s' 添加到 %s 失败" -#: src/util/interface.c:1344 -msgid "ifaceGetPhysicalFunction is not supported on non-linux platforms" -msgstr "" +#: src/util/pci.c:1037 +#, c-format +msgid "Failed to unbind PCI device '%s'" +msgstr "取消绑定 PCI 设备 '%s' 失败" -#: src/util/iptables.c:297 -msgid "Only IPv4 or IPv6 addresses can be used with iptables" -msgstr "" +#: src/util/pci.c:1059 +#, c-format +msgid "Failed to add slot for PCI device '%s' to %s" +msgstr "为 PCI 设备 '%s' 在 %s 添加插槽失败" -#: src/util/iptables.c:303 -msgid "Failure to mask address" -msgstr "" +#: src/util/pci.c:1071 +#, c-format +msgid "Failed to bind PCI device '%s' to %s" +msgstr "将 PCI 设备 ID '%s' 绑定到 %s 失败" -#: src/util/iptables.c:767 +#: src/util/pci.c:1094 #, c-format -msgid "Attempted to NAT '%s'. NAT is only supported for IPv4." -msgstr "" +msgid "Failed to remove PCI ID '%s' from %s" +msgstr "从 %s 中删除 PCI ID '%s' 失败" -#: src/util/json.c:927 -msgid "Unable to create JSON parser" -msgstr "" +#: src/util/pci.c:1125 src/util/pci.c:1144 +msgid "cannot find any PCI stub module" +msgstr "无法找到任何 PCI stub 模块" -#: src/util/json.c:912 +#: src/util/pci.c:1131 #, c-format -msgid "cannot parse json %s: %s" +msgid "Not detaching active device %s" msgstr "" -#: src/util/json.c:1051 -msgid "Unable to create JSON formatter" +#: src/util/pci.c:1150 +#, c-format +msgid "Not reattaching active device %s" msgstr "" -#: src/util/json.c:1037 src/util/json.c:1043 -msgid "No JSON parser implementation is available" +#: src/util/pci.c:1321 +#, c-format +msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x" msgstr "" -#: src/util/macvtap.c:124 -msgid "buffer for ifindex path is too small" +#: src/util/pci.c:1333 +#, c-format +msgid "Device %s not found: could not access %s" msgstr "" -#: src/util/macvtap.c:132 +#: src/util/pci.c:1343 #, c-format -msgid "cannot open macvtap file %s to determine interface index" -msgstr "" +msgid "Failed to read product/vendor ID for %s" +msgstr "读取 %s 产品/经销商 ID 失败" -#: src/util/macvtap.c:139 -msgid "cannot determine macvtap's tap device interface index" +#: src/util/pci.c:1352 +#, c-format +msgid "dev->id buffer overflow: %s %s" msgstr "" -#: src/util/macvtap.c:151 -msgid "internal buffer for tap device is too small" +#: src/util/pci.c:1490 +#, c-format +msgid "Device %s is already in use" msgstr "" -#: src/util/macvtap.c:168 +#: src/util/pci.c:1733 #, c-format -msgid "cannot open macvtap tap device %s" +msgid "Device %s is behind a switch lacking ACS and cannot be assigned" msgstr "" -#: src/util/macvtap.c:202 -msgid "cannot get interface flags on macvtap tap" +#: src/util/pci.c:1830 +#, c-format +msgid "Failed to resolve device link '%s': '%s'" msgstr "" -#: src/util/macvtap.c:211 -msgid "cannot clean IFF_VNET_HDR flag on macvtap tap" +#: src/util/pci.c:1844 +#, c-format +msgid "Failed to parse PCI config address '%s'" msgstr "" -#: src/util/macvtap.c:215 -msgid "cannot get feature flags on macvtap tap" +#: src/util/pci.c:1911 +#, c-format +msgid "Failed to open dir '%s': '%s'" msgstr "" -#: src/util/macvtap.c:220 -msgid "cannot set IFF_VNET_HDR flag on macvtap tap" +#: src/util/pci.c:1942 +#, c-format +msgid "Failed to get SR IOV function from device link '%s'" msgstr "" -#: src/util/macvtap.c:310 +#: src/util/pci.c:2004 #, c-format -msgid "Interface %s already exists" +msgid "Error getting physical function's '%s' virtual_functions" msgstr "" -#: src/util/macvtap.c:349 -#, c-format -msgid "" -"cannot 'up' interface %s -- another macvtap device may be 'up' and have the " -"same MAC address" +#: src/util/pci.c:2076 +msgid "pciGetPhysicalFunction is not supported on non-linux platforms" msgstr "" -#: src/util/macvtap.c:452 -msgid "error parsing pid of lldpad" +#: src/util/pci.c:2086 +msgid "pciGetVirtualFunctions is not supported on non-linux platforms" +msgstr "" + +#: src/util/pci.c:2094 +msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms" msgstr "" -#: src/util/macvtap.c:457 +#: src/util/pci.c:2104 +msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms" +msgstr "" + +#: src/util/pci.c:2114 +msgid "pciDeviceNetName is not supported on non-linux platforms" +msgstr "" + +#: src/util/processinfo.c:75 src/util/processinfo.c:91 #, c-format -msgid "Error opening file %s" +msgid "cannot set CPU affinity on process %d" msgstr "" -#: src/util/macvtap.c:493 -msgid "error parsing IFLA_PORT_SELF part" +#: src/util/processinfo.c:136 src/util/processinfo.c:150 +#, c-format +msgid "cannot get CPU affinity of process %d" msgstr "" -#: src/util/macvtap.c:497 -msgid "IFLA_PORT_SELF is missing" +#: src/util/processinfo.c:170 src/util/processinfo.c:180 +msgid "Process CPU affinity is not supported on this platform" msgstr "" -#: src/util/macvtap.c:509 -msgid "error while iterating over IFLA_VF_PORTS part" +#: src/util/sexpr.c:245 +#, c-format +msgid "unknown s-expression kind %d" msgstr "" -#: src/util/macvtap.c:515 -msgid "error parsing IFLA_VF_PORT part" +#: src/util/stats_linux.c:54 +msgid "Could not open /proc/net/dev" msgstr "" -#: src/util/macvtap.c:533 -msgid "Could not find netlink response with expected parameters" +#: src/util/stats_linux.c:110 +msgid "/proc/net/dev: Interface not found" msgstr "" -#: src/util/macvtap.c:538 -msgid "IFLA_VF_PORTS is missing" +#: src/util/storage_file.c:760 +#, c-format +msgid "cannot set to start of '%s'" msgstr "" -#: src/util/macvtap.c:552 -msgid "no IFLA_PORT_RESPONSE found in netlink message" +#: src/util/storage_file.c:765 src/util/storage_file.c:861 +#, c-format +msgid "cannot read header '%s'" +msgstr "无法读取标题 '%s'" + +#: src/util/storage_file.c:796 src/util/storage_file.c:908 +#, c-format +msgid "cannot open file '%s'" msgstr "" -#: src/util/macvtap.c:715 +#: src/util/storage_file.c:851 #, c-format -msgid "error during virtual port configuration of ifindex %d" +msgid "cannot seek to start of '%s'" msgstr "" -#: src/util/macvtap.c:786 -msgid "sending of PortProfileRequest failed." +#: src/util/storage_file.c:870 +#, c-format +msgid "unknown storage file format %d" msgstr "" -#: src/util/macvtap.c:807 +#: src/util/storage_file.c:974 #, c-format -msgid "error %d during port-profile setlink on interface %s (%d)" +msgid "Invalid relative path '%s'" msgstr "" -#: src/util/macvtap.c:821 -msgid "port-profile setlink timed out" +#: src/util/storage_file.c:992 +#, c-format +msgid "cannot determine filesystem for '%s'" msgstr "" -#: src/util/macvtap.c:881 src/util/macvtap.c:1000 -msgid "Kernel VF Port support was missing at compile time." +#: src/util/sysinfo.c:127 +msgid "Host sysinfo extraction not supported on this platform" msgstr "" -#: src/util/macvtap.c:922 src/util/macvtap.c:1067 +#: src/util/sysinfo.c:464 #, c-format -msgid "operation type %d not supported" +msgid "Failed to find path for %s binary" msgstr "" -#: src/util/netlink.c:81 -msgid "cannot allocate nlhandle for netlink" +#: src/util/sysinfo.c:474 +#, c-format +msgid "Failed to execute command %s" msgstr "" -#: src/util/netlink.c:87 -msgid "cannot connect to netlink socket" +#: src/util/sysinfo.c:680 +#, c-format +msgid "unexpected sysinfo type model %d" msgstr "" -#: src/util/netlink.c:99 -msgid "cannot send to netlink socket" +#: src/util/sysinfo.c:713 +msgid "Target sysinfo does not match source" msgstr "" -#: src/util/netlink.c:113 -msgid "error in select call" +#: src/util/sysinfo.c:719 +#, c-format +msgid "Target sysinfo %s does not match source %s" msgstr "" -#: src/util/netlink.c:116 -msgid "no valid netlink response was received" +#: src/util/sysinfo.c:729 +#, c-format +msgid "Target sysinfo %s %s does not match source %s" msgstr "" -#: src/util/netlink.c:124 -msgid "nl_recv failed" +#: src/util/util.c:328 +msgid "Unknown poll response." +msgstr "未知 poll 响应。" + +#: src/util/util.c:362 +msgid "poll error" +msgstr "poll 错误" + +#: src/util/util.c:451 +#, c-format +msgid "Failed to open file '%s'" msgstr "" -#: src/util/netlink.c:147 -msgid "nlComm is not supported since libnl was not available" +#: src/util/util.c:458 +#, c-format +msgid "Failed to read file '%s'" msgstr "" -#: src/util/netlink.c:149 -msgid "nlComm is not supported on non-linux platforms" +#: src/util/util.c:745 +#, c-format +msgid "failed to create file '%s'" msgstr "" -#: src/util/network.c:85 src/util/network.c:178 -msgid "Missing address" +#: src/util/util.c:794 +#, c-format +msgid "failed to create directory '%s'" msgstr "" -#: src/util/network.c:94 +#: src/util/util.c:866 #, c-format -msgid "Cannot parse socket address '%s': %s" +msgid "failed to create socket needed for '%s'" msgstr "" -#: src/util/network.c:101 +#: src/util/util.c:901 src/util/util.c:994 #, c-format -msgid "No socket addresses found for '%s'" +msgid "failed to wait for child creating '%s'" msgstr "" -#: src/util/network.c:202 +#: src/util/util.c:1024 #, c-format -msgid "Cannot convert socket address to string: %s" +msgid "child failed to create directory '%s'" msgstr "" -#: src/util/network.c:709 -msgid "missing virtualportprofile type" +#: src/util/util.c:1040 +#, c-format +msgid "cannot chown '%s' to group %u" msgstr "" -#: src/util/network.c:739 -msgid "cannot parse value of managerid parameter" +#: src/util/util.c:1078 +msgid "virFileOpenAs is not implemented for WIN32" msgstr "" -#: src/util/network.c:745 -msgid "value of managerid out of range" +#: src/util/util.c:1090 +msgid "virDirCreate is not implemented for WIN32" msgstr "" -#: src/util/network.c:753 -msgid "cannot parse value of typeid parameter" +#: src/util/util.c:1913 +#, c-format +msgid "Disk index %d is negative" msgstr "" -#: src/util/network.c:759 -msgid "value for typeid out of range" +#: src/util/util.c:1969 +msgid "failed to determine host name" +msgstr "决定主机名失败" + +#: src/util/util.c:2151 +#, c-format +msgid "Failed to find user record for uid '%u'" msgstr "" -#: src/util/network.c:767 -msgid "cannot parse value of typeidversion parameter" +#: src/util/util.c:2215 +#, c-format +msgid "Failed to find user record for name '%s'" msgstr "" -#: src/util/network.c:773 -msgid "value of typeidversion out of range" +#: src/util/util.c:2264 +#, c-format +msgid "Failed to find group record for name '%s'" msgstr "" -#: src/util/network.c:783 -msgid "cannot parse instanceid parameter as a uuid" +#: src/util/util.c:2291 +#, c-format +msgid "cannot change to '%d' group" msgstr "" -#: src/util/network.c:789 -msgid "cannot generate a random uuid for instanceid" +#: src/util/util.c:2323 +#, c-format +msgid "cannot getpwuid_r(%d)" msgstr "" -#: src/util/network.c:798 -msgid "a parameter is missing for 802.1Qbg description" +#: src/util/util.c:2330 +#, c-format +msgid "cannot initgroups(\"%s\", %d)" msgstr "" -#: src/util/network.c:810 -msgid "profileid parameter too long" +#: src/util/util.c:2339 +#, c-format +msgid "cannot change to uid to '%d'" msgstr "" -#: src/util/network.c:815 -msgid "profileid parameter is missing for 802.1Qbh descripion" +#: src/util/util.c:2357 +msgid "virGetUserDirectory is not available" msgstr "" -#: src/util/network.c:825 -msgid "unknown virtualport type" +#: src/util/util.c:2366 +msgid "virGetUserName is not available" msgstr "" -#: src/util/network.c:931 src/util/network.c:998 src/util/network.c:1305 -msgid "invalid argument supplied" +#: src/util/util.c:2375 +msgid "virGetUserID is not available" msgstr "" -#: src/util/network.c:942 src/util/network.c:954 src/util/network.c:961 -#, c-format -msgid "could not convert %s" +#: src/util/util.c:2385 +msgid "virGetGroupID is not available" msgstr "" -#: src/util/network.c:948 -msgid "Missing mandatory average attribute" +#: src/util/util.c:2395 +msgid "virSetUIDGID is not available" msgstr "" -#: src/util/network.c:1007 -msgid "Only one child element allowed" +#: src/util/viraudit.c:60 +msgid "Unable to initialize audit layer" msgstr "" -#: src/util/network.c:1015 -msgid "Only one child element allowed" +#: src/util/virfile.c:150 +msgid "O_DIRECT unsupported on this platform" msgstr "" -#: src/util/pci.c:477 +#: src/util/virfile.c:167 #, c-format -msgid "Active %s devices on bus with %s, not doing bus reset" +msgid "invalid fd %d for %s" msgstr "" -#: src/util/pci.c:486 +#: src/util/virfile.c:173 #, c-format -msgid "Failed to find parent device for %s" +msgid "unexpected mode %x for %s" msgstr "" -#: src/util/pci.c:647 src/util/pci.c:693 +#: src/util/virfile.c:180 #, c-format -msgid "Failed to read PCI config space for %s" +msgid "unable to create pipe for %s" msgstr "" -#: src/util/pci.c:519 src/util/pci.c:565 -#, c-format -msgid "Failed to restore PCI config space for %s" +#: src/util/virfile.c:200 +msgid "unable to close pipe" msgstr "" -#: src/util/pci.c:578 +#: src/util/virfile.c:354 #, c-format -msgid "Failed to open config space file '%s'" -msgstr "打开 config 空间文件 '%s' 失败" +msgid "cannot create file '%s'" +msgstr "" -#: src/util/pci.c:600 +#: src/util/virfile.c:360 #, c-format -msgid "Not resetting active device %s" +msgid "cannot write data to file '%s'" msgstr "" -#: src/util/pci.c:627 +#: src/util/virfile.c:366 #, c-format -msgid "Unable to reset PCI device %s: %s" +msgid "cannot sync file '%s'" msgstr "" -#: src/util/pci.c:629 -msgid "no FLR, PM reset or bus reset available" +#: src/util/virfile.c:372 +#, c-format +msgid "cannot save file '%s'" msgstr "" -#: src/util/pci.c:906 +#: src/util/virfile.c:378 #, c-format -msgid "Failed to unbind PCI device '%s' from %s" +msgid "cannot rename file '%s' as '%s'" msgstr "" -#: src/util/pci.c:924 +#: 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 "Failed to remove slot for PCI device '%s' from %s" +msgid "Network interface name '%s' is too long" msgstr "" -#: src/util/pci.c:818 -#, c-format -msgid "Failed to trigger a re-probe for PCI device '%s'" -msgstr "为 PCI 设备 '%s' 激发重新探测失败" +#: src/util/virnetdev.c:69 src/util/virnetdevbridge.c:69 +msgid "Cannot open network interface control socket" +msgstr "" -#: src/util/pci.c:712 -#, c-format -msgid "Failed to add PCI device ID '%s' to %s" -msgstr "将 PCI 设备 ID '%s' 添加到 %s 失败" +#: src/util/virnetdev.c:75 src/util/virnetdevbridge.c:75 +msgid "Cannot set close-on-exec flag for socket" +msgstr "" -#: src/util/pci.c:725 +#: src/util/virnetdev.c:115 #, c-format -msgid "Failed to unbind PCI device '%s'" -msgstr "取消绑定 PCI 设备 '%s' 失败" +msgid "Unable to check interface flags for %s" +msgstr "" -#: src/util/pci.c:738 +#: src/util/virnetdev.c:129 #, c-format -msgid "Failed to add slot for PCI device '%s' to %s" -msgstr "为 PCI 设备 '%s' 在 %s 添加插槽失败" +msgid "Unable to check interface %s" +msgstr "" -#: src/util/pci.c:746 src/util/pci.c:793 +#: src/util/virnetdev.c:159 src/util/virnetdev.c:213 src/util/virnetdev.c:231 #, c-format -msgid "Failed to bind PCI device '%s' to %s" -msgstr "将 PCI 设备 ID '%s' 绑定到 %s 失败" +msgid "Cannot get interface MAC on '%s'" +msgstr "" -#: src/util/pci.c:758 +#: src/util/virnetdev.c:168 src/util/virnetdev.c:184 #, c-format -msgid "Failed to remove PCI ID '%s' from %s" -msgstr "从 %s 中删除 PCI ID '%s' 失败" - -#: src/util/pci.c:772 src/util/pci.c:833 -msgid "cannot find any PCI stub module" -msgstr "无法找到任何 PCI stub 模块" +msgid "Cannot set interface MAC on '%s'" +msgstr "" -#: src/util/pci.c:1131 +#: src/util/virnetdev.c:269 #, c-format -msgid "Not detaching active device %s" +msgid "Unable to preserve mac for %s" msgstr "" -#: src/util/pci.c:1150 +#: src/util/virnetdev.c:310 #, c-format -msgid "Not reattaching active device %s" +msgid "Cannot parse MAC address from '%s'" msgstr "" -#: src/util/pci.c:1321 +#: src/util/virnetdev.c:345 src/util/virnetdev.c:360 #, c-format -msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x" +msgid "Cannot get interface MTU on '%s'" msgstr "" -#: src/util/pci.c:1333 +#: src/util/virnetdev.c:391 src/util/virnetdev.c:406 #, c-format -msgid "Device %s not found: could not access %s" +msgid "Cannot set interface MTU on '%s'" msgstr "" -#: src/util/pci.c:896 +#: src/util/virnetdev.c:493 #, c-format -msgid "Failed to read product/vendor ID for %s" -msgstr "读取 %s 产品/经销商 ID 失败" +msgid "Unable to rename '%s' to '%s'" +msgstr "" -#: src/util/pci.c:1352 +#: src/util/virnetdev.c:508 #, c-format -msgid "dev->id buffer overflow: %s %s" +msgid "Cannot rename interface '%s' to '%s' on this platform" msgstr "" -#: src/util/pci.c:975 +#: src/util/virnetdev.c:538 src/util/virnetdev.c:598 src/util/virnetdev.c:615 #, c-format -msgid "Device %s is already in use" +msgid "Cannot get interface flags on '%s'" msgstr "" -#: src/util/pci.c:1733 +#: src/util/virnetdev.c:552 src/util/virnetdev.c:569 #, c-format -msgid "Device %s is behind a switch lacking ACS and cannot be assigned" +msgid "Cannot set interface flags on '%s'" msgstr "" -#: src/util/pci.c:1830 -#, c-format -msgid "Failed to resolve device link '%s': '%s'" +#: src/util/virnetdev.c:640 src/util/virnetdev.c:689 +msgid "Unable to open control socket" msgstr "" -#: src/util/pci.c:1844 +#: src/util/virnetdev.c:649 src/util/virnetdev.c:695 #, c-format -msgid "Failed to parse PCI config address '%s'" +msgid "invalid interface name %s" msgstr "" -#: src/util/pci.c:1911 +#: src/util/virnetdev.c:656 #, c-format -msgid "Failed to open dir '%s': '%s'" +msgid "Unable to get index for interface %s" msgstr "" -#: src/util/pci.c:1942 +#: src/util/virnetdev.c:672 +msgid "Unable to get interface index on this platform" +msgstr "" + +#: src/util/virnetdev.c:702 #, c-format -msgid "Failed to get SR IOV function from device link '%s'" +msgid "Unable to get VLAN for interface %s" msgstr "" -#: src/util/pci.c:2004 +#: src/util/virnetdev.c:719 +msgid "Unable to get VLAN on this platform" +msgstr "" + +#: src/util/virnetdev.c:837 #, c-format -msgid "Error getting physical function's '%s' virtual_functions" +msgid "Unable to get IPv4 address for interface %s" msgstr "" -#: src/util/pci.c:2076 -msgid "pciGetPhysicalFunction is not supported on non-linux platforms" +#: src/util/virnetdev.c:857 +msgid "Unable to get IPv4 address on this platform" msgstr "" -#: src/util/pci.c:2086 -msgid "pciGetVirtualFunctions is not supported on non-linux platforms" +#: src/util/virnetdev.c:903 +#, c-format +msgid "coud not get MAC address of interface %s" msgstr "" -#: src/util/pci.c:2094 -msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms" +#: src/util/virnetdev.c:935 +msgid "Unable to check interface config on this platform" msgstr "" -#: src/util/pci.c:2104 -msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms" +#: src/util/virnetdev.c:1063 +msgid "Unable to check virtual function status on this platfornm" msgstr "" -#: src/util/pci.c:2114 -msgid "pciDeviceNetName is not supported on non-linux platforms" +#: src/util/virnetdev.c:1073 +msgid "Unable to get virtual function index on this platfornm" msgstr "" -#: src/util/processinfo.c:77 src/util/processinfo.c:93 -#: src/util/processinfo.c:138 src/util/processinfo.c:152 -#, c-format -msgid "cannot set CPU affinity on process %d" +#: src/util/virnetdev.c:1082 +msgid "Unable to get physical function status on this platfornm" msgstr "" -#: src/util/processinfo.c:136 src/util/processinfo.c:150 +#: src/util/virnetdevbridge.c:118 src/util/virnetdevbridge.c:129 +#: src/util/virnetdevbridge.c:136 #, c-format -msgid "cannot get CPU affinity of process %d" +msgid "Unable to set bridge %s %s" msgstr "" -#: src/util/processinfo.c:172 src/util/processinfo.c:182 -msgid "Process CPU affinity is not supported on this platform" +#: 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 "" -#: src/util/sexpr.c:245 +#: src/util/virnetdevbridge.c:224 src/util/virnetdevbridge.c:238 #, c-format -msgid "unknown s-expression kind %d" +msgid "Unable to create bridge %s" msgstr "" -#: src/util/stats_linux.c:54 -msgid "Could not open /proc/net/dev" +#: src/util/virnetdevbridge.c:262 src/util/virnetdevbridge.c:276 +#, c-format +msgid "Unable to delete bridge %s" msgstr "" -#: src/util/stats_linux.c:110 -msgid "/proc/net/dev: Interface not found" +#: src/util/virnetdevbridge.c:303 src/util/virnetdevbridge.c:350 +#, c-format +msgid "Unable to get interface index for %s" msgstr "" -#: src/util/storage_file.c:760 +#: src/util/virnetdevbridge.c:309 src/util/virnetdevbridge.c:323 #, c-format -msgid "cannot set to start of '%s'" +msgid "Unable to add bridge %s port %s" msgstr "" -#: src/util/storage_file.c:289 +#: src/util/virnetdevbridge.c:357 src/util/virnetdevbridge.c:371 #, c-format -msgid "cannot read header '%s'" -msgstr "无法读取标题 '%s'" +msgid "Unable to remove bridge %s port %s" +msgstr "" -#: src/util/storage_file.c:415 +#: src/util/virnetdevbridge.c:502 #, c-format -msgid "cannot open file '%s'" +msgid "Unable to set STP delay on %s on this platform" msgstr "" -#: src/util/storage_file.c:851 +#: src/util/virnetdevbridge.c:510 #, c-format -msgid "cannot seek to start of '%s'" +msgid "Unable to get STP delay on %s on this platform" msgstr "" -#: src/util/storage_file.c:870 +#: src/util/virnetdevbridge.c:520 #, c-format -msgid "unknown storage file format %d" +msgid "Unable to set STP on %s on this platform" msgstr "" -#: src/util/storage_file.c:974 +#: src/util/virnetdevbridge.c:528 #, c-format -msgid "Invalid relative path '%s'" +msgid "Unable to get STP on %s on this platform" msgstr "" -#: src/util/storage_file.c:992 +#: src/util/virnetdevmacvlan.c:184 #, c-format -msgid "cannot determine filesystem for '%s'" +msgid "error creating %s type of interface" msgstr "" -#: src/util/sysinfo.c:127 -msgid "Host sysinfo extraction not supported on this platform" +#: 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 "" -#: src/util/sysinfo.c:464 -#, c-format -msgid "Failed to find path for %s binary" +#: 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 "" -#: src/util/sysinfo.c:474 +#: src/util/virnetdevmacvlan.c:270 #, c-format -msgid "Failed to execute command %s" +msgid "error destroying %s interface" msgstr "" -#: src/util/sysinfo.c:680 +#: src/util/virnetdevmacvlan.c:329 +msgid "buffer for ifindex path is too small" +msgstr "" + +#: src/util/virnetdevmacvlan.c:337 #, c-format -msgid "unexpected sysinfo type model %d" +msgid "cannot open macvtap file %s to determine interface index" +msgstr "" + +#: src/util/virnetdevmacvlan.c:344 +msgid "cannot determine macvtap's tap device interface index" msgstr "" -#: src/util/sysinfo.c:713 -msgid "Target sysinfo does not match source" +#: src/util/virnetdevmacvlan.c:356 +msgid "internal buffer for tap device is too small" msgstr "" -#: src/util/sysinfo.c:719 +#: src/util/virnetdevmacvlan.c:373 #, c-format -msgid "Target sysinfo %s does not match source %s" +msgid "cannot open macvtap tap device %s" msgstr "" -#: src/util/sysinfo.c:729 -#, c-format -msgid "Target sysinfo %s %s does not match source %s" +#: src/util/virnetdevmacvlan.c:407 +msgid "cannot get interface flags on macvtap tap" msgstr "" -#: src/util/util.c:736 -msgid "Unknown poll response." -msgstr "未知 poll 响应。" - -#: src/util/util.c:767 -msgid "poll error" -msgstr "poll 错误" - -#: src/util/util.c:968 -#, c-format -msgid "Failed to open file '%s'" +#: src/util/virnetdevmacvlan.c:416 +msgid "cannot clean IFF_VNET_HDR flag on macvtap tap" msgstr "" -#: src/util/util.c:975 -#, c-format -msgid "Failed to read file '%s'" +#: src/util/virnetdevmacvlan.c:420 +msgid "cannot get feature flags on macvtap tap" msgstr "" -#: src/util/util.c:747 -#, c-format -msgid "failed to create file '%s'" +#: src/util/virnetdevmacvlan.c:425 +msgid "cannot set IFF_VNET_HDR flag on macvtap tap" msgstr "" -#: src/util/util.c:796 +#: src/util/virnetdevmacvlan.c:517 #, c-format -msgid "failed to create directory '%s'" +msgid "Unable to create macvlan device %s" msgstr "" -#: src/util/util.c:868 -#, c-format -msgid "failed to create socket needed for '%s'" +#: 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 "" -#: src/util/util.c:903 src/util/util.c:996 -#, c-format -msgid "failed to wait for child creating '%s'" +#: src/util/virnetdevtap.c:131 src/util/virnetdevtap.c:195 +msgid "Unable to open /dev/net/tun, is tun module loaded?" msgstr "" -#: src/util/util.c:1026 +#: src/util/virnetdevtap.c:154 #, c-format -msgid "child failed to create directory '%s'" +msgid "Unable to create tap device %s" msgstr "" -#: src/util/util.c:1042 +#: src/util/virnetdevtap.c:162 #, c-format -msgid "cannot chown '%s' to group %u" +msgid "Unable to set tap device %s to persistent" msgstr "" -#: src/util/util.c:1080 -msgid "virFileOpenAs is not implemented for WIN32" +#: src/util/virnetdevtap.c:211 +msgid "Unable to associate TAP device" msgstr "" -#: src/util/util.c:1092 -msgid "virDirCreate is not implemented for WIN32" +#: src/util/virnetdevtap.c:217 +msgid "Unable to make TAP device non-persistent" msgstr "" -#: src/util/util.c:1790 -#, c-format -msgid "Disk index %d is negative" +#: src/util/virnetdevtap.c:233 +msgid "Unable to create TAP devices on this platform" msgstr "" -#: src/util/util.c:1826 -msgid "failed to determine host name" -msgstr "决定主机名失败" +#: src/util/virnetdevtap.c:239 +msgid "Unable to delete TAP devices on this platform" +msgstr "" -#: src/util/util.c:2153 -#, c-format -msgid "Failed to find user record for uid '%u'" +#: src/util/virnetdevvportprofile.c:154 +msgid "error parsing pid of lldpad" msgstr "" -#: src/util/util.c:2028 +#: src/util/virnetdevvportprofile.c:159 #, c-format -msgid "Failed to find user record for name '%s'" +msgid "Error opening file %s" msgstr "" -#: src/util/util.c:2065 +#: src/util/virnetdevvportprofile.c:245 #, c-format -msgid "Failed to find group record for name '%s'" +msgid "error dumping %s (%d) interface" msgstr "" -#: src/qemu/qemu_driver.c:2306 -#, c-format -msgid "cannot change to '%d' group" +#: src/util/virnetdevvportprofile.c:314 +msgid "error parsing IFLA_PORT_SELF part" msgstr "" -#: src/util/util.c:2325 -#, c-format -msgid "cannot getpwuid_r(%d)" +#: src/util/virnetdevvportprofile.c:318 +msgid "IFLA_PORT_SELF is missing" msgstr "" -#: src/util/util.c:2332 -#, c-format -msgid "cannot initgroups(\"%s\", %d)" +#: src/util/virnetdevvportprofile.c:330 +msgid "error while iterating over IFLA_VF_PORTS part" msgstr "" -#: src/util/util.c:2341 -#, c-format -msgid "cannot change to uid to '%d'" +#: src/util/virnetdevvportprofile.c:336 +msgid "error parsing IFLA_VF_PORT part" msgstr "" -#: src/util/util.c:2359 -msgid "virGetUserDirectory is not available" +#: src/util/virnetdevvportprofile.c:354 +msgid "Could not find netlink response with expected parameters" msgstr "" -#: src/util/util.c:2368 -msgid "virGetUserName is not available" +#: src/util/virnetdevvportprofile.c:359 +msgid "IFLA_VF_PORTS is missing" msgstr "" -#: src/util/util.c:2377 -msgid "virGetUserID is not available" +#: src/util/virnetdevvportprofile.c:373 +msgid "no IFLA_PORT_RESPONSE found in netlink message" msgstr "" -#: src/util/util.c:2387 -msgid "virGetGroupID is not available" +#: src/util/virnetdevvportprofile.c:536 +#, c-format +msgid "error during virtual port configuration of ifindex %d" msgstr "" -#: src/util/util.c:2397 -msgid "virSetUIDGID is not available" +#: src/util/virnetdevvportprofile.c:618 +msgid "buffer for root interface name is too small" msgstr "" -#: src/qemu/qemu_driver.c:300 src/qemu/qemu_driver.c:342 -#: src/xen/xm_internal.c:496 -msgid "cannot get time of day" -msgstr "正在获得日期" +#: src/util/virnetdevvportprofile.c:674 +msgid "sending of PortProfileRequest failed." +msgstr "" -#: src/util/viraudit.c:60 -msgid "Unable to initialize audit layer" +#: src/util/virnetdevvportprofile.c:695 +#, c-format +msgid "error %d during port-profile setlink on interface %s (%d)" msgstr "" -#: src/util/virfile.c:150 -msgid "O_DIRECT unsupported on this platform" +#: src/util/virnetdevvportprofile.c:709 +msgid "port-profile setlink timed out" msgstr "" -#: src/util/virfile.c:167 +#: src/util/virnetdevvportprofile.c:793 src/util/virnetdevvportprofile.c:925 #, c-format -msgid "invalid fd %d for %s" +msgid "operation type %d not supported" msgstr "" -#: src/util/virfile.c:173 -#, c-format -msgid "unexpected mode %x for %s" +#: src/util/virnetdevvportprofile.c:1062 src/util/virnetdevvportprofile.c:1073 +msgid "Virtual port profile association not supported on this platform" msgstr "" -#: src/util/virfile.c:180 -#, c-format -msgid "unable to create pipe for %s" +#: src/util/virnodesuspend.c:99 +msgid "Suspend duration is too short" msgstr "" -#: src/util/virfile.c:200 -msgid "unable to close pipe" +#: src/util/virnodesuspend.c:202 +msgid "Suspend operation already in progress" msgstr "" -#: src/util/virfile.c:354 -#, c-format -msgid "cannot create file '%s'" +#: src/util/virnodesuspend.c:210 +msgid "Suspend-to-RAM" msgstr "" -#: src/util/virfile.c:360 -#, c-format -msgid "cannot write data to file '%s'" +#: src/util/virnodesuspend.c:218 +msgid "Suspend-to-Disk" msgstr "" -#: src/util/virfile.c:366 -#, c-format -msgid "cannot sync file '%s'" +#: src/util/virnodesuspend.c:226 +msgid "Hybrid-Suspend" msgstr "" -#: src/util/virfile.c:372 -#, c-format -msgid "cannot save file '%s'" +#: src/util/virnodesuspend.c:233 +msgid "Invalid suspend target" msgstr "" -#: src/util/virfile.c:378 -#, c-format -msgid "cannot rename file '%s' as '%s'" +#: src/util/virnodesuspend.c:243 +msgid "Failed to create thread to suspend the host\n" msgstr "" #: src/util/virpidfile.c:321 @@ -15739,674 +16370,701 @@ msgid "Failed to write to pid file '%s'" msgstr "" -#: src/util/virterror.c:223 +#: src/util/virsocketaddr.c:95 src/util/virsocketaddr.c:188 +msgid "Missing address" +msgstr "" + +#: src/util/virsocketaddr.c:104 +#, c-format +msgid "Cannot parse socket address '%s': %s" +msgstr "" + +#: src/util/virsocketaddr.c:111 +#, c-format +msgid "No socket addresses found for '%s'" +msgstr "" + +#: src/util/virsocketaddr.c:212 +#, c-format +msgid "Cannot convert socket address to string: %s" +msgstr "" + +#: src/util/virterror.c:226 msgid "An error occurred, but the cause is unknown" msgstr "" -#: src/util/virterror.c:537 +#: src/util/virterror.c:572 msgid "warning" msgstr "警告" -#: src/util/virterror.c:540 +#: src/util/virterror.c:575 tools/virsh.c:16932 msgid "error" msgstr "错误" -#: src/util/virterror.c:674 +#: src/util/virterror.c:705 msgid "No error message provided" msgstr "没有错误讯息提供" -#: src/util/virterror.c:737 +#: src/util/virterror.c:768 #, c-format msgid "internal error %s" msgstr "内部错误 %s" -#: src/util/virterror.c:739 +#: src/util/virterror.c:770 msgid "internal error" msgstr "内部错误" -#: src/util/virterror.c:742 +#: src/util/virterror.c:773 tools/virsh.c:12077 msgid "out of memory" msgstr "内存溢出" -#: src/util/virterror.c:774 +#: src/util/virterror.c:777 msgid "this function is not supported by the connection driver" msgstr "" -#: src/util/virterror.c:776 +#: src/util/virterror.c:779 #, c-format msgid "this function is not supported by the connection driver: %s" msgstr "" -#: src/util/virterror.c:780 +#: src/util/virterror.c:783 msgid "no connection driver available" msgstr "" -#: src/util/virterror.c:782 +#: src/util/virterror.c:785 #, c-format msgid "no connection driver available for %s" msgstr "" -#: src/util/virterror.c:758 +#: src/util/virterror.c:789 msgid "invalid connection pointer in" msgstr "无效的连接指向" -#: src/util/virterror.c:760 +#: src/util/virterror.c:791 #, c-format msgid "invalid connection pointer in %s" msgstr "无效的连接指向 %s" -#: src/util/virterror.c:764 +#: src/util/virterror.c:795 msgid "invalid domain pointer in" msgstr "无效的域名指向" -#: src/util/virterror.c:766 +#: src/util/virterror.c:797 #, c-format msgid "invalid domain pointer in %s" msgstr "无效的域名指向 %s" -#: src/util/virterror.c:798 +#: src/util/virterror.c:801 msgid "invalid argument" msgstr "" -#: src/util/virterror.c:800 +#: src/util/virterror.c:803 #, c-format msgid "invalid argument: %s" msgstr "" -#: src/util/virterror.c:776 +#: src/util/virterror.c:807 #, c-format msgid "operation failed: %s" msgstr "操作失败: %s" -#: src/util/virterror.c:778 +#: src/util/virterror.c:809 msgid "operation failed" msgstr "操作失败" -#: src/util/virterror.c:782 +#: src/util/virterror.c:813 #, c-format msgid "GET operation failed: %s" msgstr "GET操作失败: %s" -#: src/util/virterror.c:784 +#: src/util/virterror.c:815 msgid "GET operation failed" msgstr "GET操作失败" -#: src/util/virterror.c:788 +#: src/util/virterror.c:819 #, c-format msgid "POST operation failed: %s" msgstr "POST操作失败: %s" -#: src/util/virterror.c:790 +#: src/util/virterror.c:821 msgid "POST operation failed" msgstr "POST操作失败" -#: src/util/virterror.c:793 +#: src/util/virterror.c:824 #, c-format msgid "got unknown HTTP error code %d" msgstr "得到未知的HTTP错误代码 %d" -#: src/util/virterror.c:797 +#: src/util/virterror.c:828 #, c-format msgid "unknown host %s" msgstr "未知的主机 %s" -#: src/util/virterror.c:799 +#: src/util/virterror.c:830 msgid "unknown host" msgstr "未知的主机" -#: src/util/virterror.c:803 +#: src/util/virterror.c:834 #, c-format msgid "failed to serialize S-Expr: %s" msgstr "序列化S-Expr失败: %s" -#: src/util/virterror.c:805 +#: src/util/virterror.c:836 msgid "failed to serialize S-Expr" msgstr "序列化S-Expr失败" -#: src/util/virterror.c:809 +#: src/util/virterror.c:840 msgid "could not use Xen hypervisor entry" msgstr "不能使用Xen管理程序登录" -#: src/util/virterror.c:811 +#: src/util/virterror.c:842 #, c-format msgid "could not use Xen hypervisor entry %s" msgstr "不能使用Xen管理程序登录 %s" -#: src/util/virterror.c:815 +#: src/util/virterror.c:846 msgid "could not connect to Xen Store" msgstr "不能连接Xen存储器" -#: src/util/virterror.c:817 +#: src/util/virterror.c:848 #, c-format msgid "could not connect to Xen Store %s" msgstr "不能连接Xen存储器 %s" -#: src/util/virterror.c:820 +#: src/util/virterror.c:851 #, c-format msgid "failed Xen syscall %s" msgstr "Xen系统调用失败 %s" -#: src/util/virterror.c:824 +#: src/util/virterror.c:855 msgid "unknown OS type" msgstr "未知操作系统类型" -#: src/util/virterror.c:826 +#: src/util/virterror.c:857 #, c-format msgid "unknown OS type %s" msgstr "未知操作系统类型 %s" -#: src/util/virterror.c:829 +#: src/util/virterror.c:860 msgid "missing kernel information" msgstr "丢失内核信息" -#: src/util/virterror.c:833 +#: src/util/virterror.c:864 msgid "missing root device information" msgstr "丢失root设备信息" -#: src/util/virterror.c:835 +#: src/util/virterror.c:866 #, c-format msgid "missing root device information in %s" msgstr "丢失root信息 %s" -#: src/util/virterror.c:839 +#: src/util/virterror.c:870 msgid "missing source information for device" msgstr "丢失设备的源代码信息" -#: src/util/virterror.c:841 +#: src/util/virterror.c:872 #, c-format msgid "missing source information for device %s" msgstr "丢失设备的源代码信息 %s" -#: src/util/virterror.c:845 +#: src/util/virterror.c:876 msgid "missing target information for device" msgstr "丢失设备的目标信息" -#: src/util/virterror.c:847 +#: src/util/virterror.c:878 #, c-format msgid "missing target information for device %s" msgstr "丢失设备的目标信息 %s" -#: src/util/virterror.c:851 +#: src/util/virterror.c:882 msgid "missing domain name information" msgstr "丢失域名信息" -#: src/util/virterror.c:853 +#: src/util/virterror.c:884 #, c-format msgid "missing domain name information in %s" msgstr "丢失域名信息 %s" -#: src/util/virterror.c:857 +#: src/util/virterror.c:888 msgid "missing operating system information" msgstr "丢失操作系统信息" -#: src/util/virterror.c:859 +#: src/util/virterror.c:890 #, c-format msgid "missing operating system information for %s" msgstr "丢失操作系统信息 %s" -#: src/util/virterror.c:863 +#: src/util/virterror.c:894 msgid "missing devices information" msgstr "丢失设备信息" -#: src/util/virterror.c:865 +#: src/util/virterror.c:896 #, c-format msgid "missing devices information for %s" msgstr "丢失设备信息 %s" -#: src/util/virterror.c:869 +#: src/util/virterror.c:900 msgid "too many drivers registered" msgstr "注册了太多的设备" -#: src/util/virterror.c:871 +#: src/util/virterror.c:902 #, c-format msgid "too many drivers registered in %s" msgstr "注册了太多的设备 %s" -#: src/util/virterror.c:875 +#: src/util/virterror.c:906 msgid "library call failed, possibly not supported" msgstr "库调用失败,可能不支持" -#: src/util/virterror.c:877 +#: src/util/virterror.c:908 #, c-format msgid "library call %s failed, possibly not supported" msgstr "库调用 %s 失败,可能不支持" -#: src/util/virterror.c:909 +#: src/util/virterror.c:912 msgid "XML description is invalid or not well formed" msgstr "" -#: src/util/virterror.c:911 +#: src/util/virterror.c:914 #, c-format msgid "XML error: %s" msgstr "" -#: src/util/virterror.c:887 +#: src/util/virterror.c:918 msgid "this domain exists already" msgstr "这个域名已经存在" -#: src/util/virterror.c:889 +#: src/util/virterror.c:920 #, c-format msgid "domain %s exists already" msgstr "域名 %s 已经存在" -#: src/util/virterror.c:893 +#: src/util/virterror.c:924 msgid "operation forbidden for read only access" msgstr "只读权限禁止此操作" -#: src/util/virterror.c:895 +#: src/util/virterror.c:926 #, c-format msgid "operation %s forbidden for read only access" msgstr "只读权限禁止操作 %s" -#: src/util/virterror.c:899 +#: src/util/virterror.c:930 msgid "failed to open configuration file for reading" msgstr "打开并读取配置文件失败" -#: src/util/virterror.c:901 +#: src/util/virterror.c:932 #, c-format msgid "failed to open %s for reading" msgstr "打开并读取 %s 文件失败" -#: src/util/virterror.c:905 +#: src/util/virterror.c:936 msgid "failed to read configuration file" msgstr "读取配置文件失败" -#: src/util/virterror.c:907 +#: src/util/virterror.c:938 #, c-format msgid "failed to read configuration file %s" msgstr "读取配置文件 %s 失败" -#: src/util/virterror.c:911 +#: src/util/virterror.c:942 msgid "failed to parse configuration file" msgstr "解析配置文件失败" -#: src/util/virterror.c:913 +#: src/util/virterror.c:944 #, c-format msgid "failed to parse configuration file %s" msgstr "解析配置文件%s失败" -#: src/util/virterror.c:917 +#: src/util/virterror.c:948 msgid "configuration file syntax error" msgstr "配置文件语法错误" -#: src/util/virterror.c:919 +#: src/util/virterror.c:950 #, c-format msgid "configuration file syntax error: %s" msgstr "配置文件语法错误: %s" -#: src/util/virterror.c:923 +#: src/util/virterror.c:954 msgid "failed to write configuration file" msgstr "写入配置文件失败" -#: src/util/virterror.c:925 +#: src/util/virterror.c:956 #, c-format msgid "failed to write configuration file: %s" msgstr "写入配置文件失败: %s" -#: src/util/virterror.c:929 +#: src/util/virterror.c:960 msgid "parser error" msgstr "语法错误" -#: src/util/virterror.c:935 +#: src/util/virterror.c:966 msgid "invalid network pointer in" msgstr "无效的网络指针" -#: src/util/virterror.c:937 +#: src/util/virterror.c:968 #, c-format msgid "invalid network pointer in %s" msgstr "无效的网络指针 %s" -#: src/util/virterror.c:941 +#: src/util/virterror.c:972 msgid "this network exists already" msgstr "这个网络已存在" -#: src/util/virterror.c:943 +#: src/util/virterror.c:974 #, c-format msgid "network %s exists already" msgstr "网络%s 已经存在" -#: src/util/virterror.c:947 +#: src/util/virterror.c:978 msgid "system call error" msgstr "系统调用错误" -#: src/util/virterror.c:953 +#: src/util/virterror.c:984 msgid "RPC error" msgstr "RPC错误" -#: src/util/virterror.c:959 +#: src/util/virterror.c:990 msgid "GNUTLS call error" msgstr "GNUTLS调用错误" -#: src/util/virterror.c:965 +#: src/util/virterror.c:996 msgid "Failed to find the network" msgstr "查找网络失败" -#: src/util/virterror.c:967 +#: src/util/virterror.c:998 #, c-format msgid "Failed to find the network: %s" msgstr "查找网络失败: %s" -#: src/util/virterror.c:971 +#: src/util/virterror.c:1002 msgid "Domain not found" msgstr "未找到域" -#: src/util/virterror.c:973 +#: src/util/virterror.c:1004 #, c-format msgid "Domain not found: %s" msgstr "未找到域: %s" -#: src/util/virterror.c:977 +#: src/util/virterror.c:1008 msgid "Network not found" msgstr "未找到网络" -#: src/util/virterror.c:979 +#: src/util/virterror.c:1010 #, c-format msgid "Network not found: %s" msgstr "未找到网络: %s" -#: src/util/virterror.c:983 +#: src/util/virterror.c:1014 msgid "invalid MAC address" msgstr "无效的 MAC 地址" -#: src/util/virterror.c:985 +#: src/util/virterror.c:1016 #, c-format msgid "invalid MAC address: %s" msgstr "无效的 MAC 地址: %s" -#: src/util/virterror.c:991 +#: src/util/virterror.c:1022 #, c-format msgid "authentication failed: %s" msgstr "验证失败: %s" -#: src/util/virterror.c:995 +#: src/util/virterror.c:1026 msgid "Storage pool not found" msgstr "未找到存储池" -#: src/util/virterror.c:997 +#: src/util/virterror.c:1028 #, c-format msgid "Storage pool not found: %s" msgstr "未找到存储池: %s" -#: src/util/virterror.c:1001 +#: src/util/virterror.c:1032 msgid "Storage volume not found" msgstr "未找到存储卷" -#: src/util/virterror.c:1003 +#: src/util/virterror.c:1034 #, c-format msgid "Storage volume not found: %s" msgstr "未找到存储卷: %s" -#: src/util/virterror.c:1035 +#: src/util/virterror.c:1038 msgid "Storage pool probe failed" msgstr "" -#: src/util/virterror.c:1037 +#: src/util/virterror.c:1040 #, c-format msgid "Storage pool probe failed: %s" msgstr "" -#: src/util/virterror.c:1041 +#: src/util/virterror.c:1044 msgid "Storage pool already built" msgstr "" -#: src/util/virterror.c:1043 +#: src/util/virterror.c:1046 #, c-format msgid "Storage pool already built: %s" msgstr "" -#: src/util/virterror.c:1007 +#: src/util/virterror.c:1050 msgid "invalid storage pool pointer in" msgstr "无效的存储池指针" -#: src/util/virterror.c:1009 +#: src/util/virterror.c:1052 #, c-format msgid "invalid storage pool pointer in %s" msgstr "%s 中无效的存储池指针" -#: src/util/virterror.c:1013 +#: src/util/virterror.c:1056 msgid "invalid storage volume pointer in" msgstr "无效的存储卷指针" -#: src/util/virterror.c:1015 +#: src/util/virterror.c:1058 #, c-format msgid "invalid storage volume pointer in %s" msgstr "%s 中无效的存储卷指针" -#: src/util/virterror.c:1019 +#: src/util/virterror.c:1062 msgid "Failed to find a storage driver" msgstr "查找存储驱动程序失败" -#: src/util/virterror.c:1021 +#: src/util/virterror.c:1064 #, c-format msgid "Failed to find a storage driver: %s" msgstr "查找存储驱动程序失败: %s" -#: src/util/virterror.c:1025 +#: src/util/virterror.c:1068 msgid "Failed to find a node driver" msgstr "查找节点程序失败" -#: src/util/virterror.c:1027 +#: src/util/virterror.c:1070 #, c-format msgid "Failed to find a node driver: %s" msgstr "查找节点程序失败:%s" -#: src/util/virterror.c:1031 +#: src/util/virterror.c:1074 msgid "invalid node device pointer" msgstr "无效的节点设备" -#: src/util/virterror.c:1033 +#: src/util/virterror.c:1076 #, c-format msgid "invalid node device pointer in %s" msgstr "%s 中的无效节点设备指针" -#: src/util/virterror.c:1037 +#: src/util/virterror.c:1080 msgid "Node device not found" msgstr "未找到节点设备" -#: src/util/virterror.c:1039 +#: src/util/virterror.c:1082 #, c-format msgid "Node device not found: %s" msgstr "未找到节点设备:%s" -#: src/util/virterror.c:1043 +#: src/util/virterror.c:1086 msgid "Security model not found" msgstr "未找到安全性模式" -#: src/util/virterror.c:1045 +#: src/util/virterror.c:1088 #, c-format msgid "Security model not found: %s" msgstr "未找到安全性模式:%s" -#: src/util/virterror.c:1049 +#: src/util/virterror.c:1092 msgid "Requested operation is not valid" msgstr "" -#: src/util/virterror.c:1051 +#: src/util/virterror.c:1094 #, c-format msgid "Requested operation is not valid: %s" msgstr "" -#: src/util/virterror.c:1055 +#: src/util/virterror.c:1098 msgid "Failed to find the interface" msgstr "" -#: src/util/virterror.c:1057 +#: src/util/virterror.c:1100 #, c-format msgid "Failed to find the interface: %s" msgstr "" -#: src/util/virterror.c:1061 +#: src/util/virterror.c:1104 msgid "Interface not found" msgstr "" -#: src/util/virterror.c:1063 +#: src/util/virterror.c:1106 #, c-format msgid "Interface not found: %s" msgstr "" -#: src/util/virterror.c:1067 +#: src/util/virterror.c:1110 msgid "invalid interface pointer in" msgstr "" -#: src/util/virterror.c:1069 +#: src/util/virterror.c:1112 #, c-format msgid "invalid interface pointer in %s" msgstr "" -#: src/util/virterror.c:1073 +#: src/util/virterror.c:1116 msgid "multiple matching interfaces found" msgstr "" -#: src/util/virterror.c:1075 +#: src/util/virterror.c:1118 #, c-format msgid "multiple matching interfaces found: %s" msgstr "" -#: src/util/virterror.c:1079 +#: src/util/virterror.c:1122 msgid "Failed to find a secret storage driver" msgstr "" -#: src/util/virterror.c:1081 +#: src/util/virterror.c:1124 #, c-format msgid "Failed to find a secret storage driver: %s" msgstr "" -#: src/util/virterror.c:1085 +#: src/util/virterror.c:1128 msgid "Invalid secret" msgstr "" -#: src/util/virterror.c:1087 +#: src/util/virterror.c:1130 #, c-format msgid "Invalid secret: %s" msgstr "" -#: src/util/virterror.c:1091 +#: src/util/virterror.c:1134 msgid "Secret not found" msgstr "" -#: src/util/virterror.c:1093 +#: src/util/virterror.c:1136 #, c-format msgid "Secret not found: %s" msgstr "" -#: src/util/virterror.c:1137 +#: src/util/virterror.c:1140 msgid "Failed to start the nwfilter driver" msgstr "" -#: src/util/virterror.c:1139 +#: src/util/virterror.c:1142 #, c-format msgid "Failed to start the nwfilter driver: %s" msgstr "" -#: src/util/virterror.c:1143 +#: src/util/virterror.c:1146 msgid "Invalid network filter" msgstr "" -#: src/util/virterror.c:1145 +#: src/util/virterror.c:1148 #, c-format msgid "Invalid network filter: %s" msgstr "" -#: src/util/virterror.c:1149 +#: src/util/virterror.c:1152 msgid "Network filter not found" msgstr "" -#: src/util/virterror.c:1151 +#: src/util/virterror.c:1154 #, c-format msgid "Network filter not found: %s" msgstr "" -#: src/util/virterror.c:1155 +#: src/util/virterror.c:1158 msgid "Error while building firewall" msgstr "" -#: src/util/virterror.c:1157 +#: src/util/virterror.c:1160 #, c-format msgid "Error while building firewall: %s" msgstr "" -#: src/util/virterror.c:1097 +#: src/util/virterror.c:1164 msgid "unsupported configuration" msgstr "" -#: src/util/virterror.c:1099 +#: src/util/virterror.c:1166 #, c-format msgid "unsupported configuration: %s" msgstr "" -#: src/util/virterror.c:1103 +#: src/util/virterror.c:1170 msgid "Timed out during operation" msgstr "" -#: src/util/virterror.c:1105 +#: src/util/virterror.c:1172 #, c-format msgid "Timed out during operation: %s" msgstr "" -#: src/util/virterror.c:1109 +#: src/util/virterror.c:1176 msgid "Failed to make domain persistent after migration" msgstr "" -#: src/util/virterror.c:1111 +#: src/util/virterror.c:1178 #, c-format msgid "Failed to make domain persistent after migration: %s" msgstr "" -#: src/util/virterror.c:1179 +#: src/util/virterror.c:1182 msgid "Hook script execution failed" msgstr "" -#: src/util/virterror.c:1181 +#: src/util/virterror.c:1184 #, c-format msgid "Hook script execution failed: %s" msgstr "" -#: src/util/virterror.c:1185 +#: src/util/virterror.c:1188 msgid "Invalid snapshot" msgstr "" -#: src/util/virterror.c:1187 +#: src/util/virterror.c:1190 #, c-format msgid "Invalid snapshot: %s" msgstr "" -#: src/util/virterror.c:1191 +#: src/util/virterror.c:1194 msgid "Domain snapshot not found" msgstr "" -#: src/util/virterror.c:1193 +#: src/util/virterror.c:1196 #, c-format msgid "Domain snapshot not found: %s" msgstr "" -#: src/util/virterror.c:1197 +#: src/util/virterror.c:1200 msgid "invalid stream pointer" msgstr "" -#: src/util/virterror.c:1199 +#: src/util/virterror.c:1202 #, c-format msgid "invalid stream pointer in %s" msgstr "" -#: src/util/virterror.c:1203 +#: src/util/virterror.c:1206 msgid "argument unsupported" msgstr "" -#: src/util/virterror.c:1205 +#: src/util/virterror.c:1208 #, c-format msgid "argument unsupported: %s" msgstr "" -#: src/util/virterror.c:1209 +#: src/util/virterror.c:1212 msgid "revert requires force" msgstr "" -#: src/util/virterror.c:1211 +#: src/util/virterror.c:1214 #, c-format msgid "revert requires force: %s" msgstr "" -#: src/util/xml.c:60 +#: src/util/virtime.c:288 +msgid "Unable to break out time format" +msgstr "" + +#: src/util/virtime.c:316 src/util/virtime.c:347 +msgid "Unable to format time" +msgstr "" + +#: src/util/xml.c:70 msgid "Invalid parameter to virXPathString()" msgstr "virXPathString() 的无效参数" @@ -16415,15 +17073,15 @@ msgid "'%s' value longer than %zd bytes" msgstr "" -#: src/util/xml.c:131 +#: src/util/xml.c:140 msgid "Invalid parameter to virXPathNumber()" msgstr "virXPathNumber() 的无效参数" -#: src/util/xml.c:161 +#: src/util/xml.c:169 msgid "Invalid parameter to virXPathLong()" msgstr "virXPathLong() 的无效参数" -#: src/util/xml.c:248 src/util/xml.c:346 +#: src/util/xml.c:282 src/util/xml.c:406 msgid "Invalid parameter to virXPathULong()" msgstr "virXPathLong() 的无效参数" @@ -16431,15 +17089,15 @@ msgid "Invalid parameter to virXPathLongLong()" msgstr "" -#: src/util/xml.c:404 +#: src/util/xml.c:517 msgid "Invalid parameter to virXPathBoolean()" msgstr "virXPathBoolean() 的无效参数" -#: src/util/xml.c:442 +#: src/util/xml.c:554 msgid "Invalid parameter to virXPathNode()" msgstr "virXPathNode() 的无效参数" -#: src/util/xml.c:483 +#: src/util/xml.c:594 msgid "Invalid parameter to virXPathNodeSet()" msgstr "virXPathNodeSet() 的无效参数" @@ -16462,21 +17120,11 @@ "%s" msgstr "" -#: src/conf/domain_conf.c:2611 src/conf/domain_conf.c:3498 -#: src/conf/domain_conf.c:3539 src/conf/domain_conf.c:3611 -#: src/conf/interface_conf.c:937 src/conf/interface_conf.c:977 -#: src/conf/network_conf.c:560 src/conf/network_conf.c:600 -#: src/conf/node_device_conf.c:1302 src/conf/secret_conf.c:241 -#: src/conf/storage_conf.c:800 src/conf/storage_conf.c:1210 +#: src/util/xml.c:774 msgid "missing root element" msgstr "缺少根元素" -#: src/conf/domain_conf.c:3492 src/conf/domain_conf.c:3533 -#: src/conf/domain_conf.c:3605 src/conf/interface_conf.c:931 -#: src/conf/interface_conf.c:971 src/conf/network_conf.c:554 -#: src/conf/network_conf.c:594 src/conf/node_device_conf.c:1296 -#: src/conf/secret_conf.c:234 src/conf/storage_conf.c:793 -#: src/conf/storage_conf.c:1203 +#: src/util/xml.c:798 msgid "failed to parse xml document" msgstr "解析 xml 文档失败" @@ -16525,21 +17173,21 @@ msgid "Calling %s from '%s' failed" msgstr "" -#: src/vbox/vbox_driver.c:135 src/vbox/vbox_tmpl.c:788 +#: src/vbox/vbox_driver.c:166 src/vbox/vbox_tmpl.c:1001 msgid "no VirtualBox driver path specified (try vbox:///session)" msgstr "" -#: src/vbox/vbox_driver.c:142 src/vbox/vbox_tmpl.c:795 +#: src/vbox/vbox_driver.c:173 src/vbox/vbox_tmpl.c:1008 #, c-format msgid "unknown driver path '%s' specified (try vbox:///session)" msgstr "" -#: src/vbox/vbox_driver.c:149 src/vbox/vbox_tmpl.c:802 +#: src/vbox/vbox_driver.c:180 src/vbox/vbox_tmpl.c:1015 #, c-format msgid "unknown driver path '%s' specified (try vbox:///system)" msgstr "" -#: src/vbox/vbox_driver.c:155 +#: src/vbox/vbox_driver.c:186 msgid "unable to initialize VirtualBox driver API" msgstr "" @@ -16559,390 +17207,390 @@ msgid "Cound not extract VirtualBox version" msgstr "" -#: src/vbox/vbox_tmpl.c:1127 +#: src/vbox/vbox_tmpl.c:1132 #, c-format msgid "Could not get list of Domains, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:1164 +#: src/vbox/vbox_tmpl.c:1169 #, c-format msgid "Could not get number of Domains, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:1236 src/vbox/vbox_tmpl.c:1296 -#: src/vbox/vbox_tmpl.c:1366 src/vbox/vbox_tmpl.c:1440 -#: src/vbox/vbox_tmpl.c:1853 src/vbox/vbox_tmpl.c:3679 +#: 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 "" -#: src/vbox/vbox_tmpl.c:1536 +#: src/vbox/vbox_tmpl.c:1541 msgid "error while suspending the domain" msgstr "" -#: src/vbox/vbox_tmpl.c:1542 +#: src/vbox/vbox_tmpl.c:1547 msgid "machine not in running state to suspend it" msgstr "" -#: src/vbox/vbox_tmpl.c:1588 +#: src/vbox/vbox_tmpl.c:1593 msgid "error while resuming the domain" msgstr "" -#: src/vbox/vbox_tmpl.c:1594 +#: src/vbox/vbox_tmpl.c:1599 msgid "machine not paused, so can't resume it" msgstr "" -#: src/vbox/vbox_tmpl.c:1631 +#: src/vbox/vbox_tmpl.c:1636 msgid "machine paused, so can't power it down" msgstr "" -#: src/vbox/vbox_tmpl.c:1635 src/vbox/vbox_tmpl.c:1735 +#: src/vbox/vbox_tmpl.c:1640 src/vbox/vbox_tmpl.c:1740 msgid "machine already powered down" msgstr "" -#: src/vbox/vbox_tmpl.c:1693 +#: src/vbox/vbox_tmpl.c:1698 msgid "machine not running, so can't reboot it" msgstr "" -#: src/vbox/vbox_tmpl.c:1811 +#: src/vbox/vbox_tmpl.c:1816 msgid "memory size can't be changed unless domain is powered down" msgstr "" -#: src/vbox/vbox_tmpl.c:1827 src/vbox/vbox_tmpl.c:5042 +#: 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 "" -#: src/vbox/vbox_tmpl.c:1964 src/vbox/vbox_tmpl.c:5891 -#: src/vbox/vbox_tmpl.c:5993 src/vbox/vbox_tmpl.c:6098 -#: src/vbox/vbox_tmpl.c:6149 src/vbox/vbox_tmpl.c:6238 -#: src/vbox/vbox_tmpl.c:6270 src/vbox/vbox_tmpl.c:6312 -#: src/vbox/vbox_tmpl.c:6376 src/vbox/vbox_tmpl.c:6544 -#: src/vbox/vbox_tmpl.c:6702 +#: 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 "" -#: src/vbox/vbox_tmpl.c:2101 +#: src/vbox/vbox_tmpl.c:2106 #, c-format msgid "could not set the number of cpus of the domain to: %u, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:2112 +#: src/vbox/vbox_tmpl.c:2117 #, c-format msgid "can't open session to the domain with id %d" msgstr "" -#: src/vbox/vbox_tmpl.c:2765 +#: 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 "" -#: src/vbox/vbox_tmpl.c:3405 +#: src/vbox/vbox_tmpl.c:3410 #, c-format msgid "Could not get list of Defined Domains, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:3455 +#: src/vbox/vbox_tmpl.c:3460 #, c-format msgid "Could not get number of Defined Domains, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:3625 +#: src/vbox/vbox_tmpl.c:3630 msgid "OpenRemoteSession/LaunchVMProcess failed, domain can't be started" msgstr "" -#: src/vbox/vbox_tmpl.c:3672 +#: src/vbox/vbox_tmpl.c:3677 msgid "Error while reading the domain name" msgstr "" -#: src/vbox/vbox_tmpl.c:3709 +#: src/vbox/vbox_tmpl.c:3714 msgid "machine is not in poweroff|saved|aborted state, so couldn't start it" msgstr "" -#: src/vbox/vbox_tmpl.c:3842 src/vbox/vbox_tmpl.c:5393 +#: 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 "" -#: src/vbox/vbox_tmpl.c:3849 src/vbox/vbox_tmpl.c:5402 +#: 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 "" -#: src/vbox/vbox_tmpl.c:3906 +#: 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 "" -#: src/vbox/vbox_tmpl.c:3952 +#: src/vbox/vbox_tmpl.c:3957 #, c-format msgid "could not attach the file as harddisk: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:3998 src/vbox/vbox_tmpl.c:5446 +#: 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 "" -#: src/vbox/vbox_tmpl.c:4006 src/vbox/vbox_tmpl.c:5453 +#: 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 "" -#: src/vbox/vbox_tmpl.c:4186 +#: src/vbox/vbox_tmpl.c:4191 #, c-format msgid "" "Failed to attach the following disk/dvd/floppy to the machine: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:4196 +#: 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 "" -#: src/vbox/vbox_tmpl.c:4237 +#: 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 "" -#: src/vbox/vbox_tmpl.c:4260 +#: src/vbox/vbox_tmpl.c:4265 #, c-format msgid "could not attach the file as harddisk/dvd/floppy: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5034 src/vbox/vbox_tmpl.c:5102 +#: src/vbox/vbox_tmpl.c:5039 src/vbox/vbox_tmpl.c:5107 #, c-format msgid "could not define a domain, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5054 +#: src/vbox/vbox_tmpl.c:5059 #, c-format msgid "could not set the number of virtual CPUs to: %u, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5072 +#: src/vbox/vbox_tmpl.c:5077 #, c-format msgid "could not change PAE status to: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085 -#: src/vbox/vbox_tmpl.c:5093 +#: 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:5074 src/vbox/vbox_tmpl.c:5085 -#: src/vbox/vbox_tmpl.c:5093 +#: 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:5083 +#: src/vbox/vbox_tmpl.c:5088 #, c-format msgid "could not change ACPI status to: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5091 +#: src/vbox/vbox_tmpl.c:5096 #, c-format msgid "could not change APIC status to: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5298 +#: src/vbox/vbox_tmpl.c:5303 #, c-format msgid "could not delete the domain, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5498 +#: src/vbox/vbox_tmpl.c:5503 #, c-format msgid "could not attach shared folder '%s', rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5618 +#: src/vbox/vbox_tmpl.c:5623 #, c-format msgid "could not de-attach the mounted ISO, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5639 +#: src/vbox/vbox_tmpl.c:5644 #, c-format msgid "could not attach the file to floppy drive, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5674 +#: src/vbox/vbox_tmpl.c:5679 #, c-format msgid "could not detach shared folder '%s', rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:5726 src/vbox/vbox_tmpl.c:6111 +#: src/vbox/vbox_tmpl.c:5731 src/vbox/vbox_tmpl.c:6116 #, c-format msgid "could not get snapshot count for domain %s" msgstr "" -#: src/vbox/vbox_tmpl.c:5746 src/vbox/vbox_tmpl.c:6172 +#: src/vbox/vbox_tmpl.c:5751 src/vbox/vbox_tmpl.c:6177 #, c-format msgid "could not get root snapshot for domain %s" msgstr "" -#: src/vbox/vbox_tmpl.c:5759 +#: src/vbox/vbox_tmpl.c:5764 #, c-format msgid "unexpected number of snapshots < %u" msgstr "" -#: src/vbox/vbox_tmpl.c:5767 src/vbox/vbox_tmpl.c:6666 +#: src/vbox/vbox_tmpl.c:5772 src/vbox/vbox_tmpl.c:6671 msgid "could not get children snapshots" msgstr "" -#: src/vbox/vbox_tmpl.c:5776 +#: src/vbox/vbox_tmpl.c:5781 #, c-format msgid "unexpected number of snapshots > %u" msgstr "" -#: src/vbox/vbox_tmpl.c:5822 src/vbox/vbox_tmpl.c:6192 +#: src/vbox/vbox_tmpl.c:5827 src/vbox/vbox_tmpl.c:6197 msgid "could not get snapshot name" msgstr "" -#: src/vbox/vbox_tmpl.c:5837 +#: src/vbox/vbox_tmpl.c:5842 #, c-format msgid "domain %s has no snapshots with name %s" msgstr "" -#: src/vbox/vbox_tmpl.c:5898 src/vbox/vbox_tmpl.c:6471 -#: src/vbox/vbox_tmpl.c:6571 src/vbox/vbox_tmpl.c:6713 +#: 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:5913 src/vbox/vbox_tmpl.c:6487 -#: src/vbox/vbox_tmpl.c:6736 +#: 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 "" -#: src/vbox/vbox_tmpl.c:5935 src/vbox/vbox_tmpl.c:5943 +#: src/vbox/vbox_tmpl.c:5940 src/vbox/vbox_tmpl.c:5948 #, c-format msgid "could not take snapshot of domain %s" msgstr "" -#: src/vbox/vbox_tmpl.c:5950 src/vbox/vbox_tmpl.c:6563 +#: src/vbox/vbox_tmpl.c:5955 src/vbox/vbox_tmpl.c:6568 #, c-format msgid "could not get current snapshot of domain %s" msgstr "" -#: src/vbox/vbox_tmpl.c:6007 +#: src/vbox/vbox_tmpl.c:6012 #, c-format msgid "could not get description of snapshot %s" msgstr "" -#: src/vbox/vbox_tmpl.c:6023 +#: src/vbox/vbox_tmpl.c:6028 #, c-format msgid "could not get creation time of snapshot %s" msgstr "" -#: src/vbox/vbox_tmpl.c:6033 src/vbox/vbox_tmpl.c:6322 +#: src/vbox/vbox_tmpl.c:6038 src/vbox/vbox_tmpl.c:6327 #, c-format msgid "could not get parent of snapshot %s" msgstr "" -#: src/vbox/vbox_tmpl.c:6041 src/vbox/vbox_tmpl.c:6336 +#: 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 "" -#: src/vbox/vbox_tmpl.c:6056 src/vbox/vbox_tmpl.c:6555 +#: src/vbox/vbox_tmpl.c:6061 src/vbox/vbox_tmpl.c:6560 #, c-format msgid "could not get online state of snapshot %s" msgstr "" -#: src/vbox/vbox_tmpl.c:6277 src/vbox/vbox_tmpl.c:6383 +#: src/vbox/vbox_tmpl.c:6282 src/vbox/vbox_tmpl.c:6388 msgid "could not get current snapshot" msgstr "" -#: src/vbox/vbox_tmpl.c:6389 +#: src/vbox/vbox_tmpl.c:6394 msgid "domain has no snapshots" msgstr "" -#: src/vbox/vbox_tmpl.c:6396 +#: src/vbox/vbox_tmpl.c:6401 msgid "could not get current snapshot name" msgstr "" -#: src/vbox/vbox_tmpl.c:6430 src/vbox/vbox_tmpl.c:6617 +#: src/vbox/vbox_tmpl.c:6435 src/vbox/vbox_tmpl.c:6622 msgid "could not get snapshot UUID" msgstr "" -#: src/vbox/vbox_tmpl.c:6437 src/vbox/vbox_tmpl.c:6499 -#: src/vbox/vbox_tmpl.c:6509 +#: 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 "" -#: src/vbox/vbox_tmpl.c:6464 +#: src/vbox/vbox_tmpl.c:6469 msgid "could not get domain UUID" msgstr "" -#: src/vbox/vbox_tmpl.c:6478 +#: src/vbox/vbox_tmpl.c:6483 #, c-format msgid "domain %s is already running" msgstr "" -#: src/vbox/vbox_tmpl.c:6496 +#: src/vbox/vbox_tmpl.c:6501 msgid "cannot restore domain snapshot for running domain" msgstr "" -#: src/vbox/vbox_tmpl.c:6578 +#: src/vbox/vbox_tmpl.c:6583 msgid "cannot revert snapshot of running domain" msgstr "" -#: src/vbox/vbox_tmpl.c:6629 +#: src/vbox/vbox_tmpl.c:6634 msgid "cannot delete domain snapshot for running domain" msgstr "" -#: src/vbox/vbox_tmpl.c:6632 src/vbox/vbox_tmpl.c:6641 +#: src/vbox/vbox_tmpl.c:6637 src/vbox/vbox_tmpl.c:6646 msgid "could not delete snapshot" msgstr "" -#: src/vbox/vbox_tmpl.c:6727 +#: src/vbox/vbox_tmpl.c:6732 msgid "cannot delete snapshots of running domain" msgstr "" -#: src/vbox/vbox_tmpl.c:8238 +#: src/vbox/vbox_tmpl.c:8243 #, c-format msgid "could not get number of volumes in the pool: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:8290 +#: src/vbox/vbox_tmpl.c:8295 #, c-format msgid "could not get the volume list in the pool: %s, rc=%08x" msgstr "" -#: src/vbox/vbox_tmpl.c:8372 src/vbox/vbox_tmpl.c:8603 -#: src/vbox/vbox_tmpl.c:8772 src/vbox/vbox_tmpl.c:8842 -#: src/vbox/vbox_tmpl.c:8949 +#: 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 "" -#: src/vbox/vbox_tmpl.c:9024 +#: src/vbox/vbox_tmpl.c:9029 msgid "unable to get monitor count" msgstr "" -#: src/vbox/vbox_tmpl.c:9030 +#: src/vbox/vbox_tmpl.c:9035 #, c-format msgid "screen ID higher than monitor count (%d)" msgstr "" -#: src/vbox/vbox_tmpl.c:9069 +#: src/vbox/vbox_tmpl.c:9074 msgid "unable to get screen resolution" msgstr "" -#: src/vbox/vbox_tmpl.c:9079 +#: src/vbox/vbox_tmpl.c:9084 msgid "failed to take screenshot" msgstr "" -#: src/vbox/vbox_tmpl.c:9085 +#: src/vbox/vbox_tmpl.c:9090 #, c-format msgid "unable to write data to '%s'" msgstr "" @@ -17469,7 +18117,7 @@ #: src/vmx/vmx.c:3516 #, c-format msgid "" -"Expecting domain XML entry 'devices/interfase/model' to be 'vlance' or " +"Expecting domain XML entry 'devices/interface/model' to be 'vlance' or " "'vmxnet' or 'vmxnet2' or 'vmxnet3' or 'e1000' but found '%s'" msgstr "" @@ -17543,116 +18191,116 @@ msgid "unsupported path, use xvdN, hdN, or sdN for domain %d" msgstr "" -#: src/xen/xen_driver.c:1319 +#: src/xen/xen_driver.c:1425 msgid "failed to get XML representation of migrated domain" msgstr "" -#: src/xen/xen_driver.c:1326 +#: src/xen/xen_driver.c:1432 msgid "failed to define domain on destination host" msgstr "" -#: src/xen/xen_driver.c:2072 +#: src/xen/xen_driver.c:2080 #, c-format msgid "Device %s has been assigned to guest %d" msgstr "" -#: src/xen/xen_driver.c:2131 +#: src/xen/xen_driver.c:2139 msgid "Named device aliases are not supported" msgstr "" -#: src/xen/xen_driver.c:2146 +#: src/xen/xen_driver.c:2154 msgid "cannot find default console device" msgstr "" -#: src/xen/xen_hypervisor.c:1340 +#: 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:1417 +#: src/xen/xen_hypervisor.c:1418 #, c-format msgid "Credit scheduler cap parameter (%d) is out of range (0-65534)" msgstr "" -#: src/xen/xen_hypervisor.c:2313 +#: src/xen/xen_hypervisor.c:2444 msgid "could not read CPU flags" msgstr "" -#: src/xen/xen_hypervisor.c:2595 src/xen/xen_hypervisor.c:2606 +#: 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:2775 src/xen/xen_hypervisor.c:3433 +#: src/xen/xen_hypervisor.c:2905 src/xen/xen_hypervisor.c:3598 msgid "domain shut off or invalid" msgstr "" -#: src/xen/xen_hypervisor.c:2783 +#: src/xen/xen_hypervisor.c:2913 msgid "unsupported in dom interface < 4" msgstr "" -#: src/xen/xen_hypervisor.c:2791 src/xen/xen_hypervisor.c:2797 -#: src/xen/xen_hypervisor.c:3448 +#: src/xen/xen_hypervisor.c:2921 src/xen/xen_hypervisor.c:2927 +#: src/xen/xen_hypervisor.c:3613 msgid "cannot get domain details" msgstr "" -#: src/xen/xen_hypervisor.c:3465 src/xen/xen_hypervisor.c:3473 +#: src/xen/xen_hypervisor.c:3630 src/xen/xen_hypervisor.c:3638 msgid "cannot get VCPUs info" msgstr "" -#: src/xen/xen_inotify.c:131 src/xen/xen_inotify.c:207 +#: 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:156 +#: src/xen/xen_inotify.c:120 msgid "finding dom on config list" msgstr "正在 config 列表中查找 dom" -#: src/xen/xen_inotify.c:243 +#: src/xen/xen_inotify.c:207 msgid "Error looking up domain" msgstr "正在查找域" -#: src/xen/xen_inotify.c:250 src/xen/xen_inotify.c:343 -#: src/xen/xen_inotify.c:350 +#: 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:296 +#: src/xen/xen_inotify.c:260 msgid "conn, or private data is NULL" msgstr "conn 或者专用数据为 NULL" -#: src/xen/xen_inotify.c:339 src/xen/xen_inotify.c:362 +#: src/xen/xen_inotify.c:303 src/xen/xen_inotify.c:326 msgid "looking up dom" msgstr "查找 dom" -#: src/xen/xen_inotify.c:407 +#: src/xen/xen_inotify.c:373 #, c-format msgid "cannot open directory: %s" msgstr "无法打开目录:%s" -#: src/xen/xen_inotify.c:425 +#: src/xen/xen_inotify.c:389 msgid "Error adding file to config list" msgstr "在 config 列表中添加文件时出错" -#: src/xen/xen_inotify.c:435 +#: src/xen/xen_inotify.c:402 msgid "initializing inotify" msgstr "初始化 inotify" -#: src/xen/xen_inotify.c:446 +#: src/xen/xen_inotify.c:413 #, c-format msgid "adding watch on %s" msgstr "在 %s 中添加 watch" -#: src/xen/xend_internal.c:128 +#: src/xen/xend_internal.c:93 msgid "failed to create a socket" msgstr "生成套接字失败" -#: src/xen/xend_internal.c:151 +#: src/xen/xend_internal.c:113 msgid "failed to connect to xend" msgstr "连接到 xend 失败" -#: src/xen/xend_internal.c:198 src/xen/xend_internal.c:201 +#: src/xen/xend_internal.c:160 msgid "failed to read from Xen Daemon" msgstr "从 Xen 守护进程读失败" @@ -17665,56 +18313,56 @@ msgid "Xend returned HTTP Content-Length of %d, which exceeds maximum of %d" msgstr "" -#: src/xen/xend_internal.c:389 +#: 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:440 src/xen/xend_internal.c:443 -#: src/xen/xend_internal.c:451 +#: 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/remote/remote_driver.c:592 src/xen/xend_internal.c:811 +#: src/xen/xend_internal.c:681 #, c-format msgid "unable to resolve hostname '%s': %s" msgstr "无法解析主机名 '%s':%s" -#: src/xen/xend_internal.c:848 +#: src/xen/xend_internal.c:718 #, c-format msgid "unable to connect to '%s:%s'" msgstr "无法连接到 '%s:%s'" -#: src/xen/xend_internal.c:1007 +#: src/xen/xend_internal.c:855 msgid "domain information incomplete, missing domid" msgstr "域信息不完全,缺少 domid" -#: src/xen/xend_internal.c:1013 +#: src/xen/xend_internal.c:861 msgid "domain information incorrect domid not numeric" msgstr "域信息不正确,domid 不是数字值" -#: src/xen/xend_internal.c:1018 src/xen/xend_internal.c:1070 +#: 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:1057 src/xen/xend_internal.c:2359 -#: src/xen/xend_internal.c:2366 +#: 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/xen/xend_internal.c:2833 +#: src/xen/xend_internal.c:1176 msgid "topology syntax error" msgstr "拓扑结构句法错误" -#: src/xen/xend_internal.c:2897 +#: src/xen/xend_internal.c:1239 msgid "failed to parse Xend domain information" msgstr "解释 Xend 域信息失败" -#: src/xen/xend_internal.c:3023 src/xen/xend_internal.c:3050 -#: src/xen/xend_internal.c:3078 src/xen/xend_internal.c:3107 -#: src/xen/xend_internal.c:3138 src/xen/xend_internal.c:3216 -#: src/xen/xend_internal.c:3253 +#: 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 没有在运行。" @@ -17735,10 +18383,6 @@ msgid "Xend only supports modifying both live and persistent config" msgstr "" -#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731 -msgid "could not determin max vcpus for the domain" -msgstr "" - #: src/xen/xend_internal.c:2299 msgid "failed to add vcpupin xml entry" msgstr "" @@ -17748,8 +18392,8 @@ msgid "Cannot modify live config if domain is inactive" msgstr "" -#: src/xen/xend_internal.c:4173 src/xen/xend_internal.c:4180 -#: src/xen/xend_internal.c:4262 +#: 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 "不支持的设备类型" @@ -17762,72 +18406,72 @@ msgid "requested device does not exist" msgstr "" -#: src/xen/xend_internal.c:4307 +#: src/xen/xend_internal.c:3022 msgid "xenDaemonGetAutostart failed to find this domain" msgstr "xenDaemonGetAutostart 无法找到这个域" -#: src/xen/xend_internal.c:4348 +#: src/xen/xend_internal.c:3062 msgid "xenDaemonSetAutostart failed to find this domain" msgstr "xenDaemonGetAutostart 无法找到这个域" -#: src/xen/xend_internal.c:4356 +#: src/xen/xend_internal.c:3072 msgid "unexpected value from on_xend_start" msgstr "on_xend_start 中的意外值" -#: src/xen/xend_internal.c:4372 +#: src/xen/xend_internal.c:3087 msgid "sexpr2string failed" msgstr "sexpr2string 失败" -#: src/xen/xend_internal.c:4377 +#: src/xen/xend_internal.c:3100 msgid "Failed to redefine sexpr" msgstr "重新定义 sexpr 失败" -#: src/xen/xend_internal.c:4382 +#: src/xen/xend_internal.c:3105 msgid "on_xend_start not present in sexpr" msgstr "sexpr 中没有 on_xend_start" -#: src/xen/xend_internal.c:4440 +#: src/xen/xend_internal.c:3168 msgid "" "xenDaemonDomainMigrate: Xen does not support renaming domains during " "migration" msgstr "xenDaemonDomainMigrate:Xen 不支持在迁移时重新命名域" -#: src/xen/xend_internal.c:4450 +#: src/xen/xend_internal.c:3178 msgid "" "xenDaemonDomainMigrate: Xen does not support bandwidth limits during " "migration" msgstr "xenDaemonDomainMigrate:Xen 不支持在迁移时的带宽限制" -#: src/xen/xend_internal.c:4478 +#: src/xen/xend_internal.c:3206 msgid "xenDaemonDomainMigrate: xend cannot migrate paused domains" msgstr "" -#: src/xen/xend_internal.c:4486 +#: src/xen/xend_internal.c:3214 msgid "xenDaemonDomainMigrate: unsupported flag" msgstr "xenDaemonDomainMigrate:不支持的标记" -#: src/xen/xend_internal.c:4499 +#: src/xen/xend_internal.c:3227 msgid "xenDaemonDomainMigrate: invalid URI" msgstr "xenDaemonDomainMigrate:无效 URI" -#: src/xen/xend_internal.c:4504 +#: src/xen/xend_internal.c:3232 msgid "" "xenDaemonDomainMigrate: only xenmigr:// migrations are supported by Xen" msgstr "xenDaemonDomainMigrate:Xen 只支持 xenmigr:// 迁移" -#: src/xen/xend_internal.c:4511 +#: src/xen/xend_internal.c:3239 msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI" msgstr "xenDaemonDomainMigrate:在 URI 中必须指定主机名" -#: src/xen/xend_internal.c:4531 +#: src/xen/xend_internal.c:3259 msgid "xenDaemonDomainMigrate: invalid port number" msgstr "xenDaemonDomainMigrate:无效端口号" -#: src/xen/xend_internal.c:4590 +#: src/xen/xend_internal.c:3325 msgid "failed to parse domain description" msgstr "解释域描述失败" -#: src/xen/xend_internal.c:4596 +#: src/xen/xend_internal.c:3331 msgid "failed to build sexpr" msgstr "构建 sexpr 失败" @@ -17836,155 +18480,159 @@ msgid "Failed to create inactive domain %s" msgstr "" -#: src/xen/xend_internal.c:4786 src/xen/xend_internal.c:4862 -#: src/xen/xend_internal.c:4959 +#: 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:4798 +#: src/xen/xend_internal.c:3527 msgid "node information incomplete, missing scheduler name" msgstr "节点信息不完整,缺少调度程序名称" -#: src/xen/xend_internal.c:4816 src/xen/xend_internal.c:4917 -#: src/xen/xend_internal.c:5029 +#: 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:4875 src/xen/xend_internal.c:4972 +#: 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:4888 src/xen/xend_internal.c:5008 +#: 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:4893 src/xen/xend_internal.c:5017 +#: 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:4899 +#: src/xen/xend_internal.c:3632 #, c-format msgid "Weight %s too big for destination" msgstr "" -#: src/xen/xend_internal.c:4908 +#: src/xen/xend_internal.c:3643 #, c-format msgid "Cap %s too big for destination" msgstr "" -#: src/xen/xend_internal.c:5075 +#: src/xen/xend_internal.c:3815 msgid "domainBlockPeek is not supported for dom0" msgstr "不支持 dom0 中的 domainBlockPeek" -#: src/xen/xend_internal.c:5096 +#: src/xen/xend_internal.c:3836 #, c-format msgid "%s: invalid path" msgstr "%s:无效路径" -#: src/xen/xend_internal.c:5104 +#: src/xen/xend_internal.c:3845 #, c-format msgid "failed to open for reading: %s" msgstr "打开并读取失败:%s" -#: src/xen/xend_internal.c:5116 +#: 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:6065 +#: src/xen/xend_internal.c:3998 msgid "hotplug of device type not supported" msgstr "不支持热查报设备类型" -#: src/xen/xm_internal.c:399 +#: src/xen/xm_internal.c:221 #, c-format msgid "cannot stat: %s" msgstr "无法 stat:%s" -#: src/xen/xm_internal.c:457 +#: src/xen/xm_internal.c:285 msgid "xenXMConfigCacheRefresh: virHashAddEntry" msgstr "xenXMConfigCacheRefresh: virHashAddEntry" -#: src/xen/xm_internal.c:509 +#: src/xen/xm_internal.c:326 +msgid "cannot get time of day" +msgstr "正在获得日期" + +#: src/xen/xm_internal.c:339 #, c-format msgid "cannot read directory %s" msgstr "无法读取目录 %s" -#: src/xen/xm_internal.c:1711 +#: src/xen/xm_internal.c:848 msgid "read only connection" msgstr "只读连接" -#: src/xen/xm_internal.c:1716 +#: src/xen/xm_internal.c:853 msgid "not inactive domain" msgstr "不活跃的域" -#: src/xen/xm_internal.c:1724 +#: src/xen/xm_internal.c:861 msgid "virHashLookup" msgstr "virHashLookup" -#: src/xen/xm_internal.c:1729 +#: src/xen/xm_internal.c:866 msgid "can't retrieve config file for domain" msgstr "无法为域搜索配置文件" -#: src/xen/xm_internal.c:2684 +#: src/xen/xm_internal.c:1129 msgid "can't retrieve config filename for domain to overwrite" msgstr "无法为域搜索用来覆盖的配置文件文件名" -#: src/xen/xm_internal.c:2690 +#: src/xen/xm_internal.c:1135 msgid "can't retrieve config entry for domain to overwrite" msgstr "无法为域搜索用来覆盖的配置文件条目" -#: src/xen/xm_internal.c:2701 src/xen/xm_internal.c:2708 +#: 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:2735 +#: src/xen/xm_internal.c:1169 msgid "unable to get current time" msgstr "无法获得当前时间" -#: src/xen/xm_internal.c:2744 src/xen/xm_internal.c:2751 +#: 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:1393 src/xen/xm_internal.c:1490 +#: src/xen/xm_internal.c:1392 src/xen/xm_internal.c:1489 msgid "Xm driver only supports modifying persistent config" msgstr "" -#: src/xen/xm_internal.c:1435 +#: src/xen/xm_internal.c:1434 msgid "Xm driver only supports adding disk or network devices" msgstr "" -#: src/xen/xm_internal.c:1575 +#: src/xen/xm_internal.c:1574 msgid "block peeking not implemented" msgstr "" -#: src/xen/xm_internal.c:3148 +#: 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:3177 +#: src/xen/xm_internal.c:1638 #, c-format msgid "failed to create link %s to %s" msgstr "创建 %s 到 %s 的链接失败" -#: src/xen/xm_internal.c:3185 +#: src/xen/xm_internal.c:1646 #, c-format msgid "failed to remove link %s" msgstr "删除链接 %s 失败" -#: src/xen/xs_internal.c:300 +#: src/xen/xs_internal.c:258 msgid "failed to connect to Xen Store" msgstr "连接到 Xen Store 失败" -#: src/xen/xs_internal.c:325 +#: src/xen/xs_internal.c:282 msgid "adding watch @releaseDomain" msgstr "正在添加 watch @releaseDomain" -#: src/xen/xs_internal.c:334 +#: src/xen/xs_internal.c:291 msgid "adding watch @introduceDomain" msgstr "正在添加 watch @introduceDomain" -#: src/xen/xs_internal.c:1203 +#: src/xen/xs_internal.c:1141 msgid "watch already tracked" msgstr "已跟踪 watch" @@ -18042,10 +18690,10 @@ #: 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:1239 -#: src/xenapi/xenapi_driver.c:1298 src/xenapi/xenapi_driver.c:1356 -#: src/xenapi/xenapi_driver.c:1629 src/xenapi/xenapi_driver.c:1725 -#: src/xenapi/xenapi_driver.c:1767 src/xenapi/xenapi_driver.c:1813 +#: 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 "" @@ -18057,27 +18705,27 @@ msgid "Couldn't fetch Domain Information" msgstr "" -#: src/xenapi/xenapi_driver.c:1228 +#: src/xenapi/xenapi_driver.c:1226 msgid "Couldn't fetch Node Information" msgstr "" -#: src/xenapi/xenapi_driver.c:1511 +#: src/xenapi/xenapi_driver.c:1509 msgid "Unable to parse given mac address" msgstr "" -#: src/xenapi/xenapi_driver.c:1563 +#: src/xenapi/xenapi_driver.c:1561 msgid "Couldn't get VM record" msgstr "" -#: src/xenapi/xenapi_driver.c:1690 +#: src/xenapi/xenapi_driver.c:1688 msgid "Couldn't get VM information from XML" msgstr "" -#: src/xenapi/xenapi_driver.c:1864 +#: src/xenapi/xenapi_driver.c:1862 msgid "Couldn't get host metrics - memory information" msgstr "" -#: src/xenapi/xenapi_driver.c:1870 +#: src/xenapi/xenapi_driver.c:1868 msgid "Couldn't get host metrics" msgstr "" @@ -18085,182 +18733,180 @@ msgid "Query parameter 'no_verify' has unexpected value (should be 0 or 1)" msgstr "" -#: src/xen/xend_internal.c:2346 +#: src/xenxs/xen_sxpr.c:60 src/xenxs/xen_sxpr.c:1073 msgid "domain information incomplete, missing id" msgstr "域信息不完全,缺少 id" -#: src/xen/xend_internal.c:1151 +#: src/xenxs/xen_sxpr.c:98 msgid "domain information incomplete, missing HVM loader" msgstr "域信息不完全,缺少 HVM 装载程序" -#: src/xen/xend_internal.c:1205 +#: src/xenxs/xen_sxpr.c:158 msgid "domain information incomplete, missing kernel & bootloader" msgstr "域信息不完全,缺少内核和启动器" -#: src/xen/xend_internal.c:1467 +#: src/xenxs/xen_sxpr.c:199 #, c-format msgid "unknown chr device type '%s'" msgstr "未知字符设备类型 '%s'" -#: src/xen/xend_internal.c:1303 src/xen/xend_internal.c:1343 -#: src/xen/xend_internal.c:1359 src/xen/xend_internal.c:1494 -#: src/xen/xend_internal.c:1522 src/xen/xend_internal.c:1538 +#: 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/xen/xend_internal.c:1629 +#: src/xenxs/xen_sxpr.c:375 msgid "domain information incomplete, vbd has no dev" msgstr "域信息不完全,vbd 没有 dev" -#: src/xen/xend_internal.c:1640 +#: src/xenxs/xen_sxpr.c:386 msgid "domain information incomplete, vbd has no src" msgstr "域信息不完全,vbd 没有 src" -#: src/xen/xend_internal.c:1649 +#: src/xenxs/xen_sxpr.c:395 msgid "cannot parse vbd filename, missing driver name" msgstr "缺少驱动名,无法解释 vbd 文件名" -#: src/xen/xend_internal.c:1658 src/xen/xm_internal.c:909 +#: src/xenxs/xen_sxpr.c:409 src/xenxs/xen_xm.c:496 #, c-format msgid "Driver name %s too big for destination" msgstr "" -#: src/xen/xend_internal.c:1669 +#: src/xenxs/xen_sxpr.c:422 msgid "cannot parse vbd filename, missing driver type" msgstr "缺少驱动类型,无法解释 vbd 文件名" -#: src/xen/xend_internal.c:1678 src/xen/xm_internal.c:930 +#: src/xenxs/xen_sxpr.c:431 src/xenxs/xen_xm.c:517 #, c-format msgid "Driver type %s too big for destination" msgstr "" -#: src/xen/xend_internal.c:1831 +#: src/xenxs/xen_sxpr.c:585 src/xenxs/xen_xm.c:695 #, c-format msgid "malformed mac address '%s'" msgstr "畸形 mac 地址 '%s'" -#: src/xen/xend_internal.c:1917 +#: src/xenxs/xen_sxpr.c:663 #, c-format msgid "Sound model %s too big for destination" msgstr "" -#: src/xen/xend_internal.c:2117 +#: src/xenxs/xen_sxpr.c:853 #, c-format msgid "unknown graphics type '%s'" msgstr "未知图形类型 '%s'" -#: src/xen/xend_internal.c:2244 +#: src/xenxs/xen_sxpr.c:976 msgid "missing PCI domain" msgstr "缺少 PCI 域" -#: src/xen/xend_internal.c:2249 +#: src/xenxs/xen_sxpr.c:981 msgid "missing PCI bus" msgstr "缺少 PCI 总线" -#: src/xen/xend_internal.c:2254 +#: src/xenxs/xen_sxpr.c:986 msgid "missing PCI slot" msgstr "缺少 PCI 插槽" -#: src/xen/xend_internal.c:2259 +#: src/xenxs/xen_sxpr.c:991 msgid "missing PCI func" msgstr "缺少 PCI 功能" -#: src/xen/xend_internal.c:2265 +#: src/xenxs/xen_sxpr.c:997 #, c-format msgid "cannot parse PCI domain '%s'" msgstr "无法解析 PCI 域 '%s'" -#: src/xen/xend_internal.c:2270 +#: src/xenxs/xen_sxpr.c:1002 #, c-format msgid "cannot parse PCI bus '%s'" msgstr "无法解析 PCI 总线 '%s'" -#: src/xen/xend_internal.c:2275 +#: src/xenxs/xen_sxpr.c:1007 #, c-format msgid "cannot parse PCI slot '%s'" msgstr "无法解析 PCI 插槽 '%s'" -#: src/xen/xend_internal.c:2280 +#: src/xenxs/xen_sxpr.c:1012 #, c-format msgid "cannot parse PCI func '%s'" msgstr "无法解析 PCI 功能 '%s'" -#: src/xen/xend_internal.c:2417 +#: src/xenxs/xen_sxpr.c:1146 #, c-format msgid "invalid CPU mask %s" msgstr "无效 CPU 掩码 %s" -#: src/xen/xend_internal.c:2428 src/xen/xend_internal.c:2438 -#: src/xen/xend_internal.c:2448 +#: 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/xen/xend_internal.c:5198 src/xen/xend_internal.c:5244 +#: 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:1621 +#: src/xenxs/xen_sxpr.c:1620 #, c-format msgid "unsupported chr device type '%s'" msgstr "" -#: src/xen/xend_internal.c:5370 +#: src/xenxs/xen_sxpr.c:1660 #, c-format msgid "Cannot directly attach floppy %s" msgstr "无法直接附加软盘 %s" -#: src/xen/xend_internal.c:5382 +#: src/xenxs/xen_sxpr.c:1672 #, c-format msgid "Cannot directly attach CDROM %s" msgstr "无法直接附加光驱 %s" -#: src/xen/xend_internal.c:5437 src/xen/xm_internal.c:1994 +#: src/xenxs/xen_sxpr.c:1732 src/xenxs/xen_xm.c:1166 #, c-format msgid "unsupported disk type %s" msgstr "" -#: src/xen/xend_internal.c:5487 src/xen/xm_internal.c:2097 +#: src/xenxs/xen_sxpr.c:1786 src/xenxs/xen_xm.c:1316 #, c-format msgid "unsupported network type %d" msgstr "不支持的网络类型 %d" -#: src/xen/xend_internal.c:5528 src/xen/xm_internal.c:2085 +#: src/xenxs/xen_sxpr.c:1827 src/xenxs/xen_xm.c:1304 #, c-format msgid "network %s is not active" msgstr "网络 %s 不活跃" -#: src/xen/xend_internal.c:5598 src/xen/xend_internal.c:5649 +#: src/xenxs/xen_sxpr.c:1906 src/xenxs/xen_sxpr.c:1956 msgid "managed PCI devices not supported with XenD" msgstr "XenD 不支持管理的 PCI 设备" -#: src/xen/xend_internal.c:5764 src/xen/xend_internal.c:5771 -#: src/xen/xend_internal.c:5778 +#: 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:2107 src/xenxs/xen_xm.c:1565 +#: src/xenxs/xen_sxpr.c:2106 src/xenxs/xen_xm.c:1565 msgid "configurable timezones are not supported" msgstr "" -#: src/xen/xend_internal.c:5799 +#: src/xenxs/xen_sxpr.c:2130 msgid "no HVM domain loader" msgstr "无 HVM 域装载程序" -#: src/xen/xm_internal.c:158 src/xen/xm_internal.c:186 -#: src/xen/xm_internal.c:191 src/xen/xm_internal.c:214 +#: 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/xen/xm_internal.c:236 src/xen/xm_internal.c:249 +#: 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/xen/xm_internal.c:242 +#: src/xenxs/xen_xm.c:141 #, c-format msgid "config value %s was not a string" msgstr "config 值 %s 不是字符串" @@ -18284,97 +18930,100 @@ msgid "%s not parseable" msgstr "" -#: src/xen/xm_internal.c:795 +#: src/xenxs/xen_xm.c:351 #, c-format msgid "unexpected value %s for on_poweroff" msgstr "on_poweroff 的意外值 %s" -#: src/xen/xm_internal.c:803 +#: src/xenxs/xen_xm.c:359 #, c-format msgid "unexpected value %s for on_reboot" msgstr "on_reboot 中的意外值 %s" -#: src/xen/xm_internal.c:811 +#: src/xenxs/xen_xm.c:367 #, c-format msgid "unexpected value %s for on_crash" msgstr "on_crash 中的意外值 %s" -#: src/xen/xm_internal.c:874 +#: src/xenxs/xen_xm.c:461 #, c-format msgid "Source file %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:893 +#: src/xenxs/xen_xm.c:480 #, c-format msgid "Dest file %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1048 +#: src/xenxs/xen_xm.c:633 #, c-format msgid "MAC address %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1056 +#: src/xenxs/xen_xm.c:641 #, c-format msgid "Bridge %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1079 +#: src/xenxs/xen_xm.c:662 #, c-format msgid "Type %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1086 +#: src/xenxs/xen_xm.c:669 #, c-format msgid "Vifname %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1094 +#: src/xenxs/xen_xm.c:677 #, c-format msgid "IP %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1203 +#: src/xenxs/xen_xm.c:777 #, c-format msgid "Domain %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1213 +#: src/xenxs/xen_xm.c:787 #, c-format msgid "Bus %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1223 +#: src/xenxs/xen_xm.c:797 #, c-format msgid "Slot %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1233 +#: src/xenxs/xen_xm.c:807 #, c-format msgid "Function %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:1349 +#: src/xenxs/xen_xm.c:931 #, c-format msgid "VFB %s too big for destination" msgstr "" -#: src/xen/xm_internal.c:2365 src/xen/xm_internal.c:2374 -#: src/xen/xm_internal.c:2383 +#: 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/console.c:298 +#: tools/console.c:317 #, c-format msgid "unable to get tty attributes: %s" msgstr "" -#: tools/console.c:307 +#: tools/console.c:326 #, c-format msgid "unable to set tty attributes: %s" msgstr "" +#: tools/console.c:379 +msgid "unable to wait on console condition" +msgstr "" + #: tools/libvirt-guests.init.sh:139 msgid "libvirt-guests is configured not to start any guests on boot" msgstr "" @@ -18463,702 +19112,719 @@ "restart|reload|force-reload|gueststatus|shutdown}" msgstr "" -#: tools/virsh.c:8374 tools/virsh.c:8386 tools/virsh.c:8399 +#: 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:8413 +#: tools/virsh.c:438 #, c-format msgid "%s: %d: failed to allocate %lu bytes" msgstr "%s: %d: 分配 %lu字节失败" -#: tools/virsh.c:598 +#: tools/virsh.c:610 msgid "Failed to reconnect to the hypervisor" msgstr "" -#: tools/virsh.c:600 +#: tools/virsh.c:612 msgid "Reconnected to the hypervisor" msgstr "" -#: tools/virsh.c:375 +#: tools/virsh.c:627 msgid "print help" msgstr "打印帮助" -#: tools/virsh.c:616 +#: tools/virsh.c:628 msgid "" "Prints global help, command specific help, or help for a\n" " group of related commands" msgstr "" -#: tools/virsh.c:623 +#: tools/virsh.c:635 msgid "" "Prints global help, command specific help, or help for a group of related " "commands" msgstr "" -#: tools/virsh.c:636 +#: tools/virsh.c:648 msgid "" "Grouped commands:\n" "\n" msgstr "" -#: tools/virsh.c:639 tools/virsh.c:14488 +#: tools/virsh.c:651 tools/virsh.c:15574 #, c-format msgid " %s (help keyword '%s'):\n" msgstr "" -#: tools/virsh.c:657 +#: tools/virsh.c:669 #, c-format msgid "command or command group '%s' doesn't exist" msgstr "" -#: tools/virsh.c:407 +#: tools/virsh.c:678 msgid "autostart a domain" msgstr "自动开始一个域" -#: tools/virsh.c:409 +#: tools/virsh.c:680 msgid "Configure a domain to be automatically started at boot." msgstr "设置一个域在启动时自动开始." -#: tools/virsh.c:414 tools/virsh.c:512 tools/virsh.c:737 tools/virsh.c:773 -#: tools/virsh.c:830 tools/virsh.c:897 tools/virsh.c:951 tools/virsh.c:1202 -#: tools/virsh.c:1245 tools/virsh.c:1490 tools/virsh.c:1539 tools/virsh.c:1577 -#: tools/virsh.c:1615 tools/virsh.c:1653 tools/virsh.c:1691 tools/virsh.c:1842 -#: tools/virsh.c:1928 tools/virsh.c:2065 tools/virsh.c:2121 tools/virsh.c:2177 -#: tools/virsh.c:2296 tools/virsh.c:2544 tools/virsh.c:6146 tools/virsh.c:6221 -#: tools/virsh.c:6282 tools/virsh.c:6340 tools/virsh.c:6398 tools/virsh.c:6514 -#: tools/virsh.c:6634 tools/virsh.c:6791 tools/virsh.c:7168 +#: 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.c:415 tools/virsh.c:2636 tools/virsh.c:3613 +#: tools/virsh.c:686 tools/virsh.c:6198 tools/virsh.c:8255 msgid "disable autostarting" msgstr "禁止自动启动" -#: tools/virsh.c:436 +#: tools/virsh.c:707 #, c-format msgid "Failed to mark domain %s as autostarted" msgstr "把域 %s标记为自动开始失败" -#: tools/virsh.c:438 +#: tools/virsh.c:709 #, c-format msgid "Failed to unmark domain %s as autostarted" msgstr "把域 %s取消标记为自动开始失败" -#: tools/virsh.c:444 +#: tools/virsh.c:715 #, c-format msgid "Domain %s marked as autostarted\n" msgstr "域 %s标记为自动开始\n" -#: tools/virsh.c:446 +#: tools/virsh.c:717 #, c-format msgid "Domain %s unmarked as autostarted\n" msgstr "域 %s取消标记为自动开始\n" -#: tools/virsh.c:456 +#: tools/virsh.c:727 msgid "(re)connect to hypervisor" msgstr "连接(重新连接)到 hypervisor" -#: tools/virsh.c:458 +#: tools/virsh.c:729 msgid "" "Connect to local hypervisor. This is built-in command after shell start up." msgstr "连接到本地管理程序。这是在 shell 启动后内建的命令。" -#: tools/virsh.c:463 +#: tools/virsh.c:735 msgid "hypervisor connection URI" msgstr "管理程序连接 URI" -#: tools/virsh.c:464 +#: tools/virsh.c:736 msgid "read-only connection" msgstr "只读连接" -#: tools/virsh.c:737 tools/virsh.c:16396 +#: tools/virsh.c:749 tools/virsh.c:17515 #, c-format msgid "Failed to disconnect from the hypervisor, %d leaked reference(s)" msgstr "" -#: tools/virsh.c:745 +#: tools/virsh.c:757 msgid "Please specify valid connection URI" msgstr "" -#: tools/virsh.c:494 +#: tools/virsh.c:770 msgid "Failed to connect to the hypervisor" msgstr "连接到管理程序失败" -#: tools/virsh.c:505 +#: tools/virsh.c:781 msgid "connect to the guest console" msgstr "连接到客户会话" -#: tools/virsh.c:507 +#: tools/virsh.c:783 msgid "Connect the virtual serial console for the guest" msgstr "连接客户真实串行控制台" -#: tools/virsh.c:777 +#: tools/virsh.c:789 msgid "character device name" msgstr "" -#: tools/virsh.c:544 +#: tools/virsh.c:800 msgid "Unable to get domain status" msgstr "" -#: tools/virsh.c:549 +#: tools/virsh.c:805 msgid "The domain is not running" msgstr "" -#: tools/virsh.c:570 +#: tools/virsh.c:809 #, c-format msgid "Connected to domain %s\n" msgstr "连接到域 %s\n" -#: tools/virsh.c:571 -msgid "Escape character is ^]\n" -msgstr "换码符为 ^]\n" +#: tools/virsh.c:810 +#, c-format +msgid "Escape character is %s\n" +msgstr "" -#: tools/virsh.c:821 +#: tools/virsh.c:833 msgid "Invalid devname" msgstr "" -#: tools/virsh.c:614 +#: tools/virsh.c:851 msgid "list domains" msgstr "列出域" -#: tools/virsh.c:615 +#: tools/virsh.c:852 msgid "Returns list of domains." msgstr "返回域列表" -#: tools/virsh.c:620 +#: tools/virsh.c:857 msgid "list inactive domains" msgstr "列出不活跃的域" -#: tools/virsh.c:621 +#: tools/virsh.c:858 msgid "list inactive & active domains" msgstr "不活跃和活跃的域列表" -#: tools/virsh.c:848 +#: tools/virsh.c:860 msgid "mark domains with managed save state" msgstr "" -#: tools/virsh.c:643 tools/virsh.c:650 +#: tools/virsh.c:885 tools/virsh.c:892 msgid "Failed to list active domains" msgstr "列出活跃的域失败" -#: tools/virsh.c:661 tools/virsh.c:669 +#: tools/virsh.c:903 tools/virsh.c:911 msgid "Failed to list inactive domains" msgstr "列出不活跃的域失败" -#: tools/virsh.c:678 +#: tools/virsh.c:920 msgid "Id" msgstr "Id" -#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265 -#: tools/virsh.c:5226 +#: 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.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265 +#: 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.c:941 tools/virsh.c:15745 +#: tools/virsh.c:953 tools/virsh.c:16834 msgid "saved" msgstr "" -#: tools/virsh.c:731 +#: tools/virsh.c:967 msgid "domain state" msgstr "域状态" -#: tools/virsh.c:732 +#: tools/virsh.c:968 msgid "Returns state about a domain." msgstr "返回某个域的状态。" -#: tools/virsh.c:962 +#: tools/virsh.c:974 msgid "also print reason for the state" msgstr "" -#: tools/virsh.c:1003 +#: tools/virsh.c:1015 msgid "domain control interface state" msgstr "" -#: tools/virsh.c:1004 +#: tools/virsh.c:1016 msgid "Returns state of a control interface to the domain." msgstr "" -#: tools/virsh.c:767 +#: tools/virsh.c:1061 msgid "get device block stats for a domain" msgstr "获得域设备块状态" -#: tools/virsh.c:1050 +#: tools/virsh.c:1062 msgid "" "Get device block stats for a running domain. See man page or use --human for " "explanation of fields" msgstr "" -#: tools/virsh.c:774 +#: tools/virsh.c:1069 tools/virsh.c:1647 tools/virsh.c:6246 msgid "block device" msgstr "阻止设备" -#: tools/virsh.c:1058 +#: tools/virsh.c:1070 msgid "print a more human readable output" msgstr "" -#: tools/virsh.c:1072 +#: tools/virsh.c:1084 msgid "number of read operations:" msgstr "" -#: tools/virsh.c:1074 +#: tools/virsh.c:1086 msgid "number of bytes read:" msgstr "" -#: tools/virsh.c:1076 +#: tools/virsh.c:1088 msgid "number of write operations:" msgstr "" -#: tools/virsh.c:1078 +#: tools/virsh.c:1090 msgid "number of bytes written:" msgstr "" -#: tools/virsh.c:1080 +#: tools/virsh.c:1092 msgid "error count:" msgstr "" -#: tools/virsh.c:1082 +#: tools/virsh.c:1094 msgid "number of flush operations:" msgstr "" -#: tools/virsh.c:1084 +#: tools/virsh.c:1096 msgid "total duration of reads (ns):" msgstr "" -#: tools/virsh.c:1086 +#: tools/virsh.c:1098 msgid "total duration of writes (ns):" msgstr "" -#: tools/virsh.c:1088 +#: tools/virsh.c:1100 msgid "total duration of flushes (ns):" msgstr "" -#: tools/virsh.c:797 +#: tools/virsh.c:1152 tools/virsh.c:1172 #, c-format msgid "Failed to get block stats %s %s" msgstr "无法获得块状态 %s %s" -#: tools/virsh.c:1147 tools/virsh.c:1166 +#: tools/virsh.c:1159 tools/virsh.c:1178 #, c-format msgid "Device: %s\n" msgstr "" -#: tools/virsh.c:824 +#: tools/virsh.c:1237 msgid "get network interface stats for a domain" msgstr "获得域网络接口状态" -#: tools/virsh.c:825 +#: tools/virsh.c:1238 msgid "Get network interface stats for a running domain." msgstr "获得运行域的网络接口状态。" -#: tools/virsh.c:831 +#: tools/virsh.c:1244 msgid "interface device" msgstr "接口设备" -#: tools/virsh.c:854 +#: tools/virsh.c:1267 #, c-format msgid "Failed to get interface stats %s %s" msgstr "无法获得接口状态 %s %s" -#: tools/virsh.c:1291 +#: tools/virsh.c:1303 msgid "set link state of a virtual interface" msgstr "" -#: tools/virsh.c:1292 +#: tools/virsh.c:1304 msgid "" "Set link state of a domain's virtual interface. This command wraps usage of " "update-device command." msgstr "" -#: tools/virsh.c:1298 tools/virsh.c:1463 +#: tools/virsh.c:1310 tools/virsh.c:1475 msgid "interface device (MAC Address)" msgstr "" -#: tools/virsh.c:1299 +#: tools/virsh.c:1311 msgid "new state of the device" msgstr "" -#: tools/virsh.c:1300 +#: tools/virsh.c:1312 msgid "persist interface state" msgstr "" -#: tools/virsh.c:1337 +#: tools/virsh.c:1349 #, c-format msgid "invalid link state '%s'" msgstr "" -#: tools/virsh.c:1344 tools/virsh.c:1500 +#: tools/virsh.c:1356 tools/virsh.c:1512 msgid "Failed to get domain description xml" msgstr "" -#: tools/virsh.c:1360 tools/virsh.c:1507 +#: tools/virsh.c:1372 tools/virsh.c:1519 msgid "Failed to parse domain description xml" msgstr "" -#: tools/virsh.c:1367 tools/virsh.c:1514 +#: tools/virsh.c:1379 tools/virsh.c:1526 msgid "Failed to extract interface information or no interfaces found" msgstr "" -#: tools/virsh.c:1390 +#: tools/virsh.c:1402 #, c-format msgid "interface with address '%s' not found" msgstr "" -#: tools/virsh.c:5485 tools/virsh.c:5544 tools/virsh.c:6595 tools/virsh.c:6864 +#: 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.c:6600 tools/virsh.c:6869 +#: tools/virsh.c:1441 tools/virsh.c:12602 tools/virsh.c:13065 msgid "Failed to create XML" msgstr "创建XML失败" -#: tools/virsh.c:1434 +#: tools/virsh.c:1446 msgid "Failed to update interface link state" msgstr "" -#: tools/virsh.c:1437 tools/virsh.c:11219 +#: tools/virsh.c:1449 tools/virsh.c:12292 msgid "Device updated successfully\n" msgstr "" -#: tools/virsh.c:1456 +#: tools/virsh.c:1468 msgid "get link state of a virtual interface" msgstr "" -#: tools/virsh.c:1457 +#: tools/virsh.c:1469 msgid "Get link state of a domain's virtual interface." msgstr "" -#: tools/virsh.c:1464 +#: tools/virsh.c:1476 msgid "Get persistent interface state" msgstr "" -#: tools/virsh.c:1537 +#: tools/virsh.c:1549 #, c-format msgid "Interface with address '%s' not found." msgstr "" -#: tools/virsh.c:891 +#: tools/virsh.c:1584 msgid "get memory statistics for a domain" msgstr "" -#: tools/virsh.c:892 +#: tools/virsh.c:1585 msgid "Get memory statistics for a runnng domain." msgstr "" -#: tools/virsh.c:917 +#: tools/virsh.c:1610 #, c-format msgid "Failed to get memory statistics for domain %s" msgstr "" -#: tools/virsh.c:1628 +#: tools/virsh.c:1640 msgid "domain block device size information" msgstr "" -#: tools/virsh.c:1629 +#: tools/virsh.c:1641 msgid "Get block device size info for a domain." msgstr "" -#: tools/virsh.c:4530 tools/virsh.c:5126 +#: tools/virsh.c:1675 tools/virsh.c:9466 tools/virsh.c:10376 msgid "Capacity:" msgstr "容量:" -#: tools/virsh.c:4533 tools/virsh.c:5129 +#: tools/virsh.c:1676 tools/virsh.c:9469 tools/virsh.c:10379 msgid "Allocation:" msgstr "分配:" -#: tools/virsh.c:1665 +#: tools/virsh.c:1677 msgid "Physical:" msgstr "" -#: tools/virsh.c:1675 +#: tools/virsh.c:1687 msgid "list all domain blocks" msgstr "" -#: tools/virsh.c:1676 +#: tools/virsh.c:1688 msgid "Get the names of block devices for a domain." msgstr "" -#: tools/virsh.c:1683 +#: tools/virsh.c:1695 msgid "get inactive rather than running configuration" msgstr "" -#: tools/virsh.c:1721 +#: tools/virsh.c:1733 msgid "Target" msgstr "" -#: tools/virsh.c:1721 +#: tools/virsh.c:1733 msgid "Source" msgstr "" -#: tools/virsh.c:945 +#: tools/virsh.c:1767 msgid "suspend a domain" msgstr "挂起一个域" -#: tools/virsh.c:946 +#: tools/virsh.c:1768 msgid "Suspend a running domain." msgstr "挂起一个运行的域。" -#: tools/virsh.c:969 +#: tools/virsh.c:1791 #, c-format msgid "Domain %s suspended\n" msgstr "域 %s 被挂起\n" -#: tools/virsh.c:971 +#: tools/virsh.c:1793 #, c-format msgid "Failed to suspend domain %s" msgstr "挂起 %s 域失败" -#: tools/virsh.c:983 +#: tools/virsh.c:1805 msgid "create a domain from an XML file" msgstr "从一个 XML 文件创建一个域" -#: tools/virsh.c:984 +#: tools/virsh.c:1806 msgid "Create a domain." msgstr "创建一个域" -#: tools/virsh.c:989 tools/virsh.c:1046 +#: tools/virsh.c:1811 tools/virsh.c:1874 msgid "file containing an XML domain description" msgstr "文件包括一个 XML 域描述" -#: tools/virsh.c:991 tools/virsh.c:1151 +#: tools/virsh.c:1813 tools/virsh.c:2096 msgid "attach to console after creation" msgstr "创建后附加到控制台" -#: tools/virsh.c:1803 tools/virsh.c:2086 +#: tools/virsh.c:1815 tools/virsh.c:2098 msgid "leave the guest paused after creation" msgstr "" -#: tools/virsh.c:1804 tools/virsh.c:2088 +#: tools/virsh.c:1816 tools/virsh.c:2100 msgid "automatically destroy the guest when virsh disconnects" msgstr "" -#: tools/virsh.c:1022 +#: tools/virsh.c:1850 #, c-format msgid "Domain %s created from %s\n" msgstr "域 %s 被创建(从 %s)\n" -#: tools/virsh.c:1030 +#: tools/virsh.c:1858 #, c-format msgid "Failed to create domain from %s" msgstr "从 %s 创建域失败" -#: tools/virsh.c:1040 +#: tools/virsh.c:1868 msgid "define (but don't start) a domain from an XML file" msgstr "从一个 XML 文件定义(但不开始)一个域" -#: tools/virsh.c:1041 +#: tools/virsh.c:1869 msgid "Define a domain." msgstr "定义一个域。" -#: tools/virsh.c:1073 +#: tools/virsh.c:1899 #, c-format msgid "Domain %s defined from %s\n" msgstr "定义域 %s(从 %s)\n" -#: tools/virsh.c:1077 +#: tools/virsh.c:1903 #, c-format msgid "Failed to define domain from %s" msgstr "从 %s 定义域失败" -#: tools/virsh.c:1901 +#: tools/virsh.c:1913 msgid "undefine a domain" msgstr "" -#: tools/virsh.c:1903 +#: tools/virsh.c:1915 msgid "Undefine an inactive domain, or convert persistent to transient." msgstr "" -#: tools/virsh.c:1093 tools/virsh.c:2467 +#: tools/virsh.c:1920 tools/virsh.c:5513 msgid "domain name or uuid" msgstr "域名或 uuid" -#: tools/virsh.c:1909 +#: tools/virsh.c:1921 msgid "remove domain managed state file" msgstr "" -#: tools/virsh.c:1911 +#: tools/virsh.c:1923 msgid "remove all domain snapshot metadata, if inactive" msgstr "" -#: tools/virsh.c:2048 +#: tools/virsh.c:2060 #, c-format msgid "Unable to remove metadata of %d snapshots" msgstr "" -#: tools/virsh.c:2049 +#: tools/virsh.c:2061 #, c-format msgid "Refusing to undefine while %d snapshots exist" msgstr "" -#: tools/virsh.c:1128 +#: tools/virsh.c:2070 #, c-format msgid "Domain %s has been undefined\n" msgstr "域 %s 已经被取消定义\n" -#: tools/virsh.c:1130 +#: tools/virsh.c:2073 #, c-format msgid "Failed to undefine domain %s" msgstr "取消定义域 %s 失败" -#: tools/virsh.c:1143 +#: tools/virsh.c:2086 msgid "start a (previously defined) inactive domain" msgstr "开始一个(以前定义的)非活跃的域" -#: tools/virsh.c:2075 +#: 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" " is present." msgstr "" -#: tools/virsh.c:1149 +#: tools/virsh.c:2094 msgid "name of the inactive domain" msgstr "非活跃域的名称" -#: tools/virsh.c:2090 +#: tools/virsh.c:2102 msgid "avoid file system cache when loading" msgstr "" -#: tools/virsh.c:2092 +#: tools/virsh.c:2104 msgid "force fresh boot by discarding any managed save" msgstr "" -#: tools/virsh.c:1172 +#: tools/virsh.c:2127 msgid "Domain is already active" msgstr "域已经活跃" -#: tools/virsh.c:1185 +#: tools/virsh.c:2169 #, c-format msgid "Failed to start domain %s" msgstr "开始域 %s 失败" -#: tools/virsh.c:1178 +#: tools/virsh.c:2174 #, c-format msgid "Domain %s started\n" msgstr "域 %s 已开始\n" -#: tools/virsh.c:1196 +#: tools/virsh.c:2192 msgid "save a domain state to a file" msgstr "把一个域的状态保存到一个文件" -#: tools/virsh.c:2181 +#: tools/virsh.c:2193 msgid "Save the RAM state of a running domain." msgstr "" -#: tools/virsh.c:2186 tools/virsh.c:2460 tools/virsh.c:2891 +#: tools/virsh.c:2198 tools/virsh.c:2472 tools/virsh.c:2903 msgid "avoid file system cache when saving" msgstr "" -#: tools/virsh.c:1203 +#: tools/virsh.c:2200 msgid "where to save the data" msgstr "数据存到什么地方" -#: tools/virsh.c:2190 tools/virsh.c:2305 tools/virsh.c:2826 tools/virsh.c:5498 +#: 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 "" -#: tools/virsh.c:2191 tools/virsh.c:2306 tools/virsh.c:2363 +#: tools/virsh.c:2203 tools/virsh.c:2318 tools/virsh.c:2375 msgid "set domain to be running on restore" msgstr "" -#: tools/virsh.c:2192 tools/virsh.c:2307 tools/virsh.c:2364 +#: tools/virsh.c:2204 tools/virsh.c:2319 tools/virsh.c:2376 msgid "set domain to be paused on restore" msgstr "" -#: tools/virsh.c:2221 tools/virsh.c:2855 tools/virsh.c:5543 +#: tools/virsh.c:2233 tools/virsh.c:2867 tools/virsh.c:5645 msgid "malformed xml argument" msgstr "" -#: tools/virsh.c:1227 +#: tools/virsh.c:2247 #, c-format msgid "Failed to save domain %s to %s" msgstr "把域 %s 存到 %s 失败" -#: tools/virsh.c:1225 +#: tools/virsh.c:2251 #, c-format msgid "Domain %s saved to %s\n" msgstr "域 %s 被存到 %s\n" -#: tools/virsh.c:2252 +#: tools/virsh.c:2264 msgid "saved state domain information in XML" msgstr "" -#: tools/virsh.c:2253 +#: tools/virsh.c:2265 msgid "" "Output the domain information for a saved state file,\n" "as an XML dump to stdout." msgstr "" -#: tools/virsh.c:2259 +#: tools/virsh.c:2271 msgid "saved state file to read" msgstr "" -#: tools/virsh.c:2298 +#: 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.c:2297 +#: tools/virsh.c:2309 msgid "redefine the XML for a domain's saved state file" msgstr "" -#: tools/virsh.c:2298 +#: tools/virsh.c:2310 msgid "Replace the domain XML associated with a saved state file" msgstr "" -#: tools/virsh.c:2303 +#: tools/virsh.c:2315 msgid "saved state file to modify" msgstr "" -#: tools/virsh.c:2332 +#: tools/virsh.c:2344 msgid "malformed or missing xml argument" msgstr "" -#: tools/virsh.c:2340 tools/virsh.c:2430 tools/virsh.c:13050 +#: tools/virsh.c:2352 tools/virsh.c:2442 tools/virsh.c:14129 #, c-format msgid "Failed to update %s" msgstr "" -#: tools/virsh.c:2344 +#: tools/virsh.c:2356 #, c-format msgid "State file %s updated.\n" msgstr "" -#: tools/virsh.c:2356 +#: tools/virsh.c:2368 msgid "edit XML for a domain's saved state file" msgstr "" -#: tools/virsh.c:2357 +#: tools/virsh.c:2369 msgid "Edit the domain XML associated with a saved state file" msgstr "" -#: tools/virsh.c:2362 +#: tools/virsh.c:2374 msgid "saved state file to edit" msgstr "" -#: tools/virsh.c:2389 +#: tools/virsh.c:2401 msgid "--running and --saved are mutually exclusive" msgstr "" -#: tools/virsh.c:2421 +#: tools/virsh.c:2433 #, c-format msgid "Saved image %s XML configuration not changed.\n" msgstr "" -#: tools/virsh.c:2434 +#: tools/virsh.c:2446 #, c-format msgid "State file %s edited.\n" msgstr "" -#: tools/virsh.c:2451 +#: tools/virsh.c:2463 msgid "managed save of a domain state" msgstr "" -#: tools/virsh.c:2452 +#: 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" @@ -19166,872 +19832,873 @@ " be started from this saved state." msgstr "" -#: tools/virsh.c:2462 +#: tools/virsh.c:2474 msgid "set domain to be running on next start" msgstr "" -#: tools/virsh.c:2463 +#: tools/virsh.c:2475 msgid "set domain to be paused on next start" msgstr "" -#: tools/virsh.c:2489 +#: tools/virsh.c:2501 #, c-format msgid "Failed to save domain %s state" msgstr "" -#: tools/virsh.c:2493 +#: tools/virsh.c:2505 #, c-format msgid "Domain %s state saved by libvirt\n" msgstr "" -#: tools/virsh.c:2505 +#: tools/virsh.c:2517 msgid "Remove managed save of a domain" msgstr "" -#: tools/virsh.c:2506 +#: tools/virsh.c:2518 msgid "Remove an existing managed save state file from a domain" msgstr "" -#: tools/virsh.c:2531 +#: tools/virsh.c:2543 msgid "Failed to check for domain managed save image" msgstr "" -#: tools/virsh.c:2537 +#: tools/virsh.c:2549 #, c-format msgid "Failed to remove managed save image for domain %s" msgstr "" -#: tools/virsh.c:2542 +#: tools/virsh.c:2554 #, c-format msgid "Removed managedsave image for domain %s" msgstr "" -#: tools/virsh.c:2545 +#: tools/virsh.c:2557 #, c-format msgid "Domain %s has no manage save image; removal skipped" msgstr "" -#: tools/virsh.c:1239 +#: tools/virsh.c:2571 msgid "show/set scheduler parameters" msgstr "显示/设置日程安排变量" -#: tools/virsh.c:1240 +#: tools/virsh.c:2572 msgid "Show/Set scheduler parameters." msgstr "显示/设置日程安排变量" -#: tools/virsh.c:1246 +#: tools/virsh.c:2578 msgid "parameter=value" msgstr "parameter=value" -#: tools/virsh.c:1247 +#: tools/virsh.c:2579 msgid "weight for XEN_CREDIT" msgstr "XEN_CREDIT 重量" -#: tools/virsh.c:1248 +#: tools/virsh.c:2580 msgid "cap for XEN_CREDIT" msgstr "XEN_CREDIT的cap" -#: tools/virsh.c:2569 +#: tools/virsh.c:2581 msgid "get/set current scheduler info" msgstr "" -#: tools/virsh.c:2570 +#: tools/virsh.c:2582 msgid "get/set value to be used on next boot" msgstr "" -#: tools/virsh.c:2571 +#: tools/virsh.c:2583 msgid "get/set value from running domain" msgstr "" -#: tools/virsh.c:1266 +#: tools/virsh.c:2599 msgid "Invalid value of weight" msgstr "无效的重量值" -#: tools/virsh.c:1281 +#: tools/virsh.c:2613 msgid "Invalid value of cap" msgstr "无效的容量值" -#: tools/virsh.c:1293 +#: tools/virsh.c:2625 msgid "Invalid syntax for --set, expecting name=value" msgstr "" -#: tools/virsh.c:1308 +#: tools/virsh.c:2640 msgid "Invalid value for parameter, expecting an int" msgstr "" -#: tools/virsh.c:1315 +#: tools/virsh.c:2647 msgid "Invalid value for parameter, expecting an unsigned int" msgstr "" -#: tools/virsh.c:2642 +#: tools/virsh.c:2654 msgid "Invalid value for parameter, expecting a long long" msgstr "" -#: tools/virsh.c:1329 +#: tools/virsh.c:2661 msgid "Invalid value for parameter, expecting an unsigned long long" msgstr "" -#: tools/virsh.c:1335 +#: tools/virsh.c:2667 msgid "Invalid value for parameter, expecting a double" msgstr "" -#: tools/virsh.c:2686 tools/virsh.c:4053 tools/virsh.c:4286 tools/virsh.c:4500 -#: tools/virsh.c:4589 tools/virsh.c:4674 tools/virsh.c:4830 +#: 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 "" -#: tools/virsh.c:1369 tools/virsh.c:1373 +#: tools/virsh.c:2718 tools/virsh.c:2722 msgid "Scheduler" msgstr "调度程序" -#: tools/virsh.c:1373 +#: tools/virsh.c:2722 msgid "Unknown" msgstr "未知" -#: tools/virsh.c:2767 +#: tools/virsh.c:2779 #, c-format msgid "invalid scheduler option: %s" msgstr "" -#: tools/virsh.c:2774 +#: tools/virsh.c:2786 msgid "cannot query both live and config at once" msgstr "" -#: tools/virsh.c:1445 +#: tools/virsh.c:2828 msgid "restore a domain from a saved state in a file" msgstr "从一个存在一个文件中的状态恢复一个域" -#: tools/virsh.c:1446 +#: tools/virsh.c:2829 msgid "Restore a domain." msgstr "恢复一个域。" -#: tools/virsh.c:1451 +#: tools/virsh.c:2834 msgid "the state to restore" msgstr "恢复的状态" -#: tools/virsh.c:2824 +#: tools/virsh.c:2836 msgid "avoid file system cache when restoring" msgstr "" -#: tools/virsh.c:2827 +#: tools/virsh.c:2839 msgid "restore domain into running state" msgstr "" -#: tools/virsh.c:2828 +#: tools/virsh.c:2840 msgid "restore domain into paused state" msgstr "" -#: tools/virsh.c:1472 +#: tools/virsh.c:2878 #, c-format msgid "Failed to restore domain from %s" msgstr "从 %s 恢复域失败" -#: tools/virsh.c:1470 +#: tools/virsh.c:2882 #, c-format msgid "Domain restored from %s\n" msgstr "从 %s 恢复域\n" -#: tools/virsh.c:1482 +#: tools/virsh.c:2894 msgid "dump the core of a domain to a file for analysis" msgstr "把一个域的内核 dump 到一个文件中以方便分析" -#: tools/virsh.c:1483 +#: tools/virsh.c:2895 msgid "Core dump a domain." msgstr "内核 dump 一个域。" -#: tools/virsh.c:1488 +#: tools/virsh.c:2900 msgid "perform a live core dump if supported" msgstr "" -#: tools/virsh.c:1489 +#: tools/virsh.c:2901 msgid "crash the domain after core dump" msgstr "" -#: tools/virsh.c:2892 +#: tools/virsh.c:2904 msgid "reset the domain after core dump" msgstr "" -#: tools/virsh.c:1491 +#: tools/virsh.c:2906 msgid "where to dump the core" msgstr "内核 dump 到什么地方" -#: tools/virsh.c:1521 +#: tools/virsh.c:2938 #, c-format msgid "Failed to core dump domain %s to %s" msgstr "将域 %s 核转储到 %s 失败" -#: tools/virsh.c:1519 +#: tools/virsh.c:2942 #, c-format msgid "Domain %s dumped to %s\n" msgstr "将域 %s 转储到 %s\n" -#: tools/virsh.c:2939 +#: tools/virsh.c:2951 msgid "" "take a screenshot of a current domain console and store it into a file" msgstr "" -#: tools/virsh.c:2941 +#: tools/virsh.c:2953 msgid "screenshot of a current domain console" msgstr "" -#: tools/virsh.c:2947 +#: tools/virsh.c:2959 msgid "where to store the screenshot" msgstr "" -#: tools/virsh.c:2948 +#: tools/virsh.c:2960 msgid "ID of a screen to take screenshot of" msgstr "" -#: tools/virsh.c:2978 +#: tools/virsh.c:2990 msgid "Invalid domain supplied" msgstr "" -#: tools/virsh.c:3020 tools/virsh.c:9287 tools/virsh.c:9378 +#: tools/virsh.c:3032 tools/virsh.c:10102 tools/virsh.c:10193 msgid "file must not be empty" msgstr "" -#: tools/virsh.c:3025 +#: tools/virsh.c:3037 msgid "invalid screen ID" msgstr "" -#: tools/virsh.c:3036 +#: tools/virsh.c:3048 #, c-format msgid "could not take a screenshot of %s" msgstr "" -#: tools/virsh.c:3049 +#: tools/virsh.c:3061 #, c-format msgid "cannot create file %s" msgstr "" -#: tools/virsh.c:3057 +#: tools/virsh.c:3069 #, c-format msgid "could not receive data from domain %s" msgstr "" -#: tools/virsh.c:3062 tools/virsh.c:9308 tools/virsh.c:9404 +#: tools/virsh.c:3074 tools/virsh.c:10123 tools/virsh.c:10219 #, c-format msgid "cannot close file %s" msgstr "" -#: tools/virsh.c:3067 +#: tools/virsh.c:3079 #, c-format msgid "cannot close stream on domain %s" msgstr "" -#: tools/virsh.c:3071 +#: tools/virsh.c:3083 #, c-format msgid "Screenshot saved to %s, with type of %s" msgstr "" -#: tools/virsh.c:1533 +#: tools/virsh.c:3102 msgid "resume a domain" msgstr "重新恢复一个域" -#: tools/virsh.c:1534 +#: tools/virsh.c:3103 msgid "Resume a previously suspended domain." msgstr "重新恢复一个以前被挂起的域。" -#: tools/virsh.c:1557 +#: tools/virsh.c:3126 #, c-format msgid "Domain %s resumed\n" msgstr "域 %s 被重新恢复\n" -#: tools/virsh.c:1559 +#: tools/virsh.c:3128 #, c-format msgid "Failed to resume domain %s" msgstr "恢复域 %s 失败" -#: tools/virsh.c:1571 +#: tools/virsh.c:3140 msgid "gracefully shutdown a domain" msgstr "关闭一个域" -#: tools/virsh.c:1572 +#: tools/virsh.c:3141 msgid "Run shutdown in the target domain." msgstr "在目标域中执行关闭行为。" -#: tools/virsh.c:1595 +#: tools/virsh.c:3164 #, c-format msgid "Domain %s is being shutdown\n" msgstr "域 %s 被关闭\n" -#: tools/virsh.c:1597 +#: tools/virsh.c:3166 #, c-format msgid "Failed to shutdown domain %s" msgstr "关闭域 %s 失败" -#: tools/virsh.c:1609 +#: tools/virsh.c:3178 msgid "reboot a domain" msgstr "重新启动一个域" -#: tools/virsh.c:1610 +#: tools/virsh.c:3179 msgid "Run a reboot command in the target domain." msgstr "在目标域中执行重新启动命令。" -#: tools/virsh.c:1633 +#: tools/virsh.c:3202 #, c-format msgid "Domain %s is being rebooted\n" msgstr "域 %s 正在被重新启动\n" -#: tools/virsh.c:1635 +#: tools/virsh.c:3204 #, c-format msgid "Failed to reboot domain %s" msgstr "重新启动域 %s 失败" -#: tools/virsh.c:3204 +#: tools/virsh.c:3216 msgid "reset a domain" msgstr "" -#: tools/virsh.c:3205 +#: tools/virsh.c:3217 msgid "Reset the target domain as if by power button" msgstr "" -#: tools/virsh.c:3228 +#: tools/virsh.c:3240 #, c-format msgid "Domain %s was reset\n" msgstr "" -#: tools/virsh.c:3230 +#: tools/virsh.c:3242 #, c-format msgid "Failed to reset domain %s" msgstr "" -#: tools/virsh.c:3242 +#: tools/virsh.c:3254 msgid "destroy (stop) a domain" msgstr "" -#: tools/virsh.c:3244 +#: tools/virsh.c:3256 msgid "Forcefully stop a given domain, but leave its resources intact." msgstr "" -#: tools/virsh.c:1671 +#: tools/virsh.c:3279 #, c-format msgid "Domain %s destroyed\n" msgstr "域 %s 被删除\n" -#: tools/virsh.c:1673 +#: tools/virsh.c:3281 #, c-format msgid "Failed to destroy domain %s" msgstr "删除域 %s 失败" -#: tools/virsh.c:1685 +#: tools/virsh.c:3293 msgid "domain information" msgstr "域信息" -#: tools/virsh.c:1686 +#: tools/virsh.c:3294 msgid "Returns basic information about the domain." msgstr "返回这个域的基本信息。" -#: tools/virsh.c:1714 tools/virsh.c:1716 +#: tools/virsh.c:3325 tools/virsh.c:3327 msgid "Id:" msgstr "Id:" -#: tools/virsh.c:1717 tools/virsh.c:4500 tools/virsh.c:5116 +#: tools/virsh.c:3328 tools/virsh.c:9414 tools/virsh.c:10353 msgid "Name:" msgstr "名称:" -#: tools/virsh.c:1720 tools/virsh.c:4503 +#: tools/virsh.c:3331 tools/virsh.c:9417 msgid "UUID:" msgstr "UUID:" -#: tools/virsh.c:1723 +#: tools/virsh.c:3334 msgid "OS Type:" msgstr "OS 类型:" -#: tools/virsh.c:1728 tools/virsh.c:1886 tools/virsh.c:4510 tools/virsh.c:4514 -#: tools/virsh.c:4518 tools/virsh.c:4522 +#: 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.c:1731 tools/virsh.c:2248 +#: tools/virsh.c:3342 tools/virsh.c:5037 msgid "CPU(s):" msgstr "CPU:" -#: tools/virsh.c:1738 tools/virsh.c:1893 +#: tools/virsh.c:3349 tools/virsh.c:3976 msgid "CPU time:" msgstr "CPU 时间:" -#: tools/virsh.c:1742 tools/virsh.c:1745 +#: tools/virsh.c:3353 tools/virsh.c:3356 msgid "Max memory:" msgstr "最大内存:" -#: tools/virsh.c:1746 +#: tools/virsh.c:3357 msgid "no limit" msgstr "没有限制" -#: tools/virsh.c:1748 +#: tools/virsh.c:3359 msgid "Used memory:" msgstr "使用的内存:" -#: tools/virsh.c:3359 tools/virsh.c:3361 tools/virsh.c:6288 tools/virsh.c:6290 -#: tools/virsh.c:8635 tools/virsh.c:8637 +#: 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.c:3359 tools/virsh.c:3371 tools/virsh.c:6288 tools/virsh.c:8159 -#: tools/virsh.c:8174 tools/virsh.c:8176 tools/virsh.c:8177 tools/virsh.c:8178 -#: tools/virsh.c:8635 tools/virsh.c:9557 tools/virsh.c:9699 tools/virsh.c:9706 -#: tools/virsh.c:9707 tools/virsh.c:9708 tools/virsh.c:9724 -#: tools/virsh.c:15766 tools/virsh.c:15846 +#: 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.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290 -#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151 -#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646 -#: tools/virsh.c:15800 +#: 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:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290 -#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151 -#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646 -#: tools/virsh.c:15800 +#: 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:1756 +#: 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.c:1757 +#: tools/virsh.c:3378 msgid "enable" msgstr "启用" -#: tools/virsh.c:1757 +#: tools/virsh.c:3378 msgid "disable" msgstr "禁用" -#: tools/virsh.c:3371 tools/virsh.c:3373 +#: tools/virsh.c:3383 tools/virsh.c:3385 msgid "Managed save:" msgstr "" -#: tools/virsh.c:1770 +#: tools/virsh.c:3401 msgid "Security model:" msgstr "安全性模式:" -#: tools/virsh.c:1771 +#: tools/virsh.c:3402 msgid "Security DOI:" msgstr "安全性 DOI:" -#: tools/virsh.c:1780 +#: tools/virsh.c:3416 msgid "Security label:" msgstr "安全性标签:" -#: tools/virsh.c:3419 +#: tools/virsh.c:3431 msgid "domain job information" msgstr "" -#: tools/virsh.c:3420 +#: tools/virsh.c:3432 msgid "Returns information about jobs running on a domain." msgstr "" -#: tools/virsh.c:3447 +#: tools/virsh.c:3459 msgid "Job type:" msgstr "" -#: tools/virsh.c:3450 +#: tools/virsh.c:3462 msgid "Bounded" msgstr "" -#: tools/virsh.c:3454 +#: tools/virsh.c:3466 msgid "Unbounded" msgstr "" -#: tools/virsh.c:3459 +#: tools/virsh.c:3471 msgid "None" msgstr "" -#: tools/virsh.c:3463 +#: tools/virsh.c:3475 msgid "Time elapsed:" msgstr "" -#: tools/virsh.c:3465 +#: tools/virsh.c:3477 msgid "Time remaining:" msgstr "" -#: tools/virsh.c:3468 +#: tools/virsh.c:3480 msgid "Data processed:" msgstr "" -#: tools/virsh.c:3470 +#: tools/virsh.c:3482 msgid "Data remaining:" msgstr "" -#: tools/virsh.c:3472 +#: tools/virsh.c:3484 msgid "Data total:" msgstr "" -#: tools/virsh.c:3476 +#: tools/virsh.c:3488 msgid "Memory processed:" msgstr "" -#: tools/virsh.c:3478 +#: tools/virsh.c:3490 msgid "Memory remaining:" msgstr "" -#: tools/virsh.c:3480 +#: tools/virsh.c:3492 msgid "Memory total:" msgstr "" -#: tools/virsh.c:3484 +#: tools/virsh.c:3496 msgid "File processed:" msgstr "" -#: tools/virsh.c:3486 +#: tools/virsh.c:3498 msgid "File remaining:" msgstr "" -#: tools/virsh.c:3488 +#: tools/virsh.c:3500 msgid "File total:" msgstr "" -#: tools/virsh.c:3502 +#: tools/virsh.c:3514 msgid "abort active domain job" msgstr "" -#: tools/virsh.c:3503 +#: tools/virsh.c:3515 msgid "Aborts the currently running domain job" msgstr "" -#: tools/virsh.c:1793 +#: tools/virsh.c:3547 msgid "NUMA free memory" msgstr "NUMA可用内存" -#: tools/virsh.c:1794 +#: tools/virsh.c:3548 msgid "display available free memory for the NUMA cell." msgstr "显示可用的NUMA单元空闲内存" -#: tools/virsh.c:1799 +#: tools/virsh.c:3553 msgid "NUMA cell number" msgstr "NUMA 单元 数" -#: tools/virsh.c:3542 +#: tools/virsh.c:3554 msgid "show free memory for all NUMA cells" msgstr "" -#: tools/virsh.c:3568 +#: tools/virsh.c:3580 msgid "cell number has to be a number" msgstr "" -#: tools/virsh.c:3574 +#: tools/virsh.c:3586 msgid "--cellno and --all are mutually exclusive. Please choose only one." msgstr "" -#: tools/virsh.c:3582 tools/virsh.c:3588 +#: tools/virsh.c:3594 tools/virsh.c:3600 msgid "unable to get node capabilities" msgstr "" -#: tools/virsh.c:3586 +#: tools/virsh.c:3598 msgid "(capabilities)" msgstr "" -#: tools/virsh.c:3595 +#: tools/virsh.c:3607 msgid "could not get information about NUMA topology" msgstr "" -#: tools/virsh.c:3607 +#: tools/virsh.c:3619 msgid "conversion from string failed" msgstr "" -#: tools/virsh.c:3615 +#: tools/virsh.c:3627 #, c-format msgid "failed to get free memory for NUMA node number: %lu" msgstr "" -#: tools/virsh.c:1825 +#: tools/virsh.c:3641 tools/virsh.c:3654 msgid "Total" msgstr "总量" -#: tools/virsh.c:3663 +#: tools/virsh.c:3675 msgid "connection vcpu maximum" msgstr "" -#: tools/virsh.c:3664 +#: tools/virsh.c:3676 msgid "Show maximum number of virtual CPUs for guests on this connection." msgstr "" -#: tools/virsh.c:3669 +#: tools/virsh.c:3681 msgid "domain type" msgstr "" -#: tools/virsh.c:3680 +#: tools/virsh.c:3692 msgid "Invalid type" msgstr "" -#: tools/virsh.c:3699 +#: tools/virsh.c:3711 msgid "domain vcpu counts" msgstr "" -#: tools/virsh.c:3700 +#: tools/virsh.c:3712 msgid "Returns the number of virtual CPUs used by the domain." msgstr "" -#: tools/virsh.c:3706 +#: tools/virsh.c:3718 msgid "get maximum cap on vcpus" msgstr "" -#: tools/virsh.c:3707 +#: tools/virsh.c:3719 msgid "get number of currently active vcpus" msgstr "" -#: tools/virsh.c:3708 +#: tools/virsh.c:3720 msgid "get value from running domain" msgstr "" -#: tools/virsh.c:3709 +#: tools/virsh.c:3721 msgid "get value to be used on next boot" msgstr "" -#: tools/virsh.c:3711 +#: tools/virsh.c:3723 msgid "get value according to current domain state" msgstr "" -#: tools/virsh.c:3734 +#: tools/virsh.c:3746 #, c-format msgid "" "when using --%s, one of --config, --live, or --current must be specified" msgstr "" -#: tools/virsh.c:3739 +#: tools/virsh.c:3751 #, c-format msgid "when using --%s, either --maximum or --active must be specified" msgstr "" -#: tools/virsh.c:3759 +#: tools/virsh.c:3771 msgid "--maximum and --active cannot both be specified" msgstr "" -#: tools/virsh.c:3764 +#: tools/virsh.c:3776 msgid "--config, --live, and --current are mutually exclusive" msgstr "" -#: tools/virsh.c:3810 tools/virsh.c:3831 +#: tools/virsh.c:3822 tools/virsh.c:3843 msgid "maximum" msgstr "" -#: tools/virsh.c:3810 tools/virsh.c:3868 +#: tools/virsh.c:3822 tools/virsh.c:3880 msgid "config" msgstr "config" -#: tools/virsh.c:3831 tools/virsh.c:3890 +#: tools/virsh.c:3843 tools/virsh.c:3902 msgid "live" msgstr "" -#: tools/virsh.c:3868 tools/virsh.c:3890 +#: tools/virsh.c:3880 tools/virsh.c:3902 msgid "current" msgstr "" -#: tools/virsh.c:3907 +#: tools/virsh.c:3919 msgid "detailed domain vcpu information" msgstr "" -#: tools/virsh.c:1837 +#: tools/virsh.c:3920 msgid "Returns basic information about the domain virtual CPUs." msgstr "恢复这个域虚拟 CPU 的基本信息。" -#: tools/virsh.c:1884 +#: tools/virsh.c:3967 tools/virsh.c:3996 tools/virsh.c:4131 msgid "VCPU:" msgstr "VCPU:" -#: tools/virsh.c:1885 +#: tools/virsh.c:3968 tools/virsh.c:3997 msgid "CPU:" msgstr "CPU:" -#: tools/virsh.c:1895 +#: tools/virsh.c:3978 tools/virsh.c:4000 msgid "CPU Affinity:" msgstr "CPU关系:" -#: tools/virsh.c:3985 tools/virsh.c:3986 tools/virsh.c:3987 +#: tools/virsh.c:3997 tools/virsh.c:3998 tools/virsh.c:3999 msgid "N/A" msgstr "" -#: tools/virsh.c:3987 +#: tools/virsh.c:3999 msgid "CPU time" msgstr "" -#: tools/virsh.c:4013 +#: tools/virsh.c:4025 msgid "control or query domain vcpu affinity" msgstr "" -#: tools/virsh.c:1923 +#: tools/virsh.c:4026 msgid "Pin domain VCPUs to host physical CPUs." msgstr "把域 VCPU 插入到主机的物理 CPU 中。" -#: tools/virsh.c:1929 +#: tools/virsh.c:4032 msgid "vcpu number" msgstr "vcpu 号" -#: tools/virsh.c:4022 +#: tools/virsh.c:4034 msgid "host cpu number(s) to set, or omit option to query" msgstr "" -#: tools/virsh.c:4023 tools/virsh.c:4266 tools/virsh.c:4480 tools/virsh.c:4570 -#: tools/virsh.c:4651 tools/virsh.c:4807 +#: 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.c:4024 tools/virsh.c:4267 tools/virsh.c:4481 tools/virsh.c:4571 -#: tools/virsh.c:4652 tools/virsh.c:4808 +#: 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.c:4025 tools/virsh.c:4268 tools/virsh.c:4482 tools/virsh.c:4572 -#: tools/virsh.c:4653 tools/virsh.c:4809 +#: 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.c:4074 +#: tools/virsh.c:4086 msgid "vcpupin: Missing cpulist." msgstr "" -#: tools/virsh.c:1957 +#: tools/virsh.c:4095 msgid "vcpupin: Invalid or missing vCPU number." msgstr "vcpupin:无效或者丢失的 vCPU 号。" -#: tools/virsh.c:4094 +#: tools/virsh.c:4106 msgid "vcpupin: failed to get domain information." msgstr "" -#: tools/virsh.c:1980 +#: tools/virsh.c:4112 msgid "vcpupin: Invalid vCPU number." msgstr "vcpupin:无效 vCPU 号。" -#: tools/virsh.c:4119 +#: tools/virsh.c:4131 msgid "CPU Affinity" msgstr "" -#: tools/virsh.c:2036 +#: tools/virsh.c:4200 tools/virsh.c:4224 #, c-format msgid "Physical CPU %d doesn't exist." msgstr "物理 CPU %d 不存在." -#: tools/virsh.c:4248 +#: tools/virsh.c:4260 msgid "cpulist: Invalid format." msgstr "" -#: tools/virsh.c:2059 +#: tools/virsh.c:4269 msgid "change number of virtual CPUs" msgstr "改变虚拟 CPU 的号" -#: tools/virsh.c:2060 +#: tools/virsh.c:4270 msgid "Change the number of virtual CPUs in the guest domain." msgstr "在客户域中修改虚拟 CPU 号。" -#: tools/virsh.c:2066 +#: tools/virsh.c:4276 msgid "number of virtual CPUs" msgstr "虚拟 CPU 号" -#: tools/virsh.c:4265 +#: tools/virsh.c:4277 msgid "set maximum limit on next boot" msgstr "" -#: tools/virsh.c:4307 +#: tools/virsh.c:4319 msgid "Invalid number of virtual CPUs" msgstr "" -#: tools/virsh.c:4330 +#: tools/virsh.c:4342 msgid "--maximum must be used with --config only" msgstr "" -#: tools/virsh.c:4351 +#: tools/virsh.c:4363 msgid "Inject NMI to the guest" msgstr "" -#: tools/virsh.c:4352 +#: tools/virsh.c:4364 msgid "Inject NMI to the guest domain." msgstr "" -#: tools/virsh.c:4385 +#: tools/virsh.c:4397 msgid "Send keycodes to the guest" msgstr "" -#: tools/virsh.c:4386 +#: tools/virsh.c:4398 msgid "Send keycodes (integers or symbolic names) to the guest" msgstr "" -#: tools/virsh.c:4393 +#: tools/virsh.c:4405 msgid "the codeset of keycodes, default:linux" msgstr "" -#: tools/virsh.c:4395 +#: tools/virsh.c:4407 msgid "the time (in milliseconds) how long the keys will be held" msgstr "" -#: tools/virsh.c:4396 +#: tools/virsh.c:4408 msgid "the key code" msgstr "" -#: tools/virsh.c:4439 +#: tools/virsh.c:4451 #, c-format msgid "unknown codeset: '%s'" msgstr "" -#: tools/virsh.c:4445 +#: tools/virsh.c:4457 msgid "too many keycodes" msgstr "" -#: tools/virsh.c:4451 +#: tools/virsh.c:4463 #, c-format msgid "invalid keycode: '%s'" msgstr "" -#: tools/virsh.c:2115 +#: tools/virsh.c:4484 msgid "change memory allocation" msgstr "改变内存的分配" -#: tools/virsh.c:2116 +#: tools/virsh.c:4485 msgid "Change the current memory allocation in the guest domain." msgstr "改变当前在 guest 域中的内存分配。" -#: tools/virsh.c:2122 +#: tools/virsh.c:4491 msgid "number of kilobytes of memory" msgstr "内存的千字节数" -#: tools/virsh.c:4521 tools/virsh.c:4609 +#: tools/virsh.c:4533 tools/virsh.c:4621 msgid "memory size has to be a number" msgstr "" -#: tools/virsh.c:4527 +#: tools/virsh.c:4539 #, c-format msgid "Invalid value of %lu for memory size" msgstr "" -#: tools/virsh.c:2149 +#: tools/virsh.c:4545 msgid "Unable to verify MaxMemorySize" msgstr "不能查证最大内存大小" -#: tools/virsh.c:4539 +#: tools/virsh.c:4551 #, c-format msgid "Requested memory size %lu kb is larger than maximum of %lu kb" msgstr "" -#: tools/virsh.c:2171 +#: tools/virsh.c:4574 msgid "change maximum memory limit" msgstr "改变最大内存限制值" -#: tools/virsh.c:2172 +#: tools/virsh.c:4575 msgid "Change the maximum memory allocation limit in the guest domain." msgstr "改变在客户域中的最大内存分配限制。" -#: tools/virsh.c:2178 +#: tools/virsh.c:4581 msgid "maximum memory limit in kilobytes" msgstr "最大内存限制的千字节数" -#: tools/virsh.c:2143 tools/virsh.c:2155 tools/virsh.c:2199 +#: tools/virsh.c:4627 #, c-format msgid "Invalid value of %d for memory size" msgstr "内存大小 %d 值不可用" -#: tools/virsh.c:2218 +#: tools/virsh.c:4633 tools/virsh.c:4638 msgid "Unable to change MaxMemorySize" msgstr "不能改变最大内存大小" -#: tools/virsh.c:4639 +#: tools/virsh.c:4651 msgid "Get or set blkio parameters" msgstr "" -#: tools/virsh.c:4640 +#: 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" @@ -20039,36 +20706,45 @@ " virsh # blkiotune " msgstr "" -#: tools/virsh.c:4650 +#: tools/virsh.c:4662 msgid "IO Weight in range [100, 1000]" msgstr "" -#: tools/virsh.c:4693 tools/virsh.c:4852 +#: tools/virsh.c:4664 +msgid "per-device IO Weights, in the form of /path/to/device,weight,..." +msgstr "" + +#: 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.c:4700 +#: tools/virsh.c:4715 #, c-format msgid "Invalid value of %d for I/O weight" msgstr "" -#: tools/virsh.c:4709 +#: tools/virsh.c:4723 +msgid "Unable to parse string parameter" +msgstr "" + +#: tools/virsh.c:4734 msgid "Unable to get number of blkio parameters" msgstr "" -#: tools/virsh.c:4722 +#: tools/virsh.c:4747 msgid "Unable to get blkio parameters" msgstr "" -#: tools/virsh.c:4774 +#: tools/virsh.c:4810 msgid "Unable to change blkio parameters" msgstr "" -#: tools/virsh.c:4789 +#: tools/virsh.c:4828 msgid "Get or set memory parameters" msgstr "" -#: tools/virsh.c:4790 +#: 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" @@ -20076,2934 +20752,3310 @@ " virsh # memtune " msgstr "" -#: tools/virsh.c:4800 +#: tools/virsh.c:4839 msgid "Max memory in kilobytes" msgstr "" -#: tools/virsh.c:4802 +#: tools/virsh.c:4841 msgid "Memory during contention in kilobytes" msgstr "" -#: tools/virsh.c:4804 +#: tools/virsh.c:4843 msgid "Max memory plus swap in kilobytes" msgstr "" -#: tools/virsh.c:4806 +#: tools/virsh.c:4845 msgid "Min guaranteed memory in kilobytes" msgstr "" -#: tools/virsh.c:4872 +#: tools/virsh.c:4911 msgid "Unable to get number of memory parameters" msgstr "" -#: tools/virsh.c:4885 +#: tools/virsh.c:4924 msgid "Unable to get memory parameters" msgstr "" -#: tools/virsh.c:4965 +#: tools/virsh.c:5004 msgid "Unable to change memory parameters" msgstr "" -#: tools/virsh.c:2230 +#: tools/virsh.c:5019 msgid "node information" msgstr "节点信息" -#: tools/virsh.c:2231 +#: tools/virsh.c:5020 msgid "Returns basic information about the node." msgstr "返回关于这个节点的基本信息。" -#: tools/virsh.c:2244 +#: tools/virsh.c:5033 msgid "failed to get node information" msgstr "获得节点信息失败" -#: tools/virsh.c:2247 +#: tools/virsh.c:5036 msgid "CPU model:" msgstr "CPU 型号:" -#: tools/virsh.c:2249 +#: tools/virsh.c:5038 msgid "CPU frequency:" msgstr "CPU 频率:" -#: tools/virsh.c:2250 +#: tools/virsh.c:5039 msgid "CPU socket(s):" msgstr "CPU socket:" -#: tools/virsh.c:2251 +#: tools/virsh.c:5040 msgid "Core(s) per socket:" msgstr "每个 socket 的内核数:" -#: tools/virsh.c:2252 +#: tools/virsh.c:5041 msgid "Thread(s) per core:" msgstr "每个内核的线程数:" -#: tools/virsh.c:2253 +#: tools/virsh.c:5042 msgid "NUMA cell(s):" msgstr "NUMA 单元:" -#: tools/virsh.c:2254 +#: tools/virsh.c:5043 msgid "Memory size:" msgstr "内存大小:" -#: tools/virsh.c:5013 +#: tools/virsh.c:5052 msgid "Prints cpu stats of the node." msgstr "" -#: tools/virsh.c:5014 +#: tools/virsh.c:5053 msgid "Returns cpu stats of the node, in nanoseconds." msgstr "" -#: tools/virsh.c:5019 +#: tools/virsh.c:5058 msgid "prints specified cpu statistics only." msgstr "" -#: tools/virsh.c:5020 +#: tools/virsh.c:5059 msgid "prints by percentage during 1 second." msgstr "" -#: tools/virsh.c:5048 +#: tools/virsh.c:5087 msgid "Invalid value of cpuNum" msgstr "" -#: tools/virsh.c:5054 +#: tools/virsh.c:5093 msgid "Unable to get number of cpu stats" msgstr "" -#: tools/virsh.c:5068 +#: tools/virsh.c:5107 msgid "Unable to get node cpu stats" msgstr "" -#: tools/virsh.c:5098 tools/virsh.c:5121 +#: tools/virsh.c:5137 tools/virsh.c:5160 msgid "user:" msgstr "" -#: tools/virsh.c:5099 tools/virsh.c:5123 +#: tools/virsh.c:5138 tools/virsh.c:5162 msgid "system:" msgstr "" -#: tools/virsh.c:5100 tools/virsh.c:5108 tools/virsh.c:5125 +#: tools/virsh.c:5139 tools/virsh.c:5147 tools/virsh.c:5164 msgid "idle:" msgstr "" -#: tools/virsh.c:5101 tools/virsh.c:5127 +#: tools/virsh.c:5140 tools/virsh.c:5166 msgid "iowait:" msgstr "" -#: tools/virsh.c:5107 tools/virsh.c:5119 +#: tools/virsh.c:5146 tools/virsh.c:5158 msgid "usage:" msgstr "" -#: tools/virsh.c:5142 +#: tools/virsh.c:5181 msgid "Prints memory stats of the node." msgstr "" -#: tools/virsh.c:5143 +#: tools/virsh.c:5182 msgid "Returns memory stats of the node, in kilobytes." msgstr "" -#: tools/virsh.c:5148 +#: tools/virsh.c:5187 msgid "prints specified cell statistics only." msgstr "" -#: tools/virsh.c:5165 +#: tools/virsh.c:5204 msgid "Invalid value of cellNum" msgstr "" -#: tools/virsh.c:5172 +#: tools/virsh.c:5211 msgid "Unable to get number of memory stats" msgstr "" -#: tools/virsh.c:5185 +#: tools/virsh.c:5224 msgid "Unable to get memory stats" msgstr "" -#: tools/virsh.c:2263 +#: tools/virsh.c:5242 +msgid "suspend the host node for a given time duration" +msgstr "" + +#: tools/virsh.c:5243 +msgid "" +"Suspend the host node for a given time duration and attempt to resume " +"thereafter." +msgstr "" + +#: tools/virsh.c:5249 +msgid "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)" +msgstr "" + +#: tools/virsh.c:5251 +msgid "Suspend duration in seconds" +msgstr "" + +#: tools/virsh.c:5252 +msgid "Suspend flags, 0 for default" +msgstr "" + +#: tools/virsh.c:5283 +msgid "Invalid target" +msgstr "" + +#: tools/virsh.c:5288 +msgid "Invalid duration" +msgstr "" + +#: tools/virsh.c:5294 +msgid "The host was not suspended" +msgstr "" + +#: tools/virsh.c:5305 msgid "capabilities" msgstr "性能" -#: tools/virsh.c:2264 +#: tools/virsh.c:5306 msgid "Returns capabilities of hypervisor/driver." msgstr "返回 管理程序/驱动器性能." -#: tools/virsh.c:2277 +#: tools/virsh.c:5319 msgid "failed to get capabilities" msgstr "获得性能失败" -#: tools/virsh.c:2290 +#: tools/virsh.c:5332 msgid "domain information in XML" msgstr "XML 中的域信息" -#: tools/virsh.c:2291 +#: tools/virsh.c:5333 msgid "Output the domain information as an XML dump to stdout." msgstr "把域信息作为一个 XML 输出到 stdout。" -#: tools/virsh.c:2297 tools/virsh.c:3405 +#: tools/virsh.c:5339 tools/virsh.c:7262 msgid "show inactive defined XML" msgstr "显示不活跃定义的 XML" -#: tools/virsh.c:5239 +#: tools/virsh.c:5341 msgid "update guest CPU according to host CPU" msgstr "" -#: tools/virsh.c:2339 +#: tools/virsh.c:5385 msgid "Convert native config to domain XML" msgstr "" -#: tools/virsh.c:2340 +#: tools/virsh.c:5386 msgid "Convert native guest configuration format to domain XML format." msgstr "" -#: tools/virsh.c:2345 +#: tools/virsh.c:5391 msgid "source config data format" msgstr "" -#: tools/virsh.c:2346 +#: tools/virsh.c:5392 msgid "config data file to import from" msgstr "" -#: tools/virsh.c:2385 +#: tools/virsh.c:5431 msgid "Convert domain XML to native config" msgstr "" -#: tools/virsh.c:2386 +#: tools/virsh.c:5432 msgid "Convert domain XML config to a native guest configuration format." msgstr "" -#: tools/virsh.c:2391 +#: tools/virsh.c:5437 msgid "target config data type format" msgstr "" -#: tools/virsh.c:2392 +#: tools/virsh.c:5438 msgid "xml data file to export from" msgstr "" -#: tools/virsh.c:2431 +#: tools/virsh.c:5477 msgid "convert a domain id or UUID to domain name" msgstr "将域 id 或 UUID 转换为域名" -#: tools/virsh.c:2437 +#: tools/virsh.c:5483 msgid "domain id or uuid" msgstr "域 id 或 uuid" -#: tools/virsh.c:2461 +#: tools/virsh.c:5507 msgid "convert a domain name or UUID to domain id" msgstr "把一个域名或 UUID 转换为域 id" -#: tools/virsh.c:2496 +#: tools/virsh.c:5542 msgid "convert a domain name or id to domain UUID" msgstr "把一个域名或 id 转换为域 UUID" -#: tools/virsh.c:2502 +#: tools/virsh.c:5548 msgid "domain id or name" msgstr "域 id 或域名" -#: tools/virsh.c:2521 +#: tools/virsh.c:5567 msgid "failed to get domain UUID" msgstr "获得域 UUID 失败" -#: tools/virsh.c:2531 +#: tools/virsh.c:5577 msgid "migrate domain to another host" msgstr "将域迁移到另一个主机中" -#: tools/virsh.c:2532 +#: tools/virsh.c:5578 msgid "Migrate domain to another host. Add --live for live migration." msgstr "将域迁移到另一个主机中。热迁移时添加 --live。" -#: tools/virsh.c:2537 +#: tools/virsh.c:5583 msgid "live migration" msgstr "热迁移" -#: tools/virsh.c:2538 +#: tools/virsh.c:5584 msgid "peer-2-peer migration" msgstr "" -#: tools/virsh.c:2539 +#: tools/virsh.c:5585 msgid "direct migration" msgstr "" -#: tools/virsh.c:2540 +#: tools/virsh.c:5586 msgid "tunnelled migration" msgstr "" -#: tools/virsh.c:2541 +#: tools/virsh.c:5587 msgid "persist VM on destination" msgstr "" -#: tools/virsh.c:2542 +#: tools/virsh.c:5588 msgid "undefine VM on source" msgstr "" -#: tools/virsh.c:2543 +#: tools/virsh.c:5589 msgid "do not restart the domain on the destination host" msgstr "" -#: tools/virsh.c:5488 +#: tools/virsh.c:5590 msgid "migration with non-shared storage with full disk copy" msgstr "" -#: tools/virsh.c:5489 +#: tools/virsh.c:5591 msgid "" "migration with non-shared storage with incremental copy (same base image " "shared between source and destination)" msgstr "" -#: tools/virsh.c:5491 +#: tools/virsh.c:5593 msgid "prevent any configuration changes to domain until migration ends)" msgstr "" -#: tools/virsh.c:5492 +#: tools/virsh.c:5594 msgid "display the progress of migration" msgstr "" -#: tools/virsh.c:5494 +#: tools/virsh.c:5596 msgid "" "connection URI of the destination host as seen from the client(normal " "migration) or source(p2p migration)" msgstr "" -#: tools/virsh.c:2546 +#: tools/virsh.c:5597 msgid "migration URI, usually can be omitted" msgstr "迁移 URI, 通常可省略" -#: tools/virsh.c:2547 +#: tools/virsh.c:5598 msgid "rename to new name during migration (if supported)" msgstr "在迁移过长中重新命名为一个新名称(如果支持)" -#: tools/virsh.c:5497 +#: tools/virsh.c:5599 msgid "force guest to suspend if live migration exceeds timeout (in seconds)" msgstr "" -#: tools/virsh.c:5538 tools/virsh.c:7652 tools/virsh.c:8472 tools/virsh.c:8484 -#: tools/virsh.c:8823 +#: 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.c:2597 +#: tools/virsh.c:5684 msgid "migrate: Unexpected migrateuri for peer2peer/direct migration" msgstr "" -#: tools/virsh.c:5673 +#: tools/virsh.c:5775 msgid "migrate: Unexpected timeout for offline migration" msgstr "" -#: tools/virsh.c:5678 +#: tools/virsh.c:5780 msgid "migrate: Invalid timeout" msgstr "" -#: tools/virsh.c:5684 +#: tools/virsh.c:5786 msgid "migrate: Timeout is too big" msgstr "" -#: tools/virsh.c:5778 +#: tools/virsh.c:5880 msgid "set maximum tolerable downtime" msgstr "" -#: tools/virsh.c:5779 +#: tools/virsh.c:5881 msgid "" "Set maximum tolerable downtime of a domain which is being live-migrated to " "another host." msgstr "" -#: tools/virsh.c:5785 +#: tools/virsh.c:5887 msgid "maximum tolerable downtime (in milliseconds) for migration" msgstr "" -#: tools/virsh.c:5804 +#: tools/virsh.c:5906 msgid "migrate: Invalid downtime" msgstr "" -#: tools/virsh.c:5822 +#: tools/virsh.c:5924 msgid "Set the maximum migration bandwidth" msgstr "" -#: tools/virsh.c:5823 +#: tools/virsh.c:5925 msgid "" "Set the maximum migration bandwidth (in Mbps) for a domain which is being " "migrated to another host." msgstr "" -#: tools/virsh.c:5830 +#: tools/virsh.c:5932 msgid "migration bandwidth limit in Mbps" msgstr "" -#: tools/virsh.c:5848 +#: tools/virsh.c:5950 msgid "migrate: Invalid bandwidth" msgstr "" -#: tools/virsh.c:5866 +#: tools/virsh.c:5968 msgid "Get the maximum migration bandwidth" msgstr "" -#: tools/virsh.c:5867 +#: tools/virsh.c:5969 msgid "Get the maximum migration bandwidth (in Mbps) for a domain." msgstr "" -#: tools/virsh.c:5927 +#: tools/virsh.c:6029 msgid "bandwidth must be a number" msgstr "" -#: tools/virsh.c:5950 tools/virsh.c:5951 +#: tools/virsh.c:6052 tools/virsh.c:6053 msgid "Populate a disk from its backing image." msgstr "" -#: tools/virsh.c:5957 tools/virsh.c:5981 +#: tools/virsh.c:6059 tools/virsh.c:6083 msgid "Fully-qualified path of disk" msgstr "" -#: tools/virsh.c:5958 +#: tools/virsh.c:6060 msgid "Bandwidth limit in MB/s" msgstr "" -#: tools/virsh.c:5974 tools/virsh.c:5975 +#: tools/virsh.c:6076 tools/virsh.c:6077 msgid "Manage active block operations." msgstr "" -#: tools/virsh.c:5982 +#: tools/virsh.c:6084 msgid "Abort the active job on the speficied disk" msgstr "" -#: tools/virsh.c:5983 +#: tools/virsh.c:6085 msgid "Get active job information for the specified disk" msgstr "" -#: tools/virsh.c:5984 +#: tools/virsh.c:6086 msgid "Set the Bandwidth limit in MB/s" msgstr "" -#: tools/virsh.c:6004 +#: tools/virsh.c:6106 msgid "One of --abort, --info, or --bandwidth is required" msgstr "" -#: tools/virsh.c:2628 +#: tools/virsh.c:6132 tools/virsh.c:6133 +msgid "Resize block device of domain." +msgstr "" + +#: tools/virsh.c:6139 +msgid "Fully-qualified path of block device" +msgstr "" + +#: tools/virsh.c:6140 +msgid "New size of the block device in kilobytes, the size must be integer" +msgstr "" + +#: tools/virsh.c:6158 +msgid "Path must not be empty" +msgstr "" + +#: 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.c:6168 +#, c-format +msgid "Size must be less than %llu" +msgstr "" + +#: tools/virsh.c:6176 +#, c-format +msgid "Failed to resize block device '%s'" +msgstr "" + +#: tools/virsh.c:6178 +#, c-format +msgid "Block device '%s' is resized" +msgstr "" + +#: tools/virsh.c:6190 msgid "autostart a network" msgstr "自动开始网络" -#: tools/virsh.c:2630 +#: tools/virsh.c:6192 msgid "Configure a network to be automatically started at boot." msgstr "设置一个网络在启动时自动开始." -#: tools/virsh.c:2635 tools/virsh.c:3155 +#: 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.c:2657 +#: tools/virsh.c:6219 #, c-format msgid "failed to mark network %s as autostarted" msgstr "把网络%s标记为自动启动失败" -#: tools/virsh.c:2659 +#: tools/virsh.c:6221 #, c-format msgid "failed to unmark network %s as autostarted" msgstr "把网络%s取消标记为自动启动失败" -#: tools/virsh.c:2665 +#: tools/virsh.c:6227 #, c-format msgid "Network %s marked as autostarted\n" msgstr "网络%s标记为自动启动\n" -#: tools/virsh.c:2667 +#: tools/virsh.c:6229 #, c-format msgid "Network %s unmarked as autostarted\n" msgstr "网络%s取消标记为自动启动\n" -#: tools/virsh.c:2677 +#: tools/virsh.c:6239 +msgid "Set or query a block device I/O tuning parameters." +msgstr "" + +#: tools/virsh.c:6240 +msgid "Set or query disk I/O parameters such as block throttling." +msgstr "" + +#: tools/virsh.c:6248 +msgid "total throughput limit in bytes per second" +msgstr "" + +#: tools/virsh.c:6250 +msgid "read throughput limit in bytes per second" +msgstr "" + +#: tools/virsh.c:6252 +msgid "write throughput limit in bytes per second" +msgstr "" + +#: tools/virsh.c:6254 +msgid "total I/O operations limit per second" +msgstr "" + +#: tools/virsh.c:6256 +msgid "read I/O operations limit per second" +msgstr "" + +#: tools/virsh.c:6258 +msgid "write I/O operations limit per second" +msgstr "" + +#: tools/virsh.c:6355 +msgid "Unable to get number of block I/O throttle parameters" +msgstr "" + +#: tools/virsh.c:6368 +msgid "Unable to get block I/O throttle parameters" +msgstr "" + +#: tools/virsh.c:6465 +msgid "Unable to change block I/O throttle" +msgstr "" + +#: tools/virsh.c:6482 msgid "create a network from an XML file" msgstr "从一个 XML 文件创建一个网络" -#: tools/virsh.c:2678 +#: tools/virsh.c:6483 msgid "Create a network." msgstr "创建一个网络" -#: tools/virsh.c:2683 tools/virsh.c:2731 +#: tools/virsh.c:6488 tools/virsh.c:6534 msgid "file containing an XML network description" msgstr "文件包括一个 XML网络描述" -#: tools/virsh.c:2710 +#: tools/virsh.c:6513 #, c-format msgid "Network %s created from %s\n" msgstr "从%s创建网络%s\n" -#: tools/virsh.c:2714 +#: tools/virsh.c:6517 #, c-format msgid "Failed to create network from %s" msgstr "从 %s 创建网络失败" -#: tools/virsh.c:2725 +#: tools/virsh.c:6528 msgid "define (but don't start) a network from an XML file" msgstr "从一个 XML 文件定义(但不开始)一个网络" -#: tools/virsh.c:2726 +#: tools/virsh.c:6529 msgid "Define a network." msgstr "定义一个网络." -#: tools/virsh.c:2758 +#: tools/virsh.c:6559 #, c-format msgid "Network %s defined from %s\n" msgstr "从 %s定义网络%s\n" -#: tools/virsh.c:2762 +#: tools/virsh.c:6563 #, c-format msgid "Failed to define network from %s" msgstr "从 %s 定义网络失败" -#: tools/virsh.c:6172 +#: tools/virsh.c:6574 msgid "destroy (stop) a network" msgstr "" -#: tools/virsh.c:6173 +#: tools/virsh.c:6575 msgid "Forcefully stop a given network." msgstr "" -#: tools/virsh.c:2797 +#: tools/virsh.c:6598 #, c-format msgid "Network %s destroyed\n" msgstr "网络 %s 被删除\n" -#: tools/virsh.c:2799 +#: tools/virsh.c:6600 #, c-format msgid "Failed to destroy network %s" msgstr "删除网络 %s 失败" -#: tools/virsh.c:2812 +#: tools/virsh.c:6613 msgid "network information in XML" msgstr "XML 中的网络信息" -#: tools/virsh.c:2813 +#: tools/virsh.c:6614 msgid "Output the network information as an XML dump to stdout." msgstr "把网络信息作为一个 XML 输出到 stdout。" -#: tools/virsh.c:6250 +#: tools/virsh.c:6652 msgid "network information" msgstr "" -#: tools/virsh.c:3194 +#: tools/virsh.c:6653 +msgid "Returns basic information about the network" +msgstr "" + +#: tools/virsh.c:6658 tools/virsh.c:7051 msgid "network name" msgstr "网络名" -#: tools/virsh.c:5631 +#: tools/virsh.c:6682 tools/virsh.c:8118 tools/virsh.c:11164 msgid "UUID" msgstr "" -#: tools/virsh.c:6284 +#: tools/virsh.c:6686 msgid "Active:" msgstr "" -#: tools/virsh.c:3034 tools/virsh.c:3057 tools/virsh.c:4280 tools/virsh.c:4303 +#: 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.c:6299 +#: tools/virsh.c:6701 msgid "Bridge:" msgstr "" -#: tools/virsh.c:2852 +#: tools/virsh.c:6712 msgid "edit XML configuration for a physical host interface" msgstr "" -#: tools/virsh.c:2853 +#: tools/virsh.c:6713 msgid "Edit the XML configuration for a physical host interface." msgstr "" -#: tools/virsh.c:2858 tools/virsh.c:3404 tools/virsh.c:3496 tools/virsh.c:3534 -#: tools/virsh.c:3572 +#: 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 "" -#: tools/virsh.c:2901 +#: tools/virsh.c:6758 #, c-format msgid "Interface %s XML configuration not changed.\n" msgstr "" -#: tools/virsh.c:2917 tools/virsh.c:7230 +#: tools/virsh.c:6774 tools/virsh.c:8210 tools/virsh.c:13625 msgid "ERROR: the XML configuration was changed by another user" msgstr "错误:另一位用户更改了 XML 配置" -#: tools/virsh.c:2927 +#: tools/virsh.c:6784 #, c-format msgid "Interface %s XML configuration edited.\n" msgstr "" -#: tools/virsh.c:2952 +#: tools/virsh.c:6809 msgid "list networks" msgstr "列出网络" -#: tools/virsh.c:2953 +#: tools/virsh.c:6810 msgid "Returns list of networks." msgstr "返回网络列表" -#: tools/virsh.c:2958 +#: tools/virsh.c:6815 msgid "list inactive networks" msgstr "列出不活跃的网络" -#: tools/virsh.c:2959 +#: tools/virsh.c:6816 msgid "list inactive & active networks" msgstr "列出不活跃和活跃的网络" -#: tools/virsh.c:2979 tools/virsh.c:2987 +#: tools/virsh.c:6836 tools/virsh.c:6844 msgid "Failed to list active networks" msgstr "列出活跃的网络失败" -#: tools/virsh.c:2998 tools/virsh.c:3008 +#: tools/virsh.c:6855 tools/virsh.c:6865 msgid "Failed to list inactive networks" msgstr "列出不活跃的网络失败" -#: tools/virsh.c:3018 tools/virsh.c:4265 +#: tools/virsh.c:6875 tools/virsh.c:9109 tools/virsh.c:9138 tools/virsh.c:9197 msgid "Autostart" msgstr "自动开始" -#: tools/virsh.c:3040 tools/virsh.c:3306 tools/virsh.c:4286 +#: tools/virsh.c:6897 tools/virsh.c:7163 tools/virsh.c:9077 msgid "active" msgstr "活动" -#: tools/virsh.c:3063 tools/virsh.c:3323 tools/virsh.c:4309 tools/virsh.c:4511 +#: 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.c:3079 +#: tools/virsh.c:6936 msgid "convert a network UUID to network name" msgstr "把一个网络UUID 转换为网络名" -#: tools/virsh.c:3085 +#: tools/virsh.c:6942 msgid "network uuid" msgstr "网络uuid" -#: tools/virsh.c:3110 +#: tools/virsh.c:6967 msgid "start a (previously defined) inactive network" msgstr "开始一个(以前定义的)不活跃的网络" -#: tools/virsh.c:3111 +#: tools/virsh.c:6968 msgid "Start a network." msgstr "开始一个网络." -#: tools/virsh.c:3116 +#: tools/virsh.c:6973 msgid "name of the inactive network" msgstr "非活跃网络的名称" -#: tools/virsh.c:3133 +#: tools/virsh.c:6990 #, c-format msgid "Network %s started\n" msgstr "网络 %s 已开始\n" -#: tools/virsh.c:3136 +#: tools/virsh.c:6993 #, c-format msgid "Failed to start network %s" msgstr "开始网络 %s 失败" -#: tools/virsh.c:3149 +#: tools/virsh.c:7006 msgid "undefine an inactive network" msgstr "取消定义一个非活跃的网络" -#: tools/virsh.c:3150 +#: tools/virsh.c:7007 msgid "Undefine the configuration for an inactive network." msgstr "取消定义一个非活跃网络配置。" -#: tools/virsh.c:3173 +#: tools/virsh.c:7030 #, c-format msgid "Network %s has been undefined\n" msgstr "网络 %s 已经被取消定义\n" -#: tools/virsh.c:3175 +#: tools/virsh.c:7032 #, c-format msgid "Failed to undefine network %s" msgstr "取消定义网络 %s 失败" -#: tools/virsh.c:3188 +#: tools/virsh.c:7045 msgid "convert a network name to network UUID" msgstr "把一个网络名转换为网络UUID" -#: tools/virsh.c:3214 +#: tools/virsh.c:7071 msgid "failed to get network UUID" msgstr "获得网络UUID 失败" -#: tools/virsh.c:3226 +#: tools/virsh.c:7083 msgid "list physical host interfaces" msgstr "" -#: tools/virsh.c:3227 +#: tools/virsh.c:7084 msgid "Returns list of physical host interfaces." msgstr "" -#: tools/virsh.c:3232 +#: tools/virsh.c:7089 msgid "list inactive interfaces" msgstr "" -#: tools/virsh.c:3233 +#: tools/virsh.c:7090 msgid "list inactive & active interfaces" msgstr "" -#: tools/virsh.c:3252 tools/virsh.c:3260 +#: tools/virsh.c:7109 tools/virsh.c:7117 msgid "Failed to list active interfaces" msgstr "" -#: tools/virsh.c:3271 tools/virsh.c:3281 +#: tools/virsh.c:7128 tools/virsh.c:7138 msgid "Failed to list inactive interfaces" msgstr "" -#: tools/virsh.c:3291 +#: tools/virsh.c:7148 msgid "MAC Address" msgstr "" -#: tools/virsh.c:3338 +#: tools/virsh.c:7195 msgid "convert an interface MAC address to interface name" msgstr "" -#: tools/virsh.c:3344 +#: tools/virsh.c:7201 msgid "interface mac" msgstr "" -#: tools/virsh.c:3368 +#: tools/virsh.c:7225 msgid "convert an interface name to interface MAC address" msgstr "" -#: tools/virsh.c:3374 +#: tools/virsh.c:7231 msgid "interface name" msgstr "" -#: tools/virsh.c:3398 +#: tools/virsh.c:7255 msgid "interface information in XML" msgstr "" -#: tools/virsh.c:3399 +#: tools/virsh.c:7256 msgid "" "Output the physical host interface information as an XML dump to stdout." msgstr "" -#: tools/virsh.c:3443 +#: tools/virsh.c:7300 msgid "define (but don't start) a physical host interface from an XML file" msgstr "" -#: tools/virsh.c:3444 +#: tools/virsh.c:7301 msgid "Define a physical host interface." msgstr "" -#: tools/virsh.c:3449 +#: tools/virsh.c:7306 msgid "file containing an XML interface description" msgstr "" -#: tools/virsh.c:3476 +#: tools/virsh.c:7331 #, c-format msgid "Interface %s defined from %s\n" msgstr "" -#: tools/virsh.c:3480 +#: tools/virsh.c:7335 #, c-format msgid "Failed to define interface from %s" msgstr "" -#: tools/virsh.c:3490 +#: tools/virsh.c:7345 msgid "undefine a physical host interface (remove it from configuration)" msgstr "" -#: tools/virsh.c:3491 +#: tools/virsh.c:7346 msgid "undefine an interface." msgstr "" -#: tools/virsh.c:3514 +#: tools/virsh.c:7369 #, c-format msgid "Interface %s undefined\n" msgstr "" -#: tools/virsh.c:3516 +#: tools/virsh.c:7371 #, c-format msgid "Failed to undefine interface %s" msgstr "" -#: tools/virsh.c:3528 +#: tools/virsh.c:7383 msgid "start a physical host interface (enable it / \"if-up\")" msgstr "" -#: tools/virsh.c:3529 +#: tools/virsh.c:7384 msgid "start a physical host interface." msgstr "" -#: tools/virsh.c:3552 +#: tools/virsh.c:7407 tools/virsh.c:7936 #, c-format msgid "Interface %s started\n" msgstr "" -#: tools/virsh.c:3554 +#: tools/virsh.c:7409 tools/virsh.c:7933 #, c-format msgid "Failed to start interface %s" msgstr "" -#: tools/virsh.c:3566 +#: tools/virsh.c:7421 msgid "destroy a physical host interface (disable it / \"if-down\")" msgstr "" -#: tools/virsh.c:7020 +#: tools/virsh.c:7422 msgid "forcefully stop a physical host interface." msgstr "" -#: tools/virsh.c:3590 +#: tools/virsh.c:7445 #, c-format msgid "Interface %s destroyed\n" msgstr "" -#: tools/virsh.c:3592 +#: tools/virsh.c:7447 #, c-format msgid "Failed to destroy interface %s" msgstr "" -#: tools/virsh.c:7057 +#: tools/virsh.c:7459 msgid "" "create a snapshot of current interfaces settings, which can be later " "commited (iface-commit) or restored (iface-rollback)" msgstr "" -#: tools/virsh.c:7060 +#: tools/virsh.c:7462 msgid "Create a restore point for interfaces settings" msgstr "" -#: tools/virsh.c:7075 +#: tools/virsh.c:7477 msgid "Failed to begin network config change transaction" msgstr "" -#: tools/virsh.c:7079 +#: tools/virsh.c:7481 msgid "Network config change transaction started\n" msgstr "" -#: tools/virsh.c:7087 +#: tools/virsh.c:7489 msgid "commit changes made since iface-begin and free restore point" msgstr "" -#: tools/virsh.c:7088 +#: tools/virsh.c:7490 msgid "commit changes and free restore point" msgstr "" -#: tools/virsh.c:7103 +#: tools/virsh.c:7505 msgid "Failed to commit network config change transaction" msgstr "" -#: tools/virsh.c:7107 +#: tools/virsh.c:7509 msgid "Network config change transaction committed\n" msgstr "" -#: tools/virsh.c:7115 +#: tools/virsh.c:7517 msgid "rollback to previous saved configuration created via iface-begin" msgstr "" -#: tools/virsh.c:7116 +#: tools/virsh.c:7518 msgid "rollback to previous restore point" msgstr "" -#: tools/virsh.c:7131 +#: tools/virsh.c:7533 msgid "Failed to rollback network config change transaction" msgstr "" -#: tools/virsh.c:7135 +#: tools/virsh.c:7537 msgid "Network config change transaction rolled back\n" msgstr "" -#: tools/virsh.c:7143 +#: tools/virsh.c:7545 +msgid "create a bridge device and attach an existing network device to it" +msgstr "" + +#: tools/virsh.c:7546 +msgid "bridge an existing network device" +msgstr "" + +#: tools/virsh.c:7551 +msgid "existing interface name" +msgstr "" + +#: tools/virsh.c:7552 +msgid "new bridge device name" +msgstr "" + +#: tools/virsh.c:7553 +msgid "do not enable STP for this bridge" +msgstr "" + +#: tools/virsh.c:7555 +msgid "number of seconds to squelch traffic on newly connected ports" +msgstr "" + +#: tools/virsh.c:7556 +msgid "don't start the bridge immediately" +msgstr "" + +#: tools/virsh.c:7587 +msgid "Missing bridge device name in command" +msgstr "" + +#: tools/virsh.c:7593 +#, c-format +msgid "Network device %s already exists" +msgstr "" + +#: tools/virsh.c:7601 +msgid "Unable to parse delay parameter" +msgstr "" + +#: tools/virsh.c:7611 +msgid "(interface definition)" +msgstr "" + +#: tools/virsh.c:7612 tools/virsh.c:7810 +#, c-format +msgid "Failed to parse configuration of %s" +msgstr "" + +#: tools/virsh.c:7619 tools/virsh.c:7817 +#, c-format +msgid "Existing device %s has no type" +msgstr "" + +#: tools/virsh.c:7624 +#, c-format +msgid "Existing device %s is already a bridge" +msgstr "" + +#: tools/virsh.c:7631 tools/virsh.c:7830 +#, c-format +msgid "Interface name from config %s doesn't match given supplied name %s" +msgstr "" + +#: tools/virsh.c:7638 +msgid "Failed to create bridge node in xml document" +msgstr "" + +#: tools/virsh.c:7646 +msgid "Failed to set stp attribute in xml document" +msgstr "" + +#: tools/virsh.c:7653 +#, c-format +msgid "Failed to set bridge delay %d in xml document" +msgstr "" + +#: tools/virsh.c:7661 +msgid "Failed to set bridge interface type to 'bridge' in xml document" +msgstr "" + +#: tools/virsh.c:7666 +#, c-format +msgid "Failed to set master bridge interface name to '%s' in xml document" +msgstr "" + +#: tools/virsh.c:7675 +msgid "Failed to create interface node under bridge node in xml document" +msgstr "" + +#: tools/virsh.c:7683 +#, c-format +msgid "Failed to set new slave interface type to '%s' in xml document" +msgstr "" + +#: tools/virsh.c:7689 +#, c-format +msgid "Failed to set new slave interface name to '%s' in xml document" +msgstr "" + +#: tools/virsh.c:7709 tools/virsh.c:7892 +#, c-format +msgid "Failed to move '%s' element in xml document" +msgstr "" + +#: tools/virsh.c:7720 +#, c-format +msgid "Failed to format new xml document for bridge %s" +msgstr "" + +#: tools/virsh.c:7729 +#, c-format +msgid "Failed to define new bridge interface %s" +msgstr "" + +#: tools/virsh.c:7734 +#, c-format +msgid "Created bridge %s with attached device %s\n" +msgstr "" + +#: tools/virsh.c:7740 +#, c-format +msgid "Failed to start bridge interface %s" +msgstr "" + +#: tools/virsh.c:7743 +#, c-format +msgid "Bridge interface %s started\n" +msgstr "" + +#: tools/virsh.c:7766 +msgid "undefine a bridge device after detaching its slave device" +msgstr "" + +#: tools/virsh.c:7767 +msgid "unbridge a network device" +msgstr "" + +#: tools/virsh.c:7772 +msgid "current bridge device name" +msgstr "" + +#: tools/virsh.c:7774 +msgid "don't start the un-slaved interface immediately (not recommended)" +msgstr "" + +#: tools/virsh.c:7808 +msgid "(bridge interface definition)" +msgstr "" + +#: tools/virsh.c:7822 +#, c-format +msgid "Device %s is not a bridge" +msgstr "" + +#: tools/virsh.c:7838 +msgid "No bridge node in xml document" +msgstr "" + +#: tools/virsh.c:7843 +msgid "Multiple interfaecs attached to bridge" +msgstr "" + +#: tools/virsh.c:7848 +msgid "No interface attached to bridge" +msgstr "" + +#: tools/virsh.c:7856 +#, c-format +msgid "Device attached to bridge %s has no name" +msgstr "" + +#: tools/virsh.c:7861 +#, c-format +msgid "Attached device %s has no type" +msgstr "" + +#: tools/virsh.c:7866 +#, c-format +msgid "Failed to set interface type to '%s' in xml document" +msgstr "" + +#: tools/virsh.c:7872 +#, c-format +msgid "Failed to set interface name to '%s' in xml document" +msgstr "" + +#: tools/virsh.c:7903 +#, c-format +msgid "Failed to format new xml document for un-enslaved interface %s" +msgstr "" + +#: tools/virsh.c:7912 +#, c-format +msgid "Failed to destroy bridge interface %s" +msgstr "" + +#: tools/virsh.c:7916 +#, c-format +msgid "Failed to undefine bridge interface %s" +msgstr "" + +#: tools/virsh.c:7923 +#, c-format +msgid "Failed to define new interface %s" +msgstr "" + +#: tools/virsh.c:7927 +#, c-format +msgid "Device %s un-attached from bridge %s\n" +msgstr "" + +#: tools/virsh.c:7958 msgid "define or update a network filter from an XML file" msgstr "" -#: tools/virsh.c:7144 +#: tools/virsh.c:7959 msgid "Define a new network filter or update an existing one." msgstr "" -#: tools/virsh.c:7149 +#: tools/virsh.c:7964 msgid "file containing an XML network filter description" msgstr "" -#: tools/virsh.c:7174 +#: tools/virsh.c:7989 #, c-format msgid "Network filter %s defined from %s\n" msgstr "" -#: tools/virsh.c:7178 +#: tools/virsh.c:7993 #, c-format msgid "Failed to define network filter from %s" msgstr "" -#: tools/virsh.c:7189 +#: tools/virsh.c:8004 msgid "undefine a network filter" msgstr "" -#: tools/virsh.c:7190 +#: tools/virsh.c:8005 msgid "Undefine a given network filter." msgstr "" -#: tools/virsh.c:7195 tools/virsh.c:7234 tools/virsh.c:7340 +#: tools/virsh.c:8010 tools/virsh.c:8049 tools/virsh.c:8155 msgid "network filter name or uuid" msgstr "" -#: tools/virsh.c:7213 +#: tools/virsh.c:8028 #, c-format msgid "Network filter %s undefined\n" msgstr "" -#: tools/virsh.c:7215 +#: tools/virsh.c:8030 #, c-format msgid "Failed to undefine network filter %s" msgstr "" -#: tools/virsh.c:7228 +#: tools/virsh.c:8043 msgid "network filter information in XML" msgstr "" -#: tools/virsh.c:7229 +#: tools/virsh.c:8044 msgid "Output the network filter information as an XML dump to stdout." msgstr "" -#: tools/virsh.c:7267 +#: tools/virsh.c:8082 msgid "list network filters" msgstr "" -#: tools/virsh.c:7268 +#: tools/virsh.c:8083 msgid "Returns list of network filters." msgstr "" -#: tools/virsh.c:7288 tools/virsh.c:7296 +#: tools/virsh.c:8103 tools/virsh.c:8111 msgid "Failed to list network filters" msgstr "" -#: tools/virsh.c:7334 +#: tools/virsh.c:8149 msgid "edit XML configuration for a network filter" msgstr "" -#: tools/virsh.c:7335 +#: tools/virsh.c:8150 msgid "Edit the XML configuration for a network filter." msgstr "" -#: tools/virsh.c:7379 +#: tools/virsh.c:8194 #, c-format msgid "Network filter %s XML configuration not changed.\n" msgstr "" -#: tools/virsh.c:7405 +#: tools/virsh.c:8220 #, c-format msgid "Network filter %s XML configuration edited.\n" msgstr "" -#: tools/virsh.c:3605 +#: tools/virsh.c:8247 msgid "autostart a pool" msgstr "自动启动某个池" -#: tools/virsh.c:3607 +#: tools/virsh.c:8249 msgid "Configure a pool to be automatically started at boot." msgstr "将某个池设置为在引导时自动启动。" -#: tools/virsh.c:3612 tools/virsh.c:4012 tools/virsh.c:4051 tools/virsh.c:4090 -#: tools/virsh.c:4129 tools/virsh.c:4168 tools/virsh.c:4482 tools/virsh.c:4747 -#: tools/virsh.c:4980 tools/virsh.c:5057 tools/virsh.c:5098 tools/virsh.c:5149 -#: tools/virsh.c:5190 tools/virsh.c:5334 tools/virsh.c:7288 +#: 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.c:3634 +#: tools/virsh.c:8276 #, c-format msgid "failed to mark pool %s as autostarted" msgstr "将池 %s 标记为自动启动失败" -#: tools/virsh.c:3636 +#: tools/virsh.c:8278 #, c-format msgid "failed to unmark pool %s as autostarted" msgstr "取消将池 %s 标记为自动启动失败" -#: tools/virsh.c:3642 +#: tools/virsh.c:8284 #, c-format msgid "Pool %s marked as autostarted\n" msgstr "池 %s 标记为自动启动\n" -#: tools/virsh.c:3644 +#: tools/virsh.c:8286 #, c-format msgid "Pool %s unmarked as autostarted\n" msgstr "取消将池 %s 标记为自动启动\n" -#: tools/virsh.c:3654 +#: tools/virsh.c:8296 msgid "create a pool from an XML file" msgstr "从一个 XML 文件中创建一个池" -#: tools/virsh.c:3655 tools/virsh.c:3877 +#: tools/virsh.c:8297 tools/virsh.c:8515 msgid "Create a pool." msgstr "创建一个池。" -#: tools/virsh.c:3661 tools/virsh.c:3923 +#: tools/virsh.c:8303 tools/virsh.c:8562 msgid "file containing an XML pool description" msgstr "包含 XML 池描述的文件" -#: tools/virsh.c:3688 +#: tools/virsh.c:8328 #, c-format msgid "Pool %s created from %s\n" msgstr "从 %s 中创建池 %s\n" -#: tools/virsh.c:3692 +#: tools/virsh.c:8332 #, c-format msgid "Failed to create pool from %s" msgstr "从 %s 创建池失败" -#: tools/virsh.c:3703 +#: tools/virsh.c:8343 msgid "create a device defined by an XML file on the node" msgstr "" -#: tools/virsh.c:3705 +#: 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.c:3713 +#: tools/virsh.c:8353 msgid "file containing an XML description of the device" msgstr "" -#: tools/virsh.c:3742 +#: tools/virsh.c:8378 #, c-format msgid "Node device %s created from %s\n" msgstr "" -#: tools/virsh.c:3746 +#: tools/virsh.c:8382 #, c-format msgid "Failed to create node device from %s" msgstr "" -#: tools/virsh.c:7579 +#: tools/virsh.c:8394 msgid "destroy (stop) a device on the node" msgstr "" -#: tools/virsh.c:7580 +#: tools/virsh.c:8395 msgid "" "Destroy a device on the node. Note that this command destroys devices on " "the physical host" msgstr "" -#: tools/virsh.c:3766 +#: tools/virsh.c:8402 msgid "name of the device to be destroyed" msgstr "" -#: tools/virsh.c:3790 +#: tools/virsh.c:8423 #, c-format msgid "Destroyed node device '%s'\n" msgstr "" -#: tools/virsh.c:3792 +#: tools/virsh.c:8425 #, c-format msgid "Failed to destroy node device '%s'" msgstr "" -#: tools/virsh.c:3805 +#: tools/virsh.c:8438 msgid "name of the pool" msgstr "池的名称" -#: tools/virsh.c:3806 +#: tools/virsh.c:8439 msgid "print XML document, but don't define/create" msgstr "打印 XML 文档,但不能定义/创建" -#: tools/virsh.c:3807 +#: tools/virsh.c:8440 msgid "type of the pool" msgstr "池类型" -#: tools/virsh.c:3808 +#: tools/virsh.c:8441 msgid "source-host for underlying storage" msgstr "基本存储的源主机" -#: tools/virsh.c:3809 +#: tools/virsh.c:8442 msgid "source path for underlying storage" msgstr "基本存储的源路径" -#: tools/virsh.c:3810 +#: tools/virsh.c:8443 msgid "source device for underlying storage" msgstr "基本存储的源设备" -#: tools/virsh.c:3811 +#: tools/virsh.c:8444 msgid "source name for underlying storage" msgstr "基本存储的源路径名称" -#: tools/virsh.c:3812 +#: tools/virsh.c:8445 msgid "target for underlying storage" msgstr "基本存储的目标" -#: tools/virsh.c:7631 +#: tools/virsh.c:8446 msgid "format for underlying storage" msgstr "" -#: tools/virsh.c:3859 tools/virsh.c:4713 tools/virsh.c:5018 +#: 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:3876 +#: tools/virsh.c:8514 msgid "create a pool from a set of args" msgstr "从一组变量中创建一个池" -#: tools/virsh.c:3902 +#: tools/virsh.c:8541 #, c-format msgid "Pool %s created\n" msgstr "创建池 %s\n" -#: tools/virsh.c:3905 +#: tools/virsh.c:8544 #, c-format msgid "Failed to create pool %s" msgstr "创建池 %s 失败" -#: tools/virsh.c:3917 +#: tools/virsh.c:8556 msgid "define (but don't start) a pool from an XML file" msgstr "在一个 XML 文件中定义(但不启动)一个池" -#: tools/virsh.c:3918 tools/virsh.c:3966 +#: tools/virsh.c:8557 tools/virsh.c:8603 msgid "Define a pool." msgstr "定义池。" -#: tools/virsh.c:3950 +#: tools/virsh.c:8587 #, c-format msgid "Pool %s defined from %s\n" msgstr "在 %s 中定义池 %s\n" -#: tools/virsh.c:3954 +#: tools/virsh.c:8591 #, c-format msgid "Failed to define pool from %s" msgstr "在 %s 中定义池失败" -#: tools/virsh.c:3965 +#: tools/virsh.c:8602 msgid "define a pool from a set of args" msgstr "在一组变量中定义池" -#: tools/virsh.c:3991 +#: tools/virsh.c:8629 #, c-format msgid "Pool %s defined\n" msgstr "定义池 %s\n" -#: tools/virsh.c:3994 +#: tools/virsh.c:8632 #, c-format msgid "Failed to define pool %s" msgstr "定义池 %s 失败" -#: tools/virsh.c:4006 +#: tools/virsh.c:8644 msgid "build a pool" msgstr "建立池" -#: tools/virsh.c:4007 +#: tools/virsh.c:8645 msgid "Build a given pool." msgstr "建立一个给定的池。" -#: tools/virsh.c:7836 +#: tools/virsh.c:8651 msgid "do not overwrite an existing pool of this type" msgstr "" -#: tools/virsh.c:7837 +#: tools/virsh.c:8652 msgid "overwrite any existing data" msgstr "" -#: tools/virsh.c:4030 +#: tools/virsh.c:8679 #, c-format msgid "Pool %s built\n" msgstr "构建池 %s\n" -#: tools/virsh.c:4032 +#: tools/virsh.c:8681 #, c-format msgid "Failed to build pool %s" msgstr "构建池 %s 失败" -#: tools/virsh.c:7879 +#: tools/virsh.c:8694 msgid "destroy (stop) a pool" msgstr "" -#: tools/virsh.c:7881 +#: tools/virsh.c:8696 msgid "Forcefully stop a given pool. Raw data in the pool is untouched" msgstr "" -#: tools/virsh.c:4069 +#: tools/virsh.c:8719 #, c-format msgid "Pool %s destroyed\n" msgstr "销毁池 %s\n" -#: tools/virsh.c:4071 +#: tools/virsh.c:8721 #, c-format msgid "Failed to destroy pool %s" msgstr "销毁池 %s 失败" -#: tools/virsh.c:4084 +#: tools/virsh.c:8734 msgid "delete a pool" msgstr "删除池" -#: tools/virsh.c:4085 +#: tools/virsh.c:8735 msgid "Delete a given pool." msgstr "删除一个给定的池。" -#: tools/virsh.c:4108 +#: tools/virsh.c:8758 #, c-format msgid "Pool %s deleted\n" msgstr "池 %s 被删除\n" -#: tools/virsh.c:4110 +#: tools/virsh.c:8760 #, c-format msgid "Failed to delete pool %s" msgstr "删除池 %s 失败" -#: tools/virsh.c:4123 +#: tools/virsh.c:8773 msgid "refresh a pool" msgstr "刷新池" -#: tools/virsh.c:4124 +#: tools/virsh.c:8774 msgid "Refresh a given pool." msgstr "刷新给定的池。" -#: tools/virsh.c:4147 +#: tools/virsh.c:8797 #, c-format msgid "Pool %s refreshed\n" msgstr "池 %s 被刷新\n" -#: tools/virsh.c:4149 +#: tools/virsh.c:8799 #, c-format msgid "Failed to refresh pool %s" msgstr "刷新池 %s 失败" -#: tools/virsh.c:4162 +#: tools/virsh.c:8812 msgid "pool information in XML" msgstr "XML 中的池信息" -#: tools/virsh.c:4163 +#: tools/virsh.c:8813 msgid "Output the pool information as an XML dump to stdout." msgstr "把池信息作为 XML 转储输出到 stdout。" -#: tools/virsh.c:4202 +#: tools/virsh.c:8852 msgid "list pools" msgstr "列出池" -#: tools/virsh.c:4203 +#: tools/virsh.c:8853 msgid "Returns list of pools." msgstr "返回池列表" -#: tools/virsh.c:4208 +#: tools/virsh.c:8858 msgid "list inactive pools" msgstr "列出不活跃的池" -#: tools/virsh.c:4209 +#: tools/virsh.c:8859 msgid "list inactive & active pools" msgstr "不活跃和活跃的池" -#: tools/virsh.c:8045 +#: tools/virsh.c:8860 msgid "display extended details for pools" msgstr "" -#: tools/virsh.c:4229 tools/virsh.c:4237 +#: tools/virsh.c:8901 tools/virsh.c:8927 msgid "Failed to list active pools" msgstr "列出活跃的池失败" -#: tools/virsh.c:4248 tools/virsh.c:4256 +#: tools/virsh.c:8910 tools/virsh.c:8939 msgid "Failed to list inactive pools" msgstr "列出不活跃的池失败" -#: tools/virsh.c:8173 +#: tools/virsh.c:8988 msgid "Could not retrieve pool information" msgstr "" -#: tools/virsh.c:4515 +#: tools/virsh.c:9005 tools/virsh.c:9429 msgid "building" msgstr "building" -#: tools/virsh.c:4519 tools/virsh.c:8271 tools/virsh.c:8297 +#: tools/virsh.c:9008 tools/virsh.c:9433 tools/virsh.c:16734 +#: tools/virsh.c:16947 msgid "running" msgstr "running" -#: tools/virsh.c:4523 +#: tools/virsh.c:9011 tools/virsh.c:9437 msgid "degraded" msgstr "degraded" -#: tools/virsh.c:8199 tools/virsh.c:8626 +#: tools/virsh.c:9014 tools/virsh.c:9441 msgid "inaccessible" msgstr "" -#: tools/virsh.c:8237 tools/virsh.c:8238 tools/virsh.c:8239 +#: tools/virsh.c:9052 tools/virsh.c:9053 tools/virsh.c:9054 msgid "-" msgstr "" -#: tools/virsh.c:8328 tools/virsh.c:8383 +#: tools/virsh.c:9143 tools/virsh.c:9198 msgid "Persistent" msgstr "" -#: tools/virsh.c:8333 tools/virsh.c:8383 tools/virsh.c:9819 +#: tools/virsh.c:9148 tools/virsh.c:9198 tools/virsh.c:10634 msgid "Capacity" msgstr "" -#: tools/virsh.c:8338 tools/virsh.c:8383 tools/virsh.c:9824 tools/virsh.c:9855 +#: tools/virsh.c:9153 tools/virsh.c:9198 tools/virsh.c:10639 +#: tools/virsh.c:10670 msgid "Allocation" msgstr "" -#: tools/virsh.c:8343 tools/virsh.c:8383 +#: tools/virsh.c:9158 tools/virsh.c:9198 msgid "Available" msgstr "" -#: tools/virsh.c:4381 +#: tools/virsh.c:9232 tools/virsh.c:10701 #, c-format msgid "virAsprintf failed (errno %d)" msgstr "virAsprintf 失败(errno %d)" -#: tools/virsh.c:4324 +#: tools/virsh.c:9262 msgid "find potential storage pool sources" msgstr "找到潜在存储池源" -#: tools/virsh.c:4325 tools/virsh.c:4405 +#: tools/virsh.c:9263 tools/virsh.c:9339 msgid "Returns XML document." msgstr "返回 XML 文档" -#: tools/virsh.c:4331 +#: tools/virsh.c:9269 msgid "type of storage pool sources to find" msgstr "要查找的存储池源类型" -#: tools/virsh.c:4332 +#: tools/virsh.c:9270 msgid "optional host to query" msgstr "要查询的可选主机" -#: tools/virsh.c:4333 +#: tools/virsh.c:9271 msgid "optional port to query" msgstr "要查询的可选端口" -#: tools/virsh.c:8457 +#: tools/virsh.c:9272 msgid "optional initiator IQN to use for query" msgstr "" -#: tools/virsh.c:4390 tools/virsh.c:4441 +#: tools/virsh.c:9324 tools/virsh.c:9374 #, c-format msgid "Failed to find any %s pool sources" msgstr "查找任意 %s 池源失败" -#: tools/virsh.c:4404 +#: tools/virsh.c:9338 msgid "discover potential storage pool sources" msgstr "发现潜在存储池源" -#: tools/virsh.c:4411 +#: tools/virsh.c:9345 msgid "type of storage pool sources to discover" msgstr "要发现的存储池源类型" -#: tools/virsh.c:4413 +#: tools/virsh.c:9347 msgid "optional file of source xml to query for pools" msgstr "用来查询池的源 xml 可选文件" -#: tools/virsh.c:8546 tools/virsh.c:11470 tools/virsh.c:11769 -#: tools/virsh.c:15183 +#: tools/virsh.c:9361 tools/virsh.c:12543 tools/virsh.c:12847 +#: tools/virsh.c:16272 msgid "missing option" msgstr "" -#: tools/virsh.c:4476 +#: tools/virsh.c:9388 msgid "storage pool information" msgstr "存储池信息" -#: tools/virsh.c:4477 +#: tools/virsh.c:9389 msgid "Returns basic information about the storage pool." msgstr "返回关于这个存储池的基本信息。" -#: tools/virsh.c:4536 +#: tools/virsh.c:9472 msgid "Available:" msgstr "可用:" -#: tools/virsh.c:4551 +#: tools/virsh.c:9487 msgid "convert a pool UUID to pool name" msgstr "将池 UUID 转换为池名称" -#: tools/virsh.c:4557 +#: tools/virsh.c:9493 msgid "pool uuid" msgstr "池 uuid" -#: tools/virsh.c:4582 +#: tools/virsh.c:9518 msgid "start a (previously defined) inactive pool" msgstr "启动一个(以前定义的)非活跃的池" -#: tools/virsh.c:4583 +#: tools/virsh.c:9519 msgid "Start a pool." msgstr "启动一个池。" -#: tools/virsh.c:4588 +#: tools/virsh.c:9524 msgid "name of the inactive pool" msgstr "非活跃池的名称" -#: tools/virsh.c:4605 +#: tools/virsh.c:9541 #, c-format msgid "Pool %s started\n" msgstr "池 %s 已启动\n" -#: tools/virsh.c:4608 +#: tools/virsh.c:9544 #, c-format msgid "Failed to start pool %s" msgstr "启动池 %s 失败" -#: tools/virsh.c:4621 +#: tools/virsh.c:9557 msgid "create a volume from a set of args" msgstr "从一组变量中创建卷" -#: tools/virsh.c:4622 tools/virsh.c:4818 +#: tools/virsh.c:9558 tools/virsh.c:9822 msgid "Create a vol." msgstr "创建一个卷。" -#: tools/virsh.c:4627 tools/virsh.c:4786 tools/virsh.c:4823 tools/virsh.c:4881 +#: tools/virsh.c:9563 tools/virsh.c:9790 tools/virsh.c:9827 tools/virsh.c:9884 msgid "pool name" msgstr "卷名称" -#: tools/virsh.c:4628 +#: tools/virsh.c:9564 msgid "name of the volume" msgstr "卷的名称" -#: tools/virsh.c:4629 +#: tools/virsh.c:9565 msgid "size of the vol with optional k,M,G,T suffix" msgstr "带 k、M、G、T 后缀的可选卷大小" -#: tools/virsh.c:4630 +#: tools/virsh.c:9566 msgid "initial allocation size with optional k,M,G,T suffix" msgstr "带 k、M、G、T 后缀的可选初始分配大小" -#: tools/virsh.c:4631 +#: tools/virsh.c:9567 msgid "file format type raw,bochs,qcow,qcow2,vmdk" msgstr "文件格式类型 raw、bochs、qcow、qcow2、vmdk" -#: tools/virsh.c:8753 +#: tools/virsh.c:9568 msgid "the backing volume if taking a snapshot" msgstr "" -#: tools/virsh.c:8754 +#: tools/virsh.c:9569 msgid "format of backing volume if taking a snapshot" msgstr "" -#: tools/virsh.c:4689 tools/virsh.c:4694 +#: tools/virsh.c:9628 tools/virsh.c:9632 #, c-format msgid "Malformed size %s" msgstr "畸形的大小 %s" -#: tools/virsh.c:7965 +#: tools/virsh.c:9692 tools/virsh.c:16306 #, c-format msgid "failed to get vol '%s'" msgstr "获得卷 '%s' 失败" -#: tools/virsh.c:4722 +#: tools/virsh.c:9726 #, c-format msgid "Vol %s created\n" msgstr "创建卷 %s\n" -#: tools/virsh.c:4726 +#: tools/virsh.c:9730 #, c-format msgid "Failed to create vol %s" msgstr "创建卷 %s 失败" -#: tools/virsh.c:4741 +#: tools/virsh.c:9745 msgid "undefine an inactive pool" msgstr "取消定义一个不活跃的池" -#: tools/virsh.c:4742 +#: tools/virsh.c:9746 msgid "Undefine the configuration for an inactive pool." msgstr "取消定义一个不活跃池的配置。" -#: tools/virsh.c:4765 +#: tools/virsh.c:9769 #, c-format msgid "Pool %s has been undefined\n" msgstr "池 %s 已经被取消定义\n" -#: tools/virsh.c:4767 +#: tools/virsh.c:9771 #, c-format msgid "Failed to undefine pool %s" msgstr "取消定义池 %s 失败" -#: tools/virsh.c:4780 +#: tools/virsh.c:9784 msgid "convert a pool name to pool UUID" msgstr "把一个池名称转换为池 UUID" -#: tools/virsh.c:4806 +#: tools/virsh.c:9810 msgid "failed to get pool UUID" msgstr "获得池 UUID 失败" -#: tools/virsh.c:4817 +#: tools/virsh.c:9821 msgid "create a vol from an XML file" msgstr "从一个 XML 文件创建一个卷" -#: tools/virsh.c:4824 tools/virsh.c:4882 +#: tools/virsh.c:9828 tools/virsh.c:9885 msgid "file containing an XML vol description" msgstr "包含 XML 卷描述的文件" -#: tools/virsh.c:4861 +#: tools/virsh.c:9864 #, c-format msgid "Vol %s created from %s\n" msgstr "在 %s 中创建卷 %s\n" -#: tools/virsh.c:4865 tools/virsh.c:4922 +#: tools/virsh.c:9868 tools/virsh.c:9924 #, c-format msgid "Failed to create vol from %s" msgstr "在 %s 中创建卷失败" -#: tools/virsh.c:4875 +#: tools/virsh.c:9878 msgid "create a vol, using another volume as input" msgstr "" -#: tools/virsh.c:4876 +#: tools/virsh.c:9879 msgid "Create a vol from an existing volume." msgstr "" -#: tools/virsh.c:4884 +#: tools/virsh.c:9886 msgid "input vol name or key" msgstr "" -#: tools/virsh.c:4883 +#: tools/virsh.c:9887 msgid "pool name or uuid of the input volume's pool" msgstr "" -#: tools/virsh.c:4919 +#: tools/virsh.c:9921 #, c-format msgid "Vol %s created from input vol %s\n" msgstr "" -#: tools/virsh.c:9135 +#: tools/virsh.c:9950 msgid "(volume_definition)" msgstr "" -#: tools/virsh.c:4974 +#: tools/virsh.c:9973 msgid "clone a volume." msgstr "" -#: tools/virsh.c:4975 +#: tools/virsh.c:9974 msgid "Clone an existing volume." msgstr "" -#: tools/virsh.c:4981 +#: tools/virsh.c:9979 msgid "orig vol name or key" msgstr "" -#: tools/virsh.c:4982 +#: tools/virsh.c:9980 msgid "clone name" msgstr "" -#: tools/virsh.c:5004 +#: tools/virsh.c:10003 tools/virsh.c:10795 msgid "failed to get parent pool" msgstr "" -#: tools/virsh.c:5025 +#: tools/virsh.c:10023 #, c-format msgid "Vol %s cloned from %s\n" msgstr "" -#: tools/virsh.c:5028 +#: tools/virsh.c:10026 #, c-format msgid "Failed to clone vol from %s" msgstr "" -#: tools/virsh.c:9235 +#: tools/virsh.c:10050 msgid "upload a file into a volume" msgstr "" -#: tools/virsh.c:9236 +#: tools/virsh.c:10051 msgid "Upload a file into a volume" msgstr "" -#: tools/virsh.c:5058 tools/virsh.c:5099 tools/virsh.c:5150 +#: 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.c:5123 +#: tools/virsh.c:10057 tools/virsh.c:10157 tools/virsh.c:10360 +#: tools/virsh.c:10530 msgid "file" msgstr "文件" -#: tools/virsh.c:9244 +#: tools/virsh.c:10059 msgid "volume offset to upload to" msgstr "" -#: tools/virsh.c:9245 +#: tools/virsh.c:10060 msgid "amount of data to upload" msgstr "" -#: tools/virsh.c:9273 tools/virsh.c:9278 tools/virsh.c:9365 tools/virsh.c:9370 -msgid "Unable to parse integer" -msgstr "" - -#: tools/virsh.c:9298 +#: tools/virsh.c:10113 #, c-format msgid "cannot upload to volume %s" msgstr "" -#: tools/virsh.c:9303 +#: tools/virsh.c:10118 #, c-format msgid "cannot send data to volume %s" msgstr "" -#: tools/virsh.c:9314 tools/virsh.c:9410 +#: tools/virsh.c:10129 tools/virsh.c:10225 #, c-format msgid "cannot close volume %s" msgstr "" -#: tools/virsh.c:9335 tools/virsh.c:9336 +#: tools/virsh.c:10150 tools/virsh.c:10151 msgid "Download a volume to a file" msgstr "" -#: tools/virsh.c:9344 +#: tools/virsh.c:10159 msgid "volume offset to download from" msgstr "" -#: tools/virsh.c:9345 +#: tools/virsh.c:10160 msgid "amount of data to download" msgstr "" -#: tools/virsh.c:9385 +#: tools/virsh.c:10200 #, c-format msgid "cannot create %s" msgstr "" -#: tools/virsh.c:9394 +#: tools/virsh.c:10209 #, c-format msgid "cannot download from volume %s" msgstr "" -#: tools/virsh.c:9399 +#: tools/virsh.c:10214 #, c-format msgid "cannot receive data from volume %s" msgstr "" -#: tools/virsh.c:5051 +#: tools/virsh.c:10247 msgid "delete a vol" msgstr "删除卷" -#: tools/virsh.c:5052 +#: tools/virsh.c:10248 msgid "Delete a given vol." msgstr "删除一个给定的卷。" -#: tools/virsh.c:5077 +#: tools/virsh.c:10273 #, c-format msgid "Vol %s deleted\n" msgstr "卷 %s 被删除\n" -#: tools/virsh.c:5079 +#: tools/virsh.c:10275 #, c-format msgid "Failed to delete vol %s" msgstr "删除卷 %s 失败" -#: tools/virsh.c:9473 +#: tools/virsh.c:10288 msgid "wipe a vol" msgstr "" -#: tools/virsh.c:9474 +#: tools/virsh.c:10289 msgid "Ensure data previously on a volume is not accessible to future reads" msgstr "" -#: tools/virsh.c:9499 +#: tools/virsh.c:10314 #, c-format msgid "Vol %s wiped\n" msgstr "" -#: tools/virsh.c:9501 +#: tools/virsh.c:10316 #, c-format msgid "Failed to wipe vol %s" msgstr "" -#: tools/virsh.c:5092 +#: tools/virsh.c:10329 msgid "storage vol information" msgstr "存储卷信息" -#: tools/virsh.c:5093 +#: tools/virsh.c:10330 msgid "Returns basic information about the storage vol." msgstr "返回关于这个存储卷的基本信息。" -#: tools/virsh.c:5121 +#: tools/virsh.c:10360 tools/virsh.c:10364 tools/virsh.c:10368 +#: tools/virsh.c:10372 msgid "Type:" msgstr "类型:" -#: tools/virsh.c:5123 +#: tools/virsh.c:10364 tools/virsh.c:10533 msgid "block" msgstr "块" -#: tools/virsh.c:9553 tools/virsh.c:9721 +#: tools/virsh.c:10368 tools/virsh.c:10536 msgid "dir" msgstr "" -#: tools/virsh.c:5143 +#: tools/virsh.c:10393 msgid "vol information in XML" msgstr "XML 中的卷信息" -#: tools/virsh.c:5144 +#: tools/virsh.c:10394 msgid "Output the vol information as an XML dump to stdout." msgstr "将卷信息作为一个 XML 转储输出到 stdout。" -#: tools/virsh.c:5184 +#: tools/virsh.c:10434 msgid "list vols" msgstr "列出卷" -#: tools/virsh.c:5185 +#: tools/virsh.c:10435 msgid "Returns list of vols by pool." msgstr "根据池返回卷列表" -#: tools/virsh.c:9626 +#: tools/virsh.c:10441 msgid "display extended details for volumes" msgstr "" -#: tools/virsh.c:9667 +#: tools/virsh.c:10482 msgid "Failed to list storage volumes" msgstr "" -#: tools/virsh.c:5210 tools/virsh.c:5218 +#: tools/virsh.c:10492 msgid "Failed to list active vols" msgstr "列出活跃的卷失败" -#: tools/virsh.c:5226 +#: tools/virsh.c:10604 tools/virsh.c:10624 tools/virsh.c:10669 msgid "Path" msgstr "路径" -#: tools/virsh.c:9814 tools/virsh.c:9854 +#: tools/virsh.c:10629 tools/virsh.c:10669 msgid "Type" msgstr "" -#: tools/virsh.c:9917 +#: tools/virsh.c:10732 msgid "returns the volume name for a given volume key or path" msgstr "" -#: tools/virsh.c:9923 tools/virsh.c:9956 +#: tools/virsh.c:10738 tools/virsh.c:10771 msgid "volume key or path" msgstr "" -#: tools/virsh.c:9949 +#: tools/virsh.c:10764 msgid "returns the storage pool for a given volume key or path" msgstr "" -#: tools/virsh.c:9955 +#: tools/virsh.c:10770 msgid "return the pool uuid rather than pool name" msgstr "" -#: tools/virsh.c:10006 +#: tools/virsh.c:10821 msgid "returns the volume key for a given volume name or path" msgstr "" -#: tools/virsh.c:10012 +#: tools/virsh.c:10827 msgid "volume name or path" msgstr "" -#: tools/virsh.c:10039 +#: tools/virsh.c:10854 msgid "returns the volume path for a given volume name or key" msgstr "" -#: tools/virsh.c:10045 +#: tools/virsh.c:10860 msgid "volume name or key" msgstr "" -#: tools/virsh.c:5362 +#: tools/virsh.c:10894 msgid "define or modify a secret from an XML file" msgstr "" -#: tools/virsh.c:5363 +#: tools/virsh.c:10895 msgid "Define or modify a secret." msgstr "" -#: tools/virsh.c:5368 +#: tools/virsh.c:10900 msgid "file containing secret attributes in XML" msgstr "" -#: tools/virsh.c:5393 +#: tools/virsh.c:10925 #, c-format msgid "Failed to set attributes from %s" msgstr "" -#: tools/virsh.c:5397 +#: tools/virsh.c:10929 msgid "Failed to get UUID of created secret" msgstr "" -#: tools/virsh.c:5401 +#: tools/virsh.c:10933 #, c-format msgid "Secret %s created\n" msgstr "" -#: tools/virsh.c:5410 +#: tools/virsh.c:10942 msgid "secret attributes in XML" msgstr "" -#: tools/virsh.c:5411 +#: tools/virsh.c:10943 msgid "Output attributes of a secret as an XML dump to stdout." msgstr "" -#: tools/virsh.c:5416 tools/virsh.c:5456 tools/virsh.c:5515 tools/virsh.c:5567 +#: tools/virsh.c:10948 tools/virsh.c:10988 tools/virsh.c:11048 +#: tools/virsh.c:11100 msgid "secret UUID" msgstr "" -#: tools/virsh.c:5450 +#: tools/virsh.c:10982 msgid "set a secret value" msgstr "" -#: tools/virsh.c:5451 +#: tools/virsh.c:10983 msgid "Set a secret value." msgstr "" -#: tools/virsh.c:5457 +#: tools/virsh.c:10989 msgid "base64-encoded secret value" msgstr "" -#: tools/virsh.c:5481 +#: tools/virsh.c:11014 msgid "Invalid base64 data" msgstr "" -#: tools/virsh.c:5494 +#: tools/virsh.c:11027 msgid "Failed to set secret value" msgstr "" -#: tools/virsh.c:5497 +#: tools/virsh.c:11030 msgid "Secret value set\n" msgstr "" -#: tools/virsh.c:5509 +#: tools/virsh.c:11042 msgid "Output a secret value" msgstr "" -#: tools/virsh.c:5510 +#: tools/virsh.c:11043 msgid "Output a secret value to stdout." msgstr "" -#: tools/virsh.c:5561 +#: tools/virsh.c:11094 msgid "undefine a secret" msgstr "" -#: tools/virsh.c:5562 +#: tools/virsh.c:11095 msgid "Undefine a secret." msgstr "" -#: tools/virsh.c:5586 +#: tools/virsh.c:11119 #, c-format msgid "Failed to delete secret %s" msgstr "" -#: tools/virsh.c:5589 +#: tools/virsh.c:11122 #, c-format msgid "Secret %s deleted\n" msgstr "" -#: tools/virsh.c:5601 +#: tools/virsh.c:11134 msgid "list secrets" msgstr "" -#: tools/virsh.c:5602 +#: tools/virsh.c:11135 msgid "Returns a list of secrets" msgstr "" -#: tools/virsh.c:5617 tools/virsh.c:5624 +#: tools/virsh.c:11150 tools/virsh.c:11157 msgid "Failed to list secrets" msgstr "" -#: tools/virsh.c:5631 +#: tools/virsh.c:11164 msgid "Usage" msgstr "" -#: tools/virsh.c:5645 +#: tools/virsh.c:11178 msgid "Volume" msgstr "" -#: tools/virsh.c:5655 +#: tools/virsh.c:11188 msgid "Unused" msgstr "" -#: tools/virsh.c:5669 +#: tools/virsh.c:11202 msgid "show version" msgstr "显示版本" -#: tools/virsh.c:5670 +#: tools/virsh.c:11203 msgid "Display the system version information." msgstr "显示系统版本信息。" -#: tools/virsh.c:10393 +#: tools/virsh.c:11208 msgid "report daemon version too" msgstr "" -#: tools/virsh.c:5693 +#: tools/virsh.c:11231 msgid "failed to get hypervisor type" msgstr "获得管理程序类型失败" -#: tools/virsh.c:5702 +#: tools/virsh.c:11240 #, c-format msgid "Compiled against library: libvir %d.%d.%d\n" msgstr "编译使用的库:libvir %d.%d.%d\n" -#: tools/virsh.c:5707 +#: tools/virsh.c:11245 msgid "failed to get the library version" msgstr "获得库函数信息失败" -#: tools/virsh.c:5714 +#: tools/virsh.c:11252 #, c-format msgid "Using library: libvir %d.%d.%d\n" msgstr "使用的库:libvir %d.%d.%d\n" -#: tools/virsh.c:5721 +#: tools/virsh.c:11259 #, c-format msgid "Using API: %s %d.%d.%d\n" msgstr "使用的 API: %s %d.%d.%d\n" -#: tools/virsh.c:5726 +#: tools/virsh.c:11264 msgid "failed to get the hypervisor version" msgstr "获得管理程序版本失败" -#: tools/virsh.c:5731 +#: tools/virsh.c:11269 #, c-format msgid "Cannot extract running %s hypervisor version\n" msgstr "无法提取运行的 %s管理程序版本\n" -#: tools/virsh.c:5738 +#: tools/virsh.c:11276 #, c-format msgid "Running hypervisor: %s %d.%d.%d\n" msgstr "运行管理程序: %s %d.%d.%d\n" -#: tools/virsh.c:10468 +#: tools/virsh.c:11283 msgid "failed to get the daemon version" msgstr "" -#: tools/virsh.c:10474 +#: tools/virsh.c:11289 #, c-format msgid "Running against daemon: %d.%d.%d\n" msgstr "" -#: tools/virsh.c:5748 +#: tools/virsh.c:11301 msgid "enumerate devices on this host" msgstr "这台主机中中的枚举设备" -#: tools/virsh.c:5754 +#: tools/virsh.c:11307 msgid "list devices in a tree" msgstr "在某个树中列出设备" -#: tools/virsh.c:5755 +#: tools/virsh.c:11308 msgid "capability name" msgstr "能力名称" -#: tools/virsh.c:5856 +#: tools/virsh.c:11408 msgid "Failed to count node devices" msgstr "节点设备计数失败" -#: tools/virsh.c:5866 +#: tools/virsh.c:11418 msgid "Failed to list node devices" msgstr "列出节点设备失败" -#: tools/virsh.c:5916 +#: tools/virsh.c:11468 msgid "node device details in XML" msgstr "XML 中的节点设备详情" -#: tools/virsh.c:5917 +#: tools/virsh.c:11469 msgid "Output the node device details as an XML dump to stdout." msgstr "将节点设备详情作为 XML 转储到 stdout。" -#: tools/virsh.c:5923 tools/virsh.c:5966 tools/virsh.c:6007 tools/virsh.c:6048 +#: tools/virsh.c:11475 tools/virsh.c:11518 tools/virsh.c:11559 +#: tools/virsh.c:11600 msgid "device key" msgstr "设备密钥" -#: tools/virsh.c:5939 tools/virsh.c:5982 tools/virsh.c:6023 tools/virsh.c:6064 +#: 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.c:5959 +#: tools/virsh.c:11511 msgid "dettach node device from its device driver" msgstr "" -#: tools/virsh.c:5960 +#: tools/virsh.c:11512 msgid "" "Dettach node device from its device driver before assigning to a domain." msgstr "" -#: tools/virsh.c:5987 +#: tools/virsh.c:11539 #, c-format msgid "Device %s dettached\n" msgstr "分离设备 %s\n" -#: tools/virsh.c:5989 +#: tools/virsh.c:11541 #, c-format msgid "Failed to dettach device %s" msgstr "分离设备 %s 失败" -#: tools/virsh.c:6000 +#: tools/virsh.c:11552 msgid "reattach node device to its device driver" msgstr "" -#: tools/virsh.c:6001 +#: tools/virsh.c:11553 msgid "" "Reattach node device to its device driver once released by the domain." msgstr "" -#: tools/virsh.c:6028 +#: tools/virsh.c:11580 #, c-format msgid "Device %s re-attached\n" msgstr "重新附加设备 %s\n" -#: tools/virsh.c:6030 +#: tools/virsh.c:11582 #, c-format msgid "Failed to re-attach device %s" msgstr "重新附加设备 %s 失败" -#: tools/virsh.c:6041 +#: tools/virsh.c:11593 msgid "reset node device" msgstr "重置节点设备" -#: tools/virsh.c:6042 +#: tools/virsh.c:11594 msgid "Reset node device before or after assigning to a domain." msgstr "在分配到某个域之前或者之后重置节点设备。" -#: tools/virsh.c:6069 +#: tools/virsh.c:11621 #, c-format msgid "Device %s reset\n" msgstr "重置设备 %s\n" -#: tools/virsh.c:6071 +#: tools/virsh.c:11623 #, c-format msgid "Failed to reset device %s" msgstr "重置设备 %s 失败" -#: tools/virsh.c:6082 +#: tools/virsh.c:11634 msgid "print the hypervisor hostname" msgstr "打印管理程序主机名" -#: tools/virsh.c:6097 +#: tools/virsh.c:11649 msgid "failed to get hostname" msgstr "获得主机名失败" -#: tools/virsh.c:6111 +#: tools/virsh.c:11663 msgid "print the hypervisor canonical URI" msgstr "打印管理程序典型的URI" -#: tools/virsh.c:6126 +#: tools/virsh.c:11678 msgid "failed to get URI" msgstr "获得URI失败" -#: tools/virsh.c:10877 +#: tools/virsh.c:11692 msgid "print the hypervisor sysinfo" msgstr "" -#: tools/virsh.c:10879 +#: tools/virsh.c:11694 msgid "output an XML string for the hypervisor sysinfo, if available" msgstr "" -#: tools/virsh.c:10893 +#: tools/virsh.c:11708 msgid "failed to get sysinfo" msgstr "" -#: tools/virsh.c:6140 +#: tools/virsh.c:11722 msgid "vnc display" msgstr "vnc 显示" -#: tools/virsh.c:6141 +#: tools/virsh.c:11723 msgid "Output the IP address and port number for the VNC display." msgstr "为VNC 显示输出IP地址和端口号." -#: tools/virsh.c:6215 +#: tools/virsh.c:11791 msgid "tty console" msgstr "tty 控制台" -#: tools/virsh.c:6216 +#: tools/virsh.c:11792 msgid "Output the device for the TTY console." msgstr "为 TTY 控制台输出设备。" -#: tools/virsh.c:6276 +#: tools/virsh.c:11846 msgid "attach device from an XML file" msgstr "从一个XML文件附加装置" -#: tools/virsh.c:6277 +#: tools/virsh.c:11847 msgid "Attach device from an XML ." msgstr "从一个XML文件附加装置." -#: tools/virsh.c:6283 tools/virsh.c:6341 +#: tools/virsh.c:11853 tools/virsh.c:12162 tools/virsh.c:12241 msgid "XML file" msgstr "XML 文件" -#: tools/virsh.c:11039 +#: tools/virsh.c:11854 msgid "persist device attachment" msgstr "" -#: tools/virsh.c:6318 +#: tools/virsh.c:11895 #, c-format msgid "Failed to attach device from %s" msgstr "从 %s 获得设备失败" -#: tools/virsh.c:6322 +#: tools/virsh.c:11899 msgid "Device attached successfully\n" msgstr "成功附加设备\n" -#: tools/virsh.c:6334 +#: tools/virsh.c:11982 tools/virsh.c:11995 +msgid "Bad child elements counting." +msgstr "" + +#: tools/virsh.c:12056 +#, c-format +msgid "couldn't get XML description of domain %s" +msgstr "" + +#: tools/virsh.c:12063 +msgid "Failed to parse domain definition xml" +msgstr "" + +#: tools/virsh.c:12069 +msgid "Failed to parse device definition xml" +msgstr "" + +#: tools/virsh.c:12091 +msgid "error when selecting nodes" +msgstr "" + +#: tools/virsh.c:12120 +msgid "failed to create document saving context" +msgstr "" + +#: tools/virsh.c:12155 msgid "detach device from an XML file" msgstr "从一个 XML 文件分离设备" -#: tools/virsh.c:6335 +#: tools/virsh.c:12156 msgid "Detach device from an XML " msgstr "从一个 XML 文件分离设备" -#: tools/virsh.c:11104 +#: tools/virsh.c:12163 msgid "persist device detachment" msgstr "" -#: tools/virsh.c:6376 +#: tools/virsh.c:12194 +#, c-format +msgid "no such device in %s" +msgstr "" + +#: tools/virsh.c:12196 +msgid "given XML selects too many devices. Please, be more specific" +msgstr "" + +#: tools/virsh.c:12215 #, c-format msgid "Failed to detach device from %s" msgstr "为域 %s 分离设备失败" -#: tools/virsh.c:6380 +#: tools/virsh.c:12219 msgid "Device detached successfully\n" msgstr "成功分离设备\n" -#: tools/virsh.c:11161 +#: tools/virsh.c:12234 msgid "update device from an XML file" msgstr "" -#: tools/virsh.c:11162 +#: tools/virsh.c:12235 msgid "Update device from an XML ." msgstr "" -#: tools/virsh.c:11169 +#: tools/virsh.c:12242 msgid "persist device update" msgstr "" -#: tools/virsh.c:11170 +#: tools/virsh.c:12243 msgid "force device update" msgstr "" -#: tools/virsh.c:11215 +#: tools/virsh.c:12288 #, c-format msgid "Failed to update device from %s" msgstr "" -#: tools/virsh.c:6392 +#: tools/virsh.c:12304 msgid "attach network interface" msgstr "获得网络界面" -#: tools/virsh.c:6393 +#: tools/virsh.c:12305 msgid "Attach new network interface." msgstr "附加新网络界面." -#: tools/virsh.c:6399 tools/virsh.c:6515 +#: tools/virsh.c:12311 tools/virsh.c:12510 msgid "network interface type" msgstr "网络界面类型" -#: tools/virsh.c:6400 +#: tools/virsh.c:12312 msgid "source of network interface" msgstr "网络界面源" -#: tools/virsh.c:6401 +#: tools/virsh.c:12313 msgid "target network name" msgstr "目标网络名称" -#: tools/virsh.c:6402 tools/virsh.c:6516 +#: tools/virsh.c:12314 tools/virsh.c:12511 msgid "MAC address" msgstr "MAC 地址" -#: tools/virsh.c:6403 +#: tools/virsh.c:12315 msgid "script used to bridge network interface" msgstr "构建网络界面用脚本" -#: tools/virsh.c:11243 +#: tools/virsh.c:12316 msgid "model type" msgstr "" -#: tools/virsh.c:11244 +#: tools/virsh.c:12317 msgid "persist interface attachment" msgstr "" -#: tools/virsh.c:11245 +#: tools/virsh.c:12318 msgid "control domain's incoming traffics" msgstr "" -#: tools/virsh.c:11246 +#: tools/virsh.c:12319 msgid "control domain's outgoing traffics" msgstr "" -#: tools/virsh.c:11326 +#: tools/virsh.c:12399 #, c-format msgid "No support for %s in command 'attach-interface'" msgstr "" -#: tools/virsh.c:11334 +#: tools/virsh.c:12407 msgid "inbound format is incorrect" msgstr "" -#: tools/virsh.c:11338 +#: tools/virsh.c:12411 msgid "inbound average is mandatory" msgstr "" -#: tools/virsh.c:11345 +#: tools/virsh.c:12418 msgid "outbound format is incorrect" msgstr "" -#: tools/virsh.c:11349 +#: tools/virsh.c:12422 msgid "outbound average is mandatory" msgstr "" -#: tools/virsh.c:11413 +#: tools/virsh.c:12486 msgid "Failed to attach interface" msgstr "" -#: tools/virsh.c:6491 +#: tools/virsh.c:12488 msgid "Interface attached successfully\n" msgstr "成功附加接口\n" -#: tools/virsh.c:6508 +#: tools/virsh.c:12503 msgid "detach network interface" msgstr "分离网络界面" -#: tools/virsh.c:6509 +#: tools/virsh.c:12504 msgid "Detach network interface." msgstr "分离网络界面。" -#: tools/virsh.c:11439 +#: tools/virsh.c:12512 msgid "persist interface detachment" msgstr "" -#: tools/virsh.c:6554 tools/virsh.c:6559 +#: tools/virsh.c:12554 msgid "Failed to get interface information" msgstr "获得界面信息失败" -#: tools/virsh.c:6567 +#: tools/virsh.c:12562 #, c-format msgid "No found interface whose type is %s" msgstr "未找到类型为%s的界面" -#: tools/virsh.c:11494 +#: tools/virsh.c:12567 #, c-format msgid "" "Domain has %d interfaces. Please specify which one to detach using --mac" msgstr "" -#: tools/virsh.c:6589 +#: tools/virsh.c:12591 #, c-format msgid "No found interface whose MAC address is %s" msgstr "未找到MAC地址为%s的界面" -#: tools/virsh.c:11545 +#: tools/virsh.c:12618 msgid "Failed to detach interface" msgstr "" -#: tools/virsh.c:6608 +#: tools/virsh.c:12620 msgid "Interface detached successfully\n" msgstr "成功分离接口\n" -#: tools/virsh.c:6628 +#: tools/virsh.c:12638 msgid "attach disk device" msgstr "附加磁盘设备" -#: tools/virsh.c:6629 +#: tools/virsh.c:12639 msgid "Attach new disk device." msgstr "附加新磁盘设备." -#: tools/virsh.c:6635 +#: tools/virsh.c:12646 msgid "source of disk device" msgstr "磁盘设备源" -#: tools/virsh.c:6636 tools/virsh.c:6792 +#: tools/virsh.c:12647 tools/virsh.c:12990 msgid "target of disk device" msgstr "磁盘设备目标" -#: tools/virsh.c:6637 +#: tools/virsh.c:12648 msgid "driver of disk device" msgstr "磁盘设备驱动" -#: tools/virsh.c:6638 +#: tools/virsh.c:12649 msgid "subdriver of disk device" msgstr "磁盘设备副驱动" -#: tools/virsh.c:11576 +#: tools/virsh.c:12650 msgid "cache mode of disk device" msgstr "" -#: tools/virsh.c:6639 +#: tools/virsh.c:12651 msgid "target device type" msgstr "目标设备类型" -#: tools/virsh.c:6640 +#: tools/virsh.c:12652 msgid "mode of device reading and writing" msgstr "设备读写模式" -#: tools/virsh.c:11579 +#: tools/virsh.c:12653 msgid "persist disk attachment" msgstr "" -#: tools/virsh.c:11580 +#: tools/virsh.c:12654 msgid "type of source (block|file)" msgstr "" -#: tools/virsh.c:11581 +#: tools/virsh.c:12655 msgid "serial of disk device" msgstr "" -#: tools/virsh.c:11582 +#: tools/virsh.c:12656 msgid "shareable between domains" msgstr "" -#: tools/virsh.c:11583 +#: tools/virsh.c:12657 msgid "address of disk device" msgstr "" -#: tools/virsh.c:11779 +#: tools/virsh.c:12857 #, c-format msgid "Unknown source type: '%s'" msgstr "" -#: tools/virsh.c:11785 +#: tools/virsh.c:12863 #, c-format msgid "No support for %s in command 'attach-disk'" msgstr "" -#: tools/virsh.c:11826 +#: tools/virsh.c:12905 msgid "Invalid address." msgstr "" -#: tools/virsh.c:11838 +#: tools/virsh.c:12917 msgid "expecting a pci:0000.00.00.00 address." msgstr "" -#: tools/virsh.c:11849 +#: tools/virsh.c:12928 msgid "expecting a scsi:00.00.00 address." msgstr "" -#: tools/virsh.c:11860 +#: tools/virsh.c:12939 msgid "expecting an ide:00.00.00 address." msgstr "" -#: tools/virsh.c:11887 +#: tools/virsh.c:12966 msgid "Failed to attach disk" msgstr "" -#: tools/virsh.c:6769 +#: tools/virsh.c:12968 msgid "Disk attached successfully\n" msgstr "成功附加磁盘\n" -#: tools/virsh.c:6785 +#: tools/virsh.c:12983 msgid "detach disk device" msgstr "分离磁盘设备" -#: tools/virsh.c:6786 +#: tools/virsh.c:12984 msgid "Detach disk device." msgstr "分离磁盘设备。" -#: tools/virsh.c:11912 +#: tools/virsh.c:12991 msgid "persist disk detachment" msgstr "" -#: tools/virsh.c:6827 tools/virsh.c:6832 tools/virsh.c:6839 +#: tools/virsh.c:13027 tools/virsh.c:13034 msgid "Failed to get disk information" msgstr "获得磁盘信息失败" -#: tools/virsh.c:6858 +#: tools/virsh.c:13054 #, c-format msgid "No found disk whose target is %s" msgstr "目标为 %s的磁盘未找到" -#: tools/virsh.c:12002 +#: tools/virsh.c:13081 msgid "Failed to detach disk" msgstr "" -#: tools/virsh.c:6877 +#: tools/virsh.c:13083 msgid "Disk detached successfully\n" msgstr "成功分离磁盘\n" -#: tools/virsh.c:6897 +#: tools/virsh.c:13101 msgid "compare host CPU with a CPU described by an XML file" msgstr "" -#: tools/virsh.c:6898 +#: tools/virsh.c:13102 msgid "compare CPU with host CPU" msgstr "" -#: tools/virsh.c:6903 +#: tools/virsh.c:13107 msgid "file containing an XML CPU description" msgstr "" -#: tools/virsh.c:12053 +#: tools/virsh.c:13132 #, c-format msgid "Failed to read file '%s' to compare" msgstr "" -#: tools/virsh.c:12066 +#: tools/virsh.c:13145 msgid "Can't create XML buffer to extract CPU element." msgstr "" -#: tools/virsh.c:12071 +#: tools/virsh.c:13150 msgid "Failed to extract CPU element snippet from domain XML." msgstr "" -#: tools/virsh.c:12077 +#: tools/virsh.c:13156 #, c-format msgid "" "File '%s' does not contain a element or is not a valid domain or " "capabilities XML" msgstr "" -#: tools/virsh.c:6931 +#: tools/virsh.c:13165 #, c-format msgid "CPU described in %s is incompatible with host CPU\n" msgstr "" -#: tools/virsh.c:6937 +#: tools/virsh.c:13171 #, c-format msgid "CPU described in %s is identical to host CPU\n" msgstr "" -#: tools/virsh.c:6943 +#: tools/virsh.c:13176 #, c-format msgid "Host CPU is a superset of CPU described in %s\n" msgstr "" -#: tools/virsh.c:6950 +#: tools/virsh.c:13182 #, c-format msgid "Failed to compare host CPU with %s" msgstr "" -#: tools/virsh.c:12122 +#: tools/virsh.c:13201 msgid "compute baseline CPU" msgstr "" -#: tools/virsh.c:12123 +#: tools/virsh.c:13202 msgid "Compute baseline CPU for a set of given CPUs." msgstr "" -#: tools/virsh.c:12128 +#: tools/virsh.c:13207 msgid "file containing XML CPU descriptions" msgstr "" -#: tools/virsh.c:12175 +#: tools/virsh.c:13254 #, c-format msgid "No host CPU specified in '%s'" msgstr "" -#: tools/virsh.c:12188 +#: tools/virsh.c:13267 msgid "Failed to extract element" msgstr "" -#: tools/virsh.c:12237 +#: tools/virsh.c:13316 #, c-format msgid "mkstemps: failed to create temporary file: %s" msgstr "" -#: tools/virsh.c:6984 +#: tools/virsh.c:13323 #, c-format msgid "write: %s: failed to write to temporary file: %s" msgstr "写入:%s:写入临时文件失败:%s" -#: tools/virsh.c:6992 +#: tools/virsh.c:13331 #, c-format msgid "close: %s: failed to write or close temporary file: %s" msgstr "关闭:%s:写入或者关闭临时文件失败:%s" -#: tools/virsh.c:7030 +#: 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:7067 +#: tools/virsh.c:13405 #, c-format msgid "%s: failed to read temporary file: %s" msgstr "%s:读取临时文件失败:%s" -#: tools/virsh.c:7080 +#: tools/virsh.c:13417 msgid "change the current directory" msgstr "" -#: tools/virsh.c:7081 +#: tools/virsh.c:13418 msgid "Change the current directory." msgstr "" -#: tools/virsh.c:7086 +#: tools/virsh.c:13423 msgid "directory to switch to (default: home or else root)" msgstr "" -#: tools/virsh.c:7097 +#: tools/virsh.c:13435 msgid "cd: command valid only in interactive mode" msgstr "" -#: tools/virsh.c:7110 +#: tools/virsh.c:13447 #, c-format msgid "cd: %s: %s" msgstr "" -#: tools/virsh.c:7124 +#: tools/virsh.c:13459 msgid "print the current directory" msgstr "" -#: tools/virsh.c:7125 +#: tools/virsh.c:13460 msgid "Print the current directory." msgstr "" -#: tools/virsh.c:7148 +#: tools/virsh.c:13472 #, c-format msgid "pwd: cannot get current directory: %s" msgstr "" -#: tools/virsh.c:7151 +#: tools/virsh.c:13476 #, c-format msgid "%s\n" msgstr "" -#: tools/virsh.c:12408 +#: tools/virsh.c:13487 msgid "echo arguments" msgstr "" -#: tools/virsh.c:12409 +#: tools/virsh.c:13488 msgid "Echo back arguments, possibly with quoting." msgstr "" -#: tools/virsh.c:12414 +#: tools/virsh.c:13493 msgid "escape for shell use" msgstr "" -#: tools/virsh.c:12415 +#: tools/virsh.c:13494 msgid "escape for XML use" msgstr "" -#: tools/virsh.c:12416 +#: tools/virsh.c:13495 msgid "arguments to echo" msgstr "" -#: tools/virsh.c:7162 +#: tools/virsh.c:13560 msgid "edit XML configuration for a domain" msgstr "编辑某个域的 XML 配置" -#: tools/virsh.c:7163 +#: tools/virsh.c:13561 msgid "Edit the XML configuration for a domain." msgstr "编辑某个域的 XML 配置。" -#: tools/virsh.c:7214 +#: tools/virsh.c:13609 #, c-format msgid "Domain %s XML configuration not changed.\n" msgstr "没有更改域 %s XML 配置。\n" -#: tools/virsh.c:7240 +#: tools/virsh.c:13635 #, c-format msgid "Domain %s XML configuration edited.\n" msgstr "编辑了域 %s XML 配置。\n" -#: tools/virsh.c:7265 +#: tools/virsh.c:13661 msgid "edit XML configuration for a network" msgstr "为网络编辑 XML 配置" -#: tools/virsh.c:7266 +#: tools/virsh.c:13662 msgid "Edit the XML configuration for a network." msgstr "为网络编辑 XML 配置。" -#: tools/virsh.c:7282 +#: tools/virsh.c:13678 msgid "edit XML configuration for a storage pool" msgstr "为存储池编辑 XML 配置" -#: tools/virsh.c:7283 +#: tools/virsh.c:13679 msgid "Edit the XML configuration for a storage pool." msgstr "为存储池编辑 XML 配置。" -#: tools/virsh.c:7299 +#: tools/virsh.c:13695 msgid "quit this interactive terminal" msgstr "退出这个非交互式终端" -#: tools/virsh.c:12657 +#: tools/virsh.c:13736 msgid "cannot halt after snapshot of transient domain" msgstr "" -#: tools/virsh.c:12676 +#: tools/virsh.c:13755 msgid "Could not get snapshot name" msgstr "" -#: tools/virsh.c:12681 +#: tools/virsh.c:13760 #, c-format msgid "Domain snapshot %s created from '%s'" msgstr "" -#: tools/virsh.c:12683 +#: tools/virsh.c:13762 #, c-format msgid "Domain snapshot %s created" msgstr "" -#: tools/virsh.c:12700 +#: tools/virsh.c:13779 msgid "Create a snapshot from XML" msgstr "" -#: tools/virsh.c:12701 +#: tools/virsh.c:13780 msgid "Create a snapshot (disk and RAM) from XML" msgstr "" -#: tools/virsh.c:12707 +#: tools/virsh.c:13786 msgid "domain snapshot XML" msgstr "" -#: tools/virsh.c:12708 +#: tools/virsh.c:13787 msgid "redefine metadata for existing snapshot" msgstr "" -#: tools/virsh.c:12709 +#: tools/virsh.c:13788 msgid "with redefine, set current snapshot" msgstr "" -#: tools/virsh.c:12710 tools/virsh.c:12840 +#: tools/virsh.c:13789 tools/virsh.c:13919 msgid "take snapshot but create no metadata" msgstr "" -#: tools/virsh.c:12711 tools/virsh.c:12841 +#: tools/virsh.c:13790 tools/virsh.c:13920 msgid "halt domain after snapshot is created" msgstr "" -#: tools/virsh.c:12712 tools/virsh.c:12842 +#: tools/virsh.c:13791 tools/virsh.c:13921 msgid "capture disk state but not vm state" msgstr "" -#: tools/virsh.c:12824 +#: tools/virsh.c:13903 #, c-format msgid "unable to parse diskspec: %s" msgstr "" -#: tools/virsh.c:12830 +#: tools/virsh.c:13909 msgid "Create a snapshot from a set of args" msgstr "" -#: tools/virsh.c:12831 +#: tools/virsh.c:13910 msgid "Create a snapshot (disk and RAM) from arguments" msgstr "" -#: tools/virsh.c:12837 +#: tools/virsh.c:13916 msgid "name of snapshot" msgstr "" -#: tools/virsh.c:12838 +#: tools/virsh.c:13917 msgid "description of snapshot" msgstr "" -#: tools/virsh.c:12839 +#: tools/virsh.c:13918 msgid "print XML document rather than create" msgstr "" -#: tools/virsh.c:12844 +#: tools/virsh.c:13923 msgid "disk attributes: disk[,snapshot=type][,driver=type][,file=name]" msgstr "" -#: tools/virsh.c:12876 +#: tools/virsh.c:13955 msgid "argument must not be empty" msgstr "" -#: tools/virsh.c:12932 +#: tools/virsh.c:14011 #, c-format msgid "invalid argument for --%s" msgstr "" -#: tools/virsh.c:12937 +#: tools/virsh.c:14016 #, c-format msgid "--%s and --current are mutually exclusive" msgstr "" -#: tools/virsh.c:12946 +#: tools/virsh.c:14025 #, c-format msgid "--%s or --current is required" msgstr "" -#: tools/virsh.c:12962 +#: tools/virsh.c:14041 msgid "edit XML for a snapshot" msgstr "" -#: tools/virsh.c:12963 +#: tools/virsh.c:14042 msgid "Edit the domain snapshot XML for a named snapshot" msgstr "" -#: tools/virsh.c:12969 tools/virsh.c:13644 tools/virsh.c:13763 -#: tools/virsh.c:13837 +#: tools/virsh.c:14048 tools/virsh.c:14723 tools/virsh.c:14842 +#: tools/virsh.c:14916 msgid "snapshot name" msgstr "" -#: tools/virsh.c:12970 +#: tools/virsh.c:14049 msgid "also set edited snapshot as current" msgstr "" -#: tools/virsh.c:12971 +#: tools/virsh.c:14050 msgid "allow renaming an existing snapshot" msgstr "" -#: tools/virsh.c:12972 +#: tools/virsh.c:14051 msgid "allow cloning to new name" msgstr "" -#: tools/virsh.c:12995 +#: tools/virsh.c:14074 msgid "--rename and --clone are mutually exclusive" msgstr "" -#: tools/virsh.c:13041 +#: tools/virsh.c:14120 #, c-format msgid "Snapshot %s XML configuration not changed.\n" msgstr "" -#: tools/virsh.c:13056 +#: tools/virsh.c:14135 #, c-format msgid "Snapshot %s edited.\n" msgstr "" -#: tools/virsh.c:13058 +#: tools/virsh.c:14137 #, c-format msgid "Snapshot %s cloned to %s.\n" msgstr "" -#: tools/virsh.c:13067 +#: tools/virsh.c:14146 #, c-format msgid "Failed to clean up %s" msgstr "" -#: tools/virsh.c:13072 +#: tools/virsh.c:14151 #, c-format msgid "Must use --rename or --clone to change %s to %s" msgstr "" -#: tools/virsh.c:13100 tools/virsh.c:13101 +#: tools/virsh.c:14179 tools/virsh.c:14180 msgid "Get or set the current snapshot" msgstr "" -#: tools/virsh.c:13107 +#: tools/virsh.c:14186 msgid "list the name, rather than the full xml" msgstr "" -#: tools/virsh.c:13111 +#: tools/virsh.c:14190 msgid "name of existing snapshot to make current" msgstr "" -#: tools/virsh.c:13138 +#: tools/virsh.c:14217 #, c-format msgid "invalid snapshotname argument '%s'" msgstr "" -#: tools/virsh.c:13148 +#: tools/virsh.c:14227 msgid "--name and snapshotname are mutually exclusive" msgstr "" -#: tools/virsh.c:13164 +#: tools/virsh.c:14243 #, c-format msgid "Snapshot %s set as current" msgstr "" -#: tools/virsh.c:13173 +#: tools/virsh.c:14252 #, c-format msgid "domain '%s' has no current snapshot" msgstr "" -#: tools/virsh.c:13256 +#: tools/virsh.c:14335 msgid "unable to determine if snapshot has parent" msgstr "" -#: tools/virsh.c:13273 +#: tools/virsh.c:14352 msgid "List snapshots for a domain" msgstr "" -#: tools/virsh.c:13274 +#: tools/virsh.c:14353 msgid "Snapshot List" msgstr "" -#: tools/virsh.c:13280 +#: tools/virsh.c:14359 msgid "add a column showing parent snapshot" msgstr "" -#: tools/virsh.c:13281 +#: tools/virsh.c:14360 msgid "list only snapshots without parents" msgstr "" -#: tools/virsh.c:13282 +#: tools/virsh.c:14361 msgid "list only snapshots without children" msgstr "" -#: tools/virsh.c:13284 +#: tools/virsh.c:14363 msgid "list only snapshots that have metadata that would prevent undefine" msgstr "" -#: tools/virsh.c:13285 +#: tools/virsh.c:14364 msgid "list snapshots in a tree" msgstr "" -#: tools/virsh.c:13286 +#: tools/virsh.c:14365 msgid "limit list to children of given snapshot" msgstr "" -#: tools/virsh.c:13288 +#: tools/virsh.c:14367 msgid "limit list to children of current snapshot" msgstr "" -#: tools/virsh.c:13289 +#: tools/virsh.c:14368 msgid "with --from, list all descendants" msgstr "" -#: tools/virsh.c:13338 +#: tools/virsh.c:14417 msgid "--parent and --roots are mutually exclusive" msgstr "" -#: tools/virsh.c:13343 +#: tools/virsh.c:14422 msgid "--parent and --tree are mutually exclusive" msgstr "" -#: tools/virsh.c:13350 +#: tools/virsh.c:14429 msgid "--roots and --tree are mutually exclusive" msgstr "" -#: tools/virsh.c:13355 +#: tools/virsh.c:14434 msgid "--roots and --from are mutually exclusive" msgstr "" -#: tools/virsh.c:13362 +#: tools/virsh.c:14441 msgid "--leaves and --tree are mutually exclusive" msgstr "" -#: tools/virsh.c:13410 +#: tools/virsh.c:14489 msgid "missing support" msgstr "" -#: tools/virsh.c:13417 tools/virsh.c:13421 +#: tools/virsh.c:14496 tools/virsh.c:14500 msgid "Creation Time" msgstr "" -#: tools/virsh.c:13418 +#: tools/virsh.c:14497 msgid "Parent" msgstr "" -#: tools/virsh.c:13507 +#: tools/virsh.c:14586 #, c-format msgid "snapshot %s disappeared from list" msgstr "" -#: tools/virsh.c:13592 +#: tools/virsh.c:14671 msgid "time_t overflow" msgstr "" -#: tools/virsh.c:13637 +#: tools/virsh.c:14716 msgid "Dump XML for a domain snapshot" msgstr "" -#: tools/virsh.c:13638 +#: tools/virsh.c:14717 msgid "Snapshot Dump XML" msgstr "" -#: tools/virsh.c:13699 +#: tools/virsh.c:14778 msgid "Get the name of the parent of a snapshot" msgstr "" -#: tools/virsh.c:13700 +#: tools/virsh.c:14779 msgid "Extract the snapshot's parent, if any" msgstr "" -#: tools/virsh.c:13706 +#: tools/virsh.c:14785 msgid "find parent of snapshot name" msgstr "" -#: tools/virsh.c:13707 +#: tools/virsh.c:14786 msgid "find parent of current snapshot" msgstr "" -#: tools/virsh.c:13734 +#: tools/virsh.c:14813 #, c-format msgid "snapshot '%s' has no parent" msgstr "" -#: tools/virsh.c:13756 +#: tools/virsh.c:14835 msgid "Revert a domain to a snapshot" msgstr "" -#: tools/virsh.c:13757 +#: tools/virsh.c:14836 msgid "Revert domain to snapshot" msgstr "" -#: tools/virsh.c:13764 +#: tools/virsh.c:14843 msgid "revert to current snapshot" msgstr "" -#: tools/virsh.c:13765 +#: tools/virsh.c:14844 msgid "after reverting, change state to running" msgstr "" -#: tools/virsh.c:13766 +#: tools/virsh.c:14845 msgid "after reverting, change state to paused" msgstr "" -#: tools/virsh.c:13767 +#: tools/virsh.c:14846 msgid "try harder on risky reverts" msgstr "" -#: tools/virsh.c:13830 +#: tools/virsh.c:14909 msgid "Delete a domain snapshot" msgstr "" -#: tools/virsh.c:13831 +#: tools/virsh.c:14910 msgid "Snapshot Delete" msgstr "" -#: tools/virsh.c:13838 +#: tools/virsh.c:14917 msgid "delete current snapshot" msgstr "" -#: tools/virsh.c:13839 +#: tools/virsh.c:14918 msgid "delete snapshot and all children" msgstr "" -#: tools/virsh.c:13840 +#: tools/virsh.c:14919 msgid "delete children but not snapshot" msgstr "" -#: tools/virsh.c:13842 +#: tools/virsh.c:14921 msgid "delete only libvirt metadata, leaving snapshot contents behind" msgstr "" -#: tools/virsh.c:13878 +#: tools/virsh.c:14957 #, c-format msgid "Domain snapshot %s children deleted\n" msgstr "" -#: tools/virsh.c:13880 +#: tools/virsh.c:14959 #, c-format msgid "Domain snapshot %s deleted\n" msgstr "" -#: tools/virsh.c:13882 +#: tools/virsh.c:14961 #, c-format msgid "Failed to delete snapshot %s" msgstr "" -#: tools/virsh.c:13901 tools/virsh.c:13902 +#: tools/virsh.c:14980 tools/virsh.c:14981 msgid "QEMU Monitor Command" msgstr "" -#: tools/virsh.c:13908 +#: tools/virsh.c:14987 msgid "command is in human monitor protocol" msgstr "" -#: tools/virsh.c:13909 +#: tools/virsh.c:14988 msgid "command" msgstr "" -#: tools/virsh.c:13939 +#: tools/virsh.c:15018 msgid "Failed to collect command" msgstr "" -#: tools/virsh.c:13967 tools/virsh.c:13968 +#: tools/virsh.c:15046 tools/virsh.c:15047 msgid "QEMU Attach" msgstr "" -#: tools/virsh.c:13973 +#: tools/virsh.c:15052 msgid "pid" msgstr "" -#: tools/virsh.c:13989 +#: tools/virsh.c:15068 msgid "missing pid value" msgstr "" -#: tools/virsh.c:13997 +#: tools/virsh.c:15076 #, c-format msgid "Domain %s attached to pid %u\n" msgstr "" -#: tools/virsh.c:14002 +#: tools/virsh.c:15081 #, c-format msgid "Failed to attach to pid %u" msgstr "" -#: tools/virsh.c:14388 +#: tools/virsh.c:15474 #, c-format msgid "option --%s already seen" msgstr "" -#: tools/virsh.c:8176 +#: tools/virsh.c:15483 #, c-format msgid "command '%s' doesn't support option --%s" msgstr "命令 '%s' 不支持选项 --%s" -#: tools/virsh.c:7519 +#: tools/virsh.c:15527 #, c-format msgid "command '%s' requires <%s> option" msgstr "命令 '%s' 需要 <%s> 选项" -#: tools/virsh.c:7520 +#: tools/virsh.c:15528 #, c-format msgid "command '%s' requires --%s option" msgstr "命令 '%s' 需要 --%s 选项" -#: tools/virsh.c:14485 +#: tools/virsh.c:15571 #, c-format msgid "command group '%s' doesn't exist" msgstr "" -#: tools/virsh.c:7547 +#: tools/virsh.c:15592 #, c-format msgid "command '%s' doesn't exist" msgstr "命令 '%s' 不存在" -#: tools/virsh.c:14518 tools/virsh.c:15374 +#: tools/virsh.c:15604 tools/virsh.c:16463 #, c-format msgid "internal error: bad options in command: '%s'" msgstr "" -#: tools/virsh.c:7554 +#: tools/virsh.c:15609 msgid " NAME\n" msgstr " NAME\n" -#: tools/virsh.c:7557 +#: tools/virsh.c:15612 msgid "" "\n" " SYNOPSIS\n" @@ -23011,37 +24063,37 @@ "\n" " SYNOPSIS\n" -#: tools/virsh.c:7566 +#: tools/virsh.c:15625 #, c-format msgid "[--%s ]" msgstr "[--%s ]" -#: tools/virsh.c:7568 +#: tools/virsh.c:15631 #, c-format msgid "[--%s ]" msgstr "[--%s ]" -#: tools/virsh.c:14558 +#: tools/virsh.c:15644 #, c-format msgid "{[--%s] }..." msgstr "" -#: tools/virsh.c:14559 +#: tools/virsh.c:15645 #, c-format msgid "[[--%s] ]..." msgstr "" -#: tools/virsh.c:14561 +#: tools/virsh.c:15647 #, c-format msgid "<%s>..." msgstr "" -#: tools/virsh.c:14562 +#: tools/virsh.c:15648 #, c-format msgid "[<%s>]..." msgstr "" -#: tools/virsh.c:7581 +#: tools/virsh.c:15662 msgid "" "\n" " DESCRIPTION\n" @@ -23049,7 +24101,7 @@ "\n" " DESCRIPTION\n" -#: tools/virsh.c:7587 +#: tools/virsh.c:15668 msgid "" "\n" " OPTIONS\n" @@ -23057,72 +24109,72 @@ "\n" " OPTIONS\n" -#: tools/virsh.c:14590 +#: tools/virsh.c:15676 #, c-format msgid "[--%s] " msgstr "" -#: tools/virsh.c:7592 +#: tools/virsh.c:15677 #, c-format msgid "--%s " msgstr "--%s " -#: tools/virsh.c:7594 +#: tools/virsh.c:15681 #, c-format msgid "--%s " msgstr "--%s " -#: tools/virsh.c:14598 tools/virsh.c:14603 +#: tools/virsh.c:15684 tools/virsh.c:15689 #, c-format msgid "[--%s] " msgstr "" -#: tools/virsh.c:14603 +#: tools/virsh.c:15689 #, c-format msgid "<%s>" msgstr "" -#: tools/virsh.c:7746 +#: 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:7795 +#: tools/virsh.c:16100 #, c-format msgid "failed to get domain '%s'" msgstr "获得域 '%s' 失败" -#: tools/virsh.c:7835 +#: tools/virsh.c:16138 #, c-format msgid "failed to get network '%s'" msgstr "获得网络 '%s' 失败" -#: tools/virsh.c:15091 +#: tools/virsh.c:16177 #, c-format msgid "failed to get nwfilter '%s'" msgstr "" -#: tools/virsh.c:7875 +#: tools/virsh.c:16218 #, c-format msgid "failed to get interface '%s'" msgstr "" -#: tools/virsh.c:7912 +#: tools/virsh.c:16253 #, c-format msgid "failed to get pool '%s'" msgstr "获得池 '%s' 失败" -#: tools/virsh.c:15219 +#: tools/virsh.c:16308 #, c-format msgid "failed to get vol '%s', specifying --%s might help" msgstr "" -#: tools/virsh.c:7997 +#: tools/virsh.c:16340 #, c-format msgid "failed to get secret '%s'" msgstr "" -#: tools/virsh.c:8028 +#: tools/virsh.c:16387 #, c-format msgid "" "\n" @@ -23133,213 +24185,213 @@ "(Time: %.3f ms)\n" "\n" -#: tools/virsh.c:8168 +#: tools/virsh.c:16457 #, c-format msgid "unknown command: '%s'" msgstr "未知的命令:'%s'" -#: tools/virsh.c:8191 +#: tools/virsh.c:16496 #, c-format msgid "expected syntax: --%s <%s>" msgstr "期望的使用方法:--%s <%s>" -#: tools/virsh.c:8194 +#: tools/virsh.c:16499 msgid "number" msgstr "数字" -#: tools/virsh.c:8194 +#: tools/virsh.c:16499 msgid "string" msgstr "字符串" -#: tools/virsh.c:15418 +#: tools/virsh.c:16507 #, c-format msgid "invalid '=' after option --%s" msgstr "" -#: tools/virsh.c:8200 +#: tools/virsh.c:16521 #, c-format msgid "unexpected data '%s'" msgstr "非期望的数据 '%s'" -#: tools/virsh.c:15454 +#: tools/virsh.c:16543 msgid "optdata" msgstr "" -#: tools/virsh.c:15454 +#: tools/virsh.c:16543 msgid "bool" msgstr "" -#: tools/virsh.c:15455 +#: tools/virsh.c:16544 msgid "(none)" msgstr "" -#: tools/virsh.c:15571 +#: tools/virsh.c:16660 msgid "dangling \\" msgstr "" -#: tools/virsh.c:8102 +#: tools/virsh.c:16673 msgid "missing \"" msgstr "缺少 \"" -#: tools/virsh.c:8273 tools/virsh.c:8295 +#: tools/virsh.c:16736 tools/virsh.c:16945 msgid "idle" msgstr "闲置" -#: tools/virsh.c:8275 +#: tools/virsh.c:16738 msgid "paused" msgstr "暂停" -#: tools/virsh.c:8277 +#: tools/virsh.c:16740 msgid "in shutdown" msgstr "关闭" -#: tools/virsh.c:8279 +#: tools/virsh.c:16742 msgid "shut off" msgstr "关闭" -#: tools/virsh.c:8281 +#: tools/virsh.c:16744 tools/virsh.c:16830 msgid "crashed" msgstr "崩溃" -#: tools/virsh.c:691 tools/virsh.c:713 tools/virsh.c:8285 tools/virsh.c:8301 +#: tools/virsh.c:16749 tools/virsh.c:16951 msgid "no state" msgstr "没有状态" -#: tools/virsh.c:15677 +#: tools/virsh.c:16766 msgid "booted" msgstr "" -#: tools/virsh.c:15679 tools/virsh.c:15743 +#: tools/virsh.c:16768 tools/virsh.c:16832 msgid "migrated" msgstr "" -#: tools/virsh.c:15681 +#: tools/virsh.c:16770 msgid "restored" msgstr "" -#: tools/virsh.c:15683 tools/virsh.c:15717 tools/virsh.c:15749 +#: tools/virsh.c:16772 tools/virsh.c:16806 tools/virsh.c:16838 msgid "from snapshot" msgstr "" -#: tools/virsh.c:15685 +#: tools/virsh.c:16774 msgid "unpaused" msgstr "" -#: tools/virsh.c:15687 +#: tools/virsh.c:16776 msgid "migration canceled" msgstr "" -#: tools/virsh.c:15689 +#: tools/virsh.c:16778 msgid "save canceled" msgstr "" -#: tools/virsh.c:15705 tools/virsh.c:15728 +#: tools/virsh.c:16794 tools/virsh.c:16817 msgid "user" msgstr "" -#: tools/virsh.c:15707 +#: tools/virsh.c:16796 msgid "migrating" msgstr "" -#: tools/virsh.c:15709 +#: tools/virsh.c:16798 msgid "saving" msgstr "" -#: tools/virsh.c:15711 +#: tools/virsh.c:16800 msgid "dumping" msgstr "" -#: tools/virsh.c:15713 +#: tools/virsh.c:16802 msgid "I/O error" msgstr "" -#: tools/virsh.c:15715 +#: tools/virsh.c:16804 msgid "watchdog" msgstr "" -#: tools/virsh.c:15719 +#: tools/virsh.c:16808 msgid "shutting down" msgstr "" -#: tools/virsh.c:15737 +#: tools/virsh.c:16826 msgid "shutdown" msgstr "" -#: tools/virsh.c:15739 +#: tools/virsh.c:16828 msgid "destroyed" msgstr "" -#: tools/virsh.c:15747 +#: tools/virsh.c:16836 msgid "failed" msgstr "" -#: tools/virsh.c:15804 +#: tools/virsh.c:16893 msgid "unimplemented block statistics parameter type" msgstr "" -#: tools/virsh.c:15837 +#: tools/virsh.c:16926 msgid "ok" msgstr "" -#: tools/virsh.c:15839 +#: tools/virsh.c:16928 msgid "background job" msgstr "" -#: tools/virsh.c:15841 +#: tools/virsh.c:16930 msgid "occupied" msgstr "" -#: tools/virsh.c:8293 +#: tools/virsh.c:16943 msgid "offline" msgstr "离线" -#: tools/virsh.c:8312 +#: tools/virsh.c:16961 msgid "no valid connection" msgstr "无效的连接" -#: tools/virsh.c:8358 +#: tools/virsh.c:17032 msgid "error: " msgstr "错误: " -#: tools/virsh.c:15976 +#: tools/virsh.c:17085 msgid "VIRSH_DEBUG not set with a valid numeric value" msgstr "" -#: tools/virsh.c:8443 +#: tools/virsh.c:17128 msgid "failed to connect to the hypervisor" msgstr "连接到管理程序失败" -#: tools/virsh.c:8475 +#: tools/virsh.c:17158 msgid "failed to get the log file information" msgstr "获得日志文件信息失败" -#: tools/virsh.c:8480 +#: tools/virsh.c:17163 msgid "the log path is not a file" msgstr "日志路径不是一个文件" -#: tools/virsh.c:8488 +#: tools/virsh.c:17171 msgid "failed to open the log file. check the log file path" msgstr "打开日志文件失败,检查日志文件路径" -#: tools/virsh.c:8557 +#: tools/virsh.c:17253 msgid "failed to write the log file" msgstr "写入日志文件失败" -#: tools/virsh.c:8572 +#: tools/virsh.c:17268 #, c-format msgid "%s: failed to write log file: %s" msgstr "%s:写入日志文件失败:%s" -#: tools/virsh.c:16303 +#: tools/virsh.c:17416 msgid "Could not determine home directory" msgstr "" -#: tools/virsh.c:16332 +#: tools/virsh.c:17445 #, c-format msgid "Failed to create '%s': %s" msgstr "" -#: tools/virsh.c:16413 +#: tools/virsh.c:17551 #, c-format msgid "" "\n" @@ -23347,32 +24399,34 @@ "%s [options]... [args...]\n" "\n" " options:\n" -" -c | --connect hypervisor connection URI\n" +" -c | --connect=URI hypervisor connection URI\n" " -r | --readonly connect readonly\n" -" -d | --debug debug level [0-4]\n" +" -d | --debug=NUM debug level [0-4]\n" " -h | --help this help\n" " -q | --quiet quiet mode\n" " -t | --timing print timing information\n" -" -l | --log output logging to file\n" -" -v | --version[=short] program version\n" -" -V | --version=long version and full options\n" +" -l | --log=FILE output logging to file\n" +" -v short version\n" +" -V long version\n" +" --version[=TYPE] version, TYPE is short or long (default short)\n" +" -e | --escape set escape sequence for console\n" "\n" " commands (non interactive mode):\n" "\n" msgstr "" -#: tools/virsh.c:16428 +#: tools/virsh.c:17568 #, c-format msgid " %s (help keyword '%s')\n" msgstr "" -#: tools/virsh.c:16438 +#: tools/virsh.c:17578 msgid "" "\n" " (specify help for details about the commands in the group)\n" msgstr "" -#: tools/virsh.c:8783 +#: tools/virsh.c:17580 msgid "" "\n" " (specify help for details about the command)\n" @@ -23382,57 +24436,66 @@ " (使用 --help 来获得这个命令的详细信息)\n" "\n" -#: tools/virsh.c:16451 +#: tools/virsh.c:17591 #, c-format msgid "Virsh command line tool of libvirt %s\n" msgstr "" -#: tools/virsh.c:16452 +#: tools/virsh.c:17592 #, c-format msgid "" "See web site at %s\n" "\n" msgstr "" -#: tools/virsh.c:16454 +#: tools/virsh.c:17594 msgid "Compiled with support for:\n" msgstr "" -#: tools/virsh.c:16455 +#: tools/virsh.c:17595 msgid " Hypervisors:" msgstr "" -#: tools/virsh.c:16491 +#: tools/virsh.c:17631 msgid " Networking:" msgstr "" -#: tools/virsh.c:16518 +#: tools/virsh.c:17658 msgid " Storage:" msgstr "" -#: tools/virsh.c:16542 +#: tools/virsh.c:17682 msgid " Miscellaneous:" msgstr "" -#: tools/virsh.c:16595 +#: tools/virsh.c:17736 msgid "option -d takes a numeric argument" msgstr "" -#: tools/virsh.c:8875 +#: tools/virsh.c:17774 +#, c-format +msgid "Invalid string '%s' for escape sequence" +msgstr "" + +#: tools/virsh.c:17780 #, c-format msgid "unsupported option '-%c'. See --help." msgstr "不支持选项 '-%c'。参阅 --help。" -#: tools/virsh.c:8882 +#: tools/virsh.c:17787 #, c-format msgid "extra argument '%s'. See --help." msgstr "提取参数 '%s'。请看 --help。" -#: tools/virsh.c:16682 +#: tools/virsh.c:17837 +msgid "Failed to initialize mutex" +msgstr "" + +#: tools/virsh.c:17842 msgid "Failed to initialize libvirt" msgstr "" -#: tools/virsh.c:8966 +#: tools/virsh.c:17871 #, c-format msgid "" "Welcome to %s, the virtualization interactive terminal.\n" @@ -23441,7 +24504,7 @@ "欢迎使用 %s,虚拟化的交互式终端。\n" "\n" -#: tools/virsh.c:8969 +#: tools/virsh.c:17874 msgid "" "Type: 'help' for help with commands\n" " 'quit' to quit\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvisual-0.4.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvisual-0.4.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvisual-0.4.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvisual-0.4.po 2012-02-23 07:11: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: 2011-12-29 15:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: libvisual/lv_libvisual.c:137 msgid "Show info for" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po 2012-02-23 07:11: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: 2011-12-29 15:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: plugins/actor/bumpscope/actor_bumpscope.c:62 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lightdm.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lightdm.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lightdm.po 2012-01-02 18:07:48.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lightdm.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,235 +0,0 @@ -# Chinese (Simplified) translation for lightdm -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 -# This file is distributed under the same license as the lightdm package. -# FIRST AUTHOR , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: lightdm\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-02 23:36+0000\n" -"PO-Revision-Date: 2011-09-19 12:06+0000\n" -"Last-Translator: 朱涛 \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: 2011-12-29 19:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" - -#: ../greeters/gtk/greeter.ui.h:1 -msgid "Cancel" -msgstr "取消" - -#: ../greeters/gtk/greeter.ui.h:2 -msgid "Hibernate" -msgstr "休眠" - -#: ../greeters/gtk/greeter.ui.h:3 -msgid "High Contrast" -msgstr "高对比度" - -#: ../greeters/gtk/greeter.ui.h:4 -msgid "Large Font" -msgstr "大字体" - -#: ../greeters/gtk/greeter.ui.h:5 -msgid "Login" -msgstr "登录" - -#: ../greeters/gtk/greeter.ui.h:6 -msgid "Restart..." -msgstr "重启..." - -#: ../greeters/gtk/greeter.ui.h:7 -msgid "Shutdown..." -msgstr "关闭..." - -#: ../greeters/gtk/greeter.ui.h:8 -msgid "Suspend" -msgstr "待机" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:224 -msgid "Failed to start session" -msgstr "启动会话失败" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:340 -msgid "Incorrect password, please try again" -msgstr "密码不正确,请重试" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:344 -msgid "Failed to authenticate" -msgstr "认证失败" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:409 -msgid "Are you sure you want to close all programs and restart the computer?" -msgstr "您确定要关闭所有程序并重新启动计算机?" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:410 -#: ../greeters/gtk/lightdm-gtk-greeter.c:435 -msgid "Return To Login" -msgstr "返回登录界面" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:410 -msgid "Restart" -msgstr "重启" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:434 -msgid "" -"Are you sure you want to close all programs and shutdown the computer?" -msgstr "您确定要关闭所有程序并关闭计算机?" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:435 -msgid "Shutdown" -msgstr "关机" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:612 -msgid "Guest Account" -msgstr "" - -#: ../greeters/gtk/lightdm-gtk-greeter.c:621 -msgid "Other..." -msgstr "" - -#. Help string for command line --config flag -#: ../src/lightdm.c:883 -msgid "Use configuration file" -msgstr "使用配置文件" - -#. Help string for command line --debug flag -#: ../src/lightdm.c:886 -msgid "Print debugging messages" -msgstr "打印调试信息" - -#. Help string for command line --test-mode flag -#: ../src/lightdm.c:889 -msgid "Run as unprivileged user, skipping things that require root access" -msgstr "以非特权用户运行,跳过需要 root 权限的操作" - -#. Help string for command line --use-passwd flag -#: ../src/lightdm.c:892 -msgid "" -"Use the given password file for authentication (for testing, requires --no-" -"root)" -msgstr "使用指定的密码文件来认证(测试用,需要 --no-root)" - -#. Help string for command line --pid-file flag -#: ../src/lightdm.c:895 -msgid "File to write PID into" -msgstr "要写入 PID 的文件" - -#. Help string for command line --xserver-command flag -#: ../src/lightdm.c:898 -msgid "Command to run X servers" -msgstr "运行 X 服务器的命令" - -#. Help string for command line --greeter-session flag -#: ../src/lightdm.c:901 -msgid "Greeter session" -msgstr "欢迎会话" - -#. Help string for command line --user-session flag -#: ../src/lightdm.c:904 -msgid "User session" -msgstr "用户会话" - -#. Help string for command line --session-wrapper flag -#: ../src/lightdm.c:907 -msgid "Session wrapper" -msgstr "会话包裹器" - -#. Help string for command line --minimum-vt flag -#: ../src/lightdm.c:910 -msgid "Minimum VT to use for X servers" -msgstr "X 服务器使用的最小 VT 号" - -#. Help string for command line --minimum-display-number flag -#: ../src/lightdm.c:913 -msgid "Minimum display number to use for X servers" -msgstr "X 服务器使用的最小显示号" - -#. Help string for command line --xsessions-dir flag -#: ../src/lightdm.c:916 -msgid "Directory to load X sessions from" -msgstr "加载 X 会话的目录" - -#. Help string for command line --xgreeters-dir flag -#: ../src/lightdm.c:919 -msgid "Directory to load X greeters from" -msgstr "加载 X 欢迎界面的目录" - -#. Help string for command line --log-dir flag -#: ../src/lightdm.c:922 -msgid "Directory to write logs to" -msgstr "写入日志的目录" - -#. Help string for command line --run-dir flag -#: ../src/lightdm.c:925 -msgid "Directory to store running state" -msgstr "存储运行状态的目录" - -#. Help string for command line --cache-dir flag -#: ../src/lightdm.c:928 -msgid "Directory to cached information" -msgstr "缓存信息的目录" - -#. Help string for command line --version flag -#: ../src/lightdm.c:931 -msgid "Show release version" -msgstr "显示版本信息" - -#. Arguments and description for --help test -#: ../src/lightdm.c:943 -msgid "- Display Manager" -msgstr "- 显示管理器" - -#. Text printed out when an unknown command-line argument provided -#: ../src/lightdm.c:953 -#, c-format -msgid "Run '%s --help' to see a full list of available command line options." -msgstr "运行“%s --help”来查看可用命令行选项的完整列表。" - -#: ../utils/lightdm-set-defaults.c:37 -msgid "Enable debugging" -msgstr "启用调试" - -#: ../utils/lightdm-set-defaults.c:38 -msgid "Only update if no default already set" -msgstr "仅当无缺省设置时更新" - -#: ../utils/lightdm-set-defaults.c:39 -msgid "Remove default value if it's the current one" -msgstr "去除现在的缺省值" - -#: ../utils/lightdm-set-defaults.c:40 -msgid "Set default session" -msgstr "设置默认会话" - -#: ../utils/lightdm-set-defaults.c:41 -msgid "Set default greeter" -msgstr "设置默认欢迎界面" - -#: ../utils/lightdm-set-defaults.c:115 -msgid "- set lightdm default values" -msgstr "- 设置 lightdm 默认值" - -#: ../utils/lightdm-set-defaults.c:118 -#, c-format -msgid "option parsing failed: %s\n" -msgstr "选项解析失败:%s\n" - -#: ../utils/lightdm-set-defaults.c:124 -#, c-format -msgid "" -"Wrong usage of the command\n" -"%s" -msgstr "" -"错误使用了命令\n" -"%s" - -#. Text printed out when an unknown command-line argument provided -#: ../utils/dm-tool.c:28 -#, c-format -msgid "" -"Run 'dm-tool --help' to see a full list of available command line options." -msgstr "运行 'dm-tool --help' 来查看可以使用的命令的完整列表。" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Linux-PAM.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2012-02-23 07:11:33.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: 2011-12-29 10:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp-live.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-live.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp-live.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-live.po 2012-02-23 07:11: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: 2011-12-29 15:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../ltsp-live:40 msgid "Creating new configuration file" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp-login.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-login.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp-login.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-login.po 2012-02-23 07:11: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: 2011-12-29 15:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ltsp-login.sh:17 #, sh-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/ltsp.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp.po 2012-02-23 07:11: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: 2011-12-29 15:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: ../server/configs/ALTLinux/ltsp-login.sh:30 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lvm2.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lvm2.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lvm2.po 2012-01-02 18:07:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lvm2.po 2012-02-23 07:11: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: 2011-12-29 10:59+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: activate/activate.c:44 msgid "LVM1 proc global snprintf failed" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lynx.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lynx.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/lynx.po 2012-01-02 18:07:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lynx.po 2012-02-23 07:11:49.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: 2011-12-29 14:48+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:47+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. ****************************************************************** #. * The following definitions are for status line prompts, messages, or diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/m17n-db.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/m17n-db.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/m17n-db.po 2012-01-02 18:07:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/m17n-db.po 2012-02-23 07:11: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: 2011-12-29 14:48+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:47+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: MIM/cmc-kbd.mim:26 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mailman.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mailman.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mailman.po 2012-01-02 18:07:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mailman.po 2012-02-23 07:11:34.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: 2011-12-29 11:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Generated-By: pygettext.py 1.4\n" #: Mailman/Archiver/HyperArch.py:123 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/make.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/make.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/make.po 2012-01-02 18:07:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/make.po 2012-02-23 07:11: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: 2011-12-29 15:35+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ar.c:53 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/man-db-gnulib.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db-gnulib.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/man-db-gnulib.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db-gnulib.po 2012-02-23 07:11:34.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: 2011-12-29 11:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: gnulib/lib/argp-help.c:147 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/man-db.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/man-db.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db.po 2012-02-23 07:11:34.000000000 +0000 @@ -25,8 +25,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" # need-proofread diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mlocate.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mlocate.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mlocate.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mlocate.po 2012-02-23 07:11:59.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: 2011-12-29 17:06+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:05+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/MoinMoin.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/MoinMoin.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/MoinMoin.po 2012-02-23 07:11: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: 2011-12-29 11:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:51+0000\n" +"X-Generator: Launchpad (build 14838)\n" msgid "The wiki is currently not reachable." msgstr "此 wiki 目前无法访问。" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mono-tools.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mono-tools.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mono-tools.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mono-tools.po 2012-02-23 07:11: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: 2011-12-29 15:26+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:28+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: docbrowser/browser.glade:8 msgid "Mono Documentation Library" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mountall.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mountall.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mountall.po 2012-01-02 18:07:45.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mountall.po 2012-02-23 07:12:06.000000000 +0000 @@ -7,296 +7,296 @@ msgstr "" "Project-Id-Version: mountall\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-07-15 12:36+0000\n" +"POT-Creation-Date: 2012-02-15 20:54+0000\n" "PO-Revision-Date: 2010-04-13 09:50+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 19:01+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 01:42+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/mountall.c:748 msgid "unable to mount" msgstr "无法挂载" -#: src/mountall.c:1210 src/mountall.c:1214 src/mountall.c:1218 -#: src/mountall.c:1223 src/mountall.c:1227 src/mountall.c:1231 -#: src/mountall.c:1234 +#: src/mountall.c:1244 src/mountall.c:1248 src/mountall.c:1252 +#: src/mountall.c:1257 src/mountall.c:1261 src/mountall.c:1265 +#: src/mountall.c:1268 #, c-format msgid "%s is %s" msgstr "" -#: src/mountall.c:1461 +#: src/mountall.c:1495 #, c-format msgid "" "\n" " %s finished! " msgstr "" -#: src/mountall.c:1561 src/mountall.c:1570 src/mountall.c:1579 -#: src/mountall.c:1597 +#: src/mountall.c:1595 src/mountall.c:1604 src/mountall.c:1613 +#: src/mountall.c:1631 #, c-format msgid "%s finished" msgstr "" -#: src/mountall.c:1589 +#: src/mountall.c:1623 msgid "All filesystems mounted" msgstr "" -#: src/mountall.c:1869 +#: src/mountall.c:1903 #, c-format msgid "setpgid failed: %s" msgstr "" -#: src/mountall.c:1949 +#: src/mountall.c:1983 #, c-format msgid "%s %s [%d] terminated with status %d" msgstr "" -#: src/mountall.c:1953 +#: src/mountall.c:1987 #, c-format msgid "%s %s [%d] exited normally" msgstr "" -#: src/mountall.c:1984 +#: src/mountall.c:2018 #, c-format msgid "remounting %s" msgstr "" -#: src/mountall.c:1995 +#: src/mountall.c:2029 #, c-format msgid "mounting %s" msgstr "" -#: src/mountall.c:2093 src/mountall.c:2099 +#: src/mountall.c:2127 src/mountall.c:2133 #, c-format msgid "Filesystem could not be mounted: %s" msgstr "" -#: src/mountall.c:2142 +#: src/mountall.c:2176 #, c-format msgid "activating %s" msgstr "" -#: src/mountall.c:2172 +#: src/mountall.c:2206 #, c-format msgid "Problem activating swap: %s" msgstr "" -#: src/mountall.c:2217 +#: src/mountall.c:2251 #, c-format msgid "checking %s" msgstr "" -#: src/mountall.c:2290 +#: src/mountall.c:2324 #, c-format msgid "System must be rebooted: %s" msgstr "" -#: src/mountall.c:2295 +#: src/mountall.c:2329 #, c-format msgid "Filesystem has errors: %s" msgstr "" -#: src/mountall.c:2300 +#: src/mountall.c:2334 #, c-format msgid "Unrecoverable fsck error: %s" msgstr "" -#: src/mountall.c:2310 +#: src/mountall.c:2344 #, c-format msgid "Filesytem check cancelled: %s" msgstr "" -#: src/mountall.c:2315 +#: src/mountall.c:2349 #, c-format msgid "Filesystem errors corrected: %s" msgstr "" -#: src/mountall.c:2417 +#: src/mountall.c:2451 #, c-format msgid "rmdir %s failed: %s" msgstr "" -#: src/mountall.c:2428 +#: src/mountall.c:2462 msgid "Disconnected from Upstart" msgstr "从 upstart 断开连接" -#: src/mountall.c:2919 +#: src/mountall.c:2953 #, c-format msgid "ioprio_set %d failed: %s" msgstr "" -#: src/mountall.c:3052 +#: src/mountall.c:3086 msgid "Connected to Plymouth" msgstr "" -#: src/mountall.c:3061 +#: src/mountall.c:3095 msgid "Disconnected from Plymouth" msgstr "" -#: src/mountall.c:3102 +#: src/mountall.c:3136 #, c-format msgid "Checking disk %1$d of %2$d (%3$d %% complete)" msgstr "" -#: src/mountall.c:3126 +#: src/mountall.c:3160 #, c-format msgid "Skipping mounting %s since Plymouth is not available" msgstr "" -#: src/mountall.c:3192 +#: src/mountall.c:3226 #, c-format msgid "The disk drive for %s is not ready yet or not present." msgstr "" -#: src/mountall.c:3195 +#: src/mountall.c:3229 msgid "" "Continue to wait, or Press S to skip mounting or M for manual recovery" msgstr "" -#: src/mountall.c:3199 +#: src/mountall.c:3233 #, c-format msgid "Errors were found while checking the disk drive for %s." msgstr "" -#: src/mountall.c:3202 +#: src/mountall.c:3236 msgid "" "Press F to attempt to fix the errors, I to ignore, S to skip mounting, or M " "for manual recovery" msgstr "" -#: src/mountall.c:3206 +#: src/mountall.c:3240 #, c-format msgid "Serious errors were found while checking the disk drive for %s." msgstr "" -#: src/mountall.c:3209 +#: src/mountall.c:3243 msgid "Press I to ignore, S to skip mounting, or M for manual recovery" msgstr "" -#: src/mountall.c:3213 +#: src/mountall.c:3247 #, c-format msgid "An error occurred while mounting %s." msgstr "" -#: src/mountall.c:3216 +#: src/mountall.c:3250 msgid "Press S to skip mounting or M for manual recovery" msgstr "" -#: src/mountall.c:3220 +#: src/mountall.c:3254 msgid "Checking disk drives for errors. This may take several minutes." msgstr "" -#: src/mountall.c:3222 +#: src/mountall.c:3256 msgid "Press C to cancel all checks in progress" msgstr "" -#: src/mountall.c:3260 +#: src/mountall.c:3294 msgid "Plymouth command failed" msgstr "" -#: src/mountall.c:3288 +#: src/mountall.c:3322 #, c-format msgid "Attempting to fix %s filesystem" msgstr "" -#: src/mountall.c:3305 +#: src/mountall.c:3339 #, c-format msgid "Ignoring errors with %s at user request" msgstr "" -#: src/mountall.c:3319 +#: src/mountall.c:3353 #, c-format msgid "Skipping %s at user request" msgstr "" -#: src/mountall.c:3332 +#: src/mountall.c:3366 msgid "Spawning maintenance shell" msgstr "" -#: src/mountall.c:3352 +#: src/mountall.c:3386 msgid "User cancelled filesystem checks" msgstr "" -#: src/mountall.c:3388 src/mountall.c:3392 src/mountall.c:3396 +#: src/mountall.c:3422 src/mountall.c:3426 src/mountall.c:3430 msgid "" "\n" " Legal values of dev-wait-time lie between 1sec to 2147483647 sec" msgstr "" -#: src/mountall.c:3423 src/mountall.c:3478 +#: src/mountall.c:3457 src/mountall.c:3512 msgid "Empty mountpoint specified" msgstr "" -#: src/mountall.c:3538 +#: src/mountall.c:3572 msgid "Empty device name specified" msgstr "" -#: src/mountall.c:3542 +#: src/mountall.c:3576 msgid "Empty mount point specified" msgstr "" -#: src/mountall.c:3598 +#: src/mountall.c:3632 msgid "Detach and run in the background" msgstr "分离并在后台运行" -#: src/mountall.c:3600 +#: src/mountall.c:3634 msgid "Force check of all filesystems" msgstr "强制检查所有文件系统" -#: src/mountall.c:3602 +#: src/mountall.c:3636 msgid "Attempt to fix all fsck errors" msgstr "尝试修复所有 fsck 检查到的错误" -#: src/mountall.c:3604 +#: src/mountall.c:3638 msgid "Do not emit events after mounting filesystems" msgstr "" -#: src/mountall.c:3606 +#: src/mountall.c:3640 msgid "" "In case of (bootwait,timeout): specify the time to wait for device to be " "detected" msgstr "" -#: src/mountall.c:3607 +#: src/mountall.c:3641 msgid "" "value in seconds (Default is 30 seconds, Legal value between 1second to " "2147483647 seconds)" msgstr "" -#: src/mountall.c:3625 +#: src/mountall.c:3659 msgid "Mount filesystems on boot" msgstr "启动时挂载文件系统" -#: src/mountall.c:3627 +#: src/mountall.c:3661 msgid "" "By default, mountall does not detach from the console and remains in the " "foreground. Use the --daemon option to have it detach." msgstr "mountall 默认运行在前台且不自动进行控制台分离,请使用 --daemon 参数使其成为守护进程。" -#: src/mountall.c:3643 +#: src/mountall.c:3677 msgid "Could not connect to Upstart" msgstr "无法连接到 upstart" -#: src/mountall.c:3657 +#: src/mountall.c:3691 msgid "Could not create Upstart proxy" msgstr "无法创建 upstart 代理" -#: src/mountall.c:3711 +#: src/mountall.c:3745 msgid "root filesystem isn't mounted" msgstr "根文件系统尚未挂载" -#: src/mountall.c:3728 src/mountall.c:3742 +#: src/mountall.c:3762 src/mountall.c:3776 msgid "Unable to become daemon" msgstr "无法成为守护进程" -#: src/mountall.c:3797 +#: src/mountall.c:3831 msgid "Unable to listen for privateconnections" msgstr "" -#: src/mountall.c:3837 +#: src/mountall.c:3871 msgid "Received SIGUSR1 (network device up)" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mutt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mutt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/mutt.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mutt.po 2012-02-23 07:11:34.000000000 +0000 @@ -11,14 +11,14 @@ "Project-Id-Version: Mutt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-15 10:09-0700\n" -"PO-Revision-Date: 2011-01-17 04:06+0000\n" +"PO-Revision-Date: 2012-01-10 12:42+0000\n" "Last-Translator: Deng Xiyue \n" "Language-Team: i18n-zh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: account.c:163 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nabi.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nabi.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nabi.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nabi.po 2012-02-23 07:11:35.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: 2011-12-29 11:03+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/candidate.c:367 msgid "hanja" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nagios-plugins.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nagios-plugins.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nagios-plugins.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nagios-plugins.po 2012-02-23 07:11: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: 2011-12-29 11:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87 #: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nano.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nano.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nano.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nano.po 2012-02-23 07:11:35.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: 2011-12-29 11:04+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/browser.c:220 msgid "Go To Directory" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/neon.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/neon.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/neon.po 2012-01-02 18:07:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/neon.po 2012-02-23 07:11:58.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: 2011-12-29 17:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:01+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/ne_207.c:198 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/net-tools.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/net-tools.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/net-tools.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/net-tools.po 2012-02-23 07:11:35.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: 2011-12-29 11:05+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../arp.c:112 ../arp.c:279 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/NetworkManager.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/NetworkManager.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/NetworkManager.po 2012-02-23 07:11:51.000000000 +0000 @@ -13,101 +13,198 @@ "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=gene" "ral\n" -"POT-Creation-Date: 2011-12-21 07:43+0000\n" +"POT-Creation-Date: 2012-02-18 20:54+0000\n" "PO-Revision-Date: 2011-06-01 00:01+0000\n" "Last-Translator: Aron Xu \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: 2011-12-29 15:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:06+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: ../cli/src/connections.c:55 ../cli/src/connections.c:70 -#: ../cli/src/devices.c:103 ../cli/src/devices.c:116 ../cli/src/devices.c:126 -#: ../cli/src/devices.c:136 ../cli/src/devices.c:150 ../cli/src/devices.c:164 -#: ../cli/src/devices.c:175 ../cli/src/devices.c:186 ../cli/src/devices.c:195 -#: ../cli/src/devices.c:204 ../cli/src/devices.c:226 +#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 +#: ../cli/src/common.c:63 ../cli/src/connections.c:119 +#: ../cli/src/connections.c:153 +msgid "GROUP" +msgstr "" + +#. 0 +#: ../cli/src/common.c:33 ../cli/src/common.c:53 +msgid "ADDRESS" +msgstr "地址" + +#. 1 +#: ../cli/src/common.c:34 ../cli/src/common.c:54 +msgid "ROUTE" +msgstr "" + +#. 2 +#: ../cli/src/common.c:35 ../cli/src/common.c:55 +msgid "DNS" +msgstr "DNS" + +#. 3 +#: ../cli/src/common.c:36 ../cli/src/common.c:56 +msgid "DOMAIN" +msgstr "" + +#. 4 +#: ../cli/src/common.c:37 +msgid "WINS" +msgstr "" + +#. 0 +#: ../cli/src/common.c:45 ../cli/src/common.c:64 +msgid "OPTION" +msgstr "" + +#. 0 +#. used only for 'GENERAL' group listing +#: ../cli/src/connections.c:56 ../cli/src/connections.c:120 +#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131 +#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169 +#: ../cli/src/devices.c:191 msgid "NAME" msgstr "名称" #. 0 -#: ../cli/src/connections.c:56 ../cli/src/connections.c:71 +#. 1 +#: ../cli/src/connections.c:57 ../cli/src/connections.c:121 msgid "UUID" msgstr "UUID" #. 1 -#: ../cli/src/connections.c:57 -msgid "DEVICES" -msgstr "设备" +#. 0 +#. 1 +#. 2 +#: ../cli/src/connections.c:58 ../cli/src/connections.c:154 +#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194 +msgid "TYPE" +msgstr "类型" #. 2 -#: ../cli/src/connections.c:58 -msgid "DEFAULT" -msgstr "默认" +#: ../cli/src/connections.c:59 +msgid "TIMESTAMP" +msgstr "时间戳" #. 3 -#: ../cli/src/connections.c:59 -msgid "SPEC-OBJECT" -msgstr "SPEC 对象" +#: ../cli/src/connections.c:60 +msgid "TIMESTAMP-REAL" +msgstr "真实时间戳" #. 4 -#: ../cli/src/connections.c:60 -msgid "VPN" -msgstr "VPN" +#: ../cli/src/connections.c:61 +msgid "AUTOCONNECT" +msgstr "自动连接" #. 5 +#: ../cli/src/connections.c:62 +msgid "READONLY" +msgstr "只读" + #. 6 +#. 8 #. 2 #. 11 #. 5 -#: ../cli/src/connections.c:61 ../cli/src/connections.c:77 -#: ../cli/src/devices.c:71 ../cli/src/devices.c:216 ../cli/src/devices.c:232 +#: ../cli/src/connections.c:63 ../cli/src/connections.c:128 +#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197 msgid "DBUS-PATH" msgstr "" +#. 2 +#: ../cli/src/connections.c:122 +msgid "DEVICES" +msgstr "设备" + +#. 3 +#. 1 #. 6 -#: ../cli/src/connections.c:62 -msgid "ZONE" +#. 1 +#: ../cli/src/connections.c:123 ../cli/src/devices.c:67 +#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39 +msgid "STATE" +msgstr "状态" + +#. 4 +#: ../cli/src/connections.c:124 +msgid "DEFAULT" +msgstr "默认" + +#. 5 +#: ../cli/src/connections.c:125 +msgid "DEFAULT6" msgstr "" +#. 6 +#: ../cli/src/connections.c:126 +msgid "SPEC-OBJECT" +msgstr "SPEC 对象" + +#. 7 #. 1 +#: ../cli/src/connections.c:127 ../cli/src/connections.c:141 +msgid "VPN" +msgstr "VPN" + +#. 9 +#: ../cli/src/connections.c:129 +msgid "CON-PATH" +msgstr "" + +#. 10 +#: ../cli/src/connections.c:130 +msgid "ZONE" +msgstr "" + +#. 11 +#: ../cli/src/connections.c:131 +msgid "MASTER-PATH" +msgstr "" + +#: ../cli/src/connections.c:139 ../cli/src/devices.c:77 +msgid "GENERAL" +msgstr "常规" + #. 0 +#: ../cli/src/connections.c:140 +msgid "IP" +msgstr "" + #. 1 -#. 2 -#: ../cli/src/connections.c:72 ../cli/src/devices.c:69 -#: ../cli/src/devices.c:105 ../cli/src/devices.c:229 -msgid "TYPE" -msgstr "类型" +#: ../cli/src/connections.c:155 +msgid "USERNAME" +msgstr "" #. 2 -#: ../cli/src/connections.c:73 -msgid "TIMESTAMP" -msgstr "时间戳" +#: ../cli/src/connections.c:156 +msgid "GATEWAY" +msgstr "网关" #. 3 -#: ../cli/src/connections.c:74 -msgid "TIMESTAMP-REAL" -msgstr "真实时间戳" +#: ../cli/src/connections.c:157 +msgid "BANNER" +msgstr "" #. 4 -#: ../cli/src/connections.c:75 -msgid "AUTOCONNECT" -msgstr "自动连接" +#: ../cli/src/connections.c:158 +msgid "VPN-STATE" +msgstr "" #. 5 -#: ../cli/src/connections.c:76 -msgid "READONLY" -msgstr "只读" +#: ../cli/src/connections.c:159 +msgid "CFG" +msgstr "" -#: ../cli/src/connections.c:147 +#: ../cli/src/connections.c:180 #, c-format msgid "" "Usage: nmcli con { COMMAND | help }\n" " COMMAND := { list | status | up | down | delete }\n" "\n" " list [id | uuid ]\n" -" status\n" +" status [id | uuid | path ]\n" " up id | uuid [iface ] [ap ] [nsp ] [--" "nowait] [--timeout ]\n" " up id | uuid [iface ] [ap ] [--nowait] [--timeout " @@ -116,353 +213,376 @@ " delete id | uuid \n" msgstr "" -#: ../cli/src/connections.c:201 ../cli/src/connections.c:534 +#: ../cli/src/connections.c:234 ../cli/src/connections.c:567 #, c-format msgid "Error: 'con list': %s" msgstr "错误:'con list': %s" -#: ../cli/src/connections.c:203 ../cli/src/connections.c:536 +#: ../cli/src/connections.c:236 ../cli/src/connections.c:569 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "错误:'con list': %s;允许的字段:%s" -#: ../cli/src/connections.c:211 +#: ../cli/src/connections.c:244 msgid "Connection details" msgstr "连接详情" -#: ../cli/src/connections.c:409 +#: ../cli/src/connections.c:442 msgid "never" msgstr "从不" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../cli/src/connections.c:410 ../cli/src/connections.c:411 -#: ../cli/src/connections.c:589 ../cli/src/connections.c:591 -#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683 -#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711 -#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572 -#: ../cli/src/settings.c:642 ../cli/src/settings.c:761 -#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044 -#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1048 -#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1177 -#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179 -#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1255 -#: ../cli/src/settings.c:1256 ../cli/src/settings.c:1257 -#: ../cli/src/settings.c:1258 ../cli/src/settings.c:1259 +#: ../cli/src/connections.c:443 ../cli/src/connections.c:444 +#: ../cli/src/connections.c:681 ../cli/src/connections.c:682 +#: ../cli/src/connections.c:684 ../cli/src/devices.c:586 +#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751 +#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810 +#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813 +#: ../cli/src/settings.c:576 ../cli/src/settings.c:646 +#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048 +#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051 +#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054 +#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183 +#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185 #: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261 #: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263 #: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265 #: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267 -#: ../cli/src/settings.c:1338 +#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269 +#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271 +#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343 msgid "yes" msgstr "是" -#: ../cli/src/connections.c:410 ../cli/src/connections.c:411 -#: ../cli/src/connections.c:589 ../cli/src/connections.c:591 -#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683 -#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711 -#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572 -#: ../cli/src/settings.c:574 ../cli/src/settings.c:642 -#: ../cli/src/settings.c:761 ../cli/src/settings.c:1043 -#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046 +#: ../cli/src/connections.c:443 ../cli/src/connections.c:444 +#: ../cli/src/connections.c:681 ../cli/src/connections.c:682 +#: ../cli/src/connections.c:684 ../cli/src/devices.c:586 +#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751 +#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810 +#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813 +#: ../cli/src/settings.c:576 ../cli/src/settings.c:578 +#: ../cli/src/settings.c:646 ../cli/src/settings.c:766 #: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049 -#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178 -#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180 -#: ../cli/src/settings.c:1255 ../cli/src/settings.c:1256 -#: ../cli/src/settings.c:1257 ../cli/src/settings.c:1258 -#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260 +#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053 +#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182 +#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184 +#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260 #: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262 #: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264 #: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266 -#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1338 +#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268 +#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270 +#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272 +#: ../cli/src/settings.c:1343 msgid "no" msgstr "否" -#: ../cli/src/connections.c:485 +#: ../cli/src/connections.c:518 msgid "Connection list" msgstr "" -#: ../cli/src/connections.c:498 ../cli/src/connections.c:1410 -#: ../cli/src/connections.c:1425 ../cli/src/connections.c:1434 -#: ../cli/src/connections.c:1444 ../cli/src/connections.c:1456 -#: ../cli/src/connections.c:1551 ../cli/src/connections.c:1634 -#: ../cli/src/devices.c:1186 ../cli/src/devices.c:1196 -#: ../cli/src/devices.c:1310 ../cli/src/devices.c:1318 -#: ../cli/src/devices.c:1531 ../cli/src/devices.c:1538 +#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064 +#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823 +#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842 +#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949 +#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190 +#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314 +#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535 +#: ../cli/src/devices.c:1542 #, c-format msgid "Error: %s argument is missing." msgstr "错误:缺少 %s 参数。" -#: ../cli/src/connections.c:511 +#: ../cli/src/connections.c:544 #, c-format msgid "Error: %s - no such connection." msgstr "错误:%s - 没有这个连接。" -#: ../cli/src/connections.c:517 ../cli/src/connections.c:1469 -#: ../cli/src/connections.c:1568 ../cli/src/connections.c:1641 -#: ../cli/src/devices.c:983 ../cli/src/devices.c:1063 -#: ../cli/src/devices.c:1210 ../cli/src/devices.c:1324 -#: ../cli/src/devices.c:1544 +#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867 +#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058 +#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067 +#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328 +#: ../cli/src/devices.c:1548 #, c-format msgid "Unknown parameter: %s\n" msgstr "未知参数:%s\n" -#: ../cli/src/connections.c:526 +#: ../cli/src/connections.c:559 #, c-format msgid "Error: no valid parameter specified." msgstr "错误:没有指定有效参数。" -#: ../cli/src/connections.c:541 ../cli/src/connections.c:1722 -#: ../cli/src/devices.c:1752 ../cli/src/network-manager.c:456 +#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151 +#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456 #, c-format msgid "Error: %s." msgstr "错误:%s。" -#: ../cli/src/connections.c:630 -#, c-format -msgid "Error: 'con status': %s" -msgstr "错误:'con status': %s" - -#: ../cli/src/connections.c:632 -#, c-format -msgid "Error: 'con status': %s; allowed fields: %s" -msgstr "错误:'con status': %s;允许的字段:%s" - -#: ../cli/src/connections.c:640 ../cli/src/connections.c:1484 -#: ../cli/src/connections.c:1583 ../cli/src/connections.c:1655 -#: ../cli/src/devices.c:1010 ../cli/src/devices.c:1072 -#: ../cli/src/devices.c:1225 ../cli/src/devices.c:1354 -#: ../cli/src/devices.c:1573 -#, c-format -msgid "Error: Can't find out if NetworkManager is running: %s." -msgstr "" - -#: ../cli/src/connections.c:644 ../cli/src/connections.c:1488 -#: ../cli/src/connections.c:1587 ../cli/src/connections.c:1659 -#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076 -#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358 -#: ../cli/src/devices.c:1577 -#, c-format -msgid "Error: NetworkManager is not running." -msgstr "" - -#: ../cli/src/connections.c:652 -msgid "Active connections" -msgstr "活跃连接" - -#: ../cli/src/connections.c:1127 -#, c-format -msgid "no active connection on device '%s'" -msgstr "设备 '%s' 中没有活跃连接" - -#: ../cli/src/connections.c:1135 -#, c-format -msgid "no active connection or device" -msgstr "没有活跃连接或者设备" - -#: ../cli/src/connections.c:1206 -#, c-format -msgid "device '%s' not compatible with connection '%s'" -msgstr "设备 '%s' 不兼容连接 '%s'" - -#: ../cli/src/connections.c:1208 -#, c-format -msgid "no device found for connection '%s'" -msgstr "没有找到可用于连接 '%s' 的设备" - -#: ../cli/src/connections.c:1219 +#: ../cli/src/connections.c:587 msgid "activating" msgstr "激活中" -#: ../cli/src/connections.c:1221 +#: ../cli/src/connections.c:589 msgid "activated" msgstr "已激活" -#: ../cli/src/connections.c:1223 ../cli/src/devices.c:296 +#: ../cli/src/connections.c:591 ../cli/src/devices.c:261 msgid "deactivating" msgstr "" -#: ../cli/src/connections.c:1226 ../cli/src/connections.c:1249 -#: ../cli/src/connections.c:1282 ../cli/src/devices.c:300 -#: ../cli/src/devices.c:684 ../cli/src/network-manager.c:111 +#: ../cli/src/connections.c:594 ../cli/src/connections.c:617 +#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265 +#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111 #: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176 #: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291 #: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384 -#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:527 -#: ../cli/src/utils.c:397 +#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531 +#: ../cli/src/utils.c:499 ../src/main.c:438 ../src/main.c:457 msgid "unknown" msgstr "未知" -#: ../cli/src/connections.c:1235 +#: ../cli/src/connections.c:603 msgid "VPN connecting (prepare)" msgstr "VPN 连接(准备)" -#: ../cli/src/connections.c:1237 +#: ../cli/src/connections.c:605 msgid "VPN connecting (need authentication)" msgstr "VPN 连接中(需要验证)" -#: ../cli/src/connections.c:1239 +#: ../cli/src/connections.c:607 msgid "VPN connecting" msgstr "VPN 连接中" -#: ../cli/src/connections.c:1241 +#: ../cli/src/connections.c:609 msgid "VPN connecting (getting IP configuration)" msgstr "VPN 连接中(获取 IP 配置)" -#: ../cli/src/connections.c:1243 +#: ../cli/src/connections.c:611 msgid "VPN connected" msgstr "VPN 连接" -#: ../cli/src/connections.c:1245 +#: ../cli/src/connections.c:613 msgid "VPN connection failed" msgstr "VPN 连接失败" -#: ../cli/src/connections.c:1247 +#: ../cli/src/connections.c:615 msgid "VPN disconnected" msgstr "断开 VPN 连接" -#: ../cli/src/connections.c:1258 +#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092 +#, c-format +msgid "Error: 'con status': %s" +msgstr "错误:'con status': %s" + +#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094 +#, c-format +msgid "Error: 'con status': %s; allowed fields: %s" +msgstr "错误:'con status': %s;允许的字段:%s" + +#: ../cli/src/connections.c:878 +msgid "Active connection details" +msgstr "" + +#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882 +#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072 +#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076 +#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358 +#: ../cli/src/devices.c:1577 +#, c-format +msgid "Error: Can't find out if NetworkManager is running: %s." +msgstr "" + +#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886 +#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076 +#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080 +#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362 +#: ../cli/src/devices.c:1581 +#, c-format +msgid "Error: NetworkManager is not running." +msgstr "" + +#: ../cli/src/connections.c:1050 +msgid "Active connections" +msgstr "活跃连接" + +#: ../cli/src/connections.c:1075 +#, c-format +msgid "Error: '%s' is not an active connection." +msgstr "" + +#: ../cli/src/connections.c:1080 +#, c-format +msgid "Error: unknown parameter: %s" +msgstr "" + +#: ../cli/src/connections.c:1564 +#, c-format +msgid "no active connection on device '%s'" +msgstr "设备 '%s' 中没有活跃连接" + +#: ../cli/src/connections.c:1572 +#, c-format +msgid "no active connection or device" +msgstr "没有活跃连接或者设备" + +#: ../cli/src/connections.c:1643 +#, c-format +msgid "device '%s' not compatible with connection '%s'" +msgstr "设备 '%s' 不兼容连接 '%s'" + +#: ../cli/src/connections.c:1645 +#, c-format +msgid "no device found for connection '%s'" +msgstr "没有找到可用于连接 '%s' 的设备" + +#: ../cli/src/connections.c:1656 msgid "unknown reason" msgstr "未知原因" -#: ../cli/src/connections.c:1260 +#: ../cli/src/connections.c:1658 msgid "none" msgstr "无" -#: ../cli/src/connections.c:1262 +#: ../cli/src/connections.c:1660 msgid "the user was disconnected" msgstr "用户已断开连接" -#: ../cli/src/connections.c:1264 +#: ../cli/src/connections.c:1662 msgid "the base network connection was interrupted" msgstr "基点网络连接中断" -#: ../cli/src/connections.c:1266 +#: ../cli/src/connections.c:1664 msgid "the VPN service stopped unexpectedly" msgstr "VPN 服务意外停止" -#: ../cli/src/connections.c:1268 +#: ../cli/src/connections.c:1666 msgid "the VPN service returned invalid configuration" msgstr "VPN 服务返回无效配置" -#: ../cli/src/connections.c:1270 +#: ../cli/src/connections.c:1668 msgid "the connection attempt timed out" msgstr "连接尝试超时" -#: ../cli/src/connections.c:1272 +#: ../cli/src/connections.c:1670 msgid "the VPN service did not start in time" msgstr "VPN 连接没有按时启动" -#: ../cli/src/connections.c:1274 +#: ../cli/src/connections.c:1672 msgid "the VPN service failed to start" msgstr "VPN 服务启动失败" -#: ../cli/src/connections.c:1276 +#: ../cli/src/connections.c:1674 msgid "no valid VPN secrets" msgstr "没有有效的 VPN 加密" -#: ../cli/src/connections.c:1278 +#: ../cli/src/connections.c:1676 msgid "invalid VPN secrets" msgstr "无效 VPN 加密" -#: ../cli/src/connections.c:1280 +#: ../cli/src/connections.c:1678 msgid "the connection was removed" msgstr "连接被删除" -#: ../cli/src/connections.c:1294 +#: ../cli/src/connections.c:1692 #, c-format msgid "state: %s\n" msgstr "状态:%s\n" -#: ../cli/src/connections.c:1297 ../cli/src/connections.c:1323 +#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721 #, c-format msgid "Connection activated\n" msgstr "连接已激活\n" -#: ../cli/src/connections.c:1300 +#: ../cli/src/connections.c:1698 #, c-format msgid "Error: Connection activation failed." msgstr "错误:激活连接失败。" -#: ../cli/src/connections.c:1319 +#: ../cli/src/connections.c:1717 #, c-format msgid "state: %s (%d)\n" msgstr "状态:%s (%d)\n" -#: ../cli/src/connections.c:1329 +#: ../cli/src/connections.c:1727 #, c-format msgid "Error: Connection activation failed: %s." msgstr "错误:激活连接失败:%s。" -#: ../cli/src/connections.c:1346 ../cli/src/devices.c:1132 +#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136 #, c-format msgid "Error: Timeout %d sec expired." msgstr "错误:超时 %d 秒过期。" -#: ../cli/src/connections.c:1359 +#: ../cli/src/connections.c:1757 #, c-format msgid "Error: Connection activation failed: %s" msgstr "错误:激活连接失败:%s" -#: ../cli/src/connections.c:1365 +#: ../cli/src/connections.c:1763 #, c-format msgid "Active connection state: %s\n" msgstr "活跃连接状态:%s\n" -#: ../cli/src/connections.c:1366 +#: ../cli/src/connections.c:1764 #, c-format msgid "Active connection path: %s\n" msgstr "活跃连接路径:%s\n" -#: ../cli/src/connections.c:1418 ../cli/src/connections.c:1559 -#: ../cli/src/connections.c:1668 +#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957 +#: ../cli/src/connections.c:2085 #, c-format msgid "Error: Unknown connection: %s." msgstr "错误:未知连接:%s" -#: ../cli/src/connections.c:1464 ../cli/src/devices.c:1204 +#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "错误:超时值 '%s' 无效。" -#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1576 -#: ../cli/src/connections.c:1648 +#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974 +#: ../cli/src/connections.c:2065 #, c-format msgid "Error: id or uuid has to be specified." msgstr "错误:必须指定 ID 或者 UUID。" -#: ../cli/src/connections.c:1505 +#: ../cli/src/connections.c:1903 #, c-format msgid "Error: No suitable device found: %s." msgstr "错误:没有找到合适的设备:%s。" -#: ../cli/src/connections.c:1507 +#: ../cli/src/connections.c:1905 #, c-format msgid "Error: No suitable device found." msgstr "错误:没有找到合适的设备。" -#: ../cli/src/connections.c:1612 +#: ../cli/src/connections.c:2010 #, c-format msgid "Warning: Connection not active\n" msgstr "警告:连接没有激活\n" -#: ../cli/src/connections.c:1713 +#: ../cli/src/connections.c:2024 +#, c-format +msgid "Error: Connection deletion failed: %s" +msgstr "" + +#: ../cli/src/connections.c:2142 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "错误:'con' 命令 '%s' 无效。" -#: ../cli/src/connections.c:1778 +#: ../cli/src/connections.c:2207 #, c-format msgid "Error: could not connect to D-Bus." msgstr "错误:无法连接到 D-Bus。" -#: ../cli/src/connections.c:1786 +#: ../cli/src/connections.c:2215 #, c-format msgid "Error: Could not get system settings." msgstr "错误:无法获得系统设置。" -#: ../cli/src/connections.c:1796 +#: ../cli/src/connections.c:2225 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -470,222 +590,230 @@ #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:214 -#: ../cli/src/devices.c:230 +#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179 +#: ../cli/src/devices.c:195 msgid "DEVICE" msgstr "设备" -#. 1 -#. 4 -#. 1 -#: ../cli/src/devices.c:70 ../cli/src/devices.c:108 -#: ../cli/src/network-manager.c:39 -msgid "STATE" -msgstr "状态" - -#: ../cli/src/devices.c:80 -msgid "GENERAL" -msgstr "常规" - #. 0 -#: ../cli/src/devices.c:81 +#: ../cli/src/devices.c:78 msgid "CAPABILITIES" msgstr "功能" #. 1 -#: ../cli/src/devices.c:82 +#: ../cli/src/devices.c:79 msgid "WIFI-PROPERTIES" msgstr "WIFI 属性" #. 2 -#: ../cli/src/devices.c:83 +#: ../cli/src/devices.c:80 msgid "AP" msgstr "AP" #. 3 -#: ../cli/src/devices.c:84 +#: ../cli/src/devices.c:81 msgid "WIRED-PROPERTIES" msgstr "有线连接属性" #. 4 -#: ../cli/src/devices.c:85 +#: ../cli/src/devices.c:82 msgid "WIMAX-PROPERTIES" msgstr "" #. 5 #. 0 -#: ../cli/src/devices.c:86 ../cli/src/devices.c:227 +#: ../cli/src/devices.c:83 ../cli/src/devices.c:192 msgid "NSP" msgstr "" #. 6 -#: ../cli/src/devices.c:87 -msgid "IP4-SETTINGS" -msgstr "IP4 设置" +#: ../cli/src/devices.c:84 +msgid "IP4" +msgstr "" #. 7 -#: ../cli/src/devices.c:88 -msgid "IP4-DNS" -msgstr "IP4-DNS" +#: ../cli/src/devices.c:85 +msgid "DHCP4" +msgstr "" #. 8 -#: ../cli/src/devices.c:89 -msgid "IP6-SETTINGS" -msgstr "IP6 设置" +#: ../cli/src/devices.c:86 +msgid "IP6" +msgstr "" #. 9 -#: ../cli/src/devices.c:90 -msgid "IP6-DNS" -msgstr "IP6-DNS" +#: ../cli/src/devices.c:87 +msgid "DHCP6" +msgstr "" #. 2 -#: ../cli/src/devices.c:106 +#: ../cli/src/devices.c:103 +msgid "VENDOR" +msgstr "" + +#. 3 +#: ../cli/src/devices.c:104 +msgid "PRODUCT" +msgstr "" + +#. 4 +#: ../cli/src/devices.c:105 msgid "DRIVER" msgstr "驱动程序" -#. 3 -#: ../cli/src/devices.c:107 +#. 5 +#: ../cli/src/devices.c:106 msgid "HWADDR" msgstr "硬盘" +#. 7 +#: ../cli/src/devices.c:108 +msgid "REASON" +msgstr "" + +#. 8 +#: ../cli/src/devices.c:109 +msgid "UDI" +msgstr "" + +#. 9 +#: ../cli/src/devices.c:110 +msgid "IP-IFACE" +msgstr "" + +#. 10 +#: ../cli/src/devices.c:111 +msgid "NM-MANAGED" +msgstr "" + +#. 11 +#: ../cli/src/devices.c:112 +msgid "FIRMWARE-MISSING" +msgstr "" + +#. 12 +#: ../cli/src/devices.c:113 +msgid "CONNECTION" +msgstr "" + #. 0 -#: ../cli/src/devices.c:117 +#: ../cli/src/devices.c:122 msgid "CARRIER-DETECT" msgstr "容器探测" #. 1 -#: ../cli/src/devices.c:118 +#: ../cli/src/devices.c:123 msgid "SPEED" msgstr "速度" #. 0 -#: ../cli/src/devices.c:127 +#: ../cli/src/devices.c:132 msgid "CARRIER" msgstr "容器" #. 0 -#: ../cli/src/devices.c:137 +#: ../cli/src/devices.c:142 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:138 +#: ../cli/src/devices.c:143 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:139 +#: ../cli/src/devices.c:144 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:140 +#: ../cli/src/devices.c:145 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:141 +#: ../cli/src/devices.c:146 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:151 +#: ../cli/src/devices.c:156 msgid "CTR-FREQ" msgstr "" #. 1 -#: ../cli/src/devices.c:152 +#: ../cli/src/devices.c:157 msgid "RSSI" msgstr "" #. 2 -#: ../cli/src/devices.c:153 +#: ../cli/src/devices.c:158 msgid "CINR" msgstr "" #. 3 -#: ../cli/src/devices.c:154 +#: ../cli/src/devices.c:159 msgid "TX-POW" msgstr "" #. 4 -#: ../cli/src/devices.c:155 +#: ../cli/src/devices.c:160 msgid "BSID" msgstr "" #. 0 -#: ../cli/src/devices.c:165 ../cli/src/devices.c:176 -msgid "ADDRESS" -msgstr "地址" - -#. 1 -#: ../cli/src/devices.c:166 ../cli/src/devices.c:177 -msgid "PREFIX" -msgstr "前缀" - -#. 2 -#: ../cli/src/devices.c:167 ../cli/src/devices.c:178 -msgid "GATEWAY" -msgstr "网关" - -#. 0 -#: ../cli/src/devices.c:187 ../cli/src/devices.c:196 -msgid "DNS" -msgstr "DNS" - -#. 0 -#: ../cli/src/devices.c:205 +#: ../cli/src/devices.c:170 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:206 +#: ../cli/src/devices.c:171 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:207 +#: ../cli/src/devices.c:172 msgid "MODE" msgstr "型号" #. 3 -#: ../cli/src/devices.c:208 +#: ../cli/src/devices.c:173 msgid "FREQ" msgstr "FREQ" #. 4 -#: ../cli/src/devices.c:209 +#: ../cli/src/devices.c:174 msgid "RATE" msgstr "频率" #. 5 #. 1 -#: ../cli/src/devices.c:210 ../cli/src/devices.c:228 +#: ../cli/src/devices.c:175 ../cli/src/devices.c:193 msgid "SIGNAL" msgstr "信号" #. 6 -#: ../cli/src/devices.c:211 +#: ../cli/src/devices.c:176 msgid "SECURITY" msgstr "安全性" #. 7 -#: ../cli/src/devices.c:212 +#: ../cli/src/devices.c:177 msgid "WPA-FLAGS" msgstr "WPA-标志" #. 8 -#: ../cli/src/devices.c:213 +#: ../cli/src/devices.c:178 msgid "RSN-FLAGS" msgstr "RSN-标志" #. 10 #. 4 -#: ../cli/src/devices.c:215 ../cli/src/devices.c:231 +#: ../cli/src/devices.c:180 ../cli/src/devices.c:196 msgid "ACTIVE" msgstr "活跃" -#: ../cli/src/devices.c:248 +#: ../cli/src/devices.c:213 #, c-format msgid "" "Usage: nmcli dev { COMMAND | help }\n" @@ -702,257 +830,457 @@ "\n" msgstr "" -#: ../cli/src/devices.c:276 +#: ../cli/src/devices.c:241 msgid "unmanaged" msgstr "未管理" -#: ../cli/src/devices.c:278 +#: ../cli/src/devices.c:243 msgid "unavailable" msgstr "不可用" -#: ../cli/src/devices.c:280 ../cli/src/network-manager.c:108 +#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108 msgid "disconnected" msgstr "已断开" -#: ../cli/src/devices.c:282 +#: ../cli/src/devices.c:247 msgid "connecting (prepare)" msgstr "连接中(准备)" -#: ../cli/src/devices.c:284 +#: ../cli/src/devices.c:249 msgid "connecting (configuring)" msgstr "连接中(配置)" -#: ../cli/src/devices.c:286 +#: ../cli/src/devices.c:251 msgid "connecting (need authentication)" msgstr "连接中(需要验证)" -#: ../cli/src/devices.c:288 +#: ../cli/src/devices.c:253 msgid "connecting (getting IP configuration)" msgstr "连接中(获得 IP 配置)" -#: ../cli/src/devices.c:290 +#: ../cli/src/devices.c:255 msgid "connecting (checking IP connectivity)" msgstr "" -#: ../cli/src/devices.c:292 +#: ../cli/src/devices.c:257 msgid "connecting (starting secondary connections)" msgstr "" -#: ../cli/src/devices.c:294 ../cli/src/network-manager.c:104 +#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104 msgid "connected" msgstr "连接的" -#: ../cli/src/devices.c:298 +#: ../cli/src/devices.c:263 msgid "connection failed" msgstr "连接失败" -#: ../cli/src/devices.c:323 ../cli/src/devices.c:335 ../cli/src/devices.c:495 -#: ../cli/src/devices.c:539 +#: ../cli/src/devices.c:274 +msgid "No reason given" +msgstr "" + +#: ../cli/src/devices.c:277 +msgid "Unknown error" +msgstr "" + +#: ../cli/src/devices.c:280 +msgid "Device is now managed" +msgstr "" + +#: ../cli/src/devices.c:283 +msgid "Device is now unmanaged" +msgstr "" + +#: ../cli/src/devices.c:286 +msgid "The device could not be readied for configuration" +msgstr "" + +#: ../cli/src/devices.c:289 +msgid "" +"IP configuration could not be reserved (no available address, timeout, etc)" +msgstr "" + +#: ../cli/src/devices.c:292 +msgid "The IP configuration is no longer valid" +msgstr "" + +#: ../cli/src/devices.c:295 +msgid "Secrets were required, but not provided" +msgstr "" + +#: ../cli/src/devices.c:298 +msgid "802.1X supplicant disconnected" +msgstr "" + +#: ../cli/src/devices.c:301 +msgid "802.1X supplicant configuration failed" +msgstr "" + +#: ../cli/src/devices.c:304 +msgid "802.1X supplicant failed" +msgstr "" + +#: ../cli/src/devices.c:307 +msgid "802.1X supplicant took too long to authenticate" +msgstr "" + +#: ../cli/src/devices.c:310 +msgid "PPP service failed to start" +msgstr "" + +#: ../cli/src/devices.c:313 +msgid "PPP service disconnected" +msgstr "" + +#: ../cli/src/devices.c:316 +msgid "PPP failed" +msgstr "" + +#: ../cli/src/devices.c:319 +msgid "DHCP client failed to start" +msgstr "" + +#: ../cli/src/devices.c:322 +msgid "DHCP client error" +msgstr "" + +#: ../cli/src/devices.c:325 +msgid "DHCP client failed" +msgstr "" + +#: ../cli/src/devices.c:328 +msgid "Shared connection service failed to start" +msgstr "" + +#: ../cli/src/devices.c:331 +msgid "Shared connection service failed" +msgstr "" + +#: ../cli/src/devices.c:334 +msgid "AutoIP service failed to start" +msgstr "" + +#: ../cli/src/devices.c:337 +msgid "AutoIP service error" +msgstr "" + +#: ../cli/src/devices.c:340 +msgid "AutoIP service failed" +msgstr "" + +#: ../cli/src/devices.c:343 +msgid "The line is busy" +msgstr "" + +#: ../cli/src/devices.c:346 +msgid "No dial tone" +msgstr "" + +#: ../cli/src/devices.c:349 +msgid "No carrier could be established" +msgstr "" + +#: ../cli/src/devices.c:352 +msgid "The dialing request timed out" +msgstr "" + +#: ../cli/src/devices.c:355 +msgid "The dialing attempt failed" +msgstr "" + +#: ../cli/src/devices.c:358 +msgid "Modem initialization failed" +msgstr "" + +#: ../cli/src/devices.c:361 +msgid "Failed to select the specified APN" +msgstr "" + +#: ../cli/src/devices.c:364 +msgid "Not searching for networks" +msgstr "" + +#: ../cli/src/devices.c:367 +msgid "Network registration denied" +msgstr "" + +#: ../cli/src/devices.c:370 +msgid "Network registration timed out" +msgstr "" + +#: ../cli/src/devices.c:373 +msgid "Failed to register with the requested network" +msgstr "" + +#: ../cli/src/devices.c:376 +msgid "PIN check failed" +msgstr "" + +#: ../cli/src/devices.c:379 +msgid "Necessary firmware for the device may be missing" +msgstr "" + +#: ../cli/src/devices.c:382 +msgid "The device was removed" +msgstr "" + +#: ../cli/src/devices.c:385 +msgid "NetworkManager went to sleep" +msgstr "" + +#: ../cli/src/devices.c:388 +msgid "The device's active connection disappeared" +msgstr "" + +#: ../cli/src/devices.c:391 +msgid "Device disconnected by user or client" +msgstr "" + +#: ../cli/src/devices.c:394 +msgid "Carrier/link changed" +msgstr "" + +#: ../cli/src/devices.c:397 +msgid "The device's existing connection was assumed" +msgstr "" + +#: ../cli/src/devices.c:400 +msgid "The supplicant is now available" +msgstr "" + +#: ../cli/src/devices.c:403 +msgid "The modem could not be found" +msgstr "" + +#: ../cli/src/devices.c:406 +msgid "The Bluetooth connection failed or timed out" +msgstr "" + +#: ../cli/src/devices.c:409 +msgid "GSM Modem's SIM card not inserted" +msgstr "" + +#: ../cli/src/devices.c:412 +msgid "GSM Modem's SIM PIN required" +msgstr "" + +#: ../cli/src/devices.c:415 +msgid "GSM Modem's SIM PUK required" +msgstr "" + +#: ../cli/src/devices.c:418 +msgid "GSM Modem's SIM wrong" +msgstr "" + +#: ../cli/src/devices.c:421 +msgid "Infiniband device does not support connected mode" +msgstr "" + +#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458 +#: ../cli/src/devices.c:578 ../cli/src/devices.c:622 msgid "Unknown" msgstr "未知" -#: ../cli/src/devices.c:368 +#: ../cli/src/devices.c:491 msgid "(none)" msgstr "(无)" -#: ../cli/src/devices.c:393 -#, c-format -msgid "%s: error converting IP4 address 0x%X" -msgstr "%s:转换 IP4 地址 0x%X 出错" - -#: ../cli/src/devices.c:464 +#: ../cli/src/devices.c:547 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:465 +#: ../cli/src/devices.c:548 #, c-format msgid "%u MB/s" msgstr "%u MB/s" -#: ../cli/src/devices.c:474 +#: ../cli/src/devices.c:557 msgid "Encrypted: " msgstr "加密: " -#: ../cli/src/devices.c:479 +#: ../cli/src/devices.c:562 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:481 +#: ../cli/src/devices.c:564 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:483 +#: ../cli/src/devices.c:566 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:486 +#: ../cli/src/devices.c:569 msgid "Enterprise " msgstr "企业级 " -#: ../cli/src/devices.c:495 +#: ../cli/src/devices.c:578 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:495 +#: ../cli/src/devices.c:578 msgid "Infrastructure" msgstr "基础构架" -#: ../cli/src/devices.c:530 +#: ../cli/src/devices.c:613 msgid "Home" msgstr "" -#: ../cli/src/devices.c:533 +#: ../cli/src/devices.c:616 msgid "Partner" msgstr "" -#: ../cli/src/devices.c:536 +#: ../cli/src/devices.c:619 msgid "Roaming" msgstr "" -#: ../cli/src/devices.c:606 +#: ../cli/src/devices.c:691 #, c-format msgid "Error: 'dev list': %s" msgstr "错误:'dev list': %s" -#: ../cli/src/devices.c:608 +#: ../cli/src/devices.c:693 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "错误:'dev list': %s;允许的字段:%s" -#: ../cli/src/devices.c:617 +#: ../cli/src/devices.c:702 msgid "Device details" msgstr "设备详情" -#: ../cli/src/devices.c:653 ../cli/src/devices.c:654 ../cli/src/devices.c:1148 -#: ../cli/src/utils.c:343 +#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152 +#: ../cli/src/utils.c:445 msgid "(unknown)" msgstr "(未知)" -#: ../cli/src/devices.c:680 +#: ../cli/src/devices.c:753 +msgid "not connected" +msgstr "" + +#: ../cli/src/devices.c:780 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:753 +#: ../cli/src/devices.c:853 msgid "on" msgstr "开" -#: ../cli/src/devices.c:753 +#: ../cli/src/devices.c:853 msgid "off" msgstr "关" -#: ../cli/src/devices.c:1000 +#: ../cli/src/devices.c:1004 #, c-format msgid "Error: 'dev status': %s" msgstr "错误:'dev status': %s" -#: ../cli/src/devices.c:1002 +#: ../cli/src/devices.c:1006 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "错误:'dev status': %s;允许的字段:%s" -#: ../cli/src/devices.c:1025 +#: ../cli/src/devices.c:1029 msgid "Status of devices" msgstr "设备状态" -#: ../cli/src/devices.c:1056 +#: ../cli/src/devices.c:1060 #, c-format msgid "Error: '%s' argument is missing." msgstr "错误:缺少 '%s' 参数。" -#: ../cli/src/devices.c:1097 ../cli/src/devices.c:1249 -#: ../cli/src/devices.c:1386 ../cli/src/devices.c:1605 +#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253 +#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609 #, c-format msgid "Error: Device '%s' not found." msgstr "错误:没有找到设备 '%s'。" -#: ../cli/src/devices.c:1120 +#: ../cli/src/devices.c:1124 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "成功:成功断开设备 '%s'。" -#: ../cli/src/devices.c:1145 +#: ../cli/src/devices.c:1149 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "错误:断开设备 '%s'(%s)失败:%s" -#: ../cli/src/devices.c:1153 +#: ../cli/src/devices.c:1157 #, c-format msgid "Device state: %d (%s)\n" msgstr "设备状态:%d (%s)\n" -#: ../cli/src/devices.c:1218 +#: ../cli/src/devices.c:1222 #, c-format msgid "Error: iface has to be specified." msgstr "错误:没有指定 iface。" -#: ../cli/src/devices.c:1344 +#: ../cli/src/devices.c:1348 #, c-format msgid "Error: 'dev wifi': %s" msgstr "错误:'dev wifi':%s" -#: ../cli/src/devices.c:1346 +#: ../cli/src/devices.c:1350 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "错误:'dev wifi': %s;允许的字段:%s" -#: ../cli/src/devices.c:1369 +#: ../cli/src/devices.c:1373 msgid "WiFi scan list" msgstr "WiFi 扫描列表" -#: ../cli/src/devices.c:1406 ../cli/src/devices.c:1460 +#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "" -#: ../cli/src/devices.c:1423 +#: ../cli/src/devices.c:1427 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "错误:设备 '%s' 不是 WiFi 设备。" -#: ../cli/src/devices.c:1487 +#: ../cli/src/devices.c:1491 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "错误:'dev wifi' 命令 '%s' 无效。" -#: ../cli/src/devices.c:1563 +#: ../cli/src/devices.c:1567 #, c-format msgid "Error: 'dev wimax': %s" msgstr "" -#: ../cli/src/devices.c:1565 +#: ../cli/src/devices.c:1569 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "" -#: ../cli/src/devices.c:1588 +#: ../cli/src/devices.c:1592 msgid "WiMAX NSP list" msgstr "" -#: ../cli/src/devices.c:1625 +#: ../cli/src/devices.c:1629 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "" -#: ../cli/src/devices.c:1636 +#: ../cli/src/devices.c:1640 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "" -#: ../cli/src/devices.c:1667 +#: ../cli/src/devices.c:1671 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "" -#: ../cli/src/devices.c:1694 +#: ../cli/src/devices.c:1698 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "" -#: ../cli/src/devices.c:1744 +#: ../cli/src/devices.c:1748 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "错误:'dev' 命令 '%s' 无效。" @@ -1081,7 +1409,7 @@ msgid "not running" msgstr "未运行" -#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323 +#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425 #, c-format msgid "Error: Couldn't connect to system bus: %s" msgstr "错误:无法连接到系统总线:%s" @@ -1240,130 +1568,140 @@ msgid "Success" msgstr "成功" -#: ../cli/src/settings.c:461 +#: ../cli/src/settings.c:465 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (hex-ascii-key)" -#: ../cli/src/settings.c:463 +#: ../cli/src/settings.c:467 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128 位密码短语)" -#: ../cli/src/settings.c:466 +#: ../cli/src/settings.c:470 #, c-format msgid "%d (unknown)" msgstr "%d (未知)" -#: ../cli/src/settings.c:492 +#: ../cli/src/settings.c:496 msgid "0 (unknown)" msgstr "0 (未知)" -#: ../cli/src/settings.c:498 +#: ../cli/src/settings.c:502 msgid "any, " msgstr "任意, " -#: ../cli/src/settings.c:500 +#: ../cli/src/settings.c:504 msgid "900 MHz, " msgstr "900 MHz, " -#: ../cli/src/settings.c:502 +#: ../cli/src/settings.c:506 msgid "1800 MHz, " msgstr "1800 MHz, " -#: ../cli/src/settings.c:504 +#: ../cli/src/settings.c:508 msgid "1900 MHz, " msgstr "1900 MHz, " -#: ../cli/src/settings.c:506 +#: ../cli/src/settings.c:510 msgid "850 MHz, " msgstr "850 MHz, " -#: ../cli/src/settings.c:508 +#: ../cli/src/settings.c:512 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 MHz, " -#: ../cli/src/settings.c:510 +#: ../cli/src/settings.c:514 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 MHz, " -#: ../cli/src/settings.c:512 +#: ../cli/src/settings.c:516 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, " -#: ../cli/src/settings.c:514 +#: ../cli/src/settings.c:518 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 MHz, " -#: ../cli/src/settings.c:516 +#: ../cli/src/settings.c:520 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 MHz, " -#: ../cli/src/settings.c:518 +#: ../cli/src/settings.c:522 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 MHz, " -#: ../cli/src/settings.c:520 +#: ../cli/src/settings.c:524 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 MHz, " -#: ../cli/src/settings.c:522 +#: ../cli/src/settings.c:526 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "" -#: ../cli/src/settings.c:524 +#: ../cli/src/settings.c:528 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "" -#: ../cli/src/settings.c:646 ../cli/src/settings.c:841 -#: ../cli/src/settings.c:1545 +#: ../cli/src/settings.c:650 ../cli/src/settings.c:846 +#: ../cli/src/settings.c:1550 msgid "auto" msgstr "自动" -#: ../cli/src/settings.c:835 ../cli/src/settings.c:838 -#: ../cli/src/settings.c:839 ../cli/src/utils.c:176 +#: ../cli/src/settings.c:840 ../cli/src/settings.c:843 +#: ../cli/src/settings.c:844 ../cli/src/utils.c:247 msgid "not set" msgstr "未设置" -#: ../cli/src/utils.c:128 +#: ../cli/src/utils.c:103 +#, c-format +msgid "Error converting IP4 address '0x%X' to text form" +msgstr "" + +#: ../cli/src/utils.c:131 +#, c-format +msgid "Error converting IP6 address '%s' to text form" +msgstr "" + +#: ../cli/src/utils.c:200 #, c-format msgid "field '%s' has to be alone" msgstr "字段 '%s' 必须是单独的" -#: ../cli/src/utils.c:131 +#: ../cli/src/utils.c:203 #, c-format msgid "invalid field '%s'" msgstr "无效字段 '%s'" -#: ../cli/src/utils.c:150 +#: ../cli/src/utils.c:222 #, c-format msgid "Option '--terse' requires specifying '--fields'" msgstr "选项 '--terse' 要求指定 '--fields'" -#: ../cli/src/utils.c:154 +#: ../cli/src/utils.c:226 #, c-format msgid "" "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "选项 '--terse' 需要特定 '--fields' 选项值,不是 '%s'" -#: ../cli/src/utils.c:334 +#: ../cli/src/utils.c:436 #, c-format msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus" msgstr "" -#: ../cli/src/utils.c:342 +#: ../cli/src/utils.c:444 #, c-format msgid "Error: NameHasOwner request failed: %s" msgstr "" -#: ../cli/src/utils.c:387 +#: ../cli/src/utils.c:489 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" "nocheck to suppress the warning.\n" msgstr "" -#: ../cli/src/utils.c:396 +#: ../cli/src/utils.c:498 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " @@ -1712,26 +2050,26 @@ msgid "Could not generate random data." msgstr "无法生成随机数据。" -#: ../libnm-util/nm-utils.c:2003 +#: ../libnm-util/nm-utils.c:2034 #, c-format msgid "Not enough memory to make encryption key." msgstr "没有足够的空间生成加密密钥。" -#: ../libnm-util/nm-utils.c:2113 +#: ../libnm-util/nm-utils.c:2144 msgid "Could not allocate memory for PEM file creation." msgstr "无法为创建 PEM 文件分配内存。" -#: ../libnm-util/nm-utils.c:2125 +#: ../libnm-util/nm-utils.c:2156 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "无法为在 PEM 文件中写入 IV 分配内存。" -#: ../libnm-util/nm-utils.c:2137 +#: ../libnm-util/nm-utils.c:2168 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "无法为在 PEM 文件中写入加密密钥分配内存。" -#: ../libnm-util/nm-utils.c:2156 +#: ../libnm-util/nm-utils.c:2187 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "无法为 PEM 文件数据分配内存。" @@ -1837,16 +2175,136 @@ msgid "System policy prevents use of user-specific connections" msgstr "系统策略阻止使用用户连接" +#: ../src/main.c:143 +#, c-format +msgid "Failed to initialize SIGTERM pipe: %d" +msgstr "" + +#: ../src/main.c:169 +#, c-format +msgid "Opening %s failed: %s\n" +msgstr "" + +#: ../src/main.c:175 +#, c-format +msgid "Writing to %s failed: %s\n" +msgstr "" + +#: ../src/main.c:180 +#, c-format +msgid "Closing %s failed: %s\n" +msgstr "" + +#: ../src/main.c:223 +#, c-format +msgid "NetworkManager is already running (pid %ld)\n" +msgstr "" + +#: ../src/main.c:360 +msgid "Print NetworkManager version and exit" +msgstr "" + +#: ../src/main.c:361 +msgid "Don't become a daemon" +msgstr "" + +#: ../src/main.c:362 +msgid "Make all warnings fatal" +msgstr "" + +#: ../src/main.c:363 +msgid "Specify the location of a PID file" +msgstr "" + +#: ../src/main.c:363 +msgid "filename" +msgstr "" + +#: ../src/main.c:364 +msgid "State file location" +msgstr "" + +#: ../src/main.c:364 +msgid "/path/to/state.file" +msgstr "" + +#: ../src/main.c:365 +msgid "Config file location" +msgstr "" + +#: ../src/main.c:365 +msgid "/path/to/config.file" +msgstr "" + +#: ../src/main.c:366 +msgid "List of plugins separated by ','" +msgstr "" + +#: ../src/main.c:366 +msgid "plugin1,plugin2" +msgstr "" + +#. Translators: Do not translate the values in the square brackets +#: ../src/main.c:368 +msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" +msgstr "" + +#. Translators: Do not translate the values in the square brackets +#: ../src/main.c:371 +msgid "" +"Log domains separated by ',': any combination of\n" +" " +"[NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n" +" " +"WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n" +" " +"AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n" +" INFINIBAND,FIREWALL]" +msgstr "" + +#: ../src/main.c:381 +#, c-format +msgid "GModules are not supported on your platform!\n" +msgstr "" + #: ../src/main.c:400 +msgid "" +"NetworkManager monitors all network connections and automatically\n" +"chooses the best connection to use. It also allows the user to\n" +"specify wireless access points which wireless cards in the computer\n" +"should associate with." +msgstr "" + +#: ../src/main.c:406 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "无效选项。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:441 +#: ../src/main.c:416 +#, c-format +msgid "You must be root to run NetworkManager!\n" +msgstr "" + +#: ../src/main.c:436 +#, c-format +msgid "Failed to read configuration: (%d) %s\n" +msgstr "" + +#: ../src/main.c:447 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" +#: ../src/main.c:454 +#, c-format +msgid "State file %s parsing failed: (%d) %s\n" +msgstr "" + +#: ../src/main.c:471 +#, c-format +msgid "Could not daemonize: %s [error %u]\n" +msgstr "" + #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62 msgid "# Created by NetworkManager\n" msgstr "# 由 NetworkManger 创建\n" @@ -1860,19 +2318,19 @@ "# 合并自 %s\n" "\n" -#: ../src/dhcp-manager/nm-dhcp-manager.c:284 +#: ../src/dhcp-manager/nm-dhcp-manager.c:266 msgid "no usable DHCP client could be found." msgstr "找到无法使用的 DHCP 客户端。" -#: ../src/dhcp-manager/nm-dhcp-manager.c:293 +#: ../src/dhcp-manager/nm-dhcp-manager.c:275 msgid "'dhclient' could be found." msgstr "找到 'dhclient'。" -#: ../src/dhcp-manager/nm-dhcp-manager.c:303 +#: ../src/dhcp-manager/nm-dhcp-manager.c:285 msgid "'dhcpcd' could be found." msgstr "找到 'dhcpcd'。" -#: ../src/dhcp-manager/nm-dhcp-manager.c:311 +#: ../src/dhcp-manager/nm-dhcp-manager.c:293 #, c-format msgid "unsupported DHCP client '%s'" msgstr "不支持的 DHCP 客户端 '%s'" @@ -1885,57 +2343,57 @@ msgid "The nameservers listed below may not be recognized." msgstr "以下列出的名字服务器可能无法被识别。" -#: ../src/logging/nm-logging.c:154 +#: ../src/logging/nm-logging.c:130 #, c-format msgid "Unknown log level '%s'" msgstr "未知日志等级 '%s'" -#: ../src/logging/nm-logging.c:179 +#: ../src/logging/nm-logging.c:155 #, c-format msgid "Unknown log domain '%s'" msgstr "未知日志域 '%s'" -#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:354 +#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:324 #, c-format msgid "CDMA connection %d" msgstr "" -#: ../src/modem-manager/nm-modem-gsm.c:521 ../src/nm-device-bt.c:350 +#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:320 #, c-format msgid "GSM connection %d" msgstr "" -#: ../src/nm-device-bt.c:325 +#: ../src/nm-device-bt.c:295 #, c-format msgid "PAN connection %d" msgstr "" -#: ../src/nm-device-bt.c:358 +#: ../src/nm-device-bt.c:328 #, c-format msgid "DUN connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1425 +#: ../src/nm-device-ethernet.c:1354 #, c-format msgid "PPPoE connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1425 ../src/settings/nm-settings-utils.c:50 +#: ../src/nm-device-ethernet.c:1354 ../src/settings/nm-settings-utils.c:50 #, c-format msgid "Wired connection %d" msgstr "" -#: ../src/nm-device-infiniband.c:292 +#: ../src/nm-device-infiniband.c:302 #, c-format msgid "Infiniband connection %d" msgstr "" -#: ../src/nm-device-olpc-mesh.c:323 +#: ../src/nm-device-olpc-mesh.c:293 #, c-format msgid "Mesh %d" msgstr "" -#: ../src/nm-manager.c:689 +#: ../src/nm-manager.c:642 #, c-format msgid "VPN connection %d" msgstr "" @@ -1980,11 +2438,11 @@ msgid "error updating link cache: %s" msgstr "更新链接缓存出错:%s" -#: ../src/settings/plugins/ifcfg-rh/reader.c:97 +#: ../src/settings/plugins/ifcfg-rh/reader.c:91 #: ../src/settings/plugins/ifnet/connection_parser.c:51 msgid "System" msgstr "系统" -#: ../src/settings/plugins/ifcfg-rh/reader.c:3557 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3648 msgid "Bond" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/newt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/newt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/newt.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/newt.po 2012-02-23 07:11: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: 2011-12-29 10:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493 msgid "Ok" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/notify-osd-icons.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/notify-osd-icons.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/notify-osd-icons.po 2012-01-02 18:07:45.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/notify-osd-icons.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# Simplified Chinese translation for notify-osd-icons -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the notify-osd-icons package. -# FIRST AUTHOR , 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: notify-osd-icons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-09-24 10:57+0000\n" -"PO-Revision-Date: 2010-08-12 03:16+0000\n" -"Last-Translator: Xhacker Liu \n" -"Language-Team: Simplified Chinese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 19:02+0000\n" -"X-Generator: Launchpad (build 14560)\n" - -#: ../index.theme.in.h:1 -msgid "Ubuntu default theme for Notify-OSD" -msgstr "Ubuntu 默认的 Notify-OSD 主题" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nova.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nova.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nova.po 2012-01-02 18:08:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nova.po 2012-02-23 07:12:24.000000000 +0000 @@ -7,2408 +7,2173 @@ msgstr "" "Project-Id-Version: nova\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-16 21:34+0000\n" +"POT-Creation-Date: 2012-02-17 16:29+0000\n" "PO-Revision-Date: 2011-12-07 13:06+0000\n" "Last-Translator: xh2012@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: 2011-12-30 01:43+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 06:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: ../nova/api/ec2/ec2utils.py:80 ../nova/api/openstack/common.py:311 -#, python-format -msgid "Instance %(name)s has stale IP address: %(ip)s (no network or vif)" +#: nova/api/openstack/compute/contrib/flavorextraspecs.py:49 +#: nova/api/openstack/compute/contrib/volumetypes.py:158 +msgid "No Request Body" +msgstr "没有请求主体" + +#: nova/api/openstack/compute/image_metadata.py:83 +#: nova/api/openstack/compute/server_metadata.py:82 +#: nova/api/openstack/compute/contrib/flavorextraspecs.py:79 +#: nova/api/openstack/compute/contrib/volumetypes.py:188 +msgid "Request body and URI mismatch" msgstr "" -#: ../nova/network/quantum/quantum_connection.py:94 +#: nova/api/openstack/compute/image_metadata.py:86 +#: nova/api/openstack/compute/server_metadata.py:86 +#: nova/api/openstack/compute/contrib/flavorextraspecs.py:82 +#: nova/api/openstack/compute/contrib/volumetypes.py:191 +msgid "Request body contains too many items" +msgstr "" + +#: nova/network/quantum/quantum_connection.py:100 #, python-format msgid "" "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s" msgstr "" -#: ../nova/network/quantum/quantum_connection.py:108 +#: nova/network/quantum/quantum_connection.py:114 #, python-format msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s" msgstr "" -#: ../nova/manager.py:145 +#: nova/manager.py:146 #, python-format msgid "" "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run" -msgstr "" +msgstr "跳过 %(full_task_name)s,到下次运行还剩下%(ticks_to_skip)s 跳。" -#: ../nova/manager.py:151 +#: nova/manager.py:152 #, python-format msgid "Running periodic task %(full_task_name)s" msgstr "" -#: ../nova/manager.py:158 +#: nova/manager.py:159 #, python-format msgid "Error during %(full_task_name)s: %(e)s" -msgstr "" +msgstr "在 %(full_task_name)s 期间发生的错误:%(e)s" -#: ../nova/manager.py:193 +#: nova/manager.py:203 msgid "Notifying Schedulers of capabilities ..." -msgstr "" - -#: ../nova/api/openstack/v2/zones.py:59 -msgid "--build_plan_encryption_key not set" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:58 -#, python-format -msgid "_create: %s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:67 -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:70 -#, python-format -msgid "_delete: %s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:76 -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:79 -#, python-format -msgid "_get: %s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:86 -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:89 -#, python-format -msgid "_get_all: %s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:130 -#, python-format -msgid "test_snapshot_create: param=%s" -msgstr "" +msgstr "向 Schedulers 通报能力。" -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:139 -#, python-format -msgid "test_snapshot_create: resp_dict=%s" -msgstr "" +#: nova/api/openstack/compute/contrib/admin_actions.py:244 +#: nova/api/openstack/compute/contrib/console_output.py:46 +#: nova/api/openstack/compute/contrib/console_output.py:58 +#: nova/api/openstack/compute/contrib/consoles.py:49 +#: nova/api/openstack/compute/contrib/consoles.py:60 +#: nova/api/openstack/compute/contrib/server_action_list.py:49 +#: nova/api/openstack/compute/contrib/server_diagnostics.py:47 +#: nova/api/openstack/compute/contrib/server_start_stop.py:38 +msgid "Instance not found" +msgstr "没有找到实例" -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:161 -#, python-format -msgid "test_snapshot_create_force: param=%s" +#: nova/virt/disk/mount.py:76 +msgid "no partitions found" msgstr "" -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:170 +#: nova/virt/disk/mount.py:77 #, python-format -msgid "test_snapshot_create_force: resp_dict=%s" +msgid "Failed to map partitions: %s" msgstr "" -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:210 +#: nova/virt/disk/api.py:259 nova/virt/disk/guestfs.py:64 +#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100 #, python-format -msgid "test_snapshot_show: resp=%s" +msgid "Failed to mount filesystem: %s" msgstr "" -#: ../nova/tests/api/openstack/v2/contrib/test_snapshots.py:236 -#, python-format -msgid "test_snapshot_detail: resp_dict=%s" +#: nova/api/openstack/wsgi.py:813 nova/api/openstack/wsgi.py:826 +#: nova/api/openstack/compute/server_metadata.py:58 +#: nova/api/openstack/compute/server_metadata.py:76 +#: nova/api/openstack/compute/server_metadata.py:103 +#: nova/api/openstack/compute/server_metadata.py:128 +#: nova/api/openstack/compute/contrib/admin_actions.py:211 +#: nova/api/openstack/compute/contrib/console_output.py:51 +msgid "Malformed request body" msgstr "" -#: ../nova/virt/xenapi/fake.py:77 ../nova/virt/vmwareapi/fake.py:45 +#: nova/virt/vmwareapi/fake.py:44 nova/virt/xenapi/fake.py:77 #, python-format msgid "%(text)s: _db_content => %(content)s" msgstr "" -#: ../nova/virt/xenapi/fake.py:495 ../nova/virt/xenapi/fake.py:594 -#: ../nova/virt/xenapi/fake.py:612 ../nova/virt/xenapi/fake.py:675 +#: nova/virt/xenapi/fake.py:524 nova/virt/xenapi/fake.py:623 +#: nova/virt/xenapi/fake.py:641 nova/virt/xenapi/fake.py:704 msgid "Raising NotImplemented" msgstr "" -#: ../nova/virt/xenapi/fake.py:497 +#: nova/virt/xenapi/fake.py:526 #, python-format msgid "xenapi.fake does not have an implementation for %s" msgstr "" -#: ../nova/virt/xenapi/fake.py:531 +#: nova/virt/xenapi/fake.py:560 #, python-format msgid "Calling %(localname)s %(impl)s" msgstr "" -#: ../nova/virt/xenapi/fake.py:536 +#: nova/virt/xenapi/fake.py:565 #, python-format msgid "Calling getter %s" msgstr "" -#: ../nova/virt/xenapi/fake.py:596 +#: nova/virt/xenapi/fake.py:625 #, python-format msgid "" "xenapi.fake does not have an implementation for %s or it has been called " "with the wrong number of arguments" msgstr "" -#: ../nova/virt/connection.py:78 +#: nova/virt/connection.py:85 msgid "Failed to open connection to the hypervisor" msgstr "" -#: ../nova/utils.py:66 +#: nova/api/openstack/compute/limits.py:140 +#, python-format +msgid "" +"Only %(value)s %(verb)s request(s) can be made to %(uri)s every " +"%(unit_string)s." +msgstr "" + +#: nova/api/openstack/compute/limits.py:265 +msgid "This request was rate-limited." +msgstr "" + +#: nova/utils.py:72 #, python-format msgid "Inner Exception: %s" msgstr "内层异常:%s" -#: ../nova/utils.py:150 +#: nova/utils.py:156 #, python-format msgid "Fetching %s" msgstr "正在抓取 %s" -#: ../nova/utils.py:188 +#: nova/utils.py:197 #, python-format msgid "Got unknown keyword args to utils.execute: %r" -msgstr "" +msgstr "发现未知的 utils.execute 关键字参数:%r" -#: ../nova/utils.py:198 +#: nova/utils.py:207 #, python-format msgid "Running cmd (subprocess): %s" msgstr "正在运行(在子进程中)运行命令:%s" -#: ../nova/utils.py:214 ../nova/utils.py:264 +#: nova/utils.py:223 nova/utils.py:302 #, python-format msgid "Result was %s" msgstr "运行结果为 %s" -#: ../nova/utils.py:228 +#: nova/utils.py:236 #, python-format msgid "%r failed. Retrying." -msgstr "" +msgstr "%r 失败,重试。" -#: ../nova/utils.py:240 +#: nova/utils.py:278 #, python-format msgid "Running cmd (SSH): %s" -msgstr "" +msgstr "运行SSH命令:%s" -#: ../nova/utils.py:242 +#: nova/utils.py:280 msgid "Environment not supported over SSH" -msgstr "" +msgstr "SSH上不支持环境变量" -#. This is (probably) fixable if we need it... -#: ../nova/utils.py:246 +#: nova/utils.py:284 msgid "process_input not supported over SSH" -msgstr "" +msgstr "SSH上不支持的进程输入参数。" -#: ../nova/utils.py:304 +#: nova/utils.py:343 #, python-format msgid "debug in callback: %s" msgstr "回调中debug:%s" -#: ../nova/utils.py:309 -#, python-format -msgid "Running %s" -msgstr "正在运行 %s" - -#: ../nova/utils.py:414 +#: nova/utils.py:476 #, python-format msgid "Link Local address is not found.:%s" -msgstr "" +msgstr "本地IP地址没有找到:%s" -#: ../nova/utils.py:417 +#: nova/utils.py:479 #, python-format msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s" msgstr "" -#: ../nova/utils.py:514 +#: nova/utils.py:576 #, python-format msgid "Invalid backend: %s" msgstr "无效的后台:%s" -#: ../nova/utils.py:525 +#: nova/utils.py:587 #, python-format msgid "backend %s" msgstr "后台 %s" -#: ../nova/utils.py:748 +#: nova/utils.py:636 +msgid "in looping call" +msgstr "循环调用中。" + +#: ../nova/utils.py:810 #, python-format msgid "" "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..." msgstr "" -#: ../nova/utils.py:752 +#: ../nova/utils.py:814 #, python-format msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..." msgstr "" -#: ../nova/utils.py:756 +#: ../nova/utils.py:818 #, python-format msgid "" "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..." msgstr "" -#: ../nova/utils.py:767 +#: ../nova/utils.py:825 #, python-format msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..." msgstr "" -#: ../nova/utils.py:875 +#: nova/utils.py:935 #, python-format msgid "Expected object of type: %s" -msgstr "" +msgstr "期望的对象类型:%s" -#: ../nova/utils.py:906 +#: nova/utils.py:966 #, python-format msgid "Invalid server_string: %s" -msgstr "" +msgstr "不正确的server_string:%s" -#: ../nova/utils.py:1029 +#: nova/utils.py:1091 #, python-format msgid "timefunc: '%(name)s' took %(total_time).2f secs" -msgstr "" +msgstr "timefunc:'%(name)s' 用了%(total_time).2f 秒" -#: ../nova/utils.py:1059 +#: nova/utils.py:1123 msgid "Original exception being dropped" -msgstr "" +msgstr "正在丢弃原来的异常。" -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost.py:84 -msgid "Missing 'enabled' argument to set_host_enabled" -msgstr "" +#: nova/utils.py:1242 +#, python-format +msgid "Class %(fullname)s is deprecated: %(msg)s" +msgstr "类 %(fullname)s 废弃不用了:%(msg)s" + +#: nova/utils.py:1244 +#, python-format +msgid "Class %(fullname)s is deprecated" +msgstr "类 %(fullname)s 废弃不用了" + +#: nova/utils.py:1276 +#, python-format +msgid "Function %(name)s in %(location)s is deprecated: %(msg)s" +msgstr "%(location)s 里的函数 %(name)s 已经废弃了:%(msg)s" + +#: nova/utils.py:1278 +#, python-format +msgid "Function %(name)s in %(location)s is deprecated" +msgstr "%(location)s 里的函数 %(name)s 已经废弃了" + +#: nova/api/openstack/compute/contrib/volumes.py:481 +#: nova/api/openstack/volume/snapshots.py:109 +#, python-format +msgid "Delete snapshot with id: %s" +msgstr "删除id为 %s 的快照" -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost.py:90 +#: nova/api/openstack/compute/contrib/volumes.py:523 +#: nova/api/openstack/volume/snapshots.py:149 #, python-format -msgid "Illegal enabled status: %s" +msgid "Create snapshot from volume %s" msgstr "" -#: ../nova/virt/libvirt/firewall.py:38 +#: nova/api/openstack/compute/contrib/volumes.py:73 +#: nova/api/openstack/volume/volumes.py:99 +#, python-format +msgid "vol=%s" +msgstr "vol=%s" + +#: nova/api/openstack/compute/contrib/volumes.py:146 +#: nova/api/openstack/volume/volumes.py:177 +#, python-format +msgid "Delete volume with id: %s" +msgstr "删除id为 %s 的卷" + +#: nova/api/ec2/cloud.py:858 nova/api/openstack/compute/contrib/volumes.py:186 +#: nova/api/openstack/volume/volumes.py:215 +#, python-format +msgid "Create volume of %s GB" +msgstr "创建 %s GB的卷" + +#: nova/api/openstack/compute/contrib/volumes.py:329 +#, python-format +msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s" +msgstr "把卷 %(volume_id)s 挂载到实例 %(server_id)s 的 %(device)s 设备上" + +#: nova/api/ec2/cloud.py:897 nova/api/openstack/compute/contrib/volumes.py:366 +#, python-format +msgid "Detach volume %s" +msgstr "卸载卷 %s" + +#: nova/virt/libvirt/firewall.py:42 msgid "" "Libvirt module could not be loaded. NWFilterFirewall will not work correctly." msgstr "" -#: ../nova/virt/libvirt/firewall.py:309 +#: nova/virt/libvirt/firewall.py:140 +msgid "Called setup_basic_filtering in nwfilter" +msgstr "" + +#: nova/virt/libvirt/firewall.py:148 +msgid "Ensuring static filters" +msgstr "" + +#: nova/virt/libvirt/firewall.py:262 #, python-format -msgid "" -"The nwfilter(%(instance_filter_name)s) for %(instance_name)s is not found." +msgid "The nwfilter(%(instance_filter_name)s) is not found." msgstr "" -#: ../nova/virt/libvirt/firewall.py:319 +#: nova/virt/libvirt/firewall.py:274 #, python-format -msgid "" -"The nwfilter(%(instance_secgroup_filter_name)s) for %(instance_name)s is not " -"found." +msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found." msgstr "" -#: ../nova/virt/libvirt/firewall.py:500 +#: nova/virt/libvirt/firewall.py:457 #, python-format msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found." msgstr "" -#: ../nova/virt/libvirt/firewall.py:524 +#: nova/virt/libvirt/firewall.py:473 msgid "iptables firewall: Setup Basic Filtering" msgstr "" -#: ../nova/virt/libvirt/firewall.py:540 +#: nova/virt/libvirt/firewall.py:492 +msgid "Attempted to unfilter instance which is not filtered" +msgstr "" + +#: nova/api/openstack/compute/contrib/floating_ips.py:159 #, python-format -msgid "Attempted to unfilter instance %s which is not filtered" +msgid "No more floating ips in pool %s." +msgstr "池 %s 中已经没有浮动ip。" + +#: nova/api/openstack/compute/contrib/floating_ips.py:161 +msgid "No more floating ips available." +msgstr "没有更多的浮动ip。" + +#: nova/api/openstack/compute/contrib/floating_ips.py:201 +#: nova/api/openstack/compute/contrib/floating_ips.py:230 +#: nova/api/openstack/compute/contrib/security_groups.py:559 +#: nova/api/openstack/compute/contrib/security_groups.py:592 +msgid "Missing parameter dict" +msgstr "缺少参数 dict" + +#: nova/api/openstack/compute/contrib/floating_ips.py:204 +#: nova/api/openstack/compute/contrib/floating_ips.py:233 +msgid "Address not specified" +msgstr "地址没有指定" + +#: nova/api/openstack/compute/contrib/floating_ips.py:213 +msgid "No fixed ips associated to instance" +msgstr "没有固定ip与实例关联" + +#: nova/api/openstack/compute/contrib/floating_ips.py:216 +msgid "Associate floating ip failed" +msgstr "关联浮动ip失败" + +#: nova/api/metadata/handler.py:251 nova/api/metadata/handler.py:258 +#, python-format +msgid "Failed to get metadata for ip: %s" +msgstr "为ip: %s获取元数据失败" + +#: nova/api/ec2/__init__.py:638 nova/api/metadata/handler.py:253 +msgid "An unknown error has occurred. Please try your request again." +msgstr "发生了一个未知的错误. 请重试你的请求." + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:58 +#, python-format +msgid "_create: %s" msgstr "" -#: ../nova/virt/libvirt/firewall.py:650 +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:67 +#: nova/tests/api/openstack/compute/contrib/test_vsa.py:70 #, python-format -msgid "Adding security group rule: %r" +msgid "_delete: %s" msgstr "" -#: ../nova/virt/libvirt/firewall.py:772 +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:76 +#: nova/tests/api/openstack/compute/contrib/test_vsa.py:79 #, python-format -msgid "Adding provider rule: %s" +msgid "_get: %s" msgstr "" -#: ../nova/api/metadata/handler.py:250 ../nova/api/metadata/handler.py:257 +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:86 +#: nova/tests/api/openstack/compute/contrib/test_vsa.py:89 #, python-format -msgid "Failed to get metadata for ip: %s" +msgid "_get_all: %s" msgstr "" -#: ../nova/api/metadata/handler.py:252 ../nova/api/ec2/__init__.py:414 -msgid "An unknown error has occurred. Please try your request again." -msgstr "发生了一个未知的错误. 请重试你的请求." +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:131 +#, python-format +msgid "test_snapshot_create: param=%s" +msgstr "" + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:140 +#, python-format +msgid "test_snapshot_create: resp_dict=%s" +msgstr "" + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:162 +#, python-format +msgid "test_snapshot_create_force: param=%s" +msgstr "" + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:171 +#, python-format +msgid "test_snapshot_create_force: resp_dict=%s" +msgstr "" + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:211 +#, python-format +msgid "test_snapshot_show: resp=%s" +msgstr "" + +#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:237 +#, python-format +msgid "test_snapshot_detail: resp_dict=%s" +msgstr "" -#: ../nova/console/manager.py:71 ../nova/console/vmrc_manager.py:64 +#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70 msgid "Adding console" msgstr "" -#: ../nova/console/manager.py:91 +#: nova/console/manager.py:97 #, python-format msgid "Tried to remove non-existant console %(console_id)s." msgstr "" -#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:41 -#: ../nova/api/openstack/v2/contrib/volumetypes.py:136 -msgid "No Request Body" +#: nova/api/openstack/compute/ips.py:74 +msgid "Instance does not exist" msgstr "" -#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:65 -#: ../nova/api/openstack/v2/image_metadata.py:78 -#: ../nova/api/openstack/v2/contrib/volumetypes.py:160 -#: ../nova/api/openstack/v2/server_metadata.py:77 -msgid "Request body and URI mismatch" +#: nova/api/openstack/compute/ips.py:97 +msgid "Instance is not a member of specified network" msgstr "" -#: ../nova/api/openstack/v2/contrib/flavorextraspecs.py:68 -#: ../nova/api/openstack/v2/image_metadata.py:81 -#: ../nova/api/openstack/v2/contrib/volumetypes.py:163 -#: ../nova/api/openstack/v2/server_metadata.py:81 -msgid "Request body contains too many items" +#: nova/api/openstack/compute/extensions.py:29 +#: nova/api/openstack/volume/extensions.py:29 +msgid "Initializing extension manager." msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:127 -#, python-format -msgid "Host %s" +#: nova/virt/disk/api.py:150 +msgid "no capable image handler configured" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:174 +#: nova/virt/disk/api.py:163 #, python-format -msgid "Test: provision vol %(name)s on host %(host)s" +msgid "unknown disk image handler: %s" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:176 -#, python-format -msgid "\t vol=%(vol)s" +#: nova/virt/disk/api.py:174 +msgid "image already mounted" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:179 +#: nova/virt/disk/api.py:274 #, python-format -msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s" +msgid "Failed to remove container: %s" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:183 +#: nova/scheduler/host_manager.py:265 #, python-format -msgid "Test: Volume create: %s" +msgid "Received %(service_name)s service update from %(host)s." msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:190 +#: nova/scheduler/host_manager.py:306 +msgid "host_manager only implemented for 'compute'" +msgstr "" + +#: nova/scheduler/host_manager.py:316 #, python-format -msgid "Test: Volume get request: id=%(volume_id)s" +msgid "No service for compute ID %s" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:197 +#: nova/tests/scheduler/test_vsa_scheduler.py:147 #, python-format -msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s" +msgid "Host %s" msgstr "" -#: ../nova/tests/scheduler/test_vsa_scheduler.py:462 +#: nova/tests/scheduler/test_vsa_scheduler.py:194 #, python-format -msgid "Test: Volume get: id=%(volume_id)s" +msgid "Test: provision vol %(name)s on host %(host)s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:37 -msgid "progress column not added to instances table" +#: nova/tests/scheduler/test_vsa_scheduler.py:196 +#, python-format +msgid "\t vol=%(vol)s" msgstr "" -#: ../nova/api/openstack/v2/image_metadata.py:41 -#: ../nova/api/openstack/v2/images.py:89 -#: ../nova/api/openstack/v2/images.py:104 -msgid "Image not found." +#: nova/tests/scheduler/test_vsa_scheduler.py:199 +#, python-format +msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s" msgstr "" -#: ../nova/api/openstack/v2/image_metadata.py:74 -msgid "Incorrect request body format" +#: nova/tests/scheduler/test_vsa_scheduler.py:203 +#, python-format +msgid "Test: Volume create: %s" msgstr "" -#: ../nova/api/openstack/v2/image_metadata.py:103 -msgid "Invalid metadata key" +#: nova/tests/scheduler/test_vsa_scheduler.py:210 +#, python-format +msgid "Test: Volume get request: id=%(volume_id)s" msgstr "" -#: ../nova/notifier/list_notifier.py:61 +#: nova/tests/scheduler/test_vsa_scheduler.py:217 #, python-format -msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s." +msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s" msgstr "" -#: ../nova/virt/vmwareapi/error_util.py:94 +#: nova/tests/scheduler/test_vsa_scheduler.py:453 #, python-format -msgid "Error(s) %s " +msgid "Test: Volume get: id=%(volume_id)s" +msgstr "" + +#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:38 +msgid "progress column not added to instances table" msgstr "" -#: ../nova/virt/fake.py:271 ../nova/virt/xenapi_conn.py:400 -#: ../nova/virt/libvirt/connection.py:1539 +#: nova/consoleauth/manager.py:63 #, python-format -msgid "Compute_service record created for %s " +msgid "Deleting Expired Token: (%s)" msgstr "" -#: ../nova/virt/fake.py:275 ../nova/virt/xenapi_conn.py:404 -#: ../nova/virt/libvirt/connection.py:1543 +#: nova/consoleauth/manager.py:75 #, python-format -msgid "Compute_service record updated for %s " +msgid "Received Token: %(token)s, %(token_dict)s)" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:41 -#: ../nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:59 -#: ../nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:59 -msgid "foreign key constraint couldn't be added" +#: nova/consoleauth/manager.py:79 +#, python-format +msgid "Checking Token: %(token)s, %(token_valid)s)" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:55 -msgid "foreign key constraint couldn't be dropped" +#: nova/network/minidns.py:65 +msgid "This driver only supports type 'a'" msgstr "" -#: ../nova/notifier/api.py:109 +#: nova/notifier/api.py:115 #, python-format msgid "%s not in valid priorities" msgstr "" -#: ../nova/notifier/api.py:124 +#: nova/notifier/api.py:132 #, python-format msgid "" "Problem '%(e)s' attempting to send to notification system. " "Payload=%(payload)s" msgstr "" -#: ../nova/network/manager.py:217 +#: nova/network/manager.py:274 nova/network/manager.py:466 +#, python-format +msgid "Interface %(interface)s not found" +msgstr "" + +#: nova/network/manager.py:289 #, python-format msgid "floating IP allocation for instance |%s|" msgstr "" -#: ../nova/network/manager.py:251 +#: nova/network/manager.py:324 #, python-format msgid "floating IP deallocation for instance |%s|" msgstr "" -#: ../nova/network/manager.py:278 +#: nova/network/manager.py:356 #, python-format msgid "Address |%(address)s| is not allocated" msgstr "" -#: ../nova/network/manager.py:282 +#: nova/network/manager.py:360 #, python-format msgid "Address |%(address)s| is not allocated to your project |%(project)s|" msgstr "" -#: ../nova/network/manager.py:293 +#: nova/network/manager.py:372 #, python-format msgid "Quota exceeded for %s, tried to allocate address" msgstr "" -#: ../nova/network/manager.py:296 -msgid "Address quota exceeded. You cannot allocate any more addresses" +#: nova/network/manager.py:584 +#, python-format +msgid "" +"Database inconsistency: DNS domain |%s| is registered in the Nova db but not " +"visible to either the floating or instance DNS driver. It will be ignored." +msgstr "" + +#: nova/network/manager.py:630 +#, python-format +msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|." +msgstr "" + +#: nova/network/manager.py:640 +#, python-format +msgid "" +"Domain |%(domain)s| already exists, changing project to |%(project)s|." msgstr "" -#: ../nova/network/manager.py:521 +#: nova/network/manager.py:748 #, python-format msgid "Disassociated %s stale fixed ip(s)" msgstr "" -#: ../nova/network/manager.py:525 +#: nova/network/manager.py:752 msgid "setting network host" msgstr "" -#: ../nova/network/manager.py:630 ../nova/network/quantum/manager.py:220 +#: nova/network/manager.py:864 #, python-format -msgid "network allocations for instance %s" +msgid "network allocations for instance |%s|" +msgstr "" + +#: nova/network/manager.py:869 +#, python-format +msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|" msgstr "" -#: ../nova/network/manager.py:653 +#: nova/network/manager.py:893 #, python-format msgid "network deallocation for instance |%s|" msgstr "" -#: ../nova/network/manager.py:676 +#: nova/network/manager.py:1112 #, python-format -msgid "No fixed IPs for instance %s" +msgid "" +"instance-dns-zone is |%(domain)s|, which is in availability zone |%(zone)s|. " +"Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record will be " +"created." msgstr "" -#: ../nova/network/manager.py:857 +#: nova/network/manager.py:1187 #, python-format msgid "Leased IP |%(address)s|" msgstr "" -#: ../nova/network/manager.py:861 +#: nova/network/manager.py:1191 #, python-format msgid "IP %s leased that is not associated" msgstr "" -#: ../nova/network/manager.py:869 +#: nova/network/manager.py:1199 #, python-format msgid "IP |%s| leased that isn't allocated" msgstr "" -#: ../nova/network/manager.py:874 +#: nova/network/manager.py:1204 #, python-format msgid "Released IP |%(address)s|" msgstr "" -#: ../nova/network/manager.py:878 +#: nova/network/manager.py:1208 #, python-format msgid "IP %s released that is not associated" msgstr "" -#: ../nova/network/manager.py:881 +#: nova/network/manager.py:1211 #, python-format msgid "IP %s released that was not leased" msgstr "" -#: ../nova/network/manager.py:941 +#: nova/network/manager.py:1279 msgid "cidr already in use" msgstr "" -#: ../nova/network/manager.py:944 +#: nova/network/manager.py:1282 #, python-format msgid "" "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)" msgstr "" -#: ../nova/network/manager.py:955 +#: nova/network/manager.py:1293 #, python-format msgid "" "requested cidr (%(cidr)s) conflicts with existing smaller cidr (%(smaller)s)" msgstr "" -#: ../nova/network/manager.py:1012 +#: nova/network/manager.py:1352 msgid "Network already exists!" msgstr "" -#: ../nova/network/manager.py:1030 +#: nova/network/manager.py:1371 #, python-format msgid "Network must be disassociated from project %s before delete" msgstr "" -#: ../nova/network/manager.py:1289 +#: nova/network/manager.py:1682 msgid "" "The sum between the number of networks and the vlan start cannot be greater " "than 4094" msgstr "" -#: ../nova/network/manager.py:1296 +#: nova/network/manager.py:1689 #, python-format msgid "" "The network range is not big enough to fit %(num_networks)s. Network size is " "%(network_size)s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:52 +#: nova/network/ldapdns.py:321 +msgid "This driver only supports type 'a' entries." +msgstr "" + +#: nova/virt/xenapi/volume_utils.py:52 msgid "creating sr within volume_utils" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:55 -#: ../nova/virt/xenapi/volume_utils.py:83 +#: nova/virt/xenapi/volume_utils.py:55 nova/virt/xenapi/volume_utils.py:83 #, python-format msgid "type is = %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:58 -#: ../nova/virt/xenapi/volume_utils.py:86 +#: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86 #, python-format msgid "name = %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:71 +#: nova/virt/xenapi/volume_utils.py:71 #, python-format msgid "Created %(label)s as %(sr_ref)s." msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:76 -#: ../nova/virt/xenapi/volume_utils.py:174 +#: nova/virt/xenapi/volume_utils.py:76 nova/virt/xenapi/volume_utils.py:174 msgid "Unable to create Storage Repository" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:80 +#: nova/virt/xenapi/volume_utils.py:80 msgid "introducing sr within volume_utils" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:103 -#: ../nova/virt/xenapi/volume_utils.py:170 -#: ../nova/virt/xenapi/volumeops.py:157 +#: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170 +#: nova/virt/xenapi/volumeops.py:157 #, python-format msgid "Introduced %(label)s as %(sr_ref)s." msgstr "" -#. Create pbd -#: ../nova/virt/xenapi/volume_utils.py:106 +#: nova/virt/xenapi/volume_utils.py:106 msgid "Creating pbd for SR" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:108 +#: nova/virt/xenapi/volume_utils.py:108 msgid "Plugging SR" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:116 -#: ../nova/virt/xenapi/volumeops.py:160 +#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160 msgid "Unable to introduce Storage Repository" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:127 ../nova/virt/xenapi/volumeops.py:51 +#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51 msgid "Unable to get SR using uuid" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:129 +#: nova/virt/xenapi/volume_utils.py:129 #, python-format msgid "Forgetting SR %s..." msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:137 +#: nova/virt/xenapi/volume_utils.py:137 msgid "Unable to forget Storage Repository" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:157 +#: nova/virt/xenapi/volume_utils.py:157 #, python-format msgid "Introducing %s..." msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:186 +#: nova/virt/xenapi/volume_utils.py:186 #, python-format msgid "Unable to find SR from VBD %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:206 +#: nova/virt/xenapi/volume_utils.py:206 #, python-format msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... " msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:209 +#: nova/virt/xenapi/volume_utils.py:209 #, python-format msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s." msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:228 +#: nova/virt/xenapi/volume_utils.py:228 #, python-format msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:234 +#: nova/virt/xenapi/volume_utils.py:234 #, python-format msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:249 +#: nova/virt/xenapi/volume_utils.py:249 #, python-format msgid "Unable to introduce VDI on SR %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:257 +#: nova/virt/xenapi/volume_utils.py:257 #, python-format msgid "Unable to get record of VDI %s on" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:279 +#: nova/virt/xenapi/volume_utils.py:279 #, python-format msgid "Unable to introduce VDI for SR %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:289 +#: nova/virt/xenapi/volume_utils.py:289 #, python-format msgid "Error finding vdis in SR %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:296 +#: nova/virt/xenapi/volume_utils.py:296 #, python-format msgid "Unable to find vbd for vdi %s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:330 +#: nova/virt/xenapi/volume_utils.py:330 #, python-format msgid "Unable to obtain target information %(data)s, %(mountpoint)s" msgstr "" -#: ../nova/virt/xenapi/volume_utils.py:356 +#: nova/virt/xenapi/volume_utils.py:356 #, python-format msgid "Mountpoint cannot be translated: %s" msgstr "" -#: ../nova/rpc/impl_kombu.py:346 +#: nova/rpc/impl_kombu.py:357 #, python-format -msgid "" -"Unable to connect to AMQP server after %(max_retries)d tries: %(err_str)s" +msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d" msgstr "" -#: ../nova/rpc/impl_kombu.py:349 +#: nova/rpc/impl_kombu.py:380 #, python-format msgid "Connected to AMQP server on %(hostname)s:%(port)d" msgstr "" -#: ../nova/rpc/impl_kombu.py:358 -msgid "Re-established AMQP queues" -msgstr "" - -#: ../nova/rpc/impl_kombu.py:369 +#: nova/rpc/impl_kombu.py:416 #, python-format msgid "" -"AMQP server on %(hostname)s:%(port)d is unreachable: %(e)s. Trying again in " -"%(intv)d seconds." +"Unable to connect to AMQP server on %(hostname)s:%(port)d after " +"%(max_retries)d tries: %(err_str)s" msgstr "" -#: ../nova/rpc/impl_kombu.py:413 +#: nova/rpc/impl_kombu.py:432 #, python-format -msgid "Failed to consume message from queue: %s" +msgid "" +"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying " +"again in %(sleep_time)d seconds." msgstr "" -#: ../nova/rpc/impl_kombu.py:436 +#: nova/rpc/impl_kombu.py:483 nova/rpc/impl_qpid.py:379 #, python-format -msgid "Failed to publish message %s" +msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s" msgstr "" -#: ../nova/rpc/impl_kombu.py:600 ../nova/rpc/impl_carrot.py:255 +#: nova/rpc/impl_kombu.py:501 nova/rpc/impl_qpid.py:394 #, python-format -msgid "received %s" -msgstr "已接收 %s" +msgid "Timed out waiting for RPC response: %s" +msgstr "" -#. NOTE(vish): we may not want to ack here, but that means that bad -#. messages stay in the queue indefinitely, so for now -#. we just log the message and send an error string -#. back to the caller -#: ../nova/rpc/impl_kombu.py:605 ../nova/rpc/impl_carrot.py:268 +#: nova/rpc/impl_kombu.py:505 nova/rpc/impl_qpid.py:398 #, python-format -msgid "no method for message: %s" -msgstr "没有适用于消息 %s 的方法" +msgid "Failed to consume message from queue: %s" +msgstr "" -#: ../nova/rpc/impl_kombu.py:606 ../nova/rpc/impl_carrot.py:270 +#: nova/rpc/impl_kombu.py:539 nova/rpc/impl_qpid.py:425 #, python-format -msgid "No method for message: %s" -msgstr "没有适用于消息 %s 的方法" +msgid "Failed to publish message to topic '%(topic)s': %(err_str)s" +msgstr "" -#: ../nova/rpc/impl_kombu.py:646 ../nova/rpc/impl_carrot.py:486 +#: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103 #, python-format -msgid "unpacked context: %s" +msgid "Error in handshake: %s" msgstr "" -#. Can't use 'with' for multicall, as it returns an iterator -#. that will continue to use the connection. When it's done, -#. connection.close() will get called which will put it back into -#. the pool -#: ../nova/rpc/impl_kombu.py:730 ../nova/rpc/impl_carrot.py:519 +#: nova/vnc/xvp_proxy.py:119 #, python-format -msgid "Making asynchronous call on %s ..." +msgid "Invalid request: %s" msgstr "" -#: ../nova/rpc/impl_kombu.py:733 ../nova/rpc/impl_carrot.py:522 +#: nova/vnc/xvp_proxy.py:139 #, python-format -msgid "MSG_ID is %s" -msgstr "消息ID(MSG_ID)是 %s" +msgid "Request: %s" +msgstr "" -#: ../nova/rpc/impl_kombu.py:755 ../nova/rpc/impl_carrot.py:601 +#: nova/vnc/xvp_proxy.py:142 #, python-format -msgid "Making asynchronous cast on %s..." +msgid "Request made with missing token: %s" msgstr "" -#: ../nova/rpc/impl_kombu.py:763 ../nova/rpc/impl_carrot.py:611 -msgid "Making asynchronous fanout cast..." +#: nova/vnc/xvp_proxy.py:153 +#, python-format +msgid "Request made with invalid token: %s" msgstr "" -#: ../nova/rpc/impl_kombu.py:779 ../nova/rpc/impl_carrot.py:453 +#: nova/vnc/xvp_proxy.py:160 #, python-format -msgid "Returning exception %s to caller" -msgstr "返回 %s 异常给调用者" - -#: ../nova/api/openstack/v2/ips.py:47 -msgid "Instance does not exist" +msgid "Unexpected error: %s" msgstr "" -#: ../nova/api/openstack/v2/ips.py:69 -msgid "Instance is not a member of specified network" +#: nova/vnc/xvp_proxy.py:180 +#, python-format +msgid "Starting nova-xvpvncproxy node (version %s)" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:132 +#: nova/virt/vmwareapi/fake.py:131 #, python-format -msgid "Property %(attr)s not set for the managed " +msgid "Property %(attr)s not set for the managed object %(objName)s" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:438 +#: nova/virt/vmwareapi/fake.py:437 msgid "There is no VM registered" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:440 ../nova/virt/vmwareapi/fake.py:612 +#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609 #, python-format -msgid "Virtual Machine with ref %s is not " +msgid "Virtual Machine with ref %s is not there" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:503 -msgid "Logging out a session that is invalid or already logged " +#: nova/virt/vmwareapi/fake.py:502 +#, python-format +msgid "Logging out a session that is invalid or already logged out: %s" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:518 +#: nova/virt/vmwareapi/fake.py:517 msgid "Session is faulty" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:521 +#: nova/virt/vmwareapi/fake.py:520 msgid "Session Invalid" msgstr "" -#: ../nova/virt/vmwareapi/fake.py:609 -msgid " No Virtual Machine has been " +#: nova/virt/vmwareapi/fake.py:606 +msgid " No Virtual Machine has been registered yet" msgstr "" -#: ../nova/service.py:141 +#: nova/service.py:159 #, python-format msgid "Starting %(topic)s node (version %(vcs_string)s)" -msgstr "" +msgstr "启动 %(topic)s 节点 (版本 %(vcs_string)s)" -#: ../nova/service.py:232 +#: nova/service.py:176 +#, python-format +msgid "Creating Consumer connection for Service %s" +msgstr "为服务 %s 创建消费者" + +#: nova/service.py:250 msgid "Service killed that has no database entry" msgstr "因无数据库记录,服务已被中止" -#: ../nova/service.py:269 +#: nova/service.py:287 msgid "The service database object disappeared, Recreating it." -msgstr "" +msgstr "服务数据库对象消失,正在重新创建。" -#: ../nova/service.py:284 +#: nova/service.py:302 msgid "Recovered model server connection!" msgstr "与模型服务器(model server)的连接已恢复!" -#: ../nova/service.py:290 +#: nova/service.py:308 msgid "model server went away" msgstr "失去与模型服务器的连接" -#: ../nova/service.py:388 +#: nova/service.py:400 msgid "Full set of FLAGS:" msgstr "FLAGS全集:" -#: ../nova/api/ec2/admin.py:145 -#, python-format -msgid "Creating new user: %s" -msgstr "创建新用户: %s" - -#: ../nova/api/ec2/admin.py:153 +#: nova/service.py:407 #, python-format -msgid "Deleting user: %s" -msgstr "删除用户: %s" +msgid "%(flag)s : FLAG SET " +msgstr "FLAG集合:%(flag)s " -#: ../nova/api/ec2/admin.py:175 +#: nova/virt/disk/loop.py:30 #, python-format -msgid "Adding role %(role)s to user %(user)s for project %(project)s" -msgstr "添加角色 %(role)s 给项目 %(project)s 中的用户 %(user)s" +msgid "Could not attach image to loopback: %s" +msgstr "" -#: ../nova/api/ec2/admin.py:179 -#, python-format -msgid "Adding sitewide role %(role)s to user %(user)s" -msgstr "给用户 %(user)s 添加站点角色 %(role)s" - -#: ../nova/api/ec2/admin.py:185 -#, python-format -msgid "Removing role %(role)s from user %(user)s for project %(project)s" -msgstr "删除项目 %(project)s中用户 %(user)s的角色 %(role)s" - -#: ../nova/api/ec2/admin.py:189 -#, python-format -msgid "Removing sitewide role %(role)s from user %(user)s" -msgstr "删除用户 %(user)s 的站点角色 %(role)s" - -#: ../nova/api/ec2/admin.py:194 ../nova/api/ec2/admin.py:271 -msgid "operation must be add or remove" -msgstr "操作必须为添加或删除" - -#: ../nova/api/ec2/admin.py:207 -#, python-format -msgid "Getting x509 for user: %(name)s on project: %(project)s" -msgstr "获得用户: %(name)s 在项目 :%(project)s中的x509" - -#: ../nova/api/ec2/admin.py:225 -#, python-format -msgid "Create project %(name)s managed by %(manager_user)s" -msgstr "创建被%(manager_user)s 管理的项目 %(name)s" - -#: ../nova/api/ec2/admin.py:238 -#, python-format -msgid "Modify project: %(name)s managed by %(manager_user)s" -msgstr "更改被 %(manager_user)s 管理的项目: %(name)s" - -#: ../nova/api/ec2/admin.py:248 -#, python-format -msgid "Delete project: %s" -msgstr "" - -#: ../nova/api/ec2/admin.py:262 -#, python-format -msgid "Adding user %(user)s to project %(project)s" -msgstr "添加用户 %(user)s 到项目 %(project)s 中" - -#: ../nova/api/ec2/admin.py:266 -#, python-format -msgid "Removing user %(user)s from project %(project)s" -msgstr "从项目 %(project)s 中移除用户 %(user)s" - -#: ../nova/api/ec2/admin.py:348 -#, python-format -msgid "Blocking traffic to all projects incoming from %s" -msgstr "" - -#: ../nova/api/ec2/admin.py:372 -msgid "Duplicate rule" -msgstr "" - -#: ../nova/api/ec2/admin.py:385 -#, python-format -msgid "Removing ip block from %s" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/floating_ips.py:88 -msgid "No more floating ips available." -msgstr "" - -#: ../nova/api/openstack/v2/contrib/floating_ips.py:164 -#: ../nova/api/openstack/v2/contrib/floating_ips.py:188 -#: ../nova/api/openstack/v2/contrib/security_groups.py:457 -#: ../nova/api/openstack/v2/contrib/security_groups.py:486 -msgid "Missing parameter dict" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/floating_ips.py:167 -#: ../nova/api/openstack/v2/contrib/floating_ips.py:191 -msgid "Address not specified" -msgstr "" - -#: ../nova/rpc/common.py:22 +#: nova/rpc/common.py:54 #, python-format msgid "" "Remote error: %(exc_type)s %(value)s\n" "%(traceback)s." msgstr "" -#: ../nova/scheduler/chance.py:50 ../nova/scheduler/simple.py:71 -#: ../nova/scheduler/simple.py:125 ../nova/scheduler/simple.py:142 -msgid "Is the appropriate service running?" -msgstr "" - -#: ../nova/scheduler/chance.py:55 -msgid "Could not find another compute" -msgstr "" - -#: ../nova/auth/manager.py:277 -#, python-format -msgid "Looking up user: %r" -msgstr "" - -#: ../nova/auth/manager.py:281 -#, python-format -msgid "Failed authorization for access key %s" -msgstr "" - -#: ../nova/auth/manager.py:287 -#, python-format -msgid "Using project name = user name (%s)" -msgstr "" - -#: ../nova/auth/manager.py:294 -#, python-format -msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)" -msgstr "" - -#: ../nova/auth/manager.py:303 -#, python-format -msgid "" -"Failed authorization: user %(uname)s not admin and not member of project " -"%(pjname)s" -msgstr "" - -#: ../nova/auth/manager.py:310 ../nova/auth/manager.py:322 -#, python-format -msgid "user.secret: %s" -msgstr "" - -#: ../nova/auth/manager.py:311 ../nova/auth/manager.py:323 -#, python-format -msgid "expected_signature: %s" -msgstr "" - -#: ../nova/auth/manager.py:312 ../nova/auth/manager.py:324 -#, python-format -msgid "signature: %s" -msgstr "" - -#: ../nova/auth/manager.py:314 ../nova/auth/manager.py:336 -#, python-format -msgid "Invalid signature for user %s" +#: nova/rpc/common.py:71 +msgid "Timeout while waiting on RPC response." msgstr "" -#: ../nova/auth/manager.py:332 +#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:82 +#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:53 +#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:58 #, python-format -msgid "host_only_signature: %s" -msgstr "" - -#: ../nova/auth/manager.py:428 -msgid "Must specify project" -msgstr "" - -#: ../nova/auth/manager.py:469 -#, python-format -msgid "Adding role %(role)s to user %(uid)s in project %(pid)s" -msgstr "" - -#: ../nova/auth/manager.py:472 -#, python-format -msgid "Adding sitewide role %(role)s to user %(uid)s" -msgstr "" - -#: ../nova/auth/manager.py:498 -#, python-format -msgid "Removing role %(role)s from user %(uid)s on project %(pid)s" -msgstr "" - -#: ../nova/auth/manager.py:501 -#, python-format -msgid "Removing sitewide role %(role)s from user %(uid)s" -msgstr "" - -#: ../nova/auth/manager.py:574 -#, python-format -msgid "Created project %(name)s with manager %(manager_user)s" -msgstr "" - -#: ../nova/auth/manager.py:592 -#, python-format -msgid "modifying project %s" -msgstr "" - -#: ../nova/auth/manager.py:604 -#, python-format -msgid "Adding user %(uid)s to project %(pid)s" -msgstr "" - -#: ../nova/auth/manager.py:625 -#, python-format -msgid "Remove user %(uid)s from project %(pid)s" -msgstr "" - -#: ../nova/auth/manager.py:655 -#, python-format -msgid "Deleting project %s" -msgstr "删除项目 %s" - -#: ../nova/auth/manager.py:713 -#, python-format -msgid "Created user %(rvname)s (admin: %(rvadmin)r)" -msgstr "" - -#: ../nova/auth/manager.py:722 -#, python-format -msgid "Deleting user %s" -msgstr "删除用户 %s" - -#: ../nova/auth/manager.py:732 -#, python-format -msgid "Access Key change for user %s" -msgstr "" - -#: ../nova/auth/manager.py:734 -#, python-format -msgid "Secret Key change for user %s" -msgstr "" - -#: ../nova/auth/manager.py:736 -#, python-format -msgid "Admin status set to %(admin)r for user %(uid)s" -msgstr "" - -#: ../nova/auth/manager.py:781 -#, python-format -msgid "No vpn data for project %s" -msgstr "没有 %s 项目的vpn数据" - -#: ../nova/virt/xenapi/vmops.py:164 -#, python-format -msgid "Attempted to power on non-existent instance bad instance id %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:166 -#, python-format -msgid "Starting instance %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:216 -#, python-format -msgid "instance %s: Failed to spawn" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:218 -#, python-format -msgid "Instance %s failed to spawn - performing clean-up" -msgstr "" - -#. Collect VDI/file resources to clean up; -#. These resources will be removed by _handle_spawn_error. -#: ../nova/virt/xenapi/vmops.py:284 -#, python-format -msgid "instance %s: Failed to spawn - " -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:349 -#, python-format -msgid "" -"Auto configuring disk for instance %(instance_uuid)s, attempting to resize " -"partition..." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:388 -#, python-format -msgid "Starting VM %s..." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:391 -#, python-format -msgid "Spawning VM %(instance_name)s created %(vm_ref)s." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:398 -#, python-format -msgid "Latest agent build for %(hypervisor)s/%(os)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:401 -#, python-format -msgid "No agent build found for %(hypervisor)s/%(os)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:408 -msgid "Querying agent version" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:414 -#, python-format -msgid "Instance agent version: %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:419 -#, python-format -msgid "Updating Agent to %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:432 -#, python-format -msgid "Invalid value for injected_files: '%s'" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:437 -#, python-format -msgid "Injecting file path: '%s'" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:443 -msgid "Setting admin password" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:447 -msgid "Resetting network" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:454 -msgid "Setting VCPU weight" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:467 -#, python-format -msgid "Instance %s: booted" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:477 -#, python-format -msgid "Instance %s: failed to boot" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:498 -#, python-format -msgid "Resources to remove:%s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:509 -#, python-format -msgid "Removing VDI %(vdi_ref)s" -msgstr "" - -#. Vdi has already been deleted -#: ../nova/virt/xenapi/vmops.py:514 -#, python-format -msgid "Skipping VDI destroy for %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:523 -msgid "Removing kernel/ramdisk files from dom0" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:552 -#, python-format -msgid "No opaque_ref could be determined for '%s'." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:606 -#, python-format -msgid "Finished snapshot and upload for VM %s" -msgstr "" - -#. TODO(sirp): Add quiesce and VSS locking support when Windows support -#. is added -#: ../nova/virt/xenapi/vmops.py:612 -#, python-format -msgid "Starting snapshot for VM %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:621 -#, python-format -msgid "Unable to Snapshot %(vm_ref)s: %(exc)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:640 -msgid "Failed to transfer vhd to new host" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:660 -#, python-format -msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:708 -#, python-format -msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB" -msgstr "" - -#. Resize up. Simple VDI resize will do the trick -#: ../nova/virt/xenapi/vmops.py:832 -#, python-format -msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:840 -#, python-format -msgid "Resize instance %s complete" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:868 -#, python-format -msgid "Failed to query agent version: %(resp)r" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:888 -#, python-format -msgid "domid changed from %(olddomid)s to %(newdomid)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:904 -#, python-format -msgid "Failed to update agent: %(resp)r" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:927 -#, python-format -msgid "Failed to exchange keys: %(resp)r" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:942 -#, python-format -msgid "Failed to update password: %(resp)r" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:968 -#, python-format -msgid "Failed to inject file: %(resp)r" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:977 -#, python-format -msgid "VM %(instance_name)s already halted,skipping shutdown..." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:982 -#, python-format -msgid "Shutting down VM for Instance %(instance_uuid)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1014 -#, python-format -msgid "Destroying VDIs for Instance %(instance_uuid)s" -msgstr "" - -#. 1. No kernel or ramdisk -#: ../nova/virt/xenapi/vmops.py:1072 -#, python-format -msgid "" -"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk " -"deletion" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1079 -msgid "instance has a kernel or ramdisk but not both" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1086 -msgid "kernel/ramdisk files removed" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1098 -#, python-format -msgid "Instance %(instance_uuid)s VM destroyed" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1116 -#, python-format -msgid "Destroying VM for Instance %(instance_uuid)s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1131 -msgid "VM is not present, skipping destroy..." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1181 -#, python-format -msgid "Instance is already in Rescue Mode: %s" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1252 -#, python-format -msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1256 -#, python-format -msgid "Automatically hard rebooting %d" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1312 -#, python-format -msgid "" -"Found %(migration_count)d unconfirmed migrations older than " -"%(confirm_window)d seconds" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1316 -#, python-format -msgid "Automatically confirming migration %d" -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1339 -msgid "Could not get bandwidth info." -msgstr "" - -#: ../nova/virt/xenapi/vmops.py:1406 -#, python-format -msgid "The call to %(method)s returned an error: %(e)s." +msgid "Table |%s| not created!" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1422 -#, python-format -msgid "injecting network info to xs for vm: |%s|" +#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:66 +msgid "dns_domains table not dropped" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1440 -#, python-format -msgid "creating vif(s) for vm: |%s|" +#: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91 +#: nova/scheduler/simple.py:142 +msgid "Is the appropriate service running?" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1449 -#, python-format -msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s." +#: nova/scheduler/chance.py:52 +msgid "Could not find another compute" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1452 -#, python-format -msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s." +#: nova/db/sqlalchemy/migration.py:36 +msgid "python-migrate is not installed. Exiting." msgstr "" -#: ../nova/virt/xenapi/vmops.py:1481 -#, python-format -msgid "injecting hostname to xs for vm: |%s|" +#: nova/db/sqlalchemy/migration.py:46 +msgid "version should be an integer" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1543 +#: nova/api/openstack/compute/contrib/server_start_stop.py:45 #, python-format -msgid "" -"The agent call to %(method)s returned an invalid response: %(ret)r. VM " -"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r" -msgstr "" +msgid "start instance %r" +msgstr "启动实例 %r" -#: ../nova/virt/xenapi/vmops.py:1568 +#: nova/api/openstack/compute/contrib/server_start_stop.py:54 #, python-format -msgid "" -"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; " -"args=%(args)r" -msgstr "" +msgid "stop instance %r" +msgstr "停止实例 %r" -#: ../nova/virt/xenapi/vmops.py:1572 +#: nova/scheduler/manager.py:85 #, python-format msgid "" -"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM " -"id=%(instance_uuid)s; args=%(args)r" +"Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1577 +#: nova/scheduler/manager.py:101 #, python-format -msgid "" -"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s; " -"args=%(args)r" +msgid "Failed to schedule_%(method)s: %(ex)s" msgstr "" -#: ../nova/virt/xenapi/vmops.py:1764 +#: nova/scheduler/manager.py:116 #, python-format -msgid "OpenSSL error: %s" +msgid "Setting instance %(instance_uuid)s to ERROR state." msgstr "" -#: ../nova/compute/manager.py:101 +#: nova/compute/manager.py:136 #, python-format msgid "check_instance_lock: decorating: |%s|" msgstr "" -#: ../nova/compute/manager.py:103 +#: nova/compute/manager.py:138 #, python-format msgid "" "check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_uuid)s|" msgstr "" -#: ../nova/compute/manager.py:107 +#: nova/compute/manager.py:142 #, python-format msgid "check_instance_lock: locked: |%s|" msgstr "check_instance_lock: 被鎖定: |%s|" -#: ../nova/compute/manager.py:109 +#: nova/compute/manager.py:144 #, python-format msgid "check_instance_lock: admin: |%s|" msgstr "" -#: ../nova/compute/manager.py:114 +#: nova/compute/manager.py:149 #, python-format msgid "check_instance_lock: executing: |%s|" msgstr "check_instance_lock: 执行中: |%s|" -#: ../nova/compute/manager.py:118 +#: nova/compute/manager.py:153 #, python-format msgid "check_instance_lock: not executing |%s|" msgstr "" -#: ../nova/compute/manager.py:145 +#: nova/compute/manager.py:199 #, python-format msgid "Unable to load the virtualization driver: %s" msgstr "" -#: ../nova/compute/manager.py:172 +#: ../nova/compute/manager.py:231 #, python-format msgid "" -"Current state of %(inst_name)s is %(drv_state)s, state in DB is %(db_state)s." +"Current state of %(instance_uuid)s is %(drv_state)s, state in DB is " +"%(db_state)s." msgstr "" -#: ../nova/compute/manager.py:177 +#: ../nova/compute/manager.py:236 #, python-format -msgid "Rebooting instance %(inst_name)s after nova-compute restart." +msgid "Rebooting instance %(instance_uuid)s after nova-compute restart." msgstr "" -#: ../nova/compute/manager.py:187 +#: nova/compute/manager.py:248 msgid "Hypervisor driver does not support firewall rules" msgstr "" -#: ../nova/compute/manager.py:192 +#: ../nova/compute/manager.py:251 #, python-format msgid "Checking state of %s" msgstr "" -#: ../nova/compute/manager.py:254 +#: ../nova/compute/manager.py:320 #, python-format msgid "setting up bdm %s" msgstr "" -#: ../nova/compute/manager.py:313 +#: nova/compute/manager.py:389 #, python-format msgid "" "Going to force the deletion of the vm %(instance_uuid)s, even if it is " "deleted" msgstr "" -#: ../nova/compute/manager.py:319 +#: nova/compute/manager.py:395 #, python-format msgid "" "Instance %(instance_uuid)s did not exist in the DB, but I will shut it down " "anyway using a special context" msgstr "" -#: ../nova/compute/manager.py:325 +#: nova/compute/manager.py:401 #, python-format -msgid "exception terminating the instance %(instance_id)s" +msgid "exception terminating the instance %(instance_uuid)s" msgstr "" -#: ../nova/compute/manager.py:354 +#: nova/compute/manager.py:434 #, python-format msgid "Instance %s not found." msgstr "" -#: ../nova/compute/manager.py:368 +#: nova/compute/manager.py:446 msgid "Instance has already been created" msgstr "虚拟机已经创建" -#: ../nova/compute/manager.py:410 +#: nova/compute/manager.py:489 #, python-format msgid "" "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, " "allowed_size_bytes=%(allowed_size_bytes)d" msgstr "" -#: ../nova/compute/manager.py:415 +#: nova/compute/manager.py:494 #, python-format msgid "" "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed size " "%(allowed_size_bytes)d" msgstr "" -#: ../nova/compute/manager.py:425 +#: ../nova/compute/manager.py:501 #, python-format msgid "instance %s: starting..." msgstr "虚拟机 %s :启动" -#: ../nova/compute/manager.py:435 +#: ../nova/compute/manager.py:511 #, python-format msgid "Skipping network allocation for instance %s" msgstr "" -#: ../nova/compute/manager.py:447 +#: ../nova/compute/manager.py:524 #, python-format msgid "Instance %s failed network setup" msgstr "" -#: ../nova/compute/manager.py:450 +#: ../nova/compute/manager.py:528 #, python-format msgid "instance network_info: |%s|" msgstr "" -#: ../nova/compute/manager.py:462 +#: ../nova/compute/manager.py:540 #, python-format msgid "Instance %s failed block device setup" msgstr "" -#: ../nova/compute/manager.py:482 +#: ../nova/compute/manager.py:556 #, python-format msgid "Instance %s failed to spawn" msgstr "" -#: ../nova/compute/manager.py:501 +#: ../nova/compute/manager.py:578 #, python-format msgid "deallocating network for instance: %s" msgstr "" -#: ../nova/compute/manager.py:541 +#: ../nova/compute/manager.py:629 #, python-format msgid "%(action_str)s instance %(instance_uuid)s" msgstr "" -#: ../nova/compute/manager.py:554 +#: nova/compute/manager.py:644 +#, python-format +msgid "trying to destroy already destroyed instance: %s" +msgstr "尝试销毁已经销毁的实例: %s" + +#: nova/compute/manager.py:664 #, python-format msgid "Ignoring DiskNotFound: %s" msgstr "" -#: ../nova/compute/manager.py:558 +#: nova/compute/manager.py:671 #, python-format -msgid "trying to destroy already destroyed instance: %s" -msgstr "尝试销毁已经销毁的实例: %s" +msgid "terminating bdm %s" +msgstr "" -#: ../nova/compute/manager.py:569 +#: nova/compute/manager.py:760 #, python-format -msgid "terminating bdm %s" +msgid "" +"Cannot rebuild instance [%(instance_uuid)s], because the given image does " +"not exist." msgstr "" -#: ../nova/compute/manager.py:655 +#: nova/compute/manager.py:765 +#, python-format +msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s" +msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s" + +#: nova/compute/manager.py:772 #, python-format msgid "Rebuilding instance %s" -msgstr "" +msgstr "正在重新创建实例 %s" -#: ../nova/compute/manager.py:709 +#: nova/compute/manager.py:825 #, python-format msgid "Rebooting instance %s" -msgstr "重启虚拟机 %s" +msgstr "正在重启实例 %s" -#: ../nova/compute/manager.py:722 +#: nova/compute/manager.py:840 #, python-format msgid "" "trying to reboot a non-running instance: %(instance_uuid)s (state: %(state)s " "expected: %(running)s)" -msgstr "" +msgstr "试图重启一个没有运行的实例:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)" -#: ../nova/compute/manager.py:756 +#: nova/compute/manager.py:878 #, python-format msgid "Image type not recognized %s" -msgstr "" +msgstr "无法识别镜像类型 %s" -#: ../nova/compute/manager.py:768 +#: nova/compute/manager.py:890 #, python-format msgid "instance %s: snapshotting" msgstr "实例 %s: 快照中" -#: ../nova/compute/manager.py:774 +#: nova/compute/manager.py:896 #, python-format msgid "" "trying to snapshot a non-running instance: %(instance_uuid)s (state: " "%(state)s expected: %(running)s)" -msgstr "" +msgstr "试图为一个没有运行的实例快照:%(instance_uuid)s (状态:%(state)s 预计:%(running)s)" -#: ../nova/compute/manager.py:825 +#: nova/compute/manager.py:949 #, python-format msgid "Found %(num_images)d images (rotation: %(rotation)d)" -msgstr "" +msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)" -#: ../nova/compute/manager.py:831 +#: nova/compute/manager.py:954 #, python-format msgid "Rotating out %d backups" msgstr "" -#: ../nova/compute/manager.py:835 +#: nova/compute/manager.py:958 #, python-format msgid "Deleting image %s" -msgstr "" +msgstr "正在删除镜像 %s" -#: ../nova/compute/manager.py:863 -msgid "Instance is not running" -msgstr "" +#: nova/compute/manager.py:988 +#, python-format +msgid "Failed to set admin password. Instance %s is not running" +msgstr "设置管理员密码失败。实例 %s 没有运行" -#: ../nova/compute/manager.py:867 +#: nova/compute/manager.py:994 #, python-format msgid "Instance %s: Root password set" -msgstr "" +msgstr "实例 %s:Root密码已设置" -#. NOTE(dprince): if the driver doesn't implement -#. set_admin_password we break to avoid a loop -#: ../nova/compute/manager.py:876 +#: nova/compute/manager.py:1003 msgid "set_admin_password is not implemented by this driver." -msgstr "" +msgstr "该驱动不能执行set_admin_password。" -#: ../nova/compute/manager.py:892 -msgid "Internal error" -msgstr "" +#: nova/compute/manager.py:1017 +msgid "Error setting admin password" +msgstr "设置管理员密码出错" -#: ../nova/compute/manager.py:905 +#: nova/compute/manager.py:1032 #, python-format msgid "" "trying to inject a file into a non-running instance: %(instance_uuid)s " -"(state: %(instance_state)s expected: %(expected_state)s)" +"(state: %(current_power_state)s expected: %(expected_state)s)" msgstr "" +"试图把一个文件注入到没有运行的实例:%(instance_uuid)s (状态: %(current_power_state)s 预计: " +"%(expected_state)s)" -#: ../nova/compute/manager.py:909 +#: nova/compute/manager.py:1037 #, python-format -msgid "instance %(nm)s: injecting file to %(path)s" -msgstr "" +msgid "instance %(instance_uuid)s: injecting file to %(path)s" +msgstr "实例 %(instance_uuid)s:把文件注入 %(path)s" -#: ../nova/compute/manager.py:922 +#: nova/compute/manager.py:1051 #, python-format msgid "" "trying to update agent on a non-running instance: %(instance_uuid)s (state: " -"%(instance_state)s expected: %(expected_state)s)" +"%(current_power_state)s expected: %(expected_state)s)" msgstr "" +"试图更新没有运行的实例上agent:%(instance_uuid)s (状态: %(current_power_state)s 预计: " +"%(expected_state)s)" -#: ../nova/compute/manager.py:926 +#: nova/compute/manager.py:1056 #, python-format -msgid "instance %(nm)s: updating agent to %(url)s" -msgstr "" +msgid "instance %(instance_uuid)s: updating agent to %(url)s" +msgstr "实例 %(instance_uuid)s:正在把agent更新到 %(url)s" -#: ../nova/compute/manager.py:938 +#: nova/compute/manager.py:1069 #, python-format msgid "instance %s: rescuing" -msgstr "实例%s:救援中..." +msgstr "实例%s:正在救援" -#: ../nova/compute/manager.py:960 +#: nova/compute/manager.py:1094 #, python-format msgid "instance %s: unrescuing" -msgstr "实例%s:取消救援" +msgstr "实例%s:正在取消救援" -#: ../nova/compute/manager.py:1068 -msgid "Migration error: destination same as source!" -msgstr "" +#: nova/compute/manager.py:1213 +msgid "destination same as source!" +msgstr "目标与来源一样。" -#: ../nova/compute/manager.py:1085 +#: nova/compute/manager.py:1230 #, python-format msgid "instance %s: migrating" -msgstr "" +msgstr "实例 %s:正在迁移" -#: ../nova/compute/manager.py:1122 ../nova/compute/manager.py:1183 +#: nova/compute/manager.py:1267 nova/compute/manager.py:1342 +#: nova/compute/manager.py:2290 #, python-format msgid "%s. Setting instance vm_state to ERROR" -msgstr "" +msgstr "%s。把实例的 vm_state设置为ERROR" -#: ../nova/compute/manager.py:1240 +#: nova/compute/manager.py:1395 #, python-format msgid "instance %s: pausing" msgstr "实例 %s: 暂停" -#: ../nova/compute/manager.py:1257 +#: nova/compute/manager.py:1413 #, python-format msgid "instance %s: unpausing" msgstr "实例 %s: 取消暫停" -#: ../nova/compute/manager.py:1285 +#: nova/compute/manager.py:1443 #, python-format msgid "instance %s: retrieving diagnostics" msgstr "实例 %s: 取消检测" -#: ../nova/compute/manager.py:1293 +#: nova/compute/manager.py:1452 #, python-format msgid "instance %s: suspending" msgstr "虚拟机 %s:挂起" -#: ../nova/compute/manager.py:1310 +#: nova/compute/manager.py:1474 #, python-format msgid "instance %s: resuming" msgstr "实例 %s: 唤醒中。。。" -#: ../nova/compute/manager.py:1328 +#: nova/compute/manager.py:1497 #, python-format msgid "instance %s: locking" msgstr "实例%s:锁定中" -#: ../nova/compute/manager.py:1336 +#: nova/compute/manager.py:1506 #, python-format msgid "instance %s: unlocking" msgstr "实例%s:取消锁定" -#: ../nova/compute/manager.py:1343 +#: nova/compute/manager.py:1514 #, python-format msgid "instance %s: getting locked state" msgstr "实例%s:获取锁状态" -#: ../nova/compute/manager.py:1352 +#: nova/compute/manager.py:1524 #, python-format msgid "instance %s: reset network" msgstr "实例%s:重置网络" -#: ../nova/compute/manager.py:1359 +#: nova/compute/manager.py:1532 #, python-format msgid "instance %s: inject network info" msgstr "" -#: ../nova/compute/manager.py:1363 +#: nova/compute/manager.py:1536 #, python-format msgid "network_info to inject: |%s|" msgstr "" -#: ../nova/compute/manager.py:1372 ../nova/api/ec2/cloud.py:800 +#: nova/api/ec2/cloud.py:785 nova/compute/manager.py:1548 #, python-format msgid "Get console output for instance %s" msgstr "获取虚拟机 %s 控制台输出" -#: ../nova/compute/manager.py:1381 -#, python-format -msgid "instance %s: getting ajax console" -msgstr "虚拟机 %s :获取ajax控制台" - -#: ../nova/compute/manager.py:1389 +#: nova/compute/manager.py:1573 #, python-format msgid "instance %s: getting vnc console" msgstr "" -#: ../nova/compute/manager.py:1399 +#: ../nova/compute/manager.py:1596 #, python-format msgid "" -"instance %(instance_id)s: booting with volume %(volume_id)s at %(mountpoint)s" +"instance %(instance_uuid)s: booting with volume %(volume_id)s at " +"%(mountpoint)s" msgstr "" -#: ../nova/compute/manager.py:1417 +#: ../nova/compute/manager.py:1615 #, python-format msgid "" "instance %(instance_uuid)s: attaching volume %(volume_id)s to %(mountpoint)s" msgstr "" -#. NOTE(vish): The inline callback eats the exception info so we -#. log the traceback here and reraise the same -#. ecxception below. -#: ../nova/compute/manager.py:1433 +#: ../nova/compute/manager.py:1628 #, python-format msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing" msgstr "" -#: ../nova/compute/manager.py:1472 +#: ../nova/compute/manager.py:1656 #, python-format msgid "" "Detach volume %(volume_id)s from mountpoint %(mp)s on instance " -"%(instance_id)s" -msgstr "移除挂载在实例%(instance_id)s上的%(mp)s卷%(volume_id)s" +"%(instance_uuid)s" +msgstr "" -#: ../nova/compute/manager.py:1477 +#: nova/compute/manager.py:1665 #, python-format msgid "Detaching volume from unknown instance %s" msgstr "从未知实例%s中移除卷" -#: ../nova/compute/manager.py:1534 +#: nova/compute/manager.py:1731 #, python-format msgid "" "Creating tmpfile %s to notify to other compute nodes that they should mount " "the same storage." msgstr "" -#: ../nova/compute/manager.py:1595 +#: ../nova/compute/manager.py:1788 #, python-format msgid "%s has no volume." msgstr "" -#: ../nova/compute/manager.py:1621 +#: nova/compute/manager.py:1821 #, python-format msgid "" "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s." msgstr "" -#: ../nova/compute/manager.py:1679 +#: ../nova/compute/manager.py:1873 #, python-format -msgid "Pre live migration for %(i_name)s failed at %(dest)s" +msgid "Pre live migration for %(instance_uuid)s failed at %(dest)s" msgstr "" -#: ../nova/compute/manager.py:1707 +#: nova/compute/manager.py:1905 msgid "post_live_migration() is started.." msgstr "" -#: ../nova/compute/manager.py:1733 ../nova/compute/manager.py:1741 +#: ../nova/compute/manager.py:1931 ../nova/compute/manager.py:1939 #, python-format msgid "No floating_ip is found for %s." msgstr "" -#: ../nova/compute/manager.py:1743 +#: ../nova/compute/manager.py:1941 #, python-format msgid "" -"Live migration: Unexpected error: %(i_name)s cannot inherit floating ip.\n" +"Live migration: Unexpected error: %(instance_uuid)s cannot inherit floating " +"ip.\n" "%(e)s" msgstr "" -#: ../nova/compute/manager.py:1780 +#: ../nova/compute/manager.py:1979 #, python-format -msgid "Migrating %(i_name)s to %(dest)s finished successfully." +msgid "Migrating %(instance_uuid)s to %(dest)s finished successfully." msgstr "" -#: ../nova/compute/manager.py:1782 +#: nova/compute/manager.py:1985 msgid "" "You may see the error \"libvirt: QEMU error: Domain not found: no domain " "with matching name.\" This error can be safely ignored." msgstr "" -#: ../nova/compute/manager.py:1796 +#: ../nova/compute/manager.py:1995 #, python-format msgid "Post operation of migraton started for %s ." msgstr "" -#: ../nova/compute/manager.py:1875 +#: nova/compute/manager.py:2083 msgid "Updating bandwidth usage cache" msgstr "" -#: ../nova/compute/manager.py:1898 +#: nova/compute/manager.py:2110 msgid "Updating host status" msgstr "" -#: ../nova/compute/manager.py:1923 +#: nova/compute/manager.py:2138 #, python-format msgid "" "Found %(num_db_instances)s in the database and %(num_vm_instances)s on the " -"hypervisor." -msgstr "" - -#: ../nova/compute/manager.py:1947 -msgid "FLAGS.reclaim_instance_interval <= 0, skipping..." -msgstr "" - -#: ../nova/compute/manager.py:1959 -#, python-format -msgid "Reclaiming deleted instance %(instance_id)s" -msgstr "" - -#: ../nova/scheduler/simple.py:67 -msgid "All hosts have too many cores" -msgstr "所有服务器拥有太多处理器" - -#: ../nova/scheduler/simple.py:119 -msgid "All hosts have too many gigabytes" -msgstr "所有服务器拥有太多硬盘空间" - -#: ../nova/scheduler/simple.py:136 -msgid "All hosts have too many networks" -msgstr "所有服务器拥有太多网络" - -#: ../nova/api/openstack/v2/contrib/extended_status.py:50 -#: ../nova/api/openstack/v2/contrib/extended_status.py:69 -msgid "Server not found." -msgstr "" - -#: ../nova/api/openstack/v2/contrib/disk_config.py:76 -msgid "RAX-DCF:diskConfig must be either 'MANUAL' or 'AUTO'." -msgstr "" - -#: ../nova/api/openstack/v2/contrib/volumes.py:74 -#, python-format -msgid "vol=%s" +"hypervisor." msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:109 +#: nova/compute/manager.py:2150 #, python-format -msgid "Delete volume with id: %s" +msgid "" +"Instance %(name)s found in database but not known by hypervisor. Setting " +"power state to NOSTATE" msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:143 -#: ../nova/api/ec2/cloud.py:887 -#, python-format -msgid "Create volume of %s GB" +#: nova/compute/manager.py:2174 +msgid "FLAGS.reclaim_instance_interval <= 0, skipping..." msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:291 +#: ../nova/compute/manager.py:2181 #, python-format -msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s" +msgid "Reclaiming deleted instance %(instance_uuid)s" msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:327 -#: ../nova/api/ec2/cloud.py:936 +#: ../nova/compute/manager.py:2255 #, python-format -msgid "Detach volume %s" +msgid "" +"Detected instance %(instance_uuid)s with name label '%(name_label)s' which " +"is marked as DELETED but still present on host." msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:444 +#: ../nova/compute/manager.py:2261 #, python-format -msgid "Delete snapshot with id: %s" +msgid "" +"Destroying instance %(instance_uuid)s with name label '%(name_label)s' which " +"is marked as DELETED but still present on host." msgstr "" -#: ../nova/api/openstack/v2/contrib/volumes.py:479 +#: nova/compute/manager.py:2279 #, python-format -msgid "Create snapshot from volume %s" +msgid "" +"Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action" msgstr "" -#: ../nova/vnc/auth.py:58 -#, python-format -msgid "Unauthorized Access: (%s)" +#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:45 +msgid "progress column not added to compute_nodes table" msgstr "" -#: ../nova/vnc/auth.py:98 -#, python-format -msgid "Received Websocket Request: %s" +#: nova/scheduler/simple.py:87 +msgid "Not enough allocatable CPU cores remaining" msgstr "" -#: ../nova/vnc/auth.py:100 -#, python-format -msgid "Received Request: %s" +#: nova/scheduler/simple.py:136 +msgid "Not enough allocatable volume gigabytes remaining" msgstr "" -#: ../nova/vnc/auth.py:118 +#: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34 #, python-format -msgid "Received Token: %(token)s, %(token_dict)s)" +msgid "Bad mac for to_global_ipv6: %s" msgstr "" -#: ../nova/vnc/auth.py:122 +#: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36 #, python-format -msgid "Checking Token: %(token)s, %(token_valid)s)" +msgid "Bad prefix for to_global_ipv6: %s" msgstr "" -#: ../nova/vnc/auth.py:134 +#: nova/api/openstack/compute/contrib/aggregates.py:137 #, python-format -msgid "Deleting Expired Token: %s)" -msgstr "" +msgid "Aggregates does not have %s action" +msgstr "Aggregates没有动作 %s" + +#: nova/api/openstack/compute/servers.py:1006 +#: nova/api/openstack/compute/contrib/aggregates.py:140 +#: nova/api/openstack/compute/contrib/networks.py:65 +msgid "Invalid request body" +msgstr "无效的请求主体" -#: ../nova/virt/vmwareapi_conn.py:100 +#: nova/virt/vmwareapi_conn.py:105 msgid "" "Must specify vmwareapi_host_ip,vmwareapi_host_username and " "vmwareapi_host_password to useconnection_type=vmwareapi" msgstr "" -#: ../nova/virt/vmwareapi_conn.py:262 +#: nova/virt/vmwareapi_conn.py:271 #, python-format msgid "In vmwareapi:_create_session, got this exception: %s" msgstr "" -#: ../nova/virt/vmwareapi_conn.py:345 +#: nova/virt/vmwareapi_conn.py:354 #, python-format msgid "In vmwareapi:_call_method, got this exception: %s" msgstr "" -#: ../nova/virt/vmwareapi_conn.py:384 +#: nova/virt/vmwareapi_conn.py:393 #, python-format msgid "Task [%(task_name)s] %(task_ref)s status: success" msgstr "" -#: ../nova/virt/vmwareapi_conn.py:390 +#: nova/virt/vmwareapi_conn.py:399 #, python-format msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s" msgstr "" -#: ../nova/virt/vmwareapi_conn.py:395 +#: nova/virt/vmwareapi_conn.py:404 #, python-format msgid "In vmwareapi:_poll_task, Got this error %s" msgstr "" -#: ../nova/vsa/manager.py:70 +#: nova/vsa/manager.py:73 #, python-format msgid "Create call received for VSA %s" msgstr "" -#: ../nova/vsa/manager.py:77 ../nova/vsa/manager.py:104 +#: nova/vsa/manager.py:80 nova/vsa/manager.py:107 #, python-format msgid "Failed to find VSA %(vsa_id)d" msgstr "" -#: ../nova/vsa/manager.py:86 +#: nova/vsa/manager.py:89 #, python-format msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s" msgstr "" -#: ../nova/vsa/manager.py:97 +#: nova/vsa/manager.py:100 #, python-format msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait" msgstr "" -#: ../nova/vsa/manager.py:111 +#: nova/vsa/manager.py:114 #, python-format msgid "" "VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of " "%(cvol_exp)d)" msgstr "" -#: ../nova/vsa/manager.py:134 +#: nova/vsa/manager.py:137 #, python-format msgid "" "VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in %(status)s " "state" msgstr "" -#: ../nova/vsa/manager.py:143 +#: nova/vsa/manager.py:146 #, python-format msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s" msgstr "" -#: ../nova/vsa/manager.py:150 +#: nova/vsa/manager.py:153 #, python-format msgid "VSA ID %(vsa_id)d: Delete all BE volumes" msgstr "" -#: ../nova/vsa/manager.py:165 +#: nova/vsa/manager.py:168 #, python-format msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances" msgstr "" -#: ../nova/auth/fakeldap.py:33 +#: nova/auth/fakeldap.py:33 msgid "Attempted to instantiate singleton" msgstr "" -#: ../nova/network/quantum/client.py:151 +#: nova/network/quantum/client.py:154 msgid "Tenant ID not set" msgstr "" -#: ../nova/network/quantum/client.py:177 +#: nova/network/quantum/client.py:181 #, python-format -msgid "" -"Quantum Client Request:\n" -"%(method)s %(action)s\n" +msgid "Quantum Client Request: %(method)s %(action)s" msgstr "" -#: ../nova/network/quantum/client.py:193 +#: nova/network/quantum/client.py:196 #, python-format msgid "Quantum entity not found: %s" msgstr "" -#: ../nova/network/quantum/client.py:203 +#: nova/network/quantum/client.py:207 #, python-format msgid "Server %(status_code)s error: %(data)s" msgstr "" -#: ../nova/network/quantum/client.py:207 -#: ../nova/network/quantum/melange_connection.py:86 +#: nova/network/quantum/client.py:210 #, python-format msgid "Unable to connect to server. Got error: %s" msgstr "" -#: ../nova/network/quantum/client.py:225 +#: nova/network/quantum/client.py:229 #, python-format msgid "unable to deserialize object of type = '%s'" msgstr "" -#: ../nova/tests/fake_utils.py:73 -#, python-format -msgid "Faking execution of cmd (subprocess): %s" -msgstr "" - -#: ../nova/tests/fake_utils.py:81 -#, python-format -msgid "Faked command matched %s" -msgstr "" - -#: ../nova/tests/fake_utils.py:97 -#, python-format -msgid "Faked command raised an exception %s" -msgstr "" - -#: ../nova/tests/fake_utils.py:102 -#, python-format -msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'" -msgstr "" - -#: ../nova/virt/vmwareapi/vim.py:81 +#: nova/virt/vmwareapi/vim.py:84 msgid "Unable to import suds." msgstr "" -#: ../nova/virt/vmwareapi/vim.py:87 +#: nova/virt/vmwareapi/vim.py:90 msgid "Must specify vmwareapi_wsdl_loc" msgstr "" -#: ../nova/virt/vmwareapi/vim.py:143 -msgid "No such SOAP method " +#: nova/virt/vmwareapi/vim.py:145 +#, python-format +msgid "No such SOAP method '%s' provided by VI SDK" msgstr "" -#: ../nova/virt/vmwareapi/vim.py:148 -msgid "httplib " +#: nova/virt/vmwareapi/vim.py:150 +#, python-format +msgid "httplib error in %s: " msgstr "" -#: ../nova/virt/vmwareapi/vim.py:155 -msgid "Socket " +#: nova/virt/vmwareapi/vim.py:157 +#, python-format +msgid "Socket error in %s: " msgstr "" -#: ../nova/virt/vmwareapi/vim.py:160 -msgid "Type " +#: nova/virt/vmwareapi/vim.py:162 +#, python-format +msgid "Type error in %s: " msgstr "" -#: ../nova/virt/vmwareapi/vim.py:164 +#: nova/virt/vmwareapi/vim.py:166 #, python-format msgid "Exception in %s " msgstr "" -#: ../nova/api/direct.py:219 +#: nova/api/direct.py:218 msgid "not available" -msgstr "" +msgstr "不可用" -#: ../nova/api/direct.py:300 +#: nova/api/direct.py:299 #, python-format msgid "Returned non-serializeable type: %s" -msgstr "" +msgstr "返回的non-serializeable类型:%s" -#: ../nova/virt/vmwareapi/vmops.py:63 +#: nova/virt/vmwareapi/vmops.py:66 msgid "Getting list of instances" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:79 +#: nova/virt/vmwareapi/vmops.py:82 #, python-format msgid "Got total of %s instances" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:122 +#: nova/virt/vmwareapi/vmops.py:125 msgid "Couldn't get a local Datastore reference" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:192 +#: nova/virt/vmwareapi/vmops.py:195 #, python-format msgid "Creating VM with the name %s on the ESX host" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:201 +#: nova/virt/vmwareapi/vmops.py:204 #, python-format msgid "Created VM with the name %s on the ESX host" msgstr "" -#. Create a Virtual Disk of the size of the flat vmdk file. This is -#. done just to generate the meta-data file whose specifics -#. depend on the size of the disk, thin/thick provisioning and the -#. storage adapter type. -#. Here we assume thick provisioning and lsiLogic for the adapter -#. type -#: ../nova/virt/vmwareapi/vmops.py:230 -msgid "Creating Virtual Disk of size " +#: nova/virt/vmwareapi/vmops.py:233 +#, 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:247 +#: nova/virt/vmwareapi/vmops.py:250 #, python-format -msgid "Created Virtual Disk of size %(vmdk_file_size_in_kb)s" +msgid "" +"Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host " +"local store %(data_store_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:256 +#: nova/virt/vmwareapi/vmops.py:259 #, python-format -msgid "Deleting the file %(flat_uploaded_vmdk_path)s " +msgid "" +"Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore " +"%(data_store_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:268 +#: nova/virt/vmwareapi/vmops.py:271 #, python-format -msgid "Deleted the file %(flat_uploaded_vmdk_path)s on the " +msgid "" +"Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store " +"%(data_store_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:279 +#: nova/virt/vmwareapi/vmops.py:282 #, python-format -msgid "Downloading image file data %(image_ref)s to the ESX " +msgid "" +"Downloading image file data %(image_ref)s to the ESX data store " +"%(data_store_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:294 +#: nova/virt/vmwareapi/vmops.py:297 #, python-format -msgid "Downloaded image file data %(image_ref)s to the ESX " +msgid "" +"Downloaded image file data %(image_ref)s to the ESX data store " +"%(data_store_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:311 +#: nova/virt/vmwareapi/vmops.py:314 #, python-format -msgid "Reconfiguring VM instance %s to attach the image " +msgid "Reconfiguring VM instance %s to attach the image disk" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:318 +#: nova/virt/vmwareapi/vmops.py:321 #, python-format -msgid "Reconfigured VM instance %s to attach the image " +msgid "Reconfigured VM instance %s to attach the image disk" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:325 +#: nova/virt/vmwareapi/vmops.py:328 #, python-format msgid "Powering on the VM instance %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:331 +#: nova/virt/vmwareapi/vmops.py:334 #, python-format msgid "Powered on the VM instance %s" msgstr "" -#. Create a snapshot of the VM -#: ../nova/virt/vmwareapi/vmops.py:376 +#: nova/virt/vmwareapi/vmops.py:379 #, python-format msgid "Creating Snapshot of the VM instance %s " msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:386 +#: nova/virt/vmwareapi/vmops.py:389 #, python-format msgid "Created Snapshot of the VM instance %s " msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:429 -msgid "Copying disk data before snapshot of the VM " +#: nova/virt/vmwareapi/vmops.py:432 +#, python-format +msgid "Copying disk data before snapshot of the VM instance %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:442 -msgid "Copied disk data before snapshot of the VM " +#: nova/virt/vmwareapi/vmops.py:445 +#, python-format +msgid "Copied disk data before snapshot of the VM instance %s" msgstr "" -#. Upload the contents of -flat.vmdk file which has the disk data. -#: ../nova/virt/vmwareapi/vmops.py:451 +#: nova/virt/vmwareapi/vmops.py:454 #, python-format msgid "Uploading image %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:464 +#: nova/virt/vmwareapi/vmops.py:467 #, python-format msgid "Uploaded image %s" msgstr "" -#. Delete the temporary vmdk created above. -#: ../nova/virt/vmwareapi/vmops.py:474 +#: nova/virt/vmwareapi/vmops.py:477 #, python-format msgid "Deleting temporary vmdk file %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:483 +#: nova/virt/vmwareapi/vmops.py:486 #, python-format msgid "Deleted temporary vmdk file %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:515 +#: nova/virt/vmwareapi/vmops.py:518 msgid "instance is not powered on" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:522 +#: nova/virt/vmwareapi/vmops.py:525 #, python-format msgid "Rebooting guest OS of VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:525 +#: nova/virt/vmwareapi/vmops.py:528 #, python-format msgid "Rebooted guest OS of VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:527 +#: nova/virt/vmwareapi/vmops.py:530 #, python-format msgid "Doing hard reboot of VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:531 +#: nova/virt/vmwareapi/vmops.py:534 #, python-format msgid "Did hard reboot of VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:543 +#: nova/virt/vmwareapi/vmops.py:546 #, python-format msgid "instance - %s not present" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:562 +#: nova/virt/vmwareapi/vmops.py:565 #, python-format msgid "Powering off the VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:567 +#: nova/virt/vmwareapi/vmops.py:570 #, python-format msgid "Powered off the VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:571 +#: nova/virt/vmwareapi/vmops.py:574 #, python-format msgid "Unregistering the VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:574 +#: nova/virt/vmwareapi/vmops.py:577 #, python-format msgid "Unregistered the VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:576 -msgid "In vmwareapi:vmops:destroy, got this exception" +#: nova/virt/vmwareapi/vmops.py:579 +#, python-format +msgid "" +"In vmwareapi:vmops:destroy, got this exception while un-registering the VM: " +"%s" +msgstr "" + +#: nova/virt/vmwareapi/vmops.py:590 +#, python-format +msgid "" +"Deleting contents of the VM %(name)s from datastore %(datastore_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:587 +#: nova/virt/vmwareapi/vmops.py:600 #, python-format -msgid "Deleting contents of the VM %(name)s from " +msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:597 +#: nova/virt/vmwareapi/vmops.py:605 #, python-format -msgid "Deleted contents of the VM %(name)s from " +msgid "" +"In vmwareapi:vmops:destroy, got this exception while deleting the VM " +"contents from the disk: %s" +msgstr "" + +#: nova/virt/vmwareapi/vmops.py:613 +msgid "pause not supported for vmwareapi" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:602 -msgid "In vmwareapi:vmops:destroy, " +#: nova/virt/vmwareapi/vmops.py:617 +msgid "unpause not supported for vmwareapi" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:628 +#: nova/virt/vmwareapi/vmops.py:631 #, python-format msgid "Suspending the VM %s " msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:632 +#: nova/virt/vmwareapi/vmops.py:635 #, python-format msgid "Suspended the VM %s " msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:635 +#: nova/virt/vmwareapi/vmops.py:638 msgid "instance is powered off and can not be suspended." msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:638 +#: nova/virt/vmwareapi/vmops.py:641 #, python-format -msgid "VM %s was already in suspended state. So returning " +msgid "" +"VM %s was already in suspended state. So returning without doing anything" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:651 +#: nova/virt/vmwareapi/vmops.py:654 #, python-format msgid "Resuming the VM %s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:656 +#: nova/virt/vmwareapi/vmops.py:659 #, python-format msgid "Resumed the VM %s " msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:658 +#: nova/virt/vmwareapi/vmops.py:661 msgid "instance is not in a suspended state" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:757 -#, python-format -msgid "Reconfiguring VM instance %(name)s to set the machine id " +#: nova/virt/vmwareapi/vmops.py:697 +msgid "get_diagnostics not implemented for vmwareapi" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:765 +#: nova/virt/vmwareapi/vmops.py:755 #, python-format -msgid "Reconfigured VM instance %(name)s to set the machine id " +msgid "" +"Reconfiguring VM instance %(name)s to set the machine id with ip - " +"%(ip_addr)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:802 +#: nova/virt/vmwareapi/vmops.py:763 #, python-format -msgid "Creating directory with path %s" +msgid "" +"Reconfigured VM instance %(name)s to set the machine id with ip - %(ip_addr)s" msgstr "" -#: ../nova/virt/vmwareapi/vmops.py:806 +#: nova/virt/vmwareapi/vmops.py:800 #, python-format -msgid "Created directory with path %s" +msgid "Creating directory with path %s" msgstr "" -#: ../nova/tests/integrated/test_volumes.py:185 +#: nova/virt/vmwareapi/vmops.py:804 #, python-format -msgid "Attachment = %s" +msgid "Created directory with path %s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:102 +#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:102 #, python-format msgid "" "Could not cast flavorid to integer: %s. Set flavorid to an integer-like " "string to downgrade." msgstr "" -#: ../nova/tests/test_compute.py:288 ../nova/tests/test_compute.py:1165 +#: nova/tests/test_compute.py:352 nova/tests/test_compute.py:1460 #, python-format msgid "Running instances: %s" msgstr "" -#: ../nova/tests/test_compute.py:294 +#: nova/tests/test_compute.py:358 #, python-format msgid "After terminating instances: %s" msgstr "" -#: ../nova/tests/test_compute.py:1176 +#: nova/tests/test_compute.py:582 +msgid "Internal error" +msgstr "" + +#: nova/tests/test_compute.py:1471 #, python-format msgid "After force-killing instances: %s" msgstr "" -#: ../nova/tests/integrated/api/client.py:38 +#: nova/api/openstack/compute/contrib/admin_actions.py:60 +#, python-format +msgid "Compute.api::pause %s" +msgstr "Compute.api::暂停 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:77 +#, python-format +msgid "Compute.api::unpause %s" +msgstr "Compute.api::继续 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:94 +#, python-format +msgid "compute.api::suspend %s" +msgstr "compute.api::挂起 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:111 +#, python-format +msgid "compute.api::resume %s" +msgstr "compute.api::恢复 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:127 +#, python-format +msgid "Error in migrate %s" +msgstr "迁移错误 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:141 +#, python-format +msgid "Compute.api::reset_network %s" +msgstr "Compute.api::reset_network %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:154 +#: nova/api/openstack/compute/contrib/admin_actions.py:170 +#: nova/api/openstack/compute/contrib/admin_actions.py:186 +#: nova/api/openstack/compute/contrib/multinic.py:41 +#: nova/api/openstack/compute/contrib/rescue.py:43 +msgid "Server not found" +msgstr "没有找到服务器" + +#: nova/api/openstack/compute/contrib/admin_actions.py:157 +#, python-format +msgid "Compute.api::inject_network_info %s" +msgstr "Compute.api::inject_network_info %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:173 +#, python-format +msgid "Compute.api::lock %s" +msgstr "compute.api::加锁 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:189 +#, python-format +msgid "Compute.api::unlock %s" +msgstr "compute.api::解锁 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:219 +#, python-format +msgid "createBackup entity requires %s attribute" +msgstr "实体createBackup需要有属性 %s" + +#: nova/api/openstack/compute/contrib/admin_actions.py:223 +msgid "Malformed createBackup entity" +msgstr "非正常的实体createBackup" + +#: nova/api/openstack/compute/contrib/admin_actions.py:229 +msgid "createBackup attribute 'rotation' must be an integer" +msgstr "createBackup的属性 'rotation'必须是整数" + +#: nova/api/openstack/compute/servers.py:1102 +#: nova/api/openstack/compute/contrib/admin_actions.py:238 +msgid "Invalid metadata" +msgstr "无效的元数据" + +#: nova/api/openstack/compute/contrib/admin_actions.py:272 +msgid "host and block_migration must be specified." +msgstr "host与block_migration必须确定" + +#: nova/api/openstack/compute/contrib/admin_actions.py:284 +#, python-format +msgid "Live migration of instance %(id)s to host %(host)s failed" +msgstr "实例 %(id)s 到主机 %(host)s 的动态迁移失败" + +#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:460 +#, python-format +msgid "Returning exception %s to caller" +msgstr "返回 %s 异常给调用者" + +#: nova/rpc/amqp.py:187 nova/rpc/impl_carrot.py:494 +#, python-format +msgid "unpacked context: %s" +msgstr "" + +#: nova/rpc/amqp.py:230 nova/rpc/impl_carrot.py:261 +#, python-format +msgid "received %s" +msgstr "已接收 %s" + +#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:274 +#, python-format +msgid "no method for message: %s" +msgstr "没有适用于消息 %s 的方法" + +#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:276 +#, python-format +msgid "No method for message: %s" +msgstr "没有适用于消息 %s 的方法" + +#: nova/rpc/amqp.py:318 nova/rpc/impl_carrot.py:528 +#, python-format +msgid "Making asynchronous call on %s ..." +msgstr "" + +#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:531 +#, python-format +msgid "MSG_ID is %s" +msgstr "消息ID(MSG_ID)是 %s" + +#: nova/rpc/amqp.py:343 nova/rpc/impl_carrot.py:610 +#, python-format +msgid "Making asynchronous cast on %s..." +msgstr "" + +#: nova/rpc/amqp.py:351 nova/rpc/impl_carrot.py:620 +msgid "Making asynchronous fanout cast..." +msgstr "" + +#: nova/rpc/amqp.py:376 nova/rpc/impl_carrot.py:630 +#, python-format +msgid "Sending notification on %s..." +msgstr "" + +#: nova/tests/integrated/api/client.py:38 #, python-format msgid "" "%(message)s\n" @@ -2416,1822 +2181,2073 @@ "Body: %(_body)s" msgstr "" -#: ../nova/tests/integrated/api/client.py:47 +#: nova/tests/integrated/api/client.py:47 msgid "Authentication error" msgstr "" -#: ../nova/tests/integrated/api/client.py:55 +#: nova/tests/integrated/api/client.py:55 msgid "Authorization error" msgstr "" -#: ../nova/tests/integrated/api/client.py:63 +#: nova/tests/integrated/api/client.py:63 msgid "Item not found" msgstr "" -#: ../nova/tests/integrated/api/client.py:105 +#: nova/tests/integrated/api/client.py:105 #, python-format msgid "Doing %(method)s on %(relative_url)s" msgstr "" -#: ../nova/tests/integrated/api/client.py:107 +#: nova/tests/integrated/api/client.py:107 #, python-format msgid "Body: %s" msgstr "" -#: ../nova/tests/integrated/api/client.py:125 +#: nova/tests/integrated/api/client.py:125 #, python-format msgid "%(auth_uri)s => code %(http_status)s" msgstr "" -#: ../nova/tests/integrated/api/client.py:151 +#: nova/tests/integrated/api/client.py:151 #, python-format msgid "%(relative_uri)s => code %(http_status)s" msgstr "" -#: ../nova/tests/integrated/api/client.py:161 +#: nova/tests/integrated/api/client.py:161 msgid "Unexpected status code" msgstr "" -#: ../nova/tests/integrated/api/client.py:168 +#: nova/tests/integrated/api/client.py:168 #, python-format msgid "Decoding JSON: %s" msgstr "" -#: ../nova/console/vmrc_manager.py:116 +#: nova/api/openstack/compute/image_metadata.py:40 +#: nova/api/openstack/compute/images.py:142 +#: nova/api/openstack/compute/images.py:157 +msgid "Image not found." +msgstr "镜像没有找到。" + +#: nova/api/openstack/compute/image_metadata.py:79 +msgid "Incorrect request body format" +msgstr "" + +#: nova/api/openstack/compute/image_metadata.py:111 +msgid "Invalid metadata key" +msgstr "" + +#: nova/console/vmrc_manager.py:122 #, python-format msgid "Tried to remove non-existent console %(console_id)s." msgstr "" -#: ../nova/console/vmrc_manager.py:119 +#: nova/console/vmrc_manager.py:125 #, python-format msgid "Removing console %(console_id)s." msgstr "" -#. Translate Base -> Service -#: ../nova/image/glance.py:266 +#: nova/image/glance.py:147 +msgid "Connection error contacting glance server, retrying" +msgstr "" + +#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103 +msgid "Maximum attempts reached" +msgstr "" + +#: nova/image/glance.py:275 #, python-format msgid "Creating image in Glance. Metadata passed in %s" msgstr "" -#: ../nova/image/glance.py:269 +#: nova/image/glance.py:278 #, python-format msgid "Metadata after formatting for Glance %s" msgstr "" -#: ../nova/image/glance.py:277 +#: nova/image/glance.py:286 #, python-format msgid "Metadata returned from Glance formatted for Base %s" msgstr "" -#: ../nova/image/glance.py:319 ../nova/image/glance.py:323 +#: nova/image/glance.py:328 nova/image/glance.py:332 msgid "Not the image owner" msgstr "" -#: ../nova/image/glance.py:398 +#: nova/image/glance.py:407 #, python-format msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s" msgstr "" -#: ../nova/virt/xenapi_conn.py:159 +#: nova/virt/xenapi_conn.py:165 msgid "" "Must specify xenapi_connection_url, xenapi_connection_username (optionally), " "and xenapi_connection_password to use connection_type=xenapi" msgstr "" -#: ../nova/virt/xenapi_conn.py:444 +#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:441 +msgid "Could not determine iscsi initiator name" +msgstr "" + +#: nova/virt/xenapi_conn.py:420 nova/virt/baremetal/proxy.py:716 +#: nova/virt/libvirt/connection.py:1703 +#, python-format +msgid "Compute_service record created for %s " +msgstr "" + +#: nova/virt/xenapi_conn.py:423 nova/virt/baremetal/proxy.py:720 +#: nova/virt/libvirt/connection.py:1706 +#, python-format +msgid "Compute_service record updated for %s " +msgstr "" + +#: nova/virt/xenapi_conn.py:484 msgid "Host startup on XenServer is not supported." msgstr "" -#: ../nova/virt/xenapi_conn.py:458 +#: nova/virt/xenapi_conn.py:498 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)" msgstr "" -#: ../nova/virt/xenapi_conn.py:542 +#: nova/virt/xenapi_conn.py:587 #, python-format msgid "Task [%(name)s] %(task)s status: success %(result)s" msgstr "" -#: ../nova/virt/xenapi_conn.py:551 +#: nova/virt/xenapi_conn.py:596 #, python-format msgid "Task [%(name)s] %(task)s status: %(status)s %(error_info)s" msgstr "" -#: ../nova/virt/xenapi_conn.py:577 ../nova/virt/xenapi_conn.py:590 +#: nova/virt/xenapi_conn.py:616 nova/virt/xenapi_conn.py:629 #, python-format msgid "Got exception: %s" msgstr "" -#: ../nova/virt/xenapi_conn.py:616 ../nova/virt/libvirt/connection.py:1918 +#: nova/virt/xenapi_conn.py:655 nova/virt/baremetal/proxy.py:773 +#: nova/virt/libvirt/connection.py:2250 msgid "Updating host stats" msgstr "" -#. Invalid JSON object -#: ../nova/virt/xenapi_conn.py:627 +#: nova/virt/xenapi_conn.py:666 #, python-format msgid "Unable to get updated status: %s" msgstr "" -#. No SR configured -#: ../nova/virt/xenapi_conn.py:634 +#: nova/virt/xenapi_conn.py:673 #, python-format msgid "Unable to get SR for this host: %s" msgstr "" -#: ../nova/scheduler/vsa.py:104 +#: nova/scheduler/vsa.py:112 #, python-format msgid "_filter_hosts: %(request_spec)s" msgstr "" -#: ../nova/scheduler/vsa.py:107 +#: nova/scheduler/vsa.py:115 #, python-format msgid "Filter hosts for drive type %s" msgstr "" -#: ../nova/scheduler/vsa.py:124 +#: nova/scheduler/vsa.py:132 #, python-format msgid "Host %s has no free capacity. Skip" msgstr "" -#: ../nova/scheduler/vsa.py:129 +#: nova/scheduler/vsa.py:137 #, python-format msgid "Filter hosts: %s" msgstr "" -#: ../nova/scheduler/vsa.py:146 +#: nova/scheduler/vsa.py:153 msgid "Must implement host selection mechanism" msgstr "" -#. try to select from already selected hosts only -#: ../nova/scheduler/vsa.py:156 +#: nova/scheduler/vsa.py:163 #, python-format msgid "Maximum number of hosts selected (%d)" msgstr "" -#: ../nova/scheduler/vsa.py:164 +#: nova/scheduler/vsa.py:171 #, python-format msgid "Selected excessive host %(host)s" msgstr "" -#: ../nova/scheduler/vsa.py:204 +#: nova/scheduler/vsa.py:211 #, python-format msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s" msgstr "" -#: ../nova/scheduler/vsa.py:232 +#: nova/scheduler/vsa.py:239 #, python-format msgid "volume_params %(volume_params)s" msgstr "" -#: ../nova/scheduler/vsa.py:237 +#: nova/scheduler/vsa.py:244 #, python-format msgid "%(i)d: Volume %(name)s" msgstr "" -#: ../nova/scheduler/vsa.py:275 +#: nova/scheduler/vsa.py:282 #, python-format msgid "Attempting to spawn %(num_volumes)d volume(s)" msgstr "" -#: ../nova/scheduler/vsa.py:291 +#: nova/scheduler/vsa.py:298 msgid "Error creating volumes" msgstr "" -#: ../nova/scheduler/vsa.py:321 +#: nova/scheduler/vsa.py:328 #, python-format msgid "Non-VSA volume %d" msgstr "" -#: ../nova/scheduler/vsa.py:334 +#: nova/scheduler/vsa.py:341 #, python-format msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s" msgstr "" -#: ../nova/scheduler/vsa.py:344 +#: nova/scheduler/vsa.py:351 msgid "Error creating volume" msgstr "" -#: ../nova/scheduler/vsa.py:386 +#: nova/scheduler/vsa.py:391 #, python-format msgid "No capability selected for volume of size %(size)s" msgstr "" -#: ../nova/scheduler/vsa.py:406 +#: nova/scheduler/vsa.py:411 #, python-format msgid "Host %s:" msgstr "" -#: ../nova/scheduler/vsa.py:415 +#: nova/scheduler/vsa.py:420 #, python-format msgid "" "\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. " "Available capacity %(avail)-5s" msgstr "" -#: ../nova/scheduler/vsa.py:480 +#: nova/scheduler/vsa.py:483 #, python-format msgid "" "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)" msgstr "" -#: ../nova/scheduler/vsa.py:526 +#: nova/scheduler/vsa.py:528 #, python-format msgid "" "\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s " "%(type_str)s)" msgstr "" -#: ../nova/console/xvp.py:93 +#: nova/console/xvp.py:98 msgid "Rebuilding xvp conf" msgstr "" -#: ../nova/console/xvp.py:111 +#: nova/console/xvp.py:116 #, python-format msgid "Re-wrote %s" msgstr "" -#: ../nova/console/xvp.py:116 +#: nova/console/xvp.py:121 msgid "Stopping xvp" msgstr "" -#: ../nova/console/xvp.py:129 +#: nova/console/xvp.py:134 msgid "Starting xvp" msgstr "" -#: ../nova/console/xvp.py:136 +#: nova/console/xvp.py:141 +#, python-format +msgid "Error starting xvp: %s" +msgstr "" + +#: nova/console/xvp.py:144 +msgid "Restarting xvp" +msgstr "" + +#: nova/console/xvp.py:146 +msgid "xvp not running..." +msgstr "" + +#: nova/virt/baremetal/proxy.py:148 +#, python-format +msgid "Error encountered when destroying instance '%(name)s': %(ex)s" +msgstr "" + +#: nova/virt/baremetal/proxy.py:162 +#, python-format +msgid "instance %(instance_name)s: deleting instance files %(target)s" +msgstr "" + +#: nova/virt/baremetal/proxy.py:189 +#, python-format +msgid "instance %s: rebooted" +msgstr "" + +#: nova/virt/baremetal/proxy.py:192 +msgid "_wait_for_reboot failed" +msgstr "" + +#: nova/virt/baremetal/proxy.py:222 +#, python-format +msgid "instance %s: rescued" +msgstr "" + +#: nova/virt/baremetal/proxy.py:225 +msgid "_wait_for_rescue failed" +msgstr "" + +#: nova/virt/baremetal/proxy.py:242 +msgid "<============= spawn of baremetal =============>" +msgstr "" + +#: nova/virt/baremetal/proxy.py:255 +#, python-format +msgid "instance %s: is building" +msgstr "" + +#: nova/virt/baremetal/proxy.py:260 +msgid "Key is injected but instance is not running yet" +msgstr "" + +#: nova/virt/baremetal/proxy.py:265 +#, python-format +msgid "instance %s: booted" +msgstr "" + +#: nova/virt/baremetal/proxy.py:268 +#, python-format +msgid "~~~~~~ current state = %s ~~~~~~" +msgstr "" + +#: nova/virt/baremetal/proxy.py:269 +#, python-format +msgid "instance %s spawned successfully" +msgstr "" + +#: nova/virt/baremetal/proxy.py:272 +#, python-format +msgid "instance %s:not booted" +msgstr "" + +#: nova/virt/baremetal/proxy.py:274 +msgid "Bremetal assignment is overcommitted." +msgstr "" + +#: nova/virt/baremetal/proxy.py:354 +#, python-format +msgid "instance %s: Creating image" +msgstr "" + +#: nova/virt/baremetal/proxy.py:475 +#, python-format +msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s" +msgstr "" + +#: nova/virt/baremetal/proxy.py:484 +#, python-format +msgid "" +"instance %(inst_name)s: ignoring error injecting data into image %(img_id)s " +"(%(e)s)" +msgstr "" + +#: nova/virt/baremetal/proxy.py:529 +#, python-format +msgid "instance %s: starting toXML method" +msgstr "" + +#: nova/virt/baremetal/proxy.py:531 +#, python-format +msgid "instance %s: finished toXML method" +msgstr "" + +#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1473 +msgid "" +"Cannot get the number of cpu, because this function is not implemented for " +"this platform. This error can be safely ignored for now." +msgstr "" + +#: nova/virt/baremetal/proxy.py:714 #, python-format -msgid "Error starting xvp: %s" +msgid "#### RLK: cpu_arch = %s " msgstr "" -#: ../nova/console/xvp.py:139 -msgid "Restarting xvp" +#: nova/virt/baremetal/proxy.py:746 +msgid "Updating!" msgstr "" -#: ../nova/console/xvp.py:141 -msgid "xvp not running..." +#: nova/volume/san.py:114 nova/volume/san.py:152 +msgid "Specify san_password or san_private_key" msgstr "" -#: ../nova/volume/san.py:82 ../nova/volume/san.py:111 -msgid "Specify san_password or san_privatekey" +#: nova/volume/san.py:157 +msgid "san_ip must be set" msgstr "" -#: ../nova/volume/san.py:114 -msgid "san_ip must be set" +#: nova/volume/san.py:321 +#, python-format +msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s" msgstr "" -#: ../nova/volume/san.py:381 +#: nova/volume/san.py:453 #, python-format msgid "CLIQ command returned %s" msgstr "" -#: ../nova/volume/san.py:387 +#: nova/volume/san.py:459 #, python-format msgid "" "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "" -#: ../nova/volume/san.py:395 +#: nova/volume/san.py:467 #, python-format msgid "Error running CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" msgstr "" -#: ../nova/volume/san.py:425 +#: nova/volume/san.py:497 #, python-format msgid "" "Unexpected number of virtual ips for cluster %(cluster_name)s. " "Result=%(_xml)s" msgstr "" -#: ../nova/volume/san.py:478 +#: nova/volume/san.py:550 #, python-format msgid "Volume info: %(volume_name)s => %(volume_attributes)s" msgstr "" -#. TODO(justinsb): Is this needed here? -#: ../nova/volume/san.py:523 ../nova/volume/driver.py:831 +#: nova/volume/driver.py:844 nova/volume/san.py:595 msgid "local_path not supported" msgstr "" -#: ../nova/volume/san.py:555 +#: nova/volume/san.py:627 #, python-format msgid "Could not determine project for volume %s, can't export" msgstr "" -#: ../nova/volume/driver.py:79 +#: nova/volume/san.py:697 +#, python-format +msgid "Payload for SolidFire API call: %s" +msgstr "" + +#: nova/volume/san.py:714 +#, python-format +msgid "Call to json.loads() raised an exception: %s" +msgstr "" + +#: nova/volume/san.py:719 +#, python-format +msgid "Results of SolidFire API call: %s" +msgstr "" + +#: nova/volume/san.py:733 +#, python-format +msgid "Found solidfire account: %s" +msgstr "" + +#: nova/volume/san.py:747 +#, python-format +msgid "solidfire account: %s does not exist, create it..." +msgstr "" + +#: nova/volume/san.py:805 +msgid "Enter SolidFire create_volume..." +msgstr "" + +#: nova/volume/san.py:844 +msgid "Leaving SolidFire create_volume" +msgstr "" + +#: nova/volume/san.py:859 +msgid "Enter SolidFire delete_volume..." +msgstr "" + +#: nova/volume/san.py:878 +#, python-format +msgid "Deleting volumeID: %s " +msgstr "" + +#: nova/volume/san.py:886 +msgid "Leaving SolidFire delete_volume" +msgstr "" + +#: nova/volume/san.py:889 +msgid "Executing SolidFire ensure_export..." +msgstr "" + +#: nova/volume/san.py:893 +msgid "Executing SolidFire create_export..." +msgstr "" + +#: nova/volume/driver.py:92 #, python-format msgid "Recovering from a failed execute. Try number %s" msgstr "" -#: ../nova/volume/driver.py:89 +#: nova/volume/driver.py:102 #, python-format msgid "volume group %s doesn't exist" msgstr "" -#: ../nova/volume/driver.py:251 ../nova/volume/driver.py:847 +#: ../nova/volume/driver.py:264 ../nova/volume/driver.py:860 msgid "Skipping ensure_export. No iscsi_target " msgstr "" -#: ../nova/volume/driver.py:295 ../nova/volume/driver.py:304 -#: ../nova/volume/driver.py:891 +#: ../nova/volume/driver.py:308 ../nova/volume/driver.py:317 +#: ../nova/volume/driver.py:904 msgid "Skipping remove_export. No iscsi_target " msgstr "" -#. TODO(justinsb): Deprecate discovery and use stored info -#. NOTE(justinsb): Discovery won't work with CHAP-secured targets (?) -#: ../nova/volume/driver.py:314 +#: nova/volume/driver.py:327 msgid "ISCSI provider_location not stored, using discovery" msgstr "" -#: ../nova/volume/driver.py:359 +#: nova/volume/driver.py:372 #, python-format msgid "Could not find iSCSI export for volume %s" msgstr "" -#: ../nova/volume/driver.py:363 +#: nova/volume/driver.py:376 #, python-format msgid "ISCSI Discovery: Found %s" msgstr "" -#. Instances remount read-only in this case. -#. /etc/init.d/iscsitarget restart and rebooting nova-volume -#. is better since ensure_export() works at boot time. -#: ../nova/volume/driver.py:436 +#: nova/volume/driver.py:449 #, python-format msgid "Cannot confirm exported volume id:%(volume_id)s." msgstr "" -#: ../nova/volume/driver.py:463 +#: nova/volume/driver.py:476 #, python-format msgid "FAKE ISCSI: %s" msgstr "" -#: ../nova/volume/driver.py:475 +#: nova/volume/driver.py:488 #, python-format msgid "rbd has no pool %s" msgstr "" -#: ../nova/volume/driver.py:545 +#: nova/volume/driver.py:558 #, python-format msgid "Sheepdog is not working: %s" msgstr "" -#: ../nova/volume/driver.py:547 +#: nova/volume/driver.py:560 msgid "Sheepdog is not working" msgstr "" -#: ../nova/volume/driver.py:646 ../nova/volume/driver.py:651 +#: nova/volume/driver.py:659 nova/volume/driver.py:664 #, python-format msgid "LoggingVolumeDriver: %s" msgstr "" -#: ../nova/volume/driver.py:686 +#: nova/volume/driver.py:699 #, python-format msgid "\tVolume %s is NOT VSA volume" msgstr "" -#: ../nova/volume/driver.py:702 +#: nova/volume/driver.py:715 #, python-format msgid "\tFE VSA Volume %s creation - do nothing" msgstr "" -#: ../nova/volume/driver.py:735 +#: nova/volume/driver.py:748 #, python-format msgid "VSA BE create_volume for %s failed" msgstr "" -#: ../nova/volume/driver.py:738 +#: nova/volume/driver.py:751 #, python-format msgid "VSA BE create_volume for %s succeeded" msgstr "" -#: ../nova/volume/driver.py:746 +#: nova/volume/driver.py:759 #, python-format msgid "\tFE VSA Volume %s deletion - do nothing" msgstr "" -#: ../nova/volume/driver.py:757 +#: nova/volume/driver.py:770 #, python-format msgid "VSA BE delete_volume for %s failed" msgstr "" -#: ../nova/volume/driver.py:760 +#: nova/volume/driver.py:773 #, python-format msgid "VSA BE delete_volume for %s suceeded" msgstr "" -#: ../nova/volume/driver.py:798 ../nova/virt/libvirt/volume.py:146 +#: nova/virt/libvirt/volume.py:152 nova/volume/driver.py:811 #, python-format msgid "iSCSI device not found at %s" msgstr "" -#: ../nova/volume/driver.py:801 ../nova/virt/libvirt/volume.py:149 +#: nova/virt/libvirt/volume.py:155 nova/volume/driver.py:814 #, python-format msgid "" "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry. Try " "number: %(tries)s" msgstr "" -#: ../nova/volume/driver.py:813 ../nova/virt/libvirt/volume.py:161 +#: nova/virt/libvirt/volume.py:167 nova/volume/driver.py:826 #, python-format msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)" msgstr "" -#: ../nova/volume/driver.py:824 +#: nova/volume/driver.py:837 #, python-format msgid "\tFE VSA Volume %s local path call - call discover" msgstr "" -#: ../nova/volume/driver.py:839 +#: nova/volume/driver.py:852 #, python-format msgid "\tFE VSA Volume %s ensure export - do nothing" msgstr "" -#: ../nova/volume/driver.py:863 +#: nova/volume/driver.py:876 #, python-format msgid "\tFE VSA Volume %s create export - do nothing" msgstr "" -#: ../nova/volume/driver.py:883 +#: nova/volume/driver.py:896 #, python-format msgid "\tFE VSA Volume %s remove export - do nothing" msgstr "" -#: ../nova/volume/driver.py:903 +#: nova/volume/driver.py:916 #, python-format msgid "VSA BE remove_export for %s failed" msgstr "" -#: ../nova/volume/driver.py:955 +#: nova/volume/driver.py:968 msgid "Failed to retrieve QoS info" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:53 -#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:83 +#: nova/api/openstack/auth.py:91 #, python-format -msgid "Table |%s| not created!" -msgstr "" - -#: ../nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:61 -msgid "instance_info_caches tables not dropped" -msgstr "" +msgid "%(user_id)s could not be found with token '%(token)s'" +msgstr "无法为令牌 '%(token)s' 找到 %(user_id)s" -#: ../nova/scheduler/zone_manager.py:86 +#: nova/api/openstack/auth.py:135 #, python-format -msgid "'%(exception)s' error talking to zone %(api_url)s" -msgstr "" +msgid "%(user_id)s must be an admin or a member of %(project_id)s" +msgstr "%(user_id)s 必须是管理员或者 %(project_id)s 的成员" -#: ../nova/scheduler/zone_manager.py:93 -#, python-format +#: nova/api/openstack/auth.py:153 msgid "" -"No answer from zone %(api_url)s after %(max_errors)d attempts. Marking " -"inactive." +"Authentication requests must be made against a version root (e.g. /v2)." msgstr "" -#: ../nova/scheduler/zone_manager.py:111 +#: nova/api/openstack/auth.py:168 #, python-format -msgid "Polling zone: %(name)s @ %(url)s" -msgstr "" +msgid "Could not find %s in request." +msgstr "请求中找不到 %s" -#: ../nova/scheduler/zone_manager.py:236 +#: nova/api/openstack/auth.py:188 #, python-format -msgid "No service for compute ID %s" -msgstr "" +msgid "Successfully authenticated '%s'" +msgstr "成功验证 '%s'" -#: ../nova/scheduler/zone_manager.py:325 -msgid "Updating zone cache from db." -msgstr "" +#: nova/api/openstack/auth.py:238 +msgid "User not found with provided API key." +msgstr "没有为提供的API key找到用户。" -#: ../nova/scheduler/zone_manager.py:332 +#: nova/api/openstack/auth.py:255 #, python-format -msgid "Received %(service_name)s service update from %(host)s." -msgstr "" +msgid "Provided API key is valid, but not for user '%(username)s'" +msgstr "提供的API key有效,但并不是给用户 '%(username)s' 的。" -#: ../nova/api/openstack/v2/contrib/rescue.py:48 -#: ../nova/api/openstack/v2/contrib/multinic.py:71 -#: ../nova/api/openstack/v2/contrib/admin_actions.py:145 -#: ../nova/api/openstack/v2/contrib/admin_actions.py:162 -#: ../nova/api/openstack/v2/contrib/admin_actions.py:179 -msgid "Server not found" +#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:61 +msgid "instance_info_caches tables not dropped" msgstr "" -#: ../nova/ipv6/account_identifier.py:38 ../nova/ipv6/rfc2462.py:34 -#, python-format -msgid "Bad mac for to_global_ipv6: %s" -msgstr "" +#: nova/api/openstack/compute/contrib/scheduler_hints.py:41 +msgid "Malformed scheduler_hints attribute" +msgstr "非法的scheduler_hints attribute" -#: ../nova/ipv6/account_identifier.py:40 ../nova/ipv6/rfc2462.py:36 +#: nova/tests/api/openstack/compute/contrib/test_vsa.py:58 #, python-format -msgid "Bad prefix for to_global_ipv6: %s" +msgid "_create: param=%s" msgstr "" -#: ../nova/ipv6/account_identifier.py:42 +#: nova/ipv6/account_identifier.py:42 #, python-format msgid "Bad project_id for to_global_ipv6: %s" msgstr "" -#: ../nova/cloudpipe/pipelib.py:45 -msgid "Template for script to run on cloudpipe instance boot" -msgstr "" - -#: ../nova/cloudpipe/pipelib.py:48 -msgid "Network to push into openvpn config" -msgstr "" - -#: ../nova/cloudpipe/pipelib.py:51 -msgid "Netmask to push into openvpn config" -msgstr "" - -#: ../nova/cloudpipe/pipelib.py:96 -#, python-format -msgid "Launching VPN for %s" -msgstr "" - -#: ../nova/virt/xenapi/network_utils.py:37 +#: nova/virt/xenapi/network_utils.py:37 #, python-format msgid "Found non-unique network for name_label %s" msgstr "" -#: ../nova/virt/xenapi/network_utils.py:55 +#: nova/virt/xenapi/network_utils.py:55 #, python-format msgid "Found non-unique network for bridge %s" msgstr "发现网桥 %s 的网络不唯一" -#: ../nova/virt/xenapi/network_utils.py:58 +#: nova/virt/xenapi/network_utils.py:58 #, python-format msgid "Found no network for bridge %s" msgstr "发现网桥 %s 没有网络" -#: ../nova/scheduler/api.py:130 -#, python-format -msgid "Authentication failed to zone '%(name)s' URL=%(url)s: %(e)s" -msgstr "" - -#: ../nova/scheduler/api.py:169 -#, python-format -msgid "Failed request to zone; URL=%(url)s: %(e)s" -msgstr "" +#: nova/api/openstack/compute/contrib/cloudpipe.py:117 +msgid "" +"Unable to claim IP for VPN instances, ensure it isn't running, and try again " +"in a few minutes" +msgstr "无法为VPN实例申请IP,确保实例没有运行,过一会儿再试。" -#: ../nova/scheduler/api.py:208 +#: nova/virt/firewall.py:130 #, python-format -msgid "" -"%(collection)s.%(method_name)s didn't find anything matching '%(kwargs)s' on " -"'%(url)s'" +msgid "Attempted to unfilter instance %s which is not filtered" msgstr "" -#: ../nova/scheduler/api.py:220 +#: nova/virt/firewall.py:137 #, python-format -msgid "%(collection)s '%(item)s' not found on '%(url)s'" +msgid "Filters added to instance %s" msgstr "" -#: ../nova/scheduler/api.py:245 -msgid "Uncaught Zone redirection exception" +#: nova/virt/firewall.py:139 +msgid "Provider Firewall Rules refreshed" msgstr "" -#. Ask the children to provide an answer ... -#: ../nova/scheduler/api.py:284 -msgid "Asking child zones ..." +#: nova/virt/firewall.py:291 +#, python-format +msgid "Adding security group rule: %r" msgstr "" -#: ../nova/scheduler/api.py:306 +#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:88 #, python-format -msgid "Instance %(item_uuid)s not found locally: '%(e)s'" +msgid "Adding provider rule: %s" msgstr "" -#: ../nova/virt/libvirt/vif.py:80 +#: nova/virt/libvirt/vif.py:85 #, python-format msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s" msgstr "" -#: ../nova/virt/libvirt/vif.py:88 +#: nova/virt/libvirt/vif.py:93 #, python-format msgid "Ensuring bridge %s" msgstr "" -#: ../nova/virt/libvirt/vif.py:147 +#: nova/virt/libvirt/vif.py:152 #, python-format msgid "Failed while unplugging vif of instance '%s'" msgstr "" -#: ../nova/api/openstack/wsgi.py:123 +#: nova/api/openstack/wsgi.py:134 nova/api/openstack/wsgi.py:537 msgid "cannot understand JSON" -msgstr "" +msgstr "无法理解JSON" -#: ../nova/api/openstack/wsgi.py:147 -#: ../nova/api/openstack/v2/contrib/hosts.py:171 +#: nova/api/openstack/wsgi.py:158 +#: nova/api/openstack/compute/contrib/hosts.py:86 msgid "cannot understand XML" +msgstr "无法理解XML" + +#: nova/api/openstack/wsgi.py:542 +msgid "too many body keys" msgstr "" -#: ../nova/api/openstack/wsgi.py:257 +#: nova/api/openstack/wsgi.py:580 +#, python-format +msgid "Fault thrown: %s" +msgstr "错误抛出: %s" + +#: nova/api/openstack/wsgi.py:583 +#, python-format +msgid "HTTP exception thrown: %s" +msgstr "HTTP 异常抛出:%s" + +#: nova/api/openstack/wsgi.py:691 msgid "Unrecognized Content-Type provided in request" msgstr "" -#: ../nova/api/openstack/wsgi.py:261 +#: nova/api/openstack/wsgi.py:695 msgid "No Content-Type provided in request" msgstr "" -#: ../nova/api/openstack/wsgi.py:265 +#: nova/api/openstack/wsgi.py:699 msgid "Empty body provided in request" msgstr "" -#: ../nova/api/openstack/wsgi.py:271 -msgid "Unable to deserialize body as provided Content-Type" +#: nova/api/openstack/wsgi.py:810 +#, python-format +msgid "There is no such action: %s" msgstr "" -#: ../nova/api/openstack/wsgi.py:556 +#: nova/api/openstack/wsgi.py:823 msgid "Unsupported Content-Type" -msgstr "" - -#: ../nova/api/openstack/wsgi.py:559 -#: ../nova/api/openstack/v2/server_metadata.py:55 -#: ../nova/api/openstack/v2/server_metadata.py:71 -#: ../nova/api/openstack/v2/server_metadata.py:96 -#: ../nova/api/openstack/v2/server_metadata.py:121 -msgid "Malformed request body" -msgstr "" - -#: ../nova/api/openstack/wsgi.py:569 -#, python-format -msgid "Fault thrown: %s" -msgstr "" +msgstr "不支持的Content-Type" -#: ../nova/api/openstack/wsgi.py:572 -#, python-format -msgid "HTTP exception thrown: %s" -msgstr "" +#: nova/api/openstack/wsgi.py:835 +msgid "Malformed request url" +msgstr "不合法的请求url" -#: ../nova/api/openstack/wsgi.py:585 +#: nova/api/openstack/__init__.py:45 nova/api/openstack/wsgi.py:881 #, python-format msgid "%(url)s returned with HTTP %(status)d" -msgstr "" +msgstr "%(url)s 随HTTP %(status)d返回" -#: ../nova/api/openstack/wsgi.py:588 +#: nova/api/openstack/wsgi.py:884 #, python-format msgid "%(url)s returned a fault: %(e)s" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/multinic.py:79 -msgid "Missing 'networkId' argument for addFixedIp" -msgstr "" +msgstr "%(url)s返回错误:%(e)s" -#: ../nova/api/openstack/v2/contrib/multinic.py:93 -msgid "Missing 'address' argument for removeFixedIp" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/multinic.py:103 -#, python-format -msgid "Unable to find address %r" -msgstr "" - -#: ../nova/api/openstack/v2/auth.py:93 +#: nova/tests/fake_utils.py:72 #, python-format -msgid "%(user_id)s could not be found with token '%(token)s'" +msgid "Faking execution of cmd (subprocess): %s" msgstr "" -#: ../nova/api/openstack/v2/auth.py:137 ../bin/nova-manage.py:1385 +#: nova/tests/fake_utils.py:80 #, python-format -msgid "%(user_id)s must be an admin or a member of %(project_id)s" -msgstr "" - -#: ../nova/api/openstack/v2/auth.py:155 -msgid "" -"Authentication requests must be made against a version root (e.g. /v2)." +msgid "Faked command matched %s" msgstr "" -#: ../nova/api/openstack/v2/auth.py:170 +#: nova/tests/fake_utils.py:96 #, python-format -msgid "Could not find %s in request." +msgid "Faked command raised an exception %s" msgstr "" -#: ../nova/api/openstack/v2/auth.py:184 +#: nova/tests/fake_utils.py:101 #, python-format -msgid "Successfully authenticated '%s'" -msgstr "" - -#: ../nova/api/openstack/v2/auth.py:234 -msgid "User not found with provided API key." +msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'" msgstr "" -#: ../nova/api/openstack/v2/auth.py:253 -#, python-format -msgid "Provided API key is valid, but not for user '%(username)s'" -msgstr "" +#: nova/policy.py:30 +msgid "JSON file representing policy" +msgstr "JSON文件表示策略。" + +#: nova/policy.py:33 +msgid "Rule checked when requested rule is not found" +msgstr "请求的规则找不到时的检查缺省规则。" -#: ../nova/crypto.py:50 +#: nova/crypto.py:50 msgid "Filename of root CA" msgstr "根证书文件名" -#: ../nova/crypto.py:53 +#: nova/crypto.py:53 msgid "Filename of private key" msgstr "私钥文件名" -#: ../nova/crypto.py:55 +#: nova/crypto.py:56 msgid "Filename of root Certificate Revocation List" -msgstr "" +msgstr "根证书撤销列表的文件名称" -#: ../nova/crypto.py:57 +#: nova/crypto.py:59 msgid "Where we keep our keys" msgstr "保存密钥的位置" -#: ../nova/crypto.py:59 +#: nova/crypto.py:62 msgid "Where we keep our root CA" msgstr "保存根证书的位置" -#: ../nova/crypto.py:61 +#: nova/crypto.py:65 msgid "Should we use a CA for each project?" msgstr "是否所有项目都是用证书授权(CA)?" -#: ../nova/crypto.py:65 +#: nova/crypto.py:69 #, python-format msgid "Subject for certificate for users, %s for project, user, timestamp" msgstr "用户证书的标题,%s依次分别为项目,用户,时间戳" -#: ../nova/crypto.py:70 +#: nova/crypto.py:74 #, python-format msgid "Subject for certificate for projects, %s for project, timestamp" msgstr "项目证书的标题,%s依次分别为项目,时间戳" -#: ../nova/crypto.py:75 -#, python-format -msgid "Subject for certificate for vpns, %s for project, timestamp" -msgstr "VPN证书的标题,%s依次分别为项目,时间戳" - -#: ../nova/crypto.py:277 +#: nova/crypto.py:296 #, python-format msgid "Flags path: %s" msgstr "Flag所在路径:%s" -#: ../nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41 -#: ../nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:41 +#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:43 +#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42 +#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:60 +#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68 msgid "foreign key constraint couldn't be removed" msgstr "" -#: ../nova/virt/vmwareapi/io_util.py:102 -#, python-format -msgid "Glance image %s is in killed state" -msgstr "" - -#: ../nova/virt/vmwareapi/io_util.py:110 -msgid "Glance image " -msgstr "" - -#: ../nova/compute/api.py:133 -#, python-format -msgid "" -"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties" -msgstr "" - -#: ../nova/compute/api.py:144 -#, python-format -msgid "Quota exceeded for %(pid)s, metadata property key or value too long" -msgstr "" - -#: ../nova/compute/api.py:196 -#, python-format -msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances" -msgstr "" - -#: ../nova/compute/api.py:199 -msgid "" -"Instance quota exceeded. You cannot run any more instances of this type." -msgstr "" - -#: ../nova/compute/api.py:202 -#, python-format -msgid "" -"Instance quota exceeded. You can only run %s more instances of this type." -msgstr "" - -#: ../nova/compute/api.py:251 -msgid "Creating a raw instance" -msgstr "" - -#: ../nova/compute/api.py:306 -#, python-format -msgid "Going to run %s instances..." -msgstr "" - -#: ../nova/compute/api.py:369 -#, python-format -msgid "bdm %s" -msgstr "" - -#: ../nova/compute/api.py:396 -#, python-format -msgid "block_device_mapping %s" -msgstr "" - -#: ../nova/compute/api.py:505 -#, python-format -msgid "Sending create to scheduler for %(pid)s/%(uid)s's" -msgstr "" - -#: ../nova/compute/api.py:777 -#, python-format -msgid "Going to try to soft delete %s" -msgstr "" - -#: ../nova/compute/api.py:793 -#, python-format -msgid "No host for instance %s, deleting immediately" -msgstr "" - -#: ../nova/compute/api.py:818 -#, python-format -msgid "Going to try to terminate %s" -msgstr "" - -#: ../nova/compute/api.py:852 -#, python-format -msgid "Going to try to stop %s" +#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39 +#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:61 +#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:60 +#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:98 +msgid "foreign key constraint couldn't be added" msgstr "" -#: ../nova/compute/api.py:871 +#: nova/virt/vmwareapi/io_util.py:99 #, python-format -msgid "Going to try to start %s" +msgid "Glance image %s is in killed state" msgstr "" -#: ../nova/compute/api.py:874 +#: nova/virt/vmwareapi/io_util.py:107 #, python-format -msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s)" +msgid "Glance image %(image_id)s is in unknown state - %(state)s" msgstr "" -#: ../nova/compute/api.py:937 ../nova/volume/api.py:127 -#: ../nova/volume/volume_types.py:80 +#: nova/network/linux_net.py:167 #, python-format -msgid "Searching by: %s" +msgid "Attempted to remove chain %s which does not exist" msgstr "" -#: ../nova/compute/api.py:1075 +#: nova/network/linux_net.py:193 #, python-format -msgid "Unable to find host for Instance %s" -msgstr "" - -#: ../nova/compute/api.py:1265 -msgid "flavor_id is None. Assuming migration." +msgid "Unknown chain: %r" msgstr "" -#: ../nova/compute/api.py:1273 +#: nova/network/linux_net.py:216 #, python-format msgid "" -"Old instance type %(current_instance_type_name)s, new instance type " -"%(new_instance_type_name)s" -msgstr "" - -#: ../nova/compute/api.py:1521 -#, python-format -msgid "Invalid device specified: %s. Example device: /dev/vdb" -msgstr "" - -#: ../nova/compute/api.py:1536 -msgid "Volume isn't attached to anything!" +"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r" msgstr "" -#: ../nova/compute/api.py:1567 -#, python-format -msgid "instance |%s| has no fixed_ips. unable to associate floating ip" +#: nova/network/linux_net.py:336 +msgid "IPTablesManager.apply completed with success" msgstr "" -#: ../nova/compute/api.py:1571 +#: nova/network/linux_net.py:587 nova/network/linux_net.py:609 +#: nova/network/linux_net.py:651 #, python-format -msgid "multiple fixed_ips exist, using the first: %s" +msgid "Instance %(instance_id)s not found" msgstr "" -#: ../nova/network/linux_net.py:147 +#: nova/network/linux_net.py:718 #, python-format -msgid "Attempted to remove chain %s which does not exist" +msgid "Hupping dnsmasq threw %s" msgstr "" -#: ../nova/network/linux_net.py:173 +#: nova/network/linux_net.py:720 #, python-format -msgid "Unknown chain: %r" +msgid "Pid %d is stale, relaunching dnsmasq" msgstr "" -#: ../nova/network/linux_net.py:196 +#: nova/network/linux_net.py:780 #, python-format -msgid "" -"Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r" +msgid "killing radvd threw %s" msgstr "" -#. pylint: disable=W0703 -#: ../nova/network/linux_net.py:660 +#: nova/network/linux_net.py:782 #, python-format -msgid "Hupping dnsmasq threw %s" +msgid "Pid %d is stale, relaunching radvd" msgstr "" -#: ../nova/network/linux_net.py:662 +#: nova/network/linux_net.py:984 #, python-format -msgid "Pid %d is stale, relaunching dnsmasq" +msgid "Starting VLAN inteface %s" msgstr "" -#. pylint: disable=W0703 -#: ../nova/network/linux_net.py:722 +#: nova/network/linux_net.py:1016 #, python-format -msgid "killing radvd threw %s" +msgid "Starting Bridge interface for %s" msgstr "" -#: ../nova/network/linux_net.py:724 -#, python-format -msgid "Pid %d is stale, relaunching radvd" +#: nova/virt/disk/nbd.py:63 +msgid "No free nbd devices" msgstr "" -#: ../nova/network/linux_net.py:931 +#: nova/virt/disk/nbd.py:81 #, python-format -msgid "Starting VLAN inteface %s" +msgid "qemu-nbd error: %s" msgstr "" -#: ../nova/network/linux_net.py:960 +#: nova/virt/disk/nbd.py:93 #, python-format -msgid "Starting Bridge interface for %s" +msgid "nbd device %s did not show up" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:192 ../nova/virt/hyperv.py:189 +#: nova/virt/xenapi/vm_utils.py:209 #, python-format msgid "Created VM %s..." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:195 +#: nova/virt/xenapi/vm_utils.py:212 #, python-format msgid "Created VM %(instance_name)s as %(vm_ref)s." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:226 +#: nova/virt/xenapi/vm_utils.py:243 #, python-format msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... " msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:229 +#: nova/virt/xenapi/vm_utils.py:246 #, python-format msgid "" "Created a CDROM-specific VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:246 +#: nova/virt/xenapi/vm_utils.py:263 #, python-format msgid "VBD not found in instance %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:257 +#: nova/virt/xenapi/vm_utils.py:274 #, python-format msgid "Unable to unplug VBD %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:268 +#: nova/virt/xenapi/vm_utils.py:285 #, python-format msgid "Unable to destroy VBD %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:278 +#: nova/virt/xenapi/vm_utils.py:295 #, python-format msgid "Unable to destroy VDI %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:295 +#: nova/virt/xenapi/vm_utils.py:312 #, python-format msgid "" "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on " "%(sr_ref)s." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:315 +#: nova/virt/xenapi/vm_utils.py:321 +#, python-format +msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s." +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:329 +#, python-format +msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s" +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:348 #, python-format msgid "No primary VDI found for%(vm_ref)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:322 +#: nova/virt/xenapi/vm_utils.py:355 #, python-format msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:336 +#: nova/virt/xenapi/vm_utils.py:369 #, python-format msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s." msgstr "" -#. NOTE(sirp): Currently we only support uploading images as VHD, there -#. is no RAW equivalent (yet) -#: ../nova/virt/xenapi/vm_utils.py:366 +#: nova/virt/xenapi/vm_utils.py:408 #, python-format msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:532 +#: nova/virt/xenapi/vm_utils.py:618 +#, 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 %(sr_type)s. Ignoring the cow flag." +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:697 #, python-format msgid "Asking xapi to fetch vhd image %(image)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:560 +#: nova/virt/xenapi/vm_utils.py:725 #, python-format msgid "" "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID " "'%(vdi_uuid)s'" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:588 +#: nova/virt/xenapi/vm_utils.py:754 #, python-format msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:604 +#: nova/virt/xenapi/vm_utils.py:769 #, python-format msgid "" "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:608 +#: nova/virt/xenapi/vm_utils.py:773 #, python-format msgid "" "Image size %(size_bytes)d exceeded instance_type allowed size " "%(allowed_size_bytes)d" msgstr "" -#. FIXME(sirp): Since the Glance plugin seems to be required for the -#. VHD disk, it may be worth using the plugin for both VHD and RAW and -#. DISK restores -#: ../nova/virt/xenapi/vm_utils.py:631 +#: nova/virt/xenapi/vm_utils.py:796 #, python-format msgid "Fetching image %(image)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:632 +#: nova/virt/xenapi/vm_utils.py:797 #, python-format msgid "Image Type: %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:636 +#: nova/virt/xenapi/vm_utils.py:801 msgid "ISO: Found sr possibly containing the ISO image" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:645 +#: ../nova/virt/xenapi/vm_utils.py:810 #, python-format msgid "Size for image %(image)s:" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:654 +#: nova/virt/xenapi/vm_utils.py:819 #, python-format msgid "" "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes" msgstr "" -#. We need to invoke a plugin for copying the -#. content of the VDI into the proper path. -#: ../nova/virt/xenapi/vm_utils.py:671 +#: nova/virt/xenapi/vm_utils.py:836 #, python-format msgid "Copying VDI %s to /boot/guest on dom0" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:681 +#: nova/virt/xenapi/vm_utils.py:848 #, python-format msgid "Kernel/Ramdisk VDI %s destroyed" msgstr "" -#. We look for XenAPI and OS failures. -#: ../nova/virt/xenapi/vm_utils.py:691 +#: nova/virt/xenapi/vm_utils.py:858 #, python-format msgid "instance %s: Failed to fetch glance image" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:720 +#: nova/virt/xenapi/vm_utils.py:897 #, python-format -msgid "Detected %(disk_format)s format for image %(image_ref)s" +msgid "Detected %(image_type_str)s format for image %(image_ref)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:759 +#: nova/virt/xenapi/vm_utils.py:919 #, python-format msgid "Looking up vdi %s for PV kernel" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:777 +#: nova/virt/xenapi/vm_utils.py:937 #, python-format msgid "Unknown image format %(disk_image_type)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:819 +#: nova/virt/xenapi/vm_utils.py:979 #, python-format msgid "VDI %s is still available" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:857 +#: nova/virt/xenapi/vm_utils.py:1025 #, python-format msgid "(VM_UTILS) xenserver vm state -> |%s|" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:859 +#: nova/virt/xenapi/vm_utils.py:1027 +#, python-format +msgid "(VM_UTILS) xenapi power_state -> |%s|" +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:1072 +#, python-format +msgid "Re-scanning SR %s" +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:1103 #, python-format -msgid "(VM_UTILS) xenapi power_state -> |%s|" +msgid "Flag sr_matching_filter '%s' does not respect formatting convention" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:915 -#, python-format -msgid "Re-scanning SR %s" +#: nova/virt/xenapi/vm_utils.py:1121 +msgid "" +"XenAPI is unable to find a Storage Repository to install guest instances on. " +"Please check your configuration and/or configure the flag " +"'sr_matching_filter'" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:958 +#: nova/virt/xenapi/vm_utils.py:1134 msgid "Cannot find SR of content-type ISO" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:966 +#: nova/virt/xenapi/vm_utils.py:1142 #, python-format msgid "ISO: looking at SR %(sr_rec)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:968 +#: nova/virt/xenapi/vm_utils.py:1144 msgid "ISO: not iso content" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:971 +#: nova/virt/xenapi/vm_utils.py:1147 msgid "ISO: iso content_type, no 'i18n-key' key" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:974 +#: nova/virt/xenapi/vm_utils.py:1150 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:978 +#: nova/virt/xenapi/vm_utils.py:1154 msgid "ISO: SR MATCHing our criteria" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:980 +#: nova/virt/xenapi/vm_utils.py:1156 msgid "ISO: ISO, looking to see if it is host local" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:983 +#: nova/virt/xenapi/vm_utils.py:1159 #, python-format msgid "ISO: PBD %(pbd_ref)s disappeared" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:986 +#: ../nova/virt/xenapi/vm_utils.py:1162 #, python-format msgid "ISO: PBD matching, want %(pbd_rec)s, " msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:989 +#: nova/virt/xenapi/vm_utils.py:1165 msgid "ISO: SR with local PBD" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1101 +#: nova/virt/xenapi/vm_utils.py:1187 #, python-format -msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s" +msgid "" +"Unable to obtain RRD XML for VM %(vm_uuid)s with server details: %(server)s." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1152 +#: nova/virt/xenapi/vm_utils.py:1203 #, python-format -msgid "" -"VHD coalesce attempts exceeded (%(counter)d > %(max_attempts)d), giving up..." +msgid "Unable to obtain RRD XML updates with server details: %(server)s." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1159 +#: nova/virt/xenapi/vm_utils.py:1257 +#, python-format +msgid "Invalid statistics data from Xenserver: %s" +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:1310 +#, python-format +msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s" +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:1384 #, python-format msgid "" "Parent %(parent_uuid)s doesn't match original parent " "%(original_parent_uuid)s, waiting for coalesce..." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1202 +#: nova/virt/xenapi/vm_utils.py:1394 +#, python-format +msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..." +msgstr "" + +#: nova/virt/xenapi/vm_utils.py:1429 #, python-format msgid "Timeout waiting for device %s to be created" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1221 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:188 +#: nova/virt/xenapi/vm_utils.py:1448 #, python-format msgid "Creating VBD for VDI %s ... " -msgstr "" +msgstr "正在为VDI%s创建VBD " -#: ../nova/virt/xenapi/vm_utils.py:1223 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:190 +#: nova/virt/xenapi/vm_utils.py:1450 #, python-format msgid "Creating VBD for VDI %s done." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1225 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:192 +#: nova/virt/xenapi/vm_utils.py:1452 #, python-format msgid "Plugging VBD %s ... " msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1228 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:194 +#: nova/virt/xenapi/vm_utils.py:1455 #, python-format msgid "Plugging VBD %s done." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1230 +#: nova/virt/xenapi/vm_utils.py:1457 #, python-format msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1233 +#: nova/virt/xenapi/vm_utils.py:1460 #, python-format msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1242 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:197 +#: nova/virt/xenapi/vm_utils.py:1469 #, python-format msgid "Destroying VBD for VDI %s ... " msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1246 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:200 +#: nova/virt/xenapi/vm_utils.py:1473 #, python-format msgid "Destroying VBD for VDI %s done." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1258 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:211 +#: nova/virt/xenapi/vm_utils.py:1484 msgid "VBD.unplug successful first time." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1263 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:216 +#: nova/virt/xenapi/vm_utils.py:1489 msgid "VBD.unplug rejected: retrying..." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1265 +#: nova/virt/xenapi/vm_utils.py:1491 msgid "Not sleeping anymore!" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1268 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:220 +#: nova/virt/xenapi/vm_utils.py:1494 msgid "VBD.unplug successful eventually." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1271 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:223 +#: nova/virt/xenapi/vm_utils.py:1497 #, python-format msgid "Ignoring XenAPI.Failure in VBD.unplug: %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1280 -#: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:66 +#: nova/virt/xenapi/vm_utils.py:1506 #, python-format msgid "Ignoring XenAPI.Failure %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1294 +#: nova/virt/xenapi/vm_utils.py:1520 #, python-format msgid "Running pygrub against %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1301 +#: nova/virt/xenapi/vm_utils.py:1527 #, python-format msgid "Found Xen kernel %s" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1303 +#: nova/virt/xenapi/vm_utils.py:1529 msgid "No Xen kernel found. Booting HVM." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1316 +#: nova/virt/xenapi/vm_utils.py:1542 msgid "Partitions:" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1322 +#: nova/virt/xenapi/vm_utils.py:1548 #, python-format msgid " %(num)s: %(ptype)s %(size)d sectors" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1348 +#: nova/virt/xenapi/vm_utils.py:1574 #, python-format msgid "" "Writing partition table %(primary_first)d %(primary_last)d to %(dev_path)s..." msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1361 +#: nova/virt/xenapi/vm_utils.py:1587 #, python-format msgid "Writing partition table %s done." msgstr "" -#. The presence of the guest agent -#. file indicates that this instance can -#. reconfigure the network from xenstore data, -#. so manipulation of files in /etc is not -#. required -#: ../nova/virt/xenapi/vm_utils.py:1449 +#: nova/virt/xenapi/vm_utils.py:1676 msgid "" "XenServer tools installed in this image are capable of network injection. " "Networking files will not bemanipulated" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1457 +#: nova/virt/xenapi/vm_utils.py:1684 msgid "" "XenServer tools are present in this image but are not capable of network " "injection" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1461 +#: nova/virt/xenapi/vm_utils.py:1688 msgid "XenServer tools are not installed in this image" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1478 +#: nova/virt/xenapi/vm_utils.py:1705 msgid "Manipulating interface files directly" msgstr "" -#: ../nova/virt/xenapi/vm_utils.py:1485 +#: nova/virt/xenapi/vm_utils.py:1712 #, python-format msgid "Failed to mount filesystem (expected for non-linux instances): %s" msgstr "" -#: ../nova/db/sqlalchemy/session.py:87 +#: nova/db/sqlalchemy/session.py:87 #, python-format msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left." msgstr "" -#: ../nova/virt/images.py:76 +#: nova/virt/images.py:95 msgid "'qemu-img info' parsing failed." msgstr "" -#: ../nova/virt/images.py:84 +#: nova/virt/images.py:101 #, python-format msgid "fmt=%(fmt)s backed by: %(backing_file)s" msgstr "" -#: ../nova/virt/images.py:95 +#: nova/virt/images.py:114 #, python-format msgid "Converted to raw, but format is now %s" msgstr "" -#. TODO(vish): Do this with M2Crypto instead -#: ../nova/api/ec2/cloud.py:227 -#, python-format -msgid "Generating root CA: %s" -msgstr "生成根证书: %s" - -#: ../nova/api/ec2/cloud.py:351 +#: nova/api/ec2/cloud.py:326 #, python-format msgid "Create snapshot of volume %s" -msgstr "" +msgstr "创建卷 %s 的快照" -#: ../nova/api/ec2/cloud.py:385 +#: nova/api/ec2/cloud.py:361 #, python-format msgid "Create key pair %s" msgstr "创建键值对 %s" -#: ../nova/api/ec2/cloud.py:394 +#: nova/api/ec2/cloud.py:370 #, python-format msgid "Import key %s" -msgstr "" +msgstr "导入key %s" -#: ../nova/api/ec2/cloud.py:414 +#: nova/api/ec2/cloud.py:388 #, python-format msgid "Delete key pair %s" msgstr "删除键值对 %s" -#: ../nova/api/ec2/cloud.py:673 ../nova/api/ec2/cloud.py:729 +#: nova/api/ec2/cloud.py:648 nova/api/ec2/cloud.py:708 msgid "No rule for the specified parameters." msgstr "对给定的参数无特定规则。" -#. Some validation to ensure that values match API spec. -#. - Alphanumeric characters, spaces, dashes, and underscores. -#. TODO(Daviey): LP: #813685 extend beyond group_name checking, and -#. probably create a param validator that can be used elsewhere. -#: ../nova/api/ec2/cloud.py:754 +#: nova/api/ec2/cloud.py:733 #, python-format msgid "" "Value (%s) for parameter GroupName is invalid. Content limited to " "Alphanumeric characters, spaces, dashes, and underscores." -msgstr "" +msgstr "参数GroupName的值 (%s) 无效。内容仅限于含有字母数字的字符,空格,破折号和下划线。" -#: ../nova/api/ec2/cloud.py:761 +#: nova/api/ec2/cloud.py:740 #, python-format msgid "" "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of 255." -msgstr "" +msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。" -#: ../nova/api/ec2/cloud.py:765 -#: ../nova/api/openstack/v2/contrib/security_groups.py:138 +#: nova/api/ec2/cloud.py:744 +#: nova/api/openstack/compute/contrib/security_groups.py:286 #, python-format msgid "Create Security Group %s" msgstr "创建安全组 %s" -#: ../nova/api/ec2/cloud.py:768 +#: nova/api/ec2/cloud.py:747 #, python-format msgid "group %s already exists" msgstr "安全组 %s 已经存在" -#: ../nova/api/ec2/cloud.py:795 -#: ../nova/api/openstack/v2/contrib/security_groups.py:98 +#: nova/api/ec2/cloud.py:777 +#: nova/api/openstack/compute/contrib/security_groups.py:239 #, python-format msgid "Delete security group %s" msgstr "删除安全组 %s" -#: ../nova/api/ec2/cloud.py:883 +#: nova/api/ec2/cloud.py:854 #, python-format msgid "Create volume from snapshot %s" -msgstr "" +msgstr "从快照 %s 创建卷" -#: ../nova/api/ec2/cloud.py:922 +#: nova/api/ec2/cloud.py:883 #, python-format msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s" -msgstr "" +msgstr "把卷 %(volume_id)s 加载到 %(device)s 的实例 %(instance_id)s 上" -#: ../nova/api/ec2/cloud.py:963 ../nova/api/ec2/cloud.py:1024 -#: ../nova/api/ec2/cloud.py:1500 ../nova/api/ec2/cloud.py:1515 +#: nova/api/ec2/cloud.py:924 nova/api/ec2/cloud.py:981 +#: nova/api/ec2/cloud.py:1443 nova/api/ec2/cloud.py:1458 #, python-format msgid "attribute not supported: %s" -msgstr "" +msgstr "attribute不支持: %s" -#: ../nova/api/ec2/cloud.py:1070 +#: nova/api/ec2/cloud.py:1046 #, python-format msgid "vol = %s\n" -msgstr "" +msgstr "vol = %s\n" -#: ../nova/api/ec2/cloud.py:1221 +#: nova/api/ec2/cloud.py:1191 msgid "Allocate address" -msgstr "" +msgstr "分配地址" -#: ../nova/api/ec2/cloud.py:1233 +#: nova/api/ec2/cloud.py:1203 #, python-format msgid "Release address %s" -msgstr "" +msgstr "释放地址 %s" -#: ../nova/api/ec2/cloud.py:1238 +#: nova/api/ec2/cloud.py:1208 #, python-format msgid "Associate address %(public_ip)s to instance %(instance_id)s" -msgstr "" +msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s" -#: ../nova/api/ec2/cloud.py:1248 +#: nova/api/ec2/cloud.py:1218 #, python-format msgid "Disassociate address %s" -msgstr "" +msgstr "解除地址 %s 的关联" -#: ../nova/api/ec2/cloud.py:1273 +#: nova/api/ec2/cloud.py:1243 msgid "Image must be available" -msgstr "" +msgstr "镜像必须可用。" -#: ../nova/api/ec2/cloud.py:1296 +#: nova/api/ec2/cloud.py:1264 msgid "Going to start terminating instances" -msgstr "" +msgstr "准备开启终止实例" -#: ../nova/api/ec2/cloud.py:1305 +#: nova/api/ec2/cloud.py:1277 #, python-format msgid "Reboot instance %r" -msgstr "" +msgstr "重启实例 %r" -#: ../nova/api/ec2/cloud.py:1315 +#: nova/api/ec2/cloud.py:1287 msgid "Going to stop instances" -msgstr "" +msgstr "准备停止实例" -#: ../nova/api/ec2/cloud.py:1325 +#: nova/api/ec2/cloud.py:1297 msgid "Going to start instances" -msgstr "" - -#: ../nova/api/ec2/cloud.py:1334 -#, python-format -msgid "Going to rescue instance %s" -msgstr "" - -#: ../nova/api/ec2/cloud.py:1342 -#, python-format -msgid "Going to unrescue instance %s" -msgstr "" +msgstr "准备启动实例" -#: ../nova/api/ec2/cloud.py:1445 +#: nova/api/ec2/cloud.py:1388 #, python-format msgid "De-registering image %s" -msgstr "" +msgstr "解除镜像 %s注册" -#: ../nova/api/ec2/cloud.py:1472 +#: nova/api/ec2/cloud.py:1415 #, python-format msgid "Registered image %(image_location)s with id %(image_id)s" -msgstr "" +msgstr "用 id %(image_id)s注册镜像 %(image_location)s" -#: ../nova/api/ec2/cloud.py:1518 +#: nova/api/ec2/cloud.py:1461 msgid "user or group not specified" -msgstr "" +msgstr "用户或者组没有确定" -#: ../nova/api/ec2/cloud.py:1520 +#: nova/api/ec2/cloud.py:1463 msgid "only group \"all\" is supported" -msgstr "" +msgstr "仅仅支持组\"all\"" -#: ../nova/api/ec2/cloud.py:1522 +#: nova/api/ec2/cloud.py:1465 msgid "operation_type must be add or remove" -msgstr "" +msgstr "operation_type必须添加或者移除" -#: ../nova/api/ec2/cloud.py:1523 +#: nova/api/ec2/cloud.py:1467 #, python-format msgid "Updating image %s publicity" msgstr "" -#: ../nova/api/ec2/cloud.py:1579 +#: nova/api/ec2/cloud.py:1524 #, python-format msgid "Couldn't stop instance with in %d sec" +msgstr "无法在 %d 秒内停止实例" + +#: nova/api/openstack/extensions.py:191 +#, python-format +msgid "Loaded extension: %s" +msgstr "Loaded extension: %s" + +#: nova/api/openstack/extensions.py:228 +#, python-format +msgid "Ext name: %s" +msgstr "Ext name: %s" + +#: nova/api/openstack/extensions.py:229 +#, python-format +msgid "Ext alias: %s" +msgstr "Ext alias: %s" + +#: nova/api/openstack/extensions.py:230 +#, python-format +msgid "Ext description: %s" +msgstr "Ext 描述: %s" + +#: nova/api/openstack/extensions.py:232 +#, python-format +msgid "Ext namespace: %s" +msgstr "Ext 命名空间: %s" + +#: nova/api/openstack/extensions.py:233 +#, python-format +msgid "Ext updated: %s" +msgstr "Ext updated: %s" + +#: nova/api/openstack/extensions.py:235 +#, python-format +msgid "Exception loading extension: %s" +msgstr "Exception loading extension: %s" + +#: nova/api/openstack/extensions.py:249 +#, python-format +msgid "Loading extension %s" +msgstr "Loading extension %s" + +#: nova/api/openstack/extensions.py:255 +#, python-format +msgid "Calling extension factory %s" +msgstr "Calling extension factory %s" + +#: nova/api/openstack/extensions.py:267 +#, python-format +msgid "Failed to load extension %(ext_factory)s: %(exc)s" +msgstr "加载扩展 %(ext_factory)s 失败:%(exc)s" + +#: nova/api/openstack/extensions.py:345 +#, python-format +msgid "Failed to load extension %(classpath)s: %(exc)s" +msgstr "加载扩展 %(classpath)s 失败:%(exc)s" + +#: nova/api/openstack/extensions.py:369 +#, python-format +msgid "Failed to load extension %(ext_name)s: %(exc)s" +msgstr "加载扩展 %(ext_name)s 失败:%(exc)s" + +#: nova/api/openstack/compute/contrib/security_groups.py:219 +msgid "Security group id should be integer" +msgstr "安全组id应该是整数" + +#: nova/api/openstack/compute/contrib/security_groups.py:289 +#, python-format +msgid "Security group %s already exists" +msgstr "安全组 %s 已经存在" + +#: nova/api/openstack/compute/contrib/security_groups.py:309 +#, python-format +msgid "Security group %s is not a string or unicode" +msgstr "安全组 %s 既不是字符串也不是unicode" + +#: nova/api/openstack/compute/contrib/security_groups.py:312 +#, python-format +msgid "Security group %s cannot be empty." +msgstr "安全组 %s 不能为空。" + +#: nova/api/openstack/compute/contrib/security_groups.py:315 +#, python-format +msgid "Security group %s should not be greater than 255 characters." +msgstr "安全组 %s 不能比255个字符更长。" + +#: nova/api/openstack/compute/contrib/security_groups.py:342 +msgid "Parent group id is not integer" +msgstr "父组id不是整数" + +#: nova/api/openstack/compute/contrib/security_groups.py:345 +#, python-format +msgid "Security group (%s) not found" +msgstr "没有找到安全组 (%s)" + +#: nova/api/openstack/compute/contrib/security_groups.py:348 +#, python-format +msgid "Authorize security group ingress %s" +msgstr "验证安全组的输入 %s" + +#: nova/api/openstack/compute/contrib/security_groups.py:363 +msgid "Not enough parameters to build a valid rule." +msgstr "参数不够创建有效规则。" + +#: nova/api/openstack/compute/contrib/security_groups.py:370 +#, python-format +msgid "This rule already exists in group %s" msgstr "" -#: ../nova/tests/test_xenapi.py:567 +#: nova/api/openstack/compute/contrib/security_groups.py:408 +msgid "Parent or group id is not integer" +msgstr "父组id或者组id不是整数" + +#: nova/api/openstack/compute/contrib/security_groups.py:412 +msgid "Parent group id and group id cannot be same" +msgstr "父组id和组id不能一样" + +#: nova/api/openstack/compute/contrib/security_groups.py:490 +msgid "Rule id is not integer" +msgstr "规则id不是整数" + +#: nova/api/openstack/compute/contrib/security_groups.py:493 +#, python-format +msgid "Rule (%s) not found" +msgstr "没有找到规则 (%s)" + +#: nova/api/openstack/compute/contrib/security_groups.py:500 +#, python-format +msgid "Revoke security group ingress %s" +msgstr "撤销安全组输入 %s" + +#: nova/api/openstack/compute/contrib/security_groups.py:562 +#: nova/api/openstack/compute/contrib/security_groups.py:595 +msgid "Security group not specified" +msgstr "没有指定安全组" + +#: nova/api/openstack/compute/contrib/security_groups.py:566 +#: nova/api/openstack/compute/contrib/security_groups.py:599 +msgid "Security group name cannot be empty" +msgstr "安全组名称不能是空" + +#: nova/api/openstack/compute/contrib/consoles.py:44 +msgid "Missing type specification" +msgstr "缺少类型规范" + +#: nova/api/openstack/compute/contrib/consoles.py:56 +msgid "Invalid type specification" +msgstr "无效的类型规范" + +#: nova/tests/test_xenapi.py:602 #, python-format msgid "Creating files in %s to simulate guest agent" msgstr "" -#. Umount would normall make files in the m,ounted filesystem -#. disappear, so do that here -#: ../nova/tests/test_xenapi.py:578 +#: nova/tests/test_xenapi.py:613 #, python-format msgid "Removing simulated guest agent files in %s" msgstr "" -#: ../nova/tests/fakelibvirt.py:774 +#: nova/tests/fakelibvirt.py:774 msgid "Please extend mock libvirt module to support flags" msgstr "" -#: ../nova/tests/fakelibvirt.py:780 +#: nova/tests/fakelibvirt.py:780 msgid "Please extend fake libvirt module to support this auth method" msgstr "" -#: ../nova/api/openstack/v2/extensions.py:300 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170 +msgid "No body provided" +msgstr "没有提供主体" + +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182 #, python-format -msgid "Extended resource: %s" -msgstr "" +msgid "Create VSA %(display_name)s of type %(vc_type)s" +msgstr "创建类型 %(vc_type)s 的VSA %(display_name)s" -#: ../nova/api/openstack/v2/extensions.py:321 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203 #, python-format -msgid "Extended action: %s" -msgstr "" +msgid "Delete VSA with id: %s" +msgstr "删除id:%s的VSA" -#: ../nova/api/openstack/v2/extensions.py:329 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:222 #, python-format -msgid "Extended request: %s" -msgstr "" +msgid "Associate address %(ip)s to VSA %(id)s" +msgstr "把地址 %(ip)s 与VSA %(id)s关联" -#: ../nova/api/openstack/v2/extensions.py:372 -msgid "Initializing extension manager." -msgstr "" +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:251 +#, python-format +msgid "Disassociate address from VSA %(id)s" +msgstr "把地址与VSA %(id)s解除关联" -#: ../nova/api/openstack/v2/extensions.py:383 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:291 #, python-format -msgid "Loaded extension: %s" -msgstr "" +msgid "%(obj)s with ID %(id)s not found" +msgstr "没有找到ID是 %(id)s 的 %(obj)s" -#: ../nova/api/openstack/v2/extensions.py:433 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:297 #, python-format -msgid "Ext name: %s" -msgstr "" +msgid "" +"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA " +"%(vsa_id)s." +msgstr "ID是 %(id)s 的 %(obj)s 属于VSA %(own_vsa_id)s而不是VSA %(vsa_id)s。" -#: ../nova/api/openstack/v2/extensions.py:434 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:317 #, python-format -msgid "Ext alias: %s" -msgstr "" +msgid "Index. vsa_id=%(vsa_id)s" +msgstr "索引。vsa_id=%(vsa_id)s" -#: ../nova/api/openstack/v2/extensions.py:435 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:322 #, python-format -msgid "Ext description: %s" -msgstr "" +msgid "Detail. vsa_id=%(vsa_id)s" +msgstr "详细内容。vsa_id=%(vsa_id)s" -#: ../nova/api/openstack/v2/extensions.py:437 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:327 #, python-format -msgid "Ext namespace: %s" -msgstr "" +msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s" +msgstr "创建卷。vsa_id=%(vsa_id)s, body=%(body)s" -#: ../nova/api/openstack/v2/extensions.py:438 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:336 #, python-format -msgid "Ext updated: %s" -msgstr "" +msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s" +msgstr "从VSA ID %(vsa_id)s 为创建 %(size)s GB的卷" -#: ../nova/api/openstack/v2/extensions.py:440 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:381 #, python-format -msgid "Exception loading extension: %s" -msgstr "" +msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s" +msgstr "更新%(obj)s至id:%(id)s ,修改:%(changes)s" -#: ../nova/api/openstack/v2/extensions.py:453 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:396 #, python-format -msgid "Loading extension %s" -msgstr "" +msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s" +msgstr "删除卷。vsa_id=%(vsa_id)s, id=%(id)s" -#. Call it -#: ../nova/api/openstack/v2/extensions.py:459 +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:412 #, python-format -msgid "Calling extension factory %s" +msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s" +msgstr "显示卷。vsa_id=%(vsa_id)s, id=%(id)s" + +#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:623 +#, python-format +msgid "Index instances for VSA %s" +msgstr "为 VSA %s 索引实例" + +#: nova/cloudpipe/pipelib.py:46 +msgid "Template for cloudpipe instance boot script" +msgstr "" + +#: nova/cloudpipe/pipelib.py:49 +msgid "Network to push into openvpn config" +msgstr "" + +#: nova/cloudpipe/pipelib.py:52 +msgid "Netmask to push into openvpn config" msgstr "" -#: ../nova/api/openstack/v2/extensions.py:469 +#: nova/cloudpipe/pipelib.py:101 #, python-format -msgid "Failed to load extension %(ext_factory)s: %(exc)s" +msgid "Launching VPN for %s" msgstr "" -#: ../nova/scheduler/scheduler_options.py:62 +#: nova/scheduler/scheduler_options.py:67 #, python-format msgid "Could not stat scheduler options file %(filename)s: '%(e)s'" msgstr "" -#: ../nova/scheduler/scheduler_options.py:71 +#: nova/scheduler/scheduler_options.py:75 #, python-format msgid "Could not decode scheduler options: '%(e)s'" msgstr "" -#: ../nova/image/s3.py:290 +#: nova/image/s3.py:296 #, python-format msgid "Failed to download %(image_location)s to %(image_path)s" msgstr "" -#: ../nova/image/s3.py:314 +#: nova/image/s3.py:315 #, python-format msgid "Failed to decrypt %(image_location)s to %(image_path)s" msgstr "" -#: ../nova/image/s3.py:326 +#: nova/image/s3.py:327 #, python-format msgid "Failed to untar %(image_location)s to %(image_path)s" msgstr "" -#: ../nova/image/s3.py:339 +#: nova/image/s3.py:340 #, python-format msgid "Failed to upload %(image_location)s to %(image_path)s" msgstr "" -#: ../nova/image/s3.py:365 +#: nova/image/s3.py:366 #, python-format msgid "Failed to decrypt private key: %s" msgstr "" -#: ../nova/image/s3.py:374 +#: nova/image/s3.py:374 #, python-format msgid "Failed to decrypt initialization vector: %s" msgstr "" -#: ../nova/image/s3.py:385 +#: nova/image/s3.py:385 #, python-format msgid "Failed to decrypt image file %(image_file)s: %(err)s" msgstr "" -#: ../nova/image/s3.py:397 +#: nova/image/s3.py:397 msgid "Unsafe filenames in image" msgstr "" -#: ../nova/scheduler/manager.py:97 +#: nova/api/ec2/apirequest.py:64 #, python-format msgid "" -"Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()" +"Unsupported API request: controller = %(controller)s, action = %(action)s" +msgstr "不支持的API请求:controller = %(controller)s,action = %(action)s" + +#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:53 +msgid "foreign key constraint couldn't be dropped" msgstr "" -#: ../nova/scheduler/manager.py:115 +#: nova/api/openstack/__init__.py:43 #, python-format -msgid "Failed to schedule_%(method)s: %(ex)s" -msgstr "" +msgid "Caught error: %s" +msgstr "抓到错误:%s" -#: ../nova/scheduler/manager.py:119 +#: nova/api/openstack/__init__.py:94 +msgid "Must specify an ExtensionManager class" +msgstr "必须明确一个ExtensionManager类" + +#: nova/api/openstack/__init__.py:105 #, python-format -msgid "Setting instance %(instance_id)s to ERROR state." -msgstr "" +msgid "Extended resource: %s" +msgstr "扩展资源:%s" -#: ../nova/api/ec2/apirequest.py:73 +#: nova/api/openstack/__init__.py:130 #, python-format msgid "" -"Unsupported API request: controller = %(controller)s, action = %(action)s" -msgstr "" +"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such " +"resource" +msgstr "扩展%(ext_name)s:无法扩展资源 %(collection)s:没有那种资源" -#: ../nova/vsa/api.py:76 +#: nova/api/openstack/__init__.py:135 #, python-format -msgid "Invalid drive type %s" +msgid "Extension %(ext_name)s extending resource: %(collection)s" msgstr "" -#: ../nova/vsa/api.py:99 +#: nova/api/openstack/common.py:135 nova/api/openstack/common.py:170 +msgid "limit param must be an integer" +msgstr "limit param必须是整数" + +#: nova/api/openstack/common.py:138 nova/api/openstack/common.py:174 +msgid "limit param must be positive" +msgstr "limit param必须是正数" + +#: nova/api/openstack/common.py:164 +msgid "offset param must be an integer" +msgstr "offset param必须是整数" + +#: nova/api/openstack/common.py:178 +msgid "offset param must be positive" +msgstr "offset param必须是正数" + +#: nova/api/openstack/common.py:202 #, python-format -msgid "No drive_name param found in %s" -msgstr "" +msgid "marker [%s] not found" +msgstr "没有找到marker [%s]" -#: ../nova/vsa/api.py:104 +#: nova/api/openstack/common.py:242 #, python-format -msgid "Invalid drive type name %s" -msgstr "" +msgid "href %s does not contain version" +msgstr "href %s 不包含版本" -#: ../nova/vsa/api.py:149 -msgid "*** Experimental VSA code ***" -msgstr "" +#: nova/api/openstack/common.py:277 +msgid "Image metadata limit exceeded" +msgstr "超过镜像元数据限制" -#: ../nova/vsa/api.py:152 ../nova/vsa/api.py:303 +#: nova/api/openstack/common.py:358 #, python-format -msgid "Requested number of VCs (%d) is too high. Setting to default" -msgstr "" +msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s" +msgstr "实例处于 %(attr)s %(state)s 无法进行 '%(action)s'" -#: ../nova/vsa/api.py:178 +#: nova/api/openstack/common.py:361 #, python-format -msgid "Failed to find configured image %s" +msgid "Instance is in an invalid state for '%(action)s'" +msgstr "实例针对 '%(action)s' 处于无效状态" + +#: nova/api/openstack/common.py:441 +msgid "Rejecting snapshot request, snapshots currently disabled" +msgstr "拒绝快照请求,快照当前未被激活" + +#: nova/api/openstack/common.py:443 +msgid "Instance snapshots are not permitted at this time." +msgstr "该时刻实例快照是不允许的。" + +#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:75 +msgid "interface column not added to networks table" msgstr "" -#: ../nova/vsa/api.py:191 -#, python-format -msgid "Creating VSA: %s" +#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:89 +msgid "VIF column not added to fixed_ips table" msgstr "" -#: ../nova/vsa/api.py:207 +#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:99 #, python-format -msgid "Error in storage parameters: %s" +msgid "join list for moving mac_addresses |%s|" msgstr "" -#: ../nova/vsa/api.py:241 -#, python-format -msgid "" -"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d GB, " -"type %(vol_type_id)s" +#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:123 +msgid "Can't downgrade without losing data" msgstr "" -#: ../nova/vsa/api.py:272 -#, python-format -msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s" +#: nova/virt/baremetal/dom.py:93 +msgid "No domains exist." msgstr "" -#: ../nova/vsa/api.py:287 +#: nova/virt/baremetal/dom.py:95 #, python-format -msgid "VSA ID %(vsa_id)d: Update VSA call" +msgid "============= initial domains =========== : %s" msgstr "" -#: ../nova/vsa/api.py:318 -#, python-format -msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s." +#: nova/virt/baremetal/dom.py:99 +msgid "Building domain: to be removed" msgstr "" -#: ../nova/vsa/api.py:324 -#, python-format -msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s." +#: nova/virt/baremetal/dom.py:103 +msgid "Not running domain: remove" msgstr "" -#: ../nova/vsa/api.py:351 -#, python-format -msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s" +#: nova/virt/baremetal/dom.py:111 +msgid "domain running on an unknown node: discarded" msgstr "" -#: ../nova/vsa/api.py:355 +#: nova/virt/baremetal/dom.py:127 #, python-format -msgid "Unable to delete volume %s" +msgid "No such domain (%s)" msgstr "" -#: ../nova/vsa/api.py:357 +#: nova/virt/baremetal/dom.py:134 #, python-format -msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s" +msgid "Failed power down Bare-metal node %s" msgstr "" -#: ../nova/vsa/api.py:363 -#, python-format -msgid "Going to try to terminate VSA ID %s" +#: nova/virt/baremetal/dom.py:143 +msgid "deactivate -> activate fails" msgstr "" -#: ../nova/vsa/api.py:374 +#: nova/virt/baremetal/dom.py:153 +msgid "destroy_domain: no such domain" +msgstr "" + +#: nova/virt/baremetal/dom.py:154 #, python-format -msgid "VSA ID %(vsa_id)s: Delete instance %(name)s" +msgid "No such domain %s" msgstr "" -#: ../nova/api/openstack/common.py:129 ../nova/api/openstack/common.py:164 -msgid "limit param must be an integer" +#: nova/virt/baremetal/dom.py:161 +#, python-format +msgid "Domains: %s" msgstr "" -#: ../nova/api/openstack/common.py:132 ../nova/api/openstack/common.py:168 -msgid "limit param must be positive" +#: nova/virt/baremetal/dom.py:163 +#, python-format +msgid "Nodes: %s" msgstr "" -#: ../nova/api/openstack/common.py:158 -msgid "offset param must be an integer" +#: nova/virt/baremetal/dom.py:166 +#, python-format +msgid "After storing domains: %s" msgstr "" -#: ../nova/api/openstack/common.py:172 -msgid "offset param must be positive" +#: nova/virt/baremetal/dom.py:169 +msgid "deactivation/removing domain failed" msgstr "" -#: ../nova/api/openstack/common.py:196 -#, python-format -msgid "marker [%s] not found" +#: nova/virt/baremetal/dom.py:176 +msgid "===== Domain is being created =====" msgstr "" -#: ../nova/api/openstack/common.py:236 -#, python-format -msgid "href %s does not contain version" +#: nova/virt/baremetal/dom.py:179 +msgid "Same domain name already exists" msgstr "" -#: ../nova/api/openstack/common.py:271 -msgid "Image metadata limit exceeded" +#: nova/virt/baremetal/dom.py:181 +msgid "create_domain: before get_idle_node" msgstr "" -#: ../nova/api/openstack/common.py:424 -msgid "Rejecting snapshot request, snapshots currently disabled" +#: nova/virt/baremetal/dom.py:198 +#, python-format +msgid "Created new domain: %s" msgstr "" -#: ../nova/api/openstack/common.py:426 -msgid "Instance snapshots are not permitted at this time." +#: nova/virt/baremetal/dom.py:213 +#, python-format +msgid "Failed to boot Bare-metal node %s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:76 -msgid "interface column not added to networks table" +#: nova/virt/baremetal/dom.py:222 +msgid "No such domain exists" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:90 -msgid "VIF column not added to fixed_ips table" +#: nova/virt/baremetal/dom.py:226 +#, python-format +msgid "change_domain_state: to new state %s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:100 +#: nova/virt/baremetal/dom.py:233 #, python-format -msgid "join list for moving mac_addresses |%s|" +msgid "Stored fake domains to the file: %s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:124 -msgid "Can't downgrade without losing data" +#: nova/virt/baremetal/dom.py:244 +msgid "domain does not exist" msgstr "" -#: ../bin/nova-manage.py:373 +#: ../bin/nova-manage.py:381 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 "" -#: ../bin/nova-manage.py:604 +#: ../bin/nova-manage.py:612 msgid "" "No more networks available. If this is a new installation, you need\n" "to call something like this:\n" @@ -4240,631 +4256,979 @@ "\n" msgstr "" -#: ../bin/nova-manage.py:609 +#: ../bin/nova-manage.py:617 msgid "" "The above error may show that the certificate db has not been created.\n" -"Please create a database by running a nova-api server on this host." +"Please create a database by running a nova-cert server on this host." msgstr "" -#: ../bin/nova-manage.py:633 +#: ../bin/nova-manage.py:646 msgid "network" msgstr "" -#: ../bin/nova-manage.py:634 +#: ../bin/nova-manage.py:647 msgid "IP address" msgstr "" -#: ../bin/nova-manage.py:635 -msgid "MAC address" -msgstr "" - -#: ../bin/nova-manage.py:636 +#: ../bin/nova-manage.py:648 msgid "hostname" msgstr "" -#: ../bin/nova-manage.py:637 ../bin/nova-manage.py:1136 -#: ../bin/nova-manage.py:1252 ../bin/nova-manage.py:1284 +#: ../bin/nova-manage.py:649 ../bin/nova-manage.py:1167 +#: ../bin/nova-manage.py:1283 ../bin/nova-manage.py:1315 msgid "host" msgstr "" -#: ../bin/nova-manage.py:786 +#: ../bin/nova-manage.py:812 #, python-format msgid "" "Subnet(s) too large, defaulting to /%s. To override, specify network_size " "flag." msgstr "" -#: ../bin/nova-manage.py:829 ../bin/nova-manage.py:1978 -#: ../bin/nova-manage.py:2021 ../nova/tests/test_nova_manage.py:180 +#: nova/tests/test_nova_manage.py:178 msgid "id" msgstr "" -#: ../bin/nova-manage.py:830 ../nova/tests/test_nova_manage.py:181 +#: nova/tests/test_nova_manage.py:179 msgid "IPv4" msgstr "" -#: ../bin/nova-manage.py:831 ../nova/tests/test_nova_manage.py:182 +#: nova/tests/test_nova_manage.py:180 msgid "IPv6" msgstr "" -#: ../bin/nova-manage.py:832 ../nova/tests/test_nova_manage.py:183 +#: nova/tests/test_nova_manage.py:181 msgid "start address" msgstr "" -#: ../bin/nova-manage.py:833 ../nova/tests/test_nova_manage.py:184 +#: nova/tests/test_nova_manage.py:182 msgid "DNS1" msgstr "" -#: ../bin/nova-manage.py:834 ../nova/tests/test_nova_manage.py:185 +#: nova/tests/test_nova_manage.py:183 msgid "DNS2" msgstr "" -#: ../bin/nova-manage.py:835 ../nova/tests/test_nova_manage.py:186 +#: nova/tests/test_nova_manage.py:184 msgid "VlanID" msgstr "" -#: ../bin/nova-manage.py:836 ../bin/nova-manage.py:853 -#: ../bin/nova-manage.py:936 ../nova/tests/test_nova_manage.py:187 +#: nova/tests/test_nova_manage.py:185 msgid "project" msgstr "" -#: ../bin/nova-manage.py:837 ../bin/nova-manage.py:852 -#: ../nova/tests/test_nova_manage.py:188 +#: nova/tests/test_nova_manage.py:186 msgid "uuid" msgstr "" -#: ../bin/nova-manage.py:854 +#: ../bin/nova-manage.py:880 msgid "priority" msgstr "" -#: ../bin/nova-manage.py:855 +#: ../bin/nova-manage.py:881 msgid "cidr_v4" msgstr "" -#: ../bin/nova-manage.py:856 +#: ../bin/nova-manage.py:882 msgid "cidr_v6" msgstr "" -#: ../bin/nova-manage.py:928 +#: ../bin/nova-manage.py:954 msgid "instance" msgstr "" -#: ../bin/nova-manage.py:929 +#: ../bin/nova-manage.py:955 msgid "node" msgstr "" -#: ../bin/nova-manage.py:930 ../bin/nova-manage.py:1253 -#: ../bin/nova-manage.py:1280 ../bin/nova-manage.py:1512 +#: ../bin/nova-manage.py:956 ../bin/nova-manage.py:1284 +#: ../bin/nova-manage.py:1311 ../bin/nova-manage.py:1543 msgid "type" msgstr "" -#: ../bin/nova-manage.py:931 +#: ../bin/nova-manage.py:957 msgid "state" msgstr "" -#: ../bin/nova-manage.py:932 +#: ../bin/nova-manage.py:958 msgid "launched" msgstr "" -#: ../bin/nova-manage.py:933 ../bin/nova-manage.py:1279 +#: ../bin/nova-manage.py:959 ../bin/nova-manage.py:1310 msgid "image" msgstr "" -#: ../bin/nova-manage.py:934 +#: ../bin/nova-manage.py:960 msgid "kernel" msgstr "" -#: ../bin/nova-manage.py:935 +#: ../bin/nova-manage.py:961 msgid "ramdisk" msgstr "" -#: ../bin/nova-manage.py:937 +#: ../bin/nova-manage.py:963 msgid "user" msgstr "" -#: ../bin/nova-manage.py:938 ../bin/nova-manage.py:1137 +#: ../bin/nova-manage.py:964 ../bin/nova-manage.py:1168 msgid "zone" msgstr "" -#: ../bin/nova-manage.py:939 +#: ../bin/nova-manage.py:965 msgid "index" msgstr "" -#: ../bin/nova-manage.py:977 +#: ../bin/nova-manage.py:1004 msgid "Only KVM and QEmu are supported for now. Sorry!" msgstr "" -#: ../bin/nova-manage.py:981 +#: ../bin/nova-manage.py:1008 msgid "Support only ISCSIDriver. Sorry!" msgstr "" -#: ../bin/nova-manage.py:992 +#: ../bin/nova-manage.py:1020 #, python-format msgid "" "Migration of %s initiated.Check its progress using euca-describe-instances." msgstr "" -#: ../bin/nova-manage.py:1031 +#: ../bin/nova-manage.py:1062 msgid "Binary" msgstr "" -#: ../bin/nova-manage.py:1032 +#: ../bin/nova-manage.py:1063 msgid "Host" msgstr "" -#: ../bin/nova-manage.py:1033 +#: ../bin/nova-manage.py:1064 msgid "Zone" msgstr "" -#: ../bin/nova-manage.py:1034 +#: ../bin/nova-manage.py:1065 msgid "Status" msgstr "" -#: ../bin/nova-manage.py:1035 +#: ../bin/nova-manage.py:1066 msgid "State" msgstr "" -#: ../bin/nova-manage.py:1036 +#: ../bin/nova-manage.py:1067 msgid "Updated_At" msgstr "" -#: ../bin/nova-manage.py:1082 +#: ../bin/nova-manage.py:1116 msgid "An unexpected error has occurred." msgstr "" -#: ../bin/nova-manage.py:1083 +#: ../bin/nova-manage.py:1117 msgid "[Result]" msgstr "" -#: ../bin/nova-manage.py:1119 -#, python-format -msgid "%s does not exist." +#. Printing a total and used_now +#. (NOTE)The host name width 16 characters +#: ../bin/nova-manage.py:1121 +msgid "HOST" +msgstr "" + +#: ../bin/nova-manage.py:1122 +msgid "PROJECT" msgstr "" #: ../bin/nova-manage.py:1123 -#, python-format -msgid "%s is not compute node." +msgid "cpu" +msgstr "" + +#: ../bin/nova-manage.py:1124 +msgid "mem(mb)" msgstr "" -#: ../bin/nova-manage.py:1176 +#: ../bin/nova-manage.py:1125 +msgid "hdd" +msgstr "" + +#: ../bin/nova-manage.py:1207 #, python-format msgid "%s (%s)" msgstr "" -#: ../bin/nova-manage.py:1204 ../bin/nova-manage.py:1229 -#: ../bin/nova-manage.py:1248 ../bin/nova-manage.py:1276 -#: ../bin/nova-manage.py:1510 +#: ../bin/nova-manage.py:1235 ../bin/nova-manage.py:1260 +#: ../bin/nova-manage.py:1279 ../bin/nova-manage.py:1307 +#: ../bin/nova-manage.py:1541 msgid "ID" msgstr "" -#: ../bin/nova-manage.py:1205 +#: ../bin/nova-manage.py:1236 msgid "vsa_id" msgstr "" -#: ../bin/nova-manage.py:1206 +#: ../bin/nova-manage.py:1237 msgid "displayName" msgstr "" -#: ../bin/nova-manage.py:1207 +#: ../bin/nova-manage.py:1238 msgid "vc_type" msgstr "" -#: ../bin/nova-manage.py:1208 +#: ../bin/nova-manage.py:1239 msgid "vc_cnt" msgstr "" -#: ../bin/nova-manage.py:1209 +#: ../bin/nova-manage.py:1240 msgid "drive_cnt" msgstr "" -#: ../bin/nova-manage.py:1210 ../bin/nova-manage.py:1232 -#: ../bin/nova-manage.py:1251 ../bin/nova-manage.py:1283 +#: ../bin/nova-manage.py:1241 ../bin/nova-manage.py:1263 +#: ../bin/nova-manage.py:1282 ../bin/nova-manage.py:1314 msgid "status" msgstr "" -#: ../bin/nova-manage.py:1211 +#: ../bin/nova-manage.py:1242 msgid "AZ" msgstr "" -#: ../bin/nova-manage.py:1212 ../bin/nova-manage.py:1234 -#: ../bin/nova-manage.py:1255 ../bin/nova-manage.py:1285 -#: ../bin/nova-manage.py:1517 +#: ../bin/nova-manage.py:1243 ../bin/nova-manage.py:1265 +#: ../bin/nova-manage.py:1286 ../bin/nova-manage.py:1316 +#: ../bin/nova-manage.py:1548 msgid "createTime" msgstr "" -#: ../bin/nova-manage.py:1227 +#: ../bin/nova-manage.py:1258 msgid " === Volumes ===" msgstr "" -#: ../bin/nova-manage.py:1230 ../bin/nova-manage.py:1249 -#: ../bin/nova-manage.py:1277 ../bin/nova-manage.py:1511 +#: ../bin/nova-manage.py:1261 ../bin/nova-manage.py:1280 +#: ../bin/nova-manage.py:1308 ../bin/nova-manage.py:1542 msgid "name" msgstr "" -#: ../bin/nova-manage.py:1231 ../bin/nova-manage.py:1250 +#: ../bin/nova-manage.py:1262 ../bin/nova-manage.py:1281 msgid "size" msgstr "" -#: ../bin/nova-manage.py:1233 +#: ../bin/nova-manage.py:1264 msgid "attachment" msgstr "" -#: ../bin/nova-manage.py:1246 -msgid " === Drives ===" +#: ../bin/nova-manage.py:1277 +msgid " === Drives ===" +msgstr "" + +#: ../bin/nova-manage.py:1285 +msgid "typeName" +msgstr "" + +#: ../bin/nova-manage.py:1305 +msgid " === Instances ===" +msgstr "" + +#: ../bin/nova-manage.py:1309 +msgid "disp_name" +msgstr "" + +#: ../bin/nova-manage.py:1312 +msgid "floating_IP" +msgstr "" + +#: ../bin/nova-manage.py:1313 +msgid "fixed_IP" +msgstr "" + +#: ../bin/nova-manage.py:1401 +#, python-format +msgid "Failed to retrieve project id: %(exc)s" +msgstr "" + +#: ../bin/nova-manage.py:1409 +#, python-format +msgid "Failed to retrieve user info: %(exc)s" +msgstr "" + +#: ../bin/nova-manage.py:1427 +#, python-format +msgid "Invalid string format %s" +msgstr "" + +#: ../bin/nova-manage.py:1432 +#, python-format +msgid "" +"Invalid string format for element %s. Expecting keys 'drive_name' & " +"'num_drives'" +msgstr "" + +#: ../bin/nova-manage.py:1450 +msgid "" +"Shared parameter should be set either to \" \"--shared or --" +"full_drives" +msgstr "" + +#: ../bin/nova-manage.py:1544 +msgid "size_gb" +msgstr "" + +#: ../bin/nova-manage.py:1545 +msgid "rpm" +msgstr "" + +#: ../bin/nova-manage.py:1546 +msgid "capabilities" +msgstr "" + +#: ../bin/nova-manage.py:1547 +msgid "visible" +msgstr "" + +#: ../bin/nova-manage.py:1676 +msgid "visible parameter should be set to show or hide" +msgstr "" + +#: ../bin/nova-manage.py:1844 +#, python-format +msgid "Image registered to %(new)s (%(path)s)." +msgstr "" + +#: ../bin/nova-manage.py:1847 +#, python-format +msgid "Failed to register %(path)s: %(exc)s" +msgstr "" + +#: ../bin/nova-manage.py:1959 +#, python-format +msgid "Image %(old)s converted to %(new)s." +msgstr "" + +#: ../bin/nova-manage.py:1961 +#, python-format +msgid "Failed to convert %(old)s: %(exc)s" +msgstr "" + +#: ../bin/nova-manage.py:1980 +#, python-format +msgid "Failed to load %(fn)s." +msgstr "" + +#: ../bin/nova-manage.py:2002 +msgid "Label" +msgstr "" + +#: ../bin/nova-manage.py:2003 +msgid "Description" +msgstr "" + +#: ../bin/nova-manage.py:2045 +msgid "Flavor id" +msgstr "" + +#: ../bin/nova-manage.py:2046 +msgid "SR UUID" +msgstr "" + +#: ../bin/nova-manage.py:2047 +msgid "SR Type" +msgstr "" + +#: ../bin/nova-manage.py:2048 +msgid "Config Parameters" +msgstr "" + +#: ../bin/nova-manage.py:2315 +#, python-format +msgid "" +"\n" +"OpenStack Nova version: %s (%s)\n" +msgstr "" + +#: ../bin/nova-manage.py:2318 +msgid "Available categories:" +msgstr "" + +#: ../bin/nova-manage.py:2334 +#, python-format +msgid "Available actions for %s category:" +msgstr "" + +#: ../bin/nova-manage.py:2363 +msgid "Possible wrong number of arguments supplied" +msgstr "" + +#: ../bin/nova-manage.py:2368 +msgid "Command failed, please check log for more info" +msgstr "" + +#: nova/tests/integrated/test_login.py:31 +#, python-format +msgid "flavor: %s" +msgstr "" + +#: nova/api/openstack/compute/contrib/certificates.py:75 +msgid "Only root certificate can be retrieved." +msgstr "只有根证书能被获取。" + +#: nova/virt/disk/guestfs.py:39 +#, python-format +msgid "unsupported partition: %s" +msgstr "" + +#: nova/virt/disk/guestfs.py:77 +msgid "unknown guestmount error" +msgstr "" + +#: nova/network/quantum/manager.py:152 +msgid "QuantumManager does not use 'multi_host' parameter." +msgstr "" + +#: nova/network/quantum/manager.py:156 +msgid "QuantumManager requires that only one network is created per call" +msgstr "" + +#: nova/network/quantum/manager.py:166 +msgid "QuantumManager does not use 'vlan_start' parameter." +msgstr "" + +#: nova/network/quantum/manager.py:172 +msgid "QuantumManager does not use 'vpn_start' parameter." +msgstr "" + +#: nova/network/quantum/manager.py:176 +msgid "QuantumManager does not use 'bridge' parameter." +msgstr "" + +#: nova/network/quantum/manager.py:180 +msgid "QuantumManager does not use 'bridge_interface' parameter." +msgstr "" + +#: nova/network/quantum/manager.py:185 +msgid "QuantumManager requires a valid (.1) gateway address." +msgstr "" + +#: nova/network/quantum/manager.py:197 +#, python-format +msgid "" +"Unable to find existing quantum network for tenant '%(q_tenant_id)s' with " +"net-id '%(quantum_net_id)s'" +msgstr "" + +#: nova/network/quantum/manager.py:243 +#, python-format +msgid "Network %s has active ports, cannot delete" +msgstr "" + +#: nova/network/quantum/manager.py:289 +#, python-format +msgid "network allocations for instance %s" +msgstr "" + +#: nova/network/quantum/manager.py:537 +#, python-format +msgid "" +"port deallocation failed for instance: |%(instance_id)s|, port_id: " +"|%(port_id)s|" +msgstr "" + +#: nova/network/quantum/manager.py:556 +#, python-format +msgid "" +"ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: " +"|%(vif_uuid)s|" +msgstr "" + +#: nova/wsgi.py:93 +#, python-format +msgid "Started %(name)s on %(host)s:%(port)s" +msgstr "在 %(host)s:%(port)s 启动%(name)s" + +#: nova/wsgi.py:104 +msgid "Stopping WSGI server." +msgstr "关闭WSGI服务器" + +#: nova/wsgi.py:107 +msgid "Stopping raw TCP server." +msgstr "正在停止裸TCP服务器。" + +#: nova/wsgi.py:113 +#, python-format +msgid "Starting TCP server %(arg0)s on %(host)s:%(port)s" +msgstr "正在 %(host)s:%(port)s 上启动TCP服务器 %(arg0)s" + +#: nova/wsgi.py:129 +msgid "WSGI server has stopped." +msgstr "WSGI服务器已经停止。" + +#: nova/wsgi.py:207 +msgid "You must implement __call__" +msgstr "你必须执行 __call__" + +#: nova/notifier/list_notifier.py:65 +#, python-format +msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s." +msgstr "" + +#: ../bin/nova-dhcpbridge.py:54 +msgid "leasing ip" +msgstr "" + +#: ../bin/nova-dhcpbridge.py:67 +msgid "Adopted old lease or got a change of mac" +msgstr "" + +#: ../bin/nova-dhcpbridge.py:74 +msgid "releasing ip" +msgstr "" + +#: ../bin/nova-dhcpbridge.py:113 +#, python-format +msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'" +msgstr "" + +#: ../bin/nova-dhcpbridge.py:123 +msgid "Environment variable 'NETWORK_ID' must be set." +msgstr "" + +#: nova/rpc/impl_carrot.py:198 +#, python-format +msgid "" +"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying again " +"in %(fl_intv)d seconds." +msgstr "" + +#: nova/rpc/impl_carrot.py:202 +#, python-format +msgid "" +"Unable to connect to AMQP server after %(tries)d tries. Shutting down." +msgstr "" + +#: nova/rpc/impl_carrot.py:222 +msgid "Reconnected to queue" +msgstr "重新与队列建立连接" + +#: nova/rpc/impl_carrot.py:229 +#, python-format +msgid "Failed to fetch message from queue: %s" +msgstr "" + +#: nova/rpc/impl_carrot.py:237 +#, python-format +msgid "Initing the Adapter Consumer for %s" +msgstr "" + +#: nova/rpc/impl_carrot.py:336 +#, python-format +msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key" +msgstr "" + +#: nova/rpc/impl_carrot.py:381 +msgid "Exception while processing consumer" +msgstr "" + +#: nova/rpc/impl_carrot.py:418 +#, python-format +msgid "Creating \"%(exchange)s\" fanout exchange" +msgstr "" + +#: nova/rpc/impl_carrot.py:645 +#, python-format +msgid "response %s" +msgstr "回复 %s" + +#: nova/rpc/impl_carrot.py:654 +#, python-format +msgid "topic is %s" +msgstr "话题是 %s" + +#: nova/rpc/impl_carrot.py:655 +#, python-format +msgid "message %s" +msgstr "消息 %s" + +#: nova/auth/manager.py:297 +#, python-format +msgid "Looking up user: %r" msgstr "" -#: ../bin/nova-manage.py:1254 -msgid "typeName" +#: nova/auth/manager.py:301 +#, python-format +msgid "Failed authorization for access key %s" msgstr "" -#: ../bin/nova-manage.py:1274 -msgid " === Instances ===" +#: nova/auth/manager.py:307 +#, python-format +msgid "Using project name = user name (%s)" msgstr "" -#: ../bin/nova-manage.py:1278 -msgid "disp_name" +#: nova/auth/manager.py:314 +#, python-format +msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)" msgstr "" -#: ../bin/nova-manage.py:1281 -msgid "floating_IP" +#: nova/auth/manager.py:323 +#, python-format +msgid "" +"Failed authorization: user %(uname)s not admin and not member of project " +"%(pjname)s" msgstr "" -#: ../bin/nova-manage.py:1282 -msgid "fixed_IP" +#: nova/auth/manager.py:330 nova/auth/manager.py:342 +#, python-format +msgid "user.secret: %s" msgstr "" -#: ../bin/nova-manage.py:1370 +#: nova/auth/manager.py:331 nova/auth/manager.py:343 #, python-format -msgid "Failed to retrieve project id: %(exc)s" +msgid "expected_signature: %s" msgstr "" -#: ../bin/nova-manage.py:1378 +#: nova/auth/manager.py:332 nova/auth/manager.py:344 #, python-format -msgid "Failed to retrieve user info: %(exc)s" +msgid "signature: %s" msgstr "" -#: ../bin/nova-manage.py:1396 +#: nova/auth/manager.py:334 nova/auth/manager.py:356 #, python-format -msgid "Invalid string format %s" +msgid "Invalid signature for user %s" msgstr "" -#: ../bin/nova-manage.py:1401 +#: nova/auth/manager.py:352 #, python-format -msgid "" -"Invalid string format for element %s. Expecting keys 'drive_name' & " -"'num_drives'" +msgid "host_only_signature: %s" msgstr "" -#: ../bin/nova-manage.py:1419 -msgid "" -"Shared parameter should be set either to \" \"--shared or --" -"full_drives" +#: nova/auth/manager.py:448 +msgid "Must specify project" msgstr "" -#: ../bin/nova-manage.py:1513 -msgid "size_gb" +#: nova/auth/manager.py:489 +#, python-format +msgid "Adding role %(role)s to user %(uid)s in project %(pid)s" msgstr "" -#: ../bin/nova-manage.py:1514 -msgid "rpm" +#: nova/auth/manager.py:492 +#, python-format +msgid "Adding sitewide role %(role)s to user %(uid)s" msgstr "" -#: ../bin/nova-manage.py:1515 -msgid "capabilities" +#: nova/auth/manager.py:518 +#, python-format +msgid "Removing role %(role)s from user %(uid)s on project %(pid)s" msgstr "" -#: ../bin/nova-manage.py:1516 -msgid "visible" +#: nova/auth/manager.py:521 +#, python-format +msgid "Removing sitewide role %(role)s from user %(uid)s" msgstr "" -#: ../bin/nova-manage.py:1644 -msgid "visible parameter should be set to show or hide" +#: nova/auth/manager.py:594 +#, python-format +msgid "Created project %(name)s with manager %(manager_user)s" msgstr "" -#: ../bin/nova-manage.py:1820 +#: nova/auth/manager.py:612 #, python-format -msgid "Image registered to %(new)s (%(path)s)." +msgid "modifying project %s" msgstr "" -#: ../bin/nova-manage.py:1823 +#: nova/auth/manager.py:624 #, python-format -msgid "Failed to register %(path)s: %(exc)s" +msgid "Adding user %(uid)s to project %(pid)s" msgstr "" -#: ../bin/nova-manage.py:1935 -msgid "Image %(old)s converted to %(new)s (%(new)08x)." +#: nova/auth/manager.py:645 +#, python-format +msgid "Remove user %(uid)s from project %(pid)s" msgstr "" -#: ../bin/nova-manage.py:1938 +#: nova/auth/manager.py:675 #, python-format -msgid "Failed to convert %(old)s: %(exc)s" -msgstr "" +msgid "Deleting project %s" +msgstr "删除项目 %s" -#: ../bin/nova-manage.py:1957 +#: nova/auth/manager.py:733 #, python-format -msgid "Failed to load %(fn)s." +msgid "Created user %(rvname)s (admin: %(rvadmin)r)" msgstr "" -#: ../bin/nova-manage.py:1979 -msgid "Label" -msgstr "" +#: nova/auth/manager.py:742 +#, python-format +msgid "Deleting user %s" +msgstr "删除用户 %s" -#: ../bin/nova-manage.py:1980 -msgid "Description" +#: nova/auth/manager.py:752 +#, python-format +msgid "Access Key change for user %s" msgstr "" -#: ../bin/nova-manage.py:2022 -msgid "Flavor id" +#: nova/auth/manager.py:754 +#, python-format +msgid "Secret Key change for user %s" msgstr "" -#: ../bin/nova-manage.py:2023 -msgid "SR UUID" +#: nova/auth/manager.py:756 +#, python-format +msgid "Admin status set to %(admin)r for user %(uid)s" msgstr "" -#: ../bin/nova-manage.py:2024 -msgid "SR Type" -msgstr "" +#: nova/auth/manager.py:801 +#, python-format +msgid "No vpn data for project %s" +msgstr "没有 %s 项目的vpn数据" -#: ../bin/nova-manage.py:2025 -msgid "Config Parameters" +#: nova/rpc/impl_qpid.py:335 +#, python-format +msgid "Unable to connect to AMQP server: %s " msgstr "" -#: ../bin/nova-manage.py:2281 +#: nova/rpc/impl_qpid.py:340 #, python-format -msgid "" -"\n" -"OpenStack Nova version: %s (%s)\n" +msgid "Connected to AMQP server on %s" msgstr "" -#: ../bin/nova-manage.py:2284 -msgid "Available categories:" +#: nova/rpc/impl_qpid.py:348 +msgid "Re-established AMQP queues" msgstr "" -#: ../bin/nova-manage.py:2300 +#: nova/api/openstack/compute/servers.py:425 #, python-format -msgid "Available actions for %s category:" +msgid "Invalid server status: %(status)s" msgstr "" -#: ../bin/nova-manage.py:2328 -msgid "Possible wrong number of arguments supplied" +#: nova/api/openstack/compute/servers.py:433 +msgid "Invalid changes-since value" msgstr "" -#: ../bin/nova-manage.py:2333 -msgid "Command failed, please check log for more info" +#: nova/api/openstack/compute/servers.py:483 +msgid "Personality file limit exceeded" msgstr "" -#: ../nova/tests/integrated/test_login.py:31 -#, python-format -msgid "flavor: %s" +#: nova/api/openstack/compute/servers.py:485 +msgid "Personality file path too long" msgstr "" -#: ../nova/api/openstack/v2/__init__.py:63 -#, python-format -msgid "Caught error: %s" +#: nova/api/openstack/compute/servers.py:487 +msgid "Personality file content too long" msgstr "" -#: ../nova/api/openstack/v2/__init__.py:113 -msgid "Including admin operations in API." +#: nova/api/openstack/compute/servers.py:500 +msgid "Server name is not a string or unicode" msgstr "" -#: ../nova/network/quantum/manager.py:127 -msgid "QuantumManager requires that only one network is created per call" +#: nova/api/openstack/compute/servers.py:504 +msgid "Server name is an empty string" msgstr "" -#: ../nova/network/quantum/manager.py:135 +#: nova/api/openstack/compute/servers.py:522 #, python-format -msgid "" -"Unable to find existing quantum network for tenant '%(q_tenant_id)s' with " -"net-id '%(quantum_net_id)s'" +msgid "Bad personality format: missing %s" msgstr "" -#: ../nova/network/quantum/manager.py:176 -#, python-format -msgid "Network %s in use, cannot delete" +#: nova/api/openstack/compute/servers.py:525 +msgid "Bad personality format" msgstr "" -#. TODO(bgh): We need to figure out a way to tell if we -#. should actually be raising this exception or not. -#. In the case that a VM spawn failed it may not have -#. attached the vif and raising the exception here -#. prevents deletion of the VM. In that case we should -#. probably just log, continue, and move on. -#: ../nova/network/quantum/manager.py:414 +#: nova/api/openstack/compute/servers.py:530 #, python-format -msgid "No network for for virtual interface %s" +msgid "Personality content for %s cannot be decoded" msgstr "" -#: ../nova/network/quantum/manager.py:518 +#: nova/api/openstack/compute/servers.py:545 #, python-format -msgid "Attempted to deallocate non-existent instance: %s" +msgid "Bad networks format: network uuid is not in proper format (%s)" msgstr "" -#: ../nova/api/openstack/v2/contrib/hosts.py:82 +#: nova/api/openstack/compute/servers.py:554 #, python-format -msgid "Invalid status: '%s'" +msgid "Invalid fixed IP address (%s)" msgstr "" -#: ../nova/api/openstack/v2/contrib/hosts.py:85 +#: nova/api/openstack/compute/servers.py:561 #, python-format -msgid "Invalid update setting: '%s'" +msgid "Duplicate networks (%s) are not allowed" msgstr "" -#: ../nova/api/openstack/v2/contrib/hosts.py:92 +#: nova/api/openstack/compute/servers.py:567 #, python-format -msgid "Setting host %(host)s to %(state)s." +msgid "Bad network format: missing %s" msgstr "" -#: ../nova/wsgi.py:94 -#, python-format -msgid "Started %(name)s on %(host)s:%(port)s" +#: nova/api/openstack/compute/servers.py:570 +msgid "Bad networks format" msgstr "" -#: ../nova/wsgi.py:105 -msgid "Stopping WSGI server." +#: nova/api/openstack/compute/servers.py:582 +msgid "Userdata content cannot be decoded" msgstr "" -#: ../nova/wsgi.py:108 -msgid "Stopping raw TCP server." +#: nova/api/openstack/compute/servers.py:589 +#: nova/api/openstack/compute/servers.py:596 +msgid "accessIPv4 is not proper IPv4 format" msgstr "" -#: ../nova/wsgi.py:114 -#, python-format -msgid "Starting TCP server %(arg0)s on %(host)s:%(port)s" +#: nova/api/openstack/compute/servers.py:628 +msgid "Server name is not defined" msgstr "" -#: ../nova/wsgi.py:130 -msgid "WSGI server has stopped." +#: nova/api/openstack/compute/servers.py:642 +msgid "Invalid imageRef provided." msgstr "" -#: ../nova/wsgi.py:208 -msgid "You must implement __call__" -msgstr "" +#: nova/api/openstack/compute/servers.py:677 +#: nova/api/openstack/compute/servers.py:742 +msgid "Invalid flavorRef provided." +msgstr "提供了无效的flavorRef。" -#: ../bin/nova-dhcpbridge.py:58 -msgid "leasing ip" -msgstr "" +#: nova/api/openstack/compute/servers.py:739 +msgid "Can not find requested image" +msgstr "无法找到请求的镜像" -#: ../bin/nova-dhcpbridge.py:71 -msgid "Adopted old lease or got a change of mac" -msgstr "" +#: nova/api/openstack/compute/servers.py:745 +msgid "Invalid key_name provided." +msgstr "提供了无效的key_name。" -#: ../bin/nova-dhcpbridge.py:78 -msgid "releasing ip" +#: nova/api/openstack/compute/servers.py:832 +#: nova/api/openstack/compute/servers.py:852 +msgid "Instance has not been resized." msgstr "" -#: ../bin/nova-dhcpbridge.py:117 +#: nova/api/openstack/compute/servers.py:838 #, python-format -msgid "Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'" -msgstr "" - -#: ../bin/nova-dhcpbridge.py:127 -msgid "Environment variable 'NETWORK_ID' must be set." -msgstr "" +msgid "Error in confirm-resize %s" +msgstr "confirm-resize中的错误 %s" -#: ../nova/rpc/impl_carrot.py:196 +#: nova/api/openstack/compute/servers.py:858 #, python-format -msgid "" -"AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying again " -"in %(fl_intv)d seconds." -msgstr "" +msgid "Error in revert-resize %s" +msgstr "revert-resize中的错误 %s" -#: ../nova/rpc/impl_carrot.py:200 -#, python-format -msgid "" -"Unable to connect to AMQP server after %(tries)d tries. Shutting down." -msgstr "" +#: nova/api/openstack/compute/servers.py:871 +msgid "Argument 'type' for reboot is not HARD or SOFT" +msgstr "重启的参数'type'既不是HARD也不是SOFT" -#: ../nova/rpc/impl_carrot.py:220 -msgid "Reconnected to queue" -msgstr "重新与队列建立连接" +#: nova/api/openstack/compute/servers.py:875 +msgid "Missing argument 'type' for reboot" +msgstr "缺少重启的参数'type'" -#: ../nova/rpc/impl_carrot.py:227 +#: nova/api/openstack/compute/servers.py:888 #, python-format -msgid "Failed to fetch message from queue: %s" -msgstr "" +msgid "Error in reboot %s" +msgstr "重启中错误 %s" -#: ../nova/rpc/impl_carrot.py:235 -#, python-format -msgid "Initing the Adapter Consumer for %s" -msgstr "" +#: nova/api/openstack/compute/servers.py:900 +msgid "Unable to locate requested flavor." +msgstr "无法找到请求的风格。" -#: ../nova/rpc/impl_carrot.py:330 -#, python-format -msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key" -msgstr "" +#: nova/api/openstack/compute/servers.py:903 +msgid "Resize requires a change in size." +msgstr "调整大小需要尺寸的改变。" -#: ../nova/rpc/impl_carrot.py:375 -msgid "Exception while processing consumer" -msgstr "" +#: nova/api/openstack/compute/servers.py:927 +msgid "Malformed server entity" +msgstr "非正常的服务器实体" -#: ../nova/rpc/impl_carrot.py:411 -#, python-format -msgid "Creating \"%(exchange)s\" fanout exchange" -msgstr "" +#: nova/api/openstack/compute/servers.py:934 +msgid "Missing imageRef attribute" +msgstr "缺少属性imageRef" -#: ../nova/rpc/impl_carrot.py:621 -#, python-format -msgid "response %s" -msgstr "回复 %s" +#: nova/api/openstack/compute/servers.py:941 +msgid "Missing flavorRef attribute" +msgstr "缺少属性flavorRef" -#: ../nova/rpc/impl_carrot.py:630 -#, python-format -msgid "topic is %s" -msgstr "话题是 %s" +#: nova/api/openstack/compute/servers.py:954 +msgid "No adminPass was specified" +msgstr "没有确定adminPass" + +#: nova/api/openstack/compute/servers.py:958 +#: nova/api/openstack/compute/servers.py:1134 +msgid "Invalid adminPass" +msgstr "无效的adminPass" + +#: nova/api/openstack/compute/servers.py:972 +msgid "Unable to parse metadata key/value pairs." +msgstr "无法解析元数据键/值对" + +#: nova/api/openstack/compute/servers.py:985 +msgid "Resize request has invalid 'flavorRef' attribute." +msgstr "调整大小请求中的属性'flavorRef'无效。" + +#: nova/api/openstack/compute/servers.py:988 +msgid "Resize requests require 'flavorRef' attribute." +msgstr "调整大小请求要求有属性'flavorRef'。" + +#: nova/api/openstack/compute/servers.py:1011 +msgid "Could not parse imageRef from request." +msgstr "无法解析请求中的imageRef。" + +#: nova/api/openstack/compute/servers.py:1061 +msgid "Instance could not be found" +msgstr "无法找到实例" -#: ../nova/rpc/impl_carrot.py:631 +#: nova/api/openstack/compute/servers.py:1064 +msgid "Cannot find image for rebuild" +msgstr "无法找到用来重新创建的镜像" + +#: nova/api/openstack/compute/servers.py:1093 +msgid "createImage entity requires name attribute" +msgstr "实体createImage需要属性name" + +#: nova/api/openstack/compute/servers.py:1157 #, python-format -msgid "message %s" -msgstr "消息 %s" +msgid "Removing options '%(unk_opt_str)s' from query" +msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'" -#: ../nova/testing/fake/rabbit.py:50 +#: nova/testing/fake/rabbit.py:50 #, python-format msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s" msgstr "" -#: ../nova/testing/fake/rabbit.py:54 +#: nova/testing/fake/rabbit.py:54 #, python-format msgid "Publishing to route %s" msgstr "发布并路由到 %s" -#: ../nova/testing/fake/rabbit.py:84 +#: nova/testing/fake/rabbit.py:84 #, python-format msgid "Declaring queue %s" msgstr "正在声明队列 %s" -#: ../nova/testing/fake/rabbit.py:90 +#: nova/testing/fake/rabbit.py:90 #, python-format msgid "Declaring exchange %s" msgstr "正在声明交换(exchange) %s" -#: ../nova/testing/fake/rabbit.py:96 +#: nova/testing/fake/rabbit.py:96 #, python-format msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s" msgstr "" -#: ../nova/testing/fake/rabbit.py:133 +#: nova/testing/fake/rabbit.py:133 #, python-format msgid "Getting from %(queue)s: %(message)s" msgstr "" -#: ../nova/tests/test_vsa.py:62 +#: nova/tests/test_vsa.py:57 msgid "Test: Emulate wrong VSA name. Raise" msgstr "" -#: ../nova/tests/test_vsa.py:104 +#: nova/tests/test_vsa.py:99 msgid "Test: Emulate DB error. Raise" msgstr "" -#: ../nova/tests/test_vsa.py:172 +#: nova/tests/test_vsa.py:167 #, python-format msgid "Test: user_data = %s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:37 -msgid "" -"select min(rxtx_cap) as min_rxtx from instance_types where rxtx_cap > 0" -msgstr "" - -#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:41 +#: nova/virt/baremetal/nodes.py:42 #, python-format -msgid "" -"update instance_types set rxtx_factor = rxtx_cap/%s where rxtx_cap > 0" -msgstr "" - -#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:58 -msgid "select min(rxtx_base) from networks where rxtx_base > 0" +msgid "Unknown baremetal driver %(d)s" msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/059_split_rxtx_quota_into_network.py:62 -#, python-format -msgid "update instance_types set rxtx_cap = rxtx_factor * %s" -msgstr "" +#: nova/api/openstack/compute/contrib/extended_status.py:61 +msgid "Server not found." +msgstr "没有找到服务器。" -#: ../nova/exception.py:54 +#: nova/exception.py:56 msgid "Unexpected error while running command." -msgstr "运行命令时出现错误" +msgstr "运行命令时出现意外错误" -#: ../nova/exception.py:57 +#: nova/exception.py:59 #, python-format msgid "" "%(description)s\n" @@ -4874,1210 +5238,1414 @@ "Stderr: %(stderr)r" msgstr "" "%(description)s\n" -"命令: %(cmd)s\n" -"退出代码: %(exit_code)s\n" -"标准输出: %(stdout)r\n" -"标准出错: %(stderr)r" +"命令:%(cmd)s\n" +"退出代码:%(exit_code)s\n" +"标准输出:%(stdout)r\n" +"标准错误:%(stderr)r" -#: ../nova/exception.py:95 +#: nova/exception.py:92 msgid "DB exception wrapped." -msgstr "" +msgstr "数据库异常被包裹。" -#: ../nova/exception.py:156 +#: nova/exception.py:153 msgid "An unknown exception occurred." -msgstr "" +msgstr "发生未知异常。" + +#: nova/exception.py:176 +msgid "Failed to decrypt text" +msgstr "解密文本失败" -#: ../nova/exception.py:172 +#: nova/exception.py:180 msgid "Failed to paginate through images from image service" msgstr "" -#: ../nova/exception.py:176 +#: nova/exception.py:184 msgid "Virtual Interface creation failed" -msgstr "" +msgstr "虚拟接口创建失败" -#: ../nova/exception.py:180 +#: nova/exception.py:188 msgid "5 attempts to create virtual interfacewith unique mac address failed" -msgstr "" +msgstr "用唯一mac地址5次尝试创建虚拟接口失败" -#: ../nova/exception.py:185 +#: nova/exception.py:193 +msgid "Connection to glance failed" +msgstr "连接到glance失败" + +#: nova/exception.py:197 +msgid "Connection to melange failed" +msgstr "连接到melange失败" + +#: nova/exception.py:201 msgid "Not authorized." -msgstr "" +msgstr "未授权。" -#: ../nova/exception.py:192 +#: nova/exception.py:206 msgid "User does not have admin privileges" -msgstr "" +msgstr "用户没有管理员权限" -#: ../nova/exception.py:196 +#: nova/exception.py:210 #, python-format -msgid "Instance %(instance_id)s is busy. (%(task_state)s)" -msgstr "" +msgid "Policy doesn't allow %(action)s to be performed." +msgstr "政策不允许 %(action)s 被执行。" -#: ../nova/exception.py:200 -#, python-format -msgid "Instance %(instance_uuid)s is currently snapshotting." -msgstr "" +#: nova/exception.py:214 +msgid "Unacceptable parameters." +msgstr "不能接受的参数。" -#: ../nova/exception.py:204 +#: nova/exception.py:219 +msgid "Invalid snapshot" +msgstr "无效的快照" + +#: nova/exception.py:223 #, python-format -msgid "Instance %(instance_uuid)s is currently being backed up." -msgstr "" +msgid "Volume %(volume_id)s is not attached to anything" +msgstr "卷 %(volume_id)s 没有与任何东西关联" -#: ../nova/exception.py:208 -msgid "Unacceptable parameters." -msgstr "" +#: nova/exception.py:227 nova/api/openstack/compute/contrib/keypairs.py:103 +msgid "Keypair data is invalid" +msgstr "Keypair数据无效" -#: ../nova/exception.py:212 +#: nova/exception.py:231 +msgid "Failed to load data into json format" +msgstr "把数据加载为json格式失败" + +#: nova/exception.py:235 msgid "The request is invalid." -msgstr "" +msgstr "请求无效。" -#: ../nova/exception.py:216 +#: nova/exception.py:239 #, python-format msgid "Invalid signature %(signature)s for user %(user)s." -msgstr "" +msgstr "针对用户 %(user)s 的无效签名 %(signature)s" -#: ../nova/exception.py:220 +#: nova/exception.py:243 msgid "Invalid input received" -msgstr "" +msgstr "收到无效的输入" -#: ../nova/exception.py:224 +#: nova/exception.py:247 #, python-format msgid "Invalid instance type %(instance_type)s." -msgstr "" +msgstr "无效的实例类型 %(instance_type)s。" -#: ../nova/exception.py:228 -#, python-format -msgid "Invalid volume type %(volume_type)s." -msgstr "" +#: nova/exception.py:251 +msgid "Invalid volume type" +msgstr "无效的卷类型" + +#: nova/exception.py:255 +msgid "Invalid volume" +msgstr "无效的卷" -#: ../nova/exception.py:232 +#: nova/exception.py:259 #, python-format msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s" -msgstr "" +msgstr "无效的端口范围 %(from_port)s:%(to_port)s. %(msg)s" -#: ../nova/exception.py:236 +#: nova/exception.py:263 #, python-format msgid "Invalid IP protocol %(protocol)s." -msgstr "" +msgstr "无效的IP协议 %(protocol)s。" -#: ../nova/exception.py:240 +#: nova/exception.py:267 #, python-format msgid "Invalid content type %(content_type)s." -msgstr "" +msgstr "无效的内容类型 %(content_type)s。" -#: ../nova/exception.py:244 +#: nova/exception.py:271 #, python-format msgid "Invalid cidr %(cidr)s." -msgstr "" +msgstr "无效的cidr %(cidr)s。" -#: ../nova/exception.py:250 +#: nova/exception.py:275 +msgid "Invalid reuse of an RPC connection." +msgstr "无效的RPC连接重用。" + +#: nova/exception.py:281 #, python-format msgid "%(err)s" +msgstr "%(err)s" + +#: nova/exception.py:285 +#, python-format +msgid "" +"Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason: " +"%(reason)s." msgstr "" +"无法在aggregate %(aggregate_id)s 上执行啊action '%(action)s'。原因: %(reason)s。" -#: ../nova/exception.py:254 +#: nova/exception.py:290 #, python-format msgid "" "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while " "the instance is in this state." -msgstr "" +msgstr "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能 %(method)s。" -#: ../nova/exception.py:259 +#: nova/exception.py:295 #, python-format msgid "Instance %(instance_id)s is not running." -msgstr "" +msgstr "实例 %(instance_id)s 没有运行。" -#: ../nova/exception.py:263 +#: nova/exception.py:299 #, python-format msgid "Instance %(instance_id)s is not suspended." -msgstr "" +msgstr "实例 %(instance_id)s 没有挂起。" -#: ../nova/exception.py:267 +#: nova/exception.py:303 #, python-format msgid "Instance %(instance_id)s is not in rescue mode" -msgstr "" +msgstr "实例 %(instance_id)s 不在rescue模式。" -#: ../nova/exception.py:271 +#: nova/exception.py:307 msgid "Failed to suspend instance" -msgstr "" +msgstr "挂起实例失败" -#: ../nova/exception.py:275 +#: nova/exception.py:311 msgid "Failed to resume server" -msgstr "" +msgstr "再启动服务器失败" -#: ../nova/exception.py:279 +#: nova/exception.py:315 msgid "Failed to reboot instance" -msgstr "" +msgstr "重新启动实例失败" -#: ../nova/exception.py:283 +#: nova/exception.py:319 msgid "Service is unavailable at this time." -msgstr "" +msgstr "该时刻服务无法使用。" -#: ../nova/exception.py:287 +#: nova/exception.py:323 msgid "Volume service is unavailable at this time." -msgstr "" +msgstr "该时刻卷服务无法使用。" -#: ../nova/exception.py:291 +#: nova/exception.py:327 msgid "Compute service is unavailable at this time." -msgstr "" +msgstr "该时刻计算服务无法使用。" -#: ../nova/exception.py:295 +#: nova/exception.py:331 #, python-format msgid "" "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)." -msgstr "" +msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。" + +#: nova/exception.py:336 +msgid "Destination compute host is unavailable at this time." +msgstr "该时刻目标计算主机无法使用。" -#: ../nova/exception.py:300 +#: nova/exception.py:340 msgid "Original compute host is unavailable at this time." -msgstr "" +msgstr "该时刻原始计算主机无法使用。" -#: ../nova/exception.py:304 +#: nova/exception.py:344 msgid "The supplied hypervisor type of is invalid." -msgstr "" +msgstr "提供的hypervisor类型无效。" -#: ../nova/exception.py:308 +#: nova/exception.py:348 msgid "" "The instance requires a newer hypervisor version than has been provided." -msgstr "" +msgstr "该实例需要比当前更新版本的hypervisor。" -#: ../nova/exception.py:313 +#: nova/exception.py:353 #, python-format msgid "" "The supplied disk path (%(path)s) already exists, it is expected not to " "exist." -msgstr "" +msgstr "提供的磁盘路径 (%(path)s) 已经存在,预计是不存在的。" -#: ../nova/exception.py:318 +#: nova/exception.py:358 #, python-format msgid "The supplied device path (%(path)s) is invalid." -msgstr "" +msgstr "提供的设备路径 (%(path)s) 是无效的。" -#: ../nova/exception.py:322 +#: nova/exception.py:362 msgid "Unacceptable CPU info" -msgstr "" +msgstr "无法接受的CPU信息" -#: ../nova/exception.py:326 +#: nova/exception.py:366 #, python-format msgid "%(address)s is not a valid IP v4/6 address." -msgstr "" +msgstr "%(address)s 不是有效的IP v4/6地址。" -#: ../nova/exception.py:330 +#: nova/exception.py:370 #, 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 "" +msgstr "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s,但与端口组关联的是 %(pgroup)s。" -#: ../nova/exception.py:336 +#: nova/exception.py:376 #, python-format msgid "" "vSwitch which contains the port group %(bridge)s is not associated with the " "desired physical adapter. Expected vSwitch is %(expected)s, but the one " "associated is %(actual)s." msgstr "" +"包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s,但关联的是 " +"%(actual)s。" -#: ../nova/exception.py:343 +#: nova/exception.py:383 #, python-format msgid "Disk format %(disk_format)s is not acceptable" -msgstr "" +msgstr "磁盘格式 %(disk_format)s 不能接受" -#: ../nova/exception.py:347 +#: ../nova/exception.py:378 #, python-format msgid "Image %(image_id)s is unacceptable" msgstr "" -#: ../nova/exception.py:351 +#: ../nova/exception.py:382 #, python-format msgid "Instance %(instance_id)s is unacceptable" msgstr "" -#: ../nova/exception.py:355 +#: nova/exception.py:395 #, python-format msgid "Ec2 id %(ec2_id)s is unacceptable." -msgstr "" +msgstr "Ec2 id %(ec2_id)s 无法接受。" -#: ../nova/exception.py:359 +#: nova/exception.py:399 msgid "Resource could not be found." -msgstr "" +msgstr "资源没有找到。" -#: ../nova/exception.py:366 +#: nova/exception.py:404 #, python-format msgid "Required flag %(flag)s not set." -msgstr "" +msgstr "要求的flag %(flag)s 没有设置。" -#: ../nova/exception.py:370 +#: nova/exception.py:408 #, python-format msgid "Instance %(instance_id)s could not be found." -msgstr "" +msgstr "实例 %(instance_id)s 没有找到。" -#: ../nova/exception.py:374 +#: nova/exception.py:412 #, python-format msgid "Volume %(volume_id)s could not be found." -msgstr "" +msgstr "卷 %(volume_id)s 没有找到。" -#: ../nova/exception.py:378 +#: nova/exception.py:416 +#, python-format +msgid "Unable to locate account %(account_name) on Solidfire device" +msgstr "Unable to locate account %(account_name) on Solidfire device" + +#: nova/exception.py:420 #, python-format msgid "Volume not found for instance %(instance_id)s." -msgstr "" +msgstr "没有为实例 %(instance_id)s 找到卷。" -#: ../nova/exception.py:382 +#: nova/exception.py:424 #, python-format msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s." -msgstr "" +msgstr "卷 %(volume_id)s 针对键 %(metadata_key)s 没有元数据。" -#: ../nova/exception.py:387 +#: nova/exception.py:429 msgid "Zero volume types found." -msgstr "" +msgstr "没有找到卷类型。" -#: ../nova/exception.py:391 +#: nova/exception.py:433 #, python-format msgid "Volume type %(volume_type_id)s could not be found." -msgstr "" +msgstr "卷类型 %(volume_type_id)s 没有找到。" -#: ../nova/exception.py:395 +#: nova/exception.py:437 #, python-format msgid "Volume type with name %(volume_type_name)s could not be found." -msgstr "" +msgstr "名为 %(volume_type_name)s 的卷类型没有找到。" -#: ../nova/exception.py:400 +#: nova/exception.py:442 #, python-format msgid "" "Volume Type %(volume_type_id)s has no extra specs with key " "%(extra_specs_key)s." msgstr "" -#: ../nova/exception.py:405 +#: nova/exception.py:447 #, python-format msgid "Snapshot %(snapshot_id)s could not be found." -msgstr "" +msgstr "快照 %(snapshot_id)s 没有找到。" -#: ../nova/exception.py:409 +#: nova/exception.py:451 #, python-format msgid "deleting volume %(volume_name)s that has snapshot" -msgstr "" +msgstr "正在删除有快照的卷 %(volume_name)s" -#: ../nova/exception.py:413 +#: nova/exception.py:455 #, python-format msgid "No target id found for volume %(volume_id)s." -msgstr "" +msgstr "没有为卷 %(volume_id)s 找到目标id。" -#: ../nova/exception.py:417 +#: nova/exception.py:459 #, python-format msgid "No disk at %(location)s" -msgstr "" +msgstr "在 %(location)s 没有磁盘" -#: ../nova/exception.py:421 +#: nova/exception.py:463 #, python-format msgid "Could not find a handler for %(driver_type)s volume." -msgstr "" +msgstr "无法为 %(driver_type)s 卷找到handler。" -#: ../nova/exception.py:425 +#: nova/exception.py:467 #, python-format msgid "Invalid image href %(image_href)s." -msgstr "" +msgstr "无效的镜像href %(image_href)s。" -#: ../nova/exception.py:429 +#: ../nova/exception.py:461 msgid "Some images have been stored via hrefs." msgstr "" -#: ../nova/exception.py:434 +#: nova/exception.py:476 #, python-format msgid "Image %(image_id)s could not be found." -msgstr "" +msgstr "镜像 %(image_id)s 没有找到。" -#: ../nova/exception.py:438 +#: nova/exception.py:480 #, python-format msgid "Kernel not found for image %(image_id)s." -msgstr "" +msgstr "没有为镜像 %(image_id)s 找到内核。" -#: ../nova/exception.py:442 +#: nova/exception.py:484 #, python-format msgid "User %(user_id)s could not be found." -msgstr "" +msgstr "用户 %(user_id)s 没有找到。" -#: ../nova/exception.py:446 +#: nova/exception.py:488 #, python-format msgid "Project %(project_id)s could not be found." -msgstr "" +msgstr "项目 %(project_id)s 没有找到。" -#: ../nova/exception.py:450 +#: nova/exception.py:492 #, python-format msgid "User %(user_id)s is not a member of project %(project_id)s." -msgstr "" +msgstr "用户 %(user_id)s 不是项目 %(project_id)s 的成员。" -#: ../nova/exception.py:454 +#: nova/exception.py:496 #, python-format msgid "Role %(role_id)s could not be found." -msgstr "" +msgstr "角色 %(role_id)s 没有找到。" -#: ../nova/exception.py:458 +#: nova/exception.py:500 msgid "Cannot find SR to read/write VDI." -msgstr "" +msgstr "没有找到SR来读写VDI。" -#: ../nova/exception.py:462 +#: nova/exception.py:504 #, python-format msgid "%(req)s is required to create a network." -msgstr "" +msgstr "创建网络 %(req)s 是必要的。" -#: ../nova/exception.py:466 +#: nova/exception.py:508 #, python-format msgid "Network %(network_id)s could not be found." -msgstr "" +msgstr "网络 %(network_id)s 没有找到。" -#: ../nova/exception.py:470 +#: nova/exception.py:512 #, python-format msgid "Network could not be found for bridge %(bridge)s" -msgstr "" +msgstr "无法为桥 %(bridge)s 找到网络" -#: ../nova/exception.py:474 +#: nova/exception.py:516 #, python-format msgid "Network could not be found for uuid %(uuid)s" -msgstr "" +msgstr "无法为uuid %(uuid)s 找到网络" -#: ../nova/exception.py:478 +#: nova/exception.py:520 #, python-format msgid "Network could not be found with cidr %(cidr)s." -msgstr "" +msgstr "无法为cidr %(cidr)s 找到网络。" -#: ../nova/exception.py:482 +#: nova/exception.py:524 #, python-format msgid "Network could not be found for instance %(instance_id)s." -msgstr "" +msgstr "无法为实例 %(instance_id)s 找到网络。" -#: ../nova/exception.py:486 +#: nova/exception.py:528 msgid "No networks defined." -msgstr "" +msgstr "没有网络定义。" -#: ../nova/exception.py:490 +#: nova/exception.py:532 #, python-format msgid "" "Either Network uuid %(network_uuid)s is not present or is not assigned to " "the project %(project_id)s." -msgstr "" +msgstr "或者网络uuid %(network_uuid)s不存在,或者它没有分配给项目 %(project_id)s。" -#: ../nova/exception.py:495 +#: nova/exception.py:537 #, python-format msgid "Host is not set to the network (%(network_id)s)." -msgstr "" +msgstr "主机没有设置于网络 (%(network_id)s)。" -#: ../nova/exception.py:499 +#: nova/exception.py:541 msgid "Could not find the datastore reference(s) which the VM uses." -msgstr "" +msgstr "无法找到虚拟机使用的datastore reference(s)。" -#: ../nova/exception.py:503 +#: nova/exception.py:545 #, python-format msgid "No fixed IP associated with id %(id)s." -msgstr "" +msgstr "没有固定IP与id %(id)s 关联。" -#: ../nova/exception.py:507 +#: nova/exception.py:549 #, python-format msgid "Fixed ip not found for address %(address)s." -msgstr "" +msgstr "没有为地址 %(address)s 找到固定IP。" -#: ../nova/exception.py:511 +#: nova/exception.py:553 #, python-format msgid "Instance %(instance_id)s has zero fixed ips." -msgstr "" +msgstr "实例 %(instance_id)s 没有固定ip。" -#: ../nova/exception.py:515 +#: nova/exception.py:557 #, python-format msgid "Network host %(host)s has zero fixed ips in network %(network_id)s." -msgstr "" +msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。" -#: ../nova/exception.py:520 +#: nova/exception.py:562 #, python-format msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'." -msgstr "" +msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。" -#: ../nova/exception.py:524 +#: nova/exception.py:566 #, python-format msgid "Host %(host)s has zero fixed ips." -msgstr "" +msgstr "主机 %(host)s 没有固定IP。" -#: ../nova/exception.py:528 +#: nova/exception.py:570 #, python-format msgid "" "Fixed IP address (%(address)s) does not exist in network (%(network_uuid)s)." -msgstr "" +msgstr "网络 (%(network_uuid)s) 中不存在固定IP地址 (%(address)s)。" -#: ../nova/exception.py:533 +#: nova/exception.py:575 #, python-format msgid "Fixed IP address %(address)s is already in use." -msgstr "" +msgstr "固定IP地址 %(address)s 已在使用。" -#: ../nova/exception.py:537 +#: nova/exception.py:579 #, python-format msgid "Fixed IP address %(address)s is invalid." -msgstr "" +msgstr "固定IP地址 %(address)s 无效。" -#: ../nova/exception.py:541 +#: nova/exception.py:583 msgid "Zero fixed ips available." -msgstr "" +msgstr "没有固定ip可用。" -#: ../nova/exception.py:545 +#: nova/exception.py:587 msgid "Zero fixed ips could be found." -msgstr "" +msgstr "找不到固定IP。" -#: ../nova/exception.py:549 +#: nova/exception.py:591 #, python-format msgid "Floating ip not found for id %(id)s." -msgstr "" +msgstr "找不到适合id %(id)s 的浮动IP。" -#: ../nova/exception.py:553 +#: nova/exception.py:595 +#, python-format +msgid "The DNS entry %(name)s already exists in domain %(domain)s." +msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。" + +#: nova/exception.py:599 #, python-format msgid "Floating ip not found for address %(address)s." -msgstr "" +msgstr "找不到适合地址 %(address)s 的浮动ip。" -#: ../nova/exception.py:557 +#: nova/exception.py:603 #, python-format msgid "Floating ip not found for host %(host)s." -msgstr "" +msgstr "没有为主机 %(host)s 找到浮动IP。" -#: ../nova/exception.py:561 +#: nova/exception.py:607 msgid "Zero floating ips available." -msgstr "" +msgstr "没有浮动IP可用。" -#: ../nova/exception.py:565 +#: nova/exception.py:611 #, python-format msgid "Floating ip %(address)s is associated." -msgstr "" +msgstr "浮动ip %(address)s 已被关联。" -#: ../nova/exception.py:569 +#: nova/exception.py:615 #, python-format msgid "Floating ip %(address)s is not associated." -msgstr "" +msgstr "浮动ip %(address)s 没有被关联。" -#: ../nova/exception.py:573 +#: nova/exception.py:619 msgid "Zero floating ips exist." -msgstr "" +msgstr "没有浮动ip存在。" -#: ../nova/exception.py:577 +#: nova/exception.py:623 +#, python-format +msgid "Interface %(interface)s not found." +msgstr "接口 %(interface)s没有找到。" + +#: nova/exception.py:627 #, python-format msgid "Keypair %(name)s not found for user %(user_id)s" -msgstr "" +msgstr "没有为用户 %(user_id)s 找到Keypair %(name)s。" -#: ../nova/exception.py:581 +#: nova/exception.py:631 #, python-format msgid "Certificate %(certificate_id)s not found." -msgstr "" +msgstr "证书 %(certificate_id)s 没有找到。" -#: ../nova/exception.py:585 +#: nova/exception.py:635 #, python-format msgid "Service %(service_id)s could not be found." -msgstr "" +msgstr "服务 %(service_id)s 没有找到。" -#: ../nova/exception.py:589 +#: nova/exception.py:639 #, python-format msgid "Host %(host)s could not be found." -msgstr "" +msgstr "主机 %(host)s 没有找到。" -#: ../nova/exception.py:593 +#: nova/exception.py:643 #, python-format msgid "Compute host %(host)s could not be found." -msgstr "" +msgstr "计算主机 %(host)s 没有找到。" -#: ../nova/exception.py:597 +#: nova/exception.py:647 #, python-format msgid "Could not find binary %(binary)s on host %(host)s." -msgstr "" +msgstr "没有在主机 %(host)s 找到二进制 %(binary)s。" -#: ../nova/exception.py:601 +#: nova/exception.py:651 #, python-format msgid "Auth token %(token)s could not be found." -msgstr "" +msgstr "验证令牌 %(token)s 没有找到。" -#: ../nova/exception.py:605 +#: nova/exception.py:655 #, python-format msgid "Access Key %(access_key)s could not be found." -msgstr "" +msgstr "Access Key %(access_key)s 没有找到。" -#: ../nova/exception.py:609 +#: nova/exception.py:659 msgid "Quota could not be found" -msgstr "" +msgstr "Quota 没有找到。" -#: ../nova/exception.py:613 +#: nova/exception.py:663 #, python-format msgid "Quota for project %(project_id)s could not be found." -msgstr "" +msgstr "没有为项目 %(project_id)s 找到Quota。" -#: ../nova/exception.py:617 +#: nova/exception.py:667 #, python-format msgid "Security group %(security_group_id)s not found." -msgstr "" +msgstr "安全组 %(security_group_id)s 没有找到。" -#: ../nova/exception.py:621 +#: nova/exception.py:671 #, python-format msgid "" "Security group %(security_group_id)s not found for project %(project_id)s." -msgstr "" +msgstr "没有为项目 %(project_id)s 找到 安全组 %(security_group_id)s。" -#: ../nova/exception.py:626 +#: nova/exception.py:676 #, python-format msgid "Security group with rule %(rule_id)s not found." -msgstr "" +msgstr "带有规则 %(rule_id)s 的安全组没有找到。" -#: ../nova/exception.py:630 +#: nova/exception.py:680 #, python-format msgid "" "Security group %(security_group_id)s is already associated with the instance " "%(instance_id)s" -msgstr "" +msgstr "安全组 %(security_group_id)s 已经与实例 %(instance_id)s 关联。" -#: ../nova/exception.py:635 +#: nova/exception.py:685 #, python-format msgid "" "Security group %(security_group_id)s is not associated with the instance " "%(instance_id)s" -msgstr "" +msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关联。" -#: ../nova/exception.py:640 +#: nova/exception.py:690 #, python-format msgid "Migration %(migration_id)s could not be found." -msgstr "" +msgstr "迁移 %(migration_id)s 没有找到。" -#: ../nova/exception.py:644 +#: nova/exception.py:694 #, python-format msgid "" "Migration not found for instance %(instance_id)s with status %(status)s." -msgstr "" +msgstr "没有为状态是 %(status)s 的实例 %(instance_id)s 找到迁移。" -#: ../nova/exception.py:649 +#: nova/exception.py:699 #, python-format msgid "Console pool %(pool_id)s could not be found." -msgstr "" +msgstr "Console pool %(pool_id)s 没有找到。" -#: ../nova/exception.py:653 +#: nova/exception.py:703 #, python-format msgid "" "Console pool of type %(console_type)s for compute host %(compute_host)s on " "proxy host %(host)s not found." msgstr "" +"没有为计算主机 %(compute_host)s 在代理主机 %(host)s 上找到类型是 %(console_type)s 的Console " +"pool。" -#: ../nova/exception.py:659 +#: nova/exception.py:709 #, python-format msgid "Console %(console_id)s could not be found." -msgstr "" +msgstr "Console %(console_id)s 没有找到。" -#: ../nova/exception.py:663 +#: nova/exception.py:713 #, python-format msgid "Console for instance %(instance_id)s could not be found." -msgstr "" +msgstr "没有为实例 %(instance_id)s 找到Console。" -#: ../nova/exception.py:667 +#: nova/exception.py:717 #, python-format msgid "" "Console for instance %(instance_id)s in pool %(pool_id)s could not be found." -msgstr "" +msgstr "没有为池 %(pool_id)s 中的实例 %(instance_id)s 找到console." + +#: nova/exception.py:722 +#, python-format +msgid "Invalid console type %(console_type)s " +msgstr "无效的console类型 %(console_type)s " -#: ../nova/exception.py:672 +#: nova/exception.py:726 msgid "Zero instance types found." -msgstr "" +msgstr "没有找到实例类型。" -#: ../nova/exception.py:676 +#: nova/exception.py:730 #, python-format msgid "Instance type %(instance_type_id)s could not be found." -msgstr "" +msgstr "实例类型 %(instance_type_id)s 没有找到。" -#: ../nova/exception.py:680 +#: nova/exception.py:734 #, python-format msgid "Instance type with name %(instance_type_name)s could not be found." -msgstr "" +msgstr "名为 %(instance_type_name)s 的实例类型没有找到。" -#: ../nova/exception.py:685 +#: nova/exception.py:739 #, python-format msgid "Flavor %(flavor_id)s could not be found." -msgstr "" +msgstr "风格 %(flavor_id)s没有找到。" -#: ../nova/exception.py:689 +#: nova/exception.py:743 #, python-format msgid "Zone %(zone_id)s could not be found." -msgstr "" +msgstr "区域 %(zone_id)s 没有找到。" -#: ../nova/exception.py:693 +#: nova/exception.py:747 #, python-format msgid "Scheduler Host Filter %(filter_name)s could not be found." -msgstr "" +msgstr "Scheduler Host Filter %(filter_name)s 没有找到。" -#: ../nova/exception.py:697 +#: nova/exception.py:751 #, python-format msgid "Scheduler cost function %(cost_fn_str)s could not be found." -msgstr "" +msgstr "Scheduler cost function %(cost_fn_str)s 没有找到。" -#: ../nova/exception.py:702 +#: nova/exception.py:756 #, python-format msgid "Scheduler weight flag not found: %(flag_name)s" -msgstr "" +msgstr "未找到Scheduler的权重标记:%(flag_name)s" -#: ../nova/exception.py:706 +#: nova/exception.py:760 #, python-format msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s." -msgstr "" +msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。" -#: ../nova/exception.py:711 +#: nova/exception.py:765 #, python-format msgid "" "Instance Type %(instance_type_id)s has no extra specs with key " "%(extra_specs_key)s." -msgstr "" +msgstr "实例类型 %(instance_type_id)s 没有额外的 键为%(extra_specs_key)s 的规格说明。" -#: ../nova/exception.py:716 +#: nova/exception.py:770 msgid "LDAP object could not be found" -msgstr "" +msgstr "未定义LDAP对象" -#: ../nova/exception.py:720 +#: nova/exception.py:774 #, python-format msgid "LDAP user %(user_id)s could not be found." -msgstr "" +msgstr "没有找到LDAP用户 %(user_id)s。" -#: ../nova/exception.py:724 +#: nova/exception.py:778 #, python-format msgid "LDAP group %(group_id)s could not be found." -msgstr "" +msgstr "没有找到LDAP用户组 %(group_id)s。" -#: ../nova/exception.py:728 +#: nova/exception.py:782 #, python-format msgid "LDAP user %(user_id)s is not a member of group %(group_id)s." -msgstr "" +msgstr "LDAP用户 %(user_id)s 不是 %(group_id)s 的组成员。" -#: ../nova/exception.py:732 +#: nova/exception.py:786 #, python-format msgid "File %(file_path)s could not be found." -msgstr "" +msgstr "找不到文件 %(file_path)s。" -#: ../nova/exception.py:736 +#: nova/exception.py:790 msgid "Zero files could be found." -msgstr "" +msgstr "没找到文件" -#: ../nova/exception.py:740 +#: nova/exception.py:794 #, python-format msgid "" "Virtual switch associated with the network adapter %(adapter)s not found." -msgstr "" +msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。" -#: ../nova/exception.py:745 +#: nova/exception.py:799 #, python-format msgid "Network adapter %(adapter)s could not be found." -msgstr "" +msgstr "未找到网络适配器 %(adapter)s。" -#: ../nova/exception.py:749 +#: nova/exception.py:803 #, python-format msgid "Class %(class_name)s could not be found: %(exception)s" -msgstr "" +msgstr "找不到类 %(class_name)s :异常 %(exception)s" -#: ../nova/exception.py:753 +#: nova/exception.py:807 msgid "Action not allowed." -msgstr "" +msgstr "操作不允许。" -#: ../nova/exception.py:757 +#: nova/exception.py:811 #, python-format msgid "Unable to use global role %(role_id)s" -msgstr "" +msgstr "无法使用全局角色 %(role_id)s" -#: ../nova/exception.py:761 +#: nova/exception.py:815 msgid "Rotation is not allowed for snapshots" -msgstr "" +msgstr "快照不允许循环。" -#: ../nova/exception.py:765 +#: nova/exception.py:819 msgid "Rotation param is required for backup image_type" -msgstr "" +msgstr "备份 image_type 要求循环参数。" -#: ../nova/exception.py:774 +#: nova/exception.py:828 #, python-format msgid "Key pair %(key_name)s already exists." -msgstr "" +msgstr "密钥对 %(key_name)s 已经存在。" -#: ../nova/exception.py:778 +#: nova/exception.py:832 #, python-format msgid "User %(user)s already exists." -msgstr "" +msgstr "用户 %(user)s 已存在。" -#: ../nova/exception.py:782 +#: nova/exception.py:836 #, python-format msgid "LDAP user %(user)s already exists." -msgstr "" +msgstr "LDAP用户 %(user)s 已经存在。" -#: ../nova/exception.py:786 +#: nova/exception.py:840 #, python-format msgid "LDAP group %(group)s already exists." -msgstr "" +msgstr "LDAP用户组 %(group)s 已经存在。" -#: ../nova/exception.py:790 +#: nova/exception.py:844 #, python-format msgid "User %(uid)s is already a member of the group %(group_dn)s" msgstr "用户 %(uid)s 已经是 组 %(group_dn)s 中的成员" -#: ../nova/exception.py:795 +#: nova/exception.py:849 #, python-format msgid "Project %(project)s already exists." -msgstr "" +msgstr "项目 %(project)s 已经存在。" -#: ../nova/exception.py:799 +#: nova/exception.py:853 #, python-format msgid "Instance %(name)s already exists." -msgstr "" +msgstr "实例 %(name)s 已经存在。" + +#: nova/exception.py:857 +#, python-format +msgid "Instance Type %(name)s already exists." +msgstr "实例类型 %(name)s 已经存在。" -#: ../nova/exception.py:803 +#: nova/exception.py:861 +#, python-format +msgid "Volume Type %(name)s already exists." +msgstr "卷类型 %(name)s 已经存在。" + +#: nova/exception.py:865 #, python-format msgid "%(path)s is on shared storage: %(reason)s" msgstr "" -#: ../nova/exception.py:807 +#: nova/exception.py:869 msgid "Migration error" -msgstr "" +msgstr "升级错误。" -#: ../nova/exception.py:811 +#: nova/exception.py:873 #, python-format msgid "Malformed message body: %(reason)s" -msgstr "" +msgstr "格式错误的消息体: %(reason)s" -#: ../nova/exception.py:815 +#: nova/exception.py:877 #, python-format msgid "Could not find config at %(path)s" -msgstr "" +msgstr "在 %(path)s 找不到配置文件。" -#: ../nova/exception.py:819 +#: nova/exception.py:881 #, python-format msgid "Could not load paste app '%(name)s' from %(path)s" -msgstr "" +msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'" -#: ../nova/exception.py:823 +#: nova/exception.py:885 msgid "Nova access parameters were not specified." -msgstr "" +msgstr "未指定Nova访问参数。" -#: ../nova/exception.py:827 +#: nova/exception.py:889 #, python-format msgid "Virtual Storage Array %(id)d could not be found." -msgstr "" +msgstr "无法找到虚拟存储阵列 %(id)d。" -#: ../nova/exception.py:831 +#: nova/exception.py:893 #, python-format msgid "Virtual Storage Array %(name)s could not be found." -msgstr "" +msgstr "无法找到虚拟存储阵列 %(name)s。" -#: ../nova/exception.py:835 +#: nova/exception.py:897 msgid "When resizing, instances must change size!" -msgstr "" +msgstr "调整时实例的大小必须要发生变化。" -#: ../nova/exception.py:839 +#: nova/exception.py:901 msgid "Image is larger than instance type allows" -msgstr "" +msgstr "镜像比实例类型所允许的大。" -#: ../nova/exception.py:845 +#: nova/exception.py:905 msgid "1 or more Zones could not complete the request" -msgstr "" +msgstr "1个或多个区域无法完成请求。" -#: ../nova/exception.py:850 +#: nova/exception.py:909 msgid "Instance type's memory is too small for requested image." -msgstr "" +msgstr "实例类型的内存对于所请求的镜像太小。" -#: ../nova/exception.py:854 +#: nova/exception.py:913 msgid "Instance type's disk is too small for requested image." -msgstr "" +msgstr "实例类型的磁盘对于所请求的镜像太小。" -#: ../nova/exception.py:858 +#: nova/exception.py:917 #, python-format msgid "Insufficient free memory on compute node to start %(uuid)s." -msgstr "" +msgstr "没有足够的可用内存来启动计算节点 %(uuid)s。" -#: ../nova/exception.py:862 +#: nova/exception.py:921 msgid "Could not fetch bandwidth/cpu/disk metrics for this host." -msgstr "" +msgstr "无法获取此主机的带宽、CPU和磁盘指标。" -#: ../nova/exception.py:866 +#: nova/exception.py:925 #, python-format msgid "No valid host was found. %(reason)s" -msgstr "" +msgstr "找不到有效主机,原因是 %(reason)s。" -#: ../nova/exception.py:870 +#: nova/exception.py:929 #, python-format msgid "Host %(host)s is not up or doesn't exist." -msgstr "" +msgstr "主机 %(host)s 没有启动或者不存在。" + +#: nova/exception.py:933 +msgid "Quota exceeded" +msgstr "配额超出" + +#: nova/exception.py:937 +#, python-format +msgid "Aggregate %(aggregate_id)s could not be found." +msgstr "找不到 Aggregate %(aggregate_id)s。" + +#: nova/exception.py:941 +#, python-format +msgid "Aggregate %(aggregate_name)s already exists." +msgstr "Aggregate %(aggregate_name)s 已经存在。" + +#: nova/exception.py:945 +#, python-format +msgid "Aggregate %(aggregate_id)s has no host %(host)s." +msgstr "Aggregate %(aggregate_id)s没有主机 %(host)s。" + +#: nova/exception.py:949 +#, python-format +msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s." +msgstr "Aggregate %(aggregate_id)s 没有键为 %(metadata_key)s 的元数据。" + +#: nova/exception.py:954 +#, python-format +msgid "Host %(host)s already member of another aggregate." +msgstr "主机 %(host)s 已经是另外一个aggregate的成员。" + +#: nova/exception.py:958 +#, python-format +msgid "Aggregate %(aggregate_id)s already has host %(host)s." +msgstr "Aggregate %(aggregate_id)s已经有主机 %(host)s。" + +#: nova/exception.py:962 +msgid "Detected more than one volume with name %(vol_name)" +msgstr "检测到不止一个名称为 %(vol_name) 的卷。" + +#: nova/exception.py:966 +#, python-format +msgid "" +"Cannot create volume_type with name %(name)s and specs %(extra_specs)s" +msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。" + +#: nova/exception.py:971 +msgid "Unable to create instance type" +msgstr "无法创建实例类型。" + +#: nova/exception.py:975 +msgid "Bad response from SolidFire API" +msgstr "来自SolidFire API的错误响应" + +#: nova/exception.py:979 +#, python-format +msgid "Error in SolidFire API response: status=%(status)s" +msgstr "SolidFire API响应里发生错误:status=%(status)s" + +#: nova/exception.py:983 +#, python-format +msgid "Error in SolidFire API response: data=%(data)s" +msgstr "SolidFire API响应里发生错误:data=%(data)s" + +#: nova/exception.py:987 +msgid "Detected existing vlan with id %(vlan)" +msgstr "检测到已存在的id为%(vlan) vlan" #: ../nova/network/quantum/melange_ipam_lib.py:100 #, python-format msgid "No network found for cidr %s" msgstr "" -#: ../nova/network/quantum/melange_ipam_lib.py:145 +#: nova/network/quantum/melange_ipam_lib.py:132 msgid "" "get_project_and_global_net_ids must be called with a non-null project_id" msgstr "" -#: ../nova/compute/instance_types.py:50 ../nova/compute/instance_types.py:58 +#: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65 msgid "create arguments must be positive integers" msgstr "" -#: ../nova/compute/instance_types.py:67 ../nova/volume/volume_types.py:41 +#: nova/compute/instance_types.py:74 nova/volume/volume_types.py:41 #, python-format msgid "DB error: %s" msgstr "" -#: ../nova/compute/instance_types.py:68 +#: nova/compute/instance_types.py:84 +#, python-format +msgid "Instance type %s not found for deletion" +msgstr "" + +#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:39 +msgid "priority column not added to networks table" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:149 +#, python-format +msgid "Instance %(instance)s is backed by %(backing)s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:160 #, python-format msgid "" -"Cannot create instance_type with name %(name)s and flavorid %(flavorid)s" +"Instance %(instance)s is using a backing file %(backing)s which does not " +"appear in the image service" msgstr "" -#: ../nova/compute/instance_types.py:79 +#: nova/virt/libvirt/imagecache.py:211 #, python-format -msgid "Instance type %s not found for deletion" +msgid "" +"%(container_format)s-%(id)s (%(base_file)s): image verification failed" msgstr "" -#: ../nova/compute/instance_types.py:89 +#: nova/virt/libvirt/imagecache.py:223 #, python-format -msgid "Instance type %s not found for purge" +msgid "" +"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, no " +"hash stored" msgstr "" -#: ../nova/compute/instance_types.py:115 ../nova/compute/instance_types.py:127 -#: ../nova/compute/instance_types.py:141 ../nova/compute/instance_types.py:152 +#: nova/virt/libvirt/imagecache.py:243 #, python-format -msgid "Unknown instance type: %s" -msgstr "未知的虚拟机类型:%s" +msgid "Base file too young to remove: %s" +msgstr "" -#: ../nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:38 -msgid "priority column not added to networks table" +#: nova/virt/libvirt/imagecache.py:246 +#, python-format +msgid "Removing base file: %s" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:54 -msgid "" -"Ill-formed or incorrectly routed 'blob' data sent to instance create request." +#: nova/virt/libvirt/imagecache.py:253 +#, python-format +msgid "Failed to remove %(base_file)s, error was %(error)s" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:73 +#: nova/virt/libvirt/imagecache.py:265 #, python-format -msgid "No host selection for %s defined." +msgid "%(container_format)s-%(id)s (%(base_file)s): checking" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:90 +#: nova/virt/libvirt/imagecache.py:278 #, python-format -msgid "Attempting to build %(num_instances)d instance(s)" +msgid "" +"%(container_format)s-%(id)s (%(base_file)s): in use: on this node %(local)d " +"local, %(remote)d on other nodes" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:138 +#: nova/virt/libvirt/imagecache.py:291 #, python-format msgid "" -"Attempting to determine target host for resize to instance type " -"%(instance_type_id)s" +"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base file " +"is in use! instances: %(instance_list)s" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:220 +#: nova/virt/libvirt/imagecache.py:302 #, python-format msgid "" -"Forwarding instance create call to zone '%(zone_name)s'. " -"ReservationID=%(reservation_id)s" +"%(container_format)s-%(id)s (%(base_file)s): in: on other nodes (%(remote)d " +"on other nodes)" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:230 +#: nova/virt/libvirt/imagecache.py:314 #, python-format -msgid "Bad credentials attempting to talk to zone at %(url)s." +msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:270 +#: nova/virt/libvirt/imagecache.py:322 #, python-format -msgid "Bad child zone scaling values for Zone: %(zone_id)s" +msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:287 -msgid "Scheduler only understands Compute nodes (for now)" +#: nova/virt/libvirt/imagecache.py:351 +#, python-format +msgid "Skipping verification, no base directory at %s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:355 +msgid "Verify base images" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:292 -msgid "Scheduler only understands InstanceType-basedprovisioning." +#: nova/virt/libvirt/imagecache.py:383 +#, python-format +msgid "Unknown base file: %s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:388 +#, python-format +msgid "Active base files: %s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:391 +#, python-format +msgid "Corrupt base files: %s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:395 +#, python-format +msgid "Removable base files: %s" +msgstr "" + +#: nova/virt/libvirt/imagecache.py:403 +msgid "Verification complete" +msgstr "" + +#: nova/scheduler/distributed_scheduler.py:50 +#, python-format +msgid "No host selection for %s defined." msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:323 +#: nova/scheduler/distributed_scheduler.py:63 #, python-format -msgid "Filtered %(filtered_hosts)s" +msgid "Attempting to build %(num_instances)d instance(s)" +msgstr "" + +#: nova/scheduler/distributed_scheduler.py:140 +msgid "Scheduler only understands Compute nodes (for now)" msgstr "" -#: ../nova/scheduler/distributed_scheduler.py:329 +#: nova/scheduler/distributed_scheduler.py:178 +#, python-format +msgid "Filtered %(hosts)s" +msgstr "" + +#: nova/scheduler/distributed_scheduler.py:188 #, python-format msgid "Weighted %(weighted_host)s" msgstr "" -#: ../nova/volume/manager.py:89 +#: nova/volume/manager.py:96 #, python-format msgid "Re-exporting %s volumes" msgstr "重新输出卷%s" -#: ../nova/volume/manager.py:94 +#: nova/volume/manager.py:101 #, python-format msgid "volume %s: skipping export" msgstr "跳过卷:%s" -#: ../nova/volume/manager.py:100 +#: nova/volume/manager.py:107 #, python-format msgid "volume %s: creating" msgstr "儲存量 %s: 在创造" -#: ../nova/volume/manager.py:112 +#: nova/volume/manager.py:119 #, python-format msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG" msgstr "卷%(vol_name)s:创建大小为%(vol_size)s的逻辑卷" -#: ../nova/volume/manager.py:124 +#: nova/volume/manager.py:131 #, python-format msgid "volume %s: creating export" msgstr "卷%s:正在创建" -#: ../nova/volume/manager.py:138 +#: nova/volume/manager.py:145 #, python-format msgid "volume %s: created successfully" msgstr "卷%s:创建成功" -#: ../nova/volume/manager.py:167 +#: nova/volume/manager.py:174 msgid "Volume is still attached" msgstr "卷仍在挂载中" -#: ../nova/volume/manager.py:169 +#: nova/volume/manager.py:176 msgid "Volume is not local to this node" msgstr "卷不属于这个节点" -#: ../nova/volume/manager.py:173 +#: nova/volume/manager.py:180 #, python-format msgid "volume %s: removing export" msgstr "卷%s:移除中" -#: ../nova/volume/manager.py:175 +#: nova/volume/manager.py:182 #, python-format msgid "volume %s: deleting" msgstr "卷%s:删除中" -#: ../nova/volume/manager.py:178 +#: nova/volume/manager.py:185 #, python-format msgid "volume %s: volume is busy" msgstr "" -#: ../nova/volume/manager.py:190 +#: nova/volume/manager.py:197 #, python-format msgid "volume %s: deleted successfully" msgstr "卷%s:删除成功" -#: ../nova/volume/manager.py:197 +#: nova/volume/manager.py:204 #, python-format msgid "snapshot %s: creating" msgstr "" -#: ../nova/volume/manager.py:201 +#: nova/volume/manager.py:208 #, python-format msgid "snapshot %(snap_name)s: creating" msgstr "" -#: ../nova/volume/manager.py:216 +#: nova/volume/manager.py:223 #, python-format msgid "snapshot %s: created successfully" msgstr "" -#: ../nova/volume/manager.py:225 +#: nova/volume/manager.py:232 #, python-format msgid "snapshot %s: deleting" msgstr "" -#: ../nova/volume/manager.py:234 +#: nova/volume/manager.py:241 #, python-format msgid "snapshot %s: deleted successfully" msgstr "" -#: ../nova/volume/manager.py:296 +#: nova/volume/manager.py:323 msgid "Checking volume capabilities" msgstr "" -#: ../nova/volume/manager.py:300 +#: nova/volume/manager.py:327 #, python-format msgid "New capabilities found: %s" msgstr "" -#: ../nova/volume/manager.py:311 +#: nova/volume/manager.py:338 msgid "Clear capabilities" msgstr "" -#: ../nova/volume/manager.py:315 +#: nova/volume/manager.py:342 #, python-format msgid "Notification {%s} received" msgstr "" -#: ../nova/volume/api.py:49 ../nova/volume/api.py:262 -msgid "Snapshot status must be available" +#: nova/volume/api.py:74 nova/volume/api.py:210 +msgid "status must be available" msgstr "" -#: ../nova/volume/api.py:55 +#: nova/volume/api.py:85 #, python-format msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume" msgstr "" -#: ../nova/volume/api.py:57 -#, python-format -msgid "Volume quota exceeded. You cannot create a volume of size %sG" -msgstr "卷磁盘配额已耗尽,不能创建 %sG 大小的卷" - -#: ../nova/volume/api.py:102 ../nova/volume/api.py:172 -#: ../nova/volume/api.py:230 +#: nova/volume/api.py:133 msgid "Volume status must be available" msgstr "卷组状态必须可获取" -#: ../nova/volume/api.py:174 -msgid "Volume is already attached" -msgstr "卷已挂载" - -#: ../nova/volume/api.py:180 -msgid "Volume is already detached" -msgstr "卷已卸载" - -#: ../nova/virt/libvirt/connection.py:226 +#: nova/compute/api.py:1012 nova/volume/api.py:163 +#: nova/volume/volume_types.py:64 #, python-format -msgid "Connecting to libvirt: %s" +msgid "Searching by: %s" msgstr "" -#: ../nova/virt/libvirt/connection.py:240 -msgid "Connection to libvirt broke" +#: nova/volume/api.py:213 +msgid "already attached" +msgstr "" + +#: nova/volume/api.py:220 +msgid "already detached" +msgstr "" + +#: nova/volume/api.py:272 nova/volume/api.py:305 +msgid "must be available" msgstr "" -#: ../nova/virt/libvirt/connection.py:328 +#: nova/tests/test_misc.py:114 #, python-format msgid "" -"Error from libvirt during destroy of %(instance_name)s. Code=%(errcode)s " -"Error=%(e)s" +"The following migrations are missing a downgrade:\n" +"\t%s" msgstr "" -#: ../nova/virt/libvirt/connection.py:341 +#: nova/virt/libvirt/connection.py:244 #, python-format -msgid "" -"Error from libvirt during saved instance removal %(instance_name)s. " -"Code=%(errcode)s Error=%(e)s" +msgid "Connecting to libvirt: %s" +msgstr "" + +#: nova/virt/libvirt/connection.py:258 +msgid "Connection to libvirt broke" +msgstr "" + +#: nova/virt/libvirt/connection.py:362 +#, python-format +msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:352 +#: nova/virt/libvirt/connection.py:374 #, python-format msgid "" -"Error from libvirt during undefine of %(instance_name)s. Code=%(errcode)s " +"Error from libvirt during saved instance removal. Code=%(errcode)s " "Error=%(e)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:367 +#: nova/virt/libvirt/connection.py:385 #, python-format -msgid "Instance %s destroyed successfully." +msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:394 -#, python-format -msgid "instance %(instance_name)s: deleting instance files %(target)s" +#: nova/virt/libvirt/connection.py:399 +msgid "Instance destroyed successfully." msgstr "" -#: ../nova/virt/libvirt/connection.py:566 -#: ../nova/virt/libvirt/connection.py:680 +#: nova/virt/libvirt/connection.py:430 #, python-format -msgid "During reboot, %s disappeared." +msgid "Deleting instance files %(target)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:571 -#, python-format -msgid "Instance %s rebooted successfully." +#: nova/virt/libvirt/connection.py:512 +msgid "attaching LXC block device" +msgstr "" + +#: nova/virt/libvirt/connection.py:525 +msgid "detaching LXC block device" +msgstr "" + +#: nova/virt/libvirt/connection.py:676 nova/virt/libvirt/connection.py:820 +msgid "During reboot, instance disappeared." +msgstr "" + +#: nova/virt/libvirt/connection.py:681 +msgid "Instance rebooted successfully." msgstr "" -#: ../nova/virt/libvirt/connection.py:670 +#: nova/virt/libvirt/connection.py:778 nova/virt/xenapi/vmops.py:1371 #, python-format -msgid "instance %s: is running" +msgid "" +"Found %(migration_count)d unconfirmed migrations older than " +"%(confirm_window)d seconds" msgstr "" -#: ../nova/virt/libvirt/connection.py:685 +#: nova/virt/libvirt/connection.py:782 nova/virt/xenapi/vmops.py:1375 #, python-format -msgid "Instance %s spawned successfully." +msgid "Automatically confirming migration %d" +msgstr "" + +#: nova/virt/libvirt/connection.py:809 +msgid "Instance is running" +msgstr "" + +#: nova/virt/libvirt/connection.py:825 +msgid "Instance spawned successfully." msgstr "" -#: ../nova/virt/libvirt/connection.py:693 +#: nova/virt/libvirt/connection.py:833 #, python-format msgid "virsh said: %r" msgstr "" -#: ../nova/virt/libvirt/connection.py:697 +#: nova/virt/libvirt/connection.py:837 msgid "cool, it's a device" msgstr "" -#: ../nova/virt/libvirt/connection.py:708 +#: nova/virt/libvirt/connection.py:848 #, python-format msgid "data: %(data)r, fpath: %(fpath)r" msgstr "" -#. LXC is also special -#: ../nova/virt/libvirt/connection.py:728 +#: nova/virt/libvirt/connection.py:875 msgid "Unable to read LXC console" msgstr "" - -#: ../nova/virt/libvirt/connection.py:854 -#, python-format -msgid "instance %s: Creating image" + +#: nova/virt/libvirt/connection.py:992 +msgid "Creating image" msgstr "" -#: ../nova/virt/libvirt/connection.py:1033 +#: nova/virt/libvirt/connection.py:1171 #, python-format -msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s" +msgid "Injecting %(injection)s into image %(img_id)s" msgstr "" -#. This could be a windows image, or a vmdk format disk -#: ../nova/virt/libvirt/connection.py:1044 +#: nova/virt/libvirt/connection.py:1179 #, python-format -msgid "" -"instance %(inst_name)s: ignoring error injecting data into image %(img_id)s " -"(%(e)s)" +msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)" msgstr "" -#: ../nova/virt/libvirt/connection.py:1069 +#: nova/virt/libvirt/connection.py:1211 #, python-format msgid "block_device_list %s" msgstr "" -#. TODO(termie): cache? -#: ../nova/virt/libvirt/connection.py:1183 -#, python-format -msgid "instance %s: starting toXML method" +#: nova/virt/libvirt/connection.py:1336 +msgid "Starting toXML method" msgstr "" -#: ../nova/virt/libvirt/connection.py:1187 -#, python-format -msgid "instance %s: finished toXML method" +#: nova/virt/libvirt/connection.py:1340 +msgid "Finished toXML method" msgstr "" -#: ../nova/virt/libvirt/connection.py:1204 +#: nova/virt/libvirt/connection.py:1357 #, python-format msgid "" "Error from libvirt while looking up %(instance_name)s: [Error Code " "%(error_code)s] %(ex)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:1319 -msgid "" -"Cannot get the number of cpu, because this function is not implemented for " -"this platform. This error can be safely ignored for now." -msgstr "" - -#: ../nova/virt/libvirt/connection.py:1416 +#: nova/virt/libvirt/connection.py:1578 msgid "libvirt version is too old (does not support getVersion)" msgstr "" -#: ../nova/virt/libvirt/connection.py:1438 +#: nova/virt/libvirt/connection.py:1600 #, python-format msgid "'' must be 1, but %d\n" msgstr "" -#: ../nova/virt/libvirt/connection.py:1465 +#: nova/virt/libvirt/connection.py:1627 #, python-format msgid "topology (%(topology)s) must have %(ks)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:1561 +#: nova/virt/libvirt/connection.py:1724 #, python-format msgid "" "Instance launched has CPU info:\n" "%s" msgstr "" -#: ../nova/virt/libvirt/connection.py:1564 +#: nova/virt/libvirt/connection.py:1727 #, python-format msgid "" "to xml...\n" ":%s " msgstr "" -#: ../nova/virt/libvirt/connection.py:1567 +#: nova/virt/libvirt/connection.py:1730 #, python-format msgid "" "CPU doesn't have compatibility.\n" @@ -6087,307 +6655,258 @@ "Refer to %(u)s" msgstr "" -#: ../nova/virt/libvirt/connection.py:1624 +#: nova/virt/libvirt/connection.py:1787 #, python-format msgid "Timeout migrating for %s. nwfilter not found." msgstr "" -#: ../nova/virt/libvirt/connection.py:1841 +#: nova/virt/libvirt/connection.py:2007 #, python-format msgid "skipping %(path)s since it looks like volume" msgstr "" -#: ../nova/virt/vmwareapi/network_utils.py:155 -#, python-format -msgid "Creating Port Group with name %s on " -msgstr "" - -#: ../nova/virt/vmwareapi/network_utils.py:169 -#, python-format -msgid "Created Port Group with name %s on " -msgstr "" - -#: ../nova/db/sqlalchemy/api.py:50 -msgid "Use of empty request context is deprecated" -msgstr "" - -#: ../nova/db/sqlalchemy/api.py:168 -#, python-format -msgid "Unrecognized read_deleted value '%s'" -msgstr "" - -#: ../nova/db/sqlalchemy/api.py:3883 ../nova/db/sqlalchemy/api.py:3909 -#, python-format -msgid "No backend config with id %(sm_backend_id)s" -msgstr "" - -#: ../nova/db/sqlalchemy/api.py:3967 -#, python-format -msgid "No sm_flavor called %(sm_flavor)s" -msgstr "" - -#: ../nova/db/sqlalchemy/api.py:4011 -#, python-format -msgid "No sm_volume with id %(volume_id)s" -msgstr "" - -#: ../nova/volume/volume_types.py:42 +#: nova/virt/libvirt/connection.py:2098 #, python-format -msgid "" -"Cannot create volume_type with name %(name)s and specs %(extra_specs)s" +msgid "Instance %s: Starting migrate_disk_and_power_off" msgstr "" -#: ../nova/volume/volume_types.py:55 +#: nova/virt/libvirt/connection.py:2153 #, python-format -msgid "Volume type %s not found for deletion" +msgid "During wait running, %s disappeared." msgstr "" -#: ../nova/volume/volume_types.py:56 ../nova/volume/volume_types.py:68 -#: ../nova/volume/volume_types.py:120 ../nova/volume/volume_types.py:131 +#: nova/virt/libvirt/connection.py:2158 #, python-format -msgid "Unknown volume type: %s" +msgid "Instance %s running successfully." msgstr "" -#: ../nova/volume/volume_types.py:67 +#: nova/virt/libvirt/connection.py:2165 #, python-format -msgid "Volume type %s not found for purge" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:135 -msgid "No body provided" +msgid "Instance %s: Starting finish_migration" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:147 +#: nova/virt/libvirt/connection.py:2206 #, python-format -msgid "Create VSA %(display_name)s of type %(vc_type)s" +msgid "Instance %s: Starting finish_revert_migration" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:167 -#, python-format -msgid "Delete VSA with id: %s" -msgstr "" +#: nova/api/openstack/compute/contrib/keypairs.py:85 +msgid "Keypair name must be between 1 and 255 characters long" +msgstr "Keypair名称长度必须在1到255个字符之间" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:185 +#: nova/api/openstack/compute/contrib/keypairs.py:90 #, python-format -msgid "Associate address %(ip)s to VSA %(id)s" -msgstr "" +msgid "Key pair '%s' already exists." +msgstr "Keypair '%s' 已经存在。" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:213 -#, python-format -msgid "Disassociate address from VSA %(id)s" +#: nova/virt/vmwareapi/network_utils.py:128 +msgid "" +"ESX SOAP server returned an empty port group for the host system in its " +"response" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:286 +#: nova/virt/vmwareapi/network_utils.py:155 #, python-format -msgid "%(obj)s with ID %(id)s not found" +msgid "Creating Port Group with name %s on the ESX host" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:292 +#: nova/virt/vmwareapi/network_utils.py:169 #, python-format -msgid "" -"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA " -"%(vsa_id)s." +msgid "Created Port Group with name %s on the ESX host" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:311 -#, python-format -msgid "Index. vsa_id=%(vsa_id)s" +#: nova/db/sqlalchemy/api.py:56 +msgid "Use of empty request context is deprecated" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:316 +#: nova/db/sqlalchemy/api.py:188 #, python-format -msgid "Detail. vsa_id=%(vsa_id)s" +msgid "Unrecognized read_deleted value '%s'" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:321 +#: nova/db/sqlalchemy/api.py:565 nova/db/sqlalchemy/api.py:600 #, python-format -msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s" +msgid "No ComputeNode for %(host)s" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:329 +#: nova/db/sqlalchemy/api.py:4124 nova/db/sqlalchemy/api.py:4150 #, python-format -msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s" +msgid "No backend config with id %(sm_backend_id)s" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:373 +#: nova/db/sqlalchemy/api.py:4208 #, python-format -msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s" +msgid "No sm_flavor called %(sm_flavor)s" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:386 +#: nova/db/sqlalchemy/api.py:4252 #, python-format -msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s" +msgid "No sm_volume with id %(volume_id)s" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:401 -#, python-format -msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s" +#: nova/volume/volume_types.py:49 nova/volume/volume_types.py:108 +msgid "name cannot be None" msgstr "" -#: ../nova/api/openstack/v2/contrib/virtual_storage_arrays.py:614 -#, python-format -msgid "Index instances for VSA %s" +#: nova/volume/volume_types.py:96 +msgid "id cannot be None" msgstr "" -#: ../nova/network/quantum/nova_ipam_lib.py:70 +#: nova/network/quantum/nova_ipam_lib.py:75 msgid "Error creating network entry" msgstr "" -#: ../nova/network/quantum/nova_ipam_lib.py:83 +#: ../nova/network/quantum/nova_ipam_lib.py:88 #, python-format msgid "No network with fixed_range = %s" msgstr "" -#: ../nova/network/quantum/nova_ipam_lib.py:94 +#: nova/network/quantum/nova_ipam_lib.py:90 #, python-format msgid "No network with net_id = %s" msgstr "" -#: ../nova/network/quantum/nova_ipam_lib.py:214 +#: ../nova/network/quantum/nova_ipam_lib.py:230 #, python-format msgid "No fixed IPs to deallocate for vif %s" msgstr "" -#: ../nova/auth/ldapdriver.py:621 +#: nova/auth/ldapdriver.py:650 #, python-format msgid "" "Attempted to remove the last member of a group. Deleting the group at %s " "instead." msgstr "尝试删除组中最后一个成员,用删除组 %s 来代替。" -#: ../nova/virt/vmwareapi/read_write_util.py:153 -msgid "Exception during HTTP connection close in " +#: nova/api/openstack/compute/server_metadata.py:38 +#: nova/api/openstack/compute/server_metadata.py:124 +#: nova/api/openstack/compute/server_metadata.py:163 +msgid "Server does not exist" +msgstr "" + +#: nova/api/openstack/compute/server_metadata.py:143 +#: nova/api/openstack/compute/server_metadata.py:156 +msgid "Metadata item was not found" +msgstr "" + +#: nova/scheduler/filters/core_filter.py:45 +msgid "VCPUs not set; assuming CPU collection broken" +msgstr "" + +#: nova/virt/vmwareapi/read_write_util.py:150 +#, python-format +msgid "" +"Exception during HTTP connection close in VMWareHTTpWrite. Exception is %s" msgstr "" -#: ../nova/tests/test_volume.py:190 +#: nova/tests/test_volume.py:195 #, python-format msgid "Target %s allocated" msgstr "" -#: ../nova/tests/test_volume.py:392 +#: nova/tests/test_volume.py:383 #, python-format msgid "Cannot confirm exported volume id:%s." msgstr "" -#: ../nova/scheduler/driver.py:55 +#: nova/scheduler/driver.py:63 #, python-format msgid "Casted '%(method)s' to volume '%(host)s'" msgstr "" -#: ../nova/scheduler/driver.py:72 +#: nova/scheduler/driver.py:80 #, python-format msgid "Casted '%(method)s' to compute '%(host)s'" msgstr "" -#: ../nova/scheduler/driver.py:81 +#: nova/scheduler/driver.py:89 #, python-format msgid "Casted '%(method)s' to network '%(host)s'" msgstr "" -#: ../nova/scheduler/driver.py:99 +#: nova/scheduler/driver.py:107 #, python-format msgid "Casted '%(method)s' to %(topic)s '%(host)s'" msgstr "" -#: ../nova/scheduler/driver.py:165 +#: nova/scheduler/driver.py:181 msgid "Must implement a fallback schedule" msgstr "" -#: ../nova/scheduler/driver.py:287 +#: nova/scheduler/driver.py:314 msgid "Block migration can not be used with shared storage." msgstr "" -#: ../nova/scheduler/driver.py:294 +#: nova/scheduler/driver.py:322 #, python-format msgid "" "Cannot confirm tmpfile at %(ipath)s is on same shared storage between " "%(src)s and %(dest)s." msgstr "" -#: ../nova/scheduler/driver.py:332 +#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450 #, python-format msgid "host %(dest)s is not compatible with original host %(src)s." msgstr "" -#: ../nova/scheduler/driver.py:379 +#: nova/scheduler/driver.py:409 #, python-format msgid "" "Unable to migrate %(instance_id)s to %(dest)s: Lack of memory(host:%(avail)s " "<= instance:%(mem_inst)s)" msgstr "" -#: ../nova/scheduler/driver.py:410 +#: nova/scheduler/driver.py:465 #, python-format msgid "" -"Unable to migrate %(instance_id)s to %(dest)s: Lack of disk(host:%(avail)s " -"<= instance:%(disk_inst)s)" -msgstr "" - -#: ../nova/tests/scheduler/test_scheduler.py:235 -msgid "Test NoValidHost exception" -msgstr "" - -#: ../nova/tests/scheduler/test_scheduler.py:782 -msgid "Shouldn't try to create DB entry when at max cores" +"Unable to migrate %(instance_id)s to %(dest)s: Lack of " +"disk(host:%(available)s <= instance:%(necessary)s)" msgstr "" -#: ../nova/tests/scheduler/test_scheduler.py:1253 -msgid "Successful database hit should succeed" -msgstr "" +#: nova/api/openstack/compute/contrib/hosts.py:145 +#, python-format +msgid "Invalid status: '%s'" +msgstr "无效的状态:'%s'" -#: ../nova/tests/scheduler/test_scheduler.py:1270 -msgid "Should have rerouted." -msgstr "" +#: nova/api/openstack/compute/contrib/hosts.py:150 +#, python-format +msgid "Invalid update setting: '%s'" +msgstr "无效的更新设置:'%s'" -#: ../nova/tests/scheduler/test_scheduler.py:1369 +#: nova/api/openstack/compute/contrib/hosts.py:159 #, python-format -msgid "RedirectResult should have been raised: %s" -msgstr "" +msgid "Setting host %(host)s to %(state)s." +msgstr "把主机 %(host)s 设置为 %(state)s。" -#: ../nova/tests/scheduler/test_scheduler.py:1371 -msgid "RedirectResult should have been raised" -msgstr "" +#: nova/api/openstack/compute/contrib/hosts.py:206 +msgid "Describe-resource is admin only functionality" +msgstr "Describe-resource是只有管理员才能执行的功能。" -#: ../nova/api/openstack/xmlutil.py:265 +#: nova/api/openstack/compute/contrib/hosts.py:214 +msgid "Host not found" +msgstr "没有找到主机" + +#: nova/api/openstack/xmlutil.py:265 msgid "element is not a child" -msgstr "" +msgstr "元素不是子节点" -#: ../nova/api/openstack/xmlutil.py:414 +#: nova/api/openstack/xmlutil.py:414 msgid "root element selecting a list" msgstr "" -#: ../nova/api/openstack/xmlutil.py:735 +#: nova/api/openstack/xmlutil.py:739 #, python-format msgid "" "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s" msgstr "" -#: ../nova/api/openstack/xmlutil.py:854 +#: nova/api/openstack/xmlutil.py:858 msgid "subclasses must implement construct()!" -msgstr "" - -#: ../nova/tests/test_quantum.py:77 -#, python-format -msgid "interface '%s' is already attached" -msgstr "" - -#: ../nova/tests/test_quantum.py:84 -msgid "network %(net_id)s does not exist for tenant %(tenant_id)" -msgstr "" +msgstr "subclasses必须执行construct()!" -#: ../nova/tests/test_quantum.py:96 +#: nova/virt/vmwareapi/error_util.py:93 #, python-format -msgid "network %(net_id)s does not exist for tenant %(tenant_id)s" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/__init__.py:62 -#, python-format -msgid "Failed to load extension %(classname)s: %(exc)s" -msgstr "" - -#: ../nova/api/openstack/v2/contrib/__init__.py:86 -#, python-format -msgid "Failed to load extension %(ext_name)s: %(exc)s" +msgid "Error(s) %s occurred in the call to RetrieveProperties" msgstr "" #: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:84 @@ -6424,970 +6943,1004 @@ "Created VDI %(vdi_ref)s (%(label)s, %(size)s, %(read_only)s) on %(sr_ref)s." msgstr "" -#: ../nova/api/openstack/v2/contrib/admin_actions.py:59 -#, python-format -msgid "Compute.api::pause %s" -msgstr "Compute.api::暂停 %s" - -#: ../nova/api/openstack/v2/contrib/admin_actions.py:74 -#, python-format -msgid "Compute.api::unpause %s" -msgstr "Compute.api::继续 %s" - -#: ../nova/api/openstack/v2/contrib/admin_actions.py:89 -#, python-format -msgid "compute.api::suspend %s" -msgstr "compute.api::挂起 %s" - -#: ../nova/api/openstack/v2/contrib/admin_actions.py:104 -#, python-format -msgid "compute.api::resume %s" -msgstr "compute.api::回复 %s" - -#: ../nova/api/openstack/v2/contrib/admin_actions.py:116 +#: nova/virt/xenapi/vmops.py:181 #, python-format -msgid "Error in migrate %s" +msgid "Attempted to power on non-existent instance bad instance id %s" msgstr "" -#: ../nova/api/openstack/v2/contrib/admin_actions.py:131 +#: nova/virt/xenapi/vmops.py:183 #, python-format -msgid "Compute.api::reset_network %s" -msgstr "Compute.api::重置网络 %s" +msgid "Starting instance %s" +msgstr "" -#: ../nova/api/openstack/v2/contrib/admin_actions.py:148 +#: nova/virt/xenapi/vmops.py:246 #, python-format -msgid "Compute.api::inject_network_info %s" +msgid "instance %s: Failed to spawn" msgstr "" -#: ../nova/api/openstack/v2/contrib/admin_actions.py:165 +#: nova/virt/xenapi/vmops.py:248 #, python-format -msgid "Compute.api::lock %s" -msgstr "compute.api::加锁 %s" +msgid "Instance %s failed to spawn - performing clean-up" +msgstr "" -#: ../nova/api/openstack/v2/contrib/admin_actions.py:182 +#. Collect VDI/file resources to clean up; +#. These resources will be removed by _handle_spawn_error. +#: ../nova/virt/xenapi/vmops.py:323 #, python-format -msgid "Compute.api::unlock %s" -msgstr "compute.api::解锁 %s" +msgid "instance %s: Failed to spawn - " +msgstr "" -#: ../nova/tests/test_volume_types.py:62 +#: nova/virt/xenapi/vmops.py:389 #, python-format -msgid "Given data: %s" +msgid "" +"Auto configuring disk for instance %(instance_uuid)s, attempting to resize " +"partition..." msgstr "" -#: ../nova/tests/test_volume_types.py:63 +#: nova/virt/xenapi/vmops.py:448 #, python-format -msgid "Result data: %s" +msgid "Invalid value for injected_files: '%s'" msgstr "" -#: ../nova/db/sqlalchemy/migration.py:36 -msgid "python-migrate is not installed. Exiting." +#: nova/virt/xenapi/vmops.py:453 +#, python-format +msgid "Injecting file path: '%s'" msgstr "" -#: ../nova/db/sqlalchemy/migration.py:46 -msgid "version should be an integer" +#: nova/virt/xenapi/vmops.py:459 +msgid "Setting admin password" msgstr "" -#: ../nova/api/ec2/__init__.py:59 -#, python-format -msgid "FaultWrapper: %s" +#: nova/virt/xenapi/vmops.py:463 +msgid "Resetting network" msgstr "" -#: ../nova/api/ec2/__init__.py:134 -msgid "Too many failed authentications." -msgstr "认证失败过多" - -#: ../nova/api/ec2/__init__.py:144 -#, python-format -msgid "" -"Access key %(access_key)s has had %(failures)d failed authentications and " -"will be locked out for %(lock_mins)d minutes." +#: nova/virt/xenapi/vmops.py:470 +msgid "Setting VCPU weight" msgstr "" -#: ../nova/api/ec2/__init__.py:204 -#, python-format -msgid "Authentication Failure: %s" -msgstr "认证失败:%s" - -#: ../nova/api/ec2/__init__.py:220 +#: nova/virt/xenapi/vmops.py:476 #, python-format -msgid "Authenticated Request For %(uname)s:%(pname)s)" +msgid "Starting VM %s..." msgstr "" -#: ../nova/api/ec2/__init__.py:251 -#, python-format -msgid "action: %s" -msgstr "执行: %s" - -#: ../nova/api/ec2/__init__.py:253 +#: nova/virt/xenapi/vmops.py:480 #, python-format -msgid "arg: %(key)s\t\tval: %(value)s" +msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s." msgstr "" -#: ../nova/api/ec2/__init__.py:328 +#: nova/virt/xenapi/vmops.py:487 #, python-format msgid "" -"Unauthorized request for controller=%(controller)s and action=%(action)s" +"Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is %(version)s" msgstr "" -#: ../nova/api/ec2/__init__.py:359 +#: nova/virt/xenapi/vmops.py:490 #, python-format -msgid "InstanceNotFound raised: %s" +msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s" msgstr "" -#: ../nova/api/ec2/__init__.py:365 +#: nova/virt/xenapi/vmops.py:497 #, python-format -msgid "VolumeNotFound raised: %s" +msgid "Instance %s: waiting for running" msgstr "" -#: ../nova/api/ec2/__init__.py:371 +#: nova/virt/xenapi/vmops.py:506 #, python-format -msgid "SnapshotNotFound raised: %s" +msgid "Instance %s: running" msgstr "" -#: ../nova/api/ec2/__init__.py:377 -#, python-format -msgid "NotFound raised: %s" -msgstr "引起没有找到的错误: %s" - -#: ../nova/api/ec2/__init__.py:380 -#, python-format -msgid "ApiError raised: %s" -msgstr "引发了Api错误: %s" - -#: ../nova/api/ec2/__init__.py:388 -#, python-format -msgid "KeyPairExists raised: %s" +#: nova/virt/xenapi/vmops.py:510 +msgid "Querying agent version" msgstr "" -#: ../nova/api/ec2/__init__.py:392 +#: nova/virt/xenapi/vmops.py:513 #, python-format -msgid "InvalidParameterValue raised: %s" +msgid "Instance agent version: %s" msgstr "" -#: ../nova/api/ec2/__init__.py:396 +#: nova/virt/xenapi/vmops.py:517 #, python-format -msgid "InvalidPortRange raised: %s" +msgid "Updating Agent to %s" msgstr "" -#: ../nova/api/ec2/__init__.py:400 +#: nova/virt/xenapi/vmops.py:539 #, python-format -msgid "NotAuthorized raised: %s" +msgid "Resources to remove:%s" msgstr "" -#: ../nova/api/ec2/__init__.py:404 +#: nova/virt/xenapi/vmops.py:550 #, python-format -msgid "InvalidRequest raised: %s" +msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)" msgstr "" -#: ../nova/api/ec2/__init__.py:409 -#, python-format -msgid "Unexpected error raised: %s" -msgstr "引发了意外的错误:%s" - -#: ../nova/api/openstack/v2/servers.py:117 +#: nova/virt/xenapi/vmops.py:555 #, python-format -msgid "Invalid server status: %(status)s" +msgid "Skipping VDI destroy for %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:125 -msgid "Invalid changes-since value" +#: nova/virt/xenapi/vmops.py:564 +msgid "Removing kernel/ramdisk files from dom0" msgstr "" -#: ../nova/api/openstack/v2/servers.py:163 -msgid "Personality file limit exceeded" +#: nova/virt/xenapi/vmops.py:593 +#, python-format +msgid "No opaque_ref could be determined for '%s'." msgstr "" -#: ../nova/api/openstack/v2/servers.py:165 -msgid "Personality file path too long" +#: nova/virt/xenapi/vmops.py:647 +#, python-format +msgid "Finished snapshot and upload for VM %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:167 -msgid "Personality file content too long" +#: nova/virt/xenapi/vmops.py:655 +#, python-format +msgid "Starting snapshot for VM %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:195 -msgid "Server name is not a string or unicode" +#: nova/virt/xenapi/vmops.py:664 +#, python-format +msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:199 -msgid "Server name is an empty string" +#: nova/virt/xenapi/vmops.py:683 +msgid "Failed to transfer vhd to new host" msgstr "" -#: ../nova/api/openstack/v2/servers.py:217 +#: nova/virt/xenapi/vmops.py:703 #, python-format -msgid "Bad personality format: missing %s" +msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d" msgstr "" -#: ../nova/api/openstack/v2/servers.py:220 -msgid "Bad personality format" +#: nova/virt/xenapi/vmops.py:751 +#, python-format +msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB" msgstr "" -#: ../nova/api/openstack/v2/servers.py:225 +#: nova/virt/xenapi/vmops.py:874 #, python-format -msgid "Personality content for %s cannot be decoded" +msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB" msgstr "" -#: ../nova/api/openstack/v2/servers.py:241 -#: ../nova/api/openstack/v2/servers.py:729 -msgid "Invalid adminPass" +#: nova/virt/xenapi/vmops.py:882 +#, python-format +msgid "Resize instance %s complete" msgstr "" -#: ../nova/api/openstack/v2/servers.py:255 +#: nova/virt/xenapi/vmops.py:913 #, python-format -msgid "Bad networks format: network uuid is not in proper format (%s)" +msgid "Failed to query agent version: %(resp)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:264 +#: nova/virt/xenapi/vmops.py:933 #, python-format -msgid "Invalid fixed IP address (%s)" +msgid "domid changed from %(olddomid)s to %(newdomid)s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:271 +#: nova/virt/xenapi/vmops.py:949 #, python-format -msgid "Duplicate networks (%s) are not allowed" +msgid "Failed to update agent: %(resp)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:277 +#: nova/virt/xenapi/vmops.py:972 #, python-format -msgid "Bad network format: missing %s" +msgid "Failed to exchange keys: %(resp)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:280 -msgid "Bad networks format" +#: nova/virt/xenapi/vmops.py:988 +#, python-format +msgid "Failed to update password: %(resp)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:292 -msgid "Userdata content cannot be decoded" +#: nova/virt/xenapi/vmops.py:1015 +#, python-format +msgid "Failed to inject file: %(resp)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:321 -msgid "Server name is not defined" +#: nova/virt/xenapi/vmops.py:1024 +#, python-format +msgid "VM %(instance_uuid)s already halted,skipping shutdown..." msgstr "" -#: ../nova/api/openstack/v2/servers.py:359 -#: ../nova/api/openstack/v2/servers.py:434 -msgid "Invalid flavorRef provided." +#: nova/virt/xenapi/vmops.py:1028 +#, python-format +msgid "Shutting down VM for Instance %(instance_uuid)s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:431 -msgid "Can not find requested image" +#: nova/virt/xenapi/vmops.py:1047 +msgid "Unable to find VBD for VM" msgstr "" -#: ../nova/api/openstack/v2/servers.py:437 -msgid "Invalid key_name provided." +#: nova/virt/xenapi/vmops.py:1068 +#, python-format +msgid "Destroying VDIs for Instance %(instance_uuid)s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:532 +#: nova/virt/xenapi/vmops.py:1126 #, python-format -msgid "There is no such server action: %s" +msgid "" +"Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk " +"deletion" +msgstr "" + +#: nova/virt/xenapi/vmops.py:1133 +msgid "instance has a kernel or ramdisk but not both" msgstr "" -#: ../nova/api/openstack/v2/servers.py:535 -msgid "Invalid request body" +#: nova/virt/xenapi/vmops.py:1140 +msgid "kernel/ramdisk files removed" msgstr "" -#: ../nova/api/openstack/v2/servers.py:558 +#: nova/virt/xenapi/vmops.py:1152 #, python-format -msgid "createBackup entity requires %s attribute" +msgid "Instance %(instance_uuid)s VM destroyed" msgstr "" -#: ../nova/api/openstack/v2/servers.py:562 -msgid "Malformed createBackup entity" +#: nova/virt/xenapi/vmops.py:1170 +#, python-format +msgid "Destroying VM for Instance %(instance_uuid)s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:568 -msgid "createBackup attribute 'rotation' must be an integer" +#: nova/virt/xenapi/vmops.py:1185 +msgid "VM is not present, skipping destroy..." msgstr "" -#: ../nova/api/openstack/v2/servers.py:580 -#: ../nova/api/openstack/v2/servers.py:830 -msgid "Invalid metadata" +#: nova/virt/xenapi/vmops.py:1239 +#, python-format +msgid "Instance is already in Rescue Mode: %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:606 -#: ../nova/api/openstack/v2/servers.py:619 -msgid "Instance has not been resized." +#: nova/virt/xenapi/vmops.py:1311 +#, python-format +msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds" msgstr "" -#: ../nova/api/openstack/v2/servers.py:609 +#: nova/virt/xenapi/vmops.py:1315 #, python-format -msgid "Error in confirm-resize %s" +msgid "Automatically hard rebooting %d" msgstr "" -#: ../nova/api/openstack/v2/servers.py:622 +#: nova/virt/xenapi/vmops.py:1380 #, python-format -msgid "Error in revert-resize %s" +msgid "Instance for migration %d not found, skipping" msgstr "" -#: ../nova/api/openstack/v2/servers.py:631 -msgid "Argument 'type' for reboot is not HARD or SOFT" +#: nova/virt/xenapi/vmops.py:1412 +msgid "Could not get bandwidth info." msgstr "" -#: ../nova/api/openstack/v2/servers.py:635 -msgid "Missing argument 'type' for reboot" +#: nova/virt/xenapi/vmops.py:1484 +#, python-format +msgid "The call to %(method)s returned an error: %(e)s." msgstr "" -#: ../nova/api/openstack/v2/servers.py:645 +#: nova/virt/xenapi/vmops.py:1500 #, python-format -msgid "Error in reboot %s" +msgid "injecting network info to xs for vm: |%s|" msgstr "" -#: ../nova/api/openstack/v2/servers.py:680 -msgid "Unable to locate requested flavor." +#: nova/virt/xenapi/vmops.py:1518 +#, python-format +msgid "creating vif(s) for vm: |%s|" msgstr "" -#: ../nova/api/openstack/v2/servers.py:683 -msgid "Resize requires a change in size." +#: nova/virt/xenapi/vmops.py:1527 +#, python-format +msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s." msgstr "" -#: ../nova/api/openstack/v2/servers.py:702 -msgid "Malformed server entity" +#: nova/virt/xenapi/vmops.py:1530 +#, python-format +msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s." msgstr "" -#: ../nova/api/openstack/v2/servers.py:709 -msgid "Missing imageRef attribute" +#: nova/virt/xenapi/vmops.py:1559 +#, python-format +msgid "injecting hostname to xs for vm: |%s|" msgstr "" -#: ../nova/api/openstack/v2/servers.py:716 -msgid "Missing flavorRef attribute" +#: nova/virt/xenapi/vmops.py:1621 +#, python-format +msgid "" +"The agent call to %(method)s returned an invalid response: %(ret)r. VM " +"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:725 -msgid "No adminPass was specified" +#: nova/virt/xenapi/vmops.py:1646 +#, python-format +msgid "" +"TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; " +"args=%(args)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:743 -msgid "Unable to parse metadata key/value pairs." +#: nova/virt/xenapi/vmops.py:1650 +#, python-format +msgid "" +"NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM " +"id=%(instance_uuid)s; args=%(args)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:752 -msgid "Resize request has invalid 'flavorRef' attribute." +#: nova/virt/xenapi/vmops.py:1655 +#, python-format +msgid "" +"The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s; " +"args=%(args)r" msgstr "" -#: ../nova/api/openstack/v2/servers.py:755 -msgid "Resize requests require 'flavorRef' attribute." +#: nova/virt/xenapi/vmops.py:1841 +#, python-format +msgid "OpenSSL error: %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:767 -msgid "Could not parse imageRef from request." +#: nova/tests/test_volume_types.py:60 +#, python-format +msgid "Given data: %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:792 +#: nova/tests/test_volume_types.py:61 #, python-format -msgid "Instance %s must be active to rebuild." +msgid "Result data: %s" msgstr "" -#: ../nova/api/openstack/v2/servers.py:795 +#: nova/api/ec2/__init__.py:69 #, python-format -msgid "Instance %s could not be found" -msgstr "" +msgid "%(code)s: %(message)s" +msgstr "%(code)s: %(message)s" -#: ../nova/api/openstack/v2/servers.py:814 -msgid "createImage entity requires name attribute" -msgstr "" +#: nova/api/ec2/__init__.py:91 +#, python-format +msgid "FaultWrapper: %s" +msgstr "FaultWrapper: %s" -#: ../nova/api/openstack/v2/servers.py:818 -msgid "Malformed createImage entity" -msgstr "" +#: nova/api/ec2/__init__.py:166 +msgid "Too many failed authentications." +msgstr "认证失败过多" -#: ../nova/api/openstack/v2/servers.py:841 -msgid "Server is currently creating an image. Please wait." +#: nova/api/ec2/__init__.py:176 +#, 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 "" -#: ../nova/api/openstack/v2/servers.py:1177 +#: nova/api/ec2/__init__.py:263 +msgid "Signature not provided" +msgstr "签名没有提供" + +#: nova/api/ec2/__init__.py:267 +msgid "Access key not provided" +msgstr "访问key没有提供" + +#: nova/api/ec2/__init__.py:302 nova/api/ec2/__init__.py:315 +msgid "Failure communicating with keystone" +msgstr "与keystone交流失败" + +#: nova/api/ec2/__init__.py:385 #, python-format -msgid "Removing options '%(unk_opt_str)s' from query" -msgstr "" +msgid "Authentication Failure: %s" +msgstr "认证失败:%s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:81 -msgid "Security group id should be integer" -msgstr "" +#: nova/api/ec2/__init__.py:401 +#, python-format +msgid "Authenticated Request For %(uname)s:%(pname)s)" +msgstr "为%(uname)s:%(pname)s 验证通过的请求" -#: ../nova/api/openstack/v2/contrib/security_groups.py:141 +#: nova/api/ec2/__init__.py:432 #, python-format -msgid "Security group %s already exists" -msgstr "" +msgid "action: %s" +msgstr "执行: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:160 +#: nova/api/ec2/__init__.py:434 #, python-format -msgid "Security group %s is not a string or unicode" -msgstr "" +msgid "arg: %(key)s\t\tval: %(value)s" +msgstr "arg: %(key)s\t\tval: %(value)s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:163 +#: nova/api/ec2/__init__.py:509 #, python-format -msgid "Security group %s cannot be empty." -msgstr "" +msgid "" +"Unauthorized request for controller=%(controller)s and action=%(action)s" +msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求" -#: ../nova/api/openstack/v2/contrib/security_groups.py:166 +#: nova/api/ec2/__init__.py:581 #, python-format -msgid "Security group %s should not be greater than 255 characters." -msgstr "" +msgid "InstanceNotFound raised: %s" +msgstr "引发InstanceNotFound: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:190 -msgid "Parent group id is not integer" -msgstr "" +#: nova/api/ec2/__init__.py:587 +#, python-format +msgid "VolumeNotFound raised: %s" +msgstr "引发VolumeNotFound: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:193 +#: nova/api/ec2/__init__.py:593 #, python-format -msgid "Security group (%s) not found" -msgstr "" +msgid "SnapshotNotFound raised: %s" +msgstr "引发SnapshotNotFound: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:196 +#: nova/api/ec2/__init__.py:599 #, python-format -msgid "Authorize security group ingress %s" -msgstr "验证输入安全组 %s" +msgid "NotFound raised: %s" +msgstr "引起没有找到的错误: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:211 -msgid "Not enough parameters to build a valid rule." -msgstr "" +#: nova/api/ec2/__init__.py:602 +#, python-format +msgid "EC2APIError raised: %s" +msgstr "引发EC2APIError: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:218 +#: nova/api/ec2/__init__.py:610 #, python-format -msgid "This rule already exists in group %s" -msgstr "这条规则已经存在安全组 %s 中。" +msgid "KeyPairExists raised: %s" +msgstr "引发KeyPairExists: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:258 -msgid "Parent or group id is not integer" -msgstr "" +#: nova/api/ec2/__init__.py:614 +#, python-format +msgid "InvalidParameterValue raised: %s" +msgstr "引发InvalidParameterValue: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:262 -msgid "Parent group id and group id cannot be same" -msgstr "" +#: nova/api/ec2/__init__.py:618 +#, python-format +msgid "InvalidPortRange raised: %s" +msgstr "引发InvalidPortRange: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:339 -msgid "Rule id is not integer" -msgstr "" +#: nova/api/ec2/__init__.py:622 +#, python-format +msgid "NotAuthorized raised: %s" +msgstr "引发NotAuthorized: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:342 +#: nova/api/ec2/__init__.py:626 #, python-format -msgid "Rule (%s) not found" -msgstr "" +msgid "InvalidRequest raised: %s" +msgstr "引发InvalidRequest: %s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:349 +#: nova/api/ec2/__init__.py:635 #, python-format -msgid "Revoke security group ingress %s" -msgstr "撤销输入安全组 %s" +msgid "Unexpected error raised: %s" +msgstr "引发了意外的错误:%s" -#: ../nova/api/openstack/v2/contrib/security_groups.py:460 -#: ../nova/api/openstack/v2/contrib/security_groups.py:489 -msgid "Security group not specified" -msgstr "" +#: nova/api/openstack/compute/contrib/disk_config.py:44 +#, python-format +msgid "%s must be either 'MANUAL' or 'AUTO'." +msgstr "%s 必须是'MANUAL' 或者 'AUTO'。" -#: ../nova/api/openstack/v2/contrib/security_groups.py:464 -#: ../nova/api/openstack/v2/contrib/security_groups.py:493 -msgid "Security group name cannot be empty" -msgstr "" +#: nova/api/openstack/compute/contrib/networks.py:62 +#, python-format +msgid "Network does not have %s action" +msgstr "网络不包含动作 %s" + +#: nova/api/openstack/compute/contrib/networks.py:70 +#, python-format +msgid "Disassociating network with id %s" +msgstr "为id是 %s 的网络解除关联" + +#: nova/api/openstack/compute/contrib/networks.py:74 +#: nova/api/openstack/compute/contrib/networks.py:91 +#: nova/api/openstack/compute/contrib/networks.py:101 +msgid "Network not found" +msgstr "没有找到网络" + +#: nova/api/openstack/compute/contrib/networks.py:87 +#, python-format +msgid "Showing network with id %s" +msgstr "显示id是 %s 的网络" + +#: nova/api/openstack/compute/contrib/networks.py:97 +#, python-format +msgid "Deleting network with id %s" +msgstr "正在删除id是 %s 的网络" -#: ../nova/virt/vmwareapi/vmware_images.py:90 +#: nova/virt/vmwareapi/vmware_images.py:89 #, python-format msgid "Downloading image %s from glance image server" msgstr "" -#: ../nova/virt/vmwareapi/vmware_images.py:104 +#: nova/virt/vmwareapi/vmware_images.py:103 #, python-format msgid "Downloaded image %s from glance image server" msgstr "" -#: ../nova/virt/vmwareapi/vmware_images.py:109 +#: nova/virt/vmwareapi/vmware_images.py:108 #, python-format msgid "Uploading image %s to the Glance image server" msgstr "" -#: ../nova/virt/vmwareapi/vmware_images.py:130 +#: nova/virt/vmwareapi/vmware_images.py:129 #, python-format msgid "Uploaded image %s to the Glance image server" msgstr "" -#: ../nova/virt/vmwareapi/vmware_images.py:140 +#: nova/virt/vmwareapi/vmware_images.py:139 #, python-format msgid "Getting image size for the image %s" msgstr "" -#: ../nova/virt/vmwareapi/vmware_images.py:144 +#: nova/virt/vmwareapi/vmware_images.py:143 #, python-format msgid "Got image size of %(size)s for the image %(image)s" msgstr "" -#: ../nova/api/openstack/v2/limits.py:149 -#, python-format -msgid "" -"Only %(value)s %(verb)s request(s) can be made to %(uri)s every " -"%(unit_string)s." +#: nova/vsa/api.py:82 +msgid "invalid drive data" msgstr "" -#: ../nova/api/openstack/v2/limits.py:274 -msgid "This request was rate-limited." +#: nova/vsa/api.py:105 +msgid "drive_name not defined" msgstr "" -#: ../nova/virt/disk.py:124 +#: nova/vsa/api.py:111 #, python-format -msgid "Failed to load partition: %s" +msgid "invalid drive type name %s" msgstr "" -#: ../nova/virt/disk.py:148 ../nova/virt/disk.py:180 -#, python-format -msgid "Failed to mount filesystem: %s" +#: nova/vsa/api.py:155 +msgid "*** Experimental VSA code ***" msgstr "" -#: ../nova/virt/disk.py:202 +#: nova/vsa/api.py:158 nova/vsa/api.py:303 #, python-format -msgid "Failed to remove container: %s" +msgid "Requested number of VCs (%d) is too high. Setting to default" msgstr "" -#: ../nova/virt/disk.py:217 +#: nova/vsa/api.py:194 #, python-format -msgid "nbd device %s did not show up" +msgid "Creating VSA: %s" msgstr "" -#: ../nova/virt/disk.py:222 +#: nova/vsa/api.py:241 #, python-format -msgid "Could not attach image to loopback: %s" -msgstr "" - -#: ../nova/virt/disk.py:246 -msgid "No free nbd devices" +msgid "" +"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d GB, " +"type %(vol_type_id)s" msgstr "" -#: ../doc/ext/nova_todo.py:46 +#: nova/vsa/api.py:272 #, python-format -msgid "%(filename)s, line %(line_info)d" +msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s" msgstr "" -#: ../nova/api/openstack/v2/server_metadata.py:38 -#: ../nova/api/openstack/v2/server_metadata.py:117 -#: ../nova/api/openstack/v2/server_metadata.py:154 -msgid "Server does not exist" +#: nova/vsa/api.py:287 +#, python-format +msgid "VSA ID %(vsa_id)d: Update VSA call" msgstr "" -#: ../nova/api/openstack/v2/server_metadata.py:135 -#: ../nova/api/openstack/v2/server_metadata.py:147 -msgid "Metadata item was not found" +#: nova/vsa/api.py:318 +#, python-format +msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s." msgstr "" -#. FIXME(chiradeep): implement this -#: ../nova/virt/hyperv.py:119 -msgid "In init host" +#: nova/vsa/api.py:324 +#, python-format +msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s." msgstr "" -#: ../nova/virt/hyperv.py:166 +#: nova/vsa/api.py:351 #, python-format -msgid "Starting VM %s " +msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s" msgstr "" -#: ../nova/virt/hyperv.py:168 +#: nova/vsa/api.py:355 #, python-format -msgid "Started VM %s " +msgid "Unable to delete volume %s" msgstr "" -#: ../nova/virt/hyperv.py:170 +#: nova/vsa/api.py:357 #, python-format -msgid "spawn vm failed: %s" +msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s" msgstr "" -#: ../nova/virt/hyperv.py:187 +#: nova/vsa/api.py:363 #, python-format -msgid "Failed to create VM %s" +msgid "Going to try to terminate VSA ID %s" msgstr "" -#: ../nova/virt/hyperv.py:206 +#: nova/vsa/api.py:374 #, python-format -msgid "Set memory for vm %s..." +msgid "VSA ID %(vsa_id)s: Delete instance %(name)s" msgstr "" -#: ../nova/virt/hyperv.py:216 +#: nova/api/openstack/compute/contrib/multinic.py:52 +msgid "Missing 'networkId' argument for addFixedIp" +msgstr "addFixedIp缺少参数'networkId'" + +#: nova/api/openstack/compute/contrib/multinic.py:68 +msgid "Missing 'address' argument for removeFixedIp" +msgstr "removeFixedIp缺少参数'address'" + +#: nova/api/openstack/compute/contrib/multinic.py:77 #, python-format -msgid "Set vcpus for vm %s..." -msgstr "" +msgid "Unable to find address %r" +msgstr "无法找到地址 %r" -#: ../nova/virt/hyperv.py:220 +#: ../doc/ext/nova_todo.py:45 #, python-format -msgid "Creating disk for %(vm_name)s by attaching disk file %(vhdfile)s" +msgid "%(filename)s, line %(line_info)d" msgstr "" -#: ../nova/virt/hyperv.py:245 +#: nova/compute/api.py:149 #, python-format -msgid "Failed to add diskdrive to VM %s" +msgid "" +"Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties" msgstr "" -#: ../nova/virt/hyperv.py:248 +#: nova/compute/api.py:160 #, python-format -msgid "New disk drive path is %s" +msgid "Quota exceeded for %(pid)s, metadata property key or value too long" msgstr "" -#: ../nova/virt/hyperv.py:265 +#: nova/compute/api.py:213 #, python-format -msgid "Failed to add vhd file to VM %s" +msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances" msgstr "" -#: ../nova/virt/hyperv.py:267 -#, python-format -msgid "Created disk for %s" +#: nova/compute/api.py:216 +msgid "" +"Instance quota exceeded. You cannot run any more instances of this type." msgstr "" -#: ../nova/virt/hyperv.py:271 +#: nova/compute/api.py:219 #, python-format -msgid "Creating nic for %s " +msgid "" +"Instance quota exceeded. You can only run %s more instances of this type." msgstr "" -#: ../nova/virt/hyperv.py:290 -msgid "Failed creating a port on the external vswitch" +#: nova/compute/api.py:268 +msgid "Creating a raw instance" msgstr "" -#: ../nova/virt/hyperv.py:291 +#: nova/compute/api.py:270 #, python-format -msgid "Failed creating port for %s" +msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s" msgstr "" -#: ../nova/virt/hyperv.py:294 +#: nova/compute/api.py:340 #, python-format -msgid "Created switch port %(vm_name)s on switch %(ext_path)s" +msgid "Going to run %s instances..." msgstr "" -#: ../nova/virt/hyperv.py:304 +#: nova/compute/api.py:404 #, python-format -msgid "Failed to add nic to VM %s" +msgid "bdm %s" msgstr "" -#: ../nova/virt/hyperv.py:306 +#: nova/compute/api.py:431 #, python-format -msgid "Created nic for %s " +msgid "block_device_mapping %s" msgstr "" -#: ../nova/virt/hyperv.py:339 +#: nova/compute/api.py:548 #, python-format -msgid "WMI job failed: %s" +msgid "Sending create to scheduler for %(pid)s/%(uid)s's" msgstr "" -#: ../nova/virt/hyperv.py:343 +#: nova/compute/api.py:832 #, python-format -msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s " +msgid "Going to try to soft delete %s" msgstr "" -#: ../nova/virt/hyperv.py:380 +#: nova/compute/api.py:851 #, python-format -msgid "Got request to destroy vm %s" +msgid "No host for instance %s, deleting immediately" msgstr "" -#: ../nova/virt/hyperv.py:405 +#: nova/compute/api.py:885 #, python-format -msgid "Failed to destroy vm %s" +msgid "Going to try to terminate %s" msgstr "" -#: ../nova/virt/hyperv.py:412 +#: nova/compute/api.py:923 #, python-format -msgid "Del: disk %(vhdfile)s vm %(instance_name)s" +msgid "Going to try to stop %s" msgstr "" -#: ../nova/virt/hyperv.py:434 +#: nova/compute/api.py:942 #, python-format -msgid "" -"Got Info for vm %(instance_name)s: state=%(state)s, mem=%(memusage)s, " -"num_cpu=%(numprocs)s, cpu_time=%(uptime)s" +msgid "Going to try to start %s" msgstr "" -#: ../nova/virt/hyperv.py:450 +#: nova/compute/api.py:946 #, python-format -msgid "duplicate name found: %s" +msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s" msgstr "" -#: ../nova/virt/hyperv.py:470 -#, python-format -msgid "Successfully changed vm state of %(vm_name)s to %(req_state)s" +#: nova/compute/api.py:1107 +msgid "No compute host specified" msgstr "" -#: ../nova/virt/hyperv.py:473 +#: nova/compute/api.py:1110 #, python-format -msgid "Failed to change vm state of %(vm_name)s to %(req_state)s" +msgid "Unable to find host for Instance %s" msgstr "" -#: ../nova/vnc/server.py:53 +#: nova/compute/api.py:1352 +msgid "flavor_id is None. Assuming migration." +msgstr "" + +#: nova/compute/api.py:1360 #, python-format -msgid "Starting nova-vncproxy node (version %s)" +msgid "" +"Old instance type %(current_instance_type_name)s, new instance type " +"%(new_instance_type_name)s" msgstr "" -#: ../nova/vnc/server.py:58 +#: nova/compute/api.py:1651 #, python-format -msgid "Missing vncproxy_wwwroot (version %s)" +msgid "multiple fixedips exist, using the first: %s" msgstr "" -#: ../nova/vnc/server.py:60 +#: ../smoketests/run_tests.py:294 msgid "" -"You need a slightly modified version of noVNC to work with the nova-vnc-proxy" +"Missing EC2 environment variables. Please source the appropriate novarc file " +"before running this test." msgstr "" -#: ../nova/vnc/server.py:62 +#: nova/network/quantum/melange_connection.py:95 #, python-format -msgid "Check out the most recent nova noVNC code: %s" +msgid "Server returned error: %s" msgstr "" -#: ../nova/vnc/server.py:64 -#, python-format -msgid "And drop it in %s" +#: nova/network/quantum/melange_connection.py:97 +msgid "Connection error contacting melange service, retrying" msgstr "" -#: ../nova/vnc/server.py:69 +#: nova/network/quantum/melange_connection.py:107 #, python-format -msgid "Allowing access to the following files: %s" +msgid "" +"allocate IP on network |%(network_id)s| belonging to |%(network_tenant_id)s| " +"to this vif |%(vif_id)s| with mac |%(mac_address)s| belonging to " +"|%(project_id)s| " msgstr "" -#: ../nova/vnc/server.py:90 -msgid "Received connection on flash socket policy port" +#: ../bin/nova-all.py:62 ../bin/nova-all.py:68 ../bin/nova-all.py:75 +#, python-format +msgid "Failed to load %s" msgstr "" -#: ../nova/vnc/server.py:95 -msgid "Received valid flash socket policy request" +#: nova/virt/baremetal/tilera.py:185 +msgid "free_node...." msgstr "" -#: ../smoketests/run_tests.py:294 +#: nova/virt/baremetal/tilera.py:216 +#, python-format msgid "" -"Missing EC2 environment variables. Please source the appropriate novarc file " -"before running this test." +"deactivate_node is called for node_id = %(id)s node_ip = " +"%(ip)s" msgstr "" -#: ../nova/network/quantum/melange_connection.py:84 -#, python-format -msgid "Server returned error: %s" +#: nova/virt/baremetal/tilera.py:221 +msgid "status of node is set to 0" +msgstr "" + +#: nova/virt/baremetal/tilera.py:232 +msgid "rootfs is already removed" +msgstr "" + +#: nova/virt/baremetal/tilera.py:264 +msgid "Before ping to the bare-metal node" +msgstr "" + +#: nova/virt/baremetal/tilera.py:317 +msgid "activate_node" +msgstr "" + +#: nova/virt/baremetal/tilera.py:331 +msgid "Node is unknown error state." msgstr "" -#: ../nova/virt/xenapi/volumeops.py:65 +#: nova/virt/xenapi/volumeops.py:65 msgid "Could not find VDI ref" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:71 +#: nova/virt/xenapi/volumeops.py:71 msgid "Error destroying VDI" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:74 +#: nova/virt/xenapi/volumeops.py:74 #, python-format msgid "Creating SR %s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:77 +#: nova/virt/xenapi/volumeops.py:77 msgid "Could not create SR" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:80 +#: nova/virt/xenapi/volumeops.py:80 msgid "Could not retrieve SR record" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:85 +#: nova/virt/xenapi/volumeops.py:85 #, python-format msgid "Introducing SR %s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:88 +#: nova/virt/xenapi/volumeops.py:88 msgid "SR found in xapi database. No need to introduce" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:93 +#: nova/virt/xenapi/volumeops.py:93 msgid "Could not introduce SR" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:97 +#: nova/virt/xenapi/volumeops.py:97 #, python-format msgid "Checking for SR %s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:107 +#: nova/virt/xenapi/volumeops.py:107 #, python-format msgid "SR %s not found in the xapi database" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:113 +#: nova/virt/xenapi/volumeops.py:113 msgid "Could not forget SR" msgstr "" -#. NOTE: No Resource Pool concept so far -#: ../nova/virt/xenapi/volumeops.py:122 +#: nova/virt/xenapi/volumeops.py:122 #, python-format msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:174 +#: nova/virt/xenapi/volumeops.py:174 #, python-format msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s" msgstr "无法在SR %(sr_ref)s 上为实例 %(instance_name)s 创建 VDI" -#: ../nova/virt/xenapi/volumeops.py:187 +#: nova/virt/xenapi/volumeops.py:187 #, python-format msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s" msgstr "不能为实例%(instance_name)s使用SR %(sr_ref)s" -#: ../nova/virt/xenapi/volumeops.py:195 +#: nova/virt/xenapi/volumeops.py:195 #, python-format msgid "Unable to attach volume to instance %s" msgstr "无法挂载卷到虚拟机 %s" -#: ../nova/virt/xenapi/volumeops.py:198 +#: nova/virt/xenapi/volumeops.py:198 #, python-format msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s" msgstr "挂载点 %(mountpoint)s 挂载到虚拟机 %(instance_name)s" -#. Detach VBD from VM -#: ../nova/virt/xenapi/volumeops.py:208 +#: nova/virt/xenapi/volumeops.py:208 #, python-format msgid "Detach_volume: %(instance_name)s, %(mountpoint)s" msgstr "卸载_volume: %(instance_name)s, %(mountpoint)s" -#: ../nova/virt/xenapi/volumeops.py:216 +#: nova/virt/xenapi/volumeops.py:216 #, python-format msgid "Unable to locate volume %s" msgstr "无法找到 %s 卷" -#: ../nova/virt/xenapi/volumeops.py:224 +#: nova/virt/xenapi/volumeops.py:224 #, python-format msgid "Unable to detach volume %s" msgstr "无法卸载 %s 卷" -#: ../nova/virt/xenapi/volumeops.py:229 +#: nova/virt/xenapi/volumeops.py:229 #, python-format msgid "Unable to destroy vbd %s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:236 +#: nova/virt/xenapi/volumeops.py:236 #, python-format msgid "Error purging SR %s" msgstr "" -#: ../nova/virt/xenapi/volumeops.py:238 +#: nova/virt/xenapi/volumeops.py:238 #, python-format msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s" msgstr "挂载点 %(mountpoint)s 从虚拟机 %(instance_name)s 卸载" -#: ../nova/virt/libvirt/utils.py:218 +#: nova/virt/libvirt/utils.py:235 msgid "Unable to find an open port" msgstr "" -#: ../nova/tests/rpc/common.py:142 +#: nova/tests/rpc/common.py:147 #, python-format msgid "Nested received %(queue)s, %(value)s" msgstr "" -#: ../nova/tests/rpc/common.py:150 +#: nova/tests/rpc/common.py:155 #, python-format msgid "Nested return %s" msgstr "" -#: ../nova/tests/rpc/common.py:176 ../nova/tests/rpc/common.py:182 -#, python-format -msgid "Received %s" +#: nova/tests/rpc/common.py:173 +msgid "RPC backend does not support timeouts" msgstr "" -#: ../nova/tests/test_misc.py:113 +#: nova/tests/rpc/common.py:203 nova/tests/rpc/common.py:209 #, python-format -msgid "" -"The following migrations are missing a downgrade:\n" -"\t%s" +msgid "Received %s" msgstr "" -#: ../nova/virt/xenapi/vif.py:86 +#: nova/virt/xenapi/vif.py:103 #, python-format msgid "Found no PIF for device %s" msgstr "" -#: ../nova/virt/xenapi/vif.py:106 +#: nova/virt/xenapi/vif.py:122 #, python-format msgid "" "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. " "Expected %(vlan_num)d" msgstr "" -#: ../nova/volume/xensm.py:59 +#: nova/compute/utils.py:141 +msgid "v4 subnets are required for legacy nw_info" +msgstr "" + +#: nova/volume/xensm.py:55 #, python-format msgid "SR name = %s" msgstr "" -#: ../nova/volume/xensm.py:60 +#: nova/volume/xensm.py:56 #, python-format msgid "Params: %s" msgstr "" -#: ../nova/volume/xensm.py:64 +#: nova/volume/xensm.py:60 #, python-format msgid "Failed to create sr %s...continuing" msgstr "" -#: ../nova/volume/xensm.py:66 +#: nova/volume/xensm.py:62 msgid "Create failed" msgstr "" -#: ../nova/volume/xensm.py:68 +#: nova/volume/xensm.py:64 #, python-format msgid "SR UUID of new SR is: %s" msgstr "" -#: ../nova/volume/xensm.py:75 +#: nova/volume/xensm.py:71 msgid "Failed to update db" msgstr "" -#: ../nova/volume/xensm.py:84 +#: nova/volume/xensm.py:80 #, python-format msgid "Failed to introduce sr %s...continuing" msgstr "" -#: ../nova/volume/xensm.py:95 +#: nova/volume/xensm.py:91 #, python-format msgid "Failed to reach backend %d" msgstr "" -#: ../nova/volume/xensm.py:104 +#: nova/volume/xensm.py:100 msgid "XenSMDriver requires xenapi connection" msgstr "" -#: ../nova/volume/xensm.py:114 +#: nova/volume/xensm.py:110 msgid "Failed to initiate session" msgstr "" -#: ../nova/volume/xensm.py:147 +#: nova/volume/xensm.py:142 #, python-format msgid "Volume will be created in backend - %d" msgstr "" -#: ../nova/volume/xensm.py:159 +#: nova/volume/xensm.py:154 msgid "Failed to update volume in db" msgstr "" -#: ../nova/volume/xensm.py:162 +#: nova/volume/xensm.py:157 msgid "Unable to create volume" msgstr "" -#: ../nova/volume/xensm.py:176 +#: nova/volume/xensm.py:171 msgid "Failed to delete vdi" msgstr "" -#: ../nova/volume/xensm.py:182 +#: nova/volume/xensm.py:177 msgid "Failed to delete volume in db" msgstr "" -#: ../nova/volume/xensm.py:216 +#: nova/volume/xensm.py:211 msgid "Failed to find volume in db" msgstr "" -#: ../nova/volume/xensm.py:228 +#: nova/volume/xensm.py:222 msgid "Failed to find backend in db" msgstr "" -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:58 -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:255 -#, python-format -msgid "_create: param=%s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:265 -#, python-format -msgid "_volume_update: param=%s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:270 -#, python-format -msgid "_volume_delete: param=%s" -msgstr "" - -#: ../nova/tests/api/openstack/v2/contrib/test_vsa.py:275 -#, python-format -msgid "_volume_get: volume_id=%s" -msgstr "" - #. Either the methods don't exist in the agent, or they #. have been disabled. #: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/agent.py:151 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nss_db.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nss_db.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/nss_db.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nss_db.po 2012-02-23 07:11: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: 2011-12-29 10:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/makedb.c:68 msgid "Convert key to lower case" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/oneconf.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/oneconf.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/oneconf.po 2012-01-02 18:07:48.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/oneconf.po 2012-02-23 07:12:09.000000000 +0000 @@ -7,40 +7,40 @@ msgstr "" "Project-Id-Version: oneconf\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-09-23 16:42+0000\n" +"POT-Creation-Date: 2012-02-20 07:46+0000\n" "PO-Revision-Date: 2011-09-30 01:40+0000\n" "Last-Translator: Fenghua Wang \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: 2011-12-29 19:29+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 02:07+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: .././oneconf-service:66 .././oneconf-query:88 +#: .././oneconf-service:67 .././oneconf-query:89 #, c-format msgid "usage: %prog [options]" msgstr "用法: %prog [选项]" -#: .././oneconf-service:69 +#: .././oneconf-service:70 msgid "enable debug mode" msgstr "开启调试模式" -#: .././oneconf-service:71 +#: .././oneconf-service:72 msgid "use the mock infrastructure" msgstr "" -#: .././oneconf-service:92 +#: .././oneconf-service:99 msgid "" "An OneConf service is already running, shut it down with oneconf-query --stop" msgstr "已有一个 OneConf 服务运行,可用 oneconf-query --stop 将其关闭" -#: .././oneconf-query:74 +#: .././oneconf-query:75 msgid "" "you can't define --all-packages, --manual-packages or --hosts together." msgstr "您不能同时定义 --all-packages, --manual-packages 或 --hosts。" -#: .././oneconf-query:78 +#: .././oneconf-query:79 msgid "" "you can't define --list, --diff, --update, --async-update, --share-" "inventory, --stop, --get-last-sync together." @@ -48,122 +48,122 @@ "您不能同时定义--list, --diff, --update, --async-update, --share-inventory, --stop 和 " "--get-last-sync。" -#: .././oneconf-query:82 +#: .././oneconf-query:83 #, c-format msgid "%s isn't compatible with %s" msgstr "%s 与 %s 不兼容" -#: .././oneconf-query:92 +#: .././oneconf-query:93 msgid "" "Current diff between this machine and another provided by hostname/hostid" msgstr "" -#: .././oneconf-query:96 +#: .././oneconf-query:97 msgid "List stored package (default for local hostid) or host lists" msgstr "" -#: .././oneconf-query:99 +#: .././oneconf-query:100 msgid "Get last sync date" msgstr "获取最后同步日期" -#: .././oneconf-query:101 +#: .././oneconf-query:102 msgid "Update the package list in store" msgstr "更新软件中心中的软件包列表" -#: .././oneconf-query:104 +#: .././oneconf-query:105 msgid "Perform async update of the package list in store" msgstr "在软件中心异步更新包列表" -#: .././oneconf-query:106 +#: .././oneconf-query:107 msgid "Stop oneconf service" msgstr "停止 oneconf 服务" -#: .././oneconf-query:108 +#: .././oneconf-query:109 msgid "enable debug mode (use --direct)" msgstr "开启调试模式(使用 --direct)" -#: .././oneconf-query:110 +#: .././oneconf-query:111 msgid "don't use dbus for the request" msgstr "不在请求中使用 dbus" -#: .././oneconf-query:115 +#: .././oneconf-query:116 msgid "get all installed packages from storage" msgstr "列出所有已安装软件包" -#: .././oneconf-query:118 +#: .././oneconf-query:119 msgid "get only manual installed packages from storage" msgstr "列出所有手动安装的软件包" -#: .././oneconf-query:121 +#: .././oneconf-query:122 msgid "all available hosts from storage (only with list)" msgstr "" -#: .././oneconf-query:124 +#: .././oneconf-query:125 msgid "This host (only with list)" msgstr "" -#: .././oneconf-query:130 .././oneconf-query:132 +#: .././oneconf-query:131 .././oneconf-query:133 msgid "specify target host" msgstr "指定目标主机" -#: .././oneconf-query:138 +#: .././oneconf-query:139 msgid "share this inventory on the web" msgstr "在网页上共享这个清单" -#: .././oneconf-query:142 +#: .././oneconf-query:143 msgid "hide this inventory on the web" msgstr "在网页上隐藏这个清单" -#: .././oneconf-query:219 +#: .././oneconf-query:225 msgid "hostid and hostname can't be provided together" msgstr "不能同时提供主机 ID 和主机名" -#: .././oneconf-query:224 .././oneconf-query:234 +#: .././oneconf-query:230 .././oneconf-query:240 msgid "You can't use hostid or hostname when updating" msgstr "升级时无法使用主机 ID 或主机名" -#: .././oneconf-query:227 .././oneconf-query:237 +#: .././oneconf-query:233 .././oneconf-query:243 msgid "You can't define --package, --host or --hosts when updating" msgstr "升级时您无法定义 --package, --host 或 --hosts。" -#: .././oneconf-query:258 +#: .././oneconf-query:264 msgid "You have to provide either hostid or hostname for getting a diff" msgstr "您必须提供的主机 ID 或主机名以便识别" -#: .././oneconf-query:276 .././oneconf-query:285 +#: .././oneconf-query:282 .././oneconf-query:291 msgid "" "You can't define --package, --host or --hosts when changing show inventory " "status" msgstr "在更改清单状态的时候您不能定义 --package、--host 或 --hosts" -#: .././oneconf-query:282 +#: .././oneconf-query:288 msgid "You can't use hostid or hostname when changing show inventory status" msgstr "在更改显示清单时,您无法使用主机 ID 或者主机名称" -#: .././oneconf/directconnect.py:88 -msgid "" -"Nothing done: in direct mode, there is no communication with the service" -msgstr "" - #: .././oneconf/dbusconnect.py:200 #, python-format msgid "Wasn't able to request stopping the service: %s" msgstr "无法请求停止服务:%s" -#: .././oneconf/hosts.py:198 +#: .././oneconf/directconnect.py:88 +msgid "" +"Nothing done: in direct mode, there is no communication with the service" +msgstr "" + +#: .././oneconf/hosts.py:206 .././oneconf/networksync/hosts.py:206 msgid "No hostname registered for this id" msgstr "该 ID 没有主机名注册于其上" -#: .././oneconf/hosts.py:220 +#: .././oneconf/hosts.py:228 .././oneconf/networksync/hosts.py:228 msgid "" "Multiple hostid registered for this hostname. Use --list --host to get the " "hostid and use the --hostid option." msgstr "多个主机 ID 注册于该主机名。使用 --list --host 列出主机 ID 并使用 --hostid 选项。" -#: .././oneconf/hosts.py:224 +#: .././oneconf/hosts.py:232 .././oneconf/networksync/hosts.py:232 msgid "No hostid registered for this hostname" msgstr "没有为该主机名注册的主机 ID" -#: .././oneconf/hosts.py:295 +#: .././oneconf/hosts.py:304 .././oneconf/networksync/hosts.py:304 msgid "Was never synced" msgstr "从未更新" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/opcodes.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/opcodes.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/opcodes.po 2012-01-02 18:07:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/opcodes.po 2012-02-23 07:11:25.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: opcodes 2.15.96\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-02 14:30+0100\n" -"PO-Revision-Date: 2011-12-13 17:22+0000\n" +"PO-Revision-Date: 2012-01-27 01:23+0000\n" "Last-Translator: Meng Jie \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: 2011-12-29 09:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: alpha-opc.c:155 msgid "branch operand unaligned" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2012-02-23 07:11: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: 2011-12-29 15:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../bin/parsechangelog:146 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2012-01-02 18:07:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2012-02-23 07:11: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: 2011-12-29 15:25+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:27+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22 #: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/parted.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/parted.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/parted.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/parted.po 2012-02-23 07:11:33.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: 2011-12-05 21:08+0000\n" +"PO-Revision-Date: 2012-01-28 01:05+0000\n" "Last-Translator: Wang Li \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: 2011-12-29 10:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pbbuttonsd.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pbbuttonsd.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pbbuttonsd.po 2012-01-02 18:07:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pbbuttonsd.po 2012-02-23 07:11: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: 2011-12-29 14:49+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/init.c:240 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po 2012-02-23 07:11:58.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: gaim-libnotify\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-26 14:09+0000\n" -"PO-Revision-Date: 2011-08-26 14:41+0000\n" +"POT-Creation-Date: 2012-02-13 06:57+0000\n" +"PO-Revision-Date: 2012-02-13 09:12+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: chinese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../src/pidgin-libnotify.c:95 msgid "New messages" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pidgin.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pidgin.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin.po 2012-02-23 07:11:57.000000000 +0000 @@ -11,16 +11,16 @@ msgstr "" "Project-Id-Version: pidgin HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-03 13:48+0000\n" -"PO-Revision-Date: 2011-12-07 03:01+0000\n" +"POT-Creation-Date: 2012-01-05 16:39+0000\n" +"PO-Revision-Date: 2012-01-05 17:42+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \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: 2011-12-29 16:48+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:48+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #. Translators may want to transliterate the name. @@ -78,7 +78,7 @@ #: ../libpurple/protocols/jabber/jutil.c:665 #: ../libpurple/protocols/mxit/login.c:523 #: ../libpurple/protocols/mxit/protocol.c:2442 -#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1462 +#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1476 #: ../libpurple/protocols/silc10/ops.c:1451 #: ../pidgin/plugins/disco/xmppdisco.c:514 #: ../pidgin/plugins/disco/xmppdisco.c:519 @@ -194,18 +194,17 @@ #: ../libpurple/protocols/myspace/user.c:885 #: ../libpurple/protocols/oscar/oscar.c:5251 #: ../libpurple/protocols/oscar/peer.c:1066 -#: ../libpurple/protocols/sametime/sametime.c:3467 -#: ../libpurple/protocols/sametime/sametime.c:3553 -#: ../libpurple/protocols/sametime/sametime.c:3727 -#: ../libpurple/protocols/sametime/sametime.c:5480 -#: ../libpurple/protocols/sametime/sametime.c:5570 -#: ../libpurple/protocols/sametime/sametime.c:5695 +#: ../libpurple/protocols/sametime/sametime.c:3472 +#: ../libpurple/protocols/sametime/sametime.c:3558 +#: ../libpurple/protocols/sametime/sametime.c:5457 +#: ../libpurple/protocols/sametime/sametime.c:5547 +#: ../libpurple/protocols/sametime/sametime.c:5672 #: ../libpurple/protocols/silc/buddy.c:459 #: ../libpurple/protocols/silc/buddy.c:1084 #: ../libpurple/protocols/silc/buddy.c:1199 #: ../libpurple/protocols/silc/chat.c:622 #: ../libpurple/protocols/silc/chat.c:756 -#: ../libpurple/protocols/silc/ops.c:1822 +#: ../libpurple/protocols/silc/ops.c:1836 #: ../libpurple/protocols/silc/silc.c:1063 #: ../libpurple/protocols/silc/silc.c:1271 #: ../libpurple/protocols/silc10/buddy.c:468 @@ -286,7 +285,7 @@ #: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:871 -#: ../libpurple/protocols/sametime/sametime.c:5569 +#: ../libpurple/protocols/sametime/sametime.c:5546 #: ../libpurple/protocols/silc/chat.c:621 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479 #: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1696 @@ -384,10 +383,10 @@ #: ../libpurple/protocols/jabber/jabber.c:1403 #: ../libpurple/protocols/oscar/oscar.c:3032 #: ../libpurple/protocols/silc/buddy.c:1554 -#: ../libpurple/protocols/silc/ops.c:1199 -#: ../libpurple/protocols/silc/ops.c:1202 -#: ../libpurple/protocols/silc/ops.c:1338 -#: ../libpurple/protocols/silc/ops.c:1341 +#: ../libpurple/protocols/silc/ops.c:1213 +#: ../libpurple/protocols/silc/ops.c:1216 +#: ../libpurple/protocols/silc/ops.c:1352 +#: ../libpurple/protocols/silc/ops.c:1355 #: ../libpurple/protocols/silc/silc.c:1245 #: ../libpurple/protocols/silc10/buddy.c:1559 #: ../libpurple/protocols/silc10/ops.c:1191 @@ -495,8 +494,8 @@ msgstr "您必须给出要添加的组名称。" #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263 -#: ../libpurple/protocols/sametime/sametime.c:5479 -#: ../libpurple/protocols/sametime/sametime.c:5567 ../pidgin/gtkblist.c:7330 +#: ../libpurple/protocols/sametime/sametime.c:5456 +#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7330 msgid "Add Group" msgstr "添加组" @@ -629,9 +628,9 @@ #: ../libpurple/protocols/jabber/jabber.c:2445 #: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435 #: ../libpurple/protocols/silc/buddy.c:1550 -#: ../libpurple/protocols/silc/ops.c:1005 -#: ../libpurple/protocols/silc/ops.c:1188 -#: ../libpurple/protocols/silc/ops.c:1326 +#: ../libpurple/protocols/silc/ops.c:1019 +#: ../libpurple/protocols/silc/ops.c:1202 +#: ../libpurple/protocols/silc/ops.c:1340 #: ../libpurple/protocols/silc10/buddy.c:1555 #: ../libpurple/protocols/silc10/ops.c:1036 #: ../libpurple/protocols/silc10/ops.c:1179 @@ -715,8 +714,8 @@ #: ../libpurple/protocols/silc/chat.c:451 #: ../libpurple/protocols/silc/chat.c:488 #: ../libpurple/protocols/silc/chat.c:755 -#: ../libpurple/protocols/silc/ops.c:1295 -#: ../libpurple/protocols/silc/ops.c:1821 +#: ../libpurple/protocols/silc/ops.c:1309 +#: ../libpurple/protocols/silc/ops.c:1835 #: ../libpurple/protocols/silc/silc.c:1062 #: ../libpurple/protocols/silc10/buddy.c:467 #: ../libpurple/protocols/silc10/buddy.c:1191 @@ -1262,8 +1261,8 @@ #: ../libpurple/protocols/oscar/oscar.c:2296 #: ../libpurple/protocols/oscar/oscar.c:2319 #: ../libpurple/protocols/oscar/userinfo.c:303 -#: ../libpurple/protocols/sametime/sametime.c:3342 -#: ../libpurple/protocols/sametime/sametime.c:4234 +#: ../libpurple/protocols/sametime/sametime.c:3347 +#: ../libpurple/protocols/sametime/sametime.c:4198 #: ../libpurple/protocols/yahoo/libymsg.c:4030 ../pidgin/gtkblist.c:3877 #: ../pidgin/gtkblist.c:3891 ../pidgin/gtkblist.c:3893 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120 @@ -1477,7 +1476,7 @@ msgstr "聊天" #: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2138 -#: ../libpurple/protocols/sametime/sametime.c:3552 +#: ../libpurple/protocols/sametime/sametime.c:3557 msgid "Invite" msgstr "邀请" @@ -2079,10 +2078,10 @@ #: ../libpurple/protocols/oscar/oscar.c:4871 #: ../libpurple/protocols/oscar/oscar.c:4878 #: ../libpurple/protocols/oscar/oscar.c:4885 -#: ../libpurple/protocols/sametime/sametime.c:3365 -#: ../libpurple/protocols/sametime/sametime.c:3371 -#: ../libpurple/protocols/sametime/sametime.c:3377 -#: ../libpurple/protocols/sametime/sametime.c:3456 +#: ../libpurple/protocols/sametime/sametime.c:3370 +#: ../libpurple/protocols/sametime/sametime.c:3376 +#: ../libpurple/protocols/sametime/sametime.c:3382 +#: ../libpurple/protocols/sametime/sametime.c:3461 #: ../libpurple/protocols/silc/buddy.c:1566 #: ../libpurple/protocols/silc10/buddy.c:1571 #: ../libpurple/protocols/simple/simple.c:247 @@ -2952,158 +2951,158 @@ msgstr "来自 %s 的文件传送失败。" #: ../libpurple/gconf/purple.schemas.in.h:1 -msgid "Run the command in a terminal" -msgstr "在终端中运行命令" +msgid "Whether the specified command should handle \"aim\" URLs" +msgstr "指定的命令是否应处理“aim”URLs" #: ../libpurple/gconf/purple.schemas.in.h:2 -msgid "The command used to handle \"aim\" URLs, if enabled." -msgstr "如果启用的话,用于处理“aim”URL 的命令。" +msgid "" +"True if the command specified in the \"command\" key should handle \"aim\" " +"URLs." +msgstr "设为 true 可在“command”键中指定一个程序来处理“aim”URLs。" #: ../libpurple/gconf/purple.schemas.in.h:3 -msgid "The command used to handle \"gg\" URLs, if enabled." -msgstr "如果启用的话,用于处理“gg”URL 的命令。" +msgid "The handler for \"aim\" URLs" +msgstr "“aim”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:4 -msgid "The command used to handle \"icq\" URLs, if enabled." -msgstr "如果启用的话,用于处理“icq”URL 的命令。" +msgid "The command used to handle \"aim\" URLs, if enabled." +msgstr "如果启用的话,用于处理“aim”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:5 -msgid "The command used to handle \"irc\" URLs, if enabled." -msgstr "如果启用的话,用于处理“irc”URL 的命令。" +msgid "Run the command in a terminal" +msgstr "在终端中运行命令" #: ../libpurple/gconf/purple.schemas.in.h:6 -msgid "The command used to handle \"msnim\" URLs, if enabled." -msgstr "如果启用的话,用于处理“msnim”URL 的命令。" +msgid "" +"True if the command used to handle this type of URL should be run in a " +"terminal." +msgstr "真代表要处理此 URL 的程序应该在终端中运行。" #: ../libpurple/gconf/purple.schemas.in.h:7 -msgid "The command used to handle \"sip\" URLs, if enabled." -msgstr "如果启用的话,用于处理“sip”URL 的命令。" +msgid "Whether the specified command should handle \"gg\" URLs" +msgstr "是否指定的命令应当处理 \"gg\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:8 -msgid "The command used to handle \"xmpp\" URLs, if enabled." -msgstr "如果启用的话,用于处理“xmpp”URL 的命令。" +msgid "" +"True if the command specified in the \"command\" key should handle \"gg\" " +"URLs." +msgstr "设为 true 可在“command”键中指定一个程序来处理“gg”URLs。" #: ../libpurple/gconf/purple.schemas.in.h:9 -msgid "The command used to handle \"ymsgr\" URLs, if enabled." -msgstr "如果启用的话,用于处理“ymsgr”URL 的命令。" +msgid "The handler for \"gg\" URLs" +msgstr "“gg”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:10 -msgid "The handler for \"aim\" URLs" -msgstr "“aim”URL 的处理程序" +msgid "The command used to handle \"gg\" URLs, if enabled." +msgstr "如果启用的话,用于处理“gg”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:11 -msgid "The handler for \"gg\" URLs" -msgstr "“gg”URL 的处理程序" +msgid "Whether the specified command should handle \"icq\" URLs" +msgstr "是否指定的命令应当处理 \"icq\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:12 -msgid "The handler for \"icq\" URLs" -msgstr "“icq”URL 的处理程序" +msgid "" +"True if the command specified in the \"command\" key should handle \"icq\" " +"URLs." +msgstr "设为 true 可在“command”键中指定一个程序来处理“icq”URLs。" #: ../libpurple/gconf/purple.schemas.in.h:13 -msgid "The handler for \"irc\" URLs" -msgstr "“irc”URL 的处理程序" +msgid "The handler for \"icq\" URLs" +msgstr "“icq”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:14 -msgid "The handler for \"msnim\" URLs" -msgstr "“msnim”URL 的处理程序" +msgid "The command used to handle \"icq\" URLs, if enabled." +msgstr "如果启用的话,用于处理“icq”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:15 -msgid "The handler for \"sip\" URLs" -msgstr "“sip”URL 的处理程序" +msgid "Whether the specified command should handle \"irc\" URLs" +msgstr "是否指定的命令应当处理 \"irc\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:16 -msgid "The handler for \"xmpp\" URLs" -msgstr "“xmpp”URL 的处理程序" +msgid "" +"True if the command specified in the \"command\" key should handle \"irc\" " +"URLs." +msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"irc\" 网址即为真。" #: ../libpurple/gconf/purple.schemas.in.h:17 -msgid "The handler for \"ymsgr\" URLs" -msgstr "“ymsgr”URL 的处理程序" +msgid "The handler for \"irc\" URLs" +msgstr "“irc”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:18 -msgid "" -"True if the command specified in the \"command\" key should handle \"aim\" " -"URLs." -msgstr "设为 true 可在“command”键中指定一个程序来处理“aim”URLs。" +msgid "The command used to handle \"irc\" URLs, if enabled." +msgstr "如果启用的话,用于处理“irc”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:19 -msgid "" -"True if the command specified in the \"command\" key should handle \"gg\" " -"URLs." -msgstr "设为 true 可在“command”键中指定一个程序来处理“gg”URLs。" +msgid "Whether the specified command should handle \"msnim\" URLs" +msgstr "是否指定的命令应当处理 \"msnim\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:20 msgid "" -"True if the command specified in the \"command\" key should handle \"icq\" " +"True if the command specified in the \"command\" key should handle \"msnim\" " "URLs." -msgstr "设为 true 可在“command”键中指定一个程序来处理“icq”URLs。" +msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"msnim\" 网址即为真。" #: ../libpurple/gconf/purple.schemas.in.h:21 -msgid "" -"True if the command specified in the \"command\" key should handle \"irc\" " -"URLs." -msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"irc\" 网址即为真。" +msgid "The handler for \"msnim\" URLs" +msgstr "“msnim”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:22 -msgid "" -"True if the command specified in the \"command\" key should handle \"msnim\" " -"URLs." -msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"msnim\" 网址即为真。" +msgid "The command used to handle \"msnim\" URLs, if enabled." +msgstr "如果启用的话,用于处理“msnim”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:23 -msgid "" -"True if the command specified in the \"command\" key should handle \"sip\" " -"URLs." -msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"sip\" 网址即为真。" +msgid "Whether the specified command should handle \"sip\" URLs" +msgstr "是否指定的命令应当处理 \"sip\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:24 msgid "" -"True if the command specified in the \"command\" key should handle \"xmpp\" " +"True if the command specified in the \"command\" key should handle \"sip\" " "URLs." -msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"xmpp\" 网址即为真。" +msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"sip\" 网址即为真。" #: ../libpurple/gconf/purple.schemas.in.h:25 -msgid "" -"True if the command specified in the \"command\" key should handle \"ymsgr\" " -"URLs." -msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"ymsgr\" 网址即为真。" +msgid "The handler for \"sip\" URLs" +msgstr "“sip”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:26 -msgid "" -"True if the command used to handle this type of URL should be run in a " -"terminal." -msgstr "真代表要处理此 URL 的程序应该在终端中运行。" +msgid "The command used to handle \"sip\" URLs, if enabled." +msgstr "如果启用的话,用于处理“sip”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:27 -msgid "Whether the specified command should handle \"aim\" URLs" -msgstr "指定的命令是否应处理“aim”URLs" +msgid "Whether the specified command should handle \"xmpp\" URLs" +msgstr "是否指定的命令应当处理 \"xmpp\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:28 -msgid "Whether the specified command should handle \"gg\" URLs" -msgstr "是否指定的命令应当处理 \"gg\" 网址" +msgid "" +"True if the command specified in the \"command\" key should handle \"xmpp\" " +"URLs." +msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"xmpp\" 网址即为真。" #: ../libpurple/gconf/purple.schemas.in.h:29 -msgid "Whether the specified command should handle \"icq\" URLs" -msgstr "是否指定的命令应当处理 \"icq\" 网址" +msgid "The handler for \"xmpp\" URLs" +msgstr "“xmpp”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:30 -msgid "Whether the specified command should handle \"irc\" URLs" -msgstr "是否指定的命令应当处理 \"irc\" 网址" +msgid "The command used to handle \"xmpp\" URLs, if enabled." +msgstr "如果启用的话,用于处理“xmpp”URL 的命令。" #: ../libpurple/gconf/purple.schemas.in.h:31 -msgid "Whether the specified command should handle \"msnim\" URLs" -msgstr "是否指定的命令应当处理 \"msnim\" 网址" +msgid "Whether the specified command should handle \"ymsgr\" URLs" +msgstr "是否指定的命令应当处理 \"ymsgr\" 网址" #: ../libpurple/gconf/purple.schemas.in.h:32 -msgid "Whether the specified command should handle \"sip\" URLs" -msgstr "是否指定的命令应当处理 \"sip\" 网址" +msgid "" +"True if the command specified in the \"command\" key should handle \"ymsgr\" " +"URLs." +msgstr "如果在 \"command\" 键中指定的这个命令应当处理 \"ymsgr\" 网址即为真。" #: ../libpurple/gconf/purple.schemas.in.h:33 -msgid "Whether the specified command should handle \"xmpp\" URLs" -msgstr "是否指定的命令应当处理 \"xmpp\" 网址" +msgid "The handler for \"ymsgr\" URLs" +msgstr "“ymsgr”URL 的处理程序" #: ../libpurple/gconf/purple.schemas.in.h:34 -msgid "Whether the specified command should handle \"ymsgr\" URLs" -msgstr "是否指定的命令应当处理 \"ymsgr\" 网址" +msgid "The command used to handle \"ymsgr\" URLs, if enabled." +msgstr "如果启用的话,用于处理“ymsgr”URL 的命令。" #: ../libpurple/log.c:198 msgid "The logger has no read function" @@ -4109,7 +4108,7 @@ #: ../libpurple/protocols/jabber/buddy.c:2006 #: ../libpurple/protocols/jabber/jabber.c:1320 #: ../libpurple/protocols/mxit/actions.c:275 -#: ../libpurple/protocols/silc/ops.c:1044 +#: ../libpurple/protocols/silc/ops.c:1058 #: ../libpurple/protocols/silc/silc.c:1010 #: ../libpurple/protocols/silc/silc.c:1251 #: ../libpurple/protocols/silc/util.c:562 @@ -4167,8 +4166,8 @@ #: ../libpurple/protocols/bonjour/jabber.c:493 #: ../libpurple/protocols/bonjour/jabber.c:558 #: ../libpurple/protocols/bonjour/jabber.c:603 -#: ../libpurple/protocols/bonjour/jabber.c:876 -#: ../libpurple/protocols/bonjour/jabber.c:897 +#: ../libpurple/protocols/bonjour/jabber.c:880 +#: ../libpurple/protocols/bonjour/jabber.c:901 msgid "Unable to send the message, the conversation couldn't be started." msgstr "无法发送消息,无法开始对话。" @@ -4444,7 +4443,7 @@ #: ../libpurple/protocols/mxit/roster.c:57 #: ../libpurple/protocols/oscar/oscar.c:159 #: ../libpurple/protocols/oscar/oscar.c:4877 -#: ../libpurple/protocols/sametime/sametime.c:3376 +#: ../libpurple/protocols/sametime/sametime.c:3381 msgid "Do Not Disturb" msgstr "忙碌 - 请勿打扰" @@ -4483,7 +4482,7 @@ #: ../libpurple/protocols/mxit/profile.c:187 #: ../libpurple/protocols/mxit/profile.c:290 #: ../libpurple/protocols/oscar/userinfo.c:416 -#: ../libpurple/protocols/silc/ops.c:993 +#: ../libpurple/protocols/silc/ops.c:1007 #: ../libpurple/protocols/silc10/ops.c:1024 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544 msgid "First Name" @@ -4539,7 +4538,7 @@ #. * we're ready for it (session key, userid, username all setup). #: ../libpurple/protocols/gg/gg.c:1915 #: ../libpurple/protocols/myspace/myspace.c:1159 -#: ../libpurple/protocols/sametime/sametime.c:1574 +#: ../libpurple/protocols/sametime/sametime.c:1579 msgid "Connected" msgstr "已连接" @@ -4571,7 +4570,7 @@ #: ../libpurple/protocols/myspace/myspace.c:2206 #: ../libpurple/protocols/novell/novell.c:2203 #: ../libpurple/protocols/oscar/oscar.c:834 -#: ../libpurple/protocols/sametime/sametime.c:3806 +#: ../libpurple/protocols/sametime/sametime.c:3770 #: ../libpurple/protocols/simple/simple.c:1960 #: ../libpurple/protocols/yahoo/libymsg.c:3682 #: ../libpurple/protocols/zephyr/zephyr.c:1583 ../pidgin/gtkstatusbox.c:716 @@ -4738,7 +4737,7 @@ #: ../libpurple/protocols/myspace/myspace.c:2070 #: ../libpurple/protocols/oscar/flap_connection.c:474 #: ../libpurple/protocols/sametime/sametime.c:412 -#: ../libpurple/protocols/sametime/sametime.c:1775 +#: ../libpurple/protocols/sametime/sametime.c:1780 #: ../libpurple/protocols/simple/simple.c:433 #: ../libpurple/protocols/yahoo/libymsg.c:3148 #: ../libpurple/protocols/yahoo/libymsg.c:3302 @@ -4786,7 +4785,7 @@ #: ../libpurple/protocols/oscar/oscar.c:829 #: ../libpurple/protocols/oscar/oscar.c:1051 #: ../libpurple/protocols/oscar/oscar.c:1172 -#: ../libpurple/protocols/sametime/sametime.c:3810 +#: ../libpurple/protocols/sametime/sametime.c:3774 #: ../libpurple/protocols/silc/silc.c:451 #: ../libpurple/protocols/simple/simple.c:482 #: ../libpurple/protocols/simple/simple.c:1860 @@ -4807,7 +4806,7 @@ #: ../libpurple/protocols/irc/irc.c:491 #: ../libpurple/protocols/myspace/myspace.c:2163 #: ../libpurple/protocols/oscar/flap_connection.c:479 -#: ../libpurple/protocols/sametime/sametime.c:1800 +#: ../libpurple/protocols/sametime/sametime.c:1805 #: ../libpurple/protocols/simple/simple.c:452 #: ../libpurple/protocols/simple/simple.c:1740 #: ../libpurple/protocols/yahoo/libymsg.c:3237 @@ -4821,7 +4820,7 @@ #: ../libpurple/protocols/jabber/jabber.c:727 #: ../libpurple/protocols/myspace/myspace.c:2079 #: ../libpurple/protocols/oscar/flap_connection.c:472 -#: ../libpurple/protocols/sametime/sametime.c:1767 +#: ../libpurple/protocols/sametime/sametime.c:1772 #: ../libpurple/protocols/yahoo/libymsg.c:3155 #: ../libpurple/protocols/yahoo/libymsg.c:3309 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:884 @@ -4839,9 +4838,9 @@ msgstr "用户" #: ../libpurple/protocols/irc/irc.c:879 -#: ../libpurple/protocols/sametime/sametime.c:3453 +#: ../libpurple/protocols/sametime/sametime.c:3458 #: ../libpurple/protocols/silc/chat.c:1408 -#: ../libpurple/protocols/silc/ops.c:1395 +#: ../libpurple/protocols/silc/ops.c:1409 #: ../libpurple/protocols/silc10/chat.c:1429 #: ../libpurple/protocols/silc10/ops.c:1382 #: ../libpurple/protocols/yahoo/yahoochat.c:1546 @@ -4865,13 +4864,13 @@ msgid "The IRC Protocol Plugin that Sucks Less" msgstr "错误更少的 IRC 协议插件" -#. host to connect to +#. set up account ID as user:server #: ../libpurple/protocols/irc/irc.c:1049 ../libpurple/protocols/irc/msgs.c:377 #: ../libpurple/protocols/msn/msn.c:3046 #: ../libpurple/protocols/oscar/oscar.c:5785 -#: ../libpurple/protocols/sametime/sametime.c:5810 -#: ../libpurple/protocols/silc/ops.c:1251 -#: ../libpurple/protocols/silc/ops.c:1345 +#: ../libpurple/protocols/sametime/sametime.c:5784 +#: ../libpurple/protocols/silc/ops.c:1265 +#: ../libpurple/protocols/silc/ops.c:1359 #: ../libpurple/protocols/silc10/ops.c:1244 #: ../libpurple/protocols/silc10/ops.c:1347 #: ../libpurple/protocols/simple/simple.c:2164 @@ -4881,7 +4880,7 @@ #. port to connect to #: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3051 #: ../libpurple/protocols/oscar/oscar.c:5788 -#: ../libpurple/protocols/sametime/sametime.c:5815 +#: ../libpurple/protocols/sametime/sametime.c:5793 #: ../libpurple/protocols/silc/silc.c:2197 #: ../libpurple/protocols/silc10/silc.c:1910 msgid "Port" @@ -4951,13 +4950,13 @@ #: ../libpurple/protocols/irc/msgs.c:357 #: ../libpurple/protocols/oscar/userinfo.c:406 -#: ../libpurple/protocols/silc/ops.c:1424 +#: ../libpurple/protocols/silc/ops.c:1438 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Nick" msgstr "昵称" #: ../libpurple/protocols/irc/msgs.c:383 -#: ../libpurple/protocols/silc/ops.c:1270 +#: ../libpurple/protocols/silc/ops.c:1284 #: ../libpurple/protocols/silc10/ops.c:1272 msgid "Currently on" msgstr "目前位于" @@ -5058,7 +5057,7 @@ #. Remove user from channel #: ../libpurple/protocols/irc/msgs.c:962 #: ../libpurple/protocols/jabber/presence.c:747 -#: ../libpurple/protocols/silc/ops.c:716 +#: ../libpurple/protocols/silc/ops.c:730 #: ../libpurple/protocols/silc10/ops.c:720 #, c-format msgid "Kicked by %s (%s)" @@ -5128,7 +5127,7 @@ msgstr "无法加入 %s:需要注册。" #: ../libpurple/protocols/irc/msgs.c:1308 -#: ../libpurple/protocols/silc/ops.c:1095 +#: ../libpurple/protocols/silc/ops.c:1109 #: ../libpurple/protocols/silc10/ops.c:1128 msgid "Cannot join channel" msgstr "无法加入频道" @@ -5538,15 +5537,15 @@ #: ../libpurple/protocols/jabber/buddy.c:350 #: ../libpurple/protocols/jabber/buddy.c:1024 -#: ../libpurple/protocols/sametime/sametime.c:4212 -#: ../libpurple/protocols/silc/ops.c:989 +#: ../libpurple/protocols/sametime/sametime.c:4176 +#: ../libpurple/protocols/silc/ops.c:1003 #: ../libpurple/protocols/silc10/ops.c:1020 msgid "Full Name" msgstr "全名" #: ../libpurple/protocols/jabber/buddy.c:351 #: ../libpurple/protocols/jabber/buddy.c:1035 -#: ../libpurple/protocols/silc/ops.c:1001 +#: ../libpurple/protocols/silc/ops.c:1015 #: ../libpurple/protocols/silc10/ops.c:1032 msgid "Family Name" msgstr "姓" @@ -5621,7 +5620,7 @@ #: ../libpurple/protocols/jabber/buddy.c:1163 #: ../libpurple/protocols/msn/msn.c:2525 #: ../libpurple/protocols/novell/novell.c:1497 -#: ../libpurple/protocols/silc/ops.c:1013 +#: ../libpurple/protocols/silc/ops.c:1027 #: ../libpurple/protocols/silc10/ops.c:1044 msgid "Job Title" msgstr "职称" @@ -5703,7 +5702,7 @@ msgstr "%s 前" #: ../libpurple/protocols/jabber/buddy.c:1039 -#: ../libpurple/protocols/silc/ops.c:997 +#: ../libpurple/protocols/silc/ops.c:1011 #: ../libpurple/protocols/silc10/ops.c:1028 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547 msgid "Middle Name" @@ -5713,7 +5712,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1324 #: ../libpurple/protocols/oscar/userinfo.c:466 #: ../libpurple/protocols/oscar/userinfo.c:474 -#: ../libpurple/protocols/silc/ops.c:1033 +#: ../libpurple/protocols/silc/ops.c:1047 #: ../libpurple/protocols/silc10/ops.c:1064 msgid "Address" msgstr "地址" @@ -5834,7 +5833,7 @@ #. "Search" #: ../libpurple/protocols/jabber/buddy.c:2213 -#: ../libpurple/protocols/sametime/sametime.c:5694 +#: ../libpurple/protocols/sametime/sametime.c:5671 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356 msgid "Search" @@ -5927,7 +5926,7 @@ #: ../libpurple/protocols/jabber/chat.c:813 #: ../libpurple/protocols/jabber/chat.c:824 -#: ../libpurple/protocols/silc/ops.c:1462 +#: ../libpurple/protocols/silc/ops.c:1476 #: ../libpurple/protocols/silc10/ops.c:1451 msgid "Error retrieving room list" msgstr "收取聊天室列表时出错" @@ -6038,7 +6037,7 @@ msgstr "邮政编码" #: ../libpurple/protocols/jabber/jabber.c:1328 -#: ../libpurple/protocols/silc/ops.c:1038 +#: ../libpurple/protocols/silc/ops.c:1052 #: ../libpurple/protocols/silc/silc.c:1012 #: ../libpurple/protocols/silc/util.c:564 #: ../libpurple/protocols/silc10/ops.c:1069 @@ -6148,7 +6147,7 @@ #: ../libpurple/protocols/mxit/profile.c:210 #: ../libpurple/protocols/oscar/userinfo.c:298 #: ../libpurple/protocols/silc/buddy.c:1572 -#: ../libpurple/protocols/silc/ops.c:1214 +#: ../libpurple/protocols/silc/ops.c:1228 #: ../libpurple/protocols/silc10/buddy.c:1577 #: ../libpurple/protocols/silc10/ops.c:1207 msgid "Mood" @@ -8118,7 +8117,7 @@ msgstr "上次更新" #: ../libpurple/protocols/msn/msn.c:2683 -#: ../libpurple/protocols/silc/ops.c:1029 +#: ../libpurple/protocols/silc/ops.c:1043 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "主页" @@ -8205,7 +8204,7 @@ #: ../libpurple/protocols/msn/notification.c:831 #: ../libpurple/protocols/msn/notification.c:855 -#: ../libpurple/protocols/sametime/sametime.c:4509 +#: ../libpurple/protocols/sametime/sametime.c:4473 msgid "Unable to add user" msgstr "无法添加用户" @@ -9645,7 +9644,7 @@ msgstr "邮箱" #: ../libpurple/protocols/novell/novell.c:1515 -#: ../libpurple/protocols/sametime/sametime.c:4206 +#: ../libpurple/protocols/sametime/sametime.c:4170 msgid "User ID" msgstr "用户 ID" @@ -11131,155 +11130,155 @@ msgid "These buddies will always see you as offline" msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:1316 +#: ../libpurple/protocols/sametime/sametime.c:1321 #, c-format msgid "Group Title: %s
" msgstr "组标题: %s
" -#: ../libpurple/protocols/sametime/sametime.c:1317 +#: ../libpurple/protocols/sametime/sametime.c:1322 #, c-format msgid "Notes Group ID: %s
" msgstr "Notes 组 ID: %s
" -#: ../libpurple/protocols/sametime/sametime.c:1319 +#: ../libpurple/protocols/sametime/sametime.c:1324 #, c-format msgid "Info for Group %s" msgstr "组 %s 的信息" -#: ../libpurple/protocols/sametime/sametime.c:1321 +#: ../libpurple/protocols/sametime/sametime.c:1326 msgid "Notes Address Book Information" msgstr "Notes 通讯录信息" -#: ../libpurple/protocols/sametime/sametime.c:1353 +#: ../libpurple/protocols/sametime/sametime.c:1358 msgid "Invite Group to Conference..." msgstr "邀请组加入会议..." -#: ../libpurple/protocols/sametime/sametime.c:1363 +#: ../libpurple/protocols/sametime/sametime.c:1368 msgid "Get Notes Address Book Info" msgstr "获得 Notes 通讯录信息" -#: ../libpurple/protocols/sametime/sametime.c:1534 +#: ../libpurple/protocols/sametime/sametime.c:1539 msgid "Sending Handshake" msgstr "发送握手" -#: ../libpurple/protocols/sametime/sametime.c:1539 +#: ../libpurple/protocols/sametime/sametime.c:1544 msgid "Waiting for Handshake Acknowledgement" msgstr "等候握手应答" -#: ../libpurple/protocols/sametime/sametime.c:1544 +#: ../libpurple/protocols/sametime/sametime.c:1549 msgid "Handshake Acknowledged, Sending Login" msgstr "握手成功,发送登录信息" -#: ../libpurple/protocols/sametime/sametime.c:1549 +#: ../libpurple/protocols/sametime/sametime.c:1554 msgid "Waiting for Login Acknowledgement" msgstr "正在等待登录确认" -#: ../libpurple/protocols/sametime/sametime.c:1554 +#: ../libpurple/protocols/sametime/sametime.c:1559 msgid "Login Redirected" msgstr "登录被重定向" -#: ../libpurple/protocols/sametime/sametime.c:1560 +#: ../libpurple/protocols/sametime/sametime.c:1565 msgid "Forcing Login" msgstr "强制登录" -#: ../libpurple/protocols/sametime/sametime.c:1564 +#: ../libpurple/protocols/sametime/sametime.c:1569 msgid "Login Acknowledged" msgstr "登录被接受" -#: ../libpurple/protocols/sametime/sametime.c:1569 +#: ../libpurple/protocols/sametime/sametime.c:1574 msgid "Starting Services" msgstr "启动服务" -#: ../libpurple/protocols/sametime/sametime.c:1706 +#: ../libpurple/protocols/sametime/sametime.c:1711 #, c-format msgid "" "A Sametime administrator has issued the following announcement on server %s" msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:1711 +#: ../libpurple/protocols/sametime/sametime.c:1716 msgid "Sametime Administrator Announcement" msgstr "Sametime 管理员通知" -#: ../libpurple/protocols/sametime/sametime.c:1843 +#: ../libpurple/protocols/sametime/sametime.c:1848 #, c-format msgid "Announcement from %s" msgstr "来自 %s 的通知" -#: ../libpurple/protocols/sametime/sametime.c:2017 +#: ../libpurple/protocols/sametime/sametime.c:2022 msgid "Conference Closed" msgstr "会议已关闭" -#: ../libpurple/protocols/sametime/sametime.c:2482 +#: ../libpurple/protocols/sametime/sametime.c:2487 msgid "Unable to send message: " msgstr "无法发送消息: " -#: ../libpurple/protocols/sametime/sametime.c:2488 +#: ../libpurple/protocols/sametime/sametime.c:2493 #, c-format msgid "Unable to send message to %s:" msgstr "无法给 %s 发送消息:" -#: ../libpurple/protocols/sametime/sametime.c:3038 +#: ../libpurple/protocols/sametime/sametime.c:3043 msgid "Place Closed" msgstr "已取消" -#: ../libpurple/protocols/sametime/sametime.c:3308 +#: ../libpurple/protocols/sametime/sametime.c:3313 msgid "Microphone" msgstr "话筒" -#: ../libpurple/protocols/sametime/sametime.c:3309 +#: ../libpurple/protocols/sametime/sametime.c:3314 msgid "Speakers" msgstr "扬声器" -#: ../libpurple/protocols/sametime/sametime.c:3310 +#: ../libpurple/protocols/sametime/sametime.c:3315 msgid "Video Camera" msgstr "摄像头" -#: ../libpurple/protocols/sametime/sametime.c:3314 +#: ../libpurple/protocols/sametime/sametime.c:3319 msgid "File Transfer" msgstr "文件传送" -#: ../libpurple/protocols/sametime/sametime.c:3348 -#: ../libpurple/protocols/sametime/sametime.c:4229 +#: ../libpurple/protocols/sametime/sametime.c:3353 +#: ../libpurple/protocols/sametime/sametime.c:4193 msgid "Supports" msgstr "支持" -#: ../libpurple/protocols/sametime/sametime.c:3353 -#: ../libpurple/protocols/sametime/sametime.c:4203 +#: ../libpurple/protocols/sametime/sametime.c:3358 +#: ../libpurple/protocols/sametime/sametime.c:4167 msgid "External User" msgstr "外部用户" -#: ../libpurple/protocols/sametime/sametime.c:3459 +#: ../libpurple/protocols/sametime/sametime.c:3464 msgid "Create conference with user" msgstr "创建与用户的会议" -#: ../libpurple/protocols/sametime/sametime.c:3460 +#: ../libpurple/protocols/sametime/sametime.c:3465 #, c-format msgid "" "Please enter a topic for the new conference, and an invitation message to be " "sent to %s" msgstr "请输入新会议的主题,以及向 %s 发送的邀请消息" -#: ../libpurple/protocols/sametime/sametime.c:3464 +#: ../libpurple/protocols/sametime/sametime.c:3469 msgid "New Conference" msgstr "新建会议" -#: ../libpurple/protocols/sametime/sametime.c:3466 +#: ../libpurple/protocols/sametime/sametime.c:3471 msgid "Create" msgstr "创建" -#: ../libpurple/protocols/sametime/sametime.c:3531 +#: ../libpurple/protocols/sametime/sametime.c:3536 msgid "Available Conferences" msgstr "可用会议" -#: ../libpurple/protocols/sametime/sametime.c:3537 +#: ../libpurple/protocols/sametime/sametime.c:3542 msgid "Create New Conference..." msgstr "创建新会议..." -#: ../libpurple/protocols/sametime/sametime.c:3544 +#: ../libpurple/protocols/sametime/sametime.c:3549 msgid "Invite user to a conference" msgstr "邀请用户加入会议" -#: ../libpurple/protocols/sametime/sametime.c:3545 +#: ../libpurple/protocols/sametime/sametime.c:3550 #, c-format msgid "" "Select a conference from the list below to send an invite to user %s. Select " @@ -11287,91 +11286,72 @@ "this user to." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:3550 +#: ../libpurple/protocols/sametime/sametime.c:3555 msgid "Invite to Conference" msgstr "邀请会议" -#: ../libpurple/protocols/sametime/sametime.c:3641 +#: ../libpurple/protocols/sametime/sametime.c:3646 msgid "Invite to Conference..." msgstr "邀请会议..." -#: ../libpurple/protocols/sametime/sametime.c:3646 +#: ../libpurple/protocols/sametime/sametime.c:3651 msgid "Send TEST Announcement" msgstr "发送测试宣告" -#: ../libpurple/protocols/sametime/sametime.c:3665 ../pidgin/gtkconv.c:4685 +#: ../libpurple/protocols/sametime/sametime.c:3670 ../pidgin/gtkconv.c:4685 msgid "Topic:" msgstr "话题:" -#: ../libpurple/protocols/sametime/sametime.c:3693 -msgid "No Sametime Community Server specified" -msgstr "没有指定同步社区服务器" - -#: ../libpurple/protocols/sametime/sametime.c:3718 -#, c-format -msgid "" -"No host or IP address has been configured for the Meanwhile account %s. " -"Please enter one below to continue logging in." -msgstr "没有为帐户 %s 配置主机或者 IP 地址。请在下面输入一个来登录。" - -#: ../libpurple/protocols/sametime/sametime.c:3723 -msgid "Meanwhile Connection Setup" -msgstr "Meanwhile 连接设置" - -#: ../libpurple/protocols/sametime/sametime.c:3724 -msgid "No Sametime Community Server Specified" -msgstr "没有指定同步社区服务器" - -#: ../libpurple/protocols/sametime/sametime.c:3726 -msgid "Connect" -msgstr "连接" +#: ../libpurple/protocols/sametime/sametime.c:3730 +msgid "A server is required to connect this account" +msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:4219 +#: ../libpurple/protocols/sametime/sametime.c:4183 #, c-format msgid "Unknown (0x%04x)
" msgstr "未知 (0x%04x)
" -#: ../libpurple/protocols/sametime/sametime.c:4221 +#: ../libpurple/protocols/sametime/sametime.c:4185 msgid "Last Known Client" msgstr "客户等级" -#: ../libpurple/protocols/sametime/sametime.c:4385 -#: ../libpurple/protocols/sametime/sametime.c:5589 +#: ../libpurple/protocols/sametime/sametime.c:4349 +#: ../libpurple/protocols/sametime/sametime.c:5566 msgid "User Name" msgstr "用户名" -#: ../libpurple/protocols/sametime/sametime.c:4388 -#: ../libpurple/protocols/sametime/sametime.c:5592 +#: ../libpurple/protocols/sametime/sametime.c:4352 +#: ../libpurple/protocols/sametime/sametime.c:5569 msgid "Sametime ID" msgstr "Sametime ID" -#: ../libpurple/protocols/sametime/sametime.c:4412 +#: ../libpurple/protocols/sametime/sametime.c:4376 msgid "An ambiguous user ID was entered" msgstr "输入了一个模糊的用户 ID" -#: ../libpurple/protocols/sametime/sametime.c:4413 +#: ../libpurple/protocols/sametime/sametime.c:4377 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following users. Please " "select the correct user from the list below to add them to your buddy list." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:4418 +#: ../libpurple/protocols/sametime/sametime.c:4382 msgid "Select User" msgstr "选择用户" -#: ../libpurple/protocols/sametime/sametime.c:4502 +#: ../libpurple/protocols/sametime/sametime.c:4466 msgid "Unable to add user: user not found" msgstr "无法添加用户:用户未找到" -#: ../libpurple/protocols/sametime/sametime.c:4504 +#: ../libpurple/protocols/sametime/sametime.c:4468 #, c-format msgid "" "The identifier '%s' did not match any users in your Sametime community. This " "entry has been removed from your buddy list." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5093 +#: ../libpurple/protocols/sametime/sametime.c:5057 #, c-format msgid "" "Error reading file %s: \n" @@ -11380,63 +11360,63 @@ "读取文件 %s 出错:\n" "%s。\n" -#: ../libpurple/protocols/sametime/sametime.c:5229 +#: ../libpurple/protocols/sametime/sametime.c:5206 msgid "Remotely Stored Buddy List" msgstr "远程存储好友列表" -#: ../libpurple/protocols/sametime/sametime.c:5234 +#: ../libpurple/protocols/sametime/sametime.c:5211 msgid "Buddy List Storage Mode" msgstr "好友列表存储模式" -#: ../libpurple/protocols/sametime/sametime.c:5237 +#: ../libpurple/protocols/sametime/sametime.c:5214 msgid "Local Buddy List Only" msgstr "本地好友列表" -#: ../libpurple/protocols/sametime/sametime.c:5239 +#: ../libpurple/protocols/sametime/sametime.c:5216 msgid "Merge List from Server" msgstr "与服务器上的列表合并" -#: ../libpurple/protocols/sametime/sametime.c:5241 +#: ../libpurple/protocols/sametime/sametime.c:5218 msgid "Merge and Save List to Server" msgstr "合并并将列表保存到服务器" -#: ../libpurple/protocols/sametime/sametime.c:5243 +#: ../libpurple/protocols/sametime/sametime.c:5220 msgid "Synchronize List with Server" msgstr "与服务器同步列表" -#: ../libpurple/protocols/sametime/sametime.c:5298 +#: ../libpurple/protocols/sametime/sametime.c:5275 #, c-format msgid "Import Sametime List for Account %s" msgstr "为帐号 %s 导入 Sametime 列表" -#: ../libpurple/protocols/sametime/sametime.c:5338 +#: ../libpurple/protocols/sametime/sametime.c:5315 #, c-format msgid "Export Sametime List for Account %s" msgstr "为帐号 %s 导出 Sametime 列表" -#: ../libpurple/protocols/sametime/sametime.c:5392 +#: ../libpurple/protocols/sametime/sametime.c:5369 msgid "Unable to add group: group exists" msgstr "无法添加组:组已经存在" -#: ../libpurple/protocols/sametime/sametime.c:5393 +#: ../libpurple/protocols/sametime/sametime.c:5370 #, c-format msgid "A group named '%s' already exists in your buddy list." msgstr "您的好友列表中已经存在名为“%s”的组。" -#: ../libpurple/protocols/sametime/sametime.c:5396 -#: ../libpurple/protocols/sametime/sametime.c:5526 +#: ../libpurple/protocols/sametime/sametime.c:5373 +#: ../libpurple/protocols/sametime/sametime.c:5503 msgid "Unable to add group" msgstr "无法添加组" -#: ../libpurple/protocols/sametime/sametime.c:5455 +#: ../libpurple/protocols/sametime/sametime.c:5432 msgid "Possible Matches" msgstr "可能的匹配" -#: ../libpurple/protocols/sametime/sametime.c:5471 +#: ../libpurple/protocols/sametime/sametime.c:5448 msgid "Notes Address Book group results" msgstr "Notes 通讯录组结果" -#: ../libpurple/protocols/sametime/sametime.c:5472 +#: ../libpurple/protocols/sametime/sametime.c:5449 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following Notes Address " @@ -11444,37 +11424,37 @@ "to your buddy list." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5477 +#: ../libpurple/protocols/sametime/sametime.c:5454 msgid "Select Notes Address Book" msgstr "选择 Notes 通讯录" -#: ../libpurple/protocols/sametime/sametime.c:5520 +#: ../libpurple/protocols/sametime/sametime.c:5497 msgid "Unable to add group: group not found" msgstr "无法从添加组:组未找到" -#: ../libpurple/protocols/sametime/sametime.c:5522 +#: ../libpurple/protocols/sametime/sametime.c:5499 #, c-format msgid "" "The identifier '%s' did not match any Notes Address Book groups in your " "Sametime community." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5563 +#: ../libpurple/protocols/sametime/sametime.c:5540 msgid "Notes Address Book Group" msgstr "Notes 通讯录组" -#: ../libpurple/protocols/sametime/sametime.c:5564 +#: ../libpurple/protocols/sametime/sametime.c:5541 msgid "" "Enter the name of a Notes Address Book group in the field below to add the " "group and its members to your buddy list." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5613 +#: ../libpurple/protocols/sametime/sametime.c:5590 #, c-format msgid "Search results for '%s'" msgstr "“%s”的搜索结果" -#: ../libpurple/protocols/sametime/sametime.c:5614 +#: ../libpurple/protocols/sametime/sametime.c:5591 #, c-format msgid "" "The identifier '%s' may possibly refer to any of the following users. You " @@ -11482,60 +11462,60 @@ "buttons below." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5621 ../pidgin/gtknotify.c:972 +#: ../libpurple/protocols/sametime/sametime.c:5598 ../pidgin/gtknotify.c:972 msgid "Search Results" msgstr "搜索结果" -#: ../libpurple/protocols/sametime/sametime.c:5646 +#: ../libpurple/protocols/sametime/sametime.c:5623 msgid "No matches" msgstr "无匹配" -#: ../libpurple/protocols/sametime/sametime.c:5647 +#: ../libpurple/protocols/sametime/sametime.c:5624 #, c-format msgid "" "The identifier '%s' did not match any users in your Sametime community." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5651 +#: ../libpurple/protocols/sametime/sametime.c:5628 msgid "No Matches" msgstr "无匹配" -#: ../libpurple/protocols/sametime/sametime.c:5688 +#: ../libpurple/protocols/sametime/sametime.c:5665 msgid "Search for a user" msgstr "搜索用户" -#: ../libpurple/protocols/sametime/sametime.c:5689 +#: ../libpurple/protocols/sametime/sametime.c:5666 msgid "" "Enter a name or partial ID in the field below to search for matching users " "in your Sametime community." msgstr "" -#: ../libpurple/protocols/sametime/sametime.c:5692 +#: ../libpurple/protocols/sametime/sametime.c:5669 msgid "User Search" msgstr "用户搜索" -#: ../libpurple/protocols/sametime/sametime.c:5705 +#: ../libpurple/protocols/sametime/sametime.c:5682 msgid "Import Sametime List..." msgstr "导入 Sametime 列表..." -#: ../libpurple/protocols/sametime/sametime.c:5709 +#: ../libpurple/protocols/sametime/sametime.c:5686 msgid "Export Sametime List..." msgstr "导出 Sametime 列表..." -#: ../libpurple/protocols/sametime/sametime.c:5713 +#: ../libpurple/protocols/sametime/sametime.c:5690 msgid "Add Notes Address Book Group..." msgstr "添加 Notes 通讯录组..." -#: ../libpurple/protocols/sametime/sametime.c:5717 +#: ../libpurple/protocols/sametime/sametime.c:5694 msgid "User Search..." msgstr "用户搜索..." -#: ../libpurple/protocols/sametime/sametime.c:5823 +#: ../libpurple/protocols/sametime/sametime.c:5801 msgid "Force login (ignore server redirects)" msgstr "强制登录(忽略服务器重定向)" #. pretend to be Sametime Connect -#: ../libpurple/protocols/sametime/sametime.c:5833 +#: ../libpurple/protocols/sametime/sametime.c:5811 msgid "Hide client identity" msgstr "隐藏客户端身份" @@ -11664,8 +11644,8 @@ #: ../libpurple/protocols/silc/buddy.c:500 #: ../libpurple/protocols/silc/buddy.c:511 #: ../libpurple/protocols/silc/buddy.c:544 -#: ../libpurple/protocols/silc/ops.c:1505 -#: ../libpurple/protocols/silc/ops.c:1516 +#: ../libpurple/protocols/silc/ops.c:1519 +#: ../libpurple/protocols/silc/ops.c:1530 #: ../libpurple/protocols/silc10/buddy.c:513 #: ../libpurple/protocols/silc10/buddy.c:548 #: ../libpurple/protocols/silc10/ops.c:1494 @@ -11674,8 +11654,8 @@ msgstr "获取公钥" #: ../libpurple/protocols/silc/buddy.c:545 -#: ../libpurple/protocols/silc/ops.c:1506 -#: ../libpurple/protocols/silc/ops.c:1517 +#: ../libpurple/protocols/silc/ops.c:1520 +#: ../libpurple/protocols/silc/ops.c:1531 #: ../libpurple/protocols/silc10/buddy.c:549 #: ../libpurple/protocols/silc10/ops.c:1495 #: ../libpurple/protocols/silc10/ops.c:1506 @@ -11699,11 +11679,11 @@ msgstr "无法载入公钥" #: ../libpurple/protocols/silc/buddy.c:706 -#: ../libpurple/protocols/silc/ops.c:1055 -#: ../libpurple/protocols/silc/ops.c:1170 -#: ../libpurple/protocols/silc/ops.c:1292 -#: ../libpurple/protocols/silc/ops.c:1293 -#: ../libpurple/protocols/silc/ops.c:1311 +#: ../libpurple/protocols/silc/ops.c:1069 +#: ../libpurple/protocols/silc/ops.c:1184 +#: ../libpurple/protocols/silc/ops.c:1306 +#: ../libpurple/protocols/silc/ops.c:1307 +#: ../libpurple/protocols/silc/ops.c:1325 #: ../libpurple/protocols/silc10/buddy.c:713 #: ../libpurple/protocols/silc10/ops.c:1087 #: ../libpurple/protocols/silc10/ops.c:1159 @@ -11714,8 +11694,8 @@ msgstr "用户信息" #: ../libpurple/protocols/silc/buddy.c:707 -#: ../libpurple/protocols/silc/ops.c:1171 -#: ../libpurple/protocols/silc/ops.c:1312 +#: ../libpurple/protocols/silc/ops.c:1185 +#: ../libpurple/protocols/silc/ops.c:1326 #: ../libpurple/protocols/silc10/buddy.c:714 #: ../libpurple/protocols/silc10/ops.c:1160 #: ../libpurple/protocols/silc10/ops.c:1314 @@ -11810,35 +11790,35 @@ msgstr "机器人" #: ../libpurple/protocols/silc/buddy.c:1560 -#: ../libpurple/protocols/silc/ops.c:1209 +#: ../libpurple/protocols/silc/ops.c:1223 #: ../libpurple/protocols/silc10/buddy.c:1565 #: ../libpurple/protocols/silc10/ops.c:1202 msgid "User Modes" msgstr "用户模式" #: ../libpurple/protocols/silc/buddy.c:1577 -#: ../libpurple/protocols/silc/ops.c:1226 +#: ../libpurple/protocols/silc/ops.c:1240 #: ../libpurple/protocols/silc10/buddy.c:1582 #: ../libpurple/protocols/silc10/ops.c:1219 msgid "Preferred Contact" msgstr "首选联系人" #: ../libpurple/protocols/silc/buddy.c:1582 -#: ../libpurple/protocols/silc/ops.c:1231 +#: ../libpurple/protocols/silc/ops.c:1245 #: ../libpurple/protocols/silc10/buddy.c:1587 #: ../libpurple/protocols/silc10/ops.c:1224 msgid "Preferred Language" msgstr "首选语言" #: ../libpurple/protocols/silc/buddy.c:1587 -#: ../libpurple/protocols/silc/ops.c:1236 +#: ../libpurple/protocols/silc/ops.c:1250 #: ../libpurple/protocols/silc10/buddy.c:1592 #: ../libpurple/protocols/silc10/ops.c:1229 msgid "Device" msgstr "设备" #: ../libpurple/protocols/silc/buddy.c:1592 -#: ../libpurple/protocols/silc/ops.c:1241 +#: ../libpurple/protocols/silc/ops.c:1255 #: ../libpurple/protocols/silc10/buddy.c:1597 #: ../libpurple/protocols/silc10/ops.c:1234 #: ../libpurple/protocols/silc10/silc.c:747 @@ -11847,7 +11827,7 @@ msgstr "时区" #: ../libpurple/protocols/silc/buddy.c:1597 -#: ../libpurple/protocols/silc/ops.c:1246 +#: ../libpurple/protocols/silc/ops.c:1260 #: ../libpurple/protocols/silc10/buddy.c:1602 #: ../libpurple/protocols/silc10/ops.c:1239 msgid "Geolocation" @@ -11874,7 +11854,7 @@ msgstr "获取公钥..." #: ../libpurple/protocols/silc/buddy.c:1684 -#: ../libpurple/protocols/silc/ops.c:1614 +#: ../libpurple/protocols/silc/ops.c:1628 #: ../libpurple/protocols/silc10/buddy.c:1687 #: ../libpurple/protocols/silc10/ops.c:1624 msgid "Kill User" @@ -12025,7 +12005,7 @@ msgstr "组名称" #: ../libpurple/protocols/silc/chat.c:607 -#: ../libpurple/protocols/silc/ops.c:1819 +#: ../libpurple/protocols/silc/ops.c:1833 #: ../libpurple/protocols/silc/silc.c:1260 #: ../libpurple/protocols/silc10/chat.c:585 #: ../libpurple/protocols/silc10/ops.c:1907 @@ -12229,8 +12209,8 @@ msgid "Error occurred" msgstr "发生了错误" -#: ../libpurple/protocols/silc/ops.c:550 ../libpurple/protocols/silc/ops.c:559 -#: ../libpurple/protocols/silc/ops.c:568 +#: ../libpurple/protocols/silc/ops.c:564 ../libpurple/protocols/silc/ops.c:573 +#: ../libpurple/protocols/silc/ops.c:582 #: ../libpurple/protocols/silc10/ops.c:554 #: ../libpurple/protocols/silc10/ops.c:563 #: ../libpurple/protocols/silc10/ops.c:572 @@ -12238,38 +12218,38 @@ msgid "%s has changed the topic of %s to: %s" msgstr "%s 已经将 %s 的话题改为: %s" -#: ../libpurple/protocols/silc/ops.c:634 +#: ../libpurple/protocols/silc/ops.c:648 #: ../libpurple/protocols/silc10/ops.c:638 #, c-format msgid "%s set channel %s modes to: %s" msgstr "%s 已经将频道 %s 的模式设定为: %s" -#: ../libpurple/protocols/silc/ops.c:638 +#: ../libpurple/protocols/silc/ops.c:652 #: ../libpurple/protocols/silc10/ops.c:642 #, c-format msgid "%s removed all channel %s modes" msgstr "%s 删除了频道 %s 的全部模式" -#: ../libpurple/protocols/silc/ops.c:671 +#: ../libpurple/protocols/silc/ops.c:685 #: ../libpurple/protocols/silc10/ops.c:675 #, c-format msgid "%s set %s's modes to: %s" msgstr "%s%s 的模式设定为: %s" -#: ../libpurple/protocols/silc/ops.c:679 +#: ../libpurple/protocols/silc/ops.c:693 #: ../libpurple/protocols/silc10/ops.c:683 #, c-format msgid "%s removed all %s's modes" msgstr "%s 删除了 %s 的全部模式" -#: ../libpurple/protocols/silc/ops.c:708 +#: ../libpurple/protocols/silc/ops.c:722 #: ../libpurple/protocols/silc10/ops.c:712 #, c-format msgid "You have been kicked off %s by %s (%s)" msgstr "您被 %2$s (%3$s) 从 %1$s 踢出了" -#: ../libpurple/protocols/silc/ops.c:735 ../libpurple/protocols/silc/ops.c:740 -#: ../libpurple/protocols/silc/ops.c:745 +#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754 +#: ../libpurple/protocols/silc/ops.c:759 #: ../libpurple/protocols/silc10/ops.c:742 #: ../libpurple/protocols/silc10/ops.c:747 #: ../libpurple/protocols/silc10/ops.c:752 @@ -12277,8 +12257,8 @@ msgid "You have been killed by %s (%s)" msgstr "您被 %s (%s) 杀死了" -#: ../libpurple/protocols/silc/ops.c:766 ../libpurple/protocols/silc/ops.c:771 -#: ../libpurple/protocols/silc/ops.c:776 +#: ../libpurple/protocols/silc/ops.c:780 ../libpurple/protocols/silc/ops.c:785 +#: ../libpurple/protocols/silc/ops.c:790 #: ../libpurple/protocols/silc10/ops.c:773 #: ../libpurple/protocols/silc10/ops.c:778 #: ../libpurple/protocols/silc10/ops.c:783 @@ -12286,157 +12266,157 @@ msgid "Killed by %s (%s)" msgstr "被 %s (%s) 杀死" -#: ../libpurple/protocols/silc/ops.c:813 +#: ../libpurple/protocols/silc/ops.c:827 #: ../libpurple/protocols/silc10/ops.c:829 msgid "Server signoff" msgstr "服务器退出" -#: ../libpurple/protocols/silc/ops.c:986 +#: ../libpurple/protocols/silc/ops.c:1000 #: ../libpurple/protocols/silc10/ops.c:1017 msgid "Personal Information" msgstr "个人信息" -#: ../libpurple/protocols/silc/ops.c:1009 +#: ../libpurple/protocols/silc/ops.c:1023 #: ../libpurple/protocols/silc10/ops.c:1040 msgid "Birth Day" msgstr "生日" -#: ../libpurple/protocols/silc/ops.c:1017 +#: ../libpurple/protocols/silc/ops.c:1031 #: ../libpurple/protocols/silc10/ops.c:1048 msgid "Job Role" msgstr "职务" -#: ../libpurple/protocols/silc/ops.c:1021 +#: ../libpurple/protocols/silc/ops.c:1035 #: ../libpurple/protocols/silc/silc.c:1253 #: ../libpurple/protocols/silc10/ops.c:1052 #: ../libpurple/protocols/silc10/silc.c:949 msgid "Organization" msgstr "组织" -#: ../libpurple/protocols/silc/ops.c:1025 +#: ../libpurple/protocols/silc/ops.c:1039 #: ../libpurple/protocols/silc10/ops.c:1056 msgid "Unit" msgstr "单元" -#: ../libpurple/protocols/silc/ops.c:1049 +#: ../libpurple/protocols/silc/ops.c:1063 #: ../libpurple/protocols/silc10/ops.c:1080 msgid "Note" msgstr "备注" -#: ../libpurple/protocols/silc/ops.c:1095 +#: ../libpurple/protocols/silc/ops.c:1109 #: ../libpurple/protocols/silc10/ops.c:1128 msgid "Join Chat" msgstr "加入聊天" -#: ../libpurple/protocols/silc/ops.c:1129 +#: ../libpurple/protocols/silc/ops.c:1143 #: ../libpurple/protocols/silc10/chat.c:1039 #, c-format msgid "You are channel founder on %s" msgstr "您是 %s 的频道建立者" -#: ../libpurple/protocols/silc/ops.c:1133 +#: ../libpurple/protocols/silc/ops.c:1147 #: ../libpurple/protocols/silc10/chat.c:1043 #, c-format msgid "Channel founder on %s is %s" msgstr "%s 的频道建立者是 %s" -#: ../libpurple/protocols/silc/ops.c:1192 -#: ../libpurple/protocols/silc/ops.c:1330 +#: ../libpurple/protocols/silc/ops.c:1206 +#: ../libpurple/protocols/silc/ops.c:1344 #: ../libpurple/protocols/silc10/ops.c:1183 #: ../libpurple/protocols/silc10/ops.c:1332 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070 msgid "Real Name" msgstr "真名" -#: ../libpurple/protocols/silc/ops.c:1220 +#: ../libpurple/protocols/silc/ops.c:1234 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467 msgid "Status Text" msgstr "状态文本" -#: ../libpurple/protocols/silc/ops.c:1282 -#: ../libpurple/protocols/silc/ops.c:1356 +#: ../libpurple/protocols/silc/ops.c:1296 +#: ../libpurple/protocols/silc/ops.c:1370 #: ../libpurple/protocols/silc10/ops.c:1285 #: ../libpurple/protocols/silc10/ops.c:1357 msgid "Public Key Fingerprint" msgstr "公钥指纹" -#: ../libpurple/protocols/silc/ops.c:1283 -#: ../libpurple/protocols/silc/ops.c:1357 +#: ../libpurple/protocols/silc/ops.c:1297 +#: ../libpurple/protocols/silc/ops.c:1371 #: ../libpurple/protocols/silc10/ops.c:1286 #: ../libpurple/protocols/silc10/ops.c:1358 msgid "Public Key Babbleprint" msgstr "公钥漏印" -#: ../libpurple/protocols/silc/ops.c:1296 +#: ../libpurple/protocols/silc/ops.c:1310 #: ../libpurple/protocols/silc10/ops.c:1298 msgid "_More..." msgstr "更多(_M)..." -#: ../libpurple/protocols/silc/ops.c:1375 +#: ../libpurple/protocols/silc/ops.c:1389 #: ../libpurple/protocols/silc/silc.c:1317 #: ../libpurple/protocols/silc10/ops.c:1371 #: ../libpurple/protocols/silc10/silc.c:1013 msgid "Detach From Server" msgstr "与服务器脱离" -#: ../libpurple/protocols/silc/ops.c:1375 +#: ../libpurple/protocols/silc/ops.c:1389 #: ../libpurple/protocols/silc10/ops.c:1371 msgid "Cannot detach" msgstr "无法脱离" -#: ../libpurple/protocols/silc/ops.c:1395 +#: ../libpurple/protocols/silc/ops.c:1409 #: ../libpurple/protocols/silc10/ops.c:1382 msgid "Cannot set topic" msgstr "无法设定话题" -#: ../libpurple/protocols/silc/ops.c:1424 +#: ../libpurple/protocols/silc/ops.c:1438 #: ../libpurple/protocols/silc10/ops.c:1414 msgid "Failed to change nickname" msgstr "更改昵称失败" -#: ../libpurple/protocols/silc/ops.c:1473 +#: ../libpurple/protocols/silc/ops.c:1487 #: ../libpurple/protocols/silc10/ops.c:1462 msgid "Roomlist" msgstr "聊天室列表" -#: ../libpurple/protocols/silc/ops.c:1473 +#: ../libpurple/protocols/silc/ops.c:1487 #: ../libpurple/protocols/silc10/ops.c:1462 msgid "Cannot get room list" msgstr "无法获取聊天室列表" -#: ../libpurple/protocols/silc/ops.c:1474 +#: ../libpurple/protocols/silc/ops.c:1488 msgid "Network is empty" msgstr "网络为空" -#: ../libpurple/protocols/silc/ops.c:1518 +#: ../libpurple/protocols/silc/ops.c:1532 #: ../libpurple/protocols/silc10/ops.c:1507 msgid "No public key was received" msgstr "没有收到公钥" -#: ../libpurple/protocols/silc/ops.c:1530 -#: ../libpurple/protocols/silc/ops.c:1543 +#: ../libpurple/protocols/silc/ops.c:1544 +#: ../libpurple/protocols/silc/ops.c:1557 #: ../libpurple/protocols/silc10/ops.c:1519 #: ../libpurple/protocols/silc10/ops.c:1532 msgid "Server Information" msgstr "服务器信息" -#: ../libpurple/protocols/silc/ops.c:1531 +#: ../libpurple/protocols/silc/ops.c:1545 #: ../libpurple/protocols/silc10/ops.c:1520 msgid "Cannot get server information" msgstr "无法获取服务器信息" -#: ../libpurple/protocols/silc/ops.c:1554 +#: ../libpurple/protocols/silc/ops.c:1568 #: ../libpurple/protocols/silc10/ops.c:1549 #: ../libpurple/protocols/silc10/ops.c:1558 msgid "Server Statistics" msgstr "服务器统计" -#: ../libpurple/protocols/silc/ops.c:1555 +#: ../libpurple/protocols/silc/ops.c:1569 #: ../libpurple/protocols/silc10/ops.c:1550 msgid "Cannot get server statistics" msgstr "无法获取服务器统计" -#: ../libpurple/protocols/silc/ops.c:1562 +#: ../libpurple/protocols/silc/ops.c:1576 #: ../libpurple/protocols/silc10/ops.c:1581 #, c-format msgid "" @@ -12472,43 +12452,43 @@ "总计服务器管理员数: %d\n" "总计路由器管理员数: %d\n" -#: ../libpurple/protocols/silc/ops.c:1594 +#: ../libpurple/protocols/silc/ops.c:1608 #: ../libpurple/protocols/silc10/ops.c:1604 msgid "Network Statistics" msgstr "网络统计" -#: ../libpurple/protocols/silc/ops.c:1602 -#: ../libpurple/protocols/silc/ops.c:1607 +#: ../libpurple/protocols/silc/ops.c:1616 +#: ../libpurple/protocols/silc/ops.c:1621 #: ../libpurple/protocols/silc10/ops.c:1612 #: ../libpurple/protocols/silc10/ops.c:1617 msgid "Ping" msgstr "Ping" -#: ../libpurple/protocols/silc/ops.c:1602 +#: ../libpurple/protocols/silc/ops.c:1616 #: ../libpurple/protocols/silc10/ops.c:1612 msgid "Ping failed" msgstr "Ping 失败" -#: ../libpurple/protocols/silc/ops.c:1607 +#: ../libpurple/protocols/silc/ops.c:1621 #: ../libpurple/protocols/silc10/ops.c:1617 msgid "Ping reply received from server" msgstr "服务器对 ping 的响应" -#: ../libpurple/protocols/silc/ops.c:1615 +#: ../libpurple/protocols/silc/ops.c:1629 #: ../libpurple/protocols/silc10/ops.c:1625 msgid "Could not kill user" msgstr "无法杀死用户" -#: ../libpurple/protocols/silc/ops.c:1654 +#: ../libpurple/protocols/silc/ops.c:1668 msgid "WATCH" msgstr "监视" -#: ../libpurple/protocols/silc/ops.c:1654 +#: ../libpurple/protocols/silc/ops.c:1668 msgid "Cannot watch user" msgstr "无法监视您自己" -#: ../libpurple/protocols/silc/ops.c:1730 -#: ../libpurple/protocols/silc/ops.c:1781 +#: ../libpurple/protocols/silc/ops.c:1744 +#: ../libpurple/protocols/silc/ops.c:1795 #: ../libpurple/protocols/silc/silc.c:396 #: ../libpurple/protocols/silc10/ops.c:1817 #: ../libpurple/protocols/silc10/ops.c:1864 @@ -12516,17 +12496,17 @@ msgid "Resuming session" msgstr "恢复会话" -#: ../libpurple/protocols/silc/ops.c:1732 +#: ../libpurple/protocols/silc/ops.c:1746 #: ../libpurple/protocols/silc10/ops.c:1819 msgid "Authenticating connection" msgstr "身份验证连接" -#: ../libpurple/protocols/silc/ops.c:1783 +#: ../libpurple/protocols/silc/ops.c:1797 #: ../libpurple/protocols/silc10/ops.c:1866 msgid "Verifying server public key" msgstr "校验服务器公钥" -#: ../libpurple/protocols/silc/ops.c:1820 +#: ../libpurple/protocols/silc/ops.c:1834 #: ../libpurple/protocols/silc10/ops.c:1908 msgid "Passphrase required" msgstr "需要密码" @@ -14339,17 +14319,17 @@ msgstr "读取您的 %s 时遇到了错误。该文件未载入,旧文件被移动到 %s~ 中了。" #: ../pidgin.desktop.in.h:1 -msgid "" -"Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more" -msgstr "互联网通讯程序。 支持 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 和更多" +msgid "Pidgin Internet Messenger" +msgstr "Pidgin 互联网通讯程序" #: ../pidgin.desktop.in.h:2 msgid "Internet Messenger" msgstr "互联网通讯程序" #: ../pidgin.desktop.in.h:3 -msgid "Pidgin Internet Messenger" -msgstr "Pidgin 互联网通讯程序" +msgid "" +"Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more" +msgstr "互联网通讯程序。 支持 AIM、Google Talk、Jabber/XMPP、MSN、Yahoo 和更多" #. Build the login options frame. #: ../pidgin/gtkaccount.c:448 @@ -17075,10 +17055,18 @@ msgid "Incoming Call" msgstr "来电" +#: ../pidgin/gtkmedia.c:792 +msgid "_Hold" +msgstr "" + #: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92 msgid "_Pause" msgstr "暂停(_P)" +#: ../pidgin/gtkmedia.c:881 +msgid "_Mute" +msgstr "" + #: ../pidgin/gtknotify.c:752 #, c-format msgid "%s has %d new message." @@ -17352,7 +17340,7 @@ msgstr "(自定义)" #: ../pidgin/gtkprefs.c:423 ../pidgin/gtkprefs.c:543 ../pidgin/gtkprefs.c:551 -#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1 +#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3 msgid "Penguin Pimps" msgstr "Penguin 告密" @@ -18355,14 +18343,14 @@ msgid "Pidgin smileys" msgstr "Pidgin 表情" +#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1 +msgid "none" +msgstr "无" + #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2 msgid "Selecting this disables graphical emoticons." msgstr "选择此选项将禁用图形化表情。" -#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3 -msgid "none" -msgstr "无" - #: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:1 msgid "Small" msgstr "小" @@ -19802,101 +19790,100 @@ msgid "This plugin is useful for debugging XMPP servers or clients." msgstr "此插件用于调试 XMPP 服务器或客户端。" -#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue." DO NOT translate the CLICK in $_CLICK. It will break the installer. -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2 -msgid "" -"$(^Name) is released under the GNU General Public License (GPL). The license " -"is provided here for information purposes only. $_CLICK" -msgstr "$(^Name) 以 GPL 许可发布。在此提供此许可仅为参考。$_CLICK" - -#. Installer Subsection Detailed Description -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4 -msgid "A multi-platform GUI toolkit, used by Pidgin" -msgstr "Pidgin 所用的多平台 GUI 工具包" +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:1 +msgid "The installer is already running." +msgstr "安装程序已经运行。" -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:5 +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2 msgid "" "An instance of Pidgin is currently running. Please exit Pidgin and try " "again." msgstr "Pidgin 的实例正在运行中。请退出 Pidgin 然后再试一次。" -#. Installer Subsection Detailed Description -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:7 -msgid "Core Pidgin files and dlls" -msgstr "Pidgin 核心文件和 DLLs" +#. "Next >" appears on a button on the License Page of the Installer +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4 +msgid "Next >" +msgstr "下一步 >" -#. Installer Subsection Detailed Description -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:9 -msgid "Create a Start Menu entry for Pidgin" -msgstr "在开始菜单中创建 Pidgin 的快捷方式" +#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0). $_CLICK will become a translated version of "Click Next to continue." DO NOT translate the CLICK in $_CLICK. It will break the installer. +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:6 +msgid "" +"$(^Name) is released under the GNU General Public License (GPL). The license " +"is provided here for information purposes only. $_CLICK" +msgstr "$(^Name) 以 GPL 许可发布。在此提供此许可仅为参考。$_CLICK" -#. Installer Subsection Detailed Description -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:11 -msgid "Create a shortcut to Pidgin on the Desktop" -msgstr "在桌面上创建 Pidgin 的快捷方式" +#. Installer Subsection Text +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:8 +msgid "Pidgin Instant Messaging Client (required)" +msgstr "Pidgin 即时通讯程序(必需)" #. Installer Subsection Text -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:13 -msgid "Debug Symbols (for reporting crashes)" -msgstr "调试符号(用于报告崩溃错误)" +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:10 +msgid "GTK+ Runtime (required if not present)" +msgstr "GTK+ 运行时刻环境(必需)" #. Installer Subsection Text -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:15 +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:12 +msgid "Shortcuts" +msgstr "快捷方式" + +#. Installer Subsection Text +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:14 msgid "Desktop" msgstr "桌面" -#. $R2 will display the URL that the GTK+ Runtime failed to download from -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:17 -msgid "" -"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to " -"function; if retrying fails, you may need to use the 'Offline Installer' " -"from http://pidgin.im/download/windows/ ." -msgstr "" -"下载 GTK+ 运行时($R2)出错。$\\rPidgin 需要它方可工作,如果重试仍然失败,则您可能需要使用离线安装程序 " -"http://pidgin.im/download/windows/" +#. Installer Subsection Text +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:16 +msgid "Start Menu" +msgstr "开始菜单" -#. $R2 will display the URL that the Debug Symbols failed to download from -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:19 -msgid "" -"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to " -"use the 'Offline Installer' from http://pidgin.im/download/windows/ ." -msgstr "" -"安装调试符号($R2)出错。$\\r如果重试仍然失败,则您可能需要使用离线安装程序 http://pidgin.im/download/windows/" +#. Installer Subsection Text +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:18 +msgid "Localizations" +msgstr "支持的语言" -#. $R3 will display the URL that the Dictionary failed to download from +#. Installer Subsection Detailed Description +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:20 +msgid "Core Pidgin files and dlls" +msgstr "Pidgin 核心文件和 DLLs" + +#. Installer Subsection Detailed Description #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:22 -#, no-c-format -msgid "" -"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " -"installation instructions are at: " -"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i" -"nstallation" -msgstr "" -"安装拼写检查功能($R3)失败。$\\r如果重试仍然失败,您可以考虑手工安装 " -"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i" -"nstallation" +msgid "Shortcuts for starting Pidgin" +msgstr "启动 Pidgin 的快捷方式" -#. Installer Subsection Text +#. Installer Subsection Detailed Description #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:24 -msgid "GTK+ Runtime (required if not present)" -msgstr "GTK+ 运行时刻环境(必需)" +msgid "Create a shortcut to Pidgin on the Desktop" +msgstr "在桌面上创建 Pidgin 的快捷方式" -#. Installer Subsection Text +#. Installer Subsection Detailed Description #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:26 -msgid "Localizations" -msgstr "支持的语言" +msgid "Create a Start Menu entry for Pidgin" +msgstr "在开始菜单中创建 Pidgin 的快捷方式" -#. "Next >" appears on a button on the License Page of the Installer +#. Installer Subsection Detailed Description #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:28 -msgid "Next >" -msgstr "下一步 >" +msgid "A multi-platform GUI toolkit, used by Pidgin" +msgstr "Pidgin 所用的多平台 GUI 工具包" #. Installer Subsection Text #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:30 -msgid "Pidgin Instant Messaging Client (required)" -msgstr "Pidgin 即时通讯程序(必需)" +msgid "Debug Symbols (for reporting crashes)" +msgstr "调试符号(用于报告崩溃错误)" -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:31 +#. Text displayed on Installer Finish Page +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:32 +msgid "Visit the Pidgin Web Page" +msgstr "访问 Pidgin 网站" + +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33 +msgid "" +"Unable to uninstall the currently installed version of Pidgin. The new " +"version will be installed without removing the currently installed version." +msgstr "无法卸载已安装版本的 Pidgin,新版将不删除已有文件而直接安装。" + +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:34 msgid "" "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be " "already present).$\\rAre you sure you want to skip installing the GTK+ " @@ -19904,56 +19891,57 @@ msgstr "Pidgin 需要一个兼容的 GTK+ 运行时(您的系统上没有安装)。$\\r您确定不安装 GTK+ 运行时吗?" #. Installer Subsection Text -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33 -msgid "Shortcuts" -msgstr "快捷方式" - -#. Installer Subsection Detailed Description -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:35 -msgid "Shortcuts for starting Pidgin" -msgstr "启动 Pidgin 的快捷方式" +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:36 +msgid "URI Handlers" +msgstr "" #. Installer Subsection Text -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:37 +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:38 msgid "Spellchecking Support" msgstr "拼写检查支持" -#. Installer Subsection Text -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:39 -msgid "Start Menu" -msgstr "开始菜单" - -#. Installer Subsection Detailed Description +#. $R3 will display the URL that the Dictionary failed to download from #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41 +#, no-c-format msgid "" -"Support for Spellchecking. (Internet connection required for installation)" -msgstr "拼写检查支持。(安装需要连接到 Internet)" - -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:42 -msgid "The installer is already running." -msgstr "安装程序已经运行。" +"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual " +"installation instructions are at: " +"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i" +"nstallation" +msgstr "" +"安装拼写检查功能($R3)失败。$\\r如果重试仍然失败,您可以考虑手工安装 " +"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i" +"nstallation" +#. Installer Subsection Detailed Description #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43 msgid "" -"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely " -"that another user installed this application." -msgstr "卸载程序找不到 Pidgin 的注册表项目。$\\r可能是另外的用户安装了此程序。" +"Support for Spellchecking. (Internet connection required for installation)" +msgstr "拼写检查支持。(安装需要连接到 Internet)" -#. Installer Subsection Text +#. $R2 will display the URL that the Debug Symbols failed to download from #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45 -msgid "URI Handlers" +msgid "" +"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to " +"use the 'Offline Installer' from http://pidgin.im/download/windows/ ." msgstr "" +"安装调试符号($R2)出错。$\\r如果重试仍然失败,则您可能需要使用离线安装程序 http://pidgin.im/download/windows/" -#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:46 +#. $R2 will display the URL that the GTK+ Runtime failed to download from +#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:47 msgid "" -"Unable to uninstall the currently installed version of Pidgin. The new " -"version will be installed without removing the currently installed version." -msgstr "无法卸载已安装版本的 Pidgin,新版将不删除已有文件而直接安装。" +"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to " +"function; if retrying fails, you may need to use the 'Offline Installer' " +"from http://pidgin.im/download/windows/ ." +msgstr "" +"下载 GTK+ 运行时($R2)出错。$\\rPidgin 需要它方可工作,如果重试仍然失败,则您可能需要使用离线安装程序 " +"http://pidgin.im/download/windows/" -#. Text displayed on Installer Finish Page #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:48 -msgid "Visit the Pidgin Web Page" -msgstr "访问 Pidgin 网站" +msgid "" +"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely " +"that another user installed this application." +msgstr "卸载程序找不到 Pidgin 的注册表项目。$\\r可能是另外的用户安装了此程序。" #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:49 msgid "You do not have permission to uninstall this application." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/po4a.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/po4a.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/po4a.po 2012-01-02 18:07:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/po4a.po 2012-02-23 07:11: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: 2011-12-29 14:49+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: ../../lib/Locale/Po4a/Chooser.pm:26 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/popt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/popt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/popt.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/popt.po 2012-02-23 07:11:33.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: 2011-12-29 10:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: popt.c:47 msgid "unknown errno" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/powertop.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/powertop.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/powertop.po 2012-01-02 18:07:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/powertop.po 2012-02-23 07:11:58.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: 2011-12-29 16:49+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: process/do_process.cpp:664 msgid " Usage Events/s Category Description\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pppconfig.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppconfig.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pppconfig.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppconfig.po 2012-02-23 07:11:35.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: 2011-12-29 11:06+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. Arbitrary upper limits on option and chat files. #. If they are bigger than this something is wrong. diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pppoeconf.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppoeconf.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pppoeconf.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppoeconf.po 2012-02-23 07:11: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: 2011-12-29 11:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../pppoeconf:46 msgid "Please become root before running pppoeconf!" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/psmisc.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/psmisc.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/psmisc.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/psmisc.po 2012-02-23 07:11:35.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: 2011-12-29 11:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: src/fuser.c:118 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pulseaudio.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pulseaudio.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/pulseaudio.po 2012-01-02 18:07:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pulseaudio.po 2012-02-23 07:11:56.000000000 +0000 @@ -11,17 +11,17 @@ msgstr "" "Project-Id-Version: pulseaudio.master-tx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-14 23:49+0000\n" +"POT-Creation-Date: 2012-02-18 20:17+0000\n" "PO-Revision-Date: 2011-12-14 15:57+0000\n" "Last-Translator: Leah Liu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:21+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n" +"X-Generator: Launchpad (build 14838)\n" -#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3211 +#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3215 #, c-format msgid "%s %s" msgstr "%s %s" @@ -99,11 +99,11 @@ msgid "Null Output" msgstr "空输出" -#: ../src/pulsecore/sink.c:3195 -msgid "Internal Audio" -msgstr "内部音频" +#: ../src/pulsecore/sink.c:3199 +msgid "Built-in Audio" +msgstr "" -#: ../src/pulsecore/sink.c:3200 +#: ../src/pulsecore/sink.c:3204 msgid "Modem" msgstr "调制解调器" @@ -1259,7 +1259,7 @@ msgid "pa_stream_connect_record() failed: %s" msgstr "pa_stream_connect_record() failed: %s" -#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1241 +#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1271 #, c-format msgid "Connection failure: %s" msgstr "连接失败:%s" @@ -1368,7 +1368,7 @@ "Compiled with libpulse %s\n" "Linked with libpulse %s\n" -#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1387 +#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1417 #, c-format msgid "Invalid client name '%s'" msgstr "无效客户端名称 '%s'" @@ -1435,7 +1435,7 @@ "specification from file." msgstr "警告:指定的采样说明将覆盖文件中的说明。" -#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1454 +#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1484 msgid "Failed to determine sample specification from file." msgstr "从文件中确定采样说明失败。" @@ -1465,7 +1465,7 @@ msgid "playback" msgstr "回放" -#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1764 +#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1794 msgid "pa_mainloop_new() failed." msgstr "pa_mainloop_new() failed." @@ -1473,11 +1473,11 @@ msgid "io_new() failed." msgstr "io_new() failed." -#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1776 +#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1806 msgid "pa_context_new() failed." msgstr "pa_context_new() failed." -#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1782 +#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1812 #, c-format msgid "pa_context_connect() failed: %s" msgstr "pa_context_connect()失败:%s" @@ -1486,7 +1486,7 @@ msgid "pa_context_rttime_new() failed." msgstr "pa_context_rttime_new() failed." -#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1787 +#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1817 msgid "pa_mainloop_run() failed." msgstr "pa_mainloop_run() failed." @@ -1625,12 +1625,12 @@ "Cookie: %04x:%04x\n" msgstr "" -#: ../src/utils/pactl.c:235 ../src/utils/pactl.c:819 +#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:849 #, c-format msgid "Failed to get sink information: %s" msgstr "获取音频出口信息失败:%s" -#: ../src/utils/pactl.c:261 +#: ../src/utils/pactl.c:270 #, c-format msgid "" "Sink #%u\n" @@ -1652,27 +1652,27 @@ "\t\t%s\n" msgstr "" -#: ../src/utils/pactl.c:309 ../src/utils/pactl.c:420 +#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430 ../src/utils/pactl.c:588 #, c-format msgid "\tPorts:\n" msgstr "\tPorts:\n" -#: ../src/utils/pactl.c:315 ../src/utils/pactl.c:426 +#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437 #, c-format msgid "\tActive Port: %s\n" msgstr "\tActive Port: %s\n" -#: ../src/utils/pactl.c:321 ../src/utils/pactl.c:432 +#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443 #, c-format msgid "\tFormats:\n" msgstr "" -#: ../src/utils/pactl.c:347 ../src/utils/pactl.c:838 +#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:868 #, c-format msgid "Failed to get source information: %s" msgstr "获取音频入口信息失败:%s" -#: ../src/utils/pactl.c:373 +#: ../src/utils/pactl.c:383 #, c-format msgid "" "Source #%u\n" @@ -1711,20 +1711,20 @@ "\tProperties:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:405 ../src/utils/pactl.c:474 ../src/utils/pactl.c:517 -#: ../src/utils/pactl.c:559 ../src/utils/pactl.c:629 ../src/utils/pactl.c:630 -#: ../src/utils/pactl.c:641 ../src/utils/pactl.c:700 ../src/utils/pactl.c:701 -#: ../src/utils/pactl.c:712 ../src/utils/pactl.c:764 ../src/utils/pactl.c:765 -#: ../src/utils/pactl.c:772 +#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528 +#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:659 ../src/utils/pactl.c:660 +#: ../src/utils/pactl.c:671 ../src/utils/pactl.c:730 ../src/utils/pactl.c:731 +#: ../src/utils/pactl.c:742 ../src/utils/pactl.c:794 ../src/utils/pactl.c:795 +#: ../src/utils/pactl.c:802 msgid "n/a" msgstr "n/a" -#: ../src/utils/pactl.c:443 +#: ../src/utils/pactl.c:454 #, c-format msgid "Failed to get module information: %s" msgstr "获取模块信息失败:%s" -#: ../src/utils/pactl.c:466 +#: ../src/utils/pactl.c:477 #, c-format msgid "" "Module #%u\n" @@ -1741,12 +1741,12 @@ "\tProperties:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:485 +#: ../src/utils/pactl.c:496 #, c-format msgid "Failed to get client information: %s" msgstr "获取客户端信息失败:%s" -#: ../src/utils/pactl.c:511 +#: ../src/utils/pactl.c:522 #, c-format msgid "" "Client #%u\n" @@ -1761,12 +1761,12 @@ "\tProperties:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:528 +#: ../src/utils/pactl.c:539 #, c-format msgid "Failed to get card information: %s" msgstr "获取声卡信息失败:%s" -#: ../src/utils/pactl.c:551 +#: ../src/utils/pactl.c:562 #, c-format msgid "" "Card #%u\n" @@ -1783,22 +1783,32 @@ "\tProperties:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:565 +#: ../src/utils/pactl.c:576 #, c-format msgid "\tProfiles:\n" msgstr "\tProfiles:\n" -#: ../src/utils/pactl.c:571 +#: ../src/utils/pactl.c:582 #, c-format msgid "\tActive Profile: %s\n" msgstr "\tActive Profile: %s\n" -#: ../src/utils/pactl.c:582 ../src/utils/pactl.c:857 +#: ../src/utils/pactl.c:591 +#, c-format +msgid "\t\t%s: %s (priority %u)\n" +msgstr "" + +#: ../src/utils/pactl.c:593 +#, c-format +msgid "\t\t\tPart of profile(s): %s" +msgstr "" + +#: ../src/utils/pactl.c:612 ../src/utils/pactl.c:887 #, c-format msgid "Failed to get sink input information: %s" msgstr "获取音频出口输入信息失败:%s" -#: ../src/utils/pactl.c:611 +#: ../src/utils/pactl.c:641 #, c-format msgid "" "Sink Input #%u\n" @@ -1820,12 +1830,12 @@ "\t\t%s\n" msgstr "" -#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:876 +#: ../src/utils/pactl.c:682 ../src/utils/pactl.c:906 #, c-format msgid "Failed to get source output information: %s" msgstr "获取音频入口输出信息失败:%s" -#: ../src/utils/pactl.c:682 +#: ../src/utils/pactl.c:712 #, c-format msgid "" "Source Output #%u\n" @@ -1847,12 +1857,12 @@ "\t\t%s\n" msgstr "" -#: ../src/utils/pactl.c:723 +#: ../src/utils/pactl.c:753 #, c-format msgid "Failed to get sample information: %s" msgstr "获取采样信息失败:%s" -#: ../src/utils/pactl.c:750 +#: ../src/utils/pactl.c:780 #, c-format msgid "" "Sample #%u\n" @@ -1883,160 +1893,160 @@ "\tProperties:\n" "\t\t%s\n" -#: ../src/utils/pactl.c:780 ../src/utils/pactl.c:790 +#: ../src/utils/pactl.c:810 ../src/utils/pactl.c:820 #, c-format msgid "Failure: %s" msgstr "失败:%s" -#: ../src/utils/pactl.c:904 +#: ../src/utils/pactl.c:934 #, c-format msgid "Failed to set format: invalid format string %s" msgstr "" -#: ../src/utils/pactl.c:943 +#: ../src/utils/pactl.c:973 #, c-format msgid "Failed to upload sample: %s" msgstr "上传采样失败:%s" -#: ../src/utils/pactl.c:960 +#: ../src/utils/pactl.c:990 msgid "Premature end of file" msgstr "文件过早结束" -#: ../src/utils/pactl.c:980 +#: ../src/utils/pactl.c:1010 msgid "new" msgstr "" -#: ../src/utils/pactl.c:983 +#: ../src/utils/pactl.c:1013 msgid "change" msgstr "" -#: ../src/utils/pactl.c:986 +#: ../src/utils/pactl.c:1016 msgid "remove" msgstr "" -#: ../src/utils/pactl.c:989 ../src/utils/pactl.c:1024 +#: ../src/utils/pactl.c:1019 ../src/utils/pactl.c:1054 msgid "unknown" msgstr "" -#: ../src/utils/pactl.c:997 +#: ../src/utils/pactl.c:1027 msgid "sink" msgstr "" -#: ../src/utils/pactl.c:1000 +#: ../src/utils/pactl.c:1030 msgid "source" msgstr "" -#: ../src/utils/pactl.c:1003 +#: ../src/utils/pactl.c:1033 msgid "sink-input" msgstr "" -#: ../src/utils/pactl.c:1006 +#: ../src/utils/pactl.c:1036 msgid "source-output" msgstr "" -#: ../src/utils/pactl.c:1009 +#: ../src/utils/pactl.c:1039 msgid "module" msgstr "" -#: ../src/utils/pactl.c:1012 +#: ../src/utils/pactl.c:1042 msgid "client" msgstr "" -#: ../src/utils/pactl.c:1015 +#: ../src/utils/pactl.c:1045 msgid "sample-cache" msgstr "" -#: ../src/utils/pactl.c:1018 ../src/utils/pactl.c:1021 +#: ../src/utils/pactl.c:1048 ../src/utils/pactl.c:1051 msgid "server" msgstr "" -#: ../src/utils/pactl.c:1030 +#: ../src/utils/pactl.c:1060 #, c-format msgid "Event '%s' on %s #%u\n" msgstr "" -#: ../src/utils/pactl.c:1247 +#: ../src/utils/pactl.c:1277 msgid "Got SIGINT, exiting." msgstr "收到 SIGINT,正在退出。" -#: ../src/utils/pactl.c:1274 +#: ../src/utils/pactl.c:1304 msgid "Invalid volume specification" msgstr "无效采样说明" -#: ../src/utils/pactl.c:1297 +#: ../src/utils/pactl.c:1327 msgid "Volume outside permissible range.\n" msgstr "" -#: ../src/utils/pactl.c:1308 ../src/utils/pactl.c:1309 -#: ../src/utils/pactl.c:1310 ../src/utils/pactl.c:1311 -#: ../src/utils/pactl.c:1312 ../src/utils/pactl.c:1313 -#: ../src/utils/pactl.c:1314 ../src/utils/pactl.c:1315 -#: ../src/utils/pactl.c:1316 ../src/utils/pactl.c:1317 -#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1319 -#: ../src/utils/pactl.c:1320 ../src/utils/pactl.c:1321 -#: ../src/utils/pactl.c:1322 ../src/utils/pactl.c:1323 -#: ../src/utils/pactl.c:1324 ../src/utils/pactl.c:1325 -#: ../src/utils/pactl.c:1326 +#: ../src/utils/pactl.c:1338 ../src/utils/pactl.c:1339 +#: ../src/utils/pactl.c:1340 ../src/utils/pactl.c:1341 +#: ../src/utils/pactl.c:1342 ../src/utils/pactl.c:1343 +#: ../src/utils/pactl.c:1344 ../src/utils/pactl.c:1345 +#: ../src/utils/pactl.c:1346 ../src/utils/pactl.c:1347 +#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1349 +#: ../src/utils/pactl.c:1350 ../src/utils/pactl.c:1351 +#: ../src/utils/pactl.c:1352 ../src/utils/pactl.c:1353 +#: ../src/utils/pactl.c:1354 ../src/utils/pactl.c:1355 +#: ../src/utils/pactl.c:1356 msgid "[options]" msgstr "" -#: ../src/utils/pactl.c:1310 +#: ../src/utils/pactl.c:1340 msgid "[TYPE]" msgstr "" -#: ../src/utils/pactl.c:1312 +#: ../src/utils/pactl.c:1342 msgid "FILENAME [NAME]" msgstr "" -#: ../src/utils/pactl.c:1313 +#: ../src/utils/pactl.c:1343 msgid "NAME [SINK]" msgstr "" -#: ../src/utils/pactl.c:1314 +#: ../src/utils/pactl.c:1344 msgid "NAME" msgstr "" -#: ../src/utils/pactl.c:1315 +#: ../src/utils/pactl.c:1345 msgid "NAME [ARGS ...]" msgstr "" -#: ../src/utils/pactl.c:1316 +#: ../src/utils/pactl.c:1346 msgid "#N" msgstr "" -#: ../src/utils/pactl.c:1317 +#: ../src/utils/pactl.c:1347 msgid "#N SINK|SOURCE" msgstr "" -#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1323 +#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1353 msgid "NAME|#N 1|0" msgstr "" -#: ../src/utils/pactl.c:1319 +#: ../src/utils/pactl.c:1349 msgid "CARD PROFILE" msgstr "" -#: ../src/utils/pactl.c:1320 +#: ../src/utils/pactl.c:1350 msgid "NAME|#N PORT" msgstr "" -#: ../src/utils/pactl.c:1321 +#: ../src/utils/pactl.c:1351 msgid "NAME|#N VOLUME" msgstr "" -#: ../src/utils/pactl.c:1322 +#: ../src/utils/pactl.c:1352 msgid "#N VOLUME" msgstr "" -#: ../src/utils/pactl.c:1324 +#: ../src/utils/pactl.c:1354 msgid "#N 1|0" msgstr "" -#: ../src/utils/pactl.c:1325 +#: ../src/utils/pactl.c:1355 msgid "#N FORMATS" msgstr "" -#: ../src/utils/pactl.c:1328 +#: ../src/utils/pactl.c:1358 #, c-format msgid "" "\n" @@ -2049,7 +2059,7 @@ "server\n" msgstr "" -#: ../src/utils/pactl.c:1367 +#: ../src/utils/pactl.c:1397 #, c-format msgid "" "pactl %s\n" @@ -2060,130 +2070,130 @@ "Compiled with libpulse %s\n" "Linked with libpulse %s\n" -#: ../src/utils/pactl.c:1426 +#: ../src/utils/pactl.c:1456 #, c-format msgid "Specify nothing, or one of: %s" msgstr "" -#: ../src/utils/pactl.c:1436 +#: ../src/utils/pactl.c:1466 msgid "Please specify a sample file to load" msgstr "请指定要加载的采样文件" -#: ../src/utils/pactl.c:1449 +#: ../src/utils/pactl.c:1479 msgid "Failed to open sound file." msgstr "打开声音文件失败。" -#: ../src/utils/pactl.c:1461 +#: ../src/utils/pactl.c:1491 msgid "Warning: Failed to determine sample specification from file." msgstr "警告:从文件中确定采样说明失败。" -#: ../src/utils/pactl.c:1471 +#: ../src/utils/pactl.c:1501 msgid "You have to specify a sample name to play" msgstr "您必须指定要播放的采样名" -#: ../src/utils/pactl.c:1483 +#: ../src/utils/pactl.c:1513 msgid "You have to specify a sample name to remove" msgstr "您必须指定要删除的采样名" -#: ../src/utils/pactl.c:1492 +#: ../src/utils/pactl.c:1522 msgid "You have to specify a sink input index and a sink" msgstr "您必须指定漏输入索引和漏" -#: ../src/utils/pactl.c:1502 +#: ../src/utils/pactl.c:1532 msgid "You have to specify a source output index and a source" msgstr "您必须指定源输出索引和源" -#: ../src/utils/pactl.c:1517 +#: ../src/utils/pactl.c:1547 msgid "You have to specify a module name and arguments." msgstr "必须指定模块名和参数。" -#: ../src/utils/pactl.c:1537 +#: ../src/utils/pactl.c:1567 msgid "You have to specify a module index" msgstr "必须指定模块索引" -#: ../src/utils/pactl.c:1547 +#: ../src/utils/pactl.c:1577 msgid "" "You may not specify more than one sink. You have to specify a boolean value." msgstr "不可指定多个漏。必须指定一个布尔值。" -#: ../src/utils/pactl.c:1560 +#: ../src/utils/pactl.c:1590 msgid "" "You may not specify more than one source. You have to specify a boolean " "value." msgstr "不可指定多个源。必须指定一个布尔值。" -#: ../src/utils/pactl.c:1572 +#: ../src/utils/pactl.c:1602 msgid "You have to specify a card name/index and a profile name" msgstr "您必须指定声卡名称/索引和侧写名称" -#: ../src/utils/pactl.c:1583 +#: ../src/utils/pactl.c:1613 msgid "You have to specify a sink name/index and a port name" msgstr "您必须指定漏名称/索引和端口名称" -#: ../src/utils/pactl.c:1594 +#: ../src/utils/pactl.c:1624 msgid "You have to specify a source name/index and a port name" msgstr "您必须指定源名称/索引和端口名称" -#: ../src/utils/pactl.c:1605 +#: ../src/utils/pactl.c:1635 msgid "You have to specify a sink name/index and a volume" msgstr "您必须指定漏名称/索引和卷" -#: ../src/utils/pactl.c:1618 +#: ../src/utils/pactl.c:1648 msgid "You have to specify a source name/index and a volume" msgstr "您必须指定源名称/索引和卷" -#: ../src/utils/pactl.c:1631 +#: ../src/utils/pactl.c:1661 msgid "You have to specify a sink input index and a volume" msgstr "您必须指定漏输入索引和卷" -#: ../src/utils/pactl.c:1636 +#: ../src/utils/pactl.c:1666 msgid "Invalid sink input index" msgstr "无效露输入索引" -#: ../src/utils/pactl.c:1647 +#: ../src/utils/pactl.c:1677 msgid "You have to specify a source output index and a volume" msgstr "" -#: ../src/utils/pactl.c:1652 +#: ../src/utils/pactl.c:1682 msgid "Invalid source output index" msgstr "" -#: ../src/utils/pactl.c:1664 +#: ../src/utils/pactl.c:1694 msgid "You have to specify a sink name/index and a mute boolean" msgstr "您必须指定漏名称/索引和静音布尔值" -#: ../src/utils/pactl.c:1669 ../src/utils/pactl.c:1686 -#: ../src/utils/pactl.c:1708 ../src/utils/pactl.c:1729 +#: ../src/utils/pactl.c:1699 ../src/utils/pactl.c:1716 +#: ../src/utils/pactl.c:1738 ../src/utils/pactl.c:1759 msgid "Invalid mute specification" msgstr "" -#: ../src/utils/pactl.c:1681 +#: ../src/utils/pactl.c:1711 msgid "You have to specify a source name/index and a mute boolean" msgstr "您必须指定源名称/索引和静音布尔值" -#: ../src/utils/pactl.c:1698 +#: ../src/utils/pactl.c:1728 msgid "You have to specify a sink input index and a mute boolean" msgstr "您必须指定露输入索引和静音布尔值" -#: ../src/utils/pactl.c:1703 +#: ../src/utils/pactl.c:1733 msgid "Invalid sink input index specification" msgstr "无效漏输入索引说明" -#: ../src/utils/pactl.c:1719 +#: ../src/utils/pactl.c:1749 msgid "You have to specify a source output index and a mute boolean" msgstr "" -#: ../src/utils/pactl.c:1724 +#: ../src/utils/pactl.c:1754 msgid "Invalid source output index specification" msgstr "" -#: ../src/utils/pactl.c:1743 +#: ../src/utils/pactl.c:1773 msgid "" "You have to specify a sink index and a semicolon-separated list of supported " "formats" msgstr "" -#: ../src/utils/pactl.c:1759 +#: ../src/utils/pactl.c:1789 msgid "No valid command specified." msgstr "未指定有效的命令。" @@ -2334,9 +2344,9 @@ "这很可能是 ALSA 驱动程序 '%s' 中的一个 bug。请向 ALSA 开发人员报告这个问题。\n" "提醒我们设置 POLLOUT -- 但结果是 snd_pcm_avail() 返回 0 或者另一个小于最小可用值的数值。" -#: ../src/modules/alsa/module-alsa-card.c:163 +#: ../src/modules/alsa/module-alsa-card.c:168 #: ../src/modules/bluetooth/module-bluetooth-device.c:2707 -#: ../src/modules/alsa/alsa-mixer.c:3902 +#: ../src/modules/alsa/alsa-mixer.c:4007 msgid "Off" msgstr "关闭" @@ -2376,242 +2386,238 @@ msgid "Audio on @HOSTNAME@" msgstr "@HOSTNAME@ 中的音频" -#: ../src/modules/alsa/alsa-mixer.c:2220 +#: ../src/modules/alsa/alsa-mixer.c:2294 msgid "Input" msgstr "输入" -#: ../src/modules/alsa/alsa-mixer.c:2221 +#: ../src/modules/alsa/alsa-mixer.c:2295 msgid "Docking Station Input" msgstr "扩展坞输入" -#: ../src/modules/alsa/alsa-mixer.c:2222 ../src/modules/alsa/alsa-mixer.c:2306 +#: ../src/modules/alsa/alsa-mixer.c:2296 msgid "Docking Station Microphone" msgstr "扩展坞麦克风" -#: ../src/modules/alsa/alsa-mixer.c:2223 -msgid "Docking Station Line-In" +#: ../src/modules/alsa/alsa-mixer.c:2297 +msgid "Docking Station Line In" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2224 -msgid "Line-In" -msgstr "Line-In" +#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2382 +msgid "Line In" +msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2225 +#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377 msgid "Microphone" msgstr "麦克风" -#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304 +#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378 msgid "Front Microphone" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2227 ../src/modules/alsa/alsa-mixer.c:2305 +#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2379 msgid "Rear Microphone" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2228 +#: ../src/modules/alsa/alsa-mixer.c:2302 msgid "External Microphone" msgstr "外部麦克风" -#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2307 +#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2381 msgid "Internal Microphone" msgstr "内部麦克风" -#: ../src/modules/alsa/alsa-mixer.c:2230 +#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2383 msgid "Radio" msgstr "无线电" -#: ../src/modules/alsa/alsa-mixer.c:2231 +#: ../src/modules/alsa/alsa-mixer.c:2305 ../src/modules/alsa/alsa-mixer.c:2384 msgid "Video" msgstr "视频" -#: ../src/modules/alsa/alsa-mixer.c:2232 +#: ../src/modules/alsa/alsa-mixer.c:2306 msgid "Automatic Gain Control" msgstr "自动增益控制" -#: ../src/modules/alsa/alsa-mixer.c:2233 +#: ../src/modules/alsa/alsa-mixer.c:2307 msgid "No Automatic Gain Control" msgstr "无自动增益控制" -#: ../src/modules/alsa/alsa-mixer.c:2234 +#: ../src/modules/alsa/alsa-mixer.c:2308 msgid "Boost" msgstr "加速器" -#: ../src/modules/alsa/alsa-mixer.c:2235 +#: ../src/modules/alsa/alsa-mixer.c:2309 msgid "No Boost" msgstr "无加速器" -#: ../src/modules/alsa/alsa-mixer.c:2236 +#: ../src/modules/alsa/alsa-mixer.c:2310 msgid "Amplifier" msgstr "均衡器" -#: ../src/modules/alsa/alsa-mixer.c:2237 +#: ../src/modules/alsa/alsa-mixer.c:2311 msgid "No Amplifier" msgstr "无均衡器" -#: ../src/modules/alsa/alsa-mixer.c:2238 +#: ../src/modules/alsa/alsa-mixer.c:2312 msgid "Bass Boost" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2239 +#: ../src/modules/alsa/alsa-mixer.c:2313 msgid "No Bass Boost" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2240 +#: ../src/modules/alsa/alsa-mixer.c:2314 msgid "Speaker" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2241 +#: ../src/modules/alsa/alsa-mixer.c:2315 ../src/modules/alsa/alsa-mixer.c:2386 msgid "Headphones" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2302 +#: ../src/modules/alsa/alsa-mixer.c:2376 msgid "Analog Input" msgstr "模拟输入" -#: ../src/modules/alsa/alsa-mixer.c:2303 -msgid "Analog Microphone" -msgstr "模拟麦克风" - -#: ../src/modules/alsa/alsa-mixer.c:2308 -msgid "Analog Line-In" -msgstr "模拟 Line-In" - -#: ../src/modules/alsa/alsa-mixer.c:2309 -msgid "Analog Radio" -msgstr "模拟无线电" - -#: ../src/modules/alsa/alsa-mixer.c:2310 -msgid "Analog Video" -msgstr "模拟视频" +#: ../src/modules/alsa/alsa-mixer.c:2380 +msgid "Dock Microphone" +msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2311 +#: ../src/modules/alsa/alsa-mixer.c:2385 msgid "Analog Output" msgstr "模拟输出" -#: ../src/modules/alsa/alsa-mixer.c:2312 -msgid "Analog Headphones" -msgstr "模拟耳机" +#: ../src/modules/alsa/alsa-mixer.c:2387 +msgid "LFE on Separate Mono Output" +msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2313 -msgid "Analog Output (LFE)" -msgstr "模拟输出(LFE)" +#: ../src/modules/alsa/alsa-mixer.c:2388 +msgid "Line Out" +msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2314 +#: ../src/modules/alsa/alsa-mixer.c:2389 msgid "Analog Mono Output" msgstr "模拟单声道输出" -#: ../src/modules/alsa/alsa-mixer.c:2315 -msgid "Analog Speakers" +#: ../src/modules/alsa/alsa-mixer.c:2390 +msgid "Speakers" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2316 -msgid "Digital Output (IEC958)" +#: ../src/modules/alsa/alsa-mixer.c:2391 +msgid "HDMI / DisplayPort" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2317 -msgid "Digital Passthrough (IEC958)" +#: ../src/modules/alsa/alsa-mixer.c:2392 +msgid "Digital Output (S/PDIF)" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:2526 +#: ../src/modules/alsa/alsa-mixer.c:2393 +msgid "Digital Passthrough (S/PDIF)" +msgstr "" + +#: ../src/modules/alsa/alsa-mixer.c:2599 #, c-format msgid "%s+%s" msgstr "%s+%s" -#: ../src/modules/alsa/alsa-mixer.c:2529 ../src/modules/alsa/alsa-mixer.c:4440 +#: ../src/modules/alsa/alsa-mixer.c:2602 ../src/modules/alsa/alsa-mixer.c:4567 #, c-format msgid "%s / %s" msgstr "%s / %s" -#: ../src/modules/alsa/alsa-mixer.c:3761 +#: ../src/modules/alsa/alsa-mixer.c:3865 msgid "Analog Mono" msgstr "模拟单声道" -#: ../src/modules/alsa/alsa-mixer.c:3762 +#: ../src/modules/alsa/alsa-mixer.c:3866 msgid "Analog Stereo" msgstr "模拟立体声" -#: ../src/modules/alsa/alsa-mixer.c:3763 +#: ../src/modules/alsa/alsa-mixer.c:3867 msgid "Analog Surround 2.1" msgstr "模拟环绕 2.1" -#: ../src/modules/alsa/alsa-mixer.c:3764 +#: ../src/modules/alsa/alsa-mixer.c:3868 msgid "Analog Surround 3.0" msgstr "模拟环绕 3.0" -#: ../src/modules/alsa/alsa-mixer.c:3765 +#: ../src/modules/alsa/alsa-mixer.c:3869 msgid "Analog Surround 3.1" msgstr "模拟环绕 3.1" -#: ../src/modules/alsa/alsa-mixer.c:3766 +#: ../src/modules/alsa/alsa-mixer.c:3870 msgid "Analog Surround 4.0" msgstr "模拟环绕 4.0" -#: ../src/modules/alsa/alsa-mixer.c:3767 +#: ../src/modules/alsa/alsa-mixer.c:3871 msgid "Analog Surround 4.1" msgstr "模拟环绕 4.1" -#: ../src/modules/alsa/alsa-mixer.c:3768 +#: ../src/modules/alsa/alsa-mixer.c:3872 msgid "Analog Surround 5.0" msgstr "模拟环绕 5.0" -#: ../src/modules/alsa/alsa-mixer.c:3769 +#: ../src/modules/alsa/alsa-mixer.c:3873 msgid "Analog Surround 5.1" msgstr "模拟环绕 5.1" -#: ../src/modules/alsa/alsa-mixer.c:3770 +#: ../src/modules/alsa/alsa-mixer.c:3874 msgid "Analog Surround 6.0" msgstr "模拟环绕 6.0" -#: ../src/modules/alsa/alsa-mixer.c:3771 +#: ../src/modules/alsa/alsa-mixer.c:3875 msgid "Analog Surround 6.1" msgstr "模拟环绕 6.1" -#: ../src/modules/alsa/alsa-mixer.c:3772 +#: ../src/modules/alsa/alsa-mixer.c:3876 msgid "Analog Surround 7.0" msgstr "模拟环绕 7.0" -#: ../src/modules/alsa/alsa-mixer.c:3773 +#: ../src/modules/alsa/alsa-mixer.c:3877 msgid "Analog Surround 7.1" msgstr "模拟环绕 7.1" -#: ../src/modules/alsa/alsa-mixer.c:3774 +#: ../src/modules/alsa/alsa-mixer.c:3878 msgid "Digital Stereo (IEC958)" msgstr "数字立体声(IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:3775 +#: ../src/modules/alsa/alsa-mixer.c:3879 msgid "Digital Passthrough (IEC958)" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:3776 +#: ../src/modules/alsa/alsa-mixer.c:3880 msgid "Digital Surround 4.0 (IEC958/AC3)" msgstr "数字环绕 4.0(IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3777 +#: ../src/modules/alsa/alsa-mixer.c:3881 msgid "Digital Surround 5.1 (IEC958/AC3)" msgstr "数字环绕 5.1(IEC958/AC3)" -#: ../src/modules/alsa/alsa-mixer.c:3778 +#: ../src/modules/alsa/alsa-mixer.c:3882 msgid "Digital Stereo (HDMI)" msgstr "数字立体声(HDMI)" -#: ../src/modules/alsa/alsa-mixer.c:3899 +#: ../src/modules/alsa/alsa-mixer.c:3883 +msgid "Digital Surround 5.1 (HDMI)" +msgstr "" + +#: ../src/modules/alsa/alsa-mixer.c:4004 msgid "Analog Mono Duplex" msgstr "模拟单声道双工" -#: ../src/modules/alsa/alsa-mixer.c:3900 +#: ../src/modules/alsa/alsa-mixer.c:4005 msgid "Analog Stereo Duplex" msgstr "模拟立体声双工" -#: ../src/modules/alsa/alsa-mixer.c:3901 +#: ../src/modules/alsa/alsa-mixer.c:4006 msgid "Digital Stereo Duplex (IEC958)" msgstr "数字立体声双工(IEC958)" -#: ../src/modules/alsa/alsa-mixer.c:4001 +#: ../src/modules/alsa/alsa-mixer.c:4106 #, c-format msgid "%s Output" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:4009 +#: ../src/modules/alsa/alsa-mixer.c:4114 #, c-format msgid "%s Input" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/python-apt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/python-apt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/python-apt.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/python-apt.po 2012-02-23 07:11:35.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-09 12:08+0000\n" +"POT-Creation-Date: 2012-02-15 09:31+0000\n" "PO-Revision-Date: 2011-08-20 10:52+0000\n" "Last-Translator: David Gao \n" "Language-Team: 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: 2011-12-29 11:07+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -411,7 +411,7 @@ msgstr "非DFSG兼容软件" #. TRANSLATORS: %s is a country -#: ../aptsources/distro.py:210 ../aptsources/distro.py:438 +#: ../aptsources/distro.py:206 ../aptsources/distro.py:434 #, python-format msgid "Server for %s" msgstr "%s 的服务器" @@ -419,35 +419,35 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../aptsources/distro.py:228 ../aptsources/distro.py:234 -#: ../aptsources/distro.py:250 +#: ../aptsources/distro.py:224 ../aptsources/distro.py:230 +#: ../aptsources/distro.py:246 msgid "Main server" msgstr "主服务器" -#: ../aptsources/distro.py:254 +#: ../aptsources/distro.py:250 msgid "Custom servers" msgstr "自定义服务器" -#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317 +#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314 #, 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:267 ../apt/progress/gtk2.py:323 +#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下载文件 %(current)li 从 %(total)li" #. Setup some child widgets -#: ../apt/progress/gtk2.py:343 +#: ../apt/progress/gtk2.py:340 msgid "Details" msgstr "详细信息" -#: ../apt/progress/gtk2.py:431 +#: ../apt/progress/gtk2.py:428 msgid "Starting..." msgstr "开始..." -#: ../apt/progress/gtk2.py:437 +#: ../apt/progress/gtk2.py:434 msgid "Complete" msgstr "完成" @@ -456,11 +456,11 @@ msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "无效的 unicode 在 '%s' (%s) 的描述中。 请汇报。" -#: ../apt/package.py:1074 ../apt/package.py:1180 +#: ../apt/package.py:1085 ../apt/package.py:1191 msgid "The list of changes is not available" msgstr "变动列表尚不可用。" -#: ../apt/package.py:1186 +#: ../apt/package.py:1197 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -473,7 +473,7 @@ "请使用http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "直至这些选项可用或者稍后再试。" -#: ../apt/package.py:1193 +#: ../apt/package.py:1204 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -481,23 +481,28 @@ "无法下载更新列表。 \n" "请检查您的网络连接。" -#: ../apt/debfile.py:85 +#: ../apt/debfile.py:82 #, python-format msgid "List of files for '%s' could not be read" msgstr "无法读取“%s”的列表" -#: ../apt/debfile.py:205 +#: ../apt/debfile.py:93 +#, python-format +msgid "List of control files for '%s' could not be read" +msgstr "" + +#: ../apt/debfile.py:211 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "依赖关系不满足: %s\n" -#: ../apt/debfile.py:226 +#: ../apt/debfile.py:232 #, 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:371 +#: ../apt/debfile.py:373 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " @@ -506,7 +511,7 @@ "破坏现有软件包 '%(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:387 +#: ../apt/debfile.py:389 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " @@ -514,7 +519,7 @@ msgstr "" "破坏现有软件包 '%(pkgname)s' 对 %(targetpkg)s (%(comptype)s %(targetver)s) 的冲突关系" -#: ../apt/debfile.py:397 +#: ../apt/debfile.py:399 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " @@ -523,34 +528,30 @@ "破坏现有软件包 '%(pkgname)s' 和 '%(targetpkg)s' 的冲突关系。但是 '%(debfile)s' 通过 " "'%(provides)s' 提供了它" -#: ../apt/debfile.py:445 +#: ../apt/debfile.py:447 msgid "No Architecture field in the package" msgstr "软件包中没有 架构 字段信息" -#: ../apt/debfile.py:455 +#: ../apt/debfile.py:457 #, python-format msgid "Wrong architecture '%s'" msgstr "错误的架构 '%s'" #. the deb is older than the installed -#: ../apt/debfile.py:462 +#: ../apt/debfile.py:464 msgid "A later version is already installed" msgstr "已经安装了较新的版本" -#: ../apt/debfile.py:487 +#: ../apt/debfile.py:489 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "无法满足所有的依赖关系(缓存损坏)" -#: ../apt/debfile.py:517 +#: ../apt/debfile.py:519 #, python-format msgid "Cannot install '%s'" msgstr "无法安装 '%s'" -#: ../apt/debfile.py:561 -msgid "Python-debian module not available" -msgstr "Python-debian 模块不可用" - -#: ../apt/debfile.py:604 +#: ../apt/debfile.py:593 msgid "" "Automatically decompressed:\n" "\n" @@ -558,16 +559,16 @@ "自动解压:\n" "\n" -#: ../apt/debfile.py:610 +#: ../apt/debfile.py:599 msgid "Automatically converted to printable ascii:\n" msgstr "自动转换为可打印的 ascii:\n" -#: ../apt/debfile.py:700 +#: ../apt/debfile.py:689 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "为源软件包 '%s' 编译 %s 安装编译依赖\n" -#: ../apt/debfile.py:711 +#: ../apt/debfile.py:700 msgid "An essential package would be removed" msgstr "一个基本软件包将被移除" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/quilt.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quilt.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/quilt.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quilt.po 2012-02-23 07:11:35.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: quilt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-12-29 11:08+0000\n" +"POT-Creation-Date: 2012-02-21 18:55+0000\n" "PO-Revision-Date: 2008-02-02 00:21+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:08+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:55+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: bin/quilt.in:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/quota.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quota.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/quota.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quota.po 2012-02-23 07:11:35.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: quota\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-09 13:06+0000\n" +"POT-Creation-Date: 2012-01-03 16:01+0000\n" "PO-Revision-Date: 2010-03-29 10:21+0000\n" "Last-Translator: Jianle Ma \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:08+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:55+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: bylabel.c:253 #, c-format @@ -37,8 +37,8 @@ msgid "Compiled with:%s\n" msgstr "" -#: common.c:126 convertquota.c:48 quotacheck.c:318 repquota.c:64 -#: warnquota.c:996 +#: common.c:126 convertquota.c:48 quotacheck.c:318 quotasync.c:26 +#: repquota.c:64 warnquota.c:994 #, c-format msgid "Bugs to %s\n" msgstr "请将 Bug 反馈到 %s\n" @@ -63,8 +63,8 @@ msgid "You have to specify source and target format of conversion.\n" msgstr "" -#: convertquota.c:112 quotacheck.c:404 quotaon.c:134 repquota.c:141 -#: setquota.c:217 +#: convertquota.c:112 quotacheck.c:404 quotaon.c:135 quotasync.c:64 +#: repquota.c:141 setquota.c:221 msgid "Bad number of arguments.\n" msgstr "参数数量有误。\n" @@ -99,7 +99,7 @@ msgid "Cannot get name of new quotafile.\n" msgstr "" -#: convertquota.c:302 quotacheck.c:754 +#: convertquota.c:302 quotacheck.c:753 #, c-format msgid "Cannot rename new quotafile %s to name %s: %s\n" msgstr "无法将新配额文件 %s 重命名为 %s:%s\n" @@ -131,9 +131,8 @@ "...\n" "\tedquota %1$s-g [-F formatname] [-p groupname] [-f filesystem] groupname " "...\n" -"\tedquota %1$s[-u|g] [-F formatname] [-f filesystem] -t\n" -"\tedquota %1$s[-u|g] [-F formatname] [-f filesystem] -T username|groupname " -"...\n" +"\tedquota [-u|g] [-F formatname] [-f filesystem] -t\n" +"\tedquota [-u|g] [-F formatname] [-f filesystem] -T username|groupname ...\n" msgstr "" #: edquota.c:85 @@ -163,81 +162,85 @@ "\n" msgstr "" -#: edquota.c:101 quota.c:107 setquota.c:79 +#: edquota.c:101 quota.c:111 setquota.c:79 #, c-format msgid "Bugs to: %s\n" msgstr "请将 Bug 反馈到:%s\n" -#: edquota.c:182 +#: edquota.c:183 msgid "" "Prototype name does not make sense when editing grace period or times.\n" msgstr "" -#: edquota.c:200 +#: edquota.c:187 +msgid "Cannot change grace times over RPC protocol.\n" +msgstr "" + +#: edquota.c:205 #, c-format msgid "Cannot get quota information for user %s\n" msgstr "" -#: edquota.c:206 +#: edquota.c:211 msgid "fsname mismatch\n" msgstr "丢失文件系统名\n" -#: edquota.c:248 +#: edquota.c:253 msgid "No filesystems with quota detected.\n" msgstr "检测不到配额可用的文件系统。\n" -#: edquota.c:264 +#: edquota.c:269 #, c-format msgid "Cannot create temporary file: %s\n" msgstr "" -#: edquota.c:269 +#: edquota.c:274 #, c-format msgid "Cannot change owner of temporary file: %s\n" msgstr "" -#: edquota.c:276 +#: edquota.c:281 msgid "Cannot write grace times to file.\n" msgstr "" -#: edquota.c:280 +#: edquota.c:285 msgid "Error while editing grace times.\n" msgstr "" -#: edquota.c:284 +#: edquota.c:289 msgid "Failed to parse grace times file.\n" msgstr "解析超额宽限期设定文件失败。\n" -#: edquota.c:293 edquota.c:319 +#: edquota.c:298 edquota.c:324 #, c-format msgid "Cannot get quota information for user %s.\n" msgstr "" -#: edquota.c:295 +#: edquota.c:300 msgid "Cannot write individual grace times to file.\n" msgstr "" -#: edquota.c:300 +#: edquota.c:305 msgid "Error while editing individual grace times.\n" msgstr "" -#: edquota.c:305 +#: edquota.c:310 msgid "Cannot read individual grace times from file.\n" msgstr "" -#: edquota.c:321 +#: edquota.c:326 msgid "Cannot write quotas to file.\n" msgstr "" -#: edquota.c:326 +#: edquota.c:331 msgid "Error while editing quotas.\n" msgstr "" -#: edquota.c:332 +#: edquota.c:337 msgid "Cannot reopen!" msgstr "" -#: edquota.c:334 +#: edquota.c:339 msgid "Cannot read quotas from file.\n" msgstr "" @@ -304,24 +307,24 @@ msgid "XFS_IOC_FSBULKSTAT ioctl failed: %s\n" msgstr "XFS_IOC_FSBULKSTAT I/O 操作失败:%s\n" -#: quota.c:83 +#: quota.c:85 msgid "Usage: quota [-guqvswim] [-l | [-Q | -A]] [-F quotaformat]\n" msgstr "" -#: quota.c:84 +#: quota.c:86 msgid "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -u username ...\n" msgstr "" -#: quota.c:85 +#: quota.c:87 msgid "" "\tquota [-qvswim] [-l | [-Q | -A]] [-F quotaformat] -g groupname ...\n" msgstr "" -#: quota.c:86 +#: quota.c:88 msgid "\tquota [-qvswugQm] [-F quotaformat] -f filesystem ...\n" msgstr "" -#: quota.c:87 +#: quota.c:89 msgid "" "\n" "-u, --user display quota for user\n" @@ -343,87 +346,89 @@ "filesystems\n" "-A, --nfs-all display quota for all NFS mountpoints\n" "-m, --no-mixed-pathnames trim leading slashes from NFSv4 mountpoints\n" +" --show-mntpoint show mount point of the file system in output\n" +" --hide-device do not show file system device in output\n" "-h, --help display this help message and exit\n" "-V, --version display version information and exit\n" "\n" msgstr "" -#: quota.c:116 +#: quota.c:120 msgid "space" msgstr "" -#: quota.c:118 +#: quota.c:122 msgid "blocks" msgstr "块数量" -#: quota.c:120 +#: quota.c:124 #, c-format msgid "Disk quotas for %s %s (%cid %u): %s\n" msgstr "" -#: quota.c:123 +#: quota.c:127 msgid "Filesystem" msgstr "文件系统" -#: quota.c:124 quota.c:125 +#: quota.c:128 quota.c:129 msgid "quota" msgstr "配额" -#: quota.c:124 quota.c:125 +#: quota.c:128 quota.c:129 msgid "limit" msgstr "规限" -#: quota.c:124 quota.c:125 +#: quota.c:128 quota.c:129 msgid "grace" msgstr "宽限期" -#: quota.c:125 +#: quota.c:129 msgid "files" msgstr "文件节点" -#: quota.c:155 +#: quota.c:201 msgid "File limit reached on" msgstr "文件节点已达限额" -#: quota.c:161 +#: quota.c:207 msgid "In file grace period on" msgstr "文件节点超额宽限期已到" -#: quota.c:165 +#: quota.c:211 msgid "Over file quota on" msgstr "超出文件节点限额" -#: quota.c:171 +#: quota.c:217 msgid "Block limit reached on" msgstr "块数量已达限额" -#: quota.c:177 +#: quota.c:223 msgid "In block grace period on" msgstr "块数量超额限期已到" -#: quota.c:181 +#: quota.c:227 msgid "Over block quota on" msgstr "超出块数量限额" -#: quota.c:243 quotasys.c:325 +#: quota.c:290 quotasys.c:288 msgid "none" msgstr "无" -#: quota.c:339 +#: quota.c:396 #, c-format msgid "Warning: Ignoring -%c when filesystem list specified.\n" msgstr "" -#: quota.c:346 +#: quota.c:403 msgid "No filesystem specified.\n" msgstr "" -#: quota.c:354 +#: quota.c:411 #, c-format msgid "Gid set allocation (%d): %s\n" msgstr "" -#: quota.c:360 +#: quota.c:417 #, c-format msgid "getgroups(): %s\n" msgstr "" @@ -442,7 +447,7 @@ " -F --foreground run daemon in foreground\n" msgstr "" -#: quota_nld.c:114 rquota_svc.c:162 +#: quota_nld.c:114 rquota_svc.c:160 #, c-format msgid "Unknown option '%c'.\n" msgstr "未知的选项 “%c”。\n" @@ -623,55 +628,51 @@ "\n" msgstr "" -#: quotacheck.c:408 -msgid "XFS quota format needs no checking.\n" -msgstr "XFS 配额格式不需要检查。\n" - -#: quotacheck.c:434 +#: quotacheck.c:430 #, c-format msgid "error (%d) while opening %s\n" msgstr "错误 (%d) 发生在打开 %s时。\n" -#: quotacheck.c:439 +#: quotacheck.c:435 #, c-format msgid "error (%d) while allocating inode file bitmap\n" msgstr "错误 (%d) 发生在分配节点文件块组时\n" -#: quotacheck.c:444 +#: quotacheck.c:440 #, c-format msgid "errstr (%d) while allocating inode directory bitmap\n" msgstr "错误字串 (%d) 发生在分配节点目录块组时\n" -#: quotacheck.c:449 +#: quotacheck.c:445 #, c-format msgid "error (%d) while opening inode scan\n" msgstr "错误 (%d) 发生在打开节点扫描时\n" -#: quotacheck.c:454 +#: quotacheck.c:450 #, c-format msgid "error (%d) while starting inode scan\n" msgstr "错误 (%d) 发生在开始节点扫描时\n" -#: quotacheck.c:462 +#: quotacheck.c:458 #, c-format msgid "Found i_num %ld, blocks %ld\n" msgstr "已找到节点数量 %ld,块数量 %ld\n" -#: quotacheck.c:468 +#: quotacheck.c:464 msgid "High uid detected.\n" msgstr "检测到 High uid。\n" -#: quotacheck.c:484 +#: quotacheck.c:480 #, c-format msgid "Something weird happened while scanning. Error %d\n" msgstr "在扫描时发生不可预料的错误,错误号 %d\n" -#: quotacheck.c:508 +#: quotacheck.c:504 #, c-format msgid "Cannot stat directory %s: %s\n" msgstr "无法确认目录状态 %s:%s\n" -#: quotacheck.c:520 +#: quotacheck.c:516 #, c-format msgid "" "\n" @@ -683,7 +684,7 @@ "无法打开目录 %s:%s\n" "\n" -#: quotacheck.c:532 +#: quotacheck.c:528 #, c-format msgid "" "lstat Cannot stat `%s/%s': %s\n" @@ -697,23 +698,23 @@ "正在推出…\n" "\n" -#: quotacheck.c:543 +#: quotacheck.c:539 #, c-format msgid "pushd %s/%s\n" msgstr "" "pushd %s/%s\n" "\n" -#: quotacheck.c:559 +#: quotacheck.c:555 #, c-format msgid "\tAdding %s size %lld ino %d links %d uid %u gid %u\n" msgstr "" -#: quotacheck.c:569 +#: quotacheck.c:565 msgid "Scanning stored directories from directory stack\n" msgstr "正在从目录堆栈中扫描既存的目录\n" -#: quotacheck.c:573 +#: quotacheck.c:569 #, c-format msgid "" "popd %s\n" @@ -723,33 +724,33 @@ "\n" "正在进入目录 %s\n" -#: quotacheck.c:585 +#: quotacheck.c:581 #, c-format msgid "Leaving %s\n" msgstr "正在离开 %s\n" -#: quotacheck.c:625 +#: quotacheck.c:621 #, c-format msgid "Going to check %s quota file of %s\n" msgstr "即将对 %s,%s 的配额文件实施检查\n" -#: quotacheck.c:631 +#: quotacheck.c:627 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " "file.\n" msgstr "%ss 的磁盘配额已经在挂载点 %s 上启用了,因此配额检查操作可能会破坏此文件。\n" -#: quotacheck.c:632 quotacheck.c:911 +#: quotacheck.c:628 quotacheck.c:939 msgid "Should I continue" msgstr "我要继续" -#: quotacheck.c:633 quotacheck.c:912 +#: quotacheck.c:629 quotacheck.c:940 #, c-format msgid "As you wish... Canceling check of this file.\n" msgstr "如您所愿,中止对此文件的检查。\n" -#: quotacheck.c:638 +#: quotacheck.c:634 #, c-format msgid "" "Quota for %ss is enabled on mountpoint %s so quotacheck might damage the " @@ -759,93 +760,93 @@ "%ss 的磁盘配额已经在挂载点 %s 上启用了,因此配额检查操作可能会破坏此文件。\n" "请关闭磁盘配额或使用 -f 选项强制进行检查。\n" -#: quotacheck.c:645 +#: quotacheck.c:641 #, c-format msgid "Error while syncing quotas on %s: %s\n" msgstr "在 %s 上同步配额时出错:%s\n" -#: quotacheck.c:650 +#: quotacheck.c:646 #, c-format msgid "Cannot get quotafile name for %s\n" msgstr "无法获得 %s 的配额文件名\n" -#: quotacheck.c:655 quotaio.c:161 quotasys.c:541 +#: quotacheck.c:651 quotaio.c:152 quotasys.c:504 #, c-format msgid "Cannot open quotafile %s: %s\n" msgstr "无法打开配额文件 %s:%s\n" -#: quotacheck.c:692 +#: quotacheck.c:691 msgid "Renaming new files to proper names.\n" msgstr "正在将新文件重命名为适当的名字。\n" -#: quotacheck.c:694 +#: quotacheck.c:693 #, c-format msgid "Cannot get name of old quotafile on %s.\n" msgstr "无法获得 %s 上的旧配额文件名。\n" -#: quotacheck.c:697 +#: quotacheck.c:696 msgid "Old file not found.\n" msgstr "找不到旧文件。\n" -#: quotacheck.c:700 +#: quotacheck.c:699 #, c-format msgid "Error while searching for old quota file %s: %s\n" msgstr "检查旧配额文件 %s 时出错:%s\n" -#: quotacheck.c:709 +#: quotacheck.c:708 msgid "Old file found removed during check!\n" msgstr "在检查中找到的旧文件已被移除!\n" -#: quotacheck.c:712 +#: quotacheck.c:711 #, c-format msgid "Error while opening old quota file %s: %s\n" msgstr "打开旧配额文件 %s 时出错:%s\n" -#: quotacheck.c:718 +#: quotacheck.c:717 #, c-format msgid "EXT2_IOC_GETFLAGS failed: %s\n" msgstr "EXT2_IOC_GETFLAGS 失败:%s\n" -#: quotacheck.c:722 +#: quotacheck.c:721 #, c-format msgid "Quota file %s has IMMUTABLE flag set. Clearing.\n" msgstr "" -#: quotacheck.c:725 +#: quotacheck.c:724 #, c-format msgid "Failed to remove IMMUTABLE flag from quota file %s: %s\n" msgstr "" -#: quotacheck.c:734 +#: quotacheck.c:733 #, c-format msgid "Renaming old quotafile to %s~\n" msgstr "正在将旧配额文件重命名为 %s~\n" -#: quotacheck.c:740 +#: quotacheck.c:739 #, c-format msgid "Name of quota file too long. Contact %s.\n" msgstr "配额文件名过长,请联系 %s。\n" -#: quotacheck.c:742 +#: quotacheck.c:741 #, c-format msgid "Cannot rename old quotafile %s to %s: %s\n" msgstr "无法将旧配额文件 %s 重命名为 %s:%s\n" -#: quotacheck.c:748 +#: quotacheck.c:747 msgid "Renaming new quotafile\n" msgstr "正在重命名新配额文件\n" -#: quotacheck.c:760 +#: quotacheck.c:759 #, c-format msgid "Cannot change permission of %s: %s\n" msgstr "无法更改 %s 的权限:%s\n" -#: quotacheck.c:767 +#: quotacheck.c:766 #, c-format msgid "Cannot open new quota file %s: %s\n" msgstr "无法打开新配额文件 %s:%s\n" -#: quotacheck.c:772 +#: quotacheck.c:771 #, c-format msgid "Warning: Cannot set EXT2 flags on %s: %s\n" msgstr "警告:无法设置 %s 上的 EXT2 flags:%s\n" @@ -855,26 +856,31 @@ msgid "Dumping gathered data for %ss.\n" msgstr "正在倾出收集到的 %ss 的数据。\n" -#: quotacheck.c:793 +#: quotacheck.c:794 +#, c-format +msgid "Cannot initialize IO on xfs/gfs2 quotafile: %s\n" +msgstr "" + +#: quotacheck.c:800 #, c-format msgid "Cannot initialize IO on new quotafile: %s\n" msgstr "无法初始化新配额文件的 IO:%s\n" -#: quotacheck.c:811 +#: quotacheck.c:827 #, c-format msgid "Cannot finish IO on new quotafile: %s\n" msgstr "无法完成新配额文件的 IO:%s\n" -#: quotacheck.c:814 +#: quotacheck.c:830 msgid "Data dumped.\n" msgstr "数据已倾出。\n" -#: quotacheck.c:819 +#: quotacheck.c:835 #, c-format msgid "Cannot find checked quota file for %ss on %s!\n" msgstr "" -#: quotacheck.c:823 +#: quotacheck.c:839 #, c-format msgid "" "Cannot turn %s quotas off on %s: %s\n" @@ -883,58 +889,60 @@ "无法将 %s 配额于 %s 上关闭:%s\n" "内核将不会获知已进行的配额检查的更改内容。\n" -#: quotacheck.c:836 +#: quotacheck.c:852 #, c-format msgid "" "Cannot turn %s quotas on on %s: %s\n" "Kernel won't know about changes quotacheck did.\n" msgstr "" -#: quotacheck.c:857 +#: quotacheck.c:874 #, c-format msgid "Substracting space used by old %s quota file.\n" msgstr "" -#: quotacheck.c:859 +#: quotacheck.c:876 #, c-format -msgid "Old %s file not found. Usage will not be substracted.\n" +msgid "" +"Old %s file name could not been determined. Usage will not be substracted.\n" msgstr "" -#: quotacheck.c:864 +#: quotacheck.c:881 #, c-format -msgid "Cannot stat old %s quota file: %s\n" -msgstr "无法确认旧配额文件 %s 的状态:%s\n" +msgid "" +"Cannot stat old %s quota file %s: %s. Usage will not be substracted.\n" +msgstr "" -#: quotacheck.c:876 +#: quotacheck.c:893 #, c-format msgid "" "Quota structure for %s owning quota file not present! Something is really " "wrong...\n" msgstr "" -#: quotacheck.c:881 +#: quotacheck.c:898 #, c-format msgid "Substracted %lu bytes.\n" msgstr "" -#: quotacheck.c:891 +#: quotacheck.c:911 #, c-format msgid "Cannot stat mountpoint %s: %s\n" msgstr "无法确认挂载点 %s:%s\n" -#: quotacheck.c:893 +#: quotacheck.c:913 #, c-format msgid "Mountpoint %s is not a directory?!\n" msgstr "" -#: quotacheck.c:910 +#: quotacheck.c:938 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only. Counted values might not " "be right.\n" msgstr "无法以只读模式重新挂载 %s 上的文件系统,计数器的值可能不正确。\n" -#: quotacheck.c:917 +#: quotacheck.c:946 #, c-format msgid "" "Cannot remount filesystem mounted on %s read-only so counted values might " @@ -945,84 +953,84 @@ "无法以只读模式重新挂载 %s 上的文件系统,计数器的值可能不正确。\n" "请停止所有正在对该文件系统进行写操作的程序或使用 -m 标记强制进行检查。\n" -#: quotacheck.c:924 +#: quotacheck.c:954 msgid "Filesystem remounted read-only\n" msgstr "文件系统已以只读模式重新挂载\n" -#: quotacheck.c:926 +#: quotacheck.c:957 #, c-format msgid "Scanning %s [%s] " msgstr "正在扫描 %s [%s] " -#: quotacheck.c:943 +#: quotacheck.c:974 msgid "done\n" msgstr "完成\n" -#: quotacheck.c:952 +#: quotacheck.c:983 #, c-format msgid "Checked %d directories and %d files\n" msgstr "已检查 %d 个目录和 %d 个文件\n" -#: quotacheck.c:956 +#: quotacheck.c:987 #, c-format msgid "" "Cannot remount filesystem %s read-write. cannot write new quota files.\n" msgstr "无法以可读写模式重新挂载文件系统 %s,配额文件写入不可。\n" -#: quotacheck.c:957 +#: quotacheck.c:988 msgid "Filesystem remounted RW.\n" msgstr "文件系统已以可读写模式重新挂载。\n" -#: quotacheck.c:995 +#: quotacheck.c:1031 #, c-format msgid "Cannot find quota option on filesystem %s with quotas!\n" msgstr "在使用配额的文件系统 %s 上找不到配额选项!\n" -#: quotacheck.c:1001 +#: quotacheck.c:1037 #, c-format msgid "Cannot detect quota format for journalled quota on %s\n" msgstr "无法检测在日志化配额文件系统 %s 上的配额格式\n" -#: quotacheck.c:1050 quotasys.c:634 +#: quotacheck.c:1104 quotasys.c:597 msgid "Cannot initialize mountpoint scan.\n" msgstr "" -#: quotacheck.c:1058 +#: quotacheck.c:1109 #, c-format msgid "Skipping %s [%s]\n" msgstr "正在跳过 %s [%s]\n" -#: quotacheck.c:1075 +#: quotacheck.c:1126 #, c-format msgid "" "Cannot guess format from filename on %s. Please specify format on " "commandline.\n" msgstr "无法从 %s 上的文件名猜测其格式,请在命令行中指定一个确切的格式。\n" -#: quotacheck.c:1079 +#: quotacheck.c:1131 #, c-format msgid "Detected quota format %s\n" msgstr "被检测到的配额格式 %s\n" -#: quotacheck.c:1094 +#: quotacheck.c:1147 #, c-format msgid "Cannot get system info: %s\n" msgstr "" -#: quotacheck.c:1106 +#: quotacheck.c:1159 msgid "" "Your kernel probably supports journaled quota but you are not using it. " "Consider switching to journaled quota to avoid running quotacheck after an " "unclean shutdown.\n" msgstr "" -#: quotacheck.c:1117 +#: quotacheck.c:1170 msgid "" "Cannot find filesystem to check or filesystem not mounted with quota " "option.\n" msgstr "" -#: quotacheck.c:1130 +#: quotacheck.c:1188 #, c-format msgid "" "Allocated %d bytes memory\n" @@ -1235,78 +1243,86 @@ msgid "Not found any corrupted blocks. Congratulations.\n" msgstr "恭喜,找不到任何损坏的块。\n" -#: quotaio.c:64 +#: quotaio.c:66 msgid "Only RPC quota format is allowed on NFS filesystem.\n" msgstr "在 NFS 文件系统上只允许使用 RPC 配额格式。\n" -#: quotaio.c:73 +#: quotaio.c:75 msgid "RPC quota format not compiled.\n" msgstr "未编译 RPC 配额格式的支持。\n" -#: quotaio.c:77 +#: quotaio.c:79 msgid "RPC quota format specified for non-NFS filesystem.\n" msgstr "" -#: quotaio.c:84 +#: quotaio.c:86 msgid "Only XFS quota format is allowed on XFS filesystem.\n" msgstr "在 XFS 文件系统上只允许使用 XFS 配额格式。\n" -#: quotaio.c:95 +#: quotaio.c:97 msgid "XFS quota allowed only on XFS filesystem.\n" msgstr "XFS 配额只允许在 XFS 文件系统上使用。\n" -#: quotaio.c:109 +#: quotaio.c:111 msgid "Quota not supported by the filesystem.\n" msgstr "" -#: quotaio.c:113 -msgid "Operation not supported for filesystems with hidden quota files!\n" -msgstr "" - -#: quotaio.c:138 +#: quotaio.c:131 msgid "Cannot find any quota file to work on.\n" msgstr "" -#: quotaio.c:145 +#: quotaio.c:136 msgid "Quota file not found or has wrong format.\n" msgstr "配额文件找不到或格式错误。\n" -#: quotaio.c:155 +#: quotaio.c:146 #, c-format msgid "Cannot sync quotas on device %s: %s\n" msgstr "" -#: quotaio.c:186 +#: quotaio.c:177 #, c-format msgid "Cannot initialize quota on %s: %s\n" msgstr "" -#: quotaio.c:214 +#: quotaio.c:205 #, c-format msgid "Creation of %s quota format is not supported.\n" msgstr "系统不支持创建 %s 配额格式。\n" -#: quotaio.c:224 +#: quotaio.c:215 #, c-format msgid "Cannot create new quotafile %s: %s\n" msgstr "" -#: quotaio_generic.c:51 +#: quotaio.c:292 +#, c-format +msgid "" +"Trying to set quota limits out of range supported by quota format on %s.\n" +msgstr "" + +#: quotaio.c:298 +#, c-format +msgid "" +"Trying to set quota usage out of range supported by quota format on %s.\n" +msgstr "" + +#: quotaio_generic.c:54 #, c-format msgid "Cannot get info for %s quota file from kernel on %s: %s\n" msgstr "" -#: quotaio_generic.c:69 +#: quotaio_generic.c:72 #, c-format msgid "Cannot set info for %s quota file from kernel on %s: %s\n" msgstr "" -#: quotaio_generic.c:81 +#: quotaio_generic.c:84 #, c-format msgid "Cannot get quota for %s %d from kernel on %s: %s\n" msgstr "" -#: quotaio_generic.c:96 +#: quotaio_generic.c:99 #, c-format msgid "Cannot set quota for %s %d from kernel on %s: %s\n" msgstr "" @@ -1321,7 +1337,7 @@ "interface!\n" msgstr "" -#: quotaio_rpc.c:58 quotaio_v1.c:300 quotaio_v2.c:447 +#: quotaio_rpc.c:58 quotaio_v1.c:308 quotaio_v2.c:464 #, c-format msgid "Trying to write quota to readonly quotafile on %s\n" msgstr "正试图将配额写入在 %s 上的只读配额文件\n" @@ -1349,27 +1365,27 @@ msgid "Cannot write quota (id %u): %s\n" msgstr "" -#: quotaio_tree.c:278 +#: quotaio_tree.c:279 #, c-format msgid "Quota write failed (id %u): %s\n" msgstr "配额写入失败(id %u):%s\n" -#: quotaio_tree.c:290 +#: quotaio_tree.c:291 #, c-format msgid "Quota structure has offset to other block (%u) than it should (%u).\n" msgstr "" -#: quotaio_tree.c:366 +#: quotaio_tree.c:367 #, c-format msgid "Quota for id %u referenced but not present.\n" msgstr "" -#: quotaio_tree.c:424 +#: quotaio_tree.c:426 #, c-format msgid "Cannot read quota structure for id %u: %s\n" msgstr "" -#: quotaio_tree.c:465 +#: quotaio_tree.c:468 #, c-format msgid "" "Illegal reference (%u >= %u) in %s quota file on %s. Quota file is probably " @@ -1377,23 +1393,23 @@ "Please run quotacheck(8) and try again.\n" msgstr "" -#: quotaio_v1.c:206 +#: quotaio_v1.c:214 #, c-format msgid "Trying to write info to readonly quotafile on %s.\n" msgstr "正试图将信息写入在 %s 上的只读配额文件\n" -#: quotaio_v2.c:254 +#: quotaio_v2.c:255 msgid "" "Your quota file is stored in wrong endianity. Please use convertquota(8) to " "convert it.\n" msgstr "" -#: quotaio_v2.c:371 +#: quotaio_v2.c:388 #, c-format msgid "Trying to write info to readonly quotafile on %s\n" msgstr "正试图将信息写入在 %s 上的只读配额文件\n" -#: quotaio_v2.c:496 +#: quotaio_v2.c:518 #, c-format msgid "" "Statistics:\n" @@ -1413,35 +1429,35 @@ "已用平均值:%f\n" "\n" -#: quotaio_xfs.c:243 +#: quotaio_xfs.c:217 #, c-format msgid "*** Status for %s quotas on device %s\n" msgstr "" -#: quotaio_xfs.c:245 quotaio_xfs.c:260 +#: quotaio_xfs.c:219 quotaio_xfs.c:234 msgid "ON" msgstr "ON" -#: quotaio_xfs.c:245 quotaio_xfs.c:260 +#: quotaio_xfs.c:219 quotaio_xfs.c:234 msgid "OFF" msgstr "OFF" -#: quotaio_xfs.c:247 quotaio_xfs.c:251 +#: quotaio_xfs.c:221 quotaio_xfs.c:225 #, c-format msgid "Accounting: %s; Enforcement: %s\n" msgstr "" -#: quotaio_xfs.c:263 quotaio_xfs.c:267 +#: quotaio_xfs.c:237 quotaio_xfs.c:241 #, c-format msgid "Accounting [ondisk]: %s; Enforcement [ondisk]: %s\n" msgstr "" -#: quotaio_xfs.c:276 quotaio_xfs.c:285 +#: quotaio_xfs.c:250 quotaio_xfs.c:259 #, c-format msgid "Inode: none\n" msgstr "" -#: quotaio_xfs.c:278 quotaio_xfs.c:287 +#: quotaio_xfs.c:252 quotaio_xfs.c:261 #, c-format msgid "Inode: #%llu (%llu blocks, %u extents)\n" msgstr "" @@ -1453,7 +1469,7 @@ "\t%s [-guvp] [-F quotaformat] [-x state] -a\n" "\t%s [-guvp] [-F quotaformat] [-x state] filesys ...\n" "\n" -"-a, --all turn quotas on for all filesystems\n" +"-a, --all turn quotas %s for all filesystems\n" "-f, --off turn quotas off\n" "-u, --user operate on user quotas\n" "-g, --group operate on group quotas\n" @@ -1465,112 +1481,112 @@ "-V, --version display version information and exit\n" msgstr "" -#: quotaon.c:138 +#: quotaon.c:78 quotaon.c:356 +msgid "off" +msgstr "关闭" + +#: quotaon.c:78 quotaon.c:356 +msgid "on" +msgstr "开启" + +#: quotaon.c:139 msgid "Cannot turn on/off quotas via RPC.\n" msgstr "" -#: quotaon.c:185 +#: quotaon.c:186 #, c-format msgid "set root_squash on %s: %s\n" msgstr "" -#: quotaon.c:189 +#: quotaon.c:190 #, c-format msgid "%s: %s root_squash turned off\n" msgstr "" "%s:%s root_squash 已关闭\n" "\n" -#: quotaon.c:191 +#: quotaon.c:192 #, c-format msgid "%s: %s root_squash turned on\n" msgstr "" "%s:%s root_squash 已开启\n" "\n" -#: quotaon.c:209 +#: quotaon.c:210 #, c-format msgid "quotactl on %s [%s]: %s\n" msgstr "" -#: quotaon.c:212 +#: quotaon.c:213 #, c-format msgid "%s [%s]: %s quotas turned off\n" msgstr "" "%s [%s]: %s 配额已关闭\n" "\n" -#: quotaon.c:225 +#: quotaon.c:226 #, c-format msgid "cannot find %s on %s [%s]\n" msgstr "" -#: quotaon.c:227 +#: quotaon.c:228 #, c-format msgid "using %s on %s [%s]: %s\n" msgstr "" -#: quotaon.c:229 +#: quotaon.c:230 msgid "Maybe create new quota files with quotacheck(8)?\n" msgstr "也许您需要使用 quotacheck(8) 创建新的配额文件?\n" -#: quotaon.c:231 +#: quotaon.c:232 msgid "Quota format not supported in kernel.\n" msgstr "内核不支持此配额格式。\n" -#: quotaon.c:234 +#: quotaon.c:235 #, c-format msgid "%s [%s]: %s quotas turned on\n" msgstr "" "%s [%s]:%s 配额已开启\n" "\n" -#: quotaon.c:287 +#: quotaon.c:288 msgid "Cannot change state of GFS2 quota.\n" msgstr "" -#: quotaon.c:291 +#: quotaon.c:292 msgid "Cannot change state of XFS quota. It's not compiled in kernel.\n" msgstr "" -#: quotaon.c:318 +#: quotaon.c:319 #, c-format msgid "Cannot find quota file on %s [%s] to turn quotas on/off.\n" msgstr "" -#: quotaon.c:323 +#: quotaon.c:324 #, c-format msgid "Quota file on %s [%s] does not exist or has wrong format.\n" msgstr "" -#: quotaon.c:354 +#: quotaon.c:355 #, c-format msgid "%s quota on %s (%s) is %s\n" msgstr "" -#: quotaon.c:355 -msgid "on" -msgstr "开启" - -#: quotaon.c:355 -msgid "off" -msgstr "关闭" - -#: quotaon.c:371 +#: quotaon.c:372 #, c-format msgid "Name must be quotaon or quotaoff not %s\n" msgstr "名称必须是 quotaon 或 quotaoff,不能是 %s\n" -#: quotaon.c:377 +#: quotaon.c:378 #, c-format msgid "Required format %s not supported by kernel.\n" msgstr "内核不支持要求的配额格式 %s。\n" -#: quotaon.c:379 +#: quotaon.c:380 msgid "Warning: No quota format detected in the kernel.\n" msgstr "警告:在内核中检测不到支持的配额格式。\n" -#: quotaon.c:386 +#: quotaon.c:387 #, c-format msgid "%s: Quota cannot be turned on on NFS filesystem\n" msgstr "" @@ -1825,8 +1841,8 @@ " Filesystem block grace inode grace\n" msgstr "" -#: quotaops.c:455 quotaops.c:461 quotaops.c:503 quotaops.c:515 setquota.c:241 -#: setquota.c:247 +#: quotaops.c:455 quotaops.c:461 quotaops.c:503 quotaops.c:515 setquota.c:245 +#: setquota.c:251 msgid "unset" msgstr "" @@ -1834,7 +1850,7 @@ msgid "0seconds" msgstr "0秒" -#: quotaops.c:465 quotasys.c:357 +#: quotaops.c:465 quotasys.c:320 #, c-format msgid "%useconds" msgstr "%u秒" @@ -1884,89 +1900,108 @@ msgid " block grace period: %d %s file grace period: %d %s" msgstr " 块超额宽限期:%d %s 文件节点超额宽限期 %d %s" -#: quotastats.c:50 +#: quotastats.c:48 #, c-format msgid "Cannot read stat file %s: %s\n" msgstr "" -#: quotastats.c:85 +#: quotastats.c:83 #, c-format msgid "Error while getting quota statistics from kernel: %s\n" msgstr "从内核中获取配额统计信息时出错:%s\n" -#: quotastats.c:89 +#: quotastats.c:87 #, c-format msgid "Error while getting old quota statistics from kernel: %s\n" msgstr "从内核中获取旧配额统计信息时出错:%s\n" -#: quotastats.c:103 +#: quotastats.c:101 #, c-format msgid "Kernel quota version: old\n" msgstr "内核内建配额版本:旧\n" -#: quotastats.c:105 +#: quotastats.c:103 #, c-format msgid "Kernel quota version: %u.%u.%u\n" msgstr "" "内核内建配额版本:%u.%u.%u\n" "\n" -#: quotastats.c:106 +#: quotastats.c:104 #, c-format msgid "Number of dquot lookups: %ld\n" msgstr "" -#: quotastats.c:107 +#: quotastats.c:105 #, c-format msgid "Number of dquot drops: %ld\n" msgstr "" -#: quotastats.c:108 +#: quotastats.c:106 #, c-format msgid "Number of dquot reads: %ld\n" msgstr "" -#: quotastats.c:109 +#: quotastats.c:107 #, c-format msgid "Number of dquot writes: %ld\n" msgstr "" -#: quotastats.c:110 +#: quotastats.c:108 #, c-format msgid "Number of quotafile syncs: %ld\n" msgstr "" -#: quotastats.c:111 +#: quotastats.c:109 #, c-format msgid "Number of dquot cache hits: %ld\n" msgstr "" -#: quotastats.c:112 +#: quotastats.c:110 #, c-format msgid "Number of allocated dquots: %ld\n" msgstr "" -#: quotastats.c:113 +#: quotastats.c:111 #, c-format msgid "Number of free dquots: %ld\n" msgstr "" -#: quotastats.c:114 +#: quotastats.c:112 #, c-format msgid "Number of in use dquot entries (user/group): %ld\n" msgstr "" -#: quotasys.c:131 +#: quotasync.c:25 +#, c-format +msgid "" +"Utility for syncing quotas.\n" +"Usage:\n" +"%s [-ug] -a | mntpoint...\n" +"\n" +msgstr "" + +#: quotasync.c:89 +#, c-format +msgid "%s quota sync failed: %s\n" +msgstr "" + +#: quotasync.c:100 +#, c-format +msgid "%s quota sync failed for %s: %s\n" +msgstr "" + +#: quotasys.c:94 #, c-format msgid "user %s does not exist.\n" msgstr "" -#: quotasys.c:160 +#: quotasys.c:123 #, c-format msgid "group %s does not exist.\n" msgstr "" -#: quotasys.c:262 +#: quotasys.c:225 #, c-format msgid "" "Unknown quota format: %s\n" @@ -1978,85 +2013,85 @@ " xfs - XFS quota format\n" msgstr "" -#: quotasys.c:345 +#: quotasys.c:308 #, c-format msgid "%ddays" msgstr "%d天" -#: quotasys.c:347 +#: quotasys.c:310 #, c-format msgid "%02d:%02d" msgstr "%02d:%02d" -#: quotasys.c:359 +#: quotasys.c:322 #, c-format msgid "%uminutes" msgstr "%u分钟" -#: quotasys.c:361 +#: quotasys.c:324 #, c-format msgid "%uhours" msgstr "%u小时" -#: quotasys.c:363 +#: quotasys.c:326 #, c-format msgid "%udays" msgstr "%u天" -#: quotasys.c:524 +#: quotasys.c:487 #, c-format msgid "Cannot stat quota file %s: %s\n" msgstr "" -#: quotasys.c:673 +#: quotasys.c:636 msgid "Not all specified mountpoints are using quota.\n" msgstr "不是所有指定的挂载点都正在使用配额。\n" -#: quotasys.c:687 +#: quotasys.c:650 #, c-format msgid "Error while releasing file on %s\n" msgstr "释放 %s 上的文件时出错\n" -#: quotasys.c:746 +#: quotasys.c:709 #, c-format msgid "Cannot create set for sigaction(): %s\n" msgstr "" -#: quotasys.c:749 +#: quotasys.c:712 #, c-format msgid "Cannot set signal handler: %s\n" msgstr "" -#: quotasys.c:802 +#: quotasys.c:765 #, c-format msgid "Cannot reset signal handler: %s\n" msgstr "" -#: quotasys.c:937 +#: quotasys.c:900 msgid "Cannot open any file with mount points.\n" msgstr "" -#: quotasys.c:948 +#: quotasys.c:911 #, c-format msgid "Cannot get device name for %s\n" msgstr "" -#: quotasys.c:985 +#: quotasys.c:948 #, c-format msgid "Cannot resolve mountpoint path %s: %s\n" msgstr "" -#: quotasys.c:991 +#: quotasys.c:954 #, c-format msgid "Cannot statfs() %s: %s\n" msgstr "" -#: quotasys.c:1003 +#: quotasys.c:966 #, c-format msgid "Cannot stat() mounted device %s: %s\n" msgstr "" -#: quotasys.c:1009 +#: quotasys.c:972 #, c-format msgid "" "Device (%s) filesystem is mounted on unsupported device type. Skipping.\n" @@ -2064,72 +2099,72 @@ "设备(%s)的文件系统已被挂载但设备类型不被支持。\n" "正在跳过。\n" -#: quotasys.c:1024 +#: quotasys.c:987 #, c-format msgid "Cannot find device of loopback mount in options for %s. Skipping.\n" msgstr "" -#: quotasys.c:1033 +#: quotasys.c:996 #, c-format msgid "Cannot stat() loopback device %s: %s\n" msgstr "" -#: quotasys.c:1038 +#: quotasys.c:1001 #, c-format msgid "Loopback device %s is not block device!\n" msgstr "" -#: quotasys.c:1056 +#: quotasys.c:1019 #, c-format msgid "Cannot stat() mountpoint %s: %s\n" msgstr "" -#: quotasys.c:1120 +#: quotasys.c:1083 #, c-format msgid "" "Cannot find a device with %s.\n" "Skipping...\n" msgstr "" -#: quotasys.c:1124 +#: quotasys.c:1087 #, c-format msgid "" "Cannot stat() a mountpoint with %s: %s\n" "Skipping...\n" msgstr "" -#: quotasys.c:1132 +#: quotasys.c:1095 #, c-format msgid "" "Cannot stat() given mountpoint %s: %s\n" "Skipping...\n" msgstr "" -#: quotasys.c:1142 +#: quotasys.c:1105 #, c-format msgid "Cannot find a filesystem mountpoint for directory %s\n" msgstr "" -#: quotasys.c:1148 +#: quotasys.c:1111 #, c-format msgid "Cannot resolve path %s: %s\n" msgstr "" -#: quotasys.c:1159 +#: quotasys.c:1122 #, c-format msgid "Cannot find mountpoint for device %s\n" msgstr "" -#: quotasys.c:1165 +#: quotasys.c:1128 #, c-format msgid "Specified path %s is not directory nor device.\n" msgstr "指定的路径 %s 既不是目录也不是设备。\n" -#: quotasys.c:1173 +#: quotasys.c:1136 msgid "No correct mountpoint specified.\n" msgstr "没有指定正确的挂载点。\n" -#: quotasys.c:1234 +#: quotasys.c:1197 #, c-format msgid "Mountpoint (or device) %s not found or has no quota enabled.\n" msgstr "" @@ -2146,7 +2181,7 @@ "-g, --group display information about groups\n" "-s, --human-readable show numbers in human friendly units (MB, GB, " "...)\n" -"-t, --truncate-names truncate names to 8 characters\n" +"-t, --truncate-names truncate names to 9 characters\n" "-p, --raw-grace print grace time in seconds since epoch\n" "-n, --no-names do not translate uid/gid to name\n" "-i, --no-autofs avoid autofs mountpoints\n" @@ -2206,7 +2241,7 @@ msgid "Group" msgstr "用户组" -#: rquota_svc.c:90 +#: rquota_svc.c:88 #, c-format msgid "" "Usage: %s [options]\n" @@ -2221,7 +2256,7 @@ " -x --xtab set an alternative file with NFSD export table\n" msgstr "" -#: rquota_svc.c:101 +#: rquota_svc.c:99 #, c-format msgid "" "Usage: %s [options]\n" @@ -2234,36 +2269,36 @@ " -x --xtab set an alternative file with NFSD export table\n" msgstr "" -#: rquota_svc.c:148 +#: rquota_svc.c:146 #, c-format msgid "Illegal port number: %s\n" msgstr "非法的端口号:%s\n" -#: rquota_svc.c:155 +#: rquota_svc.c:153 #, c-format msgid "Cannot access the specified xtab file %s: %s\n" msgstr "无法访问指定的 xtab 文件 %s:%s\n" -#: rquota_svc.c:185 +#: rquota_svc.c:183 #, c-format msgid "host %s attempted to call setquota when disabled\n" msgstr "主机 %s 尝试在功能被禁用的情况下调用 setquota\n" -#: rquota_svc.c:192 +#: rquota_svc.c:190 #, c-format msgid "host %s attempted to call setquota from port >= 1024\n" msgstr "主机 %s 尝试在 >=1024 的端口上调用 setquota\n" -#: rquota_svc.c:207 +#: rquota_svc.c:205 #, c-format msgid "Denied access to host %s\n" msgstr "主机 %s 拒绝访问\n" -#: rquota_svc.c:295 rquota_svc.c:381 +#: rquota_svc.c:293 rquota_svc.c:379 msgid "unable to free arguments\n" msgstr "不能释放参数\n" -#: rquota_svc.c:404 +#: rquota_svc.c:402 #, c-format msgid "" "Warning: Cannot open export table %s: %s\n" @@ -2272,31 +2307,31 @@ "警告:无法打开输出表 %s:%s\n" "现在使用 “/” 作为伪文件系统的根。\n" -#: rquota_svc.c:456 +#: rquota_svc.c:454 msgid "cannot create udp service.\n" msgstr "不能创建 udp 服务。\n" -#: rquota_svc.c:460 +#: rquota_svc.c:458 msgid "unable to register (RQUOTAPROG, RQUOTAVERS, udp).\n" msgstr "不能注册(RQUOTAPROG,RQUOTAVERS,udp)。\n" -#: rquota_svc.c:464 +#: rquota_svc.c:462 msgid "unable to register (RQUOTAPROG, EXT_RQUOTAVERS, udp).\n" msgstr "不能注册(RQUOTAPROG,EXT_RQUOTAVERS,udp)。\n" -#: rquota_svc.c:471 +#: rquota_svc.c:469 msgid "cannot create tcp service.\n" msgstr "不能创建 tcp 服务。\n" -#: rquota_svc.c:475 +#: rquota_svc.c:473 msgid "unable to register (RQUOTAPROG, RQUOTAVERS, tcp).\n" msgstr "不能注册(RQUOTAPROG,RQUOTAVERS,tcp)。\n" -#: rquota_svc.c:479 +#: rquota_svc.c:477 msgid "unable to register (RQUOTAPROG, EXT_RQUOTAVERS, tcp).\n" msgstr "不能注册(RQUOTAPROG,EXT_RQUOTAVERS,tcp)。\n" -#: rquota_svc.c:488 +#: rquota_svc.c:486 msgid "svc_run returned\n" msgstr "已返回 svc_run\n" @@ -2394,70 +2429,79 @@ msgid "Batch mode and prototype user cannot be used together.\n" msgstr "批处理模式和样例用户不能一起使用。\n" -#: setquota.c:225 +#: setquota.c:206 +msgid "Cannot set grace times over RPC protocol.\n" +msgstr "" + +#: setquota.c:229 msgid "block softlimit" msgstr "块软限额" -#: setquota.c:226 +#: setquota.c:230 msgid "block hardlimit" msgstr "块硬限额" -#: setquota.c:227 +#: setquota.c:231 msgid "inode softlimit" msgstr "节点软限额" -#: setquota.c:228 +#: setquota.c:232 msgid "inode hardlimit" msgstr "节点硬限额" -#: setquota.c:234 setquota.c:246 +#: setquota.c:238 setquota.c:250 msgid "block grace time" msgstr "块超额宽限期" -#: setquota.c:235 setquota.c:252 +#: setquota.c:239 setquota.c:256 msgid "inode grace time" msgstr "节点超额宽限期" -#: setquota.c:258 +#: setquota.c:262 msgid "Mountpoint not specified.\n" msgstr "挂载点未被指定。\n" -#: setquota.c:313 +#: setquota.c:317 #, c-format msgid "Line %d too long.\n" msgstr "" -#: setquota.c:325 +#: setquota.c:329 #, c-format msgid "Cannot parse input line %d.\n" msgstr "无法分析输入行 %d。\n" -#: setquota.c:327 setquota.c:335 +#: setquota.c:331 setquota.c:339 msgid "Exitting.\n" msgstr "" -#: setquota.c:328 setquota.c:336 +#: setquota.c:332 setquota.c:340 msgid "Skipping line.\n" msgstr "" -#: setquota.c:333 +#: setquota.c:337 #, c-format msgid "Unable to resolve name '%s' on line %d.\n" msgstr "" -#: setquota.c:396 +#: setquota.c:383 +#, c-format +msgid "Setting grace period on %s is not supported.\n" +msgstr "" + +#: setquota.c:405 #, c-format msgid "" "Not setting block grace time on %s because softlimit is not exceeded.\n" msgstr "" -#: setquota.c:400 +#: setquota.c:409 #, c-format msgid "" "Not setting inode grace time on %s because softlimit is not exceeded.\n" msgstr "" -#: setquota.c:403 +#: setquota.c:412 #, c-format msgid "" "cannot write times for %s. Maybe kernel does not support such operation?\n" @@ -2478,7 +2522,7 @@ msgid "Cannot bind to given address: %s\n" msgstr "无法绑定到给定的地址:%s\n" -#: warnquota.c:56 +#: warnquota.c:54 msgid "" "Hi,\n" "\n" @@ -2498,7 +2542,7 @@ "\n" "\n" -#: warnquota.c:58 +#: warnquota.c:56 #, c-format msgid "" "\n" @@ -2534,7 +2578,7 @@ "或者通过电话:%s。\n" "\n" -#: warnquota.c:65 +#: warnquota.c:63 #, c-format msgid "" "Hi,\n" @@ -2555,7 +2599,7 @@ "\n" "\n" -#: warnquota.c:67 +#: warnquota.c:65 #, c-format msgid "" "\n" @@ -2595,71 +2639,71 @@ "或者通过电话:%s。\n" "\n" -#: warnquota.c:184 +#: warnquota.c:182 #, c-format msgid "%s: %s\n" msgstr "" -#: warnquota.c:228 +#: warnquota.c:226 #, c-format msgid "Cannot get name for uid/gid %u.\n" msgstr "" -#: warnquota.c:312 +#: warnquota.c:310 #, c-format msgid "Cannot create pipe: %s\n" msgstr "" -#: warnquota.c:318 +#: warnquota.c:316 #, c-format msgid "Cannot fork: %s\n" msgstr "" -#: warnquota.c:323 +#: warnquota.c:321 #, c-format msgid "Cannot duplicate descriptor: %s\n" msgstr "" -#: warnquota.c:327 +#: warnquota.c:325 #, c-format msgid "Cannot execute '%s': %s\n" msgstr "" -#: warnquota.c:332 +#: warnquota.c:330 #, c-format msgid "Cannot open pine: %s\n" msgstr "" -#: warnquota.c:413 +#: warnquota.c:411 msgid "Could not setup ldap connection, returning.\n" msgstr "无法设定 ldap 连接,已返回。\n" -#: warnquota.c:436 +#: warnquota.c:434 #, c-format msgid "Error with %s.\n" msgstr "处理 %s 时出错。\n" -#: warnquota.c:444 +#: warnquota.c:442 #, c-format msgid "Multiple entries found for client %s, %d not sending mail.\n" msgstr "发现了多个客户端 %s 的登录入口,%d 未寄出邮件。\n" -#: warnquota.c:448 +#: warnquota.c:446 #, c-format msgid "Entry not found for client %s, %d not sending mail.\n" msgstr "找不到客户端 %s 的登录入口,%d 未寄出邮件。\n" -#: warnquota.c:459 +#: warnquota.c:457 #, c-format msgid "Could not get values for %s.\n" msgstr "无法得到 %s 的值。\n" -#: warnquota.c:491 +#: warnquota.c:489 #, c-format msgid "Administrator for a group %s not found. Cancelling mail.\n" msgstr "找不到用户组 %s 的管理员,中止寄出邮件。\n" -#: warnquota.c:536 +#: warnquota.c:534 #, c-format msgid "" "\n" @@ -2669,39 +2713,39 @@ " 块限额 文件节点限额\n" "\n" -#: warnquota.c:537 +#: warnquota.c:535 #, c-format msgid "" "Filesystem used soft hard grace used soft hard grace\n" msgstr "文件系统 已用 软限额 硬限额 超额宽限期 已用 软限额 硬限额 超额宽限期\n" -#: warnquota.c:577 +#: warnquota.c:575 #, c-format msgid "Cannot wait for mailer: %s\n" msgstr "" -#: warnquota.c:579 +#: warnquota.c:577 msgid "Warning: Mailer exitted abnormally.\n" msgstr "警告:邮件发送程序不正常退出。\n" -#: warnquota.c:636 +#: warnquota.c:634 #, c-format msgid "" "Cannot open %s: %s\n" "Will use device names.\n" msgstr "" -#: warnquota.c:659 +#: warnquota.c:657 #, c-format msgid "Cannot parse line %d in quotatab (missing ':')\n" msgstr "" -#: warnquota.c:673 +#: warnquota.c:671 #, c-format msgid "Cannot stat device %s (maybe typo in quotatab)\n" msgstr "" -#: warnquota.c:693 +#: warnquota.c:691 #, c-format msgid "" "Incorrect format string for variable %s.\n" @@ -2710,36 +2754,36 @@ "变量 %s 的字符串格式不正确。\n" "不可识别的表达式 %%%c。\n" -#: warnquota.c:732 +#: warnquota.c:730 #, c-format msgid "Cannot open %s: %s\n" msgstr "" -#: warnquota.c:752 +#: warnquota.c:750 #, c-format msgid "Line %d too long. Truncating.\n" msgstr "行 %d 过长,正在截短。\n" -#: warnquota.c:824 +#: warnquota.c:822 #, c-format msgid "Cannot parse time at CC_BEFORE variable (line %d).\n" msgstr "无法分析 CC_BEFORE 变量里的时间(行 %d)。\n" -#: warnquota.c:848 +#: warnquota.c:846 #, c-format msgid "Error in config file (line %d), ignoring\n" msgstr "配置文件(行 %d)出错,已忽略\n" -#: warnquota.c:851 +#: warnquota.c:849 #, c-format msgid "Possible error in config file (line %d), ignoring\n" msgstr "配置文件(行 %d)可能有错,已忽略\n" -#: warnquota.c:854 +#: warnquota.c:852 msgid "Unterminated last line, ignoring\n" msgstr "未正常终止的末行,已忽略\n" -#: warnquota.c:861 +#: warnquota.c:859 #, c-format msgid "" "LDAP library version >= 2.3 detected. Please use LDAP_URI instead of " @@ -2747,32 +2791,32 @@ "Generated URI %s\n" msgstr "" -#: warnquota.c:865 +#: warnquota.c:863 msgid "LDAP library does not support ldap_initialize() but URI is specified." msgstr "" -#: warnquota.c:887 +#: warnquota.c:885 #, c-format msgid "Cannot open file with group administrators: %s\n" msgstr "" -#: warnquota.c:902 +#: warnquota.c:900 #, c-format msgid "Parse error at line %d. Cannot find end of group name.\n" msgstr "" -#: warnquota.c:911 +#: warnquota.c:909 #, c-format msgid "Parse error at line %d. Cannot find administrators name.\n" msgstr "" -#: warnquota.c:921 +#: warnquota.c:919 #, c-format msgid "" "Parse error at line %d. Trailing characters after administrators name.\n" msgstr "行 %d 分析出错,管理员名字后有多余蔓生的字符。\n" -#: warnquota.c:984 +#: warnquota.c:982 msgid "" "Usage:\n" " warnquota [-ugsid] [-F quotaformat] [-c configfile] [-q quotatabfile] [-a " @@ -2793,7 +2837,7 @@ "\n" msgstr "" -#: warnquota.c:1065 +#: warnquota.c:1063 #, c-format msgid "Cannot get host name: %s\n" msgstr "无法获得主机名:%s\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/recode.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/recode.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/recode.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/recode.po 2012-02-23 07:11:33.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: 2011-12-29 10:54+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n" +"X-Generator: Launchpad (build 14838)\n" "X-Poedit-Basepath: z:\\recode-3.6\n" #: src/main.c:142 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/rpm.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rpm.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/rpm.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rpm.po 2012-02-23 07:11: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: 2011-12-29 10:55+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: cliutils.c:20 lib/poptI.c:29 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/rrdtool.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rrdtool.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/rrdtool.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rrdtool.po 2012-02-23 07:11: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: 2011-12-29 10:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:46+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/rrd_getopt.c:618 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sane-backends.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sane-backends.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sane-backends.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sane-backends.po 2012-02-23 07:11: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: 2011-12-29 10:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:46+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../include/sane/saneopts.h:154 #, no-c-format diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po 2012-01-02 18:07:39.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po 2012-02-23 07:11:59.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: screen-resolution-extra\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-19 17:01+0000\n" +"POT-Creation-Date: 2012-01-13 09:12+0000\n" "PO-Revision-Date: 2010-10-01 05:39+0000\n" "Last-Translator: Xhacker Liu \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 17:19+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:17+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../ScreenResolution/ui.py:59 msgid "" @@ -51,13 +51,13 @@ msgstr "更改屏幕分辨率设置" #: ../screenresolution-mechanism.policy.in.h:2 -msgid "Change the effect of Ctrl+Alt+Backspace" -msgstr "更改按 Ctrl+Alt+Backspace 后的效果" - -#: ../screenresolution-mechanism.policy.in.h:3 msgid "Changing the Screen Resolution configuration requires privileges." msgstr "更改屏幕分辨率配置需要权限。" +#: ../screenresolution-mechanism.policy.in.h:3 +msgid "Change the effect of Ctrl+Alt+Backspace" +msgstr "更改按 Ctrl+Alt+Backspace 后的效果" + #: ../screenresolution-mechanism.policy.in.h:4 msgid "Changing the effect of Ctrl+Alt+Backspace requires privileges." msgstr "更改 Ctrl+Alt+Backspace 组合键功能需要权限。" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sed.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sed.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sed.po 2012-01-02 18:07:11.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sed.po 2012-02-23 07:11:36.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: 2011-12-29 11:11+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: sed/compile.c:161 msgid "multiple `!'s" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/shared-mime-info.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/shared-mime-info.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/shared-mime-info.po 2012-01-02 18:07:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/shared-mime-info.po 2012-02-23 07:11:36.000000000 +0000 @@ -8,2670 +8,2674 @@ msgstr "" "Project-Id-Version: shared-mime-info\n" "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n" -"POT-Creation-Date: 2011-11-29 06:49+0000\n" +"POT-Creation-Date: 2012-02-08 16:48+0000\n" "PO-Revision-Date: 2011-12-07 20:49+0000\n" "Last-Translator: Bastien Nocera \n" "Language-Team: Chinese (China) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 11:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: ../freedesktop.org.xml.in.h:1 -msgid "3D Studio image" -msgstr "3D Studio 图像" +msgid "ATK inset" +msgstr "ATK 嵌入对象" #: ../freedesktop.org.xml.in.h:2 -msgid "3GPP multimedia file" -msgstr "3GPP 多媒体文件" +msgid "electronic book document" +msgstr "电子书文档" #: ../freedesktop.org.xml.in.h:3 -msgid "3GPP2 multimedia file" -msgstr "3GPP2 多媒体文件" +msgid "Adobe Illustrator document" +msgstr "Adobe Illustrator 文档" #: ../freedesktop.org.xml.in.h:4 -msgid "7-zip archive" -msgstr "7-zip 归档文件" +msgid "Macintosh BinHex-encoded file" +msgstr "Macintosh BinHex 编码的文件" #: ../freedesktop.org.xml.in.h:5 -msgid "ACE archive" -msgstr "ACE 归档文件" +msgid "Mathematica Notebook" +msgstr "Mathematica 记事" #: ../freedesktop.org.xml.in.h:6 -msgid "AIFC audio" -msgstr "AIFC 音频" +msgid "MathML document" +msgstr "MathML 文档" #: ../freedesktop.org.xml.in.h:7 -msgid "AIFF audio" -msgstr "AIFF 音频" +msgid "mailbox file" +msgstr "mailbox 文件" #: ../freedesktop.org.xml.in.h:8 -msgid "AIFF/Amiga/Mac audio" -msgstr "AIFF/Amiga/Mac 音频" +msgid "Metalink file" +msgstr "元链接文件" #: ../freedesktop.org.xml.in.h:9 -msgid "AMR audio" -msgstr "AMR 音频" +msgid "unknown" +msgstr "未知" #: ../freedesktop.org.xml.in.h:10 -msgid "AMR-WB audio" -msgstr "AMR-WB 音频" +msgid "ODA document" +msgstr "ODA 文档" #: ../freedesktop.org.xml.in.h:11 -msgid "ANIM animation" -msgstr "ANIM 动画" +msgid "WWF document" +msgstr "WWF" #: ../freedesktop.org.xml.in.h:12 -msgid "AR archive" -msgstr "AR 归档文件" +msgid "PDF document" +msgstr "PDF 文档" #: ../freedesktop.org.xml.in.h:13 -msgid "ARC archive" -msgstr "ARC 归档文件" +msgid "XSPF playlist" +msgstr "XSPF 播放列表" #: ../freedesktop.org.xml.in.h:14 -msgid "ARJ archive" -msgstr "ARJ 归档文件" +msgid "Microsoft Windows theme pack" +msgstr "Microsoft Windows 主题包" #: ../freedesktop.org.xml.in.h:15 -msgid "ASF video" -msgstr "ASF 视频" +msgid "GSM 06.10 audio" +msgstr "GSM 06.10 音频" #: ../freedesktop.org.xml.in.h:16 -msgid "ASP page" -msgstr "ASP 页面" +msgid "iRiver Playlist" +msgstr "iRiver 播放列表" #: ../freedesktop.org.xml.in.h:17 -msgid "ATK inset" -msgstr "ATK 嵌入对象" +msgid "PGP/MIME-encrypted message header" +msgstr "PGP/MIME 加密的信件头" #: ../freedesktop.org.xml.in.h:18 -msgid "AVI video" -msgstr "AVI 视频" +msgid "PGP keys" +msgstr "PGP 密钥" #: ../freedesktop.org.xml.in.h:19 -msgid "AWK script" -msgstr "AWK 脚本" +msgid "detached OpenPGP signature" +msgstr "分离的 OpenPGP 签名" #: ../freedesktop.org.xml.in.h:20 -msgid "AbiWord document" -msgstr "AbiWord 文档" +msgid "S/MIME file" +msgstr "S/MIME 文件" #: ../freedesktop.org.xml.in.h:21 -msgid "Ada source code" -msgstr "Ada 源代码" +msgid "detached S/MIME signature" +msgstr "分离的 S/MIME 签名" #: ../freedesktop.org.xml.in.h:22 -msgid "Adobe DNG negative" -msgstr "Adobe DNG 负片" +msgid "PKCS#8 private key" +msgstr "PKCS#8 私钥" #: ../freedesktop.org.xml.in.h:23 -msgid "Adobe FrameMaker MIF document" -msgstr "Adobe FrameMaker MIF 文档" +msgid "PKCS#10 certification request" +msgstr "PKCS#10 认证请求" #: ../freedesktop.org.xml.in.h:24 -msgid "Adobe FrameMaker document" -msgstr "Adobe FrameMaker 文档" +msgid "X.509 certificate" +msgstr "X.509 证书" #: ../freedesktop.org.xml.in.h:25 -msgid "Adobe FrameMaker font" -msgstr "Adobe FrameMaker 字体" +msgid "Certificate revocation list" +msgstr "证书吊销列表" #: ../freedesktop.org.xml.in.h:26 -msgid "Adobe Illustrator document" -msgstr "Adobe Illustrator 文档" +msgid "PkiPath certification path" +msgstr "PkiPath 证书目录" #: ../freedesktop.org.xml.in.h:27 -msgid "Adobe font metrics" -msgstr "Adobe 字体参数" +msgid "PS document" +msgstr "PS 文档" #: ../freedesktop.org.xml.in.h:28 -msgid "Alzip archive" -msgstr "Alzip 归档文件" +msgid "Plucker document" +msgstr "Plucker 文档" #: ../freedesktop.org.xml.in.h:29 -msgid "Amiga SoundTracker audio" -msgstr "Amiga SoundTracker 音频" +msgid "RELAX NG XML schema" +msgstr "RELAX NG XML 模式" #: ../freedesktop.org.xml.in.h:30 -msgid "Android package" -msgstr "Android" +msgid "RTF document" +msgstr "RTF 文档" #: ../freedesktop.org.xml.in.h:31 -msgid "Annodex Audio" -msgstr "Annodex 音频" +msgid "Sieve mail filter script" +msgstr "Sieve 邮件过滤脚本" #: ../freedesktop.org.xml.in.h:32 -msgid "Annodex Video" -msgstr "Annodex 视频" +msgid "SMIL document" +msgstr "SMIL 文档" #: ../freedesktop.org.xml.in.h:33 -msgid "Annodex exchange format" -msgstr "Annodex 交换格式" +msgid "WPL playlist" +msgstr "WPL 播放列表" #: ../freedesktop.org.xml.in.h:34 -msgid "AportisDoc document" -msgstr "AportisDoc 文档" +msgid "SQLite2 database" +msgstr "SQLite2 数据库" #: ../freedesktop.org.xml.in.h:35 -msgid "Apple disk image" -msgstr "Apple 磁盘镜像" +msgid "SQLite3 database" +msgstr "SQLite3 数据库" #: ../freedesktop.org.xml.in.h:36 -msgid "Applix Graphics image" -msgstr "Applix Graphics 图像" +msgid "GEDCOM family history" +msgstr "GEDCOM 家谱" #: ../freedesktop.org.xml.in.h:37 -msgid "Applix Spreadsheets spreadsheet" -msgstr "Applix Spreadsheets 工作簿" +msgid "Flash video" +msgstr "Flash 影片" #: ../freedesktop.org.xml.in.h:38 -msgid "Applix Words document" -msgstr "Applix Words 文档" - -#: ../freedesktop.org.xml.in.h:39 -msgid "Atom syndication feed" -msgstr "Atom 更新种子" - -#: ../freedesktop.org.xml.in.h:40 -msgid "AutoCAD image" -msgstr "AutoCAD 图像" - -#: ../freedesktop.org.xml.in.h:41 -msgid "BCPIO document" -msgstr "BCPIO 文档" +msgid "JavaFX video" +msgstr "JavaFX 视频" +#. translators: a record is in this context a description of a board game +#. that has been played, and that can be played back again: +#. http://www.red-bean.com/sgf/ #: ../freedesktop.org.xml.in.h:42 -msgid "BDF font" -msgstr "BDF 字体" +msgid "SGF record" +msgstr "SGF 记录" #: ../freedesktop.org.xml.in.h:43 -msgid "BibTeX document" -msgstr "BibTeX 文档" +msgid "XLIFF translation file" +msgstr "XLIFF 消息翻译文件" #: ../freedesktop.org.xml.in.h:44 -msgid "BitTorrent seed file" -msgstr "BitTorrent 种子文件" +msgid "YAML document" +msgstr "YAML 文档" #: ../freedesktop.org.xml.in.h:45 -msgid "Blender scene" -msgstr "Blender 场景" +msgid "Corel Draw drawing" +msgstr "Corel Draw 图形" + +#: ../freedesktop.org.xml.in.h:46 +msgid "HPGL file" +msgstr "HPGL 文件" + +#: ../freedesktop.org.xml.in.h:47 +msgid "PCL file" +msgstr "PCL 文件" -#. http://en.wikipedia.org/wiki/Blu-ray_Disc -#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html #: ../freedesktop.org.xml.in.h:48 -msgid "Blu-ray video disc" -msgstr "蓝光视频光盘" +msgid "Lotus 1-2-3 spreadsheet" +msgstr "Lotus 1-2-3 工作簿" #: ../freedesktop.org.xml.in.h:49 -msgid "Bzip archive" -msgstr "bzip 归档文件" +msgid "JET database" +msgstr "JET 数据库" #: ../freedesktop.org.xml.in.h:50 -msgid "C header" -msgstr "C 程序头文件" +msgid "Microsoft Cabinet archive" +msgstr "Microsoft CAB 归档文件" #: ../freedesktop.org.xml.in.h:51 -msgid "C shell script" -msgstr "C shell 脚本" +msgid "Excel spreadsheet" +msgstr "Microsoft Excel 工作簿" #: ../freedesktop.org.xml.in.h:52 -msgid "C source code" -msgstr "C 源代码" +msgid "Excel add-in" +msgstr "" #: ../freedesktop.org.xml.in.h:53 -msgid "C# source code" -msgstr "C# 源代码" +msgid "Excel 2007 binary spreadsheet" +msgstr "" #: ../freedesktop.org.xml.in.h:54 -msgid "C++ header" -msgstr "C++ 源代码头文件" +msgid "Excel macro-enabled spreadsheet" +msgstr "" #: ../freedesktop.org.xml.in.h:55 -msgid "C++ source code" -msgstr "C++ 源代码" +msgid "Excel macro-enabled spreadsheet template" +msgstr "" #: ../freedesktop.org.xml.in.h:56 -msgid "CCITT G3 fax" -msgstr "CCITT G3 传真" +msgid "PowerPoint presentation" +msgstr "Microsoft PowerPoint 演示文稿" #: ../freedesktop.org.xml.in.h:57 -msgid "CD Table Of Contents" -msgstr "CD 索引" +msgid "PowerPoint add-in" +msgstr "" #: ../freedesktop.org.xml.in.h:58 -msgid "CD image cuesheet" -msgstr "CD 映像标记文件" +msgid "PowerPoint macro-enabled presentation" +msgstr "" #: ../freedesktop.org.xml.in.h:59 -msgid "CHM document" -msgstr "CHM 文档" +msgid "PowerPoint macro-enabled slide" +msgstr "" #: ../freedesktop.org.xml.in.h:60 -msgid "CMU raster image" -msgstr "CMU 矢量图像" +msgid "PowerPoint macro-enabled presentation template" +msgstr "" #: ../freedesktop.org.xml.in.h:61 -msgid "CMake source code" -msgstr "CMake 源代码" +msgid "Word macro-enabled document" +msgstr "" #: ../freedesktop.org.xml.in.h:62 -msgid "COBOL source file" -msgstr "COBOL 源" +msgid "Word macro-enabled document template" +msgstr "" #: ../freedesktop.org.xml.in.h:63 -msgid "CPIO archive" -msgstr "CPIO 归档文件" +msgid "XPS document" +msgstr "XPS 文档" #: ../freedesktop.org.xml.in.h:64 -msgid "CPIO archive (gzip-compressed)" -msgstr "CPIO 归档文件(gzip 压缩)" +msgid "Microsoft Works document" +msgstr "Microsoft Works 文档" #: ../freedesktop.org.xml.in.h:65 -msgid "CSS stylesheet" -msgstr "CSS 样式表" +msgid "Microsoft Visio document" +msgstr "" #: ../freedesktop.org.xml.in.h:66 -msgid "CSV document" -msgstr "CSV 文档" +msgid "Word document" +msgstr "Microsoft Word 文档" #: ../freedesktop.org.xml.in.h:67 -msgid "Canon CR2 raw image" -msgstr "Canon CR2 原始图像" +msgid "Word template" +msgstr "Word 模板" #: ../freedesktop.org.xml.in.h:68 -msgid "Canon CRW raw image" -msgstr "Canon CRW 原始图像" +msgid "GNUnet search file" +msgstr "GNUnet 搜索文件" #: ../freedesktop.org.xml.in.h:69 -msgid "Certificate revocation list" -msgstr "证书吊销列表" +msgid "TNEF message" +msgstr "TNEF 信件" #: ../freedesktop.org.xml.in.h:70 -msgid "ChangeLog document" -msgstr "变更日志文档" +msgid "StarCalc spreadsheet" +msgstr "STarCalc 工作簿" #: ../freedesktop.org.xml.in.h:71 -msgid "Cisco VPN Settings" -msgstr "Cisco VPN 设置" +msgid "StarChart chart" +msgstr "STarChart 图表" #: ../freedesktop.org.xml.in.h:72 -msgid "Citrix ICA settings file" -msgstr "Citrix ICA 设置文件" +msgid "StarDraw drawing" +msgstr "STarDraw 绘图" #: ../freedesktop.org.xml.in.h:73 -msgid "Commodore 64 audio" -msgstr "Commodore 64 音频" +msgid "StarImpress presentation" +msgstr "STarImpress 演示文稿" #: ../freedesktop.org.xml.in.h:74 -msgid "Computer Graphics Metafile" -msgstr "CGM 计算机图像元文件" +msgid "StarMail email" +msgstr "STarMail 电子邮件" #: ../freedesktop.org.xml.in.h:75 -msgid "Corel Draw drawing" -msgstr "Corel Draw 图形" +msgid "StarMath formula" +msgstr "STarMath 公式" #: ../freedesktop.org.xml.in.h:76 -msgid "D source code" -msgstr "D 源代码" +msgid "StarWriter document" +msgstr "STarWriter 文档" #: ../freedesktop.org.xml.in.h:77 -msgid "DAR archive" -msgstr "DAR 归档文件" +msgid "OpenOffice Calc spreadsheet" +msgstr "OpenOffice.org Calc 工作簿" #: ../freedesktop.org.xml.in.h:78 -msgid "DCL script" -msgstr "DCL 脚本" +msgid "OpenOffice Calc template" +msgstr "OpenOffice.org Calc 工作簿模板" #: ../freedesktop.org.xml.in.h:79 -msgid "DER/PEM/Netscape-encoded X.509 certificate" -msgstr "DER/PEM/Netscape-encoded X.509 证书" +msgid "OpenOffice Draw drawing" +msgstr "OpenOffice.org Draw 绘图" #: ../freedesktop.org.xml.in.h:80 -msgid "DIB image" -msgstr "DIB 图像" +msgid "OpenOffice Draw template" +msgstr "OpenOffice.org Draw 绘图模板" #: ../freedesktop.org.xml.in.h:81 -msgid "DICOM image" -msgstr "DICOM 图像" +msgid "OpenOffice Impress presentation" +msgstr "OpenOffice.org Impress 演示文稿" #: ../freedesktop.org.xml.in.h:82 -msgid "DOS font" -msgstr "DOS 字体" +msgid "OpenOffice Impress template" +msgstr "OpenOffice.org Impress 演示文稿模板" #: ../freedesktop.org.xml.in.h:83 -msgid "DOS/Windows executable" -msgstr "DOS/Windows 可执行文件" +msgid "OpenOffice Math formula" +msgstr "OpenOffice.org Math 公式" #: ../freedesktop.org.xml.in.h:84 -msgid "DPX image" -msgstr "DPX 图像" +msgid "OpenOffice Writer document" +msgstr "OpenOffice.org Writer 文档" #: ../freedesktop.org.xml.in.h:85 -msgid "DSSSL document" -msgstr "DSSSL 文档" +msgid "OpenOffice Writer global document" +msgstr "OpenOffice.org Writer 全局文档" #: ../freedesktop.org.xml.in.h:86 -msgid "DTD file" -msgstr "DTD 文件" +msgid "OpenOffice Writer template" +msgstr "OpenOffice.org Writer 文档模板" #: ../freedesktop.org.xml.in.h:87 -msgid "DV video" -msgstr "DV 视频" +msgid "ODT document" +msgstr "ODT 文档" #: ../freedesktop.org.xml.in.h:88 -msgid "DXF vector image" -msgstr "DXF 矢量图像" +msgid "ODT document (Flat XML)" +msgstr "ODT 文档(Flat XML)" #: ../freedesktop.org.xml.in.h:89 -msgid "Debian package" -msgstr "Debian 软件包" +msgid "ODT template" +msgstr "ODT 模板" #: ../freedesktop.org.xml.in.h:90 -msgid "Dia diagram" -msgstr "Dia 图表" +msgid "OTH template" +msgstr "OTH 模板" #: ../freedesktop.org.xml.in.h:91 -msgid "Dia shape" -msgstr "Dia 形状" +msgid "ODM document" +msgstr "ODM 文档" #: ../freedesktop.org.xml.in.h:92 -msgid "DirectDraw surface" -msgstr "DirectDraw 表面" +msgid "ODG drawing" +msgstr "ODG 绘图" #: ../freedesktop.org.xml.in.h:93 -msgid "DjVu image" -msgstr "DjVu 图像" +msgid "ODG drawing (Flat XML)" +msgstr "ODG 绘图(Flat XML)" #: ../freedesktop.org.xml.in.h:94 -msgid "DocBook document" -msgstr "DocBook 文档" +msgid "ODG template" +msgstr "ODG 模板" #: ../freedesktop.org.xml.in.h:95 -msgid "Dolby Digital audio" -msgstr "杜比数字音频" +msgid "ODP presentation" +msgstr "ODP 演示文稿" #: ../freedesktop.org.xml.in.h:96 -msgid "Dreamcast ROM" -msgstr "Dreamcast ROM" +msgid "ODP presentation (Flat XML)" +msgstr "ODP 演示文稿(Flat XML)" #: ../freedesktop.org.xml.in.h:97 -msgid "ECMAScript program" -msgstr "ECMAScript 程序" +msgid "ODP template" +msgstr "ODP 模板" #: ../freedesktop.org.xml.in.h:98 -msgid "EMF image" -msgstr "EMF 图像" +msgid "ODS spreadsheet" +msgstr "ODS 工作簿" #: ../freedesktop.org.xml.in.h:99 -msgid "EPS image" -msgstr "EPS 图像" +msgid "ODS spreadsheet (Flat XML)" +msgstr "ODS 工作簿(Flat XML)" #: ../freedesktop.org.xml.in.h:100 -msgid "EPS image (bzip-compressed)" -msgstr "EPS 图像(bzip 压缩)" +msgid "ODS template" +msgstr "ODS 模板" #: ../freedesktop.org.xml.in.h:101 -msgid "EPS image (gzip-compressed)" -msgstr "EPS 图像(gzip 压缩)" +msgid "ODC chart" +msgstr "ODC 图表" #: ../freedesktop.org.xml.in.h:102 -msgid "EXR image" -msgstr "EXR 图像" +msgid "ODC template" +msgstr "ODC 模板" #: ../freedesktop.org.xml.in.h:103 -msgid "Egon Animator animation" -msgstr "Egon Animator 动画" +msgid "ODF formula" +msgstr "ODF 公式" #: ../freedesktop.org.xml.in.h:104 -msgid "Eiffel source code" -msgstr "Eiffel 源代码" +msgid "ODF template" +msgstr "ODF 模板" #: ../freedesktop.org.xml.in.h:105 -msgid "Emacs Lisp source code" -msgstr "Emacs Lisp 源代码" +msgid "ODB database" +msgstr "ODB 数据库" #: ../freedesktop.org.xml.in.h:106 -msgid "Enlightenment theme" -msgstr "Enlightenment 主题" +msgid "ODI image" +msgstr "ODI 图像" #: ../freedesktop.org.xml.in.h:107 -msgid "Erlang source code" -msgstr "Erlang 源代码" +msgid "OpenOffice.org extension" +msgstr "OpenOffice.org 扩展" #: ../freedesktop.org.xml.in.h:108 -msgid "Excel 2007 binary spreadsheet" -msgstr "" +msgid "Android package" +msgstr "Android" #: ../freedesktop.org.xml.in.h:109 -msgid "Excel 2007 spreadsheet" -msgstr "Microsoft Excel 2007 工作簿" +msgid "SIS package" +msgstr "SIS 软件包" #: ../freedesktop.org.xml.in.h:110 -msgid "Excel 2007 spreadsheet template" -msgstr "" +msgid "SISX package" +msgstr "SISX 软件包" #: ../freedesktop.org.xml.in.h:111 -msgid "Excel add-in" +msgid "Network Packet Capture" msgstr "" #: ../freedesktop.org.xml.in.h:112 -msgid "Excel macro-enabled spreadsheet" -msgstr "" +msgid "WordPerfect document" +msgstr "WordPerfect 文档" #: ../freedesktop.org.xml.in.h:113 -msgid "Excel macro-enabled spreadsheet template" -msgstr "" +msgid "SPSS Portable Data File" +msgstr "SPSS 便携式数据文件" #: ../freedesktop.org.xml.in.h:114 -msgid "Excel spreadsheet" -msgstr "Microsoft Excel 工作簿" +msgid "SPSS Data File" +msgstr "SPSS 数据文件" #: ../freedesktop.org.xml.in.h:115 -msgid "FITS document" -msgstr "FITS 文档" +msgid "XBEL bookmarks" +msgstr "XBEL 书签" #: ../freedesktop.org.xml.in.h:116 -msgid "FLAC audio" -msgstr "FLAC 音频" +msgid "7-zip archive" +msgstr "7-zip 归档文件" #: ../freedesktop.org.xml.in.h:117 -msgid "FLIC animation" -msgstr "FLIC 动画" +msgid "AbiWord document" +msgstr "AbiWord 文档" #: ../freedesktop.org.xml.in.h:118 -msgid "FLTK Fluid file" -msgstr "FLTK 流体文档" +msgid "CD image cuesheet" +msgstr "CD 映像标记文件" #: ../freedesktop.org.xml.in.h:119 -msgid "FPX image" -msgstr "FPX 图像" +msgid "Lotus AmiPro document" +msgstr "Lotus AmiPro 文档" #: ../freedesktop.org.xml.in.h:120 -msgid "FastTracker II audio" -msgstr "FastTracker II 音频" +msgid "AportisDoc document" +msgstr "AportisDoc 文档" #: ../freedesktop.org.xml.in.h:121 -msgid "FictionBook document" -msgstr "FictionBook 文档" +msgid "Applix Spreadsheets spreadsheet" +msgstr "Applix Spreadsheets 工作簿" #: ../freedesktop.org.xml.in.h:122 -msgid "Flash video" -msgstr "Flash 影片" +msgid "Applix Words document" +msgstr "Applix Words 文档" #: ../freedesktop.org.xml.in.h:123 -msgid "Fortran source code" -msgstr "Fortran 源代码" +msgid "ARC archive" +msgstr "ARC 归档文件" #: ../freedesktop.org.xml.in.h:124 -msgid "Fuji RAF raw image" -msgstr "富士RAF 原始图像" +msgid "AR archive" +msgstr "AR 归档文件" #: ../freedesktop.org.xml.in.h:125 -msgid "G3 fax image" -msgstr "G3 传真文档" +msgid "ARJ archive" +msgstr "ARJ 归档文件" #: ../freedesktop.org.xml.in.h:126 -msgid "GDBM database" -msgstr "GDBM 数据库" +msgid "ASP page" +msgstr "ASP 页面" #: ../freedesktop.org.xml.in.h:127 -msgid "GEDCOM family history" -msgstr "GEDCOM 家谱" +msgid "AWK script" +msgstr "AWK 脚本" #: ../freedesktop.org.xml.in.h:128 -msgid "GIF image" -msgstr "GIF 图像" +msgid "BCPIO document" +msgstr "BCPIO 文档" #: ../freedesktop.org.xml.in.h:129 -msgid "GIMP image" -msgstr "GIMP 图像" - +msgid "BitTorrent seed file" +msgstr "BitTorrent 种子文件" + #: ../freedesktop.org.xml.in.h:130 -msgid "GMC link" -msgstr "GMC 链接" +msgid "Blender scene" +msgstr "Blender 场景" #: ../freedesktop.org.xml.in.h:131 -msgid "GNU Oleo spreadsheet" -msgstr "GNU Oleo 工作簿" +msgid "TeX DVI document (bzip-compressed)" +msgstr "TeX DVI 文档(gzip 压缩)" #: ../freedesktop.org.xml.in.h:132 -msgid "GNU mail message" -msgstr "GNU mail 信件" +msgid "Bzip archive" +msgstr "bzip 归档文件" #: ../freedesktop.org.xml.in.h:133 -msgid "GNUnet search file" -msgstr "GNUnet 搜索文件" +msgid "Tar archive (bzip-compressed)" +msgstr "Tar 归档文件(bzip 压缩)" #: ../freedesktop.org.xml.in.h:134 -msgid "GSM 06.10 audio" -msgstr "GSM 06.10 音频" +msgid "PDF document (bzip-compressed)" +msgstr "PDF 文档(bzip 压缩)" #: ../freedesktop.org.xml.in.h:135 -msgid "GTKtalog catalog" -msgstr "GTKtalog 目录" +msgid "PostScript document (bzip-compressed)" +msgstr "PostScript 文档(bzip 压缩)" #: ../freedesktop.org.xml.in.h:136 -msgid "Game Boy Advance ROM" -msgstr "Game Boy Advance ROM" +msgid "comic book archive" +msgstr "Comic Book 归档文件" #: ../freedesktop.org.xml.in.h:137 -msgid "Game Boy ROM" -msgstr "Game Boy ROM" +msgid "Lrzip archive" +msgstr "Lrzip 归档文件" + +#: ../freedesktop.org.xml.in.h:138 +msgid "Tar archive (lrzip-compressed)" +msgstr "Tar 归档文件 (lrzip 压缩)" + +#: ../freedesktop.org.xml.in.h:139 +msgid "Apple disk image" +msgstr "Apple 磁盘镜像" -#. Translate this to Megadrive if the console was known as such in your locale -#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History #: ../freedesktop.org.xml.in.h:140 -msgid "Genesis ROM" -msgstr "Genesis ROM" +msgid "raw CD image" +msgstr "原始 CD 映像" #: ../freedesktop.org.xml.in.h:141 -msgid "Glade project" -msgstr "Glade 工程" +msgid "CD Table Of Contents" +msgstr "CD 索引" #: ../freedesktop.org.xml.in.h:142 -msgid "GnuCash financial data" -msgstr "GnuCash 财务数据" +msgid "PGN chess game notation" +msgstr "PGN 象棋游戏注记" #: ../freedesktop.org.xml.in.h:143 -msgid "Gnumeric spreadsheet" -msgstr "Gnumeric 工作簿" +msgid "CHM document" +msgstr "CHM 文档" #: ../freedesktop.org.xml.in.h:144 -msgid "Gnuplot document" -msgstr "Gnuplot 文档" +msgid "Java byte code" +msgstr "Java 字节码" #: ../freedesktop.org.xml.in.h:145 -msgid "Go source code" -msgstr "Go" +msgid "UNIX-compressed file" +msgstr "UNIX 压缩文件" #: ../freedesktop.org.xml.in.h:146 -msgid "Google Video Pointer" -msgstr "Google 视频指向" +msgid "Tar archive (gzip-compressed)" +msgstr "Tar 归档文件(gzip 压缩)" #: ../freedesktop.org.xml.in.h:147 -msgid "Graphite scientific graph" -msgstr "Graphite 科学图形" +msgid "program crash data" +msgstr "程序崩溃数据" #: ../freedesktop.org.xml.in.h:148 -msgid "Graphviz DOT graph" -msgstr "Graphviz DOT 科学图形" +msgid "CPIO archive" +msgstr "CPIO 归档文件" #: ../freedesktop.org.xml.in.h:149 -msgid "Gzip archive" -msgstr "Gzip 归档文件" +msgid "CPIO archive (gzip-compressed)" +msgstr "CPIO 归档文件(gzip 压缩)" + +#: ../freedesktop.org.xml.in.h:150 +msgid "C shell script" +msgstr "C shell 脚本" + +#: ../freedesktop.org.xml.in.h:151 +msgid "Xbase document" +msgstr "Xbase 文档" -#. http://en.wikipedia.org/wiki/HD_DVD -#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder #: ../freedesktop.org.xml.in.h:152 -msgid "HD DVD video disc" -msgstr "HD DVD 视频光盘" +msgid "ECMAScript program" +msgstr "ECMAScript 程序" #: ../freedesktop.org.xml.in.h:153 -msgid "HDF document" -msgstr "HDF 文档" +msgid "Dreamcast ROM" +msgstr "Dreamcast ROM" #: ../freedesktop.org.xml.in.h:154 -msgid "HPGL file" -msgstr "HPGL 文件" +msgid "Nintendo DS ROM" +msgstr "Nintendo DS ROM" #: ../freedesktop.org.xml.in.h:155 -msgid "HTML document" -msgstr "HTML 文档" +msgid "Debian package" +msgstr "Debian 软件包" #: ../freedesktop.org.xml.in.h:156 -msgid "HTTP Live Streaming playlist" -msgstr "HTTP 直播流播放列表" +msgid "Qt Designer file" +msgstr "Qt Designer 文件" #: ../freedesktop.org.xml.in.h:157 -msgid "Haansoft Hangul document" -msgstr "Haansoft Hangul 文档" +msgid "Qt Markup Language file" +msgstr "Qt" #: ../freedesktop.org.xml.in.h:158 -msgid "Haansoft Hangul document template" -msgstr "Haansoft Hangul 文档模板" +msgid "desktop configuration file" +msgstr "桌面配置文件" #: ../freedesktop.org.xml.in.h:159 -msgid "Haskell source code" -msgstr "Haskell 源代码" +msgid "FictionBook document" +msgstr "FictionBook 文档" #: ../freedesktop.org.xml.in.h:160 -msgid "ICC profile" -msgstr "ICC 文件" +msgid "Dia diagram" +msgstr "Dia 图表" #: ../freedesktop.org.xml.in.h:161 -msgid "IDL document" -msgstr "IDL 文档" +msgid "Dia shape" +msgstr "Dia 形状" #: ../freedesktop.org.xml.in.h:162 -msgid "IEF image" -msgstr "IEF 图像" +msgid "TeX DVI document" +msgstr "TeX DVI 文档" #: ../freedesktop.org.xml.in.h:163 -msgid "IFF image" -msgstr "IFF 图像" +msgid "Enlightenment theme" +msgstr "Enlightenment 主题" #: ../freedesktop.org.xml.in.h:164 -msgid "ILBM image" -msgstr "ILBM 图像" +msgid "Egon Animator animation" +msgstr "Egon Animator 动画" #: ../freedesktop.org.xml.in.h:165 -msgid "ISI video" -msgstr "ISI 视频" +msgid "executable" +msgstr "可执行文件" #: ../freedesktop.org.xml.in.h:166 -msgid "IT 8.7 color calibration file" -msgstr "IT 8.7 色彩校准文件" +msgid "FLTK Fluid file" +msgstr "FLTK 流体文档" #: ../freedesktop.org.xml.in.h:167 -msgid "Impulse Tracker audio" -msgstr "Impulse Tracker 音频" +msgid "Postscript type-1 font" +msgstr "Postscript type-1 字体" #: ../freedesktop.org.xml.in.h:168 -msgid "Internet shortcut" -msgstr "Internet 快捷方式" +msgid "Adobe font metrics" +msgstr "Adobe 字体参数" #: ../freedesktop.org.xml.in.h:169 -msgid "JAD document" -msgstr "JAD 文档" +msgid "BDF font" +msgstr "BDF 字体" #: ../freedesktop.org.xml.in.h:170 -msgid "JBuilder project" -msgstr "JBuilder 工程" +msgid "DOS font" +msgstr "DOS 字体" #: ../freedesktop.org.xml.in.h:171 -msgid "JET database" -msgstr "JET 数据库" +msgid "Adobe FrameMaker font" +msgstr "Adobe FrameMaker 字体" #: ../freedesktop.org.xml.in.h:172 -msgid "JNG image" -msgstr "JNG 图像" +msgid "LIBGRX font" +msgstr "LIBGRX 字体" #: ../freedesktop.org.xml.in.h:173 -msgid "JNLP file" -msgstr "JNLP 文件" +msgid "Linux PSF console font" +msgstr "Linux PSF 控制台字体" #: ../freedesktop.org.xml.in.h:174 -msgid "JPEG image" -msgstr "JPEG 图像" +msgid "Linux PSF console font (gzip-compressed)" +msgstr "Linux PSF 控制台字体(gzip 压缩)" #: ../freedesktop.org.xml.in.h:175 -msgid "JPEG-2000 image" -msgstr "JPEG-2000 图像" +msgid "PCF font" +msgstr "PCF 字体" #: ../freedesktop.org.xml.in.h:176 -msgid "Java JCE keystore" -msgstr "Java JCE 密钥库" +msgid "OpenType font" +msgstr "OpenType 字体" #: ../freedesktop.org.xml.in.h:177 -msgid "Java archive" -msgstr "Java 归档文件" +msgid "Speedo font" +msgstr "Speedo 字体" #: ../freedesktop.org.xml.in.h:178 -msgid "Java byte code" -msgstr "Java 字节码" +msgid "SunOS News font" +msgstr "SunOS News 字体" #: ../freedesktop.org.xml.in.h:179 -msgid "Java class" -msgstr "Java 类" +msgid "TeX font" +msgstr "TeX 字体" #: ../freedesktop.org.xml.in.h:180 -msgid "Java keystore" -msgstr "Java 密钥库" +msgid "TeX font metrics" +msgstr "TeX 字体参数" #: ../freedesktop.org.xml.in.h:181 -msgid "Java source code" -msgstr "Java 源代码" +msgid "TrueType font" +msgstr "TrueType 字体" #: ../freedesktop.org.xml.in.h:182 -msgid "JavaFX video" -msgstr "JavaFX 视频" +msgid "TrueType XML font" +msgstr "TrueType XML 字体" #: ../freedesktop.org.xml.in.h:183 -msgid "JavaScript program" -msgstr "Javascript 程序" +msgid "V font" +msgstr "V 字体" #: ../freedesktop.org.xml.in.h:184 -msgid "KChart chart" -msgstr "KChart 图表" +msgid "Adobe FrameMaker document" +msgstr "Adobe FrameMaker 文档" #: ../freedesktop.org.xml.in.h:185 -msgid "KFormula formula" -msgstr "KFormula 公式" +msgid "Game Boy ROM" +msgstr "Game Boy ROM" #: ../freedesktop.org.xml.in.h:186 -msgid "KIllustrator drawing" -msgstr "KIllustrator 绘图" +msgid "Game Boy Advance ROM" +msgstr "Game Boy Advance ROM" #: ../freedesktop.org.xml.in.h:187 -msgid "KML geographic compressed data" -msgstr "KML 压缩地理数据" - -#: ../freedesktop.org.xml.in.h:188 -msgid "KML geographic data" -msgstr "KML 地理数据" - -#: ../freedesktop.org.xml.in.h:189 -msgid "KPovModeler scene" -msgstr "KPovModeler 场景" +msgid "GDBM database" +msgstr "GDBM 数据库" +#. Translate this to Megadrive if the console was known as such in your locale +#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History #: ../freedesktop.org.xml.in.h:190 -msgid "KPresenter presentation" -msgstr "KPresenter 演示文稿" +msgid "Genesis ROM" +msgstr "Genesis ROM" #: ../freedesktop.org.xml.in.h:191 -msgid "KSpread spreadsheet" -msgstr "KSpread 工作簿" +msgid "translated messages (machine-readable)" +msgstr "消息翻译(机读)" #: ../freedesktop.org.xml.in.h:192 -msgid "KSpread spreadsheet (encrypted)" -msgstr "KSpread 加密工作簿" +msgid "Glade project" +msgstr "Glade 工程" #: ../freedesktop.org.xml.in.h:193 -msgid "KSysV init package" -msgstr "KSysV init 软件包" +msgid "GMC link" +msgstr "GMC 链接" #: ../freedesktop.org.xml.in.h:194 -msgid "KWord document" -msgstr "KWord 文档" +msgid "GnuCash financial data" +msgstr "GnuCash 财务数据" #: ../freedesktop.org.xml.in.h:195 -msgid "KWord document (encrypted)" -msgstr "KWord 加密文档" +msgid "Gnumeric spreadsheet" +msgstr "Gnumeric 工作簿" #: ../freedesktop.org.xml.in.h:196 -msgid "Karbon14 drawing" -msgstr "Karbon14 绘图" +msgid "Gnuplot document" +msgstr "Gnuplot 文档" #: ../freedesktop.org.xml.in.h:197 -msgid "Kexi database file-based project" -msgstr "Kexi 基于文件的数据库项目" +msgid "Graphite scientific graph" +msgstr "Graphite 科学图形" #: ../freedesktop.org.xml.in.h:198 -msgid "Kexi settings for database server connection" -msgstr "Kexi 数据库服务器连接设置" +msgid "GTKtalog catalog" +msgstr "GTKtalog 目录" #: ../freedesktop.org.xml.in.h:199 -msgid "Kivio flowchart" -msgstr "Kivio 流程图" +msgid "TeX DVI document (gzip-compressed)" +msgstr "TeX DVI 文档(gzip 压缩)" #: ../freedesktop.org.xml.in.h:200 -msgid "Kodak DCR raw image" -msgstr "Kodak DCR 原始图像" +msgid "Gzip archive" +msgstr "Gzip 归档文件" #: ../freedesktop.org.xml.in.h:201 -msgid "Kodak K25 raw image" -msgstr "Kodak K25 原始图像" +msgid "PDF document (gzip-compressed)" +msgstr "PDF 文档(gzip 压缩)" #: ../freedesktop.org.xml.in.h:202 -msgid "Kodak KDC raw image" -msgstr "Kodak KDC 原始图像" +msgid "PostScript document (gzip-compressed)" +msgstr "PostScript 文档(gzip 压缩)" #: ../freedesktop.org.xml.in.h:203 -msgid "Kontour drawing" -msgstr "Kontour 绘图" +msgid "HDF document" +msgstr "HDF 文档" #: ../freedesktop.org.xml.in.h:204 -msgid "Krita document" -msgstr "Krita 文档" +msgid "iPod firmware" +msgstr "iPod 固件" #: ../freedesktop.org.xml.in.h:205 -msgid "Kugar document" -msgstr "Kugar 文档" +msgid "Java archive" +msgstr "Java 归档文件" #: ../freedesktop.org.xml.in.h:206 -msgid "LDIF address book" -msgstr "LDIF 地址簿" +msgid "Java class" +msgstr "Java 类" #: ../freedesktop.org.xml.in.h:207 -msgid "LHA archive" -msgstr "LHA 归档文件" +msgid "JNLP file" +msgstr "JNLP 文件" #: ../freedesktop.org.xml.in.h:208 -msgid "LHS source code" -msgstr "LHS 源代码" +msgid "Java keystore" +msgstr "Java 密钥库" #: ../freedesktop.org.xml.in.h:209 -msgid "LHZ archive" -msgstr "LHZ 归档文件" +msgid "Java JCE keystore" +msgstr "Java JCE 密钥库" #: ../freedesktop.org.xml.in.h:210 -msgid "LIBGRX font" -msgstr "LIBGRX 字体" +msgid "Pack200 Java archive" +msgstr "Pack200 Java 归档文件" #: ../freedesktop.org.xml.in.h:211 -msgid "LZMA archive" -msgstr "LZMA 归档文件" +msgid "JavaScript program" +msgstr "Javascript 程序" #: ../freedesktop.org.xml.in.h:212 -msgid "LZO archive" -msgstr "LZO 归档文件" +msgid "JBuilder project" +msgstr "JBuilder 工程" #: ../freedesktop.org.xml.in.h:213 -msgid "LightWave object" -msgstr "LightWave 对象" +msgid "Karbon14 drawing" +msgstr "Karbon14 绘图" #: ../freedesktop.org.xml.in.h:214 -msgid "LightWave scene" -msgstr "LightWave 场景" +msgid "KChart chart" +msgstr "KChart 图表" #: ../freedesktop.org.xml.in.h:215 -msgid "Lilypond music sheet" -msgstr "Lilypond 乐谱" +msgid "Kexi settings for database server connection" +msgstr "Kexi 数据库服务器连接设置" #: ../freedesktop.org.xml.in.h:216 -msgid "Linear and integer program expression format" -msgstr "线性和整数规划的表达格式" +msgid "shortcut to Kexi project on database server" +msgstr "数据库服务器上 Kexi 项目的快捷方式" #: ../freedesktop.org.xml.in.h:217 -msgid "Linux PSF console font" -msgstr "Linux PSF 控制台字体" +msgid "Kexi database file-based project" +msgstr "Kexi 基于文件的数据库项目" #: ../freedesktop.org.xml.in.h:218 -msgid "Linux PSF console font (gzip-compressed)" -msgstr "Linux PSF 控制台字体(gzip 压缩)" +msgid "KFormula formula" +msgstr "KFormula 公式" #: ../freedesktop.org.xml.in.h:219 -msgid "Lotus 1-2-3 spreadsheet" -msgstr "Lotus 1-2-3 工作簿" +msgid "KIllustrator drawing" +msgstr "KIllustrator 绘图" #: ../freedesktop.org.xml.in.h:220 -msgid "Lotus AmiPro document" -msgstr "Lotus AmiPro 文档" +msgid "Kivio flowchart" +msgstr "Kivio 流程图" #: ../freedesktop.org.xml.in.h:221 -msgid "Lrzip archive" -msgstr "Lrzip 归档文件" +msgid "Kontour drawing" +msgstr "Kontour 绘图" #: ../freedesktop.org.xml.in.h:222 -msgid "Lua script" -msgstr "Lua 脚本" +msgid "KPovModeler scene" +msgstr "KPovModeler 场景" #: ../freedesktop.org.xml.in.h:223 -msgid "LyX document" -msgstr "LyX 文档" +msgid "KPresenter presentation" +msgstr "KPresenter 演示文稿" #: ../freedesktop.org.xml.in.h:224 -msgid "Lzip archive" -msgstr "Lzip 归档文件" +msgid "Krita document" +msgstr "Krita 文档" #: ../freedesktop.org.xml.in.h:225 -msgid "M4 macro" -msgstr "M4 宏" +msgid "KSpread spreadsheet" +msgstr "KSpread 工作簿" #: ../freedesktop.org.xml.in.h:226 -msgid "MATLAB script/function" -msgstr "MATLAB 脚本/函数" +msgid "KSpread spreadsheet (encrypted)" +msgstr "KSpread 加密工作簿" #: ../freedesktop.org.xml.in.h:227 -msgid "MIDI audio" -msgstr "MIDI 音频" +msgid "KSysV init package" +msgstr "KSysV init 软件包" #: ../freedesktop.org.xml.in.h:228 -msgid "MNG animation" -msgstr "MNG 动画" +msgid "Kugar document" +msgstr "Kugar 文档" #: ../freedesktop.org.xml.in.h:229 -msgid "MP2 audio" -msgstr "MP2 音频" +msgid "KWord document" +msgstr "KWord 文档" #: ../freedesktop.org.xml.in.h:230 -msgid "MP3 ShoutCast playlist" -msgstr "MP3 ShoutCast 播放列表" +msgid "KWord document (encrypted)" +msgstr "KWord 加密文档" #: ../freedesktop.org.xml.in.h:231 -msgid "MP3 audio" -msgstr "MP3 音频" +msgid "LHA archive" +msgstr "LHA 归档文件" #: ../freedesktop.org.xml.in.h:232 -msgid "MP3 audio (streamed)" -msgstr "MP3 流音频" +msgid "LHZ archive" +msgstr "LHZ 归档文件" #: ../freedesktop.org.xml.in.h:233 -msgid "MPEG video" -msgstr "MPEG 视频" +msgid "message catalog" +msgstr "消息库" #: ../freedesktop.org.xml.in.h:234 -msgid "MPEG video (streamed)" -msgstr "" +msgid "LyX document" +msgstr "LyX 文档" #: ../freedesktop.org.xml.in.h:235 -msgid "MPEG-2 transport stream" -msgstr "MPEG-2 传输流" +msgid "Lzip archive" +msgstr "Lzip 归档文件" #: ../freedesktop.org.xml.in.h:236 -msgid "MPEG-4 audio" -msgstr "MPEG-4 音频" +msgid "LZMA archive" +msgstr "LZMA 归档文件" #: ../freedesktop.org.xml.in.h:237 -msgid "MPEG-4 audio book" -msgstr "MPEG-4 有声书" +msgid "Tar archive (LZMA-compressed)" +msgstr "Tar 归档文件 (LZMA 压缩)" #: ../freedesktop.org.xml.in.h:238 -msgid "MPEG-4 video" -msgstr "MPEG-4 视频" +msgid "LZO archive" +msgstr "LZO 归档文件" #: ../freedesktop.org.xml.in.h:239 -msgid "MPSub subtitles" -msgstr "MPSub 字幕" +msgid "MagicPoint presentation" +msgstr "MagicPoint 演示文稿" #: ../freedesktop.org.xml.in.h:240 -msgid "MRML playlist" -msgstr "MRML 播放列表" +msgid "Macintosh MacBinary file" +msgstr "Macintosh MacBinary 文件" #: ../freedesktop.org.xml.in.h:241 -msgid "MSX ROM" -msgstr "MSX ROM" +msgid "Matroska stream" +msgstr "Matroska 流" #: ../freedesktop.org.xml.in.h:242 -msgid "MXF video" -msgstr "MXF 视频" +msgid "Matroska video" +msgstr "Matroska 视频" #: ../freedesktop.org.xml.in.h:243 -msgid "MacOS X icon" -msgstr "MacOS X 图标" +msgid "Matroska audio" +msgstr "Matroska 音频" #: ../freedesktop.org.xml.in.h:244 -msgid "MacPaint Bitmap image" -msgstr "MacPaint 位图" +msgid "WebM video" +msgstr "WebM 视频" #: ../freedesktop.org.xml.in.h:245 -msgid "Macintosh AppleDouble-encoded file" -msgstr "Macintosh AppleDouble 编码的文件" +msgid "WebM audio" +msgstr "WebM 音频" #: ../freedesktop.org.xml.in.h:246 -msgid "Macintosh BinHex-encoded file" -msgstr "Macintosh BinHex 编码的文件" +msgid "MXF video" +msgstr "MXF 视频" #: ../freedesktop.org.xml.in.h:247 -msgid "Macintosh MacBinary file" -msgstr "Macintosh MacBinary 文件" +msgid "OCL file" +msgstr "OCL 文件" #: ../freedesktop.org.xml.in.h:248 -msgid "Macintosh Quickdraw/PICT drawing" -msgstr "Macintosh Quickdraw/PICT 绘图" +msgid "COBOL source file" +msgstr "COBOL 源" #: ../freedesktop.org.xml.in.h:249 -msgid "MagicPoint presentation" -msgstr "MagicPoint 演示文稿" +msgid "Mobipocket e-book" +msgstr "" #: ../freedesktop.org.xml.in.h:250 -msgid "Makefile" -msgstr "Makefile" +msgid "Adobe FrameMaker MIF document" +msgstr "Adobe FrameMaker MIF 文档" #: ../freedesktop.org.xml.in.h:251 -msgid "Managed Object Format" -msgstr "托管对象格式" +msgid "Mozilla bookmarks" +msgstr "Mozilla 书签" #: ../freedesktop.org.xml.in.h:252 -msgid "Markaby script" -msgstr "RMarkaby 脚本" +msgid "DOS/Windows executable" +msgstr "DOS/Windows 可执行文件" #: ../freedesktop.org.xml.in.h:253 -msgid "Markdown document" -msgstr "" +msgid "Internet shortcut" +msgstr "Internet 快捷方式" #: ../freedesktop.org.xml.in.h:254 -msgid "MathML document" -msgstr "MathML 文档" +msgid "WRI document" +msgstr "WRI 文档" #: ../freedesktop.org.xml.in.h:255 -msgid "Mathematica Notebook" -msgstr "Mathematica 记事" +msgid "MSX ROM" +msgstr "MSX ROM" #: ../freedesktop.org.xml.in.h:256 -msgid "Matroska audio" -msgstr "Matroska 音频" +msgid "M4 macro" +msgstr "M4 宏" #: ../freedesktop.org.xml.in.h:257 -msgid "Matroska stream" -msgstr "Matroska 流" +msgid "Nintendo64 ROM" +msgstr "Nintendo64 ROM" #: ../freedesktop.org.xml.in.h:258 -msgid "Matroska video" -msgstr "Matroska 视频" - -#: ../freedesktop.org.xml.in.h:259 -msgid "Metalink file" -msgstr "元链接文件" +msgid "Nautilus link" +msgstr "Nautilus 链接" +#. Translate this to Famicom if the console was known as such in your locale #: ../freedesktop.org.xml.in.h:260 -msgid "MicroDVD subtitles" -msgstr "MicroDVD 字幕" +msgid "NES ROM" +msgstr "NES ROM" #: ../freedesktop.org.xml.in.h:261 -msgid "Microsoft ASX playlist" -msgstr "Microsoft ASX 播放列表" +msgid "Unidata NetCDF document" +msgstr "Unidata NetCDF 文档" #: ../freedesktop.org.xml.in.h:262 -msgid "Microsoft Cabinet archive" -msgstr "Microsoft CAB 归档文件" +msgid "NewzBin usenet index" +msgstr "" #: ../freedesktop.org.xml.in.h:263 -msgid "Microsoft Document Imaging format" -msgstr "Microsoft Document Imaging 扫描图像" +msgid "object code" +msgstr "目标代码" #: ../freedesktop.org.xml.in.h:264 -msgid "Microsoft Windows theme pack" -msgstr "Microsoft Windows 主题包" +msgid "Annodex exchange format" +msgstr "Annodex 交换格式" #: ../freedesktop.org.xml.in.h:265 -msgid "Microsoft Works document" -msgstr "Microsoft Works 文档" +msgid "Annodex Video" +msgstr "Annodex 视频" #: ../freedesktop.org.xml.in.h:266 -msgid "Microsoft icon" -msgstr "Microsoft 图标" +msgid "Annodex Audio" +msgstr "Annodex 音频" #: ../freedesktop.org.xml.in.h:267 -msgid "MiniPSF audio" -msgstr "MiniPSF 音频" +msgid "Ogg multimedia file" +msgstr "Ogg 多媒体文件" #: ../freedesktop.org.xml.in.h:268 -msgid "Minolta MRW raw image" -msgstr "Minolta MRW 原始图像" +msgid "Ogg Audio" +msgstr "Ogg 音频" #: ../freedesktop.org.xml.in.h:269 -msgid "Mobipocket e-book" -msgstr "" +msgid "Ogg Video" +msgstr "Ogg 视频" #: ../freedesktop.org.xml.in.h:270 -msgid "Monkey's audio" -msgstr "Monkey's audio 音频" +msgid "Ogg Vorbis audio" +msgstr "Ogg Vorbis 音频" #: ../freedesktop.org.xml.in.h:271 -msgid "Mozilla bookmarks" -msgstr "Mozilla 书签" +msgid "Ogg FLAC audio" +msgstr "Ogg FLAC 音频" #: ../freedesktop.org.xml.in.h:272 -msgid "Mup publication" -msgstr "Mup 应用程序" +msgid "Ogg Speex audio" +msgstr "Ogg Speex 音频" #: ../freedesktop.org.xml.in.h:273 -msgid "Musepack audio" -msgstr "Musepack 音频" +msgid "Speex audio" +msgstr "Speex 音频" + +#: ../freedesktop.org.xml.in.h:274 +msgid "Ogg Theora video" +msgstr "Ogg Theora 视频" -#. Translate this to Famicom if the console was known as such in your locale #: ../freedesktop.org.xml.in.h:275 -msgid "NES ROM" -msgstr "NES ROM" +msgid "OGM video" +msgstr "OGM 视频" #: ../freedesktop.org.xml.in.h:276 -msgid "NFO document" -msgstr "NFO 文档" +msgid "OLE2 compound document storage" +msgstr "OLE2 组合文档存储" #: ../freedesktop.org.xml.in.h:277 -msgid "NIFF image" -msgstr "NIFF 图像" +msgid "Windows Installer package" +msgstr "Windows 程序安装包" #: ../freedesktop.org.xml.in.h:278 -msgid "Nautilus link" -msgstr "Nautilus 链接" +msgid "GNU Oleo spreadsheet" +msgstr "GNU Oleo 工作簿" #: ../freedesktop.org.xml.in.h:279 -msgid "Network Packet Capture" -msgstr "" +msgid "PAK archive" +msgstr "AR 归档文件" #: ../freedesktop.org.xml.in.h:280 -msgid "NewzBin usenet index" -msgstr "" +msgid "Palm OS database" +msgstr "Palm OS 数据库" #: ../freedesktop.org.xml.in.h:281 -msgid "Nikon NEF raw image" -msgstr "Nikon NEF 原始图像" +msgid "Parchive archive" +msgstr "Parchive 归档文件" #: ../freedesktop.org.xml.in.h:282 -msgid "Nintendo DS ROM" -msgstr "Nintendo DS ROM" +msgid "PEF executable" +msgstr "PEF 可执行文件" #: ../freedesktop.org.xml.in.h:283 -msgid "Nintendo64 ROM" -msgstr "Nintendo64 ROM" +msgid "Perl script" +msgstr "Perl 脚本" #: ../freedesktop.org.xml.in.h:284 -msgid "NullSoft video" -msgstr "Nullsoft 视频" +msgid "PHP script" +msgstr "PHP 脚本" #: ../freedesktop.org.xml.in.h:285 -msgid "OCL file" -msgstr "OCL 文件" +msgid "PKCS#7 certificate bundle" +msgstr "PKCS#7 证书束" #: ../freedesktop.org.xml.in.h:286 -msgid "OCaml source code" -msgstr "OCaml 源代码" +msgid "PKCS#12 certificate bundle" +msgstr "PKCS#12 证书束" #: ../freedesktop.org.xml.in.h:287 -msgid "ODA document" -msgstr "ODA 文档" +msgid "PlanPerfect spreadsheet" +msgstr "PlanPerfect 工作簿" #: ../freedesktop.org.xml.in.h:288 -msgid "ODB database" -msgstr "ODB 数据库" +msgid "Pocket Word document" +msgstr "Pocket Word 文档" #: ../freedesktop.org.xml.in.h:289 -msgid "ODC chart" -msgstr "ODC 图表" +msgid "Linear and integer program expression format" +msgstr "线性和整数规划的表达格式" #: ../freedesktop.org.xml.in.h:290 -msgid "ODC template" -msgstr "ODC 模板" +msgid "profiler results" +msgstr "profiler 结果" #: ../freedesktop.org.xml.in.h:291 -msgid "ODF formula" -msgstr "ODF 公式" +msgid "Pathetic Writer document" +msgstr "Pathetic Writer 文档" #: ../freedesktop.org.xml.in.h:292 -msgid "ODF template" -msgstr "ODF 模板" +msgid "Python bytecode" +msgstr "Python 字节码" #: ../freedesktop.org.xml.in.h:293 -msgid "ODG drawing" -msgstr "ODG 绘图" +msgid "Quattro Pro spreadsheet" +msgstr "Quattro Pro 工作簿" #: ../freedesktop.org.xml.in.h:294 -msgid "ODG drawing (Flat XML)" -msgstr "ODG 绘图(Flat XML)" +msgid "QuickTime metalink playlist" +msgstr "QuickTime 元链接播放列表" #: ../freedesktop.org.xml.in.h:295 -msgid "ODG template" -msgstr "ODG 模板" +msgid "Quicken document" +msgstr "Quicken 文档" #: ../freedesktop.org.xml.in.h:296 -msgid "ODI image" -msgstr "ODI 图像" +msgid "RAR archive" +msgstr "RAR 归档文件" #: ../freedesktop.org.xml.in.h:297 -msgid "ODM document" -msgstr "ODM 文档" +msgid "DAR archive" +msgstr "DAR 归档文件" #: ../freedesktop.org.xml.in.h:298 -msgid "ODP presentation" -msgstr "ODP 演示文稿" +msgid "Alzip archive" +msgstr "Alzip 归档文件" #: ../freedesktop.org.xml.in.h:299 -msgid "ODP presentation (Flat XML)" -msgstr "ODP 演示文稿(Flat XML)" +msgid "rejected patch" +msgstr "拒绝的补丁" #: ../freedesktop.org.xml.in.h:300 -msgid "ODP template" -msgstr "ODP 模板" +msgid "RPM package" +msgstr "RPM 软件包" #: ../freedesktop.org.xml.in.h:301 -msgid "ODS spreadsheet" -msgstr "ODS 工作簿" +msgid "Ruby script" +msgstr "Ruby 脚本" #: ../freedesktop.org.xml.in.h:302 -msgid "ODS spreadsheet (Flat XML)" -msgstr "ODS 工作簿(Flat XML)" +msgid "Markaby script" +msgstr "RMarkaby 脚本" #: ../freedesktop.org.xml.in.h:303 -msgid "ODS template" -msgstr "ODS 模板" +msgid "SC/Xspread spreadsheet" +msgstr "SC/Xspread 工作簿" #: ../freedesktop.org.xml.in.h:304 -msgid "ODT document" -msgstr "ODT 文档" +msgid "shell archive" +msgstr "shell 归档文件" #: ../freedesktop.org.xml.in.h:305 -msgid "ODT document (Flat XML)" -msgstr "ODT 文档(Flat XML)" +msgid "libtool shared library" +msgstr "libtool 共享库" #: ../freedesktop.org.xml.in.h:306 -msgid "ODT template" -msgstr "ODT 模板" +msgid "shared library" +msgstr "共享库" #: ../freedesktop.org.xml.in.h:307 -msgid "OGM video" -msgstr "OGM 视频" +msgid "shell script" +msgstr "shell 脚本" #: ../freedesktop.org.xml.in.h:308 -msgid "OLE2 compound document storage" -msgstr "OLE2 组合文档存储" - -#: ../freedesktop.org.xml.in.h:309 -msgid "OOC source code" -msgstr "OOC" +msgid "Shockwave Flash file" +msgstr "Shockwave Flash 文件" +#. translators: "Shorten" is the name of an audio codec #: ../freedesktop.org.xml.in.h:310 -msgid "OPML syndication feed" -msgstr "OPML 聚合种子" +msgid "Shorten audio" +msgstr "Shorten 音频" #: ../freedesktop.org.xml.in.h:311 -msgid "OTH template" -msgstr "OTH 模板" +msgid "Siag spreadsheet" +msgstr "Siag 工作簿" #: ../freedesktop.org.xml.in.h:312 -msgid "Objective-C source code" -msgstr "Objective-C 源代码" +msgid "Skencil document" +msgstr "Skencil 文档" #: ../freedesktop.org.xml.in.h:313 -msgid "Office drawing" -msgstr "Microsoft Office 绘图" +msgid "Stampede package" +msgstr "Stampede 软件包" #: ../freedesktop.org.xml.in.h:314 -msgid "Ogg Audio" -msgstr "Ogg 音频" - -#: ../freedesktop.org.xml.in.h:315 -msgid "Ogg FLAC audio" -msgstr "Ogg FLAC 音频" +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:316 -msgid "Ogg Speex audio" -msgstr "Ogg Speex 音频" +msgid "Super NES ROM" +msgstr "Super NES ROM" #: ../freedesktop.org.xml.in.h:317 -msgid "Ogg Theora video" -msgstr "Ogg Theora 视频" +msgid "StuffIt archive" +msgstr "Macintosh StuffIt 归档文件" #: ../freedesktop.org.xml.in.h:318 -msgid "Ogg Video" -msgstr "Ogg 视频" +msgid "SubRip subtitles" +msgstr "SubRip 字幕" #: ../freedesktop.org.xml.in.h:319 -msgid "Ogg Vorbis audio" -msgstr "Ogg Vorbis 音频" +msgid "WebVTT subtitles" +msgstr "" #: ../freedesktop.org.xml.in.h:320 -msgid "Ogg multimedia file" -msgstr "Ogg 多媒体文件" +msgid "SAMI subtitles" +msgstr "SAMI 字幕" #: ../freedesktop.org.xml.in.h:321 -msgid "Olympus ORF raw image" -msgstr "Olympus ORF 原始图像" +msgid "MicroDVD subtitles" +msgstr "MicroDVD 字幕" #: ../freedesktop.org.xml.in.h:322 -msgid "OpenOffice Calc spreadsheet" -msgstr "OpenOffice.org Calc 工作簿" +msgid "MPSub subtitles" +msgstr "MPSub 字幕" #: ../freedesktop.org.xml.in.h:323 -msgid "OpenOffice Calc template" -msgstr "OpenOffice.org Calc 工作簿模板" +msgid "SSA subtitles" +msgstr "SSA 字幕" #: ../freedesktop.org.xml.in.h:324 -msgid "OpenOffice Draw drawing" -msgstr "OpenOffice.org Draw 绘图" +msgid "SubViewer subtitles" +msgstr "SubViewer 字幕" #: ../freedesktop.org.xml.in.h:325 -msgid "OpenOffice Draw template" -msgstr "OpenOffice.org Draw 绘图模板" +msgid "iMelody ringtone" +msgstr "iMelody 铃声" #: ../freedesktop.org.xml.in.h:326 -msgid "OpenOffice Impress presentation" -msgstr "OpenOffice.org Impress 演示文稿" +msgid "SMAF audio" +msgstr "SMAF 音频" #: ../freedesktop.org.xml.in.h:327 -msgid "OpenOffice Impress template" -msgstr "OpenOffice.org Impress 演示文稿模板" +msgid "MRML playlist" +msgstr "MRML 播放列表" #: ../freedesktop.org.xml.in.h:328 -msgid "OpenOffice Math formula" -msgstr "OpenOffice.org Math 公式" +msgid "XMF audio" +msgstr "XMF 音频" #: ../freedesktop.org.xml.in.h:329 -msgid "OpenOffice Writer document" -msgstr "OpenOffice.org Writer 文档" +msgid "SV4 CPIO archive" +msgstr "SV4 CPIO 归档文件" #: ../freedesktop.org.xml.in.h:330 -msgid "OpenOffice Writer global document" -msgstr "OpenOffice.org Writer 全局文档" +msgid "SV4 CPIO archive (with CRC)" +msgstr "SV4 CPIP 归档文件(带有 CRC)" #: ../freedesktop.org.xml.in.h:331 -msgid "OpenOffice Writer template" -msgstr "OpenOffice.org Writer 文档模板" +msgid "Tar archive" +msgstr "Tar 归档文件" #: ../freedesktop.org.xml.in.h:332 -msgid "OpenOffice.org extension" -msgstr "OpenOffice.org 扩展" +msgid "Tar archive (compressed)" +msgstr "Tar 归档文件(压缩)" #: ../freedesktop.org.xml.in.h:333 -msgid "OpenRaster archiving image" -msgstr "OpenRaster 归档映像" +msgid "generic font file" +msgstr "通用字体文件" #: ../freedesktop.org.xml.in.h:334 -msgid "OpenType font" -msgstr "OpenType 字体" +msgid "packed font file" +msgstr "打包的字体文件" #: ../freedesktop.org.xml.in.h:335 -msgid "PAK archive" -msgstr "AR 归档文件" +msgid "TGIF document" +msgstr "TGIF 文档" #: ../freedesktop.org.xml.in.h:336 -msgid "PBM image" -msgstr "PBM 图像" +msgid "theme" +msgstr "主题" #: ../freedesktop.org.xml.in.h:337 -msgid "PCD image" -msgstr "PCD 图像" +msgid "ToutDoux document" +msgstr "ToutDoux 文档" #: ../freedesktop.org.xml.in.h:338 -msgid "PCF font" -msgstr "PCF 字体" +msgid "backup file" +msgstr "备份文件" #: ../freedesktop.org.xml.in.h:339 -msgid "PCL file" -msgstr "PCL 文件" +msgid "Troff document" +msgstr "Troff 文档" #: ../freedesktop.org.xml.in.h:340 -msgid "PCM audio" -msgstr "PCM 音频" +msgid "Troff document (with manpage macros)" +msgstr "Troff 文档(带 Man 手册宏)" #: ../freedesktop.org.xml.in.h:341 -msgid "PCX image" -msgstr "PCX 图像" +msgid "manual page (compressed)" +msgstr "手册页 (压缩)" #: ../freedesktop.org.xml.in.h:342 -msgid "PDF document" -msgstr "PDF 文档" +msgid "Tar archive (LZO-compressed)" +msgstr "Tar 归档文件(LZO 压缩)" #: ../freedesktop.org.xml.in.h:343 -msgid "PDF document (XZ-compressed)" -msgstr "PDF 文档(XZ)" +msgid "XZ archive" +msgstr "XZ 归档文件" #: ../freedesktop.org.xml.in.h:344 -msgid "PDF document (bzip-compressed)" -msgstr "PDF 文档(bzip 压缩)" +msgid "Tar archive (XZ-compressed)" +msgstr "Tar 归档文件(XZ 压缩)" #: ../freedesktop.org.xml.in.h:345 -msgid "PDF document (gzip-compressed)" -msgstr "PDF 文档(gzip 压缩)" +msgid "PDF document (XZ-compressed)" +msgstr "PDF 文档(XZ)" #: ../freedesktop.org.xml.in.h:346 -msgid "PEF executable" -msgstr "PEF 可执行文件" +msgid "Ustar archive" +msgstr "Ustar 归档文件" #: ../freedesktop.org.xml.in.h:347 -msgid "PGM image" -msgstr "PGM 图像" +msgid "WAIS source code" +msgstr "WAIS 源代码" #: ../freedesktop.org.xml.in.h:348 -msgid "PGN chess game notation" -msgstr "PGN 象棋游戏注记" +msgid "WordPerfect/Drawperfect image" +msgstr "WordPerfect/Drawperfect 图像" #: ../freedesktop.org.xml.in.h:349 -msgid "PGP keys" -msgstr "PGP 密钥" +msgid "DER/PEM/Netscape-encoded X.509 certificate" +msgstr "DER/PEM/Netscape-encoded X.509 证书" #: ../freedesktop.org.xml.in.h:350 -msgid "PGP/MIME-encrypted message header" -msgstr "PGP/MIME 加密的信件头" +msgid "empty document" +msgstr "空文档" #: ../freedesktop.org.xml.in.h:351 -msgid "PHP script" -msgstr "PHP 脚本" +msgid "Zoo archive" +msgstr "Zoo 归档文件" #: ../freedesktop.org.xml.in.h:352 -msgid "PKCS#10 certification request" -msgstr "PKCS#10 认证请求" +msgid "XHTML page" +msgstr "XHTML 页面" #: ../freedesktop.org.xml.in.h:353 -msgid "PKCS#12 certificate bundle" -msgstr "PKCS#12 证书束" +msgid "Zip archive" +msgstr "Zip 归档文件" #: ../freedesktop.org.xml.in.h:354 -msgid "PKCS#7 certificate bundle" -msgstr "PKCS#7 证书束" +msgid "Windows Imaging Format Disk Image" +msgstr "Windows Imaging 格式磁盘镜像" #: ../freedesktop.org.xml.in.h:355 -msgid "PKCS#8 private key" -msgstr "PKCS#8 私钥" +msgid "Dolby Digital audio" +msgstr "杜比数字音频" #: ../freedesktop.org.xml.in.h:356 -msgid "PNG image" -msgstr "PNG 图像" +msgid "AMR audio" +msgstr "AMR 音频" #: ../freedesktop.org.xml.in.h:357 -msgid "PNM image" -msgstr "PNM 图像" +msgid "AMR-WB audio" +msgstr "AMR-WB 音频" #: ../freedesktop.org.xml.in.h:358 -msgid "PPM image" -msgstr "PPM 图像" +msgid "ULAW (Sun) audio" +msgstr "ULAW (Sun) 音频" #: ../freedesktop.org.xml.in.h:359 -msgid "PS document" -msgstr "PS 文档" +msgid "Commodore 64 audio" +msgstr "Commodore 64 音频" #: ../freedesktop.org.xml.in.h:360 -msgid "PSF audio" -msgstr "PSF 音频" +msgid "PCM audio" +msgstr "PCM 音频" #: ../freedesktop.org.xml.in.h:361 -msgid "PSFlib audio library" -msgstr "PSFlib 音频库文件" +msgid "AIFC audio" +msgstr "AIFC 音频" #: ../freedesktop.org.xml.in.h:362 -msgid "Pack200 Java archive" -msgstr "Pack200 Java 归档文件" +msgid "AIFF/Amiga/Mac audio" +msgstr "AIFF/Amiga/Mac 音频" #: ../freedesktop.org.xml.in.h:363 -msgid "Palm OS database" -msgstr "Palm OS 数据库" +msgid "AIFF audio" +msgstr "AIFF 音频" #: ../freedesktop.org.xml.in.h:364 -msgid "Panasonic raw image" -msgstr "Panasonic 原始图像" +msgid "Monkey's audio" +msgstr "Monkey's audio 音频" #: ../freedesktop.org.xml.in.h:365 -msgid "Panasonic raw2 image" -msgstr "Panasonic raw2 图像" +msgid "Impulse Tracker audio" +msgstr "Impulse Tracker 音频" #: ../freedesktop.org.xml.in.h:366 -msgid "Parchive archive" -msgstr "Parchive 归档文件" +msgid "FLAC audio" +msgstr "FLAC 音频" #: ../freedesktop.org.xml.in.h:367 -msgid "Pascal source code" -msgstr "Pascal 源代码" +msgid "WavPack audio" +msgstr "WavPack 音频" #: ../freedesktop.org.xml.in.h:368 -msgid "Pathetic Writer document" -msgstr "Pathetic Writer 文档" +msgid "WavPack audio correction file" +msgstr "WavPack 音频校正文档" #: ../freedesktop.org.xml.in.h:369 -msgid "Pentax PEF raw image" -msgstr "Pentax PEF 原始图像" +msgid "MIDI audio" +msgstr "MIDI 音频" #: ../freedesktop.org.xml.in.h:370 -msgid "Perl script" -msgstr "Perl 脚本" +msgid "compressed Tracker audio" +msgstr "压缩的 Tracker 音频" #: ../freedesktop.org.xml.in.h:371 -msgid "Photoshop image" -msgstr "Photoshop 图像" +msgid "MPEG-4 audio" +msgstr "MPEG-4 音频" + +#: ../freedesktop.org.xml.in.h:372 +msgid "MPEG-4 video" +msgstr "MPEG-4 视频" + +#: ../freedesktop.org.xml.in.h:373 +msgid "MPEG-4 audio book" +msgstr "MPEG-4 有声书" + +#: ../freedesktop.org.xml.in.h:374 +msgid "3GPP multimedia file" +msgstr "3GPP 多媒体文件" -#. 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:375 -msgid "Picture CD" -msgstr "柯达 Picture CD" +msgid "3GPP2 multimedia file" +msgstr "3GPP2 多媒体文件" #: ../freedesktop.org.xml.in.h:376 -msgid "PkiPath certification path" -msgstr "PkiPath 证书目录" +msgid "Amiga SoundTracker audio" +msgstr "Amiga SoundTracker 音频" #: ../freedesktop.org.xml.in.h:377 -msgid "PlanPerfect spreadsheet" -msgstr "PlanPerfect 工作簿" +msgid "MP2 audio" +msgstr "MP2 音频" #: ../freedesktop.org.xml.in.h:378 -msgid "Plucker document" -msgstr "Plucker 文档" +msgid "MP3 audio" +msgstr "MP3 音频" #: ../freedesktop.org.xml.in.h:379 -msgid "Pocket Word document" -msgstr "Pocket Word 文档" +msgid "MP3 audio (streamed)" +msgstr "MP3 流音频" #: ../freedesktop.org.xml.in.h:380 -msgid "PostScript document (bzip-compressed)" -msgstr "PostScript 文档(bzip 压缩)" +msgid "HTTP Live Streaming playlist" +msgstr "HTTP 直播流播放列表" #: ../freedesktop.org.xml.in.h:381 -msgid "PostScript document (gzip-compressed)" -msgstr "PostScript 文档(gzip 压缩)" +msgid "Microsoft ASX playlist" +msgstr "Microsoft ASX 播放列表" #: ../freedesktop.org.xml.in.h:382 -msgid "Postscript type-1 font" -msgstr "Postscript type-1 字体" +msgid "PSF audio" +msgstr "PSF 音频" #: ../freedesktop.org.xml.in.h:383 -msgid "PowerPoint 2007 presentation" -msgstr "Microsoft PowerPoint 2007 演示文稿" +msgid "MiniPSF audio" +msgstr "MiniPSF 音频" #: ../freedesktop.org.xml.in.h:384 -msgid "PowerPoint 2007 presentation template" -msgstr "" +msgid "PSFlib audio library" +msgstr "PSFlib 音频库文件" #: ../freedesktop.org.xml.in.h:385 -msgid "PowerPoint 2007 show" -msgstr "Microsoft PowerPoint 2007 演示文稿" +msgid "Windows Media audio" +msgstr "Windows Media 音频" #: ../freedesktop.org.xml.in.h:386 -msgid "PowerPoint 2007 slide" -msgstr "PowerPoint 2007 文稿" +msgid "Musepack audio" +msgstr "Musepack 音频" #: ../freedesktop.org.xml.in.h:387 -msgid "PowerPoint add-in" -msgstr "" +msgid "RealAudio document" +msgstr "RealAudio 文档" #: ../freedesktop.org.xml.in.h:388 -msgid "PowerPoint macro-enabled presentation" -msgstr "" +msgid "RealMedia Metafile" +msgstr "RealMedia 元文件" #: ../freedesktop.org.xml.in.h:389 -msgid "PowerPoint macro-enabled presentation template" -msgstr "" +msgid "RealVideo document" +msgstr "RealAudio 文档" #: ../freedesktop.org.xml.in.h:390 -msgid "PowerPoint macro-enabled slide" -msgstr "" +msgid "RealMedia document" +msgstr "RealMedia 文档" #: ../freedesktop.org.xml.in.h:391 -msgid "PowerPoint presentation" -msgstr "Microsoft PowerPoint 演示文稿" +msgid "RealPix document" +msgstr "RealPix 文档" #: ../freedesktop.org.xml.in.h:392 -msgid "Python bytecode" -msgstr "Python 字节码" +msgid "RealText document" +msgstr "RealText 文档" #: ../freedesktop.org.xml.in.h:393 -msgid "Python script" -msgstr "Python 脚本" +msgid "RIFF audio" +msgstr "RIFF 音频" #: ../freedesktop.org.xml.in.h:394 -msgid "Qt Designer file" -msgstr "Qt Designer 文件" +msgid "Scream Tracker 3 audio" +msgstr "Scheme Tracker 3 音频" #: ../freedesktop.org.xml.in.h:395 -msgid "Qt MOC file" -msgstr "Qt 元对象编译文件" +msgid "MP3 ShoutCast playlist" +msgstr "MP3 ShoutCast 播放列表" #: ../freedesktop.org.xml.in.h:396 -msgid "Qt Markup Language file" -msgstr "Qt" +msgid "Scream Tracker audio" +msgstr "Scream Tracker 音频" #: ../freedesktop.org.xml.in.h:397 -msgid "Quattro Pro spreadsheet" -msgstr "Quattro Pro 工作簿" +msgid "VOC audio" +msgstr "VOC 音频" #: ../freedesktop.org.xml.in.h:398 -msgid "QuickTime image" -msgstr "QuickTime 图像" +msgid "WAV audio" +msgstr "WAV 音频" #: ../freedesktop.org.xml.in.h:399 -msgid "QuickTime metalink playlist" -msgstr "QuickTime 元链接播放列表" +msgid "Scream Tracker instrument" +msgstr "Scream Tracker 乐器" #: ../freedesktop.org.xml.in.h:400 -msgid "QuickTime video" -msgstr "QuickTime 视频" +msgid "FastTracker II audio" +msgstr "FastTracker II 音频" #: ../freedesktop.org.xml.in.h:401 -msgid "Quicken document" -msgstr "Quicken 文档" +msgid "TrueAudio audio" +msgstr "TrueAudio 音频" #: ../freedesktop.org.xml.in.h:402 -msgid "RAR archive" -msgstr "RAR 归档文件" +msgid "Windows BMP image" +msgstr "Windows BMP 图像" #: ../freedesktop.org.xml.in.h:403 -msgid "RDF file" -msgstr "RDF 文件" +msgid "WBMP image" +msgstr "WBMP 图像" #: ../freedesktop.org.xml.in.h:404 -msgid "README document" -msgstr "README 文档" +msgid "Computer Graphics Metafile" +msgstr "CGM 计算机图像元文件" #: ../freedesktop.org.xml.in.h:405 -msgid "RELAX NG XML schema" -msgstr "RELAX NG XML 模式" +msgid "CCITT G3 fax" +msgstr "CCITT G3 传真" #: ../freedesktop.org.xml.in.h:406 -msgid "RGB image" -msgstr "RGB 图像" +msgid "G3 fax image" +msgstr "G3 传真文档" #: ../freedesktop.org.xml.in.h:407 -msgid "RIFF audio" -msgstr "RIFF 音频" +msgid "GIF image" +msgstr "GIF 图像" #: ../freedesktop.org.xml.in.h:408 -msgid "RPM package" -msgstr "RPM 软件包" +msgid "IEF image" +msgstr "IEF 图像" #: ../freedesktop.org.xml.in.h:409 -msgid "RPM spec file" -msgstr "RPM spec 文件" +msgid "JPEG image" +msgstr "JPEG 图像" #: ../freedesktop.org.xml.in.h:410 -msgid "RSS summary" -msgstr "RSS 摘要" +msgid "JPEG-2000 image" +msgstr "JPEG-2000 图像" #: ../freedesktop.org.xml.in.h:411 -msgid "RTF document" -msgstr "RTF 文档" +msgid "OpenRaster archiving image" +msgstr "OpenRaster 归档映像" #: ../freedesktop.org.xml.in.h:412 -msgid "RealAudio document" -msgstr "RealAudio 文档" +msgid "DirectDraw surface" +msgstr "DirectDraw 表面" #: ../freedesktop.org.xml.in.h:413 -msgid "RealMedia Metafile" -msgstr "RealMedia 元文件" +msgid "X11 cursor" +msgstr "X11 指针" #: ../freedesktop.org.xml.in.h:414 -msgid "RealMedia document" -msgstr "RealMedia 文档" +msgid "EXR image" +msgstr "EXR 图像" #: ../freedesktop.org.xml.in.h:415 -msgid "RealPix document" -msgstr "RealPix 文档" +msgid "Macintosh Quickdraw/PICT drawing" +msgstr "Macintosh Quickdraw/PICT 绘图" #: ../freedesktop.org.xml.in.h:416 -msgid "RealText document" -msgstr "RealText 文档" +msgid "UFRaw ID image" +msgstr "UFRaw ID 图像" #: ../freedesktop.org.xml.in.h:417 -msgid "RealVideo document" -msgstr "RealAudio 文档" +msgid "digital raw image" +msgstr "数字化原始图像" #: ../freedesktop.org.xml.in.h:418 -msgid "Ruby script" -msgstr "Ruby 脚本" +msgid "Adobe DNG negative" +msgstr "Adobe DNG 负片" #: ../freedesktop.org.xml.in.h:419 -msgid "Run Length Encoded bitmap image" -msgstr "游程编码位图" +msgid "Canon CRW raw image" +msgstr "Canon CRW 原始图像" #: ../freedesktop.org.xml.in.h:420 -msgid "S/MIME file" -msgstr "S/MIME 文件" +msgid "Canon CR2 raw image" +msgstr "Canon CR2 原始图像" #: ../freedesktop.org.xml.in.h:421 -msgid "SAMI subtitles" -msgstr "SAMI 字幕" +msgid "Fuji RAF raw image" +msgstr "富士RAF 原始图像" #: ../freedesktop.org.xml.in.h:422 -msgid "SC/Xspread spreadsheet" -msgstr "SC/Xspread 工作簿" +msgid "Kodak DCR raw image" +msgstr "Kodak DCR 原始图像" #: ../freedesktop.org.xml.in.h:423 -msgid "SDP multicast stream file" -msgstr "SDP 多播流文件" +msgid "Kodak K25 raw image" +msgstr "Kodak K25 原始图像" + +#: ../freedesktop.org.xml.in.h:424 +msgid "Kodak KDC raw image" +msgstr "Kodak KDC 原始图像" + +#: ../freedesktop.org.xml.in.h:425 +msgid "Minolta MRW raw image" +msgstr "Minolta MRW 原始图像" + +#: ../freedesktop.org.xml.in.h:426 +msgid "Nikon NEF raw image" +msgstr "Nikon NEF 原始图像" -#. translators: a record is in this context a description of a board game -#. that has been played, and that can be played back again: -#. http://www.red-bean.com/sgf/ #: ../freedesktop.org.xml.in.h:427 -msgid "SGF record" -msgstr "SGF 记录" +msgid "Olympus ORF raw image" +msgstr "Olympus ORF 原始图像" #: ../freedesktop.org.xml.in.h:428 -msgid "SGI image" -msgstr "SGI 图像" +msgid "Panasonic raw image" +msgstr "Panasonic 原始图像" #: ../freedesktop.org.xml.in.h:429 -msgid "SGI video" -msgstr "SGI 视频" +msgid "Panasonic raw2 image" +msgstr "Panasonic raw2 图像" #: ../freedesktop.org.xml.in.h:430 -msgid "SGML document" -msgstr "SGML 文档" +msgid "Pentax PEF raw image" +msgstr "Pentax PEF 原始图像" #: ../freedesktop.org.xml.in.h:431 -msgid "SIS package" -msgstr "SIS 软件包" +msgid "Sigma X3F raw image" +msgstr "Sigma X3F 原始图像" #: ../freedesktop.org.xml.in.h:432 -msgid "SISX package" -msgstr "SISX 软件包" +msgid "Sony SRF raw image" +msgstr "Sony SRF 原始映像" #: ../freedesktop.org.xml.in.h:433 -msgid "SMAF audio" -msgstr "SMAF 音频" +msgid "Sony SR2 raw image" +msgstr "Sony SR2 原始映像" #: ../freedesktop.org.xml.in.h:434 -msgid "SMIL document" -msgstr "SMIL 文档" +msgid "Sony ARW raw image" +msgstr "Sony ARW 原始映像" #: ../freedesktop.org.xml.in.h:435 -msgid "SPSS Data File" -msgstr "SPSS 数据文件" +msgid "PNG image" +msgstr "PNG 图像" #: ../freedesktop.org.xml.in.h:436 -msgid "SPSS Portable Data File" -msgstr "SPSS 便携式数据文件" +msgid "Run Length Encoded bitmap image" +msgstr "游程编码位图" #: ../freedesktop.org.xml.in.h:437 -msgid "SQL code" -msgstr "SQL 代码" +msgid "SVG image" +msgstr "SVG 图像" #: ../freedesktop.org.xml.in.h:438 -msgid "SQLite2 database" -msgstr "SQLite2 数据库" +msgid "compressed SVG image" +msgstr "压缩的 SVG 图像" #: ../freedesktop.org.xml.in.h:439 -msgid "SQLite3 database" -msgstr "SQLite3 数据库" +msgid "TIFF image" +msgstr "TIFF 图像" #: ../freedesktop.org.xml.in.h:440 -msgid "SSA subtitles" -msgstr "SSA 字幕" +msgid "AutoCAD image" +msgstr "AutoCAD 图像" #: ../freedesktop.org.xml.in.h:441 -msgid "SV4 CPIO archive" -msgstr "SV4 CPIO 归档文件" +msgid "DXF vector image" +msgstr "DXF 矢量图像" #: ../freedesktop.org.xml.in.h:442 -msgid "SV4 CPIO archive (with CRC)" -msgstr "SV4 CPIP 归档文件(带有 CRC)" +msgid "Microsoft Document Imaging format" +msgstr "Microsoft Document Imaging 扫描图像" #: ../freedesktop.org.xml.in.h:443 -msgid "SVG image" -msgstr "SVG 图像" +msgid "3D Studio image" +msgstr "3D Studio 图像" #: ../freedesktop.org.xml.in.h:444 -msgid "Scala source code" -msgstr "" +msgid "Applix Graphics image" +msgstr "Applix Graphics 图像" #: ../freedesktop.org.xml.in.h:445 -msgid "Scheme source code" -msgstr "Scheme 源代码" +msgid "EPS image (bzip-compressed)" +msgstr "EPS 图像(bzip 压缩)" #: ../freedesktop.org.xml.in.h:446 -msgid "Scream Tracker 3 audio" -msgstr "Scheme Tracker 3 音频" +msgid "CMU raster image" +msgstr "CMU 矢量图像" #: ../freedesktop.org.xml.in.h:447 -msgid "Scream Tracker audio" -msgstr "Scream Tracker 音频" +msgid "compressed GIMP image" +msgstr "压缩的 GIMP 图像" #: ../freedesktop.org.xml.in.h:448 -msgid "Scream Tracker instrument" -msgstr "Scream Tracker 乐器" +msgid "DICOM image" +msgstr "DICOM 图像" #: ../freedesktop.org.xml.in.h:449 -msgid "Sega Master System/Game Gear ROM" -msgstr "Sega Master System/Game Gear ROM" +msgid "DocBook document" +msgstr "DocBook 文档" #: ../freedesktop.org.xml.in.h:450 -msgid "Setext document" -msgstr "Setext 文档" +msgid "DIB image" +msgstr "DIB 图像" #: ../freedesktop.org.xml.in.h:451 -msgid "Shockwave Flash file" -msgstr "Shockwave Flash 文件" +msgid "DjVu image" +msgstr "DjVu 图像" + +#: ../freedesktop.org.xml.in.h:452 +msgid "DPX image" +msgstr "DPX 图像" -#. translators: "Shorten" is the name of an audio codec #: ../freedesktop.org.xml.in.h:453 -msgid "Shorten audio" -msgstr "Shorten 音频" +msgid "EPS image" +msgstr "EPS 图像" #: ../freedesktop.org.xml.in.h:454 -msgid "Siag spreadsheet" -msgstr "Siag 工作簿" +msgid "FITS document" +msgstr "FITS 文档" #: ../freedesktop.org.xml.in.h:455 -msgid "Sieve mail filter script" -msgstr "Sieve 邮件过滤脚本" +msgid "FPX image" +msgstr "FPX 图像" #: ../freedesktop.org.xml.in.h:456 -msgid "Sigma X3F raw image" -msgstr "Sigma X3F 原始图像" +msgid "EPS image (gzip-compressed)" +msgstr "EPS 图像(gzip 压缩)" #: ../freedesktop.org.xml.in.h:457 -msgid "Skencil document" -msgstr "Skencil 文档" +msgid "Microsoft icon" +msgstr "Microsoft 图标" #: ../freedesktop.org.xml.in.h:458 -msgid "Sony ARW raw image" -msgstr "Sony ARW 原始映像" +msgid "MacOS X icon" +msgstr "MacOS X 图标" #: ../freedesktop.org.xml.in.h:459 -msgid "Sony SR2 raw image" -msgstr "Sony SR2 原始映像" +msgid "IFF image" +msgstr "IFF 图像" #: ../freedesktop.org.xml.in.h:460 -msgid "Sony SRF raw image" -msgstr "Sony SRF 原始映像" +msgid "ILBM image" +msgstr "ILBM 图像" #: ../freedesktop.org.xml.in.h:461 -msgid "Speedo font" -msgstr "Speedo 字体" +msgid "JNG image" +msgstr "JNG 图像" #: ../freedesktop.org.xml.in.h:462 -msgid "Speex audio" -msgstr "Speex 音频" +msgid "LightWave object" +msgstr "LightWave 对象" #: ../freedesktop.org.xml.in.h:463 -msgid "Stampede package" -msgstr "Stampede 软件包" +msgid "LightWave scene" +msgstr "LightWave 场景" #: ../freedesktop.org.xml.in.h:464 -msgid "StarCalc spreadsheet" -msgstr "STarCalc 工作簿" +msgid "MacPaint Bitmap image" +msgstr "MacPaint 位图" #: ../freedesktop.org.xml.in.h:465 -msgid "StarChart chart" -msgstr "STarChart 图表" +msgid "Office drawing" +msgstr "Microsoft Office 绘图" #: ../freedesktop.org.xml.in.h:466 -msgid "StarDraw drawing" -msgstr "STarDraw 绘图" +msgid "NIFF image" +msgstr "NIFF 图像" #: ../freedesktop.org.xml.in.h:467 -msgid "StarImpress presentation" -msgstr "STarImpress 演示文稿" +msgid "PCX image" +msgstr "PCX 图像" #: ../freedesktop.org.xml.in.h:468 -msgid "StarMail email" -msgstr "STarMail 电子邮件" +msgid "PCD image" +msgstr "PCD 图像" #: ../freedesktop.org.xml.in.h:469 -msgid "StarMath formula" -msgstr "STarMath 公式" +msgid "PNM image" +msgstr "PNM 图像" #: ../freedesktop.org.xml.in.h:470 -msgid "StarWriter document" -msgstr "STarWriter 文档" +msgid "PBM image" +msgstr "PBM 图像" #: ../freedesktop.org.xml.in.h:471 -msgid "StuffIt archive" -msgstr "Macintosh StuffIt 归档文件" +msgid "PGM image" +msgstr "PGM 图像" #: ../freedesktop.org.xml.in.h:472 -msgid "SubRip subtitles" -msgstr "SubRip 字幕" +msgid "PPM image" +msgstr "PPM 图像" #: ../freedesktop.org.xml.in.h:473 -msgid "SubViewer subtitles" -msgstr "SubViewer 字幕" +msgid "Photoshop image" +msgstr "Photoshop 图像" #: ../freedesktop.org.xml.in.h:474 -msgid "Sun raster image" -msgstr "Sun 光栅图像" +msgid "RGB image" +msgstr "RGB 图像" #: ../freedesktop.org.xml.in.h:475 -msgid "SunOS News font" -msgstr "SunOS News 字体" +msgid "SGI image" +msgstr "SGI 图像" + +#: ../freedesktop.org.xml.in.h:476 +msgid "Sun raster image" +msgstr "Sun 光栅图像" -#. 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:477 -msgid "Super NES ROM" -msgstr "Super NES ROM" +msgid "TGA image" +msgstr "TGA 图像" + +#: ../freedesktop.org.xml.in.h:478 +msgid "Windows cursor" +msgstr "Windows 光标" + +#: ../freedesktop.org.xml.in.h:479 +msgid "Windows animated cursor" +msgstr "Windows 动画光标" + +#: ../freedesktop.org.xml.in.h:480 +msgid "EMF image" +msgstr "EMF 图像" -#. 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:481 -msgid "Super Video CD" -msgstr "SVCD" +msgid "WMF image" +msgstr "WMF 图像" #: ../freedesktop.org.xml.in.h:482 -msgid "SystemVerilog header" -msgstr "SystemVerilog 头" +msgid "XBM image" +msgstr "XBM 图像" #: ../freedesktop.org.xml.in.h:483 -msgid "SystemVerilog source code" -msgstr "SystemVerilog 源代码" +msgid "GIMP image" +msgstr "GIMP 图像" #: ../freedesktop.org.xml.in.h:484 -msgid "T602 document" -msgstr "T602 文档" +msgid "XFig image" +msgstr "XFig 图像" #: ../freedesktop.org.xml.in.h:485 -msgid "TGA image" -msgstr "TGA 图像" +msgid "XPM image" +msgstr "XPM 图像" #: ../freedesktop.org.xml.in.h:486 -msgid "TGIF document" -msgstr "TGIF 文档" +msgid "X window image" +msgstr "X window 图像" #: ../freedesktop.org.xml.in.h:487 -msgid "TIFF image" -msgstr "TIFF 图像" +msgid "block device" +msgstr "块设备" #: ../freedesktop.org.xml.in.h:488 -msgid "TNEF message" -msgstr "TNEF 信件" +msgid "character device" +msgstr "字符设备" #: ../freedesktop.org.xml.in.h:489 -msgid "TSV document" -msgstr "TSV 文档" +msgid "folder" +msgstr "文件夹" #: ../freedesktop.org.xml.in.h:490 -msgid "Tar archive" -msgstr "Tar 归档文件" +msgid "pipe" +msgstr "管道" #: ../freedesktop.org.xml.in.h:491 -msgid "Tar archive (LZMA-compressed)" -msgstr "Tar 归档文件 (LZMA 压缩)" +msgid "mount point" +msgstr "挂载点" #: ../freedesktop.org.xml.in.h:492 -msgid "Tar archive (LZO-compressed)" -msgstr "Tar 归档文件(LZO 压缩)" +msgid "socket" +msgstr "套接字" #: ../freedesktop.org.xml.in.h:493 -msgid "Tar archive (XZ-compressed)" -msgstr "Tar 归档文件(XZ 压缩)" +msgid "symbolic link" +msgstr "符号链接" #: ../freedesktop.org.xml.in.h:494 -msgid "Tar archive (bzip-compressed)" -msgstr "Tar 归档文件(bzip 压缩)" +msgid "mail delivery report" +msgstr "邮件投递报告" #: ../freedesktop.org.xml.in.h:495 -msgid "Tar archive (compressed)" -msgstr "Tar 归档文件(压缩)" +msgid "mail disposition report" +msgstr "邮件接收报告" #: ../freedesktop.org.xml.in.h:496 -msgid "Tar archive (gzip-compressed)" -msgstr "Tar 归档文件(gzip 压缩)" +msgid "reference to remote file" +msgstr "到远程文件的引用" #: ../freedesktop.org.xml.in.h:497 -msgid "Tar archive (lrzip-compressed)" -msgstr "Tar 归档文件 (lrzip 压缩)" +msgid "Usenet news message" +msgstr "Usenet 新闻信" #: ../freedesktop.org.xml.in.h:498 -msgid "Tcl script" -msgstr "Tcl 脚本" +msgid "partial email message" +msgstr "部分电子邮件" #: ../freedesktop.org.xml.in.h:499 -msgid "TeX DVI document" -msgstr "TeX DVI 文档" +msgid "email message" +msgstr "电子邮件" #: ../freedesktop.org.xml.in.h:500 -msgid "TeX DVI document (bzip-compressed)" -msgstr "TeX DVI 文档(gzip 压缩)" +msgid "GNU mail message" +msgstr "GNU mail 信件" #: ../freedesktop.org.xml.in.h:501 -msgid "TeX DVI document (gzip-compressed)" -msgstr "TeX DVI 文档(gzip 压缩)" +msgid "VRML document" +msgstr "VRML 文档" #: ../freedesktop.org.xml.in.h:502 -msgid "TeX document" -msgstr "TeX 文档" +msgid "message in several formats" +msgstr "各种格式的消息" #: ../freedesktop.org.xml.in.h:503 -msgid "TeX font" -msgstr "TeX 字体" +msgid "Macintosh AppleDouble-encoded file" +msgstr "Macintosh AppleDouble 编码的文件" #: ../freedesktop.org.xml.in.h:504 -msgid "TeX font metrics" -msgstr "TeX 字体参数" +msgid "message digest" +msgstr "消息摘要" #: ../freedesktop.org.xml.in.h:505 -msgid "TeXInfo document" -msgstr "TeXInfo 文档" +msgid "encrypted message" +msgstr "加密信件" #: ../freedesktop.org.xml.in.h:506 -msgid "ToutDoux document" -msgstr "ToutDoux 文档" +msgid "compound documents" +msgstr "组合文档" #: ../freedesktop.org.xml.in.h:507 -msgid "Troff ME input document" -msgstr "Troff ME 输入文档" +msgid "compound document" +msgstr "组合文档" #: ../freedesktop.org.xml.in.h:508 -msgid "Troff MM input document" -msgstr "Troff MM 输入文档" +msgid "mail system report" +msgstr "邮件系统报告" #: ../freedesktop.org.xml.in.h:509 -msgid "Troff MS input document" -msgstr "Troff MS 输入文档" +msgid "signed message" +msgstr "签名信件" #: ../freedesktop.org.xml.in.h:510 -msgid "Troff document" -msgstr "Troff 文档" +msgid "stream of data (server push)" +msgstr "数据流(服务器推送)" #: ../freedesktop.org.xml.in.h:511 -msgid "Troff document (with manpage macros)" -msgstr "Troff 文档(带 Man 手册宏)" +msgid "VCS/ICS calendar" +msgstr "VCS/ICS 日历" #: ../freedesktop.org.xml.in.h:512 -msgid "TrueAudio audio" -msgstr "TrueAudio 音频" +msgid "CSS stylesheet" +msgstr "CSS 样式表" #: ../freedesktop.org.xml.in.h:513 -msgid "TrueType XML font" -msgstr "TrueType XML 字体" +msgid "electronic business card" +msgstr "电子商务卡" #: ../freedesktop.org.xml.in.h:514 -msgid "TrueType font" -msgstr "TrueType 字体" +msgid "txt2tags document" +msgstr "txt2tags 文档" #: ../freedesktop.org.xml.in.h:515 -msgid "UFRaw ID image" -msgstr "UFRaw ID 图像" +msgid "Verilog source code" +msgstr "Verilog 源代码" #: ../freedesktop.org.xml.in.h:516 -msgid "ULAW (Sun) audio" -msgstr "ULAW (Sun) 音频" +msgid "SystemVerilog header" +msgstr "SystemVerilog 头" + +#: ../freedesktop.org.xml.in.h:517 +msgid "SystemVerilog source code" +msgstr "SystemVerilog 源代码" + +#: ../freedesktop.org.xml.in.h:518 +msgid "VHDL source code" +msgstr "VHDL 源代码" -#. 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:519 -msgid "UNIX software" -msgstr "UNIX 软件" +msgid "enriched text document" +msgstr "富文本文档" #: ../freedesktop.org.xml.in.h:520 -msgid "UNIX-compressed file" -msgstr "UNIX 压缩文件" +msgid "help page" +msgstr "帮助页面" #: ../freedesktop.org.xml.in.h:521 -msgid "Unidata NetCDF document" -msgstr "Unidata NetCDF 文档" +msgid "plain text document" +msgstr "纯文本文档" #: ../freedesktop.org.xml.in.h:522 -msgid "Usenet news message" -msgstr "Usenet 新闻信" +msgid "RDF file" +msgstr "RDF 文件" #: ../freedesktop.org.xml.in.h:523 -msgid "Ustar archive" -msgstr "Ustar 归档文件" +msgid "email headers" +msgstr "电子邮件头" #: ../freedesktop.org.xml.in.h:524 -msgid "V font" -msgstr "V 字体" +msgid "rich text document" +msgstr "RTF 丰富文本文档" #: ../freedesktop.org.xml.in.h:525 -msgid "VCS/ICS calendar" -msgstr "VCS/ICS 日历" +msgid "RSS summary" +msgstr "RSS 摘要" #: ../freedesktop.org.xml.in.h:526 -msgid "VHDL source code" -msgstr "VHDL 源代码" +msgid "Atom syndication feed" +msgstr "Atom 更新种子" #: ../freedesktop.org.xml.in.h:527 -msgid "VOC audio" -msgstr "VOC 音频" +msgid "OPML syndication feed" +msgstr "OPML 聚合种子" #: ../freedesktop.org.xml.in.h:528 -msgid "VRML document" -msgstr "VRML 文档" +msgid "SGML document" +msgstr "SGML 文档" #: ../freedesktop.org.xml.in.h:529 -msgid "Vala source code" -msgstr "Vala 源代码" +msgid "spreadsheet interchange document" +msgstr "电子表格交换文档" #: ../freedesktop.org.xml.in.h:530 -msgid "Verilog source code" -msgstr "Verilog 源代码" +msgid "TSV document" +msgstr "TSV 文档" + +#: ../freedesktop.org.xml.in.h:531 +msgid "Graphviz DOT graph" +msgstr "Graphviz DOT 科学图形" + +#: ../freedesktop.org.xml.in.h:532 +msgid "JAD document" +msgstr "JAD 文档" + +#: ../freedesktop.org.xml.in.h:533 +msgid "WML document" +msgstr "WML 文档" -#. 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:534 -msgid "Video CD" -msgstr "VCD" +msgid "WMLScript program" +msgstr "WMLScript 程序" #: ../freedesktop.org.xml.in.h:535 -msgid "Vivo video" -msgstr "Vivo 视频" +msgid "ACE archive" +msgstr "ACE 归档文件" #: ../freedesktop.org.xml.in.h:536 -msgid "WAIS source code" -msgstr "WAIS 源代码" +msgid "Ada source code" +msgstr "Ada 源代码" #: ../freedesktop.org.xml.in.h:537 -msgid "WAV audio" -msgstr "WAV 音频" +msgid "author list" +msgstr "作者列表" #: ../freedesktop.org.xml.in.h:538 -msgid "WBMP image" -msgstr "WBMP 图像" +msgid "BibTeX document" +msgstr "BibTeX 文档" #: ../freedesktop.org.xml.in.h:539 -msgid "WMF image" -msgstr "WMF 图像" +msgid "C++ header" +msgstr "C++ 源代码头文件" #: ../freedesktop.org.xml.in.h:540 -msgid "WML document" -msgstr "WML 文档" +msgid "C++ source code" +msgstr "C++ 源代码" #: ../freedesktop.org.xml.in.h:541 -msgid "WMLScript program" -msgstr "WMLScript 程序" +msgid "ChangeLog document" +msgstr "变更日志文档" #: ../freedesktop.org.xml.in.h:542 -msgid "WPL playlist" -msgstr "WPL 播放列表" +msgid "C header" +msgstr "C 程序头文件" #: ../freedesktop.org.xml.in.h:543 -msgid "WRI document" -msgstr "WRI 文档" +msgid "CMake source code" +msgstr "CMake 源代码" #: ../freedesktop.org.xml.in.h:544 -msgid "WWF document" -msgstr "WWF" +msgid "CSV document" +msgstr "CSV 文档" #: ../freedesktop.org.xml.in.h:545 -msgid "WavPack audio" -msgstr "WavPack 音频" +msgid "license terms" +msgstr "软件许可条款" #: ../freedesktop.org.xml.in.h:546 -msgid "WavPack audio correction file" -msgstr "WavPack 音频校正文档" +msgid "author credits" +msgstr "软件作者致谢" #: ../freedesktop.org.xml.in.h:547 -msgid "Wavelet video" -msgstr "Wavelet 视频" +msgid "C source code" +msgstr "C 源代码" #: ../freedesktop.org.xml.in.h:548 -msgid "Web application cache manifest" -msgstr "网络应用程序缓存清单" +msgid "C# source code" +msgstr "C# 源代码" #: ../freedesktop.org.xml.in.h:549 -msgid "WebM audio" -msgstr "WebM 音频" +msgid "Vala source code" +msgstr "Vala 源代码" #: ../freedesktop.org.xml.in.h:550 -msgid "WebM video" -msgstr "WebM 视频" +msgid "OOC source code" +msgstr "OOC" #: ../freedesktop.org.xml.in.h:551 -msgid "WebVTT subtitles" -msgstr "" +msgid "DCL script" +msgstr "DCL 脚本" #: ../freedesktop.org.xml.in.h:552 -msgid "Windows BMP image" -msgstr "Windows BMP 图像" +msgid "DSSSL document" +msgstr "DSSSL 文档" #: ../freedesktop.org.xml.in.h:553 -msgid "Windows Imaging Format Disk Image" -msgstr "Windows Imaging 格式磁盘镜像" +msgid "D source code" +msgstr "D 源代码" #: ../freedesktop.org.xml.in.h:554 -msgid "Windows Installer package" -msgstr "Windows 程序安装包" +msgid "DTD file" +msgstr "DTD 文件" #: ../freedesktop.org.xml.in.h:555 -msgid "Windows Media Station file" -msgstr "Windows 媒体工作站文件" +msgid "Eiffel source code" +msgstr "Eiffel 源代码" #: ../freedesktop.org.xml.in.h:556 -msgid "Windows Media audio" -msgstr "Windows Media 音频" +msgid "Emacs Lisp source code" +msgstr "Emacs Lisp 源代码" #: ../freedesktop.org.xml.in.h:557 -msgid "Windows Media video" -msgstr "Windows Media 视频" +msgid "Erlang source code" +msgstr "Erlang 源代码" #: ../freedesktop.org.xml.in.h:558 -msgid "Windows Registry extract" -msgstr "Windows 注册表文件" +msgid "Fortran source code" +msgstr "Fortran 源代码" #: ../freedesktop.org.xml.in.h:559 -msgid "Windows animated cursor" -msgstr "Windows 动画光标" +msgid "translation file" +msgstr "消息翻译文件" #: ../freedesktop.org.xml.in.h:560 -msgid "Windows cursor" -msgstr "Windows 光标" +msgid "translation template" +msgstr "消息翻译模板" + +#: ../freedesktop.org.xml.in.h:561 +msgid "HTML document" +msgstr "HTML 文档" + +#: ../freedesktop.org.xml.in.h:562 +msgid "Web application cache manifest" +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:563 -msgid "Windows software" -msgstr "Windows 软件" +msgid "Google Video Pointer" +msgstr "Google 视频指向" #: ../freedesktop.org.xml.in.h:564 -msgid "Word 2007 document" -msgstr "Microsoft Word 2007 文档" +msgid "Haskell source code" +msgstr "Haskell 源代码" #: ../freedesktop.org.xml.in.h:565 -msgid "Word 2007 document template" -msgstr "" +msgid "IDL document" +msgstr "IDL 文档" #: ../freedesktop.org.xml.in.h:566 -msgid "Word document" -msgstr "Microsoft Word 文档" +msgid "installation instructions" +msgstr "软件安装指南" #: ../freedesktop.org.xml.in.h:567 -msgid "Word macro-enabled document" -msgstr "" +msgid "Java source code" +msgstr "Java 源代码" #: ../freedesktop.org.xml.in.h:568 -msgid "Word macro-enabled document template" -msgstr "" +msgid "LDIF address book" +msgstr "LDIF 地址簿" #: ../freedesktop.org.xml.in.h:569 -msgid "Word template" -msgstr "Word 模板" +msgid "Lilypond music sheet" +msgstr "Lilypond 乐谱" #: ../freedesktop.org.xml.in.h:570 -msgid "WordPerfect document" -msgstr "WordPerfect 文档" +msgid "LHS source code" +msgstr "LHS 源代码" #: ../freedesktop.org.xml.in.h:571 -msgid "WordPerfect/Drawperfect image" -msgstr "WordPerfect/Drawperfect 图像" +msgid "application log" +msgstr "应用程序日志" #: ../freedesktop.org.xml.in.h:572 -msgid "X window image" -msgstr "X window 图像" +msgid "Makefile" +msgstr "Makefile" #: ../freedesktop.org.xml.in.h:573 -msgid "X-Motif UIL table" -msgstr "X-Motif UIL 表" +msgid "Markdown document" +msgstr "" #: ../freedesktop.org.xml.in.h:574 -msgid "X.509 certificate" -msgstr "X.509 证书" +msgid "Qt MOC file" +msgstr "Qt 元对象编译文件" #: ../freedesktop.org.xml.in.h:575 -msgid "X11 cursor" -msgstr "X11 指针" +msgid "Windows Registry extract" +msgstr "Windows 注册表文件" #: ../freedesktop.org.xml.in.h:576 -msgid "XBEL bookmarks" -msgstr "XBEL 书签" +msgid "Managed Object Format" +msgstr "托管对象格式" #: ../freedesktop.org.xml.in.h:577 -msgid "XBM image" -msgstr "XBM 图像" +msgid "Mup publication" +msgstr "Mup 应用程序" #: ../freedesktop.org.xml.in.h:578 -msgid "XFig image" -msgstr "XFig 图像" +msgid "Objective-C source code" +msgstr "Objective-C 源代码" #: ../freedesktop.org.xml.in.h:579 -msgid "XHTML page" -msgstr "XHTML 页面" +msgid "OCaml source code" +msgstr "OCaml 源代码" #: ../freedesktop.org.xml.in.h:580 -msgid "XLIFF translation file" -msgstr "XLIFF 消息翻译文件" +msgid "MATLAB script/function" +msgstr "MATLAB 脚本/函数" #: ../freedesktop.org.xml.in.h:581 -msgid "XMCD CD database" -msgstr "XMCD CD 数据库" +msgid "Pascal source code" +msgstr "Pascal 源代码" #: ../freedesktop.org.xml.in.h:582 -msgid "XMF audio" -msgstr "XMF 音频" +msgid "differences between files" +msgstr "文件的区别" #: ../freedesktop.org.xml.in.h:583 -msgid "XMI file" -msgstr "XMI 文件" +msgid "Go source code" +msgstr "Go" #: ../freedesktop.org.xml.in.h:584 -msgid "XML document" -msgstr "XML 文档" +msgid "Python script" +msgstr "Python 脚本" #: ../freedesktop.org.xml.in.h:585 -msgid "XML entities document" -msgstr "XML 特征文档" +msgid "Lua script" +msgstr "Lua 脚本" #: ../freedesktop.org.xml.in.h:586 -msgid "XPInstall installer module" -msgstr "XPInstall 安装工具模块" +msgid "README document" +msgstr "README 文档" #: ../freedesktop.org.xml.in.h:587 -msgid "XPM image" -msgstr "XPM 图像" +msgid "NFO document" +msgstr "NFO 文档" #: ../freedesktop.org.xml.in.h:588 -msgid "XPS document" -msgstr "XPS 文档" +msgid "RPM spec file" +msgstr "RPM spec 文件" #: ../freedesktop.org.xml.in.h:589 -msgid "XSL FO file" -msgstr "XSL 格式化对象文件" +msgid "Scala source code" +msgstr "" #: ../freedesktop.org.xml.in.h:590 -msgid "XSLT stylesheet" -msgstr "XSLT 样式表" +msgid "Scheme source code" +msgstr "Scheme 源代码" #: ../freedesktop.org.xml.in.h:591 -msgid "XSPF playlist" -msgstr "XSPF 播放列表" +msgid "Setext document" +msgstr "Setext 文档" #: ../freedesktop.org.xml.in.h:592 -msgid "XUL interface document" -msgstr "XUL 界面文档" +msgid "SQL code" +msgstr "SQL 代码" #: ../freedesktop.org.xml.in.h:593 -msgid "XZ archive" -msgstr "XZ 归档文件" +msgid "Tcl script" +msgstr "Tcl 脚本" #: ../freedesktop.org.xml.in.h:594 -msgid "Xbase document" -msgstr "Xbase 文档" +msgid "TeX document" +msgstr "TeX 文档" #: ../freedesktop.org.xml.in.h:595 -msgid "YAML document" -msgstr "YAML 文档" +msgid "TeXInfo document" +msgstr "TeXInfo 文档" #: ../freedesktop.org.xml.in.h:596 -msgid "Zip archive" -msgstr "Zip 归档文件" +msgid "Troff ME input document" +msgstr "Troff ME 输入文档" #: ../freedesktop.org.xml.in.h:597 -msgid "Zoo archive" -msgstr "Zoo 归档文件" +msgid "Troff MM input document" +msgstr "Troff MM 输入文档" #: ../freedesktop.org.xml.in.h:598 -msgid "application log" -msgstr "应用程序日志" +msgid "Troff MS input document" +msgstr "Troff MS 输入文档" + +#: ../freedesktop.org.xml.in.h:599 +msgid "X-Motif UIL table" +msgstr "X-Motif UIL 表" -#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard) #: ../freedesktop.org.xml.in.h:600 -msgid "audio CD" -msgstr "音频 CD" +msgid "resource location" +msgstr "资源位置" + +#: ../freedesktop.org.xml.in.h:601 +msgid "XMI file" +msgstr "XMI 文件" -#. http://en.wikipedia.org/wiki/DVD-Audio #: ../freedesktop.org.xml.in.h:602 -msgid "audio DVD" -msgstr "音频 DVD" +msgid "XSL FO file" +msgstr "XSL 格式化对象文件" #: ../freedesktop.org.xml.in.h:603 -msgid "author credits" -msgstr "软件作者致谢" +msgid "iptables configuration file" +msgstr "iptables 防火墙配置文件" #: ../freedesktop.org.xml.in.h:604 -msgid "author list" -msgstr "作者列表" +msgid "XSLT stylesheet" +msgstr "XSLT 样式表" #: ../freedesktop.org.xml.in.h:605 -msgid "backup file" -msgstr "备份文件" +msgid "XMCD CD database" +msgstr "XMCD CD 数据库" + +#: ../freedesktop.org.xml.in.h:606 +msgid "XML document" +msgstr "XML 文档" -#. http://en.wikipedia.org/wiki/Blu-ray_Disc #: ../freedesktop.org.xml.in.h:607 -msgid "blank Blu-ray disc" -msgstr "空蓝光 DVD" +msgid "XML entities document" +msgstr "XML 特征文档" + +#: ../freedesktop.org.xml.in.h:608 +msgid "DV video" +msgstr "DV 视频" -#. http://en.wikipedia.org/wiki/Compact_Disc #: ../freedesktop.org.xml.in.h:609 -msgid "blank CD disc" -msgstr "空 CD 光盘" +msgid "ISI video" +msgstr "ISI 视频" + +#: ../freedesktop.org.xml.in.h:610 +msgid "MPEG-2 transport stream" +msgstr "MPEG-2 传输流" -#. http://en.wikipedia.org/wiki/DVD #: ../freedesktop.org.xml.in.h:611 -msgid "blank DVD disc" -msgstr "空 DVD 光盘" +msgid "MPEG video" +msgstr "MPEG 视频" + +#: ../freedesktop.org.xml.in.h:612 +msgid "MPEG video (streamed)" +msgstr "" -#. http://en.wikipedia.org/wiki/HD_DVD #: ../freedesktop.org.xml.in.h:613 -msgid "blank HD DVD disc" -msgstr "空 HD DVD 光盘" +msgid "QuickTime video" +msgstr "QuickTime 视频" #: ../freedesktop.org.xml.in.h:614 -msgid "block device" -msgstr "块设备" +msgid "QuickTime image" +msgstr "QuickTime 图像" #: ../freedesktop.org.xml.in.h:615 -msgid "character device" -msgstr "字符设备" +msgid "Vivo video" +msgstr "Vivo 视频" #: ../freedesktop.org.xml.in.h:616 -msgid "comic book archive" -msgstr "Comic Book 归档文件" +msgid "Wavelet video" +msgstr "Wavelet 视频" #: ../freedesktop.org.xml.in.h:617 -msgid "compound document" -msgstr "组合文档" +msgid "ANIM animation" +msgstr "ANIM 动画" #: ../freedesktop.org.xml.in.h:618 -msgid "compound documents" -msgstr "组合文档" +msgid "FLIC animation" +msgstr "FLIC 动画" #: ../freedesktop.org.xml.in.h:619 -msgid "compressed GIMP image" -msgstr "压缩的 GIMP 图像" +msgid "Haansoft Hangul document" +msgstr "Haansoft Hangul 文档" #: ../freedesktop.org.xml.in.h:620 -msgid "compressed SVG image" -msgstr "压缩的 SVG 图像" +msgid "Haansoft Hangul document template" +msgstr "Haansoft Hangul 文档模板" #: ../freedesktop.org.xml.in.h:621 -msgid "compressed Tracker audio" -msgstr "压缩的 Tracker 音频" +msgid "MNG animation" +msgstr "MNG 动画" #: ../freedesktop.org.xml.in.h:622 -msgid "desktop configuration file" -msgstr "桌面配置文件" +msgid "ASF video" +msgstr "ASF 视频" #: ../freedesktop.org.xml.in.h:623 -msgid "detached OpenPGP signature" -msgstr "分离的 OpenPGP 签名" +msgid "Windows Media Station file" +msgstr "Windows 媒体工作站文件" #: ../freedesktop.org.xml.in.h:624 -msgid "detached S/MIME signature" -msgstr "分离的 S/MIME 签名" +msgid "Windows Media video" +msgstr "Windows Media 视频" #: ../freedesktop.org.xml.in.h:625 -msgid "differences between files" -msgstr "文件的区别" +msgid "AVI video" +msgstr "AVI 视频" + +#: ../freedesktop.org.xml.in.h:626 +msgid "NullSoft video" +msgstr "Nullsoft 视频" -#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system #: ../freedesktop.org.xml.in.h:627 -msgid "digital photos" -msgstr "数字化图像" +msgid "SDP multicast stream file" +msgstr "SDP 多播流文件" #: ../freedesktop.org.xml.in.h:628 -msgid "digital raw image" -msgstr "数字化原始图像" +msgid "SGI video" +msgstr "SGI 视频" + +#: ../freedesktop.org.xml.in.h:629 +msgid "eMusic download package" +msgstr "eMusic 下载包" -#. see fd.o hal spec #: ../freedesktop.org.xml.in.h:630 -msgid "e-book reader" -msgstr "电子书阅读器" +msgid "KML geographic data" +msgstr "KML 地理数据" #: ../freedesktop.org.xml.in.h:631 -msgid "eMusic download package" -msgstr "eMusic 下载包" +msgid "KML geographic compressed data" +msgstr "KML 压缩地理数据" #: ../freedesktop.org.xml.in.h:632 -msgid "electronic book document" -msgstr "电子书文档" +msgid "Citrix ICA settings file" +msgstr "Citrix ICA 设置文件" #: ../freedesktop.org.xml.in.h:633 -msgid "electronic business card" -msgstr "电子商务卡" +msgid "XUL interface document" +msgstr "XUL 界面文档" #: ../freedesktop.org.xml.in.h:634 -msgid "email headers" -msgstr "电子邮件头" +msgid "XPInstall installer module" +msgstr "XPInstall 安装工具模块" #: ../freedesktop.org.xml.in.h:635 -msgid "email message" -msgstr "电子邮件" +msgid "Word 2007 document" +msgstr "Microsoft Word 2007 文档" #: ../freedesktop.org.xml.in.h:636 -msgid "empty document" -msgstr "空文档" +msgid "Word 2007 document template" +msgstr "" #: ../freedesktop.org.xml.in.h:637 -msgid "encrypted message" -msgstr "加密信件" +msgid "PowerPoint 2007 presentation" +msgstr "Microsoft PowerPoint 2007 演示文稿" #: ../freedesktop.org.xml.in.h:638 -msgid "enriched text document" -msgstr "富文本文档" +msgid "PowerPoint 2007 slide" +msgstr "PowerPoint 2007 文稿" #: ../freedesktop.org.xml.in.h:639 -msgid "executable" -msgstr "可执行文件" +msgid "PowerPoint 2007 show" +msgstr "Microsoft PowerPoint 2007 演示文稿" #: ../freedesktop.org.xml.in.h:640 -msgid "folder" -msgstr "文件夹" +msgid "PowerPoint 2007 presentation template" +msgstr "" #: ../freedesktop.org.xml.in.h:641 -msgid "generic font file" -msgstr "通用字体文件" +msgid "Excel 2007 spreadsheet" +msgstr "Microsoft Excel 2007 工作簿" #: ../freedesktop.org.xml.in.h:642 -msgid "help page" -msgstr "帮助页面" +msgid "Excel 2007 spreadsheet template" +msgstr "" #: ../freedesktop.org.xml.in.h:643 -msgid "iMelody ringtone" -msgstr "iMelody 铃声" +msgid "T602 document" +msgstr "T602 文档" #: ../freedesktop.org.xml.in.h:644 -msgid "iPod firmware" -msgstr "iPod 固件" +msgid "Cisco VPN Settings" +msgstr "Cisco VPN 设置" #: ../freedesktop.org.xml.in.h:645 -msgid "iRiver Playlist" -msgstr "iRiver 播放列表" +msgid "ICC profile" +msgstr "ICC 文件" #: ../freedesktop.org.xml.in.h:646 -msgid "installation instructions" -msgstr "软件安装指南" - -#: ../freedesktop.org.xml.in.h:647 -msgid "iptables configuration file" -msgstr "iptables 防火墙配置文件" +msgid "IT 8.7 color calibration file" +msgstr "IT 8.7 色彩校准文件" +#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system #: ../freedesktop.org.xml.in.h:648 -msgid "libtool shared library" -msgstr "libtool 共享库" - -#: ../freedesktop.org.xml.in.h:649 -msgid "license terms" -msgstr "软件许可条款" - -#: ../freedesktop.org.xml.in.h:650 -msgid "mail delivery report" -msgstr "邮件投递报告" - -#: ../freedesktop.org.xml.in.h:651 -msgid "mail disposition report" -msgstr "邮件接收报告" +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:652 -msgid "mail system report" -msgstr "邮件系统报告" - -#: ../freedesktop.org.xml.in.h:653 -msgid "mailbox file" -msgstr "mailbox 文件" - -#: ../freedesktop.org.xml.in.h:654 -msgid "manual page (compressed)" -msgstr "手册页 (压缩)" - -#: ../freedesktop.org.xml.in.h:655 -msgid "message catalog" -msgstr "消息库" +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:656 -msgid "message digest" -msgstr "消息摘要" - -#: ../freedesktop.org.xml.in.h:657 -msgid "message in several formats" -msgstr "各种格式的消息" +msgid "Super Video CD" +msgstr "SVCD" +#. http://en.wikipedia.org/wiki/DVD-Video #: ../freedesktop.org.xml.in.h:658 -msgid "mount point" -msgstr "挂载点" - -#: ../freedesktop.org.xml.in.h:659 -msgid "object code" -msgstr "目标代码" +msgid "video DVD" +msgstr "视频 DVD" +#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard) #: ../freedesktop.org.xml.in.h:660 -msgid "packed font file" -msgstr "打包的字体文件" - -#: ../freedesktop.org.xml.in.h:661 -msgid "partial email message" -msgstr "部分电子邮件" +msgid "audio CD" +msgstr "音频 CD" +#. http://en.wikipedia.org/wiki/Compact_Disc #: ../freedesktop.org.xml.in.h:662 -msgid "pipe" -msgstr "管道" - -#: ../freedesktop.org.xml.in.h:663 -msgid "plain text document" -msgstr "纯文本文档" +msgid "blank CD disc" +msgstr "空 CD 光盘" -#. see fd.o hal spec -#: ../freedesktop.org.xml.in.h:665 -msgid "portable audio player" -msgstr "便携式音频播放器" +#. http://en.wikipedia.org/wiki/DVD +#: ../freedesktop.org.xml.in.h:664 +msgid "blank DVD disc" +msgstr "空 DVD 光盘" +#. http://en.wikipedia.org/wiki/Blu-ray_Disc #: ../freedesktop.org.xml.in.h:666 -msgid "profiler results" -msgstr "profiler 结果" - -#: ../freedesktop.org.xml.in.h:667 -msgid "program crash data" -msgstr "程序崩溃数据" +msgid "blank Blu-ray disc" +msgstr "空蓝光 DVD" +#. http://en.wikipedia.org/wiki/HD_DVD #: ../freedesktop.org.xml.in.h:668 -msgid "raw CD image" -msgstr "原始 CD 映像" - -#: ../freedesktop.org.xml.in.h:669 -msgid "reference to remote file" -msgstr "到远程文件的引用" +msgid "blank HD DVD disc" +msgstr "空 HD DVD 光盘" +#. http://en.wikipedia.org/wiki/DVD-Audio #: ../freedesktop.org.xml.in.h:670 -msgid "rejected patch" -msgstr "拒绝的补丁" - -#: ../freedesktop.org.xml.in.h:671 -msgid "resource location" -msgstr "资源位置" - -#: ../freedesktop.org.xml.in.h:672 -msgid "rich text document" -msgstr "RTF 丰富文本文档" +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:673 -msgid "shared library" -msgstr "共享库" - -#: ../freedesktop.org.xml.in.h:674 -msgid "shell archive" -msgstr "shell 归档文件" - -#: ../freedesktop.org.xml.in.h:675 -msgid "shell script" -msgstr "shell 脚本" +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:676 -msgid "shortcut to Kexi project on database server" -msgstr "数据库服务器上 Kexi 项目的快捷方式" - -#: ../freedesktop.org.xml.in.h:677 -msgid "signed message" -msgstr "签名信件" +msgid "HD DVD video disc" +msgstr "HD DVD 视频光盘" +#. see fd.o hal spec #: ../freedesktop.org.xml.in.h:678 -msgid "socket" -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:681 -msgid "software" -msgstr "软件" +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:682 -msgid "spreadsheet interchange document" -msgstr "电子表格交换文档" - -#: ../freedesktop.org.xml.in.h:683 -msgid "stream of data (server push)" -msgstr "数据流(服务器推送)" +msgid "Picture CD" +msgstr "柯达 Picture CD" +#. see fd.o hal spec #: ../freedesktop.org.xml.in.h:684 -msgid "symbolic link" -msgstr "符号链接" - -#: ../freedesktop.org.xml.in.h:685 -msgid "theme" -msgstr "主题" - -#: ../freedesktop.org.xml.in.h:686 -msgid "translated messages (machine-readable)" -msgstr "消息翻译(机读)" +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:687 -msgid "translation file" -msgstr "消息翻译文件" - -#: ../freedesktop.org.xml.in.h:688 -msgid "translation template" -msgstr "消息翻译模板" - -#: ../freedesktop.org.xml.in.h:689 -msgid "txt2tags document" -msgstr "txt2tags 文档" +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:690 -msgid "unknown" -msgstr "未知" +msgid "UNIX software" +msgstr "UNIX 软件" -#. http://en.wikipedia.org/wiki/DVD-Video -#: ../freedesktop.org.xml.in.h:692 -msgid "video DVD" -msgstr "视频 DVD" +#. 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:693 +msgid "Windows software" +msgstr "Windows 软件" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sharutils.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sharutils.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sharutils.po 2012-01-02 18:07:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sharutils.po 2012-02-23 07:11:36.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: 2011-12-29 11:12+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: lib/error.c:181 msgid "Unknown system error" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/smart.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/smart.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/smart.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/smart.po 2012-02-23 07:11: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: 2011-12-29 14:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:51+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: smart.py:37 smart2.py:40 smart3.py:40 msgid "smart command [options] [arguments]" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/software-properties.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/software-properties.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/software-properties.po 2012-01-02 18:07:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/software-properties.po 2012-02-23 07:11:56.000000000 +0000 @@ -7,38 +7,38 @@ msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-21 15:45+0000\n" -"PO-Revision-Date: 2011-12-07 20:38+0000\n" +"POT-Creation-Date: 2012-02-03 21:11+0000\n" +"PO-Revision-Date: 2012-02-04 01:01+0000\n" "Last-Translator: catinsnow \n" "Language-Team: zh_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: 2011-12-29 16:28+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:28+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../data/com.ubuntu.softwareproperties.policy.in.h:1 -msgid "To change software repository settings, you need to authenticate." -msgstr "" - -#: ../data/com.ubuntu.softwareproperties.policy.in.h:2 msgid "Write Configuration" msgstr "写入配置" +#: ../data/com.ubuntu.softwareproperties.policy.in.h:2 +msgid "To change software repository settings, you need to authenticate." +msgstr "" + #: ../data/software-properties-gtk.desktop.in.h:1 #: ../data/software-properties-kde.desktop.in.h:1 -msgid "Configure the sources for installable software and updates" -msgstr "配置用于安装和升级软件的源" - -#: ../data/software-properties-gtk.desktop.in.h:2 -#: ../data/software-properties-kde.desktop.in.h:2 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:582 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:602 -#: ../data/gtkbuilder/main.ui.h:29 +#: ../data/gtkbuilder/main.ui.h:14 msgid "Software Sources" msgstr "软件源" +#: ../data/software-properties-gtk.desktop.in.h:2 +#: ../data/software-properties-kde.desktop.in.h:2 +msgid "Configure the sources for installable software and updates" +msgstr "配置用于安装和升级软件的源" + #: ../add-apt-repository:35 #, c-format msgid "The %s named '%s' has no PPA named '%s'" @@ -81,32 +81,43 @@ msgstr "" #: ../add-apt-repository:136 +#, c-format +msgid "" +"Cannot access PPA (%s) to get PPA information, please check your internet " +"connection." +msgstr "" + +#: ../add-apt-repository:142 +msgid "Adding private PPAs is not supported currently" +msgstr "" + +#: ../add-apt-repository:146 msgid "You are about to remove the following PPA from your system:" msgstr "" -#: ../add-apt-repository:138 +#: ../add-apt-repository:148 msgid "You are about to add the following PPA to your system:" msgstr "你将向系统添加如下 PPA:" -#: ../add-apt-repository:140 +#: ../add-apt-repository:150 #, c-format msgid " More info: %s" msgstr " 更多信息: %s" -#: ../add-apt-repository:144 +#: ../add-apt-repository:154 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it" msgstr "" -#: ../add-apt-repository:146 +#: ../add-apt-repository:156 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it" msgstr "按回车继续或者 Ctrl+c 取消添加" -#: ../add-apt-repository:160 ../add-apt-repository:164 +#: ../add-apt-repository:170 ../add-apt-repository:174 #, c-format msgid "Error: '%s' doesn't exist in a sourcelist file" msgstr "错误:“%s”不存在于一个软件源列表文件" -#: ../add-apt-repository:168 +#: ../add-apt-repository:178 #, c-format msgid "Error: '%s' invalid" msgstr "错误: '%s' 无效" @@ -180,17 +191,17 @@ msgstr "每天" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165 -#: ../data/gtkbuilder/main.ui.h:17 +#: ../data/gtkbuilder/main.ui.h:10 msgid "Every two days" msgstr "每两天" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:166 -#: ../data/gtkbuilder/main.ui.h:35 +#: ../data/gtkbuilder/main.ui.h:11 msgid "Weekly" msgstr "每周" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:167 -#: ../data/gtkbuilder/main.ui.h:18 +#: ../data/gtkbuilder/main.ui.h:12 msgid "Every two weeks" msgstr "每两周" @@ -314,11 +325,11 @@ msgstr "APT 格式行包括软件仓库的类型、路径以及组件,例如“%s”。" #: ../softwareproperties/kde/DialogEdit.py:41 -#: ../data/gtkbuilder/dialog-edit-source.ui.h:6 +#: ../data/gtkbuilder/dialog-edit-source.ui.h:1 msgid "Binary" msgstr "二进制" -#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:30 +#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:15 msgid "Source code" msgstr "源代码" @@ -405,17 +416,13 @@ msgid "Ubuntu CD Image Automatic Signing Key " msgstr "Ubuntu 光盘镜像可自动签名密钥" -#: ../data/gtkbuilder/dialog-edit-source.ui.h:1 -msgid "Comment:" -msgstr "注释:" - #: ../data/gtkbuilder/dialog-edit-source.ui.h:2 -msgid "Components:" -msgstr "组件:" +msgid "Source" +msgstr "源代码" #: ../data/gtkbuilder/dialog-edit-source.ui.h:3 -msgid "Distribution:" -msgstr "发行版:" +msgid "Edit Source" +msgstr "编辑源" #: ../data/gtkbuilder/dialog-edit-source.ui.h:4 msgid "Type:" @@ -425,13 +432,17 @@ msgid "URI:" msgstr "网址:" +#: ../data/gtkbuilder/dialog-edit-source.ui.h:6 +msgid "Distribution:" +msgstr "发行版:" + #: ../data/gtkbuilder/dialog-edit-source.ui.h:7 -msgid "Edit Source" -msgstr "编辑源" +msgid "Components:" +msgstr "组件:" #: ../data/gtkbuilder/dialog-edit-source.ui.h:8 -msgid "Source" -msgstr "源代码" +msgid "Comment:" +msgstr "注释:" #: ../data/gtkbuilder/dialog-add-sources-list.ui.h:1 msgid "_Replace" @@ -442,137 +453,137 @@ msgstr "正在扫描光驱" #: ../data/gtkbuilder/main.ui.h:1 -msgid " " -msgstr " " +msgid "Display immediately" +msgstr "立即显示" #: ../data/gtkbuilder/main.ui.h:2 -msgid "Downloadable from the Internet" -msgstr "可从互联网下载" +msgid "Display weekly" +msgstr "每周显示一次" #: ../data/gtkbuilder/main.ui.h:3 -msgid "Installable from CD-ROM/DVD" -msgstr "可从光驱安装" +msgid "Display every two weeks" +msgstr "每两周显示一次" #: ../data/gtkbuilder/main.ui.h:4 -msgid "Trusted software providers" -msgstr "可信任的软件提供者" +msgid "For any new version" +msgstr "适用任何新版本" #: ../data/gtkbuilder/main.ui.h:5 -msgid "Add Volume..." -msgstr "添加卷..." +msgid "For long-term support versions" +msgstr "适用长期支持版本" #: ../data/gtkbuilder/main.ui.h:6 -msgid "Add..." -msgstr "添加..." +msgid "Never" +msgstr "从不" #: ../data/gtkbuilder/main.ui.h:7 -msgid "Authentication" -msgstr "身份验证" +msgid "Download automatically" +msgstr "自动下载" #: ../data/gtkbuilder/main.ui.h:8 -msgid "Automatically check for updates:" -msgstr "自动检查更新:" - -#: ../data/gtkbuilder/main.ui.h:10 -msgid "Display every two weeks" -msgstr "每两周显示一次" - -#: ../data/gtkbuilder/main.ui.h:11 -msgid "Display immediately" -msgstr "立即显示" - -#: ../data/gtkbuilder/main.ui.h:12 -msgid "Display weekly" -msgstr "每周显示一次" - -#: ../data/gtkbuilder/main.ui.h:13 msgid "Download and install automatically" msgstr "自动下载和安装" -#: ../data/gtkbuilder/main.ui.h:14 -msgid "Download automatically" -msgstr "自动下载" +#: ../data/gtkbuilder/main.ui.h:13 +msgid "To install from a CD-ROM or DVD, insert the medium into the drive." +msgstr "要从光驱安装, 请将光盘放入驱动器." -#: ../data/gtkbuilder/main.ui.h:15 +#: ../data/gtkbuilder/main.ui.h:16 msgid "Download from:" msgstr "下载自:" -#: ../data/gtkbuilder/main.ui.h:16 -msgid "Edit..." -msgstr "编辑..." +#: ../data/gtkbuilder/main.ui.h:17 +msgid "Downloadable from the Internet" +msgstr "可从互联网下载" + +#: ../data/gtkbuilder/main.ui.h:18 +msgid "Installable from CD-ROM/DVD" +msgstr "可从光驱安装" #: ../data/gtkbuilder/main.ui.h:19 -msgid "For any new version" -msgstr "适用任何新版本" +msgid "Add..." +msgstr "添加..." #: ../data/gtkbuilder/main.ui.h:20 -msgid "For long-term support versions" -msgstr "适用长期支持版本" +msgid "Edit..." +msgstr "编辑..." #: ../data/gtkbuilder/main.ui.h:21 -msgid "Import the public key from a trusted software provider" -msgstr "从可信任的软件提供者导入密钥。" +msgid "Add Volume..." +msgstr "添加卷..." #: ../data/gtkbuilder/main.ui.h:22 -msgid "Install updates from:" -msgstr "从下列地点安装更新:" +msgid "Other Software" +msgstr "其它软件" #: ../data/gtkbuilder/main.ui.h:23 -msgid "" -"Keys are used to authenticate the correct source of software and so protect " -"your computer from malicious software" -msgstr "密钥用于验证软件源的正确性,使您的电脑远离恶意软件" +msgid "Install updates from:" +msgstr "从下列地点安装更新:" #: ../data/gtkbuilder/main.ui.h:24 -msgid "Never" -msgstr "从不" +msgid "Automatically check for updates:" +msgstr "自动检查更新:" #: ../data/gtkbuilder/main.ui.h:25 -msgid "Notify me of a new Ubuntu version:" -msgstr "有新版本时通知我:" +msgid "When there are security updates:" +msgstr "当有安全更新时:" #: ../data/gtkbuilder/main.ui.h:26 -msgid "Other Software" -msgstr "其它软件" +msgid "When there are other updates:" +msgstr "当有其它更新时:" #: ../data/gtkbuilder/main.ui.h:27 -msgid "Restore _Defaults" -msgstr "恢复默认值(_D)" +msgid "Notify me of a new Ubuntu version:" +msgstr "有新版本时通知我:" #: ../data/gtkbuilder/main.ui.h:28 -msgid "Restore the default keys of your distribution" -msgstr "还原为发行版本预设的密钥" +msgid "Updates" +msgstr "更新" + +#: ../data/gtkbuilder/main.ui.h:29 +msgid "Trusted software providers" +msgstr "可信任的软件提供者" + +#: ../data/gtkbuilder/main.ui.h:30 +msgid " " +msgstr " " #: ../data/gtkbuilder/main.ui.h:31 -msgid "Statistics" -msgstr "统计" +msgid "" +"Keys are used to authenticate the correct source of software and so protect " +"your computer from malicious software" +msgstr "密钥用于验证软件源的正确性,使您的电脑远离恶意软件" #: ../data/gtkbuilder/main.ui.h:32 -msgid "Submit statistical information" -msgstr "提交统计信息" +msgid "_Import Key File..." +msgstr "导入密钥文件(_I)..." #: ../data/gtkbuilder/main.ui.h:33 -msgid "To install from a CD-ROM or DVD, insert the medium into the drive." -msgstr "要从光驱安装, 请将光盘放入驱动器." +msgid "Import the public key from a trusted software provider" +msgstr "从可信任的软件提供者导入密钥。" #: ../data/gtkbuilder/main.ui.h:34 -msgid "Updates" -msgstr "更新" +msgid "Restore _Defaults" +msgstr "恢复默认值(_D)" + +#: ../data/gtkbuilder/main.ui.h:35 +msgid "Restore the default keys of your distribution" +msgstr "还原为发行版本预设的密钥" #: ../data/gtkbuilder/main.ui.h:36 -msgid "When there are other updates:" -msgstr "当有其它更新时:" +msgid "Authentication" +msgstr "身份验证" #: ../data/gtkbuilder/main.ui.h:37 -msgid "When there are security updates:" -msgstr "当有安全更新时:" +msgid "Submit statistical information" +msgstr "提交统计信息" #: ../data/gtkbuilder/main.ui.h:38 -msgid "_Import Key File..." -msgstr "导入密钥文件(_I)..." +msgid "Statistics" +msgstr "统计" #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1 -#: ../data/gtkbuilder/dialog-mirror.ui.h:1 +#: ../data/gtkbuilder/dialog-mirror.ui.h:6 msgid " " msgstr " " @@ -580,7 +591,27 @@ msgid "_Reload" msgstr "重新载入(_R)" +#: ../data/gtkbuilder/dialog-mirror.ui.h:1 +msgid "Choose a Download Server" +msgstr "选择下载服务器" + #: ../data/gtkbuilder/dialog-mirror.ui.h:2 +msgid "Protocol:" +msgstr "协议:" + +#: ../data/gtkbuilder/dialog-mirror.ui.h:3 +msgid "_Select Best Server" +msgstr "选择最佳服务器(_S)" + +#: ../data/gtkbuilder/dialog-mirror.ui.h:4 +msgid "Performs a connection test to find the best mirror for your location" +msgstr "将通过连接测试确定最佳镜像" + +#: ../data/gtkbuilder/dialog-mirror.ui.h:5 +msgid "Choose _Server" +msgstr "选择服务器(_S)" + +#: ../data/gtkbuilder/dialog-mirror.ui.h:7 msgid "" "Testing download servers\n" "\n" @@ -591,26 +622,6 @@ "\n" "为了找到最好的镜像地址,将会执行一系列的测试。" -#: ../data/gtkbuilder/dialog-mirror.ui.h:5 -msgid "Choose _Server" -msgstr "选择服务器(_S)" - -#: ../data/gtkbuilder/dialog-mirror.ui.h:6 -msgid "Choose a Download Server" -msgstr "选择下载服务器" - -#: ../data/gtkbuilder/dialog-mirror.ui.h:7 -msgid "Performs a connection test to find the best mirror for your location" -msgstr "将通过连接测试确定最佳镜像" - -#: ../data/gtkbuilder/dialog-mirror.ui.h:8 -msgid "Protocol:" -msgstr "协议:" - -#: ../data/gtkbuilder/dialog-mirror.ui.h:9 -msgid "_Select Best Server" -msgstr "选择最佳服务器(_S)" - #: ../data/gtkbuilder/dialog-add.ui.h:2 msgid "APT line:" msgstr "APT 行:" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sp5.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sp5.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sp5.po 2012-01-02 18:07:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sp5.po 2012-02-23 07:11: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: 2011-12-29 10:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n" +"X-Generator: Launchpad (build 14838)\n" msgid "" "no system identifier could be generated for meta-DTD for architecture %1" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sphinx.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sphinx.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sphinx.po 2012-01-02 18:07:39.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sphinx.po 2012-02-23 07:11:59.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: 2011-12-29 17:16+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:14+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Generated-By: Babel 0.9.4\n" #: sphinx/environment.py:106 sphinx/writers/latex.py:184 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/subdomain_parser.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subdomain_parser.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/subdomain_parser.po 2012-01-02 18:07:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subdomain_parser.po 2012-02-23 07:11:57.000000000 +0000 @@ -6,14 +6,14 @@ "Project-Id-Version: apparmor-parser\n" "Report-Msgid-Bugs-To: apparmor-general@forge.novell.com\n" "POT-Creation-Date: 2005-03-31 13:39-0800\n" -"PO-Revision-Date: 2011-12-07 03:18+0000\n" +"PO-Revision-Date: 2012-02-16 23:43+0000\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 16:37+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 23:37+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../parser_include.c:80 msgid "Error couldn't allocate temporary file\n" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/subversion.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subversion.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/subversion.po 2012-01-02 18:07:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subversion.po 2012-02-23 07:11:34.000000000 +0000 @@ -46,8 +46,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: 2011-12-29 10:57+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:47+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" "X-Poedit-Language: Chinese\n" @@ -229,7 +229,7 @@ msgstr "管道读取错误" #: ../include/svn_error_codes.h:265 ../libsvn_subr/cmdline.c:313 -#: ../libsvn_subr/cmdline.c:330 ../svn/util.c:912 ../svnlook/main.c:1716 +#: ../libsvn_subr/cmdline.c:330 ../svn/util.c:910 ../svnlook/main.c:1716 #, c-format msgid "Write error" msgstr "写入错误" @@ -1140,11 +1140,11 @@ msgid "Cannot calculate blame information for binary file '%s'" msgstr "无法为二进制文件 “%s” 计算追溯信息" -#: ../libsvn_client/blame.c:625 +#: ../libsvn_client/blame.c:623 msgid "blame of the WORKING revision is not supported" msgstr "工作版本不支持追溯" -#: ../libsvn_client/blame.c:639 +#: ../libsvn_client/blame.c:637 msgid "Start revision must precede end revision" msgstr "起始版本必须小于结束版本" @@ -1162,7 +1162,7 @@ msgid "URL '%s' refers to a directory" msgstr "URL “%s” 指向目录" -#: ../libsvn_client/checkout.c:135 ../libsvn_client/export.c:997 +#: ../libsvn_client/checkout.c:135 ../libsvn_client/export.c:992 #, c-format msgid "URL '%s' doesn't exist" msgstr "URL “%s” 不存在" @@ -1249,33 +1249,33 @@ msgid "Error in post-commit clean-up (details follow):" msgstr "清理 post-commit 出错 (细节如下):" -#: ../libsvn_client/commit.c:1255 +#: ../libsvn_client/commit.c:1253 msgid "Are all the targets part of the same working copy?" msgstr "是否所有目标都属于同一工作副本?" -#: ../libsvn_client/commit.c:1292 +#: ../libsvn_client/commit.c:1290 msgid "" "Cannot non-recursively commit a directory deletion of a directory with child " "nodes" msgstr "无法以非递归提交方式删除有子节点的目录" -#: ../libsvn_client/commit.c:1343 +#: ../libsvn_client/commit.c:1341 #, c-format msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "“%s” 是 URL,但是 URL 不可作为提交目标" -#: ../libsvn_client/commit_util.c:57 ../libsvn_repos/commit.c:128 +#: ../libsvn_client/commit_util.c:57 ../libsvn_repos/commit.c:126 #, c-format msgid "Directory '%s' is out of date" msgstr "目录 “%s” 已经过时" -#: ../libsvn_client/commit_util.c:58 ../libsvn_repos/commit.c:130 +#: ../libsvn_client/commit_util.c:58 ../libsvn_repos/commit.c:128 #, c-format msgid "File '%s' is out of date" msgstr "文件 “%s” 已经过时" -#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:510 -#: ../libsvn_client/commit_util.c:985 +#: ../libsvn_client/commit_util.c:289 ../libsvn_client/commit_util.c:499 +#: ../libsvn_client/commit_util.c:974 #, c-format msgid "Aborting commit: '%s' remains in conflict" msgstr "提交终止: “%s” 处于冲突状态" @@ -1285,50 +1285,50 @@ msgid "Aborting commit: '%s' remains in tree-conflict" msgstr "提交终止: “%s” 仍处于树冲突状态" -#: ../libsvn_client/commit_util.c:433 ../libsvn_client/commit_util.c:454 +#: ../libsvn_client/commit_util.c:432 ../libsvn_client/commit_util.c:443 #: ../libsvn_wc/crop.c:168 #, c-format msgid "Unknown entry kind for '%s'" msgstr "“%s” 有未知的条目类型" -#: ../libsvn_client/commit_util.c:471 +#: ../libsvn_client/commit_util.c:460 #, c-format msgid "Entry '%s' has unexpectedly changed special status" msgstr "条目 “%s” 意外改变状态" -#: ../libsvn_client/commit_util.c:580 +#: ../libsvn_client/commit_util.c:569 #, c-format msgid "Did not expect '%s' to be a working copy root" msgstr "不期望 “%s” 是工作副本根目录" -#: ../libsvn_client/commit_util.c:598 ../libsvn_client/commit_util.c:1322 +#: ../libsvn_client/commit_util.c:587 ../libsvn_client/commit_util.c:1311 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "提交项目 “%s” 有复制标记,但是没有源地址(copyfrom URL)" -#: ../libsvn_client/commit_util.c:617 +#: ../libsvn_client/commit_util.c:606 #, c-format msgid "'%s' is scheduled for addition, but is missing" msgstr "丢失了预定增加的“%s”" -#: ../libsvn_client/commit_util.c:885 +#: ../libsvn_client/commit_util.c:874 #, c-format msgid "" "'%s' is not under version control and is not part of the commit, yet its " "child '%s' is part of the commit" msgstr "“%s” 尚未纳入版本控制,也不是提交的一部份,但是它的子路径 “%s” 是提交的一部份" -#: ../libsvn_client/commit_util.c:993 ../libsvn_client/url.c:155 +#: ../libsvn_client/commit_util.c:982 ../libsvn_client/url.c:155 #, c-format msgid "Entry for '%s' has no URL" msgstr "条目 “%s” 没有URL" -#: ../libsvn_client/commit_util.c:1025 +#: ../libsvn_client/commit_util.c:1014 #, c-format msgid "'%s' is scheduled for addition within unversioned parent" msgstr "在未纳入版本控制的父目录,“%s” 被加入增加调度" -#: ../libsvn_client/commit_util.c:1045 +#: ../libsvn_client/commit_util.c:1034 #, c-format msgid "" "Entry for '%s' is marked as 'copied' but is not itself scheduled\n" @@ -1338,17 +1338,17 @@ "条目 “%s” 被标记为“已复制”,但是本身尚未加入增加调度。也许您提交的\n" "目标在未纳入版本控制的目录中?" -#: ../libsvn_client/commit_util.c:1178 +#: ../libsvn_client/commit_util.c:1167 #, 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:1327 +#: ../libsvn_client/commit_util.c:1316 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "提交项目 “%s” 有复制标志,但是版本无效" -#: ../libsvn_client/commit_util.c:2089 +#: ../libsvn_client/commit_util.c:2078 msgid "Standard properties can't be set explicitly as revision properties" msgstr "标准属性不能设置为版本属性" @@ -1518,8 +1518,8 @@ msgid "Cannot display: file marked as a binary type.%s" msgstr "无法显示: 文件标记为二进制类型。%s" -#: ../libsvn_client/diff.c:924 ../libsvn_client/merge.c:5826 -#: ../libsvn_client/merge.c:7722 +#: ../libsvn_client/diff.c:924 ../libsvn_client/merge.c:5726 +#: ../libsvn_client/merge.c:7542 msgid "Not all required revisions are specified" msgstr "没有全部提供需要的版本" @@ -1571,7 +1571,7 @@ msgid "'%s' already exists" msgstr "“%s” 已存在" -#: ../libsvn_client/export.c:773 ../libsvn_wc/adm_crawler.c:997 +#: ../libsvn_client/export.c:768 ../libsvn_wc/adm_crawler.c:997 #: ../libsvn_wc/update_editor.c:4529 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" @@ -1655,7 +1655,7 @@ msgid "URL '%s' non-existent in revision %ld" msgstr "URL “%s” 不在版本 %ld 中" -#: ../libsvn_client/list.c:242 +#: ../libsvn_client/list.c:233 #, c-format msgid "URL '%s' non-existent in that revision" msgstr "该版本没有 URL “%s”" @@ -1664,9 +1664,9 @@ msgid "No common parent found, unable to operate on disjoint arguments" msgstr "没有找到公共父节点,不能在分离的参数上操作" -#: ../libsvn_client/locking_commands.c:267 ../libsvn_client/merge.c:7739 -#: ../libsvn_client/merge.c:7745 ../libsvn_client/merge.c:8714 -#: ../libsvn_client/merge.c:8923 ../libsvn_client/ra.c:401 +#: ../libsvn_client/locking_commands.c:267 ../libsvn_client/merge.c:7559 +#: ../libsvn_client/merge.c:7565 ../libsvn_client/merge.c:8506 +#: ../libsvn_client/merge.c:8706 ../libsvn_client/ra.c:401 #: ../libsvn_client/ra.c:433 ../libsvn_client/ra.c:636 #, c-format msgid "'%s' has no URL" @@ -1686,7 +1686,7 @@ msgid "'%s' is not locked" msgstr "“%s” 没有被锁定" -#: ../libsvn_client/locking_commands.c:413 ../libsvn_fs/fs-loader.c:1191 +#: ../libsvn_client/locking_commands.c:413 ../libsvn_fs/fs-loader.c:1190 #: ../libsvn_ra/ra_loader.c:961 msgid "Lock comment contains illegal characters" msgstr "锁定注释包含非法字符" @@ -1723,27 +1723,27 @@ #. 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:1403 +#: ../libsvn_client/merge.c:1391 msgid ".working" msgstr ".working" -#: ../libsvn_client/merge.c:1405 +#: ../libsvn_client/merge.c:1393 #, c-format msgid ".merge-left.r%ld" msgstr ".merge-left.r%ld" -#: ../libsvn_client/merge.c:1408 +#: ../libsvn_client/merge.c:1396 #, c-format msgid ".merge-right.r%ld" msgstr ".merge-right.r%ld" -#: ../libsvn_client/merge.c:3567 +#: ../libsvn_client/merge.c:3541 msgid "" "Cannot reverse-merge a range from a path's own future history; try updating " "first" msgstr "不能从路径的未来历史中反向合并范围;请先更新" -#: ../libsvn_client/merge.c:4295 +#: ../libsvn_client/merge.c:4197 #, c-format msgid "" "One or more conflicts were produced while merging r%ld:%ld into\n" @@ -1754,63 +1754,63 @@ "当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n" "请解决所有冲突后,再次运行合并,处理剩余的未合并版本" -#: ../libsvn_client/merge.c:7361 +#: ../libsvn_client/merge.c:7222 msgid "Use of two URLs is not compatible with mergeinfo modification" msgstr "使用两个 URL 与合并信息修改不兼容" -#: ../libsvn_client/merge.c:7368 ../libsvn_client/merge.c:7613 +#: ../libsvn_client/merge.c:7229 ../libsvn_client/merge.c:7477 msgid "" "Merge from foreign repository is not compatible with mergeinfo modification" msgstr "从外部版本库合并与合并信息修改不兼容" -#: ../libsvn_client/merge.c:7783 ../libsvn_ra/ra_loader.c:514 +#: ../libsvn_client/merge.c:7603 ../libsvn_ra/ra_loader.c:514 #, c-format msgid "'%s' isn't in the same repository as '%s'" msgstr "“%s”与“%s”并不在同一个版本库中" -#: ../libsvn_client/merge.c:7958 +#: ../libsvn_client/merge.c:7777 msgid "Cannot reintegrate into a working copy with a switched subtree" msgstr "不能复兴到包含已经切换子目录的工作副本" -#: ../libsvn_client/merge.c:7963 +#: ../libsvn_client/merge.c:7782 msgid "Cannot reintegrate into a working copy not entirely at infinite depth" msgstr "不能复兴到非全部无限制深度的工作副本" -#: ../libsvn_client/merge.c:7968 +#: ../libsvn_client/merge.c:7787 msgid "Cannot reintegrate into a working copy that has local modifications" msgstr "不能复兴到有本地修改的工作副本" -#: ../libsvn_client/merge.c:7974 +#: ../libsvn_client/merge.c:7793 msgid "Cannot determine revision of working copy" msgstr "不能确定工作副本的版本" -#: ../libsvn_client/merge.c:7978 +#: ../libsvn_client/merge.c:7797 msgid "" "Cannot reintegrate into mixed-revision working copy; try updating first" msgstr "不能复兴到有混合版本的工作副本;请先更新" -#: ../libsvn_client/merge.c:8060 +#: ../libsvn_client/merge.c:7876 #, c-format msgid "At least one revision (r%ld) not yet merged from '%s'" msgstr "至少有一个版本(r%ld)没有自“%s”合并" -#: ../libsvn_client/merge.c:8534 ../libsvn_client/merge.c:8806 +#: ../libsvn_client/merge.c:8333 ../libsvn_client/merge.c:8592 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系" -#: ../libsvn_client/merge.c:8731 +#: ../libsvn_client/merge.c:8522 #, c-format msgid "'%s' must be from the same repository as '%s'" msgstr "“%s”必须与“%s”在同一个版本库中" -#: ../libsvn_client/merge.c:8755 +#: ../libsvn_client/merge.c:8555 #, c-format msgid "" "Neither the reintegrate source nor target can be the root of the repository" msgstr "复兴源或目标都不能是版本库的根。" -#: ../libsvn_client/merge.c:8831 +#: ../libsvn_client/merge.c:8616 #, c-format msgid "" "Reintegrate can only be used if revisions %ld through %ld were previously " @@ -2103,12 +2103,12 @@ msgid "Path '%s' contains '.' or '..' element" msgstr "路径 “%s” 包含 “.” 或 “..” 元素" -#: ../libsvn_fs/fs-loader.c:1173 +#: ../libsvn_fs/fs-loader.c:1172 #, c-format msgid "Malformed UUID '%s'" msgstr "非法 UUID “%s”" -#: ../libsvn_fs/fs-loader.c:1197 +#: ../libsvn_fs/fs-loader.c:1196 msgid "Negative expiration date passed to svn_fs_lock" msgstr "传递到 svn_fs_lock 的有效期非法" @@ -2125,19 +2125,19 @@ msgid "deleting changes" msgstr "正在删除修改" -#: ../libsvn_fs_base/bdb/changes-table.c:143 ../libsvn_fs_fs/fs_fs.c:3761 +#: ../libsvn_fs_base/bdb/changes-table.c:143 ../libsvn_fs_fs/fs_fs.c:3688 msgid "Missing required node revision ID" msgstr "缺少必须的节点版本 ID" -#: ../libsvn_fs_base/bdb/changes-table.c:154 ../libsvn_fs_fs/fs_fs.c:3771 +#: ../libsvn_fs_base/bdb/changes-table.c:154 ../libsvn_fs_fs/fs_fs.c:3698 msgid "Invalid change ordering: new node revision ID without delete" msgstr "无效的改变顺序: 没有删除新节点版本 ID" -#: ../libsvn_fs_base/bdb/changes-table.c:164 ../libsvn_fs_fs/fs_fs.c:3782 +#: ../libsvn_fs_base/bdb/changes-table.c:164 ../libsvn_fs_fs/fs_fs.c:3709 msgid "Invalid change ordering: non-add change on deleted path" msgstr "无效的改变顺序: 在已经删除的路径执行非增加修改" -#: ../libsvn_fs_base/bdb/changes-table.c:173 ../libsvn_fs_fs/fs_fs.c:3791 +#: ../libsvn_fs_base/bdb/changes-table.c:173 ../libsvn_fs_fs/fs_fs.c:3718 msgid "Invalid change ordering: add change on preexisting path" msgstr "无效的改变顺序: 在已有路径增加修改" @@ -2561,17 +2561,17 @@ msgid "Unsupported FS loader version (%d) for bdb" msgstr "不支持的BDB之FS加载器版本 (%d)" -#: ../libsvn_fs_base/lock.c:441 ../libsvn_fs_fs/lock.c:581 +#: ../libsvn_fs_base/lock.c:441 ../libsvn_fs_fs/lock.c:585 #, c-format msgid "Cannot verify lock on path '%s'; no username available" msgstr "不能校验路径“%s”上的锁;没有用户名" -#: ../libsvn_fs_base/lock.c:447 ../libsvn_fs_fs/lock.c:587 +#: ../libsvn_fs_base/lock.c:447 ../libsvn_fs_fs/lock.c:591 #, 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:454 ../libsvn_fs_fs/lock.c:594 +#: ../libsvn_fs_base/lock.c:454 ../libsvn_fs_fs/lock.c:598 #, c-format msgid "Cannot verify lock on path '%s'; no matching lock-token available" msgstr "不能校验路径“%s”的锁;没有匹配的可用锁令牌" @@ -2782,7 +2782,7 @@ msgid "Bad ID in cache" msgstr "缓存中有损坏的 ID" -#: ../libsvn_fs_fs/dag.c:426 ../libsvn_ra_serf/serf.c:969 +#: ../libsvn_fs_fs/dag.c:426 ../libsvn_ra_serf/serf.c:953 msgid "Can't get entries of non-directory" msgstr "不能获取非目录的条目" @@ -2879,86 +2879,86 @@ msgid "Unsupported FS loader version (%d) for fsfs" msgstr "不支持的FSFS之FS加载器版本 (%d)" -#: ../libsvn_fs_fs/fs_fs.c:264 +#: ../libsvn_fs_fs/fs_fs.c:263 #, c-format msgid "Revision file '%s' does not exist, and r%ld is not packed" msgstr "版本文件 “%s” 不存在,并且 r%ld 没有被打包" -#: ../libsvn_fs_fs/fs_fs.c:500 +#: ../libsvn_fs_fs/fs_fs.c:499 #, c-format msgid "Can't grab FSFS txn list mutex" msgstr "不能获取文件系统事务列表互斥体" -#: ../libsvn_fs_fs/fs_fs.c:508 +#: ../libsvn_fs_fs/fs_fs.c:507 #, c-format msgid "Can't ungrab FSFS txn list mutex" msgstr "不能释放文件系统事务列表互斥体" -#: ../libsvn_fs_fs/fs_fs.c:561 +#: ../libsvn_fs_fs/fs_fs.c:560 #, c-format msgid "Can't grab FSFS mutex for '%s'" msgstr "无法为 “%s” 获取 FSFS 互斥体" -#: ../libsvn_fs_fs/fs_fs.c:576 +#: ../libsvn_fs_fs/fs_fs.c:575 #, c-format msgid "Can't ungrab FSFS mutex for '%s'" msgstr "不能为 “%s” 释放 FSFS 互斥体" -#: ../libsvn_fs_fs/fs_fs.c:647 +#: ../libsvn_fs_fs/fs_fs.c:646 #, c-format msgid "Can't unlock unknown transaction '%s'" msgstr "不能解锁未知事务“%s”" -#: ../libsvn_fs_fs/fs_fs.c:651 +#: ../libsvn_fs_fs/fs_fs.c:650 #, c-format msgid "Can't unlock nonlocked transaction '%s'" msgstr "不能解锁未锁事务“%s”" -#: ../libsvn_fs_fs/fs_fs.c:658 +#: ../libsvn_fs_fs/fs_fs.c:657 #, c-format msgid "Can't unlock prototype revision lockfile for transaction '%s'" msgstr "不能为事务“%s”解锁原型版本锁文件" -#: ../libsvn_fs_fs/fs_fs.c:664 +#: ../libsvn_fs_fs/fs_fs.c:663 #, c-format msgid "Can't close prototype revision lockfile for transaction '%s'" msgstr "不能为事务“%s”关闭原型版本锁文件" -#: ../libsvn_fs_fs/fs_fs.c:726 +#: ../libsvn_fs_fs/fs_fs.c:725 #, 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:762 +#: ../libsvn_fs_fs/fs_fs.c:761 #, 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:769 ../libsvn_subr/io.c:1910 +#: ../libsvn_fs_fs/fs_fs.c:768 ../libsvn_subr/io.c:1604 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "不能获取文件“%s”的排它锁" -#: ../libsvn_fs_fs/fs_fs.c:881 +#: ../libsvn_fs_fs/fs_fs.c:880 #, c-format msgid "Format file '%s' contains an unexpected non-digit" msgstr "格式文件“%s”包含一个意外的非数字字符" -#: ../libsvn_fs_fs/fs_fs.c:930 +#: ../libsvn_fs_fs/fs_fs.c:929 #, c-format msgid "Can't read first line of format file '%s'" msgstr "不能读取格式文件“%s”的首行" -#: ../libsvn_fs_fs/fs_fs.c:974 +#: ../libsvn_fs_fs/fs_fs.c:973 #, c-format msgid "'%s' contains invalid filesystem format option '%s'" msgstr "“%s”包含非法文件系统格式选项“%s”" -#: ../libsvn_fs_fs/fs_fs.c:1050 +#: ../libsvn_fs_fs/fs_fs.c:1049 #, c-format msgid "Expected FS format between '1' and '%d'; found format '%d'" msgstr "期望文件系统格式在“1”到“%d”之间;发现格式“%d”" @@ -2976,100 +2976,100 @@ "upgrade %s'" msgstr "在“%s”创建热备份失败。源版本库丢失了文件“%s”。请创建此文件,例如通过执行“svnadmin upgrade %s”来创建它。" -#: ../libsvn_fs_fs/fs_fs.c:1697 ../libsvn_fs_fs/fs_fs.c:1711 +#: ../libsvn_fs_fs/fs_fs.c:1624 ../libsvn_fs_fs/fs_fs.c:1638 msgid "Found malformed header in revision file" msgstr "在版本文件中找到非法文件头" -#: ../libsvn_fs_fs/fs_fs.c:1745 +#: ../libsvn_fs_fs/fs_fs.c:1672 #, c-format msgid "Invalid revision number '%ld'" msgstr "无效的版本号“%ld”" -#: ../libsvn_fs_fs/fs_fs.c:1760 ../libsvn_fs_fs/fs_fs.c:1786 -#: ../libsvn_fs_fs/fs_fs.c:2718 ../libsvn_repos/log.c:1919 -#: ../libsvn_repos/log.c:1923 +#: ../libsvn_fs_fs/fs_fs.c:1687 ../libsvn_fs_fs/fs_fs.c:1713 +#: ../libsvn_fs_fs/fs_fs.c:2645 ../libsvn_repos/log.c:1621 +#: ../libsvn_repos/log.c:1625 #, c-format msgid "No such revision %ld" msgstr "没有版本 %ld" -#: ../libsvn_fs_fs/fs_fs.c:1949 ../libsvn_fs_fs/fs_fs.c:1963 -#: ../libsvn_fs_fs/fs_fs.c:1970 ../libsvn_fs_fs/fs_fs.c:1977 -#: ../libsvn_fs_fs/fs_fs.c:1985 ../libsvn_fs_fs/fs_fs.c:1998 -#: ../libsvn_fs_fs/fs_fs.c:2007 +#: ../libsvn_fs_fs/fs_fs.c:1876 ../libsvn_fs_fs/fs_fs.c:1890 +#: ../libsvn_fs_fs/fs_fs.c:1897 ../libsvn_fs_fs/fs_fs.c:1904 +#: ../libsvn_fs_fs/fs_fs.c:1912 ../libsvn_fs_fs/fs_fs.c:1925 +#: ../libsvn_fs_fs/fs_fs.c:1934 msgid "Malformed text representation offset line in node-rev" msgstr "node-rev 中有非法的文本修订版偏移行" -#: ../libsvn_fs_fs/fs_fs.c:2074 +#: ../libsvn_fs_fs/fs_fs.c:2001 msgid "Missing id field in node-rev" msgstr "node-rev 中没有 id" -#: ../libsvn_fs_fs/fs_fs.c:2086 +#: ../libsvn_fs_fs/fs_fs.c:2013 msgid "Missing kind field in node-rev" msgstr "node-rev 中没有 kind" -#: ../libsvn_fs_fs/fs_fs.c:2117 +#: ../libsvn_fs_fs/fs_fs.c:2044 msgid "Missing cpath in node-rev" msgstr "node-rev 中没有 cpath" -#: ../libsvn_fs_fs/fs_fs.c:2144 ../libsvn_fs_fs/fs_fs.c:2150 +#: ../libsvn_fs_fs/fs_fs.c:2071 ../libsvn_fs_fs/fs_fs.c:2077 msgid "Malformed copyroot line in node-rev" msgstr "node-rev 中的 copyroot 行非法" -#: ../libsvn_fs_fs/fs_fs.c:2168 ../libsvn_fs_fs/fs_fs.c:2174 +#: ../libsvn_fs_fs/fs_fs.c:2095 ../libsvn_fs_fs/fs_fs.c:2101 msgid "Malformed copyfrom line in node-rev" msgstr "node-rev 中的 copyfrom 行非法" -#: ../libsvn_fs_fs/fs_fs.c:2331 ../libsvn_fs_fs/fs_fs.c:5165 +#: ../libsvn_fs_fs/fs_fs.c:2258 ../libsvn_fs_fs/fs_fs.c:5092 msgid "Attempted to write to non-transaction" msgstr "试图写至非事务" -#: ../libsvn_fs_fs/fs_fs.c:2417 +#: ../libsvn_fs_fs/fs_fs.c:2344 msgid "Malformed representation header" msgstr "非法的修订版头" -#: ../libsvn_fs_fs/fs_fs.c:2445 +#: ../libsvn_fs_fs/fs_fs.c:2372 msgid "Missing node-id in node-rev" msgstr "node-rev 中没有 node-id" -#: ../libsvn_fs_fs/fs_fs.c:2451 +#: ../libsvn_fs_fs/fs_fs.c:2378 msgid "Corrupt node-id in node-rev" msgstr "node-rev 中的 node-id 损坏" -#: ../libsvn_fs_fs/fs_fs.c:2526 +#: ../libsvn_fs_fs/fs_fs.c:2453 #, c-format msgid "Revision file lacks trailing newline" msgstr "版本文件缺少结尾换行" -#: ../libsvn_fs_fs/fs_fs.c:2538 +#: ../libsvn_fs_fs/fs_fs.c:2465 #, c-format msgid "Final line in revision file longer than 64 characters" msgstr "版本文件的最后一行大于 64 个字符" -#: ../libsvn_fs_fs/fs_fs.c:2553 +#: ../libsvn_fs_fs/fs_fs.c:2480 msgid "Final line in revision file missing space" msgstr "版本文件的最后一行缺少空白字符" -#: ../libsvn_fs_fs/fs_fs.c:2792 +#: ../libsvn_fs_fs/fs_fs.c:2719 msgid "Malformed svndiff data in representation" msgstr "修订版的svndiff 数据非法" -#: ../libsvn_fs_fs/fs_fs.c:2984 ../libsvn_fs_fs/fs_fs.c:2997 +#: ../libsvn_fs_fs/fs_fs.c:2911 ../libsvn_fs_fs/fs_fs.c:2924 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "读svndiff窗口时超出了结尾" -#: ../libsvn_fs_fs/fs_fs.c:3137 +#: ../libsvn_fs_fs/fs_fs.c:3064 msgid "svndiff data requested non-existent source" msgstr "svndiff 数据请求不存在的来源" -#: ../libsvn_fs_fs/fs_fs.c:3143 +#: ../libsvn_fs_fs/fs_fs.c:3070 msgid "svndiff requested position beyond end of stream" msgstr "svndiff 请求的位置超出了流的结尾" -#: ../libsvn_fs_fs/fs_fs.c:3166 ../libsvn_fs_fs/fs_fs.c:3183 +#: ../libsvn_fs_fs/fs_fs.c:3093 ../libsvn_fs_fs/fs_fs.c:3110 msgid "svndiff window length is corrupt" msgstr "svndiff 的窗体长度已损坏" -#: ../libsvn_fs_fs/fs_fs.c:3234 +#: ../libsvn_fs_fs/fs_fs.c:3161 #, c-format msgid "" "Checksum mismatch while reading representation:\n" @@ -3080,58 +3080,58 @@ " 期望: %s\n" " 实际: %s\n" -#: ../libsvn_fs_fs/fs_fs.c:3536 ../libsvn_fs_fs/fs_fs.c:3549 -#: ../libsvn_fs_fs/fs_fs.c:3555 ../libsvn_fs_fs/fs_fs.c:6368 -#: ../libsvn_fs_fs/fs_fs.c:6377 ../libsvn_fs_fs/fs_fs.c:6383 +#: ../libsvn_fs_fs/fs_fs.c:3463 ../libsvn_fs_fs/fs_fs.c:3476 +#: ../libsvn_fs_fs/fs_fs.c:3482 ../libsvn_fs_fs/fs_fs.c:6267 +#: ../libsvn_fs_fs/fs_fs.c:6276 ../libsvn_fs_fs/fs_fs.c:6282 msgid "Directory entry corrupt" msgstr "目录条目损坏" -#: ../libsvn_fs_fs/fs_fs.c:3955 ../libsvn_fs_fs/fs_fs.c:3960 -#: ../libsvn_fs_fs/fs_fs.c:3966 ../libsvn_fs_fs/fs_fs.c:3983 -#: ../libsvn_fs_fs/fs_fs.c:4016 ../libsvn_fs_fs/fs_fs.c:4036 -#: ../libsvn_fs_fs/fs_fs.c:4070 ../libsvn_fs_fs/fs_fs.c:4075 +#: ../libsvn_fs_fs/fs_fs.c:3882 ../libsvn_fs_fs/fs_fs.c:3887 +#: ../libsvn_fs_fs/fs_fs.c:3893 ../libsvn_fs_fs/fs_fs.c:3910 +#: ../libsvn_fs_fs/fs_fs.c:3943 ../libsvn_fs_fs/fs_fs.c:3963 +#: ../libsvn_fs_fs/fs_fs.c:3997 ../libsvn_fs_fs/fs_fs.c:4002 msgid "Invalid changes line in rev-file" msgstr "rev-file 中有非法修改行" -#: ../libsvn_fs_fs/fs_fs.c:4009 +#: ../libsvn_fs_fs/fs_fs.c:3936 msgid "Invalid change kind in rev file" msgstr "rev 文件中有无效的改变种类" -#: ../libsvn_fs_fs/fs_fs.c:4029 +#: ../libsvn_fs_fs/fs_fs.c:3956 msgid "Invalid text-mod flag in rev-file" msgstr "rev-file 中有无效的 text-mod 标志" -#: ../libsvn_fs_fs/fs_fs.c:4049 +#: ../libsvn_fs_fs/fs_fs.c:3976 msgid "Invalid prop-mod flag in rev-file" msgstr "rev-file 中有无效的 prop-mod 标志" -#: ../libsvn_fs_fs/fs_fs.c:4227 +#: ../libsvn_fs_fs/fs_fs.c:4154 msgid "Copying from transactions not allowed" msgstr "不允许从事务复制" -#: ../libsvn_fs_fs/fs_fs.c:4382 +#: ../libsvn_fs_fs/fs_fs.c:4309 #, c-format msgid "Unable to create transaction directory in '%s' for revision %ld" msgstr "无法在“%s”中为版本 %ld 创建事务目录" -#: ../libsvn_fs_fs/fs_fs.c:4598 ../libsvn_fs_fs/fs_fs.c:4605 +#: ../libsvn_fs_fs/fs_fs.c:4525 ../libsvn_fs_fs/fs_fs.c:4532 msgid "next-id file corrupt" msgstr "next-id 文件损坏" -#: ../libsvn_fs_fs/fs_fs.c:4716 +#: ../libsvn_fs_fs/fs_fs.c:4643 msgid "Transaction cleanup failed" msgstr "事务清理失败" -#: ../libsvn_fs_fs/fs_fs.c:4829 +#: ../libsvn_fs_fs/fs_fs.c:4756 msgid "Invalid change type" msgstr "无效的修改类型" -#: ../libsvn_fs_fs/fs_fs.c:5184 +#: ../libsvn_fs_fs/fs_fs.c:5111 msgid "Can't set text contents of a directory" msgstr "无法设定目录的文本内容" -#: ../libsvn_fs_fs/fs_fs.c:5268 ../libsvn_fs_fs/fs_fs.c:5273 -#: ../libsvn_fs_fs/fs_fs.c:5280 +#: ../libsvn_fs_fs/fs_fs.c:5195 ../libsvn_fs_fs/fs_fs.c:5200 +#: ../libsvn_fs_fs/fs_fs.c:5207 msgid "Corrupt current file" msgstr "当前文件损坏" @@ -3139,56 +3139,56 @@ msgid "Truncated protorev file detected" msgstr "" -#: ../libsvn_fs_fs/fs_fs.c:5614 ../libsvn_subr/io.c:3202 ../svn/util.c:406 -#: ../svn/util.c:421 ../svn/util.c:455 +#: ../libsvn_fs_fs/fs_fs.c:5522 ../libsvn_subr/io.c:2896 ../svn/util.c:406 +#: ../svn/util.c:421 ../svn/util.c:445 #, c-format msgid "Can't stat '%s'" msgstr "不能取得“%s”的状态" -#: ../libsvn_fs_fs/fs_fs.c:5618 +#: ../libsvn_fs_fs/fs_fs.c:5526 #, c-format msgid "Can't chmod '%s'" msgstr "无法修改“%s”的存取权限" -#: ../libsvn_fs_fs/fs_fs.c:5796 +#: ../libsvn_fs_fs/fs_fs.c:5704 msgid "Transaction out of date" msgstr "事务过时" -#: ../libsvn_fs_fs/fs_fs.c:6309 +#: ../libsvn_fs_fs/fs_fs.c:6208 msgid "Recovery encountered a non-directory node" msgstr "修复时遇到非目录节点" -#: ../libsvn_fs_fs/fs_fs.c:6331 +#: ../libsvn_fs_fs/fs_fs.c:6230 msgid "Recovery encountered a deltified directory representation" msgstr "修复时遇到差异目录表示" -#: ../libsvn_fs_fs/fs_fs.c:6476 +#: ../libsvn_fs_fs/fs_fs.c:6375 #, c-format msgid "Expected current rev to be <= %ld but found %ld" msgstr "期望当前版本 <= %ld,但它是 %ld" -#: ../libsvn_fs_fs/fs_fs.c:6527 +#: ../libsvn_fs_fs/fs_fs.c:6426 #, c-format msgid "Revision %ld has a revs file but no revprops file" msgstr "版本 %ld 有版本文件,但是没有版本属性文件" -#: ../libsvn_fs_fs/fs_fs.c:6532 +#: ../libsvn_fs_fs/fs_fs.c:6431 #, c-format msgid "Revision %ld has a non-file where its revprops file should be" msgstr "版本 %ld 有非文件项目,与其属性文件的记录矛盾" -#: ../libsvn_fs_fs/fs_fs.c:6709 +#: ../libsvn_fs_fs/fs_fs.c:6608 #, 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:6818 +#: ../libsvn_fs_fs/fs_fs.c:6717 msgid "No such transaction" msgstr "无此事务" -#: ../libsvn_fs_fs/fs_fs.c:7163 +#: ../libsvn_fs_fs/fs_fs.c:7060 msgid "FS format too old to pack, please upgrade." msgstr "要打包的文件系统格式太旧,请升级。" @@ -3202,17 +3202,17 @@ msgid "Can't parse lock/entries hashfile '%s'" msgstr "不能解析锁/条目的哈希文件“%s“" -#: ../libsvn_fs_fs/lock.c:681 ../libsvn_fs_fs/lock.c:702 +#: ../libsvn_fs_fs/lock.c:685 ../libsvn_fs_fs/lock.c:706 #, c-format msgid "Path '%s' doesn't exist in HEAD revision" msgstr "HEAD中没有路径“%s”" -#: ../libsvn_fs_fs/lock.c:707 +#: ../libsvn_fs_fs/lock.c:711 #, c-format msgid "Lock failed: newer version of '%s' exists" msgstr "加锁失败: “%s”的新版本已经存在" -#: ../libsvn_fs_fs/rep-cache.c:107 ../libsvn_fs_fs/rep-cache.c:167 +#: ../libsvn_fs_fs/rep-cache.c:106 ../libsvn_fs_fs/rep-cache.c:146 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" msgstr "在表 rep_cache 中,只有 SHA1 校验和才能用作键。\n" @@ -3221,7 +3221,7 @@ msgid "Youngest revision is r%ld, but rep-cache contains r%ld" msgstr "" -#: ../libsvn_fs_fs/rep-cache.c:184 +#: ../libsvn_fs_fs/rep-cache.c:163 #, c-format msgid "" "Representation key for checksum '%%s' exists in filesystem '%%s' with a " @@ -3291,8 +3291,8 @@ 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:362 ../libsvn_ra_serf/serf.c:506 -#: ../libsvn_ra_serf/serf.c:620 +#: ../libsvn_ra/ra_loader.c:362 ../libsvn_ra_serf/serf.c:490 +#: ../libsvn_ra_serf/serf.c:604 #, c-format msgid "Illegal repository URL '%s'" msgstr "非法版本库 URL “%s”" @@ -3342,8 +3342,8 @@ 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:1394 ../libsvn_ra_neon/options.c:388 -#: ../libsvn_ra_serf/serf.c:304 ../libsvn_ra_svn/client.c:2332 +#: ../libsvn_ra_local/ra_plugin.c:1394 ../libsvn_ra_neon/options.c:372 +#: ../libsvn_ra_serf/serf.c:288 ../libsvn_ra_svn/client.c:2332 #, c-format msgid "Don't know anything about capability '%s'" msgstr "不知道特性 “%s” 的任何信息" @@ -3389,13 +3389,13 @@ msgstr "检出(CHECKOUT)响应没有包含“Location:”头信息" #: ../libsvn_ra_neon/commit.c:519 ../libsvn_ra_neon/props.c:210 -#: ../libsvn_ra_neon/util.c:521 ../libsvn_ra_serf/commit.c:1270 -#: ../libsvn_ra_serf/commit.c:1682 ../libsvn_ra_serf/update.c:2050 +#: ../libsvn_ra_neon/util.c:521 ../libsvn_ra_serf/commit.c:1264 +#: ../libsvn_ra_serf/commit.c:1676 ../libsvn_ra_serf/update.c:2037 #, c-format msgid "Unable to parse URL '%s'" msgstr "不能解析 URL “%s”" -#: ../libsvn_ra_neon/commit.c:1047 ../libsvn_ra_serf/commit.c:1521 +#: ../libsvn_ra_neon/commit.c:1047 ../libsvn_ra_serf/commit.c:1515 #, c-format msgid "File '%s' already exists" msgstr "文件“%s”已存在" @@ -3432,7 +3432,7 @@ msgid "Server response missing the expected deadprop-count property" msgstr "服务器响应丢失了期望的 deadprop-count 属性" -#: ../libsvn_ra_neon/fetch.c:1168 ../libsvn_ra_serf/commit.c:2061 +#: ../libsvn_ra_neon/fetch.c:1168 ../libsvn_ra_serf/commit.c:2049 msgid "" "DAV request failed; it's possible that the repository's pre-revprop-change " "hook either failed or is non-existent" @@ -3443,12 +3443,12 @@ msgid "Missing rev attr in target-revision element" msgstr "元素 target-revision 没有 rev 属性" -#: ../libsvn_ra_neon/fetch.c:1422 ../libsvn_ra_serf/update.c:1471 +#: ../libsvn_ra_neon/fetch.c:1422 ../libsvn_ra_serf/update.c:1460 #, c-format msgid "Missing name attr in absent-directory element" msgstr "元素 absent-directory 没有 name 属性" -#: ../libsvn_ra_neon/fetch.c:1438 ../libsvn_ra_serf/update.c:1494 +#: ../libsvn_ra_neon/fetch.c:1438 ../libsvn_ra_serf/update.c:1483 #, c-format msgid "Missing name attr in absent-file element" msgstr "元素 absent-file 没有 name 属性" @@ -3464,13 +3464,13 @@ msgstr "元素 open-directory 没有 rev 属性" #: ../libsvn_ra_neon/fetch.c:1493 ../libsvn_ra_serf/replay.c:261 -#: ../libsvn_ra_serf/update.c:1300 +#: ../libsvn_ra_serf/update.c:1289 #, c-format msgid "Missing name attr in open-directory element" msgstr "元素 open-directory 没有 name 属性" #: ../libsvn_ra_neon/fetch.c:1520 ../libsvn_ra_serf/replay.c:287 -#: ../libsvn_ra_serf/update.c:1335 +#: ../libsvn_ra_serf/update.c:1324 #, c-format msgid "Missing name attr in add-directory element" msgstr "元素 add-directory 没有 name 属性" @@ -3486,13 +3486,13 @@ msgstr "元素 open-file 没有 rev 属性" #: ../libsvn_ra_neon/fetch.c:1617 ../libsvn_ra_serf/replay.c:322 -#: ../libsvn_ra_serf/update.c:1375 +#: ../libsvn_ra_serf/update.c:1364 #, c-format msgid "Missing name attr in open-file element" msgstr "元素 open-file 没有 name 属性" #: ../libsvn_ra_neon/fetch.c:1643 ../libsvn_ra_serf/replay.c:348 -#: ../libsvn_ra_serf/update.c:1410 +#: ../libsvn_ra_serf/update.c:1399 #, c-format msgid "Missing name attr in add-file element" msgstr "元素 add-file 没有 name 属性" @@ -3502,33 +3502,33 @@ msgid "Missing copyfrom-rev attr in add-file element" msgstr "元素 add-file 没有 copyfrom-rev 属性" -#: ../libsvn_ra_neon/fetch.c:1713 +#: ../libsvn_ra_neon/fetch.c:1711 #, c-format msgid "Missing name attr in set-prop element" msgstr "元素 set-pro 没有 name 属性" -#: ../libsvn_ra_neon/fetch.c:1727 +#: ../libsvn_ra_neon/fetch.c:1725 #, c-format msgid "Missing name attr in remove-prop element" msgstr "元素 remove-prop 没有 name 属性" -#: ../libsvn_ra_neon/fetch.c:1801 ../libsvn_ra_serf/replay.c:235 -#: ../libsvn_ra_serf/update.c:1440 +#: ../libsvn_ra_neon/fetch.c:1799 ../libsvn_ra_serf/replay.c:235 +#: ../libsvn_ra_serf/update.c:1429 #, c-format msgid "Missing name attr in delete-entry element" msgstr "元素 delete-entry 没有 attr 属性" -#: ../libsvn_ra_neon/fetch.c:1963 +#: ../libsvn_ra_neon/fetch.c:1961 #, c-format msgid "Error writing to '%s': unexpected EOF" msgstr "写入 “%s” 时出错: 意外的 EOF" -#: ../libsvn_ra_neon/fetch.c:2110 +#: ../libsvn_ra_neon/fetch.c:2108 #, c-format msgid "Unknown XML encoding: '%s'" msgstr "未知的 XML 编码: “%s”" -#: ../libsvn_ra_neon/fetch.c:2411 +#: ../libsvn_ra_neon/fetch.c:2409 #, c-format msgid "REPORT response handling failed to complete the editor drive" msgstr "处理报告响应失败,不能完成编辑" @@ -3571,7 +3571,7 @@ msgstr "返回了不完全的锁数据" #: ../libsvn_ra_neon/get_locks.c:297 ../libsvn_ra_serf/property.c:355 -#: ../libsvn_ra_serf/update.c:1929 +#: ../libsvn_ra_serf/update.c:1916 #, c-format msgid "Got unrecognized encoding '%s'" msgstr "得到不能识别的编码“%s”" @@ -3643,23 +3643,23 @@ msgid "The MERGE property response had an error status" msgstr "MERGE 属性响应包含错误状态" -#: ../libsvn_ra_neon/options.c:247 ../libsvn_ra_neon/util.c:1263 +#: ../libsvn_ra_neon/options.c:231 ../libsvn_ra_neon/util.c:1259 #, c-format msgid "The %s request returned invalid XML in the response: %s (%s)" msgstr "%s 请求的响应返回无效 XML: %s (%s)" -#: ../libsvn_ra_neon/options.c:258 +#: ../libsvn_ra_neon/options.c:242 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_neon/options.c:371 ../libsvn_ra_serf/serf.c:287 +#: ../libsvn_ra_neon/options.c:355 ../libsvn_ra_serf/serf.c:271 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" msgstr "不知道如何处理“%s”,对于特性“%s”" -#: ../libsvn_ra_neon/options.c:395 ../libsvn_ra_serf/serf.c:311 +#: ../libsvn_ra_neon/options.c:379 ../libsvn_ra_serf/serf.c:295 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "试图取得特性 “%s” 导致 “%s”" @@ -3736,15 +3736,15 @@ msgid "PIN for token \"%s\" in slot \"%s\"" msgstr "钉住令牌“%s”于通道“%s”" -#: ../libsvn_ra_neon/session.c:535 ../libsvn_ra_serf/serf.c:433 +#: ../libsvn_ra_neon/session.c:535 ../libsvn_ra_serf/serf.c:417 msgid "Invalid URL: illegal character in proxy port number" msgstr "无效URL: 代理端口中有非法字符" -#: ../libsvn_ra_neon/session.c:539 ../libsvn_ra_serf/serf.c:437 +#: ../libsvn_ra_neon/session.c:539 ../libsvn_ra_serf/serf.c:421 msgid "Invalid URL: negative proxy port number" msgstr "无效URL: 负的代理端口" -#: ../libsvn_ra_neon/session.c:542 ../libsvn_ra_serf/serf.c:440 +#: ../libsvn_ra_neon/session.c:542 ../libsvn_ra_serf/serf.c:424 msgid "" "Invalid URL: proxy port number greater than maximum TCP port number 65535" msgstr "无效URL: 代理端口大于TCP通信端口最大值65535" @@ -3793,7 +3793,7 @@ msgid "Invalid config: unable to load PKCS#11 provider '%s'" msgstr "无效的配置: 无法加载 PKCS#11 提供者“%s”" -#: ../libsvn_ra_neon/session.c:1121 ../libsvn_ra_serf/serf.c:1112 +#: ../libsvn_ra_neon/session.c:1121 ../libsvn_ra_serf/serf.c:1096 msgid "The UUID property was not found on the resource or any of its parents" msgstr "无法在本资源或其任何父项目中找到UUID属性" @@ -3820,7 +3820,7 @@ msgid "%s of '%s'" msgstr "方法 %s 失败于 “%s”" -#: ../libsvn_ra_neon/util.c:547 ../libsvn_ra_serf/util.c:1534 +#: ../libsvn_ra_neon/util.c:547 ../libsvn_ra_serf/util.c:1499 #, c-format msgid "'%s' path not found" msgstr "找不到路径 “%s”" @@ -3830,46 +3830,46 @@ msgid "access to '%s' forbidden" msgstr "禁止访问“%s”" -#: ../libsvn_ra_neon/util.c:560 ../libsvn_ra_serf/util.c:1528 +#: ../libsvn_ra_neon/util.c:556 ../libsvn_ra_serf/util.c:1493 #, c-format msgid "Repository moved permanently to '%s'; please relocate" msgstr "版本库永久移到 “%s”;请重新定位。" -#: ../libsvn_ra_neon/util.c:562 ../libsvn_ra_serf/util.c:1530 +#: ../libsvn_ra_neon/util.c:558 ../libsvn_ra_serf/util.c:1495 #, c-format msgid "Repository moved temporarily to '%s'; please relocate" msgstr "版本库临时移到‘%s’;请重新定位。" -#: ../libsvn_ra_neon/util.c:570 +#: ../libsvn_ra_neon/util.c:566 #, c-format msgid "" "Server sent unexpected return value (%d %s) in response to %s request for " "'%s'" msgstr "服务器发送了意外的返回值(%d %s),在响应 “%s” 的请求 “%s” 中" -#: ../libsvn_ra_neon/util.c:582 +#: ../libsvn_ra_neon/util.c:578 #, c-format msgid "authorization failed: %s" msgstr "认证失败: %s" -#: ../libsvn_ra_neon/util.c:584 +#: ../libsvn_ra_neon/util.c:580 msgid "authorization failed" msgstr "认证失败" -#: ../libsvn_ra_neon/util.c:589 +#: ../libsvn_ra_neon/util.c:585 msgid "could not connect to server" msgstr "无法连接到服务器" -#: ../libsvn_ra_neon/util.c:593 +#: ../libsvn_ra_neon/util.c:589 msgid "timed out waiting for server" msgstr "等待服务器超时" -#: ../libsvn_ra_neon/util.c:926 +#: ../libsvn_ra_neon/util.c:922 #, c-format msgid "Can't calculate the request body size" msgstr "无法计算请求主体大小" -#: ../libsvn_ra_neon/util.c:1253 +#: ../libsvn_ra_neon/util.c:1249 #, c-format msgid "Error reading spooled %s request response" msgstr "读取请求 %s 响应的脱机数据时出现错误" @@ -3883,7 +3883,7 @@ msgid "Directory '%s' is out of date; try updating" msgstr "目录 “%s” 已经过时;请先更新" -#: ../libsvn_ra_serf/commit.c:512 ../libsvn_repos/commit.c:390 +#: ../libsvn_ra_serf/commit.c:512 ../libsvn_repos/commit.c:388 #, c-format msgid "Path '%s' not present" msgstr "路径 “%s” 不存在" @@ -3909,13 +3909,13 @@ msgid "%s of '%s': %d %s (%s://%s)" msgstr "%s 于 '%s': %d %s (%s://%s)" -#: ../libsvn_ra_serf/commit.c:1290 ../libsvn_ra_serf/commit.c:1702 +#: ../libsvn_ra_serf/commit.c:1284 ../libsvn_ra_serf/commit.c:1696 #: ../libsvn_ra_serf/property.c:984 msgid "" "The OPTIONS response did not include the requested baseline-collection value" msgstr "OPTIONS 响应中没有包含请求的 baseline-collection 值。" -#: ../libsvn_ra_serf/commit.c:1316 +#: ../libsvn_ra_serf/commit.c:1310 #, c-format msgid "Adding a directory failed: %s on %s (%d)" msgstr "增加目录失败: “%s” 于 “%s”(%d)" @@ -3939,8 +3939,8 @@ msgid "Unlock request failed: %d %s" msgstr "解锁请求失败: %d %s" -#: ../libsvn_ra_serf/property.c:970 ../libsvn_ra_serf/update.c:1142 -#: ../libsvn_ra_serf/update.c:1692 +#: ../libsvn_ra_serf/property.c:970 ../libsvn_ra_serf/update.c:1131 +#: ../libsvn_ra_serf/update.c:1679 msgid "The OPTIONS response did not include the requested checked-in value" msgstr "OPTIONS 响应中没有包含请求的 checked-in 值。" @@ -3948,7 +3948,7 @@ msgid "The OPTIONS response did not include the requested version-name value" msgstr "OPTIONS 响应中没有包含请求的 version-name 值。" -#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1237 +#: ../libsvn_ra_serf/replay.c:198 ../libsvn_ra_serf/update.c:1226 msgid "Missing revision attr in target-revision element" msgstr "元素“target-revision没有revision属性" @@ -3960,17 +3960,17 @@ msgid "Missing revision attr in delete-entry element" msgstr "delete-entry元素没有revision属性" -#: ../libsvn_ra_serf/replay.c:267 ../libsvn_ra_serf/update.c:1255 -#: ../libsvn_ra_serf/update.c:1291 +#: ../libsvn_ra_serf/replay.c:267 ../libsvn_ra_serf/update.c:1244 +#: ../libsvn_ra_serf/update.c:1280 msgid "Missing revision attr in open-directory element" msgstr "open-directory元素没有revision属性" -#: ../libsvn_ra_serf/replay.c:328 ../libsvn_ra_serf/update.c:1384 +#: ../libsvn_ra_serf/replay.c:328 ../libsvn_ra_serf/update.c:1373 msgid "Missing revision attr in open-file element" msgstr "open-file元素没有revision属性" -#: ../libsvn_ra_serf/replay.c:415 ../libsvn_ra_serf/update.c:1530 -#: ../libsvn_ra_serf/update.c:1612 +#: ../libsvn_ra_serf/replay.c:415 ../libsvn_ra_serf/update.c:1519 +#: ../libsvn_ra_serf/update.c:1601 #, c-format msgid "Missing name attr in %s element" msgstr "元素“%s”没有name属性" @@ -3980,50 +3980,50 @@ msgid "Error retrieving replay REPORT (%d)" msgstr "获取重放报告出错(%d)" -#: ../libsvn_ra_serf/serf.c:327 +#: ../libsvn_ra_serf/serf.c:311 msgid "Module for accessing a repository via WebDAV protocol using serf." msgstr "通过 WebDAV 协议使用 serf 访问版本库的模块。" -#: ../libsvn_ra_serf/serf.c:550 +#: ../libsvn_ra_serf/serf.c:534 #, c-format msgid "Could not lookup hostname `%s'" msgstr "无法解析主机 “%s” 的地址" -#: ../libsvn_ra_serf/serf.c:799 +#: ../libsvn_ra_serf/serf.c:783 msgid "The OPTIONS response did not include the requested resourcetype value" msgstr "OPTIONS 响应中没有包含请求的 resourcetype 值。" -#: ../libsvn_ra_serf/serf.c:963 +#: ../libsvn_ra_serf/serf.c:947 msgid "" "The PROPFIND response did not include the requested resourcetype value" msgstr "PROPFIND 响应中没有包含请求的 resourcetype 值" -#: ../libsvn_ra_serf/serf.c:1181 +#: ../libsvn_ra_serf/serf.c:1165 #, c-format msgid "Unsupported RA loader version (%d) for ra_serf" msgstr "不支持的 ra_serf RA 加载器版本(%d)" -#: ../libsvn_ra_serf/update.c:829 +#: ../libsvn_ra_serf/update.c:820 #, c-format msgid "GET request failed: %d %s" msgstr "GET 请求失败: %d %s" -#: ../libsvn_ra_serf/update.c:2164 ../libsvn_ra_serf/util.c:1464 +#: ../libsvn_ra_serf/update.c:2151 ../libsvn_ra_serf/util.c:1429 msgid "" "The OPTIONS response did not include the requested version-controlled-" "configuration value" msgstr "OPTIONS 响应中没有包含请求的 version-controlled-configuration 值。" -#: ../libsvn_ra_serf/update.c:2219 +#: ../libsvn_ra_serf/update.c:2206 #, c-format msgid "Error retrieving REPORT (%d)" msgstr "获取报告出错(%d)" -#: ../libsvn_ra_serf/util.c:1193 +#: ../libsvn_ra_serf/util.c:1158 msgid "Premature EOF seen from server" msgstr "从服务器发现 EOF 太早" -#: ../libsvn_ra_serf/util.c:1246 +#: ../libsvn_ra_serf/util.c:1211 msgid "Unspecified error message" msgstr "未指明的错误信息" @@ -4279,7 +4279,7 @@ msgid "Command 'finish-replay' invalid outside of replays" msgstr "finish-replay命令只在重放时有效" -#: ../libsvn_ra_svn/editorp.c:888 ../libsvn_ra_svn/marshal.c:962 +#: ../libsvn_ra_svn/editorp.c:888 ../libsvn_ra_svn/marshal.c:932 #, c-format msgid "Unknown command '%s'" msgstr "未知命令: “%s”" @@ -4309,15 +4309,15 @@ msgid "Proplist element not a list" msgstr "Proplist 元素不是列表" -#: ../libsvn_ra_svn/marshal.c:856 +#: ../libsvn_ra_svn/marshal.c:841 msgid "Empty error list" msgstr "错误列表为空" -#: ../libsvn_ra_svn/marshal.c:865 ../libsvn_ra_svn/marshal.c:891 +#: ../libsvn_ra_svn/marshal.c:850 msgid "Malformed error list" msgstr "错误列表非法" -#: ../libsvn_ra_svn/marshal.c:919 +#: ../libsvn_ra_svn/marshal.c:889 #, c-format msgid "Unknown status '%s' in command response" msgstr "命令响应中的状态 “%s” 未知" @@ -4337,17 +4337,17 @@ msgid "Can't get socket timeout" msgstr "无法获得 socket 超时" -#: ../libsvn_repos/commit.c:131 +#: ../libsvn_repos/commit.c:129 #, c-format msgid "'%s' is out of date" msgstr "“%s” 已经过时" -#: ../libsvn_repos/commit.c:298 ../libsvn_repos/commit.c:443 +#: ../libsvn_repos/commit.c:296 ../libsvn_repos/commit.c:441 #, c-format msgid "Got source path but no source revision for '%s'" msgstr "获得源路径,但“%s”没有源版本" -#: ../libsvn_repos/commit.c:330 ../libsvn_repos/commit.c:474 +#: ../libsvn_repos/commit.c:328 ../libsvn_repos/commit.c:472 #, c-format msgid "Source url '%s' is from different repository" msgstr "源 URL “%s” 来自其它版本库" @@ -4364,7 +4364,7 @@ msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" msgstr "" -#: ../libsvn_repos/commit.c:636 +#: ../libsvn_repos/commit.c:599 #, c-format msgid "" "Checksum mismatch for resulting fulltext\n" @@ -4455,38 +4455,38 @@ msgid "Unexpected node kind %d for '%s'" msgstr "意外发现节点种类 %d 于“%s”" -#: ../libsvn_repos/fs-wrap.c:62 ../libsvn_repos/load.c:1366 +#: ../libsvn_repos/fs-wrap.c:59 ../libsvn_repos/load.c:1358 msgid "Commit succeeded, but post-commit hook failed" msgstr "提交成功,但是后置提交钩子(post-commit)失败" -#: ../libsvn_repos/fs-wrap.c:170 +#: ../libsvn_repos/fs-wrap.c:166 #, 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:185 +#: ../libsvn_repos/fs-wrap.c:181 #, c-format msgid "Cannot accept '%s' property because it is not encoded in UTF-8" msgstr "不能接受属性 “%s”,因为它的编码不是 UTF-8" -#: ../libsvn_repos/fs-wrap.c:195 +#: ../libsvn_repos/fs-wrap.c:191 #, c-format msgid "Cannot accept non-LF line endings in '%s' property" msgstr "不能接受属性 “%s” 的非 LF 行结束符" -#: ../libsvn_repos/fs-wrap.c:310 +#: ../libsvn_repos/fs-wrap.c:306 #, c-format msgid "Write denied: not authorized to read all of revision %ld" msgstr "拒绝写入: 未授权读取版本 %ld 的所有数据。" -#: ../libsvn_repos/fs-wrap.c:487 +#: ../libsvn_repos/fs-wrap.c:483 #, c-format msgid "Cannot unlock path '%s', no authenticated username available" msgstr "不能解除路径“%s”的锁定,没有可用的已授权用户名" -#: ../libsvn_repos/fs-wrap.c:502 +#: ../libsvn_repos/fs-wrap.c:498 msgid "Unlock succeeded, but post-unlock hook failed" msgstr "解锁成功,但是后置解锁钩子(post-unlock)失败" @@ -4618,38 +4618,38 @@ msgid "Incomplete or unterminated property block" msgstr "不完整或未结束的属性块" -#: ../libsvn_repos/load.c:489 +#: ../libsvn_repos/load.c:520 msgid "Unexpected EOF writing contents" msgstr "写内容时意外结束" -#: ../libsvn_repos/load.c:518 +#: ../libsvn_repos/load.c:549 msgid "Malformed dumpfile header" msgstr "非法的转存文件头" -#: ../libsvn_repos/load.c:524 ../libsvn_repos/load.c:566 +#: ../libsvn_repos/load.c:555 ../libsvn_repos/load.c:597 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "不支持的转存文件版本: %d" -#: ../libsvn_repos/load.c:669 +#: ../libsvn_repos/load.c:700 msgid "Unrecognized record type in stream" msgstr "流中有无法识别的记录类型" -#: ../libsvn_repos/load.c:782 +#: ../libsvn_repos/load.c:813 msgid "Sum of subblock sizes larger than total block content length" msgstr "子块大小之和大于块内容长度" -#: ../libsvn_repos/load.c:962 +#: ../libsvn_repos/load.c:993 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< 开始新的事务,基于原始版本 %ld\n" -#: ../libsvn_repos/load.c:1007 +#: ../libsvn_repos/load.c:1038 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "当前版本库不存在相对源版本 %ld" -#: ../libsvn_repos/load.c:1022 +#: ../libsvn_repos/load.c:1053 #, c-format msgid "" "Copy source checksum mismatch on copy from '%s'@%ld\n" @@ -4661,45 +4661,45 @@ " 期望: %s\n" " 实际: %s\n" -#: ../libsvn_repos/load.c:1076 +#: ../libsvn_repos/load.c:1107 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "非法的转存流: 版本 0 不能包含节点记录" -#: ../libsvn_repos/load.c:1086 +#: ../libsvn_repos/load.c:1117 #, c-format msgid " * editing path : %s ..." msgstr " * 正在修改路径: %s ..." -#: ../libsvn_repos/load.c:1093 +#: ../libsvn_repos/load.c:1124 #, c-format msgid " * deleting path : %s ..." msgstr " * 正在删除路径: %s ..." -#: ../libsvn_repos/load.c:1101 +#: ../libsvn_repos/load.c:1132 #, c-format msgid " * adding path : %s ..." msgstr " * 正在增加路径: %s ..." -#: ../libsvn_repos/load.c:1110 +#: ../libsvn_repos/load.c:1141 #, c-format msgid " * replacing path : %s ..." msgstr " * 正在替换路径: %s ..." -#: ../libsvn_repos/load.c:1120 +#: ../libsvn_repos/load.c:1151 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "节点“%s”的动作不能识别" -#: ../libsvn_repos/load.c:1198 +#: ../libsvn_repos/load.c:411 #, c-format msgid " removing '\\r' from %s ..." msgstr " 正在从 '%s' 删除 '\\r' ..." -#: ../libsvn_repos/load.c:1304 +#: ../libsvn_repos/load.c:1307 msgid " done.\n" msgstr " 完成。\n" -#: ../libsvn_repos/load.c:1390 +#: ../libsvn_repos/load.c:1382 #, c-format msgid "" "\n" @@ -4710,7 +4710,7 @@ "------- 提交后版本 %ld >>>\n" "\n" -#: ../libsvn_repos/load.c:1396 +#: ../libsvn_repos/load.c:1388 #, c-format msgid "" "\n" @@ -4726,7 +4726,7 @@ msgid "'%s' not found in filesystem" msgstr "在文件系统中找不到“%s”" -#: ../libsvn_repos/replay.c:426 +#: ../libsvn_repos/replay.c:383 #, c-format msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "文件系统中路径“%s”既不是文件也不是目录" @@ -4746,37 +4746,37 @@ msgid "Working copy path '%s' does not exist in repository" msgstr "工作副本路径“%s”不在版本库中" -#: ../libsvn_repos/reporter.c:1159 +#: ../libsvn_repos/reporter.c:1144 msgid "Not authorized to open root of edit operation" msgstr "无权打开根进行编辑操作" -#: ../libsvn_repos/reporter.c:1176 +#: ../libsvn_repos/reporter.c:1161 #, c-format msgid "Target path '%s' does not exist" msgstr "目标路径 “%s” 不存在" -#: ../libsvn_repos/reporter.c:1184 +#: ../libsvn_repos/reporter.c:1169 msgid "Cannot replace a directory from within" msgstr "不能在子目录中替换目录" -#: ../libsvn_repos/reporter.c:1227 +#: ../libsvn_repos/reporter.c:1212 msgid "Invalid report for top level of working copy" msgstr "最上层工作副本报告无效" -#: ../libsvn_repos/reporter.c:1242 +#: ../libsvn_repos/reporter.c:1227 msgid "Two top-level reports with no target" msgstr "两个最上层报告没有目标" -#: ../libsvn_repos/reporter.c:1300 +#: ../libsvn_repos/reporter.c:1285 #, c-format msgid "Unsupported report depth '%s'" msgstr "不支持报告深度“%s”" -#: ../libsvn_repos/reporter.c:1328 +#: ../libsvn_repos/reporter.c:1313 msgid "Depth 'exclude' not supported for link" msgstr "深度 “exclude” 不支持链接" -#: ../libsvn_repos/reporter.c:1388 +#: ../libsvn_repos/reporter.c:1373 msgid "Request depth 'exclude' not supported" msgstr "不支持请求的深度 “exclude”" @@ -4882,7 +4882,7 @@ msgid "Unreadable path encountered; access denied" msgstr "遇到不可读的路径;拒绝访问。" -#: ../libsvn_repos/rev_hunt.c:1132 +#: ../libsvn_repos/rev_hunt.c:1101 #, c-format msgid "'%s' is not a file in revision %ld" msgstr "“%s” 不是文件,版本 %ld" @@ -5025,7 +5025,7 @@ "“%s”: 未知命令。\n" "\n" -#: ../libsvn_subr/deprecated.c:544 ../libsvn_subr/opt.c:1019 +#: ../libsvn_subr/deprecated.c:544 ../libsvn_subr/opt.c:1025 #, c-format msgid "Type '%s help' for usage.\n" msgstr "使用“%s help”得到用法。\n" @@ -5050,41 +5050,41 @@ msgid "Can't ungrab DSO mutex" msgstr "不能释放 DSO 互斥体" -#: ../libsvn_subr/error.c:368 +#: ../libsvn_subr/error.c:360 msgid "Can't recode error string from APR" msgstr "无法重新编码 APR 的错误信息" -#: ../libsvn_subr/error.c:466 +#: ../libsvn_subr/error.c:458 #, c-format msgid "%swarning: %s\n" msgstr "%s 警告: %s\n" -#: ../libsvn_subr/error.c:522 +#: ../libsvn_subr/error.c:509 #, c-format msgid "In file '%s' line %d: assertion failed (%s)" msgstr "文件 “%s”,行 %d:断言失败(%s)" -#: ../libsvn_subr/error.c:526 +#: ../libsvn_subr/error.c:513 #, c-format msgid "In file '%s' line %d: internal malfunction" msgstr "文件 “%s” 行 %d:内部故障" -#: ../libsvn_subr/io.c:189 +#: ../libsvn_subr/io.c:160 #, c-format msgid "Error converting entry in directory '%s' to UTF-8" msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败" -#: ../libsvn_subr/io.c:256 +#: ../libsvn_subr/io.c:227 #, c-format msgid "Can't check path '%s'" msgstr "无法检查路径 “%s”" -#: ../libsvn_subr/io.c:462 ../libsvn_subr/io.c:601 +#: ../libsvn_subr/io.c:433 #, c-format msgid "Can't open '%s'" msgstr "不能打开 “%s”" -#: ../libsvn_subr/io.c:486 ../libsvn_subr/io.c:798 +#: ../libsvn_subr/io.c:457 ../libsvn_subr/io.c:556 #, c-format msgid "Unable to make name for '%s'" msgstr "不能为 “%s” 产生名字" @@ -5104,206 +5104,206 @@ msgid "Unable to make name in '%s'" msgstr "" -#: ../libsvn_subr/io.c:785 +#: ../libsvn_subr/io.c:543 #, c-format msgid "Can't create symbolic link '%s'" msgstr "无法创建符号连接 “%s”" -#: ../libsvn_subr/io.c:802 ../libsvn_subr/io.c:835 ../libsvn_subr/io.c:863 +#: ../libsvn_subr/io.c:560 ../libsvn_subr/io.c:593 ../libsvn_subr/io.c:621 msgid "Symbolic links are not supported on this platform" msgstr "此平台不支持符号链接" -#: ../libsvn_subr/io.c:825 +#: ../libsvn_subr/io.c:583 #, c-format msgid "Can't read contents of link" msgstr "不能读取链接的内容" -#: ../libsvn_subr/io.c:876 +#: ../libsvn_subr/io.c:634 #, c-format msgid "Can't find a temporary directory" msgstr "无法找到临时目录" -#: ../libsvn_subr/io.c:984 +#: ../libsvn_subr/io.c:742 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "不能复制 “%s” 到 “%s”" -#: ../libsvn_subr/io.c:1031 ../libsvn_subr/io.c:2096 +#: ../libsvn_subr/io.c:1790 #, c-format msgid "Can't get file name" msgstr "无法获取文件名" -#: ../libsvn_subr/io.c:1035 ../libsvn_subr/io.c:1074 +#: ../libsvn_subr/io.c:808 #, c-format msgid "Can't set permissions on '%s'" msgstr "不能在 “%s” 设置权限" -#: ../libsvn_subr/io.c:1096 +#: ../libsvn_subr/io.c:830 #, c-format msgid "Can't append '%s' to '%s'" msgstr "不能附加 “%s” 到 “%s”" -#: ../libsvn_subr/io.c:1130 +#: ../libsvn_subr/io.c:864 #, c-format msgid "Source '%s' is not a directory" msgstr "源 “%s” 不是目录" -#: ../libsvn_subr/io.c:1136 +#: ../libsvn_subr/io.c:870 #, c-format msgid "Destination '%s' is not a directory" msgstr "目的 “%s” 不是目录" -#: ../libsvn_subr/io.c:1142 +#: ../libsvn_subr/io.c:876 #, c-format msgid "Destination '%s' already exists" msgstr "目的 “%s” 已存在" -#: ../libsvn_subr/io.c:1211 ../libsvn_subr/io.c:2286 ../libsvn_subr/io.c:2338 +#: ../libsvn_subr/io.c:945 ../libsvn_subr/io.c:1980 ../libsvn_subr/io.c:2032 #, c-format msgid "Can't read directory '%s'" msgstr "无法读取目录 “%s”" -#: ../libsvn_subr/io.c:1216 ../libsvn_subr/io.c:2291 ../libsvn_subr/io.c:2343 -#: ../libsvn_subr/io.c:3542 +#: ../libsvn_subr/io.c:950 ../libsvn_subr/io.c:1985 ../libsvn_subr/io.c:2037 +#: ../libsvn_subr/io.c:3236 #, c-format msgid "Error closing directory '%s'" msgstr "关闭目录 “%s” 出错" -#: ../libsvn_subr/io.c:1244 +#: ../libsvn_subr/io.c:978 #, c-format msgid "Can't make directory '%s'" msgstr "无法创建目录 “%s”" -#: ../libsvn_subr/io.c:1308 +#: ../libsvn_subr/io.c:1042 #, c-format msgid "Can't set access time of '%s'" msgstr "不能设置 “%s” 的存取时间" -#: ../libsvn_subr/io.c:1585 ../libsvn_subr/io.c:1692 +#: ../libsvn_subr/io.c:1304 ../libsvn_subr/io.c:1402 #, c-format msgid "Can't change perms of file '%s'" msgstr "不能改变文件 “%s” 的权限" -#: ../libsvn_subr/io.c:1733 +#: ../libsvn_subr/io.c:1443 #, c-format msgid "Can't set file '%s' read-only" msgstr "无法设置文件 “%s” 只读" -#: ../libsvn_subr/io.c:1765 +#: ../libsvn_subr/io.c:1475 #, c-format msgid "Can't set file '%s' read-write" msgstr "无法设置文件 “%s” 可读写" -#: ../libsvn_subr/io.c:1809 +#: ../libsvn_subr/io.c:1519 #, c-format msgid "Error getting UID of process" msgstr "获取进程用户 ID(UID) 时出错" -#: ../libsvn_subr/io.c:1906 +#: ../libsvn_subr/io.c:1600 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "不能获取文件 “%s” 的共享锁" -#: ../libsvn_subr/io.c:1940 +#: ../libsvn_subr/io.c:1634 #, c-format msgid "Can't flush file '%s'" msgstr "不能刷新文件 “%s”" -#: ../libsvn_subr/io.c:1941 +#: ../libsvn_subr/io.c:1635 #, c-format msgid "Can't flush stream" msgstr "不能刷新流" -#: ../libsvn_subr/io.c:1953 ../libsvn_subr/io.c:1970 +#: ../libsvn_subr/io.c:1647 ../libsvn_subr/io.c:1664 #, c-format msgid "Can't flush file to disk" msgstr "不能刷新文件到磁盘" -#: ../libsvn_subr/io.c:2062 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:592 +#: ../libsvn_subr/io.c:1756 ../libsvn_subr/prompt.c:97 ../svnserve/main.c:592 #, c-format msgid "Can't open stdin" msgstr "无法打开标准输入" -#: ../libsvn_subr/io.c:2082 +#: ../libsvn_subr/io.c:1776 msgid "Reading from stdin is disallowed" msgstr "不接受从标准输入设备读取" -#: ../libsvn_subr/io.c:2153 +#: ../libsvn_subr/io.c:1847 #, c-format msgid "Can't remove file '%s'" msgstr "不能移动文件“%s”" -#: ../libsvn_subr/io.c:2242 +#: ../libsvn_subr/io.c:1936 #, c-format msgid "Can't remove '%s'" msgstr "无法删除“%s”" -#: ../libsvn_subr/io.c:2407 +#: ../libsvn_subr/io.c:2101 #, c-format msgid "Can't create process '%s' attributes" msgstr "无法创建进程“%s”的属性" -#: ../libsvn_subr/io.c:2413 +#: ../libsvn_subr/io.c:2107 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "无法设置进程“%s”的命令类型" -#: ../libsvn_subr/io.c:2425 +#: ../libsvn_subr/io.c:2119 #, c-format msgid "Can't set process '%s' directory" msgstr "无法设定进程“%s”的目录" -#: ../libsvn_subr/io.c:2438 +#: ../libsvn_subr/io.c:2132 #, c-format msgid "Can't set process '%s' child input" msgstr "无法设置“%s”的子进程输入文件" -#: ../libsvn_subr/io.c:2445 +#: ../libsvn_subr/io.c:2139 #, c-format msgid "Can't set process '%s' child outfile" msgstr "无法设置“%s”的子进程输出文件" -#: ../libsvn_subr/io.c:2452 +#: ../libsvn_subr/io.c:2146 #, c-format msgid "Can't set process '%s' child errfile" msgstr "无法设置“%s”的子进程错误输出文件" -#: ../libsvn_subr/io.c:2459 +#: ../libsvn_subr/io.c:2153 #, c-format msgid "Can't set process '%s' child errfile for error handler" msgstr "无法为错误处理函数设置“%s”的子进程错误输出文件" -#: ../libsvn_subr/io.c:2465 +#: ../libsvn_subr/io.c:2159 #, c-format msgid "Can't set process '%s' error handler" msgstr "无法设置进程“%s”的错误处理函数" -#: ../libsvn_subr/io.c:2487 +#: ../libsvn_subr/io.c:2181 #, c-format msgid "Can't start process '%s'" msgstr "不能取得进程“%s”状态" -#: ../libsvn_subr/io.c:2511 +#: ../libsvn_subr/io.c:2205 #, c-format msgid "Error waiting for process '%s'" msgstr "等待进程“%s”出错" -#: ../libsvn_subr/io.c:2519 +#: ../libsvn_subr/io.c:2213 #, c-format msgid "Process '%s' failed (exitwhy %d)" msgstr "进程“%s”失败(返回 %d)" -#: ../libsvn_subr/io.c:2526 +#: ../libsvn_subr/io.c:2220 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "进程“%s”返回错误退出码 %d" -#: ../libsvn_subr/io.c:2632 +#: ../libsvn_subr/io.c:2326 #, c-format msgid "'%s' returned %d" msgstr "“%s” 返回 %d" -#: ../libsvn_subr/io.c:2753 +#: ../libsvn_subr/io.c:2447 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -5318,131 +5318,131 @@ "%s\n" "%s" -#: ../libsvn_subr/io.c:2890 +#: ../libsvn_subr/io.c:2584 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "不能检测非文件的“%s”之MIME类型" -#: ../libsvn_subr/io.c:2967 +#: ../libsvn_subr/io.c:2661 #, c-format msgid "Can't open file '%s'" msgstr "不能打开文件“%s”" -#: ../libsvn_subr/io.c:3003 +#: ../libsvn_subr/io.c:2697 #, c-format msgid "Can't close file '%s'" msgstr "无法关闭文件“%s”" -#: ../libsvn_subr/io.c:3004 +#: ../libsvn_subr/io.c:2698 #, c-format msgid "Can't close stream" msgstr "无法关闭流" -#: ../libsvn_subr/io.c:3014 ../libsvn_subr/io.c:3038 ../libsvn_subr/io.c:3051 +#: ../libsvn_subr/io.c:2708 ../libsvn_subr/io.c:2732 ../libsvn_subr/io.c:2745 #, c-format msgid "Can't read file '%s'" msgstr "不能读取文件“%s”" -#: ../libsvn_subr/io.c:3015 ../libsvn_subr/io.c:3039 ../libsvn_subr/io.c:3052 +#: ../libsvn_subr/io.c:2709 ../libsvn_subr/io.c:2733 ../libsvn_subr/io.c:2746 #, c-format msgid "Can't read stream" msgstr "无法读取流" -#: ../libsvn_subr/io.c:3026 +#: ../libsvn_subr/io.c:2720 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "无法从文件“%s”获取属性信息" -#: ../libsvn_subr/io.c:3027 +#: ../libsvn_subr/io.c:2721 #, c-format msgid "Can't get attribute information from stream" msgstr "无法从流获取属性信息" -#: ../libsvn_subr/io.c:3063 +#: ../libsvn_subr/io.c:2757 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "无法在文件“%s”设置定位指针" -#: ../libsvn_subr/io.c:3064 +#: ../libsvn_subr/io.c:2758 #, c-format msgid "Can't set position pointer in stream" msgstr "无法在流中设置定位指针" -#: ../libsvn_subr/io.c:3075 ../libsvn_subr/io.c:3109 +#: ../libsvn_subr/io.c:2769 ../libsvn_subr/io.c:2803 #, c-format msgid "Can't write to file '%s'" msgstr "无法写入文件“%s”" -#: ../libsvn_subr/io.c:3076 ../libsvn_subr/io.c:3110 +#: ../libsvn_subr/io.c:2770 ../libsvn_subr/io.c:2804 #, c-format msgid "Can't write to stream" msgstr "无法写入流" -#: ../libsvn_subr/io.c:3138 +#: ../libsvn_subr/io.c:2832 #, c-format msgid "Can't truncate file '%s'" msgstr "不能截断文件 “%s”" -#: ../libsvn_subr/io.c:3139 +#: ../libsvn_subr/io.c:2833 #, c-format msgid "Can't truncate stream" msgstr "无法截断流" -#: ../libsvn_subr/io.c:3179 +#: ../libsvn_subr/io.c:2873 #, c-format msgid "Can't read length line in file '%s'" msgstr "不能从文件 “%s” 中读取长行" -#: ../libsvn_subr/io.c:3183 +#: ../libsvn_subr/io.c:2877 msgid "Can't read length line in stream" msgstr "无法从流中读取长行" -#: ../libsvn_subr/io.c:3237 +#: ../libsvn_subr/io.c:2931 #, c-format msgid "Can't move '%s' to '%s'" msgstr "不能移动 “%s” 到 “%s”" -#: ../libsvn_subr/io.c:3318 +#: ../libsvn_subr/io.c:3012 #, c-format msgid "Can't create directory '%s'" msgstr "无法创建目录 “%s”" -#: ../libsvn_subr/io.c:3329 ../libsvn_wc/copy.c:648 +#: ../libsvn_subr/io.c:3023 ../libsvn_wc/copy.c:648 #, c-format msgid "Can't hide directory '%s'" msgstr "无法隐藏目录 “%s”" -#: ../libsvn_subr/io.c:3389 ../libsvn_subr/io.c:3479 +#: ../libsvn_subr/io.c:3083 ../libsvn_subr/io.c:3173 #, c-format msgid "Can't open directory '%s'" msgstr "无法打开目录“%s”" -#: ../libsvn_subr/io.c:3407 +#: ../libsvn_subr/io.c:3101 #, c-format msgid "Can't remove directory '%s'" msgstr "无法删除目录 “%s”" -#: ../libsvn_subr/io.c:3425 +#: ../libsvn_subr/io.c:3119 #, c-format msgid "Can't read directory" msgstr "无法读取目录" -#: ../libsvn_subr/io.c:3498 +#: ../libsvn_subr/io.c:3192 #, c-format msgid "Can't read directory entry in '%s'" msgstr "无法在 “%s” 读取目录内容" -#: ../libsvn_subr/io.c:3623 +#: ../libsvn_subr/io.c:3317 #, c-format msgid "Can't check directory '%s'" msgstr "无法检查目录 “%s”" -#: ../libsvn_subr/io.c:3683 +#: ../libsvn_subr/io.c:3377 #, c-format msgid "Reading '%s'" msgstr "正在读取 “%s”" -#: ../libsvn_subr/io.c:3699 +#: ../libsvn_subr/io.c:3393 #, c-format msgid "First line of '%s' contains non-digit" msgstr "“%s” 的第一行包含了非数字" @@ -5512,19 +5512,19 @@ msgid "Could not parse mergeinfo string '%s'" msgstr "不能解析合并信息字符串“%s”" -#: ../libsvn_subr/mergeinfo.c:1844 +#: ../libsvn_subr/mergeinfo.c:1751 msgid "NULL mergeinfo catalog\n" msgstr "空值合并信息目录\n" -#: ../libsvn_subr/mergeinfo.c:1849 +#: ../libsvn_subr/mergeinfo.c:1756 msgid "empty mergeinfo catalog\n" msgstr "空合并信息目录\n" -#: ../libsvn_subr/mergeinfo.c:1882 +#: ../libsvn_subr/mergeinfo.c:1789 msgid "NULL mergeinfo\n" msgstr "空值合并信息\n" -#: ../libsvn_subr/mergeinfo.c:1887 +#: ../libsvn_subr/mergeinfo.c:1794 msgid "empty mergeinfo\n" msgstr "空合并信息\n" @@ -5574,17 +5574,17 @@ msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" msgstr "“%s” 是 peg 版本。或许你应该使用 “%s@” ?" -#: ../libsvn_subr/opt.c:910 +#: ../libsvn_subr/opt.c:916 #, c-format msgid "URL '%s' contains a '..' element" msgstr "URL“%s”包含“..”元素" -#: ../libsvn_subr/opt.c:943 +#: ../libsvn_subr/opt.c:949 #, c-format msgid "Error resolving case of '%s'" msgstr "解析“%s”出错" -#: ../libsvn_subr/opt.c:962 +#: ../libsvn_subr/opt.c:968 #, c-format msgid "" "%s, version %s\n" @@ -5821,7 +5821,7 @@ msgid "Expected SQLite database not found: %s" msgstr "未发现期待的 SQLite 数据库:%s" -#: ../libsvn_subr/subst.c:1426 ../libsvn_wc/props.c:2375 +#: ../libsvn_subr/subst.c:1426 ../libsvn_wc/props.c:2367 #, c-format msgid "File '%s' has inconsistent newlines" msgstr "文件 “%s” 内的换行符不一致" @@ -6478,7 +6478,7 @@ msgid "Error writing log for '%s'" msgstr "为 “%s” 写入日志出错" -#: ../libsvn_wc/log.c:2539 +#: ../libsvn_wc/log.c:2530 #, c-format msgid "'%s' is not a working copy directory" msgstr "“%s” 不是工作副本目录" @@ -6496,15 +6496,15 @@ msgid "Missing end of line in wcprops file for '%s'" msgstr "wcprops文件“%s”丢失了行结束符" -#: ../libsvn_wc/props.c:1274 +#: ../libsvn_wc/props.c:1273 msgid "Conflict callback violated API: returned no results." msgstr "冲突的回调函数违反 API:没有返回结果。" -#: ../libsvn_wc/props.c:1314 +#: ../libsvn_wc/props.c:1313 msgid "Conflict callback violated API: returned no merged file." msgstr "冲突的回调函数违反 API:没有返回合并文件。" -#: ../libsvn_wc/props.c:1409 +#: ../libsvn_wc/props.c:1407 #, c-format msgid "" "Trying to add new property '%s' with value '%s',\n" @@ -6513,28 +6513,28 @@ "试图增加新属性 “%s”,值为 “%s”,\n" "但是属性已经存在,值为 “%s”。" -#: ../libsvn_wc/props.c:1425 +#: ../libsvn_wc/props.c:1422 #, c-format msgid "" "Trying to create property '%s' with value '%s',\n" "but it has been locally deleted." msgstr "试图增加新属性 “%s”,值为 “%s”,但是它已经在本地被删除。" -#: ../libsvn_wc/props.c:1500 +#: ../libsvn_wc/props.c:1496 #, c-format msgid "" "Trying to delete property '%s' with value '%s'\n" "but it has been modified from '%s' to '%s'." msgstr "试图删除属性 “%s”,值为 “%s”,但是其值已经从 “%s” 改为 “%s”。" -#: ../libsvn_wc/props.c:1522 +#: ../libsvn_wc/props.c:1517 #, c-format msgid "" "Trying to delete property '%s' with value '%s'\n" "but the local value is '%s'." msgstr "试图删除属性 “%s”,值为 “%s”,但是其本地取值为 “%s”。" -#: ../libsvn_wc/props.c:1596 ../libsvn_wc/props.c:1711 +#: ../libsvn_wc/props.c:1590 ../libsvn_wc/props.c:1704 #, c-format msgid "" "Trying to change property '%s' from '%s' to '%s',\n" @@ -6543,7 +6543,7 @@ "试图把属性 “%s” 的值从 “%s” 改为 “%s”,\n" "但是它已经在本地被删除。" -#: ../libsvn_wc/props.c:1690 +#: ../libsvn_wc/props.c:1683 #, c-format msgid "" "Trying to change property '%s' from '%s' to '%s',\n" @@ -6552,7 +6552,7 @@ "试图把属性“%s”的值从“%s”改为“%s”,\n" "但是属性的值已经是“%s”了。" -#: ../libsvn_wc/props.c:1696 +#: ../libsvn_wc/props.c:1689 #, c-format msgid "" "Trying to change property '%s' from '%s' to '%s',\n" @@ -6561,7 +6561,7 @@ "试图把属性 “%s” 的值从 “%s” 改为 “%s”,\n" "但是其本地取值已经从 “%s” 改为 “%s”。" -#: ../libsvn_wc/props.c:1704 +#: ../libsvn_wc/props.c:1697 #, c-format msgid "" "Trying to change property '%s' from '%s' to '%s',\n" @@ -6570,7 +6570,7 @@ "试图把属性 “%s” 的值从 “%s” 改为 “%s”,\n" "但是已经本地增加此属性,取值为 “%s”。" -#: ../libsvn_wc/props.c:1717 +#: ../libsvn_wc/props.c:1710 #, c-format msgid "" "Trying to change property '%s' from '%s' to '%s',\n" @@ -6579,32 +6579,32 @@ "试图把属性 “%s” 的值从 “%s” 改为 “%s”,\n" "但是属性并不存在。" -#: ../libsvn_wc/props.c:2087 ../libsvn_wc/props.c:2114 -#: ../libsvn_wc/props.c:2241 ../libsvn_wc/props.c:2461 +#: ../libsvn_wc/props.c:2079 ../libsvn_wc/props.c:2106 +#: ../libsvn_wc/props.c:2233 ../libsvn_wc/props.c:2453 msgid "Failed to load properties from disk" msgstr "无法从磁盘装载属性" -#: ../libsvn_wc/props.c:2236 ../libsvn_wc/props.c:2405 +#: ../libsvn_wc/props.c:2228 ../libsvn_wc/props.c:2397 #, c-format msgid "Property '%s' is an entry property" msgstr "属性 “%s” 是条目属性" -#: ../libsvn_wc/props.c:2280 +#: ../libsvn_wc/props.c:2272 #, c-format msgid "Cannot set '%s' on a directory ('%s')" msgstr "无法设定“%s”于目录 (“%s”)" -#: ../libsvn_wc/props.c:2288 +#: ../libsvn_wc/props.c:2280 #, c-format msgid "Cannot set '%s' on a file ('%s')" msgstr "无法设定“%s”于文件 (“%s”)" -#: ../libsvn_wc/props.c:2294 +#: ../libsvn_wc/props.c:2286 #, c-format msgid "'%s' is not a file or directory" msgstr "“%s”不是文件或目录" -#: ../libsvn_wc/props.c:2356 +#: ../libsvn_wc/props.c:2348 #, c-format msgid "File '%s' has binary mime type property" msgstr "文件“%s”有二进制的 mime 类型属性" @@ -6614,17 +6614,17 @@ msgid "Unrecognized line ending style '%s' for '%s'" msgstr "无法识别的行结束样式“%s”,对于“%s”" -#: ../libsvn_wc/props.c:2960 ../libsvn_wc/props.c:3036 +#: ../libsvn_wc/props.c:2951 ../libsvn_wc/props.c:3027 #, c-format msgid "Error parsing %s property on '%s': '%s'" msgstr "解析 %s 属性于“%s”出错: “%s”" -#: ../libsvn_wc/props.c:3005 +#: ../libsvn_wc/props.c:2996 #, c-format msgid "Can't split line into components: '%s'" msgstr "不能分割行到组件:“%s”" -#: ../libsvn_wc/props.c:3061 +#: ../libsvn_wc/props.c:3052 #, c-format msgid "" "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in " @@ -6633,14 +6633,14 @@ msgstr "" "非法属性 “%s” 于 “%s”: 不能在外部定义中使用 2 个绝对 URL(“%s” 和 “%s”);绝对或相对 URL 必须检出到本地路径" -#: ../libsvn_wc/props.c:3070 ../libsvn_wc/props.c:3078 +#: ../libsvn_wc/props.c:3061 ../libsvn_wc/props.c:3069 #, 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/props.c:3116 +#: ../libsvn_wc/props.c:3107 #, c-format msgid "" "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" @@ -6865,7 +6865,7 @@ msgid "Skipping binary file: '%s'\n" msgstr "略过二进制文件: “%s”\n" -#: ../svn/changelist-cmd.c:57 ../svn/main.c:1549 +#: ../svn/changelist-cmd.c:57 ../svn/main.c:1525 msgid "Changelist names must not be empty" msgstr "修改列表的名称不能为空" @@ -7154,7 +7154,7 @@ msgid "Path '%s' not relative to base URLs" msgstr "路径“%s”不是相对于基础 URL" -#: ../svn/export-cmd.c:95 +#: ../svn/export-cmd.c:88 msgid "" "Destination directory exists; please remove the directory or use --force to " "overwrite" @@ -9012,7 +9012,7 @@ msgid "Argument to --limit must be positive" msgstr "--limit 取值必须为正" -#: ../svn/main.c:1224 ../svn/main.c:1493 +#: ../svn/main.c:1224 ../svn/main.c:1469 msgid "Can't specify -c with --old" msgstr "不能同时指定 -c 和 --old" @@ -9021,65 +9021,65 @@ msgid "Negative number in range (%s) not supported with -c" msgstr "" -#: ../svn/main.c:1258 +#: ../svn/main.c:1243 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "-c 选项的取值(%s)不是数字" -#: ../svn/main.c:1266 +#: ../svn/main.c:1251 msgid "There is no change 0" msgstr "没有版本 0" -#: ../svn/main.c:1311 ../svnadmin/main.c:1537 +#: ../svn/main.c:1287 ../svnadmin/main.c:1537 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "版本参数“%s”中有语法错误" -#: ../svn/main.c:1384 ../svn/main.c:1403 +#: ../svn/main.c:1360 ../svn/main.c:1379 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "将深度从本地编码转换到 UTF8 失败" -#: ../svn/main.c:1392 +#: ../svn/main.c:1368 #, c-format msgid "" "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" msgstr "“%s” 不是有效的深度;尝试 “empty”,“files”,“immediates”,或 “infinity”" -#: ../svn/main.c:1411 +#: ../svn/main.c:1387 #, 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:1530 +#: ../svn/main.c:1506 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "原生换行符号参数 “%s” 中有语法错误" -#: ../svn/main.c:1585 +#: ../svn/main.c:1561 #, c-format msgid "'%s' is not a valid --accept value" msgstr "“%s” 是非法 --accept 取值" -#: ../svn/main.c:1594 +#: ../svn/main.c:1570 #, c-format msgid "'%s' is not a valid --show-revs value" msgstr "“%s” 是非法 --show-revs 取值" -#: ../svn/main.c:1656 ../svndumpfilter/main.c:1325 ../svnlook/main.c:2296 +#: ../svn/main.c:1632 ../svndumpfilter/main.c:1325 ../svnlook/main.c:2296 #, c-format msgid "Subcommand argument required\n" msgstr "必须提供子命令参数\n" -#: ../svn/main.c:1675 ../svnadmin/main.c:1672 ../svndumpfilter/main.c:1344 +#: ../svn/main.c:1651 ../svnadmin/main.c:1672 ../svndumpfilter/main.c:1344 #: ../svnlook/main.c:2315 #, c-format msgid "Unknown command: '%s'\n" msgstr "未知命令: “%s”\n" -#: ../svn/main.c:1709 +#: ../svn/main.c:1685 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -9088,86 +9088,86 @@ "子命令“%s”不接受选项“%s”\n" "输入“svn help %s”得到用法。\n" -#: ../svn/main.c:1724 +#: ../svn/main.c:1700 msgid "" "Multiple revision arguments encountered; can't specify -c twice, or both -c " "and -r" msgstr "遇到了多个版本参数;不能指定 -c 两次或者同时使用 -c 和 -r" -#: ../svn/main.c:1738 +#: ../svn/main.c:1714 msgid "-r and -c can't be used with --reintegrate" msgstr "-r 和 -c 不能与 --reintegrate 共存" -#: ../svn/main.c:1747 +#: ../svn/main.c:1723 msgid "--depth and --set-depth are mutually exclusive" msgstr "--depth 与 --set-depth 是互斥的" -#: ../svn/main.c:1757 +#: ../svn/main.c:1733 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" msgstr "--with-all-revprops 与 --with-no-revprops 是互斥的" -#: ../svn/main.c:1767 +#: ../svn/main.c:1743 msgid "--with-revprop and --with-no-revprops are mutually exclusive" msgstr "--with-revprop 与 --with-no-revprops 是互斥的" -#: ../svn/main.c:1776 ../svnsync/main.c:2250 +#: ../svn/main.c:1752 ../svnsync/main.c:2250 msgid "--trust-server-cert requires --non-interactive" msgstr "--trust-server-cert 需要 --non-interactive" -#: ../svn/main.c:1826 +#: ../svn/main.c:1802 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "日志信息文件受版本控制;请使用 “--force-log” 强制执行" -#: ../svn/main.c:1833 +#: ../svn/main.c:1809 msgid "Lock comment file is a versioned file; use '--force-log' to override" msgstr "锁注释文件受版本控制;请使用 “--force-log” 强制执行" -#: ../svn/main.c:1853 +#: ../svn/main.c:1829 msgid "" "The log message is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "日志信息是路径名称 (本来想用 -F 选项的吗?);请使用“--force-log”强制执行" -#: ../svn/main.c:1860 +#: ../svn/main.c:1836 msgid "" "The lock comment is a pathname (was -F intended?); use '--force-log' to " "override" msgstr "锁注释是路径名称 (本来想用-F 选项的吗?);请使用“--force-log”强制执行" -#: ../svn/main.c:1871 +#: ../svn/main.c:1847 msgid "--relocate and --depth are mutually exclusive" msgstr "--relocate 与 --depth 是互斥的" -#: ../svn/main.c:1957 +#: ../svn/main.c:1933 msgid "Unrecognized file in argument of --config-option" msgstr "不能接受在参数 --config-option 中的文件" -#: ../svn/main.c:1977 +#: ../svn/main.c:1953 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "--auto-props 与 --no-auto-props 是互斥的" -#: ../svn/main.c:1991 +#: ../svn/main.c:1967 msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only" msgstr "--reintegrate 不能与 --ignore-ancestry 或 --record-only 共存" -#: ../svn/main.c:1999 +#: ../svn/main.c:1975 msgid "--reintegrate cannot be used with --ignore-ancestry" msgstr "--reintegrate 不能与 --ignore-ancestry 共存" -#: ../svn/main.c:2007 +#: ../svn/main.c:1983 msgid "--reintegrate cannot be used with --record-only" msgstr "--reintegrate 不能与 --record-only 共存" -#: ../svn/main.c:2121 ../svn/main.c:2127 +#: ../svn/main.c:2097 ../svn/main.c:2103 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "--accept=%s 与 --non-interactive 不兼容" -#: ../svn/main.c:2154 +#: ../svn/main.c:2130 msgid "Try 'svn help' for more info" msgstr "请使用 “svn help” 以得到更多信息" -#: ../svn/main.c:2164 +#: ../svn/main.c:2140 msgid "" "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for " "details)\n" @@ -9193,11 +9193,11 @@ msgid "A working copy merge source needs an explicit revision" msgstr "工作副本的合并来源需要指定版本" -#: ../svn/merge-cmd.c:273 +#: ../svn/merge-cmd.c:292 msgid "--depth cannot be used with --reintegrate" msgstr "--depth 不能与 --reintegrate 共存" -#: ../svn/merge-cmd.c:278 +#: ../svn/merge-cmd.c:297 msgid "--force cannot be used with --reintegrate" msgstr "--force 不能与 --reintegrate 共存" @@ -9699,12 +9699,12 @@ msgid "Can't change working directory to '%s'" msgstr "无法改变工作目录到“%s”" -#: ../svn/util.c:186 ../svn/util.c:510 +#: ../svn/util.c:186 ../svn/util.c:508 #, c-format msgid "Can't restore working directory" msgstr "无法还原工作目录" -#: ../svn/util.c:193 ../svn/util.c:446 +#: ../svn/util.c:193 ../svn/util.c:436 #, c-format msgid "system('%s') returned %d" msgstr "system('%s') 返回 %d" @@ -9731,31 +9731,31 @@ msgid "Can't write to '%s'" msgstr "无法写入“%s”" -#: ../svn/util.c:479 +#: ../svn/util.c:477 msgid "Error normalizing edited contents to internal format" msgstr "将编辑内容规格化为内部格式出错" -#: ../svn/util.c:552 +#: ../svn/util.c:550 msgid "Log message contains a zero byte" msgstr "日志信息中有一个零字节" -#: ../svn/util.c:615 +#: ../svn/util.c:613 msgid "Your commit message was left in a temporary file:" msgstr "您的提交信息保留在临时文件中:" -#: ../svn/util.c:667 +#: ../svn/util.c:665 msgid "--This line, and those below, will be ignored--" msgstr "--此行及以下内容将会被忽略--" -#: ../svn/util.c:701 +#: ../svn/util.c:699 msgid "Error normalizing log message to internal format" msgstr "将日志内容规格化为内部格式出错" -#: ../svn/util.c:788 +#: ../svn/util.c:786 msgid "Cannot invoke editor to get log message when non-interactive" msgstr "在非交互式环境中不能调用编辑器获得日志信息" -#: ../svn/util.c:801 +#: ../svn/util.c:799 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) " @@ -9763,7 +9763,7 @@ msgstr "" "无法使用外部编辑器获得日志信息;考虑设置环境变量 $SVN_EDITOR,或者使用 --message (-m) 或 --file (-F) 选项" -#: ../svn/util.c:837 +#: ../svn/util.c:835 msgid "" "\n" "Log message unchanged or not specified\n" @@ -9773,39 +9773,39 @@ "日志信息未修改,或未指定\n" "a)终止,c)继续,e)编辑:\n" -#: ../svn/util.c:890 +#: ../svn/util.c:888 msgid "Use --force to override this restriction" msgstr "请使用 --force 选项强制执行" -#: ../svn/util.c:1048 ../svn/util.c:1081 +#: ../svn/util.c:1046 ../svn/util.c:1079 msgid "none" msgstr "无" -#: ../svn/util.c:1050 +#: ../svn/util.c:1048 msgid "dir" msgstr "目录" -#: ../svn/util.c:1052 +#: ../svn/util.c:1050 msgid "file" msgstr "文件" -#: ../svn/util.c:1083 +#: ../svn/util.c:1081 msgid "update" msgstr "更新" -#: ../svn/util.c:1085 +#: ../svn/util.c:1083 msgid "switch" msgstr "切换" -#: ../svn/util.c:1087 +#: ../svn/util.c:1085 msgid "merge" msgstr "合并" -#: ../svn/util.c:1089 +#: ../svn/util.c:1087 msgid "unknown operation" msgstr "未知操作" -#: ../svn/util.c:1191 +#: ../svn/util.c:1189 msgid "(invalid date)" msgstr "(非法日期)" @@ -11227,20 +11227,20 @@ msgid "Can't create thread" msgstr "无法创建线程" -#: ../svnserve/serve.c:1744 +#: ../svnserve/serve.c:1736 msgid "Path is not a string" msgstr "路径不是字符串" -#: ../svnserve/serve.c:1900 +#: ../svnserve/serve.c:1892 msgid "Log revprop entry not a string" msgstr "日志 revprop 入口不是字符串" -#: ../svnserve/serve.c:1907 +#: ../svnserve/serve.c:1899 #, c-format msgid "Unknown revprop word '%s' in log command" msgstr "日志命令中有未知的 revprop 单词 “%s”" -#: ../svnserve/serve.c:1923 +#: ../svnserve/serve.c:1915 msgid "Log path entry not a string" msgstr "日志路径入口不是字符串" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sudoers.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudoers.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sudoers.po 2012-01-02 18:08:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudoers.po 2012-02-23 07:12:24.000000000 +0000 @@ -7,15 +7,15 @@ "Project-Id-Version: sudoers 1.8.3rc1\n" "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n" "POT-Creation-Date: 2011-10-10 15:50-0400\n" -"PO-Revision-Date: 2011-12-07 23:11+0000\n" +"PO-Revision-Date: 2012-01-31 19:22+0000\n" "Last-Translator: 英华 \n" "Language-Team: Chinese (simplified) \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: 2011-12-30 01:43+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: plugins/sudoers/alias.c:122 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sudo.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudo.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sudo.po 2012-01-02 18:08:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudo.po 2012-02-23 07:12:24.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: 2011-12-30 01:43+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: \n" #: src/error.c:82 src/error.c:86 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sysstat.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sysstat.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/sysstat.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sysstat.po 2012-02-23 07:11:50.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: 2011-12-29 14:52+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:51+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: cifsiostat.c:69 iostat.c:80 mpstat.c:86 nfsiostat.c:68 pidstat.c:78 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-config-cluster.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-config-cluster.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-config-cluster.po 2012-01-02 18:07:30.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-config-cluster.po 2012-02-23 07:11: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: 2011-12-29 15:09+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 22:10+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: src/clui.glade.h:1 msgid "1" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-config-kickstart.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-config-kickstart.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-config-kickstart.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-config-kickstart.po 2012-02-23 07:11: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: 2011-12-29 14:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../src/RHELPackageGroupList.py:12 msgid "X Window System" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-service.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-service.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/system-service.po 2012-01-02 18:07:41.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-service.po 2012-02-23 07:12:01.000000000 +0000 @@ -7,60 +7,60 @@ msgstr "" "Project-Id-Version: ubuntu-system-service\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-11-28 10:51+0000\n" +"POT-Creation-Date: 2012-01-10 09:07+0000\n" "PO-Revision-Date: 2009-10-19 17:45+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 17:56+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-22 00:49+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../backend/com.ubuntu.systemservice.policy.in.h:1 -msgid "Check if the package system is locked" -msgstr "检查软件包系统是否是锁定的" +msgid "Get current global proxy" +msgstr "获得当前全局代理" #: ../backend/com.ubuntu.systemservice.policy.in.h:2 -msgid "Get current global keyboard" -msgstr "获得当前全局键盘" +msgid "System policy prevents querying proxy settings" +msgstr "系统策略阻止查询代理设置" #: ../backend/com.ubuntu.systemservice.policy.in.h:3 -msgid "Get current global proxy" -msgstr "获得当前全局代理" +msgid "Set current global proxy" +msgstr "设置当前全局代理" #: ../backend/com.ubuntu.systemservice.policy.in.h:4 -msgid "Set current global keyboard" -msgstr "设置当前全局键盘" +msgid "System policy prevents setting proxy settings" +msgstr "系统策略阻止设置代理设置" #: ../backend/com.ubuntu.systemservice.policy.in.h:5 -msgid "Set current global proxy" -msgstr "设置当前全局代理" - -#: ../backend/com.ubuntu.systemservice.policy.in.h:6 msgid "Set current global proxy exception" msgstr "设置当前全局代理例外" +#: ../backend/com.ubuntu.systemservice.policy.in.h:6 +msgid "System policy prevents setting no_proxy settings" +msgstr "系统策略阻止设置没有代理的设置" + #: ../backend/com.ubuntu.systemservice.policy.in.h:7 -msgid "System policy prevents querying keyboard settings" -msgstr "系统策略组织查询键盘设置" +msgid "Set current global keyboard" +msgstr "设置当前全局键盘" #: ../backend/com.ubuntu.systemservice.policy.in.h:8 -msgid "System policy prevents querying package system lock" -msgstr "系统策略阻止查询软件包系统锁" +msgid "System policy prevents setting global keyboard settings" +msgstr "系统策略阻止设置全局键盘设置" #: ../backend/com.ubuntu.systemservice.policy.in.h:9 -msgid "System policy prevents querying proxy settings" -msgstr "系统策略阻止查询代理设置" +msgid "Get current global keyboard" +msgstr "获得当前全局键盘" #: ../backend/com.ubuntu.systemservice.policy.in.h:10 -msgid "System policy prevents setting global keyboard settings" -msgstr "系统策略阻止设置全局键盘设置" +msgid "System policy prevents querying keyboard settings" +msgstr "系统策略组织查询键盘设置" #: ../backend/com.ubuntu.systemservice.policy.in.h:11 -msgid "System policy prevents setting no_proxy settings" -msgstr "系统策略阻止设置没有代理的设置" +msgid "Check if the package system is locked" +msgstr "检查软件包系统是否是锁定的" #: ../backend/com.ubuntu.systemservice.policy.in.h:12 -msgid "System policy prevents setting proxy settings" -msgstr "系统策略阻止设置代理设置" +msgid "System policy prevents querying package system lock" +msgstr "系统策略阻止查询软件包系统锁" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/tar.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tar.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/tar.po 2012-01-02 18:07:12.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tar.po 2012-02-23 07:11:36.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: 2011-12-29 11:13+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" "Language: zh_CN\n" #: gnu/argmatch.c:135 diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/tasksel.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tasksel.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/tasksel.po 2012-01-02 18:07:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tasksel.po 2012-02-23 07:11:50.000000000 +0000 @@ -10,14 +10,14 @@ "Project-Id-Version: tasksel 1.4.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-12-06 16:51-0400\n" -"PO-Revision-Date: 2011-08-10 17:13+0000\n" +"PO-Revision-Date: 2012-01-21 00:43+0000\n" "Last-Translator: Ming Hua \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n" +"X-Generator: Launchpad (build 14838)\n" #: ../tasksel.pl:433 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/texinfo.po language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/texinfo.po --- language-pack-zh-hans-base-12.04+20111229/data/zh_CN/LC_MESSAGES/texinfo.po 2012-01-02 18:07:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/texinfo.po 2012-02-23 07:11:31.000000000 +0000 @@ -1,67 +1,135 @@ -# SOME DESCRIPTIVE TITLE. +# Chinese Simplified translation about texinfo. # Copyright (C) 2002 Free Software Foundation, Inc. # This file is distributed under the same license as the texinfo package. # Wang Li , 2002. -# +# Ji ZhengYu , 2008 msgid "" msgstr "" -"Project-Id-Version: texinfo 4.2\n" +"Project-Id-Version: texinfo 4.12.94\n" "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n" -"POT-Creation-Date: 2004-12-21 16:20-0800\n" -"PO-Revision-Date: 2009-11-24 08:28+0000\n" -"Last-Translator: Wang Li \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2008-09-18 20:38+0200\n" +"PO-Revision-Date: 2011-09-07 02:18+0000\n" +"Last-Translator: Ji ZhengYu \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: 2011-12-29 15:34+0000\n" -"X-Generator: Launchpad (build 14560)\n" +"X-Launchpad-Export-Date: 2012-02-21 18:25+0000\n" +"X-Generator: Launchpad (build 14838)\n" +"Language: zh_CN\n" + +#: gnulib/lib/error.c:125 +msgid "Unknown system error" +msgstr "未知的系统错误" -#: info/echo-area.c:284 info/session.c:689 +#: gnulib/lib/getopt.c:526 gnulib/lib/getopt.c:542 +#, c-format +msgid "%s: option `%s' is ambiguous\n" +msgstr "%s:选项“%s”含义不明确\n" + +#: gnulib/lib/getopt.c:575 gnulib/lib/getopt.c:579 +#, c-format +msgid "%s: option `--%s' doesn't allow an argument\n" +msgstr "%s:选项“--%s”不接受参数\n" + +#: gnulib/lib/getopt.c:588 gnulib/lib/getopt.c:593 +#, c-format +msgid "%s: option `%c%s' doesn't allow an argument\n" +msgstr "%s:选项“%c%s”不接受参数\n" + +#: gnulib/lib/getopt.c:636 gnulib/lib/getopt.c:655 gnulib/lib/getopt.c:971 +#: gnulib/lib/getopt.c:990 +#, c-format +msgid "%s: option `%s' requires an argument\n" +msgstr "%s:选项“%s”需要一个参数\n" + +#: gnulib/lib/getopt.c:693 gnulib/lib/getopt.c:696 +#, c-format +msgid "%s: unrecognized option `--%s'\n" +msgstr "%s:不能识别的选项“--%s”\n" + +#: gnulib/lib/getopt.c:704 gnulib/lib/getopt.c:707 +#, c-format +msgid "%s: unrecognized option `%c%s'\n" +msgstr "%s:不能识别的选项“%c%s”\n" + +#: gnulib/lib/getopt.c:759 gnulib/lib/getopt.c:762 +#, c-format +msgid "%s: illegal option -- %c\n" +msgstr "%s:非法选项 -- %c\n" + +#: gnulib/lib/getopt.c:768 gnulib/lib/getopt.c:771 +#, c-format +msgid "%s: invalid option -- %c\n" +msgstr "%s:无效选项 -- %c\n" + +#: gnulib/lib/getopt.c:823 gnulib/lib/getopt.c:839 gnulib/lib/getopt.c:1043 +#: gnulib/lib/getopt.c:1061 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "%s:选项需要一个参数 -- %c\n" + +#: gnulib/lib/getopt.c:892 gnulib/lib/getopt.c:908 +#, c-format +msgid "%s: option `-W %s' is ambiguous\n" +msgstr "%s:选项“-W %s”的含义不清\n" + +#: gnulib/lib/getopt.c:932 gnulib/lib/getopt.c:950 +#, c-format +msgid "%s: option `-W %s' doesn't allow an argument\n" +msgstr "%s:选项“-W %s”不接受参数\n" + +#: gnulib/lib/xalloc-die.c:34 gnulib/lib/xsetenv.c:37 +#, c-format +msgid "memory exhausted" +msgstr "虚拟内存耗尽" + +#: info/echo-area.c:283 info/session.c:966 msgid "Move forward a character" msgstr "向前移动一个字符" -#: info/echo-area.c:296 info/session.c:705 +#: info/echo-area.c:295 info/session.c:993 msgid "Move backward a character" msgstr "向后移动一个字符" -#: info/echo-area.c:308 +#: info/echo-area.c:307 msgid "Move to the start of this line" msgstr "移动到本行的开头" -#: info/echo-area.c:313 +#: info/echo-area.c:312 msgid "Move to the end of this line" msgstr "移动到本行的末尾" -#: info/echo-area.c:321 info/session.c:723 +#: info/echo-area.c:320 info/session.c:1025 msgid "Move forward a word" msgstr "向前移动一个单词" -#: info/echo-area.c:361 info/session.c:772 +#: info/echo-area.c:360 info/session.c:1049 msgid "Move backward a word" msgstr "向后移动一个单词" -#: info/echo-area.c:401 +#: info/echo-area.c:400 msgid "Delete the character under the cursor" msgstr "删除光标位置的字符" -#: info/echo-area.c:431 +#: info/echo-area.c:430 msgid "Delete the character behind the cursor" msgstr "删除光标之后的字符" -#: info/echo-area.c:452 +#: info/echo-area.c:451 msgid "Cancel or quit operation" msgstr "取消或退出操作" -#: info/echo-area.c:467 +#: info/echo-area.c:466 msgid "Accept (or force completion of) this line" msgstr "接受(或强制完成)本行" -#: info/echo-area.c:472 +#: info/echo-area.c:471 msgid "Insert next character verbatim" msgstr "原样插入下一个字符" -#: info/echo-area.c:480 +#: info/echo-area.c:479 msgid "Insert this character" msgstr "插入该字符" @@ -97,52 +165,52 @@ msgid "Kill the word following the cursor" msgstr "剪切光标之后的单词" -#: info/echo-area.c:653 +#: info/echo-area.c:654 msgid "Kill the word preceding the cursor" msgstr "剪切光标之前的单词" -#: info/echo-area.c:868 info/echo-area.c:924 +#: info/echo-area.c:870 info/echo-area.c:926 msgid "No completions" msgstr "没有补齐" -#: info/echo-area.c:870 +#: info/echo-area.c:872 msgid "Not complete" msgstr "未补齐" -#: info/echo-area.c:911 +#: info/echo-area.c:913 msgid "List possible completions" msgstr "列举可能的补齐" -#: info/echo-area.c:928 +#: info/echo-area.c:930 msgid "Sole completion" msgstr "唯一的补齐" -#: info/echo-area.c:937 +#: info/echo-area.c:939 msgid "One completion:\n" msgstr "一个补齐:\n" -#: info/echo-area.c:938 +#: info/echo-area.c:940 #, c-format msgid "%d completions:\n" msgstr "%d 个补齐:\n" -#: info/echo-area.c:1085 +#: info/echo-area.c:1087 msgid "Insert completion" msgstr "插入补齐" -#: info/echo-area.c:1220 +#: info/echo-area.c:1222 msgid "Building completions..." msgstr "正在创建补齐..." -#: info/echo-area.c:1340 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "滚动补齐窗口" -#: info/footnotes.c:213 +#: info/footnotes.c:212 msgid "Footnotes could not be displayed" msgstr "无法显示脚注" -#: info/footnotes.c:239 +#: info/footnotes.c:238 msgid "Show the footnotes associated with this node in another window" msgstr "在另一个窗口中显示于该节点相关的脚注" @@ -150,72 +218,72 @@ msgid "---------- Footnotes ----------" msgstr "---------- 脚注 ----------" -#: info/indices.c:172 +#: info/indices.c:171 msgid "Look up a string in the index for this file" msgstr "在本文件的索引中搜索字符串" -#: info/indices.c:199 +#: info/indices.c:198 msgid "Finding index entries..." msgstr "正在搜索索引条目..." -#: info/indices.c:207 +#: info/indices.c:206 msgid "No indices found." msgstr "未找到索引。" -#: info/indices.c:217 +#: info/indices.c:216 msgid "Index entry: " msgstr "索引条目: " -#: info/indices.c:325 +#: info/indices.c:324 msgid "" "Go to the next matching index item from the last `\\[index-search]' command" msgstr "从最后一个“\\[index-search]”命令转移到下一个匹配的索引项目" -#: info/indices.c:335 +#: info/indices.c:334 msgid "No previous index search string." msgstr "没有上一个索引搜索字符串。" -#: info/indices.c:342 +#: info/indices.c:341 msgid "No index entries." msgstr "没有索引条目。" -#: info/indices.c:375 +#: info/indices.c:374 #, c-format msgid "No %sindex entries containing `%s'." msgstr "没有 %s索引条目含有“%s”。" -#: info/indices.c:376 +#: info/indices.c:375 msgid "more " msgstr "更多 " -#: info/indices.c:386 +#: info/indices.c:385 msgid "CAN'T SEE THIS" msgstr "看不到这个" -#: info/indices.c:422 +#: info/indices.c:421 #, c-format msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)" msgstr "在 %2$s 中找到“%1$s”。(“\\[next-index-match]”将试图寻找下一个匹配。)" -#: info/indices.c:541 +#: info/indices.c:549 #, c-format msgid "Scanning indices of `%s'..." msgstr "正在搜索“%s”的索引..." -#: info/indices.c:596 +#: info/indices.c:604 #, c-format msgid "No available info files have `%s' in their indices." msgstr "在可用的 info 文件的索引中均不含有“%s”。" -#: info/indices.c:622 +#: info/indices.c:630 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "整理所有已知 info 文件含有被查询字符串的索引并建立一个菜单" -#: info/indices.c:626 +#: info/indices.c:634 msgid "Index apropos: " msgstr "索引含有: " -#: info/indices.c:654 +#: info/indices.c:662 #, c-format msgid "" "\n" @@ -229,69 +297,143 @@ msgid "Try --help for more information.\n" msgstr "尝试 --更多的求助信息。\n" -#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266 -#: util/texindex.c:343 +#: info/info.c:294 info/infokey.c:145 install-info/install-info.c:2101 +#: makeinfo/makeinfo.c:802 util/texindex.c:295 #, c-format msgid "" -"There is NO warranty. You may redistribute this software\n" -"under the terms of the GNU General Public License.\n" -"For more information about these matters, see the files named COPYING.\n" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"License GPLv3+: GNU GPL version 3 or later " +"\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -"本软件没有任何担保。您可以按照通用\n" -"公共许可证(GPL)的条款发行本软件。\n" -"更多信息请阅读名为 COPYING 的文件。\n" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"License GPLv3+: GNU GPL version 3 or later " +"\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" -#: info/info.c:498 +#: info/info.c:506 #, c-format msgid "no index entries found for `%s'\n" msgstr "找不到含有“%s”的索引\n" -#: info/info.c:590 -msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" -msgstr "" - -#: info/info.c:597 +#: info/info.c:600 #, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" "Read documentation in Info format.\n" +msgstr "" +"用法: %s [OPTION]... [MENU-ITEM...]\n" "\n" +"以 Info 格式阅读文档。\n" + +#: info/info.c:606 +msgid "" "Options:\n" -" --apropos=STRING look up STRING in all indices of all " +" -k, --apropos=STRING look up STRING in all indices of all " "manuals.\n" " -d, --directory=DIR add DIR to INFOPATH.\n" " --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" -f, --file=FILENAME specify Info file to visit.\n" +" -f, --file=FILENAME specify Info file to visit." +msgstr "" +"选项:\n" +" -k, --apropos=STRING 在所有手册页的索引中查找 STRING。\n" +" -d, --directory=DIR 将 DIR 添加至 INFOPATH。\n" +" --dribble=FILENAME 将用户的击键条目在 FILENAME 中。\n" +" -f, --file=FILENAME 指定想浏览的 Info 文件。" + +#: info/info.c:613 +msgid "" " -h, --help display this help and exit.\n" " --index-search=STRING go to node pointed by index entry STRING.\n" " -n, --node=NODENAME specify nodes in first visited Info file.\n" -" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -o, --output=FILENAME output selected nodes to FILENAME." +msgstr "" +" -h, --help 显示此帮助并退出。\n" +" --index-search=STRING 跳转至索引条目 STRING 所指的节点。\n" +" -n, --node=NODENAME 在首个浏览过的 Info 文件中指定节点。\n" +" -o, --output=FILENAME 将选中的节点全输出至 FILENAME。" + +#: info/info.c:619 +msgid "" " -R, --raw-escapes output \"raw\" ANSI escapes (default).\n" " --no-raw-escapes output escapes as literal text.\n" " --restore=FILENAME read initial keystrokes from FILENAME.\n" -" -O, --show-options, --usage go to command-line options node.\n" -"%s --subnodes recursively output menu items.\n" -" -w, --where, --location print physical location of Info file.\n" +" -O, --show-options, --usage go to command-line options node." +msgstr "" +" -R, --raw-escapes 输出“原始”的 ANSI 转义符(默认)。\n" +" --no-raw-escapes 将转义符输出为普通文本。\n" +" --restore=FILENAME 从 FILENAME 中读取初始击键条目。\n" +" -O, --show-options, --usage 跳转至命令行选项节点。" + +#: info/info.c:626 +msgid " -b, --speech-friendly be friendly to speech synthesizers." +msgstr " -b, --speech-friendly 友好地合成语音。" + +#: info/info.c:630 +msgid "" +" --subnodes recursively output menu items.\n" " --vi-keys use vi-like and less-like key bindings.\n" " --version display version information and exit.\n" +" -w, --where, --location print physical location of Info file." +msgstr "" +" --subnodes 递归输出菜单项。\n" +" --vi-keys 使用类似于 vi 和 less 的按键绑定。\n" +" --version 显示版本信息并退出。\n" +" -w, --where, --location 打印 Info 文件在系统中的位置。" + +#: info/info.c:636 +msgid "" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" "If it is not present, info merges all `dir' files and shows the result.\n" "Any remaining arguments are treated as the names of menu\n" -"items relative to the initial node visited.\n" +"items relative to the initial node visited." +msgstr "" +"\n" +"如果存在第一个非选项参数,它将是个用于起始的菜单条目;\n" +"所有在 INFOPATH 变量后跟着的“dir”文件都会搜索此条目。\n" +"如果不存在此参数,info 合并所有“dir”文件并显示结果。\n" +"任何后续参数都被认为是与初始浏览\n" +"节点有关的菜单项名称。" + +#: info/info.c:643 +msgid "" +"\n" +"For a summary of key bindings, type h within Info." +msgstr "" +"\n" +"在帮助信息中按 h 获取有关按键绑定的内容。" + +#: info/info.c:646 +msgid "" "\n" "Examples:\n" " info show top-level dir menu\n" +" info info show the general manual for Info readers\n" +" info info-stnd show the manual specific to this Info program\n" " info emacs start at emacs node from top-level dir\n" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" -" info -f ./foo.info show file ./foo.info, not searching dir\n" +" info --subnodes -o out.txt emacs dump entire manual to out.txt\n" +" info -f ./foo.info show file ./foo.info, not searching dir" msgstr "" +"\n" +"范例:\n" +" info 显示顶级目录菜单\n" +" info info 显示 Info readers 的普通手册\n" +" info info-stnd 显示此 Info 程序特定手册\n" +" info emacs 从顶级目录浏览 emacs 节点\n" +" info emacs buffers 在 emacs 手册页中浏览 buffers 节点\n" +" info --show-options emacs 浏览与 emacs 的命令行选项有关的节点\n" +" info --subnodes -o out.txt emacs 将整个手册页输出至 out.txt\n" +" info -f ./foo.info 显示文件 ./foo.info,而不是查找目录" -#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465 -#: util/install-info.c:466 util/texindex.c:292 +#: info/info.c:657 info/infokey.c:918 makeinfo/makeinfo.c:475 +#: util/texindex.c:259 msgid "" "\n" "Email bug reports to bug-texinfo@gnu.org,\n" @@ -303,394 +445,376 @@ "一般的问题和讨论请发送到 help-texinfo@gnu.org。\n" "Texinfo 主页:http://www.gnu.org/software/texinfo/" -#: info/info.c:669 +#: info/info.c:691 #, c-format msgid "Cannot find node `%s'." msgstr "无法找到节点“%s”。" -#: info/info.c:670 +#: info/info.c:692 #, c-format msgid "Cannot find node `(%s)%s'." msgstr "无法找到节点“(%s)%s”。" -#: info/info.c:671 +#: info/info.c:693 msgid "Cannot find a window!" msgstr "无法找到一个窗口!" -#: info/info.c:672 +#: info/info.c:694 msgid "Point doesn't appear within this window's node!" msgstr "光标没有出现在该窗口的节点之中!" -#: info/info.c:673 +#: info/info.c:695 msgid "Cannot delete the last window." msgstr "无法删除最后的窗口。" -#: info/info.c:674 +#: info/info.c:696 msgid "No menu in this node." msgstr "该节点中没有菜单。" -#: info/info.c:675 +#: info/info.c:697 msgid "No footnotes in this node." msgstr "该节点中没有脚注。" -#: info/info.c:676 +#: info/info.c:698 msgid "No cross references in this node." msgstr "该节点中没有交叉引用。" -#: info/info.c:677 +#: info/info.c:699 #, c-format msgid "No `%s' pointer for this node." msgstr "该节点中没有“%s”指针" -#: info/info.c:678 +#: info/info.c:700 #, c-format msgid "Unknown Info command `%c'; try `?' for help." msgstr "未知的 Info 命令“%c”;请以“?”获得帮助。" -#: info/info.c:679 +#: info/info.c:701 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." msgstr "终端类型“%s”的能力不足以支持 Info 的运行。" -#: info/info.c:680 +#: info/info.c:702 msgid "You are already at the last page of this node." msgstr "您已经在该节点的最后一个页面中了。" -#: info/info.c:681 +#: info/info.c:703 msgid "You are already at the first page of this node." msgstr "您已经在该节点的第一页中了。" -#: info/info.c:682 +#: info/info.c:704 msgid "Only one window." msgstr "只有一个窗口。" -#: info/info.c:683 +#: info/info.c:705 msgid "Resulting window would be too small." msgstr "结果窗口将会太小。" -#: info/info.c:684 +#: info/info.c:706 msgid "Not enough room for a help window, please delete a window." msgstr "没有足够的空间用于求助窗口,请删除一个窗口。" -#: info/infodoc.c:46 info/infodoc.c:95 -msgid "" -"Basic Commands in Info Windows\n" -"******************************\n" -msgstr "" -"Info 窗口中的基本命令\n" -"******************************\n" - -#: info/infodoc.c:49 -msgid "\\%-10[quit-help] Quit this help.\n" -msgstr "\\%-10[quit-help] 退出该求助。\n" +#: info/infodoc.c:45 +msgid "Basic Info command keys\n" +msgstr "基本 Info 命令按键\n" + +#: info/infodoc.c:47 +msgid "\\%-10[quit-help] Close this help window.\n" +msgstr "\\%-10[quit-help] 关闭此帮助窗口。\n" -#: info/infodoc.c:50 +#: info/infodoc.c:48 msgid "\\%-10[quit] Quit Info altogether.\n" msgstr "\\%-10[quit] 一并退出 Info。\n" -#: info/infodoc.c:51 +#: info/infodoc.c:49 msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" msgstr "\\%-10[get-info-help-node] 调用 Info 教程。\n" -#: info/infodoc.c:53 info/infodoc.c:102 -msgid "" -"Selecting other nodes:\n" -"----------------------\n" -msgstr "" -"选择其它节点:\n" -"----------------------\n" +#: info/infodoc.c:51 +msgid "\\%-10[prev-line] Move up one line.\n" +msgstr "\\%-10[prev-line] 向上移动一行。\n" + +#: info/infodoc.c:52 +msgid "\\%-10[next-line] Move down one line.\n" +msgstr "\\%-10[next-line] 向下移动一行。\n" + +#: info/infodoc.c:53 +msgid "\\%-10[scroll-backward] Scroll backward one screenful.\n" +msgstr "\\%-10[scroll-backward] 向后滚动一页。\n" + +#: info/infodoc.c:54 +msgid "\\%-10[scroll-forward] Scroll forward one screenful.\n" +msgstr "\\%-10[scroll-forward] 向前滚动一页。\n" #: info/infodoc.c:55 -msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" -msgstr "\\%-10[next-node] 移动到本节点的“下一个”节点。\n" +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "\\%-10[beginning-of-node] 移动到本节点的开头。\n" #: info/infodoc.c:56 -msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" -msgstr "\\%-10[prev-node] 移动到本节点的“上一个”节点。\n" - -#: info/infodoc.c:57 -msgid "\\%-10[up-node] Move \"up\" from this node.\n" -msgstr "\\%-10[up-node] 移动到本节点的“上层”节点。\n" +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "\\%-10[end-of-node] 移动到本节点的末尾。\n" #: info/infodoc.c:58 -msgid "" -"\\%-10[menu-item] Pick menu item specified by name.\n" -" Picking a menu item causes another node to be selected.\n" -msgstr "" -"\\%-10[menu-item] 选取由名称指定的菜单项目。\n" -" 选取一个菜单项目导致选中另一个节点。\n" +msgid "\\%-10[move-to-next-xref] Skip to the next hypertext link.\n" +msgstr "\\%-10[move-to-next-xref] 跳转到下一个超文本连接。\n" -#: info/infodoc.c:60 +#: info/infodoc.c:59 msgid "" -"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" -msgstr "\\%-10[xref-item] 跟随交叉引用。读取引用的名称。\n" +"\\%-10[select-reference-this-line] Follow the hypertext link under the " +"cursor.\n" +msgstr "\\%-10[select-reference-this-line] 跟随光标下的超文本连接。\n" -#: info/infodoc.c:61 -msgid "\\%-10[history-node] Move to the last node seen in this window.\n" -msgstr "\\%-10[history-node] 移动到本窗口的最后一个可见的节点。\n" +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Go back to the last node seen in this window.\n" +msgstr "\\%-10[history-node] 移动到本窗口的最后阅读过的节点。\n" #: info/infodoc.c:62 -msgid "" -"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" -msgstr "\\%-10[move-to-next-xref] 跳转到本节点中的下一个超文本连接。\n" +msgid "\\%-10[global-prev-node] Go to the previous node in the document.\n" +msgstr "\\%-10[global-prev-node] 移动到本文档的上一个节点。\n" #: info/infodoc.c:63 -msgid "" -"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " -"node.\n" -msgstr "\\%-10[move-to-prev-xref] 跳转到本节点中的上一个超文本连接。\n" +msgid "\\%-10[global-next-node] Go to the next node in the document.\n" +msgstr "\\%-10[global-next-node] 移动到本文档的下一个节点。\n" #: info/infodoc.c:64 -msgid "" -"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" -msgstr "\\%-10[select-reference-this-line] 跟随光标下的超文本连接。\n" +msgid "\\%-10[prev-node] Go to the previous node on this level.\n" +msgstr "\\%-10[prev-node] 移动到同级的上一个节点。\n" #: info/infodoc.c:65 -msgid "" -"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" -"node] (DIR)'.\n" -msgstr "\\%-10[dir-node] 移动到“directory”节点。等价于“\\[goto-node] (DIR)”。\n" +msgid "\\%-10[next-node] Go to the next node on this level.\n" +msgstr "\\%-10[next-node] 移动到同级的下一个节点。\n" #: info/infodoc.c:66 -msgid "" -"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" -msgstr "\\%-10[top-node] 移动到顶层节点。等价于“\\[goto-node] Top”。\n" +msgid "\\%-10[up-node] Go up one level.\n" +msgstr "\\%-10[up-node] 上移一层。\n" -#: info/infodoc.c:68 info/infodoc.c:116 -msgid "" -"Moving within a node:\n" -"---------------------\n" -msgstr "" -"在一个节点中移动:\n" -"---------------------\n" +#: info/infodoc.c:67 +msgid "\\%-10[top-node] Go to the top node of this document.\n" +msgstr "\\%-10[top-node] 移到此文档的顶层节点。\n" + +#: info/infodoc.c:68 +msgid "\\%-10[dir-node] Go to the main `directory' node.\n" +msgstr "\\%-10[dir-node] 移动到主“目录”节点。\n" #: info/infodoc.c:70 -msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" -msgstr "\\%-10[beginning-of-node] 移动到本节点的开头。\n" +msgid "1...9 Pick the first...ninth item in this node's menu.\n" +msgstr "1...9\t\t选取节点菜单中的第一至第九个项目。\n" #: info/infodoc.c:71 -msgid "\\%-10[end-of-node] Go to the end of this node.\n" -msgstr "\\%-10[end-of-node] 移动到本节点的末尾。\n" +msgid "\\%-10[last-menu-item] Pick the last item in this node's menu.\n" +msgstr "\\%-10[last-menu-item] 选取节点菜单的最后一个项目。\n" #: info/infodoc.c:72 -msgid "\\%-10[next-line] Scroll forward 1 line.\n" -msgstr "\\%-10[next-line] 向前一行滚动。\n" +msgid "\\%-10[menu-item] Pick a menu item specified by name.\n" +msgstr "\\%-10[menu-item] 选取由名称指定的菜单项目。\n" #: info/infodoc.c:73 -msgid "\\%-10[prev-line] Scroll backward 1 line.\n" -msgstr "\\%-10[prev-line] 向后一行滚动。\n" +msgid "\\%-10[xref-item] Follow a cross reference specified by name.\n" +msgstr "\\%-10[xref-item] 按照交叉参考指定名称。\n" #: info/infodoc.c:74 -msgid "\\%-10[scroll-forward] Scroll forward a page.\n" -msgstr "\\%-10[scroll-forward] 向前滚动一页。\n" - -#: info/infodoc.c:75 -msgid "\\%-10[scroll-backward] Scroll backward a page.\n" -msgstr "\\%-10[scroll-backward] 向后滚动一页。\n" +msgid "\\%-10[goto-node] Go to a node specified by name.\n" +msgstr "\\%-10[goto-node] 移动到由名字指定的节点。\n" -#: info/infodoc.c:77 info/infodoc.c:125 -msgid "" -"Other commands:\n" -"---------------\n" -msgstr "" -"其它命令:\n" -"---------------\n" +#: info/infodoc.c:76 +msgid "\\%-10[search] Search forward for a specified string.\n" +msgstr "\\%-10[search] 向前搜索指定的字符串。\n" + +#: info/infodoc.c:77 +msgid "\\%-10[search-previous] Search for previous occurrence.\n" +msgstr "\\%-10[search-previous] 查找上一个出现点。\n" + +#: info/infodoc.c:78 +msgid "\\%-10[search-next] Search for next occurrence.\n" +msgstr "\\%-10[search-next] 查找下一个出现点。\n" #: info/infodoc.c:79 -msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" -msgstr "\\%-10[menu-digit] 选取节点菜单中的第一至第九个项目。\n" - -#: info/infodoc.c:80 -msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" -msgstr "\\%-10[last-menu-item] 选取节点菜单的最后一个项目。\n" - -#: info/infodoc.c:81 msgid "" -"\\%-10[index-search] Search for a specified string in the index entries of " -"this Info\n" -" file, and select the node referenced by the first entry " -"found.\n" +"\\%-10[index-search] Search for a specified string in the index, and\n" +" select the node referenced by the first entry found.\n" msgstr "" -"\\%-10[index-search] 在本 Info 文件的索引条目中搜索指定的字符串,\n" +"\\%-10[index-search] 在索引条目中搜索指定的字符串,\n" " 并选择第一个找到的条目所引用的节点。\n" -#: info/infodoc.c:83 -msgid "" -"\\%-10[goto-node] Move to node specified by name.\n" -" You may include a filename as well, as in (FILENAME)NODENAME.\n" -msgstr "" -"\\%-10[goto-node] 移动到由名字指定的节点。\n" -" 您还可以以 (文件名)节点名 的形式给出文件名。\n" - -#: info/infodoc.c:85 -msgid "" -"\\%-10[search] Search forward for a specified string\n" -" and select the node in which the next occurrence is found.\n" -msgstr "" -"\\%-10[search] 向前搜索指定的字符串\n" -" 并选择所找到的下一个实例所在的节点。\n" +#: info/infodoc.c:81 +msgid "\\%-10[abort-key] Cancel the current operation.\n" +msgstr "\\%-10[abort-key] 取消当前操作。\n" -#: info/infodoc.c:87 +#: info/infodoc.c:89 msgid "" -"\\%-10[search-backward] Search backward for a specified string\n" -" and select the node in which the previous occurrence is " -"found.\n" +"Basic Commands in Info Windows\n" +"******************************\n" msgstr "" -"\\%-10[search-backward] 向后搜索指定的字符串\n" -" 并选择所找到的上一个实例所在的节点。\n" +"Info 窗口中的基本命令\n" +"******************************\n" -#: info/infodoc.c:98 +#: info/infodoc.c:92 #, c-format msgid " %-10s Quit this help.\n" msgstr " %-10s 退出本求助。\n" -#: info/infodoc.c:99 +#: info/infodoc.c:93 #, c-format msgid " %-10s Quit Info altogether.\n" msgstr " %-10s 一并退出 Info。\n" -#: info/infodoc.c:100 +#: info/infodoc.c:94 #, c-format msgid " %-10s Invoke the Info tutorial.\n" msgstr " %-10s 调用 Info 教程。\n" -#: info/infodoc.c:104 +#: info/infodoc.c:98 #, c-format msgid " %-10s Move to the `next' node of this node.\n" msgstr " %-10s 移动到本节点的“下一个”节点。\n" -#: info/infodoc.c:105 +#: info/infodoc.c:99 #, c-format msgid " %-10s Move to the `previous' node of this node.\n" msgstr " %-10s 移动到本节点的“上一个”节点。\n" -#: info/infodoc.c:106 +#: info/infodoc.c:100 #, c-format msgid " %-10s Move `up' from this node.\n" msgstr " %-10s 移动到本节点的“上层”节点。\n" -#: info/infodoc.c:107 +#: info/infodoc.c:101 #, c-format -msgid " %-10s Pick menu item specified by name.\n" -msgstr " %-10s 选取由名称指定的菜单项目。\n" - -#: info/infodoc.c:108 msgid "" +" %-10s Pick menu item specified by name.\n" " Picking a menu item causes another node to be selected.\n" -msgstr " 选取一个菜单项目将选中另一个节点。\n" +msgstr "" +" %-10s 选取由名称指定的菜单项目。\n" +" 选取一个菜单项目导致选中另一个节点。\n" -#: info/infodoc.c:109 +#: info/infodoc.c:103 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr " %-10s 跟随交叉引用。读取引用的名称。\n" -#: info/infodoc.c:110 +#: info/infodoc.c:104 #, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr " %-10s 移动到本窗口中的最后一个可见的节点。\n" -#: info/infodoc.c:111 +#: info/infodoc.c:105 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr " %-10s 跳转到本节点中的下一个超文本连接。\n" -#: info/infodoc.c:112 +#: info/infodoc.c:106 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" msgstr " %-10s 跟随光标位置的超文本连接。\n" -#: info/infodoc.c:113 +#: info/infodoc.c:107 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr " %-10s 移动到“directory”节点。等价于“g (DIR)”。\n" -#: info/infodoc.c:114 +#: info/infodoc.c:108 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr " %-10s 移动到顶层节点。等价于“g Top”。\n" -#: info/infodoc.c:118 +#: info/infodoc.c:110 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" +"在一个节点中移动:\n" +"---------------------\n" + +#: info/infodoc.c:112 #, c-format msgid " %-10s Scroll forward a page.\n" msgstr " %-10s 向前滚动一页。\n" -#: info/infodoc.c:119 +#: info/infodoc.c:113 #, c-format msgid " %-10s Scroll backward a page.\n" msgstr " %-10s 向后滚动一页。\n" -#: info/infodoc.c:120 +#: info/infodoc.c:114 #, c-format msgid " %-10s Go to the beginning of this node.\n" msgstr " %-10s 转移到本节点的开头。\n" -#: info/infodoc.c:121 +#: info/infodoc.c:115 #, c-format msgid " %-10s Go to the end of this node.\n" msgstr " %-10s 转移到本节点的末尾。\n" -#: info/infodoc.c:122 +#: info/infodoc.c:116 #, c-format msgid " %-10s Scroll forward 1 line.\n" msgstr " %-10s 向前滚动一行。\n" -#: info/infodoc.c:123 +#: info/infodoc.c:117 #, c-format msgid " %-10s Scroll backward 1 line.\n" msgstr " %-10s 向后滚动一行。\n" -#: info/infodoc.c:127 +#: info/infodoc.c:119 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" +"其它命令:\n" +"---------------\n" + +#: info/infodoc.c:121 #, c-format -msgid " %-10s Pick first ... ninth item in node's menu.\n" +msgid " %-10s Pick first...ninth item in node's menu.\n" msgstr " %-10s 选取节点菜单中的第一至第九个项目。\n" -#: info/infodoc.c:128 +#: info/infodoc.c:122 #, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr " %-10s 选取节点菜单中的最后一个项目。\n" -#: info/infodoc.c:129 +#: info/infodoc.c:125 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" -msgstr " %-10s 在本 Info 文件中的索引条目中搜索指定的字符串,\n" - -#: info/infodoc.c:130 -msgid "" " file, and select the node referenced by the first entry " "found.\n" -msgstr " 并选择第一个找到的条目所引用的节点。\n" +msgstr "" +" %-10s 在本 Info 文件的索引条目中搜索指定的字符串,\n" +" 并选择第一个找到的条目所引用的节点。\n" -#: info/infodoc.c:131 +#: info/infodoc.c:127 #, c-format -msgid " %-10s Move to node specified by name.\n" -msgstr " %-10s 移动到由名字指定的节点。\n" - -#: info/infodoc.c:132 msgid "" +" %-10s Move to node specified by name.\n" " You may include a filename as well, as in (FILENAME)NODENAME.\n" -msgstr " 您还可以同时给出文件名,形式为 (文件名)节点名。\n" +msgstr "" +" %-10s 移动到由名字指定的节点。\n" +" 您也可在 (FILENAME)NODENAME 中包含文件名。\n" -#: info/infodoc.c:133 +#: info/infodoc.c:129 #, c-format -msgid " %-10s Search forward for a specified string,\n" -msgstr " %-10s 向前搜索指定的字符串,\n" - -#: info/infodoc.c:134 info/infodoc.c:136 msgid "" +" %-10s Search forward for a specified string,\n" " and select the node in which the next occurrence is found.\n" -msgstr " 并选择找到的下一个实例所在的节点。\n" +msgstr "" +" %-10s 向前搜索指定的字符串,\n" +" 并选择所找到的下一个实例所在的节点。\n" -#: info/infodoc.c:135 +#: info/infodoc.c:131 #, c-format -msgid " %-10s Search backward for a specified string\n" -msgstr " %-10s 向后搜索指定的字符串\n" +msgid "" +" %-10s Search backward for a specified string,\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +" %-10s 向后搜索指定的字符串,\n" +" 并选择所找到的下一个实例所在的节点。\n" -#: info/infodoc.c:316 +#: info/infodoc.c:312 msgid "The current search path is:\n" msgstr "当前搜索路径为:\n" -#: info/infodoc.c:320 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" @@ -698,7 +822,7 @@ "Info 窗口中可用的命令:\n" "\n" -#: info/infodoc.c:324 +#: info/infodoc.c:320 msgid "" "Commands available in the echo area:\n" "\n" @@ -706,7 +830,7 @@ "回显区中可用的命令:\n" "\n" -#: info/infodoc.c:347 +#: info/infodoc.c:343 #, c-format msgid "" "The following commands can only be invoked via %s:\n" @@ -715,7 +839,7 @@ "以下命令只能通过 %s 调用:\n" "\n" -#: info/infodoc.c:351 +#: info/infodoc.c:347 msgid "" "The following commands cannot be invoked at all:\n" "\n" @@ -723,82 +847,73 @@ "以下命令根本无法调用:\n" "\n" -#: info/infodoc.c:375 -msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" -msgstr "--- 用“\\[history-node]”或“\\[kill-node]”退出 ---\n" - -#: info/infodoc.c:485 +#: info/infodoc.c:477 msgid "Display help message" msgstr "显示求助消息" -#: info/infodoc.c:503 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "访问 Info 节点“(info)Help”" -#: info/infodoc.c:641 +#: info/infodoc.c:633 msgid "Print documentation for KEY" msgstr "打印关于 KEY 的文档" -#: info/infodoc.c:653 +#: info/infodoc.c:645 #, c-format msgid "Describe key: %s" msgstr "说明按键:%s" -#: info/infodoc.c:664 +#: info/infodoc.c:656 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s 未定义。" -#: info/infodoc.c:680 info/infodoc.c:709 +#: info/infodoc.c:672 info/infodoc.c:701 #, c-format msgid "%s is undefined." msgstr "%s 未定义。" -#: info/infodoc.c:730 +#: info/infodoc.c:722 #, c-format msgid "%s is defined to %s." msgstr "%s 被定义为 %s。" -#: info/infodoc.c:1153 +#: info/infodoc.c:1146 msgid "Show what to type to execute a given command" msgstr "显示执行给定命令所需的按键" -#: info/infodoc.c:1157 +#: info/infodoc.c:1150 msgid "Where is command: " -msgstr "命令在哪儿: " +msgstr "命令为: " -#: info/infodoc.c:1179 +#: info/infodoc.c:1172 #, c-format msgid "`%s' is not on any keys" msgstr "“%s”未绑定到任何按键" -#: info/infodoc.c:1186 +#: info/infodoc.c:1179 #, c-format msgid "%s can only be invoked via %s." msgstr "%s 不能通过 %s 调用。" -#: info/infodoc.c:1190 +#: info/infodoc.c:1183 #, c-format msgid "%s can be invoked via %s." msgstr "%s 可以通过 %s 调用。" -#: info/infodoc.c:1195 +#: info/infodoc.c:1188 #, c-format msgid "There is no function named `%s'" msgstr "没有名为“%s”的函数" -#: info/infokey.c:145 -#, c-format +#: info/infodoc.c:96 msgid "" -"Copyright (C) %s Free Software Foundation, Inc.\n" -"There is NO warranty. You may redistribute this software\n" -"under the terms of the GNU General Public License.\n" -"For more information about these matters, see the files named COPYING.\n" -msgstr "" -"版权所有 (C) %s 自由软件基金会。\n" -"本软件没有任何担保。您可以按照通用\n" -"公共许可证(GPL)的条款发行本软件。\n" -"这方面的详情,请阅读名为 COPYING 的文件。\n" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "" +"选择其它节点:\n" +"----------------------\n" #: info/infokey.c:170 msgid "incorrect number of arguments" @@ -907,83 +1022,83 @@ " --help 显示该求助信息并退出。\n" " --version 显示版本信息并退出。\n" -#: info/infomap.c:1500 +#: info/infomap.c:955 #, c-format msgid "Ignoring invalid infokey file `%s' - too small" msgstr "忽略非法的 infokey 文件“%s” - 太小" -#: info/infomap.c:1503 +#: info/infomap.c:958 #, c-format msgid "Ignoring invalid infokey file `%s' - too big" msgstr "忽略非法的 infokey 文件“%s” - 太大" -#: info/infomap.c:1516 +#: info/infomap.c:971 #, c-format msgid "Error reading infokey file `%s' - short read" msgstr "读入 infokey 文件“%s”时出错 - 读入中断" -#: info/infomap.c:1535 +#: info/infomap.c:990 #, c-format msgid "" "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" msgstr "非法的 infokey 文件“%s” (错误的 magic 编号) -- 运行 infokey 以便更新" -#: info/infomap.c:1544 +#: info/infomap.c:999 #, c-format msgid "Your infokey file `%s' is out of date -- run infokey to update it" msgstr "您的 infokey 文件“%s” 过时了 -- 运行 infokey 以便更新" -#: info/infomap.c:1560 +#: info/infomap.c:1015 #, c-format msgid "" "Invalid infokey file `%s' (bad section length) -- run infokey to update it" msgstr "非法的 infokey 文件“%s” (错误的节长度) -- 运行 infokey 以便更新" -#: info/infomap.c:1581 +#: info/infomap.c:1036 #, c-format msgid "" "Invalid infokey file `%s' (bad section code) -- run infokey to update it" msgstr "非法的 infokey 文件“%s” (错误的节编码) -- 运行 infokey 以便更新" -#: info/infomap.c:1716 +#: info/infomap.c:1171 msgid "Bad data in infokey file -- some key bindings ignored" msgstr "infokey 文件中的错误数据 -- 忽略某些按键绑定" -#: info/infomap.c:1766 +#: info/infomap.c:1221 msgid "Bad data in infokey file -- some var settings ignored" msgstr "infokey 文件中的错误数据 -- 忽略某些变量设置" -#: info/m-x.c:69 +#: info/m-x.c:68 msgid "Read the name of an Info command and describe it" msgstr "读取 Info 命令名称并说明它" -#: info/m-x.c:73 +#: info/m-x.c:72 msgid "Describe command: " msgstr "说明命令: " -#: info/m-x.c:96 +#: info/m-x.c:95 msgid "Read a command name in the echo area and execute it" msgstr "在回显区读入命令名并执行它" -#: info/m-x.c:140 +#: info/m-x.c:139 msgid "Cannot execute an `echo-area' command here." msgstr "无法在这里运行“回显区”命令。" -#: info/m-x.c:154 +#: info/m-x.c:153 #, c-format msgid "Undefined command: %s" msgstr "未定义的命令: %s" -#: info/m-x.c:160 +#: info/m-x.c:159 msgid "Set the height of the displayed window" msgstr "设定显示窗口的高度" -#: info/m-x.c:173 +#: info/m-x.c:172 #, c-format msgid "Set screen height to (%d): " msgstr "将屏幕高度设置为 (%d): " -#: info/makedoc.c:162 info/makedoc.c:170 +#: info/makedoc.c:166 info/makedoc.c:174 #, c-format msgid "" " Source files groveled to make this file include:\n" @@ -992,12 +1107,12 @@ " 整理源文件以使本文件包括:\n" "\n" -#: info/makedoc.c:550 +#: info/makedoc.c:556 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "无法操作文件 %s。\n" -#: info/nodemenu.c:31 +#: info/nodemenu.c:30 msgid "" "\n" "* Menu:\n" @@ -1009,7 +1124,7 @@ " (文件)节点 行 大小 含有文件\n" " ---------- ----- ---- ---------------" -#: info/nodemenu.c:202 +#: info/nodemenu.c:201 msgid "" "Here is the menu of nodes you have recently visited.\n" "Select one from this menu, or use `\\[history-node]' in another window.\n" @@ -1017,526 +1132,530 @@ "这里是您最近访问节点的菜单。\n" "从菜单中选择一个,或在其它窗口中使用“\\[history-node]”。\n" -#: info/nodemenu.c:224 +#: info/nodemenu.c:223 msgid "Make a window containing a menu of all of the currently visited nodes" msgstr "使一个窗口含有一个包括所有当前访问节点的菜单" -#: info/nodemenu.c:304 +#: info/nodemenu.c:303 msgid "Select a node which has been previously visited in a visible window" msgstr "选择一个已经在可见的窗口中访问的节点" -#: info/nodemenu.c:317 +#: info/nodemenu.c:316 msgid "Select visited node: " msgstr "选择已访问的节点: " -#: info/nodemenu.c:337 info/session.c:2264 +#: info/nodemenu.c:336 info/session.c:2578 #, c-format msgid "The reference disappeared! (%s)." msgstr "引用消失了!(%s)。" -#: info/session.c:162 +#: info/search.c:166 +#, c-format +msgid "regexp error: %s" +msgstr "正则表达式错误: %s" + +#: info/session.c:164 #, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "欢迎使用 Info %s 版。输入 \\[get-help-window] 以获得帮助,\\[menu-item] 将得到菜单。" -#: info/session.c:620 +#: info/session.c:625 msgid "Move down to the next line" msgstr "向下移动到下一行" -#: info/session.c:635 +#: info/session.c:661 msgid "Move up to the previous line" msgstr "向上移动到上一行" -#: info/session.c:650 +#: info/session.c:931 msgid "Move to the end of the line" msgstr "移动到行的末尾" -#: info/session.c:670 +#: info/session.c:942 msgid "Move to the start of the line" msgstr "移动到行的开头" -#: info/session.c:860 makeinfo/node.c:1424 +#: info/session.c:1142 msgid "Next" msgstr "下一个" -#: info/session.c:863 -msgid "Following Next node..." -msgstr "跟随下一个节点..." - -#: info/session.c:881 -msgid "Selecting first menu item..." -msgstr "选择第一个菜单项..." - -#: info/session.c:893 -msgid "Selecting Next node..." -msgstr "选择下一个节点..." - -#: info/session.c:964 -#, c-format -msgid "Moving Up %d time(s), then Next." -msgstr "向上移动 %d 次,而后后移。" - -#: info/session.c:988 +#: info/session.c:1158 info/session.c:1283 msgid "No more nodes within this document." msgstr "本文档中没有更多的节点。" -#: info/session.c:1011 +#: info/session.c:1309 msgid "No `Prev' for this node." msgstr "本节点没有“上一个”。" -#: info/session.c:1014 info/session.c:1073 -msgid "Moving Prev in this window." -msgstr "在本窗口中向上移动。" - -#: info/session.c:1030 +#: info/session.c:1329 msgid "No `Prev' or `Up' for this node within this document." msgstr "在本文档中没有本节点的“上一个”或“上层”节点。" -#: info/session.c:1034 -msgid "Moving Up in this window." -msgstr "在本窗口中向上层移动" - -#: info/session.c:1084 -msgid "Moving to `Prev's last menu item." -msgstr "移动到前一个的最后一个菜单项目。" - -#: info/session.c:1095 +#: info/session.c:1391 msgid "Move forwards or down through node structure" msgstr "在节点结构中向前或向下层移动" -#: info/session.c:1111 +#: info/session.c:1407 msgid "Move backwards or up through node structure" msgstr "在节点结构中向后或向上层移动" -#: info/session.c:1205 +#: info/session.c:1508 msgid "Scroll forward in this window" msgstr "在本窗口中向前滚动" -#: info/session.c:1213 +#: info/session.c:1516 msgid "Scroll forward in this window and set default window size" msgstr "在本窗口中向前滚动并设置为默认窗口大小" -#: info/session.c:1221 +#: info/session.c:1524 msgid "Scroll forward in this window staying within node" msgstr "在本窗口中向前滚动(不穿越节点)" -#: info/session.c:1229 +#: info/session.c:1532 msgid "" "Scroll forward in this window staying within node and set default window size" msgstr "在本窗口中向前滚动(不穿越节点)并设置默认窗口大小" -#: info/session.c:1237 +#: info/session.c:1540 msgid "Scroll backward in this window" msgstr "在本窗口中向后滚动" -#: info/session.c:1245 +#: info/session.c:1548 msgid "Scroll backward in this window and set default window size" msgstr "在本窗口中向后滚动并设置为默认窗口大小" -#: info/session.c:1254 +#: info/session.c:1557 msgid "Scroll backward in this window staying within node" msgstr "在本窗口中向后滚动(不穿越节点)" -#: info/session.c:1262 +#: info/session.c:1565 msgid "" "Scroll backward in this window staying within node and set default window " "size" msgstr "在本窗口中向后滚动(不穿越节点)并设置为默认窗口大小" -#: info/session.c:1270 +#: info/session.c:1573 msgid "Move to the start of this node" msgstr "移动到本节点的开头" -#: info/session.c:1277 +#: info/session.c:1580 msgid "Move to the end of this node" msgstr "移动到本节点的末尾" -#: info/session.c:1284 +#: info/session.c:1587 msgid "Scroll down by lines" msgstr "按行向下滚动" -#: info/session.c:1301 +#: info/session.c:1604 msgid "Scroll up by lines" msgstr "按行向上滚动" -#: info/session.c:1319 +#: info/session.c:1622 msgid "Scroll down by half screen size" msgstr "向下滚动半个屏幕" -#: info/session.c:1345 +#: info/session.c:1648 msgid "Scroll up by half screen size" msgstr "向上滚动半个屏幕" -#: info/session.c:1374 +#: info/session.c:1677 msgid "Select the next window" msgstr "选择下一个窗口" -#: info/session.c:1413 +#: info/session.c:1716 msgid "Select the previous window" msgstr "选择上一个窗口" -#: info/session.c:1464 +#: info/session.c:1767 msgid "Split the current window" msgstr "拆分当前窗口" -#: info/session.c:1545 +#: info/session.c:1848 msgid "Delete the current window" msgstr "删除当前窗口" -#: info/session.c:1553 +#: info/session.c:1856 msgid "Cannot delete a permanent window" msgstr "无法删除永久窗口" -#: info/session.c:1585 +#: info/session.c:1888 msgid "Delete all other windows" msgstr "删除所有其它窗口" -#: info/session.c:1631 +#: info/session.c:1934 msgid "Scroll the other window" msgstr "滚动其它窗口" -#: info/session.c:1652 +#: info/session.c:1955 msgid "Scroll the other window backward" msgstr "向后滚动其它窗口" -#: info/session.c:1658 +#: info/session.c:1961 msgid "Grow (or shrink) this window" msgstr "扩大(或缩小)本窗口" -#: info/session.c:1669 +#: info/session.c:1972 msgid "Divide the available screen space among the visible windows" msgstr "在可见的窗口间分配可用的屏幕空间" -#: info/session.c:1676 +#: info/session.c:1979 msgid "Toggle the state of line wrapping in the current window" msgstr "在当前窗口中切换行卷绕状态" -#: info/session.c:1848 +#: info/session.c:1986 +msgid "Toggle the usage of regular expressions in searches" +msgstr "切换查寻时正则表达式的用法" + +#: info/session.c:1990 +msgid "Using regular expressions for searches." +msgstr "使用正则表达式来查寻" + +#: info/session.c:1991 +msgid "Using literal strings for searches." +msgstr "使用普通字符串来查寻" + +#: info/session.c:2162 msgid "Select the Next node" msgstr "选择下一个节点" -#: info/session.c:1856 +#: info/session.c:2170 msgid "Select the Prev node" msgstr "选择上一个节点" -#: info/session.c:1864 +#: info/session.c:2178 msgid "Select the Up node" msgstr "选择上层节点" -#: info/session.c:1871 +#: info/session.c:2185 msgid "Select the last node in this file" msgstr "选择本文件的最后一个节点" -#: info/session.c:1898 info/session.c:1931 +#: info/session.c:2212 info/session.c:2245 msgid "This window has no additional nodes" msgstr "该窗口没有附加节点" -#: info/session.c:1904 +#: info/session.c:2218 msgid "Select the first node in this file" msgstr "选择本文件的第一个节点" -#: info/session.c:1938 +#: info/session.c:2252 msgid "Select the last item in this node's menu" msgstr "选择本节点菜单中的最后一项" -#: info/session.c:1944 +#: info/session.c:2258 msgid "Select this menu item" msgstr "选择本菜单项目" -#: info/session.c:1977 +#: info/session.c:2291 #, c-format msgid "There aren't %d items in this menu." msgstr "本菜单中没有第 %d 个项目。" -#: info/session.c:2171 info/session.c:2172 +#: info/session.c:2485 info/session.c:2486 #, c-format msgid "Menu item (%s): " msgstr "菜单项 (%s): " -#: info/session.c:2175 +#: info/session.c:2489 msgid "Menu item: " msgstr "菜单项: " -#: info/session.c:2182 info/session.c:2183 +#: info/session.c:2496 info/session.c:2497 #, c-format msgid "Follow xref (%s): " msgstr "跟随交叉引用 (%s): " -#: info/session.c:2186 +#: info/session.c:2500 msgid "Follow xref: " msgstr "跟随交叉引用: " -#: info/session.c:2315 +#: info/session.c:2629 msgid "Read a menu item and select its node" msgstr "读取菜单项并选择它的节点" -#: info/session.c:2323 +#: info/session.c:2637 msgid "Read a footnote or cross reference and select its node" msgstr "读取脚注或交叉引用并选择它的节点" -#: info/session.c:2329 +#: info/session.c:2643 msgid "Move to the start of this node's menu" msgstr "移动到本节点菜单的开头" -#: info/session.c:2353 +#: info/session.c:2667 msgid "Visit as many menu items at once as possible" msgstr "立刻访问尽可能多的菜单项" -#: info/session.c:2381 +#: info/session.c:2695 msgid "Read a node name and select it" msgstr "读取节点名并选择它" -#: info/session.c:2436 info/session.c:2441 +#: info/session.c:2750 info/session.c:2755 msgid "Goto node: " msgstr "转到节点: " -#: info/session.c:2505 +#: info/session.c:2819 #, c-format msgid "No menu in node `%s'." msgstr "节点“%s”中没有菜单。" -#: info/session.c:2551 +#: info/session.c:2865 #, c-format msgid "No menu item `%s' in node `%s'." msgstr "节点“%2$s”中没有菜单项“%1$s”。" -#: info/session.c:2581 +#: info/session.c:2895 #, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "无法在“%2$s”中找到由“%1$s”引用的节点。" -#: info/session.c:2631 +#: info/session.c:2945 msgid "Read a list of menus starting from dir and follow them" msgstr "读取自 dir 开始的菜单的列表并跟随它们" -#: info/session.c:2633 +#: info/session.c:2947 msgid "Follow menus: " msgstr "跟随菜单: " -#: info/session.c:2826 +#: info/session.c:3140 msgid "Find the node describing program invocation" msgstr "寻找说明程序调用的节点" -#: info/session.c:2828 +#: info/session.c:3142 #, c-format msgid "Find Invocation node of [%s]: " msgstr "寻找 [%s] 的调用节点: " -#: info/session.c:2866 +#: info/session.c:3180 msgid "Read a manpage reference and select it" msgstr "读取一个 man 手册的引用并选择它" -#: info/session.c:2870 +#: info/session.c:3184 msgid "Get Manpage: " msgstr "获取 man 手册: " -#: info/session.c:2900 +#: info/session.c:3214 msgid "Select the node `Top' in this file" msgstr "选择本文件中的“顶”节点" -#: info/session.c:2906 +#: info/session.c:3220 msgid "Select the node `(dir)'" msgstr "选择节点“(dir)”" -#: info/session.c:2923 info/session.c:2925 +#: info/session.c:3237 info/session.c:3239 #, c-format msgid "Kill node (%s): " msgstr "删除节点 (%s): " -#: info/session.c:2977 +#: info/session.c:3291 #, c-format msgid "Cannot kill node `%s'" msgstr "无法删除节点“%s”" -#: info/session.c:2987 +#: info/session.c:3301 msgid "Cannot kill the last node" msgstr "无法删除最后的节点" -#: info/session.c:3073 +#: info/session.c:3387 msgid "Select the most recently selected node" msgstr "选择最近选择的节点" -#: info/session.c:3079 +#: info/session.c:3393 msgid "Kill this node" msgstr "删除本节点" -#: info/session.c:3087 +#: info/session.c:3401 msgid "Read the name of a file and select it" msgstr "读取文件名并选择它" -#: info/session.c:3091 +#: info/session.c:3405 msgid "Find file: " msgstr "寻找文件: " -#: info/session.c:3108 +#: info/session.c:3422 #, c-format msgid "Cannot find `%s'." msgstr "无法寻找“%s”。" -#: info/session.c:3151 info/session.c:3269 +#: info/session.c:3465 info/session.c:3583 #, c-format msgid "Could not create output file `%s'." msgstr "无法创建输出文件“%s”。" -#: info/session.c:3165 info/session.c:3287 info/session.c:3347 +#: info/session.c:3479 info/session.c:3601 info/session.c:3661 msgid "Done." msgstr "完成。" -#: info/session.c:3220 +#: info/session.c:3534 #, c-format msgid "Writing node %s..." msgstr "正在写入节点 %s..." -#: info/session.c:3296 +#: info/session.c:3610 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "通过管道将本节点的内容输出到 INFO_PRINT_COMMAND" -#: info/session.c:3331 +#: info/session.c:3645 #, c-format msgid "Cannot open pipe to `%s'." msgstr "无法打开到“%s”的管道。" -#: info/session.c:3337 +#: info/session.c:3651 #, c-format msgid "Printing node %s..." msgstr "正在打印节点 %s..." -#: info/session.c:3567 +#: info/session.c:3900 +msgid "Search continued from the end of the document." +msgstr "从文档底部继续查寻。" + +#: info/session.c:3905 +msgid "Search continued from the beginning of the document." +msgstr "从此文档的开头继续查找。" + +#: info/session.c:3922 #, c-format msgid "Searching subfile %s ..." msgstr "正在搜索子文件 %s ..." -#: info/session.c:3619 +#: info/session.c:3979 msgid "Read a string and search for it case-sensitively" msgstr "读取一个字符串并以大小写敏感的方式搜索它" -#: info/session.c:3626 +#: info/session.c:3986 msgid "Read a string and search for it" msgstr "读取一个字符串并搜索它" -#: info/session.c:3634 +#: info/session.c:3994 msgid "Read a string and search backward for it" msgstr "读取一个字符串并向后搜索它" -#: info/session.c:3670 info/session.c:3677 +#: info/session.c:4030 info/session.c:4036 #, c-format -msgid "%s%sfor string [%s]: " -msgstr "%2$s%1$s字符串 [%3$s]: " +msgid "%s%s%s [%s]: " +msgstr "%s%s%s [%s]: " + +#: info/session.c:4031 info/session.c:4037 +msgid "Regexp search" +msgstr "正则表达式查找" + +#: info/session.c:4032 info/session.c:4038 +msgid " case-sensitively" +msgstr " 大小写敏感" -#: info/session.c:3671 info/session.c:3678 -msgid "Search backward" -msgstr "向后搜索" +#: info/session.c:4033 info/session.c:4039 +msgid " backward" +msgstr " 向后搜索" -#: info/session.c:3672 info/session.c:3678 +#: info/session.c:4037 msgid "Search" msgstr "搜索" -#: info/session.c:3673 info/session.c:3679 -msgid " case-sensitively " -msgstr " 大小写敏感地 " - -#: info/session.c:3674 info/session.c:3679 -msgid " " -msgstr " " - -#: info/session.c:3718 +#: info/session.c:4079 msgid "Search failed." msgstr "搜索失败。" -#: info/session.c:3736 +#: info/session.c:4097 msgid "Repeat last search in the same direction" msgstr "以相同的方向重复最后的搜索" -#: info/session.c:3739 info/session.c:3749 +#: info/session.c:4100 info/session.c:4110 msgid "No previous search string" msgstr "没有上次搜索字符串" -#: info/session.c:3746 +#: info/session.c:4107 msgid "Repeat last search in the reverse direction" msgstr "以相反的方向重复最后的搜索" -#: info/session.c:3765 info/session.c:3771 +#: info/session.c:4126 info/session.c:4132 msgid "Search interactively for a string as you type it" msgstr "在你输入的同时交互式地搜索字符串" -#: info/session.c:3851 +#: info/session.c:4212 +msgid "Regexp I-search backward: " +msgstr "向后增量搜索正则表达式: " + +#: info/session.c:4213 msgid "I-search backward: " -msgstr "向后递增搜索: " +msgstr "向后增量搜索: " -#: info/session.c:3853 +#: info/session.c:4215 +msgid "Regexp I-search: " +msgstr "增量搜索正则表达式: " + +#: info/session.c:4216 msgid "I-search: " -msgstr "递增搜索: " +msgstr "增量搜索: " -#: info/session.c:3878 info/session.c:3880 +#: info/session.c:4241 info/session.c:4243 msgid "Failing " msgstr "失败 " -#: info/session.c:4340 +#: info/session.c:4734 msgid "Move to the previous cross reference" msgstr "移动到上一个交叉引用" -#: info/session.c:4349 +#: info/session.c:4752 msgid "Move to the next cross reference" msgstr "移动到下一个交叉引用" -#: info/session.c:4359 +#: info/session.c:4774 msgid "Select reference or menu item appearing on this line" msgstr "选择出现在本行中的引用或菜单项" -#: info/session.c:4382 +#: info/session.c:4797 msgid "Cancel current operation" msgstr "取消当前操作" -#: info/session.c:4389 +#: info/session.c:4804 msgid "Quit" msgstr "退出" -#: info/session.c:4398 +#: info/session.c:4813 msgid "Move the cursor to a specific line of the window" msgstr "将光标移动到窗口的指定行" -#: info/session.c:4430 +#: info/session.c:4845 msgid "Redraw the display" msgstr "重画显示" -#: info/session.c:4467 +#: info/session.c:4882 msgid "Quit using Info" msgstr "退出 Info" -#: info/session.c:4480 +#: info/session.c:4895 msgid "Run command bound to this key's lowercase variant" msgstr "运行到绑定到本按键的小写版本的命令" -#: info/session.c:4491 +#: info/session.c:4906 #, c-format msgid "Unknown command (%s)." msgstr "未知的命令 (%s)。" -#: info/session.c:4494 +#: info/session.c:4909 #, c-format msgid "\"%s\" is invalid" msgstr "“%s”为非法" -#: info/session.c:4495 +#: info/session.c:4910 #, c-format msgid "`%s' is invalid" msgstr "“%s”是无效的" -#: info/session.c:4709 +#: info/session.c:5125 msgid "Add this digit to the current numeric argument" msgstr "将本数字添加到当前数值参数中" -#: info/session.c:4718 +#: info/session.c:5134 msgid "Start (or multiply by 4) the current numeric argument" msgstr "开启(或乘以 4)当前数值参数" -#: info/session.c:4733 +#: info/session.c:5149 msgid "Internally used by \\[universal-argument]" msgstr "由 \\[universal-argument] 内部使用" -#: info/tilde.c:338 +#: info/tilde.c:336 #, c-format msgid "readline: Out of virtual memory!\n" msgstr "readline:虚拟内存耗尽!\n" @@ -1570,520 +1689,713 @@ "Controls what happens when scrolling is requested at the end of a node" msgstr "控制在节点末尾时出现滚动请求将发生什么" -#: info/variables.c:64 +#: info/variables.c:65 +msgid "Same as scroll-behaviour" +msgstr "等同于滚动行为" + +#: info/variables.c:69 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "当光标移出窗口是所滚动的行数" -#: info/variables.c:68 +#: info/variables.c:73 +msgid "Controls whether scroll-behavior affects cursor movement commands" +msgstr "控制滚动行为是否影响光标移动命令" + +#: info/variables.c:77 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "在“开”时,Info 接受并显示 ISO 拉丁字符" -#: info/variables.c:74 +#: info/variables.c:81 +msgid "" +"What to do when a scrolling command is issued at the end of the last node" +msgstr "控制在最后一个节点的末尾出现滚动请求时将发生什么" + +#: info/variables.c:88 msgid "Explain the use of a variable" msgstr "解释变量的用法" -#: info/variables.c:80 +#: info/variables.c:94 msgid "Describe variable: " msgstr "说明变量: " -#: info/variables.c:99 +#: info/variables.c:113 msgid "Set the value of an Info variable" msgstr "设定 Info 变量的值" -#: info/variables.c:105 +#: info/variables.c:119 msgid "Set variable: " msgstr "设定变量: " -#: info/variables.c:123 +#: info/variables.c:137 #, c-format msgid "Set %s to value (%d): " msgstr "将 %s 设定为值 (%d): " -#: info/variables.c:164 +#: info/variables.c:178 #, c-format msgid "Set %s to value (%s): " msgstr "将 %s 设定为值 (%s): " -#: info/window.c:1138 +#: info/window.c:1026 msgid "--*** Tags out of Date ***" msgstr "--*** 标记过期 ***" -#: info/window.c:1149 +#: info/window.c:1037 msgid "-----Info: (), lines ----, " msgstr "-----Info:(),行 ----, " -#: info/window.c:1156 +#: info/window.c:1044 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info:%s,%d 行 --%s--" -#: info/window.c:1160 +#: info/window.c:1048 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info:(%s)%s,%d 行 --%s--" -#: info/window.c:1167 +#: info/window.c:1055 #, c-format msgid " Subfile: %s" msgstr " 子文件:%s" -#: lib/getopt.c:551 lib/getopt.c:570 +#: install-info/install-info.c:221 #, c-format -msgid "%s: option `%s' is ambiguous\n" -msgstr "%s:选项“%s”含义不明确\n" +msgid "%s: warning: " +msgstr "%s:警告: " -#: lib/getopt.c:603 lib/getopt.c:607 +#: install-info/install-info.c:270 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s:选项“--%s”不接受参数\n" +msgid " for %s" +msgstr " %s" -#: lib/getopt.c:616 lib/getopt.c:621 +#: install-info/install-info.c:500 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s:选项“%c%s”不接受参数\n" +msgid "\tTry `%s --help' for a complete list of options.\n" +msgstr "\t试用“%s --help”以获得选项的完整列表。\n" -#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042 +#: install-info/install-info.c:508 #, c-format -msgid "%s: option `%s' requires an argument\n" -msgstr "%s:选项“%s”需要一个参数\n" +msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n" +msgstr "用法: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n" + +#: install-info/install-info.c:510 +msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE." +msgstr "从 Info 目录 DIR-FILE 的 INFO-FILE 文件中添加或移除条目。" + +#: install-info/install-info.c:513 +msgid "" +"Options:\n" +" --debug report what is being done.\n" +" --delete delete existing entries for INFO-FILE from DIR-FILE;\n" +" don't insert any new entries.\n" +" --description=TEXT the description of the entry is TEXT; used with\n" +" the --name option to become synonymous with the\n" +" --entry option.\n" +" --dir-file=NAME specify file name of Info directory file;\n" +" equivalent to using the DIR-FILE argument.\n" +" --dry-run same as --test." +msgstr "" +"选项:\n" +" --debug 报告正在处理的事。\n" +" --delete 从 DIR-FILE 中删除存在的 INFO-FILE 条目;\n" +" 不插入任何新的条目。\n" +" --description=TEXT 条目的说明为 TEXT;与 --name 选项\n" +" 同用跟与 --entry 选项同用\n" +" 是一样的。\n" +" --dir-file=NAME 指定 Info 目录文件的文件名;\n" +" 等同于使用 DIR-FILE 参数。\n" +" --dry-run 等同于 --test。" + +#: install-info/install-info.c:525 +msgid "" +" --entry=TEXT insert TEXT as an Info directory entry.\n" +" TEXT is written as an Info menu item line followed\n" +" by zero or more extra lines starting with " +"whitespace.\n" +" If you specify more than one entry, all are added.\n" +" If you don't specify any entries, they are determined\n" +" from information in the Info file itself.\n" +" When removing, TEXT specifies the entry to remove.\n" +" TEXT is only removed as a last resort, if the\n" +" entry as determined from the Info file is not " +"present,\n" +" and the basename of the Info file isn't found either." +msgstr "" +" --entry=TEXT 插入 TEXT 作为一个 Info 目录条目。\n" +" 所写入的 TEXT 要作为一个 Info 菜单项后跟\n" +" 0 个或多个以空格开始的行。\n" +" 如果您指定一个以上的条目,将添加所有条目。\n" +" 如果您未指定任何条目,它们由来自 Info 文件\n" +" 自身的信息决定。\n" +" 删除时, TEXT 指定了要删除的条目。\n" +" 仅当 Info 文件中作为删除定义的条目不存在,\n" +" 并且还找不到 Info 文件的目录名,\n" +"\t\t\t那 TEXT 才会作为最后的删除手段。" + +#: install-info/install-info.c:537 +msgid "" +" --help display this help and exit.\n" +" --info-dir=DIR same as --dir-file=DIR/dir.\n" +" --info-file=FILE specify Info file to install in the directory;\n" +" equivalent to using the INFO-FILE argument.\n" +" --item=TEXT same as --entry=TEXT.\n" +" --keep-old do not replace entries, or remove empty sections.\n" +" --menuentry=TEXT same as --name=TEXT.\n" +" --name=TEXT the name of the entry is TEXT; used with --description\n" +" to become synonymous with the --entry option.\n" +" --no-indent do not format new entries in the DIR file.\n" +" --quiet suppress warnings." +msgstr "" +" --help 显示此帮助并退出。\n" +" --info-dir=DIR 等同于 --dir-file=DIR/dir。\n" +" --info-file=FILE 在目录中指定要安装的 Info 文件;\n" +" 等同于使用 INFO-FILE 参数。\n" +" --item=TEXT 等同于 --entry=TEXT。\n" +" --keep-old 不要替换条目,或是删除空白字段。\n" +" --menuentry=TEXT 等同于 --name=TEXT。\n" +" --name=TEXT 条目名为 TEXT;与 --description 同用\n" +" 跟与 --entry 选项同用是一样的。\n" +" --no-indent 不要在 DIR 文件中格式化新的条目。\n" +" --quiet 不要输出警告。" + +#: install-info/install-info.c:550 +msgid "" +" --regex=R put this file's entries in all sections that match the\n" +" regular expression R (ignoring case).\n" +" --remove same as --delete.\n" +" --remove-exactly only remove if the info file name matches exactly;\n" +" suffixes such as .info and .gz are not ignored.\n" +" --section=SEC put entries in section SEC of the directory.\n" +" If you specify more than one section, all the entries\n" +" are added in each of the sections.\n" +" If you don't specify any sections, they are " +"determined\n" +" from information in the Info file itself.\n" +" --section R SEC equivalent to --regex=R --section=SEC --add-once." +msgstr "" +" --regex=R 将此文件的条目放入所有匹配正则表达式\n" +"\t\t\t R(忽略大小写)的字段。\n" +" --remove 等同于 --delete。\n" +" --remove-exactly 仅当完全匹配 info 文件名时才删除;\n" +" 不要忽略类似 .info 和 .gz 这样的后缀。\n" +" --section=SEC 将条目放入目录的 SEC 字段。\n" +" 如果您指定一个以上的字段,所有的条目将被添加至\n" +" 每个字段。\n" +" 如果您未指定任何字段,它们将由 Info 文件\n" +" 自身的信息来决定。\n" +" --section R SEC 等同于 --regex=R --section=SEC --add-once。" + +#: install-info/install-info.c:563 +msgid "" +" --silent suppress warnings.\n" +" --test suppress updating of DIR-FILE.\n" +" --version display version information and exit." +msgstr "" +" --silent 不输出警告。\n" +" --test 不更新 DIR-FILE。\n" +" --version 显示版本信息并退出。" + +#: install-info/install-info.c:570 +msgid "" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" +"请将错误报告发送到 bug-texinfo@gnu.org,\n" +"一般的问题和讨论请发送到 help-texinfo@gnu.org。\n" +"Texinfo 主页:http://www.gnu.org/software/texinfo/" -#: lib/getopt.c:727 lib/getopt.c:730 +#: install-info/install-info.c:597 #, c-format -msgid "%s: unrecognized option `--%s'\n" -msgstr "%s:不能识别的选项“--%s”\n" +msgid "" +"This is the file .../info/dir, which contains the\n" +"topmost node of the Info hierarchy, called (dir)Top.\n" +"The first time you invoke Info you start off looking at this node.\n" +"\n" +"%s\tThis is the top of the INFO tree\n" +"\n" +" This (the Directory node) gives a menu of major topics.\n" +" Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n" +" \"h\" gives a primer for first-timers,\n" +" \"mEmacs\" visits the Emacs manual, etc.\n" +"\n" +" In Emacs, you can click mouse button 2 on a menu item or cross reference\n" +" to select it.\n" +"\n" +"%s\n" +msgstr "" +"这是文件 .../info/dir,它含有 Info 层次\n" +"结构的最顶层节点,称为 (dir)Top。\n" +"您第一次调用 Info 您将从该节点开始。\n" +"\n" +"%s\t这是 INFO 树的顶\n" +"\n" +" 这里 (the Directory node) 给出了主要主题的菜单。\n" +" 输入“q”将退出,输入“?”将列举所有 Info 命令,输入\n" +" “d”将返回这里。输入“h”将给初次使用的用户一个摘要,\n" +" 输入“mEmacs”将访问 Emacs 手册,等等。\n" +"\n" +" 在 Emacs中,您可以在菜单项目或交叉引用上点击鼠标右键以\n" +" 选择它。\n" +"\n" +"%s\n" -#: lib/getopt.c:738 lib/getopt.c:741 +#: install-info/install-info.c:622 #, c-format -msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s:不能识别的选项“%c%s”\n" +msgid "%s: could not read (%s) and could not create (%s)\n" +msgstr "%s:即无法读入 (%s) 也无法创建 (%s)\n" -#: lib/getopt.c:796 lib/getopt.c:799 +#: install-info/install-info.c:715 #, c-format -msgid "%s: illegal option -- %c\n" -msgstr "%s:非法选项 -- %c\n" +msgid "%s: empty file" +msgstr "%s:空文件" + +#: install-info/install-info.c:1046 install-info/install-info.c:1086 +msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY" +msgstr "START-INFO-DIR-ENTRY 没有匹配的 END-INFO-DIR-ENTRY" + +#: install-info/install-info.c:1081 +msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY" +msgstr "END-INFO-DIR-ENTRY 没有匹配的 START-INFO-DIR-ENTRY" -#: lib/getopt.c:805 lib/getopt.c:808 +#: install-info/install-info.c:1946 install-info/install-info.c:1956 #, c-format -msgid "%s: invalid option -- %c\n" -msgstr "%s:无效选项 -- %c\n" +msgid "%s: already have dir file: %s\n" +msgstr "%s: 已经存在了 dir 文件: %s\n" -#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116 +#: install-info/install-info.c:2036 #, c-format -msgid "%s: option requires an argument -- %c\n" -msgstr "%s:选项需要一个参数 -- %c\n" +msgid "%s: Specify the Info file only once.\n" +msgstr "%s:Info 文件只应该指定一次。\n" -#: lib/getopt.c:935 lib/getopt.c:954 +#: install-info/install-info.c:2069 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s:选项“-W %s”的含义不清\n" +msgid "Extra regular expression specified, ignoring `%s'" +msgstr "指定了额外的正则表达式,忽略 “%s”" -#: lib/getopt.c:978 lib/getopt.c:999 +#: install-info/install-info.c:2081 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s:选项“-W %s”不接受参数\n" +msgid "Error in regular expression `%s': %s" +msgstr "正则表达式“%s”中存在错误: %s" -#: makeinfo/cmds.c:520 makeinfo/cmds.c:542 +#: install-info/install-info.c:2139 +#, c-format +msgid "excess command line argument `%s'" +msgstr "多余的命令行参数“%s”" + +#: install-info/install-info.c:2143 +msgid "No input file specified; try --help for more information." +msgstr "没有指定输出文件;试用 --help 以获得更多信息。" + +#: install-info/install-info.c:2146 +msgid "No dir file specified; try --help for more information." +msgstr "没有指定目录文件;试用 --help 以获得更多信息。" + +#: install-info/install-info.c:2288 +#, c-format +msgid "no info dir entry in `%s'" +msgstr "“%s”中没有 info 目录条目" + +#: install-info/install-info.c:2536 +#, c-format +msgid "no entries found for `%s'; nothing deleted" +msgstr "找不到关于“%s”的条目;未删除" + +#: lib/xexit.c:54 +msgid "ferror on stdout\n" +msgstr "标准输出上 ferror 错误\n" + +#: lib/xexit.c:59 +msgid "fflush error on stdout\n" +msgstr "标准输出上 fflush 错误\n" + +#: makeinfo/cmds.c:582 makeinfo/cmds.c:604 #, c-format msgid "arguments to @%s ignored" msgstr "@%s 的参数被忽略了" -#: makeinfo/cmds.c:585 +#: makeinfo/cmds.c:779 msgid "January" msgstr "一月" -#: makeinfo/cmds.c:585 +#: makeinfo/cmds.c:779 msgid "February" msgstr "二月" -#: makeinfo/cmds.c:585 +#: makeinfo/cmds.c:779 msgid "March" msgstr "三月" -#: makeinfo/cmds.c:585 +#: makeinfo/cmds.c:779 msgid "April" msgstr "四月" -#: makeinfo/cmds.c:585 +#: makeinfo/cmds.c:779 msgid "May" msgstr "五月" -#: makeinfo/cmds.c:586 +#: makeinfo/cmds.c:780 msgid "June" msgstr "六月" -#: makeinfo/cmds.c:586 +#: makeinfo/cmds.c:780 msgid "July" msgstr "七月" -#: makeinfo/cmds.c:586 +#: makeinfo/cmds.c:780 msgid "August" msgstr "八月" -#: makeinfo/cmds.c:586 +#: makeinfo/cmds.c:780 msgid "September" msgstr "九月" -#: makeinfo/cmds.c:586 +#: makeinfo/cmds.c:780 msgid "October" msgstr "十月" -#: makeinfo/cmds.c:587 +#: makeinfo/cmds.c:781 msgid "November" msgstr "十一月" -#: makeinfo/cmds.c:587 +#: makeinfo/cmds.c:781 msgid "December" msgstr "十二月" -#: makeinfo/cmds.c:936 +#: makeinfo/cmds.c:1131 #, c-format msgid "unlikely character %c in @var" msgstr "@var 中不可靠的字符 %c" -#: makeinfo/cmds.c:979 +#: makeinfo/cmds.c:1174 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc 的参数全部为大写,因此无效" -#: makeinfo/cmds.c:1034 +#: makeinfo/cmds.c:1229 #, c-format msgid "`{' expected, but saw `%c'" msgstr "应为“{”,但看到了“%c”" -#: makeinfo/cmds.c:1074 +#: makeinfo/cmds.c:1269 msgid "end of file inside verb block" msgstr "文件在原文块中结束" -#: makeinfo/cmds.c:1082 +#: makeinfo/cmds.c:1277 #, c-format msgid "`}' expected, but saw `%c'" msgstr "应为“}”,但看到了“%c”" -#: makeinfo/cmds.c:1112 +#: makeinfo/cmds.c:1308 msgid "" "@strong{Note...} produces a spurious cross-reference in Info; reword to " "avoid that" msgstr "@strong{Note...} 在 Info 中形成了一个假的交叉引用;可通过重写避免此事" -#: makeinfo/cmds.c:1305 +#: makeinfo/cmds.c:1504 #, c-format msgid "%c%s is obsolete" msgstr "%c%s 已过时" -#: makeinfo/cmds.c:1414 +#: makeinfo/cmds.c:1612 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp 需要正数参数,而不是“%s”" -#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82 +#: makeinfo/cmds.c:2023 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "%c%s 的错误参数" -#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142 +#: makeinfo/cmds.c:2033 makeinfo/makeinfo.c:4317 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144 +#: makeinfo/cmds.c:2035 makeinfo/cmds.c:2065 makeinfo/makeinfo.c:4319 msgid "none" msgstr "none" -#: makeinfo/cmds.c:1789 +#: makeinfo/cmds.c:2049 #, c-format msgid "Bad argument to @%s" msgstr "@%s 的参数错误" -#: makeinfo/cmds.c:1803 +#: makeinfo/cmds.c:2063 msgid "insert" msgstr "插入" -#: makeinfo/defun.c:84 -msgid "Missing `}' in @def arg" -msgstr "@def 的参数遗漏了“}”" +#: makeinfo/cmds.c:2079 +#, c-format +msgid "Bad argument to @%s: %s" +msgstr "@%s 的错误参数: %s" -#: makeinfo/defun.c:403 -msgid "Function" -msgstr "函数" - -#: makeinfo/defun.c:406 -msgid "Macro" -msgstr "宏" - -#: makeinfo/defun.c:409 -msgid "Special Form" -msgstr "特殊形式" - -#: makeinfo/defun.c:413 -msgid "Variable" -msgstr "变量" - -#: makeinfo/defun.c:416 -msgid "User Option" -msgstr "用户选项" - -#: makeinfo/defun.c:420 -msgid "Instance Variable" -msgstr "实例变量" - -#: makeinfo/defun.c:424 -msgid "Method" -msgstr "方法" +#: makeinfo/cmds.c:2162 +#, c-format +msgid "Expected @%s on or off, not `%s'" +msgstr "应当 @%s 开启或关闭,而不是“%s”" -#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545 -#: makeinfo/defun.c:644 makeinfo/xml.c:2229 -msgid "of" -msgstr "从" +#: makeinfo/cmds.c:2182 +#, c-format +msgid "Only @%s 10 or 11 is supported, not `%s'" +msgstr "仅支持 @%s 10 或 11,而不是“%s”" -#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517 -#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234 -msgid "on" -msgstr "在" +#: makeinfo/defun.c:83 +msgid "Missing `}' in @def arg" +msgstr "@def 的参数遗漏了“}”" #: makeinfo/defun.c:711 #, c-format msgid "Must be in `@%s' environment to use `@%s'" msgstr "必须在“@%s”环境变量中使用“@%s”" -#: makeinfo/files.c:435 +#: makeinfo/files.c:434 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s:getwd:%s,%s\n" -#: makeinfo/files.c:638 +#: makeinfo/files.c:637 #, c-format msgid "`%s' omitted before output filename" msgstr "在输出文件名前遗漏了“%s”" -#: makeinfo/files.c:646 +#: makeinfo/files.c:645 #, c-format msgid "`%s' omitted since writing to stdout" msgstr "写入标准输出前遗漏了“%s”" -#: makeinfo/files.c:694 +#: makeinfo/files.c:693 msgid "Output buffer not empty." msgstr "输出缓冲区非空。" -#: makeinfo/footnote.c:150 +#: makeinfo/float.c:181 +#, c-format +msgid "Requested float type `%s' not previously used" +msgstr "所要的浮点类型“%s”不是上次所用的" + +#: makeinfo/float.c:376 makeinfo/float.c:382 makeinfo/index.c:959 +#: makeinfo/index.c:965 +msgid "See " +msgstr "参阅 " + +#: makeinfo/footnote.c:149 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "“%c%s”需要参数“{...}”,而不仅仅是“%s”" -#: makeinfo/footnote.c:165 +#: makeinfo/footnote.c:164 #, c-format msgid "No closing brace for footnote `%s'" msgstr "脚注“%s”没有闭合花括号" -#: makeinfo/footnote.c:198 +#: makeinfo/footnote.c:197 msgid "Footnote defined without parent node" msgstr "定义的脚注没有父节点" -#: makeinfo/footnote.c:210 +#: makeinfo/footnote.c:209 msgid "Footnotes inside footnotes are not allowed" msgstr "脚注内的脚注是不允许的" -#: makeinfo/footnote.c:302 makeinfo/index.c:189 +#: makeinfo/footnote.c:301 makeinfo/index.c:187 msgid "Footnotes" msgstr "脚注" -#: makeinfo/html.c:87 +#: makeinfo/html.c:91 #, c-format msgid "%s: could not open --css-file: %s" msgstr "%s: 无法打开 --css-file: %s" -#: makeinfo/html.c:172 +#: makeinfo/html.c:180 #, c-format msgid "%s:%d: --css-file ended in comment" msgstr "%s:%d: --css-file 以注释结尾" -#: makeinfo/html.c:207 -msgid "Untitled" -msgstr "无标题" - -#: makeinfo/html.c:422 +#: makeinfo/html.c:426 msgid "[unexpected] no html tag to pop" msgstr "[未预料到的] 无 html 标记弹出" -#: makeinfo/html.c:752 +#: makeinfo/html.c:800 #, c-format msgid "[unexpected] invalid node name: `%s'" msgstr "[未预料到的] 无效的节点名称: “%s”" -#: makeinfo/index.c:169 +#: makeinfo/index.c:167 #, c-format msgid "Unknown index `%s'" msgstr "未知的索引“%s”" -#: makeinfo/index.c:234 +#: makeinfo/index.c:232 #, c-format msgid "Info cannot handle `:' in index entry `%s'" msgstr "Info 无法处理索引条目“%s”中的“:”" -#: makeinfo/index.c:412 +#: makeinfo/index.c:410 #, c-format msgid "Index `%s' already exists" msgstr "索引“%s”已经存在" -#: makeinfo/index.c:455 +#: makeinfo/index.c:453 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "@synindex 中的未知索引“%s”和/或“%s”" -#: makeinfo/index.c:661 +#: makeinfo/index.c:676 msgid "(line )" msgstr "(行 )" -#: makeinfo/index.c:669 +#: makeinfo/index.c:684 #, c-format msgid "(line %*d)" msgstr "(行 %*d)" -#: makeinfo/index.c:750 +#: makeinfo/index.c:765 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "@printindex 中的未知索引“%s”" -#: makeinfo/index.c:819 +#: makeinfo/index.c:834 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "关于索引“%s”的条目超出了所有节点" -#: makeinfo/index.c:822 makeinfo/index.c:858 +#: makeinfo/index.c:837 makeinfo/index.c:873 msgid "(outside of any node)" msgstr "(超出任何节点)" -#: makeinfo/index.c:919 makeinfo/index.c:925 -msgid "See " -msgstr "参阅 " - -#: makeinfo/insertion.c:160 +#: makeinfo/insertion.c:161 msgid "@item not allowed in argument to @itemize" msgstr "@item 不被允许在 @itemize 的参数中" -#: makeinfo/insertion.c:238 +#: makeinfo/insertion.c:242 msgid "Broken-Type in insertion_type_pname" msgstr "insertion_type_pname 中的错误类型" -#: makeinfo/insertion.c:334 +#: makeinfo/insertion.c:338 msgid "Enumeration stack overflow" msgstr "枚举栈溢出" -#: makeinfo/insertion.c:366 +#: makeinfo/insertion.c:370 #, c-format msgid "lettering overflow, restarting at %c" msgstr "字符编号溢出,从 %c 重新开始" -#: makeinfo/insertion.c:631 +#: makeinfo/insertion.c:639 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "%s 需要一个参数: %citem 的格式化参数" -#: makeinfo/insertion.c:719 +#: makeinfo/insertion.c:727 #, c-format msgid "%cfloat environments cannot be nested" msgstr "%cfloat 环境变量不能嵌套" -#: makeinfo/insertion.c:973 +#: makeinfo/insertion.c:981 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "“@end”需要“%s”,但看到“%s”" -#: makeinfo/insertion.c:1337 +#: makeinfo/insertion.c:1349 #, c-format msgid "No matching `%cend %s'" msgstr "没有匹配的“%cend %s”" -#: makeinfo/insertion.c:1592 +#: makeinfo/insertion.c:1618 #, c-format msgid "%s requires letter or digit" msgstr "%s 需要字母或数字" -#: makeinfo/insertion.c:1687 +#: makeinfo/insertion.c:1718 msgid "end of file inside verbatim block" msgstr "文件在原文块中结束" -#: makeinfo/insertion.c:1913 +#: makeinfo/insertion.c:1942 #, c-format msgid "@%s not meaningful outside `@float' environment" msgstr "“@float”环境变量外的 @%s 是没有意义的" -#: makeinfo/insertion.c:1949 +#: makeinfo/insertion.c:1978 msgid "@menu seen before first @node, creating `Top' node" msgstr "在第一个节点之前遇到 @menu,正在创建“顶”节点" -#: makeinfo/insertion.c:1950 +#: makeinfo/insertion.c:1979 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "您的 @top 节点可能应该包含在 @ifnottex 而不是 @ifinfo 中?" -#: makeinfo/insertion.c:1962 +#: makeinfo/insertion.c:1991 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "在第一个节点之前遇到 @detailmenu,正在创建“顶”节点" -#: makeinfo/insertion.c:2018 +#: makeinfo/insertion.c:2047 #, c-format msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments" msgstr "在“@titlepage”和“@quotation”环境变量外 @%s 无意义" -#: makeinfo/insertion.c:2032 +#: makeinfo/insertion.c:2061 #, c-format msgid "@%s not meaningful outside `@titlepage' environment" msgstr "“@titlepage”环境变量外的 @%s 是没有意义的" -#: makeinfo/insertion.c:2063 +#: makeinfo/insertion.c:2092 #, c-format msgid "Unmatched `%c%s'" msgstr "未匹配的“%c%s”" -#: makeinfo/insertion.c:2068 +#: makeinfo/insertion.c:2097 #, c-format msgid "`%c%s' needs something after it" msgstr "“%c%s”之后需要有些什么" -#: makeinfo/insertion.c:2074 +#: makeinfo/insertion.c:2103 #, c-format msgid "Bad argument `%s' to `@%s', using `%s'" msgstr "“%s”的错误参数“@%s”,使用“%s”" -#: makeinfo/insertion.c:2171 +#: makeinfo/insertion.c:2200 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "在“@%2$s”块中“@%1$s”是没有意义的" -#: makeinfo/insertion.c:2180 +#: makeinfo/insertion.c:2209 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "在“%s”块中 @itemx 是没有意义的" -#: makeinfo/insertion.c:2356 +#: makeinfo/insertion.c:2383 #, c-format msgid "%c%s found outside of an insertion block" msgstr "在插入块之外发现了 %c%s" -#: makeinfo/lang.c:580 +#: makeinfo/lang.c:1218 +#, c-format +msgid "no default territory known for language `%s'" +msgstr "语言“%s”无已知的默认地区" + +#: makeinfo/lang.c:1281 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s 在 ISO 639 语言编码中是无效的" -#: makeinfo/lang.c:655 +#: makeinfo/lang.c:1399 #, c-format msgid "unrecognized encoding name `%s'" msgstr "不能识别的编码名称“%s”" -#: makeinfo/lang.c:663 +#: makeinfo/lang.c:1407 #, c-format msgid "sorry, encoding `%s' not supported" msgstr "抱歉,不支持编码“%s”" -#: makeinfo/lang.c:715 +#: makeinfo/lang.c:1492 #, c-format msgid "invalid encoded character `%s'" msgstr "无效的编码字符“%s”" -#: makeinfo/lang.c:1009 +#: makeinfo/lang.c:1800 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s 的参数应为“i”或“j”,而不是“%c”" -#: makeinfo/lang.c:1013 +#: makeinfo/lang.c:1804 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s 需要以单个字符“i”或“j”为参数" @@ -2098,7 +2410,7 @@ msgid "here is the previous definition of `%s'" msgstr "这里是“%s”前面的定义" -#: makeinfo/macro.c:355 +#: makeinfo/macro.c:359 #, c-format msgid "\\ in macro expansion followed by `%s' instead of parameter name" msgstr "\\ 以带有“%s”的宏展开式代替参数名称" @@ -2108,46 +2420,50 @@ msgid "Macro `%s' called on line %d with too many args" msgstr "在第 %2$d 行中以过多的参数调用宏“%1$s”" -#: makeinfo/macro.c:586 +#: makeinfo/macro.c:580 #, c-format msgid "%cend macro not found" msgstr "找不到宏 %cend" -#: makeinfo/macro.c:624 -msgid "@quote-arg only useful for single-argument macros" -msgstr "@quote-arg 只对单参数宏有用" +#: makeinfo/macro.c:591 +msgid "@allow-recursion is deprecated; please use @rmacro instead" +msgstr "不赞成使用 @allow-recursion;请使用 @rmacro 代替" + +#: makeinfo/macro.c:606 +msgid "@quote-arg is deprecated; arguments are quoted by default" +msgstr "不赞成使用 @quote-arg;参数是默认引用的" -#: makeinfo/macro.c:660 +#: makeinfo/macro.c:649 #, c-format msgid "mismatched @end %s with @%s" msgstr "@end %s 和 @%s 不匹配" -#: makeinfo/makeinfo.c:184 +#: makeinfo/makeinfo.c:188 #, c-format msgid "Too many errors! Gave up.\n" msgstr "过多的错误!放弃。\n" -#: makeinfo/makeinfo.c:302 +#: makeinfo/makeinfo.c:306 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d:警告: " -#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260 +#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340 #, c-format msgid "Misplaced %c" msgstr "错误放置的 %c" -#: makeinfo/makeinfo.c:340 +#: makeinfo/makeinfo.c:344 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用“%s --help”以获取更多信息。\n" -#: makeinfo/makeinfo.c:343 +#: makeinfo/makeinfo.c:347 #, c-format msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" msgstr "用法:%s [选项]... TEXINFO-文件...\n" -#: makeinfo/makeinfo.c:346 +#: makeinfo/makeinfo.c:350 msgid "" "Translate Texinfo source documentation to various other formats, by default\n" "Info files suitable for reading online with Emacs or standalone GNU Info.\n" @@ -2155,54 +2471,63 @@ "将 Texinfo 源文件转换为其它各种格式,默认转换为适于\n" "由 Emacs 或独立 GNU Info 在线浏览的 Info 文件。\n" -#: makeinfo/makeinfo.c:350 +#: makeinfo/makeinfo.c:354 #, c-format msgid "" "General options:\n" " --error-limit=NUM quit after NUM errors (default %d).\n" +" --document-language=STR locale to use in translating Texinfo keywords\n" +" for the output document (default C).\n" " --force preserve output even if errors.\n" " --help display this help and exit.\n" " --no-validate suppress node cross-reference validation.\n" " --no-warn suppress warnings (but not errors).\n" -" --reference-limit=NUM warn about at most NUM references (default " -"%d).\n" " -v, --verbose explain what is being done.\n" " --version display version information and exit.\n" msgstr "" "通用选项:\n" -" --error-limit=NUM 在 NUM 个错误后退出 (默认为 %d).\n" -" --force 即时出现错误也保留输出文件。\n" +" --error-limit=NUM 在 NUM 个错误后退出 (默认为 %d)。\n" +" --document-language=STR 为输出的文档翻译 Texinfo 关键字时所用\n" +" 的地区代码(默认为 C)。\n" +" --force 即使出现错误也保留输出文件。\n" " --help 显示该求助信息并退出。\n" " --no-validate 不进行交叉引用检查。\n" " --no-warn 不输出警告 (不涉及错误)。\n" -" --reference-limit=NUM 对至多 NUM 个引用进行警告 (默认为 %d)。\n" " -v, --verbose 解释都做了些什么。\n" " --version 显示版本信息并退出。\n" -#: makeinfo/makeinfo.c:364 +#: makeinfo/makeinfo.c:369 #, no-wrap msgid "" "Output format selection (default is to produce Info):\n" -" --docbook output Docbook XML rather than Info.\n" -" --html output HTML rather than Info.\n" -" --xml output Texinfo XML rather than Info.\n" -" --plaintext output plain text rather than Info.\n" -msgstr "" +" --docbook output Docbook XML rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output Texinfo XML rather than Info.\n" +" --plaintext output plain text rather than Info.\n" +msgstr "" +"输出格式选择 (默认生成 Info 文件):\n" +" --docbook 输出 DocBook 而不是 Info。\n" +" --html 输出 HTML 而不是 Info。\n" +" --xml 输出 XML (TexinfoML) 而不是 Info。\n" +" --plaintext 输出普通文本而不是 Info。\n" -#: makeinfo/makeinfo.c:372 +#: makeinfo/makeinfo.c:377 msgid "" "General output options:\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" ignoring any @setfilename.\n" -" --no-headers suppress node separators, Node: lines, and " +" -E, --macro-expand=FILE output macro-expanded source to FILE,\n" +" ignoring any @setfilename.\n" +" --no-headers suppress node separators, Node: lines, and " "menus\n" -" from Info output (thus producing plain text)\n" -" or from HTML (thus producing shorter output);\n" -" also, write to standard output by default.\n" -" --no-split suppress splitting of Info or HTML output,\n" -" generate only one output file.\n" -" --number-sections output chapter and sectioning numbers.\n" -" -o, --output=FILE output to FILE (directory if split HTML),\n" +" from Info output (thus producing plain " +"text)\n" +" or from HTML (thus producing shorter " +"output);\n" +" also, write to standard output by default.\n" +" --no-split suppress the splitting of Info or HTML " +"output,\n" +" generate only one output file.\n" +" --number-sections output chapter and sectioning numbers.\n" +" -o, --output=FILE output to FILE (or directory if split HTML).\n" msgstr "" "通用输出选项:\n" " -E, --macro-expand FILE 将宏扩展源输出到文件 FILE。\n" @@ -2214,20 +2539,23 @@ " --no-split 不是生成分割的 Info 或 HTML 输出,\n" " 而是生成单个输出文件。\n" " --number-sections 输出章节编号。\n" -" -o, --output=FILE 输出到文件 FILE (如果是分割的 HTML 则为目录),\n" +" -o, --output=FILE 输出到文件 FILE (如果是分割的 HTML 则为目录)。\n" -#: makeinfo/makeinfo.c:386 +#: makeinfo/makeinfo.c:391 #, c-format msgid "" "Options for Info and plain text:\n" -" --enable-encoding output accented and special characters in\n" -" Info output based on @documentencoding.\n" +" --disable-encoding do not output accented and special characters\n" +" in Info output based on @documentencoding.\n" +" --enable-encoding override --disable-encoding (default).\n" " --fill-column=NUM break Info lines at NUM characters (default " "%d).\n" " --footnote-style=STYLE output footnotes in Info according to STYLE:\n" " `separate' to put them in their own node;\n" -" `end' to put them at the end of the node\n" -" in which they are defined (default).\n" +" `end' to put them at the end of the node, " +"in\n" +" which they are defined (this is the " +"default).\n" " --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " "%d).\n" " If VAL is `none', do not indent; if VAL is\n" @@ -2235,8 +2563,9 @@ " --split-size=NUM split Info files at size NUM (default %d).\n" msgstr "" "Info 和普通文本选项:\n" -" --enable-encoding 根据 @documentencoding 输出 Info 输出中的\n" +" --disable-encoding 不要根据 @documentencoding 输出 Info 输出中的\n" " 重音和特殊字符。\n" +" --enable-encoding 覆盖 --disable-encoding 设置(默认)。\n" " --fill-column=NUM 在第 NUM 个字符处切分 Info 行 (默认为 %d)。\n" " --footnote-style=STYLE 根据 STYLE 输出 Info 中的脚注:\n" " “separate”将脚注置于独立的节点;\n" @@ -2246,24 +2575,38 @@ " “asis”,保留现有的对齐。\n" " --split-size=NUM 在大小 NUM 的时候拆分 Info 文件 (默认为 %d)。\n" -#: makeinfo/makeinfo.c:403 +#: makeinfo/makeinfo.c:409 msgid "" "Options for HTML:\n" -" --css-include=FILE include FILE in HTML