Binary files /tmp/OQXaaZRdE9/language-pack-zh-hans-base-12.04+20120221/data/extra.tar and /tmp/By8vBTPXqV/language-pack-zh-hans-base-12.04+20120322/data/extra.tar differ diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/acl.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/acl.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/acl.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/acl.po 2012-03-23 07:32:54.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:02+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../chacl/chacl.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/adduser.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/adduser.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/adduser.po 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/adduser.po 2012-03-23 07:32:47.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: 2012-02-21 17:24+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:16+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/alsa-utils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/alsa-utils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/alsa-utils.po 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/alsa-utils.po 2012-03-23 07:32:47.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: 2012-02-21 17:25+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: alsamixer/card_select.c:126 alsamixer/device_name.c:126 msgid "Sound Card" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apparmorapplet.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apparmorapplet.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2012-02-23 07:11:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apparmorapplet.po 2012-03-23 07:33:18.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: 2012-02-21 23:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:36+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/app-install-data.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/app-install-data.po 2012-03-23 07:33:19.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: 2012-01-31 17:33+0000\n" +"POT-Creation-Date: 2012-02-23 19:10+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: 2012-02-21 23:42+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:41+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" @@ -482,6 +482,22 @@ msgid "Midi connections manager " msgstr "Midi 连接管理器 " +#: ../menu-data/actionaz:actionaz.desktop.in.h:1 +msgid "Actionaz" +msgstr "" + +#: ../menu-data/actionaz:actionaz.desktop.in.h:2 +msgid "Automate tasks" +msgstr "" + +#: ../menu-data/activity-log-manager-control-center:activity-log-manager-ccpanel.desktop.in.h:1 +msgid "Privacy" +msgstr "" + +#: ../menu-data/activity-log-manager-control-center:activity-log-manager-ccpanel.desktop.in.h:2 +msgid "Privacy and Activity Manager" +msgstr "" + #: ../menu-data/activity-log-manager:activity-log-manager.desktop.in.h:1 msgid "Activity Log Manager" msgstr "" @@ -753,14 +769,6 @@ msgid "Modular Software Synth" msgstr "模块化软件合成" -#: ../menu-data/amsn:amsn.desktop.in.h:1 -msgid "aMSN" -msgstr "aMSN" - -#: ../menu-data/amsn:amsn.desktop.in.h:2 -msgid "MSN Messenger for Linux" -msgstr "Linux 下的 MSN 信使" - #: ../menu-data/amsynth:amsynth.desktop.in.h:1 msgid "amSynth" msgstr "amSynth" @@ -821,8 +829,8 @@ msgstr "俄罗斯方块游戏" #: ../menu-data/anjuta:anjuta.desktop.in.h:1 -msgid "Anjuta IDE" -msgstr "Anjuta IDE" +msgid "Anjuta" +msgstr "" #: ../menu-data/anjuta:anjuta.desktop.in.h:2 msgid "Develop software in an integrated development environment" @@ -2317,10 +2325,12 @@ msgstr "GNUstep 的字符映射表" #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:1 +#: ../menu-data/checkbox-qt:checkbox-qt.desktop.in.h:1 msgid "System Testing" msgstr "系统测试" #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:2 +#: ../menu-data/checkbox-qt:checkbox-qt.desktop.in.h:2 msgid "Test your system and submit results to the Ubuntu Friendly project" msgstr "" @@ -2407,6 +2417,28 @@ msgid "Micro-blogging Client" msgstr "" +#: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:1 +msgid "Chromium Web Browser" +msgstr "Chromium 网页浏览器" + +#: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:2 +msgid "Access the Internet" +msgstr "访问互联网" + +#: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:3 +#: ../menu-data/firefox:firefox.desktop.in.h:3 +#: ../menu-data/terminator:terminator.desktop.in.h:3 +msgid "Open a New Window" +msgstr "" + +#: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:4 +msgid "Open a New Window in incognito mode" +msgstr "" + +#: ../menu-data/chromium-browser:chromium-browser.desktop.in.h:5 +msgid "Open a New Window with a temporary profile" +msgstr "" + #: ../menu-data/chromium-bsu:chromium-bsu.desktop.in.h:1 msgid "Chromium B.S.U." msgstr "Chromium B.S.U." @@ -2492,6 +2524,38 @@ msgid "Plays music and last.fm streams" msgstr "播放音乐和 last.fm 流" +#: ../menu-data/clementine:clementine.desktop.in.h:3 +msgid "Play" +msgstr "" + +#: ../menu-data/clementine:clementine.desktop.in.h:4 +#: ../menu-data/wallch:wallch.desktop.in.h:4 +msgid "Pause" +msgstr "" + +#: ../menu-data/clementine:clementine.desktop.in.h:5 +#: ../menu-data/wallch:wallch.desktop.in.h:5 +msgid "Stop" +msgstr "" + +#: ../menu-data/clementine:clementine.desktop.in.h:6 +#: ../menu-data/wallch:wallch.desktop.in.h:7 +msgid "Previous" +msgstr "" + +#: ../menu-data/clementine:clementine.desktop.in.h:7 +#: ../menu-data/wallch:wallch.desktop.in.h:6 +msgid "Next" +msgstr "" + +#: ../menu-data/clinica:clinica.desktop.in.h:1 +msgid "Clinica" +msgstr "" + +#: ../menu-data/clinica:clinica.desktop.in.h:2 +msgid "Medical records manager" +msgstr "" + #: ../menu-data/clipit:clipit.desktop.in.h:1 msgid "ClipIt" msgstr "" @@ -2572,6 +2636,10 @@ 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 设置管理器" @@ -2783,6 +2851,14 @@ msgid "Serial Terminal" msgstr "" +#: ../menu-data/cuyo:cuyo.desktop.in.h:1 +msgid "Cuyo" +msgstr "Cuyo" + +#: ../menu-data/cuyo:cuyo.desktop.in.h:2 +msgid "Play a tetris like game with many levels" +msgstr "玩一个有很多等级的俄罗斯方块游戏" + #: ../menu-data/cycle:cycle.desktop.in.h:1 msgid "Cycle" msgstr "" @@ -2867,12 +2943,10 @@ msgid "Enter text without a keyboard" msgstr "无需键盘就输入文字" -#: ../menu-data/dates-hildon:dates.desktop.in.h:1 #: ../menu-data/dates:dates.desktop.in.h:1 msgid "Dates" msgstr "Dates" -#: ../menu-data/dates-hildon:dates.desktop.in.h:2 #: ../menu-data/dates:dates.desktop.in.h:2 msgid "Your appointments" msgstr "您的日程安排" @@ -3116,14 +3190,6 @@ "Manage your photographs like a professional with the power of open source" msgstr "" -#: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:1 -msgid "A tool to assemble images as a panorama" -msgstr "" - -#: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:2 -msgid "Panorama" -msgstr "" - #: ../menu-data/dillo:dillo.desktop.in.h:1 msgid "Dillo" msgstr "" @@ -4052,20 +4118,20 @@ msgid "Fcitx GUI Config Tool" msgstr "" -#: ../menu-data/fcitx-data:fcitx.desktop.in.h:1 -msgid "Fcitx" +#: ../menu-data/fcitx-data:fcitx-skin-installer.desktop.in.h:1 +msgid "Fcitx Skin Installer" msgstr "" -#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2 -msgid "Chinese Input Method" +#: ../menu-data/fcitx-data:fcitx-skin-installer.desktop.in.h:2 +msgid "Installer Script for Fcitx Skin" msgstr "" -#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1 -msgid "Fcitx Kimpanel" +#: ../menu-data/fcitx-data:fcitx.desktop.in.h:1 +msgid "Fcitx" msgstr "" -#: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2 -msgid "Chinese Input Method (Use Kimpanel)" +#: ../menu-data/fcitx-data:fcitx.desktop.in.h:2 +msgid "Chinese Input Method" msgstr "" #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1 @@ -4185,10 +4251,6 @@ msgid "Firefox Web Browser" msgstr "Firefox 网络浏览器" -#: ../menu-data/firefox:firefox.desktop.in.h:3 -msgid "Open a New Window" -msgstr "" - #: ../menu-data/firestarter:firestarter.desktop.in.h:1 msgid "Firestarter" msgstr "Firestarter" @@ -4555,18 +4617,6 @@ msgid "Freeciv server" msgstr "" -#: ../menu-data/freecol:freecol.desktop.in.h:1 -msgid "FreeCol" -msgstr "FreeCol" - -#: ../menu-data/freecol:freecol.desktop.in.h:2 -msgid "Turn-based strategy game" -msgstr "回合制的策略游戏" - -#: ../menu-data/freediams:freediams.desktop.in.h:1 -msgid "FreeDiams" -msgstr "" - #: ../menu-data/freedink-dfarc:freedink-dfarc.desktop.in.h:1 msgid "DFArc - Dink frontend" msgstr "DFArc - Dink 前端" @@ -5159,6 +5209,14 @@ msgid "Edit chemical 2D structures" msgstr "编辑二维化学结构" +#: ../menu-data/gcin:gcin-tools.desktop.in.h:1 +msgid "gcin Setup" +msgstr "gcin 设置" + +#: ../menu-data/gcin:gcin-tools.desktop.in.h:2 +msgid "Setup utility for gcin input method" +msgstr "gcin 输入法的设置工具" + #: ../menu-data/gcipher:gcipher.desktop.in.h:1 msgid "GCipher" msgstr "GCipher" @@ -5428,6 +5486,14 @@ msgid "Grab the gems and throw them back up before they crush you" msgstr "" +#: ../menu-data/geneatd:geneatd.desktop.in.h:1 +msgid "GeneaTD" +msgstr "" + +#: ../menu-data/geneatd:geneatd.desktop.in.h:2 +msgid "Multi-touch tower defense game" +msgstr "" + #: ../menu-data/genesis:genesis.desktop.in.h:1 msgid "GENESIS Neural Simulator" msgstr "GENESIS 神经仿真器" @@ -5556,24 +5622,6 @@ msgid "Multivariate interactive graphics for exploratory data analysis" msgstr "探索性数据分析用的多元交互图形" -#: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:1 -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:1 -msgid "ggz-txt" -msgstr "ggz-txt" - #: ../menu-data/ghemical:ghemical.desktop.in.h:1 msgid "ghemical" msgstr "ghemical" @@ -5780,14 +5828,6 @@ msgid "LADI Session Handler" msgstr "" -#: ../menu-data/glame:Multimedia__glame.desktop.in.h:1 -msgid "GLAME" -msgstr "GLAME" - -#: ../menu-data/glame:Multimedia__glame.desktop.in.h:2 -msgid "GNU/Linux Audio Mechanics" -msgstr "GNU/Linux 音频机制" - #: ../menu-data/glchess:glchess.desktop.in.h:1 msgid "Chess" msgstr "国际象棋" @@ -6632,6 +6672,14 @@ msgid "GTK or console backgammon program with analysis" msgstr "" +#: ../menu-data/gnubiff:gnubiff.desktop.in.h:1 +msgid "Gnubiff" +msgstr "Gnubiff" + +#: ../menu-data/gnubiff:gnubiff.desktop.in.h:2 +msgid "Gnubiff is a mail notification program." +msgstr "Gnubiff 是一个邮件通知程序。" + #: ../menu-data/gnubik:gnubik.desktop.in.h:1 msgid "GNUbik" msgstr "GNUbik" @@ -6641,13 +6689,13 @@ msgstr "3D 魔方游戏" #: ../menu-data/gnucash:gnucash.desktop.in.h:1 -msgid "GnuCash Finance Management" -msgstr "GnuCash 财务管理" - -#: ../menu-data/gnucash:gnucash.desktop.in.h:2 msgid "Manage your finances, accounts, and investments" msgstr "管理您的财务、帐号和投资" +#: ../menu-data/gnucash:gnucash.desktop.in.h:2 +msgid "GnuCash Finance Management" +msgstr "GnuCash 财务管理" + #: ../menu-data/gnudoq:gnudoq.desktop.in.h:1 msgid "GNUDoQ" msgstr "GNUDoQ" @@ -6794,14 +6842,6 @@ msgid "Play and extract CDs" msgstr "播放和提取 CD" -#: ../menu-data/googlizer:googlizer.desktop.in.h:1 -msgid "Googlizer" -msgstr "Googlizer" - -#: ../menu-data/googlizer:googlizer.desktop.in.h:2 -msgid "Search Google for whatever's in the X selection" -msgstr "在 Google 中搜索图形界面中任何选中的内容" - #: ../menu-data/gopchop:gopchop.desktop.in.h:1 msgid "GOPchop" msgstr "GOPchop" @@ -6818,6 +6858,14 @@ msgid "Gaming packages browser" msgstr "游戏包浏览器" +#: ../menu-data/goplay:goscience.desktop.in.h:1 +msgid "GoScience!" +msgstr "" + +#: ../menu-data/goplay:goscience.desktop.in.h:2 +msgid "Science packages browser" +msgstr "" + #: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1 msgid "GOsa²" msgstr "" @@ -7362,9 +7410,8 @@ msgstr "" #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1 -#: ../menu-data/recorditnow:kde4__recorditnow.desktop.in.h:1 -msgid "Desktop recorder" -msgstr "桌面录像机" +msgid "RecordMyDesktop" +msgstr "" #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:2 msgid "Record a video of your desktop" @@ -7482,6 +7529,14 @@ msgid "Connect to your VNC servers" msgstr "连接到您的虚拟专用网(VNC)服务器" +#: ../menu-data/gtkwave:gtkwave.desktop.in.h:1 +msgid "GTKWave" +msgstr "" + +#: ../menu-data/gtkwave:gtkwave.desktop.in.h:2 +msgid "Display simulation results" +msgstr "" + #: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1 msgid "GTK Wiimote Whiteboard" msgstr "GTK Wiimote 白板" @@ -7499,8 +7554,8 @@ msgstr "" #: ../menu-data/gtranslator:gtranslator.desktop.in.h:1 -msgid "Gtranslator PO Editor" -msgstr "Gtranslator PO 编辑器" +msgid "Gtranslator PO File Editor" +msgstr "" #: ../menu-data/gtranslator:gtranslator.desktop.in.h:2 msgid "Translate and localize applications and libraries" @@ -7776,6 +7831,14 @@ msgid "Administer the mailboxes of your IMAP Cyrus servers" msgstr "管理您的 IMAP Cyrus 服务器的邮箱" +#: ../menu-data/hamexam:hamexam.desktop.in.h:1 +msgid "hamexam" +msgstr "" + +#: ../menu-data/hamexam:hamexam.desktop.in.h:2 +msgid "Ham Radio Examination trainer" +msgstr "" + #: ../menu-data/hamfax:hamfax.desktop.in.h:1 msgid "hamfax" msgstr "" @@ -7900,6 +7963,14 @@ msgid "Hijri calendar in system tray icon" msgstr "" +#: ../menu-data/hime:hime-setup.desktop.in.h:1 +msgid "hime Setup" +msgstr "" + +#: ../menu-data/hime:hime-setup.desktop.in.h:2 +msgid "Setup utility for hime input method" +msgstr "" + #: ../menu-data/hitori:hitori.desktop.in.h:1 msgid "Hitori" msgstr "Hitori" @@ -8913,6 +8984,14 @@ msgid "A Computer Algebra System" msgstr "" +#: ../menu-data/kazam:kazam.desktop.in.h:1 +msgid "Kazam Screencaster" +msgstr "" + +#: ../menu-data/kazam:kazam.desktop.in.h:2 +msgid "Record a video of activity on your screen" +msgstr "" + #: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1 msgid "KBackup" msgstr "KBackup" @@ -9103,6 +9182,18 @@ msgid "Network Folder Wizard" msgstr "网络文件夹向导" +#: ../menu-data/kde-telepathy-contact-list:kde4__ktp-contactlist.desktop.in.h:1 +msgid "Telepathy Contact List" +msgstr "" + +#: ../menu-data/kde-telepathy-contact-list:kde4__ktp-contactlist.desktop.in.h:2 +msgid "Displays your instant messenger contacts" +msgstr "" + +#: ../menu-data/kde-telepathy-send-file:kde4__ktp-send-file.desktop.in.h:1 +msgid "Send file to IM contact" +msgstr "" + #: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1 msgid "KFontView" msgstr "" @@ -9179,6 +9270,7 @@ #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2 #: ../menu-data/netbeans:netbeans.desktop.in.h:2 +#: ../menu-data/qtcreator:qtcreator.desktop.in.h:2 msgid "Integrated Development Environment" msgstr "集成开发环境" @@ -9534,23 +9626,55 @@ msgid "Edit DV video" msgstr "编辑 DV 视频" -#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1 +#: ../menu-data/kipi-plugins-common:kde4__dngconverter.desktop.in.h:1 +msgid "DNGConverter" +msgstr "" + +#: ../menu-data/kipi-plugins-common:kde4__dngconverter.desktop.in.h:2 +msgid "A tool to batch convert RAW camera images to DNG" +msgstr "" + +#: ../menu-data/kipi-plugins-common:kde4__expoblending.desktop.in.h:1 +msgid "A tool to blend bracketed images" +msgstr "" + +#: ../menu-data/kipi-plugins-common:kde4__expoblending.desktop.in.h:2 +msgid "ExpoBlending" +msgstr "ExpoBlending" + +#: ../menu-data/kipi-plugins-common:kde4__kipiplugins.desktop.in.h:1 msgid "KIPI Plugins" msgstr "" -#: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2 +#: ../menu-data/kipi-plugins-common:kde4__kipiplugins.desktop.in.h:2 msgid "KDE Image Plugins Interface" msgstr "" +#: ../menu-data/kipi-plugins-common:kde4__panoramagui.desktop.in.h:1 +msgid "A tool to assemble images as a panorama" +msgstr "" + +#: ../menu-data/kipi-plugins-common:kde4__panoramagui.desktop.in.h:2 +msgid "Panorama" +msgstr "" + #. X-DocPath=photolayoutseditor/index.html -#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:2 msgid "Photo Layouts Editor" msgstr "" -#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:3 +#: ../menu-data/kipi-plugins-common:kde4__photolayoutseditor.desktop.in.h:3 msgid "Create beautiful and professional photo layouts from your photos" msgstr "" +#: ../menu-data/kipi-plugins-common:kde4__scangui.desktop.in.h:1 +msgid "A tool to acquire images using a flat scanner" +msgstr "" + +#: ../menu-data/kipi-plugins-common:kde4__scangui.desktop.in.h:2 +msgid "AcquireImages" +msgstr "" + #: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1 msgid "Kiriki" msgstr "" @@ -10310,14 +10434,6 @@ msgid "Personal Time Tracker" msgstr "" -#: ../menu-data/ktoon:ktoon.desktop.in.h:1 -msgid "KToon" -msgstr "KToon" - -#: ../menu-data/ktoon:ktoon.desktop.in.h:2 -msgid "Animation" -msgstr "" - #: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1 msgid "KTorrent" msgstr "KTorrent" @@ -11169,6 +11285,14 @@ msgid "The GNU Lyric Display System Display" msgstr "" +#: ../menu-data/lyx:lyx.desktop.in.h:1 +msgid "LyX Document Processor" +msgstr "LyX 文档处理器" + +#: ../menu-data/lyx:lyx.desktop.in.h:2 +msgid "High level LaTeX frontend" +msgstr "高级 LaTeX 前端" + #: ../menu-data/madbomber:madbomber.desktop.in.h:1 msgid "Mad Bomber" msgstr "" @@ -11201,6 +11325,14 @@ msgid "Puzzle game in the spirit of solomon's key" msgstr "" +#: ../menu-data/magictouch:magictouch.desktop.in.h:1 +msgid "MagicTouch" +msgstr "" + +#: ../menu-data/magictouch:magictouch.desktop.in.h:2 +msgid "Retro game goes multitouch: use two knobs to paint a picture" +msgstr "" + #: ../menu-data/mah-jong:mah-jong.desktop.in.h:1 msgid "Mah-Jong" msgstr "" @@ -11895,6 +12027,14 @@ msgid "painting program to create pixel art and manipulate digital photos" msgstr "" +#: ../menu-data/mttroff:mttroff.desktop.in.h:1 +msgid "Troff" +msgstr "" + +#: ../menu-data/mttroff:mttroff.desktop.in.h:2 +msgid "TROff - A libavg based multitouch TRON clone" +msgstr "" + #: ../menu-data/mu-cade:mu-cade.desktop.in.h:1 msgid "Mu-cade" msgstr "" @@ -11919,6 +12059,14 @@ msgid "MultiGet Downloader" msgstr "MultiGet 下载程序" +#: ../menu-data/multitet:multitet.desktop.in.h:1 +msgid "Multitet" +msgstr "" + +#: ../menu-data/multitet:multitet.desktop.in.h:2 +msgid "Multitouch cooperative Tetris-like game" +msgstr "" + #: ../menu-data/mumble:mumble.desktop.in.h:1 msgid "Mumble" msgstr "" @@ -12630,14 +12778,6 @@ msgid "Fetion For Linux" msgstr "" -#: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1 -msgid "OpenJDK Java 6 Runtime" -msgstr "OpenJDK Java 6 运行时" - -#: ../menu-data/openjdk-7-jre:openjdk-7-java.desktop.in.h:1 -msgid "OpenJDK Java 7 Runtime" -msgstr "" - #: ../menu-data/openrocket:openrocket.desktop.in.h:1 msgid "OpenRocket" msgstr "" @@ -12730,14 +12870,6 @@ msgid "Desktop calendar" msgstr "桌面日历" -#: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:1 -msgid "Orage preferences" -msgstr "" - -#: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:2 -msgid "Settings for the Xfce 4 Calendar Application (Orage)" -msgstr "" - #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:1 msgid "Orbital Eunuchs Sniper" msgstr "" @@ -12803,14 +12935,6 @@ msgid "Pacemaker CRM GUI" msgstr "" -#: ../menu-data/packagesearch:packagesearch.desktop.in.h:1 -msgid "Debian Package Search" -msgstr "Debian 软件包搜索" - -#: ../menu-data/packagesearch:packagesearch.desktop.in.h:2 -msgid "Search for packages and view package information" -msgstr "搜索软件包和查看包信息" - #: ../menu-data/packeth:packeth.desktop.in.h:1 msgid "PackETH" msgstr "" @@ -13372,6 +13496,16 @@ msgid "Help the frog cross the street" msgstr "帮青蛙穿越街道" +#: ../menu-data/planarity:planarity.desktop.in.h:1 +msgid "Planarity" +msgstr "" + +#: ../menu-data/planarity:planarity.desktop.in.h:2 +msgid "" +"A libavg based multitouch adaption of the popular game Planarity, aka " +"Untangle" +msgstr "" + #: ../menu-data/planets:planets.desktop.in.h:1 msgid "Planets" msgstr "Planets" @@ -13386,6 +13520,50 @@ msgid "Planner Project Management" msgstr "Planner 项目管理" +#: ../menu-data/plasma-active-data:kde4__active-about.desktop.in.h:1 +msgid "About" +msgstr "" + +#: ../menu-data/plasma-active-data:kde4__active-about.desktop.in.h:2 +msgid "Informations about Plasma Active" +msgstr "" + +#: ../menu-data/plasma-active-data:kde4__adjust-time.desktop.in.h:1 +msgid "Adjust date and time" +msgstr "" + +#: ../menu-data/plasma-active-data:kde4__widget-strip.desktop.in.h:1 +msgid "Widget Strip" +msgstr "" + +#: ../menu-data/plasma-active-data:kde4__widget-strip.desktop.in.h:2 +msgid "A collection of widgets" +msgstr "" + +#: ../menu-data/plasma-active-imageviewer:kde4__active-image-viewer.desktop.in.h:1 +msgid "Images" +msgstr "" + +#: ../menu-data/plasma-active-imageviewer:kde4__active-image-viewer.desktop.in.h:2 +msgid "An image viewer for touch tablets" +msgstr "" + +#: ../menu-data/plasma-active-settings:kde4__active-settings.desktop.in.h:1 +msgid "Settings" +msgstr "" + +#: ../menu-data/plasma-active-settings:kde4__active-settings.desktop.in.h:2 +msgid "Settings for Plasma Active" +msgstr "" + +#: ../menu-data/plasma-active-webbrowser:kde4__active-web-browser.desktop.in.h:1 +msgid "Browser" +msgstr "" + +#: ../menu-data/plasma-active-webbrowser:kde4__active-web-browser.desktop.in.h:2 +msgid "A web browser reader for touch tablets" +msgstr "" + #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1 msgid "SuperKaramba" msgstr "SuperKaramba" @@ -13574,6 +13752,14 @@ msgid "Graphical notification applet for prelude" msgstr "" +#: ../menu-data/prepaid-manager-applet:prepaid-manager-applet.desktop.in.h:1 +msgid "Prepaid Manager" +msgstr "" + +#: ../menu-data/prepaid-manager-applet:prepaid-manager-applet.desktop.in.h:2 +msgid "Manage balance of prepaid GSM SIM cards" +msgstr "" + #: ../menu-data/prerex:prerex.desktop.in.h:1 msgid "prerex" msgstr "" @@ -14133,6 +14319,14 @@ msgid "ALSA configuration browser" msgstr "" +#: ../menu-data/qashctl:qashctl.desktop.in.h:1 +msgid "QasHctl" +msgstr "" + +#: ../menu-data/qashctl:qashctl.desktop.in.h:2 +msgid "ALSA HCTL mixer" +msgstr "" + #: ../menu-data/qasmixer:qasmixer.desktop.in.h:1 msgid "QasMixer" msgstr "" @@ -14339,6 +14533,14 @@ msgid "Downloads and displays RFC" msgstr "下载和显示 RFC 文档" +#: ../menu-data/qrq:qrq.desktop.in.h:1 +msgid "qrq" +msgstr "" + +#: ../menu-data/qrq:qrq.desktop.in.h:2 +msgid "High speed Morse telegraphy trainer" +msgstr "" + #: ../menu-data/qsampler:qsampler.desktop.in.h:1 msgid "Qsampler" msgstr "" @@ -14443,6 +14645,10 @@ msgid "Qt 4 Settings" msgstr "Qt 4 设置" +#: ../menu-data/qtcreator:qtcreator.desktop.in.h:1 +msgid "Qt Creator" +msgstr "Qt 创造器" + #: ../menu-data/qtdmm:QtDMM.desktop.in.h:1 msgid "QtDMM" msgstr "QtDMM" @@ -14813,6 +15019,10 @@ msgid "Recoll" msgstr "Recoll" +#: ../menu-data/recorditnow:kde4__recorditnow.desktop.in.h:1 +msgid "Desktop recorder" +msgstr "桌面录像机" + #: ../menu-data/recorditnow:kde4__recorditnow.desktop.in.h:2 msgid "RecordItNow" msgstr "RecordItNow" @@ -14878,14 +15088,6 @@ msgid "A port of FlashBack game engine" msgstr "" -#: ../menu-data/remmina:remmina.desktop.in.h:1 -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 "" @@ -15287,19 +15489,14 @@ msgid "Scribes Text Editor" msgstr "Scribes 文本编辑器" -#: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:1 -msgid "ScribusNG" -msgstr "ScribusNG" +#: ../menu-data/scribus:scribus.desktop.in.h:1 +msgid "Scribus" +msgstr "" -#: ../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 "ScummVM" msgstr "" @@ -16151,6 +16348,14 @@ msgid "Graphical MIPS32 Assembly language emulator" msgstr "图形化的 MIPS32 汇编语言仿真器" +#: ../menu-data/sponc:sponc.desktop.in.h:1 +msgid "Sponc" +msgstr "" + +#: ../menu-data/sponc:sponc.desktop.in.h:2 +msgid "A multitouch pong clone" +msgstr "" + #: ../menu-data/spotlighter:spotlighter.desktop.in.h:1 msgid "Spotlighter" msgstr "" @@ -16180,11 +16385,11 @@ msgstr "" #: ../menu-data/spyder:spyder.desktop.in.h:1 -msgid "spyder" +msgid "Spyder" msgstr "" #: ../menu-data/spyder:spyder.desktop.in.h:2 -msgid "Python IDE for scientists" +msgid "Scientific PYthon Development EnviRonment" msgstr "" #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1 @@ -17352,6 +17557,14 @@ msgid "Tritium window manager" msgstr "Tritium 窗口管理器" +#: ../menu-data/trophy:trophy.desktop.in.h:1 +msgid "Trophy" +msgstr "" + +#: ../menu-data/trophy:trophy.desktop.in.h:2 +msgid "2D car racing game with power-ups" +msgstr "" + #: ../menu-data/trovacap:trovacap.desktop.in.h:1 msgid "TrovaCAP" msgstr "" @@ -17392,14 +17605,6 @@ msgid "Teletekst Browser" msgstr "" -#: ../menu-data/tucan:tucan.desktop.in.h:1 -msgid "Tucan Manager" -msgstr "" - -#: ../menu-data/tucan:tucan.desktop.in.h:2 -msgid "Download and upload manager for hosting sites." -msgstr "" - #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1 msgid "Tucnak 2" msgstr "Tucnak 2" @@ -17520,6 +17725,14 @@ msgid "TVtime Television Viewer" msgstr "TVtime 电视浏览器" +#: ../menu-data/twclock:twclock.desktop.in.h:1 +msgid "twclock" +msgstr "" + +#: ../menu-data/twclock:twclock.desktop.in.h:2 +msgid "World Clock and CW ID for Ham Radio Operators" +msgstr "" + #: ../menu-data/twinkle:twinkle.desktop.in.h:1 msgid "Twinkle" msgstr "Twinkle" @@ -17532,6 +17745,14 @@ msgid "Tile World" msgstr "" +#: ../menu-data/twpsk:twpsk.desktop.in.h:1 +msgid "twpsk" +msgstr "" + +#: ../menu-data/twpsk:twpsk.desktop.in.h:2 +msgid "PSK31 for Linux with a openMotif GUI" +msgstr "" + #: ../menu-data/txtreader:txtreader.desktop.in.h:1 msgid "Txt Reader" msgstr "Txt 阅读器" @@ -17678,21 +17899,13 @@ msgstr "Unison" #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2 -msgid "GTK interface for the unison file synchronization tool 2.32.52" +msgid "GTK interface for the unison file synchronization tool 2.40.63" msgstr "" #: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2 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 "Unity 2d Launcher" -msgstr "" - -#: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2 -msgid "A Qt-based applications launcher" -msgstr "" - #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1 msgid "Unity 2D Panel" msgstr "" @@ -17701,12 +17914,12 @@ msgid "A Qt-based panel" msgstr "" -#: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:1 -msgid "Unity 2D Places" +#: ../menu-data/unity-2d-shell:unity-2d-shell.desktop.in.h:1 +msgid "Unity 2D Shell" msgstr "" -#: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:2 -msgid "A Qt-based implementation of Unity Places" +#: ../menu-data/unity-2d-shell:unity-2d-shell.desktop.in.h:2 +msgid "A Qt-based implementation of most Unity components" msgstr "" #: ../menu-data/update-manager:update-manager.desktop.in.h:2 @@ -18135,22 +18348,6 @@ msgid "Start" msgstr "" -#: ../menu-data/wallch:wallch.desktop.in.h:4 -msgid "Pause" -msgstr "" - -#: ../menu-data/wallch:wallch.desktop.in.h:5 -msgid "Stop" -msgstr "" - -#: ../menu-data/wallch:wallch.desktop.in.h:6 -msgid "Next" -msgstr "" - -#: ../menu-data/wallch:wallch.desktop.in.h:7 -msgid "Previous" -msgstr "" - #: ../menu-data/wallch:wallch.desktop.in.h:8 msgid "Change Wallpaper" msgstr "" @@ -18187,14 +18384,6 @@ msgid "A 2D game where funny characters launch funny weapons" msgstr "一个好玩儿的字符加载好玩儿的武器的二维游戏" -#: ../menu-data/warsow:warsow.desktop.in.h:1 -msgid "Warsow" -msgstr "Warsow" - -#: ../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:1 msgid "Warzone 2100" msgstr "Warzone 2100" @@ -18302,6 +18491,14 @@ msgid "2D platform game with a slight rotational twist" msgstr "" +#: ../menu-data/whoopsie:whoopsie.desktop.in.h:1 +msgid "Diagnostics" +msgstr "" + +#: ../menu-data/whoopsie:whoopsie.desktop.in.h:2 +msgid "Change your diagnostics settings" +msgstr "" + #: ../menu-data/wicd-gtk:wicd.desktop.in.h:1 msgid "Wicd Network Manager" msgstr "Wicd 网络管理器" @@ -18352,8 +18549,7 @@ msgid "Setup content filtering" msgstr "安装内容过滤" -#: ../menu-data/wine1.2:wine.desktop.in.h:1 -#: ../menu-data/wine1.3:wine.desktop.in.h:1 +#: ../menu-data/wine1.4:wine.desktop.in.h:1 msgid "Wine Windows Program Loader" msgstr "Wine Windows 程序加载器" @@ -18498,6 +18694,14 @@ msgid "wxWidgets GUI Designer" msgstr "wxWidgets GUI 设计器" +#: ../menu-data/wxgeometrie:wxgeometrie.desktop.in.h:1 +msgid "WxGeometrie" +msgstr "" + +#: ../menu-data/wxgeometrie:wxgeometrie.desktop.in.h:2 +msgid "Swiss army knife for math teachers" +msgstr "" + #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1 msgid "wxMaxima" msgstr "wxMaxima" @@ -18518,6 +18722,10 @@ msgid "X2" msgstr "" +#: ../menu-data/x2goclient:x2goclient.desktop.in.h:1 +msgid "X2Go Client" +msgstr "" + #: ../menu-data/xabacus:xabacus.desktop.in.h:1 #: ../menu-data/xmabacus:xmabacus.desktop.in.h:1 msgid "Xabacus" @@ -18559,14 +18767,6 @@ 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 的电视浏览器" - -#: ../menu-data/xawtv:xawtv.desktop.in.h:2 -msgid "XawTV" -msgstr "XawTV" - #: ../menu-data/xbill:xbill.desktop.in.h:1 msgid "XBill" msgstr "XBill" @@ -18693,14 +18893,6 @@ msgid "Burn Image (xfburn)" msgstr "刻录镜像 (xfburn)" -#: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:1 -msgid "Desktop " -msgstr "" - -#: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "" - #: ../menu-data/xfe:xfe.desktop.in.h:1 msgid "Xfe" msgstr "Xfe" @@ -18733,30 +18925,6 @@ msgid "MPD client written in GTK+ for Xfce" msgstr "使用 GTK+ 的为 Xfce 编写的 MPD 客户端" -#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1 -msgid "Window Manager" -msgstr "" - -#: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2 -msgid "Configure window behavior and shortcuts" -msgstr "" - -#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1 -msgid "Window Manager Tweaks" -msgstr "" - -#: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2 -msgid "Fine-tune window behaviour and effects" -msgstr "" - -#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1 -msgid "Workspaces" -msgstr "" - -#: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2 -msgid "Set number and names of workspaces" -msgstr "" - #: ../menu-data/xgalaga:xgalaga.desktop.in.h:1 msgid "Galaga" msgstr "Galaga" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apport.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apport.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apport.po 2012-03-23 07:33:14.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-20 16:20+0000\n" +"POT-Creation-Date: 2012-03-09 16:22+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: 2012-02-21 22:39+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../apport/ui.py:92 @@ -42,107 +42,105 @@ "\n" "%s" -#. 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 +#: ../apport/ui.py:213 msgid "unknown program" msgstr "未知程序" -#: ../apport/ui.py:247 +#: ../apport/ui.py:214 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "抱歉，“%s”程序异常退出" -#: ../apport/ui.py:248 ../apport/ui.py:1077 +#: ../apport/ui.py:215 ../apport/ui.py:1087 #, python-format msgid "Problem in %s" msgstr "%s 中的问题" -#: ../apport/ui.py:249 +#: ../apport/ui.py:216 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。" -#: ../apport/ui.py:286 +#. package does not exist +#: ../apport/ui.py:230 ../apport/ui.py:237 ../apport/ui.py:243 +#: ../apport/ui.py:275 ../apport/ui.py:283 ../apport/ui.py:354 +#: ../apport/ui.py:357 ../apport/ui.py:555 ../apport/ui.py:910 +#: ../apport/ui.py:1043 ../apport/ui.py:1047 ../apport/ui.py:1066 +#: ../apport/ui.py:1072 +msgid "Invalid problem report" +msgstr "无效的问题报告" + +#: ../apport/ui.py:232 ../apport/ui.py:1049 +msgid "This problem report is damaged and cannot be processed." +msgstr "该问题报告已损坏，无法处理。" + +#: ../apport/ui.py:238 +msgid "The report belongs to a package that is not installed." +msgstr "该报告属于一个未安装的软件包。" + +#: ../apport/ui.py:244 +msgid "An error occurred while attempting to process this problem report:" +msgstr "" + +#: ../apport/ui.py:276 msgid "You are not allowed to access this problem report." msgstr "您不被允许访问这个问题报告。" -#: ../apport/ui.py:289 +#: ../apport/ui.py:279 msgid "Error" msgstr "错误" -#: ../apport/ui.py:290 +#: ../apport/ui.py:280 msgid "There is not enough disk space available to process this report." msgstr "没有足够的空间来执行报告。" -#: ../apport/ui.py:317 +#: ../apport/ui.py:307 msgid "No package specified" msgstr "没有指定软件包" -#: ../apport/ui.py:318 +#: ../apport/ui.py:308 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。" -#: ../apport/ui.py:334 +#: ../apport/ui.py:324 msgid "Invalid PID" msgstr "无效的 PID" -#: ../apport/ui.py:335 +#: ../apport/ui.py:325 msgid "The specified process ID does not belong to a program." msgstr "指定的进程 ID 不属于一个程序。" -#: ../apport/ui.py:343 +#: ../apport/ui.py:333 msgid "Permission denied" msgstr "没有权限" -#: ../apport/ui.py:344 +#: ../apport/ui.py:334 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:365 +#: ../apport/ui.py:355 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "症状脚本 %s 没有划定受影响的包" -#: ../apport/ui.py:368 +#: ../apport/ui.py:358 #, python-format msgid "Package %s does not exist" msgstr "软件包 %s 不存在" -#: ../apport/ui.py:393 ../apport/ui.py:577 ../apport/ui.py:582 +#: ../apport/ui.py:383 ../apport/ui.py:567 ../apport/ui.py:572 msgid "Cannot create report" msgstr "不能创建报告" -#: ../apport/ui.py:408 ../apport/ui.py:454 ../apport/ui.py:471 +#: ../apport/ui.py:398 ../apport/ui.py:444 ../apport/ui.py:461 msgid "Updating problem report" msgstr "更新问题报告" -#: ../apport/ui.py:409 +#: ../apport/ui.py:399 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -152,7 +150,7 @@ "您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经结案。\n" "请使用\"报告问题\"新建一份报告。" -#: ../apport/ui.py:418 +#: ../apport/ui.py:408 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 " @@ -167,51 +165,51 @@ "因此，我们建议您使用”apport-bug“来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n" "您确定要继续么？" -#: ../apport/ui.py:455 ../apport/ui.py:472 +#: ../apport/ui.py:445 ../apport/ui.py:462 msgid "No additional information collected." msgstr "未收集更多信息。" -#: ../apport/ui.py:522 +#: ../apport/ui.py:512 msgid "What kind of problem do you want to report?" msgstr "您想报告什么类型的问题？" -#: ../apport/ui.py:539 +#: ../apport/ui.py:529 msgid "Unknown symptom" msgstr "未知症状" -#: ../apport/ui.py:540 +#: ../apport/ui.py:530 #, python-format msgid "The symptom \"%s\" is not known." msgstr "症状\"%s\"不可知。" -#: ../apport/ui.py:568 +#: ../apport/ui.py:558 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。" -#: ../apport/ui.py:578 ../apport/ui.py:583 +#: ../apport/ui.py:568 ../apport/ui.py:573 msgid "xprop failed to determine process ID of the window" msgstr "xprop 无法确定窗口的进程 ID" -#: ../apport/ui.py:597 +#: ../apport/ui.py:587 msgid "%prog " msgstr "%prog <报告号>" -#: ../apport/ui.py:599 +#: ../apport/ui.py:589 msgid "Specify package name." msgstr "请指定包的名称。" -#: ../apport/ui.py:601 ../apport/ui.py:650 +#: ../apport/ui.py:591 ../apport/ui.py:640 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "向报告中添加额外的标记，可被多次指定。" -#: ../apport/ui.py:631 +#: ../apport/ui.py:621 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]" -#: ../apport/ui.py:634 +#: ../apport/ui.py:624 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 " @@ -219,116 +217,118 @@ msgstr "" "以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。" -#: ../apport/ui.py:636 +#: ../apport/ui.py:626 msgid "Click a window as a target for filing a problem report." msgstr "点击一个窗口作为提交问题报告的目标。" -#: ../apport/ui.py:638 +#: ../apport/ui.py:628 msgid "Start in bug updating mode. Can take an optional --package." msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。" -#: ../apport/ui.py:640 +#: ../apport/ui.py:630 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" msgstr "针对某个症状报告 bug。" -#: ../apport/ui.py:642 +#: ../apport/ui.py:632 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:644 +#: ../apport/ui.py:634 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:646 +#: ../apport/ui.py:636 #, 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:648 +#: ../apport/ui.py:638 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:652 +#: ../apport/ui.py:642 msgid "Print the Apport version number." msgstr "打印 Apport 版本号" -#: ../apport/ui.py:784 +#: ../apport/ui.py:774 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "" -#: ../apport/ui.py:785 +#: ../apport/ui.py:775 msgid "Run gdb session" msgstr "" -#: ../apport/ui.py:786 +#: ../apport/ui.py:776 msgid "Run gdb session without downloading debug symbols" msgstr "" #. TRANSLATORS: %s contains the crash report file name -#: ../apport/ui.py:788 +#: ../apport/ui.py:778 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "" -#: ../apport/ui.py:828 +#: ../apport/ui.py:819 #, python-format -msgid "The problem happened with the program %s which changed since then." +msgid "" +"The problem happened with the program %s which changed since the crash " +"occurred." msgstr "" -#: ../apport/ui.py:899 +#: ../apport/ui.py:911 msgid "Could not determine the package or source package name." msgstr "无法检测包或者源码包的名称。" -#: ../apport/ui.py:914 +#: ../apport/ui.py:929 msgid "Unable to start web browser" msgstr "无法打开浏览器" -#: ../apport/ui.py:915 +#: ../apport/ui.py:930 #, python-format msgid "Unable to start web browser to open %s." msgstr "无法用浏览器打开网页 %s" -#: ../apport/ui.py:989 +#: ../apport/ui.py:999 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "请为 %s 错误追踪系统输入您的帐户信息" -#: ../apport/ui.py:1000 +#: ../apport/ui.py:1010 msgid "Network problem" msgstr "网络问题" -#: ../apport/ui.py:1002 +#: ../apport/ui.py:1012 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。" -#: ../apport/ui.py:1028 +#: ../apport/ui.py:1038 msgid "Memory exhaustion" msgstr "内存耗尽" -#: ../apport/ui.py:1029 +#: ../apport/ui.py:1039 msgid "Your system does not have enough memory to process this crash report." msgstr "你的系统没有足够的内存来处理这一次崩溃报告。" -#: ../apport/ui.py:1052 ../apport/ui.py:1061 +#: ../apport/ui.py:1062 ../apport/ui.py:1071 msgid "" "This problem report applies to a program which is not installed any more." msgstr "这一问题报告适用于不再安装的程序。" -#: ../apport/ui.py:1080 +#: ../apport/ui.py:1090 #, python-format msgid "" "The problem cannot be reported:\n" @@ -339,18 +339,18 @@ "\n" "%s" -#: ../apport/ui.py:1113 ../apport/ui.py:1120 +#: ../apport/ui.py:1127 ../apport/ui.py:1134 msgid "Problem already known" msgstr "这是已知问题" -#: ../apport/ui.py:1114 +#: ../apport/ui.py:1128 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:1121 +#: ../apport/ui.py:1135 msgid "This problem was already reported to developers. Thank you!" msgstr "" @@ -367,68 +367,20 @@ msgid "Please choose (%s):" msgstr "请选择(%s)：" -#. translators: first %s: application name, second %s: date, third %s: time -#: ../bin/apport-cli.py:140 -#, python-format -msgid "%s closed unexpectedly on %s at %s." -msgstr "%s 异常关闭在 %s 在 %s。" - -#: ../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" -"the problem." -msgstr "" -"如果您没有做任何机密的事情 (输入密码或者其它私人信息)，\n" -"可以通过汇报这个问题来改进程序。" - -#: ../bin/apport-cli.py:147 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184 -msgid "&Report Problem..." -msgstr "提交问题报告(&R)…" - -#: ../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: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:164 -#, python-format -msgid "The package \"%s\" failed to install or upgrade." -msgstr "软件包\"%s\"安装或者升级失败。" - -#: ../bin/apport-cli.py:165 -msgid "" -"You can help the developers to fix the package by reporting the problem." -msgstr "请报告问题，这能帮助开发者修正它。" - -#: ../bin/apport-cli.py:177 -msgid "Your system encountered a serious kernel problem." -msgstr "您的系统遇到了一个严重的内核问题。" - -#: ../bin/apport-cli.py:181 -msgid "You can help the developers to fix the problem by reporting it." -msgstr "您可以通过报告这个信息来帮助开发者解决这个问题。" - -#: ../bin/apport-cli.py:212 +#: ../bin/apport-cli.py:141 #, python-format msgid "(%i bytes)" msgstr "(%i 字节)" -#: ../bin/apport-cli.py:214 ../gtk/apport-gtk.py:117 ../kde/apport-kde.py:307 +#: ../bin/apport-cli.py:143 ../gtk/apport-gtk.py:113 ../kde/apport-kde.py:311 msgid "(binary data)" msgstr "(二进制数据)" -#: ../bin/apport-cli.py:235 ../test/gtk.py:248 ../gtk/apport-gtk.py:145 -#: ../kde/apport-kde.py:153 ../test/kde.py:169 +#: ../bin/apport-cli.py:173 ../gtk/apport-gtk.py:142 ../kde/apport-kde.py:156 msgid "Send problem report to the developers?" msgstr "向开发者发送问题报告？" -#: ../bin/apport-cli.py:236 +#: ../bin/apport-cli.py:174 msgid "" "After the problem report has been sent, please fill out the form in the\n" "automatically opened web browser." @@ -436,41 +388,50 @@ "当问题报告被发出之后，请填写\n" "自动弹出窗口的表格。" -#: ../bin/apport-cli.py:239 +#: ../bin/apport-cli.py:177 #, python-format msgid "&Send report (%s)" msgstr "发送报告(&S)(%s)" -#: ../bin/apport-cli.py:243 +#: ../bin/apport-cli.py:181 msgid "&Examine locally" msgstr "" -#: ../bin/apport-cli.py:247 +#: ../bin/apport-cli.py:185 msgid "&View report" msgstr "查看报告(&V)" -#: ../bin/apport-cli.py:248 +#: ../bin/apport-cli.py:186 msgid "&Keep report file for sending later or copying to somewhere else" msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)" -#: ../bin/apport-cli.py:284 +#: ../bin/apport-cli.py:187 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "终止并忽略这个版本软件以后出现的崩溃。" + +#: ../bin/apport-cli.py:189 ../bin/apport-cli.py:266 ../bin/apport-cli.py:298 +#: ../bin/apport-cli.py:319 +msgid "&Cancel" +msgstr "取消(&C)" + +#: ../bin/apport-cli.py:217 msgid "Problem report file:" msgstr "问题报告文件：" -#: ../bin/apport-cli.py:290 ../bin/apport-cli.py:295 +#: ../bin/apport-cli.py:223 ../bin/apport-cli.py:228 msgid "&Confirm" msgstr "确认(&C)" -#: ../bin/apport-cli.py:294 +#: ../bin/apport-cli.py:227 #, python-format msgid "Error: %s" msgstr "错误：%s" -#: ../bin/apport-cli.py:300 ../kde/apport-kde.py:343 +#: ../bin/apport-cli.py:233 ../kde/apport-kde.py:356 msgid "Collecting problem information" msgstr "正在收集问题信息" -#: ../bin/apport-cli.py:301 +#: ../bin/apport-cli.py:234 msgid "" "The collected information can be sent to the developers to improve the\n" "application. This might take a few minutes." @@ -478,11 +439,11 @@ "收集到的信息将会传送到开发人员处以改进软件。\n" "这可能会花费几分钟时间，" -#: ../bin/apport-cli.py:313 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:360 +#: ../bin/apport-cli.py:246 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:384 msgid "Uploading problem information" msgstr "上传问题信息" -#: ../bin/apport-cli.py:314 +#: ../bin/apport-cli.py:247 msgid "" "The collected information is being sent to the bug tracking system.\n" "This might take a few minutes." @@ -490,50 +451,50 @@ "收集到的信息正在被发送到错误跟踪系统。\n" "这可能要花费几分钟时间。" -#: ../bin/apport-cli.py:364 +#: ../bin/apport-cli.py:297 msgid "&Done" msgstr "完成(&D)" -#: ../bin/apport-cli.py:370 +#: ../bin/apport-cli.py:303 msgid "none" msgstr "无" -#: ../bin/apport-cli.py:371 +#: ../bin/apport-cli.py:304 #, python-format msgid "Selected: %s. Multiple choices:" msgstr "已选择：%s。 多重选择：" -#: ../bin/apport-cli.py:387 +#: ../bin/apport-cli.py:320 msgid "Choices:" msgstr "选择：" -#: ../bin/apport-cli.py:401 +#: ../bin/apport-cli.py:334 msgid "Path to file (Enter to cancel):" msgstr "文件的路径(回车取消)：" -#: ../bin/apport-cli.py:407 +#: ../bin/apport-cli.py:340 msgid "File does not exist." msgstr "文件不存在。" -#: ../bin/apport-cli.py:409 +#: ../bin/apport-cli.py:342 msgid "This is a directory." msgstr "这是一个目录。" -#: ../bin/apport-cli.py:415 +#: ../bin/apport-cli.py:348 msgid "To continue, you must visit the following URL:" msgstr "要继续，您必须访问下面这个网址：" -#: ../bin/apport-cli.py:417 +#: ../bin/apport-cli.py:350 msgid "" "You can launch a browser now, or copy this URL into a browser on another " "computer." msgstr "您现在可以加载一个浏览器，或者复制这个网址到另外一个电脑的浏览器。" -#: ../bin/apport-cli.py:419 +#: ../bin/apport-cli.py:352 msgid "Launch a browser now" msgstr "现在启动一个浏览器" -#: ../bin/apport-cli.py:433 +#: ../bin/apport-cli.py:366 msgid "No pending crash reports. Try --help for more information." msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。" @@ -555,7 +516,7 @@ "completed normally." msgstr "这个恢复过程已经非常接近尾声， 将正常地结束。" -#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:395 ../kde/apport-kde.py:431 +#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:419 ../kde/apport-kde.py:455 msgid "Apport" msgstr "Apport" @@ -564,11 +525,10 @@ msgstr "" #: ../gtk/apport-gtk.ui.h:3 -msgid "Sorry, Ubuntu has experienced an internal error." +msgid "Sorry, an internal error happened." 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 +#: ../gtk/apport-gtk.ui.h:4 ../gtk/apport-gtk.py:216 ../kde/apport-kde.py:202 msgid "If you notice further problems, try restarting the computer." msgstr "" @@ -580,8 +540,8 @@ msgid "Ignore future problems of this program version" msgstr "" -#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:164 ../gtk/apport-gtk.py:461 -#: ../kde/apport-kde.py:240 +#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:160 ../gtk/apport-gtk.py:474 +#: ../kde/apport-kde.py:244 msgid "Show Details" msgstr "" @@ -589,14 +549,12 @@ msgid "_Examine locally" msgstr "" -#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:212 ../kde/apport-kde.py:192 +#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:207 ../kde/apport-kde.py:195 msgid "Leave Closed" 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 +#: ../gtk/apport-gtk.ui.h:10 ../gtk/apport-gtk.py:172 ../gtk/apport-gtk.py:219 +#: ../kde/apport-kde.py:205 msgid "Continue" msgstr "" @@ -614,7 +572,7 @@ msgid "Uploading problem information" msgstr "正在上传问题信息" -#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:361 +#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:385 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." @@ -730,102 +688,71 @@ 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:132 +#: ../gtk/apport-gtk.py:127 #, python-format msgid "Sorry, the application %s has closed unexpectedly." msgstr "" -#: ../gtk/apport-gtk.py:135 +#: ../gtk/apport-gtk.py:130 #, python-format msgid "Sorry, %s has closed unexpectedly." msgstr "" -#: ../gtk/apport-gtk.py:139 ../kde/apport-kde.py:196 +#: ../gtk/apport-gtk.py:136 ../kde/apport-kde.py:170 ../kde/apport-kde.py:199 #, python-format msgid "Sorry, %s has experienced an internal error." msgstr "" -#: ../gtk/apport-gtk.py:185 ../kde/apport-kde.py:167 -#, python-format -msgid "%s has restarted after experiencing an internal error." +#: ../gtk/apport-gtk.py:151 ../kde/apport-kde.py:164 +msgid "Send" msgstr "" -#: ../gtk/apport-gtk.py:193 ../kde/apport-kde.py:175 +#: ../gtk/apport-gtk.py:188 ../kde/apport-kde.py:178 #, python-format msgid "Package: %s" msgstr "" -#: ../gtk/apport-gtk.py:209 ../kde/apport-kde.py:187 +#: ../gtk/apport-gtk.py:195 ../kde/apport-kde.py:184 +msgid "Sorry, a problem occurred while installing software." +msgstr "" + +#: ../gtk/apport-gtk.py:204 ../kde/apport-kde.py:190 #, python-format msgid "The application %s has closed unexpectedly." msgstr "" -#: ../gtk/apport-gtk.py:464 ../kde/apport-kde.py:237 +#: ../gtk/apport-gtk.py:208 ../gtk/apport-gtk.py:270 ../kde/apport-kde.py:196 +#: ../kde/apport-kde.py:330 +msgid "Relaunch" +msgstr "" + +#: ../gtk/apport-gtk.py:478 ../kde/apport-kde.py:241 msgid "Hide Details" msgstr "" -#: ../kde/apport-kde.py:269 +#: ../kde/apport-kde.py:267 msgid "Username:" msgstr "用户名：" -#: ../kde/apport-kde.py:270 +#: ../kde/apport-kde.py:268 msgid "Password:" msgstr "密码：" -#: ../kde/apport-kde.py:342 +#: ../kde/apport-kde.py:355 msgid "Collecting Problem Information" msgstr "正在收集问题信息" -#: ../kde/apport-kde.py:344 +#: ../kde/apport-kde.py:357 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:359 +#: ../kde/apport-kde.py:383 msgid "Uploading Problem Information" msgstr "上传问题信息" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt-listchanges.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apt-listchanges.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apt-listchanges.po 2012-03-23 07:32:47.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: 2012-02-21 17:26+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Generated-By: pygettext.py 1.4\n" #: ../apt-listchanges.py:80 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apt.po 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apt.po 2012-03-23 07:32:47.000000000 +0000 @@ -9,16 +9,16 @@ 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 12:39+0000\n" +"POT-Creation-Date: 2012-03-15 19:05+0000\n" +"PO-Revision-Date: 2012-03-15 23:34+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: 2012-02-21 17:25+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: cmdline/apt-cache.cc:158 @@ -1345,33 +1345,33 @@ "　　　apt-get 需要 root 特权进行实际的执行。\n" "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" -#: cmdline/acqprogress.cc:59 +#: cmdline/acqprogress.cc:60 msgid "Hit " msgstr "命中 " -#: cmdline/acqprogress.cc:83 +#: cmdline/acqprogress.cc:84 msgid "Get:" msgstr "获取：" -#: cmdline/acqprogress.cc:114 +#: cmdline/acqprogress.cc:115 msgid "Ign " msgstr "忽略 " -#: cmdline/acqprogress.cc:118 +#: cmdline/acqprogress.cc:119 msgid "Err " msgstr "错误 " -#: cmdline/acqprogress.cc:139 +#: cmdline/acqprogress.cc:140 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "下载 %sB，耗时 %s (%sB/s)\n" -#: cmdline/acqprogress.cc:229 +#: cmdline/acqprogress.cc:230 #, c-format msgid " [Working]" msgstr " [执行中]" -#: cmdline/acqprogress.cc:285 +#: cmdline/acqprogress.cc:286 #, c-format msgid "" "Media change: please insert the disc labeled\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apturl.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/apturl.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/apturl.po 2012-03-23 07:33:19.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apturl\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-10-14 08:13+0000\n" +"POT-Creation-Date: 2012-03-13 22:49+0000\n" "PO-Revision-Date: 2011-08-20 10:38+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-21 23:55+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:53+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../apturl-gtk:50 ../apturl-kde:53 msgid "User requested interrupt." @@ -153,29 +153,29 @@ msgstr "安装(_I)" #: ../data/apturl.schemas.in.h:1 -msgid "Run the command in a terminal" -msgstr "在终端中运行命令" +msgid "Whether the specified command should handle \"apt\" URLs" +msgstr "指定的命令是否应当处理软件源 网址" #: ../data/apturl.schemas.in.h:2 -msgid "The command used to handle \"apt\" URLs, if enabled." -msgstr "如果此程序被启用，将用来处理“apt”地址。" +msgid "" +"True if the command specified in the \"command\" key should handle \"apt\" " +"URLs." +msgstr "如果在 \"command\" 按键中指定的命令应当处理软件源则为真。" #: ../data/apturl.schemas.in.h:3 msgid "The handler for \"apt\" URLs" msgstr "“apt”地址处理器" #: ../data/apturl.schemas.in.h:4 -msgid "" -"True if the command specified in the \"command\" key should handle \"apt\" " -"URLs." -msgstr "如果在 \"command\" 按键中指定的命令应当处理软件源则为真。" +msgid "The command used to handle \"apt\" URLs, if enabled." +msgstr "如果此程序被启用，将用来处理“apt”地址。" #: ../data/apturl.schemas.in.h:5 +msgid "Run the command in a terminal" +msgstr "在终端中运行命令" + +#: ../data/apturl.schemas.in.h:6 msgid "" "True if the command used to handle this type of URL should be run in a " "terminal." msgstr "True 代表要处理此 URL 的程序应该在终端中运行。" - -#: ../data/apturl.schemas.in.h:6 -msgid "Whether the specified command should handle \"apt\" URLs" -msgstr "指定的命令是否应当处理软件源 网址" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/aspell.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/aspell.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/aspell.po 2012-03-23 07:32:47.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: kevina@gnu.org\n" "POT-Creation-Date: 2011-07-07 13:15-0600\n" "PO-Revision-Date: 2011-12-05 16:34+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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: 2012-02-21 17:27+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: common/info.cpp:232 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/attr.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/attr.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/attr.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/attr.po 2012-03-23 07:32:47.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: 2012-02-21 17:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../attr/attr.c:46 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/avahi.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/avahi.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/avahi.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/avahi.po 2012-03-23 07:33:11.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: 2012-02-21 21:56+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:43+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../avahi-common/error.c:30 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bacula.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bacula.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bacula.po 2012-02-23 07:11:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bacula.po 2012-03-23 07:33:00.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: 2012-02-21 19:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/dird/jobq.c:74 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bash.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bash.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bash.po 2012-03-23 07:32:48.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:19+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: arrayfunc.c:50 msgid "bad array subscript" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bfd.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bfd.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bfd.po 2012-03-23 07:32:48.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: 2012-01-27 01:33+0000\n" +"PO-Revision-Date: 2012-03-09 02:07+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: 2012-02-21 17:29+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:19+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/binutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/binutils.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/binutils.po 2012-03-23 07:32:48.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: 2012-01-27 01:49+0000\n" +"PO-Revision-Date: 2012-03-09 02:14+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: 2012-02-21 17:30+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:20+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: addr2line.c:81 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bison.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bison.po 2012-03-23 07:32:48.000000000 +0000 @@ -9,14 +9,14 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-05-14 18:25-0400\n" "PO-Revision-Date: 2009-10-23 03:51+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:22+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/bison-runtime.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bison-runtime.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/bison-runtime.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/bison-runtime.po 2012-03-23 07:32:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:33+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:22+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: data/glr.c:923 data/yacc.c:727 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/byobu.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/byobu.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/byobu.po 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/byobu.po 2012-03-23 07:33:25.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-23 20:48-0600\n" "PO-Revision-Date: 2009-09-29 06:20+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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 01:13+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:44+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/checkbox.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/checkbox.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/checkbox.po 2012-02-23 07:12:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/checkbox.po 2012-03-23 07:33:23.000000000 +0000 @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: checkbox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-16 16:07+0000\n" +"POT-Creation-Date: 2012-03-22 09:04+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" +"X-Launchpad-Export-Date: 2012-03-22 21:26+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. Title of the user interface -#: ../gtk/checkbox-gtk.ui.h:1 ../gtk/checkbox-gtk.desktop.in.h:1 -#: ../plugins/user_interface.py:42 +#: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1 +#: ../plugins/user_interface.py:43 msgid "System Testing" msgstr "系统测试" @@ -39,8 +39,8 @@ msgid "_Skip this test" msgstr "跳过这个测试(_S)" -#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:348 -#: ../checkbox_urwid/urwid_interface.py:261 +#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:444 +#: ../checkbox_urwid/urwid_interface.py:267 msgid "Further information:" msgstr "更多信息：" @@ -60,7 +60,7 @@ msgid "Ne_xt" msgstr "下一步(_X)" -#: ../gtk/checkbox-gtk.desktop.in.h:2 +#: ../qt/checkbox-qt.desktop.in.h:2 msgid "Test your system and submit results to the Ubuntu Friendly project" msgstr "" @@ -875,7 +875,7 @@ " 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" +"VERIFICATION:\n" " Do the keys work as expected?" msgstr "" @@ -885,187 +885,187 @@ msgstr "音频测试" #. description -#: ../jobs/local.txt.in:8 +#: ../jobs/local.txt.in:10 msgid "Autotest Suite tests" msgstr "" #. description -#: ../jobs/local.txt.in:13 +#: ../jobs/local.txt.in:17 msgid "Bluetooth tests" msgstr "" #. description -#: ../jobs/local.txt.in:18 +#: ../jobs/local.txt.in:24 msgid "Camera tests" msgstr "摄像头测试" #. description -#: ../jobs/local.txt.in:23 +#: ../jobs/local.txt.in:31 msgid "Codec tests" msgstr "" #. description -#: ../jobs/local.txt.in:28 +#: ../jobs/local.txt.in:38 msgid "CPU tests" msgstr "中央处理器测试" #. description -#: ../jobs/local.txt.in:33 +#: ../jobs/local.txt.in:45 msgid "System Daemon tests" msgstr "系统守护进程测试" #. description -#: ../jobs/local.txt.in:38 +#: ../jobs/local.txt.in:52 msgid "Disk tests" msgstr "磁盘测试" #. description -#: ../jobs/local.txt.in:43 +#: ../jobs/local.txt.in:59 msgid "Fingerprint reader tests" msgstr "指纹阅读器测试" #. description -#: ../jobs/local.txt.in:48 +#: ../jobs/local.txt.in:66 msgid "Firewire disk tests" msgstr "火线(Firewire)磁盘测试" #. description -#: ../jobs/local.txt.in:53 +#: ../jobs/local.txt.in:73 msgid "Floppy disk tests" msgstr "" #. description -#: ../jobs/local.txt.in:58 +#: ../jobs/local.txt.in:80 msgid "Graphics tests" msgstr "" #. description -#: ../jobs/local.txt.in:63 +#: ../jobs/local.txt.in:87 msgid "Hibernation tests" msgstr "" #. description -#: ../jobs/local.txt.in:68 +#: ../jobs/local.txt.in:94 msgid "Informational tests" msgstr "" #. description -#: ../jobs/local.txt.in:73 +#: ../jobs/local.txt.in:101 msgid "Input Devices tests" msgstr "" #. description -#: ../jobs/local.txt.in:78 +#: ../jobs/local.txt.in:108 msgid "Software Installation tests" msgstr "" #. description -#: ../jobs/local.txt.in:83 +#: ../jobs/local.txt.in:115 msgid "Hotkey tests" msgstr "" #. description -#: ../jobs/local.txt.in:88 +#: ../jobs/local.txt.in:122 msgid "Linux Test Project tests" msgstr "" #. description -#: ../jobs/local.txt.in:93 +#: ../jobs/local.txt.in:129 msgid "Mago Automated Desktop Testing" msgstr "" #. description -#: ../jobs/local.txt.in:98 +#: ../jobs/local.txt.in:136 msgid "Media Card tests" msgstr "" #. description -#: ../jobs/local.txt.in:103 +#: ../jobs/local.txt.in:143 msgid "Memory tests" msgstr "" #. description -#: ../jobs/local.txt.in:108 +#: ../jobs/local.txt.in:150 msgid "Miscellaneous tests" msgstr "" #. description -#: ../jobs/local.txt.in:113 +#: ../jobs/local.txt.in:157 msgid "Monitor tests" msgstr "显示器测试" #. description -#: ../jobs/local.txt.in:118 +#: ../jobs/local.txt.in:164 msgid "Networking tests" msgstr "" #. description -#: ../jobs/local.txt.in:123 +#: ../jobs/local.txt.in:171 msgid "Optical Drive tests" msgstr "" #. description -#: ../jobs/local.txt.in:128 +#: ../jobs/local.txt.in:178 msgid "Panel Clock Verification tests" msgstr "" #. description -#: ../jobs/local.txt.in:133 +#: ../jobs/local.txt.in:185 msgid "PCMCIA/PCIX Card tests" msgstr "" #. description -#: ../jobs/local.txt.in:138 +#: ../jobs/local.txt.in:192 msgid "Peripheral tests" msgstr "外围设备测试" #. description -#: ../jobs/local.txt.in:143 +#: ../jobs/local.txt.in:199 msgid "Phoronix Test Suite tests" msgstr "" #. description -#: ../jobs/local.txt.in:148 +#: ../jobs/local.txt.in:206 msgid "Power Management tests" msgstr "" #. description -#: ../jobs/local.txt.in:153 +#: ../jobs/local.txt.in:213 msgid "QA Regression tests" msgstr "" #. description -#: ../jobs/local.txt.in:158 +#: ../jobs/local.txt.in:220 msgid "Server Services checks" msgstr "" #. description -#: ../jobs/local.txt.in:163 +#: ../jobs/local.txt.in:227 msgid "Suspend tests" msgstr "" #. description -#: ../jobs/local.txt.in:168 +#: ../jobs/local.txt.in:234 msgid "Unity tests" msgstr "" #. description -#: ../jobs/local.txt.in:173 +#: ../jobs/local.txt.in:241 msgid "USB tests" msgstr "" #. description -#: ../jobs/local.txt.in:178 +#: ../jobs/local.txt.in:248 msgid "User Applications" msgstr "用户应用程序" #. description -#: ../jobs/local.txt.in:183 +#: ../jobs/local.txt.in:255 msgid "Wireless networking tests" msgstr "" #. description -#: ../jobs/local.txt.in:188 +#: ../jobs/local.txt.in:262 msgid "Stress tests" msgstr "压力测试" @@ -1641,17 +1641,17 @@ " 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" +" 2. If a file browser window opens, you can safely close or ignore that " +"window.\n" +" 3. Click \"Test\" to being the test.\n" +" 4. When the test completes, proceed by clicking \"Next\"\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?" +" This test should automatically select \"Yes\" if it passes, \"No\" if it " +"fails." msgstr "" #. description -#: ../jobs/optical.txt.in:33 +#: ../jobs/optical.txt.in:34 msgid "" "PURPOSE:\n" " This test will check your system's CD writing capabilities. This test " @@ -1669,28 +1669,26 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:47 +#: ../jobs/optical.txt.in:48 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" +" 2. When prompted, launch the Music Player\n" +" 3. Locate the CD in the display of the Music Player\n" +" 4. Select the CD in the Music Player\n" +" 5. Click the Play button to listen to the music on the CD\n" " 6. Stop playing after some time\n" -" 7. Right click on the CD icon under \"Libraries\" and select \"Eject " -"Disc\"\n" +" 7. Right click on the CD icon and select \"Eject Disc\"\n" " 8. The CD should be ejected\n" -" 9. Close Banshee\n" +" 9. Close the Music Player\n" "VERIFICATION:\n" " Did all the steps work?" msgstr "" #. description -#: ../jobs/optical.txt.in:70 +#: ../jobs/optical.txt.in:71 msgid "" "PURPOSE:\n" " This test will check your system's DVD writing capabilities. This test " @@ -1708,7 +1706,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:84 +#: ../jobs/optical.txt.in:85 msgid "" "PURPOSE:\n" " This test will check your DVD movie playback capabilities. Note that " @@ -1727,7 +1725,7 @@ msgstr "" #. description -#: ../jobs/optical.txt.in:102 +#: ../jobs/optical.txt.in:103 msgid "" "PURPOSE:\n" " This test will check your DVD playback capabilities\n" @@ -2881,17 +2879,17 @@ msgstr "未知信号" #: ../checkbox_cli/cli_interface.py:31 -#: ../checkbox_urwid/urwid_interface.py:686 +#: ../checkbox_urwid/urwid_interface.py:917 msgid "yes" msgstr "是" #: ../checkbox_cli/cli_interface.py:32 -#: ../checkbox_urwid/urwid_interface.py:687 +#: ../checkbox_urwid/urwid_interface.py:918 msgid "no" msgstr "否" #: ../checkbox_cli/cli_interface.py:33 -#: ../checkbox_urwid/urwid_interface.py:688 +#: ../checkbox_urwid/urwid_interface.py:919 msgid "skip" msgstr "跳过" @@ -2899,65 +2897,77 @@ msgid "Press any key to continue..." msgstr "按下任何一个键继续…" -#: ../checkbox_cli/cli_interface.py:135 +#: ../checkbox_cli/cli_interface.py:135 ../checkbox_cli/cli_interface.py:234 #, python-format msgid "Please choose (%s): " msgstr "请选择 (%s)： " -#: ../checkbox_cli/cli_interface.py:250 ../checkbox_cli/cli_interface.py:281 +#: ../checkbox_cli/cli_interface.py:229 ../checkbox_cli/cli_interface.py:338 +#: ../checkbox_cli/cli_interface.py:368 msgid "Space when finished" msgstr "" -#: ../checkbox_cli/cli_interface.py:280 +#: ../checkbox_cli/cli_interface.py:367 msgid "Combine with character above to expand node" msgstr "" -#: ../checkbox_cli/cli_interface.py:320 +#: ../checkbox_cli/cli_interface.py:416 msgid "test" msgstr "测试" -#: ../checkbox_cli/cli_interface.py:344 +#: ../checkbox_cli/cli_interface.py:440 msgid "test again" msgstr "再次测试" -#: ../checkbox_cli/cli_interface.py:350 +#: ../checkbox_cli/cli_interface.py:446 msgid "Please type here and press Ctrl-D when finished:\n" msgstr "请在这里输入并在结束时按下 Ctrl-D ：\n" -#: ../checkbox_urwid/urwid_interface.py:60 +#: ../checkbox_urwid/urwid_interface.py:66 msgid "Checkbox System Testing" msgstr "Checkbox 系统测试" -#: ../checkbox_urwid/urwid_interface.py:99 +#: ../checkbox_urwid/urwid_interface.py:105 msgid "Continue" msgstr "继续" -#: ../checkbox_urwid/urwid_interface.py:192 -#: ../checkbox_urwid/urwid_interface.py:268 -#: ../checkbox_urwid/urwid_interface.py:418 +#: ../checkbox_urwid/urwid_interface.py:198 +#: ../checkbox_urwid/urwid_interface.py:274 +#: ../checkbox_urwid/urwid_interface.py:425 +#: ../checkbox_urwid/urwid_interface.py:547 msgid "Previous" msgstr "上一个" -#: ../checkbox_urwid/urwid_interface.py:193 -#: ../checkbox_urwid/urwid_interface.py:269 -#: ../checkbox_urwid/urwid_interface.py:419 +#: ../checkbox_urwid/urwid_interface.py:199 +#: ../checkbox_urwid/urwid_interface.py:275 +#: ../checkbox_urwid/urwid_interface.py:426 +#: ../checkbox_urwid/urwid_interface.py:548 msgid "Next" msgstr "下一个" #. Show buttons -#: ../checkbox_urwid/urwid_interface.py:416 +#: ../checkbox_urwid/urwid_interface.py:423 msgid "Select All" msgstr "选择全部" -#: ../checkbox_urwid/urwid_interface.py:417 +#: ../checkbox_urwid/urwid_interface.py:424 msgid "Deselect All" msgstr "取消全部选择" -#: ../checkbox_urwid/urwid_interface.py:774 +#. Show buttons +#: ../checkbox_urwid/urwid_interface.py:545 +msgid "Expand All" +msgstr "" + +#: ../checkbox_urwid/urwid_interface.py:546 +msgid "Collapse All" +msgstr "" + +#: ../checkbox_urwid/urwid_interface.py:1013 msgid "Test" msgstr "测试" -#: ../checkbox_urwid/urwid_interface.py:789 +#: ../checkbox_urwid/urwid_interface.py:1028 msgid "Test Again" msgstr "重新测试" @@ -2973,11 +2983,6 @@ 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" @@ -2996,19 +3001,19 @@ #: ../plugins/apport_prompt.py:227 #, python-format -msgid "Test %(name)s from suite %(suite)s failed." +msgid "Test %(name)s failed." msgstr "" -#: ../plugins/apport_prompt.py:231 +#: ../plugins/apport_prompt.py:230 #, python-format msgid "Test %s failed." msgstr "" -#: ../plugins/apport_prompt.py:232 +#: ../plugins/apport_prompt.py:231 msgid "Do you want to report a bug?" msgstr "您想报告缺陷吗？" -#: ../plugins/apport_prompt.py:249 +#: ../plugins/apport_prompt.py:248 #, python-format msgid "Is a package upgrade in process? Error: %s" msgstr "是不是正在进行软件升级？错误：%s" @@ -3103,7 +3108,7 @@ msgid "Exchanging information with the server..." msgstr "和服务器交换信息..." -#: ../plugins/launchpad_report.py:164 +#: ../plugins/launchpad_report.py:167 msgid "" "The generated report seems to have validation errors,\n" "so it might not be processed by Launchpad." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/command-not-found.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/command-not-found.po 2012-03-23 07:33:14.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: 2012-02-21 22:41+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../CommandNotFound/CommandNotFound.py:135 msgid "Ubuntu has the following similar programs" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/compiz.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/compiz.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/compiz.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/compiz.po 2012-03-23 07:33:14.000000000 +0000 @@ -7,20 +7,79 @@ msgstr "" "Project-Id-Version: Compiz\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-17 21:28+0000\n" -"PO-Revision-Date: 2012-02-18 00:14+0000\n" +"POT-Creation-Date: 2012-03-12 09:27+0000\n" +"PO-Revision-Date: 2012-03-12 18:02+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: 2012-02-21 22:34+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:03+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../gtk/gnome/compiz.desktop.in.h:1 msgid "Compiz" msgstr "Compiz" +#: ../gtk/window-decorator/events.c:134 ../metadata/core.xml.in.h:48 +msgid "Close Window" +msgstr "关闭窗口" + +#: ../gtk/window-decorator/events.c:157 ../metadata/core.xml.in.h:58 +msgid "Unmaximize Window" +msgstr "恢复窗口" + +#: ../gtk/window-decorator/events.c:160 ../metadata/core.xml.in.h:56 +msgid "Maximize Window" +msgstr "最大化窗口" + +#: ../gtk/window-decorator/events.c:210 ../metadata/core.xml.in.h:54 +msgid "Minimize Window" +msgstr "最小化窗口" + +#: ../gtk/window-decorator/events.c:230 ../metadata/core.xml.in.h:64 +msgid "Window Menu" +msgstr "窗口菜单" + +# 此功能完全不能用调整大小来描述，我找这个功能找了N久，才发现：调整大小！ = =； +#: ../gtk/window-decorator/events.c:253 +msgid "Shade" +msgstr "阴影" + +#: ../gtk/window-decorator/events.c:277 +msgid "Make Above" +msgstr "置于上面" + +#: ../gtk/window-decorator/events.c:301 +msgid "Stick" +msgstr "粘滞窗口" + +#: ../gtk/window-decorator/events.c:323 +msgid "Unshade" +msgstr "去除阴影" + +#: ../gtk/window-decorator/events.c:345 +msgid "Unmake Above" +msgstr "取消顶置" + +#: ../gtk/window-decorator/events.c:369 +msgid "Unstick" +msgstr "取消粘滞" + +#: ../gtk/window-decorator/forcequit.c:142 +#, c-format +msgid "The window \"%s\" is not responding." +msgstr "窗口\"%s\"无响应" + +#: ../gtk/window-decorator/forcequit.c:151 +msgid "" +"Forcing this application to quit will cause you to lose any unsaved changes." +msgstr "强制退出此应用程序将导致你丢失未保存的数据。" + +#: ../gtk/window-decorator/forcequit.c:166 +msgid "_Force Quit" +msgstr "强制退出(_F)" + #: ../gtk/window-decorator/gwd.schemas.in.h:1 msgid "Blur type" msgstr "模糊类型" @@ -280,10 +339,6 @@ msgid "Key bindings" msgstr "功能键" -#: ../metadata/core.xml.in.h:48 -msgid "Close Window" -msgstr "关闭窗口" - #: ../metadata/core.xml.in.h:49 msgid "Close active window" msgstr "关闭激活的窗口" @@ -304,26 +359,14 @@ msgid "Lower window beneath other windows" msgstr "将窗口降到其它窗口以下" -#: ../metadata/core.xml.in.h:54 -msgid "Minimize Window" -msgstr "最小化窗口" - #: ../metadata/core.xml.in.h:55 msgid "Minimize active window" msgstr "最小化激活的窗口" -#: ../metadata/core.xml.in.h:56 -msgid "Maximize Window" -msgstr "最大化窗口" - #: ../metadata/core.xml.in.h:57 msgid "Maximize active window" msgstr "最大化激活的窗口" -#: ../metadata/core.xml.in.h:58 -msgid "Unmaximize Window" -msgstr "恢复窗口" - #: ../metadata/core.xml.in.h:59 msgid "Unmaximize active window" msgstr "恢复激活的窗口" @@ -344,10 +387,6 @@ msgid "Maximize active window vertically" msgstr "垂直方向最大化激活的窗口" -#: ../metadata/core.xml.in.h:64 -msgid "Window Menu" -msgstr "窗口菜单" - #: ../metadata/core.xml.in.h:65 msgid "Window menu key binding" msgstr "窗口菜单按键绑定" @@ -424,6 +463,106 @@ msgid "Number of virtual desktops" msgstr "虚拟桌面的数量" +#: ../plugins/annotate/annotate.xml.in.h:1 +msgid "Annotate" +msgstr "注解" + +#: ../plugins/annotate/annotate.xml.in.h:2 +msgid "Annotate plugin" +msgstr "注解插件" + +#: ../plugins/annotate/annotate.xml.in.h:3 +msgid "Initiate Free Draw" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:4 +msgid "Initiate freehand drawing" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:5 +msgid "Initiate Line" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:6 +msgid "Initiate line drawing" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:7 +msgid "Initiate Rectangle" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:8 +msgid "Initiate rectangle drawing" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:9 +msgid "Initiate Ellipse" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:10 +msgid "Initiate ellipse drawing" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:11 +msgid "Draw" +msgstr "绘制" + +#: ../plugins/annotate/annotate.xml.in.h:12 +msgid "Draw using tool" +msgstr "使用工具绘制" + +#: ../plugins/annotate/annotate.xml.in.h:13 +msgid "Initiate Erase" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:14 +msgid "Initiate annotate erasing" +msgstr "启动注释擦除" + +#: ../plugins/annotate/annotate.xml.in.h:15 +msgid "Clear" +msgstr "清除" + +#: ../plugins/annotate/annotate.xml.in.h:16 +msgid "Draw shapes from center" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:17 +msgid "Uses the initial click point as the center of shapes." +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:18 +msgid "Annotate Fill Color" +msgstr "注解填充颜色" + +#: ../plugins/annotate/annotate.xml.in.h:19 +msgid "Fill color for annotations" +msgstr "注解使用的填充颜色" + +#: ../plugins/annotate/annotate.xml.in.h:20 +msgid "Annotate Stroke Color" +msgstr "注解描边颜色" + +#: ../plugins/annotate/annotate.xml.in.h:21 +msgid "Stroke color for annotations" +msgstr "注释描边使用的颜色" + +#: ../plugins/annotate/annotate.xml.in.h:22 +msgid "Erase width" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:23 +msgid "Erase size" +msgstr "" + +#: ../plugins/annotate/annotate.xml.in.h:24 +msgid "Stroke width" +msgstr "描边宽度" + +#: ../plugins/annotate/annotate.xml.in.h:25 +msgid "Stroke width for annotations" +msgstr "注释使用的描边宽度" + #: ../plugins/blur/blur.xml.in.h:1 msgid "Blur Windows" msgstr "柔化窗口" @@ -496,8 +635,8 @@ msgid "Gaussian" msgstr "高斯柔化" -#: ../plugins/blur/blur.xml.in.h:19 ../plugins/decor/decor.xml.in.h:17 -#: ../plugins/switcher/switcher.xml.in.h:25 +#: ../plugins/blur/blur.xml.in.h:19 ../plugins/cube/cube.xml.in.h:5 +#: ../plugins/decor/decor.xml.in.h:17 ../plugins/switcher/switcher.xml.in.h:25 msgid "Mipmap" msgstr "Mipmap" @@ -551,6 +690,24 @@ "texture fetches." msgstr "使用现存的纹理单位尽可能多的进行独立纹理取回" +#: ../plugins/clone/clone.xml.in.h:1 +msgid "Clone Output" +msgstr "克隆输出" + +#: ../plugins/clone/clone.xml.in.h:2 +msgid "Output clone handler" +msgstr "输出克隆处理程序" + +#: ../plugins/clone/clone.xml.in.h:3 ../plugins/rotate/rotate.xml.in.h:32 +#: ../plugins/screenshot/screenshot.xml.in.h:3 +#: ../plugins/water/water.xml.in.h:3 +msgid "Initiate" +msgstr "启动" + +#: ../plugins/clone/clone.xml.in.h:4 +msgid "Initiate clone selection" +msgstr "初始化克隆选取区域" + #: ../plugins/commands/commands.xml.in.h:1 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:7 msgid "Commands" @@ -1202,6 +1359,14 @@ "command20" msgstr "" +#: ../plugins/compiztoolbox/compiztoolbox.xml.in.h:1 +msgid "Compiz Library Toolbox" +msgstr "" + +#: ../plugins/compiztoolbox/compiztoolbox.xml.in.h:2 +msgid "Commonly used routines by plugins separated into a separate library" +msgstr "" + #: ../plugins/composite/composite.xml.in.h:1 msgid "Composite" msgstr "" @@ -1260,6 +1425,187 @@ msgid "Copy pixmap content to texture" msgstr "" +#: ../plugins/cube/cube.xml.in.h:1 +msgid "Desktop Cube" +msgstr "桌面立方体" + +#: ../plugins/cube/cube.xml.in.h:2 +msgid "Place windows on cube" +msgstr "将窗口放置在立方体上" + +#: ../plugins/cube/cube.xml.in.h:3 +msgid "Unfold" +msgstr "展开" + +#: ../plugins/cube/cube.xml.in.h:4 +msgid "Unfold cube" +msgstr "展开立方体" + +#: ../plugins/cube/cube.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:26 +msgid "Generate mipmaps when possible for higher quality scaling" +msgstr "有可能时生成mipmaps用于更高质量的缩放比例" + +#: ../plugins/cube/cube.xml.in.h:7 ../plugins/place/place.xml.in.h:13 +#: ../plugins/scale/scale.xml.in.h:26 +msgid "Multi Output Mode" +msgstr "多重输出模式" + +#: ../plugins/cube/cube.xml.in.h:8 +msgid "" +"Selects how the cube is displayed if multiple output devices are used." +msgstr "选择当使用多个输出设备时立方体的显示方式。" + +#: ../plugins/cube/cube.xml.in.h:9 +msgid "Automatic" +msgstr "自动" + +#: ../plugins/cube/cube.xml.in.h:10 +msgid "Multiple cubes" +msgstr "多个立方体" + +#: ../plugins/cube/cube.xml.in.h:11 +msgid "One big cube" +msgstr "单一大立方体" + +#: ../plugins/cube/cube.xml.in.h:12 ../plugins/scale/scale.xml.in.h:19 +msgid "Behaviour" +msgstr "特性" + +#: ../plugins/cube/cube.xml.in.h:13 +msgid "Inside Cube" +msgstr "立方体内部" + +#: ../plugins/cube/cube.xml.in.h:14 +msgid "Inside cube" +msgstr "立方体旋转时使用内部视角" + +#: ../plugins/cube/cube.xml.in.h:15 ../plugins/rotate/rotate.xml.in.h:24 +msgid "Acceleration" +msgstr "加速" + +#: ../plugins/cube/cube.xml.in.h:16 +msgid "Fold Acceleration" +msgstr "折叠加速" + +#: ../plugins/cube/cube.xml.in.h:17 ../plugins/rotate/rotate.xml.in.h:26 +#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19 +msgid "Speed" +msgstr "速度" + +#: ../plugins/cube/cube.xml.in.h:18 +msgid "Fold Speed" +msgstr "折叠速度" + +#: ../plugins/cube/cube.xml.in.h:19 ../plugins/rotate/rotate.xml.in.h:28 +#: ../plugins/scale/scale.xml.in.h:8 ../plugins/switcher/switcher.xml.in.h:21 +msgid "Timestep" +msgstr "时间步长" + +#: ../plugins/cube/cube.xml.in.h:20 +msgid "Fold Timestep" +msgstr "折叠时间步长" + +#: ../plugins/cube/cube.xml.in.h:21 ../plugins/scale/scale.xml.in.h:3 +msgid "Appearance" +msgstr "外观" + +#: ../plugins/cube/cube.xml.in.h:22 +msgid "Cube Cap Colors" +msgstr "" + +#: ../plugins/cube/cube.xml.in.h:23 +msgid "Top" +msgstr "" + +#: ../plugins/cube/cube.xml.in.h:24 +msgid "Color of top face of the cube" +msgstr "" + +#: ../plugins/cube/cube.xml.in.h:25 +msgid "Bottom" +msgstr "" + +#: ../plugins/cube/cube.xml.in.h:26 +msgid "Color of bottom face of the cube" +msgstr "" + +#: ../plugins/cube/cube.xml.in.h:27 +msgid "Skydome" +msgstr "天穹" + +#: ../plugins/cube/cube.xml.in.h:28 +msgid "Render skydome" +msgstr "渲染穹顶" + +#: ../plugins/cube/cube.xml.in.h:29 +msgid "Skydome Image" +msgstr "天穹图像" + +#: ../plugins/cube/cube.xml.in.h:30 +msgid "Image to use as texture for the skydome" +msgstr "用作穹顶纹理的图像" + +#: ../plugins/cube/cube.xml.in.h:31 +msgid "Animate Skydome" +msgstr "制作动画天穹" + +#: ../plugins/cube/cube.xml.in.h:32 +msgid "Animate skydome when rotating cube" +msgstr "旋转立方体时制作动画天穹" + +#: ../plugins/cube/cube.xml.in.h:33 +msgid "Skydome Gradient Start Color" +msgstr "天穹渐变起始颜色" + +#: ../plugins/cube/cube.xml.in.h:34 +msgid "Color to use for the top color-stop of the skydome-fallback gradient" +msgstr "天穹降色渐变使用的顶部结束颜色" + +#: ../plugins/cube/cube.xml.in.h:35 +msgid "Skydome Gradient End Color" +msgstr "天穹渐变结束颜色" + +#: ../plugins/cube/cube.xml.in.h:36 +msgid "" +"Color to use for the bottom color-stop of the skydome-fallback gradient" +msgstr "天穹降色渐变使用的底部结束颜色" + +#: ../plugins/cube/cube.xml.in.h:37 +msgid "Transparent Cube" +msgstr "透明立方体" + +#: ../plugins/cube/cube.xml.in.h:38 +msgid "Opacity During Rotation" +msgstr "旋转时的不透明度" + +#: ../plugins/cube/cube.xml.in.h:39 +msgid "Opacity of desktop window during rotation." +msgstr "旋转时桌面窗口的不透明度。" + +#: ../plugins/cube/cube.xml.in.h:40 +msgid "Opacity When Not Rotating" +msgstr "不旋转时的不透明度" + +#: ../plugins/cube/cube.xml.in.h:41 +msgid "Opacity of desktop window when not rotating." +msgstr "不旋转时桌面窗口的不透明度。" + +#: ../plugins/cube/cube.xml.in.h:42 +msgid "Transparency Only on Mouse Rotate" +msgstr "仅当用鼠标旋转时透明" + +#: ../plugins/cube/cube.xml.in.h:43 +msgid "Initiates Cube transparency only if rotation is mouse driven." +msgstr "仅当旋转由鼠标驱动时启用立方体透明" + +#: ../plugins/dbus/dbus.xml.in.h:1 +msgid "D-Bus" +msgstr "" + +#: ../plugins/dbus/dbus.xml.in.h:2 +msgid "D-Bus Control Backend" +msgstr "" + #: ../plugins/decor/decor.xml.in.h:1 msgid "Window Decoration" msgstr "窗口装饰" @@ -1488,20 +1834,20 @@ msgstr "打开一个终端窗口" #: ../plugins/imgpng/imgpng.xml.in.h:1 -msgid "Png" -msgstr "Png" +msgid "PNG" +msgstr "" #: ../plugins/imgpng/imgpng.xml.in.h:2 -msgid "Png image loader" -msgstr "Png图像加载工具" +msgid "PNG image loader" +msgstr "" #: ../plugins/imgsvg/imgsvg.xml.in.h:1 -msgid "Svg" -msgstr "Svg" +msgid "SVG" +msgstr "" #: ../plugins/imgsvg/imgsvg.xml.in.h:2 -msgid "Svg image loader" -msgstr "Svg图像加载工具" +msgid "SVG image loader" +msgstr "" #: ../plugins/imgsvg/imgsvg.xml.in.h:3 msgid "Set overlay" @@ -1519,6 +1865,14 @@ msgid "File change notification plugin" msgstr "文件修改通知插件" +#: ../plugins/kde/kde.xml.in.h:1 +msgid "KDE/Qt Event Loop" +msgstr "" + +#: ../plugins/kde/kde.xml.in.h:2 +msgid "Integrates the KDE/Qt event loop into Compiz" +msgstr "" + #: ../plugins/move/move.xml.in.h:1 msgid "Move Window" msgstr "移动窗口" @@ -1535,8 +1889,8 @@ 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 +#: ../plugins/move/move.xml.in.h:5 ../plugins/obs/obs.xml.in.h:3 +#: ../plugins/scale/scale.xml.in.h:12 ../plugins/switcher/switcher.xml.in.h:31 msgid "Opacity" msgstr "不透明度" @@ -1569,6 +1923,126 @@ "Do not update the server-side position of windows until finished moving" msgstr "结束移动前不更新服务端的位置信息" +#: ../plugins/obs/obs.xml.in.h:1 +msgid "Opacity, Brightness and Saturation" +msgstr "不透明度、亮度与饱和度" + +#: ../plugins/obs/obs.xml.in.h:2 +msgid "Opacity, Brightness and Saturation adjustments" +msgstr "调整不透明度、亮度和饱和度" + +#: ../plugins/obs/obs.xml.in.h:4 +msgid "Increase Opacity" +msgstr "增加不透明度" + +#: ../plugins/obs/obs.xml.in.h:5 +msgid "Opacity Increase" +msgstr "减少透明度" + +#: ../plugins/obs/obs.xml.in.h:6 +msgid "Decrease Opacity" +msgstr "降低不透明度" + +#: ../plugins/obs/obs.xml.in.h:7 +msgid "Opacity Decrease" +msgstr "增加透明度" + +# 饱和度调整步幅 +#: ../plugins/obs/obs.xml.in.h:8 +msgid "Step" +msgstr "调整步长" + +# （不）透明度调整步幅 +#: ../plugins/obs/obs.xml.in.h:9 +msgid "Opacity Step" +msgstr "不透明度步长" + +#: ../plugins/obs/obs.xml.in.h:10 +msgid "Window specific settings" +msgstr "窗口相关设置" + +#: ../plugins/obs/obs.xml.in.h:11 ../plugins/place/place.xml.in.h:32 +msgid "Windows" +msgstr "窗口" + +#: ../plugins/obs/obs.xml.in.h:12 +msgid "Windows that should have a different opacity by default" +msgstr "默认使用另一不透明度设置的窗口" + +# 都特例窗口设置的特殊饱和度数值 +#: ../plugins/obs/obs.xml.in.h:13 +msgid "Window values" +msgstr "窗口值" + +#: ../plugins/obs/obs.xml.in.h:14 +msgid "Opacity values for windows" +msgstr "窗口的不透明度数值" + +#: ../plugins/obs/obs.xml.in.h:15 ../plugins/switcher/switcher.xml.in.h:29 +msgid "Brightness" +msgstr "亮度" + +#: ../plugins/obs/obs.xml.in.h:16 +msgid "Increase Brightness" +msgstr "提高亮度" + +#: ../plugins/obs/obs.xml.in.h:17 +msgid "Brightness Increase" +msgstr "调高亮度" + +#: ../plugins/obs/obs.xml.in.h:18 +msgid "Decrease Brightness" +msgstr "降低亮度" + +#: ../plugins/obs/obs.xml.in.h:19 +msgid "Brightness Decrease" +msgstr "调低亮度" + +# 不需要用“亮度调整步幅”吧？ +#: ../plugins/obs/obs.xml.in.h:20 +msgid "Brightness Step" +msgstr "调整步幅" + +#: ../plugins/obs/obs.xml.in.h:21 +msgid "Windows that should have a different brightness by default" +msgstr "默认使用另一亮度设置的窗口" + +#: ../plugins/obs/obs.xml.in.h:22 +msgid "Brightness values for windows" +msgstr "窗口亮度" + +#: ../plugins/obs/obs.xml.in.h:23 ../plugins/switcher/switcher.xml.in.h:27 +msgid "Saturation" +msgstr "饱和度" + +#: ../plugins/obs/obs.xml.in.h:24 +msgid "Increase Saturation" +msgstr "提高饱和度" + +#: ../plugins/obs/obs.xml.in.h:25 +msgid "Saturation Increase" +msgstr "增加饱和度" + +#: ../plugins/obs/obs.xml.in.h:26 +msgid "Decrease Saturation" +msgstr "降低饱和度" + +#: ../plugins/obs/obs.xml.in.h:27 +msgid "Saturation Decrease" +msgstr "减少饱和度" + +#: ../plugins/obs/obs.xml.in.h:28 +msgid "Saturation Step" +msgstr "饱和度步长" + +#: ../plugins/obs/obs.xml.in.h:29 +msgid "Windows that should have a different saturation by default" +msgstr "默认使用另一饱和度的窗口" + +#: ../plugins/obs/obs.xml.in.h:30 +msgid "Saturation values for windows" +msgstr "窗口的饱和度数值" + #: ../plugins/opengl/opengl.xml.in.h:1 msgid "OpenGL" msgstr "" @@ -1669,10 +2143,6 @@ msgid "Pointer" 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 "" "Selects how window placement should behave if multiple outputs are selected" @@ -1750,10 +2220,6 @@ msgid "Windows with fixed placement mode" msgstr "有固定位置模式的窗口" -#: ../plugins/place/place.xml.in.h:32 -msgid "Windows" -msgstr "窗口" - #: ../plugins/place/place.xml.in.h:33 msgid "Windows that should have a certain positioning mo+de" msgstr "" @@ -1810,8 +2276,8 @@ msgid "Resize window" msgstr "调整窗口大小" -#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:30 -#: ../plugins/switcher/switcher.xml.in.h:2 +#: ../plugins/resize/resize.xml.in.h:3 ../plugins/rotate/rotate.xml.in.h:30 +#: ../plugins/scale/scale.xml.in.h:30 ../plugins/switcher/switcher.xml.in.h:2 msgid "Bindings" msgstr "绑定" @@ -1947,6 +2413,383 @@ msgid "Use these bindings to resize from the center." msgstr "" +#: ../plugins/rotate/rotate.xml.in.h:1 +msgid "Rotate Cube" +msgstr "旋转立方体" + +#: ../plugins/rotate/rotate.xml.in.h:2 +msgid "Rotate desktop cube" +msgstr "旋转桌面立方体" + +#: ../plugins/rotate/rotate.xml.in.h:3 +msgid "Edge Flip Pointer" +msgstr "指针边缘翻转" + +#: ../plugins/rotate/rotate.xml.in.h:4 +msgid "Flip to next viewport when moving pointer to screen edge" +msgstr "将指针移至屏幕边缘时翻转到下个视点" + +#: ../plugins/rotate/rotate.xml.in.h:5 +msgid "Edge Flip Move" +msgstr "移动边缘翻转" + +#: ../plugins/rotate/rotate.xml.in.h:6 +msgid "Flip to next viewport when moving window to screen edge" +msgstr "将窗口移至屏幕边缘时翻转到下个视点" + +#: ../plugins/rotate/rotate.xml.in.h:7 +msgid "Edge Flip DnD" +msgstr "DnD边缘翻转" + +#: ../plugins/rotate/rotate.xml.in.h:8 +msgid "Flip to next viewport when dragging object to screen edge" +msgstr "将对象拖至屏幕边缘时翻转到下个视点" + +#: ../plugins/rotate/rotate.xml.in.h:9 +msgid "Raise on rotate" +msgstr "旋转时升起" + +#: ../plugins/rotate/rotate.xml.in.h:10 +msgid "Raise window when rotating" +msgstr "旋转时升起窗口" + +#: ../plugins/rotate/rotate.xml.in.h:11 +msgid "Pointer Invert Y" +msgstr "指针反转Y" + +#: ../plugins/rotate/rotate.xml.in.h:12 +msgid "Invert Y axis for pointer movement" +msgstr "指针移动时反转Y轴" + +#: ../plugins/rotate/rotate.xml.in.h:13 +msgid "Snap To Top Face" +msgstr "瞬移至顶面" + +#: ../plugins/rotate/rotate.xml.in.h:14 +msgid "Snap Cube Rotation to Top Face" +msgstr "将立方体快速旋转到顶面" + +#: ../plugins/rotate/rotate.xml.in.h:15 +msgid "Snap To Bottom Face" +msgstr "瞬移至底面" + +#: ../plugins/rotate/rotate.xml.in.h:16 +msgid "Snap Cube Rotation to Bottom Face" +msgstr "将立方体快速旋转到底面" + +#: ../plugins/rotate/rotate.xml.in.h:17 +#: ../plugins/switcher/switcher.xml.in.h:37 +msgid "Zoom" +msgstr "缩放" + +#: ../plugins/rotate/rotate.xml.in.h:18 +msgid "Rotation Zoom" +msgstr "旋转缩放" + +#: ../plugins/rotate/rotate.xml.in.h:19 +msgid "Additional Settings" +msgstr "" + +#: ../plugins/rotate/rotate.xml.in.h:20 +msgid "Flip Time" +msgstr "翻转时间" + +#: ../plugins/rotate/rotate.xml.in.h:21 +msgid "Timeout before flipping viewport" +msgstr "翻转视点前的超时时间" + +#: ../plugins/rotate/rotate.xml.in.h:22 +msgid "Pointer Sensitivity" +msgstr "指针灵敏度" + +#: ../plugins/rotate/rotate.xml.in.h:23 +msgid "Sensitivity of pointer movement" +msgstr "指针移动灵敏度" + +#: ../plugins/rotate/rotate.xml.in.h:25 +msgid "Rotation Acceleration" +msgstr "旋转加速" + +#: ../plugins/rotate/rotate.xml.in.h:27 +msgid "Rotation Speed" +msgstr "旋转速度" + +#: ../plugins/rotate/rotate.xml.in.h:29 +msgid "Rotation Timestep" +msgstr "旋转时间步长" + +#: ../plugins/rotate/rotate.xml.in.h:31 +msgid "Rotate cube" +msgstr "旋转立方体" + +#: ../plugins/rotate/rotate.xml.in.h:33 +msgid "Start Rotation" +msgstr "开始旋转" + +#: ../plugins/rotate/rotate.xml.in.h:34 +msgid "Rotate Left" +msgstr "向左旋转" + +#: ../plugins/rotate/rotate.xml.in.h:35 +msgid "Rotate left" +msgstr "向左旋转" + +#: ../plugins/rotate/rotate.xml.in.h:36 +msgid "Rotate Right" +msgstr "向右旋转" + +#: ../plugins/rotate/rotate.xml.in.h:37 +msgid "Rotate right" +msgstr "向右旋转" + +#: ../plugins/rotate/rotate.xml.in.h:38 +msgid "Rotate Left with Window" +msgstr "带着窗口向左旋转" + +#: ../plugins/rotate/rotate.xml.in.h:39 +msgid "Rotate left and bring active window along" +msgstr "带着激活的窗口一起向左旋转" + +#: ../plugins/rotate/rotate.xml.in.h:40 +msgid "Rotate Right with Window" +msgstr "带着窗口向右旋转" + +#: ../plugins/rotate/rotate.xml.in.h:41 +msgid "Rotate right and bring active window along" +msgstr "带着激活的窗口一起向右旋转" + +#: ../plugins/rotate/rotate.xml.in.h:42 +msgid "Rotate To" +msgstr "旋转至" + +#: ../plugins/rotate/rotate.xml.in.h:43 +msgid "Rotate to viewport" +msgstr "旋转至视点" + +#: ../plugins/rotate/rotate.xml.in.h:44 +msgid "Rotate window" +msgstr "旋转窗口" + +#: ../plugins/rotate/rotate.xml.in.h:45 +msgid "Rotate with window" +msgstr "带窗口旋转" + +#: ../plugins/rotate/rotate.xml.in.h:46 +msgid "Rotate Flip Left" +msgstr "旋转左翻" + +#: ../plugins/rotate/rotate.xml.in.h:47 +msgid "Flip to left viewport and warp pointer" +msgstr "翻转至左视点并弯曲指针" + +#: ../plugins/rotate/rotate.xml.in.h:48 +msgid "Rotate Flip Right" +msgstr "旋转右翻" + +#: ../plugins/rotate/rotate.xml.in.h:49 +msgid "Flip to right viewport and warp pointer" +msgstr "翻转至右视点并弯曲指针" + +#: ../plugins/rotate/rotate.xml.in.h:50 +msgid "Rotate to cube face" +msgstr "旋转至立方体表面" + +#: ../plugins/rotate/rotate.xml.in.h:51 +msgid "Rotate To Face 1" +msgstr "旋转至第1面" + +#: ../plugins/rotate/rotate.xml.in.h:52 +msgid "Rotate to face 1" +msgstr "旋转至第1面" + +#: ../plugins/rotate/rotate.xml.in.h:53 +msgid "Rotate To Face 2" +msgstr "旋转至第2面" + +#: ../plugins/rotate/rotate.xml.in.h:54 +msgid "Rotate to face 2" +msgstr "旋转至第2面" + +#: ../plugins/rotate/rotate.xml.in.h:55 +msgid "Rotate To Face 3" +msgstr "旋转至第3面" + +#: ../plugins/rotate/rotate.xml.in.h:56 +msgid "Rotate to face 3" +msgstr "旋转至第3面" + +#: ../plugins/rotate/rotate.xml.in.h:57 +msgid "Rotate To Face 4" +msgstr "旋转至第4面" + +#: ../plugins/rotate/rotate.xml.in.h:58 +msgid "Rotate to face 4" +msgstr "旋转至第4面" + +#: ../plugins/rotate/rotate.xml.in.h:59 +msgid "Rotate To Face 5" +msgstr "旋转至第5面" + +#: ../plugins/rotate/rotate.xml.in.h:60 +msgid "Rotate to face 5" +msgstr "旋转至第5面" + +#: ../plugins/rotate/rotate.xml.in.h:61 +msgid "Rotate To Face 6" +msgstr "旋转至第6面" + +#: ../plugins/rotate/rotate.xml.in.h:62 +msgid "Rotate to face 6" +msgstr "旋转至第6面" + +#: ../plugins/rotate/rotate.xml.in.h:63 +msgid "Rotate To Face 7" +msgstr "旋转至第7面" + +#: ../plugins/rotate/rotate.xml.in.h:64 +msgid "Rotate to face 7" +msgstr "旋转至第7面" + +#: ../plugins/rotate/rotate.xml.in.h:65 +msgid "Rotate To Face 8" +msgstr "旋转至第8面" + +#: ../plugins/rotate/rotate.xml.in.h:66 +msgid "Rotate to face 8" +msgstr "旋转至第8面" + +#: ../plugins/rotate/rotate.xml.in.h:67 +msgid "Rotate To Face 9" +msgstr "旋转至第9面" + +#: ../plugins/rotate/rotate.xml.in.h:68 +msgid "Rotate to face 9" +msgstr "旋转至第9面" + +#: ../plugins/rotate/rotate.xml.in.h:69 +msgid "Rotate To Face 10" +msgstr "旋转至第10面" + +#: ../plugins/rotate/rotate.xml.in.h:70 +msgid "Rotate to face 10" +msgstr "旋转至第10面" + +#: ../plugins/rotate/rotate.xml.in.h:71 +msgid "Rotate To Face 11" +msgstr "旋转至第11面" + +#: ../plugins/rotate/rotate.xml.in.h:72 +msgid "Rotate to face 11" +msgstr "旋转至第11面" + +#: ../plugins/rotate/rotate.xml.in.h:73 +msgid "Rotate To Face 12" +msgstr "旋转至第12面" + +#: ../plugins/rotate/rotate.xml.in.h:74 +msgid "Rotate to face 12" +msgstr "旋转至第12面" + +#: ../plugins/rotate/rotate.xml.in.h:75 +msgid "Rotate to cube face with window" +msgstr "带窗口旋转至立方体表面" + +#: ../plugins/rotate/rotate.xml.in.h:76 +msgid "Rotate To Face 1 with Window" +msgstr "带着窗口旋转至第1面" + +#: ../plugins/rotate/rotate.xml.in.h:77 +msgid "Rotate to face 1 and bring active window along" +msgstr "带着激活的窗口一起旋转至第1面" + +#: ../plugins/rotate/rotate.xml.in.h:78 +msgid "Rotate To Face 2 with Window" +msgstr "带着窗口旋转至第2面" + +#: ../plugins/rotate/rotate.xml.in.h:79 +msgid "Rotate to face 2 and bring active window along" +msgstr "带着激活的窗口一起旋转至第2面" + +#: ../plugins/rotate/rotate.xml.in.h:80 +msgid "Rotate To Face 3 with Window" +msgstr "带着窗口旋转至第3面" + +#: ../plugins/rotate/rotate.xml.in.h:81 +msgid "Rotate to face 3 and bring active window along" +msgstr "带着激活的窗口一起旋转至第3面" + +#: ../plugins/rotate/rotate.xml.in.h:82 +msgid "Rotate To Face 4 with Window" +msgstr "带着窗口旋转至第4面" + +#: ../plugins/rotate/rotate.xml.in.h:83 +msgid "Rotate to face 4 and bring active window along" +msgstr "带着激活的窗口一起旋转至第4面" + +#: ../plugins/rotate/rotate.xml.in.h:84 +msgid "Rotate To Face 5 with Window" +msgstr "带着窗口旋转至第5面" + +#: ../plugins/rotate/rotate.xml.in.h:85 +msgid "Rotate to face 5 and bring active window along" +msgstr "带着激活的窗口一起旋转至第5面" + +#: ../plugins/rotate/rotate.xml.in.h:86 +msgid "Rotate To Face 6 with Window" +msgstr "带着窗口旋转至第6面" + +#: ../plugins/rotate/rotate.xml.in.h:87 +msgid "Rotate to face 6 and bring active window along" +msgstr "带着激活的窗口一起旋转至第6面" + +#: ../plugins/rotate/rotate.xml.in.h:88 +msgid "Rotate To Face 7 with Window" +msgstr "带着窗口旋转至第7面" + +#: ../plugins/rotate/rotate.xml.in.h:89 +msgid "Rotate to face 7 and bring active window along" +msgstr "带着激活的窗口一起旋转至第7面" + +#: ../plugins/rotate/rotate.xml.in.h:90 +msgid "Rotate To Face 8 with Window" +msgstr "带着窗口旋转至第8面" + +#: ../plugins/rotate/rotate.xml.in.h:91 +msgid "Rotate to face 8 and bring active window along" +msgstr "带着激活的窗口一起旋转至第8面" + +#: ../plugins/rotate/rotate.xml.in.h:92 +msgid "Rotate To Face 9 with Window" +msgstr "带着窗口旋转至第9面" + +#: ../plugins/rotate/rotate.xml.in.h:93 +msgid "Rotate to face 9 and bring active window along" +msgstr "带着激活的窗口一起旋转至第9面" + +#: ../plugins/rotate/rotate.xml.in.h:94 +msgid "Rotate To Face 10 with Window" +msgstr "带着窗口旋转至第10面" + +#: ../plugins/rotate/rotate.xml.in.h:95 +msgid "Rotate to face 10 and bring active window along" +msgstr "带着激活的窗口一起旋转至第10面" + +#: ../plugins/rotate/rotate.xml.in.h:96 +msgid "Rotate To Face 11 with Window" +msgstr "带着窗口旋转至第11面" + +#: ../plugins/rotate/rotate.xml.in.h:97 +msgid "Rotate to face 11 and bring active window along" +msgstr "带着激活的窗口一起旋转至第11面" + +#: ../plugins/rotate/rotate.xml.in.h:98 +msgid "Rotate To Face 12 with Window" +msgstr "带着窗口旋转至第12面" + +#: ../plugins/rotate/rotate.xml.in.h:99 +msgid "Rotate to face 12 and bring active window along" +msgstr "带着激活的窗口一起旋转至第12面" + # 此功能完全不能用调整大小来描述，我找这个功能找了N久，才发现：调整大小！ = =； #: ../plugins/scale/scale.xml.in.h:1 msgid "Scale" @@ -1956,10 +2799,6 @@ msgid "Scale windows" msgstr "窗口缩放" -#: ../plugins/scale/scale.xml.in.h:3 -msgid "Appearance" -msgstr "外观" - #: ../plugins/scale/scale.xml.in.h:4 msgid "Spacing" msgstr "间距" @@ -1968,18 +2807,10 @@ 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 "Scale speed" 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 "缩放时间步长" @@ -2004,7 +2835,7 @@ msgid "Overlay an icon on windows once they are scaled" msgstr "缩放窗口时覆盖图标" -#: ../plugins/scale/scale.xml.in.h:16 +#: ../plugins/scale/scale.xml.in.h:16 ../plugins/wobbly/wobbly.xml.in.h:19 msgid "None" msgstr "无" @@ -2016,10 +2847,6 @@ msgid "Big" msgstr "大" -#: ../plugins/scale/scale.xml.in.h:19 -msgid "Behaviour" -msgstr "特性" - #: ../plugins/scale/scale.xml.in.h:20 msgid "Scale Windows" msgstr "窗口缩放" @@ -2118,6 +2945,36 @@ msgid "Enter Show Desktop mode when Desktop is clicked during Scale" msgstr "在缩放时，点击桌面会进入显示桌面模式" +#: ../plugins/screenshot/screenshot.xml.in.h:1 +msgid "Screenshot" +msgstr "截屏" + +#: ../plugins/screenshot/screenshot.xml.in.h:2 +msgid "Screenshot plugin" +msgstr "截屏插件" + +#: ../plugins/screenshot/screenshot.xml.in.h:4 +msgid "Initiate rectangle screenshot" +msgstr "启动矩形截屏" + +#: ../plugins/screenshot/screenshot.xml.in.h:5 +msgid "Directory" +msgstr "目录" + +#: ../plugins/screenshot/screenshot.xml.in.h:6 +msgid "" +"Put screenshot images in this directory. If empty, the desktop directory " +"will be used." +msgstr "把截屏图像放在这个目录。如果没有，会使用桌面文件夹。" + +#: ../plugins/screenshot/screenshot.xml.in.h:7 +msgid "Launch Application" +msgstr "启动应用程序" + +#: ../plugins/screenshot/screenshot.xml.in.h:8 +msgid "Automatically open screenshot in this application" +msgstr "在该应用程序中自动开启截屏" + #: ../plugins/switcher/switcher.xml.in.h:1 msgid "Application Switcher" msgstr "应用程序切换条" @@ -2204,22 +3061,10 @@ msgid "Windows that should be shown in switcher" msgstr "切换程序中应显示的窗口" -#: ../plugins/switcher/switcher.xml.in.h:26 -msgid "Generate mipmaps when possible for higher quality scaling" -msgstr "有可能时生成mipmaps用于更高质量的缩放比例" - -#: ../plugins/switcher/switcher.xml.in.h:27 -msgid "Saturation" -msgstr "饱和度" - #: ../plugins/switcher/switcher.xml.in.h:28 msgid "Amount of saturation in percent" msgstr "饱和度百分比" -#: ../plugins/switcher/switcher.xml.in.h:29 -msgid "Brightness" -msgstr "亮度" - #: ../plugins/switcher/switcher.xml.in.h:30 msgid "Amount of brightness in percent" msgstr "亮度百分比" @@ -2240,10 +3085,6 @@ msgid "Bring selected window to front" msgstr "将选中的窗口放在前面" -#: ../plugins/switcher/switcher.xml.in.h:37 -msgid "Zoom" -msgstr "缩放" - #: ../plugins/switcher/switcher.xml.in.h:38 msgid "Distance desktop should be zoom out while switching windows" msgstr "切换窗口时应缩小远距离桌面" @@ -2288,10 +3129,6 @@ msgid "Adds water effects to different desktop actions" msgstr "将水纹效果添加到不同的桌面操作" -#: ../plugins/water/water.xml.in.h:3 -msgid "Initiate" -msgstr "启动" - #: ../plugins/water/water.xml.in.h:4 msgid "Enable pointer water effects" msgstr "启用指针水纹效果" @@ -2351,3 +3188,124 @@ #: ../plugins/water/water.xml.in.h:18 msgid "Add line" msgstr "增加线" + +#: ../plugins/wobbly/wobbly.xml.in.h:1 +msgid "Wobbly Windows" +msgstr "震颤窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:2 +msgid "Use spring model for wobbly window effect" +msgstr "对震颤窗口效果使用弹性模型" + +#: ../plugins/wobbly/wobbly.xml.in.h:3 +msgid "Snap windows" +msgstr "窗口吸附" + +#: ../plugins/wobbly/wobbly.xml.in.h:4 +msgid "Toggle window snapping" +msgstr "切换窗口吸附" + +#: ../plugins/wobbly/wobbly.xml.in.h:5 +msgid "Snap Inverted" +msgstr "反向吸附" + +#: ../plugins/wobbly/wobbly.xml.in.h:6 +msgid "Inverted window snapping" +msgstr "反向窗口吸附" + +# 'driver' as in '(hardware) driver update' +#: ../plugins/wobbly/wobbly.xml.in.h:7 +msgid "Shiver" +msgstr "碎裂" + +#: ../plugins/wobbly/wobbly.xml.in.h:8 +msgid "Make window shiver" +msgstr "使窗口出现碎裂效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:9 +msgid "Friction" +msgstr "摩擦力" + +#: ../plugins/wobbly/wobbly.xml.in.h:10 +msgid "Spring Friction" +msgstr "弹性摩擦力" + +#: ../plugins/wobbly/wobbly.xml.in.h:11 +msgid "Spring K" +msgstr "弹性K" + +#: ../plugins/wobbly/wobbly.xml.in.h:12 +msgid "Spring Konstant" +msgstr "弹簧常数" + +#: ../plugins/wobbly/wobbly.xml.in.h:13 +msgid "Grid Resolution" +msgstr "网格分辨率" + +#: ../plugins/wobbly/wobbly.xml.in.h:14 +msgid "Vertex Grid Resolution" +msgstr "顶点网格分辨率" + +#: ../plugins/wobbly/wobbly.xml.in.h:15 +msgid "Minimum Grid Size" +msgstr "网格最小尺寸" + +#: ../plugins/wobbly/wobbly.xml.in.h:16 +msgid "Minimum Vertex Grid Size" +msgstr "最小顶点网格大小" + +#: ../plugins/wobbly/wobbly.xml.in.h:17 +msgid "Map Effect" +msgstr "映射效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:18 +msgid "Map Window Effect" +msgstr "映射窗口效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:20 +msgid "Focus Effect" +msgstr "聚焦效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:21 +msgid "Focus Window Effect" +msgstr "聚焦窗口效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:22 +msgid "Map Windows" +msgstr "映射窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:23 +msgid "Windows that should wobble when mapped" +msgstr "映射时应采用震颤效果的窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:24 +msgid "Focus Windows" +msgstr "聚焦窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:25 +msgid "Windows that should wobble when focused" +msgstr "聚焦时应采用震颤效果的窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:26 +msgid "Grab Windows" +msgstr "捕捉窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:27 +msgid "Windows that should wobble when grabbed" +msgstr "捕捉时应采用震颤效果的窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:28 +msgid "Move Windows" +msgstr "移动窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:29 +msgid "Windows that should wobble when moved" +msgstr "移动时应采用震颤效果的窗口" + +#: ../plugins/wobbly/wobbly.xml.in.h:30 +msgid "Maximize Effect" +msgstr "最大化效果" + +#: ../plugins/wobbly/wobbly.xml.in.h:31 +msgid "Wobble effect when maximizing and unmaximizing windows" +msgstr "最大化和取消最大化窗口时的震颤效果" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/coreutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/coreutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/coreutils.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/coreutils.po 2012-03-23 07:32:49.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: 2012-02-21 17:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpio.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpio.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpio.po 2012-03-23 07:32:49.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: 2012-02-21 17:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: gnu/argmatch.c:135 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.4.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpplib-4.4.po 2012-03-23 07:33:24.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: cpplib 4.4-b20081121\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" "POT-Creation-Date: 2009-04-22 16:32+0000\n" -"PO-Revision-Date: 2011-12-13 01:06+0000\n" +"PO-Revision-Date: 2012-03-14 21:39+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: 2012-02-22 01:08+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: charset.c:674 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.5.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:06.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpplib-4.5.po 2012-03-23 07:33:28.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: 2012-02-22 01:45+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib-4.6.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpplib-4.6.po 2012-03-23 07:33:31.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: 2012-02-17 02:36+0000\n" +"PO-Revision-Date: 2012-03-10 00:54+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: 2012-02-22 02:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:25+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpplib.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cpplib.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cpplib.po 2012-03-23 07:33:14.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: 2012-02-21 22:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:04+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: charset.c:654 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cracklib.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cracklib.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cracklib.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cracklib.po 2012-03-23 07:32: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: 2012-02-21 17:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: lib/fascist.c:550 msgid "you are not registered in the password file" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cryptsetup-luks.po 2012-03-23 07:33:00.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: 2012-02-21 19:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cryptsetup.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cryptsetup.po 2012-02-23 07:11:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cryptsetup.po 2012-03-23 07:33:00.000000000 +0000 @@ -7,352 +7,364 @@ msgstr "" "Project-Id-Version: cryptsetup\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2010-07-03 15:49+0200\n" +"POT-Creation-Date: 2011-11-09 13:00+0100\n" "PO-Revision-Date: 2009-09-29 07:47+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 19:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: lib/libdevmapper.c:120 +#: lib/libdevmapper.c:184 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" msgstr "" -#: lib/libdevmapper.c:408 +#: lib/libdevmapper.c:412 #, c-format msgid "DM-UUID for device %s was truncated.\n" msgstr "" -#: lib/setup.c:103 -#, c-format -msgid "Cannot not read %d bytes from key file %s.\n" +#: lib/random.c:74 +msgid "" +"System is out of entropy while generating volume key.\n" +"Please move mouse or type some text in another window to gather some random " +"events.\n" msgstr "" -#: lib/setup.c:115 +#: lib/random.c:78 #, c-format -msgid "Key processing error (using hash algorithm %s).\n" +msgid "Generating key (%d%% done).\n" msgstr "" -#: lib/setup.c:170 -msgid "All key slots full.\n" +#: lib/random.c:167 +msgid "Fatal error during RNG initialisation.\n" msgstr "" -#: lib/setup.c:177 lib/setup.c:306 lib/setup.c:763 -#, c-format -msgid "Key slot %d is invalid, please select between 0 and %d.\n" +#: lib/random.c:194 +msgid "Unknown RNG quality requested.\n" msgstr "" -#: lib/setup.c:183 +#: lib/random.c:199 #, c-format -msgid "Key slot %d is full, please select another one.\n" -msgstr "" - -#: lib/setup.c:202 -msgid "Enter any remaining LUKS passphrase: " +msgid "Error %d reading from RNG: %s\n" msgstr "" -#: lib/setup.c:223 -#, c-format -msgid "Key slot %d verified.\n" +#: lib/setup.c:162 +msgid "Cannot initialize crypto RNG backend.\n" msgstr "" -#: lib/setup.c:258 -#, c-format -msgid "Cannot get info about device %s.\n" +#: lib/setup.c:168 +msgid "Cannot initialize crypto backend.\n" msgstr "" -#: lib/setup.c:266 +#: lib/setup.c:190 #, c-format -msgid "Device %s has zero size.\n" +msgid "Hash algorithm %s not supported.\n" msgstr "" -#: lib/setup.c:270 +#: lib/setup.c:193 lib/loopaes/loopaes.c:87 #, c-format -msgid "Device %s is too small.\n" -msgstr "" - -#: lib/setup.c:295 -msgid "Enter LUKS passphrase to be deleted: " +msgid "Key processing error (using hash %s).\n" msgstr "" -#: lib/setup.c:301 -#, c-format -msgid "key slot %d selected for deletion.\n" +#: lib/setup.c:229 +msgid "All key slots full.\n" msgstr "" -#: lib/setup.c:312 -#, c-format -msgid "Key %d not active. Can't wipe.\n" -msgstr "密钥 %d 没有激活. 不能清除.\n" - -#: lib/setup.c:318 -msgid "" -"This is the last keyslot. Device will become unusable after purging this key." -msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." - -#: lib/setup.c:369 lib/setup.c:1674 lib/setup.c:1727 lib/setup.c:1785 +#: lib/setup.c:236 #, c-format -msgid "Device %s already exists.\n" +msgid "Key slot %d is invalid, please select between 0 and %d.\n" msgstr "" -#: lib/setup.c:374 +#: lib/setup.c:242 #, c-format -msgid "Invalid key size %d.\n" +msgid "Key slot %d is full, please select another one.\n" msgstr "" -#: lib/setup.c:476 lib/setup.c:1679 +#: lib/setup.c:340 #, c-format msgid "Enter passphrase for %s: " msgstr "" -#: lib/setup.c:605 lib/setup.c:1391 lib/setup.c:1735 -msgid "Enter passphrase: " +#: lib/setup.c:496 +msgid "Cannot find a free loopback device.\n" msgstr "" -#: lib/setup.c:648 lib/setup.c:1030 lib/setup.c:1827 -#, c-format -msgid "Device %s is not active.\n" +#: lib/setup.c:504 +msgid "" +"Attaching loopback device failed (loop device with autoclear flag is " +"required).\n" msgstr "" -#: lib/setup.c:755 -msgid "No known cipher specification pattern detected.\n" +#: lib/setup.c:560 +#, c-format +msgid "LUKS header detected but device %s is too small.\n" msgstr "" -#: lib/setup.c:769 -msgid "Enter LUKS passphrase: " +#: lib/setup.c:576 lib/setup.c:1022 +msgid "This operation is not supported for this device type.\n" msgstr "" -#: lib/setup.c:910 lib/setup.c:1143 lib/setup.c:1197 lib/setup.c:1222 -#: lib/setup.c:1241 -msgid "Cannot initialize crypto backend.\n" +#: lib/setup.c:618 lib/setup.c:989 lib/setup.c:1724 +#, c-format +msgid "Device %s is not active.\n" msgstr "" -#: lib/setup.c:1039 +#: lib/setup.c:636 #, c-format msgid "Underlying device for crypt device %s disappeared.\n" msgstr "" -#: lib/setup.c:1056 +#: lib/setup.c:750 msgid "Invalid plain crypt parameters.\n" msgstr "" -#: lib/setup.c:1061 +#: lib/setup.c:755 lib/setup.c:860 msgid "Invalid key size.\n" msgstr "" -#: lib/setup.c:1094 +#: lib/setup.c:796 msgid "Can't format LUKS without device.\n" msgstr "" -#: lib/setup.c:1116 +#: lib/setup.c:834 +#, c-format +msgid "Cannot format device %s which is still in use.\n" +msgstr "" + +#: lib/setup.c:837 #, c-format -msgid "Can't wipe header on device %s.\n" +msgid "Cannot wipe header on device %s.\n" +msgstr "" + +#: lib/setup.c:855 +msgid "Can't format LOOPAES without device.\n" msgstr "" -#: lib/setup.c:1164 +#: lib/setup.c:915 #, c-format msgid "Unknown crypt device type %s requested.\n" msgstr "" -#: lib/setup.c:1283 +#: lib/setup.c:1037 +msgid "Do you really want to change UUID of device?" +msgstr "" + +#: lib/setup.c:1122 lib/setup.c:1169 lib/setup.c:1217 lib/setup.c:1272 +#: lib/setup.c:1346 lib/setup.c:1415 lib/setup.c:1461 lib/setup.c:1784 +#: lib/setup.c:1889 lib/setup.c:2028 +msgid "This operation is supported only for LUKS device.\n" +msgstr "" + +#: lib/setup.c:1129 #, c-format msgid "Volume %s is not active.\n" msgstr "" -#: lib/setup.c:1296 +#: lib/setup.c:1141 #, c-format msgid "Volume %s is already suspended.\n" msgstr "" -#: lib/setup.c:1324 lib/setup.c:1373 lib/setup.c:1432 lib/setup.c:1510 -#: lib/setup.c:1582 lib/setup.c:1627 lib/setup.c:1718 lib/setup.c:1776 -#: lib/setup.c:1897 lib/setup.c:1980 lib/setup.c:2080 -msgid "This operation is supported only for LUKS device.\n" -msgstr "" - -#: lib/setup.c:1335 lib/setup.c:1384 +#: lib/setup.c:1179 lib/setup.c:1227 #, c-format msgid "Volume %s is not suspended.\n" msgstr "" -#: lib/setup.c:1446 lib/setup.c:1524 +#: lib/setup.c:1234 lib/setup.c:1585 lib/setup.c:1599 src/cryptsetup.c:294 +msgid "Enter passphrase: " +msgstr "" + +#: lib/setup.c:1286 lib/setup.c:1360 msgid "Cannot add key slot, all slots disabled and no volume key provided.\n" msgstr "" -#: lib/setup.c:1455 lib/setup.c:1530 lib/setup.c:1533 +#: lib/setup.c:1295 lib/setup.c:1366 lib/setup.c:1370 msgid "Enter any passphrase: " msgstr "" -#: lib/setup.c:1474 lib/setup.c:1548 lib/setup.c:1552 lib/setup.c:1605 +#: lib/setup.c:1312 lib/setup.c:1383 lib/setup.c:1387 lib/setup.c:1438 msgid "Enter new passphrase for key slot: " msgstr "" -#: lib/setup.c:1596 lib/setup.c:1796 lib/setup.c:1908 +#: lib/setup.c:1429 lib/setup.c:1678 lib/setup.c:1691 lib/setup.c:1795 msgid "Volume key does not match the volume.\n" msgstr "" -#: lib/setup.c:1633 +#: lib/setup.c:1467 #, c-format msgid "Key slot %d is invalid.\n" msgstr "" -#: lib/setup.c:1638 +#: lib/setup.c:1472 #, c-format msgid "Key slot %d is not used.\n" msgstr "" -#: lib/setup.c:1823 +#: lib/setup.c:1502 lib/setup.c:1573 lib/setup.c:1654 +#, c-format +msgid "Device %s already exists.\n" +msgstr "" + +#: lib/setup.c:1665 +msgid "Incorrect volume key specified for plain device.\n" +msgstr "" + +#: lib/setup.c:1696 +msgid "Device type is not properly initialised.\n" +msgstr "" + +#: lib/setup.c:1720 #, c-format msgid "Device %s is busy.\n" msgstr "" -#: lib/setup.c:1831 +#: lib/setup.c:1728 #, c-format msgid "Invalid device %s.\n" msgstr "" -#: lib/setup.c:1855 +#: lib/setup.c:1751 msgid "Volume key buffer too small.\n" msgstr "" -#: lib/setup.c:1863 +#: lib/setup.c:1759 msgid "Cannot retrieve volume key for plain device.\n" msgstr "" -#: lib/setup.c:1885 +#: lib/setup.c:1765 #, c-format msgid "This operation is not supported for %s crypt device.\n" msgstr "" -#: lib/utils.c:418 +#: lib/utils.c:270 #, c-format -msgid "Failed to open key file %s.\n" +msgid "Device %s doesn't exist or access denied.\n" msgstr "" -#: lib/utils.c:428 -msgid "Error reading passphrase from terminal.\n" +#: lib/utils.c:280 +#, c-format +msgid "Cannot open device %s for %s%s access.\n" msgstr "" -#: lib/utils.c:433 -msgid "Verify passphrase: " +#: lib/utils.c:281 +msgid "exclusive " msgstr "" -#: lib/utils.c:435 -msgid "Passphrases do not match.\n" +#: lib/utils.c:282 +msgid "writable" msgstr "" -#: lib/utils.c:450 -msgid "Can't do passphrase verification on non-tty inputs.\n" +#: lib/utils.c:282 +msgid "read-only" msgstr "" -#: lib/utils.c:462 +#: lib/utils.c:289 #, c-format -msgid "Failed to stat key file %s.\n" +msgid "Cannot read device %s.\n" msgstr "" -#: lib/utils.c:466 +#: lib/utils.c:386 #, c-format -msgid "" -"Warning: exhausting read requested, but key file %s is not a regular file, " -"function might never return.\n" +msgid "Cannot use device %s which is in use (already mapped or mounted).\n" msgstr "" -#: lib/utils.c:478 -msgid "Out of memory while reading passphrase.\n" +#: lib/utils.c:390 +#, c-format +msgid "Cannot get info about device %s.\n" msgstr "" -#: lib/utils.c:485 -msgid "Error reading passphrase.\n" +#: lib/utils.c:396 +#, c-format +msgid "Requested offset is beyond real size of device %s.\n" msgstr "" -#: lib/utils.c:523 +#: lib/utils.c:404 #, c-format -msgid "Device %s doesn't exist or access denied.\n" +msgid "Device %s has zero size.\n" msgstr "" -#: lib/utils.c:530 +#: lib/utils.c:415 lib/luks1/keymanage.c:428 #, c-format -msgid "Cannot open device %s for %s%s access.\n" +msgid "Device %s is too small.\n" msgstr "" -#: lib/utils.c:531 -msgid "exclusive " +#: lib/utils.c:423 +#, c-format +msgid "" +"Cannot use device %s (crypt segments overlaps or in use by another device).\n" msgstr "" -#: lib/utils.c:532 -msgid "writable" +#: lib/utils.c:450 +msgid "WARNING!!! Possibly insecure memory. Are you root?\n" msgstr "" -#: lib/utils.c:532 -msgid "read-only" +#: lib/utils.c:456 +msgid "Cannot get process priority.\n" msgstr "" -#: lib/utils.c:539 +#: lib/utils.c:459 lib/utils.c:472 #, c-format -msgid "Cannot read device %s.\n" +msgid "setpriority %d failed: %s\n" msgstr "" -#: lib/utils.c:569 -#, c-format -msgid "Cannot open device: %s\n" +#: lib/utils.c:470 +msgid "Cannot unlock memory.\n" msgstr "" -#: lib/utils.c:579 -#, c-format -msgid "BLKROGET failed on device %s.\n" +#: lib/utils_crypt.c:212 lib/utils_crypt.c:225 lib/utils_crypt.c:316 +#: lib/utils_crypt.c:325 +msgid "Out of memory while reading passphrase.\n" msgstr "" -#: lib/utils.c:604 -#, c-format -msgid "BLKGETSIZE failed on device %s.\n" +#: lib/utils_crypt.c:217 lib/utils_crypt.c:232 +msgid "Error reading passphrase from terminal.\n" msgstr "" -#: lib/utils.c:652 -msgid "WARNING!!! Possibly insecure memory. Are you root?\n" +#: lib/utils_crypt.c:230 +msgid "Verify passphrase: " msgstr "" -#: lib/utils.c:658 -msgid "Cannot get process priority.\n" +#: lib/utils_crypt.c:237 +msgid "Passphrases do not match.\n" msgstr "" -#: lib/utils.c:661 lib/utils.c:674 -#, c-format -msgid "setpriority %u failed: %s" +#: lib/utils_crypt.c:292 +msgid "Failed to open key file.\n" msgstr "" -#: lib/utils.c:672 -msgid "Cannot unlock memory." +#: lib/utils_crypt.c:301 +msgid "Failed to stat key file.\n" msgstr "" -#: luks/keyencryption.c:68 -#, c-format -msgid "Unable to obtain sector size for %s" -msgstr "不能为%s获得扇区大小" - -#: luks/keyencryption.c:108 -msgid "Key size in XTS mode must be 256 or 512 bits.\n" +#: lib/utils_crypt.c:333 +msgid "Error reading passphrase.\n" msgstr "" -#: luks/keyencryption.c:110 -msgid "Block mode XTS is available since kernel 2.6.24.\n" +#: lib/utils_crypt.c:351 +msgid "Maximum keyfile size exceeeded.\n" msgstr "" -#: luks/keyencryption.c:112 -msgid "Key size in LRW mode must be 256 or 512 bits.\n" +#: lib/utils_crypt.c:356 +msgid "Cannot read requested amount of data.\n" msgstr "" -#: luks/keyencryption.c:114 -msgid "Block mode LRW is available since kernel 2.6.20.\n" +#: lib/luks1/keyencryption.c:75 +#, c-format +msgid "Unable to obtain sector size for %s" +msgstr "不能为%s获得扇区大小" + +#: lib/luks1/keyencryption.c:102 +msgid "Key size in XTS mode must be 256 or 512 bits.\n" msgstr "" -#: luks/keyencryption.c:137 +#: lib/luks1/keyencryption.c:125 msgid "Failed to obtain device mapper directory." msgstr "获取设备映射目录失败" -#: luks/keyencryption.c:153 +#: lib/luks1/keyencryption.c:141 #, c-format msgid "" "Failed to setup dm-crypt key mapping for device %s.\n" @@ -360,318 +372,390 @@ "%s" msgstr "" -#: luks/keyencryption.c:163 +#: lib/luks1/keyencryption.c:151 msgid "Failed to open temporary keystore device.\n" msgstr "" -#: luks/keyencryption.c:170 +#: lib/luks1/keyencryption.c:158 msgid "Failed to access temporary keystore device.\n" msgstr "" -#: luks/keymanage.c:94 +#: lib/luks1/keymanage.c:148 #, c-format msgid "Requested file %s already exist.\n" msgstr "" -#: luks/keymanage.c:114 luks/keymanage.c:257 +#: lib/luks1/keymanage.c:168 lib/luks1/keymanage.c:311 #, c-format msgid "Device %s is not a valid LUKS device.\n" msgstr "" -#: luks/keymanage.c:134 +#: lib/luks1/keymanage.c:188 #, c-format msgid "Cannot write header backup file %s.\n" msgstr "" -#: luks/keymanage.c:161 +#: lib/luks1/keymanage.c:215 #, c-format msgid "Backup file %s doesn't exist.\n" msgstr "" -#: luks/keymanage.c:169 -msgid "Backup file do not contain valid LUKS header.\n" +#: lib/luks1/keymanage.c:223 +msgid "Backup file doesn't contain valid LUKS header.\n" msgstr "" -#: luks/keymanage.c:182 +#: lib/luks1/keymanage.c:236 #, c-format msgid "Cannot open header backup file %s.\n" msgstr "" -#: luks/keymanage.c:188 +#: lib/luks1/keymanage.c:242 #, c-format msgid "Cannot read header backup file %s.\n" msgstr "" -#: luks/keymanage.c:199 +#: lib/luks1/keymanage.c:253 msgid "" "Data offset or key size differs on device and backup, restore failed.\n" msgstr "" -#: luks/keymanage.c:207 +#: lib/luks1/keymanage.c:261 #, c-format msgid "Device %s %s%s" msgstr "" -#: luks/keymanage.c:208 +#: lib/luks1/keymanage.c:262 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." msgstr "" -#: luks/keymanage.c:209 +#: lib/luks1/keymanage.c:263 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." msgstr "" -#: luks/keymanage.c:210 +#: lib/luks1/keymanage.c:264 msgid "" "\n" "WARNING: real device header has different UUID than backup!" msgstr "" -#: luks/keymanage.c:225 luks/keymanage.c:338 luks/keymanage.c:373 +#: lib/luks1/keymanage.c:279 lib/luks1/keymanage.c:401 +#: lib/luks1/keymanage.c:434 #, c-format msgid "Cannot open device %s.\n" msgstr "" -#: luks/keymanage.c:259 -#, c-format -msgid "Device %s is not a valid LUKS device." -msgstr "" - -#: luks/keymanage.c:262 +#: lib/luks1/keymanage.c:314 #, c-format msgid "Unsupported LUKS version %d.\n" msgstr "" -#: luks/keymanage.c:265 +#: lib/luks1/keymanage.c:317 lib/luks1/keymanage.c:506 #, c-format msgid "Requested LUKS hash %s is not supported.\n" msgstr "" -#: luks/keymanage.c:310 +#: lib/luks1/keymanage.c:330 #, c-format -msgid "Cannot open file %s.\n" +msgid "LUKS keyslot %u is invalid.\n" msgstr "" -#: luks/keymanage.c:350 +#: lib/luks1/keymanage.c:373 #, c-format -msgid "LUKS header detected but device %s is too small.\n" +msgid "Cannot open file %s.\n" msgstr "" -#: luks/keymanage.c:394 +#: lib/luks1/keymanage.c:455 #, c-format msgid "Error during update of LUKS header on device %s.\n" msgstr "" -#: luks/keymanage.c:401 +#: lib/luks1/keymanage.c:462 #, c-format msgid "Error re-reading LUKS header after update on device %s.\n" msgstr "" -#: luks/keymanage.c:413 +#: lib/luks1/keymanage.c:474 #, c-format msgid "Not compatible PBKDF2 options (using hash algorithm %s).\n" msgstr "" -#: luks/keymanage.c:461 +#: lib/luks1/keymanage.c:511 lib/luks1/keymanage.c:593 +msgid "Wrong LUKS UUID format provided.\n" +msgstr "" + +#: lib/luks1/keymanage.c:536 msgid "Cannot create LUKS header: reading random salt failed.\n" msgstr "" -#: luks/keymanage.c:478 +#: lib/luks1/keymanage.c:553 #, c-format msgid "Cannot create LUKS header: header digest failed (using hash %s).\n" msgstr "" -#: luks/keymanage.c:496 -msgid "Wrong UUID format provided, generating new one.\n" -msgstr "" - -#: luks/keymanage.c:523 +#: lib/luks1/keymanage.c:618 #, c-format msgid "Key slot %d active, purge first.\n" msgstr "" -#: luks/keymanage.c:528 +#: lib/luks1/keymanage.c:623 #, c-format msgid "Key slot %d material includes too few stripes. Header manipulation?\n" msgstr "" -#: luks/keymanage.c:587 +#: lib/luks1/keymanage.c:690 msgid "Failed to write to key storage.\n" msgstr "" -#: luks/keymanage.c:664 +#: lib/luks1/keymanage.c:775 msgid "Failed to read from key storage.\n" msgstr "" -#: luks/keymanage.c:673 +#: lib/luks1/keymanage.c:785 #, c-format msgid "Key slot %d unlocked.\n" msgstr "" -#: luks/keymanage.c:706 +#: lib/luks1/keymanage.c:821 src/cryptsetup.c:644 src/cryptsetup.c:827 msgid "No key available with this passphrase.\n" msgstr "" -#: luks/keymanage.c:783 +#: lib/luks1/keymanage.c:839 #, c-format msgid "Key slot %d is invalid, please select keyslot between 0 and %d.\n" msgstr "" -#: luks/keymanage.c:795 +#: lib/luks1/keymanage.c:853 #, c-format msgid "Cannot wipe device %s.\n" msgstr "" -#: src/cryptsetup.c:71 src/cryptsetup.c:89 +#: lib/loopaes/loopaes.c:142 +msgid "Detected not yet supported GPG encrypted keyfile.\n" +msgstr "" + +#: lib/loopaes/loopaes.c:143 +msgid "Please use gpg --decrypt | cryptsetup --keyfile=- ...\n" +msgstr "" + +#: lib/loopaes/loopaes.c:175 +msgid "Incompatible loop-AES keyfile detected.\n" +msgstr "" + +#: lib/loopaes/loopaes.c:225 +msgid "Kernel doesn't support loop-AES compatible mapping.\n" +msgstr "" + +#: src/cryptsetup.c:101 msgid " " msgstr "<名称> <设备>" -#: src/cryptsetup.c:71 +#: src/cryptsetup.c:101 msgid "create device" msgstr "创建设备" -#: src/cryptsetup.c:72 src/cryptsetup.c:73 src/cryptsetup.c:74 -#: src/cryptsetup.c:82 +#: src/cryptsetup.c:102 src/cryptsetup.c:103 src/cryptsetup.c:104 +#: src/cryptsetup.c:113 src/cryptsetup.c:120 msgid "" msgstr "<名称>" -#: src/cryptsetup.c:72 +#: src/cryptsetup.c:102 msgid "remove device" msgstr "删除设备" -#: src/cryptsetup.c:73 +#: src/cryptsetup.c:103 msgid "resize active device" msgstr "改变激活分区大小" -#: src/cryptsetup.c:74 +#: src/cryptsetup.c:104 msgid "show device status" msgstr "显示设备状态" -#: src/cryptsetup.c:75 src/cryptsetup.c:77 +#: src/cryptsetup.c:105 src/cryptsetup.c:107 msgid " []" msgstr "<设备> [<新密钥文件>]" -#: src/cryptsetup.c:75 +#: src/cryptsetup.c:105 msgid "formats a LUKS device" msgstr "格式化成一个LUKS设备" -#: src/cryptsetup.c:76 +#: src/cryptsetup.c:106 src/cryptsetup.c:119 msgid " " msgstr "<设备> <名称> " -#: src/cryptsetup.c:76 +#: src/cryptsetup.c:106 msgid "open LUKS device as mapping " msgstr "打开LUKS设备映射为<名称>" -#: src/cryptsetup.c:77 +#: src/cryptsetup.c:107 msgid "add key to LUKS device" msgstr "添加密钥到LUKS设备" -#: src/cryptsetup.c:78 +#: src/cryptsetup.c:108 src/cryptsetup.c:109 msgid " []" msgstr "" -#: src/cryptsetup.c:78 +#: src/cryptsetup.c:108 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:79 src/cryptsetup.c:88 +#: src/cryptsetup.c:109 +msgid "changes supplied key or key file of LUKS device" +msgstr "" + +#: src/cryptsetup.c:110 msgid " " msgstr "<设备> " -#: src/cryptsetup.c:79 +#: src/cryptsetup.c:110 msgid "wipes key with number from LUKS device" msgstr "从LUKS 设备用数字清除密钥" -#: src/cryptsetup.c:80 src/cryptsetup.c:81 src/cryptsetup.c:83 -#: src/cryptsetup.c:84 src/cryptsetup.c:85 src/cryptsetup.c:86 -#: src/cryptsetup.c:87 +#: src/cryptsetup.c:111 src/cryptsetup.c:112 src/cryptsetup.c:114 +#: src/cryptsetup.c:115 src/cryptsetup.c:116 src/cryptsetup.c:117 +#: src/cryptsetup.c:118 msgid "" msgstr "<设备>" -#: src/cryptsetup.c:80 +#: src/cryptsetup.c:111 msgid "print UUID of LUKS device" msgstr "显示LUKS设备的UUID" -#: src/cryptsetup.c:81 +#: src/cryptsetup.c:112 msgid "tests for LUKS partition header" msgstr "为LUKS分区头检测<设备>" -#: src/cryptsetup.c:82 +#: src/cryptsetup.c:113 msgid "remove LUKS mapping" msgstr "卸载LUKS 映射" -#: src/cryptsetup.c:83 +#: src/cryptsetup.c:114 msgid "dump LUKS partition information" msgstr "复制LUKS分区信息" -#: src/cryptsetup.c:84 +#: src/cryptsetup.c:115 msgid "Suspend LUKS device and wipe key (all IOs are frozen)." msgstr "" -#: src/cryptsetup.c:85 +#: src/cryptsetup.c:116 msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:86 +#: src/cryptsetup.c:117 msgid "Backup LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:87 +#: src/cryptsetup.c:118 msgid "Restore LUKS device header and keyslots" msgstr "" -#: src/cryptsetup.c:88 -msgid "identical to luksKillSlot - DEPRECATED - see man page" +#: src/cryptsetup.c:119 +msgid "open loop-AES device as mapping " msgstr "" -#: src/cryptsetup.c:89 -msgid "modify active device - DEPRECATED - see man page" +#: src/cryptsetup.c:120 +msgid "remove loop-AES mapping" msgstr "" -#: src/cryptsetup.c:184 +#: src/cryptsetup.c:210 msgid "Command successful.\n" msgstr "命令成功.\n" -#: src/cryptsetup.c:198 +#: src/cryptsetup.c:224 #, c-format msgid "Command failed with code %i" msgstr "" -#: src/cryptsetup.c:226 -msgid "" -"The reload action is deprecated. Please use \"dmsetup reload\" in case you " -"really need this functionality.\n" -"WARNING: do not use reload to touch LUKS devices. If that is the case, hit " -"Ctrl-C now.\n" -msgstr "" - -#: src/cryptsetup.c:395 -msgid "" -"Option --key-file takes precedence over specified key file argument.\n" +#: src/cryptsetup.c:325 +msgid "Option --key-file is required.\n" msgstr "" -#: src/cryptsetup.c:397 +#: src/cryptsetup.c:486 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "这将不能取消地在 %s 上覆盖数据" -#: src/cryptsetup.c:398 +#: src/cryptsetup.c:488 msgid "memory allocation error in action_luksFormat" msgstr "内存配置错误在 action_luksFormat" -#: src/cryptsetup.c:428 -msgid "Obsolete option --non-exclusive is ignored.\n" +#: src/cryptsetup.c:500 +msgid "No known cipher specification pattern detected.\n" +msgstr "" + +#: src/cryptsetup.c:506 +#, c-format +msgid "Cannot use %s as on-disk header.\n" +msgstr "" + +#: src/cryptsetup.c:522 src/cryptsetup.c:940 +msgid "Enter LUKS passphrase: " +msgstr "" + +#: src/cryptsetup.c:576 +msgid "Reduced data offset is allowed only for detached LUKS header.\n" +msgstr "" + +#: src/cryptsetup.c:667 src/cryptsetup.c:722 +#, c-format +msgid "Key slot %d selected for deletion.\n" msgstr "" -#: src/cryptsetup.c:588 src/cryptsetup.c:610 +#: src/cryptsetup.c:670 +#, c-format +msgid "Key %d not active. Can't wipe.\n" +msgstr "密钥 %d 没有激活. 不能清除.\n" + +#: src/cryptsetup.c:678 src/cryptsetup.c:725 +msgid "" +"This is the last keyslot. Device will become unusable after purging this key." +msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后." + +#: src/cryptsetup.c:679 +msgid "Enter any remaining LUKS passphrase: " +msgstr "" + +#: src/cryptsetup.c:707 +msgid "Enter LUKS passphrase to be deleted: " +msgstr "" + +#: src/cryptsetup.c:809 +msgid "Enter LUKS passphrase to be changed: " +msgstr "" + +#: src/cryptsetup.c:846 +msgid "Enter new LUKS passphrase: " +msgstr "" + +#: src/cryptsetup.c:859 +#, c-format +msgid "Key slot %d changed.\n" +msgstr "" + +#: src/cryptsetup.c:865 +#, c-format +msgid "Replaced with key slot %d.\n" +msgstr "" + +#: src/cryptsetup.c:870 +msgid "Failed to swap new key slot.\n" +msgstr "" + +#: src/cryptsetup.c:929 +msgid "" +"LUKS header dump with volume key is sensitive information\n" +"which allows access to encrypted partition without passphrase.\n" +"This dump should be always stored encrypted on safe place." +msgstr "" + +#: src/cryptsetup.c:1032 src/cryptsetup.c:1053 msgid "Option --header-backup-file is required.\n" msgstr "" -#: src/cryptsetup.c:644 +#: src/cryptsetup.c:1091 msgid "" "\n" " is one of:\n" @@ -679,7 +763,7 @@ "\n" " 是其中之一:\n" -#: src/cryptsetup.c:650 +#: src/cryptsetup.c:1097 #, c-format msgid "" "\n" @@ -694,145 +778,242 @@ " 是 LUKS key slot 数字去设置\n" " optional key file for the new key for luksAddKey action\n" -#: src/cryptsetup.c:657 +#: src/cryptsetup.c:1104 +#, c-format +msgid "" +"\n" +"Default compiled-in keyfile parameters:\n" +"\tMaximum keyfile size: %dkB, Maximum interactive passphrase length %d " +"(characters)\n" +msgstr "" + +#: src/cryptsetup.c:1109 #, c-format msgid "" "\n" "Default compiled-in device cipher parameters:\n" +"\tloop-AES: %s, Key %d bits\n" "\tplain: %s, Key: %d bits, Password hashing: %s\n" -"\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s\n" +"\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:704 +#: src/cryptsetup.c:1177 msgid "Show this help message" msgstr "显示该帮助信息" -#: src/cryptsetup.c:705 +#: src/cryptsetup.c:1178 msgid "Display brief usage" msgstr "显示简短用法" -#: src/cryptsetup.c:709 +#: src/cryptsetup.c:1182 msgid "Help options:" msgstr "帮助选项" -#: src/cryptsetup.c:710 +#: src/cryptsetup.c:1183 +msgid "Print package version" +msgstr "显示包版本" + +#: src/cryptsetup.c:1184 msgid "Shows more detailed error messages" msgstr "显示更多的详细错误信息" -#: src/cryptsetup.c:711 +#: src/cryptsetup.c:1185 msgid "Show debug messages" msgstr "" -#: src/cryptsetup.c:712 +#: src/cryptsetup.c:1186 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)" -#: src/cryptsetup.c:713 +#: src/cryptsetup.c:1187 msgid "The hash used to create the encryption key from the passphrase" msgstr "hash用于从密钥中创建加密密钥" -#: src/cryptsetup.c:714 +#: src/cryptsetup.c:1188 msgid "Verifies the passphrase by asking for it twice" msgstr "通过两次来校验密钥" -#: src/cryptsetup.c:715 -msgid "Read the key from a file (can be /dev/random)" -msgstr "读取密码从一个文件(可能在 /dev/random)" +#: src/cryptsetup.c:1189 +msgid "Read the key from a file." +msgstr "" -#: src/cryptsetup.c:716 +#: src/cryptsetup.c:1190 msgid "Read the volume (master) key from file." msgstr "" -#: src/cryptsetup.c:717 +#: src/cryptsetup.c:1191 +msgid "Dump volume (master) key instead of keyslots info." +msgstr "" + +#: src/cryptsetup.c:1192 msgid "The size of the encryption key" msgstr "加密密码的长度" -#: src/cryptsetup.c:717 +#: src/cryptsetup.c:1192 msgid "BITS" msgstr "位数" -#: src/cryptsetup.c:718 +#: src/cryptsetup.c:1193 +msgid "Limits the read from keyfile" +msgstr "" + +#: src/cryptsetup.c:1193 src/cryptsetup.c:1194 +msgid "bytes" +msgstr "" + +#: src/cryptsetup.c:1194 +msgid "Limits the read from newly added keyfile" +msgstr "" + +#: src/cryptsetup.c:1195 msgid "Slot number for new key (default is first free)" msgstr "" -#: src/cryptsetup.c:719 +#: src/cryptsetup.c:1196 msgid "The size of the device" msgstr "设备尺寸" -#: src/cryptsetup.c:719 src/cryptsetup.c:720 src/cryptsetup.c:721 -#: src/cryptsetup.c:728 +#: src/cryptsetup.c:1196 src/cryptsetup.c:1197 src/cryptsetup.c:1198 +#: src/cryptsetup.c:1204 msgid "SECTORS" msgstr "扇区数" -#: src/cryptsetup.c:720 +#: src/cryptsetup.c:1197 msgid "The start offset in the backend device" msgstr "在后台设备中的开始偏移量" -#: src/cryptsetup.c:721 +#: src/cryptsetup.c:1198 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "加密数据在开始跳过多少扇区" -#: src/cryptsetup.c:722 +#: src/cryptsetup.c:1199 msgid "Create a readonly mapping" msgstr "创建一个只读映射" -#: src/cryptsetup.c:723 +#: src/cryptsetup.c:1200 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)" -#: src/cryptsetup.c:723 +#: src/cryptsetup.c:1200 msgid "msecs" msgstr "毫秒" -#: src/cryptsetup.c:724 +#: src/cryptsetup.c:1201 msgid "Do not ask for confirmation" msgstr "不询问确认" -#: src/cryptsetup.c:725 -msgid "Print package version" -msgstr "显示包版本" - -#: src/cryptsetup.c:726 +#: src/cryptsetup.c:1202 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "交互密钥提示的时间限制(秒数)" -#: src/cryptsetup.c:726 +#: src/cryptsetup.c:1202 msgid "secs" msgstr "秒" -#: src/cryptsetup.c:727 +#: src/cryptsetup.c:1203 msgid "How often the input of the passphrase can be retried" msgstr "多久能重试再输入密钥" -#: src/cryptsetup.c:728 +#: src/cryptsetup.c:1204 msgid "Align payload at sector boundaries - for luksFormat" msgstr "为luksFormat排列有效负荷在扇区边界" -#: src/cryptsetup.c:729 -msgid "(Obsoleted, see man page.)" +#: src/cryptsetup.c:1205 +msgid "File with LUKS header and keyslots backup." msgstr "" -#: src/cryptsetup.c:730 -msgid "File with LUKS header and keyslots backup." +#: src/cryptsetup.c:1206 +msgid "Use /dev/random for generating volume key." +msgstr "" + +#: src/cryptsetup.c:1207 +msgid "Use /dev/urandom for generating volume key." +msgstr "" + +#: src/cryptsetup.c:1208 +msgid "Share device with another non-overlapping crypt segment." +msgstr "" + +#: src/cryptsetup.c:1209 +msgid "UUID for device to use." msgstr "" -#: src/cryptsetup.c:748 +#: src/cryptsetup.c:1210 +msgid "Allow discards (aka TRIM) requests for device." +msgstr "" + +#: src/cryptsetup.c:1211 +msgid "Device or file with separated LUKS header." +msgstr "" + +#: src/cryptsetup.c:1228 msgid "[OPTION...] ]" msgstr "[选项...] ]" -#: src/cryptsetup.c:784 -msgid "Key size must be a multiple of 8 bits" -msgstr "密码长度必须是8的倍数" - -#: src/cryptsetup.c:788 +#: src/cryptsetup.c:1268 msgid "Argument missing." msgstr "缺少参数." -#: src/cryptsetup.c:794 +#: src/cryptsetup.c:1274 msgid "Unknown action." msgstr "未知参数" -#: src/cryptsetup.c:809 +#: src/cryptsetup.c:1289 #, c-format msgid "%s: requires %s as arguments" msgstr "%s: requires %s 作为参数" + +#: src/cryptsetup.c:1298 +msgid "Option --shared is allowed only for create operation.\n" +msgstr "" + +#: src/cryptsetup.c:1307 +msgid "" +"Option --allow-discards is allowed only for luksOpen, loopaesOpen and create " +"operation.\n" +msgstr "" + +#: src/cryptsetup.c:1316 +msgid "" +"Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n" +"To limit read from keyfile use --keyfile-size=(bytes)." +msgstr "" + +#: src/cryptsetup.c:1323 +msgid "Key size must be a multiple of 8 bits" +msgstr "密码长度必须是8的倍数" + +#: src/cryptsetup.c:1330 +msgid "Key slot is invalid." +msgstr "" + +#: src/cryptsetup.c:1337 +msgid "" +"Option --key-file takes precedence over specified key file argument.\n" +msgstr "" + +#: src/cryptsetup.c:1344 +msgid "Negative number for option not permitted." +msgstr "" + +#: src/cryptsetup.c:1349 +msgid "Only one of --use-[u]random options is allowed." +msgstr "" + +#: src/cryptsetup.c:1352 +msgid "Option --use-[u]random is allowed only for luksFormat." +msgstr "" + +#: src/cryptsetup.c:1356 +msgid "Option --uuid is allowed only for luksFormat and luksUUID." +msgstr "" + +#: src/cryptsetup.c:1361 +msgid "" +"Option --skip is supported only for create and loopaesOpen commands.\n" +msgstr "" + +#: src/cryptsetup.c:1366 +msgid "" +"Option --offset is supported only for create and loopaesOpen commands.\n" +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cwidget.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cwidget.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/cwidget.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/cwidget.po 2012-03-23 07:33:20.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: 2012-02-22 00:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:58+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dctrl-tools.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dctrl-tools.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dctrl-tools.po 2012-03-23 07:33:14.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: 2012-02-21 22:38+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:04+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: lib/ifile.c:54 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debconf.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debconf.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debconf.po 2012-03-23 07:32:49.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: debconf 1.5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-10 22:59+0000\n" -"PO-Revision-Date: 2012-02-11 02:07+0000\n" +"POT-Creation-Date: 2012-03-15 13:21+0000\n" +"PO-Revision-Date: 2012-03-15 15:02+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: 2012-02-21 17:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: ../Debconf/AutoSelect.pm:76 @@ -106,17 +106,17 @@ msgid "Help" msgstr "帮助" -#: ../Debconf/Element/Noninteractive/Error.pm:39 +#: ../Debconf/Element/Noninteractive/Error.pm:40 msgid "" -"Debconf was not configured to display this error message, so it mailed it to " -"you." -msgstr "Debconf 并不显示此错误信息，所以它将被直接寄给您。" +"Debconf is not confident this error message was displayed, so it mailed it " +"to you." +msgstr "" -#: ../Debconf/Element/Noninteractive/Error.pm:63 +#: ../Debconf/Element/Noninteractive/Error.pm:67 msgid "Debconf" msgstr "Debconf" -#: ../Debconf/Element/Noninteractive/Error.pm:86 +#: ../Debconf/Element/Noninteractive/Error.pm:90 #, perl-format msgid "Debconf, running at %s" msgstr "Debconf，正在 %s 上运行" @@ -146,32 +146,32 @@ msgid "Configuring %s" msgstr "正在设定 %s" -#: ../Debconf/FrontEnd/Dialog.pm:52 +#: ../Debconf/FrontEnd/Dialog.pm:53 msgid "TERM is not set, so the dialog frontend is not usable." msgstr "系统未设定 TERM 环境变量, 所以对话框界面将不可使用." -#: ../Debconf/FrontEnd/Dialog.pm:55 +#: ../Debconf/FrontEnd/Dialog.pm:56 msgid "Dialog frontend is incompatible with emacs shell buffers" msgstr "对话框界面与 Emacs shell 缓存不兼容" -#: ../Debconf/FrontEnd/Dialog.pm:58 +#: ../Debconf/FrontEnd/Dialog.pm:59 msgid "" "Dialog frontend will not work on a dumb terminal, an emacs shell buffer, or " "without a controlling terminal." msgstr "对话框界面将不能在哑终端上运行，例如 Emacs shell 缓存，或者没有控制终端。" -#: ../Debconf/FrontEnd/Dialog.pm:104 +#: ../Debconf/FrontEnd/Dialog.pm:105 msgid "" "No usable dialog-like program is installed, so the dialog based frontend " "cannot be used." msgstr "没有安装任何可用的对话框类程序，所以无法使用基于此种形式的界面。" -#: ../Debconf/FrontEnd/Dialog.pm:111 +#: ../Debconf/FrontEnd/Dialog.pm:112 msgid "" "Dialog frontend requires a screen at least 13 lines tall and 31 columns wide." msgstr "对话框界面要求屏幕画面必须为至少 13 行高及 31 列宽." -#: ../Debconf/FrontEnd/Dialog.pm:295 +#: ../Debconf/FrontEnd/Dialog.pm:296 msgid "Package configuration" msgstr "软件包设置" @@ -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:125 +#: ../dpkg-preconfigure:126 #, perl-format msgid "must specify some debs to preconfigure" msgstr "必须指定要预设定的 deb 包" -#: ../dpkg-preconfigure:130 +#: ../dpkg-preconfigure:131 msgid "delaying package configuration, since apt-utils is not installed" msgstr "因为并未安装 apt-utils，所以软件包的设定过程将被推迟" -#: ../dpkg-preconfigure:137 +#: ../dpkg-preconfigure:138 #, perl-format msgid "unable to re-open stdin: %s" msgstr "重新开启标准输入失败：%s" -#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180 +#: ../dpkg-preconfigure:169 ../dpkg-preconfigure:181 #, perl-format msgid "apt-extracttemplates failed: %s" msgstr "apt-extracttemplates 失败：%s" -#: ../dpkg-preconfigure:172 ../dpkg-preconfigure:184 +#: ../dpkg-preconfigure:173 ../dpkg-preconfigure:185 #, perl-format msgid "Extracting templates from packages: %d%%" msgstr "正在从软件包中解出模板：%d%%" -#: ../dpkg-preconfigure:194 +#: ../dpkg-preconfigure:195 msgid "Preconfiguring packages ...\n" msgstr "正在预设定软件包 ...\n" -#: ../dpkg-preconfigure:206 +#: ../dpkg-preconfigure:207 #, perl-format msgid "template parse error: %s" msgstr "模板解读错误: %s" -#: ../dpkg-preconfigure:220 +#: ../dpkg-preconfigure:221 #, perl-format msgid "debconf: can't chmod: %s" msgstr "debconf：无法改变权限：%s" -#: ../dpkg-preconfigure:231 +#: ../dpkg-preconfigure:232 #, perl-format msgid "%s failed to preconfigure, with exit status %s" msgstr "预设定 %s 失败，退出状态为 %s" -#: ../dpkg-reconfigure:107 +#: ../dpkg-reconfigure:105 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:121 +#: ../dpkg-reconfigure:119 #, perl-format msgid "%s must be run as root" msgstr "%s 必须以 root 身份执行" -#: ../dpkg-reconfigure:154 +#: ../dpkg-reconfigure:152 msgid "please specify a package to reconfigure" msgstr "请指定要重新设定的软件包" -#: ../dpkg-reconfigure:175 +#: ../dpkg-reconfigure:177 #, perl-format msgid "%s is not installed" msgstr "%s 未安装" -#: ../dpkg-reconfigure:179 +#: ../dpkg-reconfigure:181 #, perl-format msgid "%s is broken or not fully installed" msgstr "%s 已被损坏或未完成安装" -#: ../dpkg-reconfigure:258 +#: ../dpkg-reconfigure:294 #, perl-format msgid "Cannot read status file: %s" msgstr "不能读取状态文件：%s" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debian-tasks.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debian-tasks.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debian-tasks.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debian-tasks.po 2012-03-23 07:33:11.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: 2012-02-21 21:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:41+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #. Description diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debianutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debianutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/debianutils.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/debianutils.po 2012-03-23 07:32: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: 2012-02-21 17:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:25+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. type: TH #: ../add-shell.8:1 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/desktop_kcm-gtk.po 2012-03-23 07:33: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: 2012-02-22 01:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: kcmgtk.desktop:2 msgctxt "Name" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/devscripts.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/devscripts.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/devscripts.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/devscripts.po 2012-03-23 07:32: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: 2012-02-21 17:38+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:26+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. type: TH #: ../scripts/annotate-output.1:1 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/diffutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/diffutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/diffutils.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/diffutils.po 2012-03-23 07:33:11.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" "POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-12-06 16:26+0000\n" +"PO-Revision-Date: 2012-03-19 08:27+0000\n" "Last-Translator: Yingxin Zhou \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 21:56+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:43+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/c-stack.c:204 lib/c-stack.c:297 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dnsmasq.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dnsmasq.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dnsmasq.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dnsmasq.po 2012-03-23 07:33:00.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: 2012-02-21 19:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: cache.c:764 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg-dev.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dpkg-dev.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg-dev.po 2012-02-23 07:11:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dpkg-dev.po 2012-03-23 07:32:49.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: 2012-02-21 17:41+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:28+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/dpkg.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dpkg.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dpkg.po 2012-02-23 07:11:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dpkg.po 2012-03-23 07:32:49.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: 2012-02-21 17:41+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/dpkg/ar.c:66 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dselect.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dselect.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/dselect.po 2012-02-23 07:11:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/dselect.po 2012-03-23 07:32:49.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: 2012-02-21 17:41+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: dselect/basecmds.cc:125 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/duplicity.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/duplicity.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/duplicity.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/duplicity.po 2012-03-23 07:33:00.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: duplicity\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-11-25 13:18-0600\n" +"POT-Creation-Date: 2012-02-29 13:15-0600\n" "PO-Revision-Date: 2011-07-14 16:59+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Chinese (Simplified) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../bin/duplicity:98 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE" @@ -284,43 +284,43 @@ " backup then restart the backup from the beginning." msgstr "" -#: ../bin/duplicity:1274 +#: ../bin/duplicity:1287 #, python-format msgid "Last %s backup left a partial set, restarting." msgstr "" -#: ../bin/duplicity:1278 +#: ../bin/duplicity:1291 #, python-format msgid "Cleaning up previous partial %s backup set, restarting." msgstr "" -#: ../bin/duplicity:1289 +#: ../bin/duplicity:1302 msgid "Last full backup date:" msgstr "" -#: ../bin/duplicity:1291 +#: ../bin/duplicity:1304 msgid "Last full backup date: none" msgstr "" -#: ../bin/duplicity:1293 +#: ../bin/duplicity:1306 msgid "Last full backup is too old, forcing full backup" msgstr "" -#: ../bin/duplicity:1391 +#: ../bin/duplicity:1404 msgid "INT intercepted...exiting." msgstr "" -#: ../bin/duplicity:1397 +#: ../bin/duplicity:1410 #, python-format msgid "GPG error detail: %s" msgstr "" -#: ../bin/duplicity:1406 +#: ../bin/duplicity:1419 #, python-format msgid "User error detail: %s" msgstr "" -#: ../bin/duplicity:1415 +#: ../bin/duplicity:1428 #, python-format msgid "Backend error detail: %s" msgstr "" @@ -361,26 +361,26 @@ msgid "task execution done (success: %s)" msgstr "" -#: ../duplicity/backend.py:487 ../duplicity/backend.py:511 +#: ../duplicity/backend.py:489 ../duplicity/backend.py:513 #, python-format msgid "Reading results of '%s'" msgstr "" -#: ../duplicity/backend.py:526 +#: ../duplicity/backend.py:528 #, python-format msgid "Running '%s' failed with code %d (attempt #%d)" msgid_plural "Running '%s' failed with code %d (attempt #%d)" msgstr[0] "" msgstr[1] "" -#: ../duplicity/backend.py:530 +#: ../duplicity/backend.py:532 #, python-format msgid "" "Error is:\n" "%s" msgstr "" -#: ../duplicity/backend.py:532 +#: ../duplicity/backend.py:534 #, python-format msgid "Giving up trying to execute '%s' after %d attempt" msgid_plural "Giving up trying to execute '%s' after %d attempts" @@ -509,7 +509,7 @@ msgstr[0] "" msgstr[1] "" -#. TRANSL: "cleanup" is a hard-coded command, so do not translate it +#. "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." @@ -624,7 +624,7 @@ msgid "Error opening file %s" msgstr "" -#. TRANSL: Used in usage help to represent a Unix-style path name. Example: +#. Used in usage help to represent a Unix-style path name. Example: #. --archive-dir #: ../duplicity/commandline.py:257 ../duplicity/commandline.py:265 #: ../duplicity/commandline.py:282 ../duplicity/commandline.py:339 @@ -632,14 +632,14 @@ msgid "path" msgstr "" -#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example: +#. Used in usage help to represent an ID for a GnuPG key. Example: #. --encrypt-key #: ../duplicity/commandline.py:277 ../duplicity/commandline.py:284 #: ../duplicity/commandline.py:494 ../duplicity/commandline.py:694 msgid "gpg-key-id" msgstr "" -#. TRANSL: Used in usage help to represent a "glob" style pattern for +#. Used in usage help to represent a "glob" style pattern for #. matching one or more files, as described in the documentation. #. Example: #. --exclude @@ -648,7 +648,7 @@ msgid "shell_pattern" msgstr "" -#. TRANSL: Used in usage help to represent the name of a file. Example: +#. Used in usage help to represent the name of a file. Example: #. --log-file #: ../duplicity/commandline.py:298 ../duplicity/commandline.py:305 #: ../duplicity/commandline.py:310 ../duplicity/commandline.py:381 @@ -657,12 +657,12 @@ msgid "filename" msgstr "" -#. TRANSL: Used in usage help to represent a regular expression (regexp). +#. Used in usage help to represent a regular expression (regexp). #: ../duplicity/commandline.py:317 ../duplicity/commandline.py:388 msgid "regular_expression" msgstr "" -#. TRANSL: Used in usage help to represent a time spec for a previous +#. Used in usage help to represent a time spec for a previous #. point in time, as described in the documentation. Example: #. duplicity remove-older-than time [options] target_url #: ../duplicity/commandline.py:351 ../duplicity/commandline.py:444 @@ -670,7 +670,7 @@ msgid "time" msgstr "" -#. TRANSL: Used in usage help. (Should be consistent with the "Options:" +#. Used in usage help. (Should be consistent with the "Options:" #. header.) Example: #. duplicity [full|incremental] [options] source_dir target_url #: ../duplicity/commandline.py:355 ../duplicity/commandline.py:447 @@ -685,7 +685,7 @@ "not intended" msgstr "" -#. TRANSL: Used in usage help to represent an imap mailbox +#. Used in usage help to represent an imap mailbox #: ../duplicity/commandline.py:377 msgid "imap_mailbox" msgstr "" @@ -694,12 +694,12 @@ msgid "file_descriptor" msgstr "" -#. TRANSL: Used in usage help (noun) +#. Used in usage help (noun) #: ../duplicity/commandline.py:402 msgid "backup name" msgstr "" -#. TRANSL: Used in usage help to represent a desired number of +#. Used in usage help to represent a desired number of #. something. Example: #. --num-retries #: ../duplicity/commandline.py:421 ../duplicity/commandline.py:468 @@ -707,18 +707,13 @@ msgid "number" msgstr "" -#. TRANSL: noun -#: ../duplicity/commandline.py:675 -msgid "command" -msgstr "" - -#. TRANSL: Used in usage help. Example: +#. Used in usage help. Example: #. --timeout #: ../duplicity/commandline.py:510 ../duplicity/commandline.py:738 msgid "seconds" msgstr "" -#. TRANSL: abbreviation for "character" (noun) +#. abbreviation for "character" (noun) #: ../duplicity/commandline.py:516 ../duplicity/commandline.py:672 msgid "char" msgstr "" @@ -742,88 +737,93 @@ msgid "Enter 'duplicity --help' for help screen." msgstr "" -#. TRANSL: Used in usage help to represent a Unix-style path name. Example: +#. Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other_host[:port]//absolute_path #: ../duplicity/commandline.py:660 msgid "absolute_path" msgstr "" -#. TRANSL: Used in usage help. Example: +#. Used in usage help. Example: #. tahoe://alias/some_dir #: ../duplicity/commandline.py:664 msgid "alias" msgstr "" -#. TRANSL: Used in help to represent a "bucket name" for Amazon Web +#. Used in help to represent a "bucket name" for Amazon Web #. Services' Simple Storage Service (S3). Example: #. s3://other.host/bucket_name[/prefix] #: ../duplicity/commandline.py:669 msgid "bucket_name" msgstr "" -#. TRANSL: Used in usage help to represent the name of a container in +#. noun +#: ../duplicity/commandline.py:675 +msgid "command" +msgstr "" + +#. Used in usage help to represent the name of a container in #. Amazon Web Services' Cloudfront. Example: #. cf+http://container_name #: ../duplicity/commandline.py:680 msgid "container_name" msgstr "" -#. TRANSL: noun +#. noun #: ../duplicity/commandline.py:683 msgid "count" msgstr "" -#. TRANSL: Used in usage help to represent the name of a file directory +#. Used in usage help to represent the name of a file directory #: ../duplicity/commandline.py:686 msgid "directory" msgstr "" -#. TRANSL: Used in usage help, e.g. to represent the name of a code +#. Used in usage help, e.g. to represent the name of a code #. module. Example: #. rsync://user[:password]@other.host[:port]::/module/some_dir #: ../duplicity/commandline.py:699 msgid "module" msgstr "" -#. TRANSL: Used in usage help to represent an internet hostname. Example: +#. Used in usage help to represent an internet hostname. Example: #. ftp://user[:password]@other.host[:port]/some_dir #: ../duplicity/commandline.py:713 msgid "other.host" msgstr "" -#. TRANSL: Used in usage help. Example: +#. Used in usage help. Example: #. ftp://user[:password]@other.host[:port]/some_dir #: ../duplicity/commandline.py:717 msgid "password" msgstr "" -#. TRANSL: Used in usage help to represent a TCP port number. Example: +#. Used in usage help to represent a TCP port number. Example: #. ftp://user[:password]@other.host[:port]/some_dir #: ../duplicity/commandline.py:725 msgid "port" msgstr "" -#. TRANSL: Used in usage help. This represents a string to be used as a +#. Used in usage help. This represents a string to be used as a #. prefix to names for backup files created by Duplicity. Example: #. s3://other.host/bucket_name[/prefix] #: ../duplicity/commandline.py:730 msgid "prefix" msgstr "" -#. TRANSL: Used in usage help to represent a Unix-style path name. Example: +#. Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other.host[:port]/relative_path #: ../duplicity/commandline.py:734 msgid "relative_path" msgstr "" -#. TRANSL: Used in usage help to represent the name of a single file +#. Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory. Example: #. file:///some_dir #: ../duplicity/commandline.py:749 msgid "some_dir" msgstr "" -#. TRANSL: Used in usage help to represent the name of a single file +#. Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory where files will be #. coming FROM. Example: #. duplicity [full|incremental] [options] source_dir target_url @@ -831,14 +831,14 @@ msgid "source_dir" msgstr "" -#. TRANSL: Used in usage help to represent a URL files will be coming +#. Used in usage help to represent a URL files will be coming #. FROM. Example: #. duplicity [restore] [options] source_url target_dir #: ../duplicity/commandline.py:760 msgid "source_url" msgstr "" -#. TRANSL: Used in usage help to represent the name of a single file +#. Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory. where files will be #. going TO. Example: #. duplicity [restore] [options] source_url target_dir @@ -846,26 +846,26 @@ msgid "target_dir" msgstr "" -#. TRANSL: Used in usage help to represent a URL files will be going TO. +#. Used in usage help to represent a URL files will be going TO. #. Example: #. duplicity [full|incremental] [options] source_dir target_url #: ../duplicity/commandline.py:771 msgid "target_url" msgstr "" -#. TRANSL: Used in usage help to represent a user name (i.e. login). +#. Used in usage help to represent a user name (i.e. login). #. Example: #. ftp://user[:password]@other.host[:port]/some_dir #: ../duplicity/commandline.py:781 msgid "user" msgstr "" -#. TRANSL: Header in usage help +#. Header in usage help #: ../duplicity/commandline.py:798 msgid "Backends and their URL formats:" msgstr "" -#. TRANSL: Header in usage help +#. Header in usage help #: ../duplicity/commandline.py:820 msgid "Commands:" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/e2fsprogs.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/e2fsprogs.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/e2fsprogs.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/e2fsprogs.po 2012-03-23 07:32:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:34+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:23+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: e2fsck/badblocks.c:22 misc/mke2fs.c:157 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ecryptfs-utils.po 2012-03-23 07:33:19.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ecryptfs-utils\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-17 03:43+0000\n" +"POT-Creation-Date: 2012-02-22 02:47+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: 2012-02-21 23:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:48+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../src/desktop/ecryptfs-mount-private.desktop.in.h:1 msgid "Access Your Private Data" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/eject.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/eject.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/eject.po 2012-02-23 07:11:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/eject.po 2012-03-23 07:32: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: 2012-02-21 17:42+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../eject.c:155 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/elfutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/elfutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/elfutils.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/elfutils.po 2012-03-23 07:33:17.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: 2012-02-21 23:22+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:28+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/enscript.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/enscript.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/enscript.po 2012-02-23 07:11:27.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/enscript.po 2012-03-23 07:32:49.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: 2012-02-21 17:42+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: compat/getopt.c:628 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/example-content.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/example-content.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/example-content.po 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/example-content.po 2012-03-23 07:33:14.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: 2012-02-21 22:33+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:02+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fetchmail.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/fetchmail.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fetchmail.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/fetchmail.po 2012-03-23 07:32:50.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: 2012-02-21 17:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:34+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: checkalias.c:179 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/findutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/findutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/findutils.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/findutils.po 2012-03-23 07:32:50.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: 2012-02-21 17:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:35+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: gnulib/lib/argmatch.c:133 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/flex.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/flex.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/flex.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/flex.po 2012-03-23 07:32:50.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: 2012-02-21 17:51+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:35+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: dfa.c:61 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fluid.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/fluid.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/fluid.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/fluid.po 2012-03-23 07:33:00.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: 2012-02-21 19:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:31+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: fluid.cxx:1573 msgid "&File" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/FontForge.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/FontForge.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/FontForge.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/FontForge.po 2012-03-23 07:32:51.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: 2012-02-21 17:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:38+0000\n" +"X-Generator: Launchpad (build 14981)\n" # #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/friendly-recovery.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/friendly-recovery.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/friendly-recovery.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/friendly-recovery.po 2012-03-23 07:33:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: friendly-recovery\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-16 12:08-0500\n" +"POT-Creation-Date: 2012-03-08 14:38-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: 2012-02-21 23:56+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:53+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format @@ -76,7 +76,7 @@ msgstr "降格为 root 用户的 shell 提示符" #: ../lib/recovery-mode/options/system-summary:9 -#: ../lib/recovery-mode/options/system-summary:57 +#: ../lib/recovery-mode/options/system-summary:107 #, sh-format msgid "System summary" msgstr "" @@ -111,46 +111,118 @@ msgid "No software RAID detected (mdstat)" msgstr "" -#: ../lib/recovery-mode/options/system-summary:39 +#: ../lib/recovery-mode/options/system-summary:42 +#, sh-format +msgid "No LVM detected (vgscan)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:46 +#, sh-format +msgid "Unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:48 +#, sh-format +msgid "Physical Volumes:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:51 +#: ../lib/recovery-mode/options/system-summary:60 +#, sh-format +msgid "ok (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:62 +#, sh-format +msgid "not ok (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:57 +#, sh-format +msgid "Volume Groups:" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:69 +#, sh-format +msgid "unknown (read-only filesystem)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:71 +#, sh-format +msgid "unknown (must be run as root)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:75 +#, sh-format +msgid "yes (good)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:77 +#, sh-format +msgid "no (BAD)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:81 +#, sh-format +msgid "(Use arrows/PageUp/PageDown keys to scroll and TAB key to select)" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:83 #, sh-format msgid "=== General information ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:40 +#: ../lib/recovery-mode/options/system-summary:84 #, sh-format msgid "System mode:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:41 +#: ../lib/recovery-mode/options/system-summary:85 #, sh-format msgid "CPU information:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:42 +#: ../lib/recovery-mode/options/system-summary:86 #, sh-format msgid "Network connectivity:" msgstr "" -#: ../lib/recovery-mode/options/system-summary:44 +#: ../lib/recovery-mode/options/system-summary:88 #, sh-format msgid "=== Detailed disk usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:47 +#: ../lib/recovery-mode/options/system-summary:91 #, sh-format msgid "=== Software RAID state ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:50 +#: ../lib/recovery-mode/options/system-summary:94 +#, sh-format +msgid "=== LVM state ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:97 #, sh-format msgid "=== Detailed memory usage ===" msgstr "" -#: ../lib/recovery-mode/options/system-summary:53 +#: ../lib/recovery-mode/options/system-summary:100 #, sh-format msgid "=== Detailed network configuration ===" msgstr "" +#: ../lib/recovery-mode/options/system-summary:103 +#, sh-format +msgid "=== System database (APT) ===" +msgstr "" + +#: ../lib/recovery-mode/options/system-summary:104 +#, sh-format +msgid "Database is consistent:" +msgstr "" + #: ../lib/recovery-mode/recovery-menu:20 #, sh-format msgid "Recovery Menu (filesystem state: read-only)" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gas.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gas.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gas.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gas.po 2012-03-23 07:32:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: app.c:488 app.c:502 msgid "end of file in comment" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gawk.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gawk.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gawk.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gawk.po 2012-03-23 07:32:51.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: 2012-02-21 17:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:38+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: array.c:112 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gcc-4.4.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gcc-4.4.po 2012-03-23 07:33:25.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: gcc 4.4-b20081121\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" "POT-Creation-Date: 2009-07-15 13:37+0200\n" -"PO-Revision-Date: 2011-12-13 00:09+0000\n" +"PO-Revision-Date: 2012-03-14 21:06+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: 2012-02-22 01:11+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:42+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/gcc-4.5.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:07.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gcc-4.5.po 2012-03-23 07:33:29.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: 2012-02-22 01:47+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:07+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/gcc-4.6.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:12:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gcc-4.6.po 2012-03-23 07:33:31.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: 2012-02-17 01:51+0000\n" +"PO-Revision-Date: 2012-03-10 00:28+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: 2012-02-22 02:17+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gdb.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gdb.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gdb.po 2012-02-23 07:11:28.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gdb.po 2012-03-23 07:32:51.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: gdb\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-01-24 09:23+0000\n" +"POT-Creation-Date: 2012-02-09 15:19-0200\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: 2012-02-21 17:57+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:41+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ada-exp.y:259 msgid "Invalid conversion" @@ -694,26 +694,26 @@ msgid "Invalid character '%s' in expression." msgstr "表达式中含有无效字符 '%s'" -#: ada-lex.l:342 +#: ada-lex.l:343 #, possible-c-format msgid "Invalid base: %d." msgstr "" -#: ada-lex.l:353 ada-lex.l:360 +#: ada-lex.l:354 ada-lex.l:361 msgid "Integer literal out of range" msgstr "" -#: ada-lex.l:355 +#: ada-lex.l:356 #, possible-c-format msgid "Invalid digit `%c' in based literal" msgstr "" -#: ada-lex.l:601 +#: ada-lex.l:602 #, possible-c-format msgid "ambiguous attribute name: `%s'" msgstr "不明确的属性名：`%s'" -#: ada-lex.l:604 +#: ada-lex.l:605 #, possible-c-format msgid "unrecognized attribute: `%s'" msgstr "无法辨认的属性: `%s'" @@ -1094,47 +1094,6 @@ 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." @@ -1198,25 +1157,45 @@ "search. The only need to set it is when debugging a stripped executable." msgstr "" -#: 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:96 alphabsd-nat.c:128 amd64-linux-nat.c:165 +#: amd64-linux-nat.c:220 amd64bsd-nat.c:53 amd64bsd-nat.c:87 hppabsd-nat.c:134 +#: hppabsd-nat.c:164 hppanbsd-nat.c:172 hppanbsd-nat.c:202 +#: i386-linux-nat.c:266 i386-linux-nat.c:281 i386bsd-nat.c:141 +#: i386bsd-nat.c:192 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 mips-linux-nat.c:235 mips-linux-nat.c:292 +#: mips64obsd-nat.c:87 mips64obsd-nat.c:103 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 "无法获取寄存器" -#: amd64fbsd-nat.c:200 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n" -"Please report this to ." +#: alphabsd-nat.c:110 alphabsd-nat.c:147 amd64-linux-nat.c:192 +#: amd64-linux-nat.c:255 amd64bsd-nat.c:66 amd64bsd-nat.c:105 +#: hppabsd-nat.c:145 hppabsd-nat.c:179 hppanbsd-nat.c:183 hppanbsd-nat.c:217 +#: i386-linux-nat.c:330 i386-linux-nat.c:344 i386bsd-nat.c:165 +#: i386bsd-nat.c:172 i386bsd-nat.c:228 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 "" -#: amd64fbsd-nat.c:213 -#, possible-c-format -msgid "" -"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n" -"Please report this to ." +#: alphabsd-nat.c:134 amd64-linux-nat.c:225 amd64bsd-nat.c:93 +#: hppabsd-nat.c:170 hppanbsd-nat.c:208 i386-linux-nat.c:286 i386bsd-nat.c:198 +#: 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 amd64-linux-nat.c:260 amd64bsd-nat.c:111 +#: hppabsd-nat.c:185 hppanbsd-nat.c:223 i386-linux-nat.c:349 i386bsd-nat.c:234 +#: 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 "" #: amd64-linux-nat.c:185 amd64-linux-nat.c:244 @@ -1255,6 +1234,27 @@ msgid "unable to find free reg" msgstr "" +#: amd64fbsd-nat.c:187 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n" +"Please report this to ." +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 "" + +#: amd64fbsd-nat.c:213 +#, possible-c-format +msgid "" +"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n" +"Please report this to ." +msgstr "" + #: arch-utils.c:214 m32c-tdep.c:2598 m32c-tdep.c:2619 msgid "No virtual frame pointer available" msgstr "" @@ -1435,47 +1435,6 @@ 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:1574 arm-tdep.c:4608 arm-tdep.c:4629 arm-tdep.c:4744 msgid "Invalid update to pc in instruction" @@ -1665,6 +1624,10 @@ msgid "unknown ARM EABI version 0x%x" msgstr "" +#: arm-tdep.c:10079 armnbsd-tdep.c:64 +msgid "arm_gdbarch_init: bad byte order for float format" +msgstr "" + #: arm-tdep.c:10257 #, possible-c-format msgid "arm_dump_tdep: Lowest pc = 0x%lx" @@ -1755,6 +1718,43 @@ 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:419 msgid "End of vector" msgstr "" @@ -2267,8 +2267,8 @@ msgid " %02x" msgstr "" -#: ax-general.c:360 darwin-nat.c:544 darwin-nat-info.c:294 -#: darwin-nat-info.c:587 darwin-nat-info.c:795 +#: ax-general.c:360 darwin-nat-info.c:294 darwin-nat-info.c:587 +#: darwin-nat-info.c:795 darwin-nat.c:544 msgid "\n" msgstr "" @@ -3492,12 +3492,6 @@ "\n" msgstr "" -#: 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" @@ -3748,8 +3742,8 @@ #: 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 +#: psymtab.c:702 psymtab.c:720 remote-mips.c:2700 target.c:961 target.c:1046 +#: target.c:1061 target.c:1088 utils.c:2049 utils.c:2987 utils.c:3030 #: utils.c:3197 valprint.c:639 msgid "failed internal consistency check" msgstr "" @@ -3834,96 +3828,219 @@ msgid "A %s in expression, near `%s'." msgstr "" -#: charset.c:217 -#, possible-c-format -msgid "The host character set is \"auto; currently %s\".\n" +#: c-lang.c:68 c-lang.c:616 +msgid "unhandled c_string_type" msgstr "" -#: charset.c:220 +#: c-lang.c:335 #, possible-c-format -msgid "The host character set is \"%s\".\n" +msgid "Error reading string from inferior: %s" msgstr "" -#: charset.c:230 +#: c-lang.c:369 #, possible-c-format -msgid "The target character set is \"auto; currently %s\".\n" +msgid "Trying to read string with inappropriate type `%s'." msgstr "" -#: charset.c:234 -#, possible-c-format -msgid "The target character set is \"%s\".\n" +#: c-lang.c:373 +msgid "Trying to read string with inappropriate type." msgstr "" -#: charset.c:247 -#, possible-c-format -msgid "The target wide character set is \"auto; currently %s\".\n" +#: c-lang.c:474 +msgid "Malformed escape sequence" msgstr "" -#: charset.c:251 -#, possible-c-format -msgid "The target wide character set is \"%s\".\n" +#: c-lang.c:501 +msgid "\\x used with no following hex digits." msgstr "" -#: charset.c:326 charset.c:332 -#, possible-c-format -msgid "Cannot convert between character sets `%s' and `%s'" +#: c-lang.c:523 +msgid "\\u used with no following hex digits" msgstr "" -#: charset.c:488 charset.c:595 -msgid "Converting character sets" +#: c-lang.c:675 +msgid "Could not convert character constant to target character set" msgstr "" -#: charset.c:524 -#, possible-c-format -msgid "Could not convert character to `%s' character set" +#. To avoid memory corruption. +#: c-lang.c:701 eval.c:1011 +msgid "Too many array elements" msgstr "" -#: charset.c:555 charset.c:696 -msgid "Internal error while converting character sets" +#: c-typeprint.c:333 +msgid "type not handled in c_type_print_varspec_prefix()" msgstr "" -#. No valid charset found, generate error here. -#: charset.c:1002 -msgid "Unable to find a vaild charset for string conversions" +#: c-typeprint.c:691 +msgid "type not handled in c_type_print_varspec_suffix()" msgstr "" -#: charset.c:1045 -msgid "Set the host and target character sets." +#: c-typeprint.c:734 m2-typeprint.c:82 +msgid "" msgstr "" -#: charset.c:1046 -msgid "Show the host and target character sets." +#: c-typeprint.c:762 +msgid "" msgstr "" -#: 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 '." +#: c-typeprint.c:822 +msgid "\n" msgstr "" -#: charset.c:1061 -msgid "Set the host character set." +#: c-typeprint.c:825 +msgid "\n" msgstr "" -#: charset.c:1062 -msgid "Show the host character set." +#: c-typeprint.c:1053 +#, possible-c-format +msgid " %s;\n" msgstr "" -#: 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 " -"'." +#: c-typeprint.c:1102 +#, possible-c-format +msgid "" msgstr "" -#: charset.c:1073 -msgid "Set the target character set." -msgstr "" +#: c-typeprint.c:1165 +#, possible-c-format +msgid " (Local at %s:%d)\n" +msgstr "" + +#: c-typeprint.c:1224 +msgid "struct " +msgstr "" + +#. This should not occur. +#: c-typeprint.c:1233 +msgid "" +msgstr "" + +#. At least for dump_symtab, it is important that this not +#. be an error (). +#: c-typeprint.c:1255 +#, possible-c-format +msgid "" +msgstr "" + +#: c-valprint.c:176 +msgid "Could not determine the array high bound" +msgstr "" + +#: c-valprint.c:226 +#, 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:605 m2-valprint.c:581 m2-valprint.c:661 valprint.c:362 +msgid "" +msgstr "" + +#: c-valprint.c:634 +#, possible-c-format +msgid "Invalid C/C++ type code %d in symbol table." +msgstr "" + +#: c-valprint.c:751 +msgid " [incomplete object]" +msgstr "" + +#: charset.c:217 +#, possible-c-format +msgid "The host character set is \"auto; currently %s\".\n" +msgstr "" + +#: charset.c:220 +#, possible-c-format +msgid "The host character set is \"%s\".\n" +msgstr "" + +#: charset.c:230 +#, possible-c-format +msgid "The target character set is \"auto; currently %s\".\n" +msgstr "" + +#: charset.c:234 +#, possible-c-format +msgid "The target character set is \"%s\".\n" +msgstr "" + +#: charset.c:247 +#, possible-c-format +msgid "The target wide character set is \"auto; currently %s\".\n" +msgstr "" + +#: charset.c:251 +#, possible-c-format +msgid "The target wide character set is \"%s\".\n" +msgstr "" + +#: charset.c:326 charset.c:332 +#, possible-c-format +msgid "Cannot convert between character sets `%s' and `%s'" +msgstr "" + +#: charset.c:488 charset.c:595 +msgid "Converting character sets" +msgstr "" + +#: charset.c:524 +#, possible-c-format +msgid "Could not convert character to `%s' character set" +msgstr "" + +#: charset.c:555 charset.c:696 +msgid "Internal error while converting character sets" +msgstr "" + +#. No valid charset found, generate error here. +#: charset.c:1002 +msgid "Unable to find a vaild charset for string conversions" +msgstr "" + +#: charset.c:1045 +msgid "Set the host and target character sets." +msgstr "" + +#: charset.c:1046 +msgid "Show the host and target character sets." +msgstr "" + +#: 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 "" + +#: charset.c:1061 +msgid "Set the host character set." +msgstr "" + +#: charset.c:1062 +msgid "Show the host character set." +msgstr "" + +#: 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 "" + +#: charset.c:1073 +msgid "Set the target character set." +msgstr "" #: charset.c:1074 msgid "Show the target character set." @@ -3957,43 +4074,208 @@ "`set target-wide-charset'" msgstr "" -#: c-lang.c:68 c-lang.c:616 -msgid "unhandled c_string_type" +#: cli/cli-dump.c:75 +msgid "Missing filename." msgstr "" -#: c-lang.c:335 +#: cli/cli-dump.c:116 cli/cli-dump.c:136 #, possible-c-format -msgid "Error reading string from inferior: %s" +msgid "Failed to open %s: %s." msgstr "" -#: c-lang.c:369 +#: cli/cli-dump.c:121 #, possible-c-format -msgid "Trying to read string with inappropriate type `%s'." +msgid "'%s' is not a recognized file format." msgstr "" -#: c-lang.c:373 -msgid "Trying to read string with inappropriate type." +#: cli/cli-dump.c:140 +#, possible-c-format +msgid "bfd_openw_with_cleanup: %s." msgstr "" -#: c-lang.c:474 -msgid "Malformed escape sequence" +#. Append to existing file. +#. FIXME -- doesn't work... +#: cli/cli-dump.c:144 +msgid "bfd_openw does not work with append." msgstr "" -#: c-lang.c:501 -msgid "\\x used with no following hex digits." +#: cli/cli-dump.c:147 +#, possible-c-format +msgid "bfd_openw_with_cleanup: unknown mode %s." msgstr "" -#: c-lang.c:523 -msgid "\\u used with no following hex digits" +#: cli/cli-dump.c:163 +msgid "" +"\"dump\" must be followed by a subcommand.\n" +"\n" msgstr "" -#: c-lang.c:675 -msgid "Could not convert character constant to target character set" +#: cli/cli-dump.c:170 +msgid "" +"\"append\" must be followed by a subcommand.\n" +"\n" msgstr "" -#. To avoid memory corruption. -#: c-lang.c:701 eval.c:1011 -msgid "Too many array elements" +#: 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-cmds.c:219 @@ -4527,255 +4809,120 @@ msgid "Show the max call depth for user-defined commands." msgstr "" -#: 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" +#: cli/cli-cmds.c:1923 +msgid "Set tracing of GDB CLI commands." msgstr "" -#. No, no useable data in this section. -#: cli/cli-dump.c:459 -#, possible-c-format -msgid "skipping section %s...\n" +#: cli/cli-cmds.c:1924 +msgid "Show state of GDB CLI command tracing." msgstr "" -#: cli/cli-dump.c:478 -#, possible-c-format -msgid "Failed to read bfd file %s: '%s'." +#: cli/cli-cmds.c:1925 +msgid "When 'on', each command is displayed as it is executed." msgstr "" -#: cli/cli-dump.c:501 cli/cli-dump.c:553 -#, possible-c-format -msgid "restore: memory write failed (%s)." +#: 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-dump.c:524 -#, possible-c-format -msgid "Start address is greater than length of binary file %s." +#: cli/cli-utils.c:53 +msgid "History value must have integer type." msgstr "" -#: cli/cli-dump.c:599 -msgid "Start must be less than end." +#: cli/cli-utils.c:74 +msgid "Convenience variable must have integer value.\n" msgstr "" -#: cli/cli-dump.c:668 -msgid "Dump target code/data to a local file." +#: cli/cli-utils.c:151 +msgid "inverted range" msgstr "" -#: cli/cli-dump.c:673 -msgid "Append target code/data to a local file." +#: cli/cli-utils.c:165 +msgid "negative value" msgstr "" -#: cli/cli-dump.c:689 -msgid "Write target code/data to an srec file." +#: cli/cli-utils.c:207 +msgid "Args must be numbers or '$' variables." msgstr "" -#: cli/cli-dump.c:695 -msgid "Write target code/data to an intel hex file." +#: cli/cli-setshow.c:59 +msgid "\"on\", \"off\" or \"auto\" expected." msgstr "" -#: cli/cli-dump.c:701 -msgid "Write target code/data to a tekhex file." +#: cli/cli-setshow.c:88 +msgid "\"on\" or \"off\" expected." msgstr "" -#: cli/cli-dump.c:707 -msgid "Write target code/data to a raw binary file." +#: cli/cli-setshow.c:194 +msgid "filename to set it to." msgstr "" -#: cli/cli-dump.c:713 -msgid "Append target code/data to a raw binary file." +#: 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-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." +#: cli/cli-setshow.c:230 +#, possible-c-format +msgid "integer %u out of range" 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." +#: cli/cli-setshow.c:273 +#, possible-c-format +msgid "Requires an argument. Valid arguments are %s." 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." +#: cli/cli-setshow.c:302 +#, possible-c-format +msgid "Undefined item: \"%s\"." 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." +#: cli/cli-setshow.c:305 +#, possible-c-format +msgid "Ambiguous item \"%s\"." 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." +#: cli/cli-setshow.c:311 cli/cli-setshow.c:379 +msgid "gdb internal error: bad var_type in do_setshow_command" 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." +#: cli/cli-setshow.c:356 +msgid "do_setshow_command: invalid var_auto_boolean" 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." +#: cli/cli-setshow.c:403 +msgid "gdb internal error: bad cmd_type in do_setshow_command" 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." +#: cli/cli-decode.c:1330 +#, possible-c-format +msgid "Undefined %scommand: \"%s\". Try \"help%s%.*s\"." 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." +#: cli/cli-decode.c:1363 +#, possible-c-format +msgid "Lack of needed %scommand" 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." +#: cli/cli-decode.c:1428 +#, possible-c-format +msgid "Ambiguous %scommand \"%s\": %s." 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." +#: cli/cli-decode.c:1812 +msgid "Invalid command" msgstr "" #: cli/cli-logging.c:45 @@ -4996,7 +5143,7 @@ #: 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 +#: reggroups.c:219 remote.c:6514 utils.c:987 utils.c:1006 msgid "bad switch" msgstr "" @@ -5020,75 +5167,6 @@ msgid "bad reason" msgstr "" -#: cli/cli-setshow.c:59 -msgid "\"on\", \"off\" or \"auto\" expected." -msgstr "" - -#: cli/cli-setshow.c:88 -msgid "\"on\" or \"off\" expected." -msgstr "" - -#: cli/cli-setshow.c:194 -msgid "filename to set it to." -msgstr "" - -#: 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:230 -#, possible-c-format -msgid "integer %u out of range" -msgstr "" - -#: cli/cli-setshow.c:273 -#, possible-c-format -msgid "Requires an argument. Valid arguments are %s." -msgstr "" - -#: cli/cli-setshow.c:302 -#, possible-c-format -msgid "Undefined item: \"%s\"." -msgstr "" - -#: cli/cli-setshow.c:305 -#, possible-c-format -msgid "Ambiguous item \"%s\"." -msgstr "" - -#: 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:356 -msgid "do_setshow_command: invalid var_auto_boolean" -msgstr "" - -#: cli/cli-setshow.c:403 -msgid "gdb internal error: bad cmd_type in do_setshow_command" -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 "" - #: coffread.c:594 #, possible-c-format msgid "\"%s\": error reading line numbers." @@ -5176,20 +5254,6 @@ msgid "Unexpected type for symbol %s" msgstr "" -#: 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" @@ -5208,6 +5272,20 @@ "Use \"info signals\" for a list of symbolic signals." 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/common-utils.c:136 +msgid "vasprintf call failed" +msgstr "" + #: complaints.c:320 #, possible-c-format msgid "Max number of complaints about incorrect symbols is %s.\n" @@ -5225,8 +5303,16 @@ msgid "Conditions for redistributing copies of GDB." msgstr "" -#: copying.c:656 copying.c:663 -msgid "Various kinds of warranty you do not have." +#: copying.c:656 copying.c:663 +msgid "Various kinds of warranty you do not have." +msgstr "" + +#: 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 "" #: corefile.c:76 @@ -5360,14 +5446,6 @@ msgid "init_core_ops: core target already exists (\"%s\")." msgstr "" -#: 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 "" @@ -5624,881 +5702,797 @@ 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 "" - -#: c-typeprint.c:822 -msgid "\n" -msgstr "" - -#: c-typeprint.c:825 -msgid "\n" -msgstr "" - -#: c-typeprint.c:1053 -#, possible-c-format -msgid " %s;\n" -msgstr "" - -#: c-typeprint.c:1102 -#, possible-c-format -msgid "" -msgstr "" - -#: c-typeprint.c:1165 +#: darwin-nat-info.c:53 #, possible-c-format -msgid " (Local at %s:%d)\n" -msgstr "" - -#: c-typeprint.c:1224 -msgid "struct " -msgstr "" - -#. This should not occur. -#: c-typeprint.c:1233 -msgid "" +msgid "%s must be specified with 0x..." msgstr "" -#. At least for dump_symtab, it is important that this not -#. be an error (). -#: c-typeprint.c:1255 +#: darwin-nat-info.c:57 #, possible-c-format -msgid "" -msgstr "" - -#: c-valprint.c:176 -msgid "Could not determine the array high bound" +msgid ":\t%#lx\n" msgstr "" -#: c-valprint.c:226 +#: darwin-nat-info.c:60 #, 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:605 m2-valprint.c:581 m2-valprint.c:661 valprint.c:362 -msgid "" +msgid ":\t%u.%06u sec\n" msgstr "" -#: c-valprint.c:634 +#: darwin-nat-info.c:86 #, possible-c-format -msgid "Invalid C/C++ type code %d in symbol table." -msgstr "" - -#: c-valprint.c:751 -msgid " [incomplete object]" +msgid "%d processes:\n" msgstr "" -#: darwin-nat.c:186 +#: darwin-nat-info.c:97 #, possible-c-format -msgid "[%d inferior]: " -msgstr "" - -#: darwin-nat.c:198 -msgid "[UNKNOWN]" +msgid " %s is %d has task %#x\n" msgstr "" -#: darwin-nat.c:200 +#: darwin-nat-info.c:103 #, possible-c-format -msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)" +msgid " %s is %d unknown task port\n" msgstr "" -#: darwin-nat.c:232 -#, c-format -msgid "unknown (%d)" +#: darwin-nat-info.c:121 darwin-nat-info.c:814 darwin-nat-info.c:835 +msgid "No inferior running\n" msgstr "" -#: darwin-nat.c:257 +#: darwin-nat-info.c:129 #, possible-c-format -msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n" -msgstr "" - -#: darwin-nat.c:259 -msgid "no error" +msgid "cannot parse task id '%s'\n" msgstr "" -#: darwin-nat.c:325 +#: darwin-nat-info.c:153 #, possible-c-format -msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n" +msgid "TASK_BASIC_INFO for 0x%x:\n" msgstr "" -#: darwin-nat.c:484 -msgid "message header:\n" +#: darwin-nat-info.c:165 +msgid "" +"\n" +"TASK_EVENTS_INFO:\n" msgstr "" -#: darwin-nat.c:485 -#, possible-c-format -msgid " bits: 0x%x\n" +#: darwin-nat-info.c:181 +msgid "" +"\n" +"TASK_THREAD_TIMES_INFO:\n" msgstr "" -#: darwin-nat.c:486 +#: darwin-nat-info.c:211 #, possible-c-format -msgid " size: 0x%x\n" +msgid "Ports for task 0x%x:\n" msgstr "" -#: darwin-nat.c:487 -#, possible-c-format -msgid " remote-port: 0x%x\n" +#: darwin-nat-info.c:212 +msgid "port type\n" msgstr "" -#: darwin-nat.c:488 +#: darwin-nat-info.c:232 #, possible-c-format -msgid " local-port: 0x%x\n" +msgid "%04x: %08x " msgstr "" -#: darwin-nat.c:489 +#: darwin-nat-info.c:239 #, possible-c-format -msgid " reserved: 0x%x\n" +msgid " %s(" msgstr "" -#: darwin-nat.c:490 -#, possible-c-format -msgid " id: 0x%x\n" +#: darwin-nat-info.c:242 +msgid "??" msgstr "" -#: darwin-nat.c:509 +#: darwin-nat-info.c:244 #, possible-c-format -msgid "body: descriptor_count=%u\n" +msgid "%u" msgstr "" -#: darwin-nat.c:518 -#, possible-c-format -msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n" +#: darwin-nat-info.c:245 +msgid " refs)" msgstr "" -#: darwin-nat.c:522 -#, possible-c-format -msgid " descr %d: type=%u\n" +#: darwin-nat-info.c:251 +msgid " gdb-task" msgstr "" -#: darwin-nat.c:532 -#, possible-c-format -msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n" +#: darwin-nat-info.c:253 +msgid " host-self" msgstr "" -#: darwin-nat.c:540 -msgid " data:" +#: darwin-nat-info.c:255 +msgid " gdb-exception" msgstr "" -#: darwin-nat.c:682 -#, possible-c-format -msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n" +#: darwin-nat-info.c:257 +msgid " gdb-port_set" msgstr "" -#: darwin-nat.c:695 -#, possible-c-format -msgid "ptrace THUP: res=%d\n" +#: darwin-nat-info.c:263 +msgid " inferior-task" msgstr "" -#: darwin-nat.c:702 -#, possible-c-format -msgid "darwin_resume_thread: kill 0x%x %d: %d\n" +#: darwin-nat-info.c:265 +msgid " inferior-notify" msgstr "" -#. Set single step. -#: darwin-nat.c:708 -#, possible-c-format -msgid "darwin_set_sstep (thread=%x, enable=%d)\n" +#: darwin-nat-info.c:274 +msgid " inferior-excp-port" msgstr "" -#: darwin-nat.c:797 +#: darwin-nat-info.c:286 #, possible-c-format -msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n" +msgid " inferior-thread for 0x%x" msgstr "" -#. Should not happen... -#: darwin-nat.c:877 +#: darwin-nat-info.c:315 #, possible-c-format -msgid "darwin_wait: ill-formatted message (id=%x)\n" +msgid "Port 0x%lx in task 0x%lx:\n" msgstr "" -#: darwin-nat.c:890 +#: darwin-nat-info.c:317 #, possible-c-format -msgid "darwin_wait: thread=%x, got %s\n" +msgid " port set: 0x%x\n" msgstr "" -#: darwin-nat.c:913 +#: darwin-nat-info.c:318 #, possible-c-format -msgid " (signal %d: %s)\n" +msgid " seqno: 0x%x\n" msgstr "" -#: darwin-nat.c:958 +#: darwin-nat-info.c:319 #, possible-c-format -msgid "wait4: res=%d: %s\n" +msgid " mscount: 0x%x\n" msgstr "" -#: darwin-nat.c:974 +#: darwin-nat-info.c:320 #, possible-c-format -msgid "darwin_wait: pid=%d exit, status=%x\n" +msgid " qlimit: 0x%x\n" msgstr "" -#: darwin-nat.c:984 +#: darwin-nat-info.c:321 #, possible-c-format -msgid "darwin_wait: pid=%d\n" +msgid " msgcount: 0x%x\n" msgstr "" -#: darwin-nat.c:991 +#: darwin-nat-info.c:322 #, possible-c-format -msgid "Bad local-port: %x\n" +msgid " sorights: 0x%x\n" msgstr "" -#: darwin-nat.c:1041 +#: darwin-nat-info.c:323 #, possible-c-format -msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n" +msgid " srights: 0x%x\n" msgstr "" -#: darwin-nat.c:1075 +#: darwin-nat-info.c:324 #, possible-c-format -msgid "mach_msg: ret=%x\n" +msgid " pdrequest: 0x%x\n" msgstr "" -#: darwin-nat.c:1109 +#: darwin-nat-info.c:325 #, possible-c-format -msgid "darwin_wait: mach_msg(pending) ret=%x\n" +msgid " nsrequest: 0x%x\n" msgstr "" -#: darwin-nat.c:1127 +#: darwin-nat-info.c:326 #, possible-c-format -msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n" +msgid " flags: 0x%x\n" msgstr "" -#: darwin-nat.c:1131 -msgid "darwin_wait: unhandled pending message\n" +#: darwin-nat-info.c:335 +msgid "Task and port" msgstr "" -#: darwin-nat.c:1255 +#: darwin-nat-info.c:357 #, possible-c-format -msgid "cannot kill: %s" +msgid "Threads in task %#x:\n" msgstr "" -#: darwin-nat.c:1321 +#: darwin-nat-info.c:360 #, possible-c-format -msgid "Failed to kill inferior: ptrace returned %d [%s] (pid=%d)" +msgid " %#x\n" msgstr "" -#: 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))" +#: darwin-nat-info.c:380 +msgid "Thread" msgstr "" -#: darwin-nat.c:1375 -#, possible-c-format -msgid "inferior task: 0x%x, pid: %d\n" +#: darwin-nat-info.c:383 +msgid "THREAD_BASIC_INFO\n" msgstr "" -#: darwin-nat.c:1486 -#, possible-c-format -msgid "unable to create a pipe: %s" +#: darwin-nat-info.c:434 +msgid "share" msgstr "" -#. 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!" +#: darwin-nat-info.c:436 +msgid "copy " msgstr "" -#: darwin-nat.c:1580 inf-ptrace.c:220 inf-ttrace.c:750 -#, possible-c-format -msgid "Attaching to program: %s, %s\n" +#: darwin-nat-info.c:438 +msgid "none " msgstr "" -#: darwin-nat.c:1583 inf-ptrace.c:223 inf-ttrace.c:753 procfs.c:3303 -#, possible-c-format -msgid "Attaching to %s\n" +#: darwin-nat-info.c:440 +msgid "??? " msgstr "" -#: darwin-nat.c:1590 -#, possible-c-format -msgid "Can't attach to process %d: %s (%d)" +#: darwin-nat-info.c:450 +msgid "cow" msgstr "" -#: 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" +#: darwin-nat-info.c:452 +msgid "private" msgstr "" -#: darwin-nat.c:1651 -#, possible-c-format -msgid "Unable to detach from process-id %d: %s (%d)" +#: darwin-nat-info.c:454 +msgid "empty" msgstr "" -#: darwin-nat.c:1679 -#, c-format -msgid "Thread 0x%lx of process %u" +#: darwin-nat-info.c:456 +msgid "shared" msgstr "" -#: darwin-nat.c:1712 -#, possible-c-format -msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n" +#: darwin-nat-info.c:458 +msgid "true-shrd" msgstr "" -#: darwin-nat.c:1721 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s" +#: darwin-nat-info.c:460 +msgid "prv-alias" msgstr "" -#: darwin-nat.c:1753 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n" +#: darwin-nat-info.c:462 +msgid "shr-alias" msgstr "" -#: darwin-nat.c:1761 -#, possible-c-format -msgid "" -"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, " -"len=%s\n" +#: darwin-nat-info.c:464 +msgid "???" msgstr "" -#: darwin-nat.c:1770 -#, possible-c-format -msgid "No memory at %s (vs %s+0x%x). Nothing written" +#: darwin-nat-info.c:474 darwin-nat-info.c:763 +msgid "default" msgstr "" -#: darwin-nat.c:1788 -#, possible-c-format -msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s" +#: darwin-nat-info.c:476 +msgid "malloc" msgstr "" -#: darwin-nat.c:1803 -#, possible-c-format -msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s" +#: darwin-nat-info.c:478 +msgid "malloc_small" msgstr "" -#: darwin-nat.c:1817 -#, possible-c-format -msgid "darwin_read_write_inferior: mach_vm_write failed: %s" +#: darwin-nat-info.c:480 +msgid "malloc_large" msgstr "" -#: darwin-nat.c:1865 -#, possible-c-format -msgid "darwin_xfer_memory(%s, %d, %c)\n" +#: darwin-nat-info.c:482 +msgid "malloc_huge" msgstr "" -#: darwin-nat.c:1883 -#, possible-c-format -msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n" +#: darwin-nat-info.c:484 +msgid "sbrk" msgstr "" -#: darwin-nat.c:2037 -msgid "Darwin child process" +#: darwin-nat-info.c:486 +msgid "realloc" msgstr "" -#: darwin-nat.c:2039 -msgid "Darwin child process (started by the \"run\" command)." +#: darwin-nat-info.c:488 +msgid "malloc_tiny" msgstr "" -#: darwin-nat.c:2063 -#, possible-c-format -msgid "GDB task: 0x%lx, pid: %d\n" +#: darwin-nat-info.c:490 +msgid "analysis_tool" msgstr "" -#: darwin-nat.c:2067 -msgid "Set if printing inferior communication debugging statements." +#: darwin-nat-info.c:492 +msgid "mach_msg" msgstr "" -#: darwin-nat.c:2068 -msgid "Show if printing inferior communication debugging statements." +#: darwin-nat-info.c:494 +msgid "iokit" msgstr "" -#: darwin-nat.c:2074 -msgid "Set if mach exceptions are caught." +#: darwin-nat-info.c:496 +msgid "stack" msgstr "" -#: darwin-nat.c:2075 -msgid "Show if mach exceptions are caught." +#: darwin-nat-info.c:498 +msgid "guard" msgstr "" -#: darwin-nat.c:2076 -msgid "" -"When this mode is on, all low level exceptions are reported before being\n" -"reported by the kernel." +#: darwin-nat-info.c:500 +msgid "shared_pmap" msgstr "" -#: darwin-nat-info.c:53 -#, possible-c-format -msgid "%s must be specified with 0x..." +#: darwin-nat-info.c:502 +msgid "dylib" msgstr "" -#: darwin-nat-info.c:57 -#, possible-c-format -msgid ":\t%#lx\n" +#: darwin-nat-info.c:504 +msgid "appkit" msgstr "" -#: darwin-nat-info.c:60 -#, possible-c-format -msgid ":\t%u.%06u sec\n" +#: darwin-nat-info.c:506 +msgid "foundation" msgstr "" -#: darwin-nat-info.c:86 -#, possible-c-format -msgid "%d processes:\n" +#: darwin-nat-info.c:531 +msgid "No memory regions." msgstr "" -#: darwin-nat-info.c:97 +#: darwin-nat-info.c:575 #, possible-c-format -msgid " %s is %d has task %#x\n" +msgid "%s-%s %s/%s %s %s %s" msgstr "" -#: darwin-nat-info.c:103 -#, possible-c-format -msgid " %s is %d unknown task port\n" +#: darwin-nat-info.c:581 +msgid "shrd" msgstr "" -#: darwin-nat-info.c:121 darwin-nat-info.c:814 darwin-nat-info.c:835 -msgid "No inferior running\n" +#: darwin-nat-info.c:581 +msgid "priv" msgstr "" -#: darwin-nat-info.c:129 -#, possible-c-format -msgid "cannot parse task id '%s'\n" +#: darwin-nat-info.c:582 +msgid "reserved" msgstr "" -#: darwin-nat-info.c:153 -#, possible-c-format -msgid "TASK_BASIC_INFO for 0x%x:\n" +#: darwin-nat-info.c:582 +msgid "not-rsvd" msgstr "" -#: darwin-nat-info.c:165 -msgid "" -"\n" -"TASK_EVENTS_INFO:\n" +#: darwin-nat-info.c:585 +#, possible-c-format +msgid " (%d sub-rgn)" msgstr "" -#: darwin-nat-info.c:181 -msgid "" -"\n" -"TASK_THREAD_TIMES_INFO:\n" +#: darwin-nat-info.c:674 +msgid "sm " msgstr "" -#: darwin-nat-info.c:211 -#, possible-c-format -msgid "Ports for task 0x%x:\n" +#: darwin-nat-info.c:674 +msgid "obj" msgstr "" -#: darwin-nat-info.c:212 -msgid "port type\n" +#: darwin-nat-info.c:743 +msgid "Inferior not available" msgstr "" -#: darwin-nat-info.c:232 +#: darwin-nat-info.c:754 #, possible-c-format -msgid "%04x: %08x " -msgstr "" +msgid "%d exceptions:\n" +msgstr "%d 个异常：\n" -#: darwin-nat-info.c:239 +#: darwin-nat-info.c:759 #, possible-c-format -msgid " %s(" -msgstr "" - -#: darwin-nat-info.c:242 -msgid "??" +msgid "port 0x%04x, behavior: " msgstr "" -#: darwin-nat-info.c:244 -#, possible-c-format -msgid "%u" +#: darwin-nat-info.c:766 +msgid "state" msgstr "" -#: darwin-nat-info.c:245 -msgid " refs)" +#: darwin-nat-info.c:769 +msgid "state-identity" msgstr "" -#: darwin-nat-info.c:251 -msgid " gdb-task" +#: darwin-nat-info.c:772 +#, possible-c-format +msgid "0x%x" msgstr "" -#: darwin-nat-info.c:253 -msgid " host-self" +#: darwin-nat-info.c:774 +msgid ", masks:" msgstr "" -#: darwin-nat-info.c:255 -msgid " gdb-exception" +#: darwin-nat-info.c:776 +msgid " BAD_ACCESS" msgstr "" -#: darwin-nat-info.c:257 -msgid " gdb-port_set" +#: darwin-nat-info.c:778 +msgid " BAD_INSTRUCTION" msgstr "" -#: darwin-nat-info.c:263 -msgid " inferior-task" +#: darwin-nat-info.c:780 +msgid " ARITHMETIC" msgstr "" -#: darwin-nat-info.c:265 -msgid " inferior-notify" +#: darwin-nat-info.c:782 +msgid " EMULATION" msgstr "" -#: darwin-nat-info.c:274 -msgid " inferior-excp-port" +#: darwin-nat-info.c:784 +msgid " SOFTWARE" msgstr "" -#: darwin-nat-info.c:286 -#, possible-c-format -msgid " inferior-thread for 0x%x" +#: darwin-nat-info.c:786 +msgid " BREAKPOINT" msgstr "" -#: darwin-nat-info.c:315 -#, possible-c-format -msgid "Port 0x%lx in task 0x%lx:\n" +#: darwin-nat-info.c:788 +msgid " SYSCALL" msgstr "" -#: darwin-nat-info.c:317 -#, possible-c-format -msgid " port set: 0x%x\n" +#: darwin-nat-info.c:790 +msgid " MACH_SYSCALL" msgstr "" -#: darwin-nat-info.c:318 -#, possible-c-format -msgid " seqno: 0x%x\n" +#: darwin-nat-info.c:792 +msgid " RPC_ALERT" msgstr "" -#: darwin-nat-info.c:319 -#, possible-c-format -msgid " mscount: 0x%x\n" +#: darwin-nat-info.c:794 +msgid " CRASH" msgstr "" -#: darwin-nat-info.c:320 -#, possible-c-format -msgid " qlimit: 0x%x\n" +#: darwin-nat-info.c:828 +msgid "Parameter is saved, host or none" msgstr "" -#: darwin-nat-info.c:321 -#, possible-c-format -msgid " msgcount: 0x%x\n" +#: darwin-nat-info.c:850 +msgid "Get list of tasks in system." msgstr "" -#: darwin-nat-info.c:322 -#, possible-c-format -msgid " sorights: 0x%x\n" +#: darwin-nat-info.c:852 +msgid "Get list of ports in a task." msgstr "" -#: darwin-nat-info.c:323 -#, possible-c-format -msgid " srights: 0x%x\n" +#: darwin-nat-info.c:854 +msgid "Get info on a specific port." msgstr "" -#: darwin-nat-info.c:324 -#, possible-c-format -msgid " pdrequest: 0x%x\n" +#: darwin-nat-info.c:856 +msgid "Get info on a specific task." msgstr "" -#: darwin-nat-info.c:325 -#, possible-c-format -msgid " nsrequest: 0x%x\n" +#: darwin-nat-info.c:858 +msgid "Get list of threads in a task." msgstr "" -#: darwin-nat-info.c:326 -#, possible-c-format -msgid " flags: 0x%x\n" +#: darwin-nat-info.c:860 +msgid "Get info on a specific thread." msgstr "" -#: darwin-nat-info.c:335 -msgid "Task and port" +#: darwin-nat-info.c:863 +msgid "Get information on all mach region for the task." msgstr "" -#: darwin-nat-info.c:357 -#, possible-c-format -msgid "Threads in task %#x:\n" +#: darwin-nat-info.c:865 +msgid "Get information on all mach sub region for the task." msgstr "" -#: darwin-nat-info.c:360 -#, possible-c-format -msgid " %#x\n" +#: darwin-nat-info.c:867 +msgid "Get information on mach region at given address." msgstr "" -#: darwin-nat-info.c:380 -msgid "Thread" +#: darwin-nat-info.c:870 +msgid "Disp mach exceptions." msgstr "" -#: darwin-nat-info.c:383 -msgid "THREAD_BASIC_INFO\n" +#: darwin-nat.c:186 +#, possible-c-format +msgid "[%d inferior]: " msgstr "" -#: darwin-nat-info.c:434 -msgid "share" +#: darwin-nat.c:198 +msgid "[UNKNOWN]" msgstr "" -#: darwin-nat-info.c:436 -msgid "copy " +#: darwin-nat.c:200 +#, possible-c-format +msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)" msgstr "" -#: darwin-nat-info.c:438 -msgid "none " +#: darwin-nat.c:232 +#, c-format +msgid "unknown (%d)" msgstr "" -#: darwin-nat-info.c:440 -msgid "??? " +#: darwin-nat.c:257 +#, possible-c-format +msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n" msgstr "" -#: darwin-nat-info.c:450 -msgid "cow" +#: darwin-nat.c:259 +msgid "no error" msgstr "" -#: darwin-nat-info.c:452 -msgid "private" +#: darwin-nat.c:325 +#, possible-c-format +msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n" msgstr "" -#: darwin-nat-info.c:454 -msgid "empty" +#: darwin-nat.c:484 +msgid "message header:\n" msgstr "" -#: darwin-nat-info.c:456 -msgid "shared" +#: darwin-nat.c:485 +#, possible-c-format +msgid " bits: 0x%x\n" msgstr "" -#: darwin-nat-info.c:458 -msgid "true-shrd" +#: darwin-nat.c:486 +#, possible-c-format +msgid " size: 0x%x\n" msgstr "" -#: darwin-nat-info.c:460 -msgid "prv-alias" +#: darwin-nat.c:487 +#, possible-c-format +msgid " remote-port: 0x%x\n" msgstr "" -#: darwin-nat-info.c:462 -msgid "shr-alias" +#: darwin-nat.c:488 +#, possible-c-format +msgid " local-port: 0x%x\n" msgstr "" -#: darwin-nat-info.c:464 -msgid "???" +#: darwin-nat.c:489 +#, possible-c-format +msgid " reserved: 0x%x\n" msgstr "" -#: darwin-nat-info.c:474 darwin-nat-info.c:763 -msgid "default" +#: darwin-nat.c:490 +#, possible-c-format +msgid " id: 0x%x\n" msgstr "" -#: darwin-nat-info.c:476 -msgid "malloc" +#: darwin-nat.c:509 +#, possible-c-format +msgid "body: descriptor_count=%u\n" msgstr "" -#: darwin-nat-info.c:478 -msgid "malloc_small" +#: darwin-nat.c:518 +#, possible-c-format +msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n" msgstr "" -#: darwin-nat-info.c:480 -msgid "malloc_large" +#: darwin-nat.c:522 +#, possible-c-format +msgid " descr %d: type=%u\n" msgstr "" -#: darwin-nat-info.c:482 -msgid "malloc_huge" +#: 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:484 -msgid "sbrk" +#: darwin-nat.c:540 +msgid " data:" msgstr "" -#: darwin-nat-info.c:486 -msgid "realloc" +#: 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:488 -msgid "malloc_tiny" +#: darwin-nat.c:695 +#, possible-c-format +msgid "ptrace THUP: res=%d\n" msgstr "" -#: darwin-nat-info.c:490 -msgid "analysis_tool" +#: darwin-nat.c:702 +#, possible-c-format +msgid "darwin_resume_thread: kill 0x%x %d: %d\n" msgstr "" -#: darwin-nat-info.c:492 -msgid "mach_msg" +#. Set single step. +#: darwin-nat.c:708 +#, possible-c-format +msgid "darwin_set_sstep (thread=%x, enable=%d)\n" msgstr "" -#: darwin-nat-info.c:494 -msgid "iokit" +#: darwin-nat.c:797 +#, possible-c-format +msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n" msgstr "" -#: darwin-nat-info.c:496 -msgid "stack" +#. Should not happen... +#: darwin-nat.c:877 +#, possible-c-format +msgid "darwin_wait: ill-formatted message (id=%x)\n" msgstr "" -#: darwin-nat-info.c:498 -msgid "guard" +#: darwin-nat.c:890 +#, possible-c-format +msgid "darwin_wait: thread=%x, got %s\n" msgstr "" -#: darwin-nat-info.c:500 -msgid "shared_pmap" +#: darwin-nat.c:913 +#, possible-c-format +msgid " (signal %d: %s)\n" msgstr "" -#: darwin-nat-info.c:502 -msgid "dylib" +#: darwin-nat.c:958 +#, possible-c-format +msgid "wait4: res=%d: %s\n" msgstr "" -#: darwin-nat-info.c:504 -msgid "appkit" +#: darwin-nat.c:974 +#, possible-c-format +msgid "darwin_wait: pid=%d exit, status=%x\n" msgstr "" -#: darwin-nat-info.c:506 -msgid "foundation" +#: darwin-nat.c:984 +#, possible-c-format +msgid "darwin_wait: pid=%d\n" msgstr "" -#: darwin-nat-info.c:531 -msgid "No memory regions." +#: darwin-nat.c:991 +#, possible-c-format +msgid "Bad local-port: %x\n" msgstr "" -#: darwin-nat-info.c:575 +#: darwin-nat.c:1041 #, possible-c-format -msgid "%s-%s %s/%s %s %s %s" +msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n" msgstr "" -#: darwin-nat-info.c:581 -msgid "shrd" +#: darwin-nat.c:1075 +#, possible-c-format +msgid "mach_msg: ret=%x\n" msgstr "" -#: darwin-nat-info.c:581 -msgid "priv" +#: darwin-nat.c:1109 +#, possible-c-format +msgid "darwin_wait: mach_msg(pending) ret=%x\n" msgstr "" -#: darwin-nat-info.c:582 -msgid "reserved" +#: darwin-nat.c:1127 +#, possible-c-format +msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n" msgstr "" -#: darwin-nat-info.c:582 -msgid "not-rsvd" +#: darwin-nat.c:1131 +msgid "darwin_wait: unhandled pending message\n" msgstr "" -#: darwin-nat-info.c:585 +#: darwin-nat.c:1255 #, possible-c-format -msgid " (%d sub-rgn)" -msgstr "" - -#: darwin-nat-info.c:674 -msgid "sm " +msgid "cannot kill: %s" msgstr "" -#: darwin-nat-info.c:674 -msgid "obj" +#: darwin-nat.c:1321 +#, possible-c-format +msgid "Failed to kill inferior: ptrace returned %d [%s] (pid=%d)" msgstr "" -#: darwin-nat-info.c:743 -msgid "Inferior not available" +#: 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:754 +#: darwin-nat.c:1375 #, possible-c-format -msgid "%d exceptions:\n" -msgstr "%d 个异常：\n" +msgid "inferior task: 0x%x, pid: %d\n" +msgstr "" -#: darwin-nat-info.c:759 +#: darwin-nat.c:1486 #, possible-c-format -msgid "port 0x%04x, behavior: " +msgid "unable to create a pipe: %s" msgstr "" -#: darwin-nat-info.c:766 -msgid "state" +#. 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:769 -msgid "state-identity" +#: 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:772 +#: darwin-nat.c:1583 inf-ptrace.c:223 inf-ttrace.c:753 procfs.c:3307 #, possible-c-format -msgid "0x%x" +msgid "Attaching to %s\n" msgstr "" -#: darwin-nat-info.c:774 -msgid ", masks:" +#: darwin-nat.c:1590 +#, possible-c-format +msgid "Can't attach to process %d: %s (%d)" msgstr "" -#: darwin-nat-info.c:776 -msgid " BAD_ACCESS" +#: darwin-nat.c:1635 inf-ptrace.c:282 inf-ttrace.c:798 procfs.c:3333 +#, possible-c-format +msgid "Detaching from program: %s, %s\n" msgstr "" -#: darwin-nat-info.c:778 -msgid " BAD_INSTRUCTION" +#: darwin-nat.c:1651 +#, possible-c-format +msgid "Unable to detach from process-id %d: %s (%d)" msgstr "" -#: darwin-nat-info.c:780 -msgid " ARITHMETIC" +#: darwin-nat.c:1679 +#, c-format +msgid "Thread 0x%lx of process %u" msgstr "" -#: darwin-nat-info.c:782 -msgid " EMULATION" +#: darwin-nat.c:1712 +#, possible-c-format +msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n" msgstr "" -#: darwin-nat-info.c:784 -msgid " SOFTWARE" +#: darwin-nat.c:1721 +#, possible-c-format +msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s" msgstr "" -#: darwin-nat-info.c:786 -msgid " BREAKPOINT" +#: 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:788 -msgid " SYSCALL" +#: 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:790 -msgid " MACH_SYSCALL" +#: darwin-nat.c:1770 +#, possible-c-format +msgid "No memory at %s (vs %s+0x%x). Nothing written" msgstr "" -#: darwin-nat-info.c:792 -msgid " RPC_ALERT" +#: 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:794 -msgid " CRASH" +#: 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:828 -msgid "Parameter is saved, host or none" +#: darwin-nat.c:1817 +#, possible-c-format +msgid "darwin_read_write_inferior: mach_vm_write failed: %s" msgstr "" -#: darwin-nat-info.c:850 -msgid "Get list of tasks in system." +#: darwin-nat.c:1865 +#, possible-c-format +msgid "darwin_xfer_memory(%s, %d, %c)\n" msgstr "" -#: darwin-nat-info.c:852 -msgid "Get list of ports in a task." +#: 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:854 -msgid "Get info on a specific port." +#: darwin-nat.c:2037 +msgid "Darwin child process" msgstr "" -#: darwin-nat-info.c:856 -msgid "Get info on a specific task." +#: darwin-nat.c:2039 +msgid "Darwin child process (started by the \"run\" command)." msgstr "" -#: darwin-nat-info.c:858 -msgid "Get list of threads in a task." +#: darwin-nat.c:2063 +#, possible-c-format +msgid "GDB task: 0x%lx, pid: %d\n" msgstr "" -#: darwin-nat-info.c:860 -msgid "Get info on a specific thread." +#: darwin-nat.c:2067 +msgid "Set if printing inferior communication debugging statements." msgstr "" -#: darwin-nat-info.c:863 -msgid "Get information on all mach region for the task." +#: darwin-nat.c:2068 +msgid "Show if printing inferior communication debugging statements." msgstr "" -#: darwin-nat-info.c:865 -msgid "Get information on all mach sub region for the task." +#: darwin-nat.c:2074 +msgid "Set if mach exceptions are caught." msgstr "" -#: darwin-nat-info.c:867 -msgid "Get information on mach region at given address." +#: darwin-nat.c:2075 +msgid "Show if mach exceptions are caught." msgstr "" -#: darwin-nat-info.c:870 -msgid "Disp mach exceptions." +#: darwin-nat.c:2076 +msgid "" +"When this mode is on, all low level exceptions are reported before being\n" +"reported by the kernel." msgstr "" #: dbxread.c:170 mdebugread.c:3441 @@ -6769,83 +6763,178 @@ msgid "Show the current C++ demangling style." msgstr "" -#: demangle.c:242 -msgid "" -"Use `set demangle-style' without arguments for a list of demangling styles." +#: demangle.c:242 +msgid "" +"Use `set demangle-style' without arguments for a list of demangling styles." +msgstr "" + +#: dfp.c:92 +#, possible-c-format +msgid "Cannot perform operation: %s" +msgstr "" + +#: dfp.c:137 dfp.c:165 dfp.c:194 +msgid "Unknown decimal floating point type." +msgstr "" + +#. libdecnumber can convert only 32-bit integers. +#: dfp.c:221 +msgid "" +"Conversion of large integer to a decimal floating type is not supported." +msgstr "" + +#: dfp.c:306 +msgid "Unknown decimal floating point operation." +msgstr "" + +#: dfp.c:359 +msgid "Comparison with an invalid number (NaN)." +msgstr "" + +#: dicos-tdep.c:84 dicos-tdep.c:98 +#, possible-c-format +msgid "Can't read elf symbols from %s: %s" +msgstr "" + +#: dictionary.c:587 +msgid "dict_add_symbol: non-expandable dictionary" +msgstr "" + +#: doublest.c:801 +#, possible-c-format +msgid "Unrecognized %d-bit floating-point type." +msgstr "" + +#. If we don't know the floating-point format of FROM_TYPE or +#. TO_TYPE, there's not much we can do. We might make the +#. assumption that if the length of FROM_TYPE and TO_TYPE match, +#. their floating-point format would match too, but that +#. 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:882 +msgid "Can't convert floating-point number to desired type." +msgstr "" + +#: dsrec.c:65 +#, possible-c-format +msgid "Unable to open file %s\n" +msgstr "" + +#: dsrec.c:71 +msgid "File is not an object file\n" +msgstr "" + +#: dsrec.c:129 dsrec.c:143 symfile.c:1958 +msgid "Canceled the download" +msgstr "" + +#: dsrec.c:256 +#, possible-c-format +msgid "make_srec: Bad address (%s), or bad flags (0x%x)." +msgstr "" + +#: dummy-frame.c:312 +msgid "maintenance print dummy-frames" +msgstr "" + +#: dummy-frame.c:325 +msgid "Print the contents of the internal dummy-frame stack." +msgstr "" + +#: dwarf2-frame.c:336 +#, possible-c-format +msgid "" +"incomplete CFI data; DW_CFA_restore unspecified\n" +"register %s (#%d) at %s" +msgstr "" + +#. 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:392 +msgid "" +"Not implemented: computing unwound register using explicit value operator" +msgstr "" + +#: dwarf2-frame.c:524 +#, possible-c-format +msgid "bad CFI data; mismatched DW_CFA_restore_state at %s" +msgstr "" + +#: dwarf2-frame.c:684 +msgid "Unknown CFI encountered." +msgstr "" + +#: dwarf2-frame.c:905 +msgid "Could not compute CFA; needed to translate this expression" msgstr "" -#: dfp.c:92 +#: dwarf2-frame.c:935 dwarf2loc.c:2331 #, possible-c-format -msgid "Cannot perform operation: %s" +msgid "Unable to access DWARF register number %d" msgstr "" -#: dfp.c:137 dfp.c:165 dfp.c:194 -msgid "Unknown decimal floating point type." +#: dwarf2-frame.c:959 dwarf2-frame.c:1105 +msgid "Unknown CFA rule." msgstr "" -#. libdecnumber can convert only 32-bit integers. -#: dfp.c:221 -msgid "" -"Conversion of large integer to a decimal floating type is not supported." +#: dwarf2-frame.c:1160 +#, possible-c-format +msgid "incomplete CFI data; unspecified registers (e.g., %s) at %s" msgstr "" -#: dfp.c:306 -msgid "Unknown decimal floating point operation." +#: dwarf2-frame.c:1354 +msgid "Unknown register rule." msgstr "" -#: dfp.c:359 -msgid "Comparison with an invalid number (NaN)." +#: dwarf2-frame.c:1492 +msgid "can't compute CFA for this frame" msgstr "" -#: dicos-tdep.c:84 dicos-tdep.c:98 -#, possible-c-format -msgid "Can't read elf symbols from %s: %s" +#: dwarf2-frame.c:1619 +msgid "Unsupported address size" msgstr "" -#: dictionary.c:587 -msgid "dict_add_symbol: non-expandable dictionary" +#: dwarf2-frame.c:1636 +msgid "Unsupported encoding: DW_EH_PE_indirect" msgstr "" -#: doublest.c:801 -#, possible-c-format -msgid "Unrecognized %d-bit floating-point type." +#: dwarf2-frame.c:1669 dwarf2-frame.c:1717 +msgid "Invalid or unsupported encoding" msgstr "" -#. If we don't know the floating-point format of FROM_TYPE or -#. TO_TYPE, there's not much we can do. We might make the -#. assumption that if the length of FROM_TYPE and TO_TYPE match, -#. their floating-point format would match too, but that -#. 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:882 -msgid "Can't convert floating-point number to desired type." +#: dwarf2-frame.c:1927 +msgid "Found a CIE when not expecting it." msgstr "" -#: dsrec.c:65 -#, possible-c-format -msgid "Unable to open file %s\n" +#: dwarf2-frame.c:2096 +msgid "Found an FDE when not expecting it." msgstr "" -#: dsrec.c:71 -msgid "File is not an object file\n" +#: dwarf2-frame.c:2234 +#, possible-c-format +msgid "Corrupt data in %s:%s; align 4 workaround apparently succeeded" msgstr "" -#: dsrec.c:129 dsrec.c:143 symfile.c:1958 -msgid "Canceled the download" +#: dwarf2-frame.c:2241 +#, possible-c-format +msgid "Corrupt data in %s:%s; align 8 workaround apparently succeeded" msgstr "" -#: dsrec.c:256 +#: dwarf2-frame.c:2249 #, possible-c-format -msgid "make_srec: Bad address (%s), or bad flags (0x%x)." +msgid "Corrupt data in %s:%s" msgstr "" -#: dummy-frame.c:312 -msgid "maintenance print dummy-frames" +#: dwarf2-frame.c:2340 +#, possible-c-format +msgid "skipping .eh_frame info of %s: %s" msgstr "" -#: dummy-frame.c:325 -msgid "Print the contents of the internal dummy-frame stack." +#: dwarf2-frame.c:2380 +#, possible-c-format +msgid "skipping .debug_frame info of %s: %s" msgstr "" #: dwarf2expr.c:80 @@ -6978,101 +7067,6 @@ 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" -"register %s (#%d) at %s" -msgstr "" - -#. 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:392 -msgid "" -"Not implemented: computing unwound register using explicit value operator" -msgstr "" - -#: dwarf2-frame.c:524 -#, possible-c-format -msgid "bad CFI data; mismatched DW_CFA_restore_state at %s" -msgstr "" - -#: dwarf2-frame.c:684 -msgid "Unknown CFI encountered." -msgstr "" - -#: dwarf2-frame.c:905 -msgid "Could not compute CFA; needed to translate this expression" -msgstr "" - -#: dwarf2-frame.c:935 dwarf2loc.c:2331 -#, possible-c-format -msgid "Unable to access DWARF register number %d" -msgstr "" - -#: dwarf2-frame.c:959 dwarf2-frame.c:1105 -msgid "Unknown CFA rule." -msgstr "" - -#: dwarf2-frame.c:1160 -#, possible-c-format -msgid "incomplete CFI data; unspecified registers (e.g., %s) at %s" -msgstr "" - -#: dwarf2-frame.c:1354 -msgid "Unknown register rule." -msgstr "" - -#: dwarf2-frame.c:1492 -msgid "can't compute CFA for this frame" -msgstr "" - -#: dwarf2-frame.c:1619 -msgid "Unsupported address size" -msgstr "" - -#: dwarf2-frame.c:1636 -msgid "Unsupported encoding: DW_EH_PE_indirect" -msgstr "" - -#: dwarf2-frame.c:1669 dwarf2-frame.c:1717 -msgid "Invalid or unsupported encoding" -msgstr "" - -#: 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:2241 -#, possible-c-format -msgid "Corrupt data in %s:%s; align 8 workaround apparently succeeded" -msgstr "" - -#: dwarf2-frame.c:2249 -#, possible-c-format -msgid "Corrupt data in %s:%s" -msgstr "" - -#: dwarf2-frame.c:2340 -#, possible-c-format -msgid "skipping .eh_frame info of %s: %s" -msgstr "" - -#: dwarf2-frame.c:2380 -#, possible-c-format -msgid "skipping .debug_frame info of %s: %s" -msgstr "" - #: dwarf2loc.c:90 msgid "dwarf2_find_location_expression: Corrupted DWARF expression." msgstr "" @@ -8559,15 +8553,91 @@ msgid "" msgstr "" +#: f-exp.y:760 m2-exp.y:726 +msgid "Overflow on numeric constant." +msgstr "" + +#: f-lang.c:101 +msgid "unrecognized character type" +msgstr "" + +#: f-lang.c:484 +msgid "Malformed function STAB found in add_common_block()" +msgstr "" + +#: f-lang.c:532 +msgid "Attempt to add COMMON entry with no block open!" +msgstr "" + +#: f-lang.c:725 +msgid "cannot get .bf node off empty list" +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 "" + +#: f-valprint.c:230 +#, possible-c-format +msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)" +msgstr "" + +#: f-valprint.c:514 +#, possible-c-format +msgid "Invalid F77 type code %d in symbol table." +msgstr "" + +#: f-valprint.c:527 +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:556 f-valprint.c:646 +msgid "No frame selected" +msgstr "" + +#. Got no 'funname', code below will fail. +#: f-valprint.c:596 +msgid "No function found for frame." +msgstr "" + +#: f-valprint.c:613 +msgid "Contents of blank COMMON block:\n" +msgstr "" + +#: f-valprint.c:615 +#, possible-c-format +msgid "Contents of F77 COMMON block '%s':\n" +msgstr "" + +#: f-valprint.c:627 +#, possible-c-format +msgid "Cannot locate the common block %s in function '%s'\n" +msgstr "" + +#: f-valprint.c:644 +msgid "Cannot deal with NULL common name!" +msgstr "" + +#: f-valprint.c:696 f-valprint.c:699 +msgid "Print out the values contained in a Fortran COMMON block." +msgstr "" + #: fbsd-nat.c:108 #, possible-c-format msgid "Couldn't open %s." msgstr "" -#: f-exp.y:760 m2-exp.y:726 -msgid "Overflow on numeric constant." -msgstr "" - #: filesystem.c:67 #, possible-c-format msgid "" @@ -8693,22 +8763,6 @@ 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 "" - -#: f-lang.c:532 -msgid "Attempt to add COMMON entry with no block open!" -msgstr "" - -#: f-lang.c:725 -msgid "cannot get .bf node off empty list" -msgstr "" - #: fork-child.c:331 msgid "setpgrp failed in child" msgstr "" @@ -8741,6 +8795,10 @@ msgid "Disable use of an execution wrapper." msgstr "" +#: frame-unwind.c:132 +msgid "frame_unwind_find_by_frame failed" +msgstr "" + #: frame.c:173 #, possible-c-format msgid "Frame debugging is %s.\n" @@ -8898,10 +8956,6 @@ 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 "" @@ -8925,155 +8979,99 @@ 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 "" - -#: f-valprint.c:230 -#, possible-c-format -msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)" -msgstr "" - -#: f-valprint.c:514 -#, possible-c-format -msgid "Invalid F77 type code %d in symbol table." -msgstr "" - -#: f-valprint.c:527 -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:556 f-valprint.c:646 -msgid "No frame selected" -msgstr "" - -#. Got no 'funname', code below will fail. -#: f-valprint.c:596 -msgid "No function found for frame." -msgstr "" - -#: f-valprint.c:613 -msgid "Contents of blank COMMON block:\n" -msgstr "" - -#: f-valprint.c:615 -#, possible-c-format -msgid "Contents of F77 COMMON block '%s':\n" -msgstr "" - -#: f-valprint.c:627 -#, possible-c-format -msgid "Cannot locate the common block %s in function '%s'\n" -msgstr "" - -#: f-valprint.c:644 -msgid "Cannot deal with NULL common name!" -msgstr "" - -#: f-valprint.c:696 f-valprint.c:699 -msgid "Print out the values contained in a Fortran COMMON block." -msgstr "" - #: gcore.c:56 #, possible-c-format msgid "Failed to open '%s' for output." msgstr "" -#: gcore.c:84 +#: gcore.c:83 +msgid "Target does not support core file generation." +msgstr "" + +#: gcore.c:91 #, possible-c-format msgid "Failed to create 'note' section for corefile: %s" msgstr "" -#: gcore.c:94 +#: gcore.c:100 msgid "gcore: failed to get corefile memory sections from target." msgstr "" -#: gcore.c:100 +#: gcore.c:104 #, possible-c-format msgid "writing note section (%s)" msgstr "" -#: gcore.c:170 +#: gcore.c:172 msgid "Can't find default bfd machine type (need execfile)." msgstr "" -#: gcore.c:184 +#: gcore.c:186 msgid "Can't find bfd architecture for corefile (need execfile)." msgstr "" -#: gcore.c:445 +#: gcore.c:447 #, possible-c-format msgid "Couldn't make gcore segment: %s" msgstr "" -#: gcore.c:539 +#: gcore.c:541 #, possible-c-format msgid "Memory read failed for corefile section, %s bytes at %s." msgstr "" -#: gcore.c:547 +#: gcore.c:549 #, possible-c-format msgid "Failed to write corefile contents (%s)." msgstr "" -#: gcore.c:580 +#: gcore.c:588 msgid "" "Save a core file with the current state of the debugged process.\n" "Argument is optional filename. Default filename is 'core.'." msgstr "" +#: gdb-dlfcn.c:82 gdb-dlfcn.c:96 +#, possible-c-format +msgid "Could not load %s: %s" +msgstr "" + #: gdbarch.c:67 #, possible-c-format msgid "Architecture debugging is %s.\n" msgstr "" -#: gdbarch.c:722 +#: gdbarch.c:731 #, possible-c-format msgid "verify_gdbarch: the following are invalid ...%s" msgstr "" -#: gdbarch.c:4077 +#: gdbarch.c:4176 msgid "gdbarch_architecture_names: multi-arch unknown" msgstr "" -#: gdbarch.c:4103 +#: gdbarch.c:4202 #, possible-c-format msgid "gdbarch: Attempt to register unknown architecture (%d)" msgstr "" -#: gdbarch.c:4114 +#: gdbarch.c:4213 #, possible-c-format msgid "gdbarch: Duplicate registration of architecture (%s)" msgstr "" -#: gdbarch.c:4303 +#: gdbarch.c:4402 msgid "Set architecture debugging." msgstr "" -#: gdbarch.c:4304 +#: gdbarch.c:4403 msgid "Show architecture debugging." msgstr "" -#: gdbarch.c:4305 +#: gdbarch.c:4404 msgid "When non-zero, architecture debugging is enabled." msgstr "" -#: 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." @@ -9981,43 +9979,6 @@ "unwinding problems." msgstr "" -#: 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" @@ -10053,45 +10014,6 @@ msgid "darwin_set_sstep: unknown flavour: %d" 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 "" - #: i386-linux-nat.c:386 i386-linux-nat.c:409 msgid "Couldn't read extended state status" msgstr "" @@ -10304,10 +10226,86 @@ msgid "Show the convention for returning small structs." msgstr "" -#: i386-tdep.c:7573 -msgid "" -"Valid values are \"default\", \"pcc\" and \"reg\", and the default value\n" -"is \"default\"." +#: i386-tdep.c:7573 +msgid "" +"Valid values are \"default\", \"pcc\" and \"reg\", and the default value\n" +"is \"default\"." +msgstr "" + +#: 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 "" + +#: 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:322 m68k-tdep.c:216 @@ -10371,6 +10369,60 @@ "Cannot remove breakpoint at address %s, no break instruction at such address." msgstr "" +#: inf-child.c:88 windows-nat.c:1907 +msgid "Use the \"run\" command to start a Unix child process." +msgstr "" + +#: inf-loop.c:137 +msgid "Event type not recognized.\n" +msgstr "" + +#: 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 "" + +#: 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:3913 procfs.c:4051 +#, possible-c-format +msgid "[%s exited]\n" +msgstr "" + +#: inf-ttrace.c:1111 +#, possible-c-format +msgid "[%s has been terminated]\n" +msgstr "" + #: infcall.c:79 #, possible-c-format msgid "Coercion of floats to doubles when calling functions is %s.\n" @@ -10567,10 +10619,6 @@ "The default is to unwind the frame." msgstr "" -#: 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 "" @@ -10802,7 +10850,7 @@ msgid "In %s,\n" msgstr "" -#: infcmd.c:2498 target.c:2522 +#: infcmd.c:2498 target.c:2529 msgid "A program is being debugged already. Kill it? " msgstr "" @@ -10822,32 +10870,32 @@ msgid "\"unset\" must be followed by the name of an unset subcommand.\n" msgstr "" -#: infcmd.c:2815 +#: infcmd.c:2893 msgid "Set terminal for future runs of program being debugged." msgstr "" -#: infcmd.c:2816 +#: infcmd.c:2894 msgid "Show terminal for future runs of program being debugged." msgstr "" -#: infcmd.c:2817 +#: infcmd.c:2895 msgid "Usage: set inferior-tty /dev/pts/1" msgstr "" -#: infcmd.c:2825 +#: infcmd.c:2903 msgid "Set argument list to give program being debugged when it is started." msgstr "" -#: infcmd.c:2826 +#: infcmd.c:2904 msgid "Show argument list to give program being debugged when it is started." msgstr "" -#: infcmd.c:2827 +#: infcmd.c:2905 msgid "" "Follow this command with any number of args, to be passed to the program." msgstr "" -#: infcmd.c:2833 +#: infcmd.c:2911 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" @@ -10855,17 +10903,17 @@ "environment to be given to the program." msgstr "" -#: infcmd.c:2841 +#: infcmd.c:2919 msgid "Complement to certain \"set\" commands." msgstr "" -#: infcmd.c:2844 +#: infcmd.c:2922 msgid "" "Cancel environment variable VAR for the program.\n" "This does not affect the program until the next \"run\" command." msgstr "" -#: infcmd.c:2850 +#: infcmd.c:2928 msgid "" "Set environment variable value to give the program.\n" "Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n" @@ -10873,7 +10921,7 @@ "This does not affect the program until the next \"run\" command." msgstr "" -#: infcmd.c:2858 +#: infcmd.c:2936 msgid "" "Add directory DIR(s) to beginning of search path for object files.\n" "$cwd in the path means the current working directory.\n" @@ -10882,7 +10930,7 @@ "fully linked executable files and separately compiled object files as needed." msgstr "" -#: infcmd.c:2867 +#: infcmd.c:2945 msgid "" "Current search path for finding object files.\n" "$cwd in the path means the current working directory.\n" @@ -10891,11 +10939,11 @@ "fully linked executable files and separately compiled object files as needed." msgstr "" -#: infcmd.c:2878 +#: infcmd.c:2956 msgid "Kill execution of program being debugged." msgstr "" -#: infcmd.c:2881 +#: infcmd.c:2959 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" @@ -10910,45 +10958,45 @@ "to specify the program, and to load its symbol table." msgstr "" -#: infcmd.c:2894 +#: infcmd.c:2972 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:2900 +#: infcmd.c:2978 msgid "" "Disconnect from a target.\n" "The target will wait for another debugger to connect. Not available for\n" "all targets." msgstr "" -#: infcmd.c:2905 +#: infcmd.c:2983 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:2909 +#: infcmd.c:2987 msgid "" "Step one instruction exactly.\n" "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2915 +#: infcmd.c:2993 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:2921 +#: infcmd.c:2999 msgid "" "Execute until selected stack frame returns.\n" "Upon return, the value returned is printed and put in the value history." msgstr "" -#: infcmd.c:2926 +#: infcmd.c:3004 msgid "" "Step program, proceeding through subroutine calls.\n" "Like the \"step\" command as long as subroutine calls do not happen;\n" @@ -10956,34 +11004,34 @@ "Argument N means do this N times (or till program stops for another reason)." msgstr "" -#: infcmd.c:2936 +#: infcmd.c:3014 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:2942 +#: infcmd.c:3020 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:2949 +#: infcmd.c:3027 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:2955 +#: infcmd.c:3033 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:2963 +#: infcmd.c:3041 msgid "" "Usage: go \n" "Continue program being debugged, stopping at specified line or \n" @@ -10993,7 +11041,7 @@ "This command is a combination of tbreak and jump." msgstr "" -#: infcmd.c:2976 +#: infcmd.c:3054 msgid "" "Continue program being debugged, after signal or breakpoint.\n" "If proceeding from breakpoint, a number N may be used as an argument,\n" @@ -11006,7 +11054,7 @@ "Specifying -a and an ignore count simultaneously is an error." msgstr "" -#: infcmd.c:2989 +#: infcmd.c:3067 msgid "" "Start debugged program. You may specify arguments to give it.\n" "Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n" @@ -11018,18 +11066,18 @@ "use \"set args\" without arguments." msgstr "" -#: infcmd.c:3002 +#: infcmd.c:3080 msgid "Start debugged program with no arguments." msgstr "" -#: infcmd.c:3004 +#: infcmd.c:3082 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:3011 +#: infcmd.c:3089 msgid "" "Interrupt the execution of the debugged program.\n" "If non-stop mode is enabled, interrupt only the current thread,\n" @@ -11037,143 +11085,178 @@ "interrupt all running threads in non-stop mode, use the -a option." msgstr "" -#: infcmd.c:3016 infcmd.c:3022 +#: infcmd.c:3094 infcmd.c:3100 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:3025 +#: infcmd.c:3103 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:3030 +#: infcmd.c:3108 msgid "Execution status of the program." msgstr "" -#: infcmd.c:3033 +#: infcmd.c:3111 msgid "Print the status of the floating point unit\n" msgstr "" -#: infcmd.c:3036 +#: infcmd.c:3114 msgid "Print the status of the vector unit\n" msgstr "" +#: infcmd.c:3117 +msgid "" +"Show /proc process information about any running process.\n" +"Specify any process id, or use the program being debugged by default." +msgstr "" + +#. allow-unknown +#: infcmd.c:3123 +msgid "List of mapped memory regions." +msgstr "" + +#: infcmd.c:3127 +msgid "List process info from /proc/PID/stat." +msgstr "" + +#: infcmd.c:3131 +msgid "List process info from /proc/PID/status." +msgstr "" + +#: infcmd.c:3135 +msgid "List current working directory of the process." +msgstr "" + +#: infcmd.c:3139 +msgid "List command line arguments of the process." +msgstr "" + +#: infcmd.c:3143 +msgid "List absolute filename for executable of the process." +msgstr "" + +#: infcmd.c:3147 +msgid "List all available /proc info." +msgstr "" + #: inferior.c:154 #, possible-c-format msgid "[New inferior %d]\n" msgstr "" -#: inferior.c:241 inferior.c:297 +#: inferior.c:241 inferior.c:298 #, possible-c-format msgid "[Inferior %d exited]\n" msgstr "" -#: inferior.c:324 +#: inferior.c:325 #, possible-c-format msgid "[Inferior %d detached]\n" msgstr "" -#: inferior.c:598 +#: inferior.c:599 msgid "" "\n" "\tis vfork child of inferior " msgstr "" -#: inferior.c:603 +#: inferior.c:604 msgid "" "\n" "\tis vfork parent of inferior " msgstr "" -#: inferior.c:622 +#: inferior.c:623 msgid "Requires argument (inferior id(s) to detach)" msgstr "" -#: inferior.c:631 inferior.c:667 inferior.c:698 inferior.c:771 inferior.c:915 +#: inferior.c:632 inferior.c:668 inferior.c:699 inferior.c:772 inferior.c:916 #, possible-c-format msgid "Inferior ID %d not known." msgstr "" -#: inferior.c:640 inferior.c:676 +#: inferior.c:641 inferior.c:677 #, possible-c-format msgid "Inferior ID %d has no threads." msgstr "" -#: inferior.c:658 +#: inferior.c:659 msgid "Requires argument (inferior id(s) to kill)" msgstr "" -#: inferior.c:700 +#: inferior.c:701 #, possible-c-format msgid "[Switching to inferior %d [%s] (%s)]\n" msgstr "" -#: inferior.c:705 +#: inferior.c:706 msgid "" msgstr "" -#: inferior.c:715 mi/mi-main.c:372 +#: inferior.c:716 mi/mi-main.c:372 msgid "Inferior has no threads." msgstr "" -#: inferior.c:720 +#: inferior.c:721 #, possible-c-format msgid "[Switching to thread %d (%s)] " msgstr "" -#: inferior.c:761 +#: inferior.c:762 msgid "Requires an argument (inferior id(s) to remove)" msgstr "" -#: inferior.c:777 +#: inferior.c:778 #, possible-c-format msgid "Can not remove current symbol inferior %d." msgstr "" -#: inferior.c:783 +#: inferior.c:784 #, possible-c-format msgid "Can not remove active inferior %d." msgstr "" -#: inferior.c:833 inferior.c:896 +#: inferior.c:834 inferior.c:897 msgid "No argument to -copies" msgstr "" -#: inferior.c:840 +#: inferior.c:841 msgid "No argument to -exec" msgstr "" -#: inferior.c:845 inferior.c:919 +#: inferior.c:846 inferior.c:920 msgid "Invalid argument" msgstr "" -#: inferior.c:855 +#: inferior.c:856 #, possible-c-format msgid "Added inferior %d\n" msgstr "" -#: inferior.c:900 +#: inferior.c:901 msgid "Invalid copies number" msgstr "" -#: inferior.c:946 +#: inferior.c:947 #, possible-c-format msgid "Added inferior %d.\n" msgstr "" -#: inferior.c:961 +#: inferior.c:962 #, possible-c-format msgid "Printing of inferior events is %s.\n" msgstr "" -#: inferior.c:1079 +#: inferior.c:1080 msgid "IDs of specified inferiors (all inferiors if no argument)." msgstr "" -#: inferior.c:1081 +#: inferior.c:1082 msgid "" "Add a new inferior.\n" "Usage: add-inferior [-copies ] [-exec ]\n" @@ -11182,13 +11265,13 @@ "as main program." msgstr "" -#: inferior.c:1088 +#: inferior.c:1089 msgid "" "Remove inferior ID (or list of IDs).\n" "Usage: remove-inferiors ID..." msgstr "" -#: inferior.c:1092 +#: inferior.c:1093 msgid "" "Clone inferior ID.\n" "Usage: clone-inferior [-copies ] [ID]\n" @@ -11198,32 +11281,28 @@ "that is cloned." msgstr "" -#: inferior.c:1100 +#: inferior.c:1101 msgid "Detach from inferior ID (or list of IDS)." msgstr "" -#: inferior.c:1104 +#: inferior.c:1105 msgid "Kill inferior ID (or list of IDs)." msgstr "" -#: inferior.c:1108 +#: inferior.c:1109 msgid "" "Use this command to switch between inferiors.\n" "The new inferior ID must be currently known." msgstr "" -#: inferior.c:1114 +#: inferior.c:1115 msgid "Set printing of inferior events (e.g., inferior start and exit)." msgstr "" -#: inferior.c:1115 +#: inferior.c:1116 msgid "Show printing of inferior events (e.g., inferior start and exit)." msgstr "" -#: inf-loop.c:137 -msgid "Event type not recognized.\n" -msgstr "" - #: inflow.c:573 msgid "This GDB does not control a terminal.\n" msgstr "" @@ -11266,24 +11345,6 @@ "input settings." msgstr "" -#: 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" @@ -11318,7 +11379,7 @@ "this platform." msgstr "" -#: infrun.c:249 infrun.c:7038 target.c:4273 target.c:4321 +#: infrun.c:249 infrun.c:7038 target.c:4610 target.c:4658 msgid "Cannot change this setting while the inferior is running." msgstr "多线程进行时，不能改变这个设置。" @@ -11807,34 +11868,6 @@ "or signalled." msgstr "" -#: 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\"." @@ -11984,12 +12017,6 @@ "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" @@ -12607,342 +12634,288 @@ msgid "unknown ptrace event %d" msgstr "" -#: linux-nat.c:2400 linux-nat.c:4827 linux-nat.c:4907 linux-nat.c:4921 -#: linux-nat.c:5019 +#: linux-nat.c:2400 linux-tdep.c:295 linux-tdep.c:382 linux-tdep.c:395 +#: linux-tdep.c:529 #, 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:4803 +#: linux-nat.c:4552 linux-nat.c:4565 #, possible-c-format -msgid "Too many parameters: %s" -msgstr "" - -#: linux-nat.c:4806 procfs.c:5435 -msgid "No current process: you must name one." +msgid "Could not parse signal set: %s" msgstr "" -#: linux-nat.c:4810 +#: linux-nat.c:4599 #, possible-c-format -msgid "No /proc directory: '%s'" +msgid "Could not open %s" msgstr "" -#: linux-nat.c:4812 -#, possible-c-format -msgid "process %ld\n" +#: linux-nat.c:5195 +msgid "Set debugging of GNU/Linux lwp module." msgstr "" -#: linux-nat.c:4823 -#, possible-c-format -msgid "unable to read '%s'" +#: linux-nat.c:5196 +msgid "Show debugging of GNU/Linux lwp module." msgstr "" -#: linux-nat.c:4836 linux-nat.c:4845 -#, possible-c-format -msgid "unable to read link '%s'" +#: linux-nat.c:5197 +msgid "Enables printf debugging output." msgstr "" -#. No output for summary mode. -#: linux-nat.c:4857 procfs.c:5370 +#: linux-record.c:245 msgid "" -"Mapped address spaces:\n" -"\n" -msgstr "" - -#: linux-nat.c:4934 -#, possible-c-format -msgid "Process: %d\n" -msgstr "" - -#: linux-nat.c:4936 -#, possible-c-format -msgid "Exec file: %s\n" -msgstr "" - -#: linux-nat.c:4938 -#, possible-c-format -msgid "State: %c\n" -msgstr "" - -#: linux-nat.c:4940 -#, possible-c-format -msgid "Parent process: %d\n" -msgstr "" - -#: linux-nat.c:4942 -#, possible-c-format -msgid "Process group: %d\n" -msgstr "" - -#: linux-nat.c:4944 -#, possible-c-format -msgid "Session id: %d\n" -msgstr "" - -#: linux-nat.c:4946 -#, possible-c-format -msgid "TTY: %d\n" -msgstr "" - -#: linux-nat.c:4948 -#, possible-c-format -msgid "TTY owner process group: %d\n" +"The next instruction is syscall exit. It will make the program exit. Do " +"you want to stop the program?" msgstr "" -#: linux-nat.c:4950 -#, possible-c-format -msgid "Flags: 0x%lx\n" +#: linux-record.c:492 +msgid "" +"Process record and replay target doesn't support ioctl request " +"TIOCSERGSTRUCT\n" msgstr "" -#: linux-nat.c:4952 +#: linux-record.c:498 #, possible-c-format -msgid "Minor faults (no memory page): %lu\n" +msgid "" +"Process record and replay target doesn't support ioctl request 0x%s.\n" msgstr "" -#: linux-nat.c:4955 -#, possible-c-format -msgid "Minor faults, children: %lu\n" +#: linux-record.c:677 +msgid "" +"The next instruction is syscall reboot. It will restart the computer. Do " +"you want to stop the program?" msgstr "" -#: linux-nat.c:4958 +#: linux-record.c:708 #, possible-c-format -msgid "Major faults (memory page faults): %lu\n" +msgid "" +"The next instruction is syscall munmap.\n" +"It will free the memory addr = 0x%s len = %u.\n" +"It will make record target cannot record some memory change.\n" +"Do you want to stop the program?" msgstr "" -#: linux-nat.c:4961 +#: linux-record.c:1053 #, possible-c-format -msgid "Major faults, children: %lu\n" +msgid "" +"Process record and replay target doesn't support socketcall call 0x%s\n" msgstr "" -#: linux-nat.c:4964 +#. XXX RECORD_SEMCTL still not supported. +#: linux-record.c:1216 #, possible-c-format -msgid "utime: %ld\n" +msgid "Process record and replay target doesn't support ipc number %s\n" msgstr "" -#: linux-nat.c:4966 -#, possible-c-format -msgid "stime: %ld\n" +#: linux-record.c:1910 +msgid "" +"The next instruction is syscall exit_group. It will make the program exit. " +"Do you want to stop the program?" msgstr "" -#: linux-nat.c:4968 +#: linux-record.c:2245 #, possible-c-format -msgid "utime, children: %ld\n" +msgid "Process record and replay target doesn't support syscall number %d\n" msgstr "" -#: linux-nat.c:4970 -#, possible-c-format -msgid "stime, children: %ld\n" +#: linux-tdep.c:272 procfs.c:5446 +msgid "No current process: you must name one." msgstr "" -#: linux-nat.c:4972 -#, possible-c-format -msgid "jiffies remaining in current time slice: %ld\n" +#: linux-tdep.c:274 +msgid "Can't determine the current process's PID: you must name one." msgstr "" -#: linux-nat.c:4975 +#: linux-tdep.c:281 #, possible-c-format -msgid "'nice' value: %ld\n" +msgid "Too many parameters: %s" msgstr "" -#: linux-nat.c:4977 +#: linux-tdep.c:283 #, possible-c-format -msgid "jiffies until next timeout: %lu\n" +msgid "process %ld\n" msgstr "" -#: linux-nat.c:4980 +#: linux-tdep.c:308 linux-tdep.c:321 #, possible-c-format -msgid "jiffies until next SIGALRM: %lu\n" +msgid "unable to read link '%s'" msgstr "" -#: linux-nat.c:4983 -#, possible-c-format -msgid "start time (jiffies since system boot): %ld\n" +#. No output for summary mode. +#: linux-tdep.c:332 procfs.c:5374 +msgid "" +"Mapped address spaces:\n" +"\n" msgstr "" -#: linux-nat.c:4986 +#: linux-tdep.c:408 #, possible-c-format -msgid "Virtual memory size: %lu\n" +msgid "Process: %s\n" msgstr "" -#: linux-nat.c:4989 +#: linux-tdep.c:422 #, possible-c-format -msgid "Resident set size: %lu\n" +msgid "State: %c\n" msgstr "" -#: linux-nat.c:4992 +#: linux-tdep.c:425 #, possible-c-format -msgid "rlim: %lu\n" +msgid "Parent process: %s\n" msgstr "" -#: linux-nat.c:4994 +#: linux-tdep.c:428 #, possible-c-format -msgid "Start of text: 0x%lx\n" +msgid "Process group: %s\n" msgstr "" -#: linux-nat.c:4996 +#: linux-tdep.c:431 #, possible-c-format -msgid "End of text: 0x%lx\n" +msgid "Session id: %s\n" msgstr "" -#: linux-nat.c:4998 +#: linux-tdep.c:434 #, possible-c-format -msgid "Start of stack: 0x%lx\n" +msgid "TTY: %s\n" msgstr "" -#. FIXME arch? -#: linux-nat.c:5002 +#: linux-tdep.c:437 #, possible-c-format -msgid "Kernel stack pointer: 0x%lx\n" +msgid "TTY owner process group: %s\n" msgstr "" -#. FIXME arch? -#: linux-nat.c:5004 +#: linux-tdep.c:441 #, possible-c-format -msgid "Kernel instr pointer: 0x%lx\n" +msgid "Flags: %s\n" msgstr "" -#: linux-nat.c:5006 +#: linux-tdep.c:444 #, possible-c-format -msgid "Pending signals bitmap: 0x%lx\n" +msgid "Minor faults (no memory page): %s\n" msgstr "" -#: linux-nat.c:5008 +#: linux-tdep.c:447 #, possible-c-format -msgid "Blocked signals bitmap: 0x%lx\n" +msgid "Minor faults, children: %s\n" msgstr "" -#: linux-nat.c:5010 +#: linux-tdep.c:450 #, possible-c-format -msgid "Ignored signals bitmap: 0x%lx\n" +msgid "Major faults (memory page faults): %s\n" msgstr "" -#: linux-nat.c:5012 +#: linux-tdep.c:453 #, possible-c-format -msgid "Catched signals bitmap: 0x%lx\n" +msgid "Major faults, children: %s\n" msgstr "" -#. FIXME arch? -#: linux-nat.c:5014 +#: linux-tdep.c:456 #, possible-c-format -msgid "wchan (system call): 0x%lx\n" +msgid "utime: %s\n" msgstr "" -#: linux-nat.c:5237 linux-nat.c:5250 +#: linux-tdep.c:459 #, possible-c-format -msgid "Could not parse signal set: %s" +msgid "stime: %s\n" msgstr "" -#: linux-nat.c:5284 +#: linux-tdep.c:462 #, possible-c-format -msgid "Could not open %s" +msgid "utime, children: %s\n" msgstr "" - -#: 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." -msgstr "" - -#. allow-unknown -#: linux-nat.c:5889 -msgid "List of mapped memory regions." + +#: linux-tdep.c:465 +#, possible-c-format +msgid "stime, children: %s\n" msgstr "" -#: linux-nat.c:5893 -msgid "List process info from /proc/PID/stat." +#: linux-tdep.c:468 +#, possible-c-format +msgid "jiffies remaining in current time slice: %s\n" msgstr "" -#: linux-nat.c:5897 -msgid "List process info from /proc/PID/status." +#: linux-tdep.c:472 +#, possible-c-format +msgid "'nice' value: %s\n" msgstr "" -#: linux-nat.c:5901 -msgid "List current working directory of the process." +#: linux-tdep.c:475 +#, possible-c-format +msgid "jiffies until next timeout: %s\n" msgstr "" -#: linux-nat.c:5905 -msgid "List command line arguments of the process." +#: linux-tdep.c:478 +#, possible-c-format +msgid "jiffies until next SIGALRM: %s\n" msgstr "" -#: linux-nat.c:5909 -msgid "List absolute filename for executable of the process." +#: linux-tdep.c:481 +#, possible-c-format +msgid "start time (jiffies since system boot): %s\n" msgstr "" -#: linux-nat.c:5913 -msgid "List all available /proc info." +#: linux-tdep.c:485 +#, possible-c-format +msgid "Virtual memory size: %s\n" msgstr "" -#: linux-nat.c:5918 -msgid "Set debugging of GNU/Linux lwp module." +#: linux-tdep.c:488 +#, possible-c-format +msgid "Resident set size: %s\n" msgstr "" -#: linux-nat.c:5919 -msgid "Show debugging of GNU/Linux lwp module." +#: linux-tdep.c:491 +#, possible-c-format +msgid "rlim: %s\n" msgstr "" -#: linux-nat.c:5920 -msgid "Enables printf debugging output." +#: linux-tdep.c:494 +#, possible-c-format +msgid "Start of text: %s\n" msgstr "" -#: linux-record.c:245 -msgid "" -"The next instruction is syscall exit. It will make the program exit. Do " -"you want to stop the program?" +#: linux-tdep.c:497 +#, possible-c-format +msgid "End of text: %s\n" msgstr "" -#: linux-record.c:492 -msgid "" -"Process record and replay target doesn't support ioctl request " -"TIOCSERGSTRUCT\n" +#: linux-tdep.c:500 +#, possible-c-format +msgid "Start of stack: %s\n" msgstr "" -#: linux-record.c:498 +#: linux-tdep.c:505 #, possible-c-format -msgid "" -"Process record and replay target doesn't support ioctl request 0x%s.\n" +msgid "Kernel stack pointer: %s\n" msgstr "" -#: linux-record.c:677 -msgid "" -"The next instruction is syscall reboot. It will restart the computer. Do " -"you want to stop the program?" +#: linux-tdep.c:508 +#, possible-c-format +msgid "Kernel instr pointer: %s\n" msgstr "" -#: linux-record.c:708 +#: linux-tdep.c:511 #, possible-c-format -msgid "" -"The next instruction is syscall munmap.\n" -"It will free the memory addr = 0x%s len = %u.\n" -"It will make record target cannot record some memory change.\n" -"Do you want to stop the program?" +msgid "Pending signals bitmap: %s\n" msgstr "" -#: linux-record.c:1053 +#: linux-tdep.c:514 #, possible-c-format -msgid "" -"Process record and replay target doesn't support socketcall call 0x%s\n" +msgid "Blocked signals bitmap: %s\n" msgstr "" -#. XXX RECORD_SEMCTL still not supported. -#: linux-record.c:1216 +#: linux-tdep.c:517 #, possible-c-format -msgid "Process record and replay target doesn't support ipc number %s\n" +msgid "Ignored signals bitmap: %s\n" msgstr "" -#: linux-record.c:1910 -msgid "" -"The next instruction is syscall exit_group. It will make the program exit. " -"Do you want to stop the program?" +#: linux-tdep.c:520 +#, possible-c-format +msgid "Catched signals bitmap: %s\n" msgstr "" -#: linux-record.c:2245 +#: linux-tdep.c:523 #, possible-c-format -msgid "Process record and replay target doesn't support syscall number %d\n" +msgid "wchan (system call): %s\n" msgstr "" #: linux-thread-db.c:97 @@ -13351,7 +13324,7 @@ msgid "return of value > 4 is not supported." msgstr "" -#: m68hc11-tdep.c:1321 sh64-tdep.c:1277 sh-tdep.c:1322 +#: m68hc11-tdep.c:1321 sh-tdep.c:1322 sh64-tdep.c:1277 msgid "bad size for return value" msgstr "" @@ -14354,6 +14327,10 @@ msgid "Error reading ECOFF debugging information: %s" msgstr "" +#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:210 +msgid "Software breakpoints not implemented for this target." +msgstr "" + #: memattr.c:77 msgid "Unknown memory addresses will be treated as inaccessible.\n" msgstr "" @@ -14405,291 +14382,126 @@ msgid "unknown attribute: %s" msgstr "" -#: memattr.c:419 -msgid "Using memory regions provided by the target.\n" -msgstr "" - -#: memattr.c:421 -msgid "Using user-defined memory regions.\n" -msgstr "" - -#: memattr.c:427 -msgid "There are no memory regions defined.\n" -msgstr "" - -#: 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:678 -msgid "Delete all memory regions? " -msgstr "" - -#: memattr.c:707 -msgid "" -"Define attributes for memory region or reset memory region handling to\n" -"target-based.\n" -"Usage: mem auto\n" -" mem [ ],\n" -"where may be rw (read/write), ro (read-only) or wo (write-only),\n" -" may be 8, 16, 32, or 64, and\n" -" may be cache or nocache" -msgstr "" - -#: memattr.c:716 -msgid "" -"Enable memory region.\n" -"Arguments are the code numbers of the memory regions to enable.\n" -"Usage: enable mem ...\n" -"Do \"info mem\" to see current list of code numbers." -msgstr "" - -#: memattr.c:722 -msgid "" -"Disable memory region.\n" -"Arguments are the code numbers of the memory regions to disable.\n" -"Usage: disable mem ...\n" -"Do \"info mem\" to see current list of code numbers." -msgstr "" - -#: memattr.c:728 -msgid "" -"Delete memory region.\n" -"Arguments are the code numbers of the memory regions to delete.\n" -"Usage: delete mem ...\n" -"Do \"info mem\" to see current list of code numbers." -msgstr "" - -#: memattr.c:735 -msgid "Memory region attributes" -msgstr "" - -#. allow-unknown -#: memattr.c:737 memattr.c:741 -msgid "Memory regions settings" -msgstr "" - -#: memattr.c:747 -msgid "Set handling of unknown memory regions." -msgstr "" - -#: memattr.c:748 -msgid "Show handling of unknown memory regions." -msgstr "" - -#: 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 "" - -#: 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:89 -msgid "Flash block size is not set" -msgstr "" - -#: memory-map.c:124 -#, possible-c-format -msgid "Unknown property \"%s\"" -msgstr "" - -#: 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: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:2433 -#, possible-c-format -msgid "" -"the MeP module '%s' is %s-endian, but the executable\n" -"%s is %s-endian." -msgstr "" - -#: 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/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:191 -msgid "Usage: tracepoint-number passcount" -msgstr "" - -#: mi/mi-cmd-break.c:204 -#, possible-c-format -msgid "Could not find tracepoint %d" -msgstr "" - -#: mi/mi-cmd-break.c:252 -msgid "-break-watch: Missing " -msgstr "" - -#: mi/mi-cmd-break.c:254 -msgid "-break-watch: Garbage following " -msgstr "" - -#: mi/mi-cmd-break.c:270 -msgid "-break-watch: Unknown watchpoint type." -msgstr "" - -#: mi/mi-cmd-break.c:301 -#, possible-c-format -msgid "USAGE: %s [ [...]]" -msgstr "" - -#: mi/mi-cmd-break.c:305 -#, possible-c-format -msgid "breakpoint number argument \"%s\" is not a number." -msgstr "" - -#: mi/mi-cmd-break.c:308 -#, possible-c-format -msgid "junk at the end of breakpoint number argument \"%s\"." -msgstr "" - -#: mi/mi-cmd-break.c:313 -#, possible-c-format -msgid "breakpoint %d not found." -msgstr "" - -#: 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-disas.c:140 -msgid "" -"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s " -"startaddr -e endaddr] [--] mode." -msgstr "" - -#: mi/mi-cmd-disas.c:145 -msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3." -msgstr "" - -#: mi/mi-cmd-disas.c:162 -msgid "-data-disassemble: Invalid filename." -msgstr "" - -#: mi/mi-cmd-disas.c:164 -msgid "-data-disassemble: Invalid line number" +#: memattr.c:419 +msgid "Using memory regions provided by the target.\n" msgstr "" -#: mi/mi-cmd-disas.c:166 -msgid "-data-disassemble: No function contains specified address" +#: memattr.c:421 +msgid "Using user-defined memory regions.\n" msgstr "" -#: mi/mi-cmd-env.c:74 -msgid "-environment-pwd: No arguments required" +#: memattr.c:427 +msgid "There are no memory regions defined.\n" msgstr "" -#: mi/mi-cmd-env.c:85 +#: memattr.c:560 memattr.c:607 memattr.c:649 memattr.c:659 #, possible-c-format -msgid "-environment-pwd: error finding name of working directory: %s" -msgstr "" - -#: mi/mi-cmd-env.c:96 -msgid "-environment-cd: Usage DIRECTORY" +msgid "No memory region number %d.\n" msgstr "" -#: mi/mi-cmd-env.c:260 -msgid "-inferior-tty-show: Usage: No args" +#: memattr.c:678 +msgid "Delete all memory regions? " msgstr "" -#: mi/mi-cmd-file.c:39 -msgid "-file-list-exec-source-file: Usage: No args" +#: memattr.c:707 +msgid "" +"Define attributes for memory region or reset memory region handling to\n" +"target-based.\n" +"Usage: mem auto\n" +" mem [ ],\n" +"where may be rw (read/write), ro (read-only) or wo (write-only),\n" +" may be 8, 16, 32, or 64, and\n" +" may be cache or nocache" msgstr "" -#: mi/mi-cmd-file.c:49 -msgid "-file-list-exec-source-file: No symtab" +#: memattr.c:716 +msgid "" +"Enable memory region.\n" +"Arguments are the code numbers of the memory regions to enable.\n" +"Usage: enable mem ...\n" +"Do \"info mem\" to see current list of code numbers." msgstr "" -#: mi/mi-cmd-file.c:90 -msgid "-file-list-exec-source-files: Usage: No args" +#: memattr.c:722 +msgid "" +"Disable memory region.\n" +"Arguments are the code numbers of the memory regions to disable.\n" +"Usage: disable mem ...\n" +"Do \"info mem\" to see current list of code numbers." msgstr "" -#: mi/mi-cmd-stack.c:57 -msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]" +#: memattr.c:728 +msgid "" +"Delete memory region.\n" +"Arguments are the code numbers of the memory regions to delete.\n" +"Usage: delete mem ...\n" +"Do \"info mem\" to see current list of code numbers." msgstr "" -#: mi/mi-cmd-stack.c:80 -msgid "-stack-list-frames: Not enough frames in stack." +#: memattr.c:735 +msgid "Memory region attributes" msgstr "" -#: mi/mi-cmd-stack.c:107 -msgid "-stack-info-depth: Usage: [MAX_DEPTH]" +#. allow-unknown +#: memattr.c:737 memattr.c:741 +msgid "Memory regions settings" msgstr "" -#: 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\"" +#: memattr.c:747 +msgid "Set handling of unknown memory regions." msgstr "" -#: mi/mi-cmd-stack.c:151 -msgid "-stack-list-locals: Usage: PRINT_VALUES" +#: memattr.c:748 +msgid "Show handling of unknown memory regions." msgstr "" -#: mi/mi-cmd-stack.c:173 -msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]" +#: 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 "" -#: mi/mi-cmd-stack.c:199 -msgid "-stack-list-arguments: Not enough frames in stack." +#: memory-map.c:37 +msgid "" +"Can not parse XML memory map; XML support was disabled at compile time" msgstr "" -#: mi/mi-cmd-stack.c:232 -msgid "Usage: PRINT_VALUES" +#: memory-map.c:89 +msgid "Flash block size is not set" msgstr "" -#: mi/mi-cmd-stack.c:440 -msgid "-stack-select-frame: Usage: FRAME_SPEC" +#: memory-map.c:124 +#, possible-c-format +msgid "Unknown property \"%s\"" msgstr "" -#: mi/mi-cmd-stack.c:449 -msgid "-stack-info-frame: No arguments required" +#: memory-map.c:186 +msgid "target memory map" msgstr "" -#: mi/mi-cmd-target.c:40 -msgid "-target-file-get: Usage: REMOTE_FILE LOCAL_FILE" +#. 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: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 "" -#: mi/mi-cmd-target.c:64 -msgid "-target-file-put: Usage: LOCAL_FILE REMOTE_FILE" +#: mep-tdep.c:2433 +#, possible-c-format +msgid "" +"the MeP module '%s' is %s-endian, but the executable\n" +"%s is %s-endian." msgstr "" -#: mi/mi-cmd-target.c:88 -msgid "-target-file-delete: Usage: REMOTE_FILE" +#: 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: @@ -14820,9 +14632,46 @@ msgid "-var-set-update-range: Usage: VAROBJ FROM TO" msgstr "" -#: mi/mi-cmds.c:218 +#: 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-disas.c:140 +msgid "" +"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s " +"startaddr -e endaddr] [--] mode." +msgstr "" + +#: mi/mi-cmd-disas.c:145 +msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3." +msgstr "" + +#: 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-getopt.c:36 +msgid "mi_getopt_long: optind out of bounds" +msgstr "" + +#: mi/mi-getopt.c:62 #, possible-c-format -msgid "command `%s' appears to be duplicated" +msgid "%s: Option %s requires an argument" +msgstr "" + +#: mi/mi-getopt.c:74 +#, possible-c-format +msgid "%s: Unknown option ``%s''" msgstr "" #: mi/mi-console.c:68 @@ -14833,37 +14682,120 @@ msgid "mi_console_file_transform: bad magic number" msgstr "" -#: mi/mi-console.c:126 -msgid "mi_console_file_flush: bad magic number" +#: mi/mi-console.c:126 +msgid "mi_console_file_flush: bad magic number" +msgstr "" + +#: mi/mi-cmd-stack.c:57 +msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]" +msgstr "" + +#: mi/mi-cmd-stack.c:80 +msgid "-stack-list-frames: Not enough frames in stack." +msgstr "" + +#: mi/mi-cmd-stack.c:107 +msgid "-stack-info-depth: Usage: [MAX_DEPTH]" +msgstr "" + +#: 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-stack.c:151 +msgid "-stack-list-locals: Usage: PRINT_VALUES" +msgstr "" + +#: mi/mi-cmd-stack.c:173 +msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]" +msgstr "" + +#: mi/mi-cmd-stack.c:199 +msgid "-stack-list-arguments: Not enough frames in stack." +msgstr "" + +#: mi/mi-cmd-stack.c:232 +msgid "Usage: PRINT_VALUES" +msgstr "" + +#: 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 +msgid "-target-file-get: Usage: REMOTE_FILE LOCAL_FILE" +msgstr "" + +#: mi/mi-cmd-target.c:64 +msgid "-target-file-put: Usage: LOCAL_FILE REMOTE_FILE" +msgstr "" + +#: mi/mi-cmd-target.c:88 +msgid "-target-file-delete: Usage: REMOTE_FILE" +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-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:191 +msgid "Usage: tracepoint-number passcount" +msgstr "" + +#: mi/mi-cmd-break.c:204 +#, possible-c-format +msgid "Could not find tracepoint %d" +msgstr "" + +#: mi/mi-cmd-break.c:252 +msgid "-break-watch: Missing " +msgstr "" + +#: mi/mi-cmd-break.c:254 +msgid "-break-watch: Garbage following " msgstr "" -#: mi/mi-getopt.c:36 -msgid "mi_getopt_long: optind out of bounds" +#: mi/mi-cmd-break.c:270 +msgid "-break-watch: Unknown watchpoint type." msgstr "" -#: mi/mi-getopt.c:62 +#: mi/mi-cmd-break.c:301 #, possible-c-format -msgid "%s: Option %s requires an argument" +msgid "USAGE: %s [ [...]]" msgstr "" -#: mi/mi-getopt.c:74 +#: mi/mi-cmd-break.c:305 #, possible-c-format -msgid "%s: Unknown option ``%s''" -msgstr "" - -#: mi/mi-interp.c:219 -msgid "-interpreter-exec: Usage: -interpreter-exec interp command" +msgid "breakpoint number argument \"%s\" is not a number." msgstr "" -#: mi/mi-interp.c:224 +#: mi/mi-cmd-break.c:308 #, possible-c-format -msgid "-interpreter-exec: could not find interpreter \"%s\"" +msgid "junk at the end of breakpoint number argument \"%s\"." msgstr "" -#: mi/mi-interp.c:228 +#: mi/mi-cmd-break.c:313 #, possible-c-format -msgid "" -"-interpreter-exec: interpreter \"%s\" does not support command execution" +msgid "breakpoint %d not found." msgstr "" #: mi/mi-main.c:290 @@ -15131,6 +15063,55 @@ msgid "Invalid option: %s" msgstr "" +#: mi/mi-cmd-env.c:74 +msgid "-environment-pwd: No arguments required" +msgstr "" + +#: mi/mi-cmd-env.c:85 +#, possible-c-format +msgid "-environment-pwd: error finding name of working directory: %s" +msgstr "" + +#: mi/mi-cmd-env.c:96 +msgid "-environment-cd: Usage DIRECTORY" +msgstr "" + +#: mi/mi-cmd-env.c:260 +msgid "-inferior-tty-show: Usage: No args" +msgstr "" + +#: mi/mi-interp.c:219 +msgid "-interpreter-exec: Usage: -interpreter-exec interp command" +msgstr "" + +#: mi/mi-interp.c:224 +#, possible-c-format +msgid "-interpreter-exec: could not find interpreter \"%s\"" +msgstr "" + +#: mi/mi-interp.c:228 +#, possible-c-format +msgid "" +"-interpreter-exec: interpreter \"%s\" does not support command execution" +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" +msgstr "" + +#: mi/mi-cmd-file.c:90 +msgid "-file-list-exec-source-files: Usage: No args" +msgstr "" + +#: mi/mi-cmds.c:218 +#, possible-c-format +msgid "command `%s' appears to be duplicated" +msgstr "" + #: mi/mi-parse.c:286 #, possible-c-format msgid "Undefined MI command: %s" @@ -15162,14 +15143,6 @@ msgid "Problem parsing arguments: %s %s" 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 "" - #: microblaze-tdep.c:145 msgid "push_dummy_code not implemented" msgstr "" @@ -15252,11 +15225,6 @@ msgid "wrong size fpregset struct in core file" msgstr "" -#: 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" @@ -15428,6 +15396,11 @@ msgid "When non-zero, mips specific debugging is enabled." msgstr "" +#: mipsread.c:84 +#, possible-c-format +msgid "Error reading symbol table: %s" +msgstr "" + #: mn10300-tdep.c:194 #, possible-c-format msgid "Cannot store return value %d bytes long." @@ -15505,7 +15478,7 @@ msgid "monitor_supply_register (%d): bad value from monitor: %s." msgstr "" -#: monitor.c:1033 nto-procfs.c:693 remote.c:4850 remote-mips.c:2274 +#: monitor.c:1033 nto-procfs.c:693 remote-mips.c:2274 remote.c:4872 msgid "" "Interrupted while waiting for the program.\n" "Give up (and stop debugging it)? " @@ -15607,7 +15580,7 @@ msgid "Invalid target CPU." msgstr "" -#: nto-procfs.c:625 procfs.c:3293 +#: nto-procfs.c:625 procfs.c:3297 msgid "Attaching GDB to itself is not a good idea..." msgstr "" @@ -15986,6 +15959,32 @@ msgid "Show OS data ARG." msgstr "" +#: p-typeprint.c:300 +msgid "type not handled in pascal_type_print_varspec_prefix()" +msgstr "" + +#: p-typeprint.c:419 +msgid "type not handled in pascal_type_print_varspec_suffix()" +msgstr "" + +#: 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 "" + #: parse.c:109 #, possible-c-format msgid "Expression debugging is %s.\n" @@ -16608,410 +16607,543 @@ msgid "Show filename for /proc tracefile." msgstr "" -#: procfs.c:489 +#: procfs.c:493 #, possible-c-format msgid "procfs: couldn't find pid %d (kernel thread %d) in procinfo list." msgstr "" -#: procfs.c:493 +#: procfs.c:497 #, possible-c-format msgid "procfs: couldn't find pid %d in procinfo list." msgstr "" -#: procfs.c:890 +#: procfs.c:894 #, possible-c-format msgid "load_syscalls: Can't open /proc/%d/sysent" msgstr "" -#: procfs.c:897 procfs.c:911 +#: procfs.c:901 procfs.c:915 #, possible-c-format msgid "load_syscalls: Error reading /proc/%d/sysent" msgstr "" -#: procfs.c:902 +#: procfs.c:906 #, possible-c-format msgid "load_syscalls: /proc/%d/sysent contains no syscalls!" msgstr "" -#: procfs.c:1442 +#: procfs.c:1446 #, possible-c-format msgid "procfs: modify_flag failed to turn %s %s" msgstr "" -#: procfs.c:1719 +#: procfs.c:1723 msgid "procfs: set_traced_signals failed" msgstr "" -#: procfs.c:2811 +#: procfs.c:2815 #, possible-c-format msgid "procfs_find_LDT_entry: could not find procinfo for %d:%ld." msgstr "" -#: procfs.c:2818 +#: procfs.c:2822 #, possible-c-format msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld." msgstr "" -#: procfs.c:3300 +#: procfs.c:3304 #, possible-c-format msgid "Attaching to program `%s', %s\n" msgstr "" -#: procfs.c:3350 +#: procfs.c:3354 msgid "procfs: out of memory in 'attach'" msgstr "" -#: procfs.c:3439 +#: procfs.c:3443 msgid "Was stopped when attached, make it runnable again? " msgstr "" -#: procfs.c:3482 +#: procfs.c:3486 #, possible-c-format msgid "procfs: fetch_registers failed to find procinfo for %s" msgstr "" -#: procfs.c:3531 +#: procfs.c:3535 #, possible-c-format msgid "procfs: store_registers: failed to find procinfo for %s" msgstr "" -#: procfs.c:3638 +#: procfs.c:3642 msgid "Unable to remove __dbx_link breakpoint." msgstr "" -#: procfs.c:3693 +#: procfs.c:3697 #, possible-c-format msgid "Failed to create a bfd: %s." msgstr "" -#: procfs.c:3714 +#: procfs.c:3718 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:3853 +#: procfs.c:3857 #, possible-c-format msgid "procfs: couldn't stop process %d: wait returned %d." msgstr "" -#: procfs.c:3961 +#: procfs.c:3965 msgid "procfs: trapped on entry to " msgstr "" -#: procfs.c:3971 procfs.c:4074 +#: procfs.c:3975 procfs.c:4078 #, possible-c-format msgid "%ld syscall arguments:\n" msgstr "" -#: procfs.c:4064 +#: procfs.c:4068 msgid "procfs: trapped on exit from " msgstr "" -#: procfs.c:4093 +#: procfs.c:4097 #, possible-c-format msgid "Retry #%d:\n" msgstr "" -#: procfs.c:4169 procfs.c:4177 +#: procfs.c:4173 procfs.c:4181 msgid "child stopped for unknown reason:\n" msgstr "" -#: procfs.c:4171 procfs.c:4179 +#: procfs.c:4175 procfs.c:4183 msgid "... giving up..." msgstr "" -#: procfs.c:4202 +#: procfs.c:4206 msgid "procfs: ...giving up..." msgstr "" -#: procfs.c:4457 +#: procfs.c:4461 msgid "" "resume: target already running. Pretend to resume, and hope for the best!" msgstr "" -#: procfs.c:4493 +#: procfs.c:4497 #, possible-c-format msgid "\tUsing the running image of %s %s via /proc.\n" msgstr "" -#: procfs.c:4629 +#: procfs.c:4633 msgid "procfs: out of memory in 'init_inferior'" msgstr "" -#: procfs.c:4738 +#: procfs.c:4742 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:4909 +#: procfs.c:4913 #, possible-c-format msgid "procfs:%d -- Can't find shell %s in PATH" msgstr "" -#: procfs.c:5456 +#: procfs.c:5420 target.c:3120 +msgid "Not supported on this target." +msgstr "" + +#: procfs.c:5467 #, possible-c-format msgid "process %d flags:\n" msgstr "" -#: procfs.c:5466 -#, possible-c-format -msgid "thread %d flags:\n" +#: procfs.c:5477 +#, possible-c-format +msgid "thread %d flags:\n" +msgstr "" + +#: procfs.c:5537 +msgid "you must be debugging a process to use this command." +msgstr "" + +#: procfs.c:5540 +msgid "system call to trace" +msgstr "" + +#: procfs.c:5582 +msgid "Give a trace of entries into the syscall." +msgstr "" + +#: procfs.c:5584 +msgid "Give a trace of exits from the syscall." +msgstr "" + +#: procfs.c:5586 +msgid "Cancel a trace of entries into the syscall." +msgstr "" + +#: procfs.c:5588 +msgid "Cancel a trace of exits from the syscall." +msgstr "" + +#: procfs.c:5784 +msgid "gcore not implemented for this host." +msgstr "" + +#: progspace.c:397 +#, possible-c-format +msgid "program space ID %d not known." +msgstr "" + +#: progspace.c:613 +msgid "Info about currently known program spaces." +msgstr "" + +#: psymtab.c:88 symfile.c:1120 +#, possible-c-format +msgid "Reading symbols from %s..." +msgstr "" + +#: psymtab.c:98 symfile.c:1149 +msgid "(no debugging symbols 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:394 +#, possible-c-format +msgid "(Internal error: pc %s in read in psymtab, but not in symtab.)\n" +msgstr "" + +#: psymtab.c:842 +msgid "select_source_symtab: readin pst found and no symtabs." +msgstr "" + +#: psymtab.c:1040 +#, possible-c-format +msgid " Number of psym tables (not yet expanded): %d\n" +msgstr "" + +#: psymtab.c:1722 +msgid "" +"print-psymbols takes an output file name and optional symbol file name" +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." +msgstr "" + +#. 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/py-infthread.c:98 +msgid "Cannot delete `name' attribute." +msgstr "" + +#: python/py-infthread.c:106 +msgid "The value of `name' must be a string." +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." +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." +msgstr "" + +#. Require that INFERIOR be a valid inferior ID. +#: python/py-inferior.c:75 +msgid "Inferior no longer exists." +msgstr "" + +#: python/py-inferior.c:449 +msgid "Could not allocate memory buffer object." +msgstr "" + +#: python/py-inferior.c:526 +#, possible-c-format +msgid "Memory buffer for address %s, which is %s bytes long." +msgstr "" + +#: python/py-inferior.c:540 +msgid "The memory buffer supports only one segment." +msgstr "" + +#: python/py-inferior.c:607 +msgid "Search range is empty." +msgstr "" + +#: python/py-inferior.c:615 +msgid "The search range is too large." +msgstr "" + +#: python/py-inferior.c:626 +msgid "The pattern is not a Python buffer." +msgstr "" + +#: python/py-param.c:133 +msgid "String required for filename." +msgstr "" + +#: python/py-param.c:166 +msgid "ENUM arguments must be a string." msgstr "" -#: procfs.c:5526 -msgid "you must be debugging a process to use this command." +#: python/py-param.c:180 +msgid "The value must be member of an enumeration." msgstr "" -#: procfs.c:5529 -msgid "system call to trace" +#: python/py-param.c:191 +msgid "A boolean argument is required." msgstr "" -#: 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." +#: python/py-param.c:204 +msgid "A boolean or None is required" msgstr "" -#: procfs.c:5575 -msgid "Give a trace of entries into the syscall." +#: python/py-param.c:232 +msgid "The value must be integer." msgstr "" -#: procfs.c:5577 -msgid "Give a trace of exits from the syscall." +#: python/py-param.c:257 +msgid "Range exceeded." msgstr "" -#: procfs.c:5579 -msgid "Cancel a trace of entries into the syscall." +#: python/py-param.c:267 +msgid "Unhandled type in parameter value." msgstr "" -#: procfs.c:5581 -msgid "Cancel a trace of exits from the syscall." +#: python/py-param.c:284 +msgid "Cannot delete a parameter's value." msgstr "" -#: procfs.c:5777 -msgid "gcore not implemented for this host." +#: python/py-param.c:314 python/py-cmd.c:505 +msgid "This command is not documented." msgstr "" -#: progspace.c:397 -#, possible-c-format -msgid "program space ID %d not known." +#: python/py-param.c:341 +msgid "Parameter must return a string value." msgstr "" -#: progspace.c:613 -msgid "Info about currently known program spaces." +#: python/py-param.c:569 +msgid "An enumeration is required for PARAM_ENUM." msgstr "" -#: psymtab.c:88 symfile.c:1120 -#, possible-c-format -msgid "Reading symbols from %s..." +#: python/py-param.c:576 +msgid "The enumeration is not a sequence." msgstr "" -#: psymtab.c:98 symfile.c:1149 -msgid "(no debugging symbols found)..." +#: python/py-param.c:586 +msgid "The enumeration is empty." 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:394 -#, possible-c-format -msgid "(Internal error: pc %s in read in psymtab, but not in symtab.)\n" +#: python/py-param.c:607 +msgid "The enumeration item not a string." msgstr "" -#: psymtab.c:842 -msgid "select_source_symtab: readin pst found and no symtabs." +#: python/py-param.c:669 python/py-cmd.c:441 +msgid "Invalid command class argument." msgstr "" -#: psymtab.c:1040 -#, possible-c-format -msgid " Number of psym tables (not yet expanded): %d\n" +#: python/py-param.c:681 +msgid "Invalid parameter class argument." msgstr "" -#: psymtab.c:1722 -msgid "" -"print-psymbols takes an output file name and optional symbol file name" +#: python/py-param.c:688 +msgid "Only PARAM_ENUM accepts a fourth argument." msgstr "" -#: p-typeprint.c:300 -msgid "type not handled in pascal_type_print_varspec_prefix()" +#: python/py-utils.c:79 +msgid "Expected a string or unicode object." msgstr "" -#: p-typeprint.c:419 -msgid "type not handled in pascal_type_print_varspec_suffix()" +#: python/py-utils.c:322 +msgid "Overflow converting to address." msgstr "" -#: p-valprint.c:575 -#, possible-c-format -msgid "Invalid pascal type code %d in symbol table." +#: python/python.c:121 +msgid "internal error: Unhandled Python exception" msgstr "" -#: p-valprint.c:624 +#: python/python.c:195 #, possible-c-format -msgid "Printing of pascal static members is %s.\n" -msgstr "" - -#: p-valprint.c:1075 -msgid "Set printing of pascal static members." +msgid "Error while opening file: %s" msgstr "" -#: p-valprint.c:1076 -msgid "Show printing of pascal static members." +#: python/python.c:244 +msgid "Invalid \"python\" block structure." msgstr "" -#: python/py-auto-load.c:260 -#, possible-c-format -msgid "Invalid entry in %s section" +#: python/python.c:252 python/python.c:274 python/py-prettyprint.c:642 +#: python/py-function.c:152 +msgid "Error while executing Python code." msgstr "" -#: python/py-auto-load.c:275 -#, possible-c-format -msgid "Non-null-terminated path in %s: %s" +#: python/python.c:348 +msgid "Programmer error: unhandled type." msgstr "" -#: python/py-auto-load.c:282 +#: python/python.c:376 #, possible-c-format -msgid "Empty path in %s" +msgid "Could not find parameter `%s'." msgstr "" -#: python/py-auto-load.c:304 +#: python/python.c:380 #, 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." +msgid "`%s' is not a parameter." msgstr "" -#: python/py-auto-load.c:345 -#, possible-c-format -msgid "Couldn't read %s section of %s" +#: python/python.c:711 +msgid "Posted event is not callable" msgstr "" -#: python/py-auto-load.c:549 solib.c:882 solib.c:964 xcoffsolib.c:113 -#, possible-c-format -msgid "Invalid regexp: %s" +#: python/python.c:792 +msgid "Return from prompt_hook must be either a Python string, or None" msgstr "" -#: python/py-auto-load.c:613 -msgid "Set the debugger's behaviour regarding auto-loaded scripts." +#: python/python.c:931 +msgid "Error occurred computing Python errormessage.\n" msgstr "" -#: python/py-auto-load.c:614 -msgid "Show the debugger's behaviour regarding auto-loaded scripts." +#: 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-auto-load.c:615 -msgid "" -"If enabled, auto-loaded scripts are loaded when the debugger reads\n" -"an executable or shared library." +#: python/python.c:1092 +msgid "gdbpy_should_stop called when Python scripting is not supported." msgstr "" -#: python/py-auto-load.c:624 +#: python/python.c:1100 msgid "" -"Print the list of automatically loaded scripts.\n" -"Usage: info auto-load-scripts [REGEXP]" +"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported." 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/python.c:1152 +#, possible-c-format +msgid "The mode of Python stack printing on error is \"%s\".\n" 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/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 "" -#: python/py-block.c:322 -msgid "Symbol is null." +#: python/python.c:1206 +msgid "" +"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-block.c:391 python/py-frame.c:239 -msgid "Cannot locate object file for block." +#: python/python.c:1215 python/python.c:1219 +msgid "Prefix command for python maintenance settings." msgstr "" -#: python/py-breakpoint.c:124 -msgid "Cannot delete `enabled' attribute." +#: python/python.c:1224 +msgid "Enable or disable printing of Python stack dump on error." msgstr "" -#: python/py-breakpoint.c:131 -msgid "The value of `enabled' must be a boolean." +#: python/python.c:1225 +msgid "Show whether Python stack will be printed on error." msgstr "" -#: python/py-breakpoint.c:163 -msgid "Cannot delete `silent' attribute." +#: python/python.c:1226 +msgid "Enables or disables printing of Python stack traces." msgstr "" -#: python/py-breakpoint.c:169 -msgid "The value of `silent' must be a boolean." +#: python/python.c:1244 python/python.c:1249 +msgid "Prefix command for python preference settings." msgstr "" -#: python/py-breakpoint.c:194 -msgid "Cannot delete `thread' attribute." +#: python/python.c:1254 +msgid "Set mode for Python stack dump on error." msgstr "" -#: python/py-breakpoint.c:205 -msgid "Invalid thread ID." +#: python/python.c:1255 +msgid "Show the mode of Python stack printing on error." msgstr "" -#: python/py-breakpoint.c:214 -msgid "The value of `thread' must be an integer or None." +#: 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 "" -#: python/py-breakpoint.c:237 -msgid "Cannot delete `task' attribute." +#: python/py-type.c:470 +msgid "Array bound must be an integer" msgstr "" -#: python/py-breakpoint.c:254 -msgid "Invalid task ID." +#: python/py-type.c:486 +msgid "Array length must not be negative" msgstr "" -#: python/py-breakpoint.c:263 -msgid "The value of `task' must be an integer or None." +#: python/py-type.c:532 +msgid "This type does not have a range." msgstr "" -#: python/py-breakpoint.c:308 -msgid "Cannot delete `ignore_count' attribute." +#: python/py-type.c:605 +msgid "Type does not have a target." msgstr "" -#: python/py-breakpoint.c:314 -msgid "The value of `ignore_count' must be an integer." +#: python/py-type.c:786 +msgid "Null type name." msgstr "" -#: python/py-breakpoint.c:344 -msgid "Cannot delete `hit_count' attribute." +#: python/py-type.c:813 +msgid "Type is not a template." msgstr "" -#: python/py-breakpoint.c:357 -msgid "The value of `hit_count' must be zero." +#: python/py-type.c:826 python/py-type.c:880 +#, possible-c-format +msgid "No argument %d in template." msgstr "" -#: python/py-breakpoint.c:439 -msgid "Cannot delete `condition' attribute." +#: python/py-type.c:859 python/py-frame.c:441 +msgid "Second argument must be block." msgstr "" -#: python/py-breakpoint.c:642 -msgid "Cannot understand watchpoint access type." +#: python/py-type.c:891 +msgid "Template argument is optimized out" msgstr "" -#: python/py-breakpoint.c:646 -msgid "Do not understand breakpoint type to set." +#: python/py-type.c:1044 +#, possible-c-format +msgid "Unsupported field kind %d by check_types_equal" msgstr "" -#: python/py-breakpoint.c:826 -msgid "Error while creating breakpoint from GDB." +#: python/py-type.c:1482 +msgid "'block' argument must be a Block." msgstr "" -#: python/py-breakpoint.c:921 -msgid "" -"Cannot set 'stop' method. There is an existing GDB condition attached to " -"the breakpoint." +#: 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-cmd.c:125 python/py-cmd.c:220 @@ -17065,345 +17197,223 @@ msgid "Command object already initialized." msgstr "" -#: python/py-cmd.c:441 python/py-param.c:669 -msgid "Invalid command class argument." -msgstr "" - #: python/py-cmd.c:448 msgid "Invalid completion type argument." msgstr "" -#: python/py-cmd.c:505 python/py-param.c:314 -msgid "This command is not documented." -msgstr "" - -#: python/py-finishbreakpoint.c:190 -msgid "\"FinishBreakpoint\" not meaningful in the outermost frame." -msgstr "" - -#: python/py-finishbreakpoint.c:196 -msgid "\"FinishBreakpoint\" cannot be set on a dummy frame." -msgstr "" - -#: python/py-finishbreakpoint.c:204 python/py-finishbreakpoint.c:305 -msgid "Invalid ID for the `frame' object." +#: python/py-value.c:132 +msgid "Value object creation takes only 1 argument" msgstr "" -#: python/py-finishbreakpoint.c:219 -msgid "No thread currently selected." +#: python/py-value.c:140 +msgid "Could not allocate memory to create Value object." msgstr "" -#: python/py-finishbreakpoint.c:229 -msgid "The value of `internal' must be a boolean." +#: python/py-value.c:391 +msgid "Argument must be a type." 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-value.c:443 python/py-value.c:982 python/py-value.c:1019 +msgid "Invalid operation on gdb.Value." msgstr "" -#: python/py-frame.c:292 -msgid "Could not allocate frame object." +#: python/py-value.c:487 +msgid "Cannot subscript requested type." msgstr "" -#: python/py-frame.c:441 python/py-type.c:859 -msgid "Second argument must be block." +#: python/py-value.c:504 +msgid "Setting of struct elements is not currently supported." msgstr "" -#: python/py-frame.c:459 -#, possible-c-format -msgid "Variable '%s' not found." +#: python/py-value.c:529 +msgid "Value is not callable (not TYPE_CODE_FUNC)." msgstr "" -#: python/py-frame.c:470 -msgid "Argument must be a symbol or string." +#: python/py-value.c:536 +msgid "Inferior arguments must be provided in a tuple." msgstr "" -#: python/py-frame.c:559 -msgid "Invalid frame stop reason." +#: python/py-value.c:1060 +msgid "Cannot convert value to int." msgstr "" -#: python/py-function.c:86 -msgid "No method named 'invoke' in object." +#: python/py-value.c:1083 +msgid "Cannot convert value to long." 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:113 -msgid "" -"An error occurred in a Python convenience function\n" -"and then another occurred computing the error message.\n" +#: python/py-value.c:1106 +msgid "Cannot convert value to float." msgstr "" -#: python/py-function.c:133 +#: python/py-value.c:1242 #, possible-c-format -msgid "Error occurred in Python convenience function: %s" -msgstr "" - -#: python/py-function.c:136 -msgid "Error occurred in Python convenience function." -msgstr "" - -#: python/py-function.c:152 python/py-prettyprint.c:642 python/python.c:252 -#: python/python.c:274 -msgid "Error while executing Python code." +msgid "Could not convert Python object: %s." msgstr "" -#: python/py-function.c:188 -msgid "This function is not documented." +#. 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 that INFERIOR be a valid inferior ID. -#: python/py-inferior.c:75 -msgid "Inferior no longer exists." +#: python/py-frame.c:239 python/py-block.c:391 +msgid "Cannot locate object file for block." msgstr "" -#: python/py-inferior.c:449 -msgid "Could not allocate memory buffer object." +#: python/py-frame.c:292 +msgid "Could not allocate frame object." msgstr "" -#: python/py-inferior.c:526 +#: python/py-frame.c:459 #, possible-c-format -msgid "Memory buffer for address %s, which is %s bytes long." -msgstr "" - -#: python/py-inferior.c:540 -msgid "The memory buffer supports only one segment." -msgstr "" - -#: python/py-inferior.c:607 -msgid "Search range is empty." -msgstr "" - -#: python/py-inferior.c:615 -msgid "The search range is too large." -msgstr "" - -#: python/py-inferior.c:626 -msgid "The pattern is not a Python buffer." -msgstr "" - -#. 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/py-infthread.c:98 -msgid "Cannot delete `name' attribute." -msgstr "" - -#: python/py-infthread.c:106 -msgid "The value of `name' must be a string." -msgstr "" - -#: python/py-lazy-string.c:105 -msgid "Cannot create a value from NULL." -msgstr "" - -#: python/py-lazy-string.c:135 -msgid "Cannot create a lazy string with address 0x0, and a non-zero length." -msgstr "" - -#: python/py-lazy-string.c:143 -msgid "A lazy string's type cannot be NULL." -msgstr "" - -#: python/py-objfile.c:101 -msgid "Cannot delete the pretty_printers attribute." -msgstr "" - -#: python/py-objfile.c:108 -msgid "The pretty_printers attribute must be a list." -msgstr "" - -#: python/py-param.c:133 -msgid "String required for filename." -msgstr "" - -#: python/py-param.c:166 -msgid "ENUM arguments must be a string." -msgstr "" - -#: python/py-param.c:180 -msgid "The value must be member of an enumeration." -msgstr "" - -#: python/py-param.c:191 -msgid "A boolean argument is required." -msgstr "" - -#: python/py-param.c:204 -msgid "A boolean or None is required" -msgstr "" - -#: python/py-param.c:232 -msgid "The value must be integer." -msgstr "" - -#: python/py-param.c:257 -msgid "Range exceeded." -msgstr "" - -#: python/py-param.c:267 -msgid "Unhandled type in parameter value." -msgstr "" - -#: python/py-param.c:284 -msgid "Cannot delete a parameter's value." -msgstr "" - -#: python/py-param.c:341 -msgid "Parameter must return a string value." -msgstr "" - -#: python/py-param.c:569 -msgid "An enumeration is required for PARAM_ENUM." +msgid "Variable '%s' not found." msgstr "" -#: python/py-param.c:576 -msgid "The enumeration is not a sequence." +#: python/py-frame.c:470 +msgid "Argument must be a symbol or string." msgstr "" -#: python/py-param.c:586 -msgid "The enumeration is empty." +#: python/py-frame.c:559 +msgid "Invalid frame stop reason." msgstr "" -#: python/py-param.c:607 -msgid "The enumeration item not a string." +#: python/py-breakpoint.c:124 +msgid "Cannot delete `enabled' attribute." msgstr "" -#: python/py-param.c:681 -msgid "Invalid parameter class argument." +#: python/py-breakpoint.c:131 +msgid "The value of `enabled' must be a boolean." msgstr "" -#: python/py-param.c:688 -msgid "Only PARAM_ENUM accepts a fourth argument." +#: python/py-breakpoint.c:163 +msgid "Cannot delete `silent' attribute." msgstr "" -#: python/py-prettyprint.c:291 valprint.c:394 -msgid "" +#: python/py-breakpoint.c:169 +msgid "The value of `silent' must be a boolean." msgstr "" -#: python/py-prettyprint.c:815 -msgid "Argument must be a gdb.Value." +#: python/py-breakpoint.c:194 +msgid "Cannot delete `thread' attribute." 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-breakpoint.c:205 +msgid "Invalid thread ID." 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." +#: python/py-breakpoint.c:214 +msgid "The value of `thread' must be an integer or None." 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-breakpoint.c:237 +msgid "Cannot delete `task' attribute." msgstr "" -#: python/py-type.c:470 -msgid "Array bound must be an integer" +#: python/py-breakpoint.c:254 +msgid "Invalid task ID." msgstr "" -#: python/py-type.c:486 -msgid "Array length must not be negative" +#: python/py-breakpoint.c:263 +msgid "The value of `task' must be an integer or None." msgstr "" -#: python/py-type.c:532 -msgid "This type does not have a range." +#: python/py-breakpoint.c:308 +msgid "Cannot delete `ignore_count' attribute." msgstr "" -#: python/py-type.c:605 -msgid "Type does not have a target." +#: python/py-breakpoint.c:314 +msgid "The value of `ignore_count' must be an integer." msgstr "" -#: python/py-type.c:786 -msgid "Null type name." +#: python/py-breakpoint.c:344 +msgid "Cannot delete `hit_count' attribute." msgstr "" -#: python/py-type.c:813 -msgid "Type is not a template." +#: python/py-breakpoint.c:357 +msgid "The value of `hit_count' must be zero." msgstr "" -#: python/py-type.c:826 python/py-type.c:880 -#, possible-c-format -msgid "No argument %d in template." +#: python/py-breakpoint.c:439 +msgid "Cannot delete `condition' attribute." msgstr "" -#: python/py-type.c:891 -msgid "Template argument is optimized out" +#: python/py-breakpoint.c:642 +msgid "Cannot understand watchpoint access type." msgstr "" -#: python/py-type.c:1044 -#, possible-c-format -msgid "Unsupported field kind %d by check_types_equal" +#: python/py-breakpoint.c:646 +msgid "Do not understand breakpoint type to set." msgstr "" -#: python/py-type.c:1482 -msgid "'block' argument must be a Block." +#: python/py-breakpoint.c:826 +msgid "Error while creating breakpoint from GDB." msgstr "" -#: python/py-utils.c:79 -msgid "Expected a string or unicode object." +#: python/py-breakpoint.c:921 +msgid "" +"Cannot set 'stop' method. There is an existing GDB condition attached to " +"the breakpoint." msgstr "" -#: python/py-utils.c:322 -msgid "Overflow converting to address." +#: python/py-lazy-string.c:105 +msgid "Cannot create a value from NULL." msgstr "" -#: python/py-value.c:132 -msgid "Value object creation takes only 1 argument" +#: python/py-lazy-string.c:135 +msgid "Cannot create a lazy string with address 0x0, and a non-zero length." msgstr "" -#: python/py-value.c:140 -msgid "Could not allocate memory to create Value object." +#: python/py-lazy-string.c:143 +msgid "A lazy string's type cannot be NULL." msgstr "" -#: python/py-value.c:391 -msgid "Argument must be a type." +#. 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:443 python/py-value.c:982 python/py-value.c:1019 -msgid "Invalid operation on gdb.Value." +#. 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:487 -msgid "Cannot subscript requested type." +#: python/py-block.c:322 +msgid "Symbol is null." msgstr "" -#: python/py-value.c:504 -msgid "Setting of struct elements is not currently supported." +#: python/py-objfile.c:101 +msgid "Cannot delete the pretty_printers attribute." msgstr "" -#: python/py-value.c:529 -msgid "Value is not callable (not TYPE_CODE_FUNC)." +#: python/py-objfile.c:108 +msgid "The pretty_printers attribute must be a list." msgstr "" -#: python/py-value.c:536 -msgid "Inferior arguments must be provided in a tuple." +#: python/py-function.c:86 +msgid "No method named 'invoke' in object." msgstr "" -#: python/py-value.c:1060 -msgid "Cannot convert value to int." +#. 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-value.c:1083 -msgid "Cannot convert value to long." +#: python/py-function.c:133 +#, possible-c-format +msgid "Error occurred in Python convenience function: %s" msgstr "" -#: python/py-value.c:1106 -msgid "Cannot convert value to float." +#: python/py-function.c:136 +msgid "Error occurred in Python convenience function." msgstr "" -#: python/py-value.c:1242 -#, possible-c-format -msgid "Could not convert Python object: %s." +#: python/py-function.c:188 +msgid "This function is not documented." msgstr "" #. Require that BREAKPOINT be a valid breakpoint ID; throw a Python @@ -17415,117 +17425,77 @@ msgid "Breakpoint %d is invalid." msgstr "" -#: python/python.c:121 -msgid "internal error: Unhandled Python exception" -msgstr "" - -#: python/python.c:195 +#: python/py-auto-load.c:260 #, possible-c-format -msgid "Error while opening file: %s" -msgstr "" - -#: python/python.c:244 -msgid "Invalid \"python\" block structure." -msgstr "" - -#: python/python.c:348 -msgid "Programmer error: unhandled type." +msgid "Invalid entry in %s section" msgstr "" -#: python/python.c:376 +#: python/py-auto-load.c:275 #, possible-c-format -msgid "Could not find parameter `%s'." +msgid "Non-null-terminated path in %s: %s" msgstr "" -#: python/python.c:380 +#: python/py-auto-load.c:282 #, possible-c-format -msgid "`%s' is not a parameter." -msgstr "" - -#: python/python.c:711 -msgid "Posted event is not callable" -msgstr "" - -#: python/python.c:792 -msgid "Return from prompt_hook must be either a Python string, or None" -msgstr "" - -#: python/python.c:931 -msgid "Error occurred computing Python errormessage.\n" -msgstr "" - -#: 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/python.c:1092 -msgid "gdbpy_should_stop called when Python scripting is not supported." +msgid "Empty path in %s" msgstr "" -#: python/python.c:1100 +#: python/py-auto-load.c:304 +#, possible-c-format msgid "" -"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported." +"Missing auto-load scripts referenced in section %s\n" +"of file %s\n" +"Use `info auto-load-scripts [REGEXP]' to list them." msgstr "" -#: python/python.c:1152 +#: python/py-auto-load.c:345 #, possible-c-format -msgid "The mode of Python stack printing on error is \"%s\".\n" +msgid "Couldn't read %s section of %s" msgstr "" -#: 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." +#: python/py-auto-load.c:549 solib.c:882 solib.c:964 xcoffsolib.c:113 +#, possible-c-format +msgid "Invalid regexp: %s" msgstr "" -#: python/python.c:1206 -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-auto-load.c:613 +msgid "Set the debugger's behaviour regarding auto-loaded scripts." msgstr "" -#: python/python.c:1215 python/python.c:1219 -msgid "Prefix command for python maintenance settings." +#: python/py-auto-load.c:614 +msgid "Show the debugger's behaviour regarding auto-loaded scripts." msgstr "" -#: python/python.c:1224 -msgid "Enable or disable printing of Python stack dump on error." +#: 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/python.c:1225 -msgid "Show whether Python stack will be printed on error." +#: python/py-auto-load.c:624 +msgid "" +"Print the list of automatically loaded scripts.\n" +"Usage: info auto-load-scripts [REGEXP]" msgstr "" -#: python/python.c:1226 -msgid "Enables or disables printing of Python stack traces." +#: python/py-finishbreakpoint.c:190 +msgid "\"FinishBreakpoint\" not meaningful in the outermost frame." msgstr "" -#: python/python.c:1244 python/python.c:1249 -msgid "Prefix command for python preference settings." +#: python/py-finishbreakpoint.c:196 +msgid "\"FinishBreakpoint\" cannot be set on a dummy frame." msgstr "" -#: python/python.c:1254 -msgid "Set mode for Python stack dump on error." +#: python/py-finishbreakpoint.c:204 python/py-finishbreakpoint.c:305 +msgid "Invalid ID for the `frame' object." msgstr "" -#: python/python.c:1255 -msgid "Show the mode of Python stack printing on error." +#: python/py-finishbreakpoint.c:219 +msgid "No thread currently selected." msgstr "" -#: 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." +#: python/py-finishbreakpoint.c:229 +msgid "The value of `internal' must be a boolean." msgstr "" #: ravenscar-thread.c:396 @@ -17672,7 +17642,7 @@ msgid "Unbalanced quotes: %s" msgstr "" -#: record.c:1956 record.c:2043 target.c:524 +#: record.c:1956 record.c:2043 target.c:525 msgid "You can't do that without a process to debug." msgstr "" @@ -17989,1464 +17959,1469 @@ "Takes an optional file parameter." msgstr "" -#. malformed packet error -#. general case: -#: remote.c:425 -msgid "remote.c: error in outgoing packet." +#: remote-fileio.c:1451 +msgid "Illegal argument for \"set remote system-call-allowed\" command" msgstr "" -#: remote.c:427 +#: remote-fileio.c:1458 #, possible-c-format -msgid "remote.c: error in outgoing packet at field #%ld." +msgid "Garbage after \"show remote system-call-allowed\" command: `%s'" msgstr "" -#: remote.c:430 -#, possible-c-format -msgid "trace API error 0x%s." +#: remote-fileio.c:1473 +msgid "Set if the host system(3) call is allowed for the target." msgstr "" -#: remote.c:432 -#, possible-c-format -msgid "Target returns error code '%s'." +#: remote-fileio.c:1477 +msgid "Show if the host system(3) call is allowed for the target." msgstr "" -#: remote.c:461 -#, possible-c-format -msgid "invalid qRelocInsn packet: %s" +#: remote-m32r-sdi.c:330 +msgid "Cannot pass arguments to remote STDEBUG process" msgstr "" -#: remote.c:495 -msgid "warning: relocating instruction: " +#: remote-m32r-sdi.c:333 remote-mips.c:2330 +msgid "No executable file specified" msgstr "" -#: remote.c:761 -msgid "" -"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the " -"execution of the program.\n" +#: remote-m32r-sdi.c:392 +msgid "Connection refused." msgstr "" -#: remote.c:766 -msgid "" -"send a break signal to the remote target to interrupt the execution of the " -"program.\n" +#: remote-m32r-sdi.c:395 remote-m32r-sdi.c:398 +msgid "Cannot connect to SDI target." msgstr "" -#: 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" +#: remote-m32r-sdi.c:725 remote-m32r-sdi.c:731 remote-m32r-sdi.c:747 +#: remote.c:6779 +msgid "Remote connection closed" +msgstr "" + +#: remote-m32r-sdi.c:1189 +msgid "Too many breakpoints" msgstr "" -#: remote.c:775 remote.c:3148 +#: remote-m32r-sdi.c:1258 #, possible-c-format -msgid "Invalid value for interrupt_sequence_mode: %s." +msgid "Unknown option `%s'" msgstr "" -#: remote.c:919 -msgid "Argument required (integer, `fixed' or `limited')." +#: remote-m32r-sdi.c:1273 symfile.c:2085 +#, possible-c-format +msgid "\"%s\" is not an object file: %s" msgstr "" -#: remote.c:932 +#: remote-m32r-sdi.c:1324 #, possible-c-format -msgid "Invalid %s (bad syntax)." +msgid "Error while downloading %s section." msgstr "" -#: remote.c:939 -#, possible-c-format -msgid "Invalid %s (too large)." +#: remote-m32r-sdi.c:1443 +msgid "Too many watchpoints" msgstr "" -#: remote.c:945 -#, possible-c-format -msgid "" -"The target may not be able to correctly handle a %s\n" -"of %ld bytes. Change the packet size? " +#: remote-m32r-sdi.c:1685 +msgid "Reset SDI connection." msgstr "" -#: remote.c:948 -msgid "Packet size not changed." +#: remote-m32r-sdi.c:1688 +msgid "Show status of SDI connection." msgstr "" -#: remote.c:958 -#, possible-c-format -msgid "The %s is %ld. " +#: remote-m32r-sdi.c:1691 +msgid "Debug M32R/Chaos." msgstr "" -#: remote.c:960 -#, possible-c-format -msgid "Packets are fixed at %ld bytes.\n" +#: remote-m32r-sdi.c:1694 +msgid "Use debug DMA mem access." msgstr "" -#: remote.c:963 -#, possible-c-format -msgid "Packets are limited to %ld bytes.\n" +#: remote-m32r-sdi.c:1696 +msgid "Use mon code mem access." msgstr "" -#: remote.c:1087 -#, possible-c-format -msgid "Support for the `%s' packet is auto-detected, currently %s.\n" +#: remote-m32r-sdi.c:1699 +msgid "Set breakpoints by IB break." msgstr "" -#: remote.c:1093 -#, possible-c-format -msgid "Support for the `%s' packet is currently %s.\n" +#: remote-m32r-sdi.c:1701 +msgid "Set breakpoints by dbt." msgstr "" -#: remote.c:1188 -msgid "packet_ok: attempt to use a disabled packet" +#: remote-mips.c:674 +msgid "Watchdog has expired. Target detached." msgstr "" -#. 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." +#: remote-mips.c:678 +msgid "End of file from remote" msgstr "" -#. The user set it wrong. -#: remote.c:1206 +#: remote-mips.c:680 #, possible-c-format -msgid "Enabled packet %s (%s) not recognized by stub" +msgid "Error reading from remote: %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:715 +msgid "Remote board reset, debug protocol re-initialized." msgstr "" -#: remote.c:1295 remote.c:1316 +#: remote-mips.c:773 #, possible-c-format -msgid "Could not find config for %s" +msgid "Debug protocol failure: more than %d characters before a sync." 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 +#: remote-mips.c:862 #, possible-c-format -msgid "Remote failure reply: %s" +msgid "MIPS protocol data packet too long: %s" msgstr "" -#: remote.c:1912 +#: remote-mips.c:900 remote-mips.c:1161 remote-mips.c:1202 #, possible-c-format -msgid "invalid remote ptid: %s" +msgid "write to target failed: %s" msgstr "" -#: remote.c:2243 -msgid "Incomplete response to threadinfo request." +#: remote-mips.c:1008 +msgid "Remote did not acknowledge packet" msgstr "" -#. This is an answer to a different request. -#: remote.c:2246 -msgid "ERROR RMT Thread info mismatch." +#: remote-mips.c:1039 remote-mips.c:1079 +msgid "Timed out waiting for remote packet" msgstr "" -#: remote.c:2260 -msgid "ERROR RMT: threadinfo tag mismatch." +#: remote-mips.c:1101 +msgid "Timed out waiting for packet" msgstr "" -#: remote.c:2268 -msgid "ERROR RMT: length of threadid is not 16." +#: remote-mips.c:1259 +msgid "mips_request: Trying to send command before reply" msgstr "" -#: remote.c:2283 -msgid "ERROR RMT: 'exists' length too long." +#: remote-mips.c:1279 +msgid "mips_request: Trying to get reply before command" msgstr "" -#: remote.c:2307 -msgid "ERROR RMT: unknown thread info tag." +#: remote-mips.c:1290 +msgid "Bad response from remote board" 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:2411 -msgid "HMM: threadlist did not echo arg thread, dropping it." +#: remote-mips.c:1366 +msgid "Failed to initialize (didn't receive packet)." msgstr "" -#: remote.c:2418 -msgid "RMT ERROR : failed to get remote thread list." +#: remote-mips.c:1416 +msgid "internal error: mips_initialize called twice" msgstr "" -#: remote.c:2426 -msgid "RMT ERROR: threadlist response longer than requested." +#: remote-mips.c:1490 +msgid "Failed to initialize." msgstr "" -#: remote.c:2463 -msgid "Remote fetch threadlist -infinite loop-." +#: 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 "" -#. paranoia -#: remote.c:2628 -msgid "Command can only be used when connected to the remote target." +#: remote-mips.c:1601 +msgid "Unable to open UDP port" msgstr "" -#: remote.c:2645 -msgid "threads" +#: remote-mips.c:1744 remote.c:4189 +msgid "Argument given to \"detach\" when remotely debugging." msgstr "" -#: remote.c:2744 -msgid "remote_threads_extra_info" +#: remote-mips.c:1851 +#, possible-c-format +msgid "Remote failure: %s" msgstr "" -#: remote.c:3019 remote.c:3046 +#: remote-mips.c:2049 #, possible-c-format -msgid "Target reported unsupported offsets: %s" +msgid "Can't read register %d: %s" msgstr "" -#: remote.c:3044 +#: remote-mips.c:2088 #, possible-c-format -msgid "Malformed response to offset query, %s" +msgid "Can't write register %d: %s" msgstr "" -#: remote.c:3092 -msgid "Can not handle qOffsets TextSeg response with this symbol file" +#: remote-mips.c:2323 +msgid "Can't pass arguments to remote MIPS board; arguments ignored." msgstr "" -#: remote.c:3224 -msgid "Non-stop mode requested, but remote does not support non-stop" +#: remote-mips.c:2582 +#, possible-c-format +msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s" msgstr "" -#: remote.c:3231 +#: remote-mips.c:2597 remote-mips.c:2650 remote-mips.c:2722 #, possible-c-format -msgid "Remote refused setting non-stop mode with: %s" +msgid "mips_common_breakpoint: Bad response from remote board: %s" +msgstr "" + +#: remote-mips.c:2761 +msgid "Timeout during download." msgstr "" -#: remote.c:3247 +#: remote-mips.c:2771 #, possible-c-format -msgid "Remote refused setting all-stop mode with: %s" +msgid "Download got unexpected ack char: 0x%x, retrying." msgstr "" -#: remote.c:3259 remote.c:3365 -msgid "The target is not running (try extended-remote?)" +#: remote-mips.c:3520 +msgid "mips_load: Couldn't get into monitor mode." msgstr "" -#: remote.c:3380 -msgid "remote didn't report the current thread in non-stop mode" +#: remote-mips.c:3678 +msgid "Set timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:3407 -msgid "Trace is already running on the target.\n" +#: remote-mips.c:3679 +msgid "Show timeout in seconds for remote MIPS serial I/O." +msgstr "" + +#: remote-mips.c:3686 +msgid "Set retransmit timeout in seconds for remote MIPS serial I/O." +msgstr "" + +#: remote-mips.c:3687 +msgid "Show retransmit timeout in seconds for remote MIPS serial I/O." msgstr "" -#: remote.c:3532 +#: remote-mips.c:3688 msgid "" -"The remote protocol may be unreliable over UDP.\n" -"Some events may be lost, rendering further debugging impossible." +"This is the number of seconds to wait for an acknowledgement to a packet\n" +"before resending the packet." msgstr "" -#: remote.c:3568 -#, possible-c-format -msgid "Remote refused setting permissions with: %s" +#: remote-mips.c:3696 +msgid "" +"Set the maximum number of characters to ignore when scanning for a SYN." msgstr "" -#: remote.c:3605 -#, possible-c-format -msgid "Remote qSupported response supplied an unexpected value for \"%s\"." +#: remote-mips.c:3697 +msgid "" +"Show the maximum number of characters to ignore when scanning for a SYN." msgstr "" -#: remote.c:3629 -#, possible-c-format -msgid "Remote target reported \"%s\" without a size." +#: remote-mips.c:3698 +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.)" msgstr "" -#: remote.c:3638 -#, possible-c-format -msgid "Remote target reported \"%s\" with a bad size: \"%s\"." +#: remote-mips.c:3708 +msgid "Set the prompt that GDB expects from the monitor." msgstr "" -#: remote.c:3645 -#, possible-c-format -msgid "limiting remote suggested packet size (%d bytes) to %d" +#: remote-mips.c:3709 +msgid "Show the prompt that GDB expects from the monitor." msgstr "" -#: remote.c:3916 -msgid "empty item in \"qSupported\" response" +#: remote-mips.c:3716 +msgid "Set printing of monitor warnings." msgstr "" -#: remote.c:3947 -#, possible-c-format -msgid "unrecognized item \"%s\" in \"qSupported\" response" +#: remote-mips.c:3717 +msgid "Show printing of monitor warnings." msgstr "" -#: remote.c:3995 +#: remote-mips.c:3718 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.)." +"When enabled, monitor warnings about hardware breakpoints will be displayed." msgstr "" -#: remote.c:4010 -msgid "Already connected to a remote target. Disconnect? " +#: remote-mips.c:3725 +msgid "Send a packet to PMON (must be in debug mode)." msgstr "" -#: remote.c:4013 -msgid "Still connected." +#: remote-mips.c:3727 +msgid "" +"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON " +"targets." msgstr "" -#: remote.c:4167 remote-mips.c:1744 -msgid "Argument given to \"detach\" when remotely debugging." +#: remote-mips.c:3728 +msgid "" +"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON " +"targets." msgstr "" -#: remote.c:4170 -msgid "No process to detach from." +#: remote-mips.c:3729 +msgid "Use \"on\" to enable the masking and \"off\" to disable it." msgstr "" -#: remote.c:4184 -msgid "Remote doesn't know how to detach" +#: remote-sim.c:187 +#, possible-c-format +msgid "Unable to create simulator instance for inferior %d." +msgstr "" + +#: 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:4186 -msgid "Can't detach process." +#: remote-sim.c:529 +msgid "Register size different to expected" msgstr "" -#: remote.c:4191 +#: remote-sim.c:532 #, possible-c-format -msgid "Detached from remote %s.\n" +msgid "Register %d not updated" msgstr "" -#: remote.c:4196 -msgid "Detached from remote process.\n" +#: remote-sim.c:534 +#, possible-c-format +msgid "Register %s not updated" msgstr "" -#: remote.c:4198 -msgid "Ending remote debugging.\n" +#: remote-sim.c:573 +msgid "program to load" msgstr "" -#: remote.c:4224 -msgid "Argument given to \"disconnect\" when remotely debugging." +#: remote-sim.c:581 +msgid "GDB sim does not yet support a load offset." msgstr "" -#: remote.c:4251 remote.c:4276 -msgid "This target does not support attaching to a process" +#: remote-sim.c:590 +msgid "unable to load program" msgstr "" -#: remote.c:4261 -#, possible-c-format -msgid "Attached to %s\n" +#: remote-sim.c:617 +msgid "No executable file specified." msgstr "" -#: remote.c:4271 -#, possible-c-format -msgid "Attaching to %s failed with: %s" +#: remote-sim.c:619 remote-sim.c:1085 +msgid "No program loaded." msgstr "" -#: remote.c:4278 -#, possible-c-format -msgid "Attaching to %s failed" +#: remote-sim.c:728 +msgid "unable to create simulator instance" msgstr "" -#: remote.c:4361 +#: remote-sim.c:855 #, possible-c-format -msgid "Reply contains invalid hex digit %d" +msgid "gdbsim_resume: pid %d, step %d, signal %d\n" msgstr "" -#: remote.c:4577 +#: remote-sim.c:934 #, possible-c-format -msgid "Unexpected vCont reply in non-stop mode: %s" +msgid "Can't stop pid %d. No inferior found." msgstr "" -#: remote.c:4617 +#: remote-sim.c:991 #, possible-c-format -msgid " - Can't pass signal %d to target in reverse: ignored." +msgid "Unable to wait for pid %d. Inferior not found." msgstr "" -#: remote.c:4622 -msgid "Remote reverse-step not supported." +#. 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:4625 -msgid "Remote reverse-continue not supported." +#: remote-sim.c:1310 +msgid "Send a command to the simulator." msgstr "" -#: remote.c:4763 -msgid "Remote server does not support stopping threads" +#. malformed packet error +#. general case: +#: remote.c:425 +msgid "remote.c: error in outgoing packet." msgstr "" -#: remote.c:4796 +#: remote.c:427 #, possible-c-format -msgid "Stopping %s failed: %s" +msgid "remote.c: error in outgoing packet at field #%ld." msgstr "" -#: remote.c:5153 +#: remote.c:430 #, possible-c-format -msgid "" -"Malformed packet(a) (missing colon): %s\n" -"Packet: '%s'\n" +msgid "trace API error 0x%s." msgstr "" -#: remote.c:5209 +#: remote.c:432 #, possible-c-format -msgid "" -"Malformed packet(b) (missing colon): %s\n" -"Packet: '%s'\n" +msgid "Target returns error code '%s'." msgstr "" -#: remote.c:5215 +#: remote.c:461 #, possible-c-format -msgid "" -"Remote sent bad register number %s: %s\n" -"Packet: '%s'\n" +msgid "invalid qRelocInsn packet: %s" msgstr "" -#: remote.c:5227 -#, possible-c-format -msgid "Remote reply is too short: %s" +#: remote.c:495 +msgid "warning: relocating instruction: " msgstr "" -#: remote.c:5233 -#, possible-c-format +#: remote.c:761 msgid "" -"Remote register badly formatted: %s\n" -"here: %s" +"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the " +"execution of the program.\n" msgstr "" -#: remote.c:5295 remote.c:5298 -#, possible-c-format -msgid "unknown stop reply packet: %s" +#: remote.c:766 +msgid "" +"send a break signal to the remote target to interrupt the execution of the " +"program.\n" msgstr "" -#: remote.c:5305 -#, possible-c-format -msgid "No process or thread specified in stop reply: %s" +#: 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.c:5470 remote.c:5612 +#: remote.c:775 remote.c:3149 #, possible-c-format -msgid "Invalid remote reply: %s" +msgid "Invalid value for interrupt_sequence_mode: %s." msgstr "" -#: remote.c:5699 -#, possible-c-format -msgid "Could not fetch register \"%s\"; remote failure reply '%s'" +#: remote.c:919 +msgid "Argument required (integer, `fixed' or `limited')." msgstr "" -#: remote.c:5718 -msgid "fetch_register_using_p: early buf termination" +#: remote.c:932 +#, possible-c-format +msgid "Invalid %s (bad syntax)." msgstr "" -#: remote.c:5756 +#: remote.c:939 #, possible-c-format -msgid "Remote 'g' packet reply is of odd length: %s" +msgid "Invalid %s (too large)." msgstr "" -#: remote.c:5775 +#: remote.c:945 #, possible-c-format -msgid "Remote 'g' packet reply is too long: %s" +msgid "" +"The target may not be able to correctly handle a %s\n" +"of %ld bytes. Change the packet size? " msgstr "" -#: remote.c:5818 remote.c:5836 -msgid "unexpected end of 'g' packet reply" +#: remote.c:948 +msgid "Packet size not changed." msgstr "" -#: remote.c:5877 -msgid "could not set remote traceframe" +#: remote.c:958 +#, possible-c-format +msgid "The %s is %ld. " msgstr "" -#: remote.c:5985 +#: remote.c:960 #, possible-c-format -msgid "Could not write register \"%s\"; remote failure reply '%s'" +msgid "Packets are fixed at %ld bytes.\n" msgstr "" -#: remote.c:5990 -msgid "Bad result from packet_ok" +#: remote.c:963 +#, possible-c-format +msgid "Packets are limited to %ld bytes.\n" msgstr "" -#: remote.c:6031 +#: remote.c:1087 #, possible-c-format -msgid "Could not write registers; remote failure reply '%s'" +msgid "Support for the `%s' packet is auto-detected, currently %s.\n" msgstr "" -#: remote.c:6211 -msgid "Received too much data from remote target; ignoring overflow." +#: remote.c:1093 +#, possible-c-format +msgid "Support for the `%s' packet is currently %s.\n" msgstr "" -#: remote.c:6228 -msgid "Unmatched escape character in target response." +#: remote.c:1188 +msgid "packet_ok: attempt to use a disabled packet" msgstr "" -#: remote.c:6327 -msgid "remote_write_bytes_aux: bad packet format" +#. 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.c:6374 -msgid "minimum packet size too small to write data" +#. The user set it wrong. +#: remote.c:1206 +#, possible-c-format +msgid "Enabled packet %s (%s) not recognized by stub" msgstr "" -#: remote.c:6490 -msgid "remote_write_bytes: bad internal state" +#: remote.c:1296 remote.c:1317 +#, possible-c-format +msgid "Could not find config for %s" msgstr "" -#: remote.c:6640 -msgid "Too long remote packet." +#. 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:1434 remote.c:2828 remote.c:2868 remote.c:2985 remote.c:3908 +#: remote.c:5486 remote.c:5585 remote.c:6805 +#, possible-c-format +msgid "Remote failure reply: %s" msgstr "" -#: remote.c:6643 remote.c:8556 -msgid "Communication problem with target." +#: remote.c:1913 +#, possible-c-format +msgid "invalid remote ptid: %s" msgstr "" -#: remote.c:6682 -msgid "Remote target does not support flash erase" +#: remote.c:2244 +msgid "Incomplete response to threadinfo request." msgstr "" -#: remote.c:6684 -msgid "Error erasing flash with vFlashErase packet" +#. This is an answer to a different request. +#: remote.c:2247 +msgid "ERROR RMT Thread info mismatch." msgstr "" -#: remote.c:6724 -msgid "Remote target does not support vFlashDone" +#: remote.c:2261 +msgid "ERROR RMT: threadinfo tag mismatch." msgstr "" -#: remote.c:6726 -msgid "Error finishing flash operation" +#: remote.c:2269 +msgid "ERROR RMT: length of threadid is not 16." msgstr "" -#: remote.c:6757 remote-m32r-sdi.c:725 remote-m32r-sdi.c:731 -#: remote-m32r-sdi.c:747 -msgid "Remote connection closed" +#: remote.c:2284 +msgid "ERROR RMT: 'exists' length too long." msgstr "" -#: remote.c:6761 -msgid "Remote communication error. Target disconnected." +#: remote.c:2308 +msgid "ERROR RMT: unknown thread info tag." msgstr "" -#: remote.c:6850 -msgid "Cannot execute this command while the target is running." +#. 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:2412 +msgid "HMM: threadlist did not echo arg thread, dropping it." msgstr "" -#: remote.c:6890 -msgid "putpkt: write failed" +#: remote.c:2419 +msgid "RMT ERROR : failed to get remote thread list." msgstr "" -#: remote.c:7176 -#, possible-c-format -msgid "Invalid run length encoding: %s\n" +#: remote.c:2427 +msgid "RMT ERROR: threadlist response longer than requested." msgstr "" -#: remote.c:7282 -msgid "Watchdog timeout has expired. Target detached." +#: remote.c:2464 +msgid "Remote fetch threadlist -infinite loop-." msgstr "" -#. We have tried hard enough, and just can't receive the -#. packet/notification. Give up. -#: remote.c:7303 -msgid "Ignoring packet error, continuing...\n" +#. paranoia +#: remote.c:2629 +msgid "Command can only be used when connected to the remote target." msgstr "" -#: remote.c:7439 -msgid "Can't kill process" +#: remote.c:2646 +msgid "threads" msgstr "" -#: remote.c:7547 -msgid "Target does not support QDisableRandomization." +#: remote.c:2745 +msgid "remote_threads_extra_info" msgstr "" -#: remote.c:7549 +#: remote.c:3020 remote.c:3047 #, possible-c-format -msgid "Bogus QDisableRandomization reply from target: %s" -msgstr "" - -#: remote.c:7567 -msgid "Remote file name too long for run packet" -msgstr "" - -#: remote.c:7582 -msgid "Argument list too long for run packet" -msgstr "" - -#: remote.c:7605 -msgid "" -"Running the default executable on the remote target failed; try \"set remote " -"exec-file\"?" +msgid "Target reported unsupported offsets: %s" msgstr "" -#: remote.c:7608 +#: remote.c:3045 #, possible-c-format -msgid "Running \"%s\" on the remote target failed" +msgid "Malformed response to offset query, %s" msgstr "" -#: remote.c:7638 -msgid "Remote target does not support \"set remote exec-file\"" +#: remote.c:3093 +msgid "Can not handle qOffsets TextSeg response with this symbol file" msgstr "" -#: remote.c:7640 -msgid "Remote target does not support \"set args\" or run " +#: remote.c:3225 +msgid "Non-stop mode requested, but remote does not support non-stop" msgstr "" -#: remote.c:7772 +#: remote.c:3232 #, possible-c-format -msgid "hw_bp_to_z: bad watchpoint type %d" +msgid "Remote refused setting non-stop mode with: %s" msgstr "" -#: remote.c:7806 -msgid "remote_insert_watchpoint: reached end of function" +#: remote.c:3248 +#, possible-c-format +msgid "Remote refused setting all-stop mode with: %s" msgstr "" -#: remote.c:7838 -msgid "remote_remove_watchpoint: reached end of function" +#: remote.c:3264 remote.c:3388 +msgid "The target is not running (try extended-remote?)" msgstr "" -#: remote.c:7946 -msgid "remote_insert_hw_breakpoint: reached end of function" +#: remote.c:3403 +msgid "remote didn't report the current thread in non-stop mode" msgstr "" -#: remote.c:7981 -msgid "remote_remove_hw_breakpoint: reached end of function" +#: remote.c:3430 +msgid "Trace is already running on the target.\n" msgstr "" -#: remote.c:8038 -msgid "remote target does not support this operation" +#: remote.c:3555 +msgid "" +"The remote protocol may be unreliable over UDP.\n" +"Some events may be lost, rendering further debugging impossible." msgstr "" -#: remote.c:8066 -msgid "command cannot be used without an exec file" +#: remote.c:3591 +#, possible-c-format +msgid "Remote refused setting permissions with: %s" msgstr "" -#: remote.c:8091 +#: remote.c:3628 #, possible-c-format -msgid "target memory fault, section %s, range %s -- %s" +msgid "Remote qSupported response supplied an unexpected value for \"%s\"." msgstr "" -#: remote.c:8109 -msgid "" -"One or more sections of the remote executable does not match\n" -"the loaded file\n" +#: remote.c:3652 +#, possible-c-format +msgid "Remote target reported \"%s\" without a size." msgstr "" -#: remote.c:8112 +#: remote.c:3661 #, possible-c-format -msgid "No loaded section named '%s'.\n" +msgid "Remote target reported \"%s\" with a bad size: \"%s\"." msgstr "" -#: remote.c:8212 +#: remote.c:3668 #, possible-c-format -msgid "Unknown remote qXfer reply: %s" +msgid "limiting remote suggested packet size (%d bytes) to %d" msgstr "" -#: remote.c:8218 -msgid "Remote qXfer reply contained no data." +#: remote.c:3938 +msgid "empty item in \"qSupported\" response" msgstr "" -#: remote.c:8407 -msgid "remote query is only available after target open" +#: remote.c:3969 +#, possible-c-format +msgid "unrecognized item \"%s\" in \"qSupported\" response" msgstr "" -#: remote.c:8498 -msgid "Pattern is too large to transmit to remote target." +#: remote.c:4017 +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.)." msgstr "" -#: remote.c:8520 remote.c:8525 -#, possible-c-format -msgid "Unknown qSearch:memory reply: %s" +#: remote.c:4032 +msgid "Already connected to a remote target. Disconnect? " msgstr "" -#: remote.c:8538 -msgid "remote rcmd is only available after target open" +#: remote.c:4035 +msgid "Still connected." msgstr "" -#: remote.c:8550 -#, possible-c-format -msgid "\"monitor\" command ``%s'' is too long." +#: remote.c:4192 +msgid "No process to detach from." msgstr "" -#: 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." +#: remote.c:4206 +msgid "Remote doesn't know how to detach" msgstr "" -#: remote.c:8579 -msgid "Protocol error with Rcmd" +#: remote.c:4208 +msgid "Can't detach process." msgstr "" -#: remote.c:8615 remote.c:9514 remote.c:9602 remote.c:9653 -msgid "command can only be used with remote target" +#: remote.c:4213 +#, possible-c-format +msgid "Detached from remote %s.\n" msgstr "" -#: remote.c:8618 -msgid "remote-packet command requires packet text as argument" +#: remote.c:4218 +msgid "Detached from remote process.\n" msgstr "" -#: remote.c:8659 -msgid "Remote threadset test\n" +#: remote.c:4220 +msgid "Ending remote debugging.\n" msgstr "" -#: remote.c:8765 -msgid "Fetch and print the remote list of thread identifiers, one pkt only" +#: remote.c:4246 +msgid "Argument given to \"disconnect\" when remotely debugging." msgstr "" -#: remote.c:8768 -msgid "Fetch and display info about one thread" +#: remote.c:4273 remote.c:4298 +msgid "This target does not support attaching to a process" msgstr "" -#: remote.c:8770 -msgid "Test setting to a different thread" +#: remote.c:4283 +#, possible-c-format +msgid "Attached to %s\n" msgstr "" -#: remote.c:8772 -msgid "Iterate through updating all remote thread info" +#: remote.c:4293 +#, possible-c-format +msgid "Attaching to %s failed with: %s" msgstr "" -#: remote.c:8774 -msgid " Remote thread alive test " +#: remote.c:4300 +#, possible-c-format +msgid "Attaching to %s failed" msgstr "" -#: remote.c:8859 -msgid "Remote target doesn't support qGetTLSAddr packet" +#: remote.c:4383 +#, possible-c-format +msgid "Reply contains invalid hex digit %d" msgstr "" -#: remote.c:8862 -msgid "Remote target failed to process qGetTLSAddr request" +#: remote.c:4599 +#, possible-c-format +msgid "Unexpected vCont reply in non-stop mode: %s" msgstr "" -#: remote.c:8866 -msgid "TLS not supported or disabled on this target" +#: remote.c:4639 +#, possible-c-format +msgid " - Can't pass signal %d to target in reverse: ignored." msgstr "" -#: remote.c:8903 -msgid "Remote target doesn't support qGetTIBAddr packet" +#: remote.c:4644 +msgid "Remote reverse-step not supported." msgstr "" -#: remote.c:8905 -msgid "Remote target failed to process qGetTIBAddr request" +#: remote.c:4647 +msgid "Remote reverse-continue not supported." msgstr "" -#: remote.c:8908 -msgid "qGetTIBAddr not supported or disabled on this target" +#: remote.c:4785 +msgid "Remote server does not support stopping threads" msgstr "" -#: remote.c:8956 +#: remote.c:4818 #, possible-c-format -msgid "Duplicate g packet description added for size %d" -msgstr "" - -#: remote.c:9023 remote.c:9044 remote.c:9066 -msgid "Packet too long for target." +msgid "Stopping %s failed: %s" msgstr "" -#: remote.c:9298 +#: remote.c:5175 #, possible-c-format -msgid "Read returned %d, but %d bytes." +msgid "" +"Malformed packet(a) (missing colon): %s\n" +"Packet: '%s'\n" msgstr "" -#: remote.c:9397 +#: remote.c:5231 #, possible-c-format -msgid "Unknown remote I/O error %d" +msgid "" +"Malformed packet(b) (missing colon): %s\n" +"Packet: '%s'\n" msgstr "" -#: remote.c:9399 +#: remote.c:5237 #, possible-c-format -msgid "Remote I/O error: %s" +msgid "" +"Remote sent bad register number %s: %s\n" +"Packet: '%s'\n" msgstr "" -#: remote.c:9548 +#: remote.c:5249 #, possible-c-format -msgid "Error reading %s." +msgid "Remote reply is too short: %s" msgstr "" -#: remote.c:9571 +#: remote.c:5255 #, possible-c-format -msgid "Remote write of %d bytes returned 0!" +msgid "" +"Remote register badly formatted: %s\n" +"here: %s" msgstr "" -#: remote.c:9588 +#: remote.c:5317 remote.c:5320 #, possible-c-format -msgid "Successfully sent file \"%s\".\n" +msgid "unknown stop reply packet: %s" msgstr "" -#: remote.c:9643 +#: remote.c:5327 #, possible-c-format -msgid "Successfully fetched file \"%s\".\n" +msgid "No process or thread specified in stop reply: %s" msgstr "" -#: remote.c:9660 +#: remote.c:5492 remote.c:5634 #, possible-c-format -msgid "Successfully deleted file \"%s\".\n" +msgid "Invalid remote reply: %s" msgstr "" -#: remote.c:9670 -msgid "file to put" +#: remote.c:5721 +#, possible-c-format +msgid "Could not fetch register \"%s\"; remote failure reply '%s'" msgstr "" -#: remote.c:9675 -msgid "Invalid parameters to remote put" +#: remote.c:5740 +msgid "fetch_register_using_p: early buf termination" msgstr "" -#: remote.c:9689 -msgid "file to get" +#: remote.c:5778 +#, possible-c-format +msgid "Remote 'g' packet reply is of odd length: %s" msgstr "" -#: remote.c:9694 -msgid "Invalid parameters to remote get" +#: remote.c:5797 +#, possible-c-format +msgid "Remote 'g' packet reply is too long: %s" msgstr "" -#: remote.c:9708 -msgid "file to delete" +#: remote.c:5840 remote.c:5858 +msgid "unexpected end of 'g' packet reply" msgstr "" -#: remote.c:9713 -msgid "Invalid parameters to remote delete" +#: remote.c:5899 +msgid "could not set remote traceframe" msgstr "" -#: remote.c:9856 remote.c:9871 remote.c:10030 remote.c:10041 -msgid "Target does not support source download." +#: remote.c:6007 +#, possible-c-format +msgid "Could not write register \"%s\"; remote failure reply '%s'" msgstr "" -#: remote.c:9923 -msgid "Fast tracepoint not valid during download" +#: remote.c:6012 +msgid "Bad result from packet_ok" 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:9930 +#: remote.c:6053 #, possible-c-format -msgid "" -"Target does not support fast tracepoints, downloading %d as regular " -"tracepoint" +msgid "Could not write registers; remote failure reply '%s'" msgstr "" -#: remote.c:9944 -msgid "Static tracepoint not valid during download" +#: remote.c:6233 +msgid "Received too much data from remote target; ignoring overflow." 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:9950 -msgid "Target does not support static tracepoints" +#: remote.c:6250 +msgid "Unmatched escape character in target response." msgstr "" -#: remote.c:9970 -#, possible-c-format -msgid "Target does not support conditional tracepoints, ignoring tp %d cond" +#: remote.c:6349 +msgid "remote_write_bytes_aux: bad packet format" msgstr "" -#: remote.c:9979 -msgid "Target does not support tracepoints." +#: remote.c:6396 +msgid "minimum packet size too small to write data" msgstr "" -#: remote.c:9996 remote.c:10013 -msgid "Error on target while setting tracepoints." +#: remote.c:6512 +msgid "remote_write_bytes: bad internal state" msgstr "" -#: remote.c:10078 -msgid "Trace state variable name too long for tsv definition packet" +#: remote.c:6662 +msgid "Too long remote packet." msgstr "" -#: remote.c:10086 -msgid "Error on target while downloading trace state variable." +#: remote.c:6665 remote.c:8578 +msgid "Communication problem with target." msgstr "" -#: remote.c:10100 -msgid "" -"Target does not support enabling tracepoints while a trace run is ongoing." +#: remote.c:6704 +msgid "Remote target does not support flash erase" msgstr "" -#: remote.c:10102 -msgid "Error on target while enabling tracepoint." +#: remote.c:6706 +msgid "Error erasing flash with vFlashErase packet" msgstr "" -#: remote.c:10116 -msgid "" -"Target does not support disabling tracepoints while a trace run is ongoing." +#: remote.c:6746 +msgid "Remote target does not support vFlashDone" msgstr "" -#: remote.c:10118 -msgid "Error on target while disabling tracepoint." +#: remote.c:6748 +msgid "Error finishing flash operation" msgstr "" -#: remote.c:10154 -msgid "Too many sections for read-only sections definition packet." +#: remote.c:6783 +msgid "Remote communication error. Target disconnected." msgstr "" -#: 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" +#: remote.c:6872 +msgid "Cannot execute this command while the target is running." msgstr "" -#: remote.c:10216 -#, possible-c-format -msgid "Bogus trace status reply from target: %s" +#: remote.c:6912 +msgid "putpkt: write failed" msgstr "" -#: remote.c:10315 +#: remote.c:7198 #, possible-c-format -msgid "Unknown trace find type %d" +msgid "Invalid run length encoding: %s\n" msgstr "" -#: remote.c:10330 -msgid "Unable to parse trace frame number" +#: remote.c:7304 +msgid "Watchdog timeout has expired. Target detached." msgstr "" -#: remote.c:10340 -msgid "Unable to parse tracepoint number" +#. We have tried hard enough, and just can't receive the +#. packet/notification. Give up. +#: remote.c:7325 +msgid "Ignoring packet error, continuing...\n" msgstr "" -#: remote.c:10392 -msgid "Remote file name too long for trace save packet" +#: remote.c:7461 +msgid "Can't kill process" msgstr "" -#: remote.c:10465 -msgid "Target does not support disconnected tracing." +#: remote.c:7569 +msgid "Target does not support QDisableRandomization." msgstr "" -#. 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" +#: remote.c:7571 +#, possible-c-format +msgid "Bogus QDisableRandomization reply from target: %s" msgstr "" -#. 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)." +#: remote.c:7589 +msgid "Remote file name too long for run packet" msgstr "" -#: 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." +#: remote.c:7604 +msgid "Argument list too long for run packet" msgstr "" -#: remote.c:10945 -msgid "Set whether to send break if interrupted." +#: remote.c:7627 +msgid "" +"Running the default executable on the remote target failed; try \"set remote " +"exec-file\"?" msgstr "" -#: remote.c:10946 -msgid "Show whether to send break if interrupted." +#: remote.c:7630 +#, possible-c-format +msgid "Running \"%s\" on the remote target failed" msgstr "" -#: remote.c:10947 -msgid "If set, a break, instead of a cntrl-c, is sent to the remote target." +#: remote.c:7660 +msgid "Remote target does not support \"set remote exec-file\"" msgstr "" -#: remote.c:10960 -msgid "Set interrupt sequence to remote target." +#: remote.c:7662 +msgid "Remote target does not support \"set args\" or run " msgstr "" -#: remote.c:10961 -msgid "Show interrupt sequence to remote target." +#: remote.c:7794 +#, possible-c-format +msgid "hw_bp_to_z: bad watchpoint type %d" msgstr "" -#: remote.c:10962 -msgid "" -"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-" -"C\"." +#: remote.c:7828 +msgid "remote_insert_watchpoint: reached end of function" msgstr "" -#: remote.c:10969 -msgid "" -"Set whether interrupt-sequence is sent to remote target when gdb connects to." +#: remote.c:7860 +msgid "remote_remove_watchpoint: reached end of function" msgstr "" -#: remote.c:10970 -msgid "" -"\t\tShow whether interrupt-sequence is sent to remote target when gdb " -"connects to." +#: remote.c:7968 +msgid "remote_insert_hw_breakpoint: reached end of function" msgstr "" -#: remote.c:10971 -msgid "\t\tIf set, interrupt sequence is sent to remote target." +#: remote.c:8003 +msgid "remote_remove_hw_breakpoint: reached end of function" msgstr "" -#. Install commands for configuring memory read/write packets. -#: remote.c:10978 -msgid "Set the maximum number of bytes per memory write packet (deprecated)." +#: remote.c:8060 +msgid "remote target does not support this operation" msgstr "" -#: remote.c:10981 -msgid "" -"Show the maximum number of bytes per memory write packet (deprecated)." +#: remote.c:8088 +msgid "command cannot be used without an exec file" msgstr "" -#: 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." +#: remote.c:8113 +#, possible-c-format +msgid "target memory fault, section %s, range %s -- %s" msgstr "" -#: remote.c:10993 +#: remote.c:8131 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:11002 -msgid "Show the maximum number of bytes per memory-write packet." -msgstr "" - -#: remote.c:11006 -msgid "Show the maximum number of bytes per memory-read packet." +"One or more sections of the remote executable does not match\n" +"the loaded file\n" msgstr "" -#: remote.c:11010 -msgid "Set the maximum number of target hardware watchpoints." +#: remote.c:8134 +#, possible-c-format +msgid "No loaded section named '%s'.\n" msgstr "" -#: remote.c:11011 -msgid "Show the maximum number of target hardware watchpoints." +#: remote.c:8234 +#, possible-c-format +msgid "Unknown remote qXfer reply: %s" msgstr "" -#: remote.c:11012 remote.c:11021 remote.c:11030 -msgid "Specify a negative limit for unlimited." +#: remote.c:8240 +msgid "Remote qXfer reply contained no data." msgstr "" -#: remote.c:11019 -msgid "Set the maximum length (in bytes) of a target hardware watchpoint." +#: remote.c:8429 +msgid "remote query is only available after target open" msgstr "" -#: remote.c:11020 -msgid "Show the maximum length (in bytes) of a target hardware watchpoint." +#: remote.c:8520 +msgid "Pattern is too large to transmit to remote target." msgstr "" -#: remote.c:11028 -msgid "Set the maximum number of target hardware breakpoints." +#: remote.c:8542 remote.c:8547 +#, possible-c-format +msgid "Unknown qSearch:memory reply: %s" msgstr "" -#: remote.c:11029 -msgid "Show the maximum number of target hardware breakpoints." +#: remote.c:8560 +msgid "remote rcmd is only available after target open" msgstr "" -#: remote.c:11038 -msgid "Set the maximum size of the address (in bits) in a memory packet." +#: remote.c:8572 +#, possible-c-format +msgid "\"monitor\" command ``%s'' is too long." msgstr "" -#: remote.c:11039 -msgid "Show the maximum size of the address (in bits) in a memory packet." +#: remote.c:8590 remote.c:9875 remote.c:10148 remote.c:10238 remote.c:10338 +#: remote.c:10385 remote.c:10462 remote.c:10524 remote.c:10552 +msgid "Target does not support this command." msgstr "" -#: remote.c:11197 -msgid "Set use of remote protocol `Z' packets" +#: remote.c:8601 +msgid "Protocol error with Rcmd" msgstr "" -#: remote.c:11198 -msgid "Show use of remote protocol `Z' packets " +#: remote.c:8637 remote.c:9574 remote.c:9662 remote.c:9713 +msgid "command can only be used with remote target" msgstr "" -#: remote.c:11199 -msgid "" -"When set, GDB will attempt to use the remote breakpoint and watchpoint\n" -"packets." +#: remote.c:8640 +msgid "remote-packet command requires packet text as argument" msgstr "" -#: remote.c:11208 -msgid "" -"Manipulate files on the remote system\n" -"Transfer files to and from the remote target system." +#: remote.c:8681 +msgid "Remote threadset test\n" msgstr "" -#: remote.c:11215 -msgid "Copy a local file to the remote system." +#: remote.c:8787 +msgid "Fetch and print the remote list of thread identifiers, one pkt only" msgstr "" -#: remote.c:11219 -msgid "Copy a remote file to the local system." +#: remote.c:8790 +msgid "Fetch and display info about one thread" msgstr "" -#: remote.c:11223 -msgid "Delete a remote file." +#: remote.c:8792 +msgid "Test setting to a different thread" msgstr "" -#: remote.c:11228 -msgid "Set the remote pathname for \"run\"" +#: remote.c:8794 +msgid "Iterate through updating all remote thread info" msgstr "" -#: remote.c:11229 -msgid "Show the remote pathname for \"run\"" +#: remote.c:8796 +msgid " Remote thread alive test " msgstr "" -#: remote-fileio.c:1451 -msgid "Illegal argument for \"set remote system-call-allowed\" command" +#: remote.c:8881 +msgid "Remote target doesn't support qGetTLSAddr packet" msgstr "" -#: remote-fileio.c:1458 -#, possible-c-format -msgid "Garbage after \"show remote system-call-allowed\" command: `%s'" +#: remote.c:8884 +msgid "Remote target failed to process qGetTLSAddr request" msgstr "" -#: remote-fileio.c:1473 -msgid "Set if the host system(3) call is allowed for the target." +#: remote.c:8888 +msgid "TLS not supported or disabled on this target" msgstr "" -#: remote-fileio.c:1477 -msgid "Show if the host system(3) call is allowed for the target." +#: remote.c:8925 +msgid "Remote target doesn't support qGetTIBAddr packet" msgstr "" -#: remote-m32r-sdi.c:330 -msgid "Cannot pass arguments to remote STDEBUG process" +#: remote.c:8927 +msgid "Remote target failed to process qGetTIBAddr request" msgstr "" -#: remote-m32r-sdi.c:333 remote-mips.c:2330 -msgid "No executable file specified" +#: remote.c:8930 +msgid "qGetTIBAddr not supported or disabled on this target" msgstr "" -#: remote-m32r-sdi.c:392 -msgid "Connection refused." +#: remote.c:8978 +#, possible-c-format +msgid "Duplicate g packet description added for size %d" msgstr "" -#: remote-m32r-sdi.c:395 remote-m32r-sdi.c:398 -msgid "Cannot connect to SDI target." +#: remote.c:9045 remote.c:9066 remote.c:9088 +msgid "Packet too long for target." msgstr "" -#: remote-m32r-sdi.c:1189 -msgid "Too many breakpoints" +#: remote.c:9320 +#, possible-c-format +msgid "Read returned %d, but %d bytes." msgstr "" -#: remote-m32r-sdi.c:1258 +#: remote.c:9394 #, possible-c-format -msgid "Unknown option `%s'" +msgid "Readlink returned %d, but %d bytes." msgstr "" -#: remote-m32r-sdi.c:1273 symfile.c:2085 +#: remote.c:9457 #, possible-c-format -msgid "\"%s\" is not an object file: %s" +msgid "Unknown remote I/O error %d" msgstr "" -#: remote-m32r-sdi.c:1324 +#: remote.c:9459 #, possible-c-format -msgid "Error while downloading %s section." +msgid "Remote I/O error: %s" msgstr "" -#: remote-m32r-sdi.c:1443 -msgid "Too many watchpoints" +#: remote.c:9608 +#, possible-c-format +msgid "Error reading %s." msgstr "" -#: remote-m32r-sdi.c:1685 -msgid "Reset SDI connection." +#: remote.c:9631 +#, possible-c-format +msgid "Remote write of %d bytes returned 0!" msgstr "" -#: remote-m32r-sdi.c:1688 -msgid "Show status of SDI connection." +#: remote.c:9648 +#, possible-c-format +msgid "Successfully sent file \"%s\".\n" msgstr "" -#: remote-m32r-sdi.c:1691 -msgid "Debug M32R/Chaos." +#: remote.c:9703 +#, possible-c-format +msgid "Successfully fetched file \"%s\".\n" msgstr "" -#: remote-m32r-sdi.c:1694 -msgid "Use debug DMA mem access." +#: remote.c:9720 +#, possible-c-format +msgid "Successfully deleted file \"%s\".\n" msgstr "" -#: remote-m32r-sdi.c:1696 -msgid "Use mon code mem access." +#: remote.c:9730 +msgid "file to put" msgstr "" -#: remote-m32r-sdi.c:1699 -msgid "Set breakpoints by IB break." +#: remote.c:9735 +msgid "Invalid parameters to remote put" msgstr "" -#: remote-m32r-sdi.c:1701 -msgid "Set breakpoints by dbt." +#: remote.c:9749 +msgid "file to get" msgstr "" -#: remote-mips.c:674 -msgid "Watchdog has expired. Target detached." +#: remote.c:9754 +msgid "Invalid parameters to remote get" msgstr "" -#: remote-mips.c:678 -msgid "End of file from remote" +#: remote.c:9768 +msgid "file to delete" msgstr "" -#: remote-mips.c:680 -#, possible-c-format -msgid "Error reading from remote: %s" +#: remote.c:9773 +msgid "Invalid parameters to remote delete" 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:715 -msgid "Remote board reset, debug protocol re-initialized." +#: remote.c:9920 remote.c:9935 remote.c:10094 remote.c:10105 +msgid "Target does not support source download." msgstr "" -#: remote-mips.c:773 -#, possible-c-format -msgid "Debug protocol failure: more than %d characters before a sync." +#: remote.c:9987 +msgid "Fast tracepoint not valid during download" msgstr "" -#: remote-mips.c:862 +#. 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:9994 #, possible-c-format -msgid "MIPS protocol data packet too long: %s" +msgid "" +"Target does not support fast tracepoints, downloading %d as regular " +"tracepoint" msgstr "" -#: remote-mips.c:900 remote-mips.c:1161 remote-mips.c:1202 -#, possible-c-format -msgid "write to target failed: %s" +#: remote.c:10008 +msgid "Static tracepoint not valid during download" msgstr "" -#: remote-mips.c:1008 -msgid "Remote did not acknowledge packet" +#. 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:10014 +msgid "Target does not support static tracepoints" msgstr "" -#: remote-mips.c:1039 remote-mips.c:1079 -msgid "Timed out waiting for remote packet" +#: remote.c:10034 +#, possible-c-format +msgid "Target does not support conditional tracepoints, ignoring tp %d cond" msgstr "" -#: remote-mips.c:1101 -msgid "Timed out waiting for packet" +#: remote.c:10043 +msgid "Target does not support tracepoints." msgstr "" -#: remote-mips.c:1259 -msgid "mips_request: Trying to send command before reply" +#: remote.c:10060 remote.c:10077 +msgid "Error on target while setting tracepoints." msgstr "" -#: remote-mips.c:1279 -msgid "mips_request: Trying to get reply before command" +#: remote.c:10142 +msgid "Trace state variable name too long for tsv definition packet" msgstr "" -#: remote-mips.c:1290 -msgid "Bad response from remote board" +#: remote.c:10150 +msgid "Error on target while downloading trace state variable." msgstr "" -#: remote-mips.c:1366 -msgid "Failed to initialize (didn't receive packet)." +#: remote.c:10164 +msgid "" +"Target does not support enabling tracepoints while a trace run is ongoing." msgstr "" -#: remote-mips.c:1416 -msgid "internal error: mips_initialize called twice" +#: remote.c:10166 +msgid "Error on target while enabling tracepoint." msgstr "" -#: remote-mips.c:1490 -msgid "Failed to initialize." +#: remote.c:10180 +msgid "" +"Target does not support disabling tracepoints while a trace run is ongoing." msgstr "" -#: 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" +#: remote.c:10182 +msgid "Error on target while disabling tracepoint." msgstr "" -#: remote-mips.c:1601 -msgid "Unable to open UDP port" +#: remote.c:10218 +msgid "Too many sections for read-only sections definition packet." msgstr "" -#: remote-mips.c:1851 +#: remote.c:10240 remote.c:10340 remote.c:10410 remote.c:10413 remote.c:10464 +#: remote.c:10526 remote.c:10554 remote.c:10643 #, possible-c-format -msgid "Remote failure: %s" +msgid "Bogus reply from target: %s" msgstr "" -#: remote-mips.c:2049 +#: remote.c:10280 #, possible-c-format -msgid "Can't read register %d: %s" +msgid "Bogus trace status reply from target: %s" msgstr "" -#: remote-mips.c:2088 +#: remote.c:10379 #, possible-c-format -msgid "Can't write register %d: %s" +msgid "Unknown trace find type %d" msgstr "" -#: remote-mips.c:2323 -msgid "Can't pass arguments to remote MIPS board; arguments ignored." +#: remote.c:10394 +msgid "Unable to parse trace frame number" msgstr "" -#: remote-mips.c:2582 -#, possible-c-format -msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s" +#: remote.c:10404 +msgid "Unable to parse tracepoint number" msgstr "" -#: 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" +#: remote.c:10456 +msgid "Remote file name too long for trace save packet" msgstr "" -#: remote-mips.c:2761 -msgid "Timeout during download." +#: remote.c:10529 +msgid "Target does not support disconnected tracing." msgstr "" -#: remote-mips.c:2771 -#, possible-c-format -msgid "Download got unexpected ack char: 0x%x, retrying." +#. set/show remote ... +#. allow-unknown +#: remote.c:10988 remote.c:10994 +msgid "" +"Remote protocol specific variables\n" +"Configure various remote-protocol specific variables such as\n" +"the packets being used" msgstr "" -#: remote-mips.c:3520 -msgid "mips_load: Couldn't get into monitor mode." +#. allow-unknown +#: remote.c:11001 +msgid "" +"Compare section data on target to the exec file.\n" +"Argument is a single section name (default: all loaded sections)." msgstr "" -#: remote-mips.c:3678 -msgid "Set timeout in seconds for remote MIPS serial I/O." +#: remote.c:11006 +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-mips.c:3679 -msgid "Show timeout in seconds for remote MIPS serial I/O." +#: remote.c:11015 +msgid "Set whether to send break if interrupted." msgstr "" -#: remote-mips.c:3686 -msgid "Set retransmit timeout in seconds for remote MIPS serial I/O." +#: remote.c:11016 +msgid "Show whether to send break if interrupted." msgstr "" -#: remote-mips.c:3687 -msgid "Show retransmit timeout in seconds for remote MIPS serial I/O." +#: remote.c:11017 +msgid "If set, a break, instead of a cntrl-c, is sent to the remote target." msgstr "" -#: remote-mips.c:3688 -msgid "" -"This is the number of seconds to wait for an acknowledgement to a packet\n" -"before resending the packet." +#: remote.c:11030 +msgid "Set interrupt sequence to remote target." msgstr "" -#: remote-mips.c:3696 +#: remote.c:11031 +msgid "Show interrupt sequence to remote target." +msgstr "" + +#: remote.c:11032 msgid "" -"Set the maximum number of characters to ignore when scanning for a SYN." +"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-" +"C\"." msgstr "" -#: remote-mips.c:3697 +#: remote.c:11039 msgid "" -"Show the maximum number of characters to ignore when scanning for a SYN." +"Set whether interrupt-sequence is sent to remote target when gdb connects to." msgstr "" -#: remote-mips.c:3698 +#: remote.c:11040 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.)" +"\t\tShow whether interrupt-sequence is sent to remote target when gdb " +"connects to." msgstr "" -#: remote-mips.c:3708 -msgid "Set the prompt that GDB expects from the monitor." +#: remote.c:11041 +msgid "\t\tIf set, interrupt sequence is sent to remote target." msgstr "" -#: remote-mips.c:3709 -msgid "Show the prompt that GDB expects from the monitor." +#. Install commands for configuring memory read/write packets. +#: remote.c:11048 +msgid "Set the maximum number of bytes per memory write packet (deprecated)." msgstr "" -#: remote-mips.c:3716 -msgid "Set printing of monitor warnings." +#: remote.c:11051 +msgid "" +"Show the maximum number of bytes per memory write packet (deprecated)." msgstr "" -#: remote-mips.c:3717 -msgid "Show printing of monitor warnings." +#: remote.c:11055 +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-mips.c:3718 +#: remote.c:11063 msgid "" -"When enabled, monitor warnings about hardware breakpoints will be displayed." +"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-mips.c:3725 -msgid "Send a packet to PMON (must be in debug mode)." +#: remote.c:11072 +msgid "Show the maximum number of bytes per memory-write packet." msgstr "" -#: remote-mips.c:3727 -msgid "" -"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON " -"targets." +#: remote.c:11076 +msgid "Show the maximum number of bytes per memory-read packet." msgstr "" -#: remote-mips.c:3728 -msgid "" -"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON " -"targets." +#: remote.c:11080 +msgid "Set the maximum number of target hardware watchpoints." msgstr "" -#: remote-mips.c:3729 -msgid "Use \"on\" to enable the masking and \"off\" to disable it." +#: remote.c:11081 +msgid "Show the maximum number of target hardware watchpoints." msgstr "" -#: remote-sim.c:187 -#, possible-c-format -msgid "Unable to create simulator instance for inferior %d." +#: remote.c:11082 remote.c:11091 remote.c:11100 +msgid "Specify a negative limit for unlimited." msgstr "" -#: 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.)" +#: remote.c:11089 +msgid "Set the maximum length (in bytes) of a target hardware watchpoint." msgstr "" -#: remote-sim.c:529 -msgid "Register size different to expected" +#: remote.c:11090 +msgid "Show the maximum length (in bytes) of a target hardware watchpoint." msgstr "" -#: remote-sim.c:532 -#, possible-c-format -msgid "Register %d not updated" +#: remote.c:11098 +msgid "Set the maximum number of target hardware breakpoints." msgstr "" -#: remote-sim.c:534 -#, possible-c-format -msgid "Register %s not updated" +#: remote.c:11099 +msgid "Show the maximum number of target hardware breakpoints." msgstr "" -#: remote-sim.c:573 -msgid "program to load" +#: remote.c:11108 +msgid "Set the maximum size of the address (in bits) in a memory packet." msgstr "" -#: remote-sim.c:581 -msgid "GDB sim does not yet support a load offset." +#: remote.c:11109 +msgid "Show the maximum size of the address (in bits) in a memory packet." msgstr "" -#: remote-sim.c:590 -msgid "unable to load program" +#: remote.c:11270 +msgid "Set use of remote protocol `Z' packets" msgstr "" -#: remote-sim.c:617 -msgid "No executable file specified." +#: remote.c:11271 +msgid "Show use of remote protocol `Z' packets " msgstr "" -#: remote-sim.c:619 remote-sim.c:1085 -msgid "No program loaded." +#: remote.c:11272 +msgid "" +"When set, GDB will attempt to use the remote breakpoint and watchpoint\n" +"packets." msgstr "" -#: remote-sim.c:728 -msgid "unable to create simulator instance" +#: remote.c:11281 +msgid "" +"Manipulate files on the remote system\n" +"Transfer files to and from the remote target system." msgstr "" -#: remote-sim.c:855 -#, possible-c-format -msgid "gdbsim_resume: pid %d, step %d, signal %d\n" +#: remote.c:11288 +msgid "Copy a local file to the remote system." msgstr "" -#: remote-sim.c:934 -#, possible-c-format -msgid "Can't stop pid %d. No inferior found." +#: remote.c:11292 +msgid "Copy a remote file to the local system." msgstr "" -#: remote-sim.c:991 -#, possible-c-format -msgid "Unable to wait for pid %d. Inferior not found." +#: remote.c:11296 +msgid "Delete a remote file." 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:1188 -msgid "Not connected to the simulator target" +#: remote.c:11301 +msgid "Set the remote pathname for \"run\"" msgstr "" -#: remote-sim.c:1310 -msgid "Send a command to the simulator." +#: remote.c:11302 +msgid "Show the remote pathname for \"run\"" msgstr "" #: reverse.c:53 @@ -19832,66 +19807,6 @@ msgid "Print DOS serial port status." msgstr "" -#: 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 "" @@ -19984,26 +19899,64 @@ "when debugging using remote targets." msgstr "" -#: sh64-tdep.c:1591 -msgid "sh64_register_convert_to_virtual called with non DR register number" +#: serial.c:389 +msgid "serial_readchar: blocking read in async mode" msgstr "" -#: sh64-tdep.c:1616 -msgid "sh64_register_convert_to_raw called with non DR register number" +#: serial.c:568 +msgid "serial: FD not valid" msgstr "" -#: sh64-tdep.c:2096 -#, possible-c-format -msgid "Invalid pseudo register number %d\n" +#: serial.c:701 serial.c:739 +msgid "connect" msgstr "" -#: sh64-tdep.c:2191 -#, possible-c-format -msgid "Invalid register number %d\n" +#: serial.c:774 +msgid "" +"Connect the terminal directly up to the command monitor.\n" +"Use ~. or ~^D to break out." msgstr "" -#: sh64-tdep.c:2275 -msgid "Not a valid register for the current processor mode." +#: 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 "" #: sh-tdep.c:2276 @@ -20028,6 +19981,28 @@ "renesas - Enforce Renesas calling convention." msgstr "" +#: sh64-tdep.c:1591 +msgid "sh64_register_convert_to_virtual called with non DR register number" +msgstr "" + +#: sh64-tdep.c:1616 +msgid "sh64_register_convert_to_raw called with non DR register number" +msgstr "" + +#: 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 "" + #: skip.c:99 msgid "No default file now." msgstr "" @@ -20168,136 +20143,126 @@ "\tfunction - ignored function" msgstr "" -#: solib.c:103 +#: 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:427 +#: 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:434 +#: 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:476 -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:619 +#: 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:625 +#: 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:810 solib.c:1261 -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:826 +#: 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:831 -#, 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:915 +#: sol-thread.c:467 #, possible-c-format -msgid "Symbols already loaded for %s\n" -msgstr "" - -#: solib.c:1044 -msgid "No shared libraries matched.\n" +msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s" msgstr "" -#: solib.c:1047 -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:1053 -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:1333 +#: 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:1458 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:1460 -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:1462 -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:1465 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:1466 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: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'." +#: sol-thread.c:575 +#, possible-c-format +msgid "sol_thread_store_registers: td_thr_getxregs %s" msgstr "" -#: solib.c:1478 -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:1479 -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: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'." +#: sol-thread.c:661 +#, possible-c-format +msgid "sol_thread_new_objfile: td_init: %s" msgstr "" -#: solib.c:1494 -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:1496 -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:1498 -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 "" #: solib-darwin.c:456 @@ -20709,126 +20674,136 @@ msgid "Could not relocate shared library \"%s\": bad offsets" msgstr "" -#: sol-thread.c:260 +#: solib.c:103 #, possible-c-format -msgid "thread_to_lwp: td_ta_map_id2thr %s" +msgid "" +"The search path for loading non-absolute shared library symbol files is %s.\n" msgstr "" -#: sol-thread.c:266 +#: solib.c:427 #, possible-c-format -msgid "thread_to_lwp: td_thr_get_info: %s" +msgid "`%s': not in executable format: %s" msgstr "" -#: sol-thread.c:272 +#: solib.c:434 #, possible-c-format -msgid "thread_to_lwp: thread state not active: %s" +msgid "" +"`%s': Shared library architecture %s is not compatible with target " +"architecture %s." msgstr "" -#: sol-thread.c:303 -#, possible-c-format -msgid "lwp_to_thread: td_ta_map_lwp2thr: %s." +#: solib.c:476 +msgid "Shared library file name is too long." msgstr "" -#: sol-thread.c:309 +#: solib.c:619 #, possible-c-format -msgid "lwp_to_thread: td_thr_validate: %s." +msgid "Error while reading shared library symbols for %s:\n" msgstr "" -#: sol-thread.c:315 +#: solib.c:625 #, possible-c-format -msgid "lwp_to_thread: td_thr_get_info: %s." +msgid "Loaded symbols for %s\n" msgstr "" -#. Inactive thread. -#: sol-thread.c:367 sol-thread.c:403 -msgid "This version of Solaris can't start inactive threads." +#: solib.c:810 solib.c:1261 +msgid "Error while mapping shared library sections:\n" msgstr "" -#: sol-thread.c:369 sol-thread.c:405 +#: solib.c:826 #, possible-c-format -msgid "Specified thread %ld seems to have terminated" +msgid "" +"Could not load shared library symbols for %s.\n" +"Do you need \"set solib-search-path\" or \"set sysroot\"?" msgstr "" -#: sol-thread.c:463 -msgid "sol_thread_fetch_registers: thread == 0" +#: solib.c:831 +#, 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\"?" msgstr "" -#: sol-thread.c:467 +#: solib.c:915 #, possible-c-format -msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s" +msgid "Symbols already loaded for %s\n" msgstr "" -#: sol-thread.c:474 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getgregs %s" +#: solib.c:1044 +msgid "No shared libraries matched.\n" msgstr "" -#: sol-thread.c:484 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getfpregs %s" +#: solib.c:1047 +msgid "No shared libraries loaded at this time.\n" msgstr "" -#: sol-thread.c:498 -#, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getxregsize %s" +#: solib.c:1053 +msgid "(*): Shared library is missing debugging information.\n" msgstr "" -#: sol-thread.c:506 +#: solib.c:1333 #, possible-c-format -msgid "sol_thread_fetch_registers: td_thr_getxregs %s" +msgid "Autoloading of shared library symbols is %s.\n" msgstr "" -#: sol-thread.c:540 -#, possible-c-format -msgid "sol_thread_store_registers: td_ta_map_id2thr %s" +#: solib.c:1458 xcoffsolib.c:165 +msgid "Load shared object library symbols for files matching REGEXP." msgstr "" -#: sol-thread.c:553 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getgregs %s" +#: solib.c:1460 +msgid "Status of loaded shared object libraries." msgstr "" -#: sol-thread.c:557 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getfpregs %s" +#: solib.c:1462 +msgid "Unload all shared object library symbols." msgstr "" -#: sol-thread.c:567 sol-thread.c:597 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getxregsize %s" +#: solib.c:1465 xcoffsolib.c:170 +msgid "Set autoloading of shared library symbols." msgstr "" -#: sol-thread.c:575 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_getxregs %s" +#: solib.c:1466 xcoffsolib.c:171 +msgid "Show autoloading of shared library symbols." msgstr "" -#: sol-thread.c:586 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_setgregs %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:590 -#, possible-c-format -msgid "sol_thread_store_registers: td_thr_setfpregs %s" +#: solib.c:1478 +msgid "Set an alternate system root." msgstr "" -#: sol-thread.c:661 -#, possible-c-format -msgid "sol_thread_new_objfile: td_init: %s" +#: solib.c:1479 +msgid "Show the current system root." msgstr "" -#: sol-thread.c:689 -#, possible-c-format -msgid "Cannot initialize thread debugging library: %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:1274 -msgid "info sol-thread: failed to get info for thread." +#: solib.c:1494 +msgid "" +"Set the search path for loading non-absolute shared library symbol files." msgstr "" -#: sol-thread.c:1387 -msgid "Show info on Solaris user threads." +#: 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 "" #: somread.c:74 @@ -21678,6 +21653,39 @@ 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." +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 "" + #: symfile.c:162 #, possible-c-format msgid "Dynamic symbol table reloading multiple times in one run is %s.\n" @@ -21999,46 +22007,6 @@ "directory as the binary, then in the `" msgstr "" -#: 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" @@ -22238,17 +22206,109 @@ msgid "Section index is uninitialized" msgstr "" -#: target.c:212 +#: 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-descriptions.c:1728 +msgid "Show the file to read for an XML target description" +msgstr "" + +#: target-descriptions.c:1729 +msgid "" +"When set, GDB will read the target description from a local\n" +"file instead of querying the remote target." +msgstr "" + +#: 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-descriptions.c:1741 +msgid "Print the current target description as a C source file." +msgstr "" + +#: target-memory.c:430 +msgid "Error writing data to flash" +msgstr "" + +#: target.c:213 #, possible-c-format msgid "Target debugging is %s.\n" msgstr "" -#: target.c:243 +#: target.c:244 #, possible-c-format msgid "Cache use for stack accesses is %s.\n" msgstr "" -#: target.c:426 +#: target.c:427 msgid "" "Connect to a target machine or process.\n" "The first argument is the type or protocol of the target machine.\n" @@ -22257,42 +22317,42 @@ "`help target ' followed by the protocol name." msgstr "" -#: target.c:488 +#: target.c:489 msgid "could not find a target to create inferior" msgstr "" -#: target.c:517 +#: target.c:518 #, possible-c-format msgid "You can't do that when your target is `%s'" msgstr "" -#: target.c:530 +#: target.c:531 msgid "No saved terminal information.\n" msgstr "" -#: target.c:1002 +#: target.c:1003 msgid "Attempt to unpush the dummy target" msgstr "" -#: target.c:1129 +#: target.c:1130 msgid "TLS load module not found" msgstr "" -#: target.c:1143 +#: target.c:1144 msgid "Cannot find thread-local variables in this thread library." msgstr "" -#: target.c:1148 +#: target.c:1149 #, possible-c-format msgid "Cannot find shared library `%s' in dynamic linker's load module list" msgstr "" -#: target.c:1151 +#: target.c:1152 #, possible-c-format msgid "Cannot find executable file `%s' in dynamic linker's load module list" msgstr "" -#: target.c:1156 +#: target.c:1157 #, possible-c-format msgid "" "The inferior has not yet allocated storage for thread-local variables in\n" @@ -22300,7 +22360,7 @@ "for %s" msgstr "" -#: target.c:1162 +#: target.c:1163 #, possible-c-format msgid "" "The inferior has not yet allocated storage for thread-local variables in\n" @@ -22308,90 +22368,90 @@ "for %s" msgstr "" -#: target.c:1170 +#: target.c:1171 #, possible-c-format msgid "" "Cannot find thread-local storage for %s, shared library %s:\n" "%s" msgstr "" -#: target.c:1175 +#: target.c:1176 #, possible-c-format msgid "" "Cannot find thread-local storage for %s, executable file %s:\n" "%s" msgstr "" -#: target.c:1189 +#: target.c:1190 msgid "Cannot find thread-local variables on this target" msgstr "" -#: target.c:1515 +#: target.c:1516 msgid "Writing to flash memory forbidden in this context" msgstr "" -#: target.c:1667 +#: target.c:1668 #, possible-c-format msgid "Writing to memory is not allowed (addr %s, len %s)" msgstr "" -#: target.c:1850 +#: target.c:1851 msgid "Overlapping regions in memory map: ignoring" msgstr "" -#: target.c:1900 +#: target.c:1901 #, possible-c-format msgid "Mode for reading from readonly sections is %s.\n" msgstr "" -#: target.c:2360 +#: target.c:2365 #, possible-c-format msgid "target object %d, annex %s, contained unexpected null characters" msgstr "" -#: target.c:2399 +#: target.c:2406 msgid "May not insert breakpoints" msgstr "" -#: target.c:2416 +#: target.c:2423 msgid "May not remove breakpoints" msgstr "" -#: target.c:2430 +#: target.c:2437 #, possible-c-format msgid "Symbols from \"%s\".\n" msgstr "" -#: target.c:2440 +#: target.c:2447 msgid "\tWhile running this, GDB does not access memory from...\n" msgstr "" -#: target.c:2525 +#: target.c:2532 msgid "Program not killed." msgstr "" -#: target.c:2567 +#: target.c:2574 msgid "could not find a target to detach" msgstr "" -#: target.c:2733 +#: target.c:2740 msgid "could not find a target to follow fork" msgstr "" -#: target.c:2759 +#: target.c:2766 msgid "could not find a target to follow mourn inferior" msgstr "" -#: target.c:2810 +#: target.c:2817 msgid "Unable to allocate memory to perform the search." msgstr "" -#: target.c:2818 target.c:2872 +#: target.c:2825 target.c:2879 #, possible-c-format msgid "Unable to access target memory at %s, halting search." msgstr "" -#: target.c:2961 +#: target.c:2968 #, possible-c-format msgid "" "The \"%s\" target does not support \"run\". Try \"help target\" or " @@ -22401,289 +22461,202 @@ #. 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:2969 +#: target.c:2976 msgid "No targets found" msgstr "" -#: target.c:3001 +#: target.c:3008 #, possible-c-format msgid "Don't know how to %s. Try \"help target\"." msgstr "" -#: target.c:3156 +#: target.c:3195 #, possible-c-format msgid "Can't determine the current address space of thread %s\n" msgstr "" -#: target.c:3307 target.c:3315 +#: target.c:3490 +#, possible-c-format +msgid "target file %s contained unexpected null characters" +msgstr "" + +#: target.c:3644 target.c:3652 msgid "Command not implemented for this target." msgstr "" -#: target.c:3409 +#: target.c:3746 msgid "could not find a target to attach" msgstr "" -#: target.c:3458 +#: target.c:3795 msgid "May not interrupt or stop the target, ignoring attempt" msgstr "" -#: target.c:3577 +#: target.c:3914 #, possible-c-format msgid "Writing to registers is not allowed (regno %d)" msgstr "" -#: target.c:4240 +#: target.c:4577 msgid "\"monitor\" command not supported by this target." msgstr "" -#: target.c:4251 +#: target.c:4588 msgid "The current target stack is:\n" msgstr "" -#: target.c:4285 +#: target.c:4622 #, possible-c-format msgid "Controlling the inferior in asynchronous mode is %s.\n" msgstr "" -#: target.c:4354 +#: target.c:4691 msgid "Set target debugging." msgstr "" -#: target.c:4355 +#: target.c:4692 msgid "Show target debugging." msgstr "" -#: target.c:4356 +#: target.c:4693 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:4365 +#: target.c:4702 msgid "Set mode for reading from readonly sections." msgstr "" -#: target.c:4366 +#: target.c:4703 msgid "Show mode for reading from readonly sections." msgstr "" -#: target.c:4367 +#: target.c:4704 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:4376 +#: target.c:4713 msgid "Send a command to the remote monitor (remote targets only)." msgstr "" -#: target.c:4379 +#: target.c:4716 msgid "Print the name of each layer of the internal target stack." msgstr "" -#: target.c:4383 +#: target.c:4720 msgid "Set whether gdb controls the inferior in asynchronous mode." msgstr "" -#: target.c:4384 +#: target.c:4721 msgid "Show whether gdb controls the inferior in asynchronous mode." msgstr "" -#: target.c:4385 +#: target.c:4722 msgid "Tells gdb whether to control the inferior in asynchronous mode." msgstr "" -#: target.c:4393 -msgid "Set cache use for stack access." -msgstr "" - -#: target.c:4394 -msgid "Show cache use for stack access." -msgstr "" - -#: 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:4404 -msgid "Set permission to write into registers." -msgstr "" - -#: target.c:4405 -msgid "Show permission to write into registers." -msgstr "" - -#: 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:4413 -msgid "Set permission to write into target memory." -msgstr "" - -#: target.c:4414 -msgid "Show permission to write into target memory." -msgstr "" - -#: 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:4422 -msgid "Set permission to insert breakpoints in the target." -msgstr "" - -#: target.c:4423 -msgid "Show permission to insert breakpoints in the target." -msgstr "" - -#: 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:4431 -msgid "Set permission to insert tracepoints in the target." -msgstr "" - -#: target.c:4432 -msgid "Show permission to insert tracepoints in the target." -msgstr "" - -#: 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: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." +#: target.c:4730 +msgid "Set cache use for stack access." msgstr "" -#: target-descriptions.c:306 -msgid "Architecture rejected target-supplied description" +#: target.c:4731 +msgid "Show cache use for stack access." msgstr "" -#: target-descriptions.c:314 +#: target.c:4732 msgid "" -"Target-supplied registers are not supported by the current architecture" +"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-descriptions.c:341 -msgid "Could not remove target-supplied description" +#: target.c:4741 +msgid "Set permission to write into registers." msgstr "" -#: target-descriptions.c:932 target-descriptions.c:954 -#, possible-c-format -msgid "Register \"%s\" has an unsupported size (%d bits)" +#: target.c:4742 +msgid "Show permission to write into registers." msgstr "" -#: target-descriptions.c:1445 -#, possible-c-format -msgid "Attempted to add duplicate compatible architecture \"%s\"" +#: target.c:4743 +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-descriptions.c:1465 -#, possible-c-format -msgid "Attempted to add duplicate property \"%s\"" +#: target.c:4750 +msgid "Set permission to write into target memory." msgstr "" -#: target-descriptions.c:1523 -#, possible-c-format -msgid "The target description will be read from \"%s\".\n" +#: target.c:4751 +msgid "Show permission to write into target memory." msgstr "" -#: target-descriptions.c:1526 -msgid "The target description will be read from the target.\n" +#: target.c:4752 +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-descriptions.c:1560 -msgid "There is no target description to print." +#: target.c:4759 +msgid "Set permission to insert breakpoints in the target." msgstr "" -#: target-descriptions.c:1563 -msgid "The current target description did not come from an XML file." +#: target.c:4760 +msgid "Show permission to insert breakpoints in the target." msgstr "" -#: target-descriptions.c:1679 -#, possible-c-format -msgid "C output is not supported type \"%s\"." +#: target.c:4761 +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-descriptions.c:1712 -msgid "Set target description specific variables." +#: target.c:4768 +msgid "Set permission to insert tracepoints in the target." msgstr "" -#. allow-unknown -#: target-descriptions.c:1716 -msgid "Show target description specific variables." +#: target.c:4769 +msgid "Show permission to insert tracepoints in the target." msgstr "" -#. allow-unknown -#: target-descriptions.c:1720 -msgid "Unset target description specific variables." +#: target.c:4770 +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-descriptions.c:1727 -msgid "Set the file to read for an XML target description" +#: target.c:4777 +msgid "Set permission to insert fast tracepoints in the target." msgstr "" -#: target-descriptions.c:1728 -msgid "Show the file to read for an XML target description" +#: target.c:4778 +msgid "Show permission to insert fast tracepoints in the target." msgstr "" -#: target-descriptions.c:1729 +#: target.c:4779 msgid "" -"When set, GDB will read the target description from a local\n" -"file instead of querying the remote target." +"When this permission is on, GDB may insert fast tracepoints.\n" +"Otherwise, any sort of insertion attempt will result in an error." msgstr "" -#: 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." +#: target.c:4786 +msgid "Set permission to interrupt or signal the target." msgstr "" -#: target-descriptions.c:1741 -msgid "Print the current target description as a C source file." +#: target.c:4787 +msgid "Show permission to interrupt or signal the target." msgstr "" -#: target-memory.c:430 -msgid "Error writing data to flash" +#: target.c:4788 +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 "" #: thread.c:239 @@ -23815,32 +23788,8 @@ 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-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" +#: tui/tui.c:368 +msgid "TUI mode not allowed" msgstr "" #: tui/tui-hooks.c:80 @@ -23851,10 +23800,6 @@ 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" @@ -23892,60 +23837,6 @@ "%s" msgstr "" -#: tui/tui-regs.c:624 -msgid "\"tui reg\" must be followed by the name of a tui reg command.\n" -msgstr "" - -#: tui/tui-regs.c:640 -msgid "TUI commands to control the register window." -msgstr "" - -#: tui/tui-regs.c:645 -msgid "Display only floating point registers." -msgstr "" - -#: tui/tui-regs.c:648 -msgid "Display only general registers." -msgstr "" - -#: tui/tui-regs.c:651 -msgid "Display only system registers." -msgstr "" - -#: tui/tui-regs.c:654 -msgid "Display next register group." -msgstr "" - -#: tui/tui-regs.c:660 -msgid "Display only floating point registers\n" -msgstr "" - -#: tui/tui-regs.c:662 -msgid "Display only general registers\n" -msgstr "" - -#: tui/tui-regs.c:664 -msgid "Display only special registers\n" -msgstr "" - -#: 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:211 #, possible-c-format msgid "" @@ -24126,8 +24017,90 @@ "%s" msgstr "" -#: tui/tui.c:368 -msgid "TUI mode not allowed" +#: tui/tui-file.c:80 +msgid "tui_file_delete: bad magic number" +msgstr "" + +#: 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-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-interp.c:140 +msgid "tui_exec called" +msgstr "" + +#: tui/tui-regs.c:624 +msgid "\"tui reg\" must be followed by the name of a tui reg command.\n" +msgstr "" + +#: tui/tui-regs.c:640 +msgid "TUI commands to control the register window." +msgstr "" + +#: tui/tui-regs.c:645 +msgid "Display only floating point registers." +msgstr "" + +#: tui/tui-regs.c:648 +msgid "Display only general registers." +msgstr "" + +#: tui/tui-regs.c:651 +msgid "Display only system registers." +msgstr "" + +#: tui/tui-regs.c:654 +msgid "Display next register group." +msgstr "" + +#: tui/tui-regs.c:660 +msgid "Display only floating point registers\n" +msgstr "" + +#: tui/tui-regs.c:662 +msgid "Display only general registers\n" +msgstr "" + +#: tui/tui-regs.c:664 +msgid "Display only special registers\n" +msgstr "" + +#: 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 "" #: typeprint.c:265 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-runtime.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gettext-runtime.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-runtime.po 2012-02-23 07:11:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gettext-runtime.po 2012-03-23 07:32:51.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: 2012-02-21 17:59+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnulib-lib/closeout.c:66 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-tools.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gettext-tools.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gettext-tools.po 2012-02-23 07:11:29.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gettext-tools.po 2012-03-23 07:32:52.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: 2012-02-21 17:59+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnulib-lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggz-config.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ggz-config.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggz-config.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ggz-config.po 2012-03-23 07:33:00.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: 2012-02-21 19:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:31+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../../ggz-config/ggz-config.c:97 msgid "Query GGZCONFDIR - location of configuration directory" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggzcore.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ggzcore.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ggzcore.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ggzcore.po 2012-03-23 07:33:00.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: 2012-02-21 19:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:31+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../../ggzcore/server.c:872 msgid "Unknown negotation" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/git-gui.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/git-gui.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/git-gui.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/git-gui.po 2012-03-23 07:33:00.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: 2012-02-21 19:17+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:31+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/glance.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/glance.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/glance.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/glance.po 2012-03-23 07:33:46.000000000 +0000 @@ -0,0 +1,1244 @@ +# Chinese (Simplified) translation for glance +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the glance package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: glance\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-19 17:19-0800\n" +"PO-Revision-Date: 2012-03-21 17:44+0000\n" +"Last-Translator: FULL NAME \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-03-23 01:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#: glance/api/middleware/cache.py:50 +msgid "Initialized image cache middleware" +msgstr "已初始化镜像缓存中间件" + +#: glance/api/middleware/cache.py:77 +#, python-format +msgid "Cache hit for image '%s'" +msgstr "命中镜像'%s'的缓存" + +#: glance/api/middleware/cache.py:93 +#, python-format +msgid "" +"Image cache contained image file for image '%s', however the registry did " +"not contain metadata for that image!" +msgstr "镜像缓存中包含'%s'的镜像文件，但是注册表不包含此镜像的元数据！" + +#: glance/api/middleware/cache.py:121 +#, python-format +msgid "Removing image %s from cache" +msgstr "正在从缓存中删除镜像 %s" + +#: glance/api/middleware/cache_manage.py:70 +msgid "Initialized image cache management middleware" +msgstr "已初始化镜像缓存管理中间件" + +#: glance/api/middleware/version_negotiation.py:53 +#, python-format +msgid "Processing request: %(method)s %(path)s Accept: %(accept)s" +msgstr "正在处理请求：%(method)s %(path)s Accept: %(accept)s" + +#: glance/api/middleware/version_negotiation.py:66 +#, python-format +msgid "Matched versioned URI. Version: %d.%d" +msgstr "匹配版本的URI。版本：%d.%d" + +#: glance/api/middleware/version_negotiation.py:73 +#, python-format +msgid "Unknown version in versioned URI: %d.%d. Returning version choices." +msgstr "未知版本的URI：%d.%d。正返回版本选项。" + +#: glance/api/middleware/version_negotiation.py:87 +#, python-format +msgid "Matched versioned media type. Version: %d.%d" +msgstr "匹配版本的媒体类型。版本：%d.%d" + +#: glance/api/middleware/version_negotiation.py:93 +#, python-format +msgid "Unknown version in accept header: %d.%d...returning version choices." +msgstr "在接收消息头里有未知版本：%d.%d...正在返回版本选项。" + +#: glance/api/middleware/version_negotiation.py:100 +#, python-format +msgid "Unknown accept header: %s...returning version choices." +msgstr "未知的接收消息头：%s...正在返回版本选项。" + +#: glance/api/v1/controller.py:43 glance/api/v1/members.py:37 +#, python-format +msgid "Image with identifier %s not found" +msgstr "未找到标识为 %s 的镜像" + +#: glance/api/v1/controller.py:48 glance/api/v1/members.py:41 +msgid "Unauthorized image access" +msgstr "未授权的镜像访问" + +#: glance/api/v1/controller.py:60 +#, python-format +msgid "Image %s is not active" +msgstr "镜像 %s 不是活动状态" + +#: glance/api/v1/images.py:292 +#, python-format +msgid "An image with identifier %s already exists" +msgstr "已经存在标识为 %s 的镜像" + +#: glance/api/v1/images.py:297 +#, python-format +msgid "Failed to reserve image. Got error: %(e)s" +msgstr "保存镜像失败。发生错误：%(e)s" + +#: glance/api/v1/images.py:302 +msgid "Not authorized to reserve image." +msgstr "未经授权保存镜像" + +#: glance/api/v1/images.py:324 +msgid "Content-Type must be application/octet-stream" +msgstr "Content-Type 必须为 application/octet-stream" + +#: glance/api/v1/images.py:334 +#, python-format +msgid "Setting image %s to status 'saving'" +msgstr "设置镜像 %s 的状态为 'saving'" + +#: glance/api/v1/images.py:338 +#, python-format +msgid "Uploading image data for image %(image_id)s to %(store_name)s store" +msgstr "正在上传镜像 %(image_id)s 的数据至存储 %(store_name)s。" + +#: glance/api/v1/images.py:345 +msgid "Got request with no content-length and no x-image-meta-size header" +msgstr "收到没有 content-length 和 x-image-meta-size 消息头的请求" + +#: glance/api/v1/images.py:351 +#, python-format +msgid "" +"Denying attempt to upload image larger than %(max_image_size)d. Supplied " +"image size was %(image_size)d" +msgstr "拒绝上传大于 %(max_image_size)d 的镜像。提供的镜像大小为 %(image_size)d" + +#: glance/api/v1/images.py:365 +#, python-format +msgid "" +"Supplied checksum (%(supplied_checksum)s) and checksum generated from " +"uploaded image (%(checksum)s) did not match. Setting image status to " +"'killed'." +msgstr "" +"提供的校验和(%(supplied_checksum)s)与从所上传镜像产生的校验和(%(checksum)s)不匹配。设置镜像状态为 'killed'。" + +#: glance/api/v1/images.py:376 +#, python-format +msgid "" +"Updating image %(image_id)s data. Checksum set to %(checksum)s, size set to " +"%(size)d" +msgstr "正在更新镜像 %(image_id)s 的数据。校验和设置为 %(checksum)s，大小设置为 %(size)d" + +#: glance/api/v1/images.py:387 +#, python-format +msgid "Attempt to upload duplicate image: %s" +msgstr "尝试上传重复镜像：%s" + +#: glance/api/v1/images.py:394 +#, python-format +msgid "Unauthorized upload attempt: %s" +msgstr "未授权的上传尝试：%s" + +#: glance/api/v1/images.py:402 +#, python-format +msgid "Image storage media is full: %s" +msgstr "镜像存储介质已满：%s" + +#: glance/api/v1/images.py:410 +#, python-format +msgid "Insufficient permissions on image storage media: %s" +msgstr "没有足够的权限访问镜像存储介质：%s" + +#: glance/api/v1/images.py:428 +#, python-format +msgid "Error uploading image: (%(class_name)s): %(exc)s" +msgstr "上传镜像时发生错误：(%(class_name)s): %(exc)s" + +#: glance/api/v1/images.py:473 +#, python-format +msgid "Unable to kill image %(id)s: %(exc)s" +msgstr "无法删除镜像 %(id)s: %(exc)s" + +#: glance/api/v1/images.py:532 glance/api/v1/images.py:564 +#: glance/api/v1/images.py:637 +msgid "Read-only access" +msgstr "只读访问" + +#: glance/api/v1/images.py:585 +msgid "Cannot upload to an unqueued image" +msgstr "无法上传没有排队的镜像" + +#: glance/api/v1/images.py:591 +msgid "Attempted to update Location field for an image not in queued status." +msgstr "试图更新不在排队状态的镜像的 Location 字段信息" + +#: glance/api/v1/images.py:602 glance/registry/api/v1/images.py:392 +#, python-format +msgid "Failed to update image metadata. Got error: %(e)s" +msgstr "无法更新镜像的元数据。发生错误：%(e)s" + +#: glance/api/v1/images.py:644 +msgid "Image is protected" +msgstr "镜像受保护" + +#: glance/api/v1/images.py:680 +#, python-format +msgid "Requested store %s not available on this Glance server" +msgstr "在这个Glance服务器上所请求的存储 %s 不可用" + +#: glance/api/v1/images.py:696 +#, python-format +msgid "Default store %s not available on this Glance server\n" +msgstr "在这个Glance服务器上缺省的存储 %s 不可用\n" + +#: glance/api/v1/images.py:714 +#, python-format +msgid "Incoming image size of %s was not convertible to an integer." +msgstr "引入的镜像 %s 的大小无法转换成整数。" + +#: glance/api/v1/images.py:723 +#, python-format +msgid "" +"Denying attempt to upload image larger than %(max_image_size)d. Supplied " +"image size was %(incoming_image_size)d" +msgstr "拒绝上传大于 %(max_image_size)d 的镜像。所提供的镜像大小为 %(incoming_image_size)d" + +#: glance/api/v1/images.py:800 +#, python-format +msgid "An error occurred during image.send notification: %(err)s" +msgstr "在执行 image.send notification时发生错误：%(err)s" + +#: glance/api/v1/images.py:831 +#, python-format +msgid "" +"An error occurred reading from backend storage for image %(image_id): %(err)s" +msgstr "从后台存储读取镜像 %(image_id) 时发生错误：%(err)s" + +#: glance/api/v1/images.py:837 +#, python-format +msgid "" +"Backend storage for image %(image_id)s disconnected after writing only " +"%(bytes_written)d bytes" +msgstr "只写到 %(bytes_written)d 字节时，镜像 %(image_id)s 的后台存储中断" + +#: glance/api/v1/images.py:841 +#, python-format +msgid "Corrupt image download for image %(image_id)s" +msgstr "镜像%(image_id)s 的下载损坏" + +#: glance/api/v1/members.py:53 glance/api/v1/members.py:88 +#: glance/api/v1/members.py:124 glance/registry/api/v1/members.py:70 +#: glance/registry/api/v1/members.py:173 glance/registry/api/v1/members.py:228 +msgid "No authenticated user" +msgstr "未认证的用户" + +#: glance/common/auth.py:168 glance/common/auth.py:213 +#, python-format +msgid "Unexpected response: %s" +msgstr "意外的响应：%s" + +#: glance/common/auth.py:235 +#, python-format +msgid "Unknown auth strategy '%s'" +msgstr "未知的授权策略'%s'" + +#: glance/common/client.py:267 +msgid "" +"You have selected to use SSL in connecting, and you have supplied a cert, " +"however you have failed to supply either a key_file parameter or set the " +"GLANCE_CLIENT_KEY_FILE environ variable" +msgstr "" +"您已选择使用SSL进行连接，您虽然已提供了证书，但是您未能提供 key_file 参数或者设置 GLANCE_CLIENT_KEY_FILE 环境变量" + +#: glance/common/client.py:275 +msgid "" +"You have selected to use SSL in connecting, and you have supplied a key, " +"however you have failed to supply either a cert_file parameter or set the " +"GLANCE_CLIENT_CERT_FILE environ variable" +msgstr "" +"您已选择使用SSL进行连接，您虽然已提供了密钥，但是您未能提供 cert_file 参数或者设置 GLANCE_CLIENT_CERT_FILE 环境变量" + +#: glance/common/client.py:283 +#, python-format +msgid "The key file you specified %s does not exist" +msgstr "您指定的密钥文件 %s 不存在" + +#: glance/common/client.py:289 +#, python-format +msgid "The cert file you specified %s does not exist" +msgstr "您指定的证书文件 %s 不存在" + +#: glance/common/client.py:295 +#, python-format +msgid "The CA file you specified %s does not exist" +msgstr "您指定的认证权威(CA)证书文件 %s 不存在" + +#: glance/common/config.py:90 +msgid "Invalid syslog facility" +msgstr "错误的syslog设备" + +#: glance/common/exception.py:37 +msgid "An unknown exception occurred" +msgstr "发生未知异常" + +#: glance/common/exception.py:59 +msgid "Missing required argument." +msgstr "缺少必要参数" + +#: glance/common/exception.py:63 +#, python-format +msgid "Missing required credential: %(required)s" +msgstr "缺少必要凭证：%(required)s" + +#: glance/common/exception.py:67 +msgid "An object with the specified identifier was not found." +msgstr "未找到指定标识的对象。" + +#: glance/common/exception.py:71 +#, python-format +msgid "Unknown scheme '%(scheme)s' found in URI" +msgstr "在URI中发现未知的方案( schema ) '%(scheme)s'" + +#: glance/common/exception.py:75 +#, python-format +msgid "The Store URI %(uri)s was malformed. Reason: %(reason)s" +msgstr "存储的URI %(uri)s 格式不正确。原因：%(reason)s" + +#: glance/common/exception.py:79 +msgid "An object with the same identifier already exists." +msgstr "已经存在相同标识的对象。" + +#: glance/common/exception.py:83 +msgid "There is not enough disk space on the image storage media." +msgstr "镜像存储介质没有足够的磁盘空间。" + +#: glance/common/exception.py:87 +msgid "Permission to write image storage media denied." +msgstr "拒绝写入镜像存储介质。" + +#: glance/common/exception.py:91 +#, python-format +msgid "" +"Failed to import requested object/class: '%(import_str)s'. Reason: %(reason)s" +msgstr "无法导入请求对象：'%(import_str)s'。原因：%(reason)s" + +#: glance/common/exception.py:96 +#, python-format +msgid "Connect error/bad request to Auth service at URL %(url)s." +msgstr "连接错误/错误请求，认证服务URL地址为%(url)s 。" + +#: glance/common/exception.py:100 +#, python-format +msgid "Auth service at URL %(url)s not found." +msgstr "未在URL地址 %(url)s 处找到认证服务。" + +#: glance/common/exception.py:104 +msgid "Authorization failed." +msgstr "授权失败。" + +#: glance/common/exception.py:108 glance/common/exception.py:112 +msgid "You are not authorized to complete this action." +msgstr "您未被授权来完成此操作。" + +#: glance/common/exception.py:116 +msgid "Data supplied was not valid." +msgstr "提供的数据不正确。" + +#: glance/common/exception.py:120 +#, python-format +msgid "Redirecting to %(uri)s for authorization." +msgstr "重定向至 %(uri)s 进行授权。" + +#: glance/common/exception.py:124 +msgid "There was an error migrating the database." +msgstr "迁移数据库时发生错误。" + +#: glance/common/exception.py:128 +msgid "There was an error connecting to a server" +msgstr "连接服务器时发生错误" + +#: glance/common/exception.py:132 +msgid "There was an error configuring the client." +msgstr "配置客户端时发生错误。" + +#: glance/common/exception.py:136 +#, python-format +msgid "" +"The request returned a 302 Multiple Choices. This generally means that you " +"have not included a version indicator in a request URI.\n" +"\n" +"The body of response returned:\n" +"%(body)s" +msgstr "" +"请求返回状态码 302 多个选项。这通常意味着您在请求的URI里没有包含一个版本指示。\n" +"返回的响应消息体：\n" +"%(body)s" + +#: glance/common/exception.py:142 +#, python-format +msgid "Invalid content type %(content_type)s" +msgstr "错误的内容类型 %(content_type)s" + +#: glance/common/exception.py:146 +#, python-format +msgid "" +"Registry was not configured correctly on API server. Reason: %(reason)s" +msgstr "没有正确配置API服务器上的注册表。原因：%(reason)s" + +#: glance/common/exception.py:151 +#, python-format +msgid "" +"Store %(store_name)s could not be configured correctly. Reason: %(reason)s" +msgstr "无法正确配置存储 %(store_name)s。原因：%(reason)s" + +#: glance/common/exception.py:156 +#, python-format +msgid "" +"Driver %(driver_name)s could not be configured correctly. Reason: %(reason)s" +msgstr "无法正确配置驱动 %(driver_name)s。原因：%(reason)s" + +#: glance/common/exception.py:161 +msgid "Deleting images from this store is not supported." +msgstr "不支持删除此存储中的镜像" + +#: glance/common/exception.py:165 +msgid "" +"Configuration for store failed. Adding images to this store is disabled." +msgstr "存储配置失败。禁止向此存储添加镜像。" + +#: glance/common/exception.py:170 +#, python-format +msgid "'%(strategy)s' is not an available notifier strategy." +msgstr "'%(strategy)s' 不是可用通知策略。" + +#: glance/common/exception.py:174 +#, python-format +msgid "Maximum redirects (%(redirects)s) was exceeded." +msgstr "超过最大重定向次数(%(redirects)s)" + +#: glance/common/exception.py:178 +msgid "Received invalid HTTP redirect." +msgstr "收到错误的HTTP重定向操作。" + +#: glance/common/exception.py:182 +msgid "Response from Keystone does not contain a Glance endpoint." +msgstr "Keystone的响应里没有包含Glance服务端点。" + +#: glance/common/wsgi.py:106 +msgid "" +"When running server in SSL mode, you must specify both a cert_file and " +"key_file option value in your configuration file" +msgstr "在通过SSL连接方式运行服务器时，您必须在配置文件中指定cert_file和key_file参数值" + +#: glance/common/wsgi.py:124 +#, python-format +msgid "Could not bind to %s:%s after trying for 30 seconds" +msgstr "试了30秒后无法绑定到%s:%s" + +#: glance/common/wsgi.py:155 +msgid "SIGTERM received" +msgstr "收到 SIGTERM 信号" + +#: glance/common/wsgi.py:164 +msgid "SIGHUP received" +msgstr "收到 SIGHUP 信号" + +#: glance/common/wsgi.py:180 +#, python-format +msgid "Starting %d workers" +msgstr "启动 %d 个工作线程" + +#: glance/common/wsgi.py:191 +#, python-format +msgid "Removing dead child %s" +msgstr "删除死的子线程 %s" + +#: glance/common/wsgi.py:199 +msgid "Caught keyboard interrupt. Exiting." +msgstr "捕获到键盘中断。退出中。" + +#: glance/common/wsgi.py:203 +msgid "Exited" +msgstr "已退出" + +#: glance/common/wsgi.py:221 +#, python-format +msgid "Child %d exiting normally" +msgstr "子线程 %d 正常退出" + +#: glance/common/wsgi.py:224 +#, python-format +msgid "Started child %s" +msgstr "已启动子线程 %s" + +#: glance/common/wsgi.py:243 +msgid "Starting single process server" +msgstr "正启动单进程服务器" + +#: glance/image_cache/__init__.py:57 +#, python-format +msgid "Image cache loaded driver '%s'." +msgstr "已加载镜像缓存驱动 '%s'。" + +#: glance/image_cache/__init__.py:60 +#, python-format +msgid "" +"Image cache driver '%(driver_name)s' failed to load. Got error: " +"'%(import_err)s." +msgstr "加载镜像缓存驱动'%(driver_name)s'失败。发生错误：'%(import_err)s。" + +#: glance/image_cache/__init__.py:65 glance/image_cache/__init__.py:82 +msgid "Defaulting to SQLite driver." +msgstr "使用缺省的SQLite驱动。" + +#: glance/image_cache/__init__.py:79 +#, python-format +msgid "" +"Image cache driver '%(driver_module)s' failed to configure. Got error: " +"'%(config_err)s" +msgstr "配置镜像缓存驱动'%(driver_module)s'失败。发生错误：'%(config_err)s" + +#: glance/image_cache/__init__.py:164 +msgid "Image cache has free space, skipping prune..." +msgstr "镜像缓存无可用空间，正跳过删除过程..." + +#: glance/image_cache/__init__.py:168 +#, python-format +msgid "" +"Image cache currently %(overage)d bytes over max size. Starting prune to max " +"size of %(max_size)d " +msgstr "镜像缓存目前已超过最大值 %(overage)d 个字节。开始删除镜像至最大值 %(max_size)d " + +#: glance/image_cache/__init__.py:177 +#, python-format +msgid "Pruning '%(image_id)s' to free %(size)d bytes" +msgstr "正在删除镜像 '%(image_id)s' 来释放 %(size)d 字节" + +#: glance/image_cache/__init__.py:185 +#, python-format +msgid "" +"Pruning finished pruning. Pruned %(total_files_pruned)d and " +"%(total_bytes_pruned)d." +msgstr "完成删除过程。删除文件数 %(total_files_pruned)d，字节数 %(total_bytes_pruned)d。" + +#: glance/image_cache/__init__.py:220 +#, python-format +msgid "Tee'ing image '%s' into cache" +msgstr "读取镜像'%s'至缓存" + +#: glance/image_cache/__init__.py:232 +#, python-format +msgid "" +"Exception encountered while tee'ing image '%s' into cache. Continuing with " +"response." +msgstr "读取镜像'%s'至缓存时发生异常。继续响应。" + +#: glance/image_cache/prefetcher.py:55 +#, python-format +msgid "Image '%s' is not active. Not caching." +msgstr "镜像'%s'不是活动状态。不缓存。" + +#: glance/image_cache/prefetcher.py:60 glance/image_cache/queue_image.py:52 +#, python-format +msgid "No metadata found for image '%s'" +msgstr "未找到镜像'%s'的元数据" + +#: glance/image_cache/prefetcher.py:64 +#, python-format +msgid "Caching image '%s'" +msgstr "缓存镜像'%s'" + +#: glance/image_cache/prefetcher.py:72 +msgid "Nothing to prefetch." +msgstr "没有可预取的镜像" + +#: glance/image_cache/prefetcher.py:76 +#, python-format +msgid "Found %d images to prefetch" +msgstr "发现%d个镜像可预取" + +#: glance/image_cache/prefetcher.py:82 +msgid "Failed to successfully cache all images in queue." +msgstr "无法成功缓存队列里的所有镜像。" + +#: glance/image_cache/prefetcher.py:86 +#, python-format +msgid "Successfully cached all %d images" +msgstr "成功缓存所有的 %d 个镜像" + +#: glance/image_cache/queue_image.py:47 +#, python-format +msgid "Image '%s' is not active. Not queueing." +msgstr "镜像'%s'不是活动的。不排队。" + +#: glance/image_cache/queue_image.py:55 +#, python-format +msgid "Queueing image '%s'" +msgstr "排队镜像'%s'" + +#: glance/image_cache/queue_image.py:63 +msgid "No images to queue!" +msgstr "没有可排队的镜像！" + +#: glance/image_cache/queue_image.py:66 +#, python-format +msgid "Received %d images to queue" +msgstr "收到 %d 个镜像要排队" + +#: glance/image_cache/queue_image.py:72 +msgid "Failed to successfully queue all images in queue." +msgstr "没有成功的把所有镜像放入队列。" + +#: glance/image_cache/queue_image.py:76 +#, python-format +msgid "Successfully queued all %d images" +msgstr "成功的把所有 %d 个镜像放入队列" + +#: glance/image_cache/drivers/base.py:65 +#, python-format +msgid "Failed to read %s from config" +msgstr "未能从配置中读取 %s" + +#: glance/image_cache/drivers/sqlite.py:120 +#, python-format +msgid "Failed to initialize the image cache database. Got error: %s" +msgstr "未能初始化镜像缓存数据库。发生错误：%s" + +#: glance/image_cache/drivers/sqlite.py:159 +#: glance/image_cache/drivers/xattr.py:143 +msgid "Gathering cached image entries." +msgstr "收集缓存镜像条目。" + +#: glance/image_cache/drivers/sqlite.py:294 +#: glance/image_cache/drivers/xattr.py:273 +#, python-format +msgid "Fetch finished, moving '%(incomplete_path)s' to '%(final_path)s'" +msgstr "完成读取，将 '%(incomplete_path)s' 移至 '%(final_path)s'" + +#: glance/image_cache/drivers/sqlite.py:318 +#: glance/image_cache/drivers/xattr.py:289 +#, python-format +msgid "" +"Fetch of cache file failed, rolling back by moving '%(incomplete_path)s' to " +"'%(invalid_path)s'" +msgstr "读取缓存文件失败，进行回滚操作，把 '%(incomplete_path)s' 移至 '%(invalid_path)s'" + +#: glance/image_cache/drivers/sqlite.py:372 +#, python-format +msgid "Error executing SQLite call. Got error: %s" +msgstr "执行SQLite调用时出错。错误：%s" + +#: glance/image_cache/drivers/sqlite.py:388 +#: glance/image_cache/drivers/xattr.py:327 +#, python-format +msgid "Not queueing image '%s'. Already cached." +msgstr "不对镜像 '%s' 进行排队操作。已缓存。" + +#: glance/image_cache/drivers/sqlite.py:393 +#: glance/image_cache/drivers/xattr.py:332 +#, python-format +msgid "Not queueing image '%s'. Already being written to cache" +msgstr "不对镜像 '%s' 进行排队操作。已经在写入缓存" + +#: glance/image_cache/drivers/sqlite.py:399 +#: glance/image_cache/drivers/xattr.py:338 +#, python-format +msgid "Not queueing image '%s'. Already queued." +msgstr "不对镜像 '%s' 进行排队操作。已经排队。" + +#: glance/image_cache/drivers/sqlite.py:460 +#: glance/image_cache/drivers/xattr.py:429 +#, python-format +msgid "Deleting image cache file '%s'" +msgstr "删除镜像缓存文件'%s'" + +#: glance/image_cache/drivers/sqlite.py:463 +#: glance/image_cache/drivers/xattr.py:432 +#, python-format +msgid "Cached image file '%s' doesn't exist, unable to delete" +msgstr "缓存的镜像文件'%s'不存在，不能删除" + +#: glance/image_cache/drivers/xattr.py:104 +#, python-format +msgid "" +"The device housing the image cache directory %(image_cache_dir)s does not " +"support xattr. It is likely you need to edit your fstab and add the " +"user_xattr option to the appropriate line for the device housing the cache " +"directory." +msgstr "" +"镜像缓存路径 %(image_cache_dir)s " +"所在设备不支持xattr。您可能需要编辑您的fstab，在缓存路径所在设备的行中添加user_xattr选项。" + +#: glance/image_cache/drivers/xattr.py:281 +#, python-format +msgid "Removing image '%s' from queue after caching it." +msgstr "缓存后正从队列中删除镜像'%s'。" + +#: glance/image_cache/drivers/xattr.py:343 +#, python-format +msgid "Queueing image '%s'." +msgstr "镜像'%s'排队中。" + +#: glance/image_cache/drivers/xattr.py:375 +#, python-format +msgid "No grace period, reaping '%(path)s' immediately" +msgstr "没有缓冲期，立即清除'%(path)s'" + +#: glance/image_cache/drivers/xattr.py:380 +#, python-format +msgid "" +"Cache entry '%(path)s' exceeds grace period, (%(age)i s > %(grace)i s)" +msgstr "缓存项'%(path)s'超过了缓冲期，(%(age)i s > %(grace)i s)" + +#: glance/image_cache/drivers/xattr.py:385 +#, python-format +msgid "Reaped %(reaped)s %(entry_type)s cache entries" +msgstr "清除 %(reaped)s 个 %(entry_type)s 的缓存条目" + +#: glance/notifier/notify_kombu.py:88 +#, python-format +msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d" +msgstr "正在重新连接位于 %(hostname)s:%(port)d 的AMQP服务器" + +#: glance/notifier/notify_kombu.py:92 +#, python-format +msgid "Connecting to AMQP server on %(hostname)s:%(port)d" +msgstr "正在连接位于 %(hostname)s:%(port)d 的AMQP服务器" + +#: glance/notifier/notify_kombu.py:121 +#, python-format +msgid "Connected to AMQP server on %(hostname)s:%(port)d" +msgstr "连接到位于 %(hostname)s:%(port)d 的AMQP服务器" + +#: glance/notifier/notify_kombu.py:150 +#, python-format +msgid "" +"Unable to connect to AMQP server on %(hostname)s:%(port)d after " +"%(max_retries)d tries: %(err_str)s" +msgstr "%(max_retries)d 次尝试后无法连接到位于%(hostname)s:%(port)d的AMQP服务器：%(err_str)s" + +#: glance/notifier/notify_kombu.py:162 +#, python-format +msgid "" +"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying " +"again in %(sleep_time)d seconds." +msgstr "" +"位于%(hostname)s:%(port)d的AMQP服务器不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。" + +#: glance/notifier/notify_kombu.py:169 +#, python-format +msgid "Notification with priority %(priority)s failed; msg=%s" +msgstr "优先级为%(priority)s的通知失败；msg=%s" + +#: glance/notifier/notify_kombu.py:206 +#, python-format +msgid "Unable to send notification: %s" +msgstr "无法发送通知：%s" + +#: glance/notifier/notify_qpid.py:113 +#, python-format +msgid "Connected to AMQP server on %s" +msgstr "连接到位于 %s 的AMQP服务器" + +#: glance/registry/__init__.py:66 +msgid "Configuration option was not valid" +msgstr "配置选项不正确" + +#: glance/registry/__init__.py:70 +msgid "Could not find required configuration option" +msgstr "未能找到要求的配置选项" + +#: glance/registry/__init__.py:117 +msgid "Adding image metadata..." +msgstr "正在添加镜像元数据..." + +#: glance/registry/__init__.py:124 +#, python-format +msgid "Updating image metadata for image %s..." +msgstr "正在更新镜像%s的元数据..." + +#: glance/registry/__init__.py:130 +#, python-format +msgid "Deleting image metadata for image %s..." +msgstr "正在删除镜像%s的元数据..." + +#: glance/registry/api/v1/images.py:70 +msgid "Invalid marker. Image could not be found." +msgstr "错误的标记。无法找到镜像。" + +#: glance/registry/api/v1/images.py:171 +msgid "Unrecognized changes-since value" +msgstr "无法识别的changes-since取值" + +#: glance/registry/api/v1/images.py:176 +msgid "protected must be True, or False" +msgstr "protected必须为True，或False" + +#: glance/registry/api/v1/images.py:202 +msgid "limit param must be an integer" +msgstr "limit 参数必须是整数" + +#: glance/registry/api/v1/images.py:205 +msgid "limit param must be positive" +msgstr "limit参数必须是正数" + +#: glance/registry/api/v1/images.py:214 +msgid "Invalid marker format" +msgstr "无效的标记格式" + +#: glance/registry/api/v1/images.py:224 +#, python-format +msgid "Unsupported sort_key. Acceptable values: %s" +msgstr "不支持的sort_key。可接受的值：%s" + +#: glance/registry/api/v1/images.py:233 +#, python-format +msgid "Unsupported sort_dir. Acceptable values: %s" +msgstr "不支持的sort_dir。可接受的值：%s" + +#: glance/registry/api/v1/images.py:259 +msgid "is_public must be None, True, or False" +msgstr "is_public必须是None，True或者False" + +#: glance/registry/api/v1/images.py:280 glance/registry/api/v1/images.py:403 +#: glance/registry/api/v1/members.py:47 glance/registry/api/v1/members.py:81 +#: glance/registry/api/v1/members.py:183 glance/registry/api/v1/members.py:238 +#, python-format +msgid "Access by %(user)s to image %(id)s denied" +msgstr "用户 %(user)s 访问镜像 %(id)s 被拒绝" + +#: glance/registry/api/v1/images.py:306 +#, python-format +msgid "Access by %(user)s to delete public image %(id)s denied" +msgstr "用户 %(user)s 删除公有镜像 %(id)s 被拒绝" + +#: glance/registry/api/v1/images.py:312 +#, python-format +msgid "Access by %(user)s to delete private image %(id)s denied" +msgstr "用户 %(user)s 删除私有镜像 %(id)s 被拒绝" + +#: glance/registry/api/v1/images.py:345 +msgid "Invalid image id format" +msgstr "无效的镜像id格式" + +#: glance/registry/api/v1/images.py:352 +#, python-format +msgid "Image with identifier %s already exists!" +msgstr "标识是 %s 的镜像已经存在！" + +#: glance/registry/api/v1/images.py:356 +#, python-format +msgid "Failed to add image metadata. Got error: %(e)s" +msgstr "添加镜像元数据失败。得到错误：%(e)s" + +#: glance/registry/api/v1/images.py:382 +#, python-format +msgid "Updating image %(id)s with metadata: %(image_data)r" +msgstr "更新镜像 %(id)s 的元数据：%(image_data)r" + +#: glance/registry/api/v1/members.py:89 glance/registry/api/v1/members.py:191 +#: glance/registry/api/v1/members.py:246 +msgid "No permission to share that image" +msgstr "不允许共享该镜像" + +#: glance/registry/api/v1/members.py:97 glance/registry/api/v1/members.py:110 +#: glance/registry/api/v1/members.py:201 +#, python-format +msgid "Invalid membership association: %s" +msgstr "无效的成员资格关联：%s" + +#: glance/registry/api/v1/members.py:275 +msgid "Invalid marker. Membership could not be found." +msgstr "无效的标记。无法找到成员资格。" + +#: glance/registry/db/api.py:83 +#, python-format +msgid "" +"Error configuring registry database with supplied sql_connection " +"'%(sql_connection)s'. Got error:\n" +"%(err)s" +msgstr "" +"配置注册数据库出错，提供的sql_connection为 '%(sql_connection)s'。错误信息：\n" +"%(err)s" + +#: glance/registry/db/api.py:100 +msgid "Attempted to modify image user did not own." +msgstr "尝试更改不属于用户的镜像。" + +#: glance/registry/db/api.py:101 +msgid "You do not own this image" +msgstr "您没有这个镜像的所有权" + +#: glance/registry/db/migration.py:47 +#, python-format +msgid "database '%(sql_connection)s' is not under migration control" +msgstr "数据库 '%(sql_connection)s' 不在迁移控制范围内" + +#: glance/registry/db/migration.py:64 +#, python-format +msgid "Upgrading %(sql_connection)s to version %(version_str)s" +msgstr "升级 %(sql_connection)s 到版本 %(version_str)s" + +#: glance/registry/db/migration.py:80 +#, python-format +msgid "Downgrading %(sql_connection)s to version %(version)s" +msgstr "降级 %(sql_connection)s 到版本 %(version)s" + +#: glance/registry/db/migration.py:95 +#, python-format +msgid "database '%(sql_connection)s' is already under migration control" +msgstr "数据库 '%(sql_connection)s' 已经在迁移控制中" + +#: glance/registry/db/migrate_repo/schema.py:96 +#, python-format +msgid "creating table %(table)s" +msgstr "创建表格 %(table)s" + +#: glance/registry/db/migrate_repo/schema.py:102 +#, python-format +msgid "dropping table %(table)s" +msgstr "删除表格 %(table)s" + +#: glance/store/__init__.py:196 +#, python-format +msgid "Failed to delete image at %s from store (%s)" +msgstr "从存储 (%s) 中删除在 (%s) 的镜像失败" + +#: glance/store/__init__.py:209 +#, python-format +msgid "Image id %(image_id)s already queued for delete" +msgstr "镜像id %(image_id)s 已在队列中等待删除" + +#: glance/store/base.py:44 +msgid "Failed to configure store correctly. Disabling add method." +msgstr "未能正确配置存储。禁用add方法。" + +#: glance/store/filesystem.py:59 +msgid "No path specified" +msgstr "没有指定路径" + +#: glance/store/filesystem.py:111 +#, python-format +msgid "Could not find %s in configuration options." +msgstr "在配置选项里没有找到 %s" + +#: glance/store/filesystem.py:118 +#, python-format +msgid "Directory to write image files does not exist (%s). Creating." +msgstr "用来写入镜像文件的文件夹不存在 (%s)。正在创建。" + +#: glance/store/filesystem.py:124 +#, python-format +msgid "Unable to create datadir: %s" +msgstr "无法创建datadir：%s" + +#: glance/store/filesystem.py:142 +#, python-format +msgid "Image file %s not found" +msgstr "无法找到镜像文件 %s" + +#: glance/store/filesystem.py:144 +#, python-format +msgid "Found image at %s. Returning in ChunkedFile." +msgstr "在 %s 找到镜像。以ChunkedFile形式返回。" + +#: glance/store/filesystem.py:163 +#, python-format +msgid "Deleting image at %(fn)s" +msgstr "在 %(fn)s 删除镜像" + +#: glance/store/filesystem.py:166 +#, python-format +msgid "You cannot delete file %s" +msgstr "不能删除文件 %s" + +#: glance/store/filesystem.py:169 +#, python-format +msgid "Image file %s does not exist" +msgstr "镜像文件 %s 不存在" + +#: glance/store/filesystem.py:194 +#, python-format +msgid "Image file %s already exists!" +msgstr "镜像文件 %s 已经存在" + +#: glance/store/filesystem.py:218 +#, python-format +msgid "" +"Wrote %(bytes_written)d bytes to %(filepath)s with checksum %(checksum_hex)s" +msgstr "把 %(bytes_written)d 字节写入 %(filepath)s，校验和是 %(checksum_hex)s" + +#: glance/store/http.py:76 +#, python-format +msgid "Credentials '%s' not well-formatted." +msgstr "凭证 '%s' 没有正确格式化" + +#: glance/store/http.py:82 +msgid "No address specified in HTTP URL" +msgstr "HTTP URL中没有确定地址" + +#: glance/store/location.py:123 +#, python-format +msgid "Unable to find StoreLocation class in store %s" +msgstr "在储存 %s 无法找到类 StoreLocation" + +#: glance/store/rbd.py:63 +msgid "URI must start with rbd://" +msgstr "URI必须以 rbd:// 开始" + +#: glance/store/rbd.py:96 glance/store/rbd.py:202 +#, python-format +msgid "RBD image %s does not exist" +msgstr "RBD镜像 %s 不存在" + +#: glance/store/rbd.py:128 +#, python-format +msgid "Error in store configuration: %s" +msgstr "储存配置错误：%s" + +#: glance/store/rbd.py:172 +#, python-format +msgid "RBD image %s already exists" +msgstr "RBD镜像 %s 已经存在" + +#: glance/store/s3.py:90 +msgid "" +"URI cannot contain more than one occurrence of a scheme.If you have " +"specified a URI like " +"s3://accesskey:secretkey@https://s3.amazonaws.com/bucket/key-id, you need to " +"change it to use the s3+https:// scheme, like so: " +"s3+https://accesskey:secretkey@s3.amazonaws.com/bucket/key-id" +msgstr "" +"URI不允许一个方案 (schema) " +"出现多次。如果指定一个URI类似s3://accesskey:secretkey@https://s3.amazonaws.com/bucket/key-" +"id，必须把它改为是s3+https://的方案，如：s3+https://accesskey:secretkey@s3.amazonaws.com/bu" +"cket/key-id" + +#: glance/store/s3.py:125 +#, python-format +msgid "Badly formed S3 credentials %s" +msgstr "错误格式的S3凭证 %s" + +#: glance/store/s3.py:137 +msgid "Badly formed S3 URI. Missing s3 service URL." +msgstr "不恰当格式的S3 URI。缺少s3服务URL。" + +#: glance/store/s3.py:140 +msgid "Badly formed S3 URI" +msgstr "不恰当格式的S3 URI" + +#: glance/store/s3.py:233 glance/store/swift.py:312 +#, python-format +msgid "Could not find %(param)s in configuration options." +msgstr "无法在配置选项中找到 %(param)s" + +#: glance/store/s3.py:281 +#, python-format +msgid "" +"Retrieved image object from S3 using (s3_host=%(s3_host)s, " +"access_key=%(accesskey)s, bucket=%(bucket)s, key=%(obj_name)s)" +msgstr "" +"使用(s3_host=%(s3_host)s, access_key=%(accesskey)s, bucket=%(bucket)s, " +"key=%(obj_name)s)从S3中获取镜像对象" + +#: glance/store/s3.py:333 +#, python-format +msgid "S3 already has an image at location %s" +msgstr "S3已经在 %s 有镜像了" + +#: glance/store/s3.py:336 +#, python-format +msgid "" +"Adding image object to S3 using (s3_host=%(s3_host)s, " +"access_key=%(access_key)s, bucket=%(bucket)s, key=%(obj_name)s)" +msgstr "" +"使用(s3_host=%(s3_host)s, access_key=%(access_key)s, bucket=%(bucket)s, " +"key=%(obj_name)s)添加镜像对象到S3里" + +#: glance/store/s3.py:357 +#, python-format +msgid "Writing request body file to temporary file for %s" +msgstr "为 %s 把请求主体写入临时文件" + +#: glance/store/s3.py:371 +#, python-format +msgid "Uploading temporary file to S3 for %s" +msgstr "为 %s 把临时文件上载到S3" + +#: glance/store/s3.py:379 +#, python-format +msgid "" +"Wrote %(size)d bytes to S3 key named %(obj_name)s with checksum " +"%(checksum_hex)s" +msgstr "向S3写入 %(size)d 字节，键值为 %(obj_name)s，校验和为 %(checksum_hex)s" + +#: glance/store/s3.py:404 +#, python-format +msgid "" +"Deleting image object from S3 using (s3_host=%(s3_host)s, " +"access_key=%(accesskey)s, bucket=%(bucket)s, key=%(obj_name)s)" +msgstr "" +"从S3删除镜像对象：(s3_host=%(s3_host)s, access_key=%(accesskey)s, bucket=%(bucket)s, " +"key=%(obj_name)s)" + +#: glance/store/s3.py:425 +#, python-format +msgid "Could not find bucket with ID %(bucket_id)s" +msgstr "找不到ID是 %(bucket_id)s 的桶(bucket)" + +#: glance/store/s3.py:473 +#, python-format +msgid "Could not find key %(obj)s in bucket %(bucket)s" +msgstr "无法在桶(bucket) %(bucket)s 中找到键值 %(obj)s" + +#: glance/store/scrubber.py:42 +#, python-format +msgid "Starting Daemon: wakeup_time=%(wakeup_time)s threads=%(threads)s" +msgstr "启动守护进程：wakeup_time=%(wakeup_time)s threads=%(threads)s" + +#: glance/store/scrubber.py:55 +msgid "Daemon Shutdown on KeyboardInterrupt" +msgstr "由于KeyboardInterrupt，守护进程关闭" + +#: glance/store/scrubber.py:59 +msgid "Runing application" +msgstr "运行应用" + +#: glance/store/scrubber.py:62 +#, python-format +msgid "Next run scheduled in %s seconds" +msgstr "下一步在 %s 后运行预先安排的" + +#: glance/store/scrubber.py:83 +#, python-format +msgid "Initializing scrubber with conf: %s" +msgstr "按照配置初始化scrubber：%s" + +#: glance/store/scrubber.py:98 +#, python-format +msgid "%s does not exist" +msgstr "%s 不存在" + +#: glance/store/scrubber.py:120 glance/store/scrubber.py:175 +#, python-format +msgid "Deleting %s images" +msgstr "正在删除 %s 个镜像" + +#: glance/store/scrubber.py:129 +#, python-format +msgid "Deleting %(uri)s" +msgstr "正在删除 %(uri)s" + +#: glance/store/scrubber.py:132 +#, python-format +msgid "Failed to delete image from store (%(uri)s)." +msgstr "从储存 (%(uri)s) 删除镜像失败。" + +#: glance/store/scrubber.py:151 +#, python-format +msgid "Getting images deleted before %s" +msgstr "在 %s 之前删除镜像" + +#: glance/store/swift.py:105 +msgid "" +"URI cannot contain more than one occurrence of a scheme.If you have " +"specified a URI like swift://user:pass@http://authurl.com/v1/container/obj, " +"you need to change it to use the swift+http:// scheme, like so: " +"swift+http://user:pass@authurl.com/v1/container/obj" +msgstr "" +"URI不允许一个方案 (schema) " +"出现多次。如果指定一个URI类似swift://user:pass@http://authurl.com/v1/container/obj，必须把它改为是" +"swift+https://的方案，如：swift+http://user:pass@authurl.com/v1/container/obj" + +#: glance/store/swift.py:142 +#, python-format +msgid "Badly formed credentials '%(creds)s' in Swift URI" +msgstr "Swift URI中存在错误格式的凭证 '%(creds)s'" + +#: glance/store/swift.py:163 +msgid "Badly formed Swift URI" +msgstr "不恰当格式的Swift URI" + +#: glance/store/swift.py:229 +#, python-format +msgid "Error in configuration conf: %s" +msgstr "配置conf的错误：%s" + +#: glance/store/swift.py:264 glance/store/swift.py:506 +#, python-format +msgid "Swift could not find image at uri %(uri)s" +msgstr "Swift在uri %(uri)s 找不到镜像" + +#: glance/store/swift.py:303 +#, python-format +msgid "" +"Creating Swift connection with (auth_address=%(auth_url)s, user=%(user)s, " +"snet=%(snet)s)" +msgstr "以(auth_address=%(auth_url)s, user=%(user)s, snet=%(snet)s)创建Swift连接" + +#: glance/store/swift.py:367 +#, python-format +msgid "Adding image object '%(obj_name)s' to Swift" +msgstr "把镜像对象 '%(obj_name)s' 添加到Swift" + +#: glance/store/swift.py:387 +msgid "Cannot determine image size. Adding as a segmented object to Swift." +msgstr "无法确定镜像大小。作为分段对象添加到Swift。" + +#: glance/store/swift.py:411 +#, python-format +msgid "" +"Wrote chunk %(chunk_id)d/%(total_chunks)s of length %(bytes_read)d to Swift " +"returning MD5 of content: %(chunk_etag)s" +msgstr "" +"将长度为 %(bytes_read)d 的块 %(chunk_id)d/%(total_chunks)s " +"写入Swift，返回内容的MD5：%(chunk_etag)s" + +#: glance/store/swift.py:420 +msgid "Deleting final zero-length chunk" +msgstr "删除最终长度是0的chunk" + +#: glance/store/swift.py:456 +#, python-format +msgid "Swift already has an image at location %s" +msgstr "Swift在 %s 已经有镜像了" + +#: glance/store/swift.py:458 +#, python-format +msgid "" +"Failed to add object to Swift.\n" +"Got error from Swift: %(e)s" +msgstr "" +"向Swift添加对象失败。\n" +"从Swift得到错误：%(e)s" + +#: glance/store/swift.py:546 +#, python-format +msgid "" +"Failed to add container to Swift.\n" +"Got error from Swift: %(e)s" +msgstr "" +"向Swift添加容器失败。\n" +"从Swift得到错误：%(e)s" + +#: glance/store/swift.py:550 +#, python-format +msgid "" +"The container %(container)s does not exist in Swift. Please set the " +"swift_store_create_container_on_put optionto add container to Swift " +"automatically." +msgstr "" +"在Swift中不存在容器 %(container)s " +"。请设置swift_store_create_container_on_put选项以自动的添加容器到Swift。" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg2.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gnupg2.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg2.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gnupg2.po 2012-03-23 07:33:01.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: 2012-02-21 19:20+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:33+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/gnupg.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gnupg.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gnupg.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gnupg.po 2012-03-23 07:32: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: 2012-02-21 18:19+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:53+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/gODBCConfig.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gODBCConfig.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gODBCConfig.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gODBCConfig.po 2012-03-23 07:32: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: 2012-02-21 18:23+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/main.c:25 msgid "gODBCConfig - ODBC Data Source Administrator" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gold.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gold.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gold.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gold.po 2012-03-23 07:32:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: archive.cc:119 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gprof.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gprof.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gprof.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gprof.po 2012-03-23 07:32:48.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: alpha.c:102 mips.c:54 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grep.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/grep.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grep.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/grep.po 2012-03-23 07:32: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: 2012-02-21 18:19+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:54+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grub.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/grub.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/grub.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/grub.po 2012-03-23 07:33:01.000000000 +0000 @@ -11,79 +11,85 @@ "Project-Id-Version: grub 1.97+20110101\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-05-14 22:59+0200\n" -"PO-Revision-Date: 2011-12-08 03:52+0000\n" +"PO-Revision-Date: 2012-03-19 22:37+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 19:22+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:34+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: commands/acpi.c:40 +#: grub-core/commands/acpi.c:40 msgid "Don't load host tables specified by comma-separated list." msgstr "不载入指定的主机表(多个表用逗号分隔)。" -#: commands/acpi.c:43 +#: grub-core/commands/acpi.c:43 msgid "Load only tables specified by comma-separated list." msgstr "只载入指定的主机表(多个表用逗号分隔)。" -#: commands/acpi.c:44 +#: grub-core/commands/acpi.c:44 msgid "Expose v1 tables." msgstr "显示 v1 表。" -#: commands/acpi.c:45 +#: grub-core/commands/acpi.c:45 msgid "Expose v2 and v3 tables." msgstr "显示 v2 和 v3 表。" -#: commands/acpi.c:46 +#: grub-core/commands/acpi.c:46 msgid "Set OEMID of RSDP, XSDT and RSDT." msgstr "设置 RSDP，XSDT 和 RSDT 中的 OEMID。" -#: commands/acpi.c:48 +#: grub-core/commands/acpi.c:48 msgid "Set OEMTABLE ID of RSDP, XSDT and RSDT." msgstr "设置 RSDP，XSDT 和 RSDT 中的 OEMTABLE ID。" -#: commands/acpi.c:50 +#: grub-core/commands/acpi.c:50 msgid "Set OEMTABLE revision of RSDP, XSDT and RSDT." msgstr "设置 RSDP，XSDT 和 RSDT 中的 OEMTABLE 版本信息。" -#: commands/acpi.c:52 +#: grub-core/commands/acpi.c:52 msgid "Set creator field of RSDP, XSDT and RSDT." msgstr "设置 RSDP，XSDT 和 RSDT 中的制造商信息。" -#: commands/acpi.c:54 +#: grub-core/commands/acpi.c:54 msgid "Set creator revision of RSDP, XSDT and RSDT." msgstr "设置 RSDP，XSDT 和 RSDT 中的制造商版本信息。" -#: commands/acpi.c:55 +#: grub-core/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 的操作系统无效。" -#: commands/acpi.c:763 +#: grub-core/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] [...]" -#: commands/acpi.c:766 +#: grub-core/commands/acpi.c:766 msgid "Load host ACPI tables and tables specified by arguments." msgstr "载入主机 ACPI 表和参数指定的表。" -#: 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 +#: 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 msgid "FILE" msgstr "文件" -#: commands/blocklist.c:114 +#: grub-core/commands/blocklist.c:116 msgid "Print a block list." msgstr "显示块列表。" -#: commands/boot.c:190 +#: grub-core/commands/boot.c:192 msgid "Boot an operating system." msgstr "引导操作系统。" @@ -91,23 +97,23 @@ msgid "Accept DOS-style CR/NL line endings." msgstr "接受 DOS 风格的 CR/NL 行结尾。" -#: commands/cat.c:82 commands/minicmd.c:357 +#: grub-core/commands/cat.c:97 grub-core/commands/minicmd.c:204 msgid "Show the contents of a file." msgstr "显示文件内容。" -#: commands/cmp.c:113 +#: grub-core/commands/cmp.c:114 msgid "FILE1 FILE2" msgstr "文件1 文件2" -#: commands/cmp.c:113 +#: grub-core/commands/cmp.c:114 msgid "Compare two files." msgstr "比较两个文件。" -#: commands/configfile.c:57 +#: grub-core/commands/configfile.c:65 msgid "Load another config file." msgstr "载入另外的配置文件。" -#: commands/configfile.c:61 commands/configfile.c:66 +#: grub-core/commands/configfile.c:69 grub-core/commands/configfile.c:87 msgid "Load another config file without changing context." msgstr "载入另外的配置文件(不改变环境)。" @@ -116,43 +122,43 @@ "Load another config file without changing context but take only menuentries." msgstr "载入另外的配置文件(不改变环境，仅载入菜单项)。" -#: commands/date.c:139 +#: grub-core/commands/date.c:141 msgid "[[year-]month-day] [hour:minute[:second]]" msgstr "[[年-]月-日] [时:分[:秒]]" -#: commands/date.c:140 +#: grub-core/commands/date.c:142 msgid "Command to display/set current datetime." msgstr "显示/设置时间的命令" -#: commands/echo.c:27 +#: grub-core/commands/echo.c:30 msgid "Do not output the trailing newline." msgstr "末尾不输出额外空行。" -#: commands/echo.c:28 +#: grub-core/commands/echo.c:31 msgid "Enable interpretation of backslash escapes." msgstr "启用反斜杠转义" -#: commands/echo.c:117 +#: grub-core/commands/echo.c:134 msgid "[-e|-n] STRING" msgstr "[-e|-n] 字符串" -#: commands/echo.c:117 +#: grub-core/commands/echo.c:134 msgid "Display a line of text." msgstr "显示文本" -#: commands/efi/fixvideo.c:103 +#: grub-core/commands/efi/fixvideo.c:105 msgid "Fix video problem." msgstr "修正显示问题" -#: commands/efi/loadbios.c:207 +#: grub-core/commands/efi/loadbios.c:209 msgid "Fake BIOS." msgstr "BIOS 伪装。" -#: commands/efi/loadbios.c:211 +#: grub-core/commands/efi/loadbios.c:213 msgid "Load BIOS dump." msgstr "载入 BIOS 转储。" -#: commands/gptsync.c:244 +#: grub-core/commands/gptsync.c:246 msgid "DEVICE [PARTITION[+/-[TYPE]]] ..." msgstr "设备 [分区[+/-[类型]]] ..." @@ -165,7 +171,7 @@ "重写指定 GPT 设备的混合 MBR，指定的分区会成为混合 MBR 的一部分(不超过三个)。类型指 MBR 类型，+ " "代表该分区是活动分区(只能有一个活动分区)。" -#: commands/halt.c:39 +#: grub-core/commands/halt.c:41 msgid "" "Halts the computer. This command does not work on all firmware " "implementations." @@ -211,7 +217,7 @@ msgid "[-c FILE [-p PREFIX]] [FILE1 [FILE2 ...]]" msgstr "[-c 文件 [-p 前缀]] [文件1 [文件2 ...]]" -#: commands/hdparm.c:30 +#: grub-core/commands/hdparm.c:32 msgid "" "Set Advanced Power Management\n" "(1=low, ..., 254=high, 255=off)." @@ -219,19 +225,19 @@ "设置高级电源管理模式\n" "(1=最低，...，254=最高，255=关闭)。" -#: commands/hdparm.c:33 +#: grub-core/commands/hdparm.c:35 msgid "Check power mode." msgstr "检查电源模式。" -#: commands/hdparm.c:34 +#: grub-core/commands/hdparm.c:36 msgid "Freeze ATA security settings until reset." msgstr "禁止更改 ATA 安全设置直到此设置被重置。" -#: commands/hdparm.c:36 +#: grub-core/commands/hdparm.c:38 msgid "Check SMART health status." msgstr "检查 SMART 健康状态。" -#: commands/hdparm.c:37 +#: grub-core/commands/hdparm.c:39 msgid "" "Set Automatic Acoustic Management\n" "(0=off, 128=quiet, ..., 254=fast)." @@ -239,7 +245,7 @@ "设置硬盘声音管理模式\n" "(0=关闭，128=静音，...，254=高速)。" -#: commands/hdparm.c:40 +#: grub-core/commands/hdparm.c:42 msgid "" "Set standby timeout\n" "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)." @@ -247,99 +253,99 @@ "设置等待时间\n" "(0=关闭，1=5秒，2=10秒，...，240=20分，241=30分，...)。" -#: commands/hdparm.c:43 +#: grub-core/commands/hdparm.c:45 msgid "Set drive to standby mode." msgstr "设置驱动器为等待模式。" -#: commands/hdparm.c:44 +#: grub-core/commands/hdparm.c:46 msgid "Set drive to sleep mode." msgstr "设置驱动器为休眠模式。" -#: commands/hdparm.c:45 +#: grub-core/commands/hdparm.c:47 msgid "Print drive identity and settings." msgstr "显示硬盘识别信息和设置。" -#: commands/hdparm.c:47 +#: grub-core/commands/hdparm.c:49 msgid "Dump contents of ATA IDENTIFY sector." msgstr "转储 ATA IDENTIFY 扇区内容。" -#: commands/hdparm.c:49 +#: grub-core/commands/hdparm.c:51 msgid "Disable/enable SMART (0/1)." msgstr "禁用/启用 SMART (0/1)。" -#: commands/hdparm.c:50 +#: grub-core/commands/hdparm.c:52 msgid "Do not print messages." msgstr "安静模式。" -#: commands/hdparm.c:414 +#: grub-core/commands/hdparm.c:415 msgid "[OPTIONS] DISK" msgstr "[选项] 磁盘" -#: commands/hdparm.c:415 +#: grub-core/commands/hdparm.c:416 msgid "Get/set ATA disk parameters." msgstr "获取或设定 ATA 磁盘参数。" -#: commands/help.c:103 lib/arg.c:110 +#: grub-core/commands/help.c:120 grub-core/lib/arg.c:110 msgid "Usage:" msgstr "用法：" -#: commands/help.c:136 +#: grub-core/commands/help.c:136 msgid "[PATTERN ...]" msgstr "[模式 ...]" -#: commands/help.c:137 +#: grub-core/commands/help.c:137 msgid "Show a help message." msgstr "显示帮助消息。" -#: commands/hexdump.c:30 +#: grub-core/commands/hexdump.c:31 msgid "Skip offset bytes from the beginning of file." msgstr "跳过文件头部偏移字节。" -#: commands/hexdump.c:32 +#: grub-core/commands/hexdump.c:33 msgid "Read only LENGTH bytes." msgstr "读取指定长度(字节)。" -#: commands/hexdump.c:125 +#: grub-core/commands/hexdump.c:125 msgid "[OPTIONS] FILE_OR_DEVICE" msgstr "[选项] 文件或设备" -#: commands/hexdump.c:126 +#: grub-core/commands/hexdump.c:126 msgid "Dump the contents of a file or memory." msgstr "显示文件或内存内容。" -#: commands/i386/cpuid.c:37 +#: grub-core/commands/i386/cpuid.c:39 msgid "Check for long mode flag (default)." msgstr "检查长模式标志(默认)。" -#: commands/i386/cpuid.c:92 +#: grub-core/commands/i386/cpuid.c:94 msgid "Check for CPU features." msgstr "检查 CPU 特性。" -#: commands/i386/pc/drivemap.c:37 +#: grub-core/commands/i386/pc/drivemap.c:39 msgid "Show the current mappings." msgstr "显示当前映射。" -#: commands/i386/pc/drivemap.c:38 +#: grub-core/commands/i386/pc/drivemap.c:40 msgid "Reset all mappings to the default values." msgstr "重置所有映射为默认值。" -#: commands/i386/pc/drivemap.c:39 +#: grub-core/commands/i386/pc/drivemap.c:41 msgid "Perform both direct and reverse mappings." msgstr "同时进行直接和保留映射。" -#: commands/i386/pc/drivemap.c:407 +#: grub-core/commands/i386/pc/drivemap.c:407 msgid "-l | -r | [-s] grubdev osdisk." msgstr "-l | -r | [-s] grub设备 系统磁盘" -#: commands/i386/pc/drivemap.c:408 +#: grub-core/commands/i386/pc/drivemap.c:408 msgid "Manage the BIOS drive mappings." msgstr "管理 BIOS 设备映射。" -#: commands/i386/pc/halt.c:27 +#: grub-core/commands/i386/pc/halt.c:31 msgid "Do not use APM to halt the computer." msgstr "不使用 APM 关闭计算机。" -#: commands/i386/pc/halt.c:51 +#: grub-core/commands/i386/pc/halt.c:120 msgid "Halt the system, if possible using APM." msgstr "优先使用 APM 关闭计算机。" @@ -347,23 +353,23 @@ msgid "Show APM information." msgstr "显示 APM 信息。" -#: commands/i386/pc/play.c:262 +#: grub-core/commands/i386/pc/play.c:268 msgid "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... " msgstr "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... " -#: commands/i386/pc/play.c:263 +#: grub-core/commands/i386/pc/play.c:269 msgid "Play a tune." msgstr "播放测试声音。" -#: commands/i386/pc/pxecmd.c:46 +#: grub-core/commands/i386/pc/pxecmd.c:48 msgid "Unload PXE environment." msgstr "卸载 PXE 环境。" -#: commands/ieee1275/suspend.c:43 +#: grub-core/commands/ieee1275/suspend.c:45 msgid "Return to Open Firmware prompt." msgstr "返回 Open Firmware 界面。" -#: commands/memrw.c:31 +#: grub-core/commands/iorw.c:34 grub-core/commands/memrw.c:33 msgid "Save read value into variable VARNAME." msgstr "将读取的值存入变量 VARNAME。" @@ -400,7 +406,8 @@ msgid "Write word VALUE to PORT." msgstr "向指定端口写入字类型值。" -#: commands/memrw.c:132 commands/memrw.c:135 commands/memrw.c:138 +#: grub-core/commands/iorw.c:140 grub-core/commands/memrw.c:134 +#: grub-core/commands/memrw.c:137 grub-core/commands/memrw.c:140 msgid "ADDR VALUE [MASK]" msgstr "地址 值 [掩码]" @@ -412,23 +419,23 @@ msgid "Load a keyboard layout." msgstr "载入一个键盘布局。" -#: commands/keystatus.c:28 +#: grub-core/commands/keystatus.c:30 msgid "Check Shift key." msgstr "检查 Shift 键。" -#: commands/keystatus.c:29 +#: grub-core/commands/keystatus.c:31 msgid "Check Control key." msgstr "检查 Ctrl 键。" -#: commands/keystatus.c:30 +#: grub-core/commands/keystatus.c:32 msgid "Check Alt key." msgstr "检查 Alt 键。" -#: commands/keystatus.c:85 +#: grub-core/commands/keystatus.c:102 msgid "[--shift] [--ctrl] [--alt]" msgstr "[--shift] [--ctrl] [--alt]" -#: commands/keystatus.c:86 +#: grub-core/commands/keystatus.c:103 msgid "Check key modifier status." msgstr "检查修饰键状态。" @@ -480,39 +487,39 @@ msgid "Simulate grub-legacy password command in menuentry mode" msgstr "在菜单项模式下模拟 grub-legacy 口令命令" -#: commands/loadenv.c:33 +#: grub-core/commands/loadenv.c:35 msgid "Specify filename." msgstr "指定文件名。" -#: commands/loadenv.c:383 commands/loadenv.c:389 +#: grub-core/commands/loadenv.c:380 grub-core/commands/loadenv.c:384 msgid "[-f FILE]" msgstr "[-f 文件]" -#: commands/loadenv.c:384 +#: grub-core/commands/loadenv.c:381 msgid "Load variables from environment block file." msgstr "载入环境变量文件。" -#: commands/loadenv.c:390 +#: grub-core/commands/loadenv.c:385 msgid "List variables from environment block file." msgstr "显示环境变量文件内容。" -#: commands/loadenv.c:395 +#: grub-core/commands/loadenv.c:389 msgid "[-f FILE] variable_name [...]" msgstr "[-f 文件] 变量名 [...]" -#: commands/loadenv.c:396 +#: grub-core/commands/loadenv.c:390 msgid "Save variables to environment block file." msgstr "保存变量到文件。" -#: commands/ls.c:37 +#: grub-core/commands/ls.c:39 msgid "Show a long list with more detailed information." msgstr "列出详细信息。" -#: commands/ls.c:38 +#: grub-core/commands/ls.c:40 msgid "Print sizes in a human readable format." msgstr "使用易读的格式显示文件大小。" -#: commands/ls.c:39 +#: grub-core/commands/ls.c:41 msgid "List all files." msgstr "列出全部文件。" @@ -520,7 +527,7 @@ msgid "[-l|-h|-a] [FILE ...]" msgstr "[-l|-h|-a] [文件 ...]" -#: commands/ls.c:270 +#: grub-core/commands/ls.c:276 msgid "List devices and files." msgstr "列出设备和文件。" @@ -540,40 +547,40 @@ msgid "Show ACPI information." msgstr "显示 ACPI 信息。" -#: commands/lsmmap.c:47 +#: grub-core/commands/lsmmap.c:68 msgid "List memory map provided by firmware." msgstr "列出默认的内存映射。" -#: commands/lspci.c:228 +#: grub-core/commands/lspci.c:230 msgid "List PCI devices." msgstr "列出 PCI 设备。" -#: commands/memrw.c:123 commands/memrw.c:126 commands/memrw.c:129 -#: commands/minicmd.c:366 +#: grub-core/commands/memrw.c:125 grub-core/commands/memrw.c:128 +#: grub-core/commands/memrw.c:131 grub-core/commands/minicmd.c:210 msgid "ADDR" msgstr "地址" -#: commands/memrw.c:123 +#: grub-core/commands/memrw.c:125 msgid "Read byte from ADDR." msgstr "从指定地址读取字节" -#: commands/memrw.c:126 +#: grub-core/commands/memrw.c:128 msgid "Read word from ADDR." msgstr "从指定地址读取字。" -#: commands/memrw.c:129 +#: grub-core/commands/memrw.c:131 msgid "Read dword from ADDR." msgstr "从指定地址读取双字。" -#: commands/memrw.c:132 +#: grub-core/commands/memrw.c:134 msgid "Write byte VALUE to ADDR." msgstr "向指定地址写入 byte 类型值。" -#: commands/memrw.c:135 +#: grub-core/commands/memrw.c:137 msgid "Write word VALUE to ADDR." msgstr "向指定地址写入 word 类型值。" -#: commands/memrw.c:138 +#: grub-core/commands/memrw.c:140 msgid "Write dword VALUE to ADDR." msgstr "向指定地址写入 dword 类型值。" @@ -606,39 +613,39 @@ msgid "Define a submenu." msgstr "定义一个子菜单。" -#: commands/minicmd.c:360 +#: grub-core/commands/minicmd.c:207 msgid "Show this message." msgstr "显示此消息。" -#: commands/minicmd.c:366 +#: grub-core/commands/minicmd.c:210 msgid "Dump memory." msgstr "转储内存。" -#: commands/minicmd.c:369 +#: grub-core/commands/minicmd.c:213 grub-core/kern/corecmd.c:193 msgid "MODULE" msgstr "模块" -#: commands/minicmd.c:369 +#: grub-core/commands/minicmd.c:213 msgid "Remove a module." msgstr "删除模块。" -#: commands/minicmd.c:372 +#: grub-core/commands/minicmd.c:216 msgid "Show loaded modules." msgstr "显示已加载的模块。" -#: commands/minicmd.c:375 +#: grub-core/commands/minicmd.c:219 msgid "Exit from GRUB." msgstr "退出 GRUB。" -#: commands/parttool.c:325 +#: grub-core/commands/parttool.c:326 msgid "PARTITION COMMANDS" msgstr "分区 命令" -#: commands/password.c:78 +#: grub-core/commands/password.c:85 msgid "USER PASSWORD" msgstr "用户 口令" -#: commands/password.c:79 +#: grub-core/commands/password.c:86 msgid "Set user password (plaintext). Unrecommended and insecure." msgstr "设置用户口令(纯文本)(不推荐且不安全)。" @@ -650,47 +657,48 @@ msgid "Set user password (PBKDF2). " msgstr "设置用户命令(PBKDF2)。 " -#: commands/probe.c:38 +#: grub-core/commands/probe.c:40 msgid "Set a variable to return value." msgstr "设置用于返回值的变量。" -#: commands/probe.c:39 +#: grub-core/commands/probe.c:41 msgid "Determine driver." msgstr "指定驱动。" -#: commands/probe.c:40 +#: grub-core/commands/probe.c:42 msgid "Determine partition map type." msgstr "指定分区表类型。" -#: commands/probe.c:41 +#: grub-core/commands/probe.c:43 msgid "Determine filesystem type." msgstr "指定文件系统类型" -#: commands/probe.c:42 +#: grub-core/commands/probe.c:44 msgid "Determine filesystem UUID." msgstr "指定文件系统 UUID。" -#: commands/probe.c:43 +#: grub-core/commands/probe.c:45 msgid "Determine filesystem label." msgstr "指定文件系统卷标。" -#: loader/i386/bsd.c:124 +#: grub-core/commands/probe.c:155 grub-core/loader/i386/bsd.c:159 +#: util/grub-setup.c:840 msgid "DEVICE" msgstr "设备" -#: commands/probe.c:155 +#: grub-core/commands/probe.c:156 msgid "Retrieve device info." msgstr "获取设备信息。" -#: commands/read.c:83 +#: grub-core/commands/read.c:85 msgid "[ENVVAR]" msgstr "[环境变量]" -#: commands/read.c:84 +#: grub-core/commands/read.c:86 msgid "Set variable with user input." msgstr "将用户输入值保存到变量。" -#: commands/reboot.c:39 +#: grub-core/commands/reboot.c:41 msgid "Reboot the computer." msgstr "重新启动计算机。" @@ -714,19 +722,19 @@ msgid "NAME [VARIABLE] [HINTS]" msgstr "名称 [变量] [提示]" -#: commands/search_file.c:5 +#: grub-core/commands/search_file.c:5 msgid "" "Search devices by file. If VARIABLE is specified, the first device found is " "set to a variable." msgstr "搜索含有指定文件的设备。如果指定了变量，找到的第一个设备会被保存到变量中。" -#: commands/search_label.c:5 +#: grub-core/commands/search_label.c:5 msgid "" "Search devices by label. If VARIABLE is specified, the first device found is " "set to a variable." msgstr "按卷标搜索。如果指定了变量，找到的第一个设备会被保存到变量中。" -#: commands/search_uuid.c:5 +#: grub-core/commands/search_uuid.c:5 msgid "" "Search devices by UUID. If VARIABLE is specified, the first device found is " "set to a variable." @@ -780,19 +788,19 @@ msgid "Manipulate PCI devices." msgstr "操作 PCI 设备。" -#: commands/sleep.c:31 +#: grub-core/commands/sleep.c:32 msgid "Verbose countdown." msgstr "显示倒计时。" -#: commands/sleep.c:32 +#: grub-core/commands/sleep.c:33 msgid "Interruptible with ESC." msgstr "可用 ESC 键中断。" -#: commands/sleep.c:106 +#: grub-core/commands/sleep.c:106 msgid "NUMBER_OF_SECONDS" msgstr "秒数" -#: commands/sleep.c:107 +#: grub-core/commands/sleep.c:107 msgid "Wait for a specified number of seconds." msgstr "等待指定时间(秒)。" @@ -828,15 +836,15 @@ msgid "List or select an output terminal." msgstr "列出或选择一个输出终端。" -#: commands/test.c:424 +#: grub-core/commands/test.c:427 msgid "EXPRESSION ]" msgstr "表达式 ]" -#: commands/test.c:424 commands/test.c:426 +#: grub-core/commands/test.c:427 grub-core/commands/test.c:430 msgid "Evaluate an expression." msgstr "执行该表达式。" -#: commands/test.c:426 +#: grub-core/commands/test.c:430 msgid "EXPRESSION" msgstr "表达式" @@ -844,15 +852,15 @@ msgid "Load the same file in multiple ways." msgstr "以多种方式载入同一个文件。" -#: commands/true.c:47 +#: grub-core/commands/true.c:49 msgid "Do nothing, successfully." msgstr "未进行操作，成功。" -#: commands/true.c:50 +#: grub-core/commands/true.c:52 msgid "Do nothing, unsuccessfully." msgstr "未进行操作，失败。" -#: commands/usbtest.c:199 +#: grub-core/commands/usbtest.c:212 msgid "Test USB support." msgstr "测试 USB 支持。" @@ -866,19 +874,19 @@ msgid "Test video subsystem in mode WxH." msgstr "在 WxH 模似下测试显示子系统。" -#: commands/videotest.c:180 +#: grub-core/commands/videotest.c:208 msgid "Test video subsystem." msgstr "测试显示子系统。" -#: commands/xnu_uuid.c:92 +#: grub-core/commands/xnu_uuid.c:94 msgid "GRUBUUID [VARNAME]" msgstr "GRUBUUID [变量]" -#: commands/xnu_uuid.c:93 +#: grub-core/commands/xnu_uuid.c:95 msgid "Transform 64-bit UUID to format suitable for XNU." msgstr "将 64 位的 UUID 转换成 XNU 的格式。" -#: disk/loopback.c:40 +#: grub-core/disk/loopback.c:41 msgid "Delete the loopback device entry." msgstr "删除回环设备项。" @@ -886,7 +894,7 @@ msgid "[-d] DEVICENAME FILE." msgstr "" -#: disk/loopback.c:250 +#: grub-core/disk/loopback.c:224 msgid "Make a device of a file." msgstr "将一个文件模拟成设备。" @@ -922,7 +930,7 @@ msgid "Translates the string with the current settings." msgstr "使用当前设置翻译字符串。" -#: normal/menu_text.c:363 +#: grub-core/gfxmenu/gui_progress_bar.c:281 grub-core/normal/menu_text.c:365 #, c-format msgid "The highlighted entry will be executed automatically in %ds." msgstr "高亮显示的启动项将在 %d 秒后自动执行。" @@ -943,7 +951,7 @@ msgid "%ds" msgstr "%d 秒" -#: hello/hello.c:43 +#: grub-core/hello/hello.c:45 msgid "Say \"Hello World\"." msgstr "显示“Hello World”。" @@ -975,7 +983,7 @@ msgid "Insert a module." msgstr "插入一个模块。" -#: util/i386/pc/grub-setup.c:562 +#: grub-core/kern/emu/hostdisk.c:1015 util/grub-setup.c:662 #, c-format msgid "cannot open `%s'" msgstr "无法打开“%s”" @@ -1004,79 +1012,85 @@ msgid "error: %s.\n" msgstr "错误：%s。\n" -#: lib/arg.c:34 +#: grub-core/lib/arg.c:34 msgid "Display this help and exit." msgstr "显示此帮助并退出。" -#: lib/arg.c:36 +#: grub-core/lib/arg.c:36 msgid "Display the usage of this command and exit." msgstr "显示此命令的用法并退出。" -#: loader/efi/appleloader.c:325 +#: grub-core/loader/efi/appleloader.c:223 msgid "Boot legacy system." msgstr "引导老版本系统。" -#: loader/efi/chainloader.c:340 loader/i386/pc/chainloader.c:153 +#: grub-core/loader/efi/chainloader.c:348 +#: grub-core/loader/i386/pc/chainloader.c:170 msgid "Load another boot loader." msgstr "载入其他引导程序。" -#: loader/i386/bsd.c:65 +#: grub-core/loader/i386/bsd.c:97 msgid "Display output on all consoles." msgstr "在所有控制台显示输出。" -#: loader/i386/bsd.c:66 +#: grub-core/loader/i386/bsd.c:98 grub-core/loader/i386/bsd.c:132 +#: grub-core/loader/i386/bsd.c:161 msgid "Use serial console." msgstr "使用串行终端。" -#: loader/i386/bsd.c:67 loader/i386/bsd.c:93 loader/i386/bsd.c:114 +#: grub-core/loader/i386/bsd.c:99 grub-core/loader/i386/bsd.c:125 +#: grub-core/loader/i386/bsd.c:149 msgid "Ask for file name to reboot from." msgstr "从指定文件重新启动。" -#: loader/i386/bsd.c:68 +#: grub-core/loader/i386/bsd.c:100 msgid "Use CDROM as root." msgstr "使用 CDROM 作为根。" -#: loader/i386/bsd.c:69 +#: grub-core/loader/i386/bsd.c:101 msgid "Invoke user configuration routing." msgstr "使用用户配置路径。" -#: loader/i386/bsd.c:70 loader/i386/bsd.c:97 loader/i386/bsd.c:117 +#: grub-core/loader/i386/bsd.c:102 grub-core/loader/i386/bsd.c:129 +#: grub-core/loader/i386/bsd.c:152 msgid "Enter in KDB on boot." msgstr "启动后进入 KDB。" -#: loader/i386/bsd.c:71 +#: grub-core/loader/i386/bsd.c:103 msgid "Use GDB remote debugger instead of DDB." msgstr "使用 GDB 远程调试工具替代 DDB。" -#: loader/i386/bsd.c:72 +#: grub-core/loader/i386/bsd.c:104 msgid "Disable all boot output." msgstr "禁用所有引导输出。" -#: loader/i386/bsd.c:74 +#: grub-core/loader/i386/bsd.c:106 msgid "Wait for keypress after every line of output." msgstr "每输出一行后暂停(按任意键继续)。" -#: loader/i386/bsd.c:76 +#: grub-core/loader/i386/bsd.c:108 msgid "Use compiled-in rootdev." msgstr "使用内置根设备" -#: loader/i386/bsd.c:77 loader/i386/bsd.c:96 loader/i386/bsd.c:120 +#: grub-core/loader/i386/bsd.c:109 grub-core/loader/i386/bsd.c:128 +#: grub-core/loader/i386/bsd.c:155 msgid "Boot into single mode." msgstr "以单用户模式启动" -#: loader/i386/bsd.c:78 loader/i386/bsd.c:121 +#: grub-core/loader/i386/bsd.c:110 grub-core/loader/i386/bsd.c:156 msgid "Boot with verbose messages." msgstr "启动时显示完整信息。" -#: loader/i386/bsd.c:94 loader/i386/bsd.c:115 +#: grub-core/loader/i386/bsd.c:126 grub-core/loader/i386/bsd.c:150 msgid "Don't reboot, just halt." msgstr "直接关机。" -#: loader/i386/bsd.c:95 loader/i386/bsd.c:116 +#: grub-core/loader/i386/bsd.c:127 grub-core/loader/i386/bsd.c:151 msgid "Change configured devices." msgstr "更改此前配置的设备。" -#: loader/i386/bsd.c:98 loader/i386/bsd.c:124 +#: grub-core/loader/i386/bsd.c:130 grub-core/loader/i386/bsd.c:159 +#: util/grub-fstest.c:364 msgid "Set root device." msgstr "设置根设备。" @@ -1084,23 +1098,23 @@ msgid "comUNIT[,SPEED]" msgstr "" -#: loader/i386/bsd.c:112 +#: grub-core/loader/i386/bsd.c:147 msgid "Disable SMP." msgstr "禁用 SMP。" -#: loader/i386/bsd.c:113 +#: grub-core/loader/i386/bsd.c:148 msgid "Disable ACPI." msgstr "禁用 ACPI。" -#: loader/i386/bsd.c:119 +#: grub-core/loader/i386/bsd.c:154 msgid "Don't display boot diagnostic messages." msgstr "不显示引导对话消息。" -#: loader/i386/bsd.c:122 +#: grub-core/loader/i386/bsd.c:157 msgid "Boot with debug messages." msgstr "显示调试信息。" -#: loader/i386/bsd.c:123 +#: grub-core/loader/i386/bsd.c:158 msgid "Supress normal output (warnings remain)." msgstr "不显示普通输出(显示警告)。" @@ -1108,23 +1122,23 @@ msgid "[ADDR|comUNIT][,SPEED]" msgstr "" -#: loader/i386/bsd.c:1297 +#: grub-core/loader/i386/bsd.c:1947 msgid "Load kernel of FreeBSD." msgstr "载入 FreeBSD 内核。" -#: loader/i386/bsd.c:1301 +#: grub-core/loader/i386/bsd.c:1950 msgid "Load kernel of OpenBSD." msgstr "载入 OpenBSD 内核。" -#: loader/i386/bsd.c:1305 +#: grub-core/loader/i386/bsd.c:1953 msgid "Load kernel of NetBSD." msgstr "载入 NetBSD 内核。" -#: loader/i386/bsd.c:1309 +#: grub-core/loader/i386/bsd.c:1957 msgid "Load FreeBSD env." msgstr "载入 FreeBSD 环境。" -#: loader/i386/bsd.c:1312 +#: grub-core/loader/i386/bsd.c:1960 msgid "Load FreeBSD kernel module." msgstr "载入 FreeBSD 内核模块。" @@ -1136,19 +1150,21 @@ msgid "Load NetBSD kernel module (ELF)." msgstr "载入 NetBSD 内核模块(ELF)。" -#: loader/i386/bsd.c:1315 +#: grub-core/loader/i386/bsd.c:1969 msgid "Load FreeBSD kernel module (ELF)." msgstr "载入 FreeBSD 内核模块(ELF)。" -#: 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 +#: 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 msgid "Load Linux." msgstr "载入 Linux。" -#: 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 +#: 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 msgid "Load initrd." msgstr "载入 initrd。" @@ -1156,11 +1172,11 @@ msgid "Load NTLDR or BootMGR." msgstr "载入 NTLDR 或 BootMGR。" -#: loader/i386/xnu.c:1032 +#: grub-core/loader/i386/xnu.c:1130 msgid "Load device-properties dump." msgstr "载入设备特性转储。" -#: loader/multiboot_loader.c:133 +#: grub-core/loader/multiboot.c:339 msgid "Load a multiboot 2 kernel." msgstr "载入 multiboot 2 内核。" @@ -1168,43 +1184,43 @@ msgid "Load a multiboot 2 module." msgstr "载入 multiboot 2 模块。" -#: loader/multiboot_loader.c:136 +#: grub-core/loader/multiboot.c:345 msgid "Load a multiboot kernel." msgstr "载入 multiboot 内核。" -#: loader/multiboot_loader.c:141 +#: grub-core/loader/multiboot.c:348 msgid "Load a multiboot module." msgstr "载入 multiboot 模块。" -#: loader/xnu.c:1428 +#: grub-core/loader/xnu.c:1456 msgid "Load XNU image." msgstr "载入 XNU 内核镜像。" -#: loader/xnu.c:1430 +#: grub-core/loader/xnu.c:1458 msgid "Load 64-bit XNU image." msgstr "载入 64 位 XNU 镜像。" -#: loader/xnu.c:1432 +#: grub-core/loader/xnu.c:1460 msgid "Load XNU extension package." msgstr "载入 XNU 扩展包。" -#: loader/xnu.c:1434 +#: grub-core/loader/xnu.c:1462 msgid "Load XNU extension." msgstr "载入 XNU 扩展。" -#: loader/xnu.c:1436 +#: grub-core/loader/xnu.c:1464 msgid "DIRECTORY [OSBundleRequired]" msgstr "目录 [OSBundleRequired]" -#: loader/xnu.c:1437 +#: grub-core/loader/xnu.c:1465 msgid "Load XNU extension directory." msgstr "载入 XNU 扩展目录。" -#: loader/xnu.c:1444 +#: grub-core/loader/xnu.c:1471 msgid "Load a splash image for XNU." msgstr "载入引导画面。" -#: loader/xnu.c:1449 +#: grub-core/loader/xnu.c:1476 msgid "Load XNU hibernate image." msgstr "载入休眠镜像。" @@ -1224,11 +1240,11 @@ msgid "Remove any memory regions in specified range." msgstr "" -#: normal/auth.c:233 +#: grub-core/normal/auth.c:216 msgid "Enter username: " msgstr "输入用户名： " -#: normal/auth.c:238 +#: grub-core/normal/auth.c:221 msgid "Enter password: " msgstr "输入口令： " @@ -1240,41 +1256,41 @@ msgid "Authenticate users" msgstr "认证用户" -#: normal/menu_entry.c:1060 +#: grub-core/normal/cmdline.c:174 grub-core/normal/menu_entry.c:1074 msgid "Possible commands are:" msgstr "可用命令：" -#: normal/menu_entry.c:1064 +#: grub-core/normal/cmdline.c:177 grub-core/normal/menu_entry.c:1078 msgid "Possible devices are:" msgstr "可用设备：" -#: normal/menu_entry.c:1068 +#: grub-core/normal/cmdline.c:180 grub-core/normal/menu_entry.c:1082 msgid "Possible files are:" msgstr "可用文件：" -#: normal/menu_entry.c:1072 +#: grub-core/normal/cmdline.c:183 grub-core/normal/menu_entry.c:1086 msgid "Possible partitions are:" msgstr "可用分区：" -#: normal/menu_entry.c:1076 +#: grub-core/normal/cmdline.c:186 grub-core/normal/menu_entry.c:1090 msgid "Possible arguments are:" msgstr "可用参数：" -#: normal/menu_entry.c:1080 +#: grub-core/normal/cmdline.c:189 grub-core/normal/menu_entry.c:1094 msgid "Possible things are:" msgstr "可用事物：" -#: normal/color.c:80 +#: grub-core/normal/color.c:81 #, c-format msgid "Warning: syntax error (missing slash) in `%s'\n" msgstr "警告：%s 中有语法错误(缺少斜杠)\n" -#: normal/color.c:89 +#: grub-core/normal/color.c:90 #, c-format msgid "Warning: invalid foreground color `%s'\n" msgstr "警告：无效的前景色 `%s'\n" -#: normal/color.c:95 +#: grub-core/normal/color.c:96 #, c-format msgid "Warning: invalid background color `%s'\n" msgstr "警告：无效的背景色 `%s'\n" @@ -1287,16 +1303,16 @@ msgid "Export variables." msgstr "导出变量。" -#: normal/dyncmd.c:147 +#: grub-core/normal/dyncmd.c:159 msgid "not loaded" msgstr "未加载" -#: normal/main.c:408 +#: grub-core/normal/main.c:214 #, c-format msgid "GNU GRUB version %s" msgstr "GNU GRUB %s 版" -#: normal/main.c:539 +#: grub-core/normal/main.c:359 #, c-format msgid "" "Minimal BASH-like line editing is supported. For the first word, TAB lists " @@ -1304,11 +1320,11 @@ "file completions. %s" msgstr "支持最小化的类 Bash 行编辑。对于第一个单词 Tab 列出可用的命令名补全；对于其他位置 Tab 列出可能的设备或文件。%s" -#: normal/main.c:542 +#: grub-core/normal/main.c:362 msgid "ESC at any time exits." msgstr "任何时候按下 ESC 均可退出。" -#: commands/minicmd.c:378 +#: grub-core/normal/main.c:496 msgid "Clear the screen." msgstr "清屏。" @@ -1320,7 +1336,7 @@ msgid "Exit from normal mode." msgstr "退出普通模式。" -#: normal/menu_entry.c:1397 +#: grub-core/normal/menu.c:50 grub-core/normal/menu_entry.c:1445 msgid "Press any key to continue..." msgstr "按任意键继续..." @@ -1338,7 +1354,7 @@ msgid "Failed to boot both default and fallback entries.\n" msgstr "引导默认启动项和会滚启动想均失败。\n" -#: normal/menu_entry.c:1184 +#: grub-core/normal/menu_entry.c:1199 msgid "Booting a command list" msgstr "正在按照命令列表进行引导" @@ -1351,48 +1367,48 @@ "支持最小化的类 Emacs 屏幕编辑。Tab 列出可补全项，Ctrl-x 或 F10 进行引导，Ctrl-c 或 F2 进入命令行，ESC " "放弃编辑并返回菜单。" -#: normal/menu_text.c:186 +#: grub-core/normal/menu_text.c:159 #, c-format msgid "Use the %C and %C keys to select which entry is highlighted.\n" msgstr "使用 %C 键和 %C 键选择要高亮的启动项。\n" -#: normal/menu_text.c:203 +#: grub-core/normal/menu_text.c:179 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" -#: normal/menu_text.c:211 +#: grub-core/normal/menu_text.c:187 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" -#: normal/misc.c:41 +#: grub-core/normal/misc.c:42 #, c-format msgid "Partition %s:" msgstr "分区 %s：" -#: normal/misc.c:46 +#: grub-core/normal/misc.c:47 #, c-format msgid "Device %s:" msgstr "设备 %s：" -#: normal/misc.c:52 +#: grub-core/normal/misc.c:53 msgid "Filesystem cannot be accessed" msgstr "无法访问文件系统" -#: normal/misc.c:63 +#: grub-core/normal/misc.c:64 #, c-format msgid "Filesystem type %s" msgstr "文件系统类型 %s" -#: normal/misc.c:73 +#: grub-core/normal/misc.c:74 #, c-format msgid "- Label \"%s\"" msgstr "- 卷标 %s" -#: normal/misc.c:88 +#: grub-core/normal/misc.c:89 #, c-format msgid "- Last modification time %d-%02d-%02d %02d:%02d:%02d %s" msgstr "- 最近更改 %d-%02d-%02d %02d:%02d:%02d %s" @@ -1448,27 +1464,27 @@ msgid "Load background image for active terminal." msgstr "为活动终端加载背景图像。" -#: term/serial.c:46 +#: grub-core/term/serial.c:37 msgid "Set the serial unit." msgstr "设置串行单元。" -#: term/serial.c:47 +#: grub-core/term/serial.c:38 msgid "Set the serial port address." msgstr "设置串行端口地址。" -#: term/serial.c:48 +#: grub-core/term/serial.c:39 msgid "Set the serial port speed." msgstr "设置串行端口速度。" -#: term/serial.c:49 +#: grub-core/term/serial.c:40 msgid "Set the serial port word length." msgstr "设置串行端口字长。" -#: term/serial.c:50 +#: grub-core/term/serial.c:41 msgid "Set the serial port parity." msgstr "设置串行端口奇偶校验。" -#: term/serial.c:51 +#: grub-core/term/serial.c:42 msgid "Set the serial port stop bits." msgstr "设置串行端口停止位。" @@ -1737,33 +1753,33 @@ msgid "Debug tool for filesystem driver." msgstr "文件系统驱动调试工具。" -#: util/grub-mkrawimage.c:69 +#: util/grub-mkimage.c:494 util/grub-mkimage.c:535 msgid "the core image is too small" msgstr "核心镜像太小" -#: util/grub-mkrawimage.c:81 +#: util/grub-mkimage.c:505 util/grub-mkimage.c:539 util/grub-mkimage.c:557 msgid "cannot compress the kernel image" msgstr "无法压缩内核镜像" -#: util/grub-mkrawimage.c:156 +#: util/grub-mkimage.c:672 msgid "prefix is too long" msgstr "前缀太长" -#: util/grub-mkrawimage.c:330 +#: util/grub-mkimage.c:836 #, c-format msgid "core image is too big (%p > %p)" msgstr "核心镜像太大(%p > %p)" -#: util/grub-mkrawimage.c:242 +#: util/grub-mkimage.c:842 msgid "the core image is too big" msgstr "核心镜像太大" -#: util/grub-mkrawimage.c:247 +#: util/grub-mkimage.c:861 #, c-format msgid "diskboot.img size must be %u bytes" msgstr "diskboot.img 的大小必须为 %u 字节" -#: util/grub-mkrawimage.c:434 util/i386/pc/grub-setup.c:602 +#: util/grub-mkimage.c:1402 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "请尝试运行“%s --help”以获得更多信息。\n" @@ -1792,34 +1808,34 @@ "Report bugs to <%s>.\n" msgstr "" -#: util/grub-mkrawimage.c:580 +#: util/grub-mkimage.c:1577 #, c-format msgid "cannot open %s" msgstr "无法打开 %s" -#: util/i386/pc/grub-setup.c:160 +#: util/grub-setup.c:215 msgid "the first sector of the core file is not sector-aligned" msgstr "核心文件的第一扇区未对齐" -#: util/i386/pc/grub-setup.c:174 +#: util/grub-setup.c:229 msgid "non-sector-aligned data is found in the core file" msgstr "核心文件中发现未对齐的扇区" -#: util/i386/pc/grub-setup.c:188 +#: util/grub-setup.c:245 msgid "the sectors of the core file are too fragmented" msgstr "核心文件的扇区碎片太多" -#: util/i386/pc/grub-setup.c:199 +#: util/grub-setup.c:258 #, c-format msgid "the size of `%s' is not %u" msgstr "“%s”的大小不是 %u" -#: util/i386/pc/grub-setup.c:216 +#: util/grub-setup.c:268 #, c-format msgid "the size of `%s' is too small" msgstr "“%s”的尺寸太小" -#: util/i386/pc/grub-setup.c:218 +#: util/grub-setup.c:271 #, c-format msgid "the size of `%s' is too large" msgstr "“%s”的尺寸太大" @@ -1830,13 +1846,13 @@ "partition label and filesystem. This is not supported yet." msgstr "正在试图将 GRUB 安装至有多个分区标签的磁盘，或同时有分区标签和文件系统的磁盘。这样的操作尚未被支持。" -#: util/i386/pc/grub-setup.c:255 +#: util/grub-setup.c:379 #, c-format msgid "" "unable to identify a filesystem in %s; safety check can't be performed" msgstr "无法在 %s 中识别文件系统，无法执行安全性检测" -#: util/i386/pc/grub-setup.c:259 +#: util/grub-setup.c:382 #, c-format msgid "" "%s appears to contain a %s filesystem which isn't known to reserve space for " @@ -1864,7 +1880,7 @@ "is a BAD idea." msgstr "正在试图将 GRUB 安装至未分区的磁盘或一个分区。这是一个坏主意。" -#: util/i386/pc/grub-setup.c:419 +#: util/grub-setup.c:499 msgid "" "embedding is not possible, but this is required when the root device is on a " "RAID array or LVM volume" @@ -1886,30 +1902,30 @@ msgid "will not proceed with blocklists" msgstr "" -#: util/i386/pc/grub-setup.c:445 +#: util/grub-setup.c:529 #, c-format msgid "attempting to read the core image `%s' from GRUB" msgstr "正在尝试从 GRUB 读取核心镜像“%s”" -#: util/i386/pc/grub-setup.c:446 +#: util/grub-setup.c:530 #, c-format msgid "attempting to read the core image `%s' from GRUB again" msgstr "正在尝试再次从 GRUB 读取核心镜像“%s”" -#: util/i386/pc/grub-setup.c:513 +#: util/grub-setup.c:589 #, c-format msgid "cannot read `%s' correctly" msgstr "无法正确读取“%s”" -#: util/i386/pc/grub-setup.c:526 +#: util/grub-setup.c:604 msgid "no terminator in the core image" msgstr "核心镜像中没有终止符" -#: util/i386/pc/grub-setup.c:537 +#: util/grub-setup.c:616 msgid "failed to read the first sector of the core image" msgstr "读取核心镜像的第一扇区失败" -#: util/i386/pc/grub-setup.c:543 +#: util/grub-setup.c:622 msgid "failed to read the rest sectors of the core image" msgstr "读取核心镜像的其他扇区失败" @@ -1959,13 +1975,12 @@ "on some BIOSes." msgstr "" -#: util/i386/pc/grub-setup.c:740 +#: util/grub-setup.c:822 #, c-format msgid "Unknown extra argument `%s'.\n" msgstr "未知的额外参数“%s”。\n" -#: util/i386/pc/grub-setup.c:734 -#, c-format +#: util/grub-setup.c:828 msgid "No device is specified.\n" msgstr "没有指定设备。\n" @@ -1980,17 +1995,17 @@ msgid "DEVICE must be an OS device (e.g. /dev/sda)." msgstr "指定的设备必须是一个操作系统设备(例如 /dev/sda)。" -#: util/i386/pc/grub-setup.c:757 +#: util/grub-setup.c:915 #, c-format msgid "Invalid device `%s'.\n" msgstr "无效的设备“%s”。\n" -#: util/i386/pc/grub-setup.c:770 +#: util/grub-setup.c:935 #, c-format msgid "invalid root device `%s'" msgstr "无效的根设备“%s”" -#: util/i386/pc/grub-setup.c:783 +#: util/grub-setup.c:949 msgid "cannot guess the root device. Specify the option `--root-device'" msgstr "无法猜测根设备。请使用“--root-device”参数指定。" @@ -2006,27 +2021,27 @@ msgid "%s, with kFreeBSD %s (recovery mode)" msgstr "%s，kFreeBSd %s (恢复模式)" -#: util/grub.d/10_kfreebsd.in:47 +#: util/grub.d/10_kfreebsd.in:76 msgid "%s, with kFreeBSD %s" msgstr "%s，kFreeBSD %s" -#: util/grub.d/10_kfreebsd.in:55 +#: util/grub.d/10_kfreebsd.in:87 msgid "Loading kernel of FreeBSD %s ..." msgstr "载入 FreeBSD 内核 %s ..." -#: util/grub.d/10_linux.in:60 +#: util/grub.d/10_linux.in:69 msgid "%s, with Linux %s (recovery mode)" msgstr "%s，Linux %s (恢复模式)" -#: util/grub.d/10_linux.in:62 +#: util/grub.d/10_linux.in:71 msgid "%s, with Linux %s" msgstr "%s，Linux %s" -#: util/grub.d/10_linux.in:87 +#: util/grub.d/10_linux.in:116 util/grub.d/20_linux_xen.in:85 msgid "Loading Linux %s ..." msgstr "载入 Linux %s ..." -#: util/grub.d/10_linux.in:92 +#: util/grub.d/10_linux.in:122 util/grub.d/20_linux_xen.in:93 msgid "Loading initial ramdisk ..." msgstr "载入初始化内存盘..." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gutenprint.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gutenprint.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/gutenprint.po 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/gutenprint.po 2012-03-23 07:33:14.000000000 +0000 @@ -7,19 +7,19 @@ msgstr "" "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" +"POT-Creation-Date: 2011-12-26 20:33-0500\n" "PO-Revision-Date: 2012-02-15 08:07+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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: 2012-02-21 22:31+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:01+0000\n" +"X-Generator: Launchpad (build 14981)\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 +#: src/main/print-escp2.c:2338 src/main/print-pcl.c:1872 msgid "Default" msgstr "默认" @@ -131,284 +131,285 @@ msgid "Dither algorithm" msgstr "抖动算法" -#: src/main/print-canon.c:202 src/main/print-escp2.c:168 -#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863 +#: src/main/print-canon.c:204 src/main/print-escp2.c:168 +#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74 msgid "Page Size" 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-canon.c:205 src/main/print-escp2.c:169 +#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75 msgid "Size of the paper being printed to" 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 +#: src/main/print-canon.c:210 src/main/print-escp2.c:174 +#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006 +#: src/main/print-pcl.c:1352 src/cups/genppd.c:1917 src/cups/genppd.c:2380 msgid "Media Type" 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-canon.c:211 src/main/print-escp2.c:175 +#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007 #: src/main/print-pcl.c:1353 msgid "Type of media (plain paper, photo paper, etc.)" 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 +#: src/main/print-canon.c:216 src/main/print-escp2.c:180 +#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012 +#: src/main/print-pcl.c:1358 src/cups/genppd.c:1952 src/cups/genppd.c:2399 msgid "Media Source" 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-canon.c:217 src/main/print-escp2.c:181 +#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013 #: src/main/print-pcl.c:1359 msgid "Source (input slot) of the media" msgstr "媒质来源(进纸槽)" -#: src/main/print-canon.c:220 src/main/print-escp2.c:192 +#: src/main/print-canon.c:222 src/main/print-escp2.c:192 msgid "CD Hub Size" msgstr "CD集线器容量" -#: src/main/print-canon.c:221 src/main/print-escp2.c:193 +#: src/main/print-canon.c:223 src/main/print-escp2.c:193 msgid "Print only outside of the hub of the CD, or all the way to the hole" msgstr "" -#: src/main/print-canon.c:226 src/main/print-escp2.c:198 +#: src/main/print-canon.c:228 src/main/print-escp2.c:198 msgid "CD Size (Custom)" msgstr "CD 尺寸(自定义)" -#: src/main/print-canon.c:227 src/main/print-escp2.c:199 +#: src/main/print-canon.c:229 src/main/print-escp2.c:199 msgid "Variable adjustment for the outer diameter of CD" msgstr "" -#: src/main/print-canon.c:232 src/main/print-escp2.c:204 +#: src/main/print-canon.c:234 src/main/print-escp2.c:204 msgid "CD Hub Size (Custom)" msgstr "CD集线器容量（自定义）" -#: src/main/print-canon.c:233 src/main/print-escp2.c:205 +#: src/main/print-canon.c:235 src/main/print-escp2.c:205 msgid "Variable adjustment to the inner hub of the CD" msgstr "" -#: src/main/print-canon.c:238 src/main/print-escp2.c:210 +#: src/main/print-canon.c:240 src/main/print-escp2.c:210 msgid "CD Horizontal Fine Adjustment" msgstr "CD 水平微调" -#: src/main/print-canon.c:239 src/main/print-canon.c:245 +#: src/main/print-canon.c:241 src/main/print-canon.c:247 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217 msgid "Fine adjustment to horizontal position for CD printing" msgstr "" -#: src/main/print-canon.c:244 src/main/print-escp2.c:216 +#: src/main/print-canon.c:246 src/main/print-escp2.c:216 msgid "CD Vertical Fine Adjustment" msgstr "CD 垂直微调" -#: src/main/print-canon.c:250 src/main/print-escp2.c:228 -#: 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 +#: src/main/print-canon.c:252 src/main/print-escp2.c:228 +#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018 +#: src/main/print-pcl.c:1370 src/cups/genppd.c:2042 src/cups/genppd.c:2435 msgid "Resolution" msgstr "分辨率" -#: src/main/print-canon.c:251 src/main/print-lexmark.c:285 -#: src/main/print-olympus.c:1882 +#: src/main/print-canon.c:253 src/main/print-lexmark.c:285 +#: src/main/print-olympus.c:2019 msgid "Resolution and quality of the print" msgstr "打印清晰度和品质" -#: src/main/print-canon.c:256 src/main/print-escp2.c:239 -#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887 +#: src/main/print-canon.c:258 src/main/print-escp2.c:239 +#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80 msgid "Ink Type" msgstr "油墨类型" -#: src/main/print-canon.c:257 src/main/print-escp2.c:240 +#: src/main/print-canon.c:259 src/main/print-escp2.c:240 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291 -#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377 +#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377 #: src/main/print-raw.c:81 msgid "Type of ink in the printer" msgstr "打印机油墨类型" -#: src/main/print-canon.c:262 src/main/print-canon.c:263 +#: src/main/print-canon.c:264 src/main/print-canon.c:265 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383 msgid "Ink Channels" msgstr "油墨通路" -#: src/main/print-canon.c:268 src/main/print-escp2.c:341 -#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909 +#: src/main/print-canon.c:270 src/main/print-escp2.c:341 +#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86 msgid "Printing Mode" msgstr "打印模式" -#: src/main/print-canon.c:269 src/main/print-escp2.c:342 -#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910 +#: src/main/print-canon.c:271 src/main/print-escp2.c:342 +#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87 msgid "Printing Output Mode" msgstr "打印输出模式" -#: src/main/print-canon.c:274 src/main/print-escp2.c:186 +#: src/main/print-canon.c:276 src/main/print-escp2.c:186 #: src/main/print-pcl.c:1394 msgid "Double-Sided Printing" msgstr "双面打印" -#: src/main/print-canon.c:275 src/main/print-escp2.c:187 +#: src/main/print-canon.c:277 src/main/print-escp2.c:187 #: src/main/print-pcl.c:1395 msgid "Duplex/Tumble Setting" msgstr "双面/滚动设置" -#: src/main/print-canon.c:280 src/main/print-canon.c:281 +#: src/main/print-canon.c:282 src/main/print-canon.c:283 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163 #: 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 "打印质量" -#: src/main/print-canon.c:303 src/main/print-escp2.c:454 +#: src/main/print-canon.c:305 src/main/print-escp2.c:454 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417 msgid "Cyan Density" msgstr "绿色浓度" -#: src/main/print-canon.c:304 src/main/print-escp2.c:455 +#: src/main/print-canon.c:306 src/main/print-escp2.c:455 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418 msgid "Adjust the cyan density" msgstr "调整绿色浓度" -#: src/main/print-canon.c:311 src/main/print-escp2.c:462 +#: src/main/print-canon.c:313 src/main/print-escp2.c:462 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425 msgid "Magenta Density" msgstr "洋红色浓度" -#: src/main/print-canon.c:312 src/main/print-escp2.c:463 +#: src/main/print-canon.c:314 src/main/print-escp2.c:463 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426 msgid "Adjust the magenta density" msgstr "调整红色浓度" -#: src/main/print-canon.c:319 src/main/print-escp2.c:470 +#: src/main/print-canon.c:321 src/main/print-escp2.c:470 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433 msgid "Yellow Density" msgstr "黄色浓度" -#: src/main/print-canon.c:320 src/main/print-escp2.c:471 +#: src/main/print-canon.c:322 src/main/print-escp2.c:471 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434 msgid "Adjust the yellow density" msgstr "调整黄色浓度" -#: src/main/print-canon.c:327 src/main/print-escp2.c:478 +#: src/main/print-canon.c:329 src/main/print-escp2.c:478 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441 msgid "Black Density" msgstr "黑色浓度" -#: src/main/print-canon.c:328 src/main/print-escp2.c:479 +#: src/main/print-canon.c:330 src/main/print-escp2.c:479 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442 msgid "Adjust the black density" msgstr "调整黑色浓度" -#: src/main/print-canon.c:335 src/main/print-canon.c:336 +#: src/main/print-canon.c:337 src/main/print-canon.c:338 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450 msgid "Light Cyan Transition" msgstr "淡青色过渡" -#: src/main/print-canon.c:343 src/main/print-canon.c:344 +#: src/main/print-canon.c:345 src/main/print-canon.c:346 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458 msgid "Light Magenta Transition" msgstr "淡红色过渡" -#: src/main/print-canon.c:351 src/main/print-canon.c:352 +#: src/main/print-canon.c:353 src/main/print-canon.c:354 msgid "Light Yellow Transition" msgstr "淡黄色过渡" -#: src/main/print-canon.c:371 src/main/print-escp2.c:2503 -#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546 -#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557 -#: src/xml/xmli18n-tmp.h:6564 +#: src/main/print-canon.c:373 src/main/print-escp2.c:2509 +#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560 +#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571 +#: src/xml/xmli18n-tmp.h:6578 msgid "Off" msgstr "关" -#: src/main/print-canon.c:372 src/main/print-escp2.c:2505 +#: src/main/print-canon.c:374 src/main/print-escp2.c:2511 #: src/main/print-pcl.c:1684 msgid "Long Edge (Standard)" msgstr "长边(标准)" -#: src/main/print-canon.c:373 src/main/print-pcl.c:1685 +#: src/main/print-canon.c:375 src/main/print-pcl.c:1685 msgid "Short Edge (Flip)" msgstr "短边（翻转）" -#: src/main/print-canon.c:666 src/main/print-escp2.c:2216 -#: src/xml/xmli18n-tmp.h:6613 +#: src/main/print-canon.c:775 src/main/print-escp2.c:2225 +#: src/xml/xmli18n-tmp.h:6636 msgid "CD - 5 inch" msgstr "CD - 5 英寸" -#: src/main/print-canon.c:668 src/main/print-escp2.c:2218 -#: src/xml/xmli18n-tmp.h:6614 +#: src/main/print-canon.c:777 src/main/print-escp2.c:2227 +#: src/xml/xmli18n-tmp.h:6637 msgid "CD - 3 inch" msgstr "CD - 3 英寸" -#: src/main/print-canon.c:670 src/main/print-escp2.c:2220 -#: src/xml/xmli18n-tmp.h:6615 +#: src/main/print-canon.c:779 src/main/print-escp2.c:2229 +#: src/xml/xmli18n-tmp.h:6638 msgid "CD - Custom" 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 -#: src/cups/genppd.c:2462 +#: src/main/print-canon.c:802 src/main/print-escp2.c:2263 +#: src/cups/genppd.c:1316 src/cups/genppd.c:2169 src/cups/genppd.c:2367 +#: src/cups/genppd.c:2458 msgid "Normal" msgstr "正常" -#: src/main/print-canon.c:695 src/main/print-escp2.c:2256 +#: src/main/print-canon.c:804 src/main/print-escp2.c:2265 msgid "Print To Hub" msgstr "打印到集线器" -#: src/main/print-canon.c:810 src/main/print-canon.c:864 -#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279 -#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997 +#: src/main/print-canon.c:921 src/main/print-canon.c:979 +#: src/main/print-escp2.c:2675 src/main/print-lexmark.c:1279 +#: src/main/print-olympus.c:2301 src/main/print-pcl.c:1997 #: src/main/print-ps.c:329 src/main/print-raw.c:135 #: src/gutenprintui2/panel.c:291 msgid "Color" msgstr "颜色" -#: src/main/print-canon.c:812 src/main/print-escp2.c:2671 +#: src/main/print-canon.c:923 src/main/print-escp2.c:2677 #: 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 "黑白" -#: src/main/print-canon.c:851 src/main/print-escp2.c:2309 +#: src/main/print-canon.c:964 src/main/print-escp2.c:2318 #: src/main/print-pcl.c:1890 src/main/generic-options.c:213 #: src/main/generic-options.c:230 msgid "Manual Control" msgstr "手动控制" -#: src/main/print-canon.c:853 src/main/print-escp2.c:2351 -#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461 +#: src/main/print-canon.c:966 src/main/print-escp2.c:2360 +#: src/main/print-escp2.c:2455 src/main/print-escp2.c:2467 #: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846 #: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757 #: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761 -#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118 -#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127 -#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133 -#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141 -#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150 -#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672 -#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569 -#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585 -#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602 +#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132 +#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141 +#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147 +#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155 +#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164 +#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686 +#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583 +#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599 +#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617 +#: src/xml/xmli18n-tmp.h:6625 msgid "Standard" msgstr "标准" -#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716 +#: src/main/print-canon.c:977 src/gutenprintui2/panel.c:1716 msgid "Both" msgstr "" -#: src/main/print-canon.c:866 src/main/print-color.c:314 +#: src/main/print-canon.c:981 src/main/print-color.c:314 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376 -#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046 -#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584 +#: src/escputil/escputil.c:1038 src/escputil/escputil.c:1060 +#: src/escputil/escputil.c:1328 src/xml/xmli18n-tmp.h:2584 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661 @@ -457,151 +458,151 @@ #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077 -#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170 -#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192 -#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209 -#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226 -#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238 -#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253 -#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268 -#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280 -#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292 -#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307 -#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319 -#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334 -#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346 -#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358 -#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380 -#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397 -#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411 -#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430 -#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456 -#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470 -#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485 -#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507 -#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522 -#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535 -#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561 -#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575 -#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590 -#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612 -#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627 -#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640 -#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655 -#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667 -#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676 -#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691 -#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703 -#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722 -#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737 -#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756 -#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784 -#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799 -#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817 -#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834 -#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856 -#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861 -#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879 -#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895 -#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916 -#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928 -#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937 -#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955 -#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973 -#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994 -#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013 -#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030 -#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052 -#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071 -#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092 -#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111 -#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128 -#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150 -#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169 -#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190 -#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209 -#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226 -#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248 -#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267 -#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279 -#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301 -#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318 -#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332 -#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346 -#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368 -#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385 -#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399 -#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413 -#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435 -#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452 -#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466 -#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480 -#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502 -#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519 -#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533 -#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547 -#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562 -#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574 -#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593 -#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608 -#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627 -#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649 -#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666 -#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679 -#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692 -#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704 -#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723 -#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738 -#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757 -#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769 -#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790 -#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805 -#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824 -#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836 -#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857 -#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872 -#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891 -#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912 -#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924 -#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933 -#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951 -#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968 -#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990 -#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995 -#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013 -#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029 -#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046 -#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068 -#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087 -#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108 -#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127 -#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142 -#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157 -#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174 -#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196 -#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215 -#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236 -#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255 -#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270 -#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281 -#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296 -#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308 -#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323 -#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335 -#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347 -#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368 -#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380 -#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389 -#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407 -#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424 -#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446 -#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451 -#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469 -#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485 -#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500 -#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515 -#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527 -#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542 +#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184 +#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206 +#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223 +#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240 +#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252 +#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267 +#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282 +#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294 +#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306 +#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321 +#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333 +#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348 +#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360 +#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372 +#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394 +#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411 +#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425 +#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444 +#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470 +#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484 +#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499 +#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521 +#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536 +#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549 +#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575 +#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589 +#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604 +#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626 +#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641 +#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654 +#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669 +#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681 +#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690 +#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705 +#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717 +#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736 +#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751 +#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770 +#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798 +#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813 +#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831 +#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848 +#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870 +#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875 +#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893 +#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909 +#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930 +#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942 +#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951 +#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969 +#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987 +#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008 +#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027 +#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044 +#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066 +#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085 +#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106 +#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125 +#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142 +#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164 +#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183 +#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204 +#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223 +#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240 +#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262 +#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281 +#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293 +#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315 +#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332 +#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346 +#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360 +#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382 +#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399 +#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413 +#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427 +#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449 +#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466 +#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480 +#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494 +#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516 +#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533 +#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547 +#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561 +#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576 +#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588 +#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607 +#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622 +#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641 +#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663 +#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680 +#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693 +#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706 +#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718 +#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737 +#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752 +#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771 +#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783 +#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804 +#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819 +#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838 +#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850 +#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871 +#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886 +#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905 +#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926 +#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938 +#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947 +#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965 +#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982 +#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004 +#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009 +#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027 +#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043 +#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060 +#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082 +#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101 +#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122 +#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141 +#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156 +#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171 +#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188 +#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210 +#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229 +#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250 +#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269 +#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284 +#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295 +#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310 +#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322 +#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337 +#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349 +#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361 +#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382 +#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394 +#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403 +#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421 +#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438 +#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460 +#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465 +#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483 +#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499 +#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514 +#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529 +#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541 +#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556 msgid "Black" msgstr "黑" @@ -638,7 +639,7 @@ msgstr "" #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292 -#: src/cups/genppd.c:1266 src/cups/genppd.c:2354 +#: src/cups/genppd.c:1261 src/cups/genppd.c:2350 msgid "Grayscale" msgstr "灰度" @@ -654,11 +655,11 @@ msgid "CMY" msgstr "CMY" -#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361 +#: src/main/print-color.c:129 src/cups/genppd.c:1292 src/cups/genppd.c:2357 msgid "CMYK" msgstr "CMYK" -#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362 +#: src/main/print-color.c:131 src/cups/genppd.c:1299 src/cups/genppd.c:2358 msgid "KCMY" msgstr "KCMY" @@ -758,8 +759,8 @@ msgstr "应用程序假定的gamma值" #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355 -#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047 -#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585 +#: src/escputil/escputil.c:1041 src/escputil/escputil.c:1061 +#: src/escputil/escputil.c:1329 src/xml/xmli18n-tmp.h:2585 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662 @@ -811,178 +812,178 @@ #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078 -#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171 -#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184 -#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194 -#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203 -#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222 -#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233 -#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243 -#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254 -#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264 -#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275 -#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297 -#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308 -#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330 -#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341 -#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365 -#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376 -#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387 -#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398 -#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431 -#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446 -#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461 -#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471 -#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486 -#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501 -#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512 -#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523 -#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536 -#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551 -#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566 -#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576 -#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591 -#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606 -#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617 -#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628 -#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641 -#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651 -#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677 -#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687 -#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710 -#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723 -#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733 -#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742 -#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757 -#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772 -#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785 -#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795 -#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804 -#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818 -#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835 -#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848 -#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864 -#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873 -#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888 -#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904 -#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917 -#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933 -#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942 -#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957 -#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975 -#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988 -#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999 -#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016 -#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031 -#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044 -#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055 -#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073 -#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086 -#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097 -#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114 -#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129 -#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142 -#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153 -#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171 -#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184 -#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195 -#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212 -#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227 -#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240 -#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251 -#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263 -#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274 -#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286 -#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297 -#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308 -#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319 -#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353 -#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364 -#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375 -#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386 -#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420 -#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431 -#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442 -#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453 -#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487 -#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498 -#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509 -#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520 -#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552 -#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563 -#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587 -#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598 -#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609 -#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620 -#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634 -#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645 -#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656 -#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667 -#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680 -#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693 -#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705 -#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717 -#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728 -#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739 -#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750 -#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784 -#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795 -#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806 -#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817 -#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851 -#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862 -#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873 -#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884 -#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900 -#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913 -#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929 -#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938 -#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953 -#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969 -#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982 -#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998 -#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007 -#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022 -#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040 -#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053 -#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064 -#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081 -#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096 -#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109 -#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120 -#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132 -#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143 -#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152 -#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168 -#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181 -#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192 -#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209 -#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224 -#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237 -#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248 -#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260 -#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271 -#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282 -#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292 -#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315 -#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325 -#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349 -#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362 -#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373 -#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390 -#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401 -#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418 -#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431 -#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442 -#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459 -#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470 -#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486 -#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496 -#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507 -#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517 -#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528 -#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538 -#: src/xml/xmli18n-tmp.h:6543 +#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185 +#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198 +#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208 +#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217 +#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236 +#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247 +#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257 +#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268 +#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278 +#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289 +#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311 +#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322 +#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344 +#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355 +#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379 +#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390 +#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401 +#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412 +#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445 +#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460 +#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475 +#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485 +#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500 +#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515 +#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526 +#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537 +#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550 +#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565 +#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580 +#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590 +#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605 +#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620 +#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631 +#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642 +#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655 +#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665 +#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691 +#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701 +#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724 +#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737 +#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747 +#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756 +#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771 +#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786 +#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799 +#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809 +#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818 +#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832 +#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849 +#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862 +#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878 +#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887 +#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902 +#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918 +#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931 +#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947 +#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956 +#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971 +#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989 +#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002 +#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013 +#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030 +#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045 +#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058 +#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069 +#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087 +#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100 +#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111 +#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128 +#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143 +#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156 +#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167 +#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185 +#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198 +#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209 +#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226 +#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241 +#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254 +#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265 +#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277 +#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288 +#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300 +#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311 +#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322 +#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333 +#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367 +#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378 +#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389 +#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400 +#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434 +#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445 +#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456 +#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467 +#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501 +#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512 +#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523 +#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534 +#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566 +#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577 +#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601 +#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612 +#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623 +#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634 +#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648 +#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659 +#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670 +#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681 +#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694 +#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707 +#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719 +#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731 +#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742 +#: src/xml/xmli18n-tmp.h:5748 src/xml/xmli18n-tmp.h:5753 +#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764 +#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798 +#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809 +#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820 +#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831 +#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865 +#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876 +#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887 +#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898 +#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914 +#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927 +#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943 +#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952 +#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967 +#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983 +#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996 +#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012 +#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021 +#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036 +#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054 +#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067 +#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078 +#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095 +#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110 +#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123 +#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134 +#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146 +#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157 +#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166 +#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182 +#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195 +#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206 +#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223 +#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238 +#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251 +#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262 +#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274 +#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285 +#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296 +#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306 +#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329 +#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339 +#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363 +#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376 +#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387 +#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404 +#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415 +#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432 +#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445 +#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456 +#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473 +#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484 +#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500 +#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510 +#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521 +#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531 +#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542 +#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552 +#: src/xml/xmli18n-tmp.h:6557 msgid "Cyan" msgstr "绿色" @@ -991,8 +992,8 @@ msgstr "" #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362 -#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048 -#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586 +#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1062 +#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2586 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663 @@ -1044,178 +1045,178 @@ #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091 -#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179 -#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189 -#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200 -#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212 -#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223 -#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234 -#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244 -#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255 -#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265 -#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276 -#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298 -#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309 -#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331 -#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342 -#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367 -#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377 -#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388 -#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400 -#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432 -#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447 -#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462 -#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472 -#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487 -#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502 -#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513 -#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524 -#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537 -#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552 -#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567 -#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577 -#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592 -#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607 -#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618 -#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629 -#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642 -#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652 -#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678 -#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688 -#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712 -#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724 -#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734 -#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744 -#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759 -#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774 -#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786 -#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796 -#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806 -#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820 -#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837 -#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849 -#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865 -#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875 -#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890 -#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906 -#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918 -#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934 -#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944 -#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959 -#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977 -#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990 -#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000 -#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018 -#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033 -#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045 -#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057 -#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075 -#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088 -#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098 -#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116 -#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131 -#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143 -#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155 -#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173 -#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186 -#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196 -#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214 -#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229 -#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241 -#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253 -#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264 -#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275 -#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288 -#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298 -#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309 -#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321 -#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355 -#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365 -#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376 -#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388 -#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422 -#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432 -#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443 -#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455 -#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489 -#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499 -#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510 -#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522 -#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553 -#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564 -#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589 -#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599 -#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610 -#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622 -#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636 -#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646 -#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657 -#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669 -#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681 -#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694 -#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706 -#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719 -#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729 -#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740 -#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752 -#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786 -#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796 -#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807 -#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819 -#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853 -#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863 -#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874 -#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886 -#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902 -#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914 -#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930 -#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940 -#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955 -#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971 -#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983 -#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999 -#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009 -#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024 -#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042 -#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055 -#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065 -#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083 -#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098 -#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110 -#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122 -#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133 -#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144 -#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153 -#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170 -#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183 -#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193 -#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211 -#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226 -#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238 -#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250 -#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261 -#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272 -#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283 -#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293 -#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316 -#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326 -#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351 -#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364 -#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374 -#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391 -#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403 -#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420 -#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433 -#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443 -#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460 -#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472 -#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487 -#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497 -#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508 -#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518 -#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529 -#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539 -#: src/xml/xmli18n-tmp.h:6544 +#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193 +#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203 +#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214 +#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226 +#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237 +#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248 +#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258 +#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269 +#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279 +#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290 +#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4312 +#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323 +#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345 +#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356 +#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381 +#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391 +#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402 +#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414 +#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446 +#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461 +#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476 +#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486 +#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501 +#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516 +#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527 +#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538 +#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551 +#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566 +#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581 +#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591 +#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606 +#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621 +#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632 +#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643 +#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656 +#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666 +#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692 +#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702 +#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726 +#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738 +#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748 +#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758 +#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773 +#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788 +#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800 +#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810 +#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820 +#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834 +#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851 +#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863 +#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879 +#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889 +#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904 +#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920 +#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932 +#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948 +#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958 +#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973 +#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991 +#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004 +#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014 +#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032 +#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047 +#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059 +#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071 +#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089 +#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102 +#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112 +#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130 +#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145 +#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157 +#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169 +#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187 +#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200 +#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210 +#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228 +#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243 +#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255 +#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267 +#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278 +#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289 +#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302 +#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312 +#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323 +#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335 +#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369 +#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379 +#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390 +#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402 +#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436 +#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446 +#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457 +#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469 +#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503 +#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513 +#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524 +#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536 +#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567 +#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578 +#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603 +#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613 +#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624 +#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636 +#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650 +#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660 +#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671 +#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683 +#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695 +#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708 +#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5720 +#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733 +#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743 +#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5754 +#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766 +#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800 +#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810 +#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821 +#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833 +#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867 +#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877 +#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888 +#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900 +#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916 +#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928 +#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944 +#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954 +#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969 +#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985 +#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997 +#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013 +#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023 +#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038 +#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056 +#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069 +#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079 +#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097 +#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112 +#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124 +#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136 +#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147 +#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158 +#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167 +#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184 +#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197 +#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207 +#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225 +#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240 +#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252 +#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264 +#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275 +#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286 +#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297 +#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307 +#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330 +#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340 +#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365 +#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378 +#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388 +#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405 +#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417 +#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434 +#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447 +#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457 +#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474 +#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486 +#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501 +#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511 +#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522 +#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532 +#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543 +#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553 +#: src/xml/xmli18n-tmp.h:6558 msgid "Magenta" msgstr "洋红色" @@ -1224,8 +1225,8 @@ msgstr "" #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369 -#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049 -#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587 +#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063 +#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2587 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664 @@ -1277,178 +1278,178 @@ #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080 -#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175 -#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186 -#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196 -#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207 -#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220 -#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230 -#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241 -#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251 -#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262 -#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272 -#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295 -#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305 -#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328 -#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338 -#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363 -#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374 -#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384 -#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395 -#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427 -#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440 -#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453 -#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467 -#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479 -#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497 -#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510 -#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520 -#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530 -#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545 -#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558 -#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572 -#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584 -#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602 -#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615 -#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625 -#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635 -#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647 -#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658 -#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683 -#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694 -#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720 -#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729 -#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740 -#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753 -#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769 -#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782 -#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791 -#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802 -#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815 -#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832 -#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845 -#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854 -#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871 -#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884 -#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901 -#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914 -#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923 -#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940 -#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953 -#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971 -#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986 -#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997 -#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010 -#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028 -#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041 -#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050 -#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069 -#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084 -#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095 -#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108 -#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126 -#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139 -#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148 -#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167 -#: src/xml/xmli18n-tmp.h:5175 src/xml/xmli18n-tmp.h:5182 -#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5193 -#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5206 -#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224 -#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237 -#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246 -#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261 -#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271 -#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284 -#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295 -#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305 -#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316 -#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351 -#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362 -#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372 -#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383 -#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418 -#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429 -#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439 -#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450 -#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485 -#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496 -#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506 -#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517 -#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550 -#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560 -#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585 -#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596 -#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606 -#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617 -#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632 -#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643 -#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653 -#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664 -#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677 -#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688 -#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700 -#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715 -#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726 -#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736 -#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747 -#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782 -#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793 -#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803 -#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814 -#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849 -#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860 -#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870 -#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881 -#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897 -#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910 -#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919 -#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936 -#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949 -#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966 -#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979 -#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988 -#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005 -#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018 -#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036 -#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051 -#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062 -#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075 -#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093 -#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106 -#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115 -#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130 -#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139 -#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149 -#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164 -#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179 -#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190 -#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203 -#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221 -#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234 -#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243 -#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258 -#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267 -#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278 -#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288 -#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299 -#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321 -#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332 -#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360 -#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371 -#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387 -#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398 -#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413 -#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429 -#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440 -#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456 -#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467 -#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482 -#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492 -#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503 -#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513 -#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524 -#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534 -#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545 +#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189 +#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200 +#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210 +#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221 +#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234 +#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244 +#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255 +#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265 +#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4276 +#: src/xml/xmli18n-tmp.h:4280 src/xml/xmli18n-tmp.h:4286 +#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4309 +#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319 +#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342 +#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352 +#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377 +#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388 +#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398 +#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409 +#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441 +#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454 +#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467 +#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481 +#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493 +#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511 +#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524 +#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534 +#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544 +#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559 +#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572 +#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586 +#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598 +#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616 +#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629 +#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639 +#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649 +#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661 +#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672 +#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697 +#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708 +#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734 +#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743 +#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754 +#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767 +#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783 +#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796 +#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805 +#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816 +#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829 +#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846 +#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859 +#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868 +#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885 +#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898 +#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915 +#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928 +#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937 +#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954 +#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967 +#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985 +#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000 +#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011 +#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024 +#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042 +#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055 +#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064 +#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083 +#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098 +#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109 +#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122 +#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140 +#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153 +#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162 +#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181 +#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196 +#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207 +#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220 +#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238 +#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251 +#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260 +#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275 +#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285 +#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298 +#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309 +#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319 +#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330 +#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365 +#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376 +#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386 +#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397 +#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432 +#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443 +#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453 +#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464 +#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499 +#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510 +#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520 +#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531 +#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564 +#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574 +#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599 +#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610 +#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620 +#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631 +#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646 +#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657 +#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667 +#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678 +#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691 +#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702 +#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714 +#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5729 +#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740 +#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5750 +#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761 +#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796 +#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807 +#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817 +#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828 +#: src/xml/xmli18n-tmp.h:5835 src/xml/xmli18n-tmp.h:5863 +#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874 +#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884 +#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895 +#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911 +#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924 +#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933 +#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950 +#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963 +#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980 +#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993 +#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002 +#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019 +#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032 +#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050 +#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065 +#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076 +#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089 +#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107 +#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120 +#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129 +#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144 +#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153 +#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163 +#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178 +#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193 +#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204 +#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217 +#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235 +#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248 +#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257 +#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272 +#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281 +#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292 +#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302 +#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313 +#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335 +#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346 +#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374 +#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385 +#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401 +#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412 +#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427 +#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443 +#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454 +#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470 +#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481 +#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496 +#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506 +#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517 +#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527 +#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538 +#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548 +#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559 msgid "Yellow" msgstr "黄色" @@ -1457,18 +1458,18 @@ msgstr "" #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383 -#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055 +#: src/escputil/escputil.c:1050 src/escputil/escputil.c:1069 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568 -#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434 -#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480 -#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498 -#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531 -#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546 -#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594 -#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609 -#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689 -#: src/xml/xmli18n-tmp.h:5701 +#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448 +#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494 +#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512 +#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545 +#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560 +#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608 +#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623 +#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703 +#: src/xml/xmli18n-tmp.h:5715 msgid "Red" msgstr "红色" @@ -1485,14 +1486,14 @@ msgstr "" #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397 -#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056 +#: src/escputil/escputil.c:1051 src/escputil/escputil.c:1070 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569 -#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442 -#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490 -#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505 -#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690 -#: src/xml/xmli18n-tmp.h:5702 +#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456 +#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504 +#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519 +#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704 +#: src/xml/xmli18n-tmp.h:5716 msgid "Blue" msgstr "蓝色" @@ -1504,7 +1505,7 @@ msgid "Adjust the black gamma" msgstr "" -#: src/main/print-color.c:322 src/main/print-olympus.c:1932 +#: src/main/print-color.c:322 src/main/print-olympus.c:2069 msgid "Cyan Balance" msgstr "绿色平衡" @@ -1512,7 +1513,7 @@ msgid "Adjust the cyan gray balance" msgstr "调节绿灰色平衡" -#: src/main/print-color.c:330 src/main/print-olympus.c:1940 +#: src/main/print-color.c:330 src/main/print-olympus.c:2077 msgid "Magenta Balance" msgstr "洋红色平衡" @@ -1520,7 +1521,7 @@ msgid "Adjust the magenta gray balance" msgstr "调节红灰色平衡" -#: src/main/print-color.c:338 src/main/print-olympus.c:1948 +#: src/main/print-color.c:338 src/main/print-olympus.c:2085 msgid "Yellow Balance" msgstr "黄色平衡" @@ -1810,11 +1811,11 @@ msgid "Printing direction (unidirectional is higher quality, but slower)" msgstr "" -#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903 +#: src/main/print-escp2.c:263 src/main/print-olympus.c:2040 msgid "Borderless" msgstr "" -#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904 +#: src/main/print-escp2.c:264 src/main/print-olympus.c:2041 msgid "Print without borders" msgstr "" @@ -1827,7 +1828,7 @@ msgstr "" #: src/main/print-escp2.c:275 src/main/print-escp2.c:276 -#: src/cups/genppd.c:2168 src/cups/genppd.c:2461 +#: src/cups/genppd.c:2164 src/cups/genppd.c:2457 msgid "Output Order" msgstr "输出顺序" @@ -2162,136 +2163,144 @@ msgstr "" #: src/main/print-escp2.c:902 -msgid "Drying Time Per Page" +msgid "Subchannel Cutoff" msgstr "" #: src/main/print-escp2.c:903 -msgid "Set drying time per page" +msgid "Upper limit for using light ink" msgstr "" #: src/main/print-escp2.c:910 -msgid "Drying Time Per Scan" +msgid "Drying Time Per Page" msgstr "" #: src/main/print-escp2.c:911 -msgid "Set drying time per scan" +msgid "Set drying time per page" msgstr "" #: src/main/print-escp2.c:918 -msgid "Minimum Drying Time Per Scan" +msgid "Drying Time Per Scan" msgstr "" #: src/main/print-escp2.c:919 +msgid "Set drying time per scan" +msgstr "" + +#: src/main/print-escp2.c:926 +msgid "Minimum Drying Time Per Scan" +msgstr "" + +#: src/main/print-escp2.c:927 msgid "Set minimum drying time per scan" msgstr "" -#: src/main/print-escp2.c:934 +#: src/main/print-escp2.c:942 msgid "Quality Enhancement" msgstr "" -#: src/main/print-escp2.c:935 +#: src/main/print-escp2.c:943 msgid "Enhance print quality by additional passes" msgstr "" -#: src/main/print-escp2.c:942 +#: src/main/print-escp2.c:950 msgid "Paper Thickness" msgstr "" -#: src/main/print-escp2.c:943 +#: src/main/print-escp2.c:951 msgid "Set printer paper thickness" msgstr "" -#: src/main/print-escp2.c:950 +#: src/main/print-escp2.c:958 msgid "Vacuum Intensity" msgstr "" -#: src/main/print-escp2.c:951 +#: src/main/print-escp2.c:959 msgid "Set vacuum intensity (printer-specific)" msgstr "" -#: src/main/print-escp2.c:958 +#: src/main/print-escp2.c:966 msgid "Feed Sequence" msgstr "" -#: src/main/print-escp2.c:959 +#: src/main/print-escp2.c:967 msgid "Set paper feed sequence (printer-specific)" msgstr "" -#: src/main/print-escp2.c:966 +#: src/main/print-escp2.c:974 msgid "Print Method" msgstr "" -#: src/main/print-escp2.c:967 +#: src/main/print-escp2.c:975 msgid "Set print method (printer-specific)" msgstr "" -#: src/main/print-escp2.c:974 +#: src/main/print-escp2.c:982 msgid "Platen Gap" msgstr "" -#: src/main/print-escp2.c:975 +#: src/main/print-escp2.c:983 msgid "Set platen gap (printer-specific)" msgstr "" -#: src/main/print-escp2.c:982 +#: src/main/print-escp2.c:990 msgid "Feed Adjustment" msgstr "" -#: src/main/print-escp2.c:984 +#: src/main/print-escp2.c:992 #, no-c-format msgid "Set paper feed adjustment (0.01% units)" msgstr "" -#: src/main/print-escp2.c:2202 +#: src/main/print-escp2.c:2211 msgid "Full Manual Control" msgstr "全部手动控制" -#: src/main/print-escp2.c:2204 +#: src/main/print-escp2.c:2213 msgid "Automatic Setting Control" msgstr "自动设置控制" -#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442 +#: src/main/print-escp2.c:2434 src/cups/genppd.c:2080 src/cups/genppd.c:2438 msgid "Automatic" msgstr "自动" -#: src/main/print-escp2.c:2430 +#: src/main/print-escp2.c:2436 msgid "Bidirectional" msgstr "双向作用" -#: src/main/print-escp2.c:2432 +#: src/main/print-escp2.c:2438 msgid "Unidirectional" msgstr "单方向性" -#: src/main/print-escp2.c:2463 +#: src/main/print-escp2.c:2469 msgid "Alternate Fill" msgstr "交替填充" -#: src/main/print-escp2.c:2465 +#: src/main/print-escp2.c:2471 msgid "Ascending Fill" msgstr "" -#: src/main/print-escp2.c:2467 +#: src/main/print-escp2.c:2473 msgid "Descending Fill" msgstr "" -#: src/main/print-escp2.c:2469 +#: src/main/print-escp2.c:2475 msgid "Ascending Double" msgstr "" -#: src/main/print-escp2.c:2471 +#: src/main/print-escp2.c:2477 msgid "Nearest Neighbor Avoidance" msgstr "" -#: src/main/print-escp2.c:2507 +#: src/main/print-escp2.c:2513 msgid "Short Edge(Flip)" msgstr "" -#: src/main/print-escp2.c:3125 +#: src/main/print-escp2.c:3131 #, c-format msgid "This printer does not support raw printer output at depth %d\n" msgstr "" -#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638 +#: src/main/print-escp2.c:4383 src/main/print-olympus.c:2775 #: src/main/print-raw.c:218 msgid "Print options not verified; cannot print.\n" msgstr "打印选项无法证实：不能打印.\n" @@ -2345,104 +2354,104 @@ msgstr "" #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671 -#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216 -#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258 -#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324 -#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444 -#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549 -#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639 -#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721 -#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846 -#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993 -#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091 -#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189 -#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257 -#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358 -#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492 -#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592 -#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722 -#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856 -#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980 -#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107 -#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141 -#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235 -#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269 -#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313 -#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436 -#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505 -#: src/xml/xmli18n-tmp.h:6526 +#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230 +#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272 +#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338 +#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458 +#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563 +#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653 +#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735 +#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860 +#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007 +#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105 +#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203 +#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271 +#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372 +#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506 +#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606 +#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736 +#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870 +#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994 +#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121 +#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155 +#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249 +#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283 +#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327 +#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450 +#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519 +#: src/xml/xmli18n-tmp.h:6540 msgid "Four Color Standard" msgstr "" #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674 -#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221 -#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263 -#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329 -#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424 -#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511 -#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616 -#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680 -#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788 -#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920 -#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047 -#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145 -#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243 -#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296 -#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430 -#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551 -#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644 -#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794 -#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916 -#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063 -#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131 -#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191 -#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259 -#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318 -#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441 -#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510 -#: src/xml/xmli18n-tmp.h:6531 +#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235 +#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277 +#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343 +#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438 +#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525 +#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630 +#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694 +#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802 +#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934 +#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061 +#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159 +#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257 +#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310 +#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444 +#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565 +#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658 +#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808 +#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930 +#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077 +#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145 +#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205 +#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273 +#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332 +#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455 +#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524 +#: src/xml/xmli18n-tmp.h:6545 msgid "Three Color Composite" msgstr "" #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677 -#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357 -#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493 -#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598 -#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770 -#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902 -#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029 -#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127 -#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225 -#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345 -#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479 -#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626 -#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709 -#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843 -#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967 -#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094 -#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222 -#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423 +#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371 +#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507 +#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612 +#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784 +#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916 +#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043 +#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141 +#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239 +#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359 +#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493 +#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640 +#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723 +#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857 +#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981 +#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108 +#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236 +#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437 msgid "Six Color Photo" msgstr "" #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680 -#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364 -#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500 -#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605 -#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777 -#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909 -#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036 -#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134 -#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232 -#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352 -#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486 -#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633 -#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783 -#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905 -#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052 -#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180 -#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361 -#: src/xml/xmli18n-tmp.h:6430 +#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378 +#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514 +#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619 +#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791 +#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923 +#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050 +#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148 +#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246 +#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366 +#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500 +#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647 +#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797 +#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919 +#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066 +#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194 +#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375 +#: src/xml/xmli18n-tmp.h:6444 msgid "Five Color Photo Composite" msgstr "" @@ -2761,24 +2770,24 @@ msgid "Coated" msgstr "" -#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479 -#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613 -#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692 -#: src/cups/genppd.c:1714 src/cups/genppd.c:1731 +#: src/main/print-olympus.c:281 src/cups/genppd.c:1440 src/cups/genppd.c:1474 +#: src/cups/genppd.c:1507 src/cups/genppd.c:1562 src/cups/genppd.c:1608 +#: src/cups/genppd.c:1654 src/cups/genppd.c:1667 src/cups/genppd.c:1687 +#: src/cups/genppd.c:1709 src/cups/genppd.c:1726 msgid "None" msgstr "" -#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059 -#: src/main/print-olympus.c:1162 +#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115 +#: src/main/print-olympus.c:1218 msgid "Glossy" msgstr "" -#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060 -#: src/main/print-olympus.c:1163 +#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116 +#: src/main/print-olympus.c:1219 msgid "Texture" msgstr "" -#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164 +#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220 msgid "Matte" msgstr "" @@ -2786,32 +2795,32 @@ #. better durability of output by covering it with transparent #. laminate surface. This surface can be of different patterns: #. common are matte, glossy or texture. -#: src/main/print-olympus.c:1897 src/main/print-olympus.c:1898 +#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035 msgid "Laminate Pattern" msgstr "" -#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940 -#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956 +#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077 +#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093 msgid "Output Level Adjustment" msgstr "输出水平调整" -#: src/main/print-olympus.c:1933 +#: src/main/print-olympus.c:2070 msgid "Adjust the cyan balance" msgstr "" -#: src/main/print-olympus.c:1941 +#: src/main/print-olympus.c:2078 msgid "Adjust the magenta balance" msgstr "" -#: src/main/print-olympus.c:1949 +#: src/main/print-olympus.c:2086 msgid "Adjust the yellow balance" msgstr "" -#: src/main/print-olympus.c:1956 +#: src/main/print-olympus.c:2093 msgid "Black Balance" msgstr "" -#: src/main/print-olympus.c:1957 +#: src/main/print-olympus.c:2094 msgid "Adjust the black balance" msgstr "" @@ -2843,7 +2852,7 @@ msgid "Quick-dry Transparency" msgstr "" -#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630 +#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653 msgid "Manual" msgstr "" @@ -2932,23 +2941,24 @@ msgstr "" #: src/main/print-pcl.c:280 src/main/generic-options.c:35 -#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575 -#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593 -#: src/xml/xmli18n-tmp.h:6601 +#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589 +#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607 +#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624 msgid "Draft" msgstr "" #: src/main/print-pcl.c:282 src/main/generic-options.c:37 -#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578 -#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595 -#: src/xml/xmli18n-tmp.h:6603 +#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592 +#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609 +#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626 msgid "High" msgstr "" #: src/main/print-pcl.c:284 src/main/print-pcl.c:285 -#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571 -#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587 -#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604 +#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6585 +#: src/xml/xmli18n-tmp.h:6591 src/xml/xmli18n-tmp.h:6601 +#: src/xml/xmli18n-tmp.h:6610 src/xml/xmli18n-tmp.h:6619 +#: src/xml/xmli18n-tmp.h:6627 msgid "Photo" msgstr "" @@ -2980,15 +2990,15 @@ msgid "None; please provide a PPD file" msgstr "" -#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608 +#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631 msgid "Letter" msgstr "" -#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653 +#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676 msgid "A4" msgstr "" -#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772 +#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800 msgid "Custom" msgstr "" @@ -3005,33 +3015,36 @@ "Please report the above information to gimp-print-devel@lists.sourceforge.net" msgstr "" -#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566 -#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591 +#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580 +#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605 +#: src/xml/xmli18n-tmp.h:6614 msgid "Fast Economy" msgstr "" -#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567 -#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592 -#: src/xml/xmli18n-tmp.h:6600 +#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581 +#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606 +#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623 msgid "Economy" msgstr "" -#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572 -#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588 -#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605 +#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586 +#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602 +#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620 +#: src/xml/xmli18n-tmp.h:6628 msgid "Super Photo" msgstr "" -#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573 -#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589 -#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606 +#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587 +#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603 +#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621 +#: src/xml/xmli18n-tmp.h:6629 msgid "Ultra Photo" msgstr "" -#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372 -#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581 -#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599 -#: src/xml/xmli18n-tmp.h:6607 +#: src/main/generic-options.c:41 src/cups/genppd.c:1319 src/cups/genppd.c:2368 +#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595 +#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613 +#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630 msgid "Best" msgstr "" @@ -3728,74 +3741,74 @@ msgid "English" msgstr "" -#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317 -#: src/cups/genppd.c:2318 +#: src/cups/genppd.c:1148 src/cups/genppd.c:1166 src/cups/genppd.c:2313 +#: src/cups/genppd.c:2314 msgid "Media Size" msgstr "" -#: src/cups/genppd.c:1246 src/cups/genppd.c:2353 +#: src/cups/genppd.c:1241 src/cups/genppd.c:2349 msgid "Color Model" msgstr "" -#: src/cups/genppd.c:1273 src/cups/genppd.c:2355 +#: src/cups/genppd.c:1268 src/cups/genppd.c:2351 msgid "Inverted Grayscale" msgstr "" -#: src/cups/genppd.c:1283 src/cups/genppd.c:2359 +#: src/cups/genppd.c:1278 src/cups/genppd.c:2355 msgid "RGB Color" msgstr "" -#: src/cups/genppd.c:1290 src/cups/genppd.c:2360 +#: src/cups/genppd.c:1285 src/cups/genppd.c:2356 msgid "CMY Color" msgstr "" -#: src/cups/genppd.c:1315 src/cups/genppd.c:2370 +#: src/cups/genppd.c:1310 src/cups/genppd.c:2366 msgid "Color Precision" msgstr "" -#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674 +#: src/cups/genppd.c:1468 src/cups/genppd.c:1479 src/cups/genppd.c:1669 msgid "Yes" msgstr "" -#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673 +#: src/cups/genppd.c:1468 src/cups/genppd.c:1477 src/cups/genppd.c:1668 msgid "No" msgstr "" -#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630 -#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741 +#: src/cups/genppd.c:1518 src/cups/genppd.c:1584 src/cups/genppd.c:1625 +#: src/cups/genppd.c:1689 src/cups/genppd.c:1720 src/cups/genppd.c:1736 msgid "Value" msgstr "" -#: src/cups/genppd.c:1531 src/cups/genppd.c:1699 +#: src/cups/genppd.c:1526 src/cups/genppd.c:1694 msgid "Fine Adjustment" msgstr "" -#: src/cups/genppd.c:1574 src/cups/genppd.c:1719 +#: src/cups/genppd.c:1569 src/cups/genppd.c:1714 #, c-format msgid "%.1f mm" msgstr "" -#: src/cups/genppd.c:2174 src/cups/genppd.c:2463 +#: src/cups/genppd.c:2170 src/cups/genppd.c:2459 msgid "Reverse" msgstr "" -#: src/cups/genppd.c:2195 src/cups/genppd.c:2479 +#: src/cups/genppd.c:2191 src/cups/genppd.c:2475 msgid "2-Sided Printing" msgstr "" -#: src/cups/genppd.c:2220 src/cups/genppd.c:2496 +#: src/cups/genppd.c:2216 src/cups/genppd.c:2492 msgid "Shrink Page If Necessary to Fit Borders" msgstr "" -#: src/cups/genppd.c:2225 src/cups/genppd.c:2497 +#: src/cups/genppd.c:2221 src/cups/genppd.c:2493 msgid "Shrink (print the whole page)" msgstr "" -#: src/cups/genppd.c:2226 src/cups/genppd.c:2498 +#: src/cups/genppd.c:2222 src/cups/genppd.c:2494 msgid "Crop (preserve dimensions)" msgstr "" -#: src/cups/genppd.c:2227 src/cups/genppd.c:2499 +#: src/cups/genppd.c:2223 src/cups/genppd.c:2495 msgid "Expand (use maximum page area)" msgstr "" @@ -3992,20 +4005,20 @@ msgid "Unknown printer %s!\n" msgstr "" -#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500 +#: src/escputil/escputil.c:876 src/escputil/escputil.c:1514 #, c-format msgid "Cannot write to %s: %s\n" msgstr "" -#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479 -#: src/escputil/escputil.c:1586 +#: src/escputil/escputil.c:927 src/escputil/escputil.c:1493 +#: src/escputil/escputil.c:1600 #, c-format msgid "" "\n" "Cannot write to %s: %s\n" msgstr "" -#: src/escputil/escputil.c:956 +#: src/escputil/escputil.c:970 #, c-format msgid "" "\n" @@ -4013,7 +4026,7 @@ "Please use -m to specify your printer model.\n" msgstr "" -#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618 +#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:618 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636 @@ -4055,22 +4068,22 @@ #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490 -#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428 -#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962 -#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158 -#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125 -#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253 +#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442 +#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976 +#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172 +#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139 +#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267 msgid "Photo Black" msgstr "" -#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032 -#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286 -#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387 +#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1046 +#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1300 +#: src/escputil/escputil.c:1364 src/escputil/escputil.c:1401 msgid "Unknown" msgstr "" -#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050 -#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678 +#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064 +#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2678 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878 @@ -4092,83 +4105,83 @@ #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081 -#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172 -#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204 -#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211 -#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366 -#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399 -#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717 -#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750 -#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765 -#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779 -#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812 -#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829 -#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842 -#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881 -#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898 -#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911 -#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950 -#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968 -#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983 -#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007 -#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025 -#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038 -#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066 -#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081 -#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105 -#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123 -#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136 -#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164 -#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179 -#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203 -#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221 -#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234 -#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281 -#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313 -#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348 -#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380 -#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415 -#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447 -#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482 -#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514 -#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582 -#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614 -#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629 -#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661 -#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712 -#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744 -#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779 -#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811 -#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846 -#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878 -#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894 -#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907 -#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946 -#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963 -#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976 -#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015 -#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033 -#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048 -#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072 -#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090 -#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103 -#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161 -#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176 -#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200 -#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218 -#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231 -#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350 -#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363 -#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402 -#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419 -#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432 -#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471 -#: src/xml/xmli18n-tmp.h:6479 +#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186 +#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218 +#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225 +#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380 +#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413 +#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731 +#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764 +#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779 +#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793 +#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826 +#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843 +#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856 +#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895 +#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912 +#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925 +#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964 +#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982 +#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997 +#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021 +#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039 +#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052 +#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080 +#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095 +#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119 +#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137 +#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150 +#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178 +#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193 +#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217 +#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235 +#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248 +#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295 +#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327 +#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362 +#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394 +#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429 +#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461 +#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496 +#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528 +#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596 +#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628 +#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643 +#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675 +#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726 +#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758 +#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793 +#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825 +#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860 +#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892 +#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908 +#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921 +#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960 +#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977 +#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990 +#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029 +#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047 +#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062 +#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086 +#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104 +#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117 +#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175 +#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190 +#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214 +#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232 +#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245 +#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364 +#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377 +#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416 +#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433 +#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446 +#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485 +#: src/xml/xmli18n-tmp.h:6493 msgid "Light Cyan" msgstr "" -#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051 -#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679 +#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065 +#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2679 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879 @@ -4190,114 +4203,114 @@ #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094 -#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180 -#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213 -#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368 -#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401 -#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719 -#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752 -#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767 -#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781 -#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814 -#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831 -#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844 -#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883 -#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900 -#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913 -#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952 -#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970 -#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985 -#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009 -#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027 -#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040 -#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068 -#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083 -#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107 -#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125 -#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138 -#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166 -#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181 -#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205 -#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223 -#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236 -#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283 -#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315 -#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350 -#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382 -#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417 -#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449 -#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484 -#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516 -#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584 -#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616 -#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631 -#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663 -#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714 -#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746 -#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781 -#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813 -#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848 -#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880 -#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896 -#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909 -#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948 -#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965 -#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978 -#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017 -#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035 -#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050 -#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074 -#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092 -#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105 -#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163 -#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178 -#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202 -#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220 -#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233 -#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352 -#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365 -#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404 -#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421 -#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434 -#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473 -#: src/xml/xmli18n-tmp.h:6481 +#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194 +#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227 +#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382 +#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415 +#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733 +#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766 +#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781 +#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795 +#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828 +#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845 +#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858 +#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897 +#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914 +#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927 +#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966 +#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984 +#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999 +#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023 +#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041 +#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054 +#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082 +#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097 +#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121 +#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139 +#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152 +#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180 +#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195 +#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219 +#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237 +#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250 +#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297 +#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329 +#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364 +#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396 +#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431 +#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463 +#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498 +#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530 +#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598 +#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630 +#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645 +#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677 +#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728 +#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760 +#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795 +#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827 +#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862 +#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894 +#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910 +#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923 +#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962 +#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979 +#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992 +#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031 +#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049 +#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064 +#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088 +#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106 +#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119 +#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177 +#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192 +#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216 +#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234 +#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247 +#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366 +#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379 +#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418 +#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435 +#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448 +#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487 +#: src/xml/xmli18n-tmp.h:6495 msgid "Light Magenta" msgstr "" -#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206 +#: src/escputil/escputil.c:1048 src/xml/xmli18n-tmp.h:3206 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910 -#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827 -#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862 -#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896 -#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931 -#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965 -#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004 -#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023 -#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063 -#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102 -#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121 -#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161 -#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200 -#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219 -#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892 -#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927 -#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961 -#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996 -#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030 -#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069 -#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088 -#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158 -#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197 -#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216 -#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348 -#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383 -#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417 -#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452 -#: src/xml/xmli18n-tmp.h:6477 +#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841 +#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876 +#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910 +#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945 +#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979 +#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018 +#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037 +#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077 +#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116 +#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135 +#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175 +#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214 +#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233 +#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906 +#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941 +#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975 +#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010 +#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044 +#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083 +#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102 +#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172 +#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211 +#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230 +#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362 +#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397 +#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431 +#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466 +#: src/xml/xmli18n-tmp.h:6491 msgid "Light Black" msgstr "" -#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619 +#: src/escputil/escputil.c:1049 src/xml/xmli18n-tmp.h:619 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637 @@ -4339,334 +4352,334 @@ #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489 -#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484 -#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597 -#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109 -#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076 -#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204 -#: src/xml/xmli18n-tmp.h:6268 +#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498 +#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611 +#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123 +#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090 +#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218 +#: src/xml/xmli18n-tmp.h:6282 msgid "Matte Black" msgstr "" -#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431 +#: src/escputil/escputil.c:1052 src/xml/xmli18n-tmp.h:3431 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493 -#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436 -#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449 -#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459 -#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474 -#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491 -#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548 -#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559 -#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573 -#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587 -#: src/xml/xmli18n-tmp.h:4596 +#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450 +#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463 +#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473 +#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488 +#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505 +#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562 +#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573 +#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587 +#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601 +#: src/xml/xmli18n-tmp.h:4610 msgid "Gloss Optimizer" msgstr "" -#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533 +#: src/escputil/escputil.c:1053 src/xml/xmli18n-tmp.h:3533 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023 -#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005 -#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054 -#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103 -#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152 -#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201 -#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250 -#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070 -#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119 -#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198 -#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247 +#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019 +#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068 +#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117 +#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166 +#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215 +#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264 +#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084 +#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133 +#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212 +#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261 msgid "Light Light Black" msgstr "" -#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059 -#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540 -#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586 -#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604 -#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637 +#: src/escputil/escputil.c:1054 src/escputil/escputil.c:1073 +#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554 +#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600 +#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618 +#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651 msgid "Orange" msgstr "" -#: src/escputil/escputil.c:1071 +#: src/escputil/escputil.c:1085 #, c-format msgid "Status: Error\n" msgstr "" -#: src/escputil/escputil.c:1074 +#: src/escputil/escputil.c:1088 #, c-format msgid "Status: Self-Printing\n" msgstr "" -#: src/escputil/escputil.c:1077 +#: src/escputil/escputil.c:1091 #, c-format msgid "Status: Busy\n" msgstr "" -#: src/escputil/escputil.c:1080 +#: src/escputil/escputil.c:1094 #, c-format msgid "Status: Waiting\n" msgstr "" -#: src/escputil/escputil.c:1083 +#: src/escputil/escputil.c:1097 #, c-format msgid "Status: Idle\n" msgstr "" -#: src/escputil/escputil.c:1086 +#: src/escputil/escputil.c:1100 #, c-format msgid "Status: Paused\n" msgstr "" -#: src/escputil/escputil.c:1089 +#: src/escputil/escputil.c:1103 #, c-format msgid "Status: Cleaning\n" msgstr "" -#: src/escputil/escputil.c:1092 +#: src/escputil/escputil.c:1106 #, c-format msgid "Status: Factory shipment\n" msgstr "" -#: src/escputil/escputil.c:1095 +#: src/escputil/escputil.c:1109 #, c-format msgid "Status: Shutting down\n" msgstr "" -#: src/escputil/escputil.c:1098 +#: src/escputil/escputil.c:1112 #, c-format msgid "Status: Unknown (%d)\n" msgstr "" -#: src/escputil/escputil.c:1109 +#: src/escputil/escputil.c:1123 #, c-format msgid "Error: Fatal Error\n" msgstr "" -#: src/escputil/escputil.c:1112 +#: src/escputil/escputil.c:1126 #, c-format msgid "Error: Other interface is selected\n" msgstr "" -#: src/escputil/escputil.c:1115 +#: src/escputil/escputil.c:1129 #, c-format msgid "Error: Cover Open\n" msgstr "" -#: src/escputil/escputil.c:1118 +#: src/escputil/escputil.c:1132 #, c-format msgid "Error: Paper jam\n" msgstr "" -#: src/escputil/escputil.c:1121 +#: src/escputil/escputil.c:1135 #, c-format msgid "Error: Ink out\n" msgstr "" -#: src/escputil/escputil.c:1124 +#: src/escputil/escputil.c:1138 #, c-format msgid "Error: Paper out\n" msgstr "" -#: src/escputil/escputil.c:1127 +#: src/escputil/escputil.c:1141 #, c-format msgid "Error: Miscellaneous paper error\n" msgstr "" -#: src/escputil/escputil.c:1130 +#: src/escputil/escputil.c:1144 #, c-format msgid "Error: Maintenance cartridge overflow\n" msgstr "" -#: src/escputil/escputil.c:1133 +#: src/escputil/escputil.c:1147 #, c-format msgid "Error: Wait return from the tear-off position\n" msgstr "" -#: src/escputil/escputil.c:1136 +#: src/escputil/escputil.c:1150 #, c-format msgid "Error: Double feed error\n" msgstr "" -#: src/escputil/escputil.c:1139 +#: src/escputil/escputil.c:1153 #, c-format msgid "" "Error: Ink cartridge lever released\n" "\n" msgstr "" -#: src/escputil/escputil.c:1142 +#: src/escputil/escputil.c:1156 #, c-format msgid "Error: Unrecoverable cutter error\n" msgstr "" -#: src/escputil/escputil.c:1145 +#: src/escputil/escputil.c:1159 #, c-format msgid "Error: Recoverable cutter jam\n" msgstr "" -#: src/escputil/escputil.c:1148 +#: src/escputil/escputil.c:1162 #, c-format msgid "Error: No maintenance cartridge present\n" msgstr "" -#: src/escputil/escputil.c:1151 +#: src/escputil/escputil.c:1165 #, c-format msgid "Error: Rear cover open\n" msgstr "" -#: src/escputil/escputil.c:1154 +#: src/escputil/escputil.c:1168 #, c-format msgid "Error: CD Tray Out\n" msgstr "" -#: src/escputil/escputil.c:1157 +#: src/escputil/escputil.c:1171 #, c-format msgid "Error: Card loading error\n" msgstr "" -#: src/escputil/escputil.c:1160 +#: src/escputil/escputil.c:1174 #, c-format msgid "Error: Tray cover open\n" msgstr "" -#: src/escputil/escputil.c:1163 +#: src/escputil/escputil.c:1177 #, c-format msgid "Error: Maintenance cartridge cover open\n" msgstr "" -#: src/escputil/escputil.c:1166 +#: src/escputil/escputil.c:1180 #, c-format msgid "Error: Front cover open\n" msgstr "" -#: src/escputil/escputil.c:1169 +#: src/escputil/escputil.c:1183 #, c-format msgid "Error: Maintenance request\n" msgstr "" -#: src/escputil/escputil.c:1172 +#: src/escputil/escputil.c:1186 #, c-format msgid "Error: Unknown (%d)\n" msgstr "" -#: src/escputil/escputil.c:1184 +#: src/escputil/escputil.c:1198 #, c-format msgid "Warning: %s Ink Low\n" msgstr "" -#: src/escputil/escputil.c:1187 +#: src/escputil/escputil.c:1201 #, c-format msgid "Warning: Channel %d Ink Low\n" msgstr "" -#: src/escputil/escputil.c:1193 +#: src/escputil/escputil.c:1207 #, c-format msgid "Warning: %s Cleaning Disabled\n" msgstr "" -#: src/escputil/escputil.c:1196 +#: src/escputil/escputil.c:1210 #, c-format msgid "Warning: Channel %d Cleaning \n" msgstr "" -#: src/escputil/escputil.c:1203 +#: src/escputil/escputil.c:1217 #, c-format msgid "Warning: Maintenance cartridge near full\n" msgstr "" -#: src/escputil/escputil.c:1206 +#: src/escputil/escputil.c:1220 #, c-format msgid "Warning: Maintenance request pending\n" msgstr "" -#: src/escputil/escputil.c:1209 +#: src/escputil/escputil.c:1223 #, c-format msgid "Warning: Unknown (%d)\n" msgstr "" -#: src/escputil/escputil.c:1221 +#: src/escputil/escputil.c:1235 #, c-format msgid "Printing nozzle self-test\n" msgstr "" -#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349 +#: src/escputil/escputil.c:1299 src/escputil/escputil.c:1363 #, c-format msgid "Printer Name: %s\n" msgstr "" -#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362 +#: src/escputil/escputil.c:1337 src/escputil/escputil.c:1376 #, c-format msgid "Ink Levels:\n" msgstr "" -#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363 +#: src/escputil/escputil.c:1338 src/escputil/escputil.c:1377 msgid "Ink color" msgstr "" -#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363 -#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692 -#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731 +#: src/escputil/escputil.c:1338 src/escputil/escputil.c:1377 +#: src/escputil/escputil.c:1679 src/escputil/escputil.c:1706 +#: src/escputil/escputil.c:1728 src/escputil/escputil.c:1745 msgid "Percent remaining" msgstr "" -#: src/escputil/escputil.c:1418 +#: src/escputil/escputil.c:1432 #, c-format msgid "Job Name: " msgstr "" -#: src/escputil/escputil.c:1447 +#: src/escputil/escputil.c:1461 msgid "ink levels" msgstr "" -#: src/escputil/escputil.c:1450 +#: src/escputil/escputil.c:1464 msgid "status" msgstr "" -#: src/escputil/escputil.c:1455 +#: src/escputil/escputil.c:1469 #, c-format msgid "Obtaining %s requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1541 +#: src/escputil/escputil.c:1555 #, c-format msgid "Obtaining extended ink information requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692 -#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731 +#: src/escputil/escputil.c:1679 src/escputil/escputil.c:1706 +#: src/escputil/escputil.c:1728 src/escputil/escputil.c:1745 msgid "Ink cartridge" msgstr "" -#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692 -#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731 +#: src/escputil/escputil.c:1679 src/escputil/escputil.c:1706 +#: src/escputil/escputil.c:1728 src/escputil/escputil.c:1745 msgid "Part number" msgstr "" -#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693 -#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732 +#: src/escputil/escputil.c:1680 src/escputil/escputil.c:1707 +#: src/escputil/escputil.c:1729 src/escputil/escputil.c:1746 msgid "Date" msgstr "" -#: src/escputil/escputil.c:1761 +#: src/escputil/escputil.c:1775 #, c-format msgid "Printer identification requires using a raw device.\n" msgstr "" -#: src/escputil/escputil.c:1779 +#: src/escputil/escputil.c:1793 #, c-format msgid "Cannot identify printer model.\n" msgstr "" -#: src/escputil/escputil.c:1801 +#: src/escputil/escputil.c:1815 #, c-format msgid "Cleaning heads...\n" msgstr "" -#: src/escputil/escputil.c:1818 +#: src/escputil/escputil.c:1832 #, c-format msgid "Running nozzle check, please ensure paper is in the printer.\n" msgstr "" -#: src/escputil/escputil.c:1822 +#: src/escputil/escputil.c:1836 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -4705,7 +4718,7 @@ "\n" msgstr "" -#: src/escputil/escputil.c:1857 +#: src/escputil/escputil.c:1871 #, c-format msgid "" "Please read these instructions very carefully before proceeding.\n" @@ -4741,17 +4754,17 @@ "\n" msgstr "" -#: src/escputil/escputil.c:1901 +#: src/escputil/escputil.c:1915 #, c-format msgid "Unable to send command to the printer, exiting.\n" msgstr "" -#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084 +#: src/escputil/escputil.c:1929 src/escputil/escputil.c:2098 #, c-format msgid "Exiting\n" msgstr "" -#: src/escputil/escputil.c:1918 +#: src/escputil/escputil.c:1932 #, c-format msgid "" "Please inspect the final output very carefully to ensure that your\n" @@ -4763,38 +4776,38 @@ "What do you want to do (s, q, r)?\n" msgstr "" -#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935 -#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968 -#: src/escputil/escputil.c:2088 +#: src/escputil/escputil.c:1940 src/escputil/escputil.c:1949 +#: src/escputil/escputil.c:1964 src/escputil/escputil.c:1982 +#: src/escputil/escputil.c:2102 msgid "> " msgstr "" -#: src/escputil/escputil.c:1933 +#: src/escputil/escputil.c:1947 #, c-format msgid "" "Please confirm by typing 'q' again that you wish to quit without saving:\n" msgstr "" -#: src/escputil/escputil.c:1940 +#: src/escputil/escputil.c:1954 #, c-format msgid "" "OK, your printer is aligned, but the alignment has not been saved.\n" "If you wish to save the alignment, you must repeat this process.\n" msgstr "" -#: src/escputil/escputil.c:1947 +#: src/escputil/escputil.c:1961 #, c-format msgid "" "Please confirm by typing 'r' again that you wish to repeat the\n" "alignment process:\n" msgstr "" -#: src/escputil/escputil.c:1955 +#: src/escputil/escputil.c:1969 #, c-format msgid "Repeating the alignment process.\n" msgstr "" -#: src/escputil/escputil.c:1961 +#: src/escputil/escputil.c:1975 #, c-format msgid "" "This will permanently alter the configuration of your printer.\n" @@ -4804,44 +4817,44 @@ "to your printer:\n" msgstr "" -#: src/escputil/escputil.c:1973 +#: src/escputil/escputil.c:1987 #, c-format msgid "About to save settings..." msgstr "" -#: src/escputil/escputil.c:1979 +#: src/escputil/escputil.c:1993 #, c-format msgid "failed!\n" msgstr "" -#: src/escputil/escputil.c:1980 +#: src/escputil/escputil.c:1994 #, c-format msgid "" "Your settings were not saved successfully. You must repeat the\n" "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:1984 +#: src/escputil/escputil.c:1998 #, c-format msgid "succeeded!\n" msgstr "" -#: src/escputil/escputil.c:1985 +#: src/escputil/escputil.c:1999 #, c-format msgid "Your alignment settings have been saved to the printer.\n" msgstr "" -#: src/escputil/escputil.c:1990 +#: src/escputil/escputil.c:2004 #, c-format msgid "Unrecognized command.\n" msgstr "" -#: src/escputil/escputil.c:1993 +#: src/escputil/escputil.c:2007 #, c-format msgid "Final command was not confirmed.\n" msgstr "" -#: src/escputil/escputil.c:1998 +#: src/escputil/escputil.c:2012 #, c-format msgid "" "This procedure assumes that your printer is an %s.\n" @@ -4852,12 +4865,12 @@ "alignment procedure.\n" msgstr "" -#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098 -#: src/escputil/escputil.c:2141 +#: src/escputil/escputil.c:2081 src/escputil/escputil.c:2112 +#: src/escputil/escputil.c:2155 msgid "Press enter to continue > " msgstr "" -#: src/escputil/escputil.c:2074 +#: src/escputil/escputil.c:2088 #, c-format msgid "" "Please inspect the print, and choose the best pair of lines in each " @@ -4865,42 +4878,42 @@ "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n" msgstr "" -#: src/escputil/escputil.c:2087 +#: src/escputil/escputil.c:2101 #, c-format msgid "Pass #%d" msgstr "" -#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140 +#: src/escputil/escputil.c:2109 src/escputil/escputil.c:2154 #, c-format msgid "Please insert a fresh sheet of paper.\n" msgstr "" -#: src/escputil/escputil.c:2114 +#: src/escputil/escputil.c:2128 #, c-format msgid "Number out of range!\n" msgstr "" -#: src/escputil/escputil.c:2119 +#: src/escputil/escputil.c:2133 #, c-format msgid "I cannot understand what you typed!\n" msgstr "" -#: src/escputil/escputil.c:2125 +#: src/escputil/escputil.c:2139 #, c-format msgid "The best pair of lines should be numbered between 1 and %d.\n" msgstr "" -#: src/escputil/escputil.c:2132 +#: src/escputil/escputil.c:2146 #, c-format msgid "Attempting to set alignment..." msgstr "" -#: src/escputil/escputil.c:2135 +#: src/escputil/escputil.c:2149 #, c-format msgid "succeeded.\n" msgstr "" -#: src/escputil/escputil.c:2136 +#: src/escputil/escputil.c:2150 #, c-format msgid "" "Please verify that the alignment is correct. After the alignment pattern\n" @@ -4909,7 +4922,7 @@ "quality printing.\n" msgstr "" -#: src/escputil/escputil.c:2182 +#: src/escputil/escputil.c:2196 #, c-format msgid "Error in input\n" msgstr "" @@ -5182,21 +5195,21 @@ #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581 -#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168 -#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236 -#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290 -#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356 -#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638 -#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674 -#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754 -#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277 -#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411 -#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545 -#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625 -#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775 -#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279 -#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483 -#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525 +#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182 +#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250 +#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304 +#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370 +#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652 +#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688 +#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768 +#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291 +#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425 +#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559 +#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639 +#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789 +#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293 +#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497 +#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539 msgid "EPSON Standard Inks" msgstr "" @@ -5224,7 +5237,7 @@ #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550 -#: src/xml/xmli18n-tmp.h:6612 +#: src/xml/xmli18n-tmp.h:6635 msgid "Postcard" msgstr "" @@ -5510,29 +5523,29 @@ #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447 -#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279 -#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311 -#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318 -#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345 -#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403 -#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410 -#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660 -#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695 -#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702 -#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325 -#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391 -#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398 -#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459 -#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525 -#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532 -#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567 -#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755 -#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762 -#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823 -#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300 -#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307 -#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334 -#: src/xml/xmli18n-tmp.h:6340 +#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293 +#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325 +#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332 +#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359 +#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417 +#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424 +#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674 +#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709 +#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716 +#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339 +#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405 +#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412 +#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473 +#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539 +#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546 +#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581 +#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769 +#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776 +#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837 +#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314 +#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321 +#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348 +#: src/xml/xmli18n-tmp.h:6354 msgid "Quadtone" msgstr "" @@ -5892,8 +5905,8 @@ #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507 -#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824 -#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345 +#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838 +#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359 msgid "UltraChrome Photo Black" msgstr "" @@ -5968,8 +5981,8 @@ #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508 -#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893 -#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414 +#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907 +#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428 msgid "UltraChrome Matte Black" msgstr "" @@ -5982,10 +5995,10 @@ #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670 -#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416 -#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404 -#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538 -#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835 +#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430 +#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418 +#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552 +#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849 msgid "Hextone" msgstr "" @@ -6126,6 +6139,7 @@ #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102 +#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118 msgid "360 DPI" msgstr "" @@ -6186,6 +6200,7 @@ #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103 +#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119 msgid "720 x 360 DPI" msgstr "" @@ -6246,6 +6261,7 @@ #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104 +#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120 msgid "720 DPI" msgstr "" @@ -6371,7 +6387,8 @@ #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099 -#: src/xml/xmli18n-tmp.h:4105 +#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114 +#: src/xml/xmli18n-tmp.h:4121 msgid "1440 x 720 DPI" msgstr "" @@ -6449,6 +6466,7 @@ #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106 +#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122 msgid "1440 x 1440 DPI" msgstr "" @@ -6485,12 +6503,13 @@ #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107 +#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123 msgid "2880 x 1440 DPI" msgstr "" #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339 -#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768 -#: src/xml/xmli18n-tmp.h:4822 +#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782 +#: src/xml/xmli18n-tmp.h:4836 msgid "Dark Yellow" msgstr "" @@ -6512,6 +6531,7 @@ #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109 +#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124 msgid "2880 x 2880 DPI" msgstr "" @@ -6585,7594 +6605,7878 @@ msgid "Vivid Magenta" msgstr "" -#: src/xml/xmli18n-tmp.h:4111 +#: src/xml/xmli18n-tmp.h:4125 msgid "Main Tray" msgstr "" -#: src/xml/xmli18n-tmp.h:4112 +#: src/xml/xmli18n-tmp.h:4126 msgid "Photo Tray" msgstr "" -#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117 -#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125 -#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153 -#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160 +#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131 +#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139 +#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167 +#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174 msgid "Print to CD" msgstr "" -#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155 -#: src/xml/xmli18n-tmp.h:4158 +#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169 +#: src/xml/xmli18n-tmp.h:4172 msgid "Rear Tray" msgstr "" -#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156 -#: src/xml/xmli18n-tmp.h:4159 +#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170 +#: src/xml/xmli18n-tmp.h:4173 msgid "Front Tray" msgstr "" -#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124 -#: src/xml/xmli18n-tmp.h:4136 +#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138 +#: src/xml/xmli18n-tmp.h:4150 msgid "Manual Feed" msgstr "" -#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128 -#: src/xml/xmli18n-tmp.h:4137 +#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142 +#: src/xml/xmli18n-tmp.h:4151 msgid "Roll Feed (cut each page)" msgstr "" -#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129 -#: src/xml/xmli18n-tmp.h:4140 +#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143 +#: src/xml/xmli18n-tmp.h:4154 msgid "Roll Feed (do not cut)" msgstr "" -#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134 -#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149 -#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167 +#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148 +#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163 +#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181 msgid "Roll Feed" msgstr "" -#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142 -#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151 +#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156 +#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165 msgid "Manual Sheet Guide" msgstr "" -#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143 -#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152 +#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157 +#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166 msgid "Manual Feed (Front)" msgstr "" -#: src/xml/xmli18n-tmp.h:4138 +#: src/xml/xmli18n-tmp.h:4152 msgid "Roll Feed (borderless with single cut)" msgstr "" -#: src/xml/xmli18n-tmp.h:4139 +#: src/xml/xmli18n-tmp.h:4153 msgid "Roll Feed (borderless with double cut)" msgstr "" -#: src/xml/xmli18n-tmp.h:4161 +#: src/xml/xmli18n-tmp.h:4175 msgid "Photo Board" msgstr "" -#: src/xml/xmli18n-tmp.h:4162 +#: src/xml/xmli18n-tmp.h:4176 msgid "Cut Sheet Bin 1" msgstr "" -#: src/xml/xmli18n-tmp.h:4163 +#: src/xml/xmli18n-tmp.h:4177 msgid "Cut Sheet Bin 2" msgstr "" -#: src/xml/xmli18n-tmp.h:4164 +#: src/xml/xmli18n-tmp.h:4178 msgid "Cut Sheet Autoselect" msgstr "" -#: src/xml/xmli18n-tmp.h:4165 +#: src/xml/xmli18n-tmp.h:4179 msgid "Manual Selection" msgstr "" -#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225 -#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267 -#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333 -#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455 -#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560 -#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648 -#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730 -#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858 -#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266 -#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367 -#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501 -#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601 -#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731 -#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865 -#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992 -#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322 -#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448 -#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514 -#: src/xml/xmli18n-tmp.h:6535 +#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239 +#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281 +#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347 +#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469 +#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574 +#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662 +#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744 +#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872 +#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280 +#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381 +#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515 +#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615 +#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745 +#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879 +#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006 +#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336 +#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462 +#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528 +#: src/xml/xmli18n-tmp.h:6549 msgid "One Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227 -#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269 -#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335 -#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460 -#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565 -#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650 -#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732 -#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863 -#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268 -#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369 -#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503 -#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603 -#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733 -#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867 -#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997 -#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324 -#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453 -#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516 -#: src/xml/xmli18n-tmp.h:6537 +#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241 +#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283 +#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349 +#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474 +#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579 +#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664 +#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746 +#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877 +#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282 +#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383 +#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517 +#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617 +#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747 +#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881 +#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011 +#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338 +#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467 +#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530 +#: src/xml/xmli18n-tmp.h:6551 msgid "Three Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231 -#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273 -#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339 -#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521 -#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654 -#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736 -#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867 -#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272 -#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373 -#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507 -#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607 -#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678 -#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737 -#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871 -#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001 -#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150 -#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274 -#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328 -#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457 -#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520 -#: src/xml/xmli18n-tmp.h:6541 +#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245 +#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287 +#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353 +#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535 +#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668 +#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750 +#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881 +#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286 +#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387 +#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521 +#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621 +#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692 +#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751 +#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885 +#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015 +#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164 +#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288 +#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342 +#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471 +#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534 +#: src/xml/xmli18n-tmp.h:6555 msgid "Four Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390 -#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803 -#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941 -#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378 -#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512 -#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659 -#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809 -#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937 -#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393 -#: src/xml/xmli18n-tmp.h:6462 +#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404 +#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817 +#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955 +#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392 +#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526 +#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673 +#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823 +#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951 +#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407 +#: src/xml/xmli18n-tmp.h:6476 msgid "Five Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396 -#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631 -#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809 -#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947 -#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384 -#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518 -#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665 -#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748 -#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882 -#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012 -#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468 +#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410 +#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645 +#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823 +#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961 +#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398 +#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532 +#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679 +#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762 +#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896 +#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026 +#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482 msgid "Six Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287 -#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320 -#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353 -#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412 -#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662 -#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698 -#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327 -#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341 -#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400 -#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461 -#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475 -#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534 -#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569 -#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758 -#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772 -#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831 -#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303 -#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336 -#: src/xml/xmli18n-tmp.h:6342 +#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301 +#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334 +#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367 +#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426 +#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676 +#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712 +#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341 +#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355 +#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414 +#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475 +#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489 +#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548 +#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583 +#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772 +#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786 +#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845 +#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317 +#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350 +#: src/xml/xmli18n-tmp.h:6356 msgid "Gray 3" msgstr "" -#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288 -#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321 -#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354 -#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413 -#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663 -#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699 -#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328 -#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342 -#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401 -#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462 -#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476 -#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535 -#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570 -#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759 -#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773 -#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832 -#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304 -#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337 -#: src/xml/xmli18n-tmp.h:6343 +#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302 +#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335 +#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368 +#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427 +#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677 +#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713 +#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342 +#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356 +#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415 +#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476 +#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490 +#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549 +#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584 +#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773 +#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787 +#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846 +#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318 +#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351 +#: src/xml/xmli18n-tmp.h:6357 msgid "Gray 2" msgstr "" -#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289 -#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322 -#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355 -#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414 -#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664 -#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700 -#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329 -#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343 -#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402 -#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463 -#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477 -#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536 -#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571 -#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760 -#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774 -#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833 -#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305 -#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338 -#: src/xml/xmli18n-tmp.h:6344 +#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303 +#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336 +#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369 +#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428 +#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678 +#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714 +#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343 +#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357 +#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416 +#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477 +#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491 +#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550 +#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585 +#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774 +#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788 +#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847 +#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319 +#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352 +#: src/xml/xmli18n-tmp.h:6358 msgid "Gray 1" msgstr "" -#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317 -#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409 -#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701 -#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397 -#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531 -#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761 -#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306 -#: src/xml/xmli18n-tmp.h:6339 +#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331 +#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423 +#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715 +#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411 +#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545 +#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775 +#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320 +#: src/xml/xmli18n-tmp.h:6353 msgid "MIS Quadtone" msgstr "" -#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336 -#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470 -#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767 -#: src/xml/xmli18n-tmp.h:5834 +#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350 +#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484 +#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781 +#: src/xml/xmli18n-tmp.h:5848 msgid "MIS Six Tone" msgstr "" -#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339 -#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473 -#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770 -#: src/xml/xmli18n-tmp.h:5837 +#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353 +#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487 +#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784 +#: src/xml/xmli18n-tmp.h:5851 msgid "Gray 5" msgstr "" -#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340 -#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474 -#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771 -#: src/xml/xmli18n-tmp.h:5838 +#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354 +#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488 +#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785 +#: src/xml/xmli18n-tmp.h:5852 msgid "Gray 4" msgstr "" -#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562 +#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576 msgid "One Color Raw Enhanced Gloss" msgstr "" -#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569 +#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583 msgid "Three Color Raw Gloss" msgstr "" -#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574 +#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588 msgid "Four Color Raw Gloss" msgstr "" -#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580 +#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594 msgid "Six Color Enhanced Gloss Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588 +#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602 msgid "Seven Color Enhanced Gloss Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4589 +#: src/xml/xmli18n-tmp.h:4603 msgid "MatteBlack" msgstr "" -#: src/xml/xmli18n-tmp.h:4672 +#: src/xml/xmli18n-tmp.h:4686 msgid "Default Black" msgstr "" -#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825 -#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972 -#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070 -#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168 -#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890 -#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037 -#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165 -#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346 -#: src/xml/xmli18n-tmp.h:6415 +#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839 +#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986 +#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084 +#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182 +#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904 +#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051 +#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179 +#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360 +#: src/xml/xmli18n-tmp.h:6429 msgid "Seven Color Photo" msgstr "" -#: src/xml/xmli18n-tmp.h:4763 +#: src/xml/xmli18n-tmp.h:4777 msgid "Six Color Enhanced Composite" msgstr "" -#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885 -#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950 -#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406 -#: src/xml/xmli18n-tmp.h:6475 +#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899 +#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964 +#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420 +#: src/xml/xmli18n-tmp.h:6489 msgid "Seven Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924 -#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989 -#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445 +#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938 +#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003 +#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459 msgid "Two Level Grayscale" msgstr "" -#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929 -#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994 -#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450 +#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943 +#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008 +#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464 msgid "Two Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012 -#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110 -#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208 -#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077 -#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205 +#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026 +#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124 +#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222 +#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091 +#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219 msgid "Eight Color Photo" msgstr "" -#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051 -#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149 -#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247 -#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116 -#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244 +#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065 +#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163 +#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261 +#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130 +#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258 msgid "Eight Color Raw" msgstr "" -#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691 +#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705 msgid "Four Color Photo" msgstr "" -#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552 -#: src/xml/xmli18n-tmp.h:6558 +#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566 +#: src/xml/xmli18n-tmp.h:6572 msgid "Interleave" msgstr "" -#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553 -#: src/xml/xmli18n-tmp.h:6559 +#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567 +#: src/xml/xmli18n-tmp.h:6573 msgid "Full Overlap" msgstr "" -#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554 -#: src/xml/xmli18n-tmp.h:6560 +#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568 +#: src/xml/xmli18n-tmp.h:6574 msgid "Four Pass" msgstr "" -#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555 -#: src/xml/xmli18n-tmp.h:6561 +#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569 +#: src/xml/xmli18n-tmp.h:6575 msgid "Full Overlap 2" msgstr "" -#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562 +#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576 msgid "Interleave 2" msgstr "" -#: src/xml/xmli18n-tmp.h:6563 +#: src/xml/xmli18n-tmp.h:6577 msgid "Eight Pass" msgstr "" -#: src/xml/xmli18n-tmp.h:6565 +#: src/xml/xmli18n-tmp.h:6579 msgid "On" msgstr "" -#: src/xml/xmli18n-tmp.h:6609 +#: src/xml/xmli18n-tmp.h:6632 msgid "Legal" msgstr "" -#: src/xml/xmli18n-tmp.h:6610 +#: src/xml/xmli18n-tmp.h:6633 msgid "Tabloid" msgstr "" -#: src/xml/xmli18n-tmp.h:6611 +#: src/xml/xmli18n-tmp.h:6634 msgid "Executive" msgstr "" -#: src/xml/xmli18n-tmp.h:6616 +#: src/xml/xmli18n-tmp.h:6639 msgid "3x5" msgstr "" -#: src/xml/xmli18n-tmp.h:6617 +#: src/xml/xmli18n-tmp.h:6640 msgid "3 1/2 x5" msgstr "" -#: src/xml/xmli18n-tmp.h:6618 +#: src/xml/xmli18n-tmp.h:6641 msgid "L" msgstr "" -#: src/xml/xmli18n-tmp.h:6619 +#: src/xml/xmli18n-tmp.h:6642 msgid "4x6" msgstr "" -#: src/xml/xmli18n-tmp.h:6620 +#: src/xml/xmli18n-tmp.h:6643 msgid "KG" msgstr "" -#: src/xml/xmli18n-tmp.h:6621 +#: src/xml/xmli18n-tmp.h:6644 msgid "Epson 4x6 Photo Paper (tear-off borders)" msgstr "" -#: src/xml/xmli18n-tmp.h:6622 +#: src/xml/xmli18n-tmp.h:6645 msgid "Epson L Photo Paper (tear-off borders)" msgstr "" -#: src/xml/xmli18n-tmp.h:6623 +#: src/xml/xmli18n-tmp.h:6646 msgid "4x8" msgstr "" -#: src/xml/xmli18n-tmp.h:6624 +#: src/xml/xmli18n-tmp.h:6647 msgid "5x7" msgstr "" -#: src/xml/xmli18n-tmp.h:6625 +#: src/xml/xmli18n-tmp.h:6648 msgid "2L" msgstr "" -#: src/xml/xmli18n-tmp.h:6626 +#: src/xml/xmli18n-tmp.h:6649 msgid "5x8" msgstr "" -#: src/xml/xmli18n-tmp.h:6627 +#: src/xml/xmli18n-tmp.h:6650 msgid "6x8" msgstr "" -#: src/xml/xmli18n-tmp.h:6628 +#: src/xml/xmli18n-tmp.h:6651 msgid "8x10" msgstr "" -#: src/xml/xmli18n-tmp.h:6629 +#: src/xml/xmli18n-tmp.h:6652 msgid "Rokukire" msgstr "" -#: src/xml/xmli18n-tmp.h:6631 +#: src/xml/xmli18n-tmp.h:6654 msgid "12x18" msgstr "" -#: src/xml/xmli18n-tmp.h:6632 +#: src/xml/xmli18n-tmp.h:6655 msgid "Super B 13x19" msgstr "" -#: src/xml/xmli18n-tmp.h:6633 +#: src/xml/xmli18n-tmp.h:6656 msgid "Engineering C 17x22" msgstr "" -#: src/xml/xmli18n-tmp.h:6634 +#: src/xml/xmli18n-tmp.h:6657 msgid "8x12" msgstr "" -#: src/xml/xmli18n-tmp.h:6635 +#: src/xml/xmli18n-tmp.h:6658 msgid "YonKire" msgstr "" -#: src/xml/xmli18n-tmp.h:6636 +#: src/xml/xmli18n-tmp.h:6659 msgid "11x14" msgstr "" -#: src/xml/xmli18n-tmp.h:6637 +#: src/xml/xmli18n-tmp.h:6660 msgid "HanKire" msgstr "" -#: src/xml/xmli18n-tmp.h:6638 +#: src/xml/xmli18n-tmp.h:6661 msgid "16x20" msgstr "" -#: src/xml/xmli18n-tmp.h:6639 +#: src/xml/xmli18n-tmp.h:6662 msgid "16x24" msgstr "" -#: src/xml/xmli18n-tmp.h:6640 +#: src/xml/xmli18n-tmp.h:6663 msgid "20x24" msgstr "" -#: src/xml/xmli18n-tmp.h:6641 +#: src/xml/xmli18n-tmp.h:6664 msgid "20x30" msgstr "" -#: src/xml/xmli18n-tmp.h:6642 +#: src/xml/xmli18n-tmp.h:6665 msgid "22x30" msgstr "" -#: src/xml/xmli18n-tmp.h:6643 +#: src/xml/xmli18n-tmp.h:6666 msgid "24x30" msgstr "" -#: src/xml/xmli18n-tmp.h:6644 +#: src/xml/xmli18n-tmp.h:6667 msgid "Super A1 24x36" msgstr "" -#: src/xml/xmli18n-tmp.h:6645 +#: src/xml/xmli18n-tmp.h:6668 msgid "30x40" msgstr "" -#: src/xml/xmli18n-tmp.h:6646 +#: src/xml/xmli18n-tmp.h:6669 msgid "4A" msgstr "" -#: src/xml/xmli18n-tmp.h:6647 +#: src/xml/xmli18n-tmp.h:6670 msgid "2A" msgstr "" -#: src/xml/xmli18n-tmp.h:6648 +#: src/xml/xmli18n-tmp.h:6671 msgid "Super A0" msgstr "" -#: src/xml/xmli18n-tmp.h:6649 +#: src/xml/xmli18n-tmp.h:6672 msgid "A0" msgstr "" -#: src/xml/xmli18n-tmp.h:6650 +#: src/xml/xmli18n-tmp.h:6673 msgid "A1" msgstr "" -#: src/xml/xmli18n-tmp.h:6651 +#: src/xml/xmli18n-tmp.h:6674 msgid "A2" msgstr "" -#: src/xml/xmli18n-tmp.h:6652 +#: src/xml/xmli18n-tmp.h:6675 msgid "A3" msgstr "" -#: src/xml/xmli18n-tmp.h:6654 +#: src/xml/xmli18n-tmp.h:6677 msgid "A5" msgstr "" -#: src/xml/xmli18n-tmp.h:6655 +#: src/xml/xmli18n-tmp.h:6678 msgid "A6" msgstr "" -#: src/xml/xmli18n-tmp.h:6656 +#: src/xml/xmli18n-tmp.h:6679 msgid "A7" msgstr "" -#: src/xml/xmli18n-tmp.h:6657 +#: src/xml/xmli18n-tmp.h:6680 msgid "A8" msgstr "" -#: src/xml/xmli18n-tmp.h:6658 +#: src/xml/xmli18n-tmp.h:6681 msgid "A9" msgstr "" -#: src/xml/xmli18n-tmp.h:6659 +#: src/xml/xmli18n-tmp.h:6682 msgid "A10" msgstr "" -#: src/xml/xmli18n-tmp.h:6660 +#: src/xml/xmli18n-tmp.h:6683 msgid "RA0" msgstr "" -#: src/xml/xmli18n-tmp.h:6661 +#: src/xml/xmli18n-tmp.h:6684 msgid "RA1" msgstr "" -#: src/xml/xmli18n-tmp.h:6662 +#: src/xml/xmli18n-tmp.h:6685 msgid "RA2" msgstr "" -#: src/xml/xmli18n-tmp.h:6663 +#: src/xml/xmli18n-tmp.h:6686 msgid "RA3" msgstr "" -#: src/xml/xmli18n-tmp.h:6664 +#: src/xml/xmli18n-tmp.h:6687 msgid "RA4" msgstr "" -#: src/xml/xmli18n-tmp.h:6665 +#: src/xml/xmli18n-tmp.h:6688 msgid "SRA0" msgstr "" -#: src/xml/xmli18n-tmp.h:6666 +#: src/xml/xmli18n-tmp.h:6689 msgid "SRA1" msgstr "" -#: src/xml/xmli18n-tmp.h:6667 +#: src/xml/xmli18n-tmp.h:6690 msgid "SRA2" msgstr "" -#: src/xml/xmli18n-tmp.h:6668 +#: src/xml/xmli18n-tmp.h:6691 msgid "SRA3" msgstr "" -#: src/xml/xmli18n-tmp.h:6669 +#: src/xml/xmli18n-tmp.h:6692 msgid "SRA4" msgstr "" -#: src/xml/xmli18n-tmp.h:6670 +#: src/xml/xmli18n-tmp.h:6693 msgid "4B ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6671 +#: src/xml/xmli18n-tmp.h:6694 msgid "2B ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6672 +#: src/xml/xmli18n-tmp.h:6695 msgid "B0 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6673 +#: src/xml/xmli18n-tmp.h:6696 msgid "B1 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6674 +#: src/xml/xmli18n-tmp.h:6697 msgid "B2 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6675 +#: src/xml/xmli18n-tmp.h:6698 msgid "B3 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6676 +#: src/xml/xmli18n-tmp.h:6699 msgid "B4 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6677 +#: src/xml/xmli18n-tmp.h:6700 msgid "B5 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6678 +#: src/xml/xmli18n-tmp.h:6701 msgid "B6 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6679 +#: src/xml/xmli18n-tmp.h:6702 msgid "B7 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6680 +#: src/xml/xmli18n-tmp.h:6703 msgid "B8 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6681 +#: src/xml/xmli18n-tmp.h:6704 msgid "B9 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6682 +#: src/xml/xmli18n-tmp.h:6705 msgid "B10 ISO" msgstr "" -#: src/xml/xmli18n-tmp.h:6683 +#: src/xml/xmli18n-tmp.h:6706 msgid "Super B0 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6684 +#: src/xml/xmli18n-tmp.h:6707 msgid "B0 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6685 +#: src/xml/xmli18n-tmp.h:6708 msgid "B1 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6686 +#: src/xml/xmli18n-tmp.h:6709 msgid "B2 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6687 +#: src/xml/xmli18n-tmp.h:6710 msgid "B3 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6688 +#: src/xml/xmli18n-tmp.h:6711 msgid "B4 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6689 +#: src/xml/xmli18n-tmp.h:6712 msgid "B5 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6690 +#: src/xml/xmli18n-tmp.h:6713 msgid "B6 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6691 +#: src/xml/xmli18n-tmp.h:6714 msgid "B7 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6692 +#: src/xml/xmli18n-tmp.h:6715 msgid "B8 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6693 +#: src/xml/xmli18n-tmp.h:6716 msgid "B9 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6694 +#: src/xml/xmli18n-tmp.h:6717 msgid "B10 JIS" msgstr "" -#: src/xml/xmli18n-tmp.h:6695 +#: src/xml/xmli18n-tmp.h:6718 msgid "C0" msgstr "" -#: src/xml/xmli18n-tmp.h:6696 +#: src/xml/xmli18n-tmp.h:6719 msgid "C0 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6697 +#: src/xml/xmli18n-tmp.h:6720 msgid "C1" msgstr "" -#: src/xml/xmli18n-tmp.h:6698 +#: src/xml/xmli18n-tmp.h:6721 msgid "C1 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6699 +#: src/xml/xmli18n-tmp.h:6722 msgid "C2" msgstr "" -#: src/xml/xmli18n-tmp.h:6700 +#: src/xml/xmli18n-tmp.h:6723 msgid "C2 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6701 +#: src/xml/xmli18n-tmp.h:6724 msgid "C3" msgstr "" -#: src/xml/xmli18n-tmp.h:6702 +#: src/xml/xmli18n-tmp.h:6725 msgid "C3 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6703 +#: src/xml/xmli18n-tmp.h:6726 msgid "C4" msgstr "" -#: src/xml/xmli18n-tmp.h:6704 +#: src/xml/xmli18n-tmp.h:6727 msgid "C4 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6705 +#: src/xml/xmli18n-tmp.h:6728 msgid "C5" msgstr "" -#: src/xml/xmli18n-tmp.h:6706 +#: src/xml/xmli18n-tmp.h:6729 msgid "C5 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6707 +#: src/xml/xmli18n-tmp.h:6730 msgid "B6-C4" msgstr "" -#: src/xml/xmli18n-tmp.h:6708 +#: src/xml/xmli18n-tmp.h:6731 msgid "B6-C4 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6709 +#: src/xml/xmli18n-tmp.h:6732 msgid "C6" msgstr "" -#: src/xml/xmli18n-tmp.h:6710 +#: src/xml/xmli18n-tmp.h:6733 msgid "C6 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6711 +#: src/xml/xmli18n-tmp.h:6734 msgid "DL" msgstr "" -#: src/xml/xmli18n-tmp.h:6712 +#: src/xml/xmli18n-tmp.h:6735 msgid "DL landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6713 +#: src/xml/xmli18n-tmp.h:6736 msgid "C7-6" msgstr "" -#: src/xml/xmli18n-tmp.h:6714 +#: src/xml/xmli18n-tmp.h:6737 msgid "C7-6 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6715 +#: src/xml/xmli18n-tmp.h:6738 msgid "C7" msgstr "" -#: src/xml/xmli18n-tmp.h:6716 +#: src/xml/xmli18n-tmp.h:6739 msgid "C7 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6717 +#: src/xml/xmli18n-tmp.h:6740 msgid "C8" msgstr "" -#: src/xml/xmli18n-tmp.h:6718 +#: src/xml/xmli18n-tmp.h:6741 msgid "C8 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6719 +#: src/xml/xmli18n-tmp.h:6742 msgid "C9" msgstr "" -#: src/xml/xmli18n-tmp.h:6720 +#: src/xml/xmli18n-tmp.h:6743 msgid "C9 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6721 +#: src/xml/xmli18n-tmp.h:6744 msgid "C10" msgstr "" -#: src/xml/xmli18n-tmp.h:6722 +#: src/xml/xmli18n-tmp.h:6745 msgid "C10 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6723 +#: src/xml/xmli18n-tmp.h:6746 msgid "EA5" msgstr "" -#: src/xml/xmli18n-tmp.h:6724 +#: src/xml/xmli18n-tmp.h:6747 msgid "EA5 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6725 +#: src/xml/xmli18n-tmp.h:6748 msgid "ArchA" msgstr "" -#: src/xml/xmli18n-tmp.h:6726 +#: src/xml/xmli18n-tmp.h:6749 msgid "ArchA transposed" msgstr "" -#: src/xml/xmli18n-tmp.h:6727 +#: src/xml/xmli18n-tmp.h:6750 msgid "ArchB" msgstr "" -#: src/xml/xmli18n-tmp.h:6728 +#: src/xml/xmli18n-tmp.h:6751 msgid "ArchB transposed" msgstr "" -#: src/xml/xmli18n-tmp.h:6729 +#: src/xml/xmli18n-tmp.h:6752 msgid "ArchC" msgstr "" -#: src/xml/xmli18n-tmp.h:6730 +#: src/xml/xmli18n-tmp.h:6753 msgid "ArchC transposed" msgstr "" -#: src/xml/xmli18n-tmp.h:6731 +#: src/xml/xmli18n-tmp.h:6754 msgid "ArchD" msgstr "" -#: src/xml/xmli18n-tmp.h:6732 +#: src/xml/xmli18n-tmp.h:6755 msgid "ArchD transposed" msgstr "" -#: src/xml/xmli18n-tmp.h:6733 +#: src/xml/xmli18n-tmp.h:6756 msgid "ArchE" msgstr "" -#: src/xml/xmli18n-tmp.h:6734 +#: src/xml/xmli18n-tmp.h:6757 msgid "ArchE transposed" msgstr "" -#: src/xml/xmli18n-tmp.h:6735 +#: src/xml/xmli18n-tmp.h:6758 msgid "American foolscap" msgstr "" -#: src/xml/xmli18n-tmp.h:6736 +#: src/xml/xmli18n-tmp.h:6759 msgid "European foolscap" msgstr "" -#: src/xml/xmli18n-tmp.h:6737 +#: src/xml/xmli18n-tmp.h:6760 msgid "Crown Quarto" msgstr "" -#: src/xml/xmli18n-tmp.h:6738 +#: src/xml/xmli18n-tmp.h:6761 msgid "Large Crown Quarto" msgstr "" -#: src/xml/xmli18n-tmp.h:6739 +#: src/xml/xmli18n-tmp.h:6762 msgid "Demy Quarto" msgstr "" -#: src/xml/xmli18n-tmp.h:6740 +#: src/xml/xmli18n-tmp.h:6763 msgid "Royal Quarto" msgstr "" -#: src/xml/xmli18n-tmp.h:6741 +#: src/xml/xmli18n-tmp.h:6764 msgid "Crown Octavo" msgstr "" -#: src/xml/xmli18n-tmp.h:6742 +#: src/xml/xmli18n-tmp.h:6765 msgid "Large Crown Octavo" msgstr "" -#: src/xml/xmli18n-tmp.h:6743 +#: src/xml/xmli18n-tmp.h:6766 msgid "Demy Octavo" msgstr "" -#: src/xml/xmli18n-tmp.h:6744 +#: src/xml/xmli18n-tmp.h:6767 msgid "Royal Octavo" msgstr "" -#: src/xml/xmli18n-tmp.h:6745 +#: src/xml/xmli18n-tmp.h:6768 msgid "Small paperback" msgstr "" -#: src/xml/xmli18n-tmp.h:6746 +#: src/xml/xmli18n-tmp.h:6769 msgid "Penguin small paperback" msgstr "" -#: src/xml/xmli18n-tmp.h:6747 +#: src/xml/xmli18n-tmp.h:6770 msgid "Penguin large paperback" msgstr "" -#: src/xml/xmli18n-tmp.h:6748 +#: src/xml/xmli18n-tmp.h:6771 msgid "10cm x 15cm" msgstr "" -#: src/xml/xmli18n-tmp.h:6749 +#: src/xml/xmli18n-tmp.h:6772 msgid "Hagaki Card" msgstr "" -#: src/xml/xmli18n-tmp.h:6750 +#: src/xml/xmli18n-tmp.h:6773 msgid "Oufuku Card" msgstr "" -#: src/xml/xmli18n-tmp.h:6751 +#: src/xml/xmli18n-tmp.h:6774 msgid "Japanese long envelope #3" msgstr "" -#: src/xml/xmli18n-tmp.h:6752 +#: src/xml/xmli18n-tmp.h:6775 msgid "Japanese long envelope #3 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6753 +#: src/xml/xmli18n-tmp.h:6776 msgid "Japanese long envelope #4" msgstr "" -#: src/xml/xmli18n-tmp.h:6754 +#: src/xml/xmli18n-tmp.h:6777 msgid "Japanese long envelope #4 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6755 +#: src/xml/xmli18n-tmp.h:6778 +msgid "Japanese Western-style envelope #4" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6779 +msgid "Japanese Western-style envelope #4 landscape" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6780 +msgid "Japanese Western-style envelope #6" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6781 +msgid "Japanese Western-style envelope #6 landscape" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6782 msgid "Japanese Kaku envelope #4" msgstr "" -#: src/xml/xmli18n-tmp.h:6756 +#: src/xml/xmli18n-tmp.h:6783 msgid "Japanese Kaku envelope #4 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6757 +#: src/xml/xmli18n-tmp.h:6784 msgid "Commercial 10" msgstr "" -#: src/xml/xmli18n-tmp.h:6758 +#: src/xml/xmli18n-tmp.h:6785 msgid "Commercial 10 landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6759 +#: src/xml/xmli18n-tmp.h:6786 msgid "A2 Invitation" msgstr "" -#: src/xml/xmli18n-tmp.h:6760 +#: src/xml/xmli18n-tmp.h:6787 msgid "Monarch Envelope" msgstr "" -#: src/xml/xmli18n-tmp.h:6761 +#: src/xml/xmli18n-tmp.h:6788 msgid "Monarch Envelope landscape" msgstr "" -#: src/xml/xmli18n-tmp.h:6762 +#: src/xml/xmli18n-tmp.h:6789 msgid "4x5 3/8" msgstr "" -#: src/xml/xmli18n-tmp.h:6763 +#: src/xml/xmli18n-tmp.h:6790 msgid "4x7" msgstr "" -#: src/xml/xmli18n-tmp.h:6764 +#: src/xml/xmli18n-tmp.h:6791 msgid "Wide 101.6x180.6" msgstr "" -#: src/xml/xmli18n-tmp.h:6765 +#: src/xml/xmli18n-tmp.h:6792 msgid "CP_L" msgstr "" -#: src/xml/xmli18n-tmp.h:6766 +#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794 msgid "Card" msgstr "" -#: src/xml/xmli18n-tmp.h:6767 +#: src/xml/xmli18n-tmp.h:6795 msgid "Wide Postcard" msgstr "" -#: src/xml/xmli18n-tmp.h:6768 +#: src/xml/xmli18n-tmp.h:6796 msgid "Chilean Office" msgstr "" -#: src/xml/xmli18n-tmp.h:6769 +#: src/xml/xmli18n-tmp.h:6797 msgid "Chilean Double Letter" msgstr "" -#: src/xml/xmli18n-tmp.h:6770 +#: src/xml/xmli18n-tmp.h:6798 msgid "Chilean Double Office" msgstr "" -#: src/xml/xmli18n-tmp.h:6771 +#: src/xml/xmli18n-tmp.h:6799 msgid "A3+" msgstr "" -#: src/xml/xmli18n-tmp.h:6773 +#: src/xml/xmli18n-tmp.h:6801 msgid "89 mm Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6774 +#: src/xml/xmli18n-tmp.h:6802 msgid "4 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6775 +#: src/xml/xmli18n-tmp.h:6803 msgid "5 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6776 +#: src/xml/xmli18n-tmp.h:6804 msgid "210 mm Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6777 +#: src/xml/xmli18n-tmp.h:6805 msgid "13 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6778 +#: src/xml/xmli18n-tmp.h:6806 msgid "17 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6779 +#: src/xml/xmli18n-tmp.h:6807 msgid "22 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6780 +#: src/xml/xmli18n-tmp.h:6808 msgid "24 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6781 +#: src/xml/xmli18n-tmp.h:6809 msgid "36 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6782 +#: src/xml/xmli18n-tmp.h:6810 msgid "44 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6783 +#: src/xml/xmli18n-tmp.h:6811 msgid "60 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6784 +#: src/xml/xmli18n-tmp.h:6812 msgid "64 Inch Roll Paper" msgstr "" -#: src/xml/xmli18n-tmp.h:6785 +#: src/xml/xmli18n-tmp.h:6813 msgid "PostScript Level 1" msgstr "" -#: src/xml/xmli18n-tmp.h:6786 +#: src/xml/xmli18n-tmp.h:6814 msgid "PostScript Level 2" msgstr "" -#: src/xml/xmli18n-tmp.h:6787 +#: src/xml/xmli18n-tmp.h:6815 msgid "Canon BJ-30" msgstr "" -#: src/xml/xmli18n-tmp.h:6788 +#: src/xml/xmli18n-tmp.h:6816 msgid "Canon BJC-50" msgstr "" -#: src/xml/xmli18n-tmp.h:6789 +#: src/xml/xmli18n-tmp.h:6817 msgid "Canon BJC-55" msgstr "" -#: src/xml/xmli18n-tmp.h:6790 +#: src/xml/xmli18n-tmp.h:6818 msgid "Canon BJC-80" msgstr "" -#: src/xml/xmli18n-tmp.h:6791 +#: src/xml/xmli18n-tmp.h:6819 msgid "Canon BJC-85" msgstr "" -#: src/xml/xmli18n-tmp.h:6792 +#: src/xml/xmli18n-tmp.h:6820 msgid "Canon BJC-210" msgstr "" -#: src/xml/xmli18n-tmp.h:6793 +#: src/xml/xmli18n-tmp.h:6821 msgid "Canon BJC-240" msgstr "" -#: src/xml/xmli18n-tmp.h:6794 +#: src/xml/xmli18n-tmp.h:6822 msgid "Canon BJC-250" msgstr "" -#: src/xml/xmli18n-tmp.h:6795 +#: src/xml/xmli18n-tmp.h:6823 msgid "Canon BJC-1000" msgstr "" -#: src/xml/xmli18n-tmp.h:6796 +#: src/xml/xmli18n-tmp.h:6824 msgid "Canon BJC-2000" msgstr "" -#: src/xml/xmli18n-tmp.h:6797 +#: src/xml/xmli18n-tmp.h:6825 msgid "Canon BJC-2010" msgstr "" -#: src/xml/xmli18n-tmp.h:6798 -msgid "Canon BJC-2100" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6799 -msgid "Canon BJC-2110" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6800 -msgid "Canon BJC-3000" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6801 -msgid "Canon BJC-4000" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6802 -msgid "Canon BJC-4300" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6803 -msgid "Canon BJC-4400" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6804 -msgid "Canon BJC-5100" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6805 -msgid "Canon BJC-5500" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6806 -msgid "Canon BJC-6000" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6807 -msgid "Canon BJC-6100" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6808 -msgid "Canon BJC-6200" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6809 -msgid "Canon BJC-6500" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6810 -msgid "Canon BJC-7000" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6811 -msgid "Canon BJC-7100" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6812 -msgid "Canon BJC-8200" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6813 -msgid "Canon BJC-8500" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6814 -msgid "Canon S100" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6815 -msgid "Canon S200" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6816 -msgid "Canon S300" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6817 -msgid "Canon S400" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6818 -msgid "Canon S450" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6819 -msgid "Canon S500" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6820 -msgid "Canon S600" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6821 -msgid "Canon S630" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6822 -msgid "Canon S800" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6823 -msgid "Canon S4500" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6824 -msgid "Canon PIXMA iP1000" -msgstr "" - -#: src/xml/xmli18n-tmp.h:6825 -msgid "Canon PIXMA iP1200" -msgstr "" - #: src/xml/xmli18n-tmp.h:6826 -msgid "Canon PIXMA iP1300" +msgid "Canon BJC-2100" msgstr "" #: src/xml/xmli18n-tmp.h:6827 -msgid "Canon PIXMA iP1500" +msgid "Canon BJC-2110" msgstr "" #: src/xml/xmli18n-tmp.h:6828 -msgid "Canon PIXMA iP1600" +msgid "Canon BJC-3000" msgstr "" #: src/xml/xmli18n-tmp.h:6829 -msgid "Canon PIXMA iP1700" +msgid "Canon BJC-4000" msgstr "" #: src/xml/xmli18n-tmp.h:6830 -msgid "Canon PIXMA iP1800" +msgid "Canon BJC-4300" msgstr "" #: src/xml/xmli18n-tmp.h:6831 -msgid "Canon PIXMA iP1900" +msgid "Canon BJC-4400" msgstr "" #: src/xml/xmli18n-tmp.h:6832 -msgid "Canon PIXMA iP2000" +msgid "Canon BJC-4550" msgstr "" #: src/xml/xmli18n-tmp.h:6833 -msgid "Canon PIXMA iP2200" +msgid "Canon BJC-5100" msgstr "" #: src/xml/xmli18n-tmp.h:6834 -msgid "Canon PIXMA iP2500" +msgid "Canon BJC-5500" msgstr "" #: src/xml/xmli18n-tmp.h:6835 -msgid "Canon PIXMA iP2600" +msgid "Canon BJC-6000" msgstr "" #: src/xml/xmli18n-tmp.h:6836 -msgid "Canon PIXUS iP2700" +msgid "Canon BJC-6100" msgstr "" #: src/xml/xmli18n-tmp.h:6837 -msgid "Canon PIXMA iP3000" +msgid "Canon BJC-6200" msgstr "" #: src/xml/xmli18n-tmp.h:6838 -msgid "Canon PIXMA iP3100" +msgid "Canon BJC-6500" msgstr "" #: src/xml/xmli18n-tmp.h:6839 -msgid "Canon PIXMA iP4000" +msgid "Canon BJC-7000" msgstr "" #: src/xml/xmli18n-tmp.h:6840 -msgid "Canon PIXMA iP4100" +msgid "Canon BJC-7100" msgstr "" #: src/xml/xmli18n-tmp.h:6841 -msgid "Canon PIXMA iP4200" +msgid "Canon BJC-8200" msgstr "" #: src/xml/xmli18n-tmp.h:6842 -msgid "Canon PIXMA iP4300" +msgid "Canon BJC-8500" msgstr "" #: src/xml/xmli18n-tmp.h:6843 -msgid "Canon PIXMA iP4500" +msgid "Canon S100" msgstr "" #: src/xml/xmli18n-tmp.h:6844 -msgid "Canon PIXMA iP4600" +msgid "Canon S200" msgstr "" #: src/xml/xmli18n-tmp.h:6845 -msgid "Canon PIXMA iP4700" +msgid "Canon S300" msgstr "" #: src/xml/xmli18n-tmp.h:6846 -msgid "Canon PIXMA iP4800" +msgid "Canon S330" msgstr "" #: src/xml/xmli18n-tmp.h:6847 -msgid "Canon PIXMA iP5000" +msgid "Canon S400" msgstr "" #: src/xml/xmli18n-tmp.h:6848 -msgid "Canon PIXMA iP5200" +msgid "Canon S450" msgstr "" #: src/xml/xmli18n-tmp.h:6849 -msgid "Canon PIXMA iP5300" +msgid "Canon S500" msgstr "" #: src/xml/xmli18n-tmp.h:6850 -msgid "Canon PIXMA iP6000D" +msgid "Canon S520" msgstr "" #: src/xml/xmli18n-tmp.h:6851 -msgid "Canon PIXMA iP6100D" +msgid "Canon S530D" msgstr "" #: src/xml/xmli18n-tmp.h:6852 -msgid "Canon PIXMA iP6600D" +msgid "Canon S600" msgstr "" #: src/xml/xmli18n-tmp.h:6853 -msgid "Canon PIXMA iP6700" +msgid "Canon S630" msgstr "" #: src/xml/xmli18n-tmp.h:6854 -msgid "Canon PIXMA iP8500" +msgid "Canon S750" msgstr "" #: src/xml/xmli18n-tmp.h:6855 -msgid "Canon PIXMA iX4000" +msgid "Canon S800" msgstr "" #: src/xml/xmli18n-tmp.h:6856 -msgid "Canon PIXMA iX5000" +msgid "Canon S820" msgstr "" #: src/xml/xmli18n-tmp.h:6857 -msgid "Canon PIXMA iX6500" +msgid "Canon S900" msgstr "" #: src/xml/xmli18n-tmp.h:6858 -msgid "Canon PIXMA iX7000" +msgid "Canon S9000" msgstr "" #: src/xml/xmli18n-tmp.h:6859 -msgid "Canon PIXMA Pro9000" +msgid "Canon S830D" msgstr "" #: src/xml/xmli18n-tmp.h:6860 -msgid "Canon PIXMA Pro9000mk2" +msgid "Canon S4500" msgstr "" #: src/xml/xmli18n-tmp.h:6861 -msgid "Canon PIXMA Pro9500" +msgid "Canon SELPHY DS700" msgstr "" #: src/xml/xmli18n-tmp.h:6862 -msgid "Canon PIXMA Pro9500mk2" +msgid "Canon SELPHY DS810" msgstr "" #: src/xml/xmli18n-tmp.h:6863 -msgid "Canon PIXMA MP150" +msgid "Canon PIXMA mini220" msgstr "" #: src/xml/xmli18n-tmp.h:6864 -msgid "Canon PIXMA MP160" +msgid "Canon PIXMA mini320" msgstr "" #: src/xml/xmli18n-tmp.h:6865 -msgid "Canon PIXMA MP170" +msgid "Canon PIXMA mini360" msgstr "" #: src/xml/xmli18n-tmp.h:6866 -msgid "Canon PIXMA MP180" +msgid "Canon PIXMA iP2000" msgstr "" #: src/xml/xmli18n-tmp.h:6867 -msgid "Canon PIXMA MP220" +msgid "Canon PIXUS iP2700" msgstr "" #: src/xml/xmli18n-tmp.h:6868 -msgid "Canon PIXMA MP250" +msgid "Canon PIXMA iP3000" msgstr "" #: src/xml/xmli18n-tmp.h:6869 -msgid "Canon PIXMA MP270" +msgid "Canon PIXMA iP3100" msgstr "" #: src/xml/xmli18n-tmp.h:6870 -msgid "Canon PIXMA MP280" +msgid "Canon PIXMA iP3300" msgstr "" #: src/xml/xmli18n-tmp.h:6871 -msgid "Canon PIXMA MP360" +msgid "Canon PIXMA iP3500" msgstr "" #: src/xml/xmli18n-tmp.h:6872 -msgid "Canon PIXMA MP370" +msgid "Canon PIXMA iP3600" msgstr "" #: src/xml/xmli18n-tmp.h:6873 -msgid "Canon PIXMA MP390" +msgid "Canon PIXMA iP4000" msgstr "" #: src/xml/xmli18n-tmp.h:6874 -msgid "Canon PIXMA MP450" +msgid "Canon PIXMA iP4100" msgstr "" #: src/xml/xmli18n-tmp.h:6875 -msgid "Canon PIXMA MP460" +msgid "Canon PIXMA iP4200" msgstr "" #: src/xml/xmli18n-tmp.h:6876 -msgid "Canon PIXMA MP480" +msgid "Canon PIXMA iP4300" msgstr "" #: src/xml/xmli18n-tmp.h:6877 -msgid "Canon PIXMA MP493" +msgid "Canon PIXMA iP4500" msgstr "" #: src/xml/xmli18n-tmp.h:6878 -msgid "Canon PIXMA MP495" +msgid "Canon PIXMA iP4600" msgstr "" #: src/xml/xmli18n-tmp.h:6879 -msgid "Canon PIXMA MP500" +msgid "Canon PIXMA iP4700" msgstr "" #: src/xml/xmli18n-tmp.h:6880 -msgid "Canon PIXMA MP510" +msgid "Canon PIXMA iP4800" msgstr "" #: src/xml/xmli18n-tmp.h:6881 -msgid "Canon PIXMA MP520" +msgid "Canon PIXMA iP4900" msgstr "" #: src/xml/xmli18n-tmp.h:6882 -msgid "Canon PIXMA MP540" +msgid "Canon PIXMA iP5000" msgstr "" #: src/xml/xmli18n-tmp.h:6883 -msgid "Canon PIXMA MP550" +msgid "Canon PIXMA iP5200" msgstr "" #: src/xml/xmli18n-tmp.h:6884 -msgid "Canon PIXMA MP600" +msgid "Canon PIXMA iP5300" msgstr "" #: src/xml/xmli18n-tmp.h:6885 -msgid "Canon PIXMA MP610" +msgid "Canon PIXMA iP6000D" msgstr "" #: src/xml/xmli18n-tmp.h:6886 -msgid "Canon PIXMA MP620" +msgid "Canon PIXMA iP6100D" msgstr "" #: src/xml/xmli18n-tmp.h:6887 -msgid "Canon PIXMA MP630" +msgid "Canon PIXMA iP6210D" msgstr "" #: src/xml/xmli18n-tmp.h:6888 -msgid "Canon PIXMA MP640" +msgid "Canon PIXMA iP6220D" msgstr "" #: src/xml/xmli18n-tmp.h:6889 -msgid "Canon PIXMA MP700" +msgid "Canon PIXMA iP6310D" msgstr "" #: src/xml/xmli18n-tmp.h:6890 -msgid "Canon PIXMA MP710" +msgid "Canon PIXMA iP6600D" msgstr "" #: src/xml/xmli18n-tmp.h:6891 -msgid "Canon PIXMA MP730" +msgid "Canon PIXMA iP6700" msgstr "" #: src/xml/xmli18n-tmp.h:6892 -msgid "Canon PIXMA MP740" +msgid "Canon PIXMA iP7100" msgstr "" #: src/xml/xmli18n-tmp.h:6893 -msgid "Canon PIXMA MP750" +msgid "Canon PIXMA iP7500" msgstr "" #: src/xml/xmli18n-tmp.h:6894 -msgid "Canon PIXMA MP760" +msgid "Canon PIXMA iP8100" msgstr "" #: src/xml/xmli18n-tmp.h:6895 -msgid "Canon PIXMA MP770" +msgid "Canon PIXMA iP8500" msgstr "" #: src/xml/xmli18n-tmp.h:6896 -msgid "Canon PIXMA MP780" +msgid "Canon PIXMA iP8600" msgstr "" #: src/xml/xmli18n-tmp.h:6897 -msgid "Canon PIXMA MP790" +msgid "Canon PIXMA iP9910" msgstr "" #: src/xml/xmli18n-tmp.h:6898 -msgid "Canon PIXMA MP800" +msgid "Canon PIXMA iX4000" msgstr "" #: src/xml/xmli18n-tmp.h:6899 -msgid "Canon PIXMA MP810" +msgid "Canon PIXMA iX5000" msgstr "" #: src/xml/xmli18n-tmp.h:6900 -msgid "Canon PIXMA MP830" +msgid "Canon PIXMA iX6500" msgstr "" #: src/xml/xmli18n-tmp.h:6901 -msgid "Canon PIXMA MP950" +msgid "Canon PIXMA iX7000" msgstr "" #: src/xml/xmli18n-tmp.h:6902 -msgid "Canon PIXMA MP960" +msgid "Canon PIXMA Pro9000" msgstr "" #: src/xml/xmli18n-tmp.h:6903 -msgid "Canon PIXMA MP970" +msgid "Canon PIXMA Pro9000mk2" msgstr "" #: src/xml/xmli18n-tmp.h:6904 -msgid "Canon PIXMA MP980" +msgid "Canon PIXMA Pro9500" msgstr "" #: src/xml/xmli18n-tmp.h:6905 -msgid "Canon PIXMA MP990" +msgid "Canon PIXMA Pro9500mk2" msgstr "" #: src/xml/xmli18n-tmp.h:6906 -msgid "Canon PIXUS iP3100" +msgid "Canon PIXMA MP140" msgstr "" #: src/xml/xmli18n-tmp.h:6907 -msgid "Canon PIXUS iP4100" +msgid "Canon PIXMA MP150" msgstr "" #: src/xml/xmli18n-tmp.h:6908 -msgid "Canon PIXMA MG5100" +msgid "Canon PIXMA MP160" msgstr "" #: src/xml/xmli18n-tmp.h:6909 -msgid "Canon PIXMA MG5200" +msgid "Canon PIXMA MP170" msgstr "" #: src/xml/xmli18n-tmp.h:6910 -msgid "Canon PIXMA MG6100" +msgid "Canon PIXMA MP180" msgstr "" #: src/xml/xmli18n-tmp.h:6911 -msgid "Canon PIXMA MG8100" +msgid "Canon PIXMA MP190" msgstr "" #: src/xml/xmli18n-tmp.h:6912 -msgid "Canon PIXMA MX300" +msgid "Canon PIXMA MP210" msgstr "" #: src/xml/xmli18n-tmp.h:6913 -msgid "Canon PIXMA MX310" +msgid "Canon PIXMA MP220" msgstr "" #: src/xml/xmli18n-tmp.h:6914 -msgid "Canon PIXMA MX330" +msgid "Canon PIXMA MP240" msgstr "" #: src/xml/xmli18n-tmp.h:6915 -msgid "Canon PIXMA MX340" +msgid "Canon PIXMA MP250" msgstr "" #: src/xml/xmli18n-tmp.h:6916 -msgid "Canon PIXMA MX350" +msgid "Canon PIXMA MP270" msgstr "" #: src/xml/xmli18n-tmp.h:6917 -msgid "Canon PIXMA MX360" +msgid "Canon PIXMA MP280" msgstr "" #: src/xml/xmli18n-tmp.h:6918 -msgid "Canon PIXMA MX410" +msgid "Canon PIXMA MP360" msgstr "" #: src/xml/xmli18n-tmp.h:6919 -msgid "Canon PIXMA MX420" +msgid "Canon PIXMA MP370" msgstr "" #: src/xml/xmli18n-tmp.h:6920 -msgid "Canon PIXMA MX700" +msgid "Canon PIXMA MP375R" msgstr "" #: src/xml/xmli18n-tmp.h:6921 -msgid "Canon PIXMA MX850" +msgid "Canon PIXMA MP390" msgstr "" #: src/xml/xmli18n-tmp.h:6922 -msgid "Canon PIXMA MX860" +msgid "Canon PIXMA MP450" msgstr "" #: src/xml/xmli18n-tmp.h:6923 -msgid "Canon PIXMA MX870" +msgid "Canon PIXMA MP460" msgstr "" #: src/xml/xmli18n-tmp.h:6924 -msgid "Canon PIXMA MX880" +msgid "Canon PIXMA MP470" msgstr "" #: src/xml/xmli18n-tmp.h:6925 -msgid "Canon PIXMA MX7600" +msgid "Canon PIXMA MP480" msgstr "" #: src/xml/xmli18n-tmp.h:6926 -msgid "Canon i80" +msgid "Canon PIXMA MP490" msgstr "" #: src/xml/xmli18n-tmp.h:6927 -msgid "Canon i560" +msgid "Canon PIXMA MP493" msgstr "" #: src/xml/xmli18n-tmp.h:6928 -msgid "Canon i850" +msgid "Canon PIXMA MP495" msgstr "" #: src/xml/xmli18n-tmp.h:6929 -msgid "Canon i860" +msgid "Canon PIXMA MP500" msgstr "" #: src/xml/xmli18n-tmp.h:6930 -msgid "Canon i865" +msgid "Canon PIXMA MP510" msgstr "" #: src/xml/xmli18n-tmp.h:6931 -msgid "Epson Artisan 50" +msgid "Canon PIXMA MP520" msgstr "" #: src/xml/xmli18n-tmp.h:6932 -msgid "Epson Artisan 700" +msgid "Canon PIXMA MP530" msgstr "" #: src/xml/xmli18n-tmp.h:6933 -msgid "Epson Artisan 710" +msgid "Canon PIXMA MP540" msgstr "" #: src/xml/xmli18n-tmp.h:6934 -msgid "Epson Artisan 800" +msgid "Canon PIXMA MP550" msgstr "" #: src/xml/xmli18n-tmp.h:6935 -msgid "Epson Artisan 810" +msgid "Canon PIXMA MP560" msgstr "" #: src/xml/xmli18n-tmp.h:6936 -msgid "Epson B-300" +msgid "Canon PIXMA MP600" msgstr "" #: src/xml/xmli18n-tmp.h:6937 -msgid "Epson B-308" +msgid "Canon PIXMA MP610" msgstr "" #: src/xml/xmli18n-tmp.h:6938 -msgid "Epson B-310" +msgid "Canon PIXMA MP620" msgstr "" #: src/xml/xmli18n-tmp.h:6939 -msgid "Epson B-310N" +msgid "Canon PIXMA MP630" msgstr "" #: src/xml/xmli18n-tmp.h:6940 -msgid "Epson B-500DN" +msgid "Canon PIXMA MP640" msgstr "" #: src/xml/xmli18n-tmp.h:6941 -msgid "Epson B-508DN" +msgid "Canon PIXMA MP700" msgstr "" #: src/xml/xmli18n-tmp.h:6942 -msgid "Epson B-510DN" +msgid "Canon PIXMA MP710" msgstr "" #: src/xml/xmli18n-tmp.h:6943 -msgid "Epson Stylus C20" +msgid "Canon PIXMA MP730" msgstr "" #: src/xml/xmli18n-tmp.h:6944 -msgid "Epson Stylus C20SX" +msgid "Canon PIXMA MP740" msgstr "" #: src/xml/xmli18n-tmp.h:6945 -msgid "Epson Stylus C20UX" +msgid "Canon PIXMA MP750" msgstr "" #: src/xml/xmli18n-tmp.h:6946 -msgid "Epson Stylus C40" +msgid "Canon PIXMA MP760" msgstr "" #: src/xml/xmli18n-tmp.h:6947 -msgid "Epson Stylus C40SX" +msgid "Canon PIXMA MP770" msgstr "" #: src/xml/xmli18n-tmp.h:6948 -msgid "Epson Stylus C40UX" +msgid "Canon PIXMA MP780" msgstr "" #: src/xml/xmli18n-tmp.h:6949 -msgid "Epson Stylus C41" +msgid "Canon PIXMA MP790" msgstr "" #: src/xml/xmli18n-tmp.h:6950 -msgid "Epson Stylus C41SX" +msgid "Canon PIXMA MP800" msgstr "" #: src/xml/xmli18n-tmp.h:6951 -msgid "Epson Stylus C41UX" +msgid "Canon PIXMA MP810" msgstr "" #: src/xml/xmli18n-tmp.h:6952 -msgid "Epson Stylus C42" +msgid "Canon PIXMA MP830" msgstr "" #: src/xml/xmli18n-tmp.h:6953 -msgid "Epson Stylus C42SX" +msgid "Canon PIXMA MP900" msgstr "" #: src/xml/xmli18n-tmp.h:6954 -msgid "Epson Stylus C42UX" +msgid "Canon PIXMA MP950" msgstr "" #: src/xml/xmli18n-tmp.h:6955 -msgid "Epson Stylus C43" +msgid "Canon PIXMA MP960" msgstr "" #: src/xml/xmli18n-tmp.h:6956 -msgid "Epson Stylus C43SX" +msgid "Canon PIXMA MP970" msgstr "" #: src/xml/xmli18n-tmp.h:6957 -msgid "Epson Stylus C43UX" +msgid "Canon PIXMA MP980" msgstr "" #: src/xml/xmli18n-tmp.h:6958 -msgid "Epson Stylus C44" +msgid "Canon PIXMA MP990" msgstr "" #: src/xml/xmli18n-tmp.h:6959 -msgid "Epson Stylus C44SX" +msgid "Canon PIXUS iP3100" msgstr "" #: src/xml/xmli18n-tmp.h:6960 -msgid "Epson Stylus C44UX" +msgid "Canon PIXUS iP4100" msgstr "" #: src/xml/xmli18n-tmp.h:6961 -msgid "Epson Stylus C45" +msgid "Canon PIXMA MG2100" msgstr "" #: src/xml/xmli18n-tmp.h:6962 -msgid "Epson Stylus C46" +msgid "Canon PIXMA MG3100" msgstr "" #: src/xml/xmli18n-tmp.h:6963 -msgid "Epson Stylus C48" +msgid "Canon PIXMA MG4100" msgstr "" #: src/xml/xmli18n-tmp.h:6964 -msgid "Epson Stylus C50" +msgid "Canon PIXMA MG5100" msgstr "" #: src/xml/xmli18n-tmp.h:6965 -msgid "Epson Stylus C60" +msgid "Canon PIXMA MG5200" msgstr "" #: src/xml/xmli18n-tmp.h:6966 -msgid "Epson Stylus C61" +msgid "Canon PIXMA MG5300" msgstr "" #: src/xml/xmli18n-tmp.h:6967 -msgid "Epson Stylus C62" +msgid "Canon PIXMA MG6100" msgstr "" #: src/xml/xmli18n-tmp.h:6968 -msgid "Epson Stylus C63" +msgid "Canon PIXMA MG6200" msgstr "" #: src/xml/xmli18n-tmp.h:6969 -msgid "Epson Stylus C64" +msgid "Canon PIXMA MG8100" msgstr "" #: src/xml/xmli18n-tmp.h:6970 -msgid "Epson Stylus C65" +msgid "Canon PIXMA MG8200" msgstr "" #: src/xml/xmli18n-tmp.h:6971 -msgid "Epson Stylus C66" +msgid "Canon PIXMA MX300" msgstr "" #: src/xml/xmli18n-tmp.h:6972 -msgid "Epson Stylus C68" +msgid "Canon PIXMA MX310" msgstr "" #: src/xml/xmli18n-tmp.h:6973 -msgid "Epson Stylus C70" +msgid "Canon PIXMA MX330" msgstr "" #: src/xml/xmli18n-tmp.h:6974 -msgid "Epson Stylus C79" +msgid "Canon PIXMA MX340" msgstr "" #: src/xml/xmli18n-tmp.h:6975 -msgid "Epson Stylus C80" +msgid "Canon PIXMA MX350" msgstr "" #: src/xml/xmli18n-tmp.h:6976 -msgid "Epson Stylus C82" +msgid "Canon PIXMA MX360" msgstr "" #: src/xml/xmli18n-tmp.h:6977 -msgid "Epson Stylus C83" +msgid "Canon PIXMA MX410" msgstr "" #: src/xml/xmli18n-tmp.h:6978 -msgid "Epson Stylus C84" +msgid "Canon PIXMA MX420" msgstr "" #: src/xml/xmli18n-tmp.h:6979 -msgid "Epson Stylus C85" +msgid "Canon PIXMA MX700" msgstr "" #: src/xml/xmli18n-tmp.h:6980 -msgid "Epson Stylus C86" +msgid "Canon PIXMA MX850" msgstr "" #: src/xml/xmli18n-tmp.h:6981 -msgid "Epson Stylus C87" +msgid "Canon PIXMA MX860" msgstr "" #: src/xml/xmli18n-tmp.h:6982 -msgid "Epson Stylus C88" +msgid "Canon PIXMA MX870" msgstr "" #: src/xml/xmli18n-tmp.h:6983 -msgid "Epson Stylus C110" +msgid "Canon PIXMA MX880" msgstr "" #: src/xml/xmli18n-tmp.h:6984 -msgid "Epson Stylus C120" +msgid "Canon PIXMA MX7600" msgstr "" #: src/xml/xmli18n-tmp.h:6985 -msgid "Epson Stylus Color" +msgid "Canon i50" msgstr "" #: src/xml/xmli18n-tmp.h:6986 -msgid "Epson Stylus Color I" +msgid "Canon i70" msgstr "" #: src/xml/xmli18n-tmp.h:6987 -msgid "Epson Stylus Color II" +msgid "Canon i80" msgstr "" #: src/xml/xmli18n-tmp.h:6988 -msgid "Epson Stylus Color IIs" +msgid "Canon i450" msgstr "" #: src/xml/xmli18n-tmp.h:6989 -msgid "Epson Stylus Color PRO" +msgid "Canon i455" msgstr "" #: src/xml/xmli18n-tmp.h:6990 -msgid "Epson Stylus Pro XL" +msgid "Canon i470D" msgstr "" #: src/xml/xmli18n-tmp.h:6991 -msgid "Epson Stylus Color 400" +msgid "Canon i550" msgstr "" #: src/xml/xmli18n-tmp.h:6992 +msgid "Canon i560" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6993 +msgid "Canon i850old" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6994 +msgid "Canon i850" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6995 +msgid "Canon i860old" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6996 +msgid "Canon i860" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6997 +msgid "Canon i865old" +msgstr "" + +#: src/xml/xmli18n-tmp.h:6998 +msgid "Canon i865 " +msgstr "" + +#: src/xml/xmli18n-tmp.h:6999 +msgid "Canon i900D" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7000 +msgid "Canon i950" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7001 +msgid "Canon i960" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7002 +msgid "Canon i6100" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7003 +msgid "Canon i6500" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7004 +msgid "Canon i9100" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7005 +msgid "Canon i9900" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7006 +msgid "Epson Artisan 50" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7007 +msgid "Epson Artisan 700" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7008 +msgid "Epson Artisan 710" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7009 +msgid "Epson Artisan 800" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7010 +msgid "Epson Artisan 810" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7011 +msgid "Epson Artisan 835" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7012 +msgid "Epson B-300" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7013 +msgid "Epson B-308" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7014 +msgid "Epson B-310" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7015 +msgid "Epson B-310N" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7016 +msgid "Epson B-500DN" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7017 +msgid "Epson B-508DN" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7018 +msgid "Epson B-510DN" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7019 +msgid "Epson Stylus C20" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7020 +msgid "Epson Stylus C20SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7021 +msgid "Epson Stylus C20UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7022 +msgid "Epson Stylus C40" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7023 +msgid "Epson Stylus C40SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7024 +msgid "Epson Stylus C40UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7025 +msgid "Epson Stylus C41" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7026 +msgid "Epson Stylus C41SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7027 +msgid "Epson Stylus C41UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7028 +msgid "Epson Stylus C42" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7029 +msgid "Epson Stylus C42SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7030 +msgid "Epson Stylus C42UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7031 +msgid "Epson Stylus C43" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7032 +msgid "Epson Stylus C43SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7033 +msgid "Epson Stylus C43UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7034 +msgid "Epson Stylus C44" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7035 +msgid "Epson Stylus C44SX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7036 +msgid "Epson Stylus C44UX" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7037 +msgid "Epson Stylus C45" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7038 +msgid "Epson Stylus C46" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7039 +msgid "Epson Stylus C48" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7040 +msgid "Epson Stylus C50" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7041 +msgid "Epson Stylus C60" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7042 +msgid "Epson Stylus C61" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7043 +msgid "Epson Stylus C62" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7044 +msgid "Epson Stylus C63" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7045 +msgid "Epson Stylus C64" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7046 +msgid "Epson Stylus C65" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7047 +msgid "Epson Stylus C66" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7048 +msgid "Epson Stylus C68" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7049 +msgid "Epson Stylus C70" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7050 +msgid "Epson Stylus C79" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7051 +msgid "Epson Stylus C80" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7052 +msgid "Epson Stylus C82" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7053 +msgid "Epson Stylus C83" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7054 +msgid "Epson Stylus C84" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7055 +msgid "Epson Stylus C85" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7056 +msgid "Epson Stylus C86" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7057 +msgid "Epson Stylus C87" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7058 +msgid "Epson Stylus C88" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7059 +msgid "Epson Stylus C110" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7060 +msgid "Epson Stylus C120" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7061 +msgid "Epson Stylus Color" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7062 +msgid "Epson Stylus Color I" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7063 +msgid "Epson Stylus Color II" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7064 +msgid "Epson Stylus Color IIs" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7065 +msgid "Epson Stylus Color PRO" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7066 +msgid "Epson Stylus Pro XL" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7067 +msgid "Epson Stylus Color 400" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7068 msgid "Epson Stylus Color 440" msgstr "" -#: src/xml/xmli18n-tmp.h:6993 +#: src/xml/xmli18n-tmp.h:7069 msgid "Epson Stylus Color 460" msgstr "" -#: src/xml/xmli18n-tmp.h:6994 +#: src/xml/xmli18n-tmp.h:7070 msgid "Epson Stylus Color 480" msgstr "" -#: src/xml/xmli18n-tmp.h:6995 +#: src/xml/xmli18n-tmp.h:7071 msgid "Epson Stylus Color 500" msgstr "" -#: src/xml/xmli18n-tmp.h:6996 +#: src/xml/xmli18n-tmp.h:7072 msgid "Epson Stylus Color 580" msgstr "" -#: src/xml/xmli18n-tmp.h:6997 +#: src/xml/xmli18n-tmp.h:7073 msgid "Epson Stylus Color 600" msgstr "" -#: src/xml/xmli18n-tmp.h:6998 +#: src/xml/xmli18n-tmp.h:7074 msgid "Epson Stylus Color 640" msgstr "" -#: src/xml/xmli18n-tmp.h:6999 +#: src/xml/xmli18n-tmp.h:7075 msgid "Epson Stylus Color 660" msgstr "" -#: src/xml/xmli18n-tmp.h:7000 +#: src/xml/xmli18n-tmp.h:7076 msgid "Epson Stylus Color 670" msgstr "" -#: src/xml/xmli18n-tmp.h:7001 +#: src/xml/xmli18n-tmp.h:7077 msgid "Epson Stylus Color 680" msgstr "" -#: src/xml/xmli18n-tmp.h:7002 +#: src/xml/xmli18n-tmp.h:7078 msgid "Epson Stylus Color 740" msgstr "" -#: src/xml/xmli18n-tmp.h:7003 +#: src/xml/xmli18n-tmp.h:7079 msgid "Epson Stylus Color 760" msgstr "" -#: src/xml/xmli18n-tmp.h:7004 +#: src/xml/xmli18n-tmp.h:7080 msgid "Epson Stylus Color 777" msgstr "" -#: src/xml/xmli18n-tmp.h:7005 +#: src/xml/xmli18n-tmp.h:7081 msgid "Epson Stylus Color 800" msgstr "" -#: src/xml/xmli18n-tmp.h:7006 +#: src/xml/xmli18n-tmp.h:7082 msgid "Epson Stylus Color 850" msgstr "" -#: src/xml/xmli18n-tmp.h:7007 +#: src/xml/xmli18n-tmp.h:7083 msgid "Epson Stylus Color 860" msgstr "" -#: src/xml/xmli18n-tmp.h:7008 +#: src/xml/xmli18n-tmp.h:7084 msgid "Epson Stylus Color 880" msgstr "" -#: src/xml/xmli18n-tmp.h:7009 +#: src/xml/xmli18n-tmp.h:7085 msgid "Epson Stylus Color 8 3" msgstr "" -#: src/xml/xmli18n-tmp.h:7010 +#: src/xml/xmli18n-tmp.h:7086 msgid "Epson Stylus Color 900" msgstr "" -#: src/xml/xmli18n-tmp.h:7011 +#: src/xml/xmli18n-tmp.h:7087 msgid "Epson Stylus Color 980" msgstr "" -#: src/xml/xmli18n-tmp.h:7012 +#: src/xml/xmli18n-tmp.h:7088 msgid "Epson Stylus Color 1160" msgstr "" -#: src/xml/xmli18n-tmp.h:7013 +#: src/xml/xmli18n-tmp.h:7089 msgid "Epson Stylus Color 1500" msgstr "" -#: src/xml/xmli18n-tmp.h:7014 +#: src/xml/xmli18n-tmp.h:7090 msgid "Epson Stylus Color 1520" msgstr "" -#: src/xml/xmli18n-tmp.h:7015 +#: src/xml/xmli18n-tmp.h:7091 msgid "Epson Stylus Color 3000" msgstr "" -#: src/xml/xmli18n-tmp.h:7016 +#: src/xml/xmli18n-tmp.h:7092 msgid "Epson Stylus Office B30" msgstr "" -#: src/xml/xmli18n-tmp.h:7017 +#: src/xml/xmli18n-tmp.h:7093 msgid "Epson Stylus Office B33" msgstr "" -#: src/xml/xmli18n-tmp.h:7018 +#: src/xml/xmli18n-tmp.h:7094 msgid "Epson Stylus Office B40W" msgstr "" -#: src/xml/xmli18n-tmp.h:7019 +#: src/xml/xmli18n-tmp.h:7095 msgid "Epson Stylus Office B1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7020 +#: src/xml/xmli18n-tmp.h:7096 msgid "Epson Stylus Office T30" msgstr "" -#: src/xml/xmli18n-tmp.h:7021 +#: src/xml/xmli18n-tmp.h:7097 msgid "Epson Stylus Office T33" msgstr "" -#: src/xml/xmli18n-tmp.h:7022 +#: src/xml/xmli18n-tmp.h:7098 msgid "Epson Stylus Office T40W" msgstr "" -#: src/xml/xmli18n-tmp.h:7023 +#: src/xml/xmli18n-tmp.h:7099 msgid "Epson Stylus Office T1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7024 +#: src/xml/xmli18n-tmp.h:7100 msgid "Epson Stylus Office T1110" msgstr "" -#: src/xml/xmli18n-tmp.h:7025 +#: src/xml/xmli18n-tmp.h:7101 msgid "Epson Stylus Office BX300F" msgstr "" -#: src/xml/xmli18n-tmp.h:7026 +#: src/xml/xmli18n-tmp.h:7102 +msgid "Epson Stylus Office BX535WD" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7103 msgid "Epson Stylus Office BX600FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7027 +#: src/xml/xmli18n-tmp.h:7104 +msgid "Epson Stylus Office BX630FW" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7105 +msgid "Epson Stylus Office BX635FWD" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7106 msgid "Epson Stylus Office SX600FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7028 +#: src/xml/xmli18n-tmp.h:7107 msgid "Epson Stylus Office TX300F" msgstr "" -#: src/xml/xmli18n-tmp.h:7029 +#: src/xml/xmli18n-tmp.h:7108 msgid "Epson Stylus Office TX600FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7030 +#: src/xml/xmli18n-tmp.h:7109 +msgid "Epson Stylus Office TX620FWD" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7110 msgid "Epson Stylus Photo" msgstr "" -#: src/xml/xmli18n-tmp.h:7031 +#: src/xml/xmli18n-tmp.h:7111 msgid "Epson Stylus Photo 700" msgstr "" -#: src/xml/xmli18n-tmp.h:7032 +#: src/xml/xmli18n-tmp.h:7112 msgid "Epson Stylus Photo EX" msgstr "" -#: src/xml/xmli18n-tmp.h:7033 +#: src/xml/xmli18n-tmp.h:7113 msgid "Epson Stylus Photo EX3" msgstr "" -#: src/xml/xmli18n-tmp.h:7034 +#: src/xml/xmli18n-tmp.h:7114 msgid "Epson Stylus Photo 720" msgstr "" -#: src/xml/xmli18n-tmp.h:7035 +#: src/xml/xmli18n-tmp.h:7115 msgid "Epson Stylus Photo 750" msgstr "" -#: src/xml/xmli18n-tmp.h:7036 +#: src/xml/xmli18n-tmp.h:7116 msgid "Epson Stylus Photo 780" msgstr "" -#: src/xml/xmli18n-tmp.h:7037 +#: src/xml/xmli18n-tmp.h:7117 msgid "Epson Stylus Photo 785" msgstr "" -#: src/xml/xmli18n-tmp.h:7038 +#: src/xml/xmli18n-tmp.h:7118 msgid "Epson Stylus Photo 790" msgstr "" -#: src/xml/xmli18n-tmp.h:7039 +#: src/xml/xmli18n-tmp.h:7119 msgid "Epson Stylus Photo 810" msgstr "" -#: src/xml/xmli18n-tmp.h:7040 +#: src/xml/xmli18n-tmp.h:7120 msgid "Epson Stylus Photo 820" msgstr "" -#: src/xml/xmli18n-tmp.h:7041 +#: src/xml/xmli18n-tmp.h:7121 msgid "Epson Stylus Photo 825" msgstr "" -#: src/xml/xmli18n-tmp.h:7042 +#: src/xml/xmli18n-tmp.h:7122 msgid "Epson Stylus Photo 830" msgstr "" -#: src/xml/xmli18n-tmp.h:7043 +#: src/xml/xmli18n-tmp.h:7123 msgid "Epson Stylus Photo 830U" msgstr "" -#: src/xml/xmli18n-tmp.h:7044 +#: src/xml/xmli18n-tmp.h:7124 msgid "Epson Stylus Photo 870" msgstr "" -#: src/xml/xmli18n-tmp.h:7045 +#: src/xml/xmli18n-tmp.h:7125 msgid "Epson Stylus Photo 875" msgstr "" -#: src/xml/xmli18n-tmp.h:7046 +#: src/xml/xmli18n-tmp.h:7126 msgid "Epson Stylus Photo 890" msgstr "" -#: src/xml/xmli18n-tmp.h:7047 +#: src/xml/xmli18n-tmp.h:7127 msgid "Epson Stylus Photo 895" msgstr "" -#: src/xml/xmli18n-tmp.h:7048 +#: src/xml/xmli18n-tmp.h:7128 msgid "Epson Stylus Photo 900" msgstr "" -#: src/xml/xmli18n-tmp.h:7049 +#: src/xml/xmli18n-tmp.h:7129 msgid "Epson Stylus Photo 915" msgstr "" -#: src/xml/xmli18n-tmp.h:7050 +#: src/xml/xmli18n-tmp.h:7130 msgid "Epson Stylus Photo 925" msgstr "" -#: src/xml/xmli18n-tmp.h:7051 +#: src/xml/xmli18n-tmp.h:7131 msgid "Epson Stylus Photo 935" msgstr "" -#: src/xml/xmli18n-tmp.h:7052 +#: src/xml/xmli18n-tmp.h:7132 msgid "Epson Stylus Photo 950" msgstr "" -#: src/xml/xmli18n-tmp.h:7053 +#: src/xml/xmli18n-tmp.h:7133 msgid "Epson Stylus Photo 960" msgstr "" -#: src/xml/xmli18n-tmp.h:7054 +#: src/xml/xmli18n-tmp.h:7134 msgid "Epson Stylus Photo 1200" msgstr "" -#: src/xml/xmli18n-tmp.h:7055 +#: src/xml/xmli18n-tmp.h:7135 msgid "Epson Stylus Photo 1270" msgstr "" -#: src/xml/xmli18n-tmp.h:7056 +#: src/xml/xmli18n-tmp.h:7136 msgid "Epson Stylus Photo 1280" msgstr "" -#: src/xml/xmli18n-tmp.h:7057 +#: src/xml/xmli18n-tmp.h:7137 msgid "Epson Stylus Photo 1290" msgstr "" -#: src/xml/xmli18n-tmp.h:7058 +#: src/xml/xmli18n-tmp.h:7138 msgid "Epson Stylus Photo 1290s" msgstr "" -#: src/xml/xmli18n-tmp.h:7059 +#: src/xml/xmli18n-tmp.h:7139 msgid "Epson Stylus Photo 1400" msgstr "" -#: src/xml/xmli18n-tmp.h:7060 +#: src/xml/xmli18n-tmp.h:7140 msgid "Epson Stylus Photo 1410" msgstr "" -#: src/xml/xmli18n-tmp.h:7061 +#: src/xml/xmli18n-tmp.h:7141 msgid "Epson Stylus Photo 2000P" msgstr "" -#: src/xml/xmli18n-tmp.h:7062 +#: src/xml/xmli18n-tmp.h:7142 msgid "Epson Stylus Photo 2100" msgstr "" -#: src/xml/xmli18n-tmp.h:7063 +#: src/xml/xmli18n-tmp.h:7143 msgid "Epson Stylus Photo 2200" msgstr "" -#: src/xml/xmli18n-tmp.h:7064 +#: src/xml/xmli18n-tmp.h:7144 msgid "Epson Stylus Photo P50" msgstr "" -#: src/xml/xmli18n-tmp.h:7065 +#: src/xml/xmli18n-tmp.h:7145 msgid "Epson Stylus Photo R200" msgstr "" -#: src/xml/xmli18n-tmp.h:7066 +#: src/xml/xmli18n-tmp.h:7146 msgid "Epson Stylus Photo R210" msgstr "" -#: src/xml/xmli18n-tmp.h:7067 +#: src/xml/xmli18n-tmp.h:7147 msgid "Epson Stylus Photo R220" msgstr "" -#: src/xml/xmli18n-tmp.h:7068 +#: src/xml/xmli18n-tmp.h:7148 msgid "Epson Stylus Photo R230" msgstr "" -#: src/xml/xmli18n-tmp.h:7069 +#: src/xml/xmli18n-tmp.h:7149 msgid "Epson Stylus Photo R240" msgstr "" -#: src/xml/xmli18n-tmp.h:7070 +#: src/xml/xmli18n-tmp.h:7150 msgid "Epson Stylus Photo R245" msgstr "" -#: src/xml/xmli18n-tmp.h:7071 +#: src/xml/xmli18n-tmp.h:7151 msgid "Epson Stylus Photo R260" msgstr "" -#: src/xml/xmli18n-tmp.h:7072 +#: src/xml/xmli18n-tmp.h:7152 msgid "Epson Stylus Photo R265" msgstr "" -#: src/xml/xmli18n-tmp.h:7073 +#: src/xml/xmli18n-tmp.h:7153 msgid "Epson Stylus Photo R270" msgstr "" -#: src/xml/xmli18n-tmp.h:7074 +#: src/xml/xmli18n-tmp.h:7154 msgid "Epson Stylus Photo R280" msgstr "" -#: src/xml/xmli18n-tmp.h:7075 +#: src/xml/xmli18n-tmp.h:7155 msgid "Epson Stylus Photo R285" msgstr "" -#: src/xml/xmli18n-tmp.h:7076 +#: src/xml/xmli18n-tmp.h:7156 msgid "Epson Stylus Photo R290" msgstr "" -#: src/xml/xmli18n-tmp.h:7077 +#: src/xml/xmli18n-tmp.h:7157 msgid "Epson Stylus Photo R300" msgstr "" -#: src/xml/xmli18n-tmp.h:7078 +#: src/xml/xmli18n-tmp.h:7158 msgid "Epson Stylus Photo R310" msgstr "" -#: src/xml/xmli18n-tmp.h:7079 +#: src/xml/xmli18n-tmp.h:7159 msgid "Epson Stylus Photo R320" msgstr "" -#: src/xml/xmli18n-tmp.h:7080 +#: src/xml/xmli18n-tmp.h:7160 msgid "Epson Stylus Photo R340" msgstr "" -#: src/xml/xmli18n-tmp.h:7081 +#: src/xml/xmli18n-tmp.h:7161 msgid "Epson Stylus Photo R350" msgstr "" -#: src/xml/xmli18n-tmp.h:7082 +#: src/xml/xmli18n-tmp.h:7162 msgid "Epson Stylus Photo R360" msgstr "" -#: src/xml/xmli18n-tmp.h:7083 +#: src/xml/xmli18n-tmp.h:7163 msgid "Epson Stylus Photo R380" msgstr "" -#: src/xml/xmli18n-tmp.h:7084 +#: src/xml/xmli18n-tmp.h:7164 msgid "Epson Stylus Photo R390" msgstr "" -#: src/xml/xmli18n-tmp.h:7085 +#: src/xml/xmli18n-tmp.h:7165 msgid "Epson Stylus Photo R800" msgstr "" -#: src/xml/xmli18n-tmp.h:7086 +#: src/xml/xmli18n-tmp.h:7166 msgid "Epson Stylus Photo R1800" msgstr "" -#: src/xml/xmli18n-tmp.h:7087 +#: src/xml/xmli18n-tmp.h:7167 msgid "Epson Stylus Photo R1900" msgstr "" -#: src/xml/xmli18n-tmp.h:7088 +#: src/xml/xmli18n-tmp.h:7168 +msgid "Epson Stylus Photo R2000" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7169 msgid "Epson Stylus Photo R2400" msgstr "" -#: src/xml/xmli18n-tmp.h:7089 +#: src/xml/xmli18n-tmp.h:7170 msgid "Epson Stylus Photo R2880" msgstr "" -#: src/xml/xmli18n-tmp.h:7090 +#: src/xml/xmli18n-tmp.h:7171 msgid "Epson Stylus Photo R3000" msgstr "" -#: src/xml/xmli18n-tmp.h:7091 +#: src/xml/xmli18n-tmp.h:7172 msgid "Epson Stylus Photo RX400" msgstr "" -#: src/xml/xmli18n-tmp.h:7092 +#: src/xml/xmli18n-tmp.h:7173 msgid "Epson Stylus Photo RX420" msgstr "" -#: src/xml/xmli18n-tmp.h:7093 +#: src/xml/xmli18n-tmp.h:7174 msgid "Epson Stylus Photo RX425" msgstr "" -#: src/xml/xmli18n-tmp.h:7094 +#: src/xml/xmli18n-tmp.h:7175 msgid "Epson Stylus Photo RX430" msgstr "" -#: src/xml/xmli18n-tmp.h:7095 +#: src/xml/xmli18n-tmp.h:7176 msgid "Epson Stylus Photo RX500" msgstr "" -#: src/xml/xmli18n-tmp.h:7096 +#: src/xml/xmli18n-tmp.h:7177 msgid "Epson Stylus Photo RX510" msgstr "" -#: src/xml/xmli18n-tmp.h:7097 +#: src/xml/xmli18n-tmp.h:7178 msgid "Epson Stylus Photo RX560" msgstr "" -#: src/xml/xmli18n-tmp.h:7098 +#: src/xml/xmli18n-tmp.h:7179 msgid "Epson Stylus Photo RX580" msgstr "" -#: src/xml/xmli18n-tmp.h:7099 +#: src/xml/xmli18n-tmp.h:7180 msgid "Epson Stylus Photo RX585" msgstr "" -#: src/xml/xmli18n-tmp.h:7100 +#: src/xml/xmli18n-tmp.h:7181 msgid "Epson Stylus Photo RX590" msgstr "" -#: src/xml/xmli18n-tmp.h:7101 +#: src/xml/xmli18n-tmp.h:7182 msgid "Epson Stylus Photo RX595" msgstr "" -#: src/xml/xmli18n-tmp.h:7102 +#: src/xml/xmli18n-tmp.h:7183 msgid "Epson Stylus Photo RX600" msgstr "" -#: src/xml/xmli18n-tmp.h:7103 +#: src/xml/xmli18n-tmp.h:7184 msgid "Epson Stylus Photo RX610" msgstr "" -#: src/xml/xmli18n-tmp.h:7104 +#: src/xml/xmli18n-tmp.h:7185 msgid "Epson Stylus Photo RX620" msgstr "" -#: src/xml/xmli18n-tmp.h:7105 +#: src/xml/xmli18n-tmp.h:7186 msgid "Epson Stylus Photo RX630" msgstr "" -#: src/xml/xmli18n-tmp.h:7106 +#: src/xml/xmli18n-tmp.h:7187 msgid "Epson Stylus Photo RX640" msgstr "" -#: src/xml/xmli18n-tmp.h:7107 +#: src/xml/xmli18n-tmp.h:7188 +msgid "Epson Stylus Photo RX650" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7189 msgid "Epson Stylus Photo RX680" msgstr "" -#: src/xml/xmli18n-tmp.h:7108 +#: src/xml/xmli18n-tmp.h:7190 msgid "Epson Stylus Photo RX685" msgstr "" -#: src/xml/xmli18n-tmp.h:7109 +#: src/xml/xmli18n-tmp.h:7191 msgid "Epson Stylus Photo RX690" msgstr "" -#: src/xml/xmli18n-tmp.h:7110 +#: src/xml/xmli18n-tmp.h:7192 msgid "Epson Stylus Photo RX700" msgstr "" -#: src/xml/xmli18n-tmp.h:7111 +#: src/xml/xmli18n-tmp.h:7193 msgid "Epson Stylus Photo TX700W" msgstr "" -#: src/xml/xmli18n-tmp.h:7112 +#: src/xml/xmli18n-tmp.h:7194 msgid "Epson Stylus Photo TX710W" msgstr "" -#: src/xml/xmli18n-tmp.h:7113 +#: src/xml/xmli18n-tmp.h:7195 msgid "Epson Stylus Photo TX800FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7114 +#: src/xml/xmli18n-tmp.h:7196 msgid "Epson Stylus Photo TX810FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7115 +#: src/xml/xmli18n-tmp.h:7197 msgid "Epson Stylus Pro 3800" msgstr "" -#: src/xml/xmli18n-tmp.h:7116 +#: src/xml/xmli18n-tmp.h:7198 msgid "Epson Stylus Pro 3880" msgstr "" -#: src/xml/xmli18n-tmp.h:7117 +#: src/xml/xmli18n-tmp.h:7199 msgid "Epson Stylus Pro 3885" msgstr "" -#: src/xml/xmli18n-tmp.h:7118 +#: src/xml/xmli18n-tmp.h:7200 msgid "Epson Stylus Pro 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:7119 +#: src/xml/xmli18n-tmp.h:7201 msgid "Epson Stylus Pro 4800/4880 Back Compatible" msgstr "" -#: src/xml/xmli18n-tmp.h:7120 +#: src/xml/xmli18n-tmp.h:7202 msgid "Epson Stylus Pro 4800" msgstr "" -#: src/xml/xmli18n-tmp.h:7121 +#: src/xml/xmli18n-tmp.h:7203 msgid "Epson Stylus Pro 4880" msgstr "" -#: src/xml/xmli18n-tmp.h:7122 +#: src/xml/xmli18n-tmp.h:7204 msgid "Epson Stylus Pro 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7123 +#: src/xml/xmli18n-tmp.h:7205 msgid "Epson Stylus Pro 5500" msgstr "" -#: src/xml/xmli18n-tmp.h:7124 +#: src/xml/xmli18n-tmp.h:7206 msgid "Epson Stylus Pro 7000" msgstr "" -#: src/xml/xmli18n-tmp.h:7125 +#: src/xml/xmli18n-tmp.h:7207 msgid "Epson Stylus Pro 7500" msgstr "" -#: src/xml/xmli18n-tmp.h:7126 +#: src/xml/xmli18n-tmp.h:7208 msgid "Epson Stylus Pro 7600" msgstr "" -#: src/xml/xmli18n-tmp.h:7127 +#: src/xml/xmli18n-tmp.h:7209 msgid "Epson Stylus Pro 7700" msgstr "" -#: src/xml/xmli18n-tmp.h:7128 +#: src/xml/xmli18n-tmp.h:7210 msgid "Epson Stylus Pro 7800" msgstr "" -#: src/xml/xmli18n-tmp.h:7129 +#: src/xml/xmli18n-tmp.h:7211 msgid "Epson Stylus Pro 7880" msgstr "" -#: src/xml/xmli18n-tmp.h:7130 +#: src/xml/xmli18n-tmp.h:7212 msgid "Epson Stylus Pro 7890" msgstr "" -#: src/xml/xmli18n-tmp.h:7131 +#: src/xml/xmli18n-tmp.h:7213 +msgid "Epson Stylus Pro 7900" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7214 msgid "Epson Stylus Pro 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:7132 +#: src/xml/xmli18n-tmp.h:7215 msgid "Epson Stylus Pro 9500" msgstr "" -#: src/xml/xmli18n-tmp.h:7133 +#: src/xml/xmli18n-tmp.h:7216 msgid "Epson Stylus Pro 9600" msgstr "" -#: src/xml/xmli18n-tmp.h:7134 +#: src/xml/xmli18n-tmp.h:7217 msgid "Epson Stylus Pro 9700" msgstr "" -#: src/xml/xmli18n-tmp.h:7135 +#: src/xml/xmli18n-tmp.h:7218 msgid "Epson Stylus Pro 9800" msgstr "" -#: src/xml/xmli18n-tmp.h:7136 +#: src/xml/xmli18n-tmp.h:7219 msgid "Epson Stylus Pro 9880" msgstr "" -#: src/xml/xmli18n-tmp.h:7137 +#: src/xml/xmli18n-tmp.h:7220 msgid "Epson Stylus Pro 9890" msgstr "" -#: src/xml/xmli18n-tmp.h:7138 +#: src/xml/xmli18n-tmp.h:7221 +msgid "Epson Stylus Pro 9900" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7222 msgid "Epson Stylus Pro 10000" msgstr "" -#: src/xml/xmli18n-tmp.h:7139 +#: src/xml/xmli18n-tmp.h:7223 msgid "Epson Stylus Pro 11800/11880 Back Compatible" msgstr "" -#: src/xml/xmli18n-tmp.h:7140 +#: src/xml/xmli18n-tmp.h:7224 msgid "Epson Stylus Pro 11800" msgstr "" -#: src/xml/xmli18n-tmp.h:7141 +#: src/xml/xmli18n-tmp.h:7225 msgid "Epson Stylus Pro 11880" msgstr "" -#: src/xml/xmli18n-tmp.h:7142 +#: src/xml/xmli18n-tmp.h:7226 msgid "Epson Stylus Scan 2000" msgstr "" -#: src/xml/xmli18n-tmp.h:7143 +#: src/xml/xmli18n-tmp.h:7227 msgid "Epson Stylus Scan 2500" msgstr "" -#: src/xml/xmli18n-tmp.h:7144 +#: src/xml/xmli18n-tmp.h:7228 msgid "Epson Stylus CX1500" msgstr "" -#: src/xml/xmli18n-tmp.h:7145 +#: src/xml/xmli18n-tmp.h:7229 msgid "Epson Stylus CX3100" msgstr "" -#: src/xml/xmli18n-tmp.h:7146 +#: src/xml/xmli18n-tmp.h:7230 msgid "Epson Stylus CX3200" msgstr "" -#: src/xml/xmli18n-tmp.h:7147 +#: src/xml/xmli18n-tmp.h:7231 msgid "Epson Stylus CX3500" msgstr "" -#: src/xml/xmli18n-tmp.h:7148 +#: src/xml/xmli18n-tmp.h:7232 msgid "Epson Stylus CX3600" msgstr "" -#: src/xml/xmli18n-tmp.h:7149 +#: src/xml/xmli18n-tmp.h:7233 msgid "Epson Stylus CX3650" msgstr "" -#: src/xml/xmli18n-tmp.h:7150 +#: src/xml/xmli18n-tmp.h:7234 msgid "Epson Stylus CX3700" msgstr "" -#: src/xml/xmli18n-tmp.h:7151 +#: src/xml/xmli18n-tmp.h:7235 msgid "Epson Stylus CX3800" msgstr "" -#: src/xml/xmli18n-tmp.h:7152 +#: src/xml/xmli18n-tmp.h:7236 msgid "Epson Stylus CX3805" msgstr "" -#: src/xml/xmli18n-tmp.h:7153 +#: src/xml/xmli18n-tmp.h:7237 msgid "Epson Stylus CX3810" msgstr "" -#: src/xml/xmli18n-tmp.h:7154 +#: src/xml/xmli18n-tmp.h:7238 +msgid "Epson Stylus CX3900" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7239 msgid "Epson Stylus CX4100" msgstr "" -#: src/xml/xmli18n-tmp.h:7155 +#: src/xml/xmli18n-tmp.h:7240 msgid "Epson Stylus CX4200" msgstr "" -#: src/xml/xmli18n-tmp.h:7156 +#: src/xml/xmli18n-tmp.h:7241 msgid "Epson Stylus CX4400" msgstr "" -#: src/xml/xmli18n-tmp.h:7157 +#: src/xml/xmli18n-tmp.h:7242 msgid "Epson Stylus CX4500" msgstr "" -#: src/xml/xmli18n-tmp.h:7158 +#: src/xml/xmli18n-tmp.h:7243 msgid "Epson Stylus CX4600" msgstr "" -#: src/xml/xmli18n-tmp.h:7159 +#: src/xml/xmli18n-tmp.h:7244 msgid "Epson Stylus CX4700" msgstr "" -#: src/xml/xmli18n-tmp.h:7160 +#: src/xml/xmli18n-tmp.h:7245 msgid "Epson Stylus CX4800" msgstr "" -#: src/xml/xmli18n-tmp.h:7161 +#: src/xml/xmli18n-tmp.h:7246 msgid "Epson Stylus CX4900" msgstr "" -#: src/xml/xmli18n-tmp.h:7162 +#: src/xml/xmli18n-tmp.h:7247 msgid "Epson Stylus CX5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7163 +#: src/xml/xmli18n-tmp.h:7248 msgid "Epson Stylus CX5000F" msgstr "" -#: src/xml/xmli18n-tmp.h:7164 +#: src/xml/xmli18n-tmp.h:7249 msgid "Epson Stylus CX5100" msgstr "" -#: src/xml/xmli18n-tmp.h:7165 +#: src/xml/xmli18n-tmp.h:7250 msgid "Epson Stylus CX5200" msgstr "" -#: src/xml/xmli18n-tmp.h:7166 +#: src/xml/xmli18n-tmp.h:7251 msgid "Epson Stylus CX5300" msgstr "" -#: src/xml/xmli18n-tmp.h:7167 +#: src/xml/xmli18n-tmp.h:7252 msgid "Epson Stylus CX5400" msgstr "" -#: src/xml/xmli18n-tmp.h:7168 +#: src/xml/xmli18n-tmp.h:7253 msgid "Epson Stylus CX5500" msgstr "" -#: src/xml/xmli18n-tmp.h:7169 +#: src/xml/xmli18n-tmp.h:7254 msgid "Epson Stylus CX5600" msgstr "" -#: src/xml/xmli18n-tmp.h:7170 +#: src/xml/xmli18n-tmp.h:7255 msgid "Epson Stylus CX5700" msgstr "" -#: src/xml/xmli18n-tmp.h:7171 +#: src/xml/xmli18n-tmp.h:7256 msgid "Epson Stylus CX5800" msgstr "" -#: src/xml/xmli18n-tmp.h:7172 +#: src/xml/xmli18n-tmp.h:7257 msgid "Epson Stylus CX6000" msgstr "" -#: src/xml/xmli18n-tmp.h:7173 +#: src/xml/xmli18n-tmp.h:7258 msgid "Epson Stylus CX6300" msgstr "" -#: src/xml/xmli18n-tmp.h:7174 +#: src/xml/xmli18n-tmp.h:7259 msgid "Epson Stylus CX6400" msgstr "" -#: src/xml/xmli18n-tmp.h:7175 +#: src/xml/xmli18n-tmp.h:7260 msgid "Epson Stylus CX6500" msgstr "" -#: src/xml/xmli18n-tmp.h:7176 +#: src/xml/xmli18n-tmp.h:7261 msgid "Epson Stylus CX6600" msgstr "" -#: src/xml/xmli18n-tmp.h:7177 +#: src/xml/xmli18n-tmp.h:7262 msgid "Epson Stylus CX7000F" msgstr "" -#: src/xml/xmli18n-tmp.h:7178 +#: src/xml/xmli18n-tmp.h:7263 msgid "Epson Stylus CX7400" msgstr "" -#: src/xml/xmli18n-tmp.h:7179 +#: src/xml/xmli18n-tmp.h:7264 msgid "Epson Stylus CX7700" msgstr "" -#: src/xml/xmli18n-tmp.h:7180 +#: src/xml/xmli18n-tmp.h:7265 msgid "Epson Stylus CX7800" msgstr "" -#: src/xml/xmli18n-tmp.h:7181 +#: src/xml/xmli18n-tmp.h:7266 msgid "Epson Stylus CX8300" msgstr "" -#: src/xml/xmli18n-tmp.h:7182 +#: src/xml/xmli18n-tmp.h:7267 msgid "Epson Stylus CX8400" msgstr "" -#: src/xml/xmli18n-tmp.h:7183 +#: src/xml/xmli18n-tmp.h:7268 msgid "Epson Stylus CX9300F" msgstr "" -#: src/xml/xmli18n-tmp.h:7184 +#: src/xml/xmli18n-tmp.h:7269 msgid "Epson Stylus CX9400" msgstr "" -#: src/xml/xmli18n-tmp.h:7185 +#: src/xml/xmli18n-tmp.h:7270 msgid "Epson Stylus CX9400F" msgstr "" -#: src/xml/xmli18n-tmp.h:7186 +#: src/xml/xmli18n-tmp.h:7271 msgid "Epson Stylus CX9475F" msgstr "" -#: src/xml/xmli18n-tmp.h:7187 +#: src/xml/xmli18n-tmp.h:7272 msgid "Epson Stylus D68" msgstr "" -#: src/xml/xmli18n-tmp.h:7188 +#: src/xml/xmli18n-tmp.h:7273 msgid "Epson Stylus D88" msgstr "" -#: src/xml/xmli18n-tmp.h:7189 +#: src/xml/xmli18n-tmp.h:7274 msgid "Epson Stylus D92" msgstr "" -#: src/xml/xmli18n-tmp.h:7190 +#: src/xml/xmli18n-tmp.h:7275 msgid "Epson Stylus D120" msgstr "" -#: src/xml/xmli18n-tmp.h:7191 +#: src/xml/xmli18n-tmp.h:7276 msgid "Epson Stylus DX3800" msgstr "" -#: src/xml/xmli18n-tmp.h:7192 +#: src/xml/xmli18n-tmp.h:7277 msgid "Epson Stylus DX3850" msgstr "" -#: src/xml/xmli18n-tmp.h:7193 +#: src/xml/xmli18n-tmp.h:7278 msgid "Epson Stylus DX4000" msgstr "" -#: src/xml/xmli18n-tmp.h:7194 +#: src/xml/xmli18n-tmp.h:7279 msgid "Epson Stylus DX4050" msgstr "" -#: src/xml/xmli18n-tmp.h:7195 +#: src/xml/xmli18n-tmp.h:7280 msgid "Epson Stylus DX4200" msgstr "" -#: src/xml/xmli18n-tmp.h:7196 +#: src/xml/xmli18n-tmp.h:7281 msgid "Epson Stylus DX4250" msgstr "" -#: src/xml/xmli18n-tmp.h:7197 +#: src/xml/xmli18n-tmp.h:7282 msgid "Epson Stylus DX4400" msgstr "" -#: src/xml/xmli18n-tmp.h:7198 +#: src/xml/xmli18n-tmp.h:7283 msgid "Epson Stylus DX4450" msgstr "" -#: src/xml/xmli18n-tmp.h:7199 +#: src/xml/xmli18n-tmp.h:7284 msgid "Epson Stylus DX4800" msgstr "" -#: src/xml/xmli18n-tmp.h:7200 +#: src/xml/xmli18n-tmp.h:7285 msgid "Epson Stylus DX4850" msgstr "" -#: src/xml/xmli18n-tmp.h:7201 +#: src/xml/xmli18n-tmp.h:7286 msgid "Epson Stylus DX7000F" msgstr "" -#: src/xml/xmli18n-tmp.h:7202 +#: src/xml/xmli18n-tmp.h:7287 msgid "Epson Stylus DX7400" msgstr "" -#: src/xml/xmli18n-tmp.h:7203 +#: src/xml/xmli18n-tmp.h:7288 msgid "Epson Stylus DX7450" msgstr "" -#: src/xml/xmli18n-tmp.h:7204 +#: src/xml/xmli18n-tmp.h:7289 msgid "Epson Stylus DX8400" msgstr "" -#: src/xml/xmli18n-tmp.h:7205 +#: src/xml/xmli18n-tmp.h:7290 msgid "Epson Stylus DX8450" msgstr "" -#: src/xml/xmli18n-tmp.h:7206 +#: src/xml/xmli18n-tmp.h:7291 msgid "Epson Stylus DX9400F" msgstr "" -#: src/xml/xmli18n-tmp.h:7207 +#: src/xml/xmli18n-tmp.h:7292 msgid "Epson Stylus NX100" msgstr "" -#: src/xml/xmli18n-tmp.h:7208 +#: src/xml/xmli18n-tmp.h:7293 msgid "Epson Stylus NX105" msgstr "" -#: src/xml/xmli18n-tmp.h:7209 +#: src/xml/xmli18n-tmp.h:7294 msgid "Epson Stylus NX115" msgstr "" -#: src/xml/xmli18n-tmp.h:7210 +#: src/xml/xmli18n-tmp.h:7295 msgid "Epson Stylus NX200" msgstr "" -#: src/xml/xmli18n-tmp.h:7211 +#: src/xml/xmli18n-tmp.h:7296 msgid "Epson Stylus NX215" msgstr "" -#: src/xml/xmli18n-tmp.h:7212 +#: src/xml/xmli18n-tmp.h:7297 msgid "Epson Stylus NX300" msgstr "" -#: src/xml/xmli18n-tmp.h:7213 +#: src/xml/xmli18n-tmp.h:7298 msgid "Epson Stylus NX400" msgstr "" -#: src/xml/xmli18n-tmp.h:7214 +#: src/xml/xmli18n-tmp.h:7299 msgid "Epson Stylus NX415" msgstr "" -#: src/xml/xmli18n-tmp.h:7215 +#: src/xml/xmli18n-tmp.h:7300 msgid "Epson Stylus NX515" msgstr "" -#: src/xml/xmli18n-tmp.h:7216 +#: src/xml/xmli18n-tmp.h:7301 +msgid "Epson Stylus NX530" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7302 +msgid "Epson Stylus NX635" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7303 msgid "Epson Stylus Photo PX650" msgstr "" -#: src/xml/xmli18n-tmp.h:7217 +#: src/xml/xmli18n-tmp.h:7304 msgid "Epson Stylus Photo PX700W" msgstr "" -#: src/xml/xmli18n-tmp.h:7218 +#: src/xml/xmli18n-tmp.h:7305 msgid "Epson Stylus Photo PX710W" msgstr "" -#: src/xml/xmli18n-tmp.h:7219 +#: src/xml/xmli18n-tmp.h:7306 msgid "Epson Stylus Photo PX800FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7220 +#: src/xml/xmli18n-tmp.h:7307 msgid "Epson Stylus Photo PX810FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7221 +#: src/xml/xmli18n-tmp.h:7308 msgid "Epson Stylus S20" msgstr "" -#: src/xml/xmli18n-tmp.h:7222 +#: src/xml/xmli18n-tmp.h:7309 msgid "Epson Stylus S21" msgstr "" -#: src/xml/xmli18n-tmp.h:7223 +#: src/xml/xmli18n-tmp.h:7310 msgid "Epson Stylus S50" msgstr "" -#: src/xml/xmli18n-tmp.h:7224 +#: src/xml/xmli18n-tmp.h:7311 msgid "Epson Stylus SX100" msgstr "" -#: src/xml/xmli18n-tmp.h:7225 +#: src/xml/xmli18n-tmp.h:7312 msgid "Epson Stylus SX105" msgstr "" -#: src/xml/xmli18n-tmp.h:7226 +#: src/xml/xmli18n-tmp.h:7313 msgid "Epson Stylus SX110" msgstr "" -#: src/xml/xmli18n-tmp.h:7227 +#: src/xml/xmli18n-tmp.h:7314 msgid "Epson Stylus SX115" msgstr "" -#: src/xml/xmli18n-tmp.h:7228 +#: src/xml/xmli18n-tmp.h:7315 msgid "Epson Stylus SX200" msgstr "" -#: src/xml/xmli18n-tmp.h:7229 +#: src/xml/xmli18n-tmp.h:7316 msgid "Epson Stylus SX205" msgstr "" -#: src/xml/xmli18n-tmp.h:7230 +#: src/xml/xmli18n-tmp.h:7317 msgid "Epson Stylus SX210" msgstr "" -#: src/xml/xmli18n-tmp.h:7231 +#: src/xml/xmli18n-tmp.h:7318 msgid "Epson Stylus SX215" msgstr "" -#: src/xml/xmli18n-tmp.h:7232 +#: src/xml/xmli18n-tmp.h:7319 msgid "Epson Stylus SX400" msgstr "" -#: src/xml/xmli18n-tmp.h:7233 +#: src/xml/xmli18n-tmp.h:7320 msgid "Epson Stylus SX405" msgstr "" -#: src/xml/xmli18n-tmp.h:7234 +#: src/xml/xmli18n-tmp.h:7321 msgid "Epson Stylus SX410" msgstr "" -#: src/xml/xmli18n-tmp.h:7235 +#: src/xml/xmli18n-tmp.h:7322 msgid "Epson Stylus SX415" msgstr "" -#: src/xml/xmli18n-tmp.h:7236 +#: src/xml/xmli18n-tmp.h:7323 msgid "Epson Stylus SX510W" msgstr "" -#: src/xml/xmli18n-tmp.h:7237 +#: src/xml/xmli18n-tmp.h:7324 msgid "Epson Stylus SX515" msgstr "" -#: src/xml/xmli18n-tmp.h:7238 +#: src/xml/xmli18n-tmp.h:7325 +msgid "Epson Stylus SX525" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7326 +msgid "Epson Stylus SX535FW" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7327 msgid "Epson Stylus SX600FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7239 +#: src/xml/xmli18n-tmp.h:7328 msgid "Epson Stylus SX610FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7240 +#: src/xml/xmli18n-tmp.h:7329 msgid "Epson Stylus SX615" msgstr "" -#: src/xml/xmli18n-tmp.h:7241 +#: src/xml/xmli18n-tmp.h:7330 msgid "Epson Stylus SX650" msgstr "" -#: src/xml/xmli18n-tmp.h:7242 +#: src/xml/xmli18n-tmp.h:7331 msgid "Epson Stylus T13" msgstr "" -#: src/xml/xmli18n-tmp.h:7243 +#: src/xml/xmli18n-tmp.h:7332 msgid "Epson Stylus T20" msgstr "" -#: src/xml/xmli18n-tmp.h:7244 +#: src/xml/xmli18n-tmp.h:7333 msgid "Epson Stylus T21" msgstr "" -#: src/xml/xmli18n-tmp.h:7245 +#: src/xml/xmli18n-tmp.h:7334 msgid "Epson Stylus T22" msgstr "" -#: src/xml/xmli18n-tmp.h:7246 +#: src/xml/xmli18n-tmp.h:7335 msgid "Epson Stylus T22E" msgstr "" -#: src/xml/xmli18n-tmp.h:7247 +#: src/xml/xmli18n-tmp.h:7336 msgid "Epson Stylus T26" msgstr "" -#: src/xml/xmli18n-tmp.h:7248 +#: src/xml/xmli18n-tmp.h:7337 msgid "Epson Stylus T30" msgstr "" -#: src/xml/xmli18n-tmp.h:7249 +#: src/xml/xmli18n-tmp.h:7338 msgid "Epson Stylus T40W" msgstr "" -#: src/xml/xmli18n-tmp.h:7250 +#: src/xml/xmli18n-tmp.h:7339 msgid "Epson Stylus T50" msgstr "" -#: src/xml/xmli18n-tmp.h:7251 +#: src/xml/xmli18n-tmp.h:7340 msgid "Epson Stylus T59" msgstr "" -#: src/xml/xmli18n-tmp.h:7252 +#: src/xml/xmli18n-tmp.h:7341 msgid "Epson Stylus T60" msgstr "" -#: src/xml/xmli18n-tmp.h:7253 +#: src/xml/xmli18n-tmp.h:7342 msgid "Epson Stylus TX100" msgstr "" -#: src/xml/xmli18n-tmp.h:7254 +#: src/xml/xmli18n-tmp.h:7343 msgid "Epson Stylus TX101" msgstr "" -#: src/xml/xmli18n-tmp.h:7255 +#: src/xml/xmli18n-tmp.h:7344 msgid "Epson Stylus TX102" msgstr "" -#: src/xml/xmli18n-tmp.h:7256 +#: src/xml/xmli18n-tmp.h:7345 msgid "Epson Stylus TX103" msgstr "" -#: src/xml/xmli18n-tmp.h:7257 +#: src/xml/xmli18n-tmp.h:7346 msgid "Epson Stylus TX104" msgstr "" -#: src/xml/xmli18n-tmp.h:7258 +#: src/xml/xmli18n-tmp.h:7347 msgid "Epson Stylus TX105" msgstr "" -#: src/xml/xmli18n-tmp.h:7259 +#: src/xml/xmli18n-tmp.h:7348 msgid "Epson Stylus TX106" msgstr "" -#: src/xml/xmli18n-tmp.h:7260 +#: src/xml/xmli18n-tmp.h:7349 msgid "Epson Stylus TX109" msgstr "" -#: src/xml/xmli18n-tmp.h:7261 +#: src/xml/xmli18n-tmp.h:7350 msgid "Epson Stylus TX110" msgstr "" -#: src/xml/xmli18n-tmp.h:7262 +#: src/xml/xmli18n-tmp.h:7351 msgid "Epson Stylus TX200" msgstr "" -#: src/xml/xmli18n-tmp.h:7263 +#: src/xml/xmli18n-tmp.h:7352 msgid "Epson Stylus TX210" msgstr "" -#: src/xml/xmli18n-tmp.h:7264 +#: src/xml/xmli18n-tmp.h:7353 msgid "Epson Stylus TX300F" msgstr "" -#: src/xml/xmli18n-tmp.h:7265 +#: src/xml/xmli18n-tmp.h:7354 msgid "Epson Stylus TX400" msgstr "" -#: src/xml/xmli18n-tmp.h:7266 +#: src/xml/xmli18n-tmp.h:7355 msgid "Epson Stylus TX410" msgstr "" -#: src/xml/xmli18n-tmp.h:7267 +#: src/xml/xmli18n-tmp.h:7356 msgid "Epson Stylus TX510FN" msgstr "" -#: src/xml/xmli18n-tmp.h:7268 +#: src/xml/xmli18n-tmp.h:7357 msgid "Epson Stylus TX550W" msgstr "" -#: src/xml/xmli18n-tmp.h:7269 +#: src/xml/xmli18n-tmp.h:7358 msgid "Epson Stylus TX610FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7270 +#: src/xml/xmli18n-tmp.h:7359 msgid "Epson Stylus TX615" msgstr "" -#: src/xml/xmli18n-tmp.h:7271 +#: src/xml/xmli18n-tmp.h:7360 msgid "Epson Stylus TX650" msgstr "" -#: src/xml/xmli18n-tmp.h:7272 +#: src/xml/xmli18n-tmp.h:7361 msgid "Epson Stylus TX659" msgstr "" -#: src/xml/xmli18n-tmp.h:7273 +#: src/xml/xmli18n-tmp.h:7362 msgid "Epson PictureMate" msgstr "" -#: src/xml/xmli18n-tmp.h:7274 +#: src/xml/xmli18n-tmp.h:7363 msgid "Epson PictureMate Dash" msgstr "" -#: src/xml/xmli18n-tmp.h:7275 +#: src/xml/xmli18n-tmp.h:7364 msgid "Epson PictureMate Deluxe" msgstr "" -#: src/xml/xmli18n-tmp.h:7276 +#: src/xml/xmli18n-tmp.h:7365 msgid "Epson PictureMate Flash" msgstr "" -#: src/xml/xmli18n-tmp.h:7277 +#: src/xml/xmli18n-tmp.h:7366 msgid "Epson PictureMate Pal" msgstr "" -#: src/xml/xmli18n-tmp.h:7278 +#: src/xml/xmli18n-tmp.h:7367 msgid "Epson PictureMate Snap" msgstr "" -#: src/xml/xmli18n-tmp.h:7279 +#: src/xml/xmli18n-tmp.h:7368 msgid "Epson PictureMate 100" msgstr "" -#: src/xml/xmli18n-tmp.h:7280 +#: src/xml/xmli18n-tmp.h:7369 msgid "Epson PictureMate 200" msgstr "" -#: src/xml/xmli18n-tmp.h:7281 +#: src/xml/xmli18n-tmp.h:7370 msgid "Epson PictureMate 210" msgstr "" -#: src/xml/xmli18n-tmp.h:7282 +#: src/xml/xmli18n-tmp.h:7371 msgid "Epson PictureMate 215" msgstr "" -#: src/xml/xmli18n-tmp.h:7283 +#: src/xml/xmli18n-tmp.h:7372 msgid "Epson PictureMate 240" msgstr "" -#: src/xml/xmli18n-tmp.h:7284 +#: src/xml/xmli18n-tmp.h:7373 msgid "Epson PictureMate 250" msgstr "" -#: src/xml/xmli18n-tmp.h:7285 +#: src/xml/xmli18n-tmp.h:7374 msgid "Epson PictureMate 260" msgstr "" -#: src/xml/xmli18n-tmp.h:7286 +#: src/xml/xmli18n-tmp.h:7375 msgid "Epson PictureMate 270" msgstr "" -#: src/xml/xmli18n-tmp.h:7287 +#: src/xml/xmli18n-tmp.h:7376 msgid "Epson PictureMate 280" msgstr "" -#: src/xml/xmli18n-tmp.h:7288 +#: src/xml/xmli18n-tmp.h:7377 msgid "Epson PictureMate 290" msgstr "" -#: src/xml/xmli18n-tmp.h:7289 +#: src/xml/xmli18n-tmp.h:7378 msgid "Epson PictureMate 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7290 +#: src/xml/xmli18n-tmp.h:7379 msgid "Epson PictureMate 2005" msgstr "" -#: src/xml/xmli18n-tmp.h:7291 +#: src/xml/xmli18n-tmp.h:7380 msgid "Epson WorkForce 30" msgstr "" -#: src/xml/xmli18n-tmp.h:7292 +#: src/xml/xmli18n-tmp.h:7381 msgid "Epson WorkForce 40" msgstr "" -#: src/xml/xmli18n-tmp.h:7293 +#: src/xml/xmli18n-tmp.h:7382 msgid "Epson WorkForce 310" msgstr "" -#: src/xml/xmli18n-tmp.h:7294 +#: src/xml/xmli18n-tmp.h:7383 msgid "Epson WorkForce 315" msgstr "" -#: src/xml/xmli18n-tmp.h:7295 +#: src/xml/xmli18n-tmp.h:7384 msgid "Epson WorkForce 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7296 +#: src/xml/xmli18n-tmp.h:7385 +msgid "Epson WorkForce 545" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7386 msgid "Epson WorkForce 600" msgstr "" -#: src/xml/xmli18n-tmp.h:7297 +#: src/xml/xmli18n-tmp.h:7387 msgid "Epson WorkForce 610" msgstr "" -#: src/xml/xmli18n-tmp.h:7298 +#: src/xml/xmli18n-tmp.h:7388 msgid "Epson WorkForce 615" msgstr "" -#: src/xml/xmli18n-tmp.h:7299 +#: src/xml/xmli18n-tmp.h:7389 +msgid "Epson WorkForce 630" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7390 +msgid "Epson WorkForce 635" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7391 +msgid "Epson WorkForce 645" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7392 msgid "Epson WorkForce 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7300 +#: src/xml/xmli18n-tmp.h:7393 msgid "Epson CL 700" msgstr "" -#: src/xml/xmli18n-tmp.h:7301 +#: src/xml/xmli18n-tmp.h:7394 msgid "Epson CL 750" msgstr "" -#: src/xml/xmli18n-tmp.h:7302 +#: src/xml/xmli18n-tmp.h:7395 msgid "Epson CL 760" msgstr "" -#: src/xml/xmli18n-tmp.h:7303 +#: src/xml/xmli18n-tmp.h:7396 msgid "Epson E 100" msgstr "" -#: src/xml/xmli18n-tmp.h:7304 +#: src/xml/xmli18n-tmp.h:7397 msgid "Epson E 150" msgstr "" -#: src/xml/xmli18n-tmp.h:7305 +#: src/xml/xmli18n-tmp.h:7398 msgid "Epson E 200" msgstr "" -#: src/xml/xmli18n-tmp.h:7306 +#: src/xml/xmli18n-tmp.h:7399 msgid "Epson E 300" msgstr "" -#: src/xml/xmli18n-tmp.h:7307 +#: src/xml/xmli18n-tmp.h:7400 msgid "Epson E 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7308 +#: src/xml/xmli18n-tmp.h:7401 msgid "Epson E 520" msgstr "" -#: src/xml/xmli18n-tmp.h:7309 +#: src/xml/xmli18n-tmp.h:7402 msgid "Epson E 700" msgstr "" -#: src/xml/xmli18n-tmp.h:7310 +#: src/xml/xmli18n-tmp.h:7403 msgid "Epson E 720" msgstr "" -#: src/xml/xmli18n-tmp.h:7311 +#: src/xml/xmli18n-tmp.h:7404 msgid "Epson EM 900C" msgstr "" -#: src/xml/xmli18n-tmp.h:7312 +#: src/xml/xmli18n-tmp.h:7405 msgid "Epson EM 930C" msgstr "" -#: src/xml/xmli18n-tmp.h:7313 +#: src/xml/xmli18n-tmp.h:7406 msgid "Epson EP 302" msgstr "" -#: src/xml/xmli18n-tmp.h:7314 +#: src/xml/xmli18n-tmp.h:7407 msgid "Epson EP 702A" msgstr "" -#: src/xml/xmli18n-tmp.h:7315 +#: src/xml/xmli18n-tmp.h:7408 msgid "Epson EP 801A" msgstr "" -#: src/xml/xmli18n-tmp.h:7316 +#: src/xml/xmli18n-tmp.h:7409 msgid "Epson EP 901A" msgstr "" -#: src/xml/xmli18n-tmp.h:7317 +#: src/xml/xmli18n-tmp.h:7410 msgid "Epson EP 901F" msgstr "" -#: src/xml/xmli18n-tmp.h:7318 +#: src/xml/xmli18n-tmp.h:7411 msgid "Epson MC 2000" msgstr "" -#: src/xml/xmli18n-tmp.h:7319 +#: src/xml/xmli18n-tmp.h:7412 msgid "Epson MC 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7320 +#: src/xml/xmli18n-tmp.h:7413 msgid "Epson MC 7000" msgstr "" -#: src/xml/xmli18n-tmp.h:7321 +#: src/xml/xmli18n-tmp.h:7414 msgid "Epson MC 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:7322 +#: src/xml/xmli18n-tmp.h:7415 msgid "Epson MC 10000" msgstr "" -#: src/xml/xmli18n-tmp.h:7323 +#: src/xml/xmli18n-tmp.h:7416 msgid "Epson ME 300" msgstr "" -#: src/xml/xmli18n-tmp.h:7324 +#: src/xml/xmli18n-tmp.h:7417 msgid "Epson ME 320" msgstr "" -#: src/xml/xmli18n-tmp.h:7325 +#: src/xml/xmli18n-tmp.h:7418 msgid "Epson ME Office 70" msgstr "" -#: src/xml/xmli18n-tmp.h:7326 +#: src/xml/xmli18n-tmp.h:7419 msgid "Epson ME Office 80W" msgstr "" -#: src/xml/xmli18n-tmp.h:7327 +#: src/xml/xmli18n-tmp.h:7420 msgid "Epson ME Office 360" msgstr "" -#: src/xml/xmli18n-tmp.h:7328 +#: src/xml/xmli18n-tmp.h:7421 msgid "Epson ME Office 600F" msgstr "" -#: src/xml/xmli18n-tmp.h:7329 +#: src/xml/xmli18n-tmp.h:7422 msgid "Epson ME Office 620F" msgstr "" -#: src/xml/xmli18n-tmp.h:7330 +#: src/xml/xmli18n-tmp.h:7423 msgid "Epson ME Office 700FW" msgstr "" -#: src/xml/xmli18n-tmp.h:7331 +#: src/xml/xmli18n-tmp.h:7424 +msgid "Epson ME Office 940FW" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7425 msgid "Epson ME Office 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7332 +#: src/xml/xmli18n-tmp.h:7426 msgid "Epson MJ 930C" msgstr "" -#: src/xml/xmli18n-tmp.h:7333 +#: src/xml/xmli18n-tmp.h:7427 msgid "Epson MJ 5100C" msgstr "" -#: src/xml/xmli18n-tmp.h:7334 +#: src/xml/xmli18n-tmp.h:7428 msgid "Epson MJ 6000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7335 +#: src/xml/xmli18n-tmp.h:7429 msgid "Epson MJ 8000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7336 +#: src/xml/xmli18n-tmp.h:7430 msgid "Epson PM 670C" msgstr "" -#: src/xml/xmli18n-tmp.h:7337 +#: src/xml/xmli18n-tmp.h:7431 msgid "Epson PM 700C" msgstr "" -#: src/xml/xmli18n-tmp.h:7338 +#: src/xml/xmli18n-tmp.h:7432 msgid "Epson PM 730C" msgstr "" -#: src/xml/xmli18n-tmp.h:7339 +#: src/xml/xmli18n-tmp.h:7433 msgid "Epson PM 740C" msgstr "" -#: src/xml/xmli18n-tmp.h:7340 +#: src/xml/xmli18n-tmp.h:7434 msgid "Epson PM 750C" msgstr "" -#: src/xml/xmli18n-tmp.h:7341 +#: src/xml/xmli18n-tmp.h:7435 msgid "Epson PM 760C" msgstr "" -#: src/xml/xmli18n-tmp.h:7342 +#: src/xml/xmli18n-tmp.h:7436 msgid "Epson PM 770C" msgstr "" -#: src/xml/xmli18n-tmp.h:7343 +#: src/xml/xmli18n-tmp.h:7437 msgid "Epson PM 780C" msgstr "" -#: src/xml/xmli18n-tmp.h:7344 +#: src/xml/xmli18n-tmp.h:7438 msgid "Epson PM 790PT" msgstr "" -#: src/xml/xmli18n-tmp.h:7345 +#: src/xml/xmli18n-tmp.h:7439 msgid "Epson PM 800C" msgstr "" -#: src/xml/xmli18n-tmp.h:7346 +#: src/xml/xmli18n-tmp.h:7440 msgid "Epson PM 850PT" msgstr "" -#: src/xml/xmli18n-tmp.h:7347 +#: src/xml/xmli18n-tmp.h:7441 msgid "Epson PM 870C" msgstr "" -#: src/xml/xmli18n-tmp.h:7348 +#: src/xml/xmli18n-tmp.h:7442 msgid "Epson PM 880C" msgstr "" -#: src/xml/xmli18n-tmp.h:7349 +#: src/xml/xmli18n-tmp.h:7443 msgid "Epson PM 930C" msgstr "" -#: src/xml/xmli18n-tmp.h:7350 +#: src/xml/xmli18n-tmp.h:7444 msgid "Epson PM 940C" msgstr "" -#: src/xml/xmli18n-tmp.h:7351 +#: src/xml/xmli18n-tmp.h:7445 msgid "Epson PM 950C" msgstr "" -#: src/xml/xmli18n-tmp.h:7352 +#: src/xml/xmli18n-tmp.h:7446 msgid "Epson PM 970C" msgstr "" -#: src/xml/xmli18n-tmp.h:7353 +#: src/xml/xmli18n-tmp.h:7447 msgid "Epson PM 980C" msgstr "" -#: src/xml/xmli18n-tmp.h:7354 +#: src/xml/xmli18n-tmp.h:7448 msgid "Epson PM 2000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7355 +#: src/xml/xmli18n-tmp.h:7449 msgid "Epson PM 2200C" msgstr "" -#: src/xml/xmli18n-tmp.h:7356 +#: src/xml/xmli18n-tmp.h:7450 msgid "Epson PM 3000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7357 +#: src/xml/xmli18n-tmp.h:7451 msgid "Epson PM 3300C" msgstr "" -#: src/xml/xmli18n-tmp.h:7358 +#: src/xml/xmli18n-tmp.h:7452 msgid "Epson PM 3500C" msgstr "" -#: src/xml/xmli18n-tmp.h:7359 +#: src/xml/xmli18n-tmp.h:7453 msgid "Epson PM 3700C" msgstr "" -#: src/xml/xmli18n-tmp.h:7360 +#: src/xml/xmli18n-tmp.h:7454 msgid "Epson PM 4000PX" msgstr "" -#: src/xml/xmli18n-tmp.h:7361 +#: src/xml/xmli18n-tmp.h:7455 msgid "Epson PM 5000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7362 +#: src/xml/xmli18n-tmp.h:7456 msgid "Epson PM 7000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7363 +#: src/xml/xmli18n-tmp.h:7457 msgid "Epson PM 9000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7364 +#: src/xml/xmli18n-tmp.h:7458 msgid "Epson PM 10000" msgstr "" -#: src/xml/xmli18n-tmp.h:7365 +#: src/xml/xmli18n-tmp.h:7459 msgid "Epson PM A650" msgstr "" -#: src/xml/xmli18n-tmp.h:7366 +#: src/xml/xmli18n-tmp.h:7460 msgid "Epson PM A750" msgstr "" -#: src/xml/xmli18n-tmp.h:7367 +#: src/xml/xmli18n-tmp.h:7461 msgid "Epson PM A820" msgstr "" -#: src/xml/xmli18n-tmp.h:7368 +#: src/xml/xmli18n-tmp.h:7462 msgid "Epson PM A890" msgstr "" -#: src/xml/xmli18n-tmp.h:7369 +#: src/xml/xmli18n-tmp.h:7463 msgid "Epson PM A900" msgstr "" -#: src/xml/xmli18n-tmp.h:7370 +#: src/xml/xmli18n-tmp.h:7464 msgid "Epson PM A940" msgstr "" -#: src/xml/xmli18n-tmp.h:7371 +#: src/xml/xmli18n-tmp.h:7465 msgid "Epson PM A950" msgstr "" -#: src/xml/xmli18n-tmp.h:7372 +#: src/xml/xmli18n-tmp.h:7466 msgid "Epson PM D600" msgstr "" -#: src/xml/xmli18n-tmp.h:7373 +#: src/xml/xmli18n-tmp.h:7467 msgid "Epson PM D750" msgstr "" -#: src/xml/xmli18n-tmp.h:7374 +#: src/xml/xmli18n-tmp.h:7468 msgid "Epson PM D770" msgstr "" -#: src/xml/xmli18n-tmp.h:7375 +#: src/xml/xmli18n-tmp.h:7469 msgid "Epson PM D800" msgstr "" -#: src/xml/xmli18n-tmp.h:7376 +#: src/xml/xmli18n-tmp.h:7470 msgid "Epson PM D870" msgstr "" -#: src/xml/xmli18n-tmp.h:7377 +#: src/xml/xmli18n-tmp.h:7471 msgid "Epson PM D1000" msgstr "" -#: src/xml/xmli18n-tmp.h:7378 +#: src/xml/xmli18n-tmp.h:7472 msgid "Epson PM G700" msgstr "" -#: src/xml/xmli18n-tmp.h:7379 +#: src/xml/xmli18n-tmp.h:7473 msgid "Epson PM G720" msgstr "" -#: src/xml/xmli18n-tmp.h:7380 +#: src/xml/xmli18n-tmp.h:7474 msgid "Epson PM G730" msgstr "" -#: src/xml/xmli18n-tmp.h:7381 +#: src/xml/xmli18n-tmp.h:7475 msgid "Epson PM G800" msgstr "" -#: src/xml/xmli18n-tmp.h:7382 +#: src/xml/xmli18n-tmp.h:7476 msgid "Epson PM G820" msgstr "" -#: src/xml/xmli18n-tmp.h:7383 +#: src/xml/xmli18n-tmp.h:7477 msgid "Epson PM G850" msgstr "" -#: src/xml/xmli18n-tmp.h:7384 +#: src/xml/xmli18n-tmp.h:7478 msgid "Epson PM T960" msgstr "" -#: src/xml/xmli18n-tmp.h:7385 +#: src/xml/xmli18n-tmp.h:7479 msgid "Epson PM G4500" msgstr "" -#: src/xml/xmli18n-tmp.h:7386 +#: src/xml/xmli18n-tmp.h:7480 msgid "Epson PX A650" msgstr "" -#: src/xml/xmli18n-tmp.h:7387 +#: src/xml/xmli18n-tmp.h:7481 msgid "Epson Offirio PX B300" msgstr "" -#: src/xml/xmli18n-tmp.h:7388 +#: src/xml/xmli18n-tmp.h:7482 msgid "Epson Offirio PX B500" msgstr "" -#: src/xml/xmli18n-tmp.h:7389 +#: src/xml/xmli18n-tmp.h:7483 +msgid "Epson PX 7V" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7484 msgid "Epson PX 101" msgstr "" -#: src/xml/xmli18n-tmp.h:7390 +#: src/xml/xmli18n-tmp.h:7485 msgid "Epson PX 201" msgstr "" -#: src/xml/xmli18n-tmp.h:7391 +#: src/xml/xmli18n-tmp.h:7486 +msgid "Epson PX 204" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7487 msgid "Epson PX 401A" msgstr "" -#: src/xml/xmli18n-tmp.h:7392 +#: src/xml/xmli18n-tmp.h:7488 +msgid "Epson PX 504A" +msgstr "" + +#: src/xml/xmli18n-tmp.h:7489 msgid "Epson PX 601F" msgstr "" -#: src/xml/xmli18n-tmp.h:7393 +#: src/xml/xmli18n-tmp.h:7490 msgid "Epson PX 1001" msgstr "" -#: src/xml/xmli18n-tmp.h:7394 +#: src/xml/xmli18n-tmp.h:7491 msgid "Epson PX G900" msgstr "" -#: src/xml/xmli18n-tmp.h:7395 +#: src/xml/xmli18n-tmp.h:7492 msgid "Epson PX G920" msgstr "" -#: src/xml/xmli18n-tmp.h:7396 +#: src/xml/xmli18n-tmp.h:7493 msgid "Epson PX G5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7397 +#: src/xml/xmli18n-tmp.h:7494 msgid "Epson PX G5300" msgstr "" -#: src/xml/xmli18n-tmp.h:7398 +#: src/xml/xmli18n-tmp.h:7495 msgid "Epson PX V500" msgstr "" -#: src/xml/xmli18n-tmp.h:7399 +#: src/xml/xmli18n-tmp.h:7496 msgid "Epson PX V600" msgstr "" -#: src/xml/xmli18n-tmp.h:7400 +#: src/xml/xmli18n-tmp.h:7497 msgid "Epson PX V630" msgstr "" -#: src/xml/xmli18n-tmp.h:7401 +#: src/xml/xmli18n-tmp.h:7498 msgid "Epson PX V780" msgstr "" -#: src/xml/xmli18n-tmp.h:7402 +#: src/xml/xmli18n-tmp.h:7499 msgid "Epson PX 5500" msgstr "" -#: src/xml/xmli18n-tmp.h:7403 +#: src/xml/xmli18n-tmp.h:7500 msgid "Epson PX G5600" msgstr "" -#: src/xml/xmli18n-tmp.h:7404 +#: src/xml/xmli18n-tmp.h:7501 msgid "Epson PX 7000" msgstr "" -#: src/xml/xmli18n-tmp.h:7405 +#: src/xml/xmli18n-tmp.h:7502 msgid "Epson PX 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:7406 +#: src/xml/xmli18n-tmp.h:7503 msgid "Apollo P-2100" msgstr "" -#: src/xml/xmli18n-tmp.h:7407 +#: src/xml/xmli18n-tmp.h:7504 msgid "Apollo P-2150" msgstr "" -#: src/xml/xmli18n-tmp.h:7408 +#: src/xml/xmli18n-tmp.h:7505 msgid "Apollo P-2200" msgstr "" -#: src/xml/xmli18n-tmp.h:7409 +#: src/xml/xmli18n-tmp.h:7506 msgid "Apollo P-2250" msgstr "" -#: src/xml/xmli18n-tmp.h:7410 +#: src/xml/xmli18n-tmp.h:7507 msgid "Apollo P-2500" msgstr "" -#: src/xml/xmli18n-tmp.h:7411 +#: src/xml/xmli18n-tmp.h:7508 msgid "Apollo P-2550" msgstr "" -#: src/xml/xmli18n-tmp.h:7412 +#: src/xml/xmli18n-tmp.h:7509 msgid "Apollo P-2600" msgstr "" -#: src/xml/xmli18n-tmp.h:7413 +#: src/xml/xmli18n-tmp.h:7510 msgid "Apollo P-2650" msgstr "" -#: src/xml/xmli18n-tmp.h:7414 +#: src/xml/xmli18n-tmp.h:7511 msgid "Apple Color StyleWriter 4100" msgstr "" -#: src/xml/xmli18n-tmp.h:7415 +#: src/xml/xmli18n-tmp.h:7512 msgid "Apple Color StyleWriter 4500" msgstr "" -#: src/xml/xmli18n-tmp.h:7416 +#: src/xml/xmli18n-tmp.h:7513 msgid "Apple Color StyleWriter 6500" msgstr "" -#: src/xml/xmli18n-tmp.h:7417 +#: src/xml/xmli18n-tmp.h:7514 msgid "Apple LaserWriter Select 360" msgstr "" -#: src/xml/xmli18n-tmp.h:7418 +#: src/xml/xmli18n-tmp.h:7515 msgid "Brother DCP-1200" msgstr "" -#: src/xml/xmli18n-tmp.h:7419 +#: src/xml/xmli18n-tmp.h:7516 msgid "Brother DCP-8045D" msgstr "" -#: src/xml/xmli18n-tmp.h:7420 +#: src/xml/xmli18n-tmp.h:7517 msgid "Brother HL-1040" msgstr "" -#: src/xml/xmli18n-tmp.h:7421 +#: src/xml/xmli18n-tmp.h:7518 msgid "Brother HL-1050" msgstr "" -#: src/xml/xmli18n-tmp.h:7422 +#: src/xml/xmli18n-tmp.h:7519 msgid "Brother HL-1060" msgstr "" -#: src/xml/xmli18n-tmp.h:7423 +#: src/xml/xmli18n-tmp.h:7520 msgid "Brother HL-1070" msgstr "" -#: src/xml/xmli18n-tmp.h:7424 +#: src/xml/xmli18n-tmp.h:7521 msgid "Brother HL-10V" msgstr "" -#: src/xml/xmli18n-tmp.h:7425 +#: src/xml/xmli18n-tmp.h:7522 msgid "Brother HL-10h" msgstr "" -#: src/xml/xmli18n-tmp.h:7426 +#: src/xml/xmli18n-tmp.h:7523 msgid "Brother HL-1240" msgstr "" -#: src/xml/xmli18n-tmp.h:7427 +#: src/xml/xmli18n-tmp.h:7524 msgid "Brother HL-1250" msgstr "" -#: src/xml/xmli18n-tmp.h:7428 +#: src/xml/xmli18n-tmp.h:7525 msgid "Brother HL-1260" msgstr "" -#: src/xml/xmli18n-tmp.h:7429 +#: src/xml/xmli18n-tmp.h:7526 msgid "Brother HL-1270N" msgstr "" -#: src/xml/xmli18n-tmp.h:7430 +#: src/xml/xmli18n-tmp.h:7527 msgid "Brother HL-1430" msgstr "" -#: src/xml/xmli18n-tmp.h:7431 +#: src/xml/xmli18n-tmp.h:7528 msgid "Brother HL-1440" msgstr "" -#: src/xml/xmli18n-tmp.h:7432 +#: src/xml/xmli18n-tmp.h:7529 msgid "Brother HL-1450" msgstr "" -#: src/xml/xmli18n-tmp.h:7433 +#: src/xml/xmli18n-tmp.h:7530 msgid "Brother HL-1470N" msgstr "" -#: src/xml/xmli18n-tmp.h:7434 +#: src/xml/xmli18n-tmp.h:7531 msgid "Brother HL-1650" msgstr "" -#: src/xml/xmli18n-tmp.h:7435 +#: src/xml/xmli18n-tmp.h:7532 msgid "Brother HL-1660e" msgstr "" -#: src/xml/xmli18n-tmp.h:7436 +#: src/xml/xmli18n-tmp.h:7533 msgid "Brother HL-1670N" msgstr "" -#: src/xml/xmli18n-tmp.h:7437 +#: src/xml/xmli18n-tmp.h:7534 msgid "Brother HL-1850" msgstr "" -#: src/xml/xmli18n-tmp.h:7438 +#: src/xml/xmli18n-tmp.h:7535 msgid "Brother HL-1870N" msgstr "" -#: src/xml/xmli18n-tmp.h:7439 +#: src/xml/xmli18n-tmp.h:7536 msgid "Brother HL-2030" msgstr "" -#: src/xml/xmli18n-tmp.h:7440 +#: src/xml/xmli18n-tmp.h:7537 msgid "Brother HL-2035" msgstr "" -#: src/xml/xmli18n-tmp.h:7441 +#: src/xml/xmli18n-tmp.h:7538 msgid "Brother HL-2060" msgstr "" -#: src/xml/xmli18n-tmp.h:7442 +#: src/xml/xmli18n-tmp.h:7539 msgid "Brother HL-2460" msgstr "" -#: src/xml/xmli18n-tmp.h:7443 +#: src/xml/xmli18n-tmp.h:7540 msgid "Brother HL-2460N" msgstr "" -#: src/xml/xmli18n-tmp.h:7444 +#: src/xml/xmli18n-tmp.h:7541 msgid "Brother HL-4Ve" msgstr "" -#: src/xml/xmli18n-tmp.h:7445 +#: src/xml/xmli18n-tmp.h:7542 msgid "Brother HL-5030" msgstr "" -#: src/xml/xmli18n-tmp.h:7446 +#: src/xml/xmli18n-tmp.h:7543 msgid "Brother HL-5040" msgstr "" -#: src/xml/xmli18n-tmp.h:7447 +#: src/xml/xmli18n-tmp.h:7544 msgid "Brother HL-5050" msgstr "" -#: src/xml/xmli18n-tmp.h:7448 +#: src/xml/xmli18n-tmp.h:7545 msgid "Brother HL-5070N" msgstr "" -#: src/xml/xmli18n-tmp.h:7449 +#: src/xml/xmli18n-tmp.h:7546 msgid "Brother HL-5140" msgstr "" -#: src/xml/xmli18n-tmp.h:7450 +#: src/xml/xmli18n-tmp.h:7547 msgid "Brother HL-5150D" msgstr "" -#: src/xml/xmli18n-tmp.h:7451 +#: src/xml/xmli18n-tmp.h:7548 msgid "Brother HL-5170DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7452 +#: src/xml/xmli18n-tmp.h:7549 msgid "Brother HL-630" msgstr "" -#: src/xml/xmli18n-tmp.h:7453 +#: src/xml/xmli18n-tmp.h:7550 msgid "Brother HL-660" msgstr "" -#: src/xml/xmli18n-tmp.h:7454 +#: src/xml/xmli18n-tmp.h:7551 msgid "Brother HL-7050" msgstr "" -#: src/xml/xmli18n-tmp.h:7455 +#: src/xml/xmli18n-tmp.h:7552 msgid "Brother HL-7050N" msgstr "" -#: src/xml/xmli18n-tmp.h:7456 +#: src/xml/xmli18n-tmp.h:7553 msgid "Brother HL-760" msgstr "" -#: src/xml/xmli18n-tmp.h:7457 +#: src/xml/xmli18n-tmp.h:7554 msgid "Brother HL-960" msgstr "" -#: src/xml/xmli18n-tmp.h:7458 +#: src/xml/xmli18n-tmp.h:7555 msgid "Brother MFC-6550MC" msgstr "" -#: src/xml/xmli18n-tmp.h:7459 +#: src/xml/xmli18n-tmp.h:7556 msgid "Brother MFC-8300" msgstr "" -#: src/xml/xmli18n-tmp.h:7460 +#: src/xml/xmli18n-tmp.h:7557 msgid "Brother MFC-9500" msgstr "" -#: src/xml/xmli18n-tmp.h:7461 +#: src/xml/xmli18n-tmp.h:7558 msgid "Brother MFC-9600" msgstr "" -#: src/xml/xmli18n-tmp.h:7462 +#: src/xml/xmli18n-tmp.h:7559 msgid "Canon GP 335" msgstr "" -#: src/xml/xmli18n-tmp.h:7463 +#: src/xml/xmli18n-tmp.h:7560 msgid "Canon LBP-4sx" msgstr "" -#: src/xml/xmli18n-tmp.h:7464 +#: src/xml/xmli18n-tmp.h:7561 msgid "Canon LBP-430" msgstr "" -#: src/xml/xmli18n-tmp.h:7465 +#: src/xml/xmli18n-tmp.h:7562 msgid "Canon LBP-1000" msgstr "" -#: src/xml/xmli18n-tmp.h:7466 +#: src/xml/xmli18n-tmp.h:7563 msgid "Canon LBP-1260" msgstr "" -#: src/xml/xmli18n-tmp.h:7467 +#: src/xml/xmli18n-tmp.h:7564 msgid "Canon LBP-1760" msgstr "" -#: src/xml/xmli18n-tmp.h:7468 +#: src/xml/xmli18n-tmp.h:7565 msgid "Canon LBP-3360" msgstr "" -#: src/xml/xmli18n-tmp.h:7469 +#: src/xml/xmli18n-tmp.h:7566 msgid "Canon imageRunner 330s" msgstr "" -#: src/xml/xmli18n-tmp.h:7470 +#: src/xml/xmli18n-tmp.h:7567 msgid "Citizen ProJet II" msgstr "" -#: src/xml/xmli18n-tmp.h:7471 +#: src/xml/xmli18n-tmp.h:7568 msgid "DEC 1800" msgstr "" -#: src/xml/xmli18n-tmp.h:7472 +#: src/xml/xmli18n-tmp.h:7569 msgid "DEC LN17" msgstr "" -#: src/xml/xmli18n-tmp.h:7473 +#: src/xml/xmli18n-tmp.h:7570 msgid "Epson ActionLaser 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7474 +#: src/xml/xmli18n-tmp.h:7571 msgid "Epson ActionLaser II" msgstr "" -#: src/xml/xmli18n-tmp.h:7475 +#: src/xml/xmli18n-tmp.h:7572 msgid "Epson AL-C2000" msgstr "" -#: src/xml/xmli18n-tmp.h:7476 +#: src/xml/xmli18n-tmp.h:7573 msgid "Epson AL-C2000 PS3" msgstr "" -#: src/xml/xmli18n-tmp.h:7477 +#: src/xml/xmli18n-tmp.h:7574 msgid "Epson AL-C8500" msgstr "" -#: src/xml/xmli18n-tmp.h:7478 +#: src/xml/xmli18n-tmp.h:7575 msgid "Epson AL-C8500PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7479 +#: src/xml/xmli18n-tmp.h:7576 msgid "Epson AL-C8600" msgstr "" -#: src/xml/xmli18n-tmp.h:7480 +#: src/xml/xmli18n-tmp.h:7577 msgid "Epson AL-C8600 PS3" msgstr "" -#: src/xml/xmli18n-tmp.h:7481 +#: src/xml/xmli18n-tmp.h:7578 msgid "Epson EPL-5200" msgstr "" -#: src/xml/xmli18n-tmp.h:7482 +#: src/xml/xmli18n-tmp.h:7579 msgid "Epson EPL-5200+" msgstr "" -#: src/xml/xmli18n-tmp.h:7483 +#: src/xml/xmli18n-tmp.h:7580 msgid "Epson EPL-5700" msgstr "" -#: src/xml/xmli18n-tmp.h:7484 +#: src/xml/xmli18n-tmp.h:7581 msgid "Epson EPL-5700PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7485 +#: src/xml/xmli18n-tmp.h:7582 msgid "Epson EPL-5800" msgstr "" -#: src/xml/xmli18n-tmp.h:7486 +#: src/xml/xmli18n-tmp.h:7583 msgid "Epson EPL-5800PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7487 +#: src/xml/xmli18n-tmp.h:7584 msgid "Epson EPL-5900" msgstr "" -#: src/xml/xmli18n-tmp.h:7488 +#: src/xml/xmli18n-tmp.h:7585 msgid "Epson EPL-5900 PS3" msgstr "" -#: src/xml/xmli18n-tmp.h:7489 +#: src/xml/xmli18n-tmp.h:7586 msgid "Epson EPL-6100" msgstr "" -#: src/xml/xmli18n-tmp.h:7490 +#: src/xml/xmli18n-tmp.h:7587 msgid "Epson EPL-6100 PS3" msgstr "" -#: src/xml/xmli18n-tmp.h:7491 +#: src/xml/xmli18n-tmp.h:7588 msgid "Epson EPL-7100" msgstr "" -#: src/xml/xmli18n-tmp.h:7492 +#: src/xml/xmli18n-tmp.h:7589 msgid "Epson EPL-N2050" msgstr "" -#: src/xml/xmli18n-tmp.h:7493 +#: src/xml/xmli18n-tmp.h:7590 msgid "Epson EPL-N2050+" msgstr "" -#: src/xml/xmli18n-tmp.h:7494 +#: src/xml/xmli18n-tmp.h:7591 msgid "Epson EPL-N2050PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7495 +#: src/xml/xmli18n-tmp.h:7592 msgid "Epson EPL-N2050PS+" msgstr "" -#: src/xml/xmli18n-tmp.h:7496 +#: src/xml/xmli18n-tmp.h:7593 msgid "Epson EPL-N2120" msgstr "" -#: src/xml/xmli18n-tmp.h:7497 +#: src/xml/xmli18n-tmp.h:7594 msgid "Epson EPL-N2500" msgstr "" -#: src/xml/xmli18n-tmp.h:7498 +#: src/xml/xmli18n-tmp.h:7595 msgid "Epson EPL-N2500 PS3" msgstr "" -#: src/xml/xmli18n-tmp.h:7499 +#: src/xml/xmli18n-tmp.h:7596 msgid "Epson EPL-N2750" msgstr "" -#: src/xml/xmli18n-tmp.h:7500 +#: src/xml/xmli18n-tmp.h:7597 msgid "Epson EPL-N2750PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7501 +#: src/xml/xmli18n-tmp.h:7598 msgid "Fujitsu PrintPartner 10V" msgstr "" -#: src/xml/xmli18n-tmp.h:7502 +#: src/xml/xmli18n-tmp.h:7599 msgid "Fujitsu PrintPartner 16DV" msgstr "" -#: src/xml/xmli18n-tmp.h:7503 +#: src/xml/xmli18n-tmp.h:7600 msgid "Fujitsu PrintPartner 20W" msgstr "" -#: src/xml/xmli18n-tmp.h:7504 +#: src/xml/xmli18n-tmp.h:7601 msgid "Fujitsu PrintPartner 8000" msgstr "" -#: src/xml/xmli18n-tmp.h:7505 +#: src/xml/xmli18n-tmp.h:7602 msgid "Generic PCL 4 Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7506 +#: src/xml/xmli18n-tmp.h:7603 msgid "Generic PCL 4 LF Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7507 +#: src/xml/xmli18n-tmp.h:7604 msgid "Generic PCL 5 Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7508 +#: src/xml/xmli18n-tmp.h:7605 msgid "Generic PCL 5 LF Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7509 +#: src/xml/xmli18n-tmp.h:7606 msgid "Generic PCL 5c Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7510 +#: src/xml/xmli18n-tmp.h:7607 msgid "Generic PCL 5c LF Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7511 +#: src/xml/xmli18n-tmp.h:7608 msgid "Generic PCL 5e Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7512 +#: src/xml/xmli18n-tmp.h:7609 msgid "Generic PCL 5e LF Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7513 +#: src/xml/xmli18n-tmp.h:7610 msgid "Generic PCL 6/PCL XL Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7514 +#: src/xml/xmli18n-tmp.h:7611 msgid "Generic PCL 6/PCL XL LF Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:7515 +#: src/xml/xmli18n-tmp.h:7612 msgid "Gestetner 10512" msgstr "" -#: src/xml/xmli18n-tmp.h:7516 +#: src/xml/xmli18n-tmp.h:7613 msgid "Gestetner 2212" msgstr "" -#: src/xml/xmli18n-tmp.h:7517 +#: src/xml/xmli18n-tmp.h:7614 msgid "Gestetner 2712" msgstr "" -#: src/xml/xmli18n-tmp.h:7518 +#: src/xml/xmli18n-tmp.h:7615 msgid "Gestetner 3212" msgstr "" -#: src/xml/xmli18n-tmp.h:7519 +#: src/xml/xmli18n-tmp.h:7616 msgid "Gestetner 3502" msgstr "" -#: src/xml/xmli18n-tmp.h:7520 +#: src/xml/xmli18n-tmp.h:7617 msgid "Gestetner 3532/4235g" msgstr "" -#: src/xml/xmli18n-tmp.h:7521 +#: src/xml/xmli18n-tmp.h:7618 msgid "Gestetner 4502" msgstr "" -#: src/xml/xmli18n-tmp.h:7522 +#: src/xml/xmli18n-tmp.h:7619 msgid "Gestetner 4532/4245g" msgstr "" -#: src/xml/xmli18n-tmp.h:7523 +#: src/xml/xmli18n-tmp.h:7620 msgid "Gestetner 6002" msgstr "" -#: src/xml/xmli18n-tmp.h:7524 +#: src/xml/xmli18n-tmp.h:7621 msgid "Gestetner 7502" msgstr "" -#: src/xml/xmli18n-tmp.h:7525 +#: src/xml/xmli18n-tmp.h:7622 msgid "Gestetner 9002" msgstr "" -#: src/xml/xmli18n-tmp.h:7526 +#: src/xml/xmli18n-tmp.h:7623 msgid "Gestetner DSm415" msgstr "" -#: src/xml/xmli18n-tmp.h:7527 +#: src/xml/xmli18n-tmp.h:7624 msgid "Gestetner DSm615" msgstr "" -#: src/xml/xmli18n-tmp.h:7528 +#: src/xml/xmli18n-tmp.h:7625 msgid "Gestetner DSm616" msgstr "" -#: src/xml/xmli18n-tmp.h:7529 +#: src/xml/xmli18n-tmp.h:7626 msgid "Gestetner DSm618" msgstr "" -#: src/xml/xmli18n-tmp.h:7530 +#: src/xml/xmli18n-tmp.h:7627 msgid "Gestetner DSm618d" msgstr "" -#: src/xml/xmli18n-tmp.h:7531 +#: src/xml/xmli18n-tmp.h:7628 msgid "Gestetner DSm620" msgstr "" -#: src/xml/xmli18n-tmp.h:7532 +#: src/xml/xmli18n-tmp.h:7629 msgid "Gestetner DSm620d" msgstr "" -#: src/xml/xmli18n-tmp.h:7533 +#: src/xml/xmli18n-tmp.h:7630 msgid "Gestetner DSm622" msgstr "" -#: src/xml/xmli18n-tmp.h:7534 +#: src/xml/xmli18n-tmp.h:7631 msgid "Gestetner DSm627" msgstr "" -#: src/xml/xmli18n-tmp.h:7535 +#: src/xml/xmli18n-tmp.h:7632 msgid "Gestetner DSm635/635G" msgstr "" -#: src/xml/xmli18n-tmp.h:7536 +#: src/xml/xmli18n-tmp.h:7633 msgid "Gestetner DSm645/645G" msgstr "" -#: src/xml/xmli18n-tmp.h:7537 +#: src/xml/xmli18n-tmp.h:7634 msgid "Gestetner DSm651" msgstr "" -#: src/xml/xmli18n-tmp.h:7538 +#: src/xml/xmli18n-tmp.h:7635 msgid "Gestetner DSm660" msgstr "" -#: src/xml/xmli18n-tmp.h:7539 +#: src/xml/xmli18n-tmp.h:7636 msgid "Gestetner DSm675" msgstr "" -#: src/xml/xmli18n-tmp.h:7540 +#: src/xml/xmli18n-tmp.h:7637 msgid "Gestetner DSm725" msgstr "" -#: src/xml/xmli18n-tmp.h:7541 +#: src/xml/xmli18n-tmp.h:7638 msgid "Gestetner DSm730" msgstr "" -#: src/xml/xmli18n-tmp.h:7542 +#: src/xml/xmli18n-tmp.h:7639 msgid "Gestetner DSm735/735G" msgstr "" -#: src/xml/xmli18n-tmp.h:7543 +#: src/xml/xmli18n-tmp.h:7640 msgid "Gestetner DSm745/745G" msgstr "" -#: src/xml/xmli18n-tmp.h:7544 +#: src/xml/xmli18n-tmp.h:7641 msgid "Gestetner MP1100/DSm7110" msgstr "" -#: src/xml/xmli18n-tmp.h:7545 +#: src/xml/xmli18n-tmp.h:7642 msgid "Gestetner MP1350/DSm7135" msgstr "" -#: src/xml/xmli18n-tmp.h:7546 +#: src/xml/xmli18n-tmp.h:7643 msgid "Gestetner MP1600/DSm716" msgstr "" -#: src/xml/xmli18n-tmp.h:7547 +#: src/xml/xmli18n-tmp.h:7644 msgid "Gestetner MP2000/DSm721d" msgstr "" -#: src/xml/xmli18n-tmp.h:7548 +#: src/xml/xmli18n-tmp.h:7645 msgid "Gestetner MP2500/DSm625" msgstr "" -#: src/xml/xmli18n-tmp.h:7549 +#: src/xml/xmli18n-tmp.h:7646 msgid "Gestetner MP3500/DSm735e" msgstr "" -#: src/xml/xmli18n-tmp.h:7550 +#: src/xml/xmli18n-tmp.h:7647 msgid "Gestetner MP4500/DSm745e" msgstr "" -#: src/xml/xmli18n-tmp.h:7551 +#: src/xml/xmli18n-tmp.h:7648 msgid "Gestetner MP5500/DSm755" msgstr "" -#: src/xml/xmli18n-tmp.h:7552 +#: src/xml/xmli18n-tmp.h:7649 msgid "Gestetner MP6500/DSm765" msgstr "" -#: src/xml/xmli18n-tmp.h:7553 +#: src/xml/xmli18n-tmp.h:7650 msgid "Gestetner MP7500/DSm775" msgstr "" -#: src/xml/xmli18n-tmp.h:7554 +#: src/xml/xmli18n-tmp.h:7651 msgid "Gestetner MP9000/DSm790" msgstr "" -#: src/xml/xmli18n-tmp.h:7555 +#: src/xml/xmli18n-tmp.h:7652 msgid "Gestetner MP 161/DSm416" msgstr "" -#: src/xml/xmli18n-tmp.h:7556 +#: src/xml/xmli18n-tmp.h:7653 msgid "Gestetner MP 2510/DSm725e" msgstr "" -#: src/xml/xmli18n-tmp.h:7557 +#: src/xml/xmli18n-tmp.h:7654 msgid "Gestetner MP 2550" msgstr "" -#: src/xml/xmli18n-tmp.h:7558 +#: src/xml/xmli18n-tmp.h:7655 msgid "Gestetner MP 2550B" msgstr "" -#: src/xml/xmli18n-tmp.h:7559 +#: src/xml/xmli18n-tmp.h:7656 msgid "Gestetner MP 3010/DSm730e" msgstr "" -#: src/xml/xmli18n-tmp.h:7560 +#: src/xml/xmli18n-tmp.h:7657 msgid "Gestetner MP 3350" msgstr "" -#: src/xml/xmli18n-tmp.h:7561 +#: src/xml/xmli18n-tmp.h:7658 msgid "Gestetner MP 3350B" msgstr "" -#: src/xml/xmli18n-tmp.h:7562 +#: src/xml/xmli18n-tmp.h:7659 msgid "Gestetner MP 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:7563 +#: src/xml/xmli18n-tmp.h:7660 msgid "Gestetner MP 4000B" msgstr "" -#: src/xml/xmli18n-tmp.h:7564 +#: src/xml/xmli18n-tmp.h:7661 msgid "Gestetner MP 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7565 +#: src/xml/xmli18n-tmp.h:7662 msgid "Gestetner MP 5000B" msgstr "" -#: src/xml/xmli18n-tmp.h:7566 +#: src/xml/xmli18n-tmp.h:7663 msgid "HP Business Inkjet 2200" msgstr "" -#: src/xml/xmli18n-tmp.h:7567 +#: src/xml/xmli18n-tmp.h:7664 msgid "HP Business Inkjet 2230" msgstr "" -#: src/xml/xmli18n-tmp.h:7568 +#: src/xml/xmli18n-tmp.h:7665 msgid "HP Business Inkjet 2250" msgstr "" -#: src/xml/xmli18n-tmp.h:7569 +#: src/xml/xmli18n-tmp.h:7666 msgid "HP Business Inkjet 2250TN" msgstr "" -#: src/xml/xmli18n-tmp.h:7570 +#: src/xml/xmli18n-tmp.h:7667 msgid "HP Business Inkjet 2280" msgstr "" -#: src/xml/xmli18n-tmp.h:7571 +#: src/xml/xmli18n-tmp.h:7668 msgid "HP Color Inkjet Printer CP1160" msgstr "" -#: src/xml/xmli18n-tmp.h:7572 +#: src/xml/xmli18n-tmp.h:7669 msgid "HP Color Inkjet Printer CP1700" msgstr "" -#: src/xml/xmli18n-tmp.h:7573 +#: src/xml/xmli18n-tmp.h:7670 msgid "HP Color LaserJet 2500" msgstr "" -#: src/xml/xmli18n-tmp.h:7574 +#: src/xml/xmli18n-tmp.h:7671 msgid "HP Color LaserJet 4500" msgstr "" -#: src/xml/xmli18n-tmp.h:7575 +#: src/xml/xmli18n-tmp.h:7672 msgid "HP Color LaserJet 4550" msgstr "" -#: src/xml/xmli18n-tmp.h:7576 +#: src/xml/xmli18n-tmp.h:7673 msgid "HP Color LaserJet 4600" msgstr "" -#: src/xml/xmli18n-tmp.h:7577 +#: src/xml/xmli18n-tmp.h:7674 msgid "HP Color LaserJet 5" msgstr "" -#: src/xml/xmli18n-tmp.h:7578 +#: src/xml/xmli18n-tmp.h:7675 msgid "HP Color LaserJet 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7579 +#: src/xml/xmli18n-tmp.h:7676 msgid "HP Color LaserJet 5500" msgstr "" -#: src/xml/xmli18n-tmp.h:7580 +#: src/xml/xmli18n-tmp.h:7677 msgid "HP Color LaserJet 8550GN" msgstr "" -#: src/xml/xmli18n-tmp.h:7581 +#: src/xml/xmli18n-tmp.h:7678 msgid "HP DesignJet 230" msgstr "" -#: src/xml/xmli18n-tmp.h:7582 +#: src/xml/xmli18n-tmp.h:7679 msgid "HP DesignJet 250C" msgstr "" -#: src/xml/xmli18n-tmp.h:7583 +#: src/xml/xmli18n-tmp.h:7680 msgid "HP DesignJet 430" msgstr "" -#: src/xml/xmli18n-tmp.h:7584 +#: src/xml/xmli18n-tmp.h:7681 msgid "HP DesignJet 450C" msgstr "" -#: src/xml/xmli18n-tmp.h:7585 +#: src/xml/xmli18n-tmp.h:7682 msgid "HP DesignJet 455CA" msgstr "" -#: src/xml/xmli18n-tmp.h:7586 +#: src/xml/xmli18n-tmp.h:7683 msgid "HP DesignJet 488CA" msgstr "" -#: src/xml/xmli18n-tmp.h:7587 +#: src/xml/xmli18n-tmp.h:7684 msgid "HP DesignJet 700" msgstr "" -#: src/xml/xmli18n-tmp.h:7588 +#: src/xml/xmli18n-tmp.h:7685 msgid "HP DesignJet 750C Plus" msgstr "" -#: src/xml/xmli18n-tmp.h:7589 +#: src/xml/xmli18n-tmp.h:7686 msgid "HP DesignJet 750C" msgstr "" -#: src/xml/xmli18n-tmp.h:7590 +#: src/xml/xmli18n-tmp.h:7687 msgid "HP DesignJet 2500CP" msgstr "" -#: src/xml/xmli18n-tmp.h:7591 +#: src/xml/xmli18n-tmp.h:7688 msgid "HP DesignJet 3500CP" msgstr "" -#: src/xml/xmli18n-tmp.h:7592 +#: src/xml/xmli18n-tmp.h:7689 msgid "HP DesignJet ColorPro CAD" msgstr "" -#: src/xml/xmli18n-tmp.h:7593 +#: src/xml/xmli18n-tmp.h:7690 msgid "HP DeskJet 400" msgstr "" -#: src/xml/xmli18n-tmp.h:7594 +#: src/xml/xmli18n-tmp.h:7691 msgid "HP DeskJet 420C" msgstr "" -#: src/xml/xmli18n-tmp.h:7595 +#: src/xml/xmli18n-tmp.h:7692 msgid "HP DeskJet 450" msgstr "" -#: src/xml/xmli18n-tmp.h:7596 +#: src/xml/xmli18n-tmp.h:7693 msgid "HP DeskJet 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7597 +#: src/xml/xmli18n-tmp.h:7694 msgid "HP DeskJet 500C" msgstr "" -#: src/xml/xmli18n-tmp.h:7598 +#: src/xml/xmli18n-tmp.h:7695 msgid "HP DeskJet 505J Plus" msgstr "" -#: src/xml/xmli18n-tmp.h:7599 +#: src/xml/xmli18n-tmp.h:7696 msgid "HP DeskJet 510" msgstr "" -#: src/xml/xmli18n-tmp.h:7600 +#: src/xml/xmli18n-tmp.h:7697 msgid "HP DeskJet 520" msgstr "" -#: src/xml/xmli18n-tmp.h:7601 +#: src/xml/xmli18n-tmp.h:7698 msgid "HP DeskJet 540C" msgstr "" -#: src/xml/xmli18n-tmp.h:7602 +#: src/xml/xmli18n-tmp.h:7699 msgid "HP DeskJet 550C" msgstr "" -#: src/xml/xmli18n-tmp.h:7603 +#: src/xml/xmli18n-tmp.h:7700 msgid "HP DeskJet 5550" msgstr "" -#: src/xml/xmli18n-tmp.h:7604 +#: src/xml/xmli18n-tmp.h:7701 msgid "HP DeskJet 5551" msgstr "" -#: src/xml/xmli18n-tmp.h:7605 +#: src/xml/xmli18n-tmp.h:7702 msgid "HP DeskJet 560C" msgstr "" -#: src/xml/xmli18n-tmp.h:7606 +#: src/xml/xmli18n-tmp.h:7703 msgid "HP DeskJet 600" msgstr "" -#: src/xml/xmli18n-tmp.h:7607 +#: src/xml/xmli18n-tmp.h:7704 msgid "HP DeskJet 600C" msgstr "" -#: src/xml/xmli18n-tmp.h:7608 +#: src/xml/xmli18n-tmp.h:7705 msgid "HP DeskJet 610C" msgstr "" -#: src/xml/xmli18n-tmp.h:7609 +#: src/xml/xmli18n-tmp.h:7706 msgid "HP DeskJet 610CL" msgstr "" -#: src/xml/xmli18n-tmp.h:7610 +#: src/xml/xmli18n-tmp.h:7707 msgid "HP DeskJet 6122" msgstr "" -#: src/xml/xmli18n-tmp.h:7611 +#: src/xml/xmli18n-tmp.h:7708 msgid "HP DeskJet 6127" msgstr "" -#: src/xml/xmli18n-tmp.h:7612 +#: src/xml/xmli18n-tmp.h:7709 msgid "HP DeskJet 612C" msgstr "" -#: src/xml/xmli18n-tmp.h:7613 +#: src/xml/xmli18n-tmp.h:7710 msgid "HP DeskJet 640C" msgstr "" -#: src/xml/xmli18n-tmp.h:7614 +#: src/xml/xmli18n-tmp.h:7711 msgid "HP DeskJet 648C" msgstr "" -#: src/xml/xmli18n-tmp.h:7615 +#: src/xml/xmli18n-tmp.h:7712 msgid "HP DeskJet 660C" msgstr "" -#: src/xml/xmli18n-tmp.h:7616 +#: src/xml/xmli18n-tmp.h:7713 msgid "HP DeskJet 670C" msgstr "" -#: src/xml/xmli18n-tmp.h:7617 +#: src/xml/xmli18n-tmp.h:7714 msgid "HP DeskJet 670TV" msgstr "" -#: src/xml/xmli18n-tmp.h:7618 +#: src/xml/xmli18n-tmp.h:7715 msgid "HP DeskJet 672C" msgstr "" -#: src/xml/xmli18n-tmp.h:7619 +#: src/xml/xmli18n-tmp.h:7716 msgid "HP DeskJet 680C" msgstr "" -#: src/xml/xmli18n-tmp.h:7620 +#: src/xml/xmli18n-tmp.h:7717 msgid "HP DeskJet 682C" msgstr "" -#: src/xml/xmli18n-tmp.h:7621 +#: src/xml/xmli18n-tmp.h:7718 msgid "HP DeskJet 690C" msgstr "" -#: src/xml/xmli18n-tmp.h:7622 +#: src/xml/xmli18n-tmp.h:7719 msgid "HP DeskJet 692C" msgstr "" -#: src/xml/xmli18n-tmp.h:7623 +#: src/xml/xmli18n-tmp.h:7720 msgid "HP DeskJet 693C" msgstr "" -#: src/xml/xmli18n-tmp.h:7624 +#: src/xml/xmli18n-tmp.h:7721 msgid "HP DeskJet 694C" msgstr "" -#: src/xml/xmli18n-tmp.h:7625 +#: src/xml/xmli18n-tmp.h:7722 msgid "HP DeskJet 695C" msgstr "" -#: src/xml/xmli18n-tmp.h:7626 +#: src/xml/xmli18n-tmp.h:7723 msgid "HP DeskJet 697C" msgstr "" -#: src/xml/xmli18n-tmp.h:7627 +#: src/xml/xmli18n-tmp.h:7724 msgid "HP DeskJet 810C" msgstr "" -#: src/xml/xmli18n-tmp.h:7628 +#: src/xml/xmli18n-tmp.h:7725 msgid "HP DeskJet 812C" msgstr "" -#: src/xml/xmli18n-tmp.h:7629 +#: src/xml/xmli18n-tmp.h:7726 msgid "HP DeskJet 815C" msgstr "" -#: src/xml/xmli18n-tmp.h:7630 +#: src/xml/xmli18n-tmp.h:7727 msgid "HP DeskJet 816C" msgstr "" -#: src/xml/xmli18n-tmp.h:7631 +#: src/xml/xmli18n-tmp.h:7728 msgid "HP DeskJet 825C" msgstr "" -#: src/xml/xmli18n-tmp.h:7632 +#: src/xml/xmli18n-tmp.h:7729 msgid "HP DeskJet 830C" msgstr "" -#: src/xml/xmli18n-tmp.h:7633 +#: src/xml/xmli18n-tmp.h:7730 msgid "HP DeskJet 832C" msgstr "" -#: src/xml/xmli18n-tmp.h:7634 +#: src/xml/xmli18n-tmp.h:7731 msgid "HP DeskJet 840C" msgstr "" -#: src/xml/xmli18n-tmp.h:7635 +#: src/xml/xmli18n-tmp.h:7732 msgid "HP DeskJet 841C" msgstr "" -#: src/xml/xmli18n-tmp.h:7636 +#: src/xml/xmli18n-tmp.h:7733 msgid "HP DeskJet 842C" msgstr "" -#: src/xml/xmli18n-tmp.h:7637 +#: src/xml/xmli18n-tmp.h:7734 msgid "HP DeskJet 843C" msgstr "" -#: src/xml/xmli18n-tmp.h:7638 +#: src/xml/xmli18n-tmp.h:7735 msgid "HP DeskJet 845C" msgstr "" -#: src/xml/xmli18n-tmp.h:7639 +#: src/xml/xmli18n-tmp.h:7736 msgid "HP DeskJet 850C" msgstr "" -#: src/xml/xmli18n-tmp.h:7640 +#: src/xml/xmli18n-tmp.h:7737 msgid "HP DeskJet 855C" msgstr "" -#: src/xml/xmli18n-tmp.h:7641 +#: src/xml/xmli18n-tmp.h:7738 msgid "HP DeskJet 870C" msgstr "" -#: src/xml/xmli18n-tmp.h:7642 +#: src/xml/xmli18n-tmp.h:7739 msgid "HP DeskJet 880C" msgstr "" -#: src/xml/xmli18n-tmp.h:7643 +#: src/xml/xmli18n-tmp.h:7740 msgid "HP DeskJet 882C" msgstr "" -#: src/xml/xmli18n-tmp.h:7644 +#: src/xml/xmli18n-tmp.h:7741 msgid "HP DeskJet 890C" msgstr "" -#: src/xml/xmli18n-tmp.h:7645 +#: src/xml/xmli18n-tmp.h:7742 msgid "HP DeskJet 895C" msgstr "" -#: src/xml/xmli18n-tmp.h:7646 +#: src/xml/xmli18n-tmp.h:7743 msgid "HP DeskJet 916C" msgstr "" -#: src/xml/xmli18n-tmp.h:7647 +#: src/xml/xmli18n-tmp.h:7744 msgid "HP DeskJet 920C" msgstr "" -#: src/xml/xmli18n-tmp.h:7648 +#: src/xml/xmli18n-tmp.h:7745 msgid "HP DeskJet 9300" msgstr "" -#: src/xml/xmli18n-tmp.h:7649 +#: src/xml/xmli18n-tmp.h:7746 msgid "HP DeskJet 930C" msgstr "" -#: src/xml/xmli18n-tmp.h:7650 +#: src/xml/xmli18n-tmp.h:7747 msgid "HP DeskJet 932C" msgstr "" -#: src/xml/xmli18n-tmp.h:7651 +#: src/xml/xmli18n-tmp.h:7748 msgid "HP DeskJet 933C" msgstr "" -#: src/xml/xmli18n-tmp.h:7652 +#: src/xml/xmli18n-tmp.h:7749 msgid "HP DeskJet 934C" msgstr "" -#: src/xml/xmli18n-tmp.h:7653 +#: src/xml/xmli18n-tmp.h:7750 msgid "HP DeskJet 935C" msgstr "" -#: src/xml/xmli18n-tmp.h:7654 +#: src/xml/xmli18n-tmp.h:7751 msgid "HP DeskJet 940C" msgstr "" -#: src/xml/xmli18n-tmp.h:7655 +#: src/xml/xmli18n-tmp.h:7752 msgid "HP DeskJet 948C" msgstr "" -#: src/xml/xmli18n-tmp.h:7656 +#: src/xml/xmli18n-tmp.h:7753 msgid "HP DeskJet 950C" msgstr "" -#: src/xml/xmli18n-tmp.h:7657 +#: src/xml/xmli18n-tmp.h:7754 msgid "HP DeskJet 952C" msgstr "" -#: src/xml/xmli18n-tmp.h:7658 +#: src/xml/xmli18n-tmp.h:7755 msgid "HP DeskJet 955C" msgstr "" -#: src/xml/xmli18n-tmp.h:7659 +#: src/xml/xmli18n-tmp.h:7756 msgid "HP DeskJet 957C" msgstr "" -#: src/xml/xmli18n-tmp.h:7660 +#: src/xml/xmli18n-tmp.h:7757 msgid "HP DeskJet 959C" msgstr "" -#: src/xml/xmli18n-tmp.h:7661 +#: src/xml/xmli18n-tmp.h:7758 msgid "HP DeskJet 960C" msgstr "" -#: src/xml/xmli18n-tmp.h:7662 +#: src/xml/xmli18n-tmp.h:7759 msgid "HP DeskJet 970C" msgstr "" -#: src/xml/xmli18n-tmp.h:7663 +#: src/xml/xmli18n-tmp.h:7760 msgid "HP DeskJet 975C" msgstr "" -#: src/xml/xmli18n-tmp.h:7664 +#: src/xml/xmli18n-tmp.h:7761 msgid "HP DeskJet 980C" msgstr "" -#: src/xml/xmli18n-tmp.h:7665 +#: src/xml/xmli18n-tmp.h:7762 msgid "HP DeskJet 990C" msgstr "" -#: src/xml/xmli18n-tmp.h:7666 +#: src/xml/xmli18n-tmp.h:7763 msgid "HP DeskJet 995C" msgstr "" -#: src/xml/xmli18n-tmp.h:7667 +#: src/xml/xmli18n-tmp.h:7764 msgid "HP DeskJet 1100C" msgstr "" -#: src/xml/xmli18n-tmp.h:7668 +#: src/xml/xmli18n-tmp.h:7765 msgid "HP DeskJet 1120C" msgstr "" -#: src/xml/xmli18n-tmp.h:7669 +#: src/xml/xmli18n-tmp.h:7766 msgid "HP DeskJet 1125C" msgstr "" -#: src/xml/xmli18n-tmp.h:7670 +#: src/xml/xmli18n-tmp.h:7767 msgid "HP DeskJet 1200C" msgstr "" -#: src/xml/xmli18n-tmp.h:7671 +#: src/xml/xmli18n-tmp.h:7768 msgid "HP DeskJet 1220C" msgstr "" -#: src/xml/xmli18n-tmp.h:7672 +#: src/xml/xmli18n-tmp.h:7769 msgid "HP DeskJet 1600C" msgstr "" -#: src/xml/xmli18n-tmp.h:7673 +#: src/xml/xmli18n-tmp.h:7770 msgid "HP DeskJet 1600CM" msgstr "" -#: src/xml/xmli18n-tmp.h:7674 +#: src/xml/xmli18n-tmp.h:7771 msgid "HP DeskJet 2000" msgstr "" -#: src/xml/xmli18n-tmp.h:7675 +#: src/xml/xmli18n-tmp.h:7772 msgid "HP DeskJet 2500" msgstr "" -#: src/xml/xmli18n-tmp.h:7676 +#: src/xml/xmli18n-tmp.h:7773 msgid "HP DeskJet 2500CM" msgstr "" -#: src/xml/xmli18n-tmp.h:7677 +#: src/xml/xmli18n-tmp.h:7774 msgid "HP DeskJet 340C" msgstr "" -#: src/xml/xmli18n-tmp.h:7678 +#: src/xml/xmli18n-tmp.h:7775 msgid "HP DeskJet 3810" msgstr "" -#: src/xml/xmli18n-tmp.h:7679 +#: src/xml/xmli18n-tmp.h:7776 msgid "HP DeskJet 3816" msgstr "" -#: src/xml/xmli18n-tmp.h:7680 +#: src/xml/xmli18n-tmp.h:7777 msgid "HP DeskJet 3820" msgstr "" -#: src/xml/xmli18n-tmp.h:7681 +#: src/xml/xmli18n-tmp.h:7778 msgid "HP DeskJet 3822" msgstr "" -#: src/xml/xmli18n-tmp.h:7682 +#: src/xml/xmli18n-tmp.h:7779 msgid "HP LaserJet 2" msgstr "" -#: src/xml/xmli18n-tmp.h:7683 +#: src/xml/xmli18n-tmp.h:7780 msgid "HP LaserJet 2D" msgstr "" -#: src/xml/xmli18n-tmp.h:7684 +#: src/xml/xmli18n-tmp.h:7781 msgid "HP LaserJet 2P Plus" msgstr "" -#: src/xml/xmli18n-tmp.h:7685 +#: src/xml/xmli18n-tmp.h:7782 msgid "HP LaserJet 2P" msgstr "" -#: src/xml/xmli18n-tmp.h:7686 +#: src/xml/xmli18n-tmp.h:7783 msgid "HP LaserJet 3" msgstr "" -#: src/xml/xmli18n-tmp.h:7687 +#: src/xml/xmli18n-tmp.h:7784 msgid "HP LaserJet 3D" msgstr "" -#: src/xml/xmli18n-tmp.h:7688 +#: src/xml/xmli18n-tmp.h:7785 msgid "HP LaserJet 3P w/ PCL5" msgstr "" -#: src/xml/xmli18n-tmp.h:7689 +#: src/xml/xmli18n-tmp.h:7786 msgid "HP LaserJet 3P w/PS" msgstr "" -#: src/xml/xmli18n-tmp.h:7690 +#: src/xml/xmli18n-tmp.h:7787 msgid "HP LaserJet 4 Plus" msgstr "" -#: src/xml/xmli18n-tmp.h:7691 +#: src/xml/xmli18n-tmp.h:7788 msgid "HP LaserJet 4" msgstr "" -#: src/xml/xmli18n-tmp.h:7692 +#: src/xml/xmli18n-tmp.h:7789 msgid "HP LaserJet 4L" msgstr "" -#: src/xml/xmli18n-tmp.h:7693 +#: src/xml/xmli18n-tmp.h:7790 msgid "HP LaserJet 4M" msgstr "" -#: src/xml/xmli18n-tmp.h:7694 +#: src/xml/xmli18n-tmp.h:7791 msgid "HP LaserJet 4ML" msgstr "" -#: src/xml/xmli18n-tmp.h:7695 +#: src/xml/xmli18n-tmp.h:7792 msgid "HP LaserJet 4P" msgstr "" -#: src/xml/xmli18n-tmp.h:7696 +#: src/xml/xmli18n-tmp.h:7793 msgid "HP LaserJet 4Si" msgstr "" -#: src/xml/xmli18n-tmp.h:7697 +#: src/xml/xmli18n-tmp.h:7794 msgid "HP LaserJet 4V" msgstr "" -#: src/xml/xmli18n-tmp.h:7698 +#: src/xml/xmli18n-tmp.h:7795 msgid "HP LaserJet 5" msgstr "" -#: src/xml/xmli18n-tmp.h:7699 +#: src/xml/xmli18n-tmp.h:7796 msgid "HP LaserJet 5L" msgstr "" -#: src/xml/xmli18n-tmp.h:7700 +#: src/xml/xmli18n-tmp.h:7797 msgid "HP LaserJet 5M" msgstr "" -#: src/xml/xmli18n-tmp.h:7701 +#: src/xml/xmli18n-tmp.h:7798 msgid "HP LaserJet 5MP" msgstr "" -#: src/xml/xmli18n-tmp.h:7702 +#: src/xml/xmli18n-tmp.h:7799 msgid "HP LaserJet 5P" msgstr "" -#: src/xml/xmli18n-tmp.h:7703 +#: src/xml/xmli18n-tmp.h:7800 msgid "HP LaserJet 5Si" msgstr "" -#: src/xml/xmli18n-tmp.h:7704 +#: src/xml/xmli18n-tmp.h:7801 msgid "HP LaserJet 6" msgstr "" -#: src/xml/xmli18n-tmp.h:7705 +#: src/xml/xmli18n-tmp.h:7802 msgid "HP LaserJet 6L" msgstr "" -#: src/xml/xmli18n-tmp.h:7706 +#: src/xml/xmli18n-tmp.h:7803 msgid "HP LaserJet 6MP" msgstr "" -#: src/xml/xmli18n-tmp.h:7707 +#: src/xml/xmli18n-tmp.h:7804 msgid "HP LaserJet 6P" msgstr "" -#: src/xml/xmli18n-tmp.h:7708 +#: src/xml/xmli18n-tmp.h:7805 msgid "HP LaserJet 1010" msgstr "" -#: src/xml/xmli18n-tmp.h:7709 +#: src/xml/xmli18n-tmp.h:7806 msgid "HP LaserJet 1012" msgstr "" -#: src/xml/xmli18n-tmp.h:7710 +#: src/xml/xmli18n-tmp.h:7807 msgid "HP LaserJet 1015" msgstr "" -#: src/xml/xmli18n-tmp.h:7711 +#: src/xml/xmli18n-tmp.h:7808 msgid "HP LaserJet 1022" msgstr "" -#: src/xml/xmli18n-tmp.h:7712 +#: src/xml/xmli18n-tmp.h:7809 msgid "HP LaserJet 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7713 +#: src/xml/xmli18n-tmp.h:7810 msgid "HP LaserJet 1100A" msgstr "" -#: src/xml/xmli18n-tmp.h:7714 +#: src/xml/xmli18n-tmp.h:7811 msgid "HP LaserJet 1150" msgstr "" -#: src/xml/xmli18n-tmp.h:7715 +#: src/xml/xmli18n-tmp.h:7812 msgid "HP LaserJet 1160" msgstr "" -#: src/xml/xmli18n-tmp.h:7716 +#: src/xml/xmli18n-tmp.h:7813 msgid "HP LaserJet 1200" msgstr "" -#: src/xml/xmli18n-tmp.h:7717 +#: src/xml/xmli18n-tmp.h:7814 msgid "HP LaserJet 1220" msgstr "" -#: src/xml/xmli18n-tmp.h:7718 +#: src/xml/xmli18n-tmp.h:7815 msgid "HP LaserJet 1300" msgstr "" -#: src/xml/xmli18n-tmp.h:7719 +#: src/xml/xmli18n-tmp.h:7816 msgid "HP LaserJet 1320" msgstr "" -#: src/xml/xmli18n-tmp.h:7720 +#: src/xml/xmli18n-tmp.h:7817 msgid "HP LaserJet 2100" msgstr "" -#: src/xml/xmli18n-tmp.h:7721 +#: src/xml/xmli18n-tmp.h:7818 msgid "HP LaserJet 2100M" msgstr "" -#: src/xml/xmli18n-tmp.h:7722 +#: src/xml/xmli18n-tmp.h:7819 msgid "HP LaserJet 2200" msgstr "" -#: src/xml/xmli18n-tmp.h:7723 +#: src/xml/xmli18n-tmp.h:7820 msgid "HP LaserJet 2300" msgstr "" -#: src/xml/xmli18n-tmp.h:7724 +#: src/xml/xmli18n-tmp.h:7821 msgid "HP LaserJet 2410" msgstr "" -#: src/xml/xmli18n-tmp.h:7725 +#: src/xml/xmli18n-tmp.h:7822 msgid "HP LaserJet 2420" msgstr "" -#: src/xml/xmli18n-tmp.h:7726 +#: src/xml/xmli18n-tmp.h:7823 msgid "HP LaserJet 2430" msgstr "" -#: src/xml/xmli18n-tmp.h:7727 +#: src/xml/xmli18n-tmp.h:7824 msgid "HP LaserJet 3015" msgstr "" -#: src/xml/xmli18n-tmp.h:7728 +#: src/xml/xmli18n-tmp.h:7825 msgid "HP LaserJet 3020" msgstr "" -#: src/xml/xmli18n-tmp.h:7729 +#: src/xml/xmli18n-tmp.h:7826 msgid "HP LaserJet 3030" msgstr "" -#: src/xml/xmli18n-tmp.h:7730 +#: src/xml/xmli18n-tmp.h:7827 msgid "HP LaserJet 3050" msgstr "" -#: src/xml/xmli18n-tmp.h:7731 +#: src/xml/xmli18n-tmp.h:7828 msgid "HP LaserJet 3052" msgstr "" -#: src/xml/xmli18n-tmp.h:7732 +#: src/xml/xmli18n-tmp.h:7829 msgid "HP LaserJet 3055" msgstr "" -#: src/xml/xmli18n-tmp.h:7733 +#: src/xml/xmli18n-tmp.h:7830 msgid "HP LaserJet 3200" msgstr "" -#: src/xml/xmli18n-tmp.h:7734 +#: src/xml/xmli18n-tmp.h:7831 msgid "HP LaserJet 3200m" msgstr "" -#: src/xml/xmli18n-tmp.h:7735 +#: src/xml/xmli18n-tmp.h:7832 msgid "HP LaserJet 3200se" msgstr "" -#: src/xml/xmli18n-tmp.h:7736 +#: src/xml/xmli18n-tmp.h:7833 msgid "HP LaserJet 3300 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7737 +#: src/xml/xmli18n-tmp.h:7834 msgid "HP LaserJet 3310 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7738 +#: src/xml/xmli18n-tmp.h:7835 msgid "HP LaserJet 3320 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7739 +#: src/xml/xmli18n-tmp.h:7836 msgid "HP LaserJet 3320N MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7740 +#: src/xml/xmli18n-tmp.h:7837 msgid "HP LaserJet 3330 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7741 +#: src/xml/xmli18n-tmp.h:7838 msgid "HP LaserJet 3380" msgstr "" -#: src/xml/xmli18n-tmp.h:7742 +#: src/xml/xmli18n-tmp.h:7839 msgid "HP LaserJet 3390" msgstr "" -#: src/xml/xmli18n-tmp.h:7743 +#: src/xml/xmli18n-tmp.h:7840 msgid "HP LaserJet 3392" msgstr "" -#: src/xml/xmli18n-tmp.h:7744 +#: src/xml/xmli18n-tmp.h:7841 msgid "HP LaserJet 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:7745 +#: src/xml/xmli18n-tmp.h:7842 msgid "HP LaserJet 4050" msgstr "" -#: src/xml/xmli18n-tmp.h:7746 +#: src/xml/xmli18n-tmp.h:7843 msgid "HP LaserJet 4100" msgstr "" -#: src/xml/xmli18n-tmp.h:7747 +#: src/xml/xmli18n-tmp.h:7844 msgid "HP LaserJet 4200" msgstr "" -#: src/xml/xmli18n-tmp.h:7748 +#: src/xml/xmli18n-tmp.h:7845 msgid "HP LaserJet 4240" msgstr "" -#: src/xml/xmli18n-tmp.h:7749 +#: src/xml/xmli18n-tmp.h:7846 msgid "HP LaserJet 4250" msgstr "" -#: src/xml/xmli18n-tmp.h:7750 +#: src/xml/xmli18n-tmp.h:7847 msgid "HP LaserJet 4300" msgstr "" -#: src/xml/xmli18n-tmp.h:7751 +#: src/xml/xmli18n-tmp.h:7848 msgid "HP LaserJet 4345 mfp" msgstr "" -#: src/xml/xmli18n-tmp.h:7752 +#: src/xml/xmli18n-tmp.h:7849 msgid "HP LaserJet 4350" msgstr "" -#: src/xml/xmli18n-tmp.h:7753 +#: src/xml/xmli18n-tmp.h:7850 msgid "HP LaserJet 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7754 +#: src/xml/xmli18n-tmp.h:7851 msgid "HP LaserJet 5100" msgstr "" -#: src/xml/xmli18n-tmp.h:7755 +#: src/xml/xmli18n-tmp.h:7852 msgid "HP LaserJet 5200" msgstr "" -#: src/xml/xmli18n-tmp.h:7756 +#: src/xml/xmli18n-tmp.h:7853 msgid "HP LaserJet 5200L" msgstr "" -#: src/xml/xmli18n-tmp.h:7757 +#: src/xml/xmli18n-tmp.h:7854 msgid "HP LaserJet 8000" msgstr "" -#: src/xml/xmli18n-tmp.h:7758 +#: src/xml/xmli18n-tmp.h:7855 msgid "HP LaserJet 8100" msgstr "" -#: src/xml/xmli18n-tmp.h:7759 +#: src/xml/xmli18n-tmp.h:7856 msgid "HP LaserJet 8150" msgstr "" -#: src/xml/xmli18n-tmp.h:7760 +#: src/xml/xmli18n-tmp.h:7857 msgid "HP LaserJet 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:7761 +#: src/xml/xmli18n-tmp.h:7858 msgid "HP LaserJet 9040" msgstr "" -#: src/xml/xmli18n-tmp.h:7762 +#: src/xml/xmli18n-tmp.h:7859 msgid "HP LaserJet 9040 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7763 +#: src/xml/xmli18n-tmp.h:7860 msgid "HP LaserJet 9050" msgstr "" -#: src/xml/xmli18n-tmp.h:7764 +#: src/xml/xmli18n-tmp.h:7861 msgid "HP LaserJet 9050 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7765 +#: src/xml/xmli18n-tmp.h:7862 msgid "HP LaserJet M3027 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7766 +#: src/xml/xmli18n-tmp.h:7863 msgid "HP LaserJet M3035 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7767 +#: src/xml/xmli18n-tmp.h:7864 msgid "HP LaserJet M4345 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7768 +#: src/xml/xmli18n-tmp.h:7865 msgid "HP LaserJet M5025 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7769 +#: src/xml/xmli18n-tmp.h:7866 msgid "HP LaserJet M5035 MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7770 +#: src/xml/xmli18n-tmp.h:7867 msgid "HP LaserJet P2010" msgstr "" -#: src/xml/xmli18n-tmp.h:7771 +#: src/xml/xmli18n-tmp.h:7868 msgid "HP LaserJet P2015" msgstr "" -#: src/xml/xmli18n-tmp.h:7772 +#: src/xml/xmli18n-tmp.h:7869 msgid "HP LaserJet P3004" msgstr "" -#: src/xml/xmli18n-tmp.h:7773 +#: src/xml/xmli18n-tmp.h:7870 msgid "HP LaserJet P3005" msgstr "" -#: src/xml/xmli18n-tmp.h:7774 +#: src/xml/xmli18n-tmp.h:7871 msgid "HP Mopier 240" msgstr "" -#: src/xml/xmli18n-tmp.h:7775 +#: src/xml/xmli18n-tmp.h:7872 msgid "HP Mopier 320" msgstr "" -#: src/xml/xmli18n-tmp.h:7776 +#: src/xml/xmli18n-tmp.h:7873 msgid "HP OfficeJet 300" msgstr "" -#: src/xml/xmli18n-tmp.h:7777 +#: src/xml/xmli18n-tmp.h:7874 msgid "HP OfficeJet 330" msgstr "" -#: src/xml/xmli18n-tmp.h:7778 +#: src/xml/xmli18n-tmp.h:7875 msgid "HP OfficeJet 350" msgstr "" -#: src/xml/xmli18n-tmp.h:7779 +#: src/xml/xmli18n-tmp.h:7876 msgid "HP OfficeJet 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7780 +#: src/xml/xmli18n-tmp.h:7877 msgid "HP OfficeJet 520" msgstr "" -#: src/xml/xmli18n-tmp.h:7781 +#: src/xml/xmli18n-tmp.h:7878 msgid "HP OfficeJet 570" msgstr "" -#: src/xml/xmli18n-tmp.h:7782 +#: src/xml/xmli18n-tmp.h:7879 msgid "HP OfficeJet 580" msgstr "" -#: src/xml/xmli18n-tmp.h:7783 +#: src/xml/xmli18n-tmp.h:7880 msgid "HP OfficeJet 590" msgstr "" -#: src/xml/xmli18n-tmp.h:7784 +#: src/xml/xmli18n-tmp.h:7881 msgid "HP OfficeJet 600" msgstr "" -#: src/xml/xmli18n-tmp.h:7785 +#: src/xml/xmli18n-tmp.h:7882 msgid "HP OfficeJet 610" msgstr "" -#: src/xml/xmli18n-tmp.h:7786 +#: src/xml/xmli18n-tmp.h:7883 msgid "HP OfficeJet 625" msgstr "" -#: src/xml/xmli18n-tmp.h:7787 +#: src/xml/xmli18n-tmp.h:7884 msgid "HP OfficeJet 630" msgstr "" -#: src/xml/xmli18n-tmp.h:7788 +#: src/xml/xmli18n-tmp.h:7885 msgid "HP OfficeJet 635" msgstr "" -#: src/xml/xmli18n-tmp.h:7789 +#: src/xml/xmli18n-tmp.h:7886 msgid "HP OfficeJet 700" msgstr "" -#: src/xml/xmli18n-tmp.h:7790 +#: src/xml/xmli18n-tmp.h:7887 msgid "HP OfficeJet 710" msgstr "" -#: src/xml/xmli18n-tmp.h:7791 +#: src/xml/xmli18n-tmp.h:7888 msgid "HP OfficeJet 720" msgstr "" -#: src/xml/xmli18n-tmp.h:7792 +#: src/xml/xmli18n-tmp.h:7889 msgid "HP OfficeJet 725" msgstr "" -#: src/xml/xmli18n-tmp.h:7793 +#: src/xml/xmli18n-tmp.h:7890 msgid "HP OfficeJet 5105" msgstr "" -#: src/xml/xmli18n-tmp.h:7794 +#: src/xml/xmli18n-tmp.h:7891 msgid "HP OfficeJet 5110" msgstr "" -#: src/xml/xmli18n-tmp.h:7795 +#: src/xml/xmli18n-tmp.h:7892 msgid "HP OfficeJet 5110xi" msgstr "" -#: src/xml/xmli18n-tmp.h:7796 +#: src/xml/xmli18n-tmp.h:7893 msgid "HP OfficeJet 6105" msgstr "" -#: src/xml/xmli18n-tmp.h:7797 +#: src/xml/xmli18n-tmp.h:7894 msgid "HP OfficeJet 6110" msgstr "" -#: src/xml/xmli18n-tmp.h:7798 +#: src/xml/xmli18n-tmp.h:7895 msgid "HP OfficeJet 7110" msgstr "" -#: src/xml/xmli18n-tmp.h:7799 +#: src/xml/xmli18n-tmp.h:7896 msgid "HP OfficeJet 7130" msgstr "" -#: src/xml/xmli18n-tmp.h:7800 +#: src/xml/xmli18n-tmp.h:7897 msgid "HP OfficeJet 7140" msgstr "" -#: src/xml/xmli18n-tmp.h:7801 +#: src/xml/xmli18n-tmp.h:7898 msgid "HP OfficeJet D125" msgstr "" -#: src/xml/xmli18n-tmp.h:7802 +#: src/xml/xmli18n-tmp.h:7899 msgid "HP OfficeJet D135" msgstr "" -#: src/xml/xmli18n-tmp.h:7803 +#: src/xml/xmli18n-tmp.h:7900 msgid "HP OfficeJet D145" msgstr "" -#: src/xml/xmli18n-tmp.h:7804 +#: src/xml/xmli18n-tmp.h:7901 msgid "HP OfficeJet D155" msgstr "" -#: src/xml/xmli18n-tmp.h:7805 +#: src/xml/xmli18n-tmp.h:7902 msgid "HP OfficeJet G55" msgstr "" -#: src/xml/xmli18n-tmp.h:7806 +#: src/xml/xmli18n-tmp.h:7903 msgid "HP OfficeJet G85" msgstr "" -#: src/xml/xmli18n-tmp.h:7807 +#: src/xml/xmli18n-tmp.h:7904 msgid "HP OfficeJet G95" msgstr "" -#: src/xml/xmli18n-tmp.h:7808 +#: src/xml/xmli18n-tmp.h:7905 msgid "HP OfficeJet K60" msgstr "" -#: src/xml/xmli18n-tmp.h:7809 +#: src/xml/xmli18n-tmp.h:7906 msgid "HP OfficeJet K60xi" msgstr "" -#: src/xml/xmli18n-tmp.h:7810 +#: src/xml/xmli18n-tmp.h:7907 msgid "HP OfficeJet K80" msgstr "" -#: src/xml/xmli18n-tmp.h:7811 +#: src/xml/xmli18n-tmp.h:7908 msgid "HP OfficeJet K80xi" msgstr "" -#: src/xml/xmli18n-tmp.h:7812 +#: src/xml/xmli18n-tmp.h:7909 msgid "HP OfficeJet LX" msgstr "" -#: src/xml/xmli18n-tmp.h:7813 +#: src/xml/xmli18n-tmp.h:7910 msgid "HP OfficeJet Pro 1150C" msgstr "" -#: src/xml/xmli18n-tmp.h:7814 +#: src/xml/xmli18n-tmp.h:7911 msgid "HP OfficeJet Pro 1170C" msgstr "" -#: src/xml/xmli18n-tmp.h:7815 +#: src/xml/xmli18n-tmp.h:7912 msgid "HP OfficeJet Pro 1175C" msgstr "" -#: src/xml/xmli18n-tmp.h:7816 +#: src/xml/xmli18n-tmp.h:7913 msgid "HP OfficeJet R40" msgstr "" -#: src/xml/xmli18n-tmp.h:7817 +#: src/xml/xmli18n-tmp.h:7914 msgid "HP OfficeJet R45" msgstr "" -#: src/xml/xmli18n-tmp.h:7818 +#: src/xml/xmli18n-tmp.h:7915 msgid "HP OfficeJet R60" msgstr "" -#: src/xml/xmli18n-tmp.h:7819 +#: src/xml/xmli18n-tmp.h:7916 msgid "HP OfficeJet R65" msgstr "" -#: src/xml/xmli18n-tmp.h:7820 +#: src/xml/xmli18n-tmp.h:7917 msgid "HP OfficeJet R80" msgstr "" -#: src/xml/xmli18n-tmp.h:7821 +#: src/xml/xmli18n-tmp.h:7918 msgid "HP OfficeJet T45" msgstr "" -#: src/xml/xmli18n-tmp.h:7822 +#: src/xml/xmli18n-tmp.h:7919 msgid "HP OfficeJet T65" msgstr "" -#: src/xml/xmli18n-tmp.h:7823 +#: src/xml/xmli18n-tmp.h:7920 msgid "HP OfficeJet V40" msgstr "" -#: src/xml/xmli18n-tmp.h:7824 +#: src/xml/xmli18n-tmp.h:7921 msgid "HP OfficeJet V40xi" msgstr "" -#: src/xml/xmli18n-tmp.h:7825 +#: src/xml/xmli18n-tmp.h:7922 msgid "HP OfficeJet" msgstr "" -#: src/xml/xmli18n-tmp.h:7826 +#: src/xml/xmli18n-tmp.h:7923 msgid "HP PSC 370" msgstr "" -#: src/xml/xmli18n-tmp.h:7827 +#: src/xml/xmli18n-tmp.h:7924 msgid "HP PSC 380" msgstr "" -#: src/xml/xmli18n-tmp.h:7828 +#: src/xml/xmli18n-tmp.h:7925 msgid "HP PSC 500" msgstr "" -#: src/xml/xmli18n-tmp.h:7829 +#: src/xml/xmli18n-tmp.h:7926 msgid "HP PSC 750" msgstr "" -#: src/xml/xmli18n-tmp.h:7830 +#: src/xml/xmli18n-tmp.h:7927 msgid "HP PSC 950" msgstr "" -#: src/xml/xmli18n-tmp.h:7831 +#: src/xml/xmli18n-tmp.h:7928 msgid "HP PSC 950xi" msgstr "" -#: src/xml/xmli18n-tmp.h:7832 +#: src/xml/xmli18n-tmp.h:7929 msgid "HP PSC 2110" msgstr "" -#: src/xml/xmli18n-tmp.h:7833 +#: src/xml/xmli18n-tmp.h:7930 msgid "HP PSC 2150" msgstr "" -#: src/xml/xmli18n-tmp.h:7834 +#: src/xml/xmli18n-tmp.h:7931 msgid "HP PSC 2210" msgstr "" -#: src/xml/xmli18n-tmp.h:7835 +#: src/xml/xmli18n-tmp.h:7932 msgid "HP PhotoSmart 7150" msgstr "" -#: src/xml/xmli18n-tmp.h:7836 +#: src/xml/xmli18n-tmp.h:7933 msgid "HP PhotoSmart 7345" msgstr "" -#: src/xml/xmli18n-tmp.h:7837 +#: src/xml/xmli18n-tmp.h:7934 msgid "HP PhotoSmart 7350" msgstr "" -#: src/xml/xmli18n-tmp.h:7838 +#: src/xml/xmli18n-tmp.h:7935 msgid "HP PhotoSmart 7550" msgstr "" -#: src/xml/xmli18n-tmp.h:7839 +#: src/xml/xmli18n-tmp.h:7936 msgid "HP PhotoSmart P100" msgstr "" -#: src/xml/xmli18n-tmp.h:7840 +#: src/xml/xmli18n-tmp.h:7937 msgid "HP PhotoSmart P130" msgstr "" -#: src/xml/xmli18n-tmp.h:7841 +#: src/xml/xmli18n-tmp.h:7938 msgid "HP PhotoSmart P230" msgstr "" -#: src/xml/xmli18n-tmp.h:7842 +#: src/xml/xmli18n-tmp.h:7939 msgid "HP PhotoSmart P1000" msgstr "" -#: src/xml/xmli18n-tmp.h:7843 +#: src/xml/xmli18n-tmp.h:7940 msgid "HP PhotoSmart P1100" msgstr "" -#: src/xml/xmli18n-tmp.h:7844 +#: src/xml/xmli18n-tmp.h:7941 msgid "HP PhotoSmart P1115" msgstr "" -#: src/xml/xmli18n-tmp.h:7845 +#: src/xml/xmli18n-tmp.h:7942 msgid "HP PhotoSmart P1215" msgstr "" -#: src/xml/xmli18n-tmp.h:7846 +#: src/xml/xmli18n-tmp.h:7943 msgid "HP PhotoSmart P1218" msgstr "" -#: src/xml/xmli18n-tmp.h:7847 +#: src/xml/xmli18n-tmp.h:7944 msgid "HP PhotoSmart P1315" msgstr "" -#: src/xml/xmli18n-tmp.h:7848 +#: src/xml/xmli18n-tmp.h:7945 msgid "HP e-printer e20" msgstr "" -#: src/xml/xmli18n-tmp.h:7849 +#: src/xml/xmli18n-tmp.h:7946 msgid "IBM 4019" msgstr "" -#: src/xml/xmli18n-tmp.h:7850 +#: src/xml/xmli18n-tmp.h:7947 msgid "IBM 4029 030 LaserPrinter 10" msgstr "" -#: src/xml/xmli18n-tmp.h:7851 +#: src/xml/xmli18n-tmp.h:7948 msgid "IBM 4312" msgstr "" -#: src/xml/xmli18n-tmp.h:7852 +#: src/xml/xmli18n-tmp.h:7949 msgid "IBM Infoprint 12" msgstr "" -#: src/xml/xmli18n-tmp.h:7853 +#: src/xml/xmli18n-tmp.h:7950 msgid "IBM Page Printer 3112" msgstr "" -#: src/xml/xmli18n-tmp.h:7854 +#: src/xml/xmli18n-tmp.h:7951 msgid "Infotec 4353 MF" msgstr "" -#: src/xml/xmli18n-tmp.h:7855 +#: src/xml/xmli18n-tmp.h:7952 msgid "Infotec 4452 MF" msgstr "" -#: src/xml/xmli18n-tmp.h:7856 +#: src/xml/xmli18n-tmp.h:7953 msgid "Infotec 4651 MF" msgstr "" -#: src/xml/xmli18n-tmp.h:7857 +#: src/xml/xmli18n-tmp.h:7954 msgid "Infotec IS2022" msgstr "" -#: src/xml/xmli18n-tmp.h:7858 +#: src/xml/xmli18n-tmp.h:7955 msgid "Infotec IS2027" msgstr "" -#: src/xml/xmli18n-tmp.h:7859 +#: src/xml/xmli18n-tmp.h:7956 msgid "Infotec IS2032" msgstr "" -#: src/xml/xmli18n-tmp.h:7860 +#: src/xml/xmli18n-tmp.h:7957 msgid "Infotec IS2035" msgstr "" -#: src/xml/xmli18n-tmp.h:7861 +#: src/xml/xmli18n-tmp.h:7958 msgid "Infotec IS2045" msgstr "" -#: src/xml/xmli18n-tmp.h:7862 +#: src/xml/xmli18n-tmp.h:7959 msgid "Infotec IS2090" msgstr "" -#: src/xml/xmli18n-tmp.h:7863 +#: src/xml/xmli18n-tmp.h:7960 msgid "Infotec IS2105" msgstr "" -#: src/xml/xmli18n-tmp.h:7864 +#: src/xml/xmli18n-tmp.h:7961 msgid "Infotec IS 2015" msgstr "" -#: src/xml/xmli18n-tmp.h:7865 +#: src/xml/xmli18n-tmp.h:7962 msgid "Infotec IS 2018" msgstr "" -#: src/xml/xmli18n-tmp.h:7866 +#: src/xml/xmli18n-tmp.h:7963 msgid "Infotec IS 2018D" msgstr "" -#: src/xml/xmli18n-tmp.h:7867 +#: src/xml/xmli18n-tmp.h:7964 msgid "Infotec IS 2060" msgstr "" -#: src/xml/xmli18n-tmp.h:7868 +#: src/xml/xmli18n-tmp.h:7965 msgid "Infotec IS 2075" msgstr "" -#: src/xml/xmli18n-tmp.h:7869 +#: src/xml/xmli18n-tmp.h:7966 msgid "Infotec IS 2122" msgstr "" -#: src/xml/xmli18n-tmp.h:7870 +#: src/xml/xmli18n-tmp.h:7967 msgid "Infotec IS 2127" msgstr "" -#: src/xml/xmli18n-tmp.h:7871 +#: src/xml/xmli18n-tmp.h:7968 msgid "Infotec IS 2132" msgstr "" -#: src/xml/xmli18n-tmp.h:7872 +#: src/xml/xmli18n-tmp.h:7969 msgid "Infotec IS 2135" msgstr "" -#: src/xml/xmli18n-tmp.h:7873 +#: src/xml/xmli18n-tmp.h:7970 msgid "Infotec IS 2145" msgstr "" -#: src/xml/xmli18n-tmp.h:7874 +#: src/xml/xmli18n-tmp.h:7971 msgid "Infotec IS 2151" msgstr "" -#: src/xml/xmli18n-tmp.h:7875 +#: src/xml/xmli18n-tmp.h:7972 msgid "Infotec IS 2160" msgstr "" -#: src/xml/xmli18n-tmp.h:7876 +#: src/xml/xmli18n-tmp.h:7973 msgid "Infotec IS 2175" msgstr "" -#: src/xml/xmli18n-tmp.h:7877 +#: src/xml/xmli18n-tmp.h:7974 msgid "Infotec IS 2215" msgstr "" -#: src/xml/xmli18n-tmp.h:7878 +#: src/xml/xmli18n-tmp.h:7975 msgid "Infotec IS 2216" msgstr "" -#: src/xml/xmli18n-tmp.h:7879 +#: src/xml/xmli18n-tmp.h:7976 msgid "Infotec IS 2220" msgstr "" -#: src/xml/xmli18n-tmp.h:7880 +#: src/xml/xmli18n-tmp.h:7977 msgid "Infotec IS 2220D" msgstr "" -#: src/xml/xmli18n-tmp.h:7881 +#: src/xml/xmli18n-tmp.h:7978 msgid "Infotec IS 2225" msgstr "" -#: src/xml/xmli18n-tmp.h:7882 +#: src/xml/xmli18n-tmp.h:7979 msgid "Infotec IS 2230" msgstr "" -#: src/xml/xmli18n-tmp.h:7883 +#: src/xml/xmli18n-tmp.h:7980 msgid "Infotec IS 2235" msgstr "" -#: src/xml/xmli18n-tmp.h:7884 +#: src/xml/xmli18n-tmp.h:7981 msgid "Infotec IS 2245" msgstr "" -#: src/xml/xmli18n-tmp.h:7885 +#: src/xml/xmli18n-tmp.h:7982 msgid "Infotec IS 2255" msgstr "" -#: src/xml/xmli18n-tmp.h:7886 +#: src/xml/xmli18n-tmp.h:7983 msgid "Infotec IS 2265" msgstr "" -#: src/xml/xmli18n-tmp.h:7887 +#: src/xml/xmli18n-tmp.h:7984 msgid "Infotec IS 2275" msgstr "" -#: src/xml/xmli18n-tmp.h:7888 +#: src/xml/xmli18n-tmp.h:7985 msgid "Infotec IS 2316" msgstr "" -#: src/xml/xmli18n-tmp.h:7889 +#: src/xml/xmli18n-tmp.h:7986 msgid "Infotec IS 2320" msgstr "" -#: src/xml/xmli18n-tmp.h:7890 +#: src/xml/xmli18n-tmp.h:7987 msgid "Infotec IS 2325" msgstr "" -#: src/xml/xmli18n-tmp.h:7891 +#: src/xml/xmli18n-tmp.h:7988 msgid "Infotec IS 2416" msgstr "" -#: src/xml/xmli18n-tmp.h:7892 +#: src/xml/xmli18n-tmp.h:7989 msgid "Infotec IS 2425" msgstr "" -#: src/xml/xmli18n-tmp.h:7893 +#: src/xml/xmli18n-tmp.h:7990 msgid "Infotec IS 2430" msgstr "" -#: src/xml/xmli18n-tmp.h:7894 +#: src/xml/xmli18n-tmp.h:7991 msgid "Infotec IS 2435" msgstr "" -#: src/xml/xmli18n-tmp.h:7895 +#: src/xml/xmli18n-tmp.h:7992 msgid "Infotec IS 2445" msgstr "" -#: src/xml/xmli18n-tmp.h:7896 +#: src/xml/xmli18n-tmp.h:7993 msgid "Infotec IS 3090" msgstr "" -#: src/xml/xmli18n-tmp.h:7897 +#: src/xml/xmli18n-tmp.h:7994 msgid "Infotec IS 3110" msgstr "" -#: src/xml/xmli18n-tmp.h:7898 +#: src/xml/xmli18n-tmp.h:7995 msgid "Infotec IS 3135" msgstr "" -#: src/xml/xmli18n-tmp.h:7899 +#: src/xml/xmli18n-tmp.h:7996 msgid "Infotec MP 2550" msgstr "" -#: src/xml/xmli18n-tmp.h:7900 +#: src/xml/xmli18n-tmp.h:7997 msgid "Infotec MP 2550B" msgstr "" -#: src/xml/xmli18n-tmp.h:7901 +#: src/xml/xmli18n-tmp.h:7998 msgid "Infotec MP 3350" msgstr "" -#: src/xml/xmli18n-tmp.h:7902 +#: src/xml/xmli18n-tmp.h:7999 msgid "Infotec MP 3350B" msgstr "" -#: src/xml/xmli18n-tmp.h:7903 +#: src/xml/xmli18n-tmp.h:8000 msgid "Infotec MP 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:7904 +#: src/xml/xmli18n-tmp.h:8001 msgid "Infotec MP 4000B" msgstr "" -#: src/xml/xmli18n-tmp.h:7905 +#: src/xml/xmli18n-tmp.h:8002 msgid "Infotec MP 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:7906 +#: src/xml/xmli18n-tmp.h:8003 msgid "Infotec MP 5000B" msgstr "" -#: src/xml/xmli18n-tmp.h:7907 +#: src/xml/xmli18n-tmp.h:8004 msgid "Kyocera CS-1815" msgstr "" -#: src/xml/xmli18n-tmp.h:7908 +#: src/xml/xmli18n-tmp.h:8005 msgid "Kyocera F-1010" msgstr "" -#: src/xml/xmli18n-tmp.h:7909 +#: src/xml/xmli18n-tmp.h:8006 msgid "Kyocera FS-600 - KPDL-2" msgstr "" -#: src/xml/xmli18n-tmp.h:7910 +#: src/xml/xmli18n-tmp.h:8007 msgid "Kyocera FS-600" msgstr "" -#: src/xml/xmli18n-tmp.h:7911 +#: src/xml/xmli18n-tmp.h:8008 msgid "Kyocera FS-680" msgstr "" -#: src/xml/xmli18n-tmp.h:7912 +#: src/xml/xmli18n-tmp.h:8009 msgid "Kyocera FS-800" msgstr "" -#: src/xml/xmli18n-tmp.h:7913 +#: src/xml/xmli18n-tmp.h:8010 msgid "Kyocera FS-920" msgstr "" -#: src/xml/xmli18n-tmp.h:7914 +#: src/xml/xmli18n-tmp.h:8011 msgid "Kyocera FS-1000" msgstr "" -#: src/xml/xmli18n-tmp.h:7915 +#: src/xml/xmli18n-tmp.h:8012 msgid "Kyocera FS-1000+" msgstr "" -#: src/xml/xmli18n-tmp.h:7916 +#: src/xml/xmli18n-tmp.h:8013 msgid "Kyocera FS-1010" msgstr "" -#: src/xml/xmli18n-tmp.h:7917 +#: src/xml/xmli18n-tmp.h:8014 msgid "Kyocera FS-1018MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7918 +#: src/xml/xmli18n-tmp.h:8015 msgid "Kyocera FS-1020D" msgstr "" -#: src/xml/xmli18n-tmp.h:7919 +#: src/xml/xmli18n-tmp.h:8016 msgid "Kyocera FS-1030D" msgstr "" -#: src/xml/xmli18n-tmp.h:7920 +#: src/xml/xmli18n-tmp.h:8017 msgid "Kyocera FS-1050" msgstr "" -#: src/xml/xmli18n-tmp.h:7921 +#: src/xml/xmli18n-tmp.h:8018 msgid "Kyocera FS-1118MFP" msgstr "" -#: src/xml/xmli18n-tmp.h:7922 +#: src/xml/xmli18n-tmp.h:8019 msgid "Kyocera FS-1200" msgstr "" -#: src/xml/xmli18n-tmp.h:7923 +#: src/xml/xmli18n-tmp.h:8020 msgid "Kyocera FS-1600" msgstr "" -#: src/xml/xmli18n-tmp.h:7924 +#: src/xml/xmli18n-tmp.h:8021 msgid "Kyocera FS-1600+" msgstr "" -#: src/xml/xmli18n-tmp.h:7925 +#: src/xml/xmli18n-tmp.h:8022 msgid "Kyocera FS-1700" msgstr "" -#: src/xml/xmli18n-tmp.h:7926 +#: src/xml/xmli18n-tmp.h:8023 msgid "Kyocera FS-1700+" msgstr "" -#: src/xml/xmli18n-tmp.h:7927 +#: src/xml/xmli18n-tmp.h:8024 msgid "Kyocera FS-1714M" msgstr "" -#: src/xml/xmli18n-tmp.h:7928 +#: src/xml/xmli18n-tmp.h:8025 msgid "Kyocera FS-1750" msgstr "" -#: src/xml/xmli18n-tmp.h:7929 +#: src/xml/xmli18n-tmp.h:8026 msgid "Kyocera FS-1800" msgstr "" -#: src/xml/xmli18n-tmp.h:7930 +#: src/xml/xmli18n-tmp.h:8027 msgid "Kyocera FS-1800+" msgstr "" -#: src/xml/xmli18n-tmp.h:7931 +#: src/xml/xmli18n-tmp.h:8028 msgid "Kyocera FS-1900" msgstr "" -#: src/xml/xmli18n-tmp.h:7932 +#: src/xml/xmli18n-tmp.h:8029 msgid "Kyocera FS-1920" msgstr "" -#: src/xml/xmli18n-tmp.h:7933 +#: src/xml/xmli18n-tmp.h:8030 msgid "Kyocera FS-2000D" msgstr "" -#: src/xml/xmli18n-tmp.h:7934 +#: src/xml/xmli18n-tmp.h:8031 msgid "Kyocera FS-3500" msgstr "" -#: src/xml/xmli18n-tmp.h:7935 +#: src/xml/xmli18n-tmp.h:8032 msgid "Kyocera FS-3600" msgstr "" -#: src/xml/xmli18n-tmp.h:7936 +#: src/xml/xmli18n-tmp.h:8033 msgid "Kyocera FS-3600+" msgstr "" -#: src/xml/xmli18n-tmp.h:7937 +#: src/xml/xmli18n-tmp.h:8034 msgid "Kyocera FS-3700" msgstr "" -#: src/xml/xmli18n-tmp.h:7938 +#: src/xml/xmli18n-tmp.h:8035 msgid "Kyocera FS-3700+" msgstr "" -#: src/xml/xmli18n-tmp.h:7939 +#: src/xml/xmli18n-tmp.h:8036 msgid "Kyocera FS-3718M" msgstr "" -#: src/xml/xmli18n-tmp.h:7940 +#: src/xml/xmli18n-tmp.h:8037 msgid "Kyocera FS-3750" msgstr "" -#: src/xml/xmli18n-tmp.h:7941 +#: src/xml/xmli18n-tmp.h:8038 msgid "Kyocera FS-3800" msgstr "" -#: src/xml/xmli18n-tmp.h:7942 +#: src/xml/xmli18n-tmp.h:8039 msgid "Kyocera FS-3820N" msgstr "" -#: src/xml/xmli18n-tmp.h:7943 +#: src/xml/xmli18n-tmp.h:8040 msgid "Kyocera FS-3830N" msgstr "" -#: src/xml/xmli18n-tmp.h:7944 +#: src/xml/xmli18n-tmp.h:8041 msgid "Kyocera FS-3900DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7945 +#: src/xml/xmli18n-tmp.h:8042 msgid "Kyocera FS-4000DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7946 +#: src/xml/xmli18n-tmp.h:8043 msgid "Kyocera FS-5800C" msgstr "" -#: src/xml/xmli18n-tmp.h:7947 +#: src/xml/xmli18n-tmp.h:8044 msgid "Kyocera FS-5900C" msgstr "" -#: src/xml/xmli18n-tmp.h:7948 +#: src/xml/xmli18n-tmp.h:8045 msgid "Kyocera FS-6020" msgstr "" -#: src/xml/xmli18n-tmp.h:7949 +#: src/xml/xmli18n-tmp.h:8046 msgid "Kyocera FS-6026" msgstr "" -#: src/xml/xmli18n-tmp.h:7950 +#: src/xml/xmli18n-tmp.h:8047 msgid "Kyocera FS-6300" msgstr "" -#: src/xml/xmli18n-tmp.h:7951 +#: src/xml/xmli18n-tmp.h:8048 msgid "Kyocera FS-6500" msgstr "" -#: src/xml/xmli18n-tmp.h:7952 +#: src/xml/xmli18n-tmp.h:8049 msgid "Kyocera FS-6500+" msgstr "" -#: src/xml/xmli18n-tmp.h:7953 +#: src/xml/xmli18n-tmp.h:8050 msgid "Kyocera FS-6700" msgstr "" -#: src/xml/xmli18n-tmp.h:7954 +#: src/xml/xmli18n-tmp.h:8051 msgid "Kyocera FS-6750" msgstr "" -#: src/xml/xmli18n-tmp.h:7955 +#: src/xml/xmli18n-tmp.h:8052 msgid "Kyocera FS-6900" msgstr "" -#: src/xml/xmli18n-tmp.h:7956 +#: src/xml/xmli18n-tmp.h:8053 msgid "Kyocera FS-6950DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7957 +#: src/xml/xmli18n-tmp.h:8054 msgid "Kyocera FS-7000" msgstr "" -#: src/xml/xmli18n-tmp.h:7958 +#: src/xml/xmli18n-tmp.h:8055 msgid "Kyocera FS-7000+" msgstr "" -#: src/xml/xmli18n-tmp.h:7959 +#: src/xml/xmli18n-tmp.h:8056 msgid "Kyocera FS-7028M" msgstr "" -#: src/xml/xmli18n-tmp.h:7960 +#: src/xml/xmli18n-tmp.h:8057 msgid "Kyocera FS-8000C" msgstr "" -#: src/xml/xmli18n-tmp.h:7961 +#: src/xml/xmli18n-tmp.h:8058 msgid "Kyocera FS-9000" msgstr "" -#: src/xml/xmli18n-tmp.h:7962 +#: src/xml/xmli18n-tmp.h:8059 msgid "Kyocera FS-9100DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7963 +#: src/xml/xmli18n-tmp.h:8060 msgid "Kyocera FS-9130DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7964 +#: src/xml/xmli18n-tmp.h:8061 msgid "Kyocera FS-9500DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7965 +#: src/xml/xmli18n-tmp.h:8062 msgid "Kyocera FS-9530DN" msgstr "" -#: src/xml/xmli18n-tmp.h:7966 +#: src/xml/xmli18n-tmp.h:8063 msgid "Kyocera KM-1510" msgstr "" -#: src/xml/xmli18n-tmp.h:7967 +#: src/xml/xmli18n-tmp.h:8064 msgid "Kyocera KM-1530" msgstr "" -#: src/xml/xmli18n-tmp.h:7968 +#: src/xml/xmli18n-tmp.h:8065 msgid "Kyocera KM-1810" msgstr "" -#: src/xml/xmli18n-tmp.h:7969 +#: src/xml/xmli18n-tmp.h:8066 msgid "Kyocera KM-1815" msgstr "" -#: src/xml/xmli18n-tmp.h:7970 +#: src/xml/xmli18n-tmp.h:8067 msgid "Kyocera KM-1820" msgstr "" -#: src/xml/xmli18n-tmp.h:7971 +#: src/xml/xmli18n-tmp.h:8068 msgid "Kyocera KM-2030" msgstr "" -#: src/xml/xmli18n-tmp.h:7972 +#: src/xml/xmli18n-tmp.h:8069 msgid "Kyocera KM-2530" msgstr "" -#: src/xml/xmli18n-tmp.h:7973 +#: src/xml/xmli18n-tmp.h:8070 msgid "Kyocera KM-3050" msgstr "" -#: src/xml/xmli18n-tmp.h:7974 +#: src/xml/xmli18n-tmp.h:8071 msgid "Kyocera KM-3530" msgstr "" -#: src/xml/xmli18n-tmp.h:7975 +#: src/xml/xmli18n-tmp.h:8072 msgid "Kyocera KM-4050" msgstr "" -#: src/xml/xmli18n-tmp.h:7976 +#: src/xml/xmli18n-tmp.h:8073 msgid "Kyocera KM-4230" msgstr "" -#: src/xml/xmli18n-tmp.h:7977 +#: src/xml/xmli18n-tmp.h:8074 msgid "Kyocera KM-4230/5230" msgstr "" -#: src/xml/xmli18n-tmp.h:7978 +#: src/xml/xmli18n-tmp.h:8075 msgid "Kyocera KM-4530" msgstr "" -#: src/xml/xmli18n-tmp.h:7979 +#: src/xml/xmli18n-tmp.h:8076 msgid "Kyocera KM-5050" msgstr "" -#: src/xml/xmli18n-tmp.h:7980 +#: src/xml/xmli18n-tmp.h:8077 msgid "Kyocera KM-5230" msgstr "" -#: src/xml/xmli18n-tmp.h:7981 +#: src/xml/xmli18n-tmp.h:8078 msgid "Kyocera KM-5530" msgstr "" -#: src/xml/xmli18n-tmp.h:7982 +#: src/xml/xmli18n-tmp.h:8079 msgid "Kyocera KM-6030" msgstr "" -#: src/xml/xmli18n-tmp.h:7983 +#: src/xml/xmli18n-tmp.h:8080 msgid "Kyocera KM-6230" msgstr "" -#: src/xml/xmli18n-tmp.h:7984 +#: src/xml/xmli18n-tmp.h:8081 msgid "Kyocera KM-8030" msgstr "" -#: src/xml/xmli18n-tmp.h:7985 +#: src/xml/xmli18n-tmp.h:8082 msgid "Lanier 5622" msgstr "" -#: src/xml/xmli18n-tmp.h:7986 +#: src/xml/xmli18n-tmp.h:8083 msgid "Lanier 5627" msgstr "" -#: src/xml/xmli18n-tmp.h:7987 +#: src/xml/xmli18n-tmp.h:8084 msgid "Lanier 5632" msgstr "" -#: src/xml/xmli18n-tmp.h:7988 +#: src/xml/xmli18n-tmp.h:8085 msgid "Lanier 5635" msgstr "" -#: src/xml/xmli18n-tmp.h:7989 +#: src/xml/xmli18n-tmp.h:8086 msgid "Lanier 5645" msgstr "" -#: src/xml/xmli18n-tmp.h:7990 +#: src/xml/xmli18n-tmp.h:8087 msgid "Lanier LD0105" msgstr "" -#: src/xml/xmli18n-tmp.h:7991 +#: src/xml/xmli18n-tmp.h:8088 msgid "Lanier LD015" msgstr "" -#: src/xml/xmli18n-tmp.h:7992 +#: src/xml/xmli18n-tmp.h:8089 msgid "Lanier LD035" msgstr "" -#: src/xml/xmli18n-tmp.h:7993 +#: src/xml/xmli18n-tmp.h:8090 msgid "Lanier LD045" msgstr "" -#: src/xml/xmli18n-tmp.h:7994 +#: src/xml/xmli18n-tmp.h:8091 msgid "Lanier LD060" msgstr "" -#: src/xml/xmli18n-tmp.h:7995 +#: src/xml/xmli18n-tmp.h:8092 msgid "Lanier LD075" msgstr "" -#: src/xml/xmli18n-tmp.h:7996 +#: src/xml/xmli18n-tmp.h:8093 msgid "Lanier LD090" msgstr "" -#: src/xml/xmli18n-tmp.h:7997 +#: src/xml/xmli18n-tmp.h:8094 msgid "Lanier LD115" msgstr "" -#: src/xml/xmli18n-tmp.h:7998 +#: src/xml/xmli18n-tmp.h:8095 msgid "Lanier LD116" msgstr "" -#: src/xml/xmli18n-tmp.h:7999 +#: src/xml/xmli18n-tmp.h:8096 msgid "Lanier LD118" msgstr "" -#: src/xml/xmli18n-tmp.h:8000 +#: src/xml/xmli18n-tmp.h:8097 msgid "Lanier LD118d" msgstr "" -#: src/xml/xmli18n-tmp.h:8001 +#: src/xml/xmli18n-tmp.h:8098 msgid "Lanier LD120" msgstr "" -#: src/xml/xmli18n-tmp.h:8002 +#: src/xml/xmli18n-tmp.h:8099 msgid "Lanier LD120d" msgstr "" -#: src/xml/xmli18n-tmp.h:8003 +#: src/xml/xmli18n-tmp.h:8100 msgid "Lanier LD122" msgstr "" -#: src/xml/xmli18n-tmp.h:8004 +#: src/xml/xmli18n-tmp.h:8101 msgid "Lanier LD127" msgstr "" -#: src/xml/xmli18n-tmp.h:8005 +#: src/xml/xmli18n-tmp.h:8102 msgid "Lanier LD132" msgstr "" -#: src/xml/xmli18n-tmp.h:8006 +#: src/xml/xmli18n-tmp.h:8103 msgid "Lanier LD135" msgstr "" -#: src/xml/xmli18n-tmp.h:8007 +#: src/xml/xmli18n-tmp.h:8104 msgid "Lanier LD145" msgstr "" -#: src/xml/xmli18n-tmp.h:8008 +#: src/xml/xmli18n-tmp.h:8105 msgid "Lanier LD151" msgstr "" -#: src/xml/xmli18n-tmp.h:8009 +#: src/xml/xmli18n-tmp.h:8106 msgid "Lanier LD160" msgstr "" -#: src/xml/xmli18n-tmp.h:8010 +#: src/xml/xmli18n-tmp.h:8107 msgid "Lanier LD175" msgstr "" -#: src/xml/xmli18n-tmp.h:8011 +#: src/xml/xmli18n-tmp.h:8108 msgid "Lanier LD225" msgstr "" -#: src/xml/xmli18n-tmp.h:8012 +#: src/xml/xmli18n-tmp.h:8109 msgid "Lanier LD230" msgstr "" -#: src/xml/xmli18n-tmp.h:8013 +#: src/xml/xmli18n-tmp.h:8110 msgid "Lanier LD235" msgstr "" -#: src/xml/xmli18n-tmp.h:8014 +#: src/xml/xmli18n-tmp.h:8111 msgid "Lanier LD245" msgstr "" -#: src/xml/xmli18n-tmp.h:8015 +#: src/xml/xmli18n-tmp.h:8112 msgid "Lanier MP2500/LD125" msgstr "" -#: src/xml/xmli18n-tmp.h:8016 +#: src/xml/xmli18n-tmp.h:8113 msgid "Lanier MP 1100/LD1100" msgstr "" -#: src/xml/xmli18n-tmp.h:8017 +#: src/xml/xmli18n-tmp.h:8114 msgid "Lanier MP 1350/LD1135" msgstr "" -#: src/xml/xmli18n-tmp.h:8018 +#: src/xml/xmli18n-tmp.h:8115 msgid "Lanier MP 1600/LD316" msgstr "" -#: src/xml/xmli18n-tmp.h:8019 +#: src/xml/xmli18n-tmp.h:8116 msgid "Lanier MP 161/LD016" msgstr "" -#: src/xml/xmli18n-tmp.h:8020 +#: src/xml/xmli18n-tmp.h:8117 msgid "Lanier MP 2000/LD320d" msgstr "" -#: src/xml/xmli18n-tmp.h:8021 +#: src/xml/xmli18n-tmp.h:8118 msgid "Lanier MP 2510/LD325" msgstr "" -#: src/xml/xmli18n-tmp.h:8022 +#: src/xml/xmli18n-tmp.h:8119 msgid "Lanier MP 2550B/LD425B" msgstr "" -#: src/xml/xmli18n-tmp.h:8023 +#: src/xml/xmli18n-tmp.h:8120 msgid "Lanier MP 2550/LD425" msgstr "" -#: src/xml/xmli18n-tmp.h:8024 +#: src/xml/xmli18n-tmp.h:8121 msgid "Lanier MP 3010/LD330" msgstr "" -#: src/xml/xmli18n-tmp.h:8025 +#: src/xml/xmli18n-tmp.h:8122 msgid "Lanier MP 3350B/LD433B" msgstr "" -#: src/xml/xmli18n-tmp.h:8026 +#: src/xml/xmli18n-tmp.h:8123 msgid "Lanier MP 3350/LD433" msgstr "" -#: src/xml/xmli18n-tmp.h:8027 +#: src/xml/xmli18n-tmp.h:8124 msgid "Lanier MP 3500/LD335" msgstr "" -#: src/xml/xmli18n-tmp.h:8028 +#: src/xml/xmli18n-tmp.h:8125 msgid "Lanier MP 4000B/LD040B" msgstr "" -#: src/xml/xmli18n-tmp.h:8029 +#: src/xml/xmli18n-tmp.h:8126 msgid "Lanier MP 4000/LD040" msgstr "" -#: src/xml/xmli18n-tmp.h:8030 +#: src/xml/xmli18n-tmp.h:8127 msgid "Lanier MP 4500/LD345" msgstr "" -#: src/xml/xmli18n-tmp.h:8031 +#: src/xml/xmli18n-tmp.h:8128 msgid "Lanier MP 5000B/LD050B" msgstr "" -#: src/xml/xmli18n-tmp.h:8032 +#: src/xml/xmli18n-tmp.h:8129 msgid "Lanier MP 5000/LD050" msgstr "" -#: src/xml/xmli18n-tmp.h:8033 +#: src/xml/xmli18n-tmp.h:8130 msgid "Lanier MP 5500/LD255" msgstr "" -#: src/xml/xmli18n-tmp.h:8034 +#: src/xml/xmli18n-tmp.h:8131 msgid "Lanier MP 6500/LD265" msgstr "" -#: src/xml/xmli18n-tmp.h:8035 +#: src/xml/xmli18n-tmp.h:8132 msgid "Lanier MP 7500/LD275" msgstr "" -#: src/xml/xmli18n-tmp.h:8036 +#: src/xml/xmli18n-tmp.h:8133 msgid "Lanier MP 9000/LD190" msgstr "" -#: src/xml/xmli18n-tmp.h:8037 +#: src/xml/xmli18n-tmp.h:8134 msgid "Lexmark 4076" msgstr "" -#: src/xml/xmli18n-tmp.h:8038 +#: src/xml/xmli18n-tmp.h:8135 msgid "Lexmark Optra E" msgstr "" -#: src/xml/xmli18n-tmp.h:8039 +#: src/xml/xmli18n-tmp.h:8136 msgid "Lexmark Optra E+" msgstr "" -#: src/xml/xmli18n-tmp.h:8040 +#: src/xml/xmli18n-tmp.h:8137 msgid "Lexmark Optra E220" msgstr "" -#: src/xml/xmli18n-tmp.h:8041 +#: src/xml/xmli18n-tmp.h:8138 msgid "Lexmark Optra E321" msgstr "" -#: src/xml/xmli18n-tmp.h:8042 +#: src/xml/xmli18n-tmp.h:8139 msgid "Lexmark Optra E323" msgstr "" -#: src/xml/xmli18n-tmp.h:8043 +#: src/xml/xmli18n-tmp.h:8140 msgid "Lexmark Valuewriter 300" msgstr "" -#: src/xml/xmli18n-tmp.h:8044 +#: src/xml/xmli18n-tmp.h:8141 msgid "Minolta PagePro 6" msgstr "" -#: src/xml/xmli18n-tmp.h:8045 +#: src/xml/xmli18n-tmp.h:8142 msgid "Minolta PagePro 6e" msgstr "" -#: src/xml/xmli18n-tmp.h:8046 +#: src/xml/xmli18n-tmp.h:8143 msgid "Minolta PagePro 6ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8047 +#: src/xml/xmli18n-tmp.h:8144 msgid "Minolta PagePro 8" msgstr "" -#: src/xml/xmli18n-tmp.h:8048 +#: src/xml/xmli18n-tmp.h:8145 msgid "Minolta PagePro 8L" msgstr "" -#: src/xml/xmli18n-tmp.h:8049 +#: src/xml/xmli18n-tmp.h:8146 msgid "Minolta PagePro 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:8050 +#: src/xml/xmli18n-tmp.h:8147 msgid "NEC SuperScript 660i" msgstr "" -#: src/xml/xmli18n-tmp.h:8051 +#: src/xml/xmli18n-tmp.h:8148 msgid "NEC SuperScript 860" msgstr "" -#: src/xml/xmli18n-tmp.h:8052 +#: src/xml/xmli18n-tmp.h:8149 msgid "NEC SuperScript 870" msgstr "" -#: src/xml/xmli18n-tmp.h:8053 +#: src/xml/xmli18n-tmp.h:8150 msgid "NEC SuperScript 1260" msgstr "" -#: src/xml/xmli18n-tmp.h:8054 +#: src/xml/xmli18n-tmp.h:8151 msgid "NEC SuperScript 1400" msgstr "" -#: src/xml/xmli18n-tmp.h:8055 +#: src/xml/xmli18n-tmp.h:8152 msgid "NEC SuperScript 1800" msgstr "" -#: src/xml/xmli18n-tmp.h:8056 +#: src/xml/xmli18n-tmp.h:8153 msgid "NRG 10515/10518/10512" msgstr "" -#: src/xml/xmli18n-tmp.h:8057 +#: src/xml/xmli18n-tmp.h:8154 msgid "NRG 2205/2238/2212" msgstr "" -#: src/xml/xmli18n-tmp.h:8058 +#: src/xml/xmli18n-tmp.h:8155 msgid "NRG 2705/2738/2712" msgstr "" -#: src/xml/xmli18n-tmp.h:8059 +#: src/xml/xmli18n-tmp.h:8156 msgid "NRG 3205/3238/3212" msgstr "" -#: src/xml/xmli18n-tmp.h:8060 +#: src/xml/xmli18n-tmp.h:8157 msgid "NRG 3525/3508/3502" msgstr "" -#: src/xml/xmli18n-tmp.h:8061 +#: src/xml/xmli18n-tmp.h:8158 msgid "NRG 3545/3518/3532" msgstr "" -#: src/xml/xmli18n-tmp.h:8062 +#: src/xml/xmli18n-tmp.h:8159 msgid "NRG 4525/4508/4502" msgstr "" -#: src/xml/xmli18n-tmp.h:8063 +#: src/xml/xmli18n-tmp.h:8160 msgid "NRG 4545/4518/4532" msgstr "" -#: src/xml/xmli18n-tmp.h:8064 +#: src/xml/xmli18n-tmp.h:8161 msgid "NRG 6002/6005/6008" msgstr "" -#: src/xml/xmli18n-tmp.h:8065 +#: src/xml/xmli18n-tmp.h:8162 msgid "NRG 7502/7505/7508" msgstr "" -#: src/xml/xmli18n-tmp.h:8066 +#: src/xml/xmli18n-tmp.h:8163 msgid "NRG 9005/9008/9002" msgstr "" -#: src/xml/xmli18n-tmp.h:8067 +#: src/xml/xmli18n-tmp.h:8164 msgid "NRG DSm415" msgstr "" -#: src/xml/xmli18n-tmp.h:8068 +#: src/xml/xmli18n-tmp.h:8165 msgid "NRG DSm615" msgstr "" -#: src/xml/xmli18n-tmp.h:8069 +#: src/xml/xmli18n-tmp.h:8166 msgid "NRG DSm616" msgstr "" -#: src/xml/xmli18n-tmp.h:8070 +#: src/xml/xmli18n-tmp.h:8167 msgid "NRG DSm618" msgstr "" -#: src/xml/xmli18n-tmp.h:8071 +#: src/xml/xmli18n-tmp.h:8168 msgid "NRG DSm618d" msgstr "" -#: src/xml/xmli18n-tmp.h:8072 +#: src/xml/xmli18n-tmp.h:8169 msgid "NRG DSm620" msgstr "" -#: src/xml/xmli18n-tmp.h:8073 +#: src/xml/xmli18n-tmp.h:8170 msgid "NRG DSm620d" msgstr "" -#: src/xml/xmli18n-tmp.h:8074 +#: src/xml/xmli18n-tmp.h:8171 msgid "NRG DSm622" msgstr "" -#: src/xml/xmli18n-tmp.h:8075 +#: src/xml/xmli18n-tmp.h:8172 msgid "NRG DSm627" msgstr "" -#: src/xml/xmli18n-tmp.h:8076 +#: src/xml/xmli18n-tmp.h:8173 msgid "NRG DSm632" msgstr "" -#: src/xml/xmli18n-tmp.h:8077 +#: src/xml/xmli18n-tmp.h:8174 msgid "NRG DSm635" msgstr "" -#: src/xml/xmli18n-tmp.h:8078 +#: src/xml/xmli18n-tmp.h:8175 msgid "NRG DSm645" msgstr "" -#: src/xml/xmli18n-tmp.h:8079 +#: src/xml/xmli18n-tmp.h:8176 msgid "NRG DSm651" msgstr "" -#: src/xml/xmli18n-tmp.h:8080 +#: src/xml/xmli18n-tmp.h:8177 msgid "NRG DSm660" msgstr "" -#: src/xml/xmli18n-tmp.h:8081 +#: src/xml/xmli18n-tmp.h:8178 msgid "NRG DSm675" msgstr "" -#: src/xml/xmli18n-tmp.h:8082 +#: src/xml/xmli18n-tmp.h:8179 msgid "NRG DSm725" msgstr "" -#: src/xml/xmli18n-tmp.h:8083 +#: src/xml/xmli18n-tmp.h:8180 msgid "NRG DSm730" msgstr "" -#: src/xml/xmli18n-tmp.h:8084 +#: src/xml/xmli18n-tmp.h:8181 msgid "NRG DSm735" msgstr "" -#: src/xml/xmli18n-tmp.h:8085 +#: src/xml/xmli18n-tmp.h:8182 msgid "NRG DSm745" msgstr "" -#: src/xml/xmli18n-tmp.h:8086 +#: src/xml/xmli18n-tmp.h:8183 msgid "NRG MP 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:8087 +#: src/xml/xmli18n-tmp.h:8184 msgid "NRG MP 1350" msgstr "" -#: src/xml/xmli18n-tmp.h:8088 +#: src/xml/xmli18n-tmp.h:8185 msgid "NRG MP 1600" msgstr "" -#: src/xml/xmli18n-tmp.h:8089 +#: src/xml/xmli18n-tmp.h:8186 msgid "NRG MP 161" msgstr "" -#: src/xml/xmli18n-tmp.h:8090 +#: src/xml/xmli18n-tmp.h:8187 msgid "NRG MP 2000" msgstr "" -#: src/xml/xmli18n-tmp.h:8091 +#: src/xml/xmli18n-tmp.h:8188 msgid "NRG MP 2500" msgstr "" -#: src/xml/xmli18n-tmp.h:8092 +#: src/xml/xmli18n-tmp.h:8189 msgid "NRG MP 2510" msgstr "" -#: src/xml/xmli18n-tmp.h:8093 +#: src/xml/xmli18n-tmp.h:8190 msgid "NRG MP 2550" msgstr "" -#: src/xml/xmli18n-tmp.h:8094 +#: src/xml/xmli18n-tmp.h:8191 msgid "NRG MP 2550B" msgstr "" -#: src/xml/xmli18n-tmp.h:8095 +#: src/xml/xmli18n-tmp.h:8192 msgid "NRG MP 3010" msgstr "" -#: src/xml/xmli18n-tmp.h:8096 +#: src/xml/xmli18n-tmp.h:8193 msgid "NRG MP 3350" msgstr "" -#: src/xml/xmli18n-tmp.h:8097 +#: src/xml/xmli18n-tmp.h:8194 msgid "NRG MP 3350B" msgstr "" -#: src/xml/xmli18n-tmp.h:8098 +#: src/xml/xmli18n-tmp.h:8195 msgid "NRG MP 3500" msgstr "" -#: src/xml/xmli18n-tmp.h:8099 +#: src/xml/xmli18n-tmp.h:8196 msgid "NRG MP 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:8100 +#: src/xml/xmli18n-tmp.h:8197 msgid "NRG MP 4000B" msgstr "" -#: src/xml/xmli18n-tmp.h:8101 +#: src/xml/xmli18n-tmp.h:8198 msgid "NRG MP 4500" msgstr "" -#: src/xml/xmli18n-tmp.h:8102 +#: src/xml/xmli18n-tmp.h:8199 msgid "NRG MP 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:8103 +#: src/xml/xmli18n-tmp.h:8200 msgid "NRG MP 5000B" msgstr "" -#: src/xml/xmli18n-tmp.h:8104 +#: src/xml/xmli18n-tmp.h:8201 msgid "NRG MP 5500" msgstr "" -#: src/xml/xmli18n-tmp.h:8105 +#: src/xml/xmli18n-tmp.h:8202 msgid "NRG MP 6500" msgstr "" -#: src/xml/xmli18n-tmp.h:8106 +#: src/xml/xmli18n-tmp.h:8203 msgid "NRG MP 7500" msgstr "" -#: src/xml/xmli18n-tmp.h:8107 +#: src/xml/xmli18n-tmp.h:8204 msgid "NRG MP 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:8108 +#: src/xml/xmli18n-tmp.h:8205 msgid "Oki B4350" msgstr "" -#: src/xml/xmli18n-tmp.h:8109 +#: src/xml/xmli18n-tmp.h:8206 msgid "Oki OL400" msgstr "" -#: src/xml/xmli18n-tmp.h:8110 +#: src/xml/xmli18n-tmp.h:8207 msgid "Oki OL400e" msgstr "" -#: src/xml/xmli18n-tmp.h:8111 +#: src/xml/xmli18n-tmp.h:8208 msgid "Oki OL400ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8112 +#: src/xml/xmli18n-tmp.h:8209 msgid "Oki OL410e" msgstr "" -#: src/xml/xmli18n-tmp.h:8113 +#: src/xml/xmli18n-tmp.h:8210 msgid "Oki OL600e" msgstr "" -#: src/xml/xmli18n-tmp.h:8114 +#: src/xml/xmli18n-tmp.h:8211 msgid "Oki OL610e/S" msgstr "" -#: src/xml/xmli18n-tmp.h:8115 +#: src/xml/xmli18n-tmp.h:8212 msgid "Oki OL800" msgstr "" -#: src/xml/xmli18n-tmp.h:8116 +#: src/xml/xmli18n-tmp.h:8213 msgid "Oki OL810ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8117 +#: src/xml/xmli18n-tmp.h:8214 msgid "Oki Okipage 6e" msgstr "" -#: src/xml/xmli18n-tmp.h:8118 +#: src/xml/xmli18n-tmp.h:8215 msgid "Oki Okipage 6ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8119 +#: src/xml/xmli18n-tmp.h:8216 msgid "Oki Okipage 8p" msgstr "" -#: src/xml/xmli18n-tmp.h:8120 +#: src/xml/xmli18n-tmp.h:8217 msgid "Oki Okipage 10e" msgstr "" -#: src/xml/xmli18n-tmp.h:8121 +#: src/xml/xmli18n-tmp.h:8218 msgid "Oki Okipage 10ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8122 +#: src/xml/xmli18n-tmp.h:8219 msgid "Oki Okipage 14ex" msgstr "" -#: src/xml/xmli18n-tmp.h:8123 +#: src/xml/xmli18n-tmp.h:8220 msgid "Oki Super 6e" msgstr "" -#: src/xml/xmli18n-tmp.h:8124 +#: src/xml/xmli18n-tmp.h:8221 msgid "Olivetti JP350S" msgstr "" -#: src/xml/xmli18n-tmp.h:8125 +#: src/xml/xmli18n-tmp.h:8222 msgid "Olivetti PG 306" msgstr "" -#: src/xml/xmli18n-tmp.h:8126 +#: src/xml/xmli18n-tmp.h:8223 msgid "PCPI 1030" msgstr "" -#: src/xml/xmli18n-tmp.h:8127 +#: src/xml/xmli18n-tmp.h:8224 msgid "Panasonic KX-P4410" msgstr "" -#: src/xml/xmli18n-tmp.h:8128 +#: src/xml/xmli18n-tmp.h:8225 msgid "Panasonic KX-P4450" msgstr "" -#: src/xml/xmli18n-tmp.h:8129 +#: src/xml/xmli18n-tmp.h:8226 msgid "Panasonic KX-P6150" msgstr "" -#: src/xml/xmli18n-tmp.h:8130 +#: src/xml/xmli18n-tmp.h:8227 msgid "Panasonic KX-P6500" msgstr "" -#: src/xml/xmli18n-tmp.h:8131 +#: src/xml/xmli18n-tmp.h:8228 msgid "Raven LP-410" msgstr "" -#: src/xml/xmli18n-tmp.h:8132 +#: src/xml/xmli18n-tmp.h:8229 msgid "Ricoh Aficio 1022" msgstr "" -#: src/xml/xmli18n-tmp.h:8133 +#: src/xml/xmli18n-tmp.h:8230 msgid "Ricoh Aficio 1027" msgstr "" -#: src/xml/xmli18n-tmp.h:8134 +#: src/xml/xmli18n-tmp.h:8231 msgid "Ricoh Aficio 1032" msgstr "" -#: src/xml/xmli18n-tmp.h:8135 +#: src/xml/xmli18n-tmp.h:8232 msgid "Ricoh Aficio 1035" msgstr "" -#: src/xml/xmli18n-tmp.h:8136 +#: src/xml/xmli18n-tmp.h:8233 msgid "Ricoh Aficio 1045" msgstr "" -#: src/xml/xmli18n-tmp.h:8137 +#: src/xml/xmli18n-tmp.h:8234 msgid "Ricoh Aficio 1060" msgstr "" -#: src/xml/xmli18n-tmp.h:8138 +#: src/xml/xmli18n-tmp.h:8235 msgid "Ricoh Aficio 1075" msgstr "" -#: src/xml/xmli18n-tmp.h:8139 +#: src/xml/xmli18n-tmp.h:8236 msgid "Ricoh Aficio 1515" msgstr "" -#: src/xml/xmli18n-tmp.h:8140 +#: src/xml/xmli18n-tmp.h:8237 msgid "Ricoh Aficio 2015" msgstr "" -#: src/xml/xmli18n-tmp.h:8141 +#: src/xml/xmli18n-tmp.h:8238 msgid "Ricoh Aficio 2016" msgstr "" -#: src/xml/xmli18n-tmp.h:8142 +#: src/xml/xmli18n-tmp.h:8239 msgid "Ricoh Aficio 2018" msgstr "" -#: src/xml/xmli18n-tmp.h:8143 +#: src/xml/xmli18n-tmp.h:8240 msgid "Ricoh Aficio 2018D" msgstr "" -#: src/xml/xmli18n-tmp.h:8144 +#: src/xml/xmli18n-tmp.h:8241 msgid "Ricoh Aficio 2020" msgstr "" -#: src/xml/xmli18n-tmp.h:8145 +#: src/xml/xmli18n-tmp.h:8242 msgid "Ricoh Aficio 2020D" msgstr "" -#: src/xml/xmli18n-tmp.h:8146 +#: src/xml/xmli18n-tmp.h:8243 msgid "Ricoh Aficio 2022" msgstr "" -#: src/xml/xmli18n-tmp.h:8147 +#: src/xml/xmli18n-tmp.h:8244 msgid "Ricoh Aficio 2027" msgstr "" -#: src/xml/xmli18n-tmp.h:8148 +#: src/xml/xmli18n-tmp.h:8245 msgid "Ricoh Aficio 2032" msgstr "" -#: src/xml/xmli18n-tmp.h:8149 +#: src/xml/xmli18n-tmp.h:8246 msgid "Ricoh Aficio 2035" msgstr "" -#: src/xml/xmli18n-tmp.h:8150 +#: src/xml/xmli18n-tmp.h:8247 msgid "Ricoh Aficio 2035e" msgstr "" -#: src/xml/xmli18n-tmp.h:8151 +#: src/xml/xmli18n-tmp.h:8248 msgid "Ricoh Aficio 2045" msgstr "" -#: src/xml/xmli18n-tmp.h:8152 +#: src/xml/xmli18n-tmp.h:8249 msgid "Ricoh Aficio 2045e" msgstr "" -#: src/xml/xmli18n-tmp.h:8153 +#: src/xml/xmli18n-tmp.h:8250 msgid "Ricoh Aficio 2051" msgstr "" -#: src/xml/xmli18n-tmp.h:8154 +#: src/xml/xmli18n-tmp.h:8251 msgid "Ricoh Aficio 2060" msgstr "" -#: src/xml/xmli18n-tmp.h:8155 +#: src/xml/xmli18n-tmp.h:8252 msgid "Ricoh Aficio 2075" msgstr "" -#: src/xml/xmli18n-tmp.h:8156 +#: src/xml/xmli18n-tmp.h:8253 msgid "Ricoh Aficio 2090" msgstr "" -#: src/xml/xmli18n-tmp.h:8157 +#: src/xml/xmli18n-tmp.h:8254 msgid "Ricoh Aficio 2105" msgstr "" -#: src/xml/xmli18n-tmp.h:8158 +#: src/xml/xmli18n-tmp.h:8255 msgid "Ricoh Aficio 220" msgstr "" -#: src/xml/xmli18n-tmp.h:8159 +#: src/xml/xmli18n-tmp.h:8256 msgid "Ricoh Aficio 3025" msgstr "" -#: src/xml/xmli18n-tmp.h:8160 +#: src/xml/xmli18n-tmp.h:8257 msgid "Ricoh Aficio 3030" msgstr "" -#: src/xml/xmli18n-tmp.h:8161 +#: src/xml/xmli18n-tmp.h:8258 msgid "Ricoh Aficio 3035" msgstr "" -#: src/xml/xmli18n-tmp.h:8162 +#: src/xml/xmli18n-tmp.h:8259 msgid "Ricoh Aficio 3045" msgstr "" -#: src/xml/xmli18n-tmp.h:8163 +#: src/xml/xmli18n-tmp.h:8260 msgid "Ricoh Aficio 401" msgstr "" -#: src/xml/xmli18n-tmp.h:8164 +#: src/xml/xmli18n-tmp.h:8261 msgid "Ricoh Aficio 700" msgstr "" -#: src/xml/xmli18n-tmp.h:8165 +#: src/xml/xmli18n-tmp.h:8262 msgid "Ricoh Aficio MP 1100" msgstr "" -#: src/xml/xmli18n-tmp.h:8166 +#: src/xml/xmli18n-tmp.h:8263 msgid "Ricoh Aficio MP 1350" msgstr "" -#: src/xml/xmli18n-tmp.h:8167 +#: src/xml/xmli18n-tmp.h:8264 msgid "Ricoh Aficio MP 1600" msgstr "" -#: src/xml/xmli18n-tmp.h:8168 +#: src/xml/xmli18n-tmp.h:8265 msgid "Ricoh Aficio MP 161" msgstr "" -#: src/xml/xmli18n-tmp.h:8169 +#: src/xml/xmli18n-tmp.h:8266 msgid "Ricoh Aficio MP 2000" msgstr "" -#: src/xml/xmli18n-tmp.h:8170 +#: src/xml/xmli18n-tmp.h:8267 msgid "Ricoh Aficio MP 2500" msgstr "" -#: src/xml/xmli18n-tmp.h:8171 +#: src/xml/xmli18n-tmp.h:8268 msgid "Ricoh Aficio MP 2510" msgstr "" -#: src/xml/xmli18n-tmp.h:8172 +#: src/xml/xmli18n-tmp.h:8269 msgid "Ricoh Aficio MP 2550" msgstr "" -#: src/xml/xmli18n-tmp.h:8173 +#: src/xml/xmli18n-tmp.h:8270 msgid "Ricoh Aficio MP 2550B" msgstr "" -#: src/xml/xmli18n-tmp.h:8174 +#: src/xml/xmli18n-tmp.h:8271 msgid "Ricoh Aficio MP 3010" msgstr "" -#: src/xml/xmli18n-tmp.h:8175 +#: src/xml/xmli18n-tmp.h:8272 msgid "Ricoh Aficio MP 3350" msgstr "" -#: src/xml/xmli18n-tmp.h:8176 +#: src/xml/xmli18n-tmp.h:8273 msgid "Ricoh Aficio MP 3350B" msgstr "" -#: src/xml/xmli18n-tmp.h:8177 +#: src/xml/xmli18n-tmp.h:8274 msgid "Ricoh Aficio MP 3500" msgstr "" -#: src/xml/xmli18n-tmp.h:8178 +#: src/xml/xmli18n-tmp.h:8275 msgid "Ricoh Aficio MP 4000" msgstr "" -#: src/xml/xmli18n-tmp.h:8179 +#: src/xml/xmli18n-tmp.h:8276 msgid "Ricoh Aficio MP 4000B" msgstr "" -#: src/xml/xmli18n-tmp.h:8180 +#: src/xml/xmli18n-tmp.h:8277 msgid "Ricoh Aficio MP 4500" msgstr "" -#: src/xml/xmli18n-tmp.h:8181 +#: src/xml/xmli18n-tmp.h:8278 msgid "Ricoh Aficio MP 5000" msgstr "" -#: src/xml/xmli18n-tmp.h:8182 +#: src/xml/xmli18n-tmp.h:8279 msgid "Ricoh Aficio MP 5000B" msgstr "" -#: src/xml/xmli18n-tmp.h:8183 +#: src/xml/xmli18n-tmp.h:8280 msgid "Ricoh Aficio MP 5500" msgstr "" -#: src/xml/xmli18n-tmp.h:8184 +#: src/xml/xmli18n-tmp.h:8281 msgid "Ricoh Aficio MP 6500" msgstr "" -#: src/xml/xmli18n-tmp.h:8185 +#: src/xml/xmli18n-tmp.h:8282 msgid "Ricoh Aficio MP 7500" msgstr "" -#: src/xml/xmli18n-tmp.h:8186 +#: src/xml/xmli18n-tmp.h:8283 msgid "Ricoh Aficio MP 9000" msgstr "" -#: src/xml/xmli18n-tmp.h:8187 +#: src/xml/xmli18n-tmp.h:8284 msgid "Samsung ML-85" msgstr "" -#: src/xml/xmli18n-tmp.h:8188 +#: src/xml/xmli18n-tmp.h:8285 msgid "Samsung ML-1250" msgstr "" -#: src/xml/xmli18n-tmp.h:8189 +#: src/xml/xmli18n-tmp.h:8286 msgid "Samsung ML-1450" msgstr "" -#: src/xml/xmli18n-tmp.h:8190 +#: src/xml/xmli18n-tmp.h:8287 msgid "Samsung ML-1450PS" msgstr "" -#: src/xml/xmli18n-tmp.h:8191 +#: src/xml/xmli18n-tmp.h:8288 msgid "Samsung ML-1650" msgstr "" -#: src/xml/xmli18n-tmp.h:8192 +#: src/xml/xmli18n-tmp.h:8289 msgid "Samsung ML-1651N" msgstr "" -#: src/xml/xmli18n-tmp.h:8193 +#: src/xml/xmli18n-tmp.h:8290 msgid "Samsung ML-1750" msgstr "" -#: src/xml/xmli18n-tmp.h:8194 +#: src/xml/xmli18n-tmp.h:8291 msgid "Samsung ML-2150" msgstr "" -#: src/xml/xmli18n-tmp.h:8195 +#: src/xml/xmli18n-tmp.h:8292 msgid "Samsung ML-2150PS" msgstr "" -#: src/xml/xmli18n-tmp.h:8196 +#: src/xml/xmli18n-tmp.h:8293 msgid "Samsung ML-2151N" msgstr "" -#: src/xml/xmli18n-tmp.h:8197 +#: src/xml/xmli18n-tmp.h:8294 msgid "Samsung ML-2151NPS" msgstr "" -#: src/xml/xmli18n-tmp.h:8198 +#: src/xml/xmli18n-tmp.h:8295 msgid "Samsung ML-2152W" msgstr "" -#: src/xml/xmli18n-tmp.h:8199 +#: src/xml/xmli18n-tmp.h:8296 msgid "Samsung ML-2152WPS" msgstr "" -#: src/xml/xmli18n-tmp.h:8200 +#: src/xml/xmli18n-tmp.h:8297 msgid "Samsung ML-2250" msgstr "" -#: src/xml/xmli18n-tmp.h:8201 +#: src/xml/xmli18n-tmp.h:8298 msgid "Samsung ML-2550" msgstr "" -#: src/xml/xmli18n-tmp.h:8202 +#: src/xml/xmli18n-tmp.h:8299 msgid "Samsung ML-2551N" msgstr "" -#: src/xml/xmli18n-tmp.h:8203 +#: src/xml/xmli18n-tmp.h:8300 msgid "Samsung ML-2552W" msgstr "" -#: src/xml/xmli18n-tmp.h:8204 +#: src/xml/xmli18n-tmp.h:8301 msgid "Samsung ML-4600" msgstr "" -#: src/xml/xmli18n-tmp.h:8205 +#: src/xml/xmli18n-tmp.h:8302 msgid "Samsung ML-5000a" msgstr "" -#: src/xml/xmli18n-tmp.h:8206 +#: src/xml/xmli18n-tmp.h:8303 msgid "Samsung ML-6000" msgstr "" -#: src/xml/xmli18n-tmp.h:8207 +#: src/xml/xmli18n-tmp.h:8304 msgid "Samsung ML-6100" msgstr "" -#: src/xml/xmli18n-tmp.h:8208 +#: src/xml/xmli18n-tmp.h:8305 msgid "Samsung ML-7000" msgstr "" -#: src/xml/xmli18n-tmp.h:8209 +#: src/xml/xmli18n-tmp.h:8306 msgid "Samsung ML-7000N" msgstr "" -#: src/xml/xmli18n-tmp.h:8210 +#: src/xml/xmli18n-tmp.h:8307 msgid "Samsung ML-7000P" msgstr "" -#: src/xml/xmli18n-tmp.h:8211 +#: src/xml/xmli18n-tmp.h:8308 msgid "Samsung ML-7050" msgstr "" -#: src/xml/xmli18n-tmp.h:8212 +#: src/xml/xmli18n-tmp.h:8309 msgid "Samsung ML-7300" msgstr "" -#: src/xml/xmli18n-tmp.h:8213 +#: src/xml/xmli18n-tmp.h:8310 msgid "Samsung ML-7300N" msgstr "" -#: src/xml/xmli18n-tmp.h:8214 +#: src/xml/xmli18n-tmp.h:8311 msgid "Samsung QL-5100A" msgstr "" -#: src/xml/xmli18n-tmp.h:8215 +#: src/xml/xmli18n-tmp.h:8312 msgid "Samsung QL-6050" msgstr "" -#: src/xml/xmli18n-tmp.h:8216 +#: src/xml/xmli18n-tmp.h:8313 msgid "Savin 2522" msgstr "" -#: src/xml/xmli18n-tmp.h:8217 +#: src/xml/xmli18n-tmp.h:8314 msgid "Savin 2527" msgstr "" -#: src/xml/xmli18n-tmp.h:8218 +#: src/xml/xmli18n-tmp.h:8315 msgid "Savin 2532" msgstr "" -#: src/xml/xmli18n-tmp.h:8219 +#: src/xml/xmli18n-tmp.h:8316 msgid "Savin 2535/2235" msgstr "" -#: src/xml/xmli18n-tmp.h:8220 +#: src/xml/xmli18n-tmp.h:8317 msgid "Savin 2545/2245" msgstr "" -#: src/xml/xmli18n-tmp.h:8221 +#: src/xml/xmli18n-tmp.h:8318 msgid "Savin 2560" msgstr "" -#: src/xml/xmli18n-tmp.h:8222 +#: src/xml/xmli18n-tmp.h:8319 msgid "Savin 2575" msgstr "" -#: src/xml/xmli18n-tmp.h:8223 +#: src/xml/xmli18n-tmp.h:8320 msgid "Savin 3515" msgstr "" -#: src/xml/xmli18n-tmp.h:8224 +#: src/xml/xmli18n-tmp.h:8321 msgid "Savin 40105" msgstr "" -#: src/xml/xmli18n-tmp.h:8225 +#: src/xml/xmli18n-tmp.h:8322 msgid "Savin 4015" msgstr "" -#: src/xml/xmli18n-tmp.h:8226 +#: src/xml/xmli18n-tmp.h:8323 msgid "Savin 4018" msgstr "" -#: src/xml/xmli18n-tmp.h:8227 +#: src/xml/xmli18n-tmp.h:8324 msgid "Savin 4018d" msgstr "" -#: src/xml/xmli18n-tmp.h:8228 +#: src/xml/xmli18n-tmp.h:8325 msgid "Savin 4022" msgstr "" -#: src/xml/xmli18n-tmp.h:8229 +#: src/xml/xmli18n-tmp.h:8326 msgid "Savin 4027" msgstr "" -#: src/xml/xmli18n-tmp.h:8230 +#: src/xml/xmli18n-tmp.h:8327 msgid "Savin 4035/4135g" msgstr "" -#: src/xml/xmli18n-tmp.h:8231 +#: src/xml/xmli18n-tmp.h:8328 msgid "Savin 4035e/4135eG" msgstr "" -#: src/xml/xmli18n-tmp.h:8232 +#: src/xml/xmli18n-tmp.h:8329 msgid "Savin 4045/4145g" msgstr "" -#: src/xml/xmli18n-tmp.h:8233 +#: src/xml/xmli18n-tmp.h:8330 msgid "Savin 4045e/4145eG" msgstr "" -#: src/xml/xmli18n-tmp.h:8234 +#: src/xml/xmli18n-tmp.h:8331 msgid "Savin 4051" msgstr "" -#: src/xml/xmli18n-tmp.h:8235 +#: src/xml/xmli18n-tmp.h:8332 msgid "Savin 4060" msgstr "" -#: src/xml/xmli18n-tmp.h:8236 +#: src/xml/xmli18n-tmp.h:8333 msgid "Savin 4075" msgstr "" -#: src/xml/xmli18n-tmp.h:8237 +#: src/xml/xmli18n-tmp.h:8334 msgid "Savin 4090" msgstr "" -#: src/xml/xmli18n-tmp.h:8238 +#: src/xml/xmli18n-tmp.h:8335 msgid "Savin 7025" msgstr "" -#: src/xml/xmli18n-tmp.h:8239 +#: src/xml/xmli18n-tmp.h:8336 msgid "Savin 8016" msgstr "" -#: src/xml/xmli18n-tmp.h:8240 +#: src/xml/xmli18n-tmp.h:8337 msgid "Savin 8020" msgstr "" -#: src/xml/xmli18n-tmp.h:8241 +#: src/xml/xmli18n-tmp.h:8338 msgid "Savin 8020d" msgstr "" -#: src/xml/xmli18n-tmp.h:8242 +#: src/xml/xmli18n-tmp.h:8339 msgid "Savin 8025" msgstr "" -#: src/xml/xmli18n-tmp.h:8243 +#: src/xml/xmli18n-tmp.h:8340 msgid "Savin 8025e" msgstr "" -#: src/xml/xmli18n-tmp.h:8244 +#: src/xml/xmli18n-tmp.h:8341 msgid "Savin 8030" msgstr "" -#: src/xml/xmli18n-tmp.h:8245 +#: src/xml/xmli18n-tmp.h:8342 msgid "Savin 8030e" msgstr "" -#: src/xml/xmli18n-tmp.h:8246 +#: src/xml/xmli18n-tmp.h:8343 msgid "Savin 8035/8035g" msgstr "" -#: src/xml/xmli18n-tmp.h:8247 +#: src/xml/xmli18n-tmp.h:8344 msgid "Savin 8035e" msgstr "" -#: src/xml/xmli18n-tmp.h:8248 +#: src/xml/xmli18n-tmp.h:8345 msgid "Savin 8045/8045g" msgstr "" -#: src/xml/xmli18n-tmp.h:8249 +#: src/xml/xmli18n-tmp.h:8346 msgid "Savin 8045e" msgstr "" -#: src/xml/xmli18n-tmp.h:8250 +#: src/xml/xmli18n-tmp.h:8347 msgid "Savin 8055" msgstr "" -#: src/xml/xmli18n-tmp.h:8251 +#: src/xml/xmli18n-tmp.h:8348 msgid "Savin 8065" msgstr "" -#: src/xml/xmli18n-tmp.h:8252 +#: src/xml/xmli18n-tmp.h:8349 msgid "Savin 8075" msgstr "" -#: src/xml/xmli18n-tmp.h:8253 +#: src/xml/xmli18n-tmp.h:8350 msgid "Savin 8090" msgstr "" -#: src/xml/xmli18n-tmp.h:8254 +#: src/xml/xmli18n-tmp.h:8351 msgid "Savin 8110" msgstr "" -#: src/xml/xmli18n-tmp.h:8255 +#: src/xml/xmli18n-tmp.h:8352 msgid "Savin 8135" msgstr "" -#: src/xml/xmli18n-tmp.h:8256 +#: src/xml/xmli18n-tmp.h:8353 msgid "Savin 816" msgstr "" -#: src/xml/xmli18n-tmp.h:8257 +#: src/xml/xmli18n-tmp.h:8354 msgid "Savin 9016" msgstr "" -#: src/xml/xmli18n-tmp.h:8258 +#: src/xml/xmli18n-tmp.h:8355 msgid "Savin 9021d" msgstr "" -#: src/xml/xmli18n-tmp.h:8259 +#: src/xml/xmli18n-tmp.h:8356 msgid "Savin 9025" msgstr "" -#: src/xml/xmli18n-tmp.h:8260 +#: src/xml/xmli18n-tmp.h:8357 msgid "Savin 9025b" msgstr "" -#: src/xml/xmli18n-tmp.h:8261 +#: src/xml/xmli18n-tmp.h:8358 msgid "Savin 9033" msgstr "" -#: src/xml/xmli18n-tmp.h:8262 +#: src/xml/xmli18n-tmp.h:8359 msgid "Savin 9033b" msgstr "" -#: src/xml/xmli18n-tmp.h:8263 +#: src/xml/xmli18n-tmp.h:8360 msgid "Savin 9040" msgstr "" -#: src/xml/xmli18n-tmp.h:8264 +#: src/xml/xmli18n-tmp.h:8361 msgid "Savin 9040b" msgstr "" -#: src/xml/xmli18n-tmp.h:8265 +#: src/xml/xmli18n-tmp.h:8362 msgid "Savin 9050" msgstr "" -#: src/xml/xmli18n-tmp.h:8266 +#: src/xml/xmli18n-tmp.h:8363 msgid "Savin 9050b" msgstr "" -#: src/xml/xmli18n-tmp.h:8267 +#: src/xml/xmli18n-tmp.h:8364 msgid "Seiko SpeedJET 200" msgstr "" -#: src/xml/xmli18n-tmp.h:8268 +#: src/xml/xmli18n-tmp.h:8365 msgid "Sharp AR-161" msgstr "" -#: src/xml/xmli18n-tmp.h:8269 +#: src/xml/xmli18n-tmp.h:8366 msgid "Sharp AR-M257" msgstr "" -#: src/xml/xmli18n-tmp.h:8270 +#: src/xml/xmli18n-tmp.h:8367 msgid "Sony IJP-V100" msgstr "" -#: src/xml/xmli18n-tmp.h:8271 +#: src/xml/xmli18n-tmp.h:8368 msgid "Star LS-04" msgstr "" -#: src/xml/xmli18n-tmp.h:8272 +#: src/xml/xmli18n-tmp.h:8369 msgid "Star LaserPrinter 8" msgstr "" -#: src/xml/xmli18n-tmp.h:8273 +#: src/xml/xmli18n-tmp.h:8370 msgid "Tally MT908" msgstr "" -#: src/xml/xmli18n-tmp.h:8274 +#: src/xml/xmli18n-tmp.h:8371 msgid "Tektronix Phaser 750DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8275 +#: src/xml/xmli18n-tmp.h:8372 msgid "Tektronix Phaser 750DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8276 +#: src/xml/xmli18n-tmp.h:8373 msgid "Tektronix Phaser 750N" msgstr "" -#: src/xml/xmli18n-tmp.h:8277 +#: src/xml/xmli18n-tmp.h:8374 msgid "Tektronix Phaser 750P" msgstr "" -#: src/xml/xmli18n-tmp.h:8278 +#: src/xml/xmli18n-tmp.h:8375 msgid "Xerox Able 1406" msgstr "" -#: src/xml/xmli18n-tmp.h:8279 +#: src/xml/xmli18n-tmp.h:8376 msgid "Xerox DocuPrint 4508" msgstr "" -#: src/xml/xmli18n-tmp.h:8280 +#: src/xml/xmli18n-tmp.h:8377 msgid "Xerox DocuPrint C20" msgstr "" -#: src/xml/xmli18n-tmp.h:8281 +#: src/xml/xmli18n-tmp.h:8378 msgid "Xerox DocuPrint N4512" msgstr "" -#: src/xml/xmli18n-tmp.h:8282 +#: src/xml/xmli18n-tmp.h:8379 msgid "Xerox DocuPrint N4512PS" msgstr "" -#: src/xml/xmli18n-tmp.h:8283 +#: src/xml/xmli18n-tmp.h:8380 msgid "Xerox DocuPrint P12" msgstr "" -#: src/xml/xmli18n-tmp.h:8284 +#: src/xml/xmli18n-tmp.h:8381 msgid "Xerox DocuPrint P1202" msgstr "" -#: src/xml/xmli18n-tmp.h:8285 +#: src/xml/xmli18n-tmp.h:8382 msgid "Xerox DocuPrint P8e" msgstr "" -#: src/xml/xmli18n-tmp.h:8286 +#: src/xml/xmli18n-tmp.h:8383 msgid "Xerox Document Centre 400" msgstr "" -#: src/xml/xmli18n-tmp.h:8287 +#: src/xml/xmli18n-tmp.h:8384 msgid "Xerox Phaser 2135" msgstr "" -#: src/xml/xmli18n-tmp.h:8288 +#: src/xml/xmli18n-tmp.h:8385 msgid "Xerox Phaser 4400B" msgstr "" -#: src/xml/xmli18n-tmp.h:8289 +#: src/xml/xmli18n-tmp.h:8386 msgid "Xerox Phaser 4400DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8290 +#: src/xml/xmli18n-tmp.h:8387 msgid "Xerox Phaser 4400DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8291 +#: src/xml/xmli18n-tmp.h:8388 msgid "Xerox Phaser 4400N" msgstr "" -#: src/xml/xmli18n-tmp.h:8292 +#: src/xml/xmli18n-tmp.h:8389 msgid "Xerox Phaser 4500B" msgstr "" -#: src/xml/xmli18n-tmp.h:8293 +#: src/xml/xmli18n-tmp.h:8390 msgid "Xerox Phaser 4500DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8294 +#: src/xml/xmli18n-tmp.h:8391 msgid "Xerox Phaser 4500DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8295 +#: src/xml/xmli18n-tmp.h:8392 msgid "Xerox Phaser 4500N" msgstr "" -#: src/xml/xmli18n-tmp.h:8296 +#: src/xml/xmli18n-tmp.h:8393 msgid "Xerox Phaser 4510B" msgstr "" -#: src/xml/xmli18n-tmp.h:8297 +#: src/xml/xmli18n-tmp.h:8394 msgid "Xerox Phaser 4510DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8298 +#: src/xml/xmli18n-tmp.h:8395 msgid "Xerox Phaser 4510DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8299 +#: src/xml/xmli18n-tmp.h:8396 msgid "Xerox Phaser 4510N" msgstr "" -#: src/xml/xmli18n-tmp.h:8300 +#: src/xml/xmli18n-tmp.h:8397 msgid "Xerox Phaser 5500B" msgstr "" -#: src/xml/xmli18n-tmp.h:8301 +#: src/xml/xmli18n-tmp.h:8398 msgid "Xerox Phaser 5500DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8302 +#: src/xml/xmli18n-tmp.h:8399 msgid "Xerox Phaser 5500DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8303 +#: src/xml/xmli18n-tmp.h:8400 msgid "Xerox Phaser 5500DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8304 +#: src/xml/xmli18n-tmp.h:8401 msgid "Xerox Phaser 5500N" msgstr "" -#: src/xml/xmli18n-tmp.h:8305 +#: src/xml/xmli18n-tmp.h:8402 msgid "Xerox Phaser 6130N" msgstr "" -#: src/xml/xmli18n-tmp.h:8306 +#: src/xml/xmli18n-tmp.h:8403 msgid "Xerox Phaser 6180DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8307 +#: src/xml/xmli18n-tmp.h:8404 msgid "Xerox Phaser 6180MFP-D" msgstr "" -#: src/xml/xmli18n-tmp.h:8308 +#: src/xml/xmli18n-tmp.h:8405 msgid "Xerox Phaser 6200B" msgstr "" -#: src/xml/xmli18n-tmp.h:8309 +#: src/xml/xmli18n-tmp.h:8406 msgid "Xerox Phaser 6200DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8310 +#: src/xml/xmli18n-tmp.h:8407 msgid "Xerox Phaser 6200DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8311 +#: src/xml/xmli18n-tmp.h:8408 msgid "Xerox Phaser 6200N" msgstr "" -#: src/xml/xmli18n-tmp.h:8312 +#: src/xml/xmli18n-tmp.h:8409 msgid "Xerox Phaser 6250B" msgstr "" -#: src/xml/xmli18n-tmp.h:8313 +#: src/xml/xmli18n-tmp.h:8410 msgid "Xerox Phaser 6250DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8314 +#: src/xml/xmli18n-tmp.h:8411 msgid "Xerox Phaser 6250DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8315 +#: src/xml/xmli18n-tmp.h:8412 msgid "Xerox Phaser 6250DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8316 +#: src/xml/xmli18n-tmp.h:8413 msgid "Xerox Phaser 6250N" msgstr "" -#: src/xml/xmli18n-tmp.h:8317 +#: src/xml/xmli18n-tmp.h:8414 msgid "Xerox Phaser 6300DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8318 +#: src/xml/xmli18n-tmp.h:8415 msgid "Xerox Phaser 6300N" msgstr "" -#: src/xml/xmli18n-tmp.h:8319 +#: src/xml/xmli18n-tmp.h:8416 msgid "Xerox Phaser 6350DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8320 +#: src/xml/xmli18n-tmp.h:8417 msgid "Xerox Phaser 6350DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8321 +#: src/xml/xmli18n-tmp.h:8418 msgid "Xerox Phaser 6350DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8322 +#: src/xml/xmli18n-tmp.h:8419 msgid "Xerox Phaser 6360DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8323 +#: src/xml/xmli18n-tmp.h:8420 msgid "Xerox Phaser 6360DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8324 +#: src/xml/xmli18n-tmp.h:8421 msgid "Xerox Phaser 7300B" msgstr "" -#: src/xml/xmli18n-tmp.h:8325 +#: src/xml/xmli18n-tmp.h:8422 msgid "Xerox Phaser 7300DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8326 +#: src/xml/xmli18n-tmp.h:8423 msgid "Xerox Phaser 7300DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8327 +#: src/xml/xmli18n-tmp.h:8424 msgid "Xerox Phaser 7300DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8328 +#: src/xml/xmli18n-tmp.h:8425 msgid "Xerox Phaser 7300N" msgstr "" -#: src/xml/xmli18n-tmp.h:8329 +#: src/xml/xmli18n-tmp.h:8426 msgid "Xerox Phaser 7400DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8330 +#: src/xml/xmli18n-tmp.h:8427 msgid "Xerox Phaser 7400DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8331 +#: src/xml/xmli18n-tmp.h:8428 msgid "Xerox Phaser 7400DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8332 +#: src/xml/xmli18n-tmp.h:8429 msgid "Xerox Phaser 7400DXF" msgstr "" -#: src/xml/xmli18n-tmp.h:8333 +#: src/xml/xmli18n-tmp.h:8430 msgid "Xerox Phaser 7400N" msgstr "" -#: src/xml/xmli18n-tmp.h:8334 +#: src/xml/xmli18n-tmp.h:8431 msgid "Xerox Phaser 7700DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8335 +#: src/xml/xmli18n-tmp.h:8432 msgid "Xerox Phaser 7700DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8336 +#: src/xml/xmli18n-tmp.h:8433 msgid "Xerox Phaser 7700GX" msgstr "" -#: src/xml/xmli18n-tmp.h:8337 +#: src/xml/xmli18n-tmp.h:8434 msgid "Xerox Phaser 7750B" msgstr "" -#: src/xml/xmli18n-tmp.h:8338 +#: src/xml/xmli18n-tmp.h:8435 msgid "Xerox Phaser 7750DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8339 +#: src/xml/xmli18n-tmp.h:8436 msgid "Xerox Phaser 7750DXF" msgstr "" -#: src/xml/xmli18n-tmp.h:8340 +#: src/xml/xmli18n-tmp.h:8437 msgid "Xerox Phaser 7750GX" msgstr "" -#: src/xml/xmli18n-tmp.h:8341 +#: src/xml/xmli18n-tmp.h:8438 msgid "Xerox Phaser 7760DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8342 +#: src/xml/xmli18n-tmp.h:8439 msgid "Xerox Phaser 7760DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8343 +#: src/xml/xmli18n-tmp.h:8440 msgid "Xerox Phaser 7760GX" msgstr "" -#: src/xml/xmli18n-tmp.h:8344 +#: src/xml/xmli18n-tmp.h:8441 msgid "Xerox Phaser 8400B" msgstr "" -#: src/xml/xmli18n-tmp.h:8345 +#: src/xml/xmli18n-tmp.h:8442 msgid "Xerox Phaser 8400BD" msgstr "" -#: src/xml/xmli18n-tmp.h:8346 +#: src/xml/xmli18n-tmp.h:8443 msgid "Xerox Phaser 8400DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8347 +#: src/xml/xmli18n-tmp.h:8444 msgid "Xerox Phaser 8400DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8348 +#: src/xml/xmli18n-tmp.h:8445 msgid "Xerox Phaser 8400N" msgstr "" -#: src/xml/xmli18n-tmp.h:8349 +#: src/xml/xmli18n-tmp.h:8446 msgid "Xerox Phaser 8500DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8350 +#: src/xml/xmli18n-tmp.h:8447 msgid "Xerox Phaser 8500N" msgstr "" -#: src/xml/xmli18n-tmp.h:8351 +#: src/xml/xmli18n-tmp.h:8448 msgid "Xerox Phaser 8550DP" msgstr "" -#: src/xml/xmli18n-tmp.h:8352 +#: src/xml/xmli18n-tmp.h:8449 msgid "Xerox Phaser 8550DT" msgstr "" -#: src/xml/xmli18n-tmp.h:8353 +#: src/xml/xmli18n-tmp.h:8450 msgid "Xerox Phaser 8550DX" msgstr "" -#: src/xml/xmli18n-tmp.h:8354 +#: src/xml/xmli18n-tmp.h:8451 msgid "Xerox Phaser 8560DN" msgstr "" -#: src/xml/xmli18n-tmp.h:8355 +#: src/xml/xmli18n-tmp.h:8452 msgid "Xerox WorkCentre 7345" msgstr "" -#: src/xml/xmli18n-tmp.h:8356 +#: src/xml/xmli18n-tmp.h:8453 msgid "Xerox WorkCentre M118" msgstr "" -#: src/xml/xmli18n-tmp.h:8357 +#: src/xml/xmli18n-tmp.h:8454 msgid "Compaq IJ1200" msgstr "" -#: src/xml/xmli18n-tmp.h:8358 +#: src/xml/xmli18n-tmp.h:8455 msgid "Lexmark X73" msgstr "" -#: src/xml/xmli18n-tmp.h:8359 +#: src/xml/xmli18n-tmp.h:8456 msgid "Lexmark Z42" msgstr "" -#: src/xml/xmli18n-tmp.h:8360 +#: src/xml/xmli18n-tmp.h:8457 msgid "Lexmark Z43" msgstr "" -#: src/xml/xmli18n-tmp.h:8361 +#: src/xml/xmli18n-tmp.h:8458 msgid "Lexmark Z52" msgstr "" -#: src/xml/xmli18n-tmp.h:8362 +#: src/xml/xmli18n-tmp.h:8459 msgid "Lexmark Z53" msgstr "" -#: src/xml/xmli18n-tmp.h:8363 +#: src/xml/xmli18n-tmp.h:8460 msgid "Olympus P-10" msgstr "" -#: src/xml/xmli18n-tmp.h:8364 +#: src/xml/xmli18n-tmp.h:8461 msgid "Olympus P-11" msgstr "" -#: src/xml/xmli18n-tmp.h:8365 +#: src/xml/xmli18n-tmp.h:8462 msgid "Olympus P-200" msgstr "" -#: src/xml/xmli18n-tmp.h:8366 +#: src/xml/xmli18n-tmp.h:8463 msgid "Olympus P-300" msgstr "" -#: src/xml/xmli18n-tmp.h:8367 +#: src/xml/xmli18n-tmp.h:8464 msgid "Olympus P-300E" msgstr "" -#: src/xml/xmli18n-tmp.h:8368 +#: src/xml/xmli18n-tmp.h:8465 msgid "Olympus P-300U" msgstr "" -#: src/xml/xmli18n-tmp.h:8369 +#: src/xml/xmli18n-tmp.h:8466 msgid "Olympus P-330E" msgstr "" -#: src/xml/xmli18n-tmp.h:8370 +#: src/xml/xmli18n-tmp.h:8467 msgid "Olympus P-330NE" msgstr "" -#: src/xml/xmli18n-tmp.h:8371 +#: src/xml/xmli18n-tmp.h:8468 msgid "Olympus P-400" msgstr "" -#: src/xml/xmli18n-tmp.h:8372 +#: src/xml/xmli18n-tmp.h:8469 msgid "Olympus P-440" msgstr "" -#: src/xml/xmli18n-tmp.h:8373 +#: src/xml/xmli18n-tmp.h:8470 msgid "Olympus P-S100" msgstr "" -#: src/xml/xmli18n-tmp.h:8374 +#: src/xml/xmli18n-tmp.h:8471 msgid "Canon CP-10" msgstr "" -#: src/xml/xmli18n-tmp.h:8375 +#: src/xml/xmli18n-tmp.h:8472 msgid "Canon CP-100" msgstr "" -#: src/xml/xmli18n-tmp.h:8376 +#: src/xml/xmli18n-tmp.h:8473 msgid "Canon CP-200" msgstr "" -#: src/xml/xmli18n-tmp.h:8377 +#: src/xml/xmli18n-tmp.h:8474 msgid "Canon CP-220" msgstr "" -#: src/xml/xmli18n-tmp.h:8378 +#: src/xml/xmli18n-tmp.h:8475 msgid "Canon CP-300" msgstr "" -#: src/xml/xmli18n-tmp.h:8379 +#: src/xml/xmli18n-tmp.h:8476 msgid "Canon CP-330" msgstr "" -#: src/xml/xmli18n-tmp.h:8380 +#: src/xml/xmli18n-tmp.h:8477 msgid "Canon SELPHY-CP-400" msgstr "" -#: src/xml/xmli18n-tmp.h:8381 +#: src/xml/xmli18n-tmp.h:8478 msgid "Canon SELPHY-CP-500" msgstr "" -#: src/xml/xmli18n-tmp.h:8382 +#: src/xml/xmli18n-tmp.h:8479 msgid "Canon SELPHY-CP-510" msgstr "" -#: src/xml/xmli18n-tmp.h:8383 +#: src/xml/xmli18n-tmp.h:8480 msgid "Canon SELPHY-CP-520" msgstr "" -#: src/xml/xmli18n-tmp.h:8384 +#: src/xml/xmli18n-tmp.h:8481 msgid "Canon SELPHY-CP-530" msgstr "" -#: src/xml/xmli18n-tmp.h:8385 +#: src/xml/xmli18n-tmp.h:8482 msgid "Canon SELPHY-CP-600" msgstr "" -#: src/xml/xmli18n-tmp.h:8386 +#: src/xml/xmli18n-tmp.h:8483 msgid "Canon SELPHY-CP-710" msgstr "" -#: src/xml/xmli18n-tmp.h:8387 -msgid "Canon SELPHY-CP-720" -msgstr "" - -#: src/xml/xmli18n-tmp.h:8388 +#: src/xml/xmli18n-tmp.h:8484 msgid "Canon SELPHY-CP-730" msgstr "" -#: src/xml/xmli18n-tmp.h:8389 +#: src/xml/xmli18n-tmp.h:8485 msgid "Canon SELPHY-CP-740" msgstr "" -#: src/xml/xmli18n-tmp.h:8390 +#: src/xml/xmli18n-tmp.h:8486 msgid "Canon SELPHY-CP-750" msgstr "" -#: src/xml/xmli18n-tmp.h:8391 -msgid "Canon SELPHY-CP-800" -msgstr "" - -#: src/xml/xmli18n-tmp.h:8392 -msgid "Canon SELPHY ES1" +#: src/xml/xmli18n-tmp.h:8487 +msgid "Canon SELPHY-CP-760" msgstr "" -#: src/xml/xmli18n-tmp.h:8393 -msgid "Canon SELPHY ES2" +#: src/xml/xmli18n-tmp.h:8488 +msgid "Canon SELPHY-CP-770" msgstr "" -#: src/xml/xmli18n-tmp.h:8394 -msgid "Canon SELPHY ES20" +#: src/xml/xmli18n-tmp.h:8489 +msgid "Canon SELPHY-CP-790" msgstr "" -#: src/xml/xmli18n-tmp.h:8395 +#: src/xml/xmli18n-tmp.h:8490 msgid "Sony DPP-EX5" msgstr "" -#: src/xml/xmli18n-tmp.h:8396 +#: src/xml/xmli18n-tmp.h:8491 msgid "Sony DPP-EX7" msgstr "Sony DPP-EX7" -#: src/xml/xmli18n-tmp.h:8397 +#: src/xml/xmli18n-tmp.h:8492 msgid "Sony UP-DP10" msgstr "" -#: src/xml/xmli18n-tmp.h:8398 +#: src/xml/xmli18n-tmp.h:8493 msgid "Sony UP-DR100" msgstr "" -#: src/xml/xmli18n-tmp.h:8399 +#: src/xml/xmli18n-tmp.h:8494 msgid "Sony UP-DR150" msgstr "" -#: src/xml/xmli18n-tmp.h:8400 +#: src/xml/xmli18n-tmp.h:8495 msgid "Fujifilm Printpix-CX-400" msgstr "" -#: src/xml/xmli18n-tmp.h:8401 +#: src/xml/xmli18n-tmp.h:8496 msgid "Fujifilm Printpix-CX-550" msgstr "" -#: src/xml/xmli18n-tmp.h:8402 +#: src/xml/xmli18n-tmp.h:8497 msgid "Fujifilm FinePix-NX-500" msgstr "" -#: src/xml/xmli18n-tmp.h:8403 +#: src/xml/xmli18n-tmp.h:8498 msgid "Kodak Easyshare-Printer-Dock" msgstr "" -#: src/xml/xmli18n-tmp.h:8404 +#: src/xml/xmli18n-tmp.h:8499 msgid "Kodak EasyShare-G600-Printer-Dock" msgstr "" -#: src/xml/xmli18n-tmp.h:8405 +#: src/xml/xmli18n-tmp.h:8500 msgid "Kodak PD-4000" msgstr "" -#: src/xml/xmli18n-tmp.h:8406 +#: src/xml/xmli18n-tmp.h:8501 msgid "Kodak PD-6000" msgstr "" -#: src/xml/xmli18n-tmp.h:8407 +#: src/xml/xmli18n-tmp.h:8502 msgid "Kodak Photo-Printer" msgstr "" -#: src/xml/xmli18n-tmp.h:8408 +#: src/xml/xmli18n-tmp.h:8503 msgid "Kodak Photo-Printer-500" msgstr "" -#: src/xml/xmli18n-tmp.h:8409 +#: src/xml/xmli18n-tmp.h:8504 msgid "Kodak Printer-Dock-Plus" msgstr "" -#: src/xml/xmli18n-tmp.h:8410 +#: src/xml/xmli18n-tmp.h:8505 msgid "Kodak Printer-Dock-Plus-S3" msgstr "" -#: src/xml/xmli18n-tmp.h:8411 +#: src/xml/xmli18n-tmp.h:8506 msgid "Shinko CHC-S9045" msgstr "" -#: src/xml/xmli18n-tmp.h:8412 +#: src/xml/xmli18n-tmp.h:8507 msgid "Dai Nippon Printing DS40" msgstr "" -#: src/xml/xmli18n-tmp.h:8413 +#: src/xml/xmli18n-tmp.h:8508 msgid "Dai Nippon Printing DS80" msgstr "" -#: src/xml/xmli18n-tmp.h:8414 +#: src/xml/xmli18n-tmp.h:8509 msgid "RAW DATA 16 bit" msgstr "" -#: src/xml/xmli18n-tmp.h:8415 +#: src/xml/xmli18n-tmp.h:8510 msgid "RAW DATA 8 bit" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello-debhelper.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hello-debhelper.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello-debhelper.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hello-debhelper.po 2012-03-23 07:33:01.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: 2012-02-21 19:23+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:35+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: src/hello.c:100 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hello.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hello.po 2012-02-23 07:11:38.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hello.po 2012-03-23 07:33:01.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: 2012-02-21 19:23+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:35+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: src/hello.c:100 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/help2man.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/help2man.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/help2man.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/help2man.po 2012-03-23 07:32: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: 2012-02-21 18:24+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: help2man:69 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/human-theme.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/human-theme.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/human-theme.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/human-theme.po 2012-03-23 07:33:14.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: 2012-02-21 22:40+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../index.theme.in.h:1 msgid "Ubuntu default theme" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hunspell.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hunspell.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/hunspell.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/hunspell.po 2012-03-23 07:33:11.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: 2012-02-21 21:59+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:44+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/tools/hunspell.cxx:205 src/tools/hunspell.cxx:313 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-anthy.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-anthy.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-anthy.po 2012-02-23 07:12:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-anthy.po 2012-03-23 07:33:24.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: 2012-02-22 00:58+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:33+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../engine/engine.py:187 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-chewing.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-chewing.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-chewing.po 2012-02-23 07:12:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-chewing.po 2012-03-23 07:33: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: 2012-02-22 01:08+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../src/IBusChewingEngine.gob:331 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-hangul.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-hangul.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-hangul.po 2012-02-23 07:12:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-hangul.po 2012-03-23 07:33: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: 2012-02-22 00:56+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:31+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../setup/keycapturedialog.py:15 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-pinyin.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-pinyin.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-pinyin.po 2012-02-23 07:12:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-pinyin.po 2012-03-23 07:33: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: 2012-02-22 00:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: engine/pydict.py:358 setup/pydict.py:358 msgid "MSPY" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-table.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-table.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-table.po 2012-02-23 07:12:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-table.po 2012-03-23 07:33:24.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: 0.1.20080819\n" "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n" -"POT-Creation-Date: 2010-01-11 10:36+1000\n" +"POT-Creation-Date: 2011-08-27 02:27+1000\n" "PO-Revision-Date: 2010-01-19 04:52+0000\n" "Last-Translator: Yu Yuwei \n" "Language-Team: Yu Yuwei \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:57+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:32+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: engine/table.py:985 msgid "CN" @@ -34,20 +34,20 @@ msgstr "切换到形码模式" #: engine/table.py:997 -msgid "Switch to half letter" -msgstr "切换到半角字符" +msgid "Switch to half-width letter" +msgstr "" #: engine/table.py:1000 -msgid "Switch to full letter" -msgstr "切换到全角字符" +msgid "Switch to full-width letter" +msgstr "" #: engine/table.py:1004 -msgid "Switch to half punction" -msgstr "切换到半角标点" +msgid "Switch to half-width punctuation" +msgstr "" #: engine/table.py:1007 -msgid "Switch to full punction" -msgstr "切换到全角标点" +msgid "Switch to full-width punctuation" +msgstr "" #: engine/table.py:1015 msgid "Switch to PinYin mode" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-unikey.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-unikey.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ibus-unikey.po 2012-02-23 07:12:06.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ibus-unikey.po 2012-03-23 07:33: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: 2012-02-22 01:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/engine.cpp:680 msgid "Enable spell check" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/indent.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/indent.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/indent.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/indent.po 2012-03-23 07:32: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: 2012-02-21 18:24+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:57+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/isoquery.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/isoquery.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/isoquery.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/isoquery.po 2012-03-23 07:33:21.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: 2012-02-22 00:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: isoquery/cmdline_parser.py:30 msgid "Usage: %prog [options] [ISO codes]" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/JabberBot.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/JabberBot.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/JabberBot.po 2012-03-23 07:32:57.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: 2012-02-21 18:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:14+0000\n" +"X-Generator: Launchpad (build 14981)\n" #, python-format msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jade.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/jade.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jade.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/jade.po 2012-03-23 07:32:55.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: 2012-02-21 18:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" msgid "cannot open output file %1 (%2)" msgstr "无法打开输出文件 %1 (%2)" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jockey.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/jockey.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/jockey.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/jockey.po 2012-03-23 07:33:21.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: restricted-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-08 12:01+0000\n" +"POT-Creation-Date: 2012-03-05 05:52+0000\n" "PO-Revision-Date: 2011-03-09 14:31+0000\n" "Last-Translator: Xhacker Liu \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: 2012-02-22 00:13+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../text/jockey-text.py:72 @@ -48,9 +48,30 @@ "graphics cards, as well as provide 2D acceleration of newer cards." msgstr "这个驱动可以充分利用一些 ATI 显示卡 3D 性能，同时为一些较新的显卡提供 2D 加速。" -#: ../data/handlers/broadcom_wl.py:20 -msgid "Broadcom STA wireless driver" -msgstr "Broadcom STA 无线驱动" +#: ../examples/handlers/nvidia.py:26 ../data/handlers/nvidia.py:28 +msgid "NVIDIA accelerated graphics driver" +msgstr "NVIDIA 图形加速驱动" + +#: ../examples/handlers/nvidia.py:27 +msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." +msgstr "NVIDIA 显示卡的专有三维加速图形驱动。" + +#: ../examples/handlers/nvidia.py:29 +msgid "" +"This driver is required to fully utilise the 3D potential of NVIDIA graphics " +"cards, as well as provide 2D acceleration of newer cards.\n" +"\n" +"If you wish to enable desktop effects, this driver is required.\n" +"\n" +"If this driver is not enabled, you will not be able to enable desktop " +"effects and will not be able to run software that requires 3D acceleration, " +"such as some games." +msgstr "" +"为了完全发挥 NVIDIA 显卡的 3D 功能或为一些新型号显卡提供 2D 加速，需要使用此驱动。\n" +"\n" +"如果您希望开启桌面特效，需要使用此驱动。\n" +"\n" +"如果不开启此驱动，您将不能开启桌面特效，也无法运行需要 3D 加速的软件（例如一些游戏）。" #: ../examples/handlers/madwifi.py:22 ../data/handlers/madwifi.py:22 msgid "Alternate Atheros \"madwifi\" driver" @@ -93,21 +114,6 @@ "graphics cards, as well as provide 2D acceleration of newer cards." msgstr "" -#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 -msgid "Software modem" -msgstr "软件调制解调器" - -#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 -msgid "" -"This driver enables the usage of many software modems, as commonly found in " -"laptops.\n" -"\n" -"If this driver is not enabled, you will not be able to use your modem." -msgstr "" -"这个驱动启用一些软件调制解调器的使用，它们在笔记本电脑中常见。\n" -"\n" -"如果这个驱动没有启用，您将不能够使用调制解调器。" - #: ../examples/handlers/vmware-client.py:17 #: ../data/handlers/vmware-client.py:17 msgid "VMWare Client Tools" @@ -151,10 +157,6 @@ msgid "Use a different target kernel version than the currently running one." msgstr "使用与当前运行的内核不同的目标内核版本。" -#: ../data/handlers/dvb_usb_firmware.py:21 -msgid "Firmware for DVB cards" -msgstr "DVB 卡固件" - #: ../kde/autostart/jockey-kde.desktop.in.h:1 #: ../gtk/autostart/jockey-gtk.desktop.in.h:1 msgid "Check for new hardware drivers" @@ -165,6 +167,21 @@ msgid "Notify about new hardware drivers available for the system" msgstr "系统有新的硬件驱动时提示" +#: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15 +msgid "Software modem" +msgstr "软件调制解调器" + +#: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17 +msgid "" +"This driver enables the usage of many software modems, as commonly found in " +"laptops.\n" +"\n" +"If this driver is not enabled, you will not be able to use your modem." +msgstr "" +"这个驱动启用一些软件调制解调器的使用，它们在笔记本电脑中常见。\n" +"\n" +"如果这个驱动没有启用，您将不能够使用调制解调器。" + #: ../kde/jockey-kde.desktop.in.h:1 ../jockey/ui.py:206 ../jockey/ui.py:582 #: ../jockey/ui.py:590 ../jockey/ui.py:598 ../jockey/ui.py:802 #: ../gtk/jockey-gtk.desktop.in.h:1 @@ -175,11 +192,14 @@ msgid "Configure third-party and proprietary drivers" msgstr "配置第三方和专有驱动" +#: ../data/handlers/dvb_usb_firmware.py:21 +msgid "Firmware for DVB cards" +msgstr "DVB 卡固件" + #: ../jockey/ui.py:121 msgid "" -"Cannot connect to D-BUS,\"+ \" please use the --" -"no-dbus option as root to\"+ \" use jockey " -"without it." +"Cannot connect to D-BUS, please use the --no-dbus option as root to use " +"jockey without it." msgstr "" #: ../jockey/ui.py:132 ../jockey/ui.py:145 @@ -523,10 +543,6 @@ msgid "NVIDIA accelerated graphics driver (post-release updates)" msgstr "" -#: ../data/handlers/nvidia.py:28 ../examples/handlers/nvidia.py:26 -msgid "NVIDIA accelerated graphics driver" -msgstr "NVIDIA 图形加速驱动" - #: ../data/handlers/nvidia.py:34 msgid "" "3D-accelerated proprietary graphics driver for NVIDIA cards. Required if you " @@ -577,23 +593,6 @@ msgid "To install or remove device drivers, you need to authenticate." msgstr "" -#: ../examples/handlers/nvidia.py:27 -msgid "3D-accelerated proprietary graphics driver for NVIDIA cards." -msgstr "NVIDIA 显示卡的专有三维加速图形驱动。" - -#: ../examples/handlers/nvidia.py:29 -msgid "" -"This driver is required to fully utilise the 3D potential of NVIDIA graphics " -"cards, as well as provide 2D acceleration of newer cards.\n" -"\n" -"If you wish to enable desktop effects, this driver is required.\n" -"\n" -"If this driver is not enabled, you will not be able to enable desktop " -"effects and will not be able to run software that requires 3D acceleration, " -"such as some games." -msgstr "" -"为了完全发挥 NVIDIA 显卡的 3D 功能或为一些新型号显卡提供 2D 加速，需要使用此驱动。\n" -"\n" -"如果您希望开启桌面特效，需要使用此驱动。\n" -"\n" -"如果不开启此驱动，您将不能开启桌面特效，也无法运行需要 3D 加速的软件（例如一些游戏）。" +#: ../data/handlers/broadcom_wl.py:20 +msgid "Broadcom STA wireless driver" +msgstr "Broadcom STA 无线驱动" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kbd.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kbd.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kbd.po 2012-02-23 07:11:39.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kbd.po 2012-03-23 07:33: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: 2012-02-21 19:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:38+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/chvt.c:28 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kcm_gtk.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kcm_gtk.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kcm_gtk.po 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kcm_gtk.po 2012-03-23 07:33:25.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: 2012-02-22 01:16+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:47+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: kcmgtk.cpp:67 msgid "kcm_gtk" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kerneloops.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kerneloops.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/kerneloops.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kerneloops.po 2012-03-23 07:33:21.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: 2012-02-22 00:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: kerneloops-applet.c:170 kerneloops-applet.c:212 msgid "Always" diff -Nru 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+20120322/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 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po 2012-03-23 07:33:11.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: 2012-02-21 22:02+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../kubuntu-docs.desktop.in.h:1 msgid "Kubuntu System Documentation Index" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/language-selector.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/language-selector.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/language-selector.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/language-selector.po 2012-03-23 07:33:11.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: language-selector\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2012-03-16 10:31+0000\n" +"PO-Revision-Date: 2012-03-09 19:39+0000\n" +"Last-Translator: Colin Watson \n" "Language-Team: Chinese (China) \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: 2012-02-21 21:55+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #. Hack for Chinese langpack split @@ -121,11 +121,11 @@ "manager. Check your preferences in Software Sources (click the icon at the " "very right of the top bar and select \"System Settings... -> Software " "Sources\")." -msgstr "" +msgstr "这通常与软件存档或软件管理器中的错误有关。请检查您在“软件源”中的设置 (点击顶栏最右边的图标并选择“系统设置... -> 软件源”)。" #: ../LanguageSelector/gtk/GtkLanguageSelector.py:615 msgid "Failed to authorize to install packages." -msgstr "" +msgstr "安装包验证失败。" #: ../LanguageSelector/gtk/GtkLanguageSelector.py:673 #: ../LanguageSelector/qt/QtLanguageSelector.py:162 @@ -155,19 +155,22 @@ msgid "Details" msgstr "详细信息" -#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935 +#: ../LanguageSelector/gtk/GtkLanguageSelector.py:939 #, python-format -msgid "Failed to apply the '%s' format choice:" -msgstr "应用“%s”格式选项失败：" +msgid "" +"Failed to apply the '%s' format\n" +"choice. The examples may show up if you\n" +"close and re-open Language Support." +msgstr "" #: ../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 " +"manager \"Muon\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -"无法安装或移除任何软件包。请先使用软件包管理器“Adept”或者在终端中运行“sudo apt-get install -f”来修复这个问题。" +"不可以安装或者移除任何软件包。请首先使用软件包管理器 \"Muon\" 或者在一个终端中运行 “sudo apt-get install -f” " +"来修复它。" #: ../LanguageSelector/qt/QtLanguageSelector.py:114 msgid "Set System Language" @@ -244,6 +247,14 @@ msgid "Language Set" msgstr "语言设定" +#: ../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 " +"this issue at first." +msgstr "" +"无法安装或移除任何软件包。请先使用软件包管理器“Adept”或者在终端中运行“sudo apt-get install -f”来修复这个问题。" + #: ../LanguageSelector/qt/QtLanguageSelector.py:354 #, python-format msgid "" @@ -347,7 +358,7 @@ msgid "" "Use the same language choices for startup and the login " "screen." -msgstr "" +msgstr "启动和登录界面使用同一语言。" #: ../data/LanguageSelector.ui.h:17 msgid "Install / Remove Languages..." @@ -397,7 +408,7 @@ #: ../data/LanguageSelector.ui.h:29 msgid "" "Use the same format choice for startup and the login screen." -msgstr "" +msgstr "启动和登录界面使用相同样式。" #: ../data/LanguageSelector.ui.h:30 msgid "Number:" @@ -447,6 +458,8 @@ "Support instead (click the icon at the very right of the top bar and select " "\"System Settings... -> Language Support\")." msgstr "" +"您所选择的语言的支持文件可能不完整。要安装缺失的组件，您可以点击“现在执行此操作”并按照指示进行。此过程需要一个可用的网络连接。如果您需要稍后再进行，请使" +"用“语言支持” (点击顶栏最右边的图标并选择“系统设置... -> 语言支持”)。" #. Description #: ../data/incomplete-language-support-kde.note.in:6 @@ -472,11 +485,11 @@ #: ../dbus_backend/com.ubuntu.languageselector.policy.in.h:1 msgid "Set system default language" -msgstr "" +msgstr "设置系统默认语言" #: ../dbus_backend/com.ubuntu.languageselector.policy.in.h:2 msgid "System policy prevented setting default language" -msgstr "" +msgstr "系统策略阻止了设置默认语言" #: ../gnome-language-selector:17 msgid "don't verify installed language support" @@ -542,7 +555,7 @@ #: ../check-language-support:28 msgid "output all available language support packages for all languages" -msgstr "" +msgstr "为所有语言输出所有可用的语言支持包" #: ../check-language-support:31 msgid "show installed packages as well as missing ones" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/launchpad-integration.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/launchpad-integration.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/launchpad-integration.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/launchpad-integration.po 2012-03-23 07:33:11.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: 2012-02-21 22:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: lib/launchpad-integration.c:71 msgid "The Launchpad helper application failed" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ldm.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ldm.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ldm.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ldm.po 2012-03-23 07:33:20.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: 2012-02-22 00:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:58+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../src/plugin.c:20 msgid "Username" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ld.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ld.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ld.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ld.po 2012-03-23 07:32:48.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: 2012-01-27 01:24+0000\n" +"PO-Revision-Date: 2012-03-09 02:27+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: 2012-02-21 17:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: emultempl/armcoff.em:73 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lftp.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lftp.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lftp.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lftp.po 2012-03-23 07:32:54.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:02+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libapt-inst1.4.po 2012-03-23 07:32:47.000000000 +0000 @@ -9,15 +9,15 @@ 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" +"POT-Creation-Date: 2012-03-15 19:05+0000\n" +"PO-Revision-Date: 2012-03-15 23:17+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" +"X-Launchpad-Export-Date: 2012-03-22 17:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: apt-inst/contrib/extracttar.cc:117 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libapt-pkg4.12.po 2012-03-23 07:32:47.000000000 +0000 @@ -9,15 +9,15 @@ 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" +"POT-Creation-Date: 2012-03-15 19:05+0000\n" +"PO-Revision-Date: 2012-03-15 22:52+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" +"X-Launchpad-Export-Date: 2012-03-22 17:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: methods/bzip2.cc:63 methods/gzip.cc:54 @@ -69,7 +69,7 @@ msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 msgid "File not found" msgstr "无法找到该文件" @@ -78,152 +78,152 @@ msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 +#: methods/ftp.cc:173 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:183 +#: methods/ftp.cc:184 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:215 methods/ftp.cc:243 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:220 +#: methods/ftp.cc:221 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:228 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:248 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:275 +#: methods/ftp.cc:276 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:301 +#: methods/ftp.cc:302 #, 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 +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:345 +#: methods/ftp.cc:346 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 +#: methods/ftp.cc:349 apt-pkg/contrib/fileutl.cc:1077 +#: apt-pkg/contrib/fileutl.cc:1080 methods/rsh.cc:199 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:355 methods/rsh.cc:204 +#: methods/ftp.cc:356 methods/rsh.cc:206 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:373 methods/ftp.cc:385 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:239 +#: methods/ftp.cc:457 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:241 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:739 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:711 methods/connect.cc:115 +#: methods/ftp.cc:712 methods/connect.cc:115 msgid "Failed" msgstr "失败" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:731 +#: methods/ftp.cc:732 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:749 +#: methods/ftp.cc:750 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:756 +#: methods/ftp.cc:757 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:788 +#: methods/ftp.cc:789 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:798 +#: methods/ftp.cc:799 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:808 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:828 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:834 +#: methods/ftp.cc:835 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:873 methods/http.cc:1034 methods/rsh.cc:309 +#: methods/ftp.cc:874 methods/http.cc:1034 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:886 +#: methods/ftp.cc:887 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:901 methods/rsh.cc:328 +#: methods/ftp.cc:902 methods/rsh.cc:330 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:931 +#: methods/ftp.cc:932 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1121 msgid "Unable to invoke " msgstr "无法调用 " @@ -259,7 +259,7 @@ #. 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 +#: methods/connect.cc:153 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -642,7 +642,7 @@ "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 +#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:998 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -826,12 +826,12 @@ msgid "Failed to write temporary StateFile %s" msgstr "无法写入临时状态文件 %s" -#: apt-pkg/tagfile.cc:126 +#: apt-pkg/tagfile.cc:129 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:213 +#: apt-pkg/tagfile.cc:216 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" @@ -906,19 +906,19 @@ 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 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:879 #, 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 +#: apt-pkg/packagemanager.cc:468 apt-pkg/packagemanager.cc:498 #, c-format msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/packagemanager.cc:507 +#: apt-pkg/packagemanager.cc:538 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -1124,8 +1124,8 @@ msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 -#: apt-pkg/acquire-item.cc:2006 +#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1881 +#: apt-pkg/acquire-item.cc:2024 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" @@ -1170,27 +1170,27 @@ msgid "GPG error: %s: %s" msgstr "GPG 错误：%s: %s" -#: apt-pkg/acquire-item.cc:1650 +#: apt-pkg/acquire-item.cc:1657 #, 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 +#: apt-pkg/acquire-item.cc:1716 #, 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 +#: apt-pkg/acquire-item.cc:1775 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1855 +#: apt-pkg/acquire-item.cc:1873 msgid "Size mismatch" msgstr "大小不符" @@ -1433,133 +1433,133 @@ msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:70 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:948 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:955 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Completely removing %s" msgstr "完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:74 +#: apt-pkg/deb/dpkgpm.cc:76 #, c-format msgid "Noting disappearance of %s" msgstr "注意到 %s 已经消失" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:702 +#: apt-pkg/deb/dpkgpm.cc:704 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 缺失" -#: apt-pkg/deb/dpkgpm.cc:717 apt-pkg/deb/dpkgpm.cc:737 +#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 #, c-format msgid "Could not open file '%s'" msgstr "无法打开文件 %s" -#: apt-pkg/deb/dpkgpm.cc:939 +#: apt-pkg/deb/dpkgpm.cc:941 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:940 +#: apt-pkg/deb/dpkgpm.cc:942 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:947 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:947 +#: apt-pkg/deb/dpkgpm.cc:949 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:954 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:954 +#: apt-pkg/deb/dpkgpm.cc:956 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:961 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:962 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:1202 +#: apt-pkg/deb/dpkgpm.cc:1204 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n" -#: apt-pkg/deb/dpkgpm.cc:1232 +#: apt-pkg/deb/dpkgpm.cc:1234 msgid "Running dpkg" msgstr "正在运行 dpkg" -#: apt-pkg/deb/dpkgpm.cc:1404 +#: apt-pkg/deb/dpkgpm.cc:1406 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1461 +#: apt-pkg/deb/dpkgpm.cc:1463 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 +#: apt-pkg/deb/dpkgpm.cc:1468 msgid "dependency problems - leaving unconfigured" msgstr "依赖问题 - 保持未配置" -#: apt-pkg/deb/dpkgpm.cc:1468 +#: apt-pkg/deb/dpkgpm.cc:1470 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 +#: apt-pkg/deb/dpkgpm.cc:1476 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" -#: apt-pkg/deb/dpkgpm.cc:1481 +#: apt-pkg/deb/dpkgpm.cc:1483 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 +#: apt-pkg/deb/dpkgpm.cc:1490 apt-pkg/deb/dpkgpm.cc:1496 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1515 +#: apt-pkg/deb/dpkgpm.cc:1517 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" @@ -1621,10 +1621,10 @@ "to be corrupt." msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。" -#: methods/rsh.cc:97 +#: methods/rsh.cc:99 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:336 +#: methods/rsh.cc:338 msgid "Connection closed prematurely" msgstr "连接被过早地关闭了" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libc.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libc.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libc.po 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libc.po 2012-03-23 07:33:25.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: glibc\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-05-31 00:06-0400\n" -"PO-Revision-Date: 2012-02-10 01:40+0000\n" +"PO-Revision-Date: 2012-03-22 02:59+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: 2012-02-22 01:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:45+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: argp/argp-help.c:228 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libelf.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libelf.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libelf.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libelf.po 2012-03-23 07:32:54.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:31+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:03+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../lib/errors.h:25 msgid "no error" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libexif-12.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libexif-12.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libexif-12.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libexif-12.po 2012-03-23 07:32:54.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:03+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/libgnutls.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgnutls.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgnutls.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgnutls.po 2012-03-23 07:33:21.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: 2012-02-22 00:15+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:07+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnutls_errors.c:54 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgpg-error.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgpg-error.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgpg-error.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgpg-error.po 2012-03-23 07:32:55.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: 2012-02-21 18:36+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/err-sources.h:28 msgid "Unspecified source" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2-2.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgphoto2-2.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2-2.po 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgphoto2-2.po 2012-03-23 07:32:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gphoto2\n" "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-04-17 18:12+0200\n" +"POT-Creation-Date: 2012-02-20 10:17+0100\n" "PO-Revision-Date: 2009-10-12 10:37+0000\n" "Last-Translator: Tao Wei \n" "Language-Team: zh_CN \n" @@ -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: 2012-02-21 18:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: camlibs/adc65/adc65.c:243 msgid "" @@ -90,12 +90,12 @@ "from the picture frame." msgstr "" -#: camlibs/ax203/library.c:442 camlibs/st2205/library.c:541 +#: camlibs/ax203/library.c:442 camlibs/st2205/library.c:543 msgid "Picture Frame Configuration" msgstr "" #: camlibs/ax203/library.c:445 camlibs/ax203/library.c:461 -#: camlibs/st2205/library.c:544 camlibs/st2205/library.c:568 +#: camlibs/st2205/library.c:546 camlibs/st2205/library.c:570 msgid "Synchronize frame data and time with PC" msgstr "" @@ -215,7 +215,7 @@ msgid "NULL parameter \"%s\" in %s line %i" msgstr "" -#: camlibs/canon/canon.h:634 +#: camlibs/canon/canon.h:635 #, c-format msgid "" "Don't know how to handle camera->port->type value %i aka 0x%x in %s line %i." @@ -238,7 +238,7 @@ "#########################\n" msgstr "警告：CRC没有检查 (add len %d, value 0x%04x) #########################\n" -#: camlibs/canon/library.c:96 camlibs/canon/library.c:1619 +#: camlibs/canon/library.c:96 camlibs/canon/library.c:1621 msgid "Compatibility Mode" msgstr "" @@ -251,8 +251,8 @@ msgstr "完整图像" #: camlibs/canon/library.c:122 camlibs/canon/library.c:265 -#: camlibs/ptp2/config.c:1503 camlibs/ptp2/config.c:1514 -#: camlibs/ptp2/ptp.c:4509 +#: camlibs/ptp2/config.c:1514 camlibs/ptp2/config.c:1525 +#: camlibs/ptp2/ptp.c:4573 msgid "Bulb" msgstr "" @@ -281,7 +281,7 @@ msgstr "蜂鸣开启" #: camlibs/canon/library.c:229 camlibs/canon/library.c:280 -#: camlibs/ptp2/config.c:2506 camlibs/ptp2/ptp.c:4142 +#: camlibs/ptp2/config.c:2593 camlibs/ptp2/ptp.c:4204 msgid "Flash off" msgstr "闪光灯关闭" @@ -297,20 +297,20 @@ msgid "AUTO" msgstr "" -#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1510 -#: camlibs/ptp2/ptp.c:4503 +#: camlibs/canon/library.c:259 camlibs/ptp2/config.c:1521 +#: camlibs/ptp2/ptp.c:4567 msgid "P" msgstr "" -#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:4504 +#: camlibs/canon/library.c:260 camlibs/ptp2/ptp.c:4568 msgid "Tv" msgstr "" -#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:4505 +#: camlibs/canon/library.c:261 camlibs/ptp2/ptp.c:4569 msgid "Av" msgstr "" -#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:4506 +#: camlibs/canon/library.c:262 camlibs/ptp2/ptp.c:4570 msgid "M" msgstr "" @@ -349,24 +349,25 @@ # camlibs/sierra/sierra.c:858 camlibs/sierra/sierra.c:867 # camlibs/sierra/sierra.c:1173 #: camlibs/canon/library.c:272 camlibs/konica/qm150.c:998 -#: camlibs/konica/qm150.c:1014 camlibs/ptp2/config.c:2527 -#: camlibs/ptp2/config.c:3195 camlibs/ptp2/ptp.c:4519 camlibs/ptp2/ptp.c:4654 +#: camlibs/konica/qm150.c:1014 camlibs/ptp2/config.c:2614 +#: camlibs/ptp2/config.c:3306 camlibs/ptp2/ptp.c:4583 camlibs/ptp2/ptp.c:4718 #: camlibs/ricoh/library.c:332 camlibs/sierra/olympus-desc.c:482 #: camlibs/sierra/sierra.c:997 camlibs/sierra/sierra.c:1006 #: camlibs/sierra/sierra.c:1312 msgid "Sepia" msgstr "棕褐色" -#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1522 -#: camlibs/ptp2/config.c:1679 camlibs/ptp2/config.c:2379 -#: camlibs/ptp2/config.c:2381 camlibs/ptp2/config.c:3007 -#: camlibs/ptp2/ptp.c:4156 camlibs/ptp2/ptp.c:4351 camlibs/ptp2/ptp.c:4520 -#: camlibs/st2205/library.c:514 camlibs/st2205/library.c:527 +#: camlibs/canon/library.c:273 camlibs/ptp2/config.c:1533 +#: camlibs/ptp2/config.c:1697 camlibs/ptp2/config.c:2430 +#: camlibs/ptp2/config.c:2432 camlibs/ptp2/config.c:2466 +#: camlibs/ptp2/config.c:3118 camlibs/ptp2/ptp.c:4218 camlibs/ptp2/ptp.c:4414 +#: camlibs/ptp2/ptp.c:4584 camlibs/st2205/library.c:516 +#: camlibs/st2205/library.c:529 msgid "Portrait" msgstr "" -#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:1667 -#: camlibs/ptp2/config.c:2499 camlibs/sierra/nikon-desc.c:492 +#: camlibs/canon/library.c:274 camlibs/ptp2/config.c:1685 +#: camlibs/ptp2/config.c:2586 camlibs/sierra/nikon-desc.c:492 #: camlibs/sierra/olympus-desc.c:775 camlibs/sierra/olympus-desc.c:791 msgid "Spot" msgstr "点" @@ -376,12 +377,13 @@ # camlibs/sierra/sierra.c:1453 camlibs/sierra/sierra.c:1666 #: camlibs/canon/library.c:275 camlibs/kodak/dc210/dc210.c:231 #: camlibs/kodak/dc210/dc210.c:245 camlibs/konica/qm150.c:1019 -#: camlibs/ptp2/config.c:2383 camlibs/ptp2/ptp.c:4158 camlibs/ptp2/ptp.c:4522 -#: camlibs/ricoh/library.c:500 camlibs/sierra/epson-desc.c:218 -#: camlibs/sierra/nikon-desc.c:324 camlibs/sierra/olympus-desc.c:637 -#: camlibs/sierra/sierra.c:1117 camlibs/sierra/sierra.c:1122 -#: camlibs/sierra/sierra.c:1393 camlibs/sierra/sierra.c:1589 -#: camlibs/sierra/sierra.c:1592 camlibs/sierra/sierra.c:1805 +#: camlibs/ptp2/config.c:2434 camlibs/ptp2/config.c:2468 +#: camlibs/ptp2/ptp.c:4220 camlibs/ptp2/ptp.c:4586 camlibs/ricoh/library.c:500 +#: camlibs/sierra/epson-desc.c:218 camlibs/sierra/nikon-desc.c:324 +#: camlibs/sierra/olympus-desc.c:637 camlibs/sierra/sierra.c:1117 +#: camlibs/sierra/sierra.c:1122 camlibs/sierra/sierra.c:1393 +#: camlibs/sierra/sierra.c:1589 camlibs/sierra/sierra.c:1592 +#: camlibs/sierra/sierra.c:1805 msgid "Macro" msgstr "巨大" @@ -393,8 +395,8 @@ msgid "PanFocus" msgstr "" -#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:3003 -#: camlibs/ptp2/config.c:3192 camlibs/ptp2/ptp.c:4347 camlibs/ptp2/ptp.c:4651 +#: camlibs/canon/library.c:278 camlibs/ptp2/config.c:3114 +#: camlibs/ptp2/config.c:3303 camlibs/ptp2/ptp.c:4410 camlibs/ptp2/ptp.c:4715 msgid "Vivid" msgstr "" @@ -406,8 +408,8 @@ # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455 # camlibs/sierra/sierra.c:1668 -#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:1681 -#: camlibs/ptp2/config.c:3193 camlibs/ptp2/ptp.c:4525 camlibs/ptp2/ptp.c:4652 +#: camlibs/canon/library.c:279 camlibs/ptp2/config.c:1699 +#: camlibs/ptp2/config.c:3304 camlibs/ptp2/ptp.c:4589 camlibs/ptp2/ptp.c:4716 msgid "Neutral" msgstr "中性" @@ -463,60 +465,64 @@ msgid "Photo in movie" msgstr "" -#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1172 -#: camlibs/ptp2/config.c:1941 camlibs/ptp2/ptp.c:4117 +#: camlibs/canon/library.c:299 camlibs/ptp2/config.c:1183 +#: camlibs/ptp2/config.c:1992 camlibs/ptp2/ptp.c:4179 msgid "RAW" msgstr "原始的" -#: camlibs/canon/library.c:301 camlibs/ptp2/config.c:1949 +#: camlibs/canon/library.c:301 +msgid "RAW 2" +msgstr "" + +#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:2000 msgid "Small Normal JPEG" msgstr "小的正常 JPEG" -#: camlibs/canon/library.c:303 camlibs/ptp2/config.c:1948 +#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:1999 msgid "Small Fine JPEG" msgstr "小的高质量 JPEG" -#: camlibs/canon/library.c:305 camlibs/ptp2/config.c:1947 +#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:1998 msgid "Medium Normal JPEG" msgstr "中等正常 JPEG" -#: camlibs/canon/library.c:307 camlibs/ptp2/config.c:1946 +#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:1997 msgid "Medium Fine JPEG" msgstr "中等高质量 JPEG" -#: camlibs/canon/library.c:309 camlibs/ptp2/config.c:1945 +#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:1996 msgid "Large Normal JPEG" msgstr "大的正常 JPEG" -#: camlibs/canon/library.c:311 camlibs/ptp2/config.c:1944 +#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:1995 msgid "Large Fine JPEG" msgstr "大的高质量 JPEG" -#: camlibs/canon/library.c:313 camlibs/ptp2/config.c:1965 +#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:2016 msgid "RAW + Small Normal JPEG" msgstr "原始的 ＋ 小的正常 JPEG" -#: camlibs/canon/library.c:315 camlibs/ptp2/config.c:1956 +#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:2007 msgid "RAW + Small Fine JPEG" msgstr "原始的 ＋ 小的高质量 JPEG" -#: camlibs/canon/library.c:317 camlibs/ptp2/config.c:1962 +#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:2013 msgid "RAW + Medium Normal JPEG" msgstr "" -#: camlibs/canon/library.c:319 camlibs/ptp2/config.c:1953 +#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:2004 msgid "RAW + Medium Fine JPEG" msgstr "" -#: camlibs/canon/library.c:321 camlibs/ptp2/config.c:1959 +#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:2010 msgid "RAW + Large Normal JPEG" msgstr "" -#: camlibs/canon/library.c:323 camlibs/ptp2/config.c:1950 +#: camlibs/canon/library.c:325 camlibs/ptp2/config.c:2001 msgid "RAW + Large Fine JPEG" msgstr "" -#: camlibs/canon/library.c:365 +#: camlibs/canon/library.c:367 msgid "" "This is the driver for Canon PowerShot, Digital IXUS, IXY Digital,\n" " and EOS Digital cameras in their native (sometimes called \"normal\")\n" @@ -548,56 +554,56 @@ # camlibs/canon/library.c:165 camlibs/canon/library.c:889 # camlibs/canon/library.c:902 -#: camlibs/canon/library.c:494 +#: camlibs/canon/library.c:496 #, c-format msgid "Camera unavailable: %s" msgstr "相机不可用：%s" # camlibs/canon/library.c:176 -#: camlibs/canon/library.c:514 +#: camlibs/canon/library.c:516 msgid "Switching Camera Off" msgstr "关闭相机" # camlibs/canon/library.c:232 -#: camlibs/canon/library.c:584 camlibs/canon/library.c:621 +#: camlibs/canon/library.c:586 camlibs/canon/library.c:623 msgid "Error capturing image" msgstr "捕获图像出错" # camlibs/canon/library.c:267 -#: camlibs/canon/library.c:677 camlibs/canon/library.c:1113 +#: camlibs/canon/library.c:679 camlibs/canon/library.c:1115 #, c-format msgid "Could not get disk name: %s" msgstr "无法获取磁盘名：%s" # camlibs/canon/library.c:268 -#: camlibs/canon/library.c:678 camlibs/canon/library.c:1114 +#: camlibs/canon/library.c:680 camlibs/canon/library.c:1116 msgid "No reason available" msgstr "不知缘由" # camlibs/canon/library.c:275 -#: camlibs/canon/library.c:685 +#: camlibs/canon/library.c:687 #, c-format msgid "Could not get disk info: %s" msgstr "无法获取磁盘信息：%s" -#: camlibs/canon/library.c:754 +#: camlibs/canon/library.c:756 #, c-format msgid "Internal error #1 in get_file_func() (%s line %i)" msgstr "内部错误 #1 在 get_file_func() (%s line %i)" # libgphoto2/gphoto2-filesys.c:1199 -#: camlibs/canon/library.c:777 +#: camlibs/canon/library.c:779 #, c-format msgid "No audio file could be found for %s" msgstr "无法为 %s 找到音频文件" -#: camlibs/canon/library.c:825 camlibs/canon/library.c:863 +#: camlibs/canon/library.c:827 camlibs/canon/library.c:865 #, c-format msgid "%s is a file type for which no thumbnail is provided" msgstr "%s 是一种没有提供缩略图的文件格式" # camlibs/canon/library.c:568 -#: camlibs/canon/library.c:1036 +#: camlibs/canon/library.c:1038 #, c-format msgid "" " Drive %s\n" @@ -610,42 +616,42 @@ # camlibs/canon/library.c:576 camlibs/canon/library.c:582 # camlibs/canon/library.c:851 camlibs/canon/library.c:857 -#: camlibs/canon/library.c:1044 camlibs/canon/library.c:1050 -#: camlibs/canon/library.c:2008 camlibs/canon/library.c:2014 +#: camlibs/canon/library.c:1046 camlibs/canon/library.c:1052 +#: camlibs/canon/library.c:2010 camlibs/canon/library.c:2016 msgid "AC adapter" msgstr "交流变压器" # camlibs/canon/library.c:576 camlibs/canon/library.c:582 # camlibs/canon/library.c:851 camlibs/canon/library.c:857 -#: camlibs/canon/library.c:1044 camlibs/canon/library.c:1050 -#: camlibs/canon/library.c:2008 camlibs/canon/library.c:2014 +#: camlibs/canon/library.c:1046 camlibs/canon/library.c:1052 +#: camlibs/canon/library.c:2010 camlibs/canon/library.c:2016 msgid "on battery" msgstr "使用电池" # camlibs/canon/library.c:578 camlibs/canon/library.c:853 -#: camlibs/canon/library.c:1046 camlibs/canon/library.c:2010 +#: camlibs/canon/library.c:1048 camlibs/canon/library.c:2012 msgid "power OK" msgstr "电力充足" # camlibs/canon/library.c:578 camlibs/canon/library.c:853 -#: camlibs/canon/library.c:1046 camlibs/canon/library.c:2010 +#: camlibs/canon/library.c:1048 camlibs/canon/library.c:2012 msgid "power bad" msgstr "电力不足" # camlibs/canon/library.c:586 -#: camlibs/canon/library.c:1054 +#: camlibs/canon/library.c:1056 #, c-format msgid "not available: %s" msgstr "不可用：%s" # camlibs/canon/library.c:598 -#: camlibs/canon/library.c:1080 +#: camlibs/canon/library.c:1082 #, c-format msgid "%s (host time %s%i seconds)" msgstr "%s (主机时间 %s%i 秒)" # camlibs/canon/library.c:608 -#: camlibs/canon/library.c:1090 +#: camlibs/canon/library.c:1092 #, c-format msgid "" "\n" @@ -673,7 +679,7 @@ "时间：%s\n" # camlibs/canon/library.c:625 -#: camlibs/canon/library.c:1148 +#: camlibs/canon/library.c:1150 msgid "" "Canon PowerShot series driver by\n" " Wolfgang G. Reissnegger,\n" @@ -696,28 +702,28 @@ " Stephen H. Westin 编写" # camlibs/canon/library.c:664 -#: camlibs/canon/library.c:1192 +#: camlibs/canon/library.c:1194 msgid "Error deleting file" msgstr "删除文件时错误" # camlibs/canon/library.c:680 -#: camlibs/canon/library.c:1208 +#: camlibs/canon/library.c:1210 msgid "Error deleting associated thumbnail file" msgstr "删除相关缩略图文件出错" # camlibs/canon/library.c:713 -#: camlibs/canon/library.c:1340 camlibs/canon/library.c:1473 +#: camlibs/canon/library.c:1342 camlibs/canon/library.c:1475 msgid "" "Speeds greater than 57600 are not supported for uploading to this camera" msgstr "该相机不支持高于 57600 的速度的上载" # camlibs/canon/library.c:730 -#: camlibs/canon/library.c:1357 camlibs/canon/library.c:1491 +#: camlibs/canon/library.c:1359 camlibs/canon/library.c:1493 msgid "Could not get flash drive letter" msgstr "无法获取闪存驱动字符" # camlibs/canon/library.c:754 -#: camlibs/canon/library.c:1401 camlibs/canon/library.c:1514 +#: camlibs/canon/library.c:1403 camlibs/canon/library.c:1516 msgid "" "Could not upload, no free folder name available!\n" "999CANON folder name exists and has an AUT_9999.JPG picture in it." @@ -726,24 +732,24 @@ "已有 999 个佳能文件夹名称存在而且每个文件夹中都有照片 AUT_9999.JPG。" # camlibs/canon/library.c:774 -#: camlibs/canon/library.c:1423 camlibs/canon/library.c:1534 +#: camlibs/canon/library.c:1425 camlibs/canon/library.c:1536 msgid "Could not create \\DCIM directory." msgstr "无法创建目录 \\DCIM。" # camlibs/canon/library.c:780 -#: camlibs/canon/library.c:1429 camlibs/canon/library.c:1540 +#: camlibs/canon/library.c:1431 camlibs/canon/library.c:1542 msgid "Could not create destination directory." msgstr "无法创建目标目录。" # camlibs/canon/library.c:806 -#: camlibs/canon/library.c:1589 camlibs/ptp2/config.c:5219 -#: camlibs/ptp2/config.c:5489 +#: camlibs/canon/library.c:1591 camlibs/ptp2/config.c:5391 +#: camlibs/ptp2/config.c:5661 msgid "Camera and Driver Configuration" msgstr "相机及驱动器配置" # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510 -#: camlibs/canon/library.c:1592 camlibs/ptp2/config.c:5183 -#: camlibs/ptp2/config.c:5184 camlibs/sierra/epson-desc.c:282 +#: camlibs/canon/library.c:1594 camlibs/ptp2/config.c:5354 +#: camlibs/ptp2/config.c:5355 camlibs/sierra/epson-desc.c:282 #: camlibs/sierra/nikon-desc.c:695 camlibs/sierra/nikon-desc.c:706 #: camlibs/sierra/nikon-desc.c:717 camlibs/sierra/olympus-desc.c:1017 #: camlibs/sierra/olympus-desc.c:1116 camlibs/sierra/olympus-desc.c:1127 @@ -752,134 +758,134 @@ msgid "Camera Settings" msgstr "相机设置" -#: camlibs/canon/library.c:1596 camlibs/canon/library.c:2060 -#: camlibs/ptp2/config.c:4944 camlibs/ptp2/config.c:4945 +#: camlibs/canon/library.c:1598 camlibs/canon/library.c:2062 +#: camlibs/ptp2/config.c:5099 camlibs/ptp2/config.c:5100 msgid "Owner Name" msgstr "" -#: camlibs/canon/library.c:1602 camlibs/canon/library.c:2073 +#: camlibs/canon/library.c:1604 camlibs/canon/library.c:2075 msgid "Capture Size Class" msgstr "" -#: camlibs/canon/library.c:1634 camlibs/canon/library.c:2099 -#: camlibs/ptp2/config.c:4968 camlibs/ptp2/config.c:4969 -#: camlibs/ptp2/config.c:4970 camlibs/ptp2/ptp.c:3450 +#: camlibs/canon/library.c:1636 camlibs/canon/library.c:2101 +#: camlibs/ptp2/config.c:5124 camlibs/ptp2/config.c:5125 +#: camlibs/ptp2/config.c:5126 camlibs/ptp2/ptp.c:3510 #: camlibs/sierra/olympus-desc.c:881 camlibs/sierra/olympus-desc.c:899 msgid "ISO Speed" msgstr "ISO 速度" -#: camlibs/canon/library.c:1660 camlibs/canon/library.c:1661 -#: camlibs/canon/library.c:1694 camlibs/canon/library.c:1695 -#: camlibs/canon/library.c:1728 camlibs/canon/library.c:1729 -#: camlibs/canon/library.c:1775 camlibs/canon/library.c:1776 -#: camlibs/canon/library.c:1808 camlibs/canon/library.c:1809 -#: camlibs/canon/library.c:1846 camlibs/canon/library.c:1847 -#: camlibs/canon/library.c:1880 camlibs/canon/library.c:1881 -#: camlibs/canon/library.c:1914 camlibs/canon/library.c:1915 -#: camlibs/canon/library.c:1948 camlibs/canon/library.c:1949 -#: camlibs/ptp2/config.c:3038 camlibs/ptp2/config.c:3317 -#: camlibs/ptp2/library.c:3091 camlibs/ptp2/library.c:3093 -#: camlibs/ptp2/ptp.c:4300 camlibs/ptp2/ptp.c:4460 camlibs/ptp2/ptp.c:4550 +#: camlibs/canon/library.c:1662 camlibs/canon/library.c:1663 +#: camlibs/canon/library.c:1696 camlibs/canon/library.c:1697 +#: camlibs/canon/library.c:1730 camlibs/canon/library.c:1731 +#: camlibs/canon/library.c:1777 camlibs/canon/library.c:1778 +#: camlibs/canon/library.c:1810 camlibs/canon/library.c:1811 +#: camlibs/canon/library.c:1848 camlibs/canon/library.c:1849 +#: camlibs/canon/library.c:1882 camlibs/canon/library.c:1883 +#: camlibs/canon/library.c:1916 camlibs/canon/library.c:1917 +#: camlibs/canon/library.c:1950 camlibs/canon/library.c:1951 +#: camlibs/ptp2/config.c:3149 camlibs/ptp2/config.c:3436 +#: camlibs/ptp2/library.c:3185 camlibs/ptp2/library.c:3187 +#: camlibs/ptp2/ptp.c:4363 camlibs/ptp2/ptp.c:4524 camlibs/ptp2/ptp.c:4614 msgid "Unknown" msgstr "未知" -#: camlibs/canon/library.c:1668 camlibs/canon/library.c:2128 +#: camlibs/canon/library.c:1670 camlibs/canon/library.c:2130 msgid "Shooting mode" msgstr "" # camlibs/sierra/sierra.c:814 camlibs/sierra/sierra.c:1137 -#: camlibs/canon/library.c:1702 camlibs/canon/library.c:2157 -#: camlibs/ptp2/config.c:5045 camlibs/ptp2/config.c:5046 -#: camlibs/ptp2/config.c:5049 camlibs/ptp2/config.c:5050 -#: camlibs/ptp2/ptp.c:3452 camlibs/ptp2/ptp.c:3989 +#: camlibs/canon/library.c:1704 camlibs/canon/library.c:2159 +#: camlibs/ptp2/config.c:5204 camlibs/ptp2/config.c:5205 +#: camlibs/ptp2/config.c:5208 camlibs/ptp2/config.c:5209 +#: camlibs/ptp2/ptp.c:3512 camlibs/ptp2/ptp.c:4051 msgid "Shutter Speed" msgstr "快门速度" # camlibs/sierra/sierra.c:1023 camlibs/sierra/sierra.c:1283 -#: camlibs/canon/library.c:1737 camlibs/canon/library.c:2328 +#: camlibs/canon/library.c:1739 camlibs/canon/library.c:2330 #: camlibs/kodak/dc210/dc210.c:224 camlibs/kodak/dc210/dc210.c:383 -#: camlibs/konica/qm150.c:1033 camlibs/ptp2/config.c:4989 -#: camlibs/ptp2/ptp.c:3437 camlibs/ptp2/ptp.c:3463 camlibs/ricoh/library.c:501 +#: camlibs/konica/qm150.c:1033 camlibs/ptp2/config.c:5146 +#: camlibs/ptp2/ptp.c:3497 camlibs/ptp2/ptp.c:3523 camlibs/ricoh/library.c:501 #: camlibs/sierra/sierra.c:1162 camlibs/sierra/sierra.c:1422 msgid "Zoom" msgstr "缩放" # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602 -#: camlibs/canon/library.c:1749 camlibs/canon/library.c:2185 -#: camlibs/canon/library.c:2344 camlibs/ptp2/config.c:5037 -#: camlibs/ptp2/config.c:5038 camlibs/ptp2/config.c:5041 -#: camlibs/ptp2/ptp.c:3451 camlibs/ptp2/ptp.c:3988 camlibs/sierra/sierra.c:964 +#: camlibs/canon/library.c:1751 camlibs/canon/library.c:2187 +#: camlibs/canon/library.c:2346 camlibs/ptp2/config.c:5196 +#: camlibs/ptp2/config.c:5197 camlibs/ptp2/config.c:5200 +#: camlibs/ptp2/ptp.c:3511 camlibs/ptp2/ptp.c:4050 camlibs/sierra/sierra.c:964 #: camlibs/sierra/sierra.c:1285 camlibs/sierra/sierra.c:1500 #: camlibs/sierra/sierra.c:1741 msgid "Aperture" msgstr "光圈" -#: camlibs/canon/library.c:1782 camlibs/canon/library.c:2212 -#: camlibs/ptp2/config.c:4994 camlibs/ptp2/config.c:4995 -#: camlibs/ptp2/config.c:4996 camlibs/ptp2/config.c:4998 -#: camlibs/ptp2/ptp.c:3453 camlibs/ptp2/ptp.c:3619 +#: camlibs/canon/library.c:1784 camlibs/canon/library.c:2214 +#: camlibs/ptp2/config.c:5151 camlibs/ptp2/config.c:5152 +#: camlibs/ptp2/config.c:5153 camlibs/ptp2/config.c:5155 +#: camlibs/ptp2/ptp.c:3513 camlibs/ptp2/ptp.c:3679 #: camlibs/sierra/nikon-desc.c:459 camlibs/sierra/nikon-desc.c:482 #: camlibs/sierra/olympus-desc.c:766 msgid "Exposure Compensation" msgstr "曝光补偿" -#: camlibs/canon/library.c:1815 camlibs/canon/library.c:2241 -#: camlibs/ptp2/config.c:4960 camlibs/ptp2/config.c:4961 -#: camlibs/ptp2/config.c:4964 +#: camlibs/canon/library.c:1817 camlibs/canon/library.c:2243 +#: camlibs/ptp2/config.c:5116 camlibs/ptp2/config.c:5117 +#: camlibs/ptp2/config.c:5120 msgid "Image Format" msgstr "" # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626 -#: camlibs/canon/library.c:1854 camlibs/canon/library.c:2269 -#: camlibs/ptp2/config.c:5023 camlibs/ptp2/config.c:5026 -#: camlibs/ptp2/ptp.c:3379 camlibs/sierra/nikon-desc.c:331 +#: camlibs/canon/library.c:1856 camlibs/canon/library.c:2271 +#: camlibs/ptp2/config.c:5180 camlibs/ptp2/config.c:5183 +#: camlibs/ptp2/ptp.c:3439 camlibs/sierra/nikon-desc.c:331 #: camlibs/sierra/olympus-desc.c:644 msgid "Focus Mode" msgstr "聚焦模式" # camlibs/sierra/sierra.c:885 camlibs/sierra/sierra.c:1186 # camlibs/sierra/sierra.c:1395 camlibs/sierra/sierra.c:1626 -#: camlibs/canon/library.c:1888 camlibs/canon/library.c:2373 -#: camlibs/ptp2/config.c:5001 camlibs/ptp2/config.c:5002 -#: camlibs/ptp2/ptp.c:3381 camlibs/ptp2/ptp.c:3432 camlibs/ptp2/ptp.c:3673 -#: camlibs/ptp2/ptp.c:3861 camlibs/sierra/sierra.c:1024 +#: camlibs/canon/library.c:1890 camlibs/canon/library.c:2375 +#: camlibs/ptp2/config.c:5158 camlibs/ptp2/config.c:5159 +#: camlibs/ptp2/ptp.c:3441 camlibs/ptp2/ptp.c:3492 camlibs/ptp2/ptp.c:3735 +#: camlibs/ptp2/ptp.c:3923 camlibs/sierra/sierra.c:1024 #: camlibs/sierra/sierra.c:1325 camlibs/sierra/sierra.c:1534 #: camlibs/sierra/sierra.c:1765 msgid "Flash Mode" msgstr "闪光灯模式" # camlibs/konica/library.c:647 camlibs/konica/library.c:858 -#: camlibs/canon/library.c:1922 camlibs/canon/library.c:2298 +#: camlibs/canon/library.c:1924 camlibs/canon/library.c:2300 #: camlibs/konica/library.c:680 camlibs/konica/library.c:894 -#: camlibs/ptp2/ptp.c:3433 +#: camlibs/ptp2/ptp.c:3493 msgid "Beep" msgstr "鸣笛" -#: camlibs/canon/library.c:1959 camlibs/ptp2/config.c:5181 +#: camlibs/canon/library.c:1961 camlibs/ptp2/config.c:5352 msgid "Camera Actions" msgstr "" -#: camlibs/canon/library.c:1963 camlibs/canon/library.c:2402 -#: camlibs/ptp2/config.c:4882 camlibs/ptp2/config.c:4883 +#: camlibs/canon/library.c:1965 camlibs/canon/library.c:2404 +#: camlibs/ptp2/config.c:5036 camlibs/ptp2/config.c:5037 msgid "Synchronize camera date and time with PC" msgstr "" -#: camlibs/canon/library.c:1970 camlibs/ptp2/config.c:5186 +#: camlibs/canon/library.c:1972 camlibs/ptp2/config.c:5357 msgid "Camera Status Information" msgstr "" # camlibs/sierra/sierra.c:1806 -#: camlibs/canon/library.c:1974 camlibs/ptp2/config.c:4898 -#: camlibs/ptp2/config.c:4899 camlibs/ptp2/ptp.c:3471 +#: camlibs/canon/library.c:1976 camlibs/ptp2/config.c:5052 +#: camlibs/ptp2/config.c:5053 camlibs/ptp2/ptp.c:3531 msgid "Camera Model" msgstr "相机型号" # camlibs/konica/library.c:633 camlibs/konica/library.c:844 # camlibs/polaroid/pdc700.c:1005 camlibs/polaroid/pdc700.c:1018 # camlibs/polaroid/pdc700.c:1088 -#: camlibs/canon/library.c:1979 camlibs/konica/library.c:666 +#: camlibs/canon/library.c:1981 camlibs/konica/library.c:666 #: camlibs/konica/library.c:877 camlibs/konica/qm150.c:758 #: camlibs/polaroid/pdc700.c:1004 camlibs/polaroid/pdc700.c:1017 #: camlibs/polaroid/pdc700.c:1087 @@ -887,196 +893,196 @@ msgstr "日期和时间" # camlibs/canon/library.c:827 -#: camlibs/canon/library.c:1988 +#: camlibs/canon/library.c:1990 msgid "Error" msgstr "错误" # camlibs/canon/library.c:832 camlibs/canon/library.c:859 -#: camlibs/canon/library.c:1991 camlibs/canon/library.c:2016 +#: camlibs/canon/library.c:1993 camlibs/canon/library.c:2018 msgid "Unavailable" msgstr "不可用" -#: camlibs/canon/library.c:1995 camlibs/ptp2/config.c:4900 -#: camlibs/ptp2/ptp.c:3470 +#: camlibs/canon/library.c:1997 camlibs/ptp2/config.c:5054 +#: camlibs/ptp2/ptp.c:3530 msgid "Firmware Version" msgstr "" -#: camlibs/canon/library.c:2020 +#: camlibs/canon/library.c:2022 msgid "Power" msgstr "" # camlibs/canon/library.c:867 -#: camlibs/canon/library.c:2028 +#: camlibs/canon/library.c:2030 msgid "Driver" msgstr "驱动器" # camlibs/canon/library.c:870 camlibs/canon/library.c:912 -#: camlibs/canon/library.c:2032 camlibs/canon/library.c:2416 +#: camlibs/canon/library.c:2034 camlibs/canon/library.c:2418 msgid "List all files" msgstr "列出所有文件" -#: camlibs/canon/library.c:2038 camlibs/canon/library.c:2429 +#: camlibs/canon/library.c:2040 camlibs/canon/library.c:2431 msgid "Keep filename on upload" msgstr "上传时保持文件名" # camlibs/canon/library.c:165 camlibs/canon/library.c:889 # camlibs/canon/library.c:902 -#: camlibs/canon/library.c:2064 camlibs/canon/library.c:2103 -#: camlibs/canon/library.c:2132 camlibs/canon/library.c:2161 -#: camlibs/canon/library.c:2189 camlibs/canon/library.c:2217 -#: camlibs/canon/library.c:2245 camlibs/canon/library.c:2273 -#: camlibs/canon/library.c:2302 camlibs/canon/library.c:2333 -#: camlibs/canon/library.c:2348 camlibs/canon/library.c:2377 -#: camlibs/canon/library.c:2406 +#: camlibs/canon/library.c:2066 camlibs/canon/library.c:2105 +#: camlibs/canon/library.c:2134 camlibs/canon/library.c:2163 +#: camlibs/canon/library.c:2191 camlibs/canon/library.c:2219 +#: camlibs/canon/library.c:2247 camlibs/canon/library.c:2275 +#: camlibs/canon/library.c:2304 camlibs/canon/library.c:2335 +#: camlibs/canon/library.c:2350 camlibs/canon/library.c:2379 +#: camlibs/canon/library.c:2408 msgid "Camera unavailable" msgstr "相机不可用" # camlibs/canon/library.c:892 -#: camlibs/canon/library.c:2067 +#: camlibs/canon/library.c:2069 msgid "Owner name changed" msgstr "所有者姓名已改变" # camlibs/canon/library.c:894 -#: camlibs/canon/library.c:2069 +#: camlibs/canon/library.c:2071 msgid "could not change owner name" msgstr "无法改变所有者姓名" -#: camlibs/canon/library.c:2081 +#: camlibs/canon/library.c:2083 msgid "Capture size class changed" msgstr "" -#: camlibs/canon/library.c:2088 +#: camlibs/canon/library.c:2090 msgid "Invalid capture size class setting" msgstr "" -#: camlibs/canon/library.c:2117 +#: camlibs/canon/library.c:2119 msgid "Invalid ISO speed setting" msgstr "" -#: camlibs/canon/library.c:2120 +#: camlibs/canon/library.c:2122 msgid "ISO speed changed" msgstr "" -#: camlibs/canon/library.c:2122 +#: camlibs/canon/library.c:2124 msgid "Could not change ISO speed" msgstr "" -#: camlibs/canon/library.c:2146 +#: camlibs/canon/library.c:2148 msgid "Invalid shooting mode setting" msgstr "" -#: camlibs/canon/library.c:2149 +#: camlibs/canon/library.c:2151 msgid "Shooting mode changed" msgstr "" -#: camlibs/canon/library.c:2151 +#: camlibs/canon/library.c:2153 msgid "Could not change shooting mode" msgstr "" -#: camlibs/canon/library.c:2175 +#: camlibs/canon/library.c:2177 msgid "Invalid shutter speed setting" msgstr "" -#: camlibs/canon/library.c:2178 +#: camlibs/canon/library.c:2180 msgid "Shutter speed changed" msgstr "" -#: camlibs/canon/library.c:2180 +#: camlibs/canon/library.c:2182 msgid "Could not change shutter speed" msgstr "" -#: camlibs/canon/library.c:2203 camlibs/canon/library.c:2362 +#: camlibs/canon/library.c:2205 camlibs/canon/library.c:2364 msgid "Invalid aperture setting" msgstr "" -#: camlibs/canon/library.c:2206 camlibs/canon/library.c:2365 +#: camlibs/canon/library.c:2208 camlibs/canon/library.c:2367 msgid "Aperture changed" msgstr "光圈已经改变" -#: camlibs/canon/library.c:2208 camlibs/canon/library.c:2367 +#: camlibs/canon/library.c:2210 camlibs/canon/library.c:2369 msgid "Could not change aperture" msgstr "不能改变光圈" -#: camlibs/canon/library.c:2231 +#: camlibs/canon/library.c:2233 msgid "Invalid exposure compensation setting" msgstr "" -#: camlibs/canon/library.c:2234 +#: camlibs/canon/library.c:2236 msgid "Exposure compensation changed" msgstr "" -#: camlibs/canon/library.c:2236 +#: camlibs/canon/library.c:2238 msgid "Could not change exposure compensation" msgstr "" -#: camlibs/canon/library.c:2258 +#: camlibs/canon/library.c:2260 msgid "Invalid image format setting" msgstr "" -#: camlibs/canon/library.c:2262 +#: camlibs/canon/library.c:2264 msgid "Image format changed" msgstr "" -#: camlibs/canon/library.c:2264 +#: camlibs/canon/library.c:2266 msgid "Could not change image format" msgstr "" -#: camlibs/canon/library.c:2287 +#: camlibs/canon/library.c:2289 msgid "Invalid focus mode setting" msgstr "无效的聚焦模式设置" -#: camlibs/canon/library.c:2290 +#: camlibs/canon/library.c:2292 msgid "Focus mode changed" msgstr "聚焦模式已经改变" -#: camlibs/canon/library.c:2292 +#: camlibs/canon/library.c:2294 msgid "Could not change focus mode" msgstr "不能改变聚焦模式" -#: camlibs/canon/library.c:2316 +#: camlibs/canon/library.c:2318 msgid "Invalid beep mode setting" msgstr "无效的蜂鸣模式设置" -#: camlibs/canon/library.c:2319 +#: camlibs/canon/library.c:2321 msgid "Beep mode changed" msgstr "蜂鸣模式已经改变" -#: camlibs/canon/library.c:2321 +#: camlibs/canon/library.c:2323 msgid "Could not change beep mode" msgstr "不能改变蜂鸣模式" -#: camlibs/canon/library.c:2336 +#: camlibs/canon/library.c:2338 msgid "Zoom level changed" msgstr "缩放级别已经改变" -#: camlibs/canon/library.c:2338 +#: camlibs/canon/library.c:2340 msgid "Could not change zoom level" msgstr "不能改变缩放级别" -#: camlibs/canon/library.c:2391 +#: camlibs/canon/library.c:2393 msgid "Invalid flash mode setting" msgstr "无效的闪光模式设置" -#: camlibs/canon/library.c:2394 +#: camlibs/canon/library.c:2396 msgid "Flash mode changed" msgstr "闪光模式已经改变" -#: camlibs/canon/library.c:2396 +#: camlibs/canon/library.c:2398 msgid "Could not change flash mode" msgstr "不能改变闪光模式" # camlibs/canon/library.c:905 -#: camlibs/canon/library.c:2409 +#: camlibs/canon/library.c:2411 msgid "time set" msgstr "时间设置" # camlibs/canon/library.c:907 -#: camlibs/canon/library.c:2411 +#: camlibs/canon/library.c:2413 msgid "could not set time" msgstr "无法设置时间" # camlibs/canon/library.c:1107 -#: camlibs/canon/library.c:2645 +#: camlibs/canon/library.c:2647 #, c-format msgid "Unsupported port type %i = 0x%x given. Initialization impossible." msgstr "给出未知端口类型 %i = 0x%x。不可能初始化。" @@ -1123,7 +1129,7 @@ # camlibs/canon/serial.c:946 camlibs/digita/digita.c:256 #: camlibs/canon/serial.c:1065 camlibs/digita/digita.c:259 -#: camlibs/directory/directory.c:540 +#: camlibs/directory/directory.c:561 msgid "Getting file..." msgstr "正在获取文件..." @@ -1618,7 +1624,7 @@ "Theodore Kilgore \n" msgstr "" -#: camlibs/digigr8/library.c:143 +#: camlibs/digigr8/library.c:149 msgid "" "For cameras with insides from S&Q Technologies, which have the \n" "USB Vendor ID 0x2770 and Product ID 0x905C, 0x9050, 0x9051,\n" @@ -1635,7 +1641,7 @@ "software command.\n" msgstr "" -#: camlibs/digigr8/library.c:162 +#: camlibs/digigr8/library.c:168 msgid "" "sq905C generic driver\n" "Theodore Kilgore \n" @@ -1705,13 +1711,13 @@ #: camlibs/dimera/dimera3500.c:469 camlibs/dimera/dimera3500.c:855 #: camlibs/kodak/dc210/dc210.c:257 camlibs/kodak/dc210/dc210.c:425 #: camlibs/konica/library.c:777 camlibs/konica/library.c:1018 -#: camlibs/konica/qm150.c:848 camlibs/ptp2/config.c:1151 -#: camlibs/ptp2/config.c:3108 camlibs/ptp2/ptp.c:4125 +#: camlibs/konica/qm150.c:848 camlibs/ptp2/config.c:1162 +#: camlibs/ptp2/config.c:3219 camlibs/ptp2/ptp.c:4187 #: camlibs/ricoh/library.c:502 camlibs/sierra/nikon-desc.c:286 msgid "Flash" msgstr "闪光灯" -#: camlibs/dimera/dimera3500.c:469 +#: camlibs/dimera/dimera3500.c:469 camlibs/ptp2/config.c:2470 msgid "No Flash" msgstr "" @@ -1912,54 +1918,54 @@ msgstr "看起来象调制解调器，而不象相机" # camlibs/directory/directory.c:159 -#: camlibs/directory/directory.c:254 +#: camlibs/directory/directory.c:268 #, c-format msgid "Listing files in '%s'..." msgstr "正在“%s”中列举文件..." # camlibs/directory/directory.c:228 -#: camlibs/directory/directory.c:332 +#: camlibs/directory/directory.c:346 #, c-format msgid "Listing folders in '%s'..." msgstr "正在“%s”中列举文件夹..." # camlibs/directory/directory.c:195 -#: camlibs/directory/directory.c:350 +#: camlibs/directory/directory.c:364 #, c-format msgid "Could not get information about '%s' (%m)." msgstr "无法获取关于“%s”(%m) 的信息。" # camlibs/directory/directory.c:269 -#: camlibs/directory/directory.c:380 +#: camlibs/directory/directory.c:394 camlibs/directory/directory.c:516 #, c-format msgid "Could not get information about '%s' in '%s' (%m)." msgstr "无法从“%2$s”中获取关于“%1$s”的信息 (%3$m)。" # camlibs/directory/directory.c:340 -#: camlibs/directory/directory.c:428 +#: camlibs/directory/directory.c:442 #, c-format msgid "Could not change time of file '%s' in '%s' (%m)." msgstr "无法改变“%2$s”中的文件“%1$s”的时间(%3$m)。" # camlibs/directory/directory.c:421 -#: camlibs/directory/directory.c:514 +#: camlibs/directory/directory.c:535 #, c-format msgid "Could not open '%s'." msgstr "无法打开“%s”。" # camlibs/directory/directory.c:506 -#: camlibs/directory/directory.c:578 +#: camlibs/directory/directory.c:599 msgid "" "The Directory Browse \"camera\" lets you index photos on your hard drive." msgstr "目录浏览“相机”允许您为您硬盘上的照片编制索引。" # camlibs/directory/directory.c:515 -#: camlibs/directory/directory.c:587 +#: camlibs/directory/directory.c:608 msgid "Directory Browse Mode - written by Scott Fritzinger ." msgstr "目录浏览模式 - 由 Scott Fritzinger 编制。" # camlibs/directory/directory.c:562 -#: camlibs/directory/directory.c:634 +#: camlibs/directory/directory.c:655 #, c-format msgid "Could not delete file '%s' in folder '%s' (error code %i: %m)." msgstr "无法删除文件夹“%2$s”中的文件“%1$s”(错误码 %3$i：%4$m)。" @@ -2082,14 +2088,14 @@ # camlibs/sierra/sierra.c:1581 camlibs/sierra/sierra.c:1754 #: camlibs/fuji/library.c:370 camlibs/fuji/library.c:403 -#: camlibs/ptp2/ptp.c:3388 camlibs/ricoh/library.c:447 +#: camlibs/ptp2/ptp.c:3448 camlibs/ricoh/library.c:447 #: camlibs/ricoh/library.c:449 camlibs/sierra/sierra.c:1720 #: camlibs/sierra/sierra.c:1893 msgid "Date & Time" msgstr "日期和时间" #: camlibs/fuji/library.c:385 camlibs/fuji/library.c:418 -#: camlibs/ptp2/config.c:4455 +#: camlibs/ptp2/config.c:4609 msgid "ID" msgstr "ID" @@ -2195,7 +2201,7 @@ # camlibs/jamcam/library.c:336 camlibs/jd11/serial.c:455 #: camlibs/jamcam/library.c:341 camlibs/jd11/serial.c:469 -#: camlibs/sierra/library.c:1247 camlibs/sonydscf1/sonydscf1.c:248 +#: camlibs/sierra/library.c:1248 camlibs/sonydscf1/sonydscf1.c:248 msgid "Downloading data..." msgstr "正在下载数据..." @@ -2261,7 +2267,7 @@ msgstr "红" # camlibs/jd11/jd11.c:228 camlibs/jd11/jd11.c:270 -#: camlibs/jd11/jd11.c:219 camlibs/jd11/jd11.c:263 camlibs/ptp2/config.c:1519 +#: camlibs/jd11/jd11.c:219 camlibs/jd11/jd11.c:263 camlibs/ptp2/config.c:1530 msgid "Green" msgstr "绿" @@ -2295,14 +2301,14 @@ "Theodore Kilgore \n" msgstr "" -#: camlibs/jl2005c/library.c:127 +#: camlibs/jl2005c/library.c:133 #, c-format msgid "" "This camera contains a Jeilin JL2005%c chipset.\n" "The number of photos in it is %i. \n" msgstr "" -#: camlibs/jl2005c/library.c:138 +#: camlibs/jl2005c/library.c:144 msgid "" "This driver supports cameras with Jeilin JL2005B or C or D chip \n" "These cameras do not support deletion of photos, nor uploading\n" @@ -2312,7 +2318,7 @@ "For more details please consult libgphoto2/camlibs/README.jl2005c\n" msgstr "" -#: camlibs/jl2005c/library.c:153 +#: camlibs/jl2005c/library.c:159 msgid "" "jl2005bcd camera library\n" "Theodore Kilgore \n" @@ -2371,7 +2377,7 @@ msgstr "文件类型" #: camlibs/kodak/dc210/dc210.c:179 camlibs/kodak/dc210/dc210.c:184 -#: camlibs/ptp2/config.c:1491 camlibs/ptp2/ptp.c:4481 +#: camlibs/ptp2/config.c:1502 camlibs/ptp2/ptp.c:4545 msgid "JPEG" msgstr "JPEG" @@ -2415,7 +2421,7 @@ # camlibs/sierra/sierra.c:826 camlibs/sierra/sierra.c:1146 # camlibs/sierra/sierra.c:1361 camlibs/sierra/sierra.c:1602 #: camlibs/kodak/dc210/dc210.c:221 camlibs/konica/qm150.c:1047 -#: camlibs/ptp2/config.c:4953 +#: camlibs/ptp2/config.c:5109 msgid "Capture" msgstr "光圈" @@ -2464,38 +2470,40 @@ #: camlibs/konica/qm150.c:961 camlibs/konica/qm150.c:964 #: camlibs/konica/qm150.c:979 camlibs/konica/qm150.c:982 #: camlibs/konica/qm150.c:999 camlibs/konica/qm150.c:1002 -#: camlibs/ptp2/config.c:1497 camlibs/ptp2/config.c:1935 -#: camlibs/ptp2/config.c:2380 camlibs/ptp2/config.c:2866 -#: camlibs/ptp2/config.c:3014 camlibs/ptp2/config.c:3025 -#: camlibs/ptp2/config.c:3037 camlibs/ptp2/config.c:3084 -#: camlibs/ptp2/config.c:3103 camlibs/ptp2/config.c:3463 -#: camlibs/ptp2/ptp.c:4155 camlibs/ptp2/ptp.c:4178 camlibs/ptp2/ptp.c:4186 -#: camlibs/ptp2/ptp.c:4385 camlibs/ptp2/ptp.c:4435 camlibs/ptp2/ptp.c:4495 -#: camlibs/ptp2/ptp.c:4502 camlibs/ptp2/ptp.c:4512 camlibs/ptp2/ptp.c:4549 -#: camlibs/ptp2/ptp.c:4566 camlibs/ptp2/ptp.c:4620 camlibs/ricoh/library.c:312 -#: camlibs/ricoh/library.c:327 camlibs/ricoh/library.c:368 -#: camlibs/sierra/epson-desc.c:151 camlibs/sierra/epson-desc.c:169 -#: camlibs/sierra/nikon-desc.c:168 camlibs/sierra/nikon-desc.c:202 -#: camlibs/sierra/nikon-desc.c:234 camlibs/sierra/nikon-desc.c:252 -#: camlibs/sierra/nikon-desc.c:282 camlibs/sierra/olympus-desc.c:196 -#: camlibs/sierra/olympus-desc.c:235 camlibs/sierra/olympus-desc.c:289 -#: camlibs/sierra/olympus-desc.c:371 camlibs/sierra/olympus-desc.c:403 -#: camlibs/sierra/olympus-desc.c:433 camlibs/sierra/olympus-desc.c:457 -#: camlibs/sierra/olympus-desc.c:498 camlibs/sierra/olympus-desc.c:515 -#: camlibs/sierra/olympus-desc.c:534 camlibs/sierra/olympus-desc.c:555 -#: camlibs/sierra/olympus-desc.c:574 camlibs/sierra/olympus-desc.c:593 -#: camlibs/sierra/olympus-desc.c:614 camlibs/sierra/olympus-desc.c:638 -#: camlibs/sierra/olympus-desc.c:873 camlibs/sierra/olympus-desc.c:890 -#: camlibs/sierra/sierra.c:925 camlibs/sierra/sierra.c:931 -#: camlibs/sierra/sierra.c:965 camlibs/sierra/sierra.c:971 -#: camlibs/sierra/sierra.c:1025 camlibs/sierra/sierra.c:1032 -#: camlibs/sierra/sierra.c:1086 camlibs/sierra/sierra.c:1093 -#: camlibs/sierra/sierra.c:1260 camlibs/sierra/sierra.c:1289 -#: camlibs/sierra/sierra.c:1329 camlibs/sierra/sierra.c:1372 -#: camlibs/sierra/sierra.c:1535 camlibs/sierra/sierra.c:1541 -#: camlibs/sierra/sierra.c:1563 camlibs/sierra/sierra.c:1568 -#: camlibs/sierra/sierra.c:1768 camlibs/sierra/sierra.c:1788 -#: camlibs/st2205/library.c:510 camlibs/st2205/library.c:523 +#: camlibs/ptp2/config.c:1508 camlibs/ptp2/config.c:1986 +#: camlibs/ptp2/config.c:2431 camlibs/ptp2/config.c:2465 +#: camlibs/ptp2/config.c:2598 camlibs/ptp2/config.c:2977 +#: camlibs/ptp2/config.c:3125 camlibs/ptp2/config.c:3136 +#: camlibs/ptp2/config.c:3148 camlibs/ptp2/config.c:3195 +#: camlibs/ptp2/config.c:3214 camlibs/ptp2/config.c:3606 +#: camlibs/ptp2/ptp.c:4209 camlibs/ptp2/ptp.c:4217 camlibs/ptp2/ptp.c:4240 +#: camlibs/ptp2/ptp.c:4248 camlibs/ptp2/ptp.c:4448 camlibs/ptp2/ptp.c:4499 +#: camlibs/ptp2/ptp.c:4559 camlibs/ptp2/ptp.c:4566 camlibs/ptp2/ptp.c:4576 +#: camlibs/ptp2/ptp.c:4613 camlibs/ptp2/ptp.c:4630 camlibs/ptp2/ptp.c:4684 +#: camlibs/ricoh/library.c:312 camlibs/ricoh/library.c:327 +#: camlibs/ricoh/library.c:368 camlibs/sierra/epson-desc.c:151 +#: camlibs/sierra/epson-desc.c:169 camlibs/sierra/nikon-desc.c:168 +#: camlibs/sierra/nikon-desc.c:202 camlibs/sierra/nikon-desc.c:234 +#: camlibs/sierra/nikon-desc.c:252 camlibs/sierra/nikon-desc.c:282 +#: camlibs/sierra/olympus-desc.c:196 camlibs/sierra/olympus-desc.c:235 +#: camlibs/sierra/olympus-desc.c:289 camlibs/sierra/olympus-desc.c:371 +#: camlibs/sierra/olympus-desc.c:403 camlibs/sierra/olympus-desc.c:433 +#: camlibs/sierra/olympus-desc.c:457 camlibs/sierra/olympus-desc.c:498 +#: camlibs/sierra/olympus-desc.c:515 camlibs/sierra/olympus-desc.c:534 +#: camlibs/sierra/olympus-desc.c:555 camlibs/sierra/olympus-desc.c:574 +#: camlibs/sierra/olympus-desc.c:593 camlibs/sierra/olympus-desc.c:614 +#: camlibs/sierra/olympus-desc.c:638 camlibs/sierra/olympus-desc.c:873 +#: camlibs/sierra/olympus-desc.c:890 camlibs/sierra/sierra.c:925 +#: camlibs/sierra/sierra.c:931 camlibs/sierra/sierra.c:965 +#: camlibs/sierra/sierra.c:971 camlibs/sierra/sierra.c:1025 +#: camlibs/sierra/sierra.c:1032 camlibs/sierra/sierra.c:1086 +#: camlibs/sierra/sierra.c:1093 camlibs/sierra/sierra.c:1260 +#: camlibs/sierra/sierra.c:1289 camlibs/sierra/sierra.c:1329 +#: camlibs/sierra/sierra.c:1372 camlibs/sierra/sierra.c:1535 +#: camlibs/sierra/sierra.c:1541 camlibs/sierra/sierra.c:1563 +#: camlibs/sierra/sierra.c:1568 camlibs/sierra/sierra.c:1768 +#: camlibs/sierra/sierra.c:1788 camlibs/st2205/library.c:512 +#: camlibs/st2205/library.c:525 msgid "Auto" msgstr "自动" @@ -2514,12 +2522,12 @@ # frontends/command-line/actions.c:168 #: camlibs/kodak/dc210/dc210.c:261 camlibs/kodak/dc210/dc210.c:269 -#: camlibs/ptp2/config.c:3020 camlibs/ptp2/config.c:3074 -#: camlibs/ptp2/config.c:3838 camlibs/ptp2/config.c:3842 -#: camlibs/ptp2/config.c:3856 camlibs/ptp2/config.c:3895 -#: camlibs/ptp2/config.c:3900 camlibs/ptp2/config.c:3915 -#: camlibs/ptp2/config.c:4549 camlibs/ptp2/library.c:3409 -#: camlibs/ptp2/library.c:3413 camlibs/ptp2/ptp.c:4184 +#: camlibs/ptp2/config.c:3131 camlibs/ptp2/config.c:3185 +#: camlibs/ptp2/config.c:3981 camlibs/ptp2/config.c:3986 +#: camlibs/ptp2/config.c:4000 camlibs/ptp2/config.c:4049 +#: camlibs/ptp2/config.c:4054 camlibs/ptp2/config.c:4069 +#: camlibs/ptp2/config.c:4703 camlibs/ptp2/library.c:3503 +#: camlibs/ptp2/library.c:3507 camlibs/ptp2/ptp.c:4246 #: camlibs/ricoh/library.c:347 msgid "None" msgstr "无" @@ -2540,14 +2548,14 @@ #: camlibs/konica/qm150.c:809 camlibs/konica/qm150.c:851 #: camlibs/konica/qm150.c:864 camlibs/konica/qm150.c:1021 #: camlibs/konica/qm150.c:1028 camlibs/konica/qm150.c:1035 -#: camlibs/konica/qm150.c:1042 camlibs/ptp2/config.c:1070 -#: camlibs/ptp2/config.c:1072 camlibs/ptp2/config.c:1084 -#: camlibs/ptp2/config.c:1103 camlibs/ptp2/config.c:1105 -#: camlibs/ptp2/config.c:1117 camlibs/ptp2/config.c:1257 -#: camlibs/ptp2/config.c:1263 camlibs/ptp2/config.c:1270 -#: camlibs/ptp2/config.c:2868 camlibs/ptp2/ptp.c:4065 camlibs/ptp2/ptp.c:4066 -#: camlibs/ptp2/ptp.c:4067 camlibs/ptp2/ptp.c:4387 camlibs/ptp2/ptp.c:4496 -#: camlibs/ptp2/ptp.c:4582 camlibs/ricoh/library.c:339 +#: camlibs/konica/qm150.c:1042 camlibs/ptp2/config.c:1081 +#: camlibs/ptp2/config.c:1083 camlibs/ptp2/config.c:1095 +#: camlibs/ptp2/config.c:1114 camlibs/ptp2/config.c:1116 +#: camlibs/ptp2/config.c:1128 camlibs/ptp2/config.c:1268 +#: camlibs/ptp2/config.c:1274 camlibs/ptp2/config.c:1281 +#: camlibs/ptp2/config.c:2979 camlibs/ptp2/ptp.c:4127 camlibs/ptp2/ptp.c:4128 +#: camlibs/ptp2/ptp.c:4129 camlibs/ptp2/ptp.c:4450 camlibs/ptp2/ptp.c:4560 +#: camlibs/ptp2/ptp.c:4646 camlibs/ricoh/library.c:339 #: camlibs/ricoh/library.c:370 camlibs/sierra/nikon-desc.c:305 #: camlibs/sierra/sierra.c:1142 camlibs/sierra/sierra.c:1148 #: camlibs/sierra/sierra.c:1411 camlibs/topfield/puppy.c:546 @@ -2572,32 +2580,33 @@ #: camlibs/konica/qm150.c:812 camlibs/konica/qm150.c:850 #: camlibs/konica/qm150.c:857 camlibs/konica/qm150.c:1022 #: camlibs/konica/qm150.c:1025 camlibs/konica/qm150.c:1036 -#: camlibs/konica/qm150.c:1039 camlibs/ptp2/config.c:1071 -#: camlibs/ptp2/config.c:1072 camlibs/ptp2/config.c:1088 -#: camlibs/ptp2/config.c:1104 camlibs/ptp2/config.c:1105 -#: camlibs/ptp2/config.c:1121 camlibs/ptp2/config.c:1258 -#: camlibs/ptp2/config.c:1264 camlibs/ptp2/config.c:1269 -#: camlibs/ptp2/config.c:1580 camlibs/ptp2/config.c:1641 -#: camlibs/ptp2/config.c:1820 camlibs/ptp2/config.c:1846 -#: camlibs/ptp2/config.c:1873 camlibs/ptp2/config.c:2867 -#: camlibs/ptp2/config.c:3191 camlibs/ptp2/config.c:3462 -#: camlibs/ptp2/config.c:3502 camlibs/ptp2/config.c:3568 -#: camlibs/ptp2/config.c:3841 camlibs/ptp2/config.c:3864 -#: camlibs/ptp2/ptp.c:4065 camlibs/ptp2/ptp.c:4066 camlibs/ptp2/ptp.c:4067 -#: camlibs/ptp2/ptp.c:4386 camlibs/ptp2/ptp.c:4494 camlibs/ptp2/ptp.c:4534 -#: camlibs/ptp2/ptp.c:4580 camlibs/ptp2/ptp.c:4645 camlibs/ptp2/ptp.c:4650 -#: camlibs/ricoh/library.c:340 camlibs/ricoh/library.c:369 -#: camlibs/ricoh/library.c:377 camlibs/sierra/epson-desc.c:153 -#: camlibs/sierra/nikon-desc.c:236 camlibs/sierra/nikon-desc.c:304 -#: camlibs/sierra/nikon-desc.c:359 camlibs/sierra/olympus-desc.c:500 -#: camlibs/sierra/olympus-desc.c:517 camlibs/sierra/olympus-desc.c:536 -#: camlibs/sierra/olympus-desc.c:658 camlibs/sierra/olympus-desc.c:856 -#: camlibs/sierra/olympus-desc.c:940 camlibs/sierra/sierra.c:1027 -#: camlibs/sierra/sierra.c:1036 camlibs/sierra/sierra.c:1143 -#: camlibs/sierra/sierra.c:1146 camlibs/sierra/sierra.c:1333 -#: camlibs/sierra/sierra.c:1413 camlibs/sierra/sierra.c:1537 -#: camlibs/sierra/sierra.c:1545 camlibs/sierra/sierra.c:1772 -#: camlibs/topfield/puppy.c:547 camlibs/topfield/puppy.c:558 +#: camlibs/konica/qm150.c:1039 camlibs/ptp2/config.c:1082 +#: camlibs/ptp2/config.c:1083 camlibs/ptp2/config.c:1099 +#: camlibs/ptp2/config.c:1115 camlibs/ptp2/config.c:1116 +#: camlibs/ptp2/config.c:1132 camlibs/ptp2/config.c:1269 +#: camlibs/ptp2/config.c:1275 camlibs/ptp2/config.c:1280 +#: camlibs/ptp2/config.c:1591 camlibs/ptp2/config.c:1652 +#: camlibs/ptp2/config.c:1871 camlibs/ptp2/config.c:1897 +#: camlibs/ptp2/config.c:1924 camlibs/ptp2/config.c:2978 +#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:3413 +#: camlibs/ptp2/config.c:3605 camlibs/ptp2/config.c:3645 +#: camlibs/ptp2/config.c:3711 camlibs/ptp2/config.c:3984 +#: camlibs/ptp2/config.c:4018 camlibs/ptp2/ptp.c:4127 camlibs/ptp2/ptp.c:4128 +#: camlibs/ptp2/ptp.c:4129 camlibs/ptp2/ptp.c:4449 camlibs/ptp2/ptp.c:4558 +#: camlibs/ptp2/ptp.c:4598 camlibs/ptp2/ptp.c:4644 camlibs/ptp2/ptp.c:4709 +#: camlibs/ptp2/ptp.c:4714 camlibs/ricoh/library.c:340 +#: camlibs/ricoh/library.c:369 camlibs/ricoh/library.c:377 +#: camlibs/sierra/epson-desc.c:153 camlibs/sierra/nikon-desc.c:236 +#: camlibs/sierra/nikon-desc.c:304 camlibs/sierra/nikon-desc.c:359 +#: camlibs/sierra/olympus-desc.c:500 camlibs/sierra/olympus-desc.c:517 +#: camlibs/sierra/olympus-desc.c:536 camlibs/sierra/olympus-desc.c:658 +#: camlibs/sierra/olympus-desc.c:856 camlibs/sierra/olympus-desc.c:940 +#: camlibs/sierra/sierra.c:1027 camlibs/sierra/sierra.c:1036 +#: camlibs/sierra/sierra.c:1143 camlibs/sierra/sierra.c:1146 +#: camlibs/sierra/sierra.c:1333 camlibs/sierra/sierra.c:1413 +#: camlibs/sierra/sierra.c:1537 camlibs/sierra/sierra.c:1545 +#: camlibs/sierra/sierra.c:1772 camlibs/topfield/puppy.c:547 +#: camlibs/topfield/puppy.c:558 msgid "Off" msgstr "关" @@ -2914,13 +2923,13 @@ # camlibs/kodak/dc240/library.c:583 camlibs/kodak/dc240/library.c:598 #: camlibs/kodak/dc240/library.c:564 camlibs/kodak/dc240/library.c:579 -#: camlibs/ptp2/ptp.c:4557 +#: camlibs/ptp2/ptp.c:4621 msgid "Invalid" msgstr "非法" # camlibs/kodak/dc240/library.c:590 -#: camlibs/kodak/dc240/library.c:571 camlibs/ptp2/config.c:1793 -#: camlibs/ptp2/ptp.c:4490 +#: camlibs/kodak/dc240/library.c:571 camlibs/ptp2/config.c:1811 +#: camlibs/ptp2/ptp.c:4554 msgid "Not used" msgstr "未使用" @@ -3294,11 +3303,13 @@ # camlibs/konica/library.c:723 camlibs/konica/library.c:946 #: camlibs/konica/library.c:756 camlibs/konica/library.c:980 +#: camlibs/ptp2/config.c:1668 msgid "NTSC" msgstr "NTSC" # camlibs/konica/library.c:724 camlibs/konica/library.c:948 #: camlibs/konica/library.c:757 camlibs/konica/library.c:982 +#: camlibs/ptp2/config.c:1669 msgid "PAL" msgstr "PAL" @@ -3353,8 +3364,8 @@ # camlibs/konica/library.c:777 camlibs/konica/library.c:1010 #: camlibs/konica/library.c:810 camlibs/konica/library.c:1044 -#: camlibs/konica/qm150.c:935 camlibs/ptp2/config.c:3544 -#: camlibs/ptp2/config.c:3550 +#: camlibs/konica/qm150.c:935 camlibs/ptp2/config.c:3687 +#: camlibs/ptp2/config.c:3693 msgid "Focus" msgstr "聚焦" @@ -3377,7 +3388,7 @@ # camlibs/polaroid/pdc700.c:163 #: camlibs/konica/library.c:830 camlibs/konica/library.c:1052 #: camlibs/konica/qm150.c:1089 camlibs/polaroid/pdc700.c:163 -#: camlibs/ptp2/config.c:4992 +#: camlibs/ptp2/config.c:5149 msgid "Self Timer" msgstr "自动定时" @@ -3398,12 +3409,12 @@ # camlibs/sierra/sierra.c:1668 #: camlibs/konica/library.c:833 camlibs/konica/library.c:840 #: camlibs/konica/qm150.c:1092 camlibs/konica/qm150.c:1099 -#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/config.c:3002 -#: camlibs/ptp2/config.c:3015 camlibs/ptp2/config.c:3026 -#: camlibs/ptp2/config.c:3302 camlibs/ptp2/config.c:3460 -#: camlibs/ptp2/config.c:3504 camlibs/ptp2/ptp.c:4179 camlibs/ptp2/ptp.c:4187 -#: camlibs/ptp2/ptp.c:4346 camlibs/ptp2/ptp.c:4355 camlibs/ptp2/ptp.c:4468 -#: camlibs/ptp2/ptp.c:4475 camlibs/ricoh/library.c:349 +#: camlibs/minolta/dimagev/dimagev.c:400 camlibs/ptp2/config.c:3113 +#: camlibs/ptp2/config.c:3126 camlibs/ptp2/config.c:3137 +#: camlibs/ptp2/config.c:3421 camlibs/ptp2/config.c:3603 +#: camlibs/ptp2/config.c:3647 camlibs/ptp2/ptp.c:4241 camlibs/ptp2/ptp.c:4249 +#: camlibs/ptp2/ptp.c:4409 camlibs/ptp2/ptp.c:4418 camlibs/ptp2/ptp.c:4532 +#: camlibs/ptp2/ptp.c:4539 camlibs/ricoh/library.c:349 #: camlibs/sierra/epson-desc.c:219 camlibs/sierra/nikon-desc.c:253 #: camlibs/sierra/nikon-desc.c:325 camlibs/sierra/olympus-desc.c:480 #: camlibs/sierra/olympus-desc.c:660 camlibs/sierra/sierra.c:995 @@ -3482,10 +3493,10 @@ # camlibs/sierra/sierra.c:828 camlibs/sierra/sierra.c:835 # camlibs/sierra/sierra.c:1152 #: camlibs/konica/qm150.c:773 camlibs/konica/qm150.c:781 -#: camlibs/ptp2/config.c:3016 camlibs/ptp2/config.c:3461 -#: camlibs/ptp2/config.c:3503 camlibs/ptp2/config.c:3696 -#: camlibs/ptp2/ptp.c:4180 camlibs/ptp2/ptp.c:4594 camlibs/ptp2/ptp.c:4600 -#: camlibs/ptp2/ptp.c:4606 camlibs/sierra/nikon-desc.c:203 +#: camlibs/ptp2/config.c:3127 camlibs/ptp2/config.c:3604 +#: camlibs/ptp2/config.c:3646 camlibs/ptp2/config.c:3839 +#: camlibs/ptp2/ptp.c:4242 camlibs/ptp2/ptp.c:4658 camlibs/ptp2/ptp.c:4664 +#: camlibs/ptp2/ptp.c:4670 camlibs/sierra/nikon-desc.c:203 #: camlibs/sierra/sierra.c:966 camlibs/sierra/sierra.c:973 #: camlibs/sierra/sierra.c:1291 msgid "Low" @@ -3503,9 +3514,9 @@ # camlibs/sierra/sierra.c:830 camlibs/sierra/sierra.c:839 # camlibs/sierra/sierra.c:1125 camlibs/sierra/sierra.c:1156 #: camlibs/konica/qm150.c:775 camlibs/konica/qm150.c:778 -#: camlibs/ptp2/config.c:3019 camlibs/ptp2/config.c:3459 -#: camlibs/ptp2/config.c:3505 camlibs/ptp2/ptp.c:4183 camlibs/ptp2/ptp.c:4596 -#: camlibs/ptp2/ptp.c:4602 camlibs/ptp2/ptp.c:4608 camlibs/sierra/sierra.c:927 +#: camlibs/ptp2/config.c:3130 camlibs/ptp2/config.c:3602 +#: camlibs/ptp2/config.c:3648 camlibs/ptp2/ptp.c:4245 camlibs/ptp2/ptp.c:4660 +#: camlibs/ptp2/ptp.c:4666 camlibs/ptp2/ptp.c:4672 camlibs/sierra/sierra.c:927 #: camlibs/sierra/sierra.c:935 camlibs/sierra/sierra.c:968 #: camlibs/sierra/sierra.c:977 camlibs/sierra/sierra.c:1264 #: camlibs/sierra/sierra.c:1295 @@ -3514,8 +3525,8 @@ # camlibs/polaroid/pdc700.c:162 #: camlibs/konica/qm150.c:789 camlibs/polaroid/pdc700.c:162 -#: camlibs/ptp2/config.c:1818 camlibs/ptp2/config.c:1844 -#: camlibs/ptp2/config.c:1871 camlibs/ptp2/ptp.c:4643 +#: camlibs/ptp2/config.c:1869 camlibs/ptp2/config.c:1895 +#: camlibs/ptp2/config.c:1922 camlibs/ptp2/ptp.c:4707 msgid "LCD" msgstr "LCD" @@ -3556,15 +3567,15 @@ # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956 # camlibs/sierra/sierra.c:1235 #: camlibs/konica/qm150.c:960 camlibs/konica/qm150.c:967 -#: camlibs/ptp2/config.c:1148 camlibs/ptp2/config.c:3085 -#: camlibs/ptp2/config.c:3104 camlibs/ptp2/ptp.c:4122 camlibs/ptp2/ptp.c:4567 +#: camlibs/ptp2/config.c:1159 camlibs/ptp2/config.c:3196 +#: camlibs/ptp2/config.c:3215 camlibs/ptp2/ptp.c:4184 camlibs/ptp2/ptp.c:4631 #: camlibs/sierra/olympus-desc.c:556 camlibs/sierra/olympus-desc.c:575 #: camlibs/sierra/olympus-desc.c:594 camlibs/sierra/olympus-desc.c:615 msgid "Daylight" msgstr "日光" -#: camlibs/konica/qm150.c:975 camlibs/ptp2/config.c:5043 -#: camlibs/ptp2/ptp.c:3392 camlibs/ptp2/ptp.c:3447 +#: camlibs/konica/qm150.c:975 camlibs/ptp2/config.c:5202 +#: camlibs/ptp2/ptp.c:3452 camlibs/ptp2/ptp.c:3507 msgid "Sharpness" msgstr "" @@ -3573,7 +3584,7 @@ msgstr "" #: camlibs/konica/qm150.c:978 camlibs/konica/qm150.c:988 -#: camlibs/ptp2/ptp.c:4526 camlibs/ptp2/ptp.c:4653 +#: camlibs/ptp2/ptp.c:4590 camlibs/ptp2/ptp.c:4717 msgid "Soft" msgstr "" @@ -3603,7 +3614,7 @@ msgstr "黑白" #: camlibs/konica/qm150.c:1049 camlibs/konica/qm150.c:1053 -#: camlibs/ptp2/config.c:1989 +#: camlibs/ptp2/config.c:2040 msgid "Single" msgstr "" @@ -3634,7 +3645,7 @@ msgid "Everywhere" msgstr "" -#: camlibs/konica/qm150.c:1136 camlibs/ptp2/ptp.c:4461 +#: camlibs/konica/qm150.c:1136 camlibs/ptp2/ptp.c:4525 #, c-format msgid "AC" msgstr "" @@ -3801,8 +3812,8 @@ "闪光灯模式：\t\t" # camlibs/minolta/dimagev/dimagev.c:299 -#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/config.c:2400 -#: camlibs/ptp2/ptp.c:4167 +#: camlibs/minolta/dimagev/dimagev.c:292 camlibs/ptp2/config.c:2484 +#: camlibs/ptp2/ptp.c:4229 msgid "Remote" msgstr "远程" @@ -3816,7 +3827,7 @@ # frontends/command-line/gphoto2-cmd-config.c:372 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302 -#: camlibs/ptp2/ptp.c:4068 +#: camlibs/ptp2/ptp.c:4130 msgid "Yes" msgstr "是" @@ -3825,13 +3836,13 @@ # frontends/command-line/gphoto2-cmd-config.c:372 #: camlibs/minolta/dimagev/dimagev.c:293 camlibs/minolta/dimagev/dimagev.c:295 #: camlibs/minolta/dimagev/dimagev.c:299 camlibs/minolta/dimagev/dimagev.c:302 -#: camlibs/ptp2/ptp.c:4068 +#: camlibs/ptp2/ptp.c:4130 msgid "No" msgstr "否" # camlibs/minolta/dimagev/dimagev.c:307 camlibs/sierra/sierra.c:1470 # camlibs/sierra/sierra.c:1477 camlibs/sierra/sierra.c:1682 -#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/ptp.c:4476 +#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/ptp.c:4540 #: camlibs/sierra/nikon-desc.c:283 msgid "Fine" msgstr "精细" @@ -3840,9 +3851,9 @@ # camlibs/sierra/sierra.c:795 camlibs/sierra/sierra.c:1123 # camlibs/sierra/sierra.c:1469 camlibs/sierra/sierra.c:1475 # camlibs/sierra/sierra.c:1680 -#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/config.c:1678 -#: camlibs/ptp2/config.c:2525 camlibs/ptp2/ptp.c:4595 camlibs/ptp2/ptp.c:4601 -#: camlibs/ptp2/ptp.c:4607 camlibs/ptp2/ptp.c:4611 camlibs/sierra/sierra.c:926 +#: camlibs/minolta/dimagev/dimagev.c:300 camlibs/ptp2/config.c:1696 +#: camlibs/ptp2/config.c:2612 camlibs/ptp2/ptp.c:4659 camlibs/ptp2/ptp.c:4665 +#: camlibs/ptp2/ptp.c:4671 camlibs/ptp2/ptp.c:4675 camlibs/sierra/sierra.c:926 #: camlibs/sierra/sierra.c:933 camlibs/sierra/sierra.c:1262 msgid "Standard" msgstr "标准" @@ -3896,8 +3907,8 @@ # camlibs/minolta/dimagev/dimagev.c:367 camlibs/minolta/dimagev/dimagev.c:410 #: camlibs/minolta/dimagev/dimagev.c:360 camlibs/minolta/dimagev/dimagev.c:403 -#: camlibs/ptp2/config.c:1556 camlibs/ptp2/config.c:1610 -#: camlibs/ptp2/config.c:1657 camlibs/ptp2/ptp.c:4406 camlibs/ptp2/ptp.c:4412 +#: camlibs/ptp2/config.c:1567 camlibs/ptp2/config.c:1621 +#: camlibs/ptp2/config.c:1674 camlibs/ptp2/ptp.c:4469 camlibs/ptp2/ptp.c:4475 #, c-format msgid "Full" msgstr "满" @@ -4251,15 +4262,15 @@ msgstr "" # camlibs/polaroid/pdc700.c:159 -#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/config.c:4959 -#: camlibs/ptp2/config.c:5020 camlibs/ptp2/config.c:5132 -#: camlibs/ptp2/config.c:5145 camlibs/ptp2/ptp.c:3428 +#: camlibs/polaroid/pdc700.c:159 camlibs/ptp2/config.c:5115 +#: camlibs/ptp2/config.c:5177 camlibs/ptp2/config.c:5302 +#: camlibs/ptp2/config.c:5315 camlibs/ptp2/ptp.c:3488 msgid "Image Quality" msgstr "图像质量" # camlibs/polaroid/pdc700.c:160 -#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/config.c:4966 -#: camlibs/ptp2/config.c:4967 camlibs/ptp2/ptp.c:3372 camlibs/ptp2/ptp.c:3430 +#: camlibs/polaroid/pdc700.c:160 camlibs/ptp2/config.c:5122 +#: camlibs/ptp2/config.c:5123 camlibs/ptp2/ptp.c:3432 camlibs/ptp2/ptp.c:3490 msgid "Image Size" msgstr "图像大小" @@ -4279,19 +4290,19 @@ msgstr "信息" # camlibs/polaroid/pdc700.c:167 -#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1482 +#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1493 msgid "normal" msgstr "普通" # camlibs/polaroid/pdc700.c:167 -#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1483 +#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1494 #: camlibs/sierra/sierra.c:1609 camlibs/sierra/sierra.c:1616 #: camlibs/sierra/sierra.c:1821 msgid "fine" msgstr "精细" # camlibs/polaroid/pdc700.c:167 -#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1485 +#: camlibs/polaroid/pdc700.c:167 camlibs/ptp2/config.c:1496 #: camlibs/sierra/sierra.c:1610 camlibs/sierra/sierra.c:1618 #: camlibs/sierra/sierra.c:1823 msgid "superfine" @@ -4299,8 +4310,8 @@ # camlibs/polaroid/pdc700.c:169 camlibs/sierra/sierra.c:1368 # camlibs/sierra/sierra.c:1382 camlibs/sierra/sierra.c:1617 -#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1531 -#: camlibs/ptp2/config.c:3202 camlibs/sierra/epson-desc.c:116 +#: camlibs/polaroid/pdc700.c:169 camlibs/ptp2/config.c:1542 +#: camlibs/ptp2/config.c:3313 camlibs/sierra/epson-desc.c:116 #: camlibs/sierra/sierra.c:1507 camlibs/sierra/sierra.c:1521 #: camlibs/sierra/sierra.c:1756 msgid "auto" @@ -4308,14 +4319,14 @@ # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170 -#: camlibs/ptp2/config.c:1532 camlibs/sierra/nikon-desc.c:565 +#: camlibs/ptp2/config.c:1543 camlibs/sierra/nikon-desc.c:565 #: camlibs/sierra/nikon-desc.c:570 msgid "on" msgstr "开" # camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170 #: camlibs/polaroid/pdc700.c:169 camlibs/polaroid/pdc700.c:170 -#: camlibs/ptp2/config.c:1530 camlibs/ptp2/config.c:1972 +#: camlibs/ptp2/config.c:1541 camlibs/ptp2/config.c:2023 #: camlibs/sierra/nikon-desc.c:564 camlibs/sierra/nikon-desc.c:569 msgid "off" msgstr "关" @@ -4449,69 +4460,69 @@ msgid "The requested port type (%i) is not supported by this driver." msgstr "该驱动程序不支持请求的端口类型 (%i)。" -#: camlibs/ptp2/config.c:146 camlibs/ptp2/config.c:1882 -#: camlibs/ptp2/library.c:1639 camlibs/ptp2/library.c:2385 +#: camlibs/ptp2/config.c:155 camlibs/ptp2/config.c:1933 +#: camlibs/ptp2/library.c:1698 camlibs/ptp2/library.c:2479 #, c-format msgid "Canon enable viewfinder failed: %d" msgstr "" # libgphoto2/gphoto2-camera.c:850 -#: camlibs/ptp2/config.c:336 camlibs/ptp2/config.c:412 +#: camlibs/ptp2/config.c:347 camlibs/ptp2/config.c:423 msgid "Sorry, your Canon camera does not support Canon capture" msgstr "对不起, 您的Canon相机不支持Canon capture。" -#: camlibs/ptp2/config.c:360 camlibs/ptp2/config.c:1893 -#: camlibs/ptp2/library.c:2269 +#: camlibs/ptp2/config.c:371 camlibs/ptp2/config.c:1944 +#: camlibs/ptp2/library.c:2354 #, c-format msgid "Canon disable viewfinder failed: %d" msgstr "" -#: camlibs/ptp2/config.c:575 camlibs/ptp2/config.c:616 -#: camlibs/ptp2/config.c:640 camlibs/ptp2/config.c:710 -#: camlibs/ptp2/config.c:748 camlibs/ptp2/config.c:822 -#: camlibs/ptp2/config.c:830 camlibs/ptp2/config.c:861 -#: camlibs/ptp2/config.c:871 camlibs/ptp2/config.c:897 +#: camlibs/ptp2/config.c:586 camlibs/ptp2/config.c:627 +#: camlibs/ptp2/config.c:651 camlibs/ptp2/config.c:721 +#: camlibs/ptp2/config.c:759 camlibs/ptp2/config.c:833 +#: camlibs/ptp2/config.c:841 camlibs/ptp2/config.c:872 +#: camlibs/ptp2/config.c:882 camlibs/ptp2/config.c:908 #, c-format msgid "Unknown value %04x" msgstr "" -#: camlibs/ptp2/config.c:605 camlibs/ptp2/config.c:737 -#: camlibs/ptp2/config.c:772 +#: camlibs/ptp2/config.c:616 camlibs/ptp2/config.c:748 +#: camlibs/ptp2/config.c:783 #, c-format msgid "Unknown value %04d" msgstr "" # camlibs/canon/serial.c:672 -#: camlibs/ptp2/config.c:927 camlibs/ptp2/config.c:944 -#: camlibs/ptp2/config.c:1053 camlibs/ptp2/config.c:1135 +#: camlibs/ptp2/config.c:938 camlibs/ptp2/config.c:955 +#: camlibs/ptp2/config.c:1064 camlibs/ptp2/config.c:1146 #, c-format msgid "unexpected datatype %i" msgstr "" -#: camlibs/ptp2/config.c:1145 camlibs/ptp2/config.c:1500 -#: camlibs/ptp2/config.c:1513 camlibs/ptp2/config.c:1542 -#: camlibs/ptp2/config.c:1579 camlibs/ptp2/config.c:1640 -#: camlibs/ptp2/config.c:3036 camlibs/ptp2/config.c:3055 -#: camlibs/ptp2/config.c:3109 camlibs/ptp2/ptp.c:4119 camlibs/ptp2/ptp.c:4390 -#: camlibs/ptp2/ptp.c:4513 camlibs/ptp2/ptp.c:4548 camlibs/ptp2/ptp.c:4588 +#: camlibs/ptp2/config.c:1156 camlibs/ptp2/config.c:1511 +#: camlibs/ptp2/config.c:1524 camlibs/ptp2/config.c:1553 +#: camlibs/ptp2/config.c:1590 camlibs/ptp2/config.c:1651 +#: camlibs/ptp2/config.c:3147 camlibs/ptp2/config.c:3166 +#: camlibs/ptp2/config.c:3220 camlibs/ptp2/ptp.c:4181 camlibs/ptp2/ptp.c:4453 +#: camlibs/ptp2/ptp.c:4577 camlibs/ptp2/ptp.c:4612 camlibs/ptp2/ptp.c:4652 #: camlibs/sierra/olympus-desc.c:639 msgid "Manual" msgstr "" # camlibs/minolta/dimagev/dimagev.c:323 -#: camlibs/ptp2/config.c:1146 camlibs/ptp2/config.c:3056 -#: camlibs/ptp2/ptp.c:4120 camlibs/ptp2/ptp.c:4131 +#: camlibs/ptp2/config.c:1157 camlibs/ptp2/config.c:3167 +#: camlibs/ptp2/ptp.c:4182 camlibs/ptp2/ptp.c:4193 msgid "Automatic" msgstr "自动" -#: camlibs/ptp2/config.c:1147 camlibs/ptp2/ptp.c:4121 +#: camlibs/ptp2/config.c:1158 camlibs/ptp2/ptp.c:4183 msgid "One-push Automatic" msgstr "" # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958 # camlibs/sierra/sierra.c:1237 -#: camlibs/ptp2/config.c:1149 camlibs/ptp2/config.c:3088 -#: camlibs/ptp2/config.c:3107 camlibs/ptp2/ptp.c:4123 camlibs/ptp2/ptp.c:4570 +#: camlibs/ptp2/config.c:1160 camlibs/ptp2/config.c:3199 +#: camlibs/ptp2/config.c:3218 camlibs/ptp2/ptp.c:4185 camlibs/ptp2/ptp.c:4634 #: camlibs/ricoh/library.c:329 camlibs/sierra/nikon-desc.c:285 #: camlibs/sierra/olympus-desc.c:557 camlibs/sierra/olympus-desc.c:576 #: camlibs/sierra/sierra.c:1088 camlibs/sierra/sierra.c:1097 @@ -4521,8 +4532,8 @@ # camlibs/sierra/sierra.c:950 camlibs/sierra/sierra.c:960 # camlibs/sierra/sierra.c:1239 -#: camlibs/ptp2/config.c:1150 camlibs/ptp2/config.c:3087 -#: camlibs/ptp2/config.c:3106 camlibs/ptp2/ptp.c:4569 +#: camlibs/ptp2/config.c:1161 camlibs/ptp2/config.c:3198 +#: camlibs/ptp2/config.c:3217 camlibs/ptp2/ptp.c:4633 #: camlibs/sierra/olympus-desc.c:558 camlibs/sierra/olympus-desc.c:577 #: camlibs/sierra/olympus-desc.c:595 camlibs/sierra/olympus-desc.c:616 #: camlibs/sierra/sierra.c:1089 camlibs/sierra/sierra.c:1099 @@ -4532,8 +4543,8 @@ # camlibs/sierra/sierra.c:951 camlibs/sierra/sierra.c:963 # camlibs/sierra/sierra.c:1241 -#: camlibs/ptp2/config.c:1152 camlibs/ptp2/config.c:3086 -#: camlibs/ptp2/config.c:3105 camlibs/ptp2/ptp.c:4126 camlibs/ptp2/ptp.c:4568 +#: camlibs/ptp2/config.c:1163 camlibs/ptp2/config.c:3197 +#: camlibs/ptp2/config.c:3216 camlibs/ptp2/ptp.c:4188 camlibs/ptp2/ptp.c:4632 #: camlibs/sierra/nikon-desc.c:288 camlibs/sierra/olympus-desc.c:559 #: camlibs/sierra/olympus-desc.c:578 camlibs/sierra/olympus-desc.c:599 #: camlibs/sierra/olympus-desc.c:622 camlibs/sierra/sierra.c:1090 @@ -4541,71 +4552,71 @@ msgid "Cloudy" msgstr "多云" -#: camlibs/ptp2/config.c:1153 camlibs/ptp2/config.c:1161 -#: camlibs/ptp2/ptp.c:4127 +#: camlibs/ptp2/config.c:1164 camlibs/ptp2/config.c:1172 +#: camlibs/ptp2/ptp.c:4189 msgid "Shade" msgstr "" -#: camlibs/ptp2/config.c:1154 camlibs/ptp2/config.c:3091 -#: camlibs/ptp2/config.c:3112 camlibs/ptp2/ptp.c:3409 camlibs/ptp2/ptp.c:3983 -#: camlibs/ptp2/ptp.c:4128 camlibs/ptp2/ptp.c:4573 +#: camlibs/ptp2/config.c:1165 camlibs/ptp2/config.c:3202 +#: camlibs/ptp2/config.c:3223 camlibs/ptp2/ptp.c:3469 camlibs/ptp2/ptp.c:4045 +#: camlibs/ptp2/ptp.c:4190 camlibs/ptp2/ptp.c:4637 msgid "Color Temperature" msgstr "" # camlibs/sierra/sierra.c:1552 camlibs/sierra/sierra.c:1568 # camlibs/sierra/sierra.c:1745 -#: camlibs/ptp2/config.c:1155 camlibs/ptp2/ptp.c:4129 camlibs/ptp2/ptp.c:4571 +#: camlibs/ptp2/config.c:1166 camlibs/ptp2/ptp.c:4191 camlibs/ptp2/ptp.c:4635 #: camlibs/sierra/nikon-desc.c:287 camlibs/sierra/olympus-desc.c:621 msgid "Preset" msgstr "预设" -#: camlibs/ptp2/config.c:1156 +#: camlibs/ptp2/config.c:1167 msgid "Fluorescent Lamp 1" msgstr "" -#: camlibs/ptp2/config.c:1157 +#: camlibs/ptp2/config.c:1168 msgid "Fluorescent Lamp 2" msgstr "" -#: camlibs/ptp2/config.c:1158 +#: camlibs/ptp2/config.c:1169 msgid "Fluorescent Lamp 3" msgstr "" -#: camlibs/ptp2/config.c:1159 +#: camlibs/ptp2/config.c:1170 msgid "Fluorescent Lamp 4" msgstr "" -#: camlibs/ptp2/config.c:1160 +#: camlibs/ptp2/config.c:1171 msgid "Fluorescent Lamp 5" msgstr "" -#: camlibs/ptp2/config.c:1162 +#: camlibs/ptp2/config.c:1173 msgid "Choose Color Temperature" msgstr "" -#: camlibs/ptp2/config.c:1163 +#: camlibs/ptp2/config.c:1174 msgid "Preset Custom 1" msgstr "" -#: camlibs/ptp2/config.c:1164 +#: camlibs/ptp2/config.c:1175 msgid "Preset Custom 2" msgstr "" -#: camlibs/ptp2/config.c:1165 +#: camlibs/ptp2/config.c:1176 msgid "Preset Custom 3" msgstr "" -#: camlibs/ptp2/config.c:1166 +#: camlibs/ptp2/config.c:1177 msgid "Preset Custom 4" msgstr "" -#: camlibs/ptp2/config.c:1167 +#: camlibs/ptp2/config.c:1178 msgid "Preset Custom 5" msgstr "" -#: camlibs/ptp2/config.c:1173 camlibs/ptp2/config.c:3470 -#: camlibs/ptp2/config.c:3481 camlibs/ptp2/config.c:3493 -#: camlibs/ptp2/ptp.c:4116 +#: camlibs/ptp2/config.c:1184 camlibs/ptp2/config.c:3613 +#: camlibs/ptp2/config.c:3624 camlibs/ptp2/config.c:3636 +#: camlibs/ptp2/ptp.c:4178 msgid "JPEG Fine" msgstr "JPEG 精细" @@ -4617,2260 +4628,2431 @@ # camlibs/sierra/sierra.c:1212 camlibs/sierra/sierra.c:1256 # camlibs/sierra/sierra.c:1451 camlibs/sierra/sierra.c:1455 # camlibs/sierra/sierra.c:1668 -#: camlibs/ptp2/config.c:1174 camlibs/ptp2/config.c:3469 -#: camlibs/ptp2/config.c:3480 camlibs/ptp2/config.c:3492 +#: camlibs/ptp2/config.c:1185 camlibs/ptp2/config.c:3612 +#: camlibs/ptp2/config.c:3623 camlibs/ptp2/config.c:3635 msgid "JPEG Normal" msgstr "JPEG 普通" -#: camlibs/ptp2/config.c:1175 +#: camlibs/ptp2/config.c:1186 msgid "RAW + JPEG Fine" msgstr "" -#: camlibs/ptp2/config.c:1176 +#: camlibs/ptp2/config.c:1187 msgid "RAW + JPEG Normal" msgstr "" -#: camlibs/ptp2/config.c:1181 +#: camlibs/ptp2/config.c:1192 msgid "Single frame" msgstr "" -#: camlibs/ptp2/config.c:1182 camlibs/ptp2/config.c:1992 +#: camlibs/ptp2/config.c:1193 camlibs/ptp2/config.c:2043 msgid "Continuous low speed" msgstr "" -#: camlibs/ptp2/config.c:1183 camlibs/ptp2/config.c:1991 +#: camlibs/ptp2/config.c:1194 camlibs/ptp2/config.c:2042 msgid "Continuous high speed" msgstr "" -#: camlibs/ptp2/config.c:1184 +#: camlibs/ptp2/config.c:1195 msgid "Self-timer" msgstr "" -#: camlibs/ptp2/config.c:1185 +#: camlibs/ptp2/config.c:1196 msgid "Mup Mirror up" msgstr "" -#: camlibs/ptp2/config.c:1480 +#: camlibs/ptp2/config.c:1491 msgid "undefined" msgstr "" -#: camlibs/ptp2/config.c:1481 +#: camlibs/ptp2/config.c:1492 msgid "economy" msgstr "" -#: camlibs/ptp2/config.c:1484 +#: camlibs/ptp2/config.c:1495 msgid "lossless" msgstr "" -#: camlibs/ptp2/config.c:1490 camlibs/ptp2/config.c:1801 -#: camlibs/ptp2/config.c:1817 camlibs/ptp2/config.c:3054 -#: camlibs/ptp2/library.c:3418 camlibs/ptp2/library.c:3432 -#: camlibs/ptp2/ptp.c:4140 camlibs/ptp2/ptp.c:4467 camlibs/ptp2/ptp.c:4473 -#: camlibs/ptp2/ptp.c:4480 camlibs/ptp2/ptp.c:4642 camlibs/ptp2/ptp.c:4853 +#: camlibs/ptp2/config.c:1501 camlibs/ptp2/config.c:1819 +#: camlibs/ptp2/config.c:1868 camlibs/ptp2/config.c:3165 +#: camlibs/ptp2/library.c:3512 camlibs/ptp2/library.c:3526 +#: camlibs/ptp2/ptp.c:4202 camlibs/ptp2/ptp.c:4531 camlibs/ptp2/ptp.c:4537 +#: camlibs/ptp2/ptp.c:4544 camlibs/ptp2/ptp.c:4706 camlibs/ptp2/ptp.c:4917 msgid "Undefined" msgstr "" -#: camlibs/ptp2/config.c:1492 camlibs/ptp2/ptp.c:4482 +#: camlibs/ptp2/config.c:1503 camlibs/ptp2/ptp.c:4546 msgid "CRW" msgstr "" -#: camlibs/ptp2/config.c:1498 camlibs/ptp2/config.c:1511 +#: camlibs/ptp2/config.c:1509 camlibs/ptp2/config.c:1522 msgid "TV" msgstr "" -#: camlibs/ptp2/config.c:1499 camlibs/ptp2/config.c:1512 +#: camlibs/ptp2/config.c:1510 camlibs/ptp2/config.c:1523 msgid "AV" msgstr "" -#: camlibs/ptp2/config.c:1501 camlibs/ptp2/config.c:1515 -#: camlibs/ptp2/ptp.c:4507 +#: camlibs/ptp2/config.c:1512 camlibs/ptp2/config.c:1526 +#: camlibs/ptp2/ptp.c:4571 msgid "A_DEP" msgstr "" -#: camlibs/ptp2/config.c:1502 camlibs/ptp2/ptp.c:4508 +#: camlibs/ptp2/config.c:1513 camlibs/ptp2/ptp.c:4572 msgid "M_DEP" msgstr "" -#: camlibs/ptp2/config.c:1516 +#: camlibs/ptp2/config.c:1527 msgid "DEP" msgstr "" # camlibs/sierra/sierra.c:1426 camlibs/sierra/sierra.c:1433 # camlibs/sierra/sierra.c:1653 -#: camlibs/ptp2/config.c:1517 camlibs/ptp2/config.c:3009 -#: camlibs/ptp2/config.c:3031 camlibs/ptp2/config.c:3089 -#: camlibs/ptp2/ptp.c:4192 camlibs/ptp2/ptp.c:4353 +#: camlibs/ptp2/config.c:1528 camlibs/ptp2/config.c:3120 +#: camlibs/ptp2/config.c:3142 camlibs/ptp2/config.c:3200 +#: camlibs/ptp2/ptp.c:4254 camlibs/ptp2/ptp.c:4416 #: camlibs/sierra/epson-desc.c:171 camlibs/sierra/sierra.c:1565 #: camlibs/sierra/sierra.c:1572 camlibs/sierra/sierra.c:1792 msgid "Custom" msgstr "定制" -#: camlibs/ptp2/config.c:1518 +#: camlibs/ptp2/config.c:1529 msgid "Lock" msgstr "" -#: camlibs/ptp2/config.c:1520 camlibs/ptp2/config.c:2385 -#: camlibs/ptp2/ptp.c:4161 +#: camlibs/ptp2/config.c:1531 camlibs/ptp2/config.c:2436 +#: camlibs/ptp2/config.c:2455 camlibs/ptp2/ptp.c:4223 msgid "Night Portrait" msgstr "" -#: camlibs/ptp2/config.c:1521 camlibs/ptp2/config.c:2384 -#: camlibs/ptp2/ptp.c:4159 camlibs/ptp2/ptp.c:4521 +#: camlibs/ptp2/config.c:1532 camlibs/ptp2/config.c:2435 +#: camlibs/ptp2/config.c:2469 camlibs/ptp2/ptp.c:4221 camlibs/ptp2/ptp.c:4585 msgid "Sports" msgstr "" -#: camlibs/ptp2/config.c:1523 camlibs/ptp2/config.c:1680 -#: camlibs/ptp2/config.c:2382 camlibs/ptp2/config.c:3008 -#: camlibs/ptp2/ptp.c:4157 camlibs/ptp2/ptp.c:4352 -#: camlibs/st2205/library.c:512 camlibs/st2205/library.c:525 +#: camlibs/ptp2/config.c:1534 camlibs/ptp2/config.c:1698 +#: camlibs/ptp2/config.c:2433 camlibs/ptp2/config.c:2467 +#: camlibs/ptp2/config.c:3119 camlibs/ptp2/ptp.c:4219 camlibs/ptp2/ptp.c:4415 +#: camlibs/st2205/library.c:514 camlibs/st2205/library.c:527 msgid "Landscape" msgstr "" -#: camlibs/ptp2/config.c:1524 +#: camlibs/ptp2/config.c:1535 msgid "Closeup" msgstr "" -#: camlibs/ptp2/config.c:1525 +#: camlibs/ptp2/config.c:1536 msgid "Flash Off" msgstr "" -#: camlibs/ptp2/config.c:1533 +#: camlibs/ptp2/config.c:1544 msgid "red eye suppression" msgstr "" -#: camlibs/ptp2/config.c:1534 +#: camlibs/ptp2/config.c:1545 msgid "fill in" msgstr "" -#: camlibs/ptp2/config.c:1535 +#: camlibs/ptp2/config.c:1546 msgid "auto + red eye suppression" msgstr "" -#: camlibs/ptp2/config.c:1536 +#: camlibs/ptp2/config.c:1547 msgid "on + red eye suppression" msgstr "" -#: camlibs/ptp2/config.c:1541 +#: camlibs/ptp2/config.c:1552 msgid "iTTL" msgstr "" -#: camlibs/ptp2/config.c:1543 camlibs/ptp2/ptp.c:4391 +#: camlibs/ptp2/config.c:1554 camlibs/ptp2/ptp.c:4454 msgid "Commander" msgstr "" -#: camlibs/ptp2/config.c:1544 +#: camlibs/ptp2/config.c:1555 msgid "Repeating" msgstr "" -#: camlibs/ptp2/config.c:1549 camlibs/ptp2/config.c:1578 -#: camlibs/ptp2/config.c:1638 camlibs/ptp2/ptp.c:4393 +#: camlibs/ptp2/config.c:1560 camlibs/ptp2/config.c:1589 +#: camlibs/ptp2/config.c:1649 camlibs/ptp2/ptp.c:4456 msgid "TTL" msgstr "" -#: camlibs/ptp2/config.c:1550 camlibs/ptp2/config.c:1639 -#: camlibs/ptp2/ptp.c:4394 +#: camlibs/ptp2/config.c:1561 camlibs/ptp2/config.c:1650 +#: camlibs/ptp2/ptp.c:4457 msgid "Auto Aperture" msgstr "" -#: camlibs/ptp2/config.c:1551 camlibs/ptp2/ptp.c:4395 +#: camlibs/ptp2/config.c:1562 camlibs/ptp2/ptp.c:4458 msgid "Full Manual" msgstr "" -#: camlibs/ptp2/config.c:1647 camlibs/ptp2/config.c:3058 -#: camlibs/ptp2/ptp.c:4361 +#: camlibs/ptp2/config.c:1658 camlibs/ptp2/config.c:3169 +#: camlibs/ptp2/ptp.c:4424 msgid "AF-S" msgstr "" -#: camlibs/ptp2/config.c:1648 camlibs/ptp2/config.c:3059 -#: camlibs/ptp2/ptp.c:4362 +#: camlibs/ptp2/config.c:1659 camlibs/ptp2/config.c:3170 +#: camlibs/ptp2/ptp.c:4425 msgid "AF-C" msgstr "" -#: camlibs/ptp2/config.c:1649 camlibs/ptp2/config.c:3060 -#: camlibs/ptp2/ptp.c:4363 +#: camlibs/ptp2/config.c:1660 camlibs/ptp2/config.c:3171 +#: camlibs/ptp2/ptp.c:4426 msgid "AF-A" msgstr "" -#: camlibs/ptp2/config.c:1650 camlibs/ptp2/ptp.c:4364 +#: camlibs/ptp2/config.c:1661 camlibs/ptp2/ptp.c:4427 msgid "MF (fixed)" msgstr "" -#: camlibs/ptp2/config.c:1651 camlibs/ptp2/ptp.c:4365 +#: camlibs/ptp2/config.c:1662 camlibs/ptp2/ptp.c:4428 msgid "MF (selection)" msgstr "" -#: camlibs/ptp2/config.c:1666 +#: camlibs/ptp2/config.c:1684 msgid "Center-weighted" msgstr "" -#: camlibs/ptp2/config.c:1668 camlibs/ptp2/config.c:2495 -#: camlibs/ptp2/config.c:2912 camlibs/ptp2/ptp.c:4136 +#: camlibs/ptp2/config.c:1686 camlibs/ptp2/config.c:2582 +#: camlibs/ptp2/config.c:3023 camlibs/ptp2/ptp.c:4198 msgid "Average" msgstr "" -#: camlibs/ptp2/config.c:1669 +#: camlibs/ptp2/config.c:1687 msgid "Evaluative" msgstr "" -#: camlibs/ptp2/config.c:1670 +#: camlibs/ptp2/config.c:1688 msgid "Partial" msgstr "" -#: camlibs/ptp2/config.c:1671 +#: camlibs/ptp2/config.c:1689 msgid "Center-weighted average" msgstr "" -#: camlibs/ptp2/config.c:1672 +#: camlibs/ptp2/config.c:1690 msgid "Spot metering interlocked with AF frame" msgstr "" -#: camlibs/ptp2/config.c:1673 +#: camlibs/ptp2/config.c:1691 msgid "Multi spot" msgstr "" -#: camlibs/ptp2/config.c:1682 +#: camlibs/ptp2/config.c:1700 msgid "Faithful" msgstr "" -#: camlibs/ptp2/config.c:1683 camlibs/ptp2/ptp.c:4523 camlibs/ptp2/ptp.c:4655 +#: camlibs/ptp2/config.c:1701 camlibs/ptp2/ptp.c:4587 camlibs/ptp2/ptp.c:4719 msgid "Monochrome" msgstr "" -#: camlibs/ptp2/config.c:1684 +#: camlibs/ptp2/config.c:1702 msgid "User defined 1" msgstr "" -#: camlibs/ptp2/config.c:1685 +#: camlibs/ptp2/config.c:1703 msgid "User defined 2" msgstr "" -#: camlibs/ptp2/config.c:1686 +#: camlibs/ptp2/config.c:1704 msgid "User defined 3" msgstr "" -#: camlibs/ptp2/config.c:1772 camlibs/ptp2/ptp.c:4558 +#: camlibs/ptp2/config.c:1790 camlibs/ptp2/ptp.c:4622 msgid "Focusing Point on Center Only, Manual" msgstr "" -#: camlibs/ptp2/config.c:1773 camlibs/ptp2/ptp.c:4559 +#: camlibs/ptp2/config.c:1791 camlibs/ptp2/ptp.c:4623 msgid "Focusing Point on Center Only, Auto" msgstr "" -#: camlibs/ptp2/config.c:1774 camlibs/ptp2/ptp.c:4560 +#: camlibs/ptp2/config.c:1792 camlibs/ptp2/ptp.c:4624 msgid "Multiple Focusing Points (No Specification), Manual" msgstr "" -#: camlibs/ptp2/config.c:1775 camlibs/ptp2/ptp.c:4561 +#: camlibs/ptp2/config.c:1793 camlibs/ptp2/ptp.c:4625 msgid "Multiple Focusing Points, Auto" msgstr "" -#: camlibs/ptp2/config.c:1776 camlibs/ptp2/ptp.c:4562 +#: camlibs/ptp2/config.c:1794 camlibs/ptp2/ptp.c:4626 msgid "Multiple Focusing Points (Right)" msgstr "" -#: camlibs/ptp2/config.c:1777 camlibs/ptp2/ptp.c:4563 +#: camlibs/ptp2/config.c:1795 camlibs/ptp2/ptp.c:4627 msgid "Multiple Focusing Points (Center)" msgstr "" -#: camlibs/ptp2/config.c:1778 camlibs/ptp2/ptp.c:4564 +#: camlibs/ptp2/config.c:1796 camlibs/ptp2/ptp.c:4628 msgid "Multiple Focusing Points (Left)" msgstr "" -#: camlibs/ptp2/config.c:1783 camlibs/ptp2/ptp.c:4484 +#: camlibs/ptp2/config.c:1801 camlibs/ptp2/ptp.c:4548 msgid "Large" msgstr "" -#: camlibs/ptp2/config.c:1784 camlibs/ptp2/ptp.c:4485 +#: camlibs/ptp2/config.c:1802 camlibs/ptp2/ptp.c:4549 msgid "Medium 1" msgstr "" -#: camlibs/ptp2/config.c:1785 camlibs/ptp2/ptp.c:4487 +#: camlibs/ptp2/config.c:1803 camlibs/ptp2/ptp.c:4551 msgid "Medium 2" msgstr "" -#: camlibs/ptp2/config.c:1786 camlibs/ptp2/ptp.c:4488 +#: camlibs/ptp2/config.c:1804 camlibs/ptp2/ptp.c:4552 msgid "Medium 3" msgstr "" -#: camlibs/ptp2/config.c:1787 camlibs/ptp2/ptp.c:4486 +#: camlibs/ptp2/config.c:1805 camlibs/ptp2/ptp.c:4550 msgid "Small" msgstr "" -#: camlibs/ptp2/config.c:1794 camlibs/ptp2/config.c:2884 -#: camlibs/ptp2/config.c:2902 camlibs/ptp2/ptp.c:4242 camlibs/ptp2/ptp.c:4245 -#: camlibs/ptp2/ptp.c:4491 +#: camlibs/ptp2/config.c:1812 camlibs/ptp2/config.c:2995 +#: camlibs/ptp2/config.c:3013 camlibs/ptp2/ptp.c:4304 camlibs/ptp2/ptp.c:4307 +#: camlibs/ptp2/ptp.c:4555 msgid "10 seconds" msgstr "" -#: camlibs/ptp2/config.c:1795 camlibs/ptp2/config.c:2900 -#: camlibs/ptp2/config.c:3075 camlibs/ptp2/ptp.c:4240 camlibs/ptp2/ptp.c:4492 +#: camlibs/ptp2/config.c:1813 camlibs/ptp2/config.c:3011 +#: camlibs/ptp2/config.c:3186 camlibs/ptp2/ptp.c:4302 camlibs/ptp2/ptp.c:4556 msgid "2 seconds" msgstr "" -#: camlibs/ptp2/config.c:1802 +#: camlibs/ptp2/config.c:1820 msgid "TFT" msgstr "" -#: camlibs/ptp2/config.c:1803 +#: camlibs/ptp2/config.c:1821 msgid "PC" msgstr "" -#: camlibs/ptp2/config.c:1804 +#: camlibs/ptp2/config.c:1822 msgid "TFT + PC" msgstr "" -#: camlibs/ptp2/config.c:1819 camlibs/ptp2/config.c:1845 -#: camlibs/ptp2/config.c:1872 camlibs/ptp2/ptp.c:4644 +#: camlibs/ptp2/config.c:1870 camlibs/ptp2/config.c:1896 +#: camlibs/ptp2/config.c:1923 camlibs/ptp2/ptp.c:4708 msgid "Video OUT" msgstr "" -#: camlibs/ptp2/config.c:1841 camlibs/ptp2/config.c:1855 -#: camlibs/ptp2/config.c:1874 +#: camlibs/ptp2/config.c:1892 camlibs/ptp2/config.c:1906 +#: camlibs/ptp2/config.c:1925 #, c-format msgid "Unknown %d" msgstr "" # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956 # camlibs/sierra/sierra.c:1235 -#: camlibs/ptp2/config.c:1905 camlibs/ptp2/config.c:3120 +#: camlibs/ptp2/config.c:1956 camlibs/ptp2/config.c:3231 msgid "Factory Default" msgstr "工厂默认值" -#: camlibs/ptp2/config.c:1942 +#: camlibs/ptp2/config.c:1993 msgid "sRAW1" msgstr "" -#: camlibs/ptp2/config.c:1943 +#: camlibs/ptp2/config.c:1994 msgid "sRAW2" msgstr "" -#: camlibs/ptp2/config.c:1951 +#: camlibs/ptp2/config.c:2002 msgid "sRAW1 + Large Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1952 +#: camlibs/ptp2/config.c:2003 msgid "sRAW2 + Large Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1954 +#: camlibs/ptp2/config.c:2005 msgid "sRAW1 + Medium Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1955 +#: camlibs/ptp2/config.c:2006 msgid "sRAW2 + Medium Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1957 +#: camlibs/ptp2/config.c:2008 msgid "sRAW1 + Small Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1958 +#: camlibs/ptp2/config.c:2009 msgid "sRAW2 + Small Fine JPEG" msgstr "" -#: camlibs/ptp2/config.c:1960 +#: camlibs/ptp2/config.c:2011 msgid "sRAW1 + Large Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1961 +#: camlibs/ptp2/config.c:2012 msgid "sRAW2 + Large Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1963 +#: camlibs/ptp2/config.c:2014 msgid "sRAW1 + Medium Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1964 +#: camlibs/ptp2/config.c:2015 msgid "sRAW2 + Medium Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1966 +#: camlibs/ptp2/config.c:2017 msgid "sRAW1 + Small Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1967 +#: camlibs/ptp2/config.c:2018 msgid "sRAW2 + Small Normal JPEG" msgstr "" -#: camlibs/ptp2/config.c:1990 camlibs/ptp2/ptp.c:4589 +#: camlibs/ptp2/config.c:2041 camlibs/ptp2/ptp.c:4653 msgid "Continuous" msgstr "" -#: camlibs/ptp2/config.c:1993 +#: camlibs/ptp2/config.c:2044 msgid "Timer 10 sec" msgstr "" -#: camlibs/ptp2/config.c:1994 +#: camlibs/ptp2/config.c:2045 msgid "Timer 2 sec" msgstr "" -#: camlibs/ptp2/config.c:2182 +#: camlibs/ptp2/config.c:2233 #, c-format msgid "%0.4fs" msgstr "" -#: camlibs/ptp2/config.c:2202 +#: camlibs/ptp2/config.c:2253 #, c-format msgid "%d %d/%d" msgstr "" -#: camlibs/ptp2/config.c:2205 +#: camlibs/ptp2/config.c:2256 #, c-format msgid "%d/%d" msgstr "" -#: camlibs/ptp2/config.c:2208 +#: camlibs/ptp2/config.c:2259 #, c-format msgid "%f" msgstr "" -#: camlibs/ptp2/config.c:2377 +#: camlibs/ptp2/config.c:2428 msgid "Creative" msgstr "" -#: camlibs/ptp2/config.c:2378 +#: camlibs/ptp2/config.c:2429 msgid "Action" msgstr "" -#: camlibs/ptp2/config.c:2386 camlibs/ptp2/ptp.c:4160 +#: camlibs/ptp2/config.c:2437 camlibs/ptp2/ptp.c:4222 msgid "Night Landscape" msgstr "" -#: camlibs/ptp2/config.c:2387 +#: camlibs/ptp2/config.c:2438 camlibs/ptp2/config.c:2471 msgid "Children" msgstr "" -#: camlibs/ptp2/config.c:2388 +#: camlibs/ptp2/config.c:2439 msgid "Automatic (No Flash)" msgstr "" -#: camlibs/ptp2/config.c:2394 camlibs/ptp2/ptp.c:4162 camlibs/ptp2/ptp.c:4585 +#: camlibs/ptp2/config.c:2444 +msgid "Night landscape" +msgstr "" + +#: camlibs/ptp2/config.c:2445 +msgid "Party/Indoor" +msgstr "" + +#: camlibs/ptp2/config.c:2446 +msgid "Beach/Snow" +msgstr "" + +#: camlibs/ptp2/config.c:2447 +msgid "Sunset" +msgstr "" + +#: camlibs/ptp2/config.c:2448 +msgid "Dusk/Dawn" +msgstr "" + +#: camlibs/ptp2/config.c:2449 +msgid "Pet Portrait" +msgstr "" + +#: camlibs/ptp2/config.c:2450 +msgid "Candlelight" +msgstr "" + +#: camlibs/ptp2/config.c:2451 +msgid "Blossom" +msgstr "" + +#: camlibs/ptp2/config.c:2452 +msgid "Autumn colors" +msgstr "" + +#: camlibs/ptp2/config.c:2453 +msgid "Food" +msgstr "" + +#: camlibs/ptp2/config.c:2472 +msgid "Scene" +msgstr "" + +#: camlibs/ptp2/config.c:2473 +msgid "Effects" +msgstr "" + +#: camlibs/ptp2/config.c:2478 camlibs/ptp2/ptp.c:4224 camlibs/ptp2/ptp.c:4649 msgid "Single Shot" msgstr "" -#: camlibs/ptp2/config.c:2395 +#: camlibs/ptp2/config.c:2479 msgid "Burst" msgstr "" -#: camlibs/ptp2/config.c:2396 camlibs/ptp2/ptp.c:4164 +#: camlibs/ptp2/config.c:2480 camlibs/ptp2/ptp.c:4226 msgid "Timelapse" msgstr "" -#: camlibs/ptp2/config.c:2397 camlibs/ptp2/ptp.c:4165 +#: camlibs/ptp2/config.c:2481 camlibs/ptp2/ptp.c:4227 msgid "Continuous Low Speed" msgstr "" -#: camlibs/ptp2/config.c:2398 camlibs/ptp2/ptp.c:4166 +#: camlibs/ptp2/config.c:2482 camlibs/ptp2/ptp.c:4228 msgid "Timer" msgstr "" -#: camlibs/ptp2/config.c:2399 camlibs/ptp2/ptp.c:4168 +#: camlibs/ptp2/config.c:2483 camlibs/ptp2/ptp.c:4230 msgid "Mirror Up" msgstr "" -#: camlibs/ptp2/config.c:2401 +#: camlibs/ptp2/config.c:2485 msgid "Quick Response Remote" msgstr "" -#: camlibs/ptp2/config.c:2402 +#: camlibs/ptp2/config.c:2486 msgid "Delayed Remote" msgstr "" -#: camlibs/ptp2/config.c:2403 +#: camlibs/ptp2/config.c:2487 msgid "Quiet Release" msgstr "" -#: camlibs/ptp2/config.c:2409 camlibs/ptp2/ptp.c:4170 +#: camlibs/ptp2/config.c:2496 camlibs/ptp2/ptp.c:4232 msgid "Centre-spot" msgstr "" -#: camlibs/ptp2/config.c:2410 camlibs/ptp2/ptp.c:4138 camlibs/ptp2/ptp.c:4171 +#: camlibs/ptp2/config.c:2497 camlibs/ptp2/ptp.c:4200 camlibs/ptp2/ptp.c:4233 msgid "Multi-spot" msgstr "" -#: camlibs/ptp2/config.c:2411 camlibs/ptp2/ptp.c:4172 +#: camlibs/ptp2/config.c:2498 camlibs/ptp2/ptp.c:4234 msgid "Single Area" msgstr "" -#: camlibs/ptp2/config.c:2412 camlibs/ptp2/ptp.c:4173 +#: camlibs/ptp2/config.c:2499 camlibs/ptp2/ptp.c:4235 msgid "Closest Subject" msgstr "" -#: camlibs/ptp2/config.c:2413 camlibs/ptp2/ptp.c:4174 +#: camlibs/ptp2/config.c:2500 camlibs/ptp2/ptp.c:4236 msgid "Group Dynamic" msgstr "" -#: camlibs/ptp2/config.c:2414 +#: camlibs/ptp2/config.c:2501 msgid "Single-area AF" msgstr "" -#: camlibs/ptp2/config.c:2415 +#: camlibs/ptp2/config.c:2502 msgid "Dynamic-area AF" msgstr "" -#: camlibs/ptp2/config.c:2416 +#: camlibs/ptp2/config.c:2503 msgid "Group-dyamic AF" msgstr "" -#: camlibs/ptp2/config.c:2417 +#: camlibs/ptp2/config.c:2504 msgid "Dynamic-area AF with closest subject priority" msgstr "" -#: camlibs/ptp2/config.c:2423 +#: camlibs/ptp2/config.c:2510 msgid "sRGB (portrait)" msgstr "" -#: camlibs/ptp2/config.c:2424 camlibs/ptp2/config.c:2431 -#: camlibs/ptp2/config.c:2437 +#: camlibs/ptp2/config.c:2511 camlibs/ptp2/config.c:2518 +#: camlibs/ptp2/config.c:2524 msgid "AdobeRGB" msgstr "" -#: camlibs/ptp2/config.c:2425 +#: camlibs/ptp2/config.c:2512 msgid "sRGB (nature)" msgstr "" -#: camlibs/ptp2/config.c:2430 camlibs/ptp2/config.c:2436 +#: camlibs/ptp2/config.c:2517 camlibs/ptp2/config.c:2523 msgid "sRGB" msgstr "" -#: camlibs/ptp2/config.c:2478 +#: camlibs/ptp2/config.c:2565 #, c-format msgid "Unknown value 0x%04x" msgstr "" -#: camlibs/ptp2/config.c:2485 camlibs/ptp2/ptp.c:4318 +#: camlibs/ptp2/config.c:2572 camlibs/ptp2/ptp.c:4381 msgid "Centre" msgstr "" -#: camlibs/ptp2/config.c:2486 camlibs/ptp2/ptp.c:4319 +#: camlibs/ptp2/config.c:2573 camlibs/ptp2/ptp.c:4382 msgid "Top" msgstr "" -#: camlibs/ptp2/config.c:2487 camlibs/ptp2/ptp.c:4320 +#: camlibs/ptp2/config.c:2574 camlibs/ptp2/ptp.c:4383 msgid "Bottom" msgstr "" -#: camlibs/ptp2/config.c:2488 camlibs/ptp2/ptp.c:4321 +#: camlibs/ptp2/config.c:2575 camlibs/ptp2/ptp.c:4384 msgid "Left" msgstr "" -#: camlibs/ptp2/config.c:2489 camlibs/ptp2/ptp.c:4322 +#: camlibs/ptp2/config.c:2576 camlibs/ptp2/ptp.c:4385 msgid "Right" msgstr "" -#: camlibs/ptp2/config.c:2496 camlibs/sierra/olympus-desc.c:790 +#: camlibs/ptp2/config.c:2583 camlibs/sierra/olympus-desc.c:790 msgid "Center Weighted" msgstr "" -#: camlibs/ptp2/config.c:2497 +#: camlibs/ptp2/config.c:2584 msgid "Multi Spot" msgstr "" -#: camlibs/ptp2/config.c:2498 +#: camlibs/ptp2/config.c:2585 msgid "Center Spot" msgstr "" -#: camlibs/ptp2/config.c:2505 +#: camlibs/ptp2/config.c:2592 msgid "Automatic Flash" msgstr "" -#: camlibs/ptp2/config.c:2507 camlibs/ptp2/ptp.c:4143 +#: camlibs/ptp2/config.c:2594 camlibs/ptp2/ptp.c:4205 msgid "Fill flash" msgstr "" -#: camlibs/ptp2/config.c:2508 +#: camlibs/ptp2/config.c:2595 msgid "Red-eye automatic" msgstr "" -#: camlibs/ptp2/config.c:2509 +#: camlibs/ptp2/config.c:2596 msgid "Red-eye fill" msgstr "" -#: camlibs/ptp2/config.c:2510 camlibs/ptp2/ptp.c:4146 +#: camlibs/ptp2/config.c:2597 camlibs/ptp2/ptp.c:4208 msgid "External sync" msgstr "" -#: camlibs/ptp2/config.c:2511 camlibs/ptp2/ptp.c:4147 -msgid "Default" +#: camlibs/ptp2/config.c:2599 camlibs/ptp2/ptp.c:4210 +msgid "Auto Slow Sync" msgstr "" -# camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901 -# camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400 -# camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637 -#: camlibs/ptp2/config.c:2512 camlibs/ptp2/ptp.c:4148 -#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:1029 -#: camlibs/sierra/sierra.c:1040 camlibs/sierra/sierra.c:1337 -#: camlibs/sierra/sierra.c:1539 camlibs/sierra/sierra.c:1549 -#: camlibs/sierra/sierra.c:1776 -msgid "Slow Sync" -msgstr "慢同步" - -#: camlibs/ptp2/config.c:2513 camlibs/ptp2/ptp.c:4149 +#: camlibs/ptp2/config.c:2600 camlibs/ptp2/ptp.c:4211 msgid "Rear Curtain Sync + Slow Sync" msgstr "" -#: camlibs/ptp2/config.c:2514 camlibs/ptp2/ptp.c:4150 +#: camlibs/ptp2/config.c:2601 camlibs/ptp2/ptp.c:4212 msgid "Red-eye Reduction + Slow Sync" msgstr "" -#: camlibs/ptp2/config.c:2515 +#: camlibs/ptp2/config.c:2602 msgid "Front-curtain sync" msgstr "" -#: camlibs/ptp2/config.c:2516 +#: camlibs/ptp2/config.c:2603 msgid "Red-eye reduction" msgstr "" -#: camlibs/ptp2/config.c:2517 +#: camlibs/ptp2/config.c:2604 msgid "Red-eye reduction with slow sync" msgstr "" -#: camlibs/ptp2/config.c:2518 +#: camlibs/ptp2/config.c:2605 msgid "Slow sync" msgstr "" -#: camlibs/ptp2/config.c:2519 +#: camlibs/ptp2/config.c:2606 msgid "Rear-curtain with slow sync" msgstr "" -#: camlibs/ptp2/config.c:2520 +#: camlibs/ptp2/config.c:2607 msgid "Rear-curtain sync" msgstr "" # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500 # camlibs/sierra/sierra.c:1700 -#: camlibs/ptp2/config.c:2526 camlibs/ricoh/library.c:331 +#: camlibs/ptp2/config.c:2613 camlibs/ricoh/library.c:331 #: camlibs/sierra/epson-desc.c:137 msgid "Black & White" msgstr "黑白" -#: camlibs/ptp2/config.c:2614 camlibs/ptp2/config.c:2660 +#: camlibs/ptp2/config.c:2619 +msgid "Night Vision" +msgstr "" + +#: camlibs/ptp2/config.c:2620 +msgid "Color sketch" +msgstr "" + +#: camlibs/ptp2/config.c:2621 +msgid "Miniature effect" +msgstr "" + +#: camlibs/ptp2/config.c:2622 +msgid "Selective color" +msgstr "" + +#: camlibs/ptp2/config.c:2623 +msgid "Silhouette" +msgstr "" + +#: camlibs/ptp2/config.c:2624 +msgid "High key" +msgstr "" + +#: camlibs/ptp2/config.c:2625 +msgid "Low key" +msgstr "" + +#: camlibs/ptp2/config.c:2712 camlibs/ptp2/config.c:2758 msgid "infinite" msgstr "" -#: camlibs/ptp2/config.c:2616 camlibs/ptp2/config.c:2624 -#: camlibs/ptp2/config.c:2664 +#: camlibs/ptp2/config.c:2714 camlibs/ptp2/config.c:2722 +#: camlibs/ptp2/config.c:2762 #, c-format msgid "%d mm" msgstr "" -#: camlibs/ptp2/config.c:2874 camlibs/ptp2/ptp.c:4226 +#: camlibs/ptp2/config.c:2962 +msgid "Face-priority AF" +msgstr "" + +#: camlibs/ptp2/config.c:2963 +msgid "Wide-area AF" +msgstr "" + +#: camlibs/ptp2/config.c:2964 +msgid "Normal-area AF" +msgstr "" + +#: camlibs/ptp2/config.c:2965 +msgid "Subject-tracking AF" +msgstr "" + +#: camlibs/ptp2/config.c:2970 +msgid "Single-servo AF" +msgstr "" + +#: camlibs/ptp2/config.c:2971 +msgid "Full-time-servo AF" +msgstr "" + +#: camlibs/ptp2/config.c:2972 camlibs/ptp2/ptp.c:4192 +msgid "Manual Focus" +msgstr "" + +#: camlibs/ptp2/config.c:2985 camlibs/ptp2/ptp.c:4288 msgid "AE/AF Lock" msgstr "" -#: camlibs/ptp2/config.c:2875 camlibs/ptp2/ptp.c:4228 +#: camlibs/ptp2/config.c:2986 camlibs/ptp2/ptp.c:4290 msgid "AE Lock only" msgstr "" -#: camlibs/ptp2/config.c:2876 +#: camlibs/ptp2/config.c:2987 msgid "AF Lock Only" msgstr "" -#: camlibs/ptp2/config.c:2877 camlibs/ptp2/ptp.c:4229 +#: camlibs/ptp2/config.c:2988 camlibs/ptp2/ptp.c:4291 msgid "AF Lock Hold" msgstr "" -#: camlibs/ptp2/config.c:2878 camlibs/ptp2/ptp.c:4230 +#: camlibs/ptp2/config.c:2989 camlibs/ptp2/ptp.c:4292 msgid "AF On" msgstr "" -#: camlibs/ptp2/config.c:2879 +#: camlibs/ptp2/config.c:2990 msgid "Flash Level Lock" msgstr "" -#: camlibs/ptp2/config.c:2885 camlibs/ptp2/config.c:2903 -#: camlibs/ptp2/ptp.c:4243 camlibs/ptp2/ptp.c:4246 +#: camlibs/ptp2/config.c:2996 camlibs/ptp2/config.c:3014 +#: camlibs/ptp2/ptp.c:4305 camlibs/ptp2/ptp.c:4308 msgid "20 seconds" msgstr "" -#: camlibs/ptp2/config.c:2886 camlibs/ptp2/config.c:2994 -#: camlibs/ptp2/config.c:3515 camlibs/ptp2/ptp.c:4247 +#: camlibs/ptp2/config.c:2997 camlibs/ptp2/config.c:3105 +#: camlibs/ptp2/config.c:3658 camlibs/ptp2/ptp.c:4309 msgid "1 minute" msgstr "" -#: camlibs/ptp2/config.c:2887 camlibs/ptp2/config.c:2995 -#: camlibs/ptp2/config.c:3516 camlibs/ptp2/ptp.c:4248 +#: camlibs/ptp2/config.c:2998 camlibs/ptp2/config.c:3106 +#: camlibs/ptp2/config.c:3659 camlibs/ptp2/ptp.c:4310 msgid "5 minutes" msgstr "" -#: camlibs/ptp2/config.c:2888 camlibs/ptp2/config.c:2996 -#: camlibs/ptp2/config.c:3517 camlibs/ptp2/ptp.c:4249 +#: camlibs/ptp2/config.c:2999 camlibs/ptp2/config.c:3107 +#: camlibs/ptp2/config.c:3660 camlibs/ptp2/ptp.c:4311 msgid "10 minutes" msgstr "10 分钟" -#: camlibs/ptp2/config.c:2889 camlibs/ptp2/config.c:2901 -#: camlibs/ptp2/ptp.c:4241 camlibs/ptp2/ptp.c:4250 +#: camlibs/ptp2/config.c:3000 camlibs/ptp2/config.c:3012 +#: camlibs/ptp2/ptp.c:4303 camlibs/ptp2/ptp.c:4312 msgid "5 seconds" msgstr "" -#: camlibs/ptp2/config.c:2894 camlibs/ptp2/ptp.c:4324 +#: camlibs/ptp2/config.c:3005 camlibs/ptp2/ptp.c:4387 msgid "Card" msgstr "" -#: camlibs/ptp2/config.c:2895 +#: camlibs/ptp2/config.c:3006 msgid "SDRAM" msgstr "" -#: camlibs/ptp2/config.c:2908 +#: camlibs/ptp2/config.c:3019 msgid "6 mm" msgstr "" -#: camlibs/ptp2/config.c:2909 +#: camlibs/ptp2/config.c:3020 msgid "8 mm" msgstr "" -#: camlibs/ptp2/config.c:2910 +#: camlibs/ptp2/config.c:3021 msgid "10 mm" msgstr "" -#: camlibs/ptp2/config.c:2911 +#: camlibs/ptp2/config.c:3022 msgid "12 mm" msgstr "" -#: camlibs/ptp2/config.c:2917 +#: camlibs/ptp2/config.c:3028 msgid "1/60" msgstr "" -#: camlibs/ptp2/config.c:2918 +#: camlibs/ptp2/config.c:3029 msgid "1/30" msgstr "" -#: camlibs/ptp2/config.c:2919 +#: camlibs/ptp2/config.c:3030 msgid "1/15" msgstr "" -#: camlibs/ptp2/config.c:2920 +#: camlibs/ptp2/config.c:3031 msgid "1/8" msgstr "" -#: camlibs/ptp2/config.c:2921 +#: camlibs/ptp2/config.c:3032 msgid "1/4" msgstr "" -#: camlibs/ptp2/config.c:2922 +#: camlibs/ptp2/config.c:3033 msgid "1/2" msgstr "" -#: camlibs/ptp2/config.c:2923 +#: camlibs/ptp2/config.c:3034 msgid "1" msgstr "" -#: camlibs/ptp2/config.c:2924 camlibs/ptp2/config.c:3566 +#: camlibs/ptp2/config.c:3035 camlibs/ptp2/config.c:3709 msgid "2" msgstr "" -#: camlibs/ptp2/config.c:2925 camlibs/ptp2/config.c:3564 +#: camlibs/ptp2/config.c:3036 camlibs/ptp2/config.c:3707 msgid "4" msgstr "" -#: camlibs/ptp2/config.c:2926 +#: camlibs/ptp2/config.c:3037 msgid "8" msgstr "" -#: camlibs/ptp2/config.c:2927 +#: camlibs/ptp2/config.c:3038 msgid "15" msgstr "" -#: camlibs/ptp2/config.c:2928 +#: camlibs/ptp2/config.c:3039 msgid "30" msgstr "" -#: camlibs/ptp2/config.c:2933 +#: camlibs/ptp2/config.c:3044 msgid "bulb" msgstr "" -#: camlibs/ptp2/config.c:2934 camlibs/ptp2/config.c:3606 +#: camlibs/ptp2/config.c:3045 camlibs/ptp2/config.c:3749 msgid "30s" msgstr "" -#: camlibs/ptp2/config.c:2935 +#: camlibs/ptp2/config.c:3046 msgid "25s" msgstr "" -#: camlibs/ptp2/config.c:2936 +#: camlibs/ptp2/config.c:3047 msgid "20s" msgstr "" -#: camlibs/ptp2/config.c:2937 camlibs/ptp2/config.c:3605 +#: camlibs/ptp2/config.c:3048 camlibs/ptp2/config.c:3748 msgid "15s" msgstr "" -#: camlibs/ptp2/config.c:2938 +#: camlibs/ptp2/config.c:3049 msgid "13s" msgstr "" -#: camlibs/ptp2/config.c:2939 +#: camlibs/ptp2/config.c:3050 msgid "10s" msgstr "" -#: camlibs/ptp2/config.c:2940 camlibs/ptp2/config.c:3604 +#: camlibs/ptp2/config.c:3051 camlibs/ptp2/config.c:3747 msgid "8s" msgstr "" -#: camlibs/ptp2/config.c:2941 +#: camlibs/ptp2/config.c:3052 msgid "6s" msgstr "" -#: camlibs/ptp2/config.c:2942 +#: camlibs/ptp2/config.c:3053 msgid "5s" msgstr "" -#: camlibs/ptp2/config.c:2943 camlibs/ptp2/config.c:3603 +#: camlibs/ptp2/config.c:3054 camlibs/ptp2/config.c:3746 msgid "4s" msgstr "" -#: camlibs/ptp2/config.c:2944 +#: camlibs/ptp2/config.c:3055 msgid "3s" msgstr "" -#: camlibs/ptp2/config.c:2945 +#: camlibs/ptp2/config.c:3056 msgid "2.5s" msgstr "" -#: camlibs/ptp2/config.c:2946 camlibs/ptp2/config.c:3602 +#: camlibs/ptp2/config.c:3057 camlibs/ptp2/config.c:3745 msgid "2s" msgstr "" -#: camlibs/ptp2/config.c:2947 +#: camlibs/ptp2/config.c:3058 msgid "1.6s" msgstr "" -#: camlibs/ptp2/config.c:2948 +#: camlibs/ptp2/config.c:3059 msgid "1.3s" msgstr "" -#: camlibs/ptp2/config.c:2949 camlibs/ptp2/config.c:3601 +#: camlibs/ptp2/config.c:3060 camlibs/ptp2/config.c:3744 msgid "1s" msgstr "" -#: camlibs/ptp2/config.c:2950 +#: camlibs/ptp2/config.c:3061 msgid "1/1.3s" msgstr "" -#: camlibs/ptp2/config.c:2951 +#: camlibs/ptp2/config.c:3062 msgid "1/1.6s" msgstr "" -#: camlibs/ptp2/config.c:2952 camlibs/ptp2/config.c:3600 +#: camlibs/ptp2/config.c:3063 camlibs/ptp2/config.c:3743 msgid "1/2s" msgstr "" -#: camlibs/ptp2/config.c:2953 +#: camlibs/ptp2/config.c:3064 msgid "1/2.5s" msgstr "" -#: camlibs/ptp2/config.c:2954 +#: camlibs/ptp2/config.c:3065 msgid "1/3s" msgstr "" -#: camlibs/ptp2/config.c:2955 camlibs/ptp2/config.c:3599 +#: camlibs/ptp2/config.c:3066 camlibs/ptp2/config.c:3742 msgid "1/4s" msgstr "" -#: camlibs/ptp2/config.c:2956 +#: camlibs/ptp2/config.c:3067 msgid "1/5s" msgstr "" -#: camlibs/ptp2/config.c:2957 +#: camlibs/ptp2/config.c:3068 msgid "1/6s" msgstr "" -#: camlibs/ptp2/config.c:2958 camlibs/ptp2/config.c:3598 +#: camlibs/ptp2/config.c:3069 camlibs/ptp2/config.c:3741 msgid "1/8s" msgstr "" -#: camlibs/ptp2/config.c:2959 +#: camlibs/ptp2/config.c:3070 msgid "1/10s" msgstr "" -#: camlibs/ptp2/config.c:2960 +#: camlibs/ptp2/config.c:3071 msgid "1/13s" msgstr "" -#: camlibs/ptp2/config.c:2961 camlibs/ptp2/config.c:3597 +#: camlibs/ptp2/config.c:3072 camlibs/ptp2/config.c:3740 msgid "1/15s" msgstr "" -#: camlibs/ptp2/config.c:2962 +#: camlibs/ptp2/config.c:3073 msgid "1/20s" msgstr "" -#: camlibs/ptp2/config.c:2963 +#: camlibs/ptp2/config.c:3074 msgid "1/25s" msgstr "" -#: camlibs/ptp2/config.c:2964 camlibs/ptp2/config.c:3596 +#: camlibs/ptp2/config.c:3075 camlibs/ptp2/config.c:3739 msgid "1/30s" msgstr "" -#: camlibs/ptp2/config.c:2965 +#: camlibs/ptp2/config.c:3076 msgid "1/40s" msgstr "" -#: camlibs/ptp2/config.c:2966 +#: camlibs/ptp2/config.c:3077 msgid "1/50s" msgstr "" -#: camlibs/ptp2/config.c:2967 camlibs/ptp2/config.c:3537 -#: camlibs/ptp2/config.c:3595 +#: camlibs/ptp2/config.c:3078 camlibs/ptp2/config.c:3680 +#: camlibs/ptp2/config.c:3738 msgid "1/60s" msgstr "" -#: camlibs/ptp2/config.c:2968 camlibs/ptp2/config.c:3536 +#: camlibs/ptp2/config.c:3079 camlibs/ptp2/config.c:3679 msgid "1/80s" msgstr "" -#: camlibs/ptp2/config.c:2969 camlibs/ptp2/config.c:3535 +#: camlibs/ptp2/config.c:3080 camlibs/ptp2/config.c:3678 msgid "1/100s" msgstr "" -#: camlibs/ptp2/config.c:2970 camlibs/ptp2/config.c:3534 +#: camlibs/ptp2/config.c:3081 camlibs/ptp2/config.c:3677 msgid "1/125s" msgstr "" -#: camlibs/ptp2/config.c:2971 camlibs/ptp2/config.c:3533 +#: camlibs/ptp2/config.c:3082 camlibs/ptp2/config.c:3676 msgid "1/160s" msgstr "" -#: camlibs/ptp2/config.c:2972 camlibs/ptp2/config.c:3532 +#: camlibs/ptp2/config.c:3083 camlibs/ptp2/config.c:3675 msgid "1/200s" msgstr "" -#: camlibs/ptp2/config.c:2973 camlibs/ptp2/config.c:3531 +#: camlibs/ptp2/config.c:3084 camlibs/ptp2/config.c:3674 msgid "1/250s" msgstr "" -#: camlibs/ptp2/config.c:2974 +#: camlibs/ptp2/config.c:3085 msgid "1/320s" msgstr "" -#: camlibs/ptp2/config.c:2975 +#: camlibs/ptp2/config.c:3086 msgid "1/400s" msgstr "" -#: camlibs/ptp2/config.c:2976 +#: camlibs/ptp2/config.c:3087 msgid "1/500s" msgstr "" -#: camlibs/ptp2/config.c:2977 +#: camlibs/ptp2/config.c:3088 msgid "1/640s" msgstr "" -#: camlibs/ptp2/config.c:2978 +#: camlibs/ptp2/config.c:3089 msgid "1/800s" msgstr "" -#: camlibs/ptp2/config.c:2979 +#: camlibs/ptp2/config.c:3090 msgid "1/1000s" msgstr "" -#: camlibs/ptp2/config.c:2980 camlibs/ptp2/config.c:2981 +#: camlibs/ptp2/config.c:3091 camlibs/ptp2/config.c:3092 msgid "1/1250s" msgstr "" -#: camlibs/ptp2/config.c:2982 +#: camlibs/ptp2/config.c:3093 msgid "1/1600s" msgstr "" -#: camlibs/ptp2/config.c:2983 +#: camlibs/ptp2/config.c:3094 msgid "1/2000s" msgstr "" -#: camlibs/ptp2/config.c:2984 +#: camlibs/ptp2/config.c:3095 msgid "1/2500s" msgstr "" -#: camlibs/ptp2/config.c:2985 +#: camlibs/ptp2/config.c:3096 msgid "1/3200s" msgstr "" -#: camlibs/ptp2/config.c:2986 +#: camlibs/ptp2/config.c:3097 msgid "1/4000s" msgstr "" -#: camlibs/ptp2/config.c:2987 +#: camlibs/ptp2/config.c:3098 msgid "1/5000s" msgstr "" -#: camlibs/ptp2/config.c:2988 +#: camlibs/ptp2/config.c:3099 msgid "1/6400s" msgstr "" -#: camlibs/ptp2/config.c:2989 +#: camlibs/ptp2/config.c:3100 msgid "1/8000s" msgstr "" -#: camlibs/ptp2/config.c:2997 +#: camlibs/ptp2/config.c:3108 msgid "15 minutes" msgstr "15 分钟" -#: camlibs/ptp2/config.c:3004 camlibs/ptp2/ptp.c:4348 +#: camlibs/ptp2/config.c:3115 camlibs/ptp2/ptp.c:4411 msgid "Sharper" msgstr "" -#: camlibs/ptp2/config.c:3005 camlibs/ptp2/ptp.c:4349 +#: camlibs/ptp2/config.c:3116 camlibs/ptp2/ptp.c:4412 msgid "Softer" msgstr "" -#: camlibs/ptp2/config.c:3006 camlibs/ptp2/ptp.c:4350 +#: camlibs/ptp2/config.c:3117 camlibs/ptp2/ptp.c:4413 msgid "Direct Print" msgstr "" -#: camlibs/ptp2/config.c:3017 camlibs/ptp2/config.c:3028 -#: camlibs/ptp2/ptp.c:4181 camlibs/ptp2/ptp.c:4189 +#: camlibs/ptp2/config.c:3128 camlibs/ptp2/config.c:3139 +#: camlibs/ptp2/ptp.c:4243 camlibs/ptp2/ptp.c:4251 msgid "Medium Low" msgstr "" -#: camlibs/ptp2/config.c:3018 camlibs/ptp2/ptp.c:4182 +#: camlibs/ptp2/config.c:3129 camlibs/ptp2/ptp.c:4244 msgid "Medium high" msgstr "" -#: camlibs/ptp2/config.c:3027 camlibs/ptp2/ptp.c:4188 +#: camlibs/ptp2/config.c:3138 camlibs/ptp2/ptp.c:4250 msgid "Low contrast" msgstr "" -#: camlibs/ptp2/config.c:3029 camlibs/ptp2/ptp.c:4190 +#: camlibs/ptp2/config.c:3140 camlibs/ptp2/ptp.c:4252 msgid "Medium High" msgstr "" -#: camlibs/ptp2/config.c:3030 camlibs/ptp2/ptp.c:4191 +#: camlibs/ptp2/config.c:3141 camlibs/ptp2/ptp.c:4253 msgid "High control" msgstr "" -#: camlibs/ptp2/config.c:3039 camlibs/ptp2/ptp.c:4551 +#: camlibs/ptp2/config.c:3150 camlibs/ptp2/ptp.c:4615 msgid "Zone Focus (Close-up)" msgstr "" -#: camlibs/ptp2/config.c:3040 camlibs/ptp2/ptp.c:4552 +#: camlibs/ptp2/config.c:3151 camlibs/ptp2/ptp.c:4616 msgid "Zone Focus (Very Close)" msgstr "" -#: camlibs/ptp2/config.c:3041 camlibs/ptp2/ptp.c:4553 +#: camlibs/ptp2/config.c:3152 camlibs/ptp2/ptp.c:4617 msgid "Zone Focus (Close)" msgstr "" -#: camlibs/ptp2/config.c:3042 camlibs/ptp2/ptp.c:4554 +#: camlibs/ptp2/config.c:3153 camlibs/ptp2/ptp.c:4618 msgid "Zone Focus (Medium)" msgstr "" -#: camlibs/ptp2/config.c:3043 camlibs/ptp2/ptp.c:4555 +#: camlibs/ptp2/config.c:3154 camlibs/ptp2/ptp.c:4619 msgid "Zone Focus (Far)" msgstr "" -#: camlibs/ptp2/config.c:3044 +#: camlibs/ptp2/config.c:3155 msgid "Zone Focus (Reserved 1)" msgstr "" -#: camlibs/ptp2/config.c:3045 +#: camlibs/ptp2/config.c:3156 msgid "Zone Focus (Reserved 2)" msgstr "" -#: camlibs/ptp2/config.c:3046 +#: camlibs/ptp2/config.c:3157 msgid "Zone Focus (Reserved 3)" msgstr "" -#: camlibs/ptp2/config.c:3047 +#: camlibs/ptp2/config.c:3158 msgid "Zone Focus (Reserved 4)" msgstr "" -#: camlibs/ptp2/config.c:3057 +#: camlibs/ptp2/config.c:3168 msgid "Automatic Macro" msgstr "" -#: camlibs/ptp2/config.c:3061 +#: camlibs/ptp2/config.c:3172 msgid "Single-Servo AF" msgstr "" -#: camlibs/ptp2/config.c:3062 +#: camlibs/ptp2/config.c:3173 msgid "Continuous-Servo AF" msgstr "" -#: camlibs/ptp2/config.c:3067 +#: camlibs/ptp2/config.c:3178 msgid "One Shot" msgstr "" -#: camlibs/ptp2/config.c:3068 camlibs/ptp2/ptp.c:4587 +#: camlibs/ptp2/config.c:3179 camlibs/ptp2/ptp.c:4651 msgid "AI Focus" msgstr "" -#: camlibs/ptp2/config.c:3069 camlibs/ptp2/ptp.c:4586 +#: camlibs/ptp2/config.c:3180 camlibs/ptp2/ptp.c:4650 msgid "AI Servo" msgstr "" -#: camlibs/ptp2/config.c:3076 camlibs/ptp2/config.c:3510 -#: camlibs/ptp2/ptp.c:4233 +#: camlibs/ptp2/config.c:3187 camlibs/ptp2/config.c:3653 +#: camlibs/ptp2/ptp.c:4295 msgid "4 seconds" msgstr "4 秒" -#: camlibs/ptp2/config.c:3077 camlibs/ptp2/config.c:3512 -#: camlibs/ptp2/ptp.c:4235 +#: camlibs/ptp2/config.c:3188 camlibs/ptp2/config.c:3655 +#: camlibs/ptp2/ptp.c:4297 msgid "8 seconds" msgstr "8 秒" -#: camlibs/ptp2/config.c:3078 +#: camlibs/ptp2/config.c:3189 msgid "Hold" msgstr "" # camlibs/sierra/sierra.c:949 camlibs/sierra/sierra.c:958 # camlibs/sierra/sierra.c:1237 -#: camlibs/ptp2/config.c:3090 camlibs/ptp2/ptp.c:4572 camlibs/ptp2/ptp.c:4578 +#: camlibs/ptp2/config.c:3201 camlibs/ptp2/ptp.c:4636 camlibs/ptp2/ptp.c:4642 msgid "Fluorescent H" msgstr "荧光" -#: camlibs/ptp2/config.c:3092 camlibs/ptp2/ptp.c:4574 +#: camlibs/ptp2/config.c:3203 camlibs/ptp2/ptp.c:4638 msgid "Custom Whitebalance PC-1" msgstr "" -#: camlibs/ptp2/config.c:3093 camlibs/ptp2/ptp.c:4575 +#: camlibs/ptp2/config.c:3204 camlibs/ptp2/ptp.c:4639 msgid "Custom Whitebalance PC-2" msgstr "" -#: camlibs/ptp2/config.c:3094 camlibs/ptp2/ptp.c:4576 +#: camlibs/ptp2/config.c:3205 camlibs/ptp2/ptp.c:4640 msgid "Custom Whitebalance PC-3" msgstr "" -#: camlibs/ptp2/config.c:3095 camlibs/ptp2/ptp.c:4577 +#: camlibs/ptp2/config.c:3206 camlibs/ptp2/ptp.c:4641 msgid "Missing Number" msgstr "" -#: camlibs/ptp2/config.c:3111 +#: camlibs/ptp2/config.c:3222 msgid "Shadow" msgstr "" -#: camlibs/ptp2/config.c:3194 +#: camlibs/ptp2/config.c:3305 msgid "Low sharpening" msgstr "" # camlibs/sierra/sierra.c:1496 camlibs/sierra/sierra.c:1500 # camlibs/sierra/sierra.c:1700 -#: camlibs/ptp2/config.c:3196 +#: camlibs/ptp2/config.c:3307 msgid "Black & white" msgstr "黑白" -#: camlibs/ptp2/config.c:3293 camlibs/ptp2/ptp.c:4274 +#: camlibs/ptp2/config.c:3404 camlibs/ptp2/ptp.c:4336 msgid "AE & Flash" msgstr "" -#: camlibs/ptp2/config.c:3294 camlibs/ptp2/ptp.c:4275 +#: camlibs/ptp2/config.c:3405 camlibs/ptp2/ptp.c:4337 msgid "AE only" msgstr "" -#: camlibs/ptp2/config.c:3295 camlibs/ptp2/config.c:3350 -#: camlibs/ptp2/ptp.c:4276 +#: camlibs/ptp2/config.c:3406 camlibs/ptp2/config.c:3493 +#: camlibs/ptp2/ptp.c:4338 msgid "Flash only" msgstr "" -#: camlibs/ptp2/config.c:3296 camlibs/ptp2/ptp.c:4277 +#: camlibs/ptp2/config.c:3407 camlibs/ptp2/ptp.c:4339 msgid "WB bracketing" msgstr "" -#: camlibs/ptp2/config.c:3297 +#: camlibs/ptp2/config.c:3408 msgid "ADL bracketing" msgstr "" -#: camlibs/ptp2/config.c:3303 camlibs/ptp2/ptp.c:4356 +#: camlibs/ptp2/config.c:3414 +msgid "Startup" +msgstr "" + +#: camlibs/ptp2/config.c:3415 +msgid "Shutdown" +msgstr "" + +#: camlibs/ptp2/config.c:3416 +msgid "Startup and Shutdown" +msgstr "" + +#: camlibs/ptp2/config.c:3422 camlibs/ptp2/ptp.c:4419 msgid "Moderate" msgstr "" -#: camlibs/ptp2/config.c:3304 camlibs/ptp2/ptp.c:4357 +#: camlibs/ptp2/config.c:3423 camlibs/ptp2/ptp.c:4420 msgid "Enhanced" msgstr "" -#: camlibs/ptp2/config.c:3310 camlibs/ptp2/ptp.c:4279 +#: camlibs/ptp2/config.c:3429 camlibs/ptp2/ptp.c:4341 msgid "MTR > Under" msgstr "" -#: camlibs/ptp2/config.c:3311 camlibs/ptp2/ptp.c:4280 +#: camlibs/ptp2/config.c:3430 camlibs/ptp2/ptp.c:4342 msgid "Under > MTR" msgstr "" -#: camlibs/ptp2/config.c:3342 +#: camlibs/ptp2/config.c:3450 +msgid "Auto sensitivity" +msgstr "" + +#: camlibs/ptp2/config.c:3451 +msgid "High sensitivity" +msgstr "" + +#: camlibs/ptp2/config.c:3452 +msgid "Medium sensitivity" +msgstr "" + +#: camlibs/ptp2/config.c:3453 +msgid "Low sensitivity" +msgstr "" + +#: camlibs/ptp2/config.c:3454 +msgid "Microphone off" +msgstr "" + +#: camlibs/ptp2/config.c:3484 msgid "Hi 1" msgstr "" -#: camlibs/ptp2/config.c:3347 +#: camlibs/ptp2/config.c:3485 +msgid "Hi 2" +msgstr "" + +#: camlibs/ptp2/config.c:3490 msgid "Flash/speed" msgstr "" -#: camlibs/ptp2/config.c:3348 +#: camlibs/ptp2/config.c:3491 msgid "Flash/speed/aperture" msgstr "" -#: camlibs/ptp2/config.c:3349 +#: camlibs/ptp2/config.c:3492 msgid "Flash/aperture" msgstr "" -#: camlibs/ptp2/config.c:3458 +#: camlibs/ptp2/config.c:3601 msgid "Extra high" msgstr "" -#: camlibs/ptp2/config.c:3468 camlibs/ptp2/config.c:3479 -#: camlibs/ptp2/config.c:3491 camlibs/ptp2/ptp.c:4114 +#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3622 +#: camlibs/ptp2/config.c:3634 camlibs/ptp2/ptp.c:4176 msgid "JPEG Basic" msgstr "" -#: camlibs/ptp2/config.c:3471 camlibs/ptp2/config.c:3483 -#: camlibs/ptp2/config.c:3494 +#: camlibs/ptp2/config.c:3614 camlibs/ptp2/config.c:3626 +#: camlibs/ptp2/config.c:3637 msgid "NEF (Raw)" msgstr "" -#: camlibs/ptp2/config.c:3472 camlibs/ptp2/config.c:3484 -#: camlibs/ptp2/config.c:3495 +#: camlibs/ptp2/config.c:3615 camlibs/ptp2/config.c:3627 +#: camlibs/ptp2/config.c:3638 msgid "NEF+Basic" msgstr "" -#: camlibs/ptp2/config.c:3473 camlibs/ptp2/config.c:3485 -#: camlibs/ptp2/config.c:3496 +#: camlibs/ptp2/config.c:3616 camlibs/ptp2/config.c:3628 +#: camlibs/ptp2/config.c:3639 msgid "NEF+Normal" msgstr "" -#: camlibs/ptp2/config.c:3474 camlibs/ptp2/config.c:3486 -#: camlibs/ptp2/config.c:3497 +#: camlibs/ptp2/config.c:3617 camlibs/ptp2/config.c:3629 +#: camlibs/ptp2/config.c:3640 msgid "NEF+Fine" msgstr "" -#: camlibs/ptp2/config.c:3482 +#: camlibs/ptp2/config.c:3625 msgid "TIFF (RGB)" msgstr "" -#: camlibs/ptp2/config.c:3511 camlibs/ptp2/ptp.c:4234 +#: camlibs/ptp2/config.c:3654 camlibs/ptp2/ptp.c:4296 msgid "6 seconds" msgstr "6 秒" -#: camlibs/ptp2/config.c:3513 camlibs/ptp2/ptp.c:4236 +#: camlibs/ptp2/config.c:3656 camlibs/ptp2/ptp.c:4298 msgid "16 seconds" msgstr "" -#: camlibs/ptp2/config.c:3514 camlibs/ptp2/ptp.c:4238 +#: camlibs/ptp2/config.c:3657 camlibs/ptp2/ptp.c:4300 msgid "30 seconds" msgstr "" -#: camlibs/ptp2/config.c:3518 camlibs/ptp2/ptp.c:4237 +#: camlibs/ptp2/config.c:3661 camlibs/ptp2/ptp.c:4299 msgid "30 minutes" msgstr "" -#: camlibs/ptp2/config.c:3524 +#: camlibs/ptp2/config.c:3667 msgid "Size Priority" msgstr "" -#: camlibs/ptp2/config.c:3525 +#: camlibs/ptp2/config.c:3668 msgid "Optimal quality" msgstr "" -#: camlibs/ptp2/config.c:3530 +#: camlibs/ptp2/config.c:3673 msgid "1/250s (Auto FP)" msgstr "" -#: camlibs/ptp2/config.c:3542 camlibs/ptp2/config.c:3549 +#: camlibs/ptp2/config.c:3685 camlibs/ptp2/config.c:3692 msgid "Release" msgstr "" -#: camlibs/ptp2/config.c:3543 +#: camlibs/ptp2/config.c:3686 msgid "Release + Focus" msgstr "" -#: camlibs/ptp2/config.c:3555 +#: camlibs/ptp2/config.c:3698 msgid "9 points" msgstr "" -#: camlibs/ptp2/config.c:3556 +#: camlibs/ptp2/config.c:3699 msgid "21 points" msgstr "" -#: camlibs/ptp2/config.c:3557 +#: camlibs/ptp2/config.c:3700 msgid "51 points" msgstr "" -#: camlibs/ptp2/config.c:3558 +#: camlibs/ptp2/config.c:3701 msgid "51 points (3D)" msgstr "" -#: camlibs/ptp2/config.c:3563 +#: camlibs/ptp2/config.c:3706 msgid "5 (Long)" msgstr "" -#: camlibs/ptp2/config.c:3565 +#: camlibs/ptp2/config.c:3708 msgid "3 (Normal)" msgstr "" -#: camlibs/ptp2/config.c:3567 +#: camlibs/ptp2/config.c:3710 msgid "1 (Short)" msgstr "" -#: camlibs/ptp2/config.c:3573 +#: camlibs/ptp2/config.c:3716 msgid "Shutter/AF-ON" msgstr "" -#: camlibs/ptp2/config.c:3574 camlibs/ptp2/config.c:3585 +#: camlibs/ptp2/config.c:3717 camlibs/ptp2/config.c:3728 msgid "AF-ON" msgstr "" -#: camlibs/ptp2/config.c:3579 +#: camlibs/ptp2/config.c:3722 msgid "AF51" msgstr "" -#: camlibs/ptp2/config.c:3580 +#: camlibs/ptp2/config.c:3723 msgid "AF11" msgstr "" -#: camlibs/ptp2/config.c:3586 +#: camlibs/ptp2/config.c:3729 msgid "AE/AF lock" msgstr "" -#: camlibs/ptp2/config.c:3587 +#: camlibs/ptp2/config.c:3730 msgid "AE lock only" msgstr "" -#: camlibs/ptp2/config.c:3588 +#: camlibs/ptp2/config.c:3731 msgid "AE lock (Reset on release)" msgstr "" -#: camlibs/ptp2/config.c:3589 +#: camlibs/ptp2/config.c:3732 msgid "AE lock (Hold)" msgstr "" -#: camlibs/ptp2/config.c:3590 +#: camlibs/ptp2/config.c:3733 msgid "AF lock only" msgstr "" -#: camlibs/ptp2/config.c:3611 camlibs/ptp2/config.c:3624 +#: camlibs/ptp2/config.c:3754 camlibs/ptp2/config.c:3767 msgid "4 fps" msgstr "" -#: camlibs/ptp2/config.c:3612 camlibs/ptp2/config.c:3625 +#: camlibs/ptp2/config.c:3755 camlibs/ptp2/config.c:3768 msgid "3 fps" msgstr "" -#: camlibs/ptp2/config.c:3613 camlibs/ptp2/config.c:3626 +#: camlibs/ptp2/config.c:3756 camlibs/ptp2/config.c:3769 msgid "2 fps" msgstr "" -#: camlibs/ptp2/config.c:3614 camlibs/ptp2/config.c:3627 +#: camlibs/ptp2/config.c:3757 camlibs/ptp2/config.c:3770 msgid "1 fps" msgstr "" -#: camlibs/ptp2/config.c:3619 camlibs/ptp2/config.c:3634 +#: camlibs/ptp2/config.c:3762 camlibs/ptp2/config.c:3777 msgid "9 fps" msgstr "" -#: camlibs/ptp2/config.c:3620 +#: camlibs/ptp2/config.c:3763 msgid "8 fps" msgstr "" -#: camlibs/ptp2/config.c:3621 +#: camlibs/ptp2/config.c:3764 msgid "7 fps" msgstr "" -#: camlibs/ptp2/config.c:3622 +#: camlibs/ptp2/config.c:3765 msgid "6 fps" msgstr "" -#: camlibs/ptp2/config.c:3623 +#: camlibs/ptp2/config.c:3766 msgid "5 fps" msgstr "" -#: camlibs/ptp2/config.c:3632 +#: camlibs/ptp2/config.c:3775 msgid "11 fps" msgstr "" -#: camlibs/ptp2/config.c:3633 +#: camlibs/ptp2/config.c:3776 msgid "10 fps" msgstr "" -#: camlibs/ptp2/config.c:3697 +#: camlibs/ptp2/config.c:3840 msgid "50%" msgstr "" -#: camlibs/ptp2/config.c:3698 +#: camlibs/ptp2/config.c:3841 msgid "100%" msgstr "" -#: camlibs/ptp2/config.c:3699 +#: camlibs/ptp2/config.c:3842 msgid "75%" msgstr "" -#: camlibs/ptp2/config.c:3700 +#: camlibs/ptp2/config.c:3843 msgid "25%" msgstr "" -#: camlibs/ptp2/config.c:3701 +#: camlibs/ptp2/config.c:3844 msgid "Unknown value" msgstr "" -#: camlibs/ptp2/config.c:3839 camlibs/ptp2/config.c:3858 +#: camlibs/ptp2/config.c:3982 camlibs/ptp2/config.c:4002 msgid "On 1" msgstr "" -#: camlibs/ptp2/config.c:3840 camlibs/ptp2/config.c:3861 +#: camlibs/ptp2/config.c:3983 camlibs/ptp2/config.c:4006 msgid "On 2" msgstr "" -#: camlibs/ptp2/config.c:3892 +#: camlibs/ptp2/config.c:3985 camlibs/ptp2/config.c:4010 +msgid "Immediate" +msgstr "" + +#: camlibs/ptp2/config.c:4046 msgid "Near 1" msgstr "" -#: camlibs/ptp2/config.c:3893 +#: camlibs/ptp2/config.c:4047 msgid "Near 2" msgstr "" -#: camlibs/ptp2/config.c:3894 +#: camlibs/ptp2/config.c:4048 msgid "Near 3" msgstr "" -#: camlibs/ptp2/config.c:3896 +#: camlibs/ptp2/config.c:4050 msgid "Far 1" msgstr "" -#: camlibs/ptp2/config.c:3897 +#: camlibs/ptp2/config.c:4051 msgid "Far 2" msgstr "" -#: camlibs/ptp2/config.c:3898 +#: camlibs/ptp2/config.c:4052 msgid "Far 3" msgstr "" -#: camlibs/ptp2/config.c:3917 +#: camlibs/ptp2/config.c:4071 #, c-format msgid "Near %d" msgstr "" -#: camlibs/ptp2/config.c:3918 +#: camlibs/ptp2/config.c:4072 #, c-format msgid "Far %d" msgstr "" -#: camlibs/ptp2/config.c:4272 +#: camlibs/ptp2/config.c:4426 msgid "" "For bulb capture to work, make sure the mode dial is switched to 'M' and set " "'shutterspeed' to 'bulb'." msgstr "" -#: camlibs/ptp2/config.c:4342 +#: camlibs/ptp2/config.c:4496 msgid "Internal RAM" msgstr "" -#: camlibs/ptp2/config.c:4343 +#: camlibs/ptp2/config.c:4497 msgid "Memory card" msgstr "" -#: camlibs/ptp2/config.c:4460 +#: camlibs/ptp2/config.c:4614 msgid "ESSID" msgstr "" -#: camlibs/ptp2/config.c:4465 +#: camlibs/ptp2/config.c:4619 msgid "Display" msgstr "" -#: camlibs/ptp2/config.c:4475 +#: camlibs/ptp2/config.c:4629 #, c-format msgid "Creation date: %s, Last usage date: %s" msgstr "" # camlibs/sierra/sierra.c:948 camlibs/sierra/sierra.c:956 # camlibs/sierra/sierra.c:1235 -#: camlibs/ptp2/config.c:4481 +#: camlibs/ptp2/config.c:4635 msgid "Delete" msgstr "删除" -#: camlibs/ptp2/config.c:4550 +#: camlibs/ptp2/config.c:4704 msgid "WEP 64-bit" msgstr "" -#: camlibs/ptp2/config.c:4551 +#: camlibs/ptp2/config.c:4705 msgid "WEP 128-bit" msgstr "" -#: camlibs/ptp2/config.c:4598 +#: camlibs/ptp2/config.c:4752 msgid "Managed" msgstr "" -#: camlibs/ptp2/config.c:4599 +#: camlibs/ptp2/config.c:4753 msgid "Ad-hoc" msgstr "" -#: camlibs/ptp2/config.c:4768 +#: camlibs/ptp2/config.c:4922 msgid "Profile name" msgstr "" -#: camlibs/ptp2/config.c:4769 +#: camlibs/ptp2/config.c:4923 msgid "WIFI ESSID" msgstr "" -#: camlibs/ptp2/config.c:4770 +#: camlibs/ptp2/config.c:4924 msgid "IP address (empty for DHCP)" msgstr "" -#: camlibs/ptp2/config.c:4771 +#: camlibs/ptp2/config.c:4925 msgid "Network mask" msgstr "" -#: camlibs/ptp2/config.c:4772 +#: camlibs/ptp2/config.c:4926 msgid "Default gateway" msgstr "" -#: camlibs/ptp2/config.c:4773 +#: camlibs/ptp2/config.c:4927 msgid "Access mode" msgstr "" -#: camlibs/ptp2/config.c:4774 +#: camlibs/ptp2/config.c:4928 msgid "WIFI channel" msgstr "" -#: camlibs/ptp2/config.c:4775 +#: camlibs/ptp2/config.c:4929 msgid "Encryption" msgstr "" -#: camlibs/ptp2/config.c:4776 +#: camlibs/ptp2/config.c:4930 msgid "Encryption key (hex)" msgstr "" -#: camlibs/ptp2/config.c:4777 +#: camlibs/ptp2/config.c:4931 msgid "Write" msgstr "" -#: camlibs/ptp2/config.c:4825 +#: camlibs/ptp2/config.c:4979 msgid "List Wifi profiles" msgstr "" -#: camlibs/ptp2/config.c:4826 +#: camlibs/ptp2/config.c:4980 msgid "Create Wifi profile" msgstr "" -#: camlibs/ptp2/config.c:4879 camlibs/ptp2/ptp.c:3633 +#: camlibs/ptp2/config.c:5033 camlibs/ptp2/ptp.c:3693 msgid "Focus Lock" msgstr "" -#: camlibs/ptp2/config.c:4880 +#: camlibs/ptp2/config.c:5034 msgid "Bulb Mode" msgstr "" -#: camlibs/ptp2/config.c:4881 +#: camlibs/ptp2/config.c:5035 msgid "UI Lock" msgstr "" -#: camlibs/ptp2/config.c:4884 +#: camlibs/ptp2/config.c:5038 msgid "Drive Nikon DSLR Autofocus" msgstr "" -#: camlibs/ptp2/config.c:4885 +#: camlibs/ptp2/config.c:5039 msgid "Drive Canon DSLR Autofocus" msgstr "" -#: camlibs/ptp2/config.c:4886 +#: camlibs/ptp2/config.c:5040 msgid "Drive Nikon DSLR Manual focus" msgstr "" -#: camlibs/ptp2/config.c:4887 +#: camlibs/ptp2/config.c:5041 msgid "Drive Canon DSLR Manual focus" msgstr "" -#: camlibs/ptp2/config.c:4888 +#: camlibs/ptp2/config.c:5042 msgid "Canon EOS Zoom" msgstr "" -#: camlibs/ptp2/config.c:4889 +#: camlibs/ptp2/config.c:5043 msgid "Canon EOS Zoom Position" msgstr "" -#: camlibs/ptp2/config.c:4890 +#: camlibs/ptp2/config.c:5044 msgid "Canon EOS Viewfinder" msgstr "" -#: camlibs/ptp2/config.c:4891 +#: camlibs/ptp2/config.c:5045 msgid "Canon EOS Remote Release" msgstr "" -#: camlibs/ptp2/config.c:4892 +#: camlibs/ptp2/config.c:5046 msgid "CHDK Reboot" msgstr "" -#: camlibs/ptp2/config.c:4893 +#: camlibs/ptp2/config.c:5047 msgid "CHDK Script" msgstr "" -#: camlibs/ptp2/config.c:4901 +#: camlibs/ptp2/config.c:5055 msgid "PTP Version" msgstr "" -#: camlibs/ptp2/config.c:4902 camlibs/ptp2/ptp.c:3491 +#: camlibs/ptp2/config.c:5056 camlibs/ptp2/ptp.c:3551 msgid "DPOF Version" msgstr "" -#: camlibs/ptp2/config.c:4903 camlibs/ptp2/ptp.c:3765 +#: camlibs/ptp2/config.c:5057 camlibs/ptp2/ptp.c:3827 msgid "AC Power" msgstr "" -#: camlibs/ptp2/config.c:4904 +#: camlibs/ptp2/config.c:5058 msgid "External Flash" msgstr "" # camlibs/sierra/sierra.c:1830 -#: camlibs/ptp2/config.c:4905 camlibs/ptp2/config.c:4906 -#: camlibs/ptp2/ptp.c:3370 +#: camlibs/ptp2/config.c:5059 camlibs/ptp2/config.c:5060 +#: camlibs/ptp2/ptp.c:3430 msgid "Battery Level" msgstr "电池级别" -#: camlibs/ptp2/config.c:4907 camlibs/ptp2/config.c:4908 -#: camlibs/ptp2/ptp.c:3787 +#: camlibs/ptp2/config.c:5061 camlibs/ptp2/config.c:5062 +#: camlibs/ptp2/ptp.c:3849 msgid "Camera Orientation" msgstr "" -#: camlibs/ptp2/config.c:4909 camlibs/ptp2/ptp.c:3921 +#: camlibs/ptp2/config.c:5063 camlibs/ptp2/ptp.c:3983 msgid "Flash Open" msgstr "" -#: camlibs/ptp2/config.c:4910 camlibs/ptp2/ptp.c:3923 +#: camlibs/ptp2/config.c:5064 camlibs/ptp2/ptp.c:3985 msgid "Flash Charged" msgstr "" -#: camlibs/ptp2/config.c:4911 camlibs/ptp2/config.c:4912 +#: camlibs/ptp2/config.c:5065 camlibs/ptp2/config.c:5066 msgid "Lens Name" msgstr "" -#: camlibs/ptp2/config.c:4913 +#: camlibs/ptp2/config.c:5067 msgid "Serial Number" msgstr "" -#: camlibs/ptp2/config.c:4914 +#: camlibs/ptp2/config.c:5068 msgid "Shutter Counter" msgstr "" -#: camlibs/ptp2/config.c:4915 +#: camlibs/ptp2/config.c:5069 msgid "Available Shots" msgstr "" -#: camlibs/ptp2/config.c:4916 +#: camlibs/ptp2/config.c:5070 msgid "Focal Length Minimum" msgstr "" -#: camlibs/ptp2/config.c:4917 +#: camlibs/ptp2/config.c:5071 msgid "Focal Length Maximum" msgstr "" -#: camlibs/ptp2/config.c:4918 +#: camlibs/ptp2/config.c:5072 msgid "Maximum Aperture at Focal Length Minimum" msgstr "" -#: camlibs/ptp2/config.c:4919 +#: camlibs/ptp2/config.c:5073 msgid "Maximum Aperture at Focal Length Maximum" msgstr "" -#: camlibs/ptp2/config.c:4920 +#: camlibs/ptp2/config.c:5074 msgid "Low Light" msgstr "" -#: camlibs/ptp2/config.c:4921 camlibs/ptp2/config.c:4922 +#: camlibs/ptp2/config.c:5075 camlibs/ptp2/config.c:5076 msgid "Light Meter" msgstr "" -#: camlibs/ptp2/config.c:4923 camlibs/ptp2/ptp.c:3769 +#: camlibs/ptp2/config.c:5077 camlibs/ptp2/ptp.c:3831 msgid "AF Locked" msgstr "" -#: camlibs/ptp2/config.c:4924 camlibs/ptp2/ptp.c:3770 +#: camlibs/ptp2/config.c:5078 camlibs/ptp2/ptp.c:3832 msgid "AE Locked" msgstr "" -#: camlibs/ptp2/config.c:4925 camlibs/ptp2/ptp.c:3771 +#: camlibs/ptp2/config.c:5079 camlibs/ptp2/ptp.c:3833 msgid "FV Locked" msgstr "" -#: camlibs/ptp2/config.c:4930 camlibs/ptp2/config.c:4931 -#: camlibs/ptp2/config.c:4932 +#: camlibs/ptp2/config.c:5084 camlibs/ptp2/config.c:5085 +#: camlibs/ptp2/config.c:5086 msgid "Camera Date and Time" msgstr "" -#: camlibs/ptp2/config.c:4933 camlibs/ptp2/ptp.c:3412 camlibs/ptp2/ptp.c:3423 +#: camlibs/ptp2/config.c:5087 camlibs/ptp2/ptp.c:3472 camlibs/ptp2/ptp.c:3483 msgid "Beep Mode" msgstr "" -#: camlibs/ptp2/config.c:4934 +#: camlibs/ptp2/config.c:5088 msgid "Image Comment" msgstr "" -#: camlibs/ptp2/config.c:4935 +#: camlibs/ptp2/config.c:5089 msgid "Enable Image Comment" msgstr "" -#: camlibs/ptp2/config.c:4936 camlibs/ptp2/ptp.c:3639 +#: camlibs/ptp2/config.c:5090 camlibs/ptp2/ptp.c:3701 msgid "LCD Off Time" msgstr "" -#: camlibs/ptp2/config.c:4937 camlibs/ptp2/ptp.c:3781 +#: camlibs/ptp2/config.c:5091 camlibs/ptp2/ptp.c:3843 msgid "Recording Media" msgstr "" -#: camlibs/ptp2/config.c:4938 +#: camlibs/ptp2/config.c:5092 msgid "Quick Review Time" msgstr "" -#: camlibs/ptp2/config.c:4939 camlibs/ptp2/ptp.c:3879 +#: camlibs/ptp2/config.c:5093 camlibs/ptp2/ptp.c:3941 msgid "CSM Menu" msgstr "" -#: camlibs/ptp2/config.c:4940 camlibs/ptp2/ptp.c:3698 +#: camlibs/ptp2/config.c:5094 camlibs/ptp2/ptp.c:3760 msgid "Reverse Command Dial" msgstr "" -#: camlibs/ptp2/config.c:4941 camlibs/ptp2/config.c:4942 -#: camlibs/ptp2/ptp.c:3475 +#: camlibs/ptp2/config.c:5095 camlibs/ptp2/config.c:5096 +#: camlibs/ptp2/ptp.c:3535 msgid "Camera Output" msgstr "" -#: camlibs/ptp2/config.c:4943 +#: camlibs/ptp2/config.c:5097 +msgid "Movie Recording" +msgstr "" + +#: camlibs/ptp2/config.c:5098 msgid "EVF Mode" msgstr "" -#: camlibs/ptp2/config.c:4946 camlibs/ptp2/ptp.c:3401 +#: camlibs/ptp2/config.c:5101 camlibs/ptp2/ptp.c:3461 msgid "Artist" msgstr "" # camlibs/sierra/sierra.c:918 camlibs/sierra/sierra.c:926 # camlibs/sierra/sierra.c:1214 -#: camlibs/ptp2/config.c:4947 camlibs/ricoh/library.c:439 +#: camlibs/ptp2/config.c:5102 camlibs/ricoh/library.c:439 msgid "Copyright" msgstr "版权" -#: camlibs/ptp2/config.c:4950 +#: camlibs/ptp2/config.c:5103 +msgid "Clean Sensor" +msgstr "" + +#: camlibs/ptp2/config.c:5106 msgid "Fast Filesystem" msgstr "" -#: camlibs/ptp2/config.c:4951 camlibs/ptp2/config.c:4952 +#: camlibs/ptp2/config.c:5107 camlibs/ptp2/config.c:5108 msgid "Capture Target" msgstr "" -#: camlibs/ptp2/config.c:4962 +#: camlibs/ptp2/config.c:5118 msgid "Image Format SD" msgstr "" -#: camlibs/ptp2/config.c:4963 +#: camlibs/ptp2/config.c:5119 msgid "Image Format CF" msgstr "" -#: camlibs/ptp2/config.c:4965 +#: camlibs/ptp2/config.c:5121 msgid "Image Format Ext HD" msgstr "" +#: camlibs/ptp2/config.c:5127 camlibs/ptp2/ptp.c:3929 +msgid "ISO Auto" +msgstr "" + # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646 -#: camlibs/ptp2/config.c:4971 camlibs/ptp2/config.c:4972 -#: camlibs/ptp2/config.c:4973 +#: camlibs/ptp2/config.c:5128 camlibs/ptp2/config.c:5129 +#: camlibs/ptp2/config.c:5130 msgid "WhiteBalance" msgstr "白平衡" -#: camlibs/ptp2/config.c:4974 +#: camlibs/ptp2/config.c:5131 msgid "WhiteBalance Adjust A" msgstr "" -#: camlibs/ptp2/config.c:4975 +#: camlibs/ptp2/config.c:5132 msgid "WhiteBalance Adjust B" msgstr "" -#: camlibs/ptp2/config.c:4976 +#: camlibs/ptp2/config.c:5133 msgid "WhiteBalance X A" msgstr "" -#: camlibs/ptp2/config.c:4977 +#: camlibs/ptp2/config.c:5134 msgid "WhiteBalance X B" msgstr "" -#: camlibs/ptp2/config.c:4978 camlibs/ptp2/ptp.c:3485 +#: camlibs/ptp2/config.c:5135 camlibs/ptp2/ptp.c:3545 msgid "Photo Effect" msgstr "" -#: camlibs/ptp2/config.c:4979 camlibs/ptp2/ptp.c:3559 +#: camlibs/ptp2/config.c:5136 camlibs/ptp2/ptp.c:3619 msgid "Color Model" msgstr "" -#: camlibs/ptp2/config.c:4980 camlibs/ptp2/config.c:4981 -#: camlibs/ptp2/ptp.c:3571 +#: camlibs/ptp2/config.c:5137 camlibs/ptp2/config.c:5138 +#: camlibs/ptp2/ptp.c:3631 msgid "Color Space" msgstr "" -#: camlibs/ptp2/config.c:4982 camlibs/ptp2/ptp.c:3611 +#: camlibs/ptp2/config.c:5139 camlibs/ptp2/ptp.c:3671 msgid "Auto ISO" msgstr "" -#: camlibs/ptp2/config.c:4987 +#: camlibs/ptp2/config.c:5144 msgid "Long Exp Noise Reduction" msgstr "" -#: camlibs/ptp2/config.c:4988 +#: camlibs/ptp2/config.c:5145 msgid "Auto Focus Mode 2" msgstr "" -#: camlibs/ptp2/config.c:4990 camlibs/ptp2/config.c:4993 -#: camlibs/ptp2/ptp.c:3486 +#: camlibs/ptp2/config.c:5147 camlibs/ptp2/config.c:5150 +#: camlibs/ptp2/ptp.c:3546 msgid "Assist Light" msgstr "" -#: camlibs/ptp2/config.c:4991 +#: camlibs/ptp2/config.c:5148 msgid "Rotation Flag" msgstr "" -#: camlibs/ptp2/config.c:4999 camlibs/ptp2/ptp.c:3454 +#: camlibs/ptp2/config.c:5156 camlibs/ptp2/ptp.c:3514 msgid "Flash Compensation" msgstr "" -#: camlibs/ptp2/config.c:5000 camlibs/ptp2/ptp.c:3455 +#: camlibs/ptp2/config.c:5157 camlibs/ptp2/ptp.c:3515 msgid "AEB Exposure Compensation" msgstr "" -#: camlibs/ptp2/config.c:5003 +#: camlibs/ptp2/config.c:5160 msgid "Nikon Flash Mode" msgstr "" -#: camlibs/ptp2/config.c:5004 camlibs/ptp2/ptp.c:3863 +#: camlibs/ptp2/config.c:5161 camlibs/ptp2/ptp.c:3925 msgid "Flash Commander Mode" msgstr "" -#: camlibs/ptp2/config.c:5005 +#: camlibs/ptp2/config.c:5162 msgid "Flash Commander Power" msgstr "" -#: camlibs/ptp2/config.c:5006 camlibs/ptp2/ptp.c:3931 +#: camlibs/ptp2/config.c:5163 camlibs/ptp2/ptp.c:3993 msgid "Flash Command Channel" msgstr "" -#: camlibs/ptp2/config.c:5007 camlibs/ptp2/ptp.c:3933 +#: camlibs/ptp2/config.c:5164 camlibs/ptp2/ptp.c:3995 msgid "Flash Command Self Mode" msgstr "" -#: camlibs/ptp2/config.c:5008 camlibs/ptp2/ptp.c:3935 +#: camlibs/ptp2/config.c:5165 camlibs/ptp2/ptp.c:3997 msgid "Flash Command Self Compensation" msgstr "" -#: camlibs/ptp2/config.c:5009 camlibs/ptp2/ptp.c:3937 +#: camlibs/ptp2/config.c:5166 camlibs/ptp2/ptp.c:3999 msgid "Flash Command Self Value" msgstr "" -#: camlibs/ptp2/config.c:5010 camlibs/ptp2/ptp.c:3939 +#: camlibs/ptp2/config.c:5167 camlibs/ptp2/ptp.c:4001 msgid "Flash Command A Mode" msgstr "" -#: camlibs/ptp2/config.c:5011 camlibs/ptp2/ptp.c:3941 +#: camlibs/ptp2/config.c:5168 camlibs/ptp2/ptp.c:4003 msgid "Flash Command A Compensation" msgstr "" -#: camlibs/ptp2/config.c:5012 camlibs/ptp2/ptp.c:3943 +#: camlibs/ptp2/config.c:5169 camlibs/ptp2/ptp.c:4005 msgid "Flash Command A Value" msgstr "" -#: camlibs/ptp2/config.c:5013 camlibs/ptp2/ptp.c:3945 +#: camlibs/ptp2/config.c:5170 camlibs/ptp2/ptp.c:4007 msgid "Flash Command B Mode" msgstr "" -#: camlibs/ptp2/config.c:5014 camlibs/ptp2/ptp.c:3947 +#: camlibs/ptp2/config.c:5171 camlibs/ptp2/ptp.c:4009 msgid "Flash Command B Compensation" msgstr "" -#: camlibs/ptp2/config.c:5015 camlibs/ptp2/ptp.c:3949 +#: camlibs/ptp2/config.c:5172 camlibs/ptp2/ptp.c:4011 msgid "Flash Command B Value" msgstr "" -#: camlibs/ptp2/config.c:5016 camlibs/ptp2/ptp.c:3859 +#: camlibs/ptp2/config.c:5173 camlibs/ptp2/ptp.c:3921 msgid "AF Area Illumination" msgstr "" -#: camlibs/ptp2/config.c:5017 camlibs/ptp2/ptp.c:3849 +#: camlibs/ptp2/config.c:5174 camlibs/ptp2/ptp.c:3911 msgid "AF Beep Mode" msgstr "" -#: camlibs/ptp2/config.c:5018 camlibs/ptp2/ptp.c:3376 +#: camlibs/ptp2/config.c:5175 camlibs/ptp2/ptp.c:3436 msgid "F-Number" msgstr "" -#: camlibs/ptp2/config.c:5019 camlibs/ptp2/ptp.c:3777 +#: camlibs/ptp2/config.c:5176 camlibs/ptp2/ptp.c:3839 msgid "Flexible Program" msgstr "" -#: camlibs/ptp2/config.c:5021 camlibs/ptp2/ptp.c:3378 +#: camlibs/ptp2/config.c:5178 camlibs/ptp2/ptp.c:3438 msgid "Focus Distance" msgstr "聚焦距离" -#: camlibs/ptp2/config.c:5022 camlibs/ptp2/ptp.c:3377 camlibs/ptp2/ptp.c:3458 +#: camlibs/ptp2/config.c:5179 camlibs/ptp2/ptp.c:3437 camlibs/ptp2/ptp.c:3518 msgid "Focal Length" msgstr "" -#: camlibs/ptp2/config.c:5025 +#: camlibs/ptp2/config.c:5182 msgid "Focus Mode 2" msgstr "" -#: camlibs/ptp2/config.c:5027 camlibs/ptp2/ptp.c:3394 +#: camlibs/ptp2/config.c:5184 camlibs/ptp2/config.c:5185 +#: camlibs/ptp2/ptp.c:3454 msgid "Effect Mode" msgstr "" -#: camlibs/ptp2/config.c:5028 +#: camlibs/ptp2/config.c:5186 camlibs/ptp2/config.c:5293 msgid "Exposure Program" msgstr "" -#: camlibs/ptp2/config.c:5029 camlibs/ptp2/config.c:5030 -#: camlibs/ptp2/ptp.c:3390 +#: camlibs/ptp2/config.c:5187 +msgid "Scene Mode" +msgstr "" + +#: camlibs/ptp2/config.c:5188 camlibs/ptp2/config.c:5189 +#: camlibs/ptp2/ptp.c:3450 msgid "Still Capture Mode" msgstr "" -#: camlibs/ptp2/config.c:5031 +#: camlibs/ptp2/config.c:5190 msgid "Canon Shooting Mode" msgstr "" -#: camlibs/ptp2/config.c:5032 +#: camlibs/ptp2/config.c:5191 msgid "Canon Auto Exposure Mode" msgstr "" -#: camlibs/ptp2/config.c:5033 camlibs/ptp2/ptp.c:3436 +#: camlibs/ptp2/config.c:5192 camlibs/ptp2/ptp.c:3496 msgid "Drive Mode" msgstr "" -#: camlibs/ptp2/config.c:5034 +#: camlibs/ptp2/config.c:5193 msgid "Picture Style" msgstr "" -#: camlibs/ptp2/config.c:5035 camlibs/ptp2/ptp.c:3399 +#: camlibs/ptp2/config.c:5194 camlibs/ptp2/ptp.c:3459 msgid "Focus Metering Mode" msgstr "" # camlibs/konica/library.c:770 camlibs/konica/library.c:1002 -#: camlibs/ptp2/config.c:5036 camlibs/ptp2/ptp.c:3380 +#: camlibs/ptp2/config.c:5195 camlibs/ptp2/ptp.c:3440 msgid "Exposure Metering Mode" msgstr "曝光测定模式" -#: camlibs/ptp2/config.c:5039 +#: camlibs/ptp2/config.c:5198 msgid "AV Open" msgstr "" -#: camlibs/ptp2/config.c:5040 +#: camlibs/ptp2/config.c:5199 msgid "AV Max" msgstr "" # camlibs/konica/konica.c:62 -#: camlibs/ptp2/config.c:5042 camlibs/ptp2/ptp.c:3440 +#: camlibs/ptp2/config.c:5201 camlibs/ptp2/ptp.c:3500 msgid "Focusing Point" msgstr "焦点" -#: camlibs/ptp2/config.c:5044 +#: camlibs/ptp2/config.c:5203 msgid "Capture Delay" msgstr "" -#: camlibs/ptp2/config.c:5048 +#: camlibs/ptp2/config.c:5207 msgid "Shutter Speed 2" msgstr "" # camlibs/sierra/sierra.c:1001 camlibs/sierra/sierra.c:1268 -#: camlibs/ptp2/config.c:5051 camlibs/ptp2/config.c:5052 -#: camlibs/ptp2/ptp.c:3438 +#: camlibs/ptp2/config.c:5210 camlibs/ptp2/config.c:5211 +#: camlibs/ptp2/ptp.c:3498 msgid "Metering Mode" msgstr "测量模式" -#: camlibs/ptp2/config.c:5053 camlibs/ptp2/ptp.c:3439 +#: camlibs/ptp2/config.c:5212 camlibs/ptp2/ptp.c:3499 msgid "AF Distance" msgstr "" -#: camlibs/ptp2/config.c:5054 camlibs/ptp2/ptp.c:3601 +#: camlibs/ptp2/config.c:5213 camlibs/ptp2/ptp.c:3661 msgid "Focus Area Wrap" msgstr "" -#: camlibs/ptp2/config.c:5055 +#: camlibs/ptp2/config.c:5214 msgid "Exposure Delay Mode" msgstr "" -#: camlibs/ptp2/config.c:5056 camlibs/ptp2/ptp.c:3631 +#: camlibs/ptp2/config.c:5215 camlibs/ptp2/ptp.c:3691 msgid "Exposure Lock" msgstr "" -#: camlibs/ptp2/config.c:5057 +#: camlibs/ptp2/config.c:5216 msgid "AE-L/AF-L Mode" msgstr "" -#: camlibs/ptp2/config.c:5058 camlibs/ptp2/ptp.c:3653 +#: camlibs/ptp2/config.c:5217 camlibs/ptp2/config.c:5218 +msgid "Live View AF Mode" +msgstr "" + +#: camlibs/ptp2/config.c:5219 camlibs/ptp2/ptp.c:3695 +msgid "Live View AF Focus" +msgstr "" + +#: camlibs/ptp2/config.c:5220 camlibs/ptp2/ptp.c:3715 msgid "File Number Sequencing" msgstr "" -#: camlibs/ptp2/config.c:5059 camlibs/ptp2/ptp.c:3865 +#: camlibs/ptp2/config.c:5221 camlibs/ptp2/ptp.c:3927 msgid "Flash Sign" msgstr "" -#: camlibs/ptp2/config.c:5060 +#: camlibs/ptp2/config.c:5222 msgid "Modelling Flash" msgstr "" -#: camlibs/ptp2/config.c:5061 +#: camlibs/ptp2/config.c:5223 msgid "Viewfinder Grid" msgstr "" -#: camlibs/ptp2/config.c:5062 camlibs/ptp2/ptp.c:3857 +#: camlibs/ptp2/config.c:5224 camlibs/ptp2/ptp.c:3919 msgid "Image Review" msgstr "" -#: camlibs/ptp2/config.c:5063 +#: camlibs/ptp2/config.c:5225 msgid "Image Rotation Flag" msgstr "" -#: camlibs/ptp2/config.c:5064 +#: camlibs/ptp2/config.c:5226 msgid "Release without CF card" msgstr "" -#: camlibs/ptp2/config.c:5065 camlibs/ptp2/ptp.c:3873 +#: camlibs/ptp2/config.c:5227 camlibs/ptp2/ptp.c:3935 msgid "Flash Mode Manual Power" msgstr "" -#: camlibs/ptp2/config.c:5066 +#: camlibs/ptp2/config.c:5228 msgid "Auto Focus Area" msgstr "" -#: camlibs/ptp2/config.c:5067 camlibs/ptp2/ptp.c:3815 +#: camlibs/ptp2/config.c:5229 camlibs/ptp2/ptp.c:3877 msgid "Flash Exposure Compensation" msgstr "" -#: camlibs/ptp2/config.c:5068 camlibs/ptp2/config.c:5069 +#: camlibs/ptp2/config.c:5230 camlibs/ptp2/config.c:5231 msgid "Bracketing" msgstr "" -#: camlibs/ptp2/config.c:5070 +#: camlibs/ptp2/config.c:5232 msgid "Bracket Mode" msgstr "" -#: camlibs/ptp2/config.c:5071 +#: camlibs/ptp2/config.c:5233 msgid "EV Step" msgstr "" -#: camlibs/ptp2/config.c:5072 camlibs/ptp2/ptp.c:3677 +#: camlibs/ptp2/config.c:5234 camlibs/ptp2/ptp.c:3739 msgid "Bracket Set" msgstr "" -#: camlibs/ptp2/config.c:5073 camlibs/ptp2/ptp.c:3681 +#: camlibs/ptp2/config.c:5235 camlibs/ptp2/ptp.c:3743 msgid "Bracket Order" msgstr "" -#: camlibs/ptp2/config.c:5074 camlibs/ptp2/ptp.c:3395 +#: camlibs/ptp2/config.c:5236 camlibs/ptp2/ptp.c:3455 msgid "Burst Number" msgstr "" -#: camlibs/ptp2/config.c:5075 camlibs/ptp2/ptp.c:3396 +#: camlibs/ptp2/config.c:5237 camlibs/ptp2/ptp.c:3456 msgid "Burst Interval" msgstr "" -#: camlibs/ptp2/config.c:5078 camlibs/ptp2/config.c:5087 -#: camlibs/ptp2/ptp.c:3517 +#: camlibs/ptp2/config.c:5240 camlibs/ptp2/config.c:5249 +#: camlibs/ptp2/ptp.c:3577 msgid "Auto White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5079 camlibs/ptp2/config.c:5088 -#: camlibs/ptp2/ptp.c:3519 +#: camlibs/ptp2/config.c:5241 camlibs/ptp2/config.c:5250 +#: camlibs/ptp2/ptp.c:3579 msgid "Tungsten White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5080 camlibs/ptp2/config.c:5089 -#: camlibs/ptp2/ptp.c:3521 +#: camlibs/ptp2/config.c:5242 camlibs/ptp2/config.c:5251 +#: camlibs/ptp2/ptp.c:3581 msgid "Fluorescent White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5081 camlibs/ptp2/config.c:5090 -#: camlibs/ptp2/ptp.c:3523 +#: camlibs/ptp2/config.c:5243 camlibs/ptp2/config.c:5252 +#: camlibs/ptp2/ptp.c:3583 msgid "Daylight White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5082 camlibs/ptp2/config.c:5091 -#: camlibs/ptp2/ptp.c:3525 +#: camlibs/ptp2/config.c:5244 camlibs/ptp2/config.c:5253 +#: camlibs/ptp2/ptp.c:3585 msgid "Flash White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5083 camlibs/ptp2/config.c:5092 -#: camlibs/ptp2/ptp.c:3527 +#: camlibs/ptp2/config.c:5245 camlibs/ptp2/config.c:5254 +#: camlibs/ptp2/ptp.c:3587 msgid "Cloudy White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5084 camlibs/ptp2/config.c:5093 -#: camlibs/ptp2/ptp.c:3529 +#: camlibs/ptp2/config.c:5246 camlibs/ptp2/config.c:5255 +#: camlibs/ptp2/ptp.c:3589 msgid "Shady White Balance Bias" msgstr "" -#: camlibs/ptp2/config.c:5095 +#: camlibs/ptp2/config.c:5257 msgid "White Balance Bias Preset Nr" msgstr "" -#: camlibs/ptp2/config.c:5096 +#: camlibs/ptp2/config.c:5258 msgid "White Balance Bias Preset 0" msgstr "" -#: camlibs/ptp2/config.c:5097 +#: camlibs/ptp2/config.c:5259 msgid "White Balance Bias Preset 1" msgstr "" -#: camlibs/ptp2/config.c:5098 +#: camlibs/ptp2/config.c:5260 msgid "White Balance Bias Preset 2" msgstr "" -#: camlibs/ptp2/config.c:5099 +#: camlibs/ptp2/config.c:5261 msgid "White Balance Bias Preset 3" msgstr "" -#: camlibs/ptp2/config.c:5100 +#: camlibs/ptp2/config.c:5262 msgid "White Balance Bias Preset 4" msgstr "" -#: camlibs/ptp2/config.c:5101 +#: camlibs/ptp2/config.c:5263 msgid "Selftimer Delay" msgstr "" -#: camlibs/ptp2/config.c:5102 +#: camlibs/ptp2/config.c:5264 msgid "Center Weight Area" msgstr "" -#: camlibs/ptp2/config.c:5103 camlibs/ptp2/config.c:5144 -#: camlibs/ptp2/config.c:5174 camlibs/ptp2/ptp.c:3671 +#: camlibs/ptp2/config.c:5265 camlibs/ptp2/config.c:5314 +#: camlibs/ptp2/config.c:5345 camlibs/ptp2/ptp.c:3733 msgid "Flash Shutter Speed" msgstr "" -#: camlibs/ptp2/config.c:5104 camlibs/ptp2/ptp.c:3869 +#: camlibs/ptp2/config.c:5266 camlibs/ptp2/ptp.c:3931 msgid "Remote Timeout" msgstr "" -#: camlibs/ptp2/config.c:5105 camlibs/ptp2/ptp.c:3817 +#: camlibs/ptp2/config.c:5267 camlibs/ptp2/ptp.c:3879 msgid "Optimize Image" msgstr "" -#: camlibs/ptp2/config.c:5106 camlibs/ptp2/ptp.c:3555 +#: camlibs/ptp2/config.c:5268 camlibs/ptp2/ptp.c:3615 msgid "Sharpening" msgstr "" -#: camlibs/ptp2/config.c:5107 camlibs/ptp2/ptp.c:3557 +#: camlibs/ptp2/config.c:5269 camlibs/ptp2/ptp.c:3617 msgid "Tone Compensation" msgstr "" -#: camlibs/ptp2/config.c:5108 camlibs/ptp2/ptp.c:3819 +#: camlibs/ptp2/config.c:5270 camlibs/ptp2/ptp.c:3881 msgid "Saturation" msgstr "" -#: camlibs/ptp2/config.c:5109 camlibs/ptp2/ptp.c:3561 +#: camlibs/ptp2/config.c:5271 camlibs/ptp2/ptp.c:3621 msgid "Hue Adjustment" msgstr "" -#: camlibs/ptp2/config.c:5110 +#: camlibs/ptp2/config.c:5272 msgid "Auto Exposure Bracketing" msgstr "" -#: camlibs/ptp2/config.c:5111 -msgid "Movie Quality" +#: camlibs/ptp2/config.c:5273 +msgid "Movie Sound" msgstr "" -#: camlibs/ptp2/config.c:5112 -msgid "Movie Sound" +#: camlibs/ptp2/config.c:5274 +msgid "Microphone" msgstr "" -#: camlibs/ptp2/config.c:5113 +#: camlibs/ptp2/config.c:5275 msgid "Reverse Indicators" msgstr "" -#: camlibs/ptp2/config.c:5123 +#: camlibs/ptp2/config.c:5276 +msgid "Auto Distortion Control" +msgstr "" + +#: camlibs/ptp2/config.c:5277 +msgid "Video Mode" +msgstr "" + +#: camlibs/ptp2/config.c:5287 msgid "Meter Off Time" msgstr "" -#: camlibs/ptp2/config.c:5128 camlibs/ptp2/config.c:5139 -#: camlibs/ptp2/config.c:5164 -msgid "Auto ISO PADV Time" +#: camlibs/ptp2/config.c:5292 camlibs/ptp2/config.c:5340 +msgid "Movie Quality" +msgstr "" + +#: camlibs/ptp2/config.c:5294 camlibs/ptp2/config.c:5298 +#: camlibs/ptp2/config.c:5309 camlibs/ptp2/config.c:5334 +msgid "Minimum Shutter Speed" msgstr "" -#: camlibs/ptp2/config.c:5129 camlibs/ptp2/config.c:5140 -#: camlibs/ptp2/config.c:5165 +#: camlibs/ptp2/config.c:5299 camlibs/ptp2/config.c:5310 +#: camlibs/ptp2/config.c:5335 msgid "ISO Auto Hi Limit" msgstr "" -#: camlibs/ptp2/config.c:5130 camlibs/ptp2/config.c:5157 -#: camlibs/ptp2/config.c:5166 +#: camlibs/ptp2/config.c:5300 camlibs/ptp2/config.c:5327 +#: camlibs/ptp2/config.c:5336 msgid "Active D-Lighting" msgstr "" -#: camlibs/ptp2/config.c:5131 camlibs/ptp2/config.c:5156 -#: camlibs/ptp2/config.c:5167 +#: camlibs/ptp2/config.c:5301 camlibs/ptp2/config.c:5326 +#: camlibs/ptp2/config.c:5337 msgid "High ISO Noise Reduction" msgstr "" -#: camlibs/ptp2/config.c:5133 camlibs/ptp2/config.c:5141 -#: camlibs/ptp2/config.c:5168 +#: camlibs/ptp2/config.c:5303 camlibs/ptp2/config.c:5311 +#: camlibs/ptp2/config.c:5338 msgid "Continuous Shooting Speed Slow" msgstr "" -#: camlibs/ptp2/config.c:5142 camlibs/ptp2/config.c:5172 +#: camlibs/ptp2/config.c:5312 camlibs/ptp2/config.c:5343 msgid "Continuous Shooting Speed High" msgstr "" -#: camlibs/ptp2/config.c:5143 camlibs/ptp2/config.c:5173 -#: camlibs/ptp2/ptp.c:3669 +#: camlibs/ptp2/config.c:5313 camlibs/ptp2/config.c:5344 +#: camlibs/ptp2/ptp.c:3731 msgid "Flash Sync. Speed" msgstr "" -#: camlibs/ptp2/config.c:5146 camlibs/ptp2/ptp.c:3569 +#: camlibs/ptp2/config.c:5316 camlibs/ptp2/ptp.c:3629 msgid "JPEG Compression Policy" msgstr "" -#: camlibs/ptp2/config.c:5147 +#: camlibs/ptp2/config.c:5317 msgid "AF-C Mode Priority" msgstr "" -#: camlibs/ptp2/config.c:5148 +#: camlibs/ptp2/config.c:5318 msgid "AF-S Mode Priority" msgstr "" -#: camlibs/ptp2/config.c:5149 +#: camlibs/ptp2/config.c:5319 msgid "AF Activation" msgstr "" -#: camlibs/ptp2/config.c:5150 camlibs/ptp2/ptp.c:3887 +#: camlibs/ptp2/config.c:5320 camlibs/ptp2/ptp.c:3949 msgid "Dynamic AF Area" msgstr "" -#: camlibs/ptp2/config.c:5151 camlibs/ptp2/ptp.c:3605 +#: camlibs/ptp2/config.c:5321 camlibs/ptp2/ptp.c:3665 msgid "AF Lock On" msgstr "" -#: camlibs/ptp2/config.c:5152 camlibs/ptp2/ptp.c:3712 +#: camlibs/ptp2/config.c:5322 camlibs/ptp2/ptp.c:3774 msgid "AF Area Point" msgstr "" -#: camlibs/ptp2/config.c:5153 +#: camlibs/ptp2/config.c:5323 msgid "AF On Button" msgstr "" -#: camlibs/ptp2/config.c:5169 +#: camlibs/ptp2/config.c:5339 msgid "Maximum continuous release" msgstr "" # camlibs/sierra/sierra.c:1048 camlibs/sierra/sierra.c:1510 -#: camlibs/ptp2/config.c:5187 +#: camlibs/ptp2/config.c:5358 msgid "Image Settings" msgstr "图像设置" # camlibs/sierra/sierra.c:777 camlibs/sierra/sierra.c:1443 -#: camlibs/ptp2/config.c:5190 camlibs/ptp2/config.c:5191 -#: camlibs/ptp2/config.c:5192 camlibs/ptp2/config.c:5193 +#: camlibs/ptp2/config.c:5361 camlibs/ptp2/config.c:5362 +#: camlibs/ptp2/config.c:5363 camlibs/ptp2/config.c:5364 +#: camlibs/ptp2/config.c:5365 msgid "Capture Settings" msgstr "捕捉设置" -#: camlibs/ptp2/config.c:5195 +#: camlibs/ptp2/config.c:5367 msgid "WIFI profiles" msgstr "" -#: camlibs/ptp2/config.c:5321 camlibs/ptp2/config.c:5577 +#: camlibs/ptp2/config.c:5493 camlibs/ptp2/config.c:5749 msgid "Other PTP Device Properties" msgstr "" -#: camlibs/ptp2/config.c:5337 camlibs/ptp2/config.c:5591 +#: camlibs/ptp2/config.c:5509 camlibs/ptp2/config.c:5763 #, c-format msgid "PTP Property 0x%04x" msgstr "" -#: camlibs/ptp2/config.c:5535 camlibs/ptp2/config.c:5608 +#: camlibs/ptp2/config.c:5707 camlibs/ptp2/config.c:5780 #, c-format msgid "Sorry, the property '%s' / 0x%04x is currently ready-only." msgstr "" -#: camlibs/ptp2/config.c:5541 camlibs/ptp2/config.c:5562 -#: camlibs/ptp2/config.c:5645 +#: camlibs/ptp2/config.c:5713 camlibs/ptp2/config.c:5734 +#: camlibs/ptp2/config.c:5817 #, c-format msgid "The property '%s' / 0x%04x was not set, PTP errorcode 0x%04x." msgstr "" -#: camlibs/ptp2/config.c:5566 +#: camlibs/ptp2/config.c:5738 #, c-format msgid "Parsing the value of widget '%s' / 0x%04x failed with %d!" msgstr "" @@ -7163,7 +7345,7 @@ msgid "PTP Timeout" msgstr "" -#: camlibs/ptp2/library.c:1550 +#: camlibs/ptp2/library.c:1603 #, c-format msgid "" "PTP2 driver\n" @@ -7175,374 +7357,380 @@ "Enjoy!" msgstr "" -#: camlibs/ptp2/library.c:1647 +#: camlibs/ptp2/library.c:1706 #, c-format msgid "Canon get viewfinder image failed: %d" msgstr "" -#: camlibs/ptp2/library.c:1727 +#: camlibs/ptp2/library.c:1788 msgid "Sorry, your Canon camera does not support Canon Viewfinder mode" msgstr "" -#: camlibs/ptp2/library.c:1734 +#: camlibs/ptp2/library.c:1795 msgid "Sorry, your Nikon camera does not support LiveView mode" msgstr "" -#: camlibs/ptp2/library.c:1749 +#: camlibs/ptp2/library.c:1810 #, c-format msgid "Nikon enable liveview failed: %x" msgstr "" -#: camlibs/ptp2/library.c:1769 camlibs/ptp2/library.c:1785 +#: camlibs/ptp2/library.c:1830 camlibs/ptp2/library.c:1846 msgid "" "Sorry, your Nikon camera does not seem to return a JPEG image in LiveView " "mode" msgstr "" -#: camlibs/ptp2/library.c:1801 +#: camlibs/ptp2/library.c:1862 camlibs/ptp2/library.c:2023 #, c-format msgid "Nikon disable liveview failed: %x" msgstr "" -#: camlibs/ptp2/library.c:1931 +#: camlibs/ptp2/library.c:1992 msgid "Sorry, your camera does not support Nikon capture" msgstr "" -#: camlibs/ptp2/library.c:2054 +#: camlibs/ptp2/library.c:2030 +#, c-format +msgid "Nikon disable liveview ended: %x" +msgstr "" + +#: camlibs/ptp2/library.c:2134 msgid "Sorry, your Canon camera does not support Canon EOS Capture" msgstr "" -#: camlibs/ptp2/library.c:2068 camlibs/ptp2/library.c:2072 +#: camlibs/ptp2/library.c:2148 camlibs/ptp2/library.c:2152 #, c-format msgid "Canon EOS Capture failed: %x" msgstr "" -#: camlibs/ptp2/library.c:2077 +#: camlibs/ptp2/library.c:2157 msgid "Canon EOS Capture failed to release: Perhaps no focus?" msgstr "" -#: camlibs/ptp2/library.c:2081 +#: camlibs/ptp2/library.c:2161 msgid "Canon EOS Capture failed to release: Perhaps no more memory on card?" msgstr "" -#: camlibs/ptp2/library.c:2085 +#: camlibs/ptp2/library.c:2165 #, c-format msgid "Canon EOS Capture failed to release: Unknown error %d, please report." msgstr "" -#: camlibs/ptp2/library.c:2095 camlibs/ptp2/library.c:2645 +#: camlibs/ptp2/library.c:2175 camlibs/ptp2/library.c:2845 #, c-format msgid "Canon EOS Get Changes failed: 0x%04x" msgstr "" -#: camlibs/ptp2/library.c:2221 +#: camlibs/ptp2/library.c:2301 msgid "Sorry, your Canon camera does not support Canon Capture initiation" msgstr "" -#: camlibs/ptp2/library.c:2232 +#: camlibs/ptp2/library.c:2312 msgid "Sorry, initializing your camera did not work. Please report this." msgstr "" -#: camlibs/ptp2/library.c:2285 +#: camlibs/ptp2/library.c:2363 camlibs/ptp2/library.c:2374 +#: camlibs/ptp2/library.c:2389 #, c-format -msgid "Canon Capture failed: %x" +msgid "Canon Capture failed: 0x%04x" msgstr "" -#: camlibs/ptp2/library.c:2461 +#: camlibs/ptp2/library.c:2555 msgid "Sorry, your camera does not support generic capture" msgstr "" -#: camlibs/ptp2/library.c:2541 +#: camlibs/ptp2/library.c:2635 #, c-format msgid "No event received, error %x." msgstr "" -#: camlibs/ptp2/library.c:3089 +#: camlibs/ptp2/library.c:3183 msgid "read only" msgstr "" -#: camlibs/ptp2/library.c:3090 +#: camlibs/ptp2/library.c:3184 msgid "readwrite" msgstr "" -#: camlibs/ptp2/library.c:3225 camlibs/sierra/sierra.c:1951 +#: camlibs/ptp2/library.c:3319 camlibs/sierra/sierra.c:1951 #, c-format msgid "Manufacturer: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3227 +#: camlibs/ptp2/library.c:3321 #, c-format msgid "Model: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3229 +#: camlibs/ptp2/library.c:3323 #, c-format msgid " Version: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3232 +#: camlibs/ptp2/library.c:3326 #, c-format msgid " Serial Number: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3236 +#: camlibs/ptp2/library.c:3330 #, c-format msgid "Vendor Extension ID: 0x%x (%d.%d)\n" msgstr "" -#: camlibs/ptp2/library.c:3243 +#: camlibs/ptp2/library.c:3337 #, c-format msgid "Vendor Extension Description: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3248 +#: camlibs/ptp2/library.c:3342 #, c-format msgid "PTP Standard Version: %d.%d\n" msgstr "" -#: camlibs/ptp2/library.c:3255 +#: camlibs/ptp2/library.c:3349 #, c-format msgid "Functional Mode: 0x%04x\n" msgstr "" -#: camlibs/ptp2/library.c:3260 +#: camlibs/ptp2/library.c:3354 #, c-format msgid "" "\n" "Capture Formats: " msgstr "" -#: camlibs/ptp2/library.c:3274 +#: camlibs/ptp2/library.c:3368 #, c-format msgid "Display Formats: " msgstr "" -#: camlibs/ptp2/library.c:3290 +#: camlibs/ptp2/library.c:3384 #, c-format msgid "Supported MTP Object Properties:\n" msgstr "" -#: camlibs/ptp2/library.c:3306 +#: camlibs/ptp2/library.c:3400 #, c-format msgid " PTP error %04x on query" msgstr "" -#: camlibs/ptp2/library.c:3323 +#: camlibs/ptp2/library.c:3417 #, c-format msgid "" "\n" "Device Capabilities:\n" msgstr "" -#: camlibs/ptp2/library.c:3327 +#: camlibs/ptp2/library.c:3421 #, c-format msgid "\tFile Download, " msgstr "" -#: camlibs/ptp2/library.c:3330 +#: camlibs/ptp2/library.c:3424 #, c-format msgid "File Deletion, " msgstr "" -#: camlibs/ptp2/library.c:3332 +#: camlibs/ptp2/library.c:3426 #, c-format msgid "No File Deletion, " msgstr "" -#: camlibs/ptp2/library.c:3336 +#: camlibs/ptp2/library.c:3430 #, c-format msgid "File Upload\n" msgstr "" -#: camlibs/ptp2/library.c:3338 +#: camlibs/ptp2/library.c:3432 #, c-format msgid "No File Upload\n" msgstr "" -#: camlibs/ptp2/library.c:3343 +#: camlibs/ptp2/library.c:3437 #, c-format msgid "\tGeneric Image Capture, " msgstr "" -#: camlibs/ptp2/library.c:3345 +#: camlibs/ptp2/library.c:3439 #, c-format msgid "\tNo Image Capture, " msgstr "" -#: camlibs/ptp2/library.c:3348 +#: camlibs/ptp2/library.c:3442 #, c-format msgid "Open Capture, " msgstr "" -#: camlibs/ptp2/library.c:3350 +#: camlibs/ptp2/library.c:3444 #, c-format msgid "No Open Capture, " msgstr "" -#: camlibs/ptp2/library.c:3356 +#: camlibs/ptp2/library.c:3450 #, c-format msgid "Canon Capture\n" msgstr "" -#: camlibs/ptp2/library.c:3360 +#: camlibs/ptp2/library.c:3454 #, c-format msgid "Canon EOS Capture\n" msgstr "" -#: camlibs/ptp2/library.c:3364 +#: camlibs/ptp2/library.c:3458 #, c-format msgid "Nikon Capture\n" msgstr "" -#: camlibs/ptp2/library.c:3366 +#: camlibs/ptp2/library.c:3460 #, c-format msgid "No vendor specific capture\n" msgstr "" -#: camlibs/ptp2/library.c:3375 +#: camlibs/ptp2/library.c:3469 #, c-format msgid "\tNikon Wifi support\n" msgstr "" -#: camlibs/ptp2/library.c:3381 +#: camlibs/ptp2/library.c:3475 #, c-format msgid "\tCanon Wifi support\n" msgstr "" -#: camlibs/ptp2/library.c:3392 +#: camlibs/ptp2/library.c:3486 #, c-format msgid "" "\n" "Storage Devices Summary:\n" msgstr "" -#: camlibs/ptp2/library.c:3408 +#: camlibs/ptp2/library.c:3502 #, c-format msgid "\tStorageDescription: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3412 +#: camlibs/ptp2/library.c:3506 #, c-format msgid "\tVolumeLabel: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3419 +#: camlibs/ptp2/library.c:3513 msgid "Builtin ROM" msgstr "" -#: camlibs/ptp2/library.c:3420 +#: camlibs/ptp2/library.c:3514 msgid "Removable ROM" msgstr "" -#: camlibs/ptp2/library.c:3421 +#: camlibs/ptp2/library.c:3515 msgid "Builtin RAM" msgstr "" -#: camlibs/ptp2/library.c:3422 +#: camlibs/ptp2/library.c:3516 msgid "Removable RAM (memory card)" msgstr "" -#: camlibs/ptp2/library.c:3424 camlibs/ptp2/library.c:3437 -#: camlibs/ptp2/library.c:3449 +#: camlibs/ptp2/library.c:3518 camlibs/ptp2/library.c:3531 +#: camlibs/ptp2/library.c:3543 #, c-format msgid "Unknown: 0x%04x\n" msgstr "" -#: camlibs/ptp2/library.c:3428 +#: camlibs/ptp2/library.c:3522 #, c-format msgid "\tStorage Type: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3433 +#: camlibs/ptp2/library.c:3527 msgid "Generic Flat" msgstr "" -#: camlibs/ptp2/library.c:3434 +#: camlibs/ptp2/library.c:3528 msgid "Generic Hierarchical" msgstr "" -#: camlibs/ptp2/library.c:3435 +#: camlibs/ptp2/library.c:3529 msgid "Digital Camera Layout (DCIM)" msgstr "" -#: camlibs/ptp2/library.c:3441 +#: camlibs/ptp2/library.c:3535 #, c-format msgid "\tFilesystemtype: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3445 +#: camlibs/ptp2/library.c:3539 msgid "Read-Write" msgstr "" -#: camlibs/ptp2/library.c:3446 +#: camlibs/ptp2/library.c:3540 msgid "Read-Only" msgstr "" -#: camlibs/ptp2/library.c:3447 +#: camlibs/ptp2/library.c:3541 msgid "Read Only with Object deletion" msgstr "" -#: camlibs/ptp2/library.c:3453 +#: camlibs/ptp2/library.c:3547 #, c-format msgid "\tAccess Capability: %s\n" msgstr "" -#: camlibs/ptp2/library.c:3455 +#: camlibs/ptp2/library.c:3549 #, c-format msgid "\tMaximum Capability: %llu (%lu MB)\n" msgstr "" -#: camlibs/ptp2/library.c:3460 +#: camlibs/ptp2/library.c:3554 #, c-format msgid "\tFree Space (Bytes): %llu (%lu MB)\n" msgstr "" -#: camlibs/ptp2/library.c:3465 +#: camlibs/ptp2/library.c:3559 #, c-format msgid "\tFree Space (Images): %d\n" msgstr "" -#: camlibs/ptp2/library.c:3473 +#: camlibs/ptp2/library.c:3567 #, c-format msgid "" "\n" "Device Property Summary:\n" msgstr "" -#: camlibs/ptp2/library.c:3499 +#: camlibs/ptp2/library.c:3593 #, c-format msgid " not read out.\n" msgstr "" -#: camlibs/ptp2/library.c:3572 +#: camlibs/ptp2/library.c:3666 #, c-format msgid " error %x on query." msgstr "" -#: camlibs/ptp2/library.c:4515 camlibs/ptp2/library.c:4519 +#: camlibs/ptp2/library.c:4611 camlibs/ptp2/library.c:4615 #, c-format msgid "File '%s/%s' does not exist." msgstr "" -#: camlibs/ptp2/library.c:4525 +#: camlibs/ptp2/library.c:4621 msgid "Metadata only supported for MTP devices." msgstr "" -#: camlibs/ptp2/library.c:4714 +#: camlibs/ptp2/library.c:4810 msgid "Device does not support setting object protection." msgstr "" -#: camlibs/ptp2/library.c:4719 +#: camlibs/ptp2/library.c:4815 #, c-format msgid "Device failed to set object protection to %d, error 0x%04x." msgstr "" # camlibs/canon/library.c:176 -#: camlibs/ptp2/library.c:5366 +#: camlibs/ptp2/library.c:5543 msgid "Initializing Camera" msgstr "初始化相机" -#: camlibs/ptp2/library.c:5530 +#: camlibs/ptp2/library.c:5707 #, c-format msgid "" "Currently, PTP is only implemented for USB and PTP/IP cameras currently, " @@ -7550,208 +7738,208 @@ msgstr "" # camlibs/ptp/library.c:90 -#: camlibs/ptp2/ptp.c:3308 +#: camlibs/ptp2/ptp.c:3368 msgid "PTP: Undefined Error" msgstr "PTP: 未定义的错误" -#: camlibs/ptp2/ptp.c:3309 +#: camlibs/ptp2/ptp.c:3369 msgid "PTP: OK!" msgstr "" -#: camlibs/ptp2/ptp.c:3310 +#: camlibs/ptp2/ptp.c:3370 msgid "PTP: General Error" msgstr "" -#: camlibs/ptp2/ptp.c:3311 +#: camlibs/ptp2/ptp.c:3371 msgid "PTP: Session Not Open" msgstr "" -#: camlibs/ptp2/ptp.c:3312 +#: camlibs/ptp2/ptp.c:3372 msgid "PTP: Invalid Transaction ID" msgstr "" -#: camlibs/ptp2/ptp.c:3313 +#: camlibs/ptp2/ptp.c:3373 msgid "PTP: Operation Not Supported" msgstr "" # camlibs/ptp/library.c:96 -#: camlibs/ptp2/ptp.c:3314 +#: camlibs/ptp2/ptp.c:3374 msgid "PTP: Parameter Not Supported" msgstr "PTP: 不支持的参数" # camlibs/ptp/library.c:97 -#: camlibs/ptp2/ptp.c:3315 +#: camlibs/ptp2/ptp.c:3375 msgid "PTP: Incomplete Transfer" msgstr "PTP: 未完成的传输" # camlibs/ptp/library.c:98 -#: camlibs/ptp2/ptp.c:3316 +#: camlibs/ptp2/ptp.c:3376 msgid "PTP: Invalid Storage ID" msgstr "PTP: 非法的存储 ID" # camlibs/ptp/library.c:99 -#: camlibs/ptp2/ptp.c:3317 +#: camlibs/ptp2/ptp.c:3377 msgid "PTP: Invalid Object Handle" msgstr "PTP: 非法的对象句柄" # camlibs/ptp/library.c:100 -#: camlibs/ptp2/ptp.c:3318 +#: camlibs/ptp2/ptp.c:3378 msgid "PTP: Device Prop Not Supported" msgstr "PTP: 不支持的设备属性" # camlibs/ptp/library.c:101 -#: camlibs/ptp2/ptp.c:3319 +#: camlibs/ptp2/ptp.c:3379 msgid "PTP: Invalid Object Format Code" msgstr "PTP: 非法的对象格式代码" # camlibs/ptp/library.c:102 -#: camlibs/ptp2/ptp.c:3320 +#: camlibs/ptp2/ptp.c:3380 msgid "PTP: Store Full" msgstr "PTP: 存储已满" # camlibs/ptp/library.c:103 -#: camlibs/ptp2/ptp.c:3321 +#: camlibs/ptp2/ptp.c:3381 msgid "PTP: Object Write Protected" msgstr "PTP: 对象写入保护" # camlibs/ptp/library.c:104 -#: camlibs/ptp2/ptp.c:3322 +#: camlibs/ptp2/ptp.c:3382 msgid "PTP: Store Read Only" msgstr "PTP: 只读的存储" # camlibs/ptp/library.c:105 -#: camlibs/ptp2/ptp.c:3323 +#: camlibs/ptp2/ptp.c:3383 msgid "PTP: Access Denied" msgstr "PTP: 访问遭拒绝" # camlibs/ptp/library.c:106 -#: camlibs/ptp2/ptp.c:3324 +#: camlibs/ptp2/ptp.c:3384 msgid "PTP: No Thumbnail Present" msgstr "PTP: 缩略图不存在" # camlibs/ptp/library.c:107 -#: camlibs/ptp2/ptp.c:3325 +#: camlibs/ptp2/ptp.c:3385 msgid "PTP: Self Test Failed" msgstr "PTP: 自检失败" # camlibs/ptp/library.c:108 -#: camlibs/ptp2/ptp.c:3326 +#: camlibs/ptp2/ptp.c:3386 msgid "PTP: Partial Deletion" msgstr "PTP: 部分删除" # camlibs/ptp/library.c:109 -#: camlibs/ptp2/ptp.c:3327 +#: camlibs/ptp2/ptp.c:3387 msgid "PTP: Store Not Available" msgstr "PTP: 存储不可用" # camlibs/ptp/library.c:111 -#: camlibs/ptp2/ptp.c:3329 +#: camlibs/ptp2/ptp.c:3389 msgid "PTP: Specification By Format Unsupported" msgstr "PTP: 不支持的格式规范" # camlibs/ptp/library.c:112 -#: camlibs/ptp2/ptp.c:3330 +#: camlibs/ptp2/ptp.c:3390 msgid "PTP: No Valid Object Info" msgstr "PTP: 没有合法的对象信息" # camlibs/ptp/library.c:113 -#: camlibs/ptp2/ptp.c:3331 +#: camlibs/ptp2/ptp.c:3391 msgid "PTP: Invalid Code Format" msgstr "PTP: 非法的代码格式" # camlibs/ptp/library.c:114 -#: camlibs/ptp2/ptp.c:3332 +#: camlibs/ptp2/ptp.c:3392 msgid "PTP: Unknown Vendor Code" msgstr "PTP: 未知的厂家代码" # camlibs/ptp/library.c:116 -#: camlibs/ptp2/ptp.c:3334 +#: camlibs/ptp2/ptp.c:3394 msgid "PTP: Capture Already Terminated" msgstr "PTP: 捕获已终止" # camlibs/ptp/library.c:117 -#: camlibs/ptp2/ptp.c:3335 +#: camlibs/ptp2/ptp.c:3395 msgid "PTP: Device Busy" msgstr "PTP: 设备忙碌" -#: camlibs/ptp2/ptp.c:3336 +#: camlibs/ptp2/ptp.c:3396 msgid "PTP: Invalid Parent Object" msgstr "" -#: camlibs/ptp2/ptp.c:3337 +#: camlibs/ptp2/ptp.c:3397 msgid "PTP: Invalid Device Prop Format" msgstr "" -#: camlibs/ptp2/ptp.c:3338 +#: camlibs/ptp2/ptp.c:3398 msgid "PTP: Invalid Device Prop Value" msgstr "" -#: camlibs/ptp2/ptp.c:3339 +#: camlibs/ptp2/ptp.c:3399 msgid "PTP: Invalid Parameter" msgstr "" -#: camlibs/ptp2/ptp.c:3340 +#: camlibs/ptp2/ptp.c:3400 msgid "PTP: Session Already Opened" msgstr "" -#: camlibs/ptp2/ptp.c:3341 +#: camlibs/ptp2/ptp.c:3401 msgid "PTP: Transaction Canceled" msgstr "" -#: camlibs/ptp2/ptp.c:3343 +#: camlibs/ptp2/ptp.c:3403 msgid "PTP: Specification Of Destination Unsupported" msgstr "" -#: camlibs/ptp2/ptp.c:3344 +#: camlibs/ptp2/ptp.c:3404 msgid "PTP: EK Filename Required" msgstr "" -#: camlibs/ptp2/ptp.c:3345 +#: camlibs/ptp2/ptp.c:3405 msgid "PTP: EK Filename Conflicts" msgstr "" -#: camlibs/ptp2/ptp.c:3346 +#: camlibs/ptp2/ptp.c:3406 msgid "PTP: EK Filename Invalid" msgstr "" # camlibs/ptp/library.c:130 -#: camlibs/ptp2/ptp.c:3348 +#: camlibs/ptp2/ptp.c:3408 msgid "PTP: I/O error" msgstr "PTP: I/O 错误" # camlibs/ptp/library.c:131 -#: camlibs/ptp2/ptp.c:3349 +#: camlibs/ptp2/ptp.c:3409 msgid "PTP: Error: bad parameter" msgstr "PTP: 错误：错误的参数" # camlibs/ptp/library.c:132 -#: camlibs/ptp2/ptp.c:3350 +#: camlibs/ptp2/ptp.c:3410 msgid "PTP: Protocol error, data expected" msgstr "PTP: 协议错误，需要数据" # camlibs/ptp/library.c:133 -#: camlibs/ptp2/ptp.c:3351 +#: camlibs/ptp2/ptp.c:3411 msgid "PTP: Protocol error, response expected" msgstr "PTP: 协议错误，需要响应" # camlibs/ptp/library.c:90 -#: camlibs/ptp2/ptp.c:3369 +#: camlibs/ptp2/ptp.c:3429 msgid "Undefined PTP Property" msgstr "PTP: 未定义的属性" # frontends/command-line/gphoto2-cmd-capture.c:218 # libgphoto2/gphoto2-result.c:51 -#: camlibs/ptp2/ptp.c:3371 +#: camlibs/ptp2/ptp.c:3431 msgid "Functional Mode" msgstr "操作模式" -#: camlibs/ptp2/ptp.c:3373 +#: camlibs/ptp2/ptp.c:3433 msgid "Compression Setting" msgstr "压缩设置" # camlibs/sierra/sierra.c:946 camlibs/sierra/sierra.c:1229 # camlibs/sierra/sierra.c:1423 camlibs/sierra/sierra.c:1646 -#: camlibs/ptp2/ptp.c:3374 camlibs/ptp2/ptp.c:3441 +#: camlibs/ptp2/ptp.c:3434 camlibs/ptp2/ptp.c:3501 #: camlibs/sierra/epson-desc.c:176 camlibs/sierra/nikon-desc.c:293 #: camlibs/sierra/olympus-desc.c:564 camlibs/sierra/olympus-desc.c:583 #: camlibs/sierra/olympus-desc.c:604 camlibs/sierra/olympus-desc.c:628 @@ -7760,1742 +7948,1734 @@ msgid "White Balance" msgstr "白平衡" -#: camlibs/ptp2/ptp.c:3375 +#: camlibs/ptp2/ptp.c:3435 msgid "RGB Gain" msgstr "" -#: camlibs/ptp2/ptp.c:3382 +#: camlibs/ptp2/ptp.c:3442 msgid "Exposure Time" msgstr "" -#: camlibs/ptp2/ptp.c:3383 +#: camlibs/ptp2/ptp.c:3443 msgid "Exposure Program Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3385 +#: camlibs/ptp2/ptp.c:3445 msgid "Exposure Index (film speed ISO)" msgstr "" -#: camlibs/ptp2/ptp.c:3387 +#: camlibs/ptp2/ptp.c:3447 msgid "Exposure Bias Compensation" msgstr "" -#: camlibs/ptp2/ptp.c:3389 +#: camlibs/ptp2/ptp.c:3449 msgid "Pre-Capture Delay" msgstr "" -#: camlibs/ptp2/ptp.c:3391 camlibs/ptp2/ptp.c:3445 +#: camlibs/ptp2/ptp.c:3451 camlibs/ptp2/ptp.c:3505 msgid "Contrast" msgstr "" -#: camlibs/ptp2/ptp.c:3393 camlibs/sierra/nikon-desc.c:553 +#: camlibs/ptp2/ptp.c:3453 camlibs/sierra/nikon-desc.c:553 #: camlibs/sierra/nikon-desc.c:576 msgid "Digital Zoom" msgstr "数字缩放" -#: camlibs/ptp2/ptp.c:3397 +#: camlibs/ptp2/ptp.c:3457 msgid "Timelapse Number" msgstr "" -#: camlibs/ptp2/ptp.c:3398 +#: camlibs/ptp2/ptp.c:3458 msgid "Timelapse Interval" msgstr "" -#: camlibs/ptp2/ptp.c:3400 +#: camlibs/ptp2/ptp.c:3460 msgid "Upload URL" msgstr "" -#: camlibs/ptp2/ptp.c:3402 +#: camlibs/ptp2/ptp.c:3462 msgid "Copyright Info" msgstr "" -#: camlibs/ptp2/ptp.c:3411 +#: camlibs/ptp2/ptp.c:3471 msgid "Date Time Stamp Format" msgstr "" -#: camlibs/ptp2/ptp.c:3413 +#: camlibs/ptp2/ptp.c:3473 msgid "Video Out" msgstr "" -#: camlibs/ptp2/ptp.c:3414 +#: camlibs/ptp2/ptp.c:3474 msgid "Power Saving" msgstr "" -#: camlibs/ptp2/ptp.c:3415 +#: camlibs/ptp2/ptp.c:3475 msgid "UI Language" msgstr "" -#: camlibs/ptp2/ptp.c:3424 +#: camlibs/ptp2/ptp.c:3484 msgid "Battery Type" msgstr "" -#: camlibs/ptp2/ptp.c:3425 +#: camlibs/ptp2/ptp.c:3485 msgid "Battery Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3426 +#: camlibs/ptp2/ptp.c:3486 msgid "UILockType" msgstr "" -#: camlibs/ptp2/ptp.c:3427 +#: camlibs/ptp2/ptp.c:3487 msgid "Camera Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3429 +#: camlibs/ptp2/ptp.c:3489 msgid "Full View File Format" msgstr "" -#: camlibs/ptp2/ptp.c:3431 +#: camlibs/ptp2/ptp.c:3491 msgid "Self Time" msgstr "" -#: camlibs/ptp2/ptp.c:3434 camlibs/ptp2/ptp.c:3567 +#: camlibs/ptp2/ptp.c:3494 camlibs/ptp2/ptp.c:3627 msgid "Shooting Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3435 +#: camlibs/ptp2/ptp.c:3495 msgid "Image Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3442 +#: camlibs/ptp2/ptp.c:3502 msgid "Slow Shutter Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3443 +#: camlibs/ptp2/ptp.c:3503 msgid "AF Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3444 +#: camlibs/ptp2/ptp.c:3504 msgid "Image Stabilization" msgstr "" -#: camlibs/ptp2/ptp.c:3446 +#: camlibs/ptp2/ptp.c:3506 msgid "Color Gain" msgstr "" -#: camlibs/ptp2/ptp.c:3448 +#: camlibs/ptp2/ptp.c:3508 msgid "Sensitivity" msgstr "" -#: camlibs/ptp2/ptp.c:3449 +#: camlibs/ptp2/ptp.c:3509 msgid "Parameter Set" msgstr "" -#: camlibs/ptp2/ptp.c:3456 +#: camlibs/ptp2/ptp.c:3516 msgid "Av Open" msgstr "" -#: camlibs/ptp2/ptp.c:3457 +#: camlibs/ptp2/ptp.c:3517 msgid "Av Max" msgstr "" -#: camlibs/ptp2/ptp.c:3459 camlibs/ptp2/ptp.c:3483 +#: camlibs/ptp2/ptp.c:3519 camlibs/ptp2/ptp.c:3543 msgid "Focal Length Tele" msgstr "" -#: camlibs/ptp2/ptp.c:3460 +#: camlibs/ptp2/ptp.c:3520 msgid "Focal Length Wide" msgstr "" -#: camlibs/ptp2/ptp.c:3461 +#: camlibs/ptp2/ptp.c:3521 msgid "Focal Length Denominator" msgstr "" -#: camlibs/ptp2/ptp.c:3462 +#: camlibs/ptp2/ptp.c:3522 msgid "Capture Transfer Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3464 +#: camlibs/ptp2/ptp.c:3524 msgid "Name Prefix" msgstr "" -#: camlibs/ptp2/ptp.c:3465 +#: camlibs/ptp2/ptp.c:3525 msgid "Size Quality Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3466 +#: camlibs/ptp2/ptp.c:3526 msgid "Supported Thumb Size" msgstr "" -#: camlibs/ptp2/ptp.c:3467 +#: camlibs/ptp2/ptp.c:3527 msgid "Size of Output Data from Camera" msgstr "" -#: camlibs/ptp2/ptp.c:3468 +#: camlibs/ptp2/ptp.c:3528 msgid "Size of Input Data to Camera" msgstr "" -#: camlibs/ptp2/ptp.c:3469 +#: camlibs/ptp2/ptp.c:3529 msgid "Remote API Version" msgstr "" # camlibs/canon/serial.c:1190 -#: camlibs/ptp2/ptp.c:3472 +#: camlibs/ptp2/ptp.c:3532 msgid "Camera Owner" msgstr "相机所有者。" -#: camlibs/ptp2/ptp.c:3473 +#: camlibs/ptp2/ptp.c:3533 msgid "UNIX Time" msgstr "" -#: camlibs/ptp2/ptp.c:3474 +#: camlibs/ptp2/ptp.c:3534 msgid "Camera Body ID" msgstr "" -#: camlibs/ptp2/ptp.c:3476 +#: camlibs/ptp2/ptp.c:3536 msgid "Disp Av" msgstr "" -#: camlibs/ptp2/ptp.c:3477 +#: camlibs/ptp2/ptp.c:3537 msgid "Av Open Apex" msgstr "" -#: camlibs/ptp2/ptp.c:3478 +#: camlibs/ptp2/ptp.c:3538 msgid "Digital Zoom Magnification" msgstr "" -#: camlibs/ptp2/ptp.c:3479 +#: camlibs/ptp2/ptp.c:3539 msgid "Ml Spot Position" msgstr "" -#: camlibs/ptp2/ptp.c:3480 +#: camlibs/ptp2/ptp.c:3540 msgid "Disp Av Max" msgstr "" -#: camlibs/ptp2/ptp.c:3481 +#: camlibs/ptp2/ptp.c:3541 msgid "Av Max Apex" msgstr "" -#: camlibs/ptp2/ptp.c:3482 +#: camlibs/ptp2/ptp.c:3542 msgid "EZoom Start Position" msgstr "" -#: camlibs/ptp2/ptp.c:3484 +#: camlibs/ptp2/ptp.c:3544 msgid "EZoom Size of Tele" msgstr "" -#: camlibs/ptp2/ptp.c:3487 +#: camlibs/ptp2/ptp.c:3547 msgid "Flash Quantity Count" msgstr "" -#: camlibs/ptp2/ptp.c:3488 +#: camlibs/ptp2/ptp.c:3548 msgid "Rotation Angle" msgstr "" -#: camlibs/ptp2/ptp.c:3489 +#: camlibs/ptp2/ptp.c:3549 msgid "Rotation Scene" msgstr "" -#: camlibs/ptp2/ptp.c:3490 +#: camlibs/ptp2/ptp.c:3550 msgid "Event Emulate Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3492 +#: camlibs/ptp2/ptp.c:3552 msgid "Type of Slideshow" msgstr "" -#: camlibs/ptp2/ptp.c:3493 +#: camlibs/ptp2/ptp.c:3553 msgid "Average Filesizes" msgstr "" -#: camlibs/ptp2/ptp.c:3494 +#: camlibs/ptp2/ptp.c:3554 msgid "Model ID" msgstr "" -#: camlibs/ptp2/ptp.c:3503 +#: camlibs/ptp2/ptp.c:3563 msgid "Shooting Bank" msgstr "" -#: camlibs/ptp2/ptp.c:3505 +#: camlibs/ptp2/ptp.c:3565 msgid "Shooting Bank Name A" msgstr "" -#: camlibs/ptp2/ptp.c:3507 +#: camlibs/ptp2/ptp.c:3567 msgid "Shooting Bank Name B" msgstr "" -#: camlibs/ptp2/ptp.c:3509 +#: camlibs/ptp2/ptp.c:3569 msgid "Shooting Bank Name C" msgstr "" -#: camlibs/ptp2/ptp.c:3511 +#: camlibs/ptp2/ptp.c:3571 msgid "Shooting Bank Name D" msgstr "" -#: camlibs/ptp2/ptp.c:3513 +#: camlibs/ptp2/ptp.c:3573 msgid "Reset Bank 0" msgstr "" -#: camlibs/ptp2/ptp.c:3515 +#: camlibs/ptp2/ptp.c:3575 msgid "Raw Compression" msgstr "" -#: camlibs/ptp2/ptp.c:3531 +#: camlibs/ptp2/ptp.c:3591 msgid "White Balance Colour Temperature" msgstr "" -#: camlibs/ptp2/ptp.c:3533 +#: camlibs/ptp2/ptp.c:3593 msgid "White Balance Preset Number" msgstr "" -#: camlibs/ptp2/ptp.c:3535 +#: camlibs/ptp2/ptp.c:3595 msgid "White Balance Preset Name 0" msgstr "" -#: camlibs/ptp2/ptp.c:3537 +#: camlibs/ptp2/ptp.c:3597 msgid "White Balance Preset Name 1" msgstr "" -#: camlibs/ptp2/ptp.c:3539 +#: camlibs/ptp2/ptp.c:3599 msgid "White Balance Preset Name 2" msgstr "" -#: camlibs/ptp2/ptp.c:3541 +#: camlibs/ptp2/ptp.c:3601 msgid "White Balance Preset Name 3" msgstr "" -#: camlibs/ptp2/ptp.c:3543 +#: camlibs/ptp2/ptp.c:3603 msgid "White Balance Preset Name 4" msgstr "" -#: camlibs/ptp2/ptp.c:3545 +#: camlibs/ptp2/ptp.c:3605 msgid "White Balance Preset Value 0" msgstr "" -#: camlibs/ptp2/ptp.c:3547 +#: camlibs/ptp2/ptp.c:3607 msgid "White Balance Preset Value 1" msgstr "" -#: camlibs/ptp2/ptp.c:3549 +#: camlibs/ptp2/ptp.c:3609 msgid "White Balance Preset Value 2" msgstr "" -#: camlibs/ptp2/ptp.c:3551 +#: camlibs/ptp2/ptp.c:3611 msgid "White Balance Preset Value 3" msgstr "" -#: camlibs/ptp2/ptp.c:3553 +#: camlibs/ptp2/ptp.c:3613 msgid "White Balance Preset Value 4" msgstr "" -#: camlibs/ptp2/ptp.c:3563 +#: camlibs/ptp2/ptp.c:3623 msgid "Lens Focal Length (Non CPU)" msgstr "" -#: camlibs/ptp2/ptp.c:3565 +#: camlibs/ptp2/ptp.c:3625 msgid "Lens Maximum Aperture (Non CPU)" msgstr "" -#: camlibs/ptp2/ptp.c:3573 +#: camlibs/ptp2/ptp.c:3633 msgid "Auto DX Crop" msgstr "" -#: camlibs/ptp2/ptp.c:3577 +#: camlibs/ptp2/ptp.c:3637 msgid "Menu Bank Name A" msgstr "" -#: camlibs/ptp2/ptp.c:3579 +#: camlibs/ptp2/ptp.c:3639 msgid "Menu Bank Name B" msgstr "" -#: camlibs/ptp2/ptp.c:3581 +#: camlibs/ptp2/ptp.c:3641 msgid "Menu Bank Name C" msgstr "" -#: camlibs/ptp2/ptp.c:3583 +#: camlibs/ptp2/ptp.c:3643 msgid "Menu Bank Name D" msgstr "" -#: camlibs/ptp2/ptp.c:3585 +#: camlibs/ptp2/ptp.c:3645 msgid "Reset Menu Bank" msgstr "" -#: camlibs/ptp2/ptp.c:3603 +#: camlibs/ptp2/ptp.c:3663 msgid "Vertical AF On" msgstr "" -#: camlibs/ptp2/ptp.c:3607 +#: camlibs/ptp2/ptp.c:3667 msgid "Focus Area Zone" msgstr "" -#: camlibs/ptp2/ptp.c:3609 +#: camlibs/ptp2/ptp.c:3669 msgid "Enable Copyright" msgstr "" -#: camlibs/ptp2/ptp.c:3613 +#: camlibs/ptp2/ptp.c:3673 msgid "Exposure ISO Step" msgstr "" -#: camlibs/ptp2/ptp.c:3615 +#: camlibs/ptp2/ptp.c:3675 msgid "Exposure Step" msgstr "" -#: camlibs/ptp2/ptp.c:3617 +#: camlibs/ptp2/ptp.c:3677 msgid "Exposure Compensation (EV)" msgstr "" -#: camlibs/ptp2/ptp.c:3621 +#: camlibs/ptp2/ptp.c:3681 msgid "Centre Weight Area" msgstr "" -#: camlibs/ptp2/ptp.c:3623 +#: camlibs/ptp2/ptp.c:3683 msgid "Exposure Base Matrix" msgstr "" -#: camlibs/ptp2/ptp.c:3625 +#: camlibs/ptp2/ptp.c:3685 msgid "Exposure Base Center" msgstr "" -#: camlibs/ptp2/ptp.c:3627 +#: camlibs/ptp2/ptp.c:3687 msgid "Exposure Base Spot" msgstr "" -#: camlibs/ptp2/ptp.c:3629 -msgid "Live View AF" +#: camlibs/ptp2/ptp.c:3689 +msgid "Live View AF Area" msgstr "" -#: camlibs/ptp2/ptp.c:3635 +#: camlibs/ptp2/ptp.c:3697 msgid "Auto Meter Off Time" msgstr "" -#: camlibs/ptp2/ptp.c:3637 +#: camlibs/ptp2/ptp.c:3699 msgid "Self Timer Delay" msgstr "" -#: camlibs/ptp2/ptp.c:3641 +#: camlibs/ptp2/ptp.c:3703 msgid "Img Conf Time" msgstr "" -#: camlibs/ptp2/ptp.c:3643 +#: camlibs/ptp2/ptp.c:3705 msgid "Angle Level" msgstr "" -#: camlibs/ptp2/ptp.c:3645 +#: camlibs/ptp2/ptp.c:3707 msgid "Shooting Speed" msgstr "" -#: camlibs/ptp2/ptp.c:3647 camlibs/ptp2/ptp.c:3768 +#: camlibs/ptp2/ptp.c:3709 camlibs/ptp2/ptp.c:3830 msgid "Maximum Shots" msgstr "" -#: camlibs/ptp2/ptp.c:3649 +#: camlibs/ptp2/ptp.c:3711 msgid "Exposure delay mode" msgstr "" -#: camlibs/ptp2/ptp.c:3651 +#: camlibs/ptp2/ptp.c:3713 msgid "Long Exposure Noise Reduction" msgstr "" -#: camlibs/ptp2/ptp.c:3659 +#: camlibs/ptp2/ptp.c:3721 msgid "LCD Illumination" msgstr "" -#: camlibs/ptp2/ptp.c:3661 +#: camlibs/ptp2/ptp.c:3723 msgid "High ISO noise reduction" msgstr "" -#: camlibs/ptp2/ptp.c:3663 +#: camlibs/ptp2/ptp.c:3725 msgid "On screen tips" msgstr "" -#: camlibs/ptp2/ptp.c:3665 +#: camlibs/ptp2/ptp.c:3727 msgid "Artist Name" msgstr "" -#: camlibs/ptp2/ptp.c:3667 +#: camlibs/ptp2/ptp.c:3729 msgid "Copyright Information" msgstr "" -#: camlibs/ptp2/ptp.c:3675 +#: camlibs/ptp2/ptp.c:3737 msgid "Modeling Flash" msgstr "" -#: camlibs/ptp2/ptp.c:3679 +#: camlibs/ptp2/ptp.c:3741 msgid "Manual Mode Bracketing" msgstr "" -#: camlibs/ptp2/ptp.c:3683 +#: camlibs/ptp2/ptp.c:3745 msgid "Auto Bracket Selection" msgstr "" -#: camlibs/ptp2/ptp.c:3684 +#: camlibs/ptp2/ptp.c:3746 msgid "NIKON Auto Bracketing Set" msgstr "" -#: camlibs/ptp2/ptp.c:3686 +#: camlibs/ptp2/ptp.c:3748 msgid "Center Button Shooting Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3688 +#: camlibs/ptp2/ptp.c:3750 msgid "Center Button Playback Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3690 +#: camlibs/ptp2/ptp.c:3752 msgid "Multiselector" msgstr "" -#: camlibs/ptp2/ptp.c:3692 +#: camlibs/ptp2/ptp.c:3754 msgid "Photo Info. Playback" msgstr "" -#: camlibs/ptp2/ptp.c:3694 +#: camlibs/ptp2/ptp.c:3756 msgid "Assign Func. Button" msgstr "" -#: camlibs/ptp2/ptp.c:3696 +#: camlibs/ptp2/ptp.c:3758 msgid "Customise Command Dials" msgstr "" -#: camlibs/ptp2/ptp.c:3700 +#: camlibs/ptp2/ptp.c:3762 msgid "Aperture Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3702 +#: camlibs/ptp2/ptp.c:3764 msgid "Menus and Playback" msgstr "" -#: camlibs/ptp2/ptp.c:3704 +#: camlibs/ptp2/ptp.c:3766 msgid "Buttons and Dials" msgstr "" -#: camlibs/ptp2/ptp.c:3706 +#: camlibs/ptp2/ptp.c:3768 msgid "No CF Card Release" msgstr "" -#: camlibs/ptp2/ptp.c:3708 +#: camlibs/ptp2/ptp.c:3770 msgid "Center Button Zoom Ratio" msgstr "" -#: camlibs/ptp2/ptp.c:3710 +#: camlibs/ptp2/ptp.c:3772 msgid "Function Button 2" msgstr "" -#: camlibs/ptp2/ptp.c:3714 +#: camlibs/ptp2/ptp.c:3776 msgid "Normal AF On" msgstr "" -#: camlibs/ptp2/ptp.c:3716 +#: camlibs/ptp2/ptp.c:3778 msgid "Image Comment String" msgstr "" -#: camlibs/ptp2/ptp.c:3718 +#: camlibs/ptp2/ptp.c:3780 msgid "Image Comment Enable" msgstr "" -#: camlibs/ptp2/ptp.c:3720 +#: camlibs/ptp2/ptp.c:3782 msgid "Image Rotation" msgstr "" -#: camlibs/ptp2/ptp.c:3722 +#: camlibs/ptp2/ptp.c:3784 msgid "Manual Set Lens Number" msgstr "" -#: camlibs/ptp2/ptp.c:3724 +#: camlibs/ptp2/ptp.c:3786 msgid "Movie Screen Size" msgstr "" -#: camlibs/ptp2/ptp.c:3726 +#: camlibs/ptp2/ptp.c:3788 msgid "Movie Voice" msgstr "" -#: camlibs/ptp2/ptp.c:3728 +#: camlibs/ptp2/ptp.c:3790 msgid "Bracketing Enable" msgstr "" -#: camlibs/ptp2/ptp.c:3730 +#: camlibs/ptp2/ptp.c:3792 msgid "Exposure Bracketing Step" msgstr "" -#: camlibs/ptp2/ptp.c:3732 +#: camlibs/ptp2/ptp.c:3794 msgid "Exposure Bracketing Program" msgstr "" -#: camlibs/ptp2/ptp.c:3734 +#: camlibs/ptp2/ptp.c:3796 msgid "Auto Exposure Bracket Count" msgstr "" -#: camlibs/ptp2/ptp.c:3735 +#: camlibs/ptp2/ptp.c:3797 msgid "White Balance Bracket Step" msgstr "" -#: camlibs/ptp2/ptp.c:3736 +#: camlibs/ptp2/ptp.c:3798 msgid "White Balance Bracket Program" msgstr "" -#: camlibs/ptp2/ptp.c:3738 +#: camlibs/ptp2/ptp.c:3800 msgid "Lens ID" msgstr "" -#: camlibs/ptp2/ptp.c:3740 +#: camlibs/ptp2/ptp.c:3802 msgid "Lens Sort" msgstr "" -#: camlibs/ptp2/ptp.c:3742 +#: camlibs/ptp2/ptp.c:3804 msgid "Lens Type" msgstr "" -#: camlibs/ptp2/ptp.c:3744 +#: camlibs/ptp2/ptp.c:3806 msgid "Min. Focal Length" msgstr "" -#: camlibs/ptp2/ptp.c:3746 +#: camlibs/ptp2/ptp.c:3808 msgid "Max. Focal Length" msgstr "" -#: camlibs/ptp2/ptp.c:3748 +#: camlibs/ptp2/ptp.c:3810 msgid "Max. Aperture at Min. Focal Length" msgstr "" -#: camlibs/ptp2/ptp.c:3750 +#: camlibs/ptp2/ptp.c:3812 msgid "Max. Aperture at Max. Focal Length" msgstr "" -#: camlibs/ptp2/ptp.c:3752 +#: camlibs/ptp2/ptp.c:3814 msgid "Finder ISO Display" msgstr "" -#: camlibs/ptp2/ptp.c:3754 +#: camlibs/ptp2/ptp.c:3816 msgid "Auto Off Photo" msgstr "" -#: camlibs/ptp2/ptp.c:3756 +#: camlibs/ptp2/ptp.c:3818 msgid "Auto Off Menu" msgstr "" -#: camlibs/ptp2/ptp.c:3758 +#: camlibs/ptp2/ptp.c:3820 msgid "Auto Off Info" msgstr "" -#: camlibs/ptp2/ptp.c:3760 +#: camlibs/ptp2/ptp.c:3822 msgid "Self Timer Shot Number" msgstr "" -#: camlibs/ptp2/ptp.c:3762 +#: camlibs/ptp2/ptp.c:3824 msgid "Vignette Control" msgstr "" -#: camlibs/ptp2/ptp.c:3764 +#: camlibs/ptp2/ptp.c:3826 msgid "Nikon Exposure Time" msgstr "" -#: camlibs/ptp2/ptp.c:3766 +#: camlibs/ptp2/ptp.c:3828 msgid "Warning Status" msgstr "" -#: camlibs/ptp2/ptp.c:3773 +#: camlibs/ptp2/ptp.c:3835 msgid "AF LCD Top Mode 2" msgstr "" -#: camlibs/ptp2/ptp.c:3775 +#: camlibs/ptp2/ptp.c:3837 msgid "Active AF Sensor" msgstr "" -#: camlibs/ptp2/ptp.c:3779 +#: camlibs/ptp2/ptp.c:3841 msgid "Exposure Meter" msgstr "" -#: camlibs/ptp2/ptp.c:3783 +#: camlibs/ptp2/ptp.c:3845 msgid "USB Speed" msgstr "" -#: camlibs/ptp2/ptp.c:3785 +#: camlibs/ptp2/ptp.c:3847 msgid "CCD Serial Number" msgstr "" -#: camlibs/ptp2/ptp.c:3789 +#: camlibs/ptp2/ptp.c:3851 msgid "Group PTN Type" msgstr "" -#: camlibs/ptp2/ptp.c:3791 +#: camlibs/ptp2/ptp.c:3853 msgid "FNumber Lock" msgstr "" -#: camlibs/ptp2/ptp.c:3793 +#: camlibs/ptp2/ptp.c:3855 msgid "Exposure Aperture Lock" msgstr "" -#: camlibs/ptp2/ptp.c:3795 +#: camlibs/ptp2/ptp.c:3857 msgid "TV Lock Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3797 +#: camlibs/ptp2/ptp.c:3859 msgid "AV Lock Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3799 +#: camlibs/ptp2/ptp.c:3861 msgid "Illum Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3801 +#: camlibs/ptp2/ptp.c:3863 msgid "Focus Point Bright" msgstr "" -#: camlibs/ptp2/ptp.c:3803 +#: camlibs/ptp2/ptp.c:3865 msgid "External Flash Attached" msgstr "" -#: camlibs/ptp2/ptp.c:3805 +#: camlibs/ptp2/ptp.c:3867 msgid "External Flash Status" msgstr "" -#: camlibs/ptp2/ptp.c:3807 +#: camlibs/ptp2/ptp.c:3869 msgid "External Flash Sort" msgstr "" -#: camlibs/ptp2/ptp.c:3809 camlibs/ptp2/ptp.c:3813 +#: camlibs/ptp2/ptp.c:3871 camlibs/ptp2/ptp.c:3875 msgid "External Flash Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3811 +#: camlibs/ptp2/ptp.c:3873 msgid "External Flash Compensation" msgstr "" -#: camlibs/ptp2/ptp.c:3821 +#: camlibs/ptp2/ptp.c:3883 msgid "BW Filler Effect" msgstr "" -#: camlibs/ptp2/ptp.c:3823 +#: camlibs/ptp2/ptp.c:3885 msgid "BW Sharpness" msgstr "" -#: camlibs/ptp2/ptp.c:3825 +#: camlibs/ptp2/ptp.c:3887 msgid "BW Contrast" msgstr "" -#: camlibs/ptp2/ptp.c:3827 +#: camlibs/ptp2/ptp.c:3889 msgid "BW Setting Type" msgstr "" -#: camlibs/ptp2/ptp.c:3829 +#: camlibs/ptp2/ptp.c:3891 msgid "Slot 2 Save Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3831 +#: camlibs/ptp2/ptp.c:3893 msgid "Raw Bit Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3833 +#: camlibs/ptp2/ptp.c:3895 msgid "ISO Auto Time" msgstr "" -#: camlibs/ptp2/ptp.c:3835 +#: camlibs/ptp2/ptp.c:3897 msgid "Flourescent Type" msgstr "" -#: camlibs/ptp2/ptp.c:3837 +#: camlibs/ptp2/ptp.c:3899 msgid "Tune Colour Temperature" msgstr "" -#: camlibs/ptp2/ptp.c:3839 +#: camlibs/ptp2/ptp.c:3901 msgid "Tune Preset 0" msgstr "" -#: camlibs/ptp2/ptp.c:3841 +#: camlibs/ptp2/ptp.c:3903 msgid "Tune Preset 1" msgstr "" -#: camlibs/ptp2/ptp.c:3843 +#: camlibs/ptp2/ptp.c:3905 msgid "Tune Preset 2" msgstr "" -#: camlibs/ptp2/ptp.c:3845 +#: camlibs/ptp2/ptp.c:3907 msgid "Tune Preset 3" msgstr "" -#: camlibs/ptp2/ptp.c:3847 +#: camlibs/ptp2/ptp.c:3909 msgid "Tune Preset 4" msgstr "" -#: camlibs/ptp2/ptp.c:3851 +#: camlibs/ptp2/ptp.c:3913 msgid "Autofocus Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3853 +#: camlibs/ptp2/ptp.c:3915 msgid "AF Assist Lamp" msgstr "" -#: camlibs/ptp2/ptp.c:3855 +#: camlibs/ptp2/ptp.c:3917 msgid "Auto ISO P/A/DVP Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3867 -msgid "ISO Auto" -msgstr "" - -#: camlibs/ptp2/ptp.c:3871 +#: camlibs/ptp2/ptp.c:3933 msgid "Viewfinder Grid Display" msgstr "" -#: camlibs/ptp2/ptp.c:3875 +#: camlibs/ptp2/ptp.c:3937 msgid "Flash Mode Commander Power" msgstr "" -#: camlibs/ptp2/ptp.c:3877 +#: camlibs/ptp2/ptp.c:3939 msgid "Auto FP" msgstr "" -#: camlibs/ptp2/ptp.c:3881 +#: camlibs/ptp2/ptp.c:3943 msgid "Warning Display" msgstr "" -#: camlibs/ptp2/ptp.c:3883 +#: camlibs/ptp2/ptp.c:3945 msgid "Battery Cell Kind" msgstr "" -#: camlibs/ptp2/ptp.c:3885 +#: camlibs/ptp2/ptp.c:3947 msgid "ISO Auto High Limit" msgstr "" -#: camlibs/ptp2/ptp.c:3889 +#: camlibs/ptp2/ptp.c:3951 msgid "Continuous Speed High" msgstr "" -#: camlibs/ptp2/ptp.c:3891 +#: camlibs/ptp2/ptp.c:3953 msgid "Info Disp Setting" msgstr "" -#: camlibs/ptp2/ptp.c:3893 +#: camlibs/ptp2/ptp.c:3955 msgid "Preview Button" msgstr "" -#: camlibs/ptp2/ptp.c:3895 +#: camlibs/ptp2/ptp.c:3957 msgid "Preview Button 2" msgstr "" -#: camlibs/ptp2/ptp.c:3897 +#: camlibs/ptp2/ptp.c:3959 msgid "AEAF Lock Button 2" msgstr "" -#: camlibs/ptp2/ptp.c:3899 +#: camlibs/ptp2/ptp.c:3961 msgid "Indicator Display" msgstr "" -#: camlibs/ptp2/ptp.c:3901 +#: camlibs/ptp2/ptp.c:3963 msgid "Cell Kind Priority" msgstr "" -#: camlibs/ptp2/ptp.c:3903 +#: camlibs/ptp2/ptp.c:3965 msgid "Bracketing Frames and Steps" msgstr "" -#: camlibs/ptp2/ptp.c:3905 +#: camlibs/ptp2/ptp.c:3967 msgid "Live View Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3907 +#: camlibs/ptp2/ptp.c:3969 msgid "Live View Drive Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3909 +#: camlibs/ptp2/ptp.c:3971 msgid "Live View Status" msgstr "" -#: camlibs/ptp2/ptp.c:3911 +#: camlibs/ptp2/ptp.c:3973 msgid "Live View Image Zoom Ratio" msgstr "" -#: camlibs/ptp2/ptp.c:3913 +#: camlibs/ptp2/ptp.c:3975 msgid "Live View Prohibit Condition" msgstr "" -#: camlibs/ptp2/ptp.c:3915 +#: camlibs/ptp2/ptp.c:3977 msgid "Exposure Display Status" msgstr "" -#: camlibs/ptp2/ptp.c:3917 +#: camlibs/ptp2/ptp.c:3979 msgid "Exposure Indicate Status" msgstr "" -#: camlibs/ptp2/ptp.c:3919 +#: camlibs/ptp2/ptp.c:3981 msgid "Exposure Indicate Lightup" msgstr "" -#: camlibs/ptp2/ptp.c:3925 +#: camlibs/ptp2/ptp.c:3987 msgid "Flash MRepeat Value" msgstr "" -#: camlibs/ptp2/ptp.c:3927 +#: camlibs/ptp2/ptp.c:3989 msgid "Flash MRepeat Count" msgstr "" -#: camlibs/ptp2/ptp.c:3929 +#: camlibs/ptp2/ptp.c:3991 msgid "Flash MRepeat Interval" msgstr "" -#: camlibs/ptp2/ptp.c:3951 +#: camlibs/ptp2/ptp.c:4013 msgid "Active Pic Ctrl Item" msgstr "" -#: camlibs/ptp2/ptp.c:3953 +#: camlibs/ptp2/ptp.c:4015 msgid "Change Pic Ctrl Item" msgstr "" -#: camlibs/ptp2/ptp.c:3960 +#: camlibs/ptp2/ptp.c:4022 msgid "Secure Time" msgstr "" -#: camlibs/ptp2/ptp.c:3961 +#: camlibs/ptp2/ptp.c:4023 msgid "Device Certificate" msgstr "" -#: camlibs/ptp2/ptp.c:3962 +#: camlibs/ptp2/ptp.c:4024 msgid "Revocation Info" msgstr "" -#: camlibs/ptp2/ptp.c:3964 +#: camlibs/ptp2/ptp.c:4026 msgid "Synchronization Partner" msgstr "" -#: camlibs/ptp2/ptp.c:3966 +#: camlibs/ptp2/ptp.c:4028 msgid "Friendly Device Name" msgstr "" -#: camlibs/ptp2/ptp.c:3967 +#: camlibs/ptp2/ptp.c:4029 msgid "Volume Level" msgstr "" -#: camlibs/ptp2/ptp.c:3968 +#: camlibs/ptp2/ptp.c:4030 msgid "Device Icon" msgstr "" -#: camlibs/ptp2/ptp.c:3969 +#: camlibs/ptp2/ptp.c:4031 msgid "Session Initiator Info" msgstr "" -#: camlibs/ptp2/ptp.c:3970 +#: camlibs/ptp2/ptp.c:4032 msgid "Perceived Device Type" msgstr "" -#: camlibs/ptp2/ptp.c:3971 +#: camlibs/ptp2/ptp.c:4033 msgid "Playback Rate" msgstr "" -#: camlibs/ptp2/ptp.c:3972 +#: camlibs/ptp2/ptp.c:4034 msgid "Playback Object" msgstr "" -#: camlibs/ptp2/ptp.c:3974 +#: camlibs/ptp2/ptp.c:4036 msgid "Playback Container Index" msgstr "" -#: camlibs/ptp2/ptp.c:3975 +#: camlibs/ptp2/ptp.c:4037 msgid "Playback Position" msgstr "" -#: camlibs/ptp2/ptp.c:3976 +#: camlibs/ptp2/ptp.c:4038 msgid "PlaysForSure ID" msgstr "" -#: camlibs/ptp2/ptp.c:3984 +#: camlibs/ptp2/ptp.c:4046 msgid "Quality" msgstr "" -#: camlibs/ptp2/ptp.c:3985 +#: camlibs/ptp2/ptp.c:4047 msgid "Release Mode" msgstr "" -#: camlibs/ptp2/ptp.c:3986 +#: camlibs/ptp2/ptp.c:4048 msgid "Focus Areas" msgstr "" -#: camlibs/ptp2/ptp.c:3987 +#: camlibs/ptp2/ptp.c:4049 msgid "AE Lock" msgstr "" -#: camlibs/ptp2/ptp.c:4090 camlibs/ptp2/ptp.c:4096 camlibs/ptp2/ptp.c:4097 -#: camlibs/ptp2/ptp.c:4104 +#: camlibs/ptp2/ptp.c:4152 camlibs/ptp2/ptp.c:4158 camlibs/ptp2/ptp.c:4159 +#: camlibs/ptp2/ptp.c:4166 #, c-format msgid "%.1f stops" msgstr "" -#: camlibs/ptp2/ptp.c:4098 +#: camlibs/ptp2/ptp.c:4160 #, c-format msgid "%.0f mm" msgstr "" -#: camlibs/ptp2/ptp.c:4115 +#: camlibs/ptp2/ptp.c:4177 msgid "JPEG Norm" msgstr "" -#: camlibs/ptp2/ptp.c:4118 +#: camlibs/ptp2/ptp.c:4180 msgid "RAW + JPEG Basic" msgstr "" -#: camlibs/ptp2/ptp.c:4124 camlibs/ricoh/library.c:330 +#: camlibs/ptp2/ptp.c:4186 camlibs/ricoh/library.c:330 #: camlibs/sierra/nikon-desc.c:284 msgid "Incandescent" msgstr "" -#: camlibs/ptp2/ptp.c:4130 -msgid "Manual Focus" -msgstr "" - -#: camlibs/ptp2/ptp.c:4132 +#: camlibs/ptp2/ptp.c:4194 msgid "Automatic Macro (close-up)" msgstr "" -#: camlibs/ptp2/ptp.c:4137 +#: camlibs/ptp2/ptp.c:4199 msgid "Center Weighted Average" msgstr "" -#: camlibs/ptp2/ptp.c:4139 +#: camlibs/ptp2/ptp.c:4201 msgid "Center-spot" msgstr "" -#: camlibs/ptp2/ptp.c:4141 +#: camlibs/ptp2/ptp.c:4203 msgid "Automatic flash" msgstr "" -#: camlibs/ptp2/ptp.c:4144 +#: camlibs/ptp2/ptp.c:4206 msgid "Automatic Red-eye Reduction" msgstr "" -#: camlibs/ptp2/ptp.c:4145 +#: camlibs/ptp2/ptp.c:4207 msgid "Red-eye fill flash" msgstr "" -#: camlibs/ptp2/ptp.c:4163 +#: camlibs/ptp2/ptp.c:4225 msgid "Power Wind" msgstr "" -#: camlibs/ptp2/ptp.c:4169 +#: camlibs/ptp2/ptp.c:4231 msgid "Timer + Remote" msgstr "" -#: camlibs/ptp2/ptp.c:4227 +#: camlibs/ptp2/ptp.c:4289 msgid "AF Lock only" msgstr "" -#: camlibs/ptp2/ptp.c:4231 +#: camlibs/ptp2/ptp.c:4293 msgid "Flash Lock" msgstr "" -#: camlibs/ptp2/ptp.c:4282 +#: camlibs/ptp2/ptp.c:4344 msgid "Reset focus point to center" msgstr "" -#: camlibs/ptp2/ptp.c:4283 +#: camlibs/ptp2/ptp.c:4345 msgid "Highlight active focus point" msgstr "" -#: camlibs/ptp2/ptp.c:4284 +#: camlibs/ptp2/ptp.c:4346 msgid "Unused" msgstr "" -#: camlibs/ptp2/ptp.c:4325 +#: camlibs/ptp2/ptp.c:4388 msgid "SDRam" msgstr "" -#: camlibs/ptp2/ptp.c:4327 +#: camlibs/ptp2/ptp.c:4390 msgid "USB 1.1" msgstr "" -#: camlibs/ptp2/ptp.c:4328 +#: camlibs/ptp2/ptp.c:4391 msgid "USB 2.0" msgstr "" -#: camlibs/ptp2/ptp.c:4340 +#: camlibs/ptp2/ptp.c:4403 msgid "LCD Backlight" msgstr "" -#: camlibs/ptp2/ptp.c:4341 +#: camlibs/ptp2/ptp.c:4404 msgid "LCD Backlight and Info Display" msgstr "" -#: camlibs/ptp2/ptp.c:4399 +#: camlibs/ptp2/ptp.c:4462 msgid "1 min" msgstr "" -#: camlibs/ptp2/ptp.c:4400 +#: camlibs/ptp2/ptp.c:4463 msgid "5 mins" msgstr "" -#: camlibs/ptp2/ptp.c:4401 +#: camlibs/ptp2/ptp.c:4464 msgid "10 mins" msgstr "" -#: camlibs/ptp2/ptp.c:4402 +#: camlibs/ptp2/ptp.c:4465 msgid "15 mins" msgstr "" -#: camlibs/ptp2/ptp.c:4436 +#: camlibs/ptp2/ptp.c:4500 msgid "Dark on light" msgstr "" -#: camlibs/ptp2/ptp.c:4437 +#: camlibs/ptp2/ptp.c:4501 msgid "Light on dark" msgstr "" -#: camlibs/ptp2/ptp.c:4462 +#: camlibs/ptp2/ptp.c:4526 msgid "Lithium Ion" msgstr "" -#: camlibs/ptp2/ptp.c:4463 +#: camlibs/ptp2/ptp.c:4527 msgid "Nickel hydride" msgstr "" -#: camlibs/ptp2/ptp.c:4464 +#: camlibs/ptp2/ptp.c:4528 msgid "Nickel cadmium" msgstr "" -#: camlibs/ptp2/ptp.c:4465 +#: camlibs/ptp2/ptp.c:4529 msgid "Alkalium manganese" msgstr "" -#: camlibs/ptp2/ptp.c:4469 +#: camlibs/ptp2/ptp.c:4533 msgid "Warning Level 1" msgstr "" -#: camlibs/ptp2/ptp.c:4470 +#: camlibs/ptp2/ptp.c:4534 msgid "Emergency" msgstr "" -#: camlibs/ptp2/ptp.c:4471 +#: camlibs/ptp2/ptp.c:4535 msgid "Warning Level 0" msgstr "" -#: camlibs/ptp2/ptp.c:4474 +#: camlibs/ptp2/ptp.c:4538 msgid "Economy" msgstr "" -#: camlibs/ptp2/ptp.c:4477 +#: camlibs/ptp2/ptp.c:4541 msgid "Lossless" msgstr "" # camlibs/sierra/sierra.c:1471 camlibs/sierra/sierra.c:1479 # camlibs/sierra/sierra.c:1684 -#: camlibs/ptp2/ptp.c:4478 +#: camlibs/ptp2/ptp.c:4542 msgid "SuperFine" msgstr "超精细" -#: camlibs/ptp2/ptp.c:4497 +#: camlibs/ptp2/ptp.c:4561 msgid "Red Eye Suppression" msgstr "" -#: camlibs/ptp2/ptp.c:4498 +#: camlibs/ptp2/ptp.c:4562 msgid "Low Speed Synchronization" msgstr "" -#: camlibs/ptp2/ptp.c:4499 +#: camlibs/ptp2/ptp.c:4563 msgid "Auto + Red Eye Suppression" msgstr "" -#: camlibs/ptp2/ptp.c:4500 +#: camlibs/ptp2/ptp.c:4564 msgid "On + Red Eye Suppression" msgstr "" -#: camlibs/ptp2/ptp.c:4514 +#: camlibs/ptp2/ptp.c:4578 msgid "Distant View" msgstr "" -#: camlibs/ptp2/ptp.c:4515 +#: camlibs/ptp2/ptp.c:4579 msgid "High-Speed Shutter" msgstr "" -#: camlibs/ptp2/ptp.c:4516 +#: camlibs/ptp2/ptp.c:4580 msgid "Low-Speed Shutter" msgstr "" -#: camlibs/ptp2/ptp.c:4517 camlibs/ptp2/ptp.c:4581 +#: camlibs/ptp2/ptp.c:4581 camlibs/ptp2/ptp.c:4645 msgid "Night View" msgstr "" -#: camlibs/ptp2/ptp.c:4518 +#: camlibs/ptp2/ptp.c:4582 msgid "Grayscale" msgstr "" -#: camlibs/ptp2/ptp.c:4524 +#: camlibs/ptp2/ptp.c:4588 msgid "Pan Focus" msgstr "" -#: camlibs/ptp2/ptp.c:4528 +#: camlibs/ptp2/ptp.c:4592 msgid "Single-Frame Shooting" msgstr "" -#: camlibs/ptp2/ptp.c:4529 +#: camlibs/ptp2/ptp.c:4593 msgid "Continuous Shooting" msgstr "" -#: camlibs/ptp2/ptp.c:4530 +#: camlibs/ptp2/ptp.c:4594 msgid "Timer (Single) Shooting" msgstr "" -#: camlibs/ptp2/ptp.c:4531 +#: camlibs/ptp2/ptp.c:4595 msgid "Continuous Low-speed Shooting" msgstr "" -#: camlibs/ptp2/ptp.c:4532 +#: camlibs/ptp2/ptp.c:4596 msgid "Continuous High-speed Shooting" msgstr "" # camlibs/sierra/sierra.c:1026 camlibs/sierra/sierra.c:1032 -#: camlibs/ptp2/ptp.c:4535 camlibs/ricoh/library.c:378 +#: camlibs/ptp2/ptp.c:4599 camlibs/ricoh/library.c:378 #: camlibs/sierra/sierra.c:1165 camlibs/sierra/sierra.c:1171 msgid "2x" msgstr "2x" -#: camlibs/ptp2/ptp.c:4536 camlibs/ricoh/library.c:380 +#: camlibs/ptp2/ptp.c:4600 camlibs/ricoh/library.c:380 msgid "4x" msgstr "4x" -#: camlibs/ptp2/ptp.c:4537 +#: camlibs/ptp2/ptp.c:4601 msgid "Smooth" msgstr "" -#: camlibs/ptp2/ptp.c:4539 +#: camlibs/ptp2/ptp.c:4603 msgid "Center-weighted Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4540 +#: camlibs/ptp2/ptp.c:4604 msgid "Spot Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4541 +#: camlibs/ptp2/ptp.c:4605 msgid "Average Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4542 +#: camlibs/ptp2/ptp.c:4606 msgid "Evaluative Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4543 +#: camlibs/ptp2/ptp.c:4607 msgid "Partial Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4544 +#: camlibs/ptp2/ptp.c:4608 msgid "Center-weighted Average Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4545 +#: camlibs/ptp2/ptp.c:4609 msgid "Spot Metering Interlocked with AF Frame" msgstr "" -#: camlibs/ptp2/ptp.c:4546 +#: camlibs/ptp2/ptp.c:4610 msgid "Multi-Spot Metering" msgstr "" -#: camlibs/ptp2/ptp.c:4583 +#: camlibs/ptp2/ptp.c:4647 msgid "Low-speed shutter function not available" msgstr "" -#: camlibs/ptp2/ptp.c:4593 camlibs/ptp2/ptp.c:4599 camlibs/ptp2/ptp.c:4605 +#: camlibs/ptp2/ptp.c:4657 camlibs/ptp2/ptp.c:4663 camlibs/ptp2/ptp.c:4669 msgid "Low 2" msgstr "" -#: camlibs/ptp2/ptp.c:4597 camlibs/ptp2/ptp.c:4603 camlibs/ptp2/ptp.c:4609 +#: camlibs/ptp2/ptp.c:4661 camlibs/ptp2/ptp.c:4667 camlibs/ptp2/ptp.c:4673 msgid "High 2" msgstr "" -#: camlibs/ptp2/ptp.c:4612 +#: camlibs/ptp2/ptp.c:4676 msgid "Upper 1" msgstr "" -#: camlibs/ptp2/ptp.c:4613 +#: camlibs/ptp2/ptp.c:4677 msgid "Upper 2" msgstr "" -#: camlibs/ptp2/ptp.c:4615 +#: camlibs/ptp2/ptp.c:4679 msgid "Standard Development Parameters" msgstr "" -#: camlibs/ptp2/ptp.c:4616 +#: camlibs/ptp2/ptp.c:4680 msgid "Development Parameters 1" msgstr "" -#: camlibs/ptp2/ptp.c:4617 +#: camlibs/ptp2/ptp.c:4681 msgid "Development Parameters 2" msgstr "" -#: camlibs/ptp2/ptp.c:4618 +#: camlibs/ptp2/ptp.c:4682 msgid "Development Parameters 3" msgstr "" -#: camlibs/ptp2/ptp.c:4647 +#: camlibs/ptp2/ptp.c:4711 msgid "MlSpotPosCenter" msgstr "" -#: camlibs/ptp2/ptp.c:4648 +#: camlibs/ptp2/ptp.c:4712 msgid "MlSpotPosAfLink" msgstr "" -#: camlibs/ptp2/ptp.c:4752 +#: camlibs/ptp2/ptp.c:4816 msgid "Media Card" msgstr "" -#: camlibs/ptp2/ptp.c:4753 +#: camlibs/ptp2/ptp.c:4817 msgid "Media Card Group" msgstr "" -#: camlibs/ptp2/ptp.c:4754 +#: camlibs/ptp2/ptp.c:4818 msgid "Encounter" msgstr "" -#: camlibs/ptp2/ptp.c:4755 +#: camlibs/ptp2/ptp.c:4819 msgid "Encounter Box" msgstr "" -#: camlibs/ptp2/ptp.c:4756 +#: camlibs/ptp2/ptp.c:4820 msgid "M4A" msgstr "" -#: camlibs/ptp2/ptp.c:4757 +#: camlibs/ptp2/ptp.c:4821 msgid "Firmware" msgstr "" -#: camlibs/ptp2/ptp.c:4758 +#: camlibs/ptp2/ptp.c:4822 msgid "Windows Image Format" msgstr "" -#: camlibs/ptp2/ptp.c:4759 +#: camlibs/ptp2/ptp.c:4823 msgid "Undefined Audio" msgstr "" -#: camlibs/ptp2/ptp.c:4763 +#: camlibs/ptp2/ptp.c:4827 msgid "Audible.com Codec" msgstr "" -#: camlibs/ptp2/ptp.c:4765 +#: camlibs/ptp2/ptp.c:4829 msgid "Samsung Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4766 +#: camlibs/ptp2/ptp.c:4830 msgid "Undefined Video" msgstr "" -#: camlibs/ptp2/ptp.c:4771 +#: camlibs/ptp2/ptp.c:4835 msgid "Undefined Collection" msgstr "" -#: camlibs/ptp2/ptp.c:4772 +#: camlibs/ptp2/ptp.c:4836 msgid "Abstract Multimedia Album" msgstr "" -#: camlibs/ptp2/ptp.c:4773 +#: camlibs/ptp2/ptp.c:4837 msgid "Abstract Image Album" msgstr "" -#: camlibs/ptp2/ptp.c:4774 +#: camlibs/ptp2/ptp.c:4838 msgid "Abstract Audio Album" msgstr "" -#: camlibs/ptp2/ptp.c:4775 +#: camlibs/ptp2/ptp.c:4839 msgid "Abstract Video Album" msgstr "" -#: camlibs/ptp2/ptp.c:4776 +#: camlibs/ptp2/ptp.c:4840 msgid "Abstract Audio Video Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4777 +#: camlibs/ptp2/ptp.c:4841 msgid "Abstract Contact Group" msgstr "" -#: camlibs/ptp2/ptp.c:4778 +#: camlibs/ptp2/ptp.c:4842 msgid "Abstract Message Folder" msgstr "" -#: camlibs/ptp2/ptp.c:4779 +#: camlibs/ptp2/ptp.c:4843 msgid "Abstract Chaptered Production" msgstr "" -#: camlibs/ptp2/ptp.c:4780 +#: camlibs/ptp2/ptp.c:4844 msgid "Abstract Audio Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4781 +#: camlibs/ptp2/ptp.c:4845 msgid "Abstract Video Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4782 +#: camlibs/ptp2/ptp.c:4846 msgid "Abstract Mediacast" msgstr "" -#: camlibs/ptp2/ptp.c:4783 +#: camlibs/ptp2/ptp.c:4847 msgid "WPL Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4784 +#: camlibs/ptp2/ptp.c:4848 msgid "M3U Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4785 +#: camlibs/ptp2/ptp.c:4849 msgid "MPL Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4786 +#: camlibs/ptp2/ptp.c:4850 msgid "ASX Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4787 +#: camlibs/ptp2/ptp.c:4851 msgid "PLS Playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4788 +#: camlibs/ptp2/ptp.c:4852 msgid "Undefined Document" msgstr "" -#: camlibs/ptp2/ptp.c:4789 +#: camlibs/ptp2/ptp.c:4853 msgid "Abstract Document" msgstr "" -#: camlibs/ptp2/ptp.c:4790 +#: camlibs/ptp2/ptp.c:4854 msgid "XMLDocument" msgstr "" -#: camlibs/ptp2/ptp.c:4791 +#: camlibs/ptp2/ptp.c:4855 msgid "Microsoft Word Document" msgstr "" -#: camlibs/ptp2/ptp.c:4792 +#: camlibs/ptp2/ptp.c:4856 msgid "MHT Compiled HTML Document" msgstr "" -#: camlibs/ptp2/ptp.c:4793 +#: camlibs/ptp2/ptp.c:4857 msgid "Microsoft Excel Spreadsheet (.xls)" msgstr "" -#: camlibs/ptp2/ptp.c:4794 +#: camlibs/ptp2/ptp.c:4858 msgid "Microsoft Powerpoint (.ppt)" msgstr "" -#: camlibs/ptp2/ptp.c:4795 +#: camlibs/ptp2/ptp.c:4859 msgid "Undefined Message" msgstr "" -#: camlibs/ptp2/ptp.c:4796 +#: camlibs/ptp2/ptp.c:4860 msgid "Abstract Message" msgstr "" -#: camlibs/ptp2/ptp.c:4797 +#: camlibs/ptp2/ptp.c:4861 msgid "Undefined Contact" msgstr "" -#: camlibs/ptp2/ptp.c:4798 +#: camlibs/ptp2/ptp.c:4862 msgid "Abstract Contact" msgstr "" -#: camlibs/ptp2/ptp.c:4799 +#: camlibs/ptp2/ptp.c:4863 msgid "vCard2" msgstr "" -#: camlibs/ptp2/ptp.c:4800 +#: camlibs/ptp2/ptp.c:4864 msgid "vCard3" msgstr "" -#: camlibs/ptp2/ptp.c:4801 +#: camlibs/ptp2/ptp.c:4865 msgid "Undefined Calendar Item" msgstr "" -#: camlibs/ptp2/ptp.c:4802 +#: camlibs/ptp2/ptp.c:4866 msgid "Abstract Calendar Item" msgstr "" -#: camlibs/ptp2/ptp.c:4803 +#: camlibs/ptp2/ptp.c:4867 msgid "vCalendar1" msgstr "" -#: camlibs/ptp2/ptp.c:4804 +#: camlibs/ptp2/ptp.c:4868 msgid "vCalendar2" msgstr "" -#: camlibs/ptp2/ptp.c:4805 +#: camlibs/ptp2/ptp.c:4869 msgid "Undefined Windows Executable" msgstr "" -#: camlibs/ptp2/ptp.c:4806 +#: camlibs/ptp2/ptp.c:4870 msgid "Media Cast" msgstr "" -#: camlibs/ptp2/ptp.c:4807 +#: camlibs/ptp2/ptp.c:4871 msgid "Section" msgstr "" -#: camlibs/ptp2/ptp.c:4846 +#: camlibs/ptp2/ptp.c:4910 #, c-format msgid "Unknown(%04x)" msgstr "" -#: camlibs/ptp2/ptp.c:4854 +#: camlibs/ptp2/ptp.c:4918 msgid "get device info" msgstr "" -#: camlibs/ptp2/ptp.c:4855 +#: camlibs/ptp2/ptp.c:4919 msgid "Open session" msgstr "" -#: camlibs/ptp2/ptp.c:4856 +#: camlibs/ptp2/ptp.c:4920 msgid "Close session" msgstr "" -#: camlibs/ptp2/ptp.c:4857 +#: camlibs/ptp2/ptp.c:4921 msgid "Get storage IDs" msgstr "" -#: camlibs/ptp2/ptp.c:4858 +#: camlibs/ptp2/ptp.c:4922 msgid "Get storage info" msgstr "" -#: camlibs/ptp2/ptp.c:4859 +#: camlibs/ptp2/ptp.c:4923 msgid "Get number of objects" msgstr "" -#: camlibs/ptp2/ptp.c:4860 +#: camlibs/ptp2/ptp.c:4924 msgid "Get object handles" msgstr "" -#: camlibs/ptp2/ptp.c:4861 +#: camlibs/ptp2/ptp.c:4925 msgid "Get object info" msgstr "" -#: camlibs/ptp2/ptp.c:4862 +#: camlibs/ptp2/ptp.c:4926 msgid "Get object" msgstr "" -#: camlibs/ptp2/ptp.c:4863 +#: camlibs/ptp2/ptp.c:4927 msgid "Get thumbnail" msgstr "" -#: camlibs/ptp2/ptp.c:4864 +#: camlibs/ptp2/ptp.c:4928 msgid "Delete object" msgstr "" -#: camlibs/ptp2/ptp.c:4865 +#: camlibs/ptp2/ptp.c:4929 msgid "Send object info" msgstr "" -#: camlibs/ptp2/ptp.c:4866 +#: camlibs/ptp2/ptp.c:4930 msgid "Send object" msgstr "" -#: camlibs/ptp2/ptp.c:4867 +#: camlibs/ptp2/ptp.c:4931 msgid "Initiate capture" msgstr "" -#: camlibs/ptp2/ptp.c:4868 +#: camlibs/ptp2/ptp.c:4932 msgid "Format storage" msgstr "" -#: camlibs/ptp2/ptp.c:4869 +#: camlibs/ptp2/ptp.c:4933 msgid "Reset device" msgstr "" -#: camlibs/ptp2/ptp.c:4870 +#: camlibs/ptp2/ptp.c:4934 msgid "Self test device" msgstr "" -#: camlibs/ptp2/ptp.c:4871 +#: camlibs/ptp2/ptp.c:4935 msgid "Set object protection" msgstr "" -#: camlibs/ptp2/ptp.c:4872 +#: camlibs/ptp2/ptp.c:4936 msgid "Power down device" msgstr "" -#: camlibs/ptp2/ptp.c:4873 +#: camlibs/ptp2/ptp.c:4937 msgid "Get device property description" msgstr "" -#: camlibs/ptp2/ptp.c:4874 +#: camlibs/ptp2/ptp.c:4938 msgid "Get device property value" msgstr "" -#: camlibs/ptp2/ptp.c:4875 +#: camlibs/ptp2/ptp.c:4939 msgid "Set device property value" msgstr "" -#: camlibs/ptp2/ptp.c:4876 +#: camlibs/ptp2/ptp.c:4940 msgid "Reset device property value" msgstr "" -#: camlibs/ptp2/ptp.c:4877 +#: camlibs/ptp2/ptp.c:4941 msgid "Terminate open capture" msgstr "" -#: camlibs/ptp2/ptp.c:4878 +#: camlibs/ptp2/ptp.c:4942 msgid "Move object" msgstr "" -#: camlibs/ptp2/ptp.c:4879 +#: camlibs/ptp2/ptp.c:4943 msgid "Copy object" msgstr "" -#: camlibs/ptp2/ptp.c:4880 +#: camlibs/ptp2/ptp.c:4944 msgid "Get partial object" msgstr "" -#: camlibs/ptp2/ptp.c:4881 +#: camlibs/ptp2/ptp.c:4945 msgid "Initiate open capture" msgstr "" -#: camlibs/ptp2/ptp.c:4888 +#: camlibs/ptp2/ptp.c:4952 msgid "Get object properties supported" msgstr "" -#: camlibs/ptp2/ptp.c:4889 +#: camlibs/ptp2/ptp.c:4953 msgid "Get object property description" msgstr "" -#: camlibs/ptp2/ptp.c:4890 +#: camlibs/ptp2/ptp.c:4954 msgid "Get object property value" msgstr "" -#: camlibs/ptp2/ptp.c:4891 +#: camlibs/ptp2/ptp.c:4955 msgid "Set object property value" msgstr "" -#: camlibs/ptp2/ptp.c:4892 +#: camlibs/ptp2/ptp.c:4956 msgid "Get object property list" msgstr "" -#: camlibs/ptp2/ptp.c:4893 +#: camlibs/ptp2/ptp.c:4957 msgid "Set object property list" msgstr "" -#: camlibs/ptp2/ptp.c:4894 +#: camlibs/ptp2/ptp.c:4958 msgid "Get interdependent property description" msgstr "" -#: camlibs/ptp2/ptp.c:4895 +#: camlibs/ptp2/ptp.c:4959 msgid "Send object property list" msgstr "" -#: camlibs/ptp2/ptp.c:4896 +#: camlibs/ptp2/ptp.c:4960 msgid "Get object references" msgstr "" -#: camlibs/ptp2/ptp.c:4897 +#: camlibs/ptp2/ptp.c:4961 msgid "Set object references" msgstr "" -#: camlibs/ptp2/ptp.c:4898 +#: camlibs/ptp2/ptp.c:4962 msgid "Update device firmware" msgstr "" -#: camlibs/ptp2/ptp.c:4899 +#: camlibs/ptp2/ptp.c:4963 msgid "Skip to next position in playlist" msgstr "" -#: camlibs/ptp2/ptp.c:4902 +#: camlibs/ptp2/ptp.c:4966 msgid "Get secure time challenge" msgstr "" -#: camlibs/ptp2/ptp.c:4903 +#: camlibs/ptp2/ptp.c:4967 msgid "Get secure time response" msgstr "" -#: camlibs/ptp2/ptp.c:4904 +#: camlibs/ptp2/ptp.c:4968 msgid "Set license response" msgstr "" -#: camlibs/ptp2/ptp.c:4905 +#: camlibs/ptp2/ptp.c:4969 msgid "Get sync list" msgstr "" -#: camlibs/ptp2/ptp.c:4906 +#: camlibs/ptp2/ptp.c:4970 msgid "Send meter challenge query" msgstr "" -#: camlibs/ptp2/ptp.c:4907 +#: camlibs/ptp2/ptp.c:4971 msgid "Get meter challenge" msgstr "" -#: camlibs/ptp2/ptp.c:4908 +#: camlibs/ptp2/ptp.c:4972 msgid "Get meter response" msgstr "" -#: camlibs/ptp2/ptp.c:4909 +#: camlibs/ptp2/ptp.c:4973 msgid "Clean data store" msgstr "" -#: camlibs/ptp2/ptp.c:4910 +#: camlibs/ptp2/ptp.c:4974 msgid "Get license state" msgstr "" -#: camlibs/ptp2/ptp.c:4911 +#: camlibs/ptp2/ptp.c:4975 msgid "Send WMDRM-PD Command" msgstr "" -#: camlibs/ptp2/ptp.c:4912 +#: camlibs/ptp2/ptp.c:4976 msgid "Send WMDRM-PD Request" msgstr "" -#: camlibs/ptp2/ptp.c:4915 +#: camlibs/ptp2/ptp.c:4979 msgid "Report Added/Deleted Items" msgstr "" -#: camlibs/ptp2/ptp.c:4916 +#: camlibs/ptp2/ptp.c:4980 msgid "Report Acquired Items" msgstr "" -#: camlibs/ptp2/ptp.c:4917 +#: camlibs/ptp2/ptp.c:4981 msgid "Get transferable playlist types" msgstr "" -#: camlibs/ptp2/ptp.c:4920 +#: camlibs/ptp2/ptp.c:4984 msgid "Send WMDRM-PD Application Request" msgstr "" -#: camlibs/ptp2/ptp.c:4921 +#: camlibs/ptp2/ptp.c:4985 msgid "Get WMDRM-PD Application Response" msgstr "" -#: camlibs/ptp2/ptp.c:4922 +#: camlibs/ptp2/ptp.c:4986 msgid "Enable trusted file operations" msgstr "" -#: camlibs/ptp2/ptp.c:4923 +#: camlibs/ptp2/ptp.c:4987 msgid "Disable trusted file operations" msgstr "" -#: camlibs/ptp2/ptp.c:4924 +#: camlibs/ptp2/ptp.c:4988 msgid "End trusted application session" msgstr "" -#: camlibs/ptp2/ptp.c:4927 +#: camlibs/ptp2/ptp.c:4991 msgid "Open Media Session" msgstr "" -#: camlibs/ptp2/ptp.c:4928 +#: camlibs/ptp2/ptp.c:4992 msgid "Close Media Session" msgstr "" -#: camlibs/ptp2/ptp.c:4929 +#: camlibs/ptp2/ptp.c:4993 msgid "Get Next Data Block" msgstr "" -#: camlibs/ptp2/ptp.c:4930 +#: camlibs/ptp2/ptp.c:4994 msgid "Set Current Time Position" msgstr "" -#: camlibs/ptp2/ptp.c:4933 +#: camlibs/ptp2/ptp.c:4997 msgid "Send Registration Request" msgstr "" -#: camlibs/ptp2/ptp.c:4934 +#: camlibs/ptp2/ptp.c:4998 msgid "Get Registration Response" msgstr "" -#: camlibs/ptp2/ptp.c:4935 +#: camlibs/ptp2/ptp.c:4999 msgid "Get Proximity Challenge" msgstr "" -#: camlibs/ptp2/ptp.c:4936 +#: camlibs/ptp2/ptp.c:5000 msgid "Send Proximity Response" msgstr "" -#: camlibs/ptp2/ptp.c:4937 +#: camlibs/ptp2/ptp.c:5001 msgid "Send WMDRM-ND License Request" msgstr "" -#: camlibs/ptp2/ptp.c:4938 +#: camlibs/ptp2/ptp.c:5002 msgid "Get WMDRM-ND License Response" msgstr "" -#: camlibs/ptp2/ptp.c:4941 +#: camlibs/ptp2/ptp.c:5005 msgid "Process WFC Object" msgstr "" -#: camlibs/ptp2/ptp.c:4964 +#: camlibs/ptp2/ptp.c:5028 #, c-format msgid "Unknown (%04x)" msgstr "未知 (%04x)" @@ -9857,6 +10037,16 @@ msgid "Red-eye Reduction" msgstr "消红眼" +# camlibs/sierra/sierra.c:890 camlibs/sierra/sierra.c:901 +# camlibs/sierra/sierra.c:1198 camlibs/sierra/sierra.c:1400 +# camlibs/sierra/sierra.c:1410 camlibs/sierra/sierra.c:1637 +#: camlibs/sierra/epson-desc.c:155 camlibs/sierra/sierra.c:1029 +#: camlibs/sierra/sierra.c:1040 camlibs/sierra/sierra.c:1337 +#: camlibs/sierra/sierra.c:1539 camlibs/sierra/sierra.c:1549 +#: camlibs/sierra/sierra.c:1776 +msgid "Slow Sync" +msgstr "慢同步" + # camlibs/polaroid/pdc700.c:161 #: camlibs/sierra/epson-desc.c:160 camlibs/sierra/nikon-desc.c:243 #: camlibs/sierra/olympus-desc.c:506 camlibs/sierra/olympus-desc.c:525 @@ -9961,7 +10151,7 @@ msgstr "" # camlibs/konica/konica.c:80 -#: camlibs/sierra/library.c:147 camlibs/sierra/library.c:1372 +#: camlibs/sierra/library.c:147 camlibs/sierra/library.c:1373 msgid "No memory card present" msgstr "未插内存卡" @@ -10022,37 +10212,37 @@ msgid "Got unexpected result 0x%x. Please contact %s." msgstr "得到意外的结果 0x%x。请联系 %s。" -#: camlibs/sierra/library.c:1016 +#: camlibs/sierra/library.c:1017 #, c-format msgid "Received unexpected answer (%i). Please contact %s." msgstr "收到意外的应答 (%i)。请联系 %s。" -#: camlibs/sierra/library.c:1078 +#: camlibs/sierra/library.c:1079 #, c-format msgid "Could not get register %i. Please contact %s." msgstr "无法读取寄存器 %i。请联系 %s。" -#: camlibs/sierra/library.c:1098 camlibs/sierra/library.c:1118 +#: camlibs/sierra/library.c:1099 camlibs/sierra/library.c:1119 msgid "Too many retries failed." msgstr "重试失败过多。" # camlibs/sierra/library.c:923 -#: camlibs/sierra/library.c:1158 +#: camlibs/sierra/library.c:1159 msgid "Sending data..." msgstr "正在发送数据..." -#: camlibs/sierra/library.c:1217 +#: camlibs/sierra/library.c:1218 #, c-format msgid "" "recursive calls are not supported by the sierra driver! Please contact %s." msgstr "Sierra 驱动程序不支持递归调用！请联系 %s。" -#: camlibs/sierra/library.c:1272 +#: camlibs/sierra/library.c:1273 #, c-format msgid "Could not get string register %i. Please contact %s." msgstr "无法读取字符串寄存器 %i。请联系 %s。" -#: camlibs/sierra/library.c:1503 +#: camlibs/sierra/library.c:1504 #, c-format msgid "Expected 32 bytes, got %i. Please contact %s." msgstr "需要 32 字节，得到 %i。请连线 %s。" @@ -10914,7 +11104,7 @@ "from the picture frame." msgstr "" -#: camlibs/st2205/library.c:548 camlibs/st2205/library.c:572 +#: camlibs/st2205/library.c:550 camlibs/st2205/library.c:574 msgid "Orientation" msgstr "" @@ -11209,95 +11399,88 @@ msgid "The path '%s' is not absolute." msgstr "路径“%s”不是绝对路径。" -# libgphoto2/gphoto2-filesys.c:594 -#: libgphoto2/gphoto2-filesys.c:744 -#, c-format -msgid "" -"Could not append '%s' to folder '%s' because this file already exists." -msgstr "由于“%s”已存在，所以无法将其附加到文件夹“%s”中。" - # libgphoto2/gphoto2-filesys.c:970 -#: libgphoto2/gphoto2-filesys.c:1109 +#: libgphoto2/gphoto2-filesys.c:1130 #, c-format msgid "" "You have been trying to delete '%s' from folder '%s', but the filesystem " "does not support deletion of files." msgstr "您试图从文件夹“%2$s”中删除“%1$s”，但文件系统不支持删除文件。" -#: libgphoto2/gphoto2-filesys.c:1118 +#: libgphoto2/gphoto2-filesys.c:1139 #, c-format msgid "Deleting '%s' from folder '%s'..." msgstr "正在删除 '%s' 从文件夹 '%s'..." -#: libgphoto2/gphoto2-filesys.c:1246 +#: libgphoto2/gphoto2-filesys.c:1267 #, c-format msgid "" "There are still subfolders in folder '%s/%s' that you are trying to remove." msgstr "仍然有子文件夹在您要移除的文件夹 '%s/%s'。" -#: libgphoto2/gphoto2-filesys.c:1251 +#: libgphoto2/gphoto2-filesys.c:1272 #, c-format msgid "" "There are still files in folder '%s/%s' that you are trying to remove." msgstr "仍然有文件在您要移除的文件夹 '%s/%s'。" # libgphoto2/gphoto2-filesys.c:1117 -#: libgphoto2/gphoto2-filesys.c:1287 +#: libgphoto2/gphoto2-filesys.c:1308 msgid "The filesystem does not support upload of files." msgstr "文件系统不支持上载文件。" -#: libgphoto2/gphoto2-filesys.c:1340 +#: libgphoto2/gphoto2-filesys.c:1361 #, c-format msgid "" "Folder '%s' only contains %i files, but you requested a file with number %i." msgstr "文件夹 '%s' 只包含 %i 文件，但您需要一个文件，它的编号是 %i。" # libgphoto2/gphoto2-filesys.c:1199 -#: libgphoto2/gphoto2-filesys.c:1388 +#: libgphoto2/gphoto2-filesys.c:1409 #, c-format msgid "File '%s' could not be found in folder '%s'." msgstr "在文件夹“%2$s”中无法找到文件“%1$s”。" # libgphoto2/gphoto2-filesys.c:1282 -#: libgphoto2/gphoto2-filesys.c:1506 +#: libgphoto2/gphoto2-filesys.c:1526 #, c-format msgid "Could not find file '%s'." msgstr "无法找到文件“%s”。" # libgphoto2/gphoto2-filesys.c:1407 -#: libgphoto2/gphoto2-filesys.c:1632 +#: libgphoto2/gphoto2-filesys.c:1652 msgid "The filesystem doesn't support getting files" msgstr "文件系统不支持获取文件" # libgphoto2/gphoto2-filesys.c:1442 libgphoto2/gphoto2-filesys.c:1764 -#: libgphoto2/gphoto2-filesys.c:1665 libgphoto2/gphoto2-filesys.c:2166 -#: libgphoto2/gphoto2-filesys.c:2324 +#: libgphoto2/gphoto2-filesys.c:1685 libgphoto2/gphoto2-filesys.c:2186 +#: libgphoto2/gphoto2-filesys.c:2344 #, c-format msgid "Unknown file type %i." msgstr "未知的文件类型 %i。" # libgphoto2/gphoto2-filesys.c:1446 -#: libgphoto2/gphoto2-filesys.c:1669 +#: libgphoto2/gphoto2-filesys.c:1689 #, c-format msgid "Downloading '%s' from folder '%s'..." msgstr "正在从文件夹“%2$s”下载“%1$s”..." # libgphoto2/gphoto2-filesys.c:1656 -#: libgphoto2/gphoto2-filesys.c:1924 +#: libgphoto2/gphoto2-filesys.c:1944 msgid "The filesystem doesn't support getting file information" msgstr "文件系统不支持获取文件信息" # libgphoto2/gphoto2-filesys.c:1867 -#: libgphoto2/gphoto2-filesys.c:2434 +#: libgphoto2/gphoto2-filesys.c:2454 msgid "The filesystem doesn't support setting file information" msgstr "文件系统不支持设置文件信息" # libgphoto2/gphoto2-filesys.c:1890 -#: libgphoto2/gphoto2-filesys.c:2456 +#: libgphoto2/gphoto2-filesys.c:2476 msgid "Read-only file attributes like width and height can not be changed." msgstr "无法改变像宽度和高度这样的只读文件属性。" -#: libgphoto2/gphoto2-filesys.c:2539 +#: libgphoto2/gphoto2-filesys.c:2559 msgid "The filesystem doesn't support getting storage information" msgstr "这个文件系统不支持获得存储信息" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:32.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libgphoto2_port-0.po 2012-03-23 07:32:55.000000000 +0000 @@ -6,99 +6,106 @@ msgstr "" "Project-Id-Version: libgphoto2_port\n" "Report-Msgid-Bugs-To: gphoto-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-03-13 23:34+0100\n" +"POT-Creation-Date: 2012-02-22 22:21+0100\n" "PO-Revision-Date: 2010-03-24 09:33+0000\n" "Last-Translator: Jianle Ma \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: 2012-02-21 18:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Launchpad-Export-Date: 2012-03-22 18:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: libgphoto2_port/gphoto2-port-info-list.c:213 +#: libgphoto2_port/gphoto2-port-info-list.c:214 #, c-format msgid "Called for filename '%s'." msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:218 +#: libgphoto2_port/gphoto2-port-info-list.c:219 #, c-format msgid "Could not load '%s': '%s'." msgstr "无法装入'%s': '%s'。" -#: libgphoto2_port/gphoto2-port-info-list.c:226 +#: libgphoto2_port/gphoto2-port-info-list.c:227 #, c-format msgid "Could not find some functions in '%s': '%s'." msgstr "在'%s': '%s'中无法找到函数。" -#: libgphoto2_port/gphoto2-port-info-list.c:238 +#: libgphoto2_port/gphoto2-port-info-list.c:239 #, c-format msgid "'%s' already loaded" msgstr "'%s' 已装入" -#: libgphoto2_port/gphoto2-port-info-list.c:247 +#: libgphoto2_port/gphoto2-port-info-list.c:248 #, c-format msgid "Could not load port driver list: '%s'." msgstr "无法装入端口驱动表'%s'。" -#: libgphoto2_port/gphoto2-port-info-list.c:254 +#: libgphoto2_port/gphoto2-port-info-list.c:255 #, c-format msgid "Loaded '%s' ('%s') from '%s'." msgstr "从 '%3$s' 加载了 '%1$s' （'%2$s'）" -#: libgphoto2_port/gphoto2-port-info-list.c:286 +#: libgphoto2_port/gphoto2-port-info-list.c:287 #, c-format msgid "Using ltdl to load io-drivers from '%s'..." msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:312 +#: libgphoto2_port/gphoto2-port-info-list.c:314 #, c-format -msgid "Counting entries (%i available)..." -msgstr "" +msgid "Counting entry (%i available)..." +msgid_plural "Counting entries (%i available)..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port-info-list.c:321 +#: libgphoto2_port/gphoto2-port-info-list.c:326 #, c-format -msgid "%i regular entries available." -msgstr "" +msgid "%i regular entry available." +msgid_plural "%i regular entries available." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port-info-list.c:351 +#: libgphoto2_port/gphoto2-port-info-list.c:359 #, c-format -msgid "Looking for path '%s' (%i entries available)..." -msgstr "正在查找路径 '%s' （%i 个入口可用）..." +msgid "Looking for path '%s' (%i entry available)..." +msgid_plural "Looking for path '%s' (%i entries available)..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port-info-list.c:363 +#: libgphoto2_port/gphoto2-port-info-list.c:373 #, c-format msgid "Starting regex search for '%s'..." msgstr "正在为 '%s' 开始正则表达式搜索..." -#: libgphoto2_port/gphoto2-port-info-list.c:371 +#: libgphoto2_port/gphoto2-port-info-list.c:381 #, c-format msgid "Trying '%s'..." msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:392 +#: libgphoto2_port/gphoto2-port-info-list.c:402 msgid "regcomp failed" msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:403 +#: libgphoto2_port/gphoto2-port-info-list.c:413 #, c-format msgid "re_match failed (%i)" msgstr "再匹配失败 (%i)(_M)" -#: libgphoto2_port/gphoto2-port-info-list.c:411 +#: libgphoto2_port/gphoto2-port-info-list.c:421 msgid "regexec failed" msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:417 +#: libgphoto2_port/gphoto2-port-info-list.c:427 msgid "Generic Port" msgstr "通用端口" -#: libgphoto2_port/gphoto2-port-info-list.c:441 +#: libgphoto2_port/gphoto2-port-info-list.c:451 #, c-format msgid "Looking up entry '%s'..." msgstr "" -#: libgphoto2_port/gphoto2-port-info-list.c:471 +#: libgphoto2_port/gphoto2-port-info-list.c:481 #, c-format msgid "Getting info of entry %i (%i available)..." msgstr "" @@ -195,225 +202,238 @@ msgid "Unknown error" msgstr "未知的错误" -#: libgphoto2_port/gphoto2-port.c:55 +#: libgphoto2_port/gphoto2-port.c:56 #, c-format msgid "The operation '%s' is not supported by this device" msgstr "该设备不支持操作‘%s’" -#: libgphoto2_port/gphoto2-port.c:56 +#: libgphoto2_port/gphoto2-port.c:57 msgid "The port has not yet been initialized" msgstr "端口尚未初始化" -#: libgphoto2_port/gphoto2-port.c:87 +#: libgphoto2_port/gphoto2-port.c:88 msgid "Creating new device..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:165 +#: libgphoto2_port/gphoto2-port.c:166 #, c-format msgid "Could not load '%s' ('%s')." msgstr "" -#: libgphoto2_port/gphoto2-port.c:175 +#: libgphoto2_port/gphoto2-port.c:176 #, c-format msgid "Could not find 'gp_port_library_operations' in '%s' ('%s')" msgstr "" -#: libgphoto2_port/gphoto2-port.c:265 +#: libgphoto2_port/gphoto2-port.c:266 #, c-format msgid "Opening %s port..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:287 +#: libgphoto2_port/gphoto2-port.c:288 msgid "Closing port..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:309 +#: libgphoto2_port/gphoto2-port.c:310 msgid "Freeing port..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:356 +#: libgphoto2_port/gphoto2-port.c:358 #, c-format -msgid "Writing %i=0x%x byte(s) to port..." -msgstr "" +msgid "Writing %i=0x%x byte to port..." +msgid_plural "Writing %i=0x%x bytes to port..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:369 +#: libgphoto2_port/gphoto2-port.c:373 #, c-format -msgid "Could only write %i out of %i byte(s)" -msgstr "只能写入 %i 字节（共 %i 字节）" +msgid "Could only write %i out of %i byte" +msgid_plural "Could only write %i out of %i bytes" +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:392 +#: libgphoto2_port/gphoto2-port.c:398 #, c-format -msgid "Reading %i=0x%x bytes from port..." -msgstr "" +msgid "Reading %i=0x%x byte from port..." +msgid_plural "Reading %i=0x%x bytes from port..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:403 libgphoto2_port/gphoto2-port.c:440 -#: libgphoto2_port/gphoto2-port.c:480 libgphoto2_port/gphoto2-port.c:905 +#: libgphoto2_port/gphoto2-port.c:412 libgphoto2_port/gphoto2-port.c:453 +#: libgphoto2_port/gphoto2-port.c:493 libgphoto2_port/gphoto2-port.c:929 +#: libgphoto2_port/gphoto2-port.c:1012 libgphoto2_port/gphoto2-port.c:1097 #, c-format -msgid "Could only read %i out of %i byte(s)" -msgstr "" +msgid "Could only read %i out of %i byte" +msgid_plural "Could only read %i out of %i bytes" +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:429 +#: libgphoto2_port/gphoto2-port.c:439 #, c-format -msgid "Reading %i=0x%x bytes from interrupt endpoint..." -msgstr "" +msgid "Reading %i=0x%x byte from interrupt endpoint..." +msgid_plural "Reading %i=0x%x bytes from interrupt endpoint..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:490 +#: libgphoto2_port/gphoto2-port.c:505 #, c-format -msgid "Reading %i=0x%x bytes from interrupt endpoint (fast)..." -msgstr "" +msgid "Reading %i=0x%x byte from interrupt endpoint (fast)..." +msgid_plural "Reading %i=0x%x bytes from interrupt endpoint (fast)..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:515 +#: libgphoto2_port/gphoto2-port.c:533 #, c-format -msgid "Setting timeout to %i millisecond(s)..." -msgstr "" +msgid "Setting timeout to %i millisecond..." +msgid_plural "Setting timeout to %i milliseconds..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:551 +#: libgphoto2_port/gphoto2-port.c:571 msgid "Getting timeout..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:555 +#: libgphoto2_port/gphoto2-port.c:575 #, c-format msgid "Current timeout: %i milliseconds" msgstr "" -#: libgphoto2_port/gphoto2-port.c:577 +#: libgphoto2_port/gphoto2-port.c:597 msgid "Setting settings..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:638 +#: libgphoto2_port/gphoto2-port.c:658 #, c-format msgid "Getting level of pin %i..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:647 +#: libgphoto2_port/gphoto2-port.c:667 #, c-format msgid "Level of pin %i: %i" msgstr "" -#: libgphoto2_port/gphoto2-port.c:673 +#: libgphoto2_port/gphoto2-port.c:693 msgid "low" msgstr "" -#: libgphoto2_port/gphoto2-port.c:674 +#: libgphoto2_port/gphoto2-port.c:694 msgid "high" msgstr "" -#: libgphoto2_port/gphoto2-port.c:700 +#: libgphoto2_port/gphoto2-port.c:720 #, c-format msgid "Setting pin %i (%s: '%s') to '%s'..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:727 +#: libgphoto2_port/gphoto2-port.c:748 #, c-format -msgid "Sending break (%i milliseconds)..." -msgstr "" +msgid "Sending break (%i millisecond)..." +msgid_plural "Sending break (%i milliseconds)..." +msgstr[0] "" +msgstr[1] "" -#: libgphoto2_port/gphoto2-port.c:753 +#: libgphoto2_port/gphoto2-port.c:776 msgid "Flushing port..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:827 +#: libgphoto2_port/gphoto2-port.c:850 msgid "Clear halt..." msgstr "清除中止..." -#: libgphoto2_port/gphoto2-port.c:858 +#: libgphoto2_port/gphoto2-port.c:881 #, c-format msgid "Writing message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:893 +#: libgphoto2_port/gphoto2-port.c:916 #, c-format msgid "Reading message (request=0x%x value=0x%x index=0x%x size=%i=0x%x)..." msgstr "" -#: libgphoto2_port/gphoto2-port.c:900 -msgid "msg_read" -msgstr "读消息" - -#: libgphoto2_port/gphoto2-port.c:1205 +#: libgphoto2_port/gphoto2-port.c:1231 msgid "No error description available" msgstr "没有可用的错误描述" -#: serial/unix.c:241 +#: serial/unix.c:239 #, c-format msgid "Could not lock device '%s'" msgstr "无法锁定设备‘%s’" -#: serial/unix.c:251 usbdiskdirect/linux.c:94 usbscsi/linux.c:95 +#: serial/unix.c:249 usbdiskdirect/linux.c:94 usbscsi/linux.c:95 #, c-format msgid "Device '%s' is locked by pid %d" msgstr "设备‘%s’已经被进行号为 %d 的进程锁定" -#: serial/unix.c:254 usbdiskdirect/linux.c:97 usbscsi/linux.c:98 +#: serial/unix.c:252 usbdiskdirect/linux.c:97 usbscsi/linux.c:98 #, c-format msgid "Device '%s' could not be locked (dev_lock returned %d)" msgstr "无法锁定设备‘%s’(dev_lock 返回 %d)" -#: serial/unix.c:288 +#: serial/unix.c:286 #, c-format msgid "Device '%s' could not be unlocked." msgstr "无法解锁设备‘%s’。" -#: serial/unix.c:300 usbdiskdirect/linux.c:126 usbscsi/linux.c:127 +#: serial/unix.c:298 usbdiskdirect/linux.c:126 usbscsi/linux.c:127 #, c-format msgid "Device '%s' could not be unlocked as it is locked by pid %d." msgstr "由于设备‘%s’已被进程号为 %d 的进程锁定，所以无法锁定。" -#: serial/unix.c:304 usbdiskdirect/linux.c:130 usbscsi/linux.c:131 +#: serial/unix.c:302 usbdiskdirect/linux.c:130 usbscsi/linux.c:131 #, c-format msgid "Device '%s' could not be unlocked (dev_unlock returned %d)" msgstr "无法解锁设备‘%s’(dev_unlock 返回 %d)" -#: serial/unix.c:385 +#: serial/unix.c:383 #, c-format msgid "Serial Port %i" msgstr "串口 %i" -#: serial/unix.c:476 usbdiskdirect/linux.c:285 usbscsi/linux.c:287 +#: serial/unix.c:474 usbdiskdirect/linux.c:285 usbscsi/linux.c:287 #, c-format msgid "Failed to open '%s' (%m)." msgstr "打开‘%s’(%m)失败。" -#: serial/unix.c:494 usbdiskdirect/linux.c:299 usbscsi/linux.c:301 +#: serial/unix.c:492 usbdiskdirect/linux.c:299 usbscsi/linux.c:301 #, c-format msgid "Could not close '%s' (%m)." msgstr "无法关闭‘%s’(%m)。" -#: serial/unix.c:548 +#: serial/unix.c:546 #, c-format msgid "Could not write to port (%m)" msgstr "无法写端口 (%m)" -#: serial/unix.c:625 +#: serial/unix.c:623 msgid "Parity error." msgstr "奇偶错误。" -#: serial/unix.c:629 +#: serial/unix.c:627 #, c-format msgid "Unexpected parity response sequence 0xff 0x%02x." msgstr "意外的奇偶应答序列 0xff 0x%02x。" -#: serial/unix.c:672 +#: serial/unix.c:670 #, c-format msgid "Unknown pin %i." msgstr "未知插脚 %i。" -#: serial/unix.c:694 +#: serial/unix.c:692 #, c-format msgid "Could not get level of pin %i (%m)." msgstr "无法获取插脚 %i 的级别 (%m)。" -#: serial/unix.c:729 +#: serial/unix.c:727 #, c-format msgid "Could not set level of pin %i to %i (%m)." msgstr "无法将插脚 %i 的级别设置为 %i (%m)。" -#: serial/unix.c:754 +#: serial/unix.c:752 #, c-format msgid "Could not flush '%s' (%m)." msgstr "无法刷新‘%s’(%m)。" -#: serial/unix.c:867 +#: serial/unix.c:865 #, c-format msgid "Could not set the baudrate to %d" msgstr "无法设置将波特率设置为 %d" @@ -423,7 +443,7 @@ msgid "Could not open USB device (%m)." msgstr "无法打开 USB 设备 (%m)。" -#: usb/libusb.c:260 +#: usb/libusb.c:260 libusb1/libusb1.c:305 msgid "Camera is already in use." msgstr "" @@ -437,7 +457,7 @@ msgid "Could not detach kernel driver '%s' of camera device." msgstr "" -#: usb/libusb.c:273 +#: usb/libusb.c:273 libusb1/libusb1.c:321 msgid "Could not query kernel driver of device." msgstr "" @@ -474,34 +494,80 @@ msgid "Could not set altsetting from %d to %d (%m)" msgstr "" -#: usb/libusb.c:713 +#: usb/libusb.c:713 libusb1/libusb1.c:763 #, c-format msgid "The supplied vendor or product id (0x%x,0x%x) is not valid." msgstr "给出的供应商或产品 id (0x%x、0x%x) 不合法。" -#: usb/libusb.c:749 +#: usb/libusb.c:749 libusb1/libusb1.c:802 #, c-format msgid "" "USB device (vendor 0x%x, product 0x%x) is a mass storage device, and might " "not function with gphoto2. Reference: %s" msgstr "" -#: usb/libusb.c:792 +#: usb/libusb.c:792 libusb1/libusb1.c:834 #, c-format msgid "" "Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device " "is connected to the computer." msgstr "无法找到 USB 设备 (供应商 0x%x、产品 0x%x)。确信该设备已连接到计算机。" -#: usb/libusb.c:1090 +#: usb/libusb.c:1090 libusb1/libusb1.c:1128 #, c-format msgid "" "Could not find USB device (class 0x%x, subclass 0x%x, protocol 0x%x). Make " "sure this device is connected to the computer." msgstr "无法找到 USB 设备 (类 0x%x、子类 0x%x、协议 0x%x)。确信该设备已连接到计算机。" -#: disk/disk.c:179 disk/disk.c:229 disk/disk.c:270 disk/disk.c:302 -#: disk/disk.c:325 +#: libusb1/libusb1.c:296 +#, c-format +msgid "Could not open USB device (%s)." +msgstr "" + +#: libusb1/libusb1.c:311 +#, c-format +msgid "Device has a kernel driver attached (%d), detaching it now." +msgstr "" + +#: libusb1/libusb1.c:314 +msgid "Could not detach kernel driver of camera device." +msgstr "" + +#: libusb1/libusb1.c:329 +#, c-format +msgid "" +"Could not claim interface %d (%s). Make sure no other program or kernel " +"module (such as %s) is using the device and you have read/write access to " +"the device." +msgstr "" + +#: libusb1/libusb1.c:351 +#, c-format +msgid "Could not release interface %d (%s)." +msgstr "" + +#: libusb1/libusb1.c:366 +#, c-format +msgid "Could not reset USB port (%s)." +msgstr "" + +#: libusb1/libusb1.c:377 +msgid "Could not reattach kernel driver of camera device." +msgstr "" + +#: libusb1/libusb1.c:626 +#, c-format +msgid "Could not set config %d/%d (%s)" +msgstr "" + +#: libusb1/libusb1.c:665 +#, c-format +msgid "Could not set altsetting from %d to %d (%s)" +msgstr "" + +#: disk/disk.c:179 disk/disk.c:237 disk/disk.c:286 disk/disk.c:318 +#: disk/disk.c:341 #, c-format msgid "Media '%s'" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libiconv.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libiconv.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libiconv.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libiconv.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,333 +0,0 @@ -# libiconv Simplified Chinese translation -# Copyright (C) 2003 Free Software Foundation, Inc. -# Wang Jian , 2003 -# -msgid "" -msgstr "" -"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: 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: 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 -msgid "Usage: iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]" -msgstr "用法：iconv [-c] [-s] [-f fromcode] [-t tocode] [file ...]" - -#. TRANSLATORS: The second line of the short usage message. -#. Align it correctly against the first line. -#: src/iconv.c:109 -msgid "or: iconv -l" -msgstr "或： iconv -l" - -#: src/iconv.c:111 -#, c-format -msgid "Try `%s --help' for more information.\n" -msgstr "" - -#. TRANSLATORS: The first line of the long usage message. -#. The %s placeholder expands to the program name. -#: src/iconv.c:116 -#, c-format, no-wrap -msgid "Usage: %s [OPTION...] [-f ENCODING] [-t ENCODING] [INPUTFILE...]\n" -msgstr "" - -#. TRANSLATORS: The second line of the long usage message. -#. Align it correctly against the first line. -#. The %s placeholder expands to the program name. -#: src/iconv.c:123 -#, c-format, no-wrap -msgid "or: %s -l\n" -msgstr "" - -#. TRANSLATORS: Description of the iconv program. -#: src/iconv.c:129 -#, c-format, no-wrap -msgid "Converts text from one encoding to another encoding.\n" -msgstr "" - -#: src/iconv.c:133 -#, c-format, no-wrap -msgid "Options controlling the input and output format:\n" -msgstr "" - -#: src/iconv.c:136 -#, c-format, no-wrap -msgid "" -" -f ENCODING, --from-code=ENCODING\n" -" the encoding of the input\n" -msgstr "" - -#: src/iconv.c:140 -#, c-format, no-wrap -msgid "" -" -t ENCODING, --to-code=ENCODING\n" -" the encoding of the output\n" -msgstr "" - -#: src/iconv.c:145 -#, c-format, no-wrap -msgid "Options controlling conversion problems:\n" -msgstr "" - -#: src/iconv.c:148 -#, c-format, no-wrap -msgid " -c discard unconvertible characters\n" -msgstr "" - -#: src/iconv.c:151 -#, c-format, no-wrap -msgid "" -" --unicode-subst=FORMATSTRING\n" -" substitution for unconvertible Unicode " -"characters\n" -msgstr "" - -#: src/iconv.c:155 -#, c-format, no-wrap -msgid " --byte-subst=FORMATSTRING substitution for unconvertible bytes\n" -msgstr "" - -#: src/iconv.c:158 -#, c-format, no-wrap -msgid "" -" --widechar-subst=FORMATSTRING\n" -" substitution for unconvertible wide " -"characters\n" -msgstr "" - -#: src/iconv.c:163 -#, c-format, no-wrap -msgid "Options controlling error output:\n" -msgstr "" - -#: src/iconv.c:166 -#, c-format, no-wrap -msgid "" -" -s, --silent suppress error messages about conversion " -"problems\n" -msgstr "" - -#: src/iconv.c:170 -#, c-format, no-wrap -msgid "Informative output:\n" -msgstr "" - -#: src/iconv.c:173 -#, c-format, no-wrap -msgid " -l, --list list the supported encodings\n" -msgstr "" - -#: src/iconv.c:176 -#, c-format, no-wrap -msgid " --help display this help and exit\n" -msgstr "" - -#: src/iconv.c:179 -#, c-format, no-wrap -msgid " --version output version information and exit\n" -msgstr "" - -#. TRANSLATORS: The placeholder indicates the bug-reporting address -#. for this package. Please add _another line_ saying -#. "Report translation bugs to <...>\n" with the address for translation -#. bugs (typically your translation team's web or email address). -#: src/iconv.c:186 -msgid "Report bugs to .\n" -msgstr "" - -#: src/iconv.c:197 -#, no-wrap -msgid "" -"License GPLv2+: GNU GPL version 2 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 "" - -#. TRANSLATORS: The %s placeholder expands to an author's name. -#: src/iconv.c:203 -#, c-format -msgid "Written by %s.\n" -msgstr "作者 %s。\n" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#: src/iconv.c:297 -#, c-format -msgid "" -"%s argument: A format directive with a variable width is not allowed here." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#: src/iconv.c:312 -#, c-format -msgid "" -"%s argument: A format directive with a variable precision is not allowed " -"here." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#: src/iconv.c:328 -#, c-format -msgid "%s argument: A format directive with a size is not allowed here." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#: src/iconv.c:370 -#, c-format -msgid "%s argument: The string ends in the middle of a directive." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#. The %c placeholder expands to an unknown format directive. -#: src/iconv.c:377 -#, c-format -msgid "%s argument: The character '%c' is not a valid conversion specifier." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#: src/iconv.c:383 -#, c-format -msgid "" -"%s argument: The character that terminates the format directive is not a " -"valid conversion specifier." -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a command-line option. -#. The %u placeholder expands to the number of arguments consumed by the format string. -#: src/iconv.c:399 -#, c-format -msgid "" -"%s argument: The format string consumes more than one argument: %u argument." -msgid_plural "" -"%s argument: The format string consumes more than one argument: %u arguments." -msgstr[0] "" -msgstr[1] "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a piece of text, specified through --byte-subst. -#: src/iconv.c:457 -#, c-format -msgid "cannot convert byte substitution to Unicode: %s" -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a piece of text, specified through --unicode-subst. -#: src/iconv.c:497 -#, c-format -msgid "cannot convert unicode substitution to target encoding: %s" -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a piece of text, specified through --byte-subst. -#: src/iconv.c:538 -#, c-format -msgid "cannot convert byte substitution to wide string: %s" -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a piece of text, specified through --widechar-subst. -#: src/iconv.c:579 -#, c-format -msgid "cannot convert widechar substitution to target encoding: %s" -msgstr "" - -#. TRANSLATORS: An error message. -#. The %s placeholder expands to a piece of text, specified through --byte-subst. -#: src/iconv.c:620 -#, c-format -msgid "cannot convert byte substitution to target encoding: %s" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholders expand to the input file name, a line number, and a column number. -#: src/iconv.c:639 -#, c-format -msgid "%s:%u:%u: cannot convert" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholders expand to the input file name, a line number, and a column number. -#. A "shift sequence" is a sequence of bytes that changes the state of the converter; -#. this concept exists only for "stateful" encodings like ISO-2022-JP. -#: src/iconv.c:653 -#, c-format -msgid "%s:%u:%u: incomplete character or shift sequence" -msgstr "" - -#. TRANSLATORS: The first part of an error message. -#. It is followed by a colon and a detail message. -#. The placeholders expand to the input file name, a line number, and a column number. -#: src/iconv.c:666 -#, c-format -msgid "%s:%u:%u" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholder expands to the input file name. -#: src/iconv.c:821 -#, c-format -msgid "%s: I/O error" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholder expands to the encoding name, specified through --from-code. -#: src/iconv.c:1009 -#, c-format -msgid "conversion from %s unsupported" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholder expands to the encoding name, specified through --to-code. -#: src/iconv.c:1015 -#, c-format -msgid "conversion to %s unsupported" -msgstr "" - -#. TRANSLATORS: An error message. -#. The placeholders expand to the encoding names, specified through --from-code and --to-code, respectively. -#: src/iconv.c:1021 -#, c-format -msgid "conversion from %s to %s unsupported" -msgstr "" - -#. TRANSLATORS: Additional advice after an error message. -#. The %s placeholder expands to the program name. -#: src/iconv.c:1026 -#, c-format -msgid "try '%s -l' to get the list of supported encodings" -msgstr "" - -#. TRANSLATORS: A filename substitute denoting standard input. -#: src/iconv.c:1083 -msgid "(stdin)" -msgstr "(标准输入)" - -#. TRANSLATORS: The first part of an error message. -#. It is followed by a colon and a detail message. -#. The %s placeholder expands to the input file name. -#: src/iconv.c:1095 -#, c-format -msgid "%s" -msgstr "" - -#. TRANSLATORS: An error message. -#: src/iconv.c:1109 -#, c-format -msgid "I/O error" -msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libidn.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libidn.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libidn.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libidn.po 2012-03-23 07:32:55.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: 2012-02-21 18:38+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:07+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/libvirt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libvirt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvirt.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libvirt.po 2012-03-23 07:33:17.000000000 +0000 @@ -20,8 +20,8 @@ "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 23:21+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: daemon/libvirtd.c:256 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/libvisual-0.4.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libvisual-0.4.po 2012-03-23 07:33:13.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: 2012-02-21 22:27+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: libvisual/lv_libvisual.c:137 msgid "Show info for" diff -Nru 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+20120322/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 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/libvisual-plugins-0.4.po 2012-03-23 07:33:13.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2006-03-21 02:50+0800\n" "PO-Revision-Date: 2009-10-18 14:10+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 22:27+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: plugins/actor/bumpscope/actor_bumpscope.c:62 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/Linux-PAM.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/Linux-PAM.po 2012-03-23 07:32:55.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: 2012-02-21 18:44+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: libpam_misc/misc_conv.c:33 msgid "...Time is running out...\n" @@ -34,7 +34,7 @@ msgstr "有错误的转换 (%d)\n" #: libpam/pam_get_authtok.c:39 modules/pam_exec/pam_exec.c:142 -#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:64 +#: modules/pam_unix/pam_unix_auth.c:157 modules/pam_userdb/pam_userdb.c:63 msgid "Password: " msgstr "密码： " @@ -52,12 +52,12 @@ msgid "Sorry, passwords do not match." msgstr "抱歉，密码不匹配。" -#: libpam/pam_get_authtok.c:133 libpam/pam_get_authtok.c:209 +#: libpam/pam_get_authtok.c:132 libpam/pam_get_authtok.c:208 #, c-format msgid "Retype %s" msgstr "重新输入 %s" -#: libpam/pam_get_authtok.c:153 libpam/pam_get_authtok.c:222 +#: libpam/pam_get_authtok.c:152 libpam/pam_get_authtok.c:221 msgid "Password change aborted." msgstr "密码更改取消。" @@ -234,12 +234,12 @@ msgstr "以某些形式包含用户名" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:476 +#: modules/pam_unix/pam_unix_passwd.c:475 msgid "No password supplied" msgstr "密码未提供" #: modules/pam_cracklib/pam_cracklib.c:555 -#: modules/pam_unix/pam_unix_passwd.c:476 +#: modules/pam_unix/pam_unix_passwd.c:475 msgid "Password unchanged" msgstr "密码未更改" @@ -315,38 +315,38 @@ msgid "Too many logins for '%s'." msgstr "“%s”登录过多。" -#: modules/pam_mail/pam_mail.c:297 +#: modules/pam_mail/pam_mail.c:318 msgid "No mail." msgstr "无邮件。" -#: modules/pam_mail/pam_mail.c:300 +#: modules/pam_mail/pam_mail.c:321 msgid "You have new mail." msgstr "您有新邮件。" -#: modules/pam_mail/pam_mail.c:303 +#: modules/pam_mail/pam_mail.c:324 msgid "You have old mail." msgstr "您有旧邮件。" -#: modules/pam_mail/pam_mail.c:307 +#: modules/pam_mail/pam_mail.c:328 msgid "You have mail." msgstr "您有邮件。" -#: modules/pam_mail/pam_mail.c:314 +#: modules/pam_mail/pam_mail.c:335 #, c-format msgid "You have no mail in folder %s." msgstr "您在文件夹 %s 中无邮件。" -#: modules/pam_mail/pam_mail.c:318 +#: modules/pam_mail/pam_mail.c:339 #, c-format msgid "You have new mail in folder %s." msgstr "您在文件夹 %s 中有新邮件。" -#: modules/pam_mail/pam_mail.c:322 +#: modules/pam_mail/pam_mail.c:343 #, c-format msgid "You have old mail in folder %s." msgstr "您在文件夹 %s 中有旧邮件。" -#: modules/pam_mail/pam_mail.c:327 +#: modules/pam_mail/pam_mail.c:348 #, c-format msgid "You have mail in folder %s." msgstr "您在文件夹 %s 中有邮件。" @@ -362,7 +362,7 @@ msgstr "无法创建和初始化目录 '%s'" #: modules/pam_pwhistory/pam_pwhistory.c:218 -#: modules/pam_unix/pam_unix_passwd.c:497 +#: modules/pam_unix/pam_unix_passwd.c:496 msgid "Password has been already used. Choose another." msgstr "密码已使用。请选择其他密码。" @@ -396,17 +396,17 @@ msgid "No default type for role %s\n" msgstr "没有角色 %s 默认类型\n" -#: modules/pam_selinux/pam_selinux.c:667 +#: modules/pam_selinux/pam_selinux.c:677 #, c-format msgid "Unable to get valid context for %s" msgstr "无法为 %s 获得有效环境" -#: modules/pam_selinux/pam_selinux.c:718 +#: modules/pam_selinux/pam_selinux.c:728 #, c-format msgid "Security Context %s Assigned" msgstr "已指派安全环境 %s" -#: modules/pam_selinux/pam_selinux.c:739 +#: modules/pam_selinux/pam_selinux.c:749 #, c-format msgid "Key Creation Context %s Assigned" msgstr "已分配密钥生成环境 %s" @@ -506,7 +506,7 @@ " [-u username] [--user username]\n" " [-r] [--reset[=n]] [--quiet]\n" -#: modules/pam_timestamp/pam_timestamp.c:345 +#: modules/pam_timestamp/pam_timestamp.c:339 #, c-format msgid "Access granted (last access was %ld seconds ago)." msgstr "可以访问（上次访问是 %ld 秒之前）。" @@ -539,27 +539,27 @@ msgid "NIS password could not be changed." msgstr "无法更改 NIS 密码。" -#: modules/pam_unix/pam_unix_passwd.c:493 +#: modules/pam_unix/pam_unix_passwd.c:492 msgid "You must choose a longer password" msgstr "必须选择更长的密码" -#: modules/pam_unix/pam_unix_passwd.c:600 +#: modules/pam_unix/pam_unix_passwd.c:597 #, c-format msgid "Changing password for %s." msgstr "更改 %s 的密码。" -#: modules/pam_unix/pam_unix_passwd.c:611 +#: modules/pam_unix/pam_unix_passwd.c:608 msgid "(current) UNIX password: " msgstr "（当前）UNIX 密码： " -#: modules/pam_unix/pam_unix_passwd.c:646 +#: modules/pam_unix/pam_unix_passwd.c:643 msgid "You must wait longer to change your password" msgstr "您必须等待更长时间以更改密码" -#: modules/pam_unix/pam_unix_passwd.c:706 +#: modules/pam_unix/pam_unix_passwd.c:703 msgid "Enter new UNIX password: " msgstr "输入新的 UNIX 密码： " -#: modules/pam_unix/pam_unix_passwd.c:707 +#: modules/pam_unix/pam_unix_passwd.c:704 msgid "Retype new UNIX password: " msgstr "重新输入新的 UNIX 密码： " diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-live.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp-live.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-live.po 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp-live.po 2012-03-23 07:33:12.000000000 +0000 @@ -7,41 +7,89 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-08-24 16:45-0400\n" +"POT-Creation-Date: 2012-03-01 10:35-0500\n" "PO-Revision-Date: 2011-10-01 18:03+0000\n" "Last-Translator: snowdream \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 22:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: ../ltsp-live:40 -msgid "Creating new configuration file" -msgstr "创建新的配置文件" - -#: ../ltsp-live:42 +#: ../ltsp-live:44 msgid "Unable to parse config" msgstr "无法分析配置" -#: ../ltsp-live:78 -msgid "Failed to enable LTSP: %s" -msgstr "启用LTSP失败： %s" - -#: ../ltsp-live:92 -msgid "Failed to list network cards: %s" -msgstr "无法列出网卡: %s" - -#: ../ltsp-live:205 -msgid "Unable to find .xml UI file" -msgstr "无法找到.xml的UI文件" +#: ../ltsp-live:105 +msgid "Restarting Network Manager" +msgstr "" + +#: ../ltsp-live:112 +msgid "Adding LTSP network to Network Manager" +msgstr "" + +#: ../ltsp-live:117 +msgid "Enabling LTSP network in Network Manager" +msgstr "" + +#: ../ltsp-live:120 ../ltsp-live:336 +msgid "Failed" +msgstr "" + +#: ../ltsp-live:124 +msgid "Installing the required packages" +msgstr "" + +#: ../ltsp-live:130 +msgid "Starting OpenSSH server" +msgstr "" + +#: ../ltsp-live:139 +msgid "Restarting openbsd-inetd" +msgstr "" + +#: ../ltsp-live:145 +msgid "Configuring LTSP" +msgstr "" + +#: ../ltsp-live:173 +msgid "Creating the guest users" +msgstr "" + +#: ../ltsp-live:184 +msgid "Configuring DNSmasq" +msgstr "" + +#: ../ltsp-live:203 +msgid "Starting DNSmasq" +msgstr "" + +#: ../ltsp-live:209 +msgid "Extracting thin client kernel and initrd" +msgstr "" -#: ../ltsp-live:244 +#: ../ltsp-live:230 +msgid "Starting NBD server" +msgstr "" + +#: ../ltsp-live:235 ../ltsp-live:326 +msgid "Ready" +msgstr "" + +#: ../ltsp-live:289 msgid "None" msgstr "无" -#: ../ltsp-live:282 +#: ../ltsp-live:331 +msgid "LTSP-Live should now be ready to use!" +msgstr "" + +#: ../ltsp-live:341 +msgid "Unable to configure Network Manager" +msgstr "" + +#: ../ltsp-live:361 msgid "" "The selected network interface is already in use.\n" "Are you sure you want to use it?" @@ -60,3 +108,15 @@ #: ../ltsp-live.xml:41 msgid "Network devices" msgstr "网络设备" + +#: ../ltsp-live.xml:86 +msgid "Status" +msgstr "" + +#: ../ltsp-live.desktop +msgid "Start LTSP-Live" +msgstr "" + +#: ../ltsp-live.desktop +msgid "Starts an LTSP server from the live CD" +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-login.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp-login.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp-login.po 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp-login.po 2012-03-23 07:33:12.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: 2012-02-21 22:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:47+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ltsp-login.sh:17 #, sh-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ltsp.po 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ltsp.po 2012-03-23 07:33:12.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: 2012-02-21 22:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: ../server/configs/ALTLinux/ltsp-login.sh:30 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lvm2.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lvm2.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lvm2.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lvm2.po 2012-03-23 07:32:57.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: 2012-02-21 18:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:13+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: activate/activate.c:44 msgid "LVM1 proc global snprintf failed" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lynx.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lynx.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/lynx.po 2012-02-23 07:11:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/lynx.po 2012-03-23 07:33:10.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: 2012-02-21 21:47+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. ****************************************************************** #. * The following definitions are for status line prompts, messages, or diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/m17n-db.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/m17n-db.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/m17n-db.po 2012-02-23 07:11:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/m17n-db.po 2012-03-23 07:33:10.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: 2012-02-21 21:47+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: MIM/cmc-kbd.mim:26 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mailman.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mailman.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mailman.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mailman.po 2012-03-23 07:32:57.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: 2012-02-21 18:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:14+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Generated-By: pygettext.py 1.4\n" #: Mailman/Archiver/HyperArch.py:123 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/make.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/make.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/make.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/make.po 2012-03-23 07:33:14.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: 2012-02-21 22:38+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:04+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ar.c:53 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db-gnulib.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/man-db-gnulib.po 2012-03-23 07:32:57.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: 2012-02-21 18:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:14+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnulib/lib/argp-help.c:147 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/man-db.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/man-db.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/man-db.po 2012-03-23 07:32:57.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: 2012-02-21 18:50+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:14+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" # need-proofread diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mlocate.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mlocate.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mlocate.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mlocate.po 2012-03-23 07:33:20.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: 2012-02-22 00:05+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:58+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Country: CHINA\n" "Language: zh_CN\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/MoinMoin.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/MoinMoin.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/MoinMoin.po 2012-03-23 07:32:57.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: 2012-02-21 18:51+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:14+0000\n" +"X-Generator: Launchpad (build 14981)\n" msgid "The wiki is currently not reachable." msgstr "此 wiki 目前无法访问。" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mono-tools.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mono-tools.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mono-tools.po 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mono-tools.po 2012-03-23 07:33:13.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: 2012-02-21 22:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: docbrowser/browser.glade:8 msgid "Mono Documentation Library" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mountall.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mountall.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mountall.po 2012-02-23 07:12:06.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mountall.po 2012-03-23 07:33:28.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: mountall\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-15 20:54+0000\n" +"POT-Creation-Date: 2012-03-08 11:02+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: 2012-02-22 01:42+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:02+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/mountall.c:748 msgid "unable to mount" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mutt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mutt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/mutt.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/mutt.po 2012-03-23 07:32:57.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: 2012-02-21 18:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:15+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: account.c:163 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nabi.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nabi.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nabi.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nabi.po 2012-03-23 07:32:57.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-11-13 21:12+0900\n" "PO-Revision-Date: 2009-10-29 08:00+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 18:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:15+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/candidate.c:367 msgid "hanja" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nagios-plugins.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nagios-plugins.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nagios-plugins.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nagios-plugins.po 2012-03-23 07:32:58.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: 2012-02-21 18:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:15+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/nano.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nano.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nano.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nano.po 2012-03-23 07:32:58.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: 2012-02-21 18:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/browser.c:220 msgid "Go To Directory" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/neon.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/neon.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/neon.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/neon.po 2012-03-23 07:33:20.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: 2012-02-22 00:01+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:56+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/ne_207.c:198 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/net-tools.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/net-tools.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/net-tools.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/net-tools.po 2012-03-23 07:32:58.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: 2012-02-21 18:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../arp.c:112 ../arp.c:279 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/NetworkManager.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/NetworkManager.po 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/NetworkManager.po 2012-03-23 07:33:12.000000000 +0000 @@ -13,19 +13,19 @@ "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=gene" "ral\n" -"POT-Creation-Date: 2012-02-18 20:54+0000\n" +"POT-Creation-Date: 2012-03-16 21:11+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: 2012-02-21 22:06+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:47+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52 -#: ../cli/src/common.c:63 ../cli/src/connections.c:119 -#: ../cli/src/connections.c:153 +#: ../cli/src/common.c:63 ../cli/src/connections.c:125 +#: ../cli/src/connections.c:159 msgid "GROUP" msgstr "" @@ -61,16 +61,16 @@ #. 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 +#: ../cli/src/connections.c:58 ../cli/src/connections.c:126 +#: ../cli/src/devices.c:102 ../cli/src/devices.c:123 ../cli/src/devices.c:133 +#: ../cli/src/devices.c:143 ../cli/src/devices.c:157 ../cli/src/devices.c:171 +#: ../cli/src/devices.c:193 msgid "NAME" msgstr "名称" #. 0 #. 1 -#: ../cli/src/connections.c:57 ../cli/src/connections.c:121 +#: ../cli/src/connections.c:59 ../cli/src/connections.c:127 msgid "UUID" msgstr "UUID" @@ -78,28 +78,28 @@ #. 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 +#: ../cli/src/connections.c:60 ../cli/src/connections.c:160 +#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:196 msgid "TYPE" msgstr "类型" #. 2 -#: ../cli/src/connections.c:59 +#: ../cli/src/connections.c:61 msgid "TIMESTAMP" msgstr "时间戳" #. 3 -#: ../cli/src/connections.c:60 +#: ../cli/src/connections.c:62 msgid "TIMESTAMP-REAL" msgstr "真实时间戳" #. 4 -#: ../cli/src/connections.c:61 +#: ../cli/src/connections.c:63 msgid "AUTOCONNECT" msgstr "自动连接" #. 5 -#: ../cli/src/connections.c:62 +#: ../cli/src/connections.c:64 msgid "READONLY" msgstr "只读" @@ -108,13 +108,13 @@ #. 2 #. 11 #. 5 -#: ../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 +#: ../cli/src/connections.c:65 ../cli/src/connections.c:134 +#: ../cli/src/devices.c:70 ../cli/src/devices.c:183 ../cli/src/devices.c:199 msgid "DBUS-PATH" msgstr "" #. 2 -#: ../cli/src/connections.c:122 +#: ../cli/src/connections.c:128 msgid "DEVICES" msgstr "设备" @@ -122,82 +122,82 @@ #. 1 #. 6 #. 1 -#: ../cli/src/connections.c:123 ../cli/src/devices.c:67 -#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39 +#: ../cli/src/connections.c:129 ../cli/src/devices.c:69 +#: ../cli/src/devices.c:109 ../cli/src/network-manager.c:39 msgid "STATE" msgstr "状态" #. 4 -#: ../cli/src/connections.c:124 +#: ../cli/src/connections.c:130 msgid "DEFAULT" msgstr "默认" #. 5 -#: ../cli/src/connections.c:125 +#: ../cli/src/connections.c:131 msgid "DEFAULT6" msgstr "" #. 6 -#: ../cli/src/connections.c:126 +#: ../cli/src/connections.c:132 msgid "SPEC-OBJECT" msgstr "SPEC 对象" #. 7 #. 1 -#: ../cli/src/connections.c:127 ../cli/src/connections.c:141 +#: ../cli/src/connections.c:133 ../cli/src/connections.c:147 msgid "VPN" msgstr "VPN" #. 9 -#: ../cli/src/connections.c:129 +#: ../cli/src/connections.c:135 msgid "CON-PATH" msgstr "" #. 10 -#: ../cli/src/connections.c:130 +#: ../cli/src/connections.c:136 msgid "ZONE" msgstr "" #. 11 -#: ../cli/src/connections.c:131 +#: ../cli/src/connections.c:137 msgid "MASTER-PATH" msgstr "" -#: ../cli/src/connections.c:139 ../cli/src/devices.c:77 +#: ../cli/src/connections.c:145 ../cli/src/devices.c:79 msgid "GENERAL" msgstr "常规" #. 0 -#: ../cli/src/connections.c:140 +#: ../cli/src/connections.c:146 msgid "IP" msgstr "" #. 1 -#: ../cli/src/connections.c:155 +#: ../cli/src/connections.c:161 msgid "USERNAME" msgstr "" #. 2 -#: ../cli/src/connections.c:156 +#: ../cli/src/connections.c:162 msgid "GATEWAY" msgstr "网关" #. 3 -#: ../cli/src/connections.c:157 +#: ../cli/src/connections.c:163 msgid "BANNER" msgstr "" #. 4 -#: ../cli/src/connections.c:158 +#: ../cli/src/connections.c:164 msgid "VPN-STATE" msgstr "" #. 5 -#: ../cli/src/connections.c:159 +#: ../cli/src/connections.c:165 msgid "CFG" msgstr "" -#: ../cli/src/connections.c:180 +#: ../cli/src/connections.c:186 #, c-format msgid "" "Usage: nmcli con { COMMAND | help }\n" @@ -213,376 +213,377 @@ " delete id | uuid \n" msgstr "" -#: ../cli/src/connections.c:234 ../cli/src/connections.c:567 +#: ../cli/src/connections.c:240 ../cli/src/connections.c:591 #, c-format msgid "Error: 'con list': %s" msgstr "错误：'con list': %s" -#: ../cli/src/connections.c:236 ../cli/src/connections.c:569 +#: ../cli/src/connections.c:242 ../cli/src/connections.c:593 #, c-format msgid "Error: 'con list': %s; allowed fields: %s" msgstr "错误：'con list': %s；允许的字段：%s" -#: ../cli/src/connections.c:244 +#: ../cli/src/connections.c:250 msgid "Connection details" msgstr "连接详情" -#: ../cli/src/connections.c:442 +#: ../cli/src/connections.c:466 msgid "never" msgstr "从不" #. "CAPABILITIES" #. Print header #. "WIFI-PROPERTIES" -#: ../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/connections.c:467 ../cli/src/connections.c:468 +#: ../cli/src/connections.c:705 ../cli/src/connections.c:706 +#: ../cli/src/connections.c:708 ../cli/src/devices.c:595 +#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763 +#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822 +#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825 +#: ../cli/src/settings.c:656 ../cli/src/settings.c:726 +#: ../cli/src/settings.c:846 ../cli/src/settings.c:1128 +#: ../cli/src/settings.c:1129 ../cli/src/settings.c:1131 +#: ../cli/src/settings.c:1133 ../cli/src/settings.c:1134 #: ../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: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 +#: ../cli/src/settings.c:1340 ../cli/src/settings.c:1341 +#: ../cli/src/settings.c:1342 ../cli/src/settings.c:1343 +#: ../cli/src/settings.c:1344 ../cli/src/settings.c:1345 +#: ../cli/src/settings.c:1346 ../cli/src/settings.c:1347 +#: ../cli/src/settings.c:1348 ../cli/src/settings.c:1349 +#: ../cli/src/settings.c:1350 ../cli/src/settings.c:1351 +#: ../cli/src/settings.c:1352 ../cli/src/settings.c:1423 msgid "yes" msgstr "是" -#: ../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: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/connections.c:467 ../cli/src/connections.c:468 +#: ../cli/src/connections.c:705 ../cli/src/connections.c:706 +#: ../cli/src/connections.c:708 ../cli/src/devices.c:595 +#: ../cli/src/devices.c:648 ../cli/src/devices.c:762 ../cli/src/devices.c:763 +#: ../cli/src/devices.c:795 ../cli/src/devices.c:821 ../cli/src/devices.c:822 +#: ../cli/src/devices.c:823 ../cli/src/devices.c:824 ../cli/src/devices.c:825 +#: ../cli/src/settings.c:656 ../cli/src/settings.c:658 +#: ../cli/src/settings.c:726 ../cli/src/settings.c:846 +#: ../cli/src/settings.c:1128 ../cli/src/settings.c:1129 +#: ../cli/src/settings.c:1131 ../cli/src/settings.c:1133 +#: ../cli/src/settings.c:1134 ../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: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 +#: ../cli/src/settings.c:1265 ../cli/src/settings.c:1340 +#: ../cli/src/settings.c:1341 ../cli/src/settings.c:1342 +#: ../cli/src/settings.c:1343 ../cli/src/settings.c:1344 +#: ../cli/src/settings.c:1345 ../cli/src/settings.c:1346 +#: ../cli/src/settings.c:1347 ../cli/src/settings.c:1348 +#: ../cli/src/settings.c:1349 ../cli/src/settings.c:1350 +#: ../cli/src/settings.c:1351 ../cli/src/settings.c:1352 +#: ../cli/src/settings.c:1423 msgid "no" msgstr "否" -#: ../cli/src/connections.c:518 +#: ../cli/src/connections.c:542 msgid "Connection list" msgstr "" -#: ../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 +#: ../cli/src/connections.c:555 ../cli/src/connections.c:1088 +#: ../cli/src/connections.c:1456 ../cli/src/connections.c:1471 +#: ../cli/src/connections.c:1480 ../cli/src/connections.c:1490 +#: ../cli/src/connections.c:1502 ../cli/src/connections.c:1601 +#: ../cli/src/connections.c:1703 ../cli/src/devices.c:1202 +#: ../cli/src/devices.c:1212 ../cli/src/devices.c:1326 +#: ../cli/src/devices.c:1334 ../cli/src/devices.c:1547 +#: ../cli/src/devices.c:1554 #, c-format msgid "Error: %s argument is missing." msgstr "错误：缺少 %s 参数。" -#: ../cli/src/connections.c:544 +#: ../cli/src/connections.c:568 #, c-format msgid "Error: %s - no such connection." msgstr "错误：%s - 没有这个连接。" -#: ../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 +#: ../cli/src/connections.c:574 ../cli/src/connections.c:1515 +#: ../cli/src/connections.c:1618 ../cli/src/connections.c:1710 +#: ../cli/src/devices.c:999 ../cli/src/devices.c:1079 +#: ../cli/src/devices.c:1226 ../cli/src/devices.c:1340 +#: ../cli/src/devices.c:1560 #, c-format msgid "Unknown parameter: %s\n" msgstr "未知参数：%s\n" -#: ../cli/src/connections.c:559 +#: ../cli/src/connections.c:583 #, c-format msgid "Error: no valid parameter specified." msgstr "错误：没有指定有效参数。" -#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151 -#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456 +#: ../cli/src/connections.c:598 ../cli/src/connections.c:1803 +#: ../cli/src/devices.c:1768 ../cli/src/network-manager.c:456 #, c-format msgid "Error: %s." msgstr "错误：%s。" -#: ../cli/src/connections.c:587 +#: ../cli/src/connections.c:611 msgid "activating" msgstr "激活中" -#: ../cli/src/connections.c:589 +#: ../cli/src/connections.c:613 msgid "activated" msgstr "已激活" -#: ../cli/src/connections.c:591 ../cli/src/devices.c:261 +#: ../cli/src/connections.c:615 ../cli/src/devices.c:263 msgid "deactivating" msgstr "" -#: ../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/connections.c:618 ../cli/src/connections.c:641 +#: ../cli/src/connections.c:1327 ../cli/src/devices.c:267 +#: ../cli/src/devices.c:796 ../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:531 -#: ../cli/src/utils.c:499 ../src/main.c:438 ../src/main.c:457 +#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:563 +#: ../cli/src/settings.c:591 ../cli/src/utils.c:499 ../src/main.c:445 +#: ../src/main.c:464 msgid "unknown" msgstr "未知" -#: ../cli/src/connections.c:603 +#: ../cli/src/connections.c:627 msgid "VPN connecting (prepare)" msgstr "VPN 连接(准备)" -#: ../cli/src/connections.c:605 +#: ../cli/src/connections.c:629 msgid "VPN connecting (need authentication)" msgstr "VPN 连接中(需要验证)" -#: ../cli/src/connections.c:607 +#: ../cli/src/connections.c:631 msgid "VPN connecting" msgstr "VPN 连接中" -#: ../cli/src/connections.c:609 +#: ../cli/src/connections.c:633 msgid "VPN connecting (getting IP configuration)" msgstr "VPN 连接中(获取 IP 配置)" -#: ../cli/src/connections.c:611 +#: ../cli/src/connections.c:635 msgid "VPN connected" msgstr "VPN 连接" -#: ../cli/src/connections.c:613 +#: ../cli/src/connections.c:637 msgid "VPN connection failed" msgstr "VPN 连接失败" -#: ../cli/src/connections.c:615 +#: ../cli/src/connections.c:639 msgid "VPN disconnected" msgstr "断开 VPN 连接" -#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092 +#: ../cli/src/connections.c:892 ../cli/src/connections.c:1116 #, c-format msgid "Error: 'con status': %s" msgstr "错误：'con status': %s" -#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094 +#: ../cli/src/connections.c:894 ../cli/src/connections.c:1118 #, c-format msgid "Error: 'con status': %s; allowed fields: %s" msgstr "错误：'con status': %s；允许的字段：%s" -#: ../cli/src/connections.c:878 +#: ../cli/src/connections.c:902 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 +#: ../cli/src/connections.c:1038 ../cli/src/connections.c:1530 +#: ../cli/src/connections.c:1633 ../cli/src/connections.c:1724 +#: ../cli/src/devices.c:1026 ../cli/src/devices.c:1088 +#: ../cli/src/devices.c:1241 ../cli/src/devices.c:1370 +#: ../cli/src/devices.c:1589 #, 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 +#: ../cli/src/connections.c:1042 ../cli/src/connections.c:1534 +#: ../cli/src/connections.c:1637 ../cli/src/connections.c:1728 +#: ../cli/src/devices.c:1030 ../cli/src/devices.c:1092 +#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1374 +#: ../cli/src/devices.c:1593 #, c-format msgid "Error: NetworkManager is not running." msgstr "" -#: ../cli/src/connections.c:1050 +#: ../cli/src/connections.c:1074 msgid "Active connections" msgstr "活跃连接" -#: ../cli/src/connections.c:1075 +#: ../cli/src/connections.c:1099 #, c-format msgid "Error: '%s' is not an active connection." msgstr "" -#: ../cli/src/connections.c:1080 +#: ../cli/src/connections.c:1104 #, c-format msgid "Error: unknown parameter: %s" msgstr "" -#: ../cli/src/connections.c:1564 +#: ../cli/src/connections.c:1211 #, c-format msgid "no active connection on device '%s'" msgstr "设备 '%s' 中没有活跃连接" -#: ../cli/src/connections.c:1572 +#: ../cli/src/connections.c:1219 #, c-format msgid "no active connection or device" msgstr "没有活跃连接或者设备" -#: ../cli/src/connections.c:1643 +#: ../cli/src/connections.c:1290 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "设备 '%s' 不兼容连接 '%s'" -#: ../cli/src/connections.c:1645 +#: ../cli/src/connections.c:1292 #, c-format msgid "no device found for connection '%s'" msgstr "没有找到可用于连接 '%s' 的设备" -#: ../cli/src/connections.c:1656 +#: ../cli/src/connections.c:1303 msgid "unknown reason" msgstr "未知原因" -#: ../cli/src/connections.c:1658 +#: ../cli/src/connections.c:1305 msgid "none" msgstr "无" -#: ../cli/src/connections.c:1660 +#: ../cli/src/connections.c:1307 msgid "the user was disconnected" msgstr "用户已断开连接" -#: ../cli/src/connections.c:1662 +#: ../cli/src/connections.c:1309 msgid "the base network connection was interrupted" msgstr "基点网络连接中断" -#: ../cli/src/connections.c:1664 +#: ../cli/src/connections.c:1311 msgid "the VPN service stopped unexpectedly" msgstr "VPN 服务意外停止" -#: ../cli/src/connections.c:1666 +#: ../cli/src/connections.c:1313 msgid "the VPN service returned invalid configuration" msgstr "VPN 服务返回无效配置" -#: ../cli/src/connections.c:1668 +#: ../cli/src/connections.c:1315 msgid "the connection attempt timed out" msgstr "连接尝试超时" -#: ../cli/src/connections.c:1670 +#: ../cli/src/connections.c:1317 msgid "the VPN service did not start in time" msgstr "VPN 连接没有按时启动" -#: ../cli/src/connections.c:1672 +#: ../cli/src/connections.c:1319 msgid "the VPN service failed to start" msgstr "VPN 服务启动失败" -#: ../cli/src/connections.c:1674 +#: ../cli/src/connections.c:1321 msgid "no valid VPN secrets" msgstr "没有有效的 VPN 加密" -#: ../cli/src/connections.c:1676 +#: ../cli/src/connections.c:1323 msgid "invalid VPN secrets" msgstr "无效 VPN 加密" -#: ../cli/src/connections.c:1678 +#: ../cli/src/connections.c:1325 msgid "the connection was removed" msgstr "连接被删除" -#: ../cli/src/connections.c:1692 +#: ../cli/src/connections.c:1339 #, c-format msgid "state: %s\n" msgstr "状态：%s\n" -#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721 +#: ../cli/src/connections.c:1342 ../cli/src/connections.c:1368 #, c-format msgid "Connection activated\n" msgstr "连接已激活\n" -#: ../cli/src/connections.c:1698 +#: ../cli/src/connections.c:1345 #, c-format msgid "Error: Connection activation failed." msgstr "错误：激活连接失败。" -#: ../cli/src/connections.c:1717 +#: ../cli/src/connections.c:1364 #, c-format msgid "state: %s (%d)\n" msgstr "状态：%s (%d)\n" -#: ../cli/src/connections.c:1727 +#: ../cli/src/connections.c:1374 #, c-format msgid "Error: Connection activation failed: %s." msgstr "错误：激活连接失败：%s。" -#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136 +#: ../cli/src/connections.c:1391 ../cli/src/devices.c:1148 #, c-format msgid "Error: Timeout %d sec expired." msgstr "错误：超时 %d 秒过期。" -#: ../cli/src/connections.c:1757 +#: ../cli/src/connections.c:1404 #, c-format msgid "Error: Connection activation failed: %s" msgstr "错误：激活连接失败：%s" -#: ../cli/src/connections.c:1763 +#: ../cli/src/connections.c:1410 #, c-format msgid "Active connection state: %s\n" msgstr "活跃连接状态：%s\n" -#: ../cli/src/connections.c:1764 +#: ../cli/src/connections.c:1411 #, c-format msgid "Active connection path: %s\n" msgstr "活跃连接路径：%s\n" -#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957 -#: ../cli/src/connections.c:2085 +#: ../cli/src/connections.c:1464 ../cli/src/connections.c:1609 +#: ../cli/src/connections.c:1737 #, c-format msgid "Error: Unknown connection: %s." msgstr "错误：未知连接：%s" -#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208 +#: ../cli/src/connections.c:1510 ../cli/src/devices.c:1220 #, c-format msgid "Error: timeout value '%s' is not valid." msgstr "错误：超时值 '%s' 无效。" -#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974 -#: ../cli/src/connections.c:2065 +#: ../cli/src/connections.c:1523 ../cli/src/connections.c:1626 +#: ../cli/src/connections.c:1717 #, c-format msgid "Error: id or uuid has to be specified." msgstr "错误：必须指定 ID 或者 UUID。" -#: ../cli/src/connections.c:1903 +#: ../cli/src/connections.c:1555 #, c-format msgid "Error: No suitable device found: %s." msgstr "错误：没有找到合适的设备：%s。" -#: ../cli/src/connections.c:1905 +#: ../cli/src/connections.c:1557 #, c-format msgid "Error: No suitable device found." msgstr "错误：没有找到合适的设备。" -#: ../cli/src/connections.c:2010 +#: ../cli/src/connections.c:1662 #, c-format msgid "Warning: Connection not active\n" msgstr "警告：连接没有激活\n" -#: ../cli/src/connections.c:2024 +#: ../cli/src/connections.c:1676 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "" -#: ../cli/src/connections.c:2142 +#: ../cli/src/connections.c:1794 #, c-format msgid "Error: 'con' command '%s' is not valid." msgstr "错误：'con' 命令 '%s' 无效。" -#: ../cli/src/connections.c:2207 +#: ../cli/src/connections.c:1859 #, c-format msgid "Error: could not connect to D-Bus." msgstr "错误：无法连接到 D-Bus。" -#: ../cli/src/connections.c:2215 +#: ../cli/src/connections.c:1867 #, c-format msgid "Error: Could not get system settings." msgstr "错误：无法获得系统设置。" -#: ../cli/src/connections.c:2225 +#: ../cli/src/connections.c:1877 #, c-format msgid "Error: Can't obtain connections: settings service is not running." msgstr "" @@ -590,230 +591,230 @@ #. 0 #. 9 #. 3 -#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179 -#: ../cli/src/devices.c:195 +#: ../cli/src/devices.c:67 ../cli/src/devices.c:103 ../cli/src/devices.c:181 +#: ../cli/src/devices.c:197 msgid "DEVICE" msgstr "设备" #. 0 -#: ../cli/src/devices.c:78 +#: ../cli/src/devices.c:80 msgid "CAPABILITIES" msgstr "功能" #. 1 -#: ../cli/src/devices.c:79 +#: ../cli/src/devices.c:81 msgid "WIFI-PROPERTIES" msgstr "WIFI 属性" #. 2 -#: ../cli/src/devices.c:80 +#: ../cli/src/devices.c:82 msgid "AP" msgstr "AP" #. 3 -#: ../cli/src/devices.c:81 +#: ../cli/src/devices.c:83 msgid "WIRED-PROPERTIES" msgstr "有线连接属性" #. 4 -#: ../cli/src/devices.c:82 +#: ../cli/src/devices.c:84 msgid "WIMAX-PROPERTIES" msgstr "" #. 5 #. 0 -#: ../cli/src/devices.c:83 ../cli/src/devices.c:192 +#: ../cli/src/devices.c:85 ../cli/src/devices.c:194 msgid "NSP" msgstr "" #. 6 -#: ../cli/src/devices.c:84 +#: ../cli/src/devices.c:86 msgid "IP4" msgstr "" #. 7 -#: ../cli/src/devices.c:85 +#: ../cli/src/devices.c:87 msgid "DHCP4" msgstr "" #. 8 -#: ../cli/src/devices.c:86 +#: ../cli/src/devices.c:88 msgid "IP6" msgstr "" #. 9 -#: ../cli/src/devices.c:87 +#: ../cli/src/devices.c:89 msgid "DHCP6" msgstr "" #. 2 -#: ../cli/src/devices.c:103 +#: ../cli/src/devices.c:105 msgid "VENDOR" msgstr "" #. 3 -#: ../cli/src/devices.c:104 +#: ../cli/src/devices.c:106 msgid "PRODUCT" msgstr "" #. 4 -#: ../cli/src/devices.c:105 +#: ../cli/src/devices.c:107 msgid "DRIVER" msgstr "驱动程序" #. 5 -#: ../cli/src/devices.c:106 +#: ../cli/src/devices.c:108 msgid "HWADDR" msgstr "硬盘" #. 7 -#: ../cli/src/devices.c:108 +#: ../cli/src/devices.c:110 msgid "REASON" msgstr "" #. 8 -#: ../cli/src/devices.c:109 +#: ../cli/src/devices.c:111 msgid "UDI" msgstr "" #. 9 -#: ../cli/src/devices.c:110 +#: ../cli/src/devices.c:112 msgid "IP-IFACE" msgstr "" #. 10 -#: ../cli/src/devices.c:111 +#: ../cli/src/devices.c:113 msgid "NM-MANAGED" msgstr "" #. 11 -#: ../cli/src/devices.c:112 +#: ../cli/src/devices.c:114 msgid "FIRMWARE-MISSING" msgstr "" #. 12 -#: ../cli/src/devices.c:113 +#: ../cli/src/devices.c:115 msgid "CONNECTION" msgstr "" #. 0 -#: ../cli/src/devices.c:122 +#: ../cli/src/devices.c:124 msgid "CARRIER-DETECT" msgstr "容器探测" #. 1 -#: ../cli/src/devices.c:123 +#: ../cli/src/devices.c:125 msgid "SPEED" msgstr "速度" #. 0 -#: ../cli/src/devices.c:132 +#: ../cli/src/devices.c:134 msgid "CARRIER" msgstr "容器" #. 0 -#: ../cli/src/devices.c:142 +#: ../cli/src/devices.c:144 msgid "WEP" msgstr "WEP" #. 1 -#: ../cli/src/devices.c:143 +#: ../cli/src/devices.c:145 msgid "WPA" msgstr "WPA" #. 2 -#: ../cli/src/devices.c:144 +#: ../cli/src/devices.c:146 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../cli/src/devices.c:145 +#: ../cli/src/devices.c:147 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../cli/src/devices.c:146 +#: ../cli/src/devices.c:148 msgid "CCMP" msgstr "CCMP" #. 0 -#: ../cli/src/devices.c:156 +#: ../cli/src/devices.c:158 msgid "CTR-FREQ" msgstr "" #. 1 -#: ../cli/src/devices.c:157 +#: ../cli/src/devices.c:159 msgid "RSSI" msgstr "" #. 2 -#: ../cli/src/devices.c:158 +#: ../cli/src/devices.c:160 msgid "CINR" msgstr "" #. 3 -#: ../cli/src/devices.c:159 +#: ../cli/src/devices.c:161 msgid "TX-POW" msgstr "" #. 4 -#: ../cli/src/devices.c:160 +#: ../cli/src/devices.c:162 msgid "BSID" msgstr "" #. 0 -#: ../cli/src/devices.c:170 +#: ../cli/src/devices.c:172 msgid "SSID" msgstr "SSID" #. 1 -#: ../cli/src/devices.c:171 +#: ../cli/src/devices.c:173 msgid "BSSID" msgstr "BSSID" #. 2 -#: ../cli/src/devices.c:172 +#: ../cli/src/devices.c:174 msgid "MODE" msgstr "型号" #. 3 -#: ../cli/src/devices.c:173 +#: ../cli/src/devices.c:175 msgid "FREQ" msgstr "FREQ" #. 4 -#: ../cli/src/devices.c:174 +#: ../cli/src/devices.c:176 msgid "RATE" msgstr "频率" #. 5 #. 1 -#: ../cli/src/devices.c:175 ../cli/src/devices.c:193 +#: ../cli/src/devices.c:177 ../cli/src/devices.c:195 msgid "SIGNAL" msgstr "信号" #. 6 -#: ../cli/src/devices.c:176 +#: ../cli/src/devices.c:178 msgid "SECURITY" msgstr "安全性" #. 7 -#: ../cli/src/devices.c:177 +#: ../cli/src/devices.c:179 msgid "WPA-FLAGS" msgstr "WPA-标志" #. 8 -#: ../cli/src/devices.c:178 +#: ../cli/src/devices.c:180 msgid "RSN-FLAGS" msgstr "RSN-标志" #. 10 #. 4 -#: ../cli/src/devices.c:180 ../cli/src/devices.c:196 +#: ../cli/src/devices.c:182 ../cli/src/devices.c:198 msgid "ACTIVE" msgstr "活跃" -#: ../cli/src/devices.c:213 +#: ../cli/src/devices.c:215 #, c-format msgid "" "Usage: nmcli dev { COMMAND | help }\n" @@ -830,457 +831,461 @@ "\n" msgstr "" -#: ../cli/src/devices.c:241 +#: ../cli/src/devices.c:243 msgid "unmanaged" msgstr "未管理" -#: ../cli/src/devices.c:243 +#: ../cli/src/devices.c:245 msgid "unavailable" msgstr "不可用" -#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108 +#: ../cli/src/devices.c:247 ../cli/src/network-manager.c:108 msgid "disconnected" msgstr "已断开" -#: ../cli/src/devices.c:247 +#: ../cli/src/devices.c:249 msgid "connecting (prepare)" msgstr "连接中(准备)" -#: ../cli/src/devices.c:249 +#: ../cli/src/devices.c:251 msgid "connecting (configuring)" msgstr "连接中(配置)" -#: ../cli/src/devices.c:251 +#: ../cli/src/devices.c:253 msgid "connecting (need authentication)" msgstr "连接中(需要验证)" -#: ../cli/src/devices.c:253 +#: ../cli/src/devices.c:255 msgid "connecting (getting IP configuration)" msgstr "连接中(获得 IP 配置)" -#: ../cli/src/devices.c:255 +#: ../cli/src/devices.c:257 msgid "connecting (checking IP connectivity)" msgstr "" -#: ../cli/src/devices.c:257 +#: ../cli/src/devices.c:259 msgid "connecting (starting secondary connections)" msgstr "" -#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104 +#: ../cli/src/devices.c:261 ../cli/src/network-manager.c:104 msgid "connected" msgstr "连接的" -#: ../cli/src/devices.c:263 +#: ../cli/src/devices.c:265 msgid "connection failed" msgstr "连接失败" -#: ../cli/src/devices.c:274 +#: ../cli/src/devices.c:276 msgid "No reason given" msgstr "" -#: ../cli/src/devices.c:277 +#: ../cli/src/devices.c:279 msgid "Unknown error" msgstr "" -#: ../cli/src/devices.c:280 +#: ../cli/src/devices.c:282 msgid "Device is now managed" msgstr "" -#: ../cli/src/devices.c:283 +#: ../cli/src/devices.c:285 msgid "Device is now unmanaged" msgstr "" -#: ../cli/src/devices.c:286 +#: ../cli/src/devices.c:288 msgid "The device could not be readied for configuration" msgstr "" -#: ../cli/src/devices.c:289 +#: ../cli/src/devices.c:291 msgid "" "IP configuration could not be reserved (no available address, timeout, etc)" msgstr "" -#: ../cli/src/devices.c:292 +#: ../cli/src/devices.c:294 msgid "The IP configuration is no longer valid" msgstr "" -#: ../cli/src/devices.c:295 +#: ../cli/src/devices.c:297 msgid "Secrets were required, but not provided" msgstr "" -#: ../cli/src/devices.c:298 +#: ../cli/src/devices.c:300 msgid "802.1X supplicant disconnected" msgstr "" -#: ../cli/src/devices.c:301 +#: ../cli/src/devices.c:303 msgid "802.1X supplicant configuration failed" msgstr "" -#: ../cli/src/devices.c:304 +#: ../cli/src/devices.c:306 msgid "802.1X supplicant failed" msgstr "" -#: ../cli/src/devices.c:307 +#: ../cli/src/devices.c:309 msgid "802.1X supplicant took too long to authenticate" msgstr "" -#: ../cli/src/devices.c:310 +#: ../cli/src/devices.c:312 msgid "PPP service failed to start" msgstr "" -#: ../cli/src/devices.c:313 +#: ../cli/src/devices.c:315 msgid "PPP service disconnected" msgstr "" -#: ../cli/src/devices.c:316 +#: ../cli/src/devices.c:318 msgid "PPP failed" msgstr "" -#: ../cli/src/devices.c:319 +#: ../cli/src/devices.c:321 msgid "DHCP client failed to start" msgstr "" -#: ../cli/src/devices.c:322 +#: ../cli/src/devices.c:324 msgid "DHCP client error" msgstr "" -#: ../cli/src/devices.c:325 +#: ../cli/src/devices.c:327 msgid "DHCP client failed" msgstr "" -#: ../cli/src/devices.c:328 +#: ../cli/src/devices.c:330 msgid "Shared connection service failed to start" msgstr "" -#: ../cli/src/devices.c:331 +#: ../cli/src/devices.c:333 msgid "Shared connection service failed" msgstr "" -#: ../cli/src/devices.c:334 +#: ../cli/src/devices.c:336 msgid "AutoIP service failed to start" msgstr "" -#: ../cli/src/devices.c:337 +#: ../cli/src/devices.c:339 msgid "AutoIP service error" msgstr "" -#: ../cli/src/devices.c:340 +#: ../cli/src/devices.c:342 msgid "AutoIP service failed" msgstr "" -#: ../cli/src/devices.c:343 +#: ../cli/src/devices.c:345 msgid "The line is busy" msgstr "" -#: ../cli/src/devices.c:346 +#: ../cli/src/devices.c:348 msgid "No dial tone" msgstr "" -#: ../cli/src/devices.c:349 +#: ../cli/src/devices.c:351 msgid "No carrier could be established" msgstr "" -#: ../cli/src/devices.c:352 +#: ../cli/src/devices.c:354 msgid "The dialing request timed out" msgstr "" -#: ../cli/src/devices.c:355 +#: ../cli/src/devices.c:357 msgid "The dialing attempt failed" msgstr "" -#: ../cli/src/devices.c:358 +#: ../cli/src/devices.c:360 msgid "Modem initialization failed" msgstr "" -#: ../cli/src/devices.c:361 +#: ../cli/src/devices.c:363 msgid "Failed to select the specified APN" msgstr "" -#: ../cli/src/devices.c:364 +#: ../cli/src/devices.c:366 msgid "Not searching for networks" msgstr "" -#: ../cli/src/devices.c:367 +#: ../cli/src/devices.c:369 msgid "Network registration denied" msgstr "" -#: ../cli/src/devices.c:370 +#: ../cli/src/devices.c:372 msgid "Network registration timed out" msgstr "" -#: ../cli/src/devices.c:373 +#: ../cli/src/devices.c:375 msgid "Failed to register with the requested network" msgstr "" -#: ../cli/src/devices.c:376 +#: ../cli/src/devices.c:378 msgid "PIN check failed" msgstr "" -#: ../cli/src/devices.c:379 +#: ../cli/src/devices.c:381 msgid "Necessary firmware for the device may be missing" msgstr "" -#: ../cli/src/devices.c:382 +#: ../cli/src/devices.c:384 msgid "The device was removed" msgstr "" -#: ../cli/src/devices.c:385 +#: ../cli/src/devices.c:387 msgid "NetworkManager went to sleep" msgstr "" -#: ../cli/src/devices.c:388 +#: ../cli/src/devices.c:390 msgid "The device's active connection disappeared" msgstr "" -#: ../cli/src/devices.c:391 +#: ../cli/src/devices.c:393 msgid "Device disconnected by user or client" msgstr "" -#: ../cli/src/devices.c:394 +#: ../cli/src/devices.c:396 msgid "Carrier/link changed" msgstr "" -#: ../cli/src/devices.c:397 +#: ../cli/src/devices.c:399 msgid "The device's existing connection was assumed" msgstr "" -#: ../cli/src/devices.c:400 +#: ../cli/src/devices.c:402 msgid "The supplicant is now available" msgstr "" -#: ../cli/src/devices.c:403 +#: ../cli/src/devices.c:405 msgid "The modem could not be found" msgstr "" -#: ../cli/src/devices.c:406 +#: ../cli/src/devices.c:408 msgid "The Bluetooth connection failed or timed out" msgstr "" -#: ../cli/src/devices.c:409 +#: ../cli/src/devices.c:411 msgid "GSM Modem's SIM card not inserted" msgstr "" -#: ../cli/src/devices.c:412 +#: ../cli/src/devices.c:414 msgid "GSM Modem's SIM PIN required" msgstr "" -#: ../cli/src/devices.c:415 +#: ../cli/src/devices.c:417 msgid "GSM Modem's SIM PUK required" msgstr "" -#: ../cli/src/devices.c:418 +#: ../cli/src/devices.c:420 msgid "GSM Modem's SIM wrong" msgstr "" -#: ../cli/src/devices.c:421 -msgid "Infiniband device does not support connected mode" +#: ../cli/src/devices.c:423 +msgid "InfiniBand device does not support connected mode" +msgstr "" + +#: ../cli/src/devices.c:426 +msgid "A dependency of the connection failed" 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 +#: ../cli/src/devices.c:428 ../cli/src/devices.c:451 ../cli/src/devices.c:467 +#: ../cli/src/devices.c:587 ../cli/src/devices.c:631 msgid "Unknown" msgstr "未知" -#: ../cli/src/devices.c:491 +#: ../cli/src/devices.c:500 msgid "(none)" msgstr "(无)" -#: ../cli/src/devices.c:547 +#: ../cli/src/devices.c:556 #, c-format msgid "%u MHz" msgstr "%u MHz" -#: ../cli/src/devices.c:548 +#: ../cli/src/devices.c:557 #, c-format msgid "%u MB/s" msgstr "%u MB/s" -#: ../cli/src/devices.c:557 +#: ../cli/src/devices.c:566 msgid "Encrypted: " msgstr "加密： " -#: ../cli/src/devices.c:562 +#: ../cli/src/devices.c:571 msgid "WEP " msgstr "WEP " -#: ../cli/src/devices.c:564 +#: ../cli/src/devices.c:573 msgid "WPA " msgstr "WPA " -#: ../cli/src/devices.c:566 +#: ../cli/src/devices.c:575 msgid "WPA2 " msgstr "WPA2 " -#: ../cli/src/devices.c:569 +#: ../cli/src/devices.c:578 msgid "Enterprise " msgstr "企业级 " -#: ../cli/src/devices.c:578 +#: ../cli/src/devices.c:587 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../cli/src/devices.c:578 +#: ../cli/src/devices.c:587 msgid "Infrastructure" msgstr "基础构架" -#: ../cli/src/devices.c:613 +#: ../cli/src/devices.c:622 msgid "Home" msgstr "" -#: ../cli/src/devices.c:616 +#: ../cli/src/devices.c:625 msgid "Partner" msgstr "" -#: ../cli/src/devices.c:619 +#: ../cli/src/devices.c:628 msgid "Roaming" msgstr "" -#: ../cli/src/devices.c:691 +#: ../cli/src/devices.c:700 #, c-format msgid "Error: 'dev list': %s" msgstr "错误：'dev list': %s" -#: ../cli/src/devices.c:693 +#: ../cli/src/devices.c:702 #, c-format msgid "Error: 'dev list': %s; allowed fields: %s" msgstr "错误：'dev list': %s；允许的字段：%s" -#: ../cli/src/devices.c:702 +#: ../cli/src/devices.c:711 msgid "Device details" msgstr "设备详情" -#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152 +#: ../cli/src/devices.c:756 ../cli/src/devices.c:757 ../cli/src/devices.c:1164 #: ../cli/src/utils.c:445 msgid "(unknown)" msgstr "(未知)" -#: ../cli/src/devices.c:753 +#: ../cli/src/devices.c:765 msgid "not connected" msgstr "" -#: ../cli/src/devices.c:780 +#: ../cli/src/devices.c:792 #, c-format msgid "%u Mb/s" msgstr "%u Mb/s" #. Print header #. "WIRED-PROPERTIES" -#: ../cli/src/devices.c:853 +#: ../cli/src/devices.c:865 msgid "on" msgstr "开" -#: ../cli/src/devices.c:853 +#: ../cli/src/devices.c:865 msgid "off" msgstr "关" -#: ../cli/src/devices.c:1004 +#: ../cli/src/devices.c:1016 #, c-format msgid "Error: 'dev status': %s" msgstr "错误：'dev status': %s" -#: ../cli/src/devices.c:1006 +#: ../cli/src/devices.c:1018 #, c-format msgid "Error: 'dev status': %s; allowed fields: %s" msgstr "错误：'dev status': %s；允许的字段：%s" -#: ../cli/src/devices.c:1029 +#: ../cli/src/devices.c:1041 msgid "Status of devices" msgstr "设备状态" -#: ../cli/src/devices.c:1060 +#: ../cli/src/devices.c:1072 #, c-format msgid "Error: '%s' argument is missing." msgstr "错误：缺少 '%s' 参数。" -#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253 -#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609 +#: ../cli/src/devices.c:1113 ../cli/src/devices.c:1265 +#: ../cli/src/devices.c:1402 ../cli/src/devices.c:1621 #, c-format msgid "Error: Device '%s' not found." msgstr "错误：没有找到设备 '%s'。" -#: ../cli/src/devices.c:1124 +#: ../cli/src/devices.c:1136 #, c-format msgid "Success: Device '%s' successfully disconnected." msgstr "成功：成功断开设备 '%s'。" -#: ../cli/src/devices.c:1149 +#: ../cli/src/devices.c:1161 #, c-format msgid "Error: Device '%s' (%s) disconnecting failed: %s" msgstr "错误：断开设备 '%s'(%s)失败：%s" -#: ../cli/src/devices.c:1157 +#: ../cli/src/devices.c:1169 #, c-format msgid "Device state: %d (%s)\n" msgstr "设备状态：%d (%s)\n" -#: ../cli/src/devices.c:1222 +#: ../cli/src/devices.c:1234 #, c-format msgid "Error: iface has to be specified." msgstr "错误：没有指定 iface。" -#: ../cli/src/devices.c:1348 +#: ../cli/src/devices.c:1360 #, c-format msgid "Error: 'dev wifi': %s" msgstr "错误：'dev wifi'：%s" -#: ../cli/src/devices.c:1350 +#: ../cli/src/devices.c:1362 #, c-format msgid "Error: 'dev wifi': %s; allowed fields: %s" msgstr "错误：'dev wifi': %s；允许的字段：%s" -#: ../cli/src/devices.c:1373 +#: ../cli/src/devices.c:1385 msgid "WiFi scan list" msgstr "WiFi 扫描列表" -#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464 +#: ../cli/src/devices.c:1422 ../cli/src/devices.c:1476 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "" -#: ../cli/src/devices.c:1427 +#: ../cli/src/devices.c:1439 #, c-format msgid "Error: Device '%s' is not a WiFi device." msgstr "错误：设备 '%s' 不是 WiFi 设备。" -#: ../cli/src/devices.c:1491 +#: ../cli/src/devices.c:1503 #, c-format msgid "Error: 'dev wifi' command '%s' is not valid." msgstr "错误：'dev wifi' 命令 '%s' 无效。" -#: ../cli/src/devices.c:1567 +#: ../cli/src/devices.c:1579 #, c-format msgid "Error: 'dev wimax': %s" msgstr "" -#: ../cli/src/devices.c:1569 +#: ../cli/src/devices.c:1581 #, c-format msgid "Error: 'dev wimax': %s; allowed fields: %s" msgstr "" -#: ../cli/src/devices.c:1592 +#: ../cli/src/devices.c:1604 msgid "WiMAX NSP list" msgstr "" -#: ../cli/src/devices.c:1629 +#: ../cli/src/devices.c:1641 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "" -#: ../cli/src/devices.c:1640 +#: ../cli/src/devices.c:1652 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "" -#: ../cli/src/devices.c:1671 +#: ../cli/src/devices.c:1683 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "" -#: ../cli/src/devices.c:1698 +#: ../cli/src/devices.c:1710 #, c-format msgid "Error: 'dev wimax' command '%s' is not valid." msgstr "" -#: ../cli/src/devices.c:1748 +#: ../cli/src/devices.c:1760 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "错误：'dev' 命令 '%s' 无效。" @@ -1568,88 +1573,104 @@ msgid "Success" msgstr "成功" -#: ../cli/src/settings.c:465 +#: ../cli/src/settings.c:497 #, c-format msgid "%d (hex-ascii-key)" msgstr "%d (hex-ascii-key)" -#: ../cli/src/settings.c:467 +#: ../cli/src/settings.c:499 #, c-format msgid "%d (104/128-bit passphrase)" msgstr "%d (104/128 位密码短语)" -#: ../cli/src/settings.c:470 +#: ../cli/src/settings.c:502 #, c-format msgid "%d (unknown)" msgstr "%d (未知)" -#: ../cli/src/settings.c:496 +#: ../cli/src/settings.c:528 msgid "0 (unknown)" msgstr "0 (未知)" -#: ../cli/src/settings.c:502 +#: ../cli/src/settings.c:534 msgid "any, " msgstr "任意， " -#: ../cli/src/settings.c:504 +#: ../cli/src/settings.c:536 msgid "900 MHz, " msgstr "900 MHz， " -#: ../cli/src/settings.c:506 +#: ../cli/src/settings.c:538 msgid "1800 MHz, " msgstr "1800 MHz， " -#: ../cli/src/settings.c:508 +#: ../cli/src/settings.c:540 msgid "1900 MHz, " msgstr "1900 MHz， " -#: ../cli/src/settings.c:510 +#: ../cli/src/settings.c:542 msgid "850 MHz, " msgstr "850 MHz， " -#: ../cli/src/settings.c:512 +#: ../cli/src/settings.c:544 msgid "WCDMA 3GPP UMTS 2100 MHz, " msgstr "WCDMA 3GPP UMTS 2100 MHz， " -#: ../cli/src/settings.c:514 +#: ../cli/src/settings.c:546 msgid "WCDMA 3GPP UMTS 1800 MHz, " msgstr "WCDMA 3GPP UMTS 1800 MHz， " -#: ../cli/src/settings.c:516 +#: ../cli/src/settings.c:548 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, " msgstr "WCDMA 3GPP UMTS 1700/2100 MHz， " -#: ../cli/src/settings.c:518 +#: ../cli/src/settings.c:550 msgid "WCDMA 3GPP UMTS 800 MHz, " msgstr "WCDMA 3GPP UMTS 800 MHz， " -#: ../cli/src/settings.c:520 +#: ../cli/src/settings.c:552 msgid "WCDMA 3GPP UMTS 850 MHz, " msgstr "WCDMA 3GPP UMTS 850 MHz， " -#: ../cli/src/settings.c:522 +#: ../cli/src/settings.c:554 msgid "WCDMA 3GPP UMTS 900 MHz, " msgstr "WCDMA 3GPP UMTS 900 MHz， " -#: ../cli/src/settings.c:524 +#: ../cli/src/settings.c:556 msgid "WCDMA 3GPP UMTS 1700 MHz, " msgstr "WCDMA 3GPP UMTS 1700 MHz， " -#: ../cli/src/settings.c:526 +#: ../cli/src/settings.c:558 msgid "WCDMA 3GPP UMTS 1900 MHz, " msgstr "" -#: ../cli/src/settings.c:528 +#: ../cli/src/settings.c:560 msgid "WCDMA 3GPP UMTS 2600 MHz, " msgstr "" -#: ../cli/src/settings.c:650 ../cli/src/settings.c:846 -#: ../cli/src/settings.c:1550 +#: ../cli/src/settings.c:578 +msgid "0 (NONE)" +msgstr "" + +#: ../cli/src/settings.c:584 +msgid "REORDER_HEADERS, " +msgstr "" + +#: ../cli/src/settings.c:586 +msgid "GVRP, " +msgstr "" + +#: ../cli/src/settings.c:588 +msgid "LOOSE_BINDING, " +msgstr "" + +#: ../cli/src/settings.c:730 ../cli/src/settings.c:926 +#: ../cli/src/settings.c:1630 msgid "auto" msgstr "自动" -#: ../cli/src/settings.c:840 ../cli/src/settings.c:843 -#: ../cli/src/settings.c:844 ../cli/src/utils.c:247 +#: ../cli/src/settings.c:920 ../cli/src/settings.c:923 +#: ../cli/src/settings.c:924 ../cli/src/utils.c:247 msgid "not set" msgstr "未设置" @@ -2050,26 +2071,26 @@ msgid "Could not generate random data." msgstr "无法生成随机数据。" -#: ../libnm-util/nm-utils.c:2034 +#: ../libnm-util/nm-utils.c:2036 #, c-format msgid "Not enough memory to make encryption key." msgstr "没有足够的空间生成加密密钥。" -#: ../libnm-util/nm-utils.c:2144 +#: ../libnm-util/nm-utils.c:2146 msgid "Could not allocate memory for PEM file creation." msgstr "无法为创建 PEM 文件分配内存。" -#: ../libnm-util/nm-utils.c:2156 +#: ../libnm-util/nm-utils.c:2158 #, c-format msgid "Could not allocate memory for writing IV to PEM file." msgstr "无法为在 PEM 文件中写入 IV 分配内存。" -#: ../libnm-util/nm-utils.c:2168 +#: ../libnm-util/nm-utils.c:2170 #, c-format msgid "Could not allocate memory for writing encrypted key to PEM file." msgstr "无法为在 PEM 文件中写入加密密钥分配内存。" -#: ../libnm-util/nm-utils.c:2187 +#: ../libnm-util/nm-utils.c:2189 #, c-format msgid "Could not allocate memory for PEM file data." msgstr "无法为 PEM 文件数据分配内存。" @@ -2200,57 +2221,57 @@ msgid "NetworkManager is already running (pid %ld)\n" msgstr "" -#: ../src/main.c:360 +#: ../src/main.c:363 msgid "Print NetworkManager version and exit" msgstr "" -#: ../src/main.c:361 +#: ../src/main.c:364 msgid "Don't become a daemon" msgstr "" -#: ../src/main.c:362 +#: ../src/main.c:365 msgid "Make all warnings fatal" msgstr "" -#: ../src/main.c:363 +#: ../src/main.c:366 msgid "Specify the location of a PID file" msgstr "" -#: ../src/main.c:363 +#: ../src/main.c:366 msgid "filename" msgstr "" -#: ../src/main.c:364 +#: ../src/main.c:367 msgid "State file location" msgstr "" -#: ../src/main.c:364 +#: ../src/main.c:367 msgid "/path/to/state.file" msgstr "" -#: ../src/main.c:365 +#: ../src/main.c:368 msgid "Config file location" msgstr "" -#: ../src/main.c:365 +#: ../src/main.c:368 msgid "/path/to/config.file" msgstr "" -#: ../src/main.c:366 +#: ../src/main.c:369 msgid "List of plugins separated by ','" msgstr "" -#: ../src/main.c:366 +#: ../src/main.c:369 msgid "plugin1,plugin2" msgstr "" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:368 +#: ../src/main.c:371 msgid "Log level: one of [ERR, WARN, INFO, DEBUG]" msgstr "" #. Translators: Do not translate the values in the square brackets -#: ../src/main.c:371 +#: ../src/main.c:374 msgid "" "Log domains separated by ',': any combination of\n" " " @@ -2262,12 +2283,12 @@ " INFINIBAND,FIREWALL]" msgstr "" -#: ../src/main.c:381 +#: ../src/main.c:387 #, c-format msgid "GModules are not supported on your platform!\n" msgstr "" -#: ../src/main.c:400 +#: ../src/main.c:406 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -2275,32 +2296,32 @@ "should associate with." msgstr "" -#: ../src/main.c:406 +#: ../src/main.c:412 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "无效选项。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:416 +#: ../src/main.c:422 #, c-format msgid "You must be root to run NetworkManager!\n" msgstr "" -#: ../src/main.c:436 +#: ../src/main.c:443 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "" -#: ../src/main.c:447 +#: ../src/main.c:454 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" -#: ../src/main.c:454 +#: ../src/main.c:461 #, c-format msgid "State file %s parsing failed: (%d) %s\n" msgstr "" -#: ../src/main.c:471 +#: ../src/main.c:478 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "" @@ -2353,39 +2374,44 @@ msgid "Unknown log domain '%s'" msgstr "未知日志域 '%s'" -#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:324 +#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:325 #, c-format msgid "CDMA connection %d" msgstr "" -#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:320 +#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:321 #, c-format msgid "GSM connection %d" msgstr "" -#: ../src/nm-device-bt.c:295 +#: ../src/nm-device-bond.c:192 +#, c-format +msgid "Bond connection %d" +msgstr "" + +#: ../src/nm-device-bt.c:296 #, c-format msgid "PAN connection %d" msgstr "" -#: ../src/nm-device-bt.c:328 +#: ../src/nm-device-bt.c:329 #, c-format msgid "DUN connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1354 +#: ../src/nm-device-ethernet.c:1326 #, c-format msgid "PPPoE connection %d" msgstr "" -#: ../src/nm-device-ethernet.c:1354 ../src/settings/nm-settings-utils.c:50 +#: ../src/nm-device-ethernet.c:1326 ../src/settings/nm-settings-utils.c:50 #, c-format msgid "Wired connection %d" msgstr "" -#: ../src/nm-device-infiniband.c:302 +#: ../src/nm-device-infiniband.c:303 #, c-format -msgid "Infiniband connection %d" +msgid "InfiniBand connection %d" msgstr "" #: ../src/nm-device-olpc-mesh.c:293 @@ -2393,7 +2419,12 @@ msgid "Mesh %d" msgstr "" -#: ../src/nm-manager.c:642 +#: ../src/nm-device-vlan.c:362 +#, c-format +msgid "VLAN connection %d" +msgstr "" + +#: ../src/nm-manager.c:667 #, c-format msgid "VPN connection %d" msgstr "" @@ -2438,11 +2469,10 @@ msgid "error updating link cache: %s" msgstr "更新链接缓存出错：%s" -#: ../src/settings/plugins/ifcfg-rh/reader.c:91 -#: ../src/settings/plugins/ifnet/connection_parser.c:51 +#: ../src/settings/plugins/ifcfg-rh/reader.c:93 msgid "System" msgstr "系统" -#: ../src/settings/plugins/ifcfg-rh/reader.c:3648 +#: ../src/settings/plugins/ifcfg-rh/reader.c:3632 msgid "Bond" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/newt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/newt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/newt.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/newt.po 2012-03-23 07:32:55.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: 2012-02-21 18:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493 msgid "Ok" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nova.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nova.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nova.po 2012-02-23 07:12:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nova.po 2012-03-23 07:33:46.000000000 +0000 @@ -8,14 +8,15 @@ "Project-Id-Version: nova\n" "Report-Msgid-Bugs-To: FULL NAME \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" +"PO-Revision-Date: 2012-03-16 22:31+0000\n" +"Last-Translator: Vincent Hou \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-22 06:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-23 01:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" +"Generated-By: Babel 0.9.6\n" #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49 #: nova/api/openstack/compute/contrib/volumetypes.py:158 @@ -27,25 +28,25 @@ #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79 #: nova/api/openstack/compute/contrib/volumetypes.py:188 msgid "Request body and URI mismatch" -msgstr "" +msgstr "请求主体和URI不匹配" #: 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 "" +msgstr "请求主体包含太多items" #: 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 "" +msgstr "将连接接口 %(interface_id)s 连接到net %(net_id)s 针对租户 %(tenant_id)s" #: 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 "" +msgstr "端口 %(port_id)s 在net %(net_id)s 上删除，针对租户是 %(tenant_id)s" #: nova/manager.py:146 #, python-format @@ -56,7 +57,7 @@ #: nova/manager.py:152 #, python-format msgid "Running periodic task %(full_task_name)s" -msgstr "" +msgstr "正在运行周期性任务 %(full_task_name)s" #: nova/manager.py:159 #, python-format @@ -65,7 +66,7 @@ #: nova/manager.py:203 msgid "Notifying Schedulers of capabilities ..." -msgstr "向 Schedulers 通报能力。" +msgstr "向调度器通报能力。" #: nova/api/openstack/compute/contrib/admin_actions.py:244 #: nova/api/openstack/compute/contrib/console_output.py:46 @@ -80,18 +81,18 @@ #: nova/virt/disk/mount.py:76 msgid "no partitions found" -msgstr "" +msgstr "未找到分区" #: nova/virt/disk/mount.py:77 #, python-format msgid "Failed to map partitions: %s" -msgstr "" +msgstr "映射分区失败：%s" #: 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 "Failed to mount filesystem: %s" -msgstr "" +msgstr "挂载文件系统失败：%s" #: nova/api/openstack/wsgi.py:813 nova/api/openstack/wsgi.py:826 #: nova/api/openstack/compute/server_metadata.py:58 @@ -101,54 +102,54 @@ #: nova/api/openstack/compute/contrib/admin_actions.py:211 #: nova/api/openstack/compute/contrib/console_output.py:51 msgid "Malformed request body" -msgstr "" +msgstr "错误格式的请求主体" #: nova/virt/vmwareapi/fake.py:44 nova/virt/xenapi/fake.py:77 #, python-format msgid "%(text)s: _db_content => %(content)s" -msgstr "" +msgstr "%(text)s: _db_content => %(content)s" #: 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 "" +msgstr "产生 NotImplemented 错误" #: nova/virt/xenapi/fake.py:526 #, python-format msgid "xenapi.fake does not have an implementation for %s" -msgstr "" +msgstr "xenapi.fake 没有 %s 的实现" #: nova/virt/xenapi/fake.py:560 #, python-format msgid "Calling %(localname)s %(impl)s" -msgstr "" +msgstr "正在调用 %(localname)s %(impl)s" #: nova/virt/xenapi/fake.py:565 #, python-format msgid "Calling getter %s" -msgstr "" +msgstr "调用 getter %s" #: 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 "" +msgstr "xenapi.fake 没有 %s 的实现或者调用时用了错误数目的参数" #: nova/virt/connection.py:85 msgid "Failed to open connection to the hypervisor" -msgstr "" +msgstr "打开虚拟机管理程序的连接失败" #: 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 "" +msgstr "只能有 %(value)s 个 %(verb)s 请求发送给 %(uri)s 限定是每一个 %(unit_string)s。" #: nova/api/openstack/compute/limits.py:265 msgid "This request was rate-limited." -msgstr "" +msgstr "这个请求受到频率限制。" #: nova/utils.py:72 #, python-format @@ -168,7 +169,7 @@ #: nova/utils.py:207 #, python-format msgid "Running cmd (subprocess): %s" -msgstr "正在运行（在子进程中）运行命令：%s" +msgstr "正在运行cmd (subprocess)：%s" #: nova/utils.py:223 nova/utils.py:302 #, python-format @@ -183,7 +184,7 @@ #: nova/utils.py:278 #, python-format msgid "Running cmd (SSH): %s" -msgstr "运行SSH命令：%s" +msgstr "运行cmd (SSH)：%s" #: nova/utils.py:280 msgid "Environment not supported over SSH" @@ -206,7 +207,7 @@ #: nova/utils.py:479 #, python-format msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s" -msgstr "" +msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s" #: nova/utils.py:576 #, python-format @@ -266,22 +267,22 @@ #: nova/utils.py:1242 #, python-format msgid "Class %(fullname)s is deprecated: %(msg)s" -msgstr "类 %(fullname)s 废弃不用了：%(msg)s" +msgstr "类 %(fullname)s 是不推荐的：%(msg)s" #: nova/utils.py:1244 #, python-format msgid "Class %(fullname)s is deprecated" -msgstr "类 %(fullname)s 废弃不用了" +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" +msgstr "函数 %(name)s 在%(location)s 里的是不推荐的：%(msg)s" #: nova/utils.py:1278 #, python-format msgid "Function %(name)s in %(location)s is deprecated" -msgstr "%(location)s 里的函数 %(name)s 已经废弃了" +msgstr "函数 %(name)s 在%(location)s 里的是不推荐的" #: nova/api/openstack/compute/contrib/volumes.py:481 #: nova/api/openstack/volume/snapshots.py:109 @@ -293,7 +294,7 @@ #: nova/api/openstack/volume/snapshots.py:149 #, python-format msgid "Create snapshot from volume %s" -msgstr "" +msgstr "为卷 %s 创建快照" #: nova/api/openstack/compute/contrib/volumes.py:73 #: nova/api/openstack/volume/volumes.py:99 @@ -316,48 +317,48 @@ #: 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 设备上" +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" +msgstr "分离卷 %s" #: nova/virt/libvirt/firewall.py:42 msgid "" "Libvirt module could not be loaded. NWFilterFirewall will not work correctly." -msgstr "" +msgstr "Libvirt模块无法加载。NWFilterFirewall 无法正常工作。" #: nova/virt/libvirt/firewall.py:140 msgid "Called setup_basic_filtering in nwfilter" -msgstr "" +msgstr "在 nwfilter 里调用 setup_basic_filtering" #: nova/virt/libvirt/firewall.py:148 msgid "Ensuring static filters" -msgstr "" +msgstr "正在确保静态过滤器" #: nova/virt/libvirt/firewall.py:262 #, python-format msgid "The nwfilter(%(instance_filter_name)s) is not found." -msgstr "" +msgstr "nwfilter(%(instance_filter_name)s)未找到" #: nova/virt/libvirt/firewall.py:274 #, python-format msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found." -msgstr "" +msgstr "nwfilter(%(instance_secgroup_filter_name)s) 未找到" #: nova/virt/libvirt/firewall.py:457 #, python-format msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found." -msgstr "" +msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。" #: nova/virt/libvirt/firewall.py:473 msgid "iptables firewall: Setup Basic Filtering" -msgstr "" +msgstr "iptables 防火墙：设置基本的过滤规则" #: nova/virt/libvirt/firewall.py:492 msgid "Attempted to unfilter instance which is not filtered" -msgstr "" +msgstr "试图不过滤没有过滤的实例" #: nova/api/openstack/compute/contrib/floating_ips.py:159 #, python-format @@ -400,256 +401,256 @@ #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:58 #, python-format msgid "_create: %s" -msgstr "" +msgstr "_create: %s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:67 #: nova/tests/api/openstack/compute/contrib/test_vsa.py:70 #, python-format msgid "_delete: %s" -msgstr "" +msgstr "_delete: %s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:76 #: nova/tests/api/openstack/compute/contrib/test_vsa.py:79 #, python-format msgid "_get: %s" -msgstr "" +msgstr "_get: %s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:86 #: nova/tests/api/openstack/compute/contrib/test_vsa.py:89 #, python-format msgid "_get_all: %s" -msgstr "" +msgstr "_get_all: %s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:131 #, python-format msgid "test_snapshot_create: param=%s" -msgstr "" +msgstr "test_snapshot_create: 参数=%s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:140 #, python-format msgid "test_snapshot_create: resp_dict=%s" -msgstr "" +msgstr "test_snapshot_create: resp_dict=%s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:162 #, python-format msgid "test_snapshot_create_force: param=%s" -msgstr "" +msgstr "test_snapshot_create_force: 参数=%s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:171 #, python-format msgid "test_snapshot_create_force: resp_dict=%s" -msgstr "" +msgstr "test_snapshot_create_force: resp_dict=%s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:211 #, python-format msgid "test_snapshot_show: resp=%s" -msgstr "" +msgstr "test_snapshot_show: resp=%s" #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:237 #, python-format msgid "test_snapshot_detail: resp_dict=%s" -msgstr "" +msgstr "test_snapshot_detail: resp_dict=%s" #: nova/console/manager.py:77 nova/console/vmrc_manager.py:70 msgid "Adding console" -msgstr "" +msgstr "正在添加控制台" #: nova/console/manager.py:97 #, python-format msgid "Tried to remove non-existant console %(console_id)s." -msgstr "" +msgstr "尝试删除不存在的控制台%(console_id)s。" #: nova/api/openstack/compute/ips.py:74 msgid "Instance does not exist" -msgstr "" +msgstr "实例不存在" #: nova/api/openstack/compute/ips.py:97 msgid "Instance is not a member of specified network" -msgstr "" +msgstr "实例并不是指定网络的成员" #: nova/api/openstack/compute/extensions.py:29 #: nova/api/openstack/volume/extensions.py:29 msgid "Initializing extension manager." -msgstr "" +msgstr "正在初始化扩展管理员。" #: nova/virt/disk/api.py:150 msgid "no capable image handler configured" -msgstr "" +msgstr "没有合适的镜像句柄配置好" #: nova/virt/disk/api.py:163 #, python-format msgid "unknown disk image handler: %s" -msgstr "" +msgstr "未知的磁盘镜像句柄：%s" #: nova/virt/disk/api.py:174 msgid "image already mounted" -msgstr "" +msgstr "镜像已经挂载" #: nova/virt/disk/api.py:274 #, python-format msgid "Failed to remove container: %s" -msgstr "" +msgstr "移除容器失败：%s" #: nova/scheduler/host_manager.py:265 #, python-format msgid "Received %(service_name)s service update from %(host)s." -msgstr "" +msgstr "接收到 %(service_name)s 服务更新，来自 %(host)s。" #: nova/scheduler/host_manager.py:306 msgid "host_manager only implemented for 'compute'" -msgstr "" +msgstr "host_manager 只实现了“compute”" #: nova/scheduler/host_manager.py:316 #, python-format msgid "No service for compute ID %s" -msgstr "" +msgstr "计算节点 %s 没有服务" #: nova/tests/scheduler/test_vsa_scheduler.py:147 #, python-format msgid "Host %s" -msgstr "" +msgstr "主机 %s" #: nova/tests/scheduler/test_vsa_scheduler.py:194 #, python-format msgid "Test: provision vol %(name)s on host %(host)s" -msgstr "" +msgstr "测试：在主机 %(host)s 上提供 %(name)s" #: nova/tests/scheduler/test_vsa_scheduler.py:196 #, python-format msgid "\t vol=%(vol)s" -msgstr "" +msgstr "\t vol=%(vol)s" #: nova/tests/scheduler/test_vsa_scheduler.py:199 #, python-format msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s" -msgstr "" +msgstr "测试：VSA更新请求：vsa_id=%(vsa_id)s values=%(values)s" #: nova/tests/scheduler/test_vsa_scheduler.py:203 #, python-format msgid "Test: Volume create: %s" -msgstr "" +msgstr "测试：卷创建：%s" #: nova/tests/scheduler/test_vsa_scheduler.py:210 #, python-format msgid "Test: Volume get request: id=%(volume_id)s" -msgstr "" +msgstr "测试：卷获取请求：id=%(volume_id)s" #: nova/tests/scheduler/test_vsa_scheduler.py:217 #, python-format msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s" -msgstr "" +msgstr "测试：卷更新请求：id=%(volume_id)s values=%(values)s" #: nova/tests/scheduler/test_vsa_scheduler.py:453 #, python-format msgid "Test: Volume get: id=%(volume_id)s" -msgstr "" +msgstr "测试：卷获取：id=%(volume_id)s" #: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:38 msgid "progress column not added to instances table" -msgstr "" +msgstr "progress列没有加入到实例表中" #: nova/consoleauth/manager.py:63 #, python-format msgid "Deleting Expired Token: (%s)" -msgstr "" +msgstr "删除过期令牌：(%s)" #: nova/consoleauth/manager.py:75 #, python-format msgid "Received Token: %(token)s, %(token_dict)s)" -msgstr "" +msgstr "接收到令牌：%(token)s, %(token_dict)s)" #: nova/consoleauth/manager.py:79 #, python-format msgid "Checking Token: %(token)s, %(token_valid)s)" -msgstr "" +msgstr "检查令牌：%(token)s, %(token_valid)s)" #: nova/network/minidns.py:65 msgid "This driver only supports type 'a'" -msgstr "" +msgstr "驱动仅支持类型 'a'" #: nova/notifier/api.py:115 #, python-format msgid "%s not in valid priorities" -msgstr "" +msgstr "%s 不在有效的优先级" #: nova/notifier/api.py:132 #, python-format msgid "" "Problem '%(e)s' attempting to send to notification system. " "Payload=%(payload)s" -msgstr "" +msgstr "Problem '%(e)s' 试图发送到通知系统。Payload=%(payload)s" #: nova/network/manager.py:274 nova/network/manager.py:466 #, python-format msgid "Interface %(interface)s not found" -msgstr "" +msgstr "没有找到接口 %(interface)s" #: nova/network/manager.py:289 #, python-format msgid "floating IP allocation for instance |%s|" -msgstr "" +msgstr "为实例 |%s| 分配浮动IP" #: nova/network/manager.py:324 #, python-format msgid "floating IP deallocation for instance |%s|" -msgstr "" +msgstr "为实例 |%s| 释放浮动IP" #: nova/network/manager.py:356 #, python-format msgid "Address |%(address)s| is not allocated" -msgstr "" +msgstr "地址 |%(address)s| 没有分配" #: nova/network/manager.py:360 #, python-format msgid "Address |%(address)s| is not allocated to your project |%(project)s|" -msgstr "" +msgstr "地址 |%(address)s| 没有分配给你的项目 |%(project)s|" #: nova/network/manager.py:372 #, python-format msgid "Quota exceeded for %s, tried to allocate address" -msgstr "" +msgstr "%s 的配额超出，尝试分配地址" #: 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 "" +msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。" #: nova/network/manager.py:630 #, python-format msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|." -msgstr "" +msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。" #: nova/network/manager.py:640 #, python-format msgid "" "Domain |%(domain)s| already exists, changing project to |%(project)s|." -msgstr "" +msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。" #: nova/network/manager.py:748 #, python-format msgid "Disassociated %s stale fixed ip(s)" -msgstr "" +msgstr "解除 %s 过期固定ip的关联" #: nova/network/manager.py:752 msgid "setting network host" -msgstr "" +msgstr "设置网络主机" #: nova/network/manager.py:864 #, python-format msgid "network allocations for instance |%s|" -msgstr "" +msgstr "为实例 |%s| 的网路分配" #: nova/network/manager.py:869 #, python-format msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|" -msgstr "" +msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|" #: nova/network/manager.py:893 #, python-format msgid "network deallocation for instance |%s|" -msgstr "" +msgstr "为实例 |%s| 解除网络分配" #: nova/network/manager.py:1112 #, python-format @@ -658,211 +659,213 @@ "Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record will be " "created." msgstr "" +"instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 " +"|%(zone2)s| 里。没有DNS记录将创建。" #: nova/network/manager.py:1187 #, python-format msgid "Leased IP |%(address)s|" -msgstr "" +msgstr "租用的IP |%(address)s|" #: nova/network/manager.py:1191 #, python-format msgid "IP %s leased that is not associated" -msgstr "" +msgstr "没有关联的IP %s 被租用了" #: nova/network/manager.py:1199 #, python-format msgid "IP |%s| leased that isn't allocated" -msgstr "" +msgstr "没有分配的IP |%s| 被租用了" #: nova/network/manager.py:1204 #, python-format msgid "Released IP |%(address)s|" -msgstr "" +msgstr "释放的IP |%(address)s|" #: nova/network/manager.py:1208 #, python-format msgid "IP %s released that is not associated" -msgstr "" +msgstr "没有关联的IP %s 被释放了" #: nova/network/manager.py:1211 #, python-format msgid "IP %s released that was not leased" -msgstr "" +msgstr "没有租用的IP %s 被释放了" #: nova/network/manager.py:1279 msgid "cidr already in use" -msgstr "" +msgstr "cidr 已经在使用" #: nova/network/manager.py:1282 #, python-format msgid "" "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)" -msgstr "" +msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突" #: nova/network/manager.py:1293 #, python-format msgid "" "requested cidr (%(cidr)s) conflicts with existing smaller cidr (%(smaller)s)" -msgstr "" +msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突" #: nova/network/manager.py:1352 msgid "Network already exists!" -msgstr "" +msgstr "网络已经存在。" #: nova/network/manager.py:1371 #, python-format msgid "Network must be disassociated from project %s before delete" -msgstr "" +msgstr "网路在删除前必须与项目 %s 解除关联" #: nova/network/manager.py:1682 msgid "" "The sum between the number of networks and the vlan start cannot be greater " "than 4094" -msgstr "" +msgstr "网络数量与VLAN起始数之和不能大于4049" #: 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 "" +msgstr "网络范围不够多而不适合 %(num_networks)s。网络大小是 %(network_size)s。" #: nova/network/ldapdns.py:321 msgid "This driver only supports type 'a' entries." -msgstr "" +msgstr "驱动仅支持入口类型 'a'。" #: nova/virt/xenapi/volume_utils.py:52 msgid "creating sr within volume_utils" -msgstr "" +msgstr "在volume_utils创建sr" #: nova/virt/xenapi/volume_utils.py:55 nova/virt/xenapi/volume_utils.py:83 #, python-format msgid "type is = %s" -msgstr "" +msgstr "类型is = %s" #: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86 #, python-format msgid "name = %s" -msgstr "" +msgstr "name = %s" #: nova/virt/xenapi/volume_utils.py:71 #, python-format msgid "Created %(label)s as %(sr_ref)s." -msgstr "" +msgstr "将 %(label)s 作为 %(sr_ref)s 创建。" #: nova/virt/xenapi/volume_utils.py:76 nova/virt/xenapi/volume_utils.py:174 msgid "Unable to create Storage Repository" -msgstr "" +msgstr "无法创建 Storage Repository" #: nova/virt/xenapi/volume_utils.py:80 msgid "introducing sr within volume_utils" -msgstr "" +msgstr "在volume_utils里引入sr" #: 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 "" +msgstr "将 %(label)s 作为 %(sr_ref)s 引入。" #: nova/virt/xenapi/volume_utils.py:106 msgid "Creating pbd for SR" -msgstr "" +msgstr "为SR创建pbd" #: nova/virt/xenapi/volume_utils.py:108 msgid "Plugging SR" -msgstr "" +msgstr "Plugging SR" #: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160 msgid "Unable to introduce Storage Repository" -msgstr "" +msgstr "无法引入Storage Repository" #: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51 msgid "Unable to get SR using uuid" -msgstr "" +msgstr "无法得到使用uuid的SR" #: nova/virt/xenapi/volume_utils.py:129 #, python-format msgid "Forgetting SR %s..." -msgstr "" +msgstr "遗忘SR %s..." #: nova/virt/xenapi/volume_utils.py:137 msgid "Unable to forget Storage Repository" -msgstr "" +msgstr "无法遗忘Storage Repository" #: nova/virt/xenapi/volume_utils.py:157 #, python-format msgid "Introducing %s..." -msgstr "" +msgstr "引入 %s..." #: nova/virt/xenapi/volume_utils.py:186 #, python-format msgid "Unable to find SR from VBD %s" -msgstr "" +msgstr "无法在VBD %s找到SR" #: nova/virt/xenapi/volume_utils.py:206 #, python-format msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... " -msgstr "" +msgstr "为虚拟机 %(vm_ref)s ，VDI %(vdi_ref)s 创建VBD... " #: 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 "" +msgstr "为虚拟机 %(vm_ref)s，VDI %(vdi_ref)s创建了VBD %(vbd_ref)s" #: nova/virt/xenapi/volume_utils.py:228 #, python-format msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s" -msgstr "" +msgstr "为 %(sr_ref)s 得到PBDs时，忽略异常 %(exc)s" #: nova/virt/xenapi/volume_utils.py:234 #, python-format msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s" -msgstr "" +msgstr "当拔开PBD %(pbd)s 时，忽略异常 %(exc)s" #: nova/virt/xenapi/volume_utils.py:249 #, python-format msgid "Unable to introduce VDI on SR %s" -msgstr "" +msgstr "无法在SR %s 上引入VDI" #: nova/virt/xenapi/volume_utils.py:257 #, python-format msgid "Unable to get record of VDI %s on" -msgstr "" +msgstr "无法使得VDI %s 的记录运行" #: nova/virt/xenapi/volume_utils.py:279 #, python-format msgid "Unable to introduce VDI for SR %s" -msgstr "" +msgstr "无法为SR %s 引入VDI" #: nova/virt/xenapi/volume_utils.py:289 #, python-format msgid "Error finding vdis in SR %s" -msgstr "" +msgstr "在SR %s 寻找VDIs出错" #: nova/virt/xenapi/volume_utils.py:296 #, python-format msgid "Unable to find vbd for vdi %s" -msgstr "" +msgstr "无法为VDI %s 找到VBD" #: nova/virt/xenapi/volume_utils.py:330 #, python-format msgid "Unable to obtain target information %(data)s, %(mountpoint)s" -msgstr "" +msgstr "无法获得目标信息 %(data)s, %(mountpoint)s" #: nova/virt/xenapi/volume_utils.py:356 #, python-format msgid "Mountpoint cannot be translated: %s" -msgstr "" +msgstr "挂载点无法被翻译：%s" #: nova/rpc/impl_kombu.py:357 #, python-format msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d" -msgstr "" +msgstr "正在重新连接位于 %(hostname)s:%(port)d 的AMQP服务器" #: nova/rpc/impl_kombu.py:380 #, python-format msgid "Connected to AMQP server on %(hostname)s:%(port)d" -msgstr "" +msgstr "连接到%(hostname)s:%(port)d的服务器" #: nova/rpc/impl_kombu.py:416 #, python-format @@ -870,6 +873,7 @@ "Unable to connect to AMQP server on %(hostname)s:%(port)d after " "%(max_retries)d tries: %(err_str)s" msgstr "" +"无法连接到位于%(hostname)s:%(port)d的AMQP server，尝试已经 %(max_retries)d 次：%(err_str)s" #: nova/rpc/impl_kombu.py:432 #, python-format @@ -877,92 +881,93 @@ "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying " "again in %(sleep_time)d seconds." msgstr "" +"位于%(hostname)s:%(port)d的AMQP server不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。" #: nova/rpc/impl_kombu.py:483 nova/rpc/impl_qpid.py:379 #, python-format msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s" -msgstr "" +msgstr "为topic '%(topic)s'声明消费者失败：%(err_str)s" #: nova/rpc/impl_kombu.py:501 nova/rpc/impl_qpid.py:394 #, python-format msgid "Timed out waiting for RPC response: %s" -msgstr "" +msgstr "等待RPC响应超时：%s" #: nova/rpc/impl_kombu.py:505 nova/rpc/impl_qpid.py:398 #, python-format msgid "Failed to consume message from queue: %s" -msgstr "" +msgstr "从队列中消费消息失败：%s" #: nova/rpc/impl_kombu.py:539 nova/rpc/impl_qpid.py:425 #, python-format msgid "Failed to publish message to topic '%(topic)s': %(err_str)s" -msgstr "" +msgstr "给topic '%(topic)s'发布消息失败：%(err_str)s" #: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103 #, python-format msgid "Error in handshake: %s" -msgstr "" +msgstr "握手出错：%s" #: nova/vnc/xvp_proxy.py:119 #, python-format msgid "Invalid request: %s" -msgstr "" +msgstr "无效的请求：%s" #: nova/vnc/xvp_proxy.py:139 #, python-format msgid "Request: %s" -msgstr "" +msgstr "请求：%s" #: nova/vnc/xvp_proxy.py:142 #, python-format msgid "Request made with missing token: %s" -msgstr "" +msgstr "请求缺少令牌：%s" #: nova/vnc/xvp_proxy.py:153 #, python-format msgid "Request made with invalid token: %s" -msgstr "" +msgstr "请求中有无效令牌：%s" #: nova/vnc/xvp_proxy.py:160 #, python-format msgid "Unexpected error: %s" -msgstr "" +msgstr "意外错误：%s" #: nova/vnc/xvp_proxy.py:180 #, python-format msgid "Starting nova-xvpvncproxy node (version %s)" -msgstr "" +msgstr "启动nova-xvpvncproxy节点(版本 %s)" #: nova/virt/vmwareapi/fake.py:131 #, python-format msgid "Property %(attr)s not set for the managed object %(objName)s" -msgstr "" +msgstr "没有为管理对象 %(objName)s 设置属性 %(attr)s" #: nova/virt/vmwareapi/fake.py:437 msgid "There is no VM registered" -msgstr "" +msgstr "没有虚拟机注册" #: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609 #, python-format msgid "Virtual Machine with ref %s is not there" -msgstr "" +msgstr "ref 为 %s 的虚拟机不存在" #: nova/virt/vmwareapi/fake.py:502 #, python-format msgid "Logging out a session that is invalid or already logged out: %s" -msgstr "" +msgstr "退出不正确的会话或者已经退出了：%s" #: nova/virt/vmwareapi/fake.py:517 msgid "Session is faulty" -msgstr "" +msgstr "会话有错误" #: nova/virt/vmwareapi/fake.py:520 msgid "Session Invalid" -msgstr "" +msgstr "会话失效" #: nova/virt/vmwareapi/fake.py:606 msgid " No Virtual Machine has been registered yet" -msgstr "" +msgstr " 还没有虚拟机被注册" #: nova/service.py:159 #, python-format @@ -992,17 +997,17 @@ #: nova/service.py:400 msgid "Full set of FLAGS:" -msgstr "FLAGS全集：" +msgstr "标记全集：" #: nova/service.py:407 #, python-format msgid "%(flag)s : FLAG SET " -msgstr "FLAG集合：%(flag)s " +msgstr "%(flag)s：标记集合 " #: nova/virt/disk/loop.py:30 #, python-format msgid "Could not attach image to loopback: %s" -msgstr "" +msgstr "无法给loopback挂载镜像：%s" #: nova/rpc/common.py:54 #, python-format @@ -1010,38 +1015,40 @@ "Remote error: %(exc_type)s %(value)s\n" "%(traceback)s." msgstr "" +"远程错误：%(exc_type)s %(value)s\n" +"%(traceback)s。" #: nova/rpc/common.py:71 msgid "Timeout while waiting on RPC response." -msgstr "" +msgstr "等待RPC响应返回超时" #: 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 "Table |%s| not created!" -msgstr "" +msgstr "表 |%s| 没有创建" #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:66 msgid "dns_domains table not dropped" -msgstr "" +msgstr "dns_domains 表没有删除" #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91 #: nova/scheduler/simple.py:142 msgid "Is the appropriate service running?" -msgstr "" +msgstr "正确的服务在运行吗？" #: nova/scheduler/chance.py:52 msgid "Could not find another compute" -msgstr "" +msgstr "无法找到另一个计算节点" #: nova/db/sqlalchemy/migration.py:36 msgid "python-migrate is not installed. Exiting." -msgstr "" +msgstr "没有安装 python-migrate。正退出。" #: nova/db/sqlalchemy/migration.py:46 msgid "version should be an integer" -msgstr "" +msgstr "version应该是整数" #: nova/api/openstack/compute/contrib/server_start_stop.py:45 #, python-format @@ -1057,38 +1064,39 @@ #, python-format msgid "" "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()" -msgstr "" +msgstr "驱动方法 %(driver_method)s 丢失：%(e)s。撤销回schedule()" #: nova/scheduler/manager.py:101 #, python-format msgid "Failed to schedule_%(method)s: %(ex)s" -msgstr "" +msgstr "schedule_%(method)s 失败：%(ex)s" #: nova/scheduler/manager.py:116 #, python-format msgid "Setting instance %(instance_uuid)s to ERROR state." -msgstr "" +msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态" #: nova/compute/manager.py:136 #, python-format msgid "check_instance_lock: decorating: |%s|" -msgstr "" +msgstr "check_instance_lock: decorating: |%s|" #: nova/compute/manager.py:138 #, python-format msgid "" "check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_uuid)s|" msgstr "" +"check_instance_lock: arguments: |%(self)s| |%(context)s| |%(instance_uuid)s|" #: nova/compute/manager.py:142 #, python-format msgid "check_instance_lock: locked: |%s|" -msgstr "check_instance_lock: 被鎖定: |%s|" +msgstr "check_instance_lock: 锁定: |%s|" #: nova/compute/manager.py:144 #, python-format msgid "check_instance_lock: admin: |%s|" -msgstr "" +msgstr "check_instance_lock: admin: |%s|" #: nova/compute/manager.py:149 #, python-format @@ -1098,12 +1106,12 @@ #: nova/compute/manager.py:153 #, python-format msgid "check_instance_lock: not executing |%s|" -msgstr "" +msgstr "check_instance_lock: 未执行 |%s|" #: nova/compute/manager.py:199 #, python-format msgid "Unable to load the virtualization driver: %s" -msgstr "" +msgstr "无法加载虚拟驱动：%s" #: ../nova/compute/manager.py:231 #, python-format @@ -1119,7 +1127,7 @@ #: nova/compute/manager.py:248 msgid "Hypervisor driver does not support firewall rules" -msgstr "" +msgstr "虚拟机管理程序驱动不支持防火墙规则" #: ../nova/compute/manager.py:251 #, python-format @@ -1136,28 +1144,28 @@ msgid "" "Going to force the deletion of the vm %(instance_uuid)s, even if it is " "deleted" -msgstr "" +msgstr "准备强制删除虚拟机 %(instance_uuid)s，即使已经删除了。" #: 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 "" +msgstr "数据库中不存在实例 %(instance_uuid)s，但是无论如何要用特殊上下文来关闭。" #: nova/compute/manager.py:401 #, python-format msgid "exception terminating the instance %(instance_uuid)s" -msgstr "" +msgstr "终止实例 %(instance_uuid)s 时发生异常" #: nova/compute/manager.py:434 #, python-format msgid "Instance %s not found." -msgstr "" +msgstr "未找到实例 %s" #: nova/compute/manager.py:446 msgid "Instance has already been created" -msgstr "虚拟机已经创建" +msgstr "实例已经创建" #: nova/compute/manager.py:489 #, python-format @@ -1165,6 +1173,8 @@ "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, " "allowed_size_bytes=%(allowed_size_bytes)d" msgstr "" +"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, " +"allowed_size_bytes=%(allowed_size_bytes)d" #: nova/compute/manager.py:494 #, python-format @@ -1172,6 +1182,8 @@ "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed size " "%(allowed_size_bytes)d" msgstr "" +"镜像 '%(image_id)s' 的大小为 %(size_bytes)d ，超过实例类型 instance_type 所允许的大小 " +"%(allowed_size_bytes)d" #: ../nova/compute/manager.py:501 #, python-format @@ -1221,19 +1233,19 @@ #: nova/compute/manager.py:664 #, python-format msgid "Ignoring DiskNotFound: %s" -msgstr "" +msgstr "忽略异常 DiskNotFound: %s" #: nova/compute/manager.py:671 #, python-format msgid "terminating bdm %s" -msgstr "" +msgstr "终止bdm %s" #: nova/compute/manager.py:760 #, python-format msgid "" "Cannot rebuild instance [%(instance_uuid)s], because the given image does " "not exist." -msgstr "" +msgstr "无法重建实例 [%(instance_uuid)s]，因为给定的镜像不存在。" #: nova/compute/manager.py:765 #, python-format @@ -1282,7 +1294,7 @@ #: nova/compute/manager.py:954 #, python-format msgid "Rotating out %d backups" -msgstr "" +msgstr "轮换出%d个备份" #: nova/compute/manager.py:958 #, python-format @@ -1327,23 +1339,23 @@ "trying to update agent on a non-running instance: %(instance_uuid)s (state: " "%(current_power_state)s expected: %(expected_state)s)" msgstr "" -"试图更新没有运行的实例上agent：%(instance_uuid)s (状态: %(current_power_state)s 预计: " +"试图更新没有运行的实例上的代理：%(instance_uuid)s (状态: %(current_power_state)s 预计: " "%(expected_state)s)" #: nova/compute/manager.py:1056 #, python-format msgid "instance %(instance_uuid)s: updating agent to %(url)s" -msgstr "实例 %(instance_uuid)s：正在把agent更新到 %(url)s" +msgstr "实例 %(instance_uuid)s：正在把代理更新到 %(url)s" #: nova/compute/manager.py:1069 #, python-format msgid "instance %s: rescuing" -msgstr "实例%s：正在救援" +msgstr "实例 %s：正在救援中" #: nova/compute/manager.py:1094 #, python-format msgid "instance %s: unrescuing" -msgstr "实例%s:正在取消救援" +msgstr "实例 %s：取消救援" #: nova/compute/manager.py:1213 msgid "destination same as source!" @@ -1373,17 +1385,17 @@ #: nova/compute/manager.py:1443 #, python-format msgid "instance %s: retrieving diagnostics" -msgstr "实例 %s: 取消检测" +msgstr "实例 %s ：获取诊断" #: nova/compute/manager.py:1452 #, python-format msgid "instance %s: suspending" -msgstr "虚拟机 %s：挂起" +msgstr "实例 %s：挂起" #: nova/compute/manager.py:1474 #, python-format msgid "instance %s: resuming" -msgstr "实例 %s: 唤醒中。。。" +msgstr "实例 %s: 恢复中" #: nova/compute/manager.py:1497 #, python-format @@ -1398,7 +1410,7 @@ #: nova/compute/manager.py:1514 #, python-format msgid "instance %s: getting locked state" -msgstr "实例%s：获取锁状态" +msgstr "实例%s：获取锁定的状态" #: nova/compute/manager.py:1524 #, python-format @@ -1408,22 +1420,22 @@ #: nova/compute/manager.py:1532 #, python-format msgid "instance %s: inject network info" -msgstr "" +msgstr "实例 %s：注入网络信息" #: nova/compute/manager.py:1536 #, python-format msgid "network_info to inject: |%s|" -msgstr "" +msgstr "将注入的network_info：|%s|" #: nova/api/ec2/cloud.py:785 nova/compute/manager.py:1548 #, python-format msgid "Get console output for instance %s" -msgstr "获取虚拟机 %s 控制台输出" +msgstr "获取实例 %s 控制台输出" #: nova/compute/manager.py:1573 #, python-format msgid "instance %s: getting vnc console" -msgstr "" +msgstr "实例 %s：正在获得VNC控制台" #: ../nova/compute/manager.py:1596 #, python-format @@ -1453,7 +1465,7 @@ #: nova/compute/manager.py:1665 #, python-format msgid "Detaching volume from unknown instance %s" -msgstr "从未知实例%s中移除卷" +msgstr "从未知实例%s中分离卷" #: nova/compute/manager.py:1731 #, python-format @@ -1471,7 +1483,7 @@ #, python-format msgid "" "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s." -msgstr "" +msgstr "plug_vifs() 失败%(cnt)d 次。最多重新尝试 %(max_retry)d 次在主机 %(hostname)s。" #: ../nova/compute/manager.py:1873 #, python-format @@ -1480,7 +1492,7 @@ #: nova/compute/manager.py:1905 msgid "post_live_migration() is started.." -msgstr "" +msgstr "post_live_migration()已经启动。" #: ../nova/compute/manager.py:1931 ../nova/compute/manager.py:1939 #, python-format @@ -1505,6 +1517,8 @@ "You may see the error \"libvirt: QEMU error: Domain not found: no domain " "with matching name.\" This error can be safely ignored." msgstr "" +"你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching " +"name。”这个错误可以放心的忽略。" #: ../nova/compute/manager.py:1995 #, python-format @@ -1513,29 +1527,29 @@ #: nova/compute/manager.py:2083 msgid "Updating bandwidth usage cache" -msgstr "" +msgstr "更新带宽使用缓存" #: nova/compute/manager.py:2110 msgid "Updating host status" -msgstr "" +msgstr "更新主机状态" #: 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 "" +msgstr "在数据库中找到 %(num_db_instances)s个实例，在虚拟机管理程序找到 %(num_vm_instances)s 个实例。" #: nova/compute/manager.py:2150 #, python-format msgid "" "Instance %(name)s found in database but not known by hypervisor. Setting " "power state to NOSTATE" -msgstr "" +msgstr "数据库中发现实例 %(name)s ，但是虚拟机管理程序不知道。设置加电状态为NOSTATE" #: nova/compute/manager.py:2174 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..." -msgstr "" +msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..." #: ../nova/compute/manager.py:2181 #, python-format @@ -1560,34 +1574,34 @@ #, python-format msgid "" "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action" -msgstr "" +msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'" #: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:45 msgid "progress column not added to compute_nodes table" -msgstr "" +msgstr "progress 列没有加入到 compute_nodes 表中" #: nova/scheduler/simple.py:87 msgid "Not enough allocatable CPU cores remaining" -msgstr "" +msgstr "没有足够可分配的剩余CPU核心" #: nova/scheduler/simple.py:136 msgid "Not enough allocatable volume gigabytes remaining" -msgstr "" +msgstr "卷没有足够可分配的空间" #: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34 #, python-format msgid "Bad mac for to_global_ipv6: %s" -msgstr "" +msgstr "错误的to_global_ipv6 mac：%s" #: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36 #, python-format msgid "Bad prefix for to_global_ipv6: %s" -msgstr "" +msgstr "错误的to_global_ipv6前缀：%s" #: nova/api/openstack/compute/contrib/aggregates.py:137 #, python-format msgid "Aggregates does not have %s action" -msgstr "Aggregates没有动作 %s" +msgstr "聚合没有动作 %s" #: nova/api/openstack/compute/servers.py:1006 #: nova/api/openstack/compute/contrib/aggregates.py:140 @@ -1600,58 +1614,60 @@ "Must specify vmwareapi_host_ip,vmwareapi_host_username and " "vmwareapi_host_password to useconnection_type=vmwareapi" msgstr "" +"针对useconnection_type=vmwareapi必须指定vmwareapi_host_ip,vmwareapi_host_username和v" +"mwareapi_host_password" #: nova/virt/vmwareapi_conn.py:271 #, python-format msgid "In vmwareapi:_create_session, got this exception: %s" -msgstr "" +msgstr "在vmwareapi：_create_session，得到这个异常：%s" #: nova/virt/vmwareapi_conn.py:354 #, python-format msgid "In vmwareapi:_call_method, got this exception: %s" -msgstr "" +msgstr "在vmwareapi：_call_method，得到这个异常：%s" #: nova/virt/vmwareapi_conn.py:393 #, python-format msgid "Task [%(task_name)s] %(task_ref)s status: success" -msgstr "" +msgstr "任务 [%(task_name)s] %(task_ref)s 状态：成功" #: nova/virt/vmwareapi_conn.py:399 #, python-format msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s" -msgstr "" +msgstr "任务 [%(task_name)s] %(task_ref)s 状态：错误 %(error_info)s" #: nova/virt/vmwareapi_conn.py:404 #, python-format msgid "In vmwareapi:_poll_task, Got this error %s" -msgstr "" +msgstr "在vmwareapi：_poll_task，得到这个错误 %s" #: nova/vsa/manager.py:73 #, python-format msgid "Create call received for VSA %s" -msgstr "" +msgstr "收到VSA %s 的Create call" #: nova/vsa/manager.py:80 nova/vsa/manager.py:107 #, python-format msgid "Failed to find VSA %(vsa_id)d" -msgstr "" +msgstr "没有找到VSA %(vsa_id)d" #: nova/vsa/manager.py:89 #, python-format msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s" -msgstr "" +msgstr "VSA ID %(vsa_id)s：Drive %(vol_id)s 创建。状态 %(status)s" #: nova/vsa/manager.py:100 #, python-format msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait" -msgstr "" +msgstr "Drive %(vol_name)s (%(vol_disp_name)s) 依然在创建阶段 - 请等待" #: 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 "" +msgstr "VSA ID %(vsa_id)d: 不是所有的卷都创建了 (%(cvol_real)d of %(cvol_exp)d)" #: nova/vsa/manager.py:137 #, python-format @@ -1659,87 +1675,88 @@ "VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in %(status)s " "state" msgstr "" +"VSA ID %(vsa_id)d：Drive %(vol_name)s (%(vol_disp_name)s)处于 %(status)s 状态。" #: nova/vsa/manager.py:146 #, python-format msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s" -msgstr "" +msgstr "更新卷 %(vol_name)s 的附加状态失败。%(ex)s" #: nova/vsa/manager.py:153 #, python-format msgid "VSA ID %(vsa_id)d: Delete all BE volumes" -msgstr "" +msgstr "VSA ID %(vsa_id)d：删除所有BE卷" #: nova/vsa/manager.py:168 #, python-format msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances" -msgstr "" +msgstr "VSA ID %(vsa_id)d：启动 %(vc_count)d 个实例" #: nova/auth/fakeldap.py:33 msgid "Attempted to instantiate singleton" -msgstr "" +msgstr "试图实例化单例" #: nova/network/quantum/client.py:154 msgid "Tenant ID not set" -msgstr "" +msgstr "租户ID没有设" #: nova/network/quantum/client.py:181 #, python-format msgid "Quantum Client Request: %(method)s %(action)s" -msgstr "" +msgstr "Quantum客户请求：%(method)s %(action)s" #: nova/network/quantum/client.py:196 #, python-format msgid "Quantum entity not found: %s" -msgstr "" +msgstr "Quantum实体没有找到：%s" #: nova/network/quantum/client.py:207 #, python-format msgid "Server %(status_code)s error: %(data)s" -msgstr "" +msgstr "服务器 %(status_code)s 错误：%(data)s" #: nova/network/quantum/client.py:210 #, python-format msgid "Unable to connect to server. Got error: %s" -msgstr "" +msgstr "无法连接到服务器。出现错误：%s" #: nova/network/quantum/client.py:229 #, python-format msgid "unable to deserialize object of type = '%s'" -msgstr "" +msgstr "无法反序列化type = '%s' 的对象" #: nova/virt/vmwareapi/vim.py:84 msgid "Unable to import suds." -msgstr "" +msgstr "无法导入 suds。" #: nova/virt/vmwareapi/vim.py:90 msgid "Must specify vmwareapi_wsdl_loc" -msgstr "" +msgstr "必须指定 vmwareapi_wsdl_loc" #: nova/virt/vmwareapi/vim.py:145 #, python-format msgid "No such SOAP method '%s' provided by VI SDK" -msgstr "" +msgstr "VI SDK没有提供这样的SOAP方法 “%s”" #: nova/virt/vmwareapi/vim.py:150 #, python-format msgid "httplib error in %s: " -msgstr "" +msgstr "在 %s 中发生 httplib 错误： " #: nova/virt/vmwareapi/vim.py:157 #, python-format msgid "Socket error in %s: " -msgstr "" +msgstr "在 %s 套接字中发生错误 " #: nova/virt/vmwareapi/vim.py:162 #, python-format msgid "Type error in %s: " -msgstr "" +msgstr "在%s里发生类型错误： " #: nova/virt/vmwareapi/vim.py:166 #, python-format msgid "Exception in %s " -msgstr "" +msgstr "在 %s 发生异常 " #: nova/api/direct.py:218 msgid "not available" @@ -1752,26 +1769,26 @@ #: nova/virt/vmwareapi/vmops.py:66 msgid "Getting list of instances" -msgstr "" +msgstr "获取实例列表" #: nova/virt/vmwareapi/vmops.py:82 #, python-format msgid "Got total of %s instances" -msgstr "" +msgstr "总共获得 %s 个实例" #: nova/virt/vmwareapi/vmops.py:125 msgid "Couldn't get a local Datastore reference" -msgstr "" +msgstr "无法得到本地的存储引用" #: nova/virt/vmwareapi/vmops.py:195 #, python-format msgid "Creating VM with the name %s on the ESX host" -msgstr "" +msgstr "在ESX主机上创建名为 %s 的虚拟机" #: nova/virt/vmwareapi/vmops.py:204 #, python-format msgid "Created VM with the name %s on the ESX host" -msgstr "" +msgstr "已经在ESX主机上创建名为 %s 的虚拟机" #: nova/virt/vmwareapi/vmops.py:233 #, python-format @@ -1779,270 +1796,272 @@ "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 "" +"在ESX主机的本地存储 %(data_store_name)s 上创建虚拟磁盘 %(vmdk_file_size_in_kb)s KB 和适配器类型 " +"%(adapter_type)s" #: nova/virt/vmwareapi/vmops.py:250 #, python-format msgid "" "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host " "local store %(data_store_name)s" -msgstr "" +msgstr "在ESX主机的本地存储 %(data_store_name)s 上创建虚拟磁盘 %(vmdk_file_size_in_kb)s KB" #: nova/virt/vmwareapi/vmops.py:259 #, python-format msgid "" "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore " "%(data_store_name)s" -msgstr "" +msgstr "正在ESX主机的本地存储 %(data_store_name)s 上删除文件 %(flat_uploaded_vmdk_path)s" #: nova/virt/vmwareapi/vmops.py:271 #, python-format msgid "" "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store " "%(data_store_name)s" -msgstr "" +msgstr "已经在ESX主机的本地存储 %(data_store_name)s 上删除文件 %(flat_uploaded_vmdk_path)s" #: nova/virt/vmwareapi/vmops.py:282 #, python-format msgid "" "Downloading image file data %(image_ref)s to the ESX data store " "%(data_store_name)s" -msgstr "" +msgstr "正在往ESX主机的数据存储 %(data_store_name)s 上下载文件数据 %(image_ref)s" #: nova/virt/vmwareapi/vmops.py:297 #, python-format msgid "" "Downloaded image file data %(image_ref)s to the ESX data store " "%(data_store_name)s" -msgstr "" +msgstr "已经在ESX数据存储 %(data_store_name)s 上下载镜像文件数据 %(image_ref)s" #: nova/virt/vmwareapi/vmops.py:314 #, python-format msgid "Reconfiguring VM instance %s to attach the image disk" -msgstr "" +msgstr "正在重新配置虚拟机实例 %s 来附加镜像磁盘" #: nova/virt/vmwareapi/vmops.py:321 #, python-format msgid "Reconfigured VM instance %s to attach the image disk" -msgstr "" +msgstr "已经重新配置虚拟机实例 %s 来挂载镜像磁盘" #: nova/virt/vmwareapi/vmops.py:328 #, python-format msgid "Powering on the VM instance %s" -msgstr "" +msgstr "正启动虚拟机实例 %s" #: nova/virt/vmwareapi/vmops.py:334 #, python-format msgid "Powered on the VM instance %s" -msgstr "" +msgstr "已经启动虚拟机实例 %s" #: nova/virt/vmwareapi/vmops.py:379 #, python-format msgid "Creating Snapshot of the VM instance %s " -msgstr "" +msgstr "正在创建虚拟机实例快照 %s " #: nova/virt/vmwareapi/vmops.py:389 #, python-format msgid "Created Snapshot of the VM instance %s " -msgstr "" +msgstr "已经创建虚拟机实例快照 %s " #: nova/virt/vmwareapi/vmops.py:432 #, python-format msgid "Copying disk data before snapshot of the VM instance %s" -msgstr "" +msgstr "正在快照虚拟机实例 %s 之前复制磁盘数据" #: nova/virt/vmwareapi/vmops.py:445 #, python-format msgid "Copied disk data before snapshot of the VM instance %s" -msgstr "" +msgstr "已经在快照虚拟机实例 %s 之前复制磁盘数据" #: nova/virt/vmwareapi/vmops.py:454 #, python-format msgid "Uploading image %s" -msgstr "" +msgstr "上传镜像 %s" #: nova/virt/vmwareapi/vmops.py:467 #, python-format msgid "Uploaded image %s" -msgstr "" +msgstr "已经上传镜像 %s" #: nova/virt/vmwareapi/vmops.py:477 #, python-format msgid "Deleting temporary vmdk file %s" -msgstr "" +msgstr "正在删除临时的vmdk文件 %s" #: nova/virt/vmwareapi/vmops.py:486 #, python-format msgid "Deleted temporary vmdk file %s" -msgstr "" +msgstr "已经删除临时的vmdk文件 %s" #: nova/virt/vmwareapi/vmops.py:518 msgid "instance is not powered on" -msgstr "" +msgstr "实例未启动" #: nova/virt/vmwareapi/vmops.py:525 #, python-format msgid "Rebooting guest OS of VM %s" -msgstr "" +msgstr "正在重启虚拟机客户操作系统 %s" #: nova/virt/vmwareapi/vmops.py:528 #, python-format msgid "Rebooted guest OS of VM %s" -msgstr "" +msgstr "已经重启虚拟机客户操作系统 %s" #: nova/virt/vmwareapi/vmops.py:530 #, python-format msgid "Doing hard reboot of VM %s" -msgstr "" +msgstr "正在冷启动虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:534 #, python-format msgid "Did hard reboot of VM %s" -msgstr "" +msgstr "已经冷启动虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:546 #, python-format msgid "instance - %s not present" -msgstr "" +msgstr "实例 - %s 不存在" #: nova/virt/vmwareapi/vmops.py:565 #, python-format msgid "Powering off the VM %s" -msgstr "" +msgstr "正在关闭虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:570 #, python-format msgid "Powered off the VM %s" -msgstr "" +msgstr "关闭虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:574 #, python-format msgid "Unregistering the VM %s" -msgstr "" +msgstr "正在注销虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:577 #, python-format msgid "Unregistered the VM %s" -msgstr "" +msgstr "已经注销虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:579 #, python-format msgid "" "In vmwareapi:vmops:destroy, got this exception while un-registering the VM: " "%s" -msgstr "" +msgstr "注销虚拟机 %s 时在 vmwareapi:vmops:destroy 中发生异常" #: nova/virt/vmwareapi/vmops.py:590 #, python-format msgid "" "Deleting contents of the VM %(name)s from datastore %(datastore_name)s" -msgstr "" +msgstr "正从数据存储 %(datastore_name)s 中删除虚拟机 %(name)s 的内容" #: nova/virt/vmwareapi/vmops.py:600 #, python-format msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s" -msgstr "" +msgstr "已经从数据存储 %(datastore_name)s 中删除虚拟机 %(name)s 的内容" #: nova/virt/vmwareapi/vmops.py:605 #, python-format msgid "" "In vmwareapi:vmops:destroy, got this exception while deleting the VM " "contents from the disk: %s" -msgstr "" +msgstr "当从磁盘删除虚拟机 %s 的内容时在 vmwareapi:vmops:destroy 里发生异常" #: nova/virt/vmwareapi/vmops.py:613 msgid "pause not supported for vmwareapi" -msgstr "" +msgstr "vmwareapi 不支持暂停" #: nova/virt/vmwareapi/vmops.py:617 msgid "unpause not supported for vmwareapi" -msgstr "" +msgstr "vmwareapi 不支持取消暂停" #: nova/virt/vmwareapi/vmops.py:631 #, python-format msgid "Suspending the VM %s " -msgstr "" +msgstr "挂起虚拟机 %s " #: nova/virt/vmwareapi/vmops.py:635 #, python-format msgid "Suspended the VM %s " -msgstr "" +msgstr "已经挂起虚拟机 %s " #: nova/virt/vmwareapi/vmops.py:638 msgid "instance is powered off and can not be suspended." -msgstr "" +msgstr "实例已关闭，无法挂起。" #: nova/virt/vmwareapi/vmops.py:641 #, python-format msgid "" "VM %s was already in suspended state. So returning without doing anything" -msgstr "" +msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回" #: nova/virt/vmwareapi/vmops.py:654 #, python-format msgid "Resuming the VM %s" -msgstr "" +msgstr "正在恢复虚拟机 %s" #: nova/virt/vmwareapi/vmops.py:659 #, python-format msgid "Resumed the VM %s " -msgstr "" +msgstr "已经恢复虚拟机 %s " #: nova/virt/vmwareapi/vmops.py:661 msgid "instance is not in a suspended state" -msgstr "" +msgstr "实例不在挂起状态" #: nova/virt/vmwareapi/vmops.py:697 msgid "get_diagnostics not implemented for vmwareapi" -msgstr "" +msgstr "get_diagnostics 没有在 vmwareapi 里实现" #: nova/virt/vmwareapi/vmops.py:755 #, python-format msgid "" "Reconfiguring VM instance %(name)s to set the machine id with ip - " "%(ip_addr)s" -msgstr "" +msgstr "正在重新配置实例 %(name)s 来设置机器的id为ip - %(ip_addr)s" #: nova/virt/vmwareapi/vmops.py:763 #, python-format msgid "" "Reconfigured VM instance %(name)s to set the machine id with ip - %(ip_addr)s" -msgstr "" +msgstr "已经重新配置虚拟机实例 %(name)s 来设置机器的id为ip - %(ip_addr)s" #: nova/virt/vmwareapi/vmops.py:800 #, python-format msgid "Creating directory with path %s" -msgstr "" +msgstr "正在使用路径 %s 创建目录" #: nova/virt/vmwareapi/vmops.py:804 #, python-format msgid "Created directory with path %s" -msgstr "" +msgstr "已经创建路径为 %s 的目录" #: 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 "" +msgstr "无法把 flavorid 转化为整数：%s。设置 flavorid 成类似整数的字符串来降级。" #: nova/tests/test_compute.py:352 nova/tests/test_compute.py:1460 #, python-format msgid "Running instances: %s" -msgstr "" +msgstr "正在运行的实例：%s" #: nova/tests/test_compute.py:358 #, python-format msgid "After terminating instances: %s" -msgstr "" +msgstr "终止实例之后：%s" #: nova/tests/test_compute.py:582 msgid "Internal error" -msgstr "" +msgstr "内部错误" #: nova/tests/test_compute.py:1471 #, python-format msgid "After force-killing instances: %s" -msgstr "" +msgstr "强制杀死实例后：%s" #: nova/api/openstack/compute/contrib/admin_actions.py:60 #, python-format @@ -2052,7 +2071,7 @@ #: nova/api/openstack/compute/contrib/admin_actions.py:77 #, python-format msgid "Compute.api::unpause %s" -msgstr "Compute.api::继续 %s" +msgstr "Compute.api::取消暂停 %s" #: nova/api/openstack/compute/contrib/admin_actions.py:94 #, python-format @@ -2104,7 +2123,7 @@ #: nova/api/openstack/compute/contrib/admin_actions.py:223 msgid "Malformed createBackup entity" -msgstr "非正常的实体createBackup" +msgstr "错误格式的实体createBackup" #: nova/api/openstack/compute/contrib/admin_actions.py:229 msgid "createBackup attribute 'rotation' must be an integer" @@ -2132,7 +2151,7 @@ #: nova/rpc/amqp.py:187 nova/rpc/impl_carrot.py:494 #, python-format msgid "unpacked context: %s" -msgstr "" +msgstr "未打包的上下文：%s" #: nova/rpc/amqp.py:230 nova/rpc/impl_carrot.py:261 #, python-format @@ -2142,17 +2161,17 @@ #: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:274 #, python-format msgid "no method for message: %s" -msgstr "没有适用于消息 %s 的方法" +msgstr "没有适用于消息的方法：%s" #: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:276 #, python-format msgid "No method for message: %s" -msgstr "没有适用于消息 %s 的方法" +msgstr "没有适用于消息的方法：%s" #: nova/rpc/amqp.py:318 nova/rpc/impl_carrot.py:528 #, python-format msgid "Making asynchronous call on %s ..." -msgstr "" +msgstr "在 %s 做异步call" #: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:531 #, python-format @@ -2162,16 +2181,16 @@ #: nova/rpc/amqp.py:343 nova/rpc/impl_carrot.py:610 #, python-format msgid "Making asynchronous cast on %s..." -msgstr "" +msgstr "在 %s 做异步cast" #: nova/rpc/amqp.py:351 nova/rpc/impl_carrot.py:620 msgid "Making asynchronous fanout cast..." -msgstr "" +msgstr "做异步fanout cast" #: nova/rpc/amqp.py:376 nova/rpc/impl_carrot.py:630 #, python-format msgid "Sending notification on %s..." -msgstr "" +msgstr "正在 %s 上发送通知" #: nova/tests/integrated/api/client.py:38 #, python-format @@ -2180,47 +2199,50 @@ "Status Code: %(_status)s\n" "Body: %(_body)s" msgstr "" +"%(message)s\n" +"状态码: %(_status)s\n" +"主体: %(_body)s" #: nova/tests/integrated/api/client.py:47 msgid "Authentication error" -msgstr "" +msgstr "认证错误" #: nova/tests/integrated/api/client.py:55 msgid "Authorization error" -msgstr "" +msgstr "验证错误" #: nova/tests/integrated/api/client.py:63 msgid "Item not found" -msgstr "" +msgstr "条目没有找到" #: nova/tests/integrated/api/client.py:105 #, python-format msgid "Doing %(method)s on %(relative_url)s" -msgstr "" +msgstr "正在 %(relative_url)s 执行 %(method)s" #: nova/tests/integrated/api/client.py:107 #, python-format msgid "Body: %s" -msgstr "" +msgstr "主体：%s" #: nova/tests/integrated/api/client.py:125 #, python-format msgid "%(auth_uri)s => code %(http_status)s" -msgstr "" +msgstr "%(auth_uri)s => code %(http_status)s" #: nova/tests/integrated/api/client.py:151 #, python-format msgid "%(relative_uri)s => code %(http_status)s" -msgstr "" +msgstr "%(relative_uri)s => code %(http_status)s" #: nova/tests/integrated/api/client.py:161 msgid "Unexpected status code" -msgstr "" +msgstr "意外的状态码" #: nova/tests/integrated/api/client.py:168 #, python-format msgid "Decoding JSON: %s" -msgstr "" +msgstr "解码JSON：%s" #: nova/api/openstack/compute/image_metadata.py:40 #: nova/api/openstack/compute/images.py:142 @@ -2230,195 +2252,197 @@ #: nova/api/openstack/compute/image_metadata.py:79 msgid "Incorrect request body format" -msgstr "" +msgstr "不正确的请求主体格式" #: nova/api/openstack/compute/image_metadata.py:111 msgid "Invalid metadata key" -msgstr "" +msgstr "无效的元数据键" #: nova/console/vmrc_manager.py:122 #, python-format msgid "Tried to remove non-existent console %(console_id)s." -msgstr "" +msgstr "尝试删除不存在的控制台%(console_id)s。" #: nova/console/vmrc_manager.py:125 #, python-format msgid "Removing console %(console_id)s." -msgstr "" +msgstr "删除控制台%(console_id)s。" #: nova/image/glance.py:147 msgid "Connection error contacting glance server, retrying" -msgstr "" +msgstr "glance服务器连接错误，重试中" #: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103 msgid "Maximum attempts reached" -msgstr "" +msgstr "达到最大尝试次数" #: nova/image/glance.py:275 #, python-format msgid "Creating image in Glance. Metadata passed in %s" -msgstr "" +msgstr "正在Glance中创建镜像。元数据 %s 已经传入。" #: nova/image/glance.py:278 #, python-format msgid "Metadata after formatting for Glance %s" -msgstr "" +msgstr "为Glance 进行格式化后的元数据 %s" #: nova/image/glance.py:286 #, python-format msgid "Metadata returned from Glance formatted for Base %s" -msgstr "" +msgstr "从Glance返回的为Base格式化的元数据 %s" #: nova/image/glance.py:328 nova/image/glance.py:332 msgid "Not the image owner" -msgstr "" +msgstr "不是镜像所有者" #: nova/image/glance.py:407 #, python-format msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s" -msgstr "" +msgstr "%(timestamp)s 没有遵循任何签名格式：%(iso_formats)s" #: 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 "" +"针对use connection_type=xenapi必须指定xenapi_connection_url, " +"xenapi_connection_username (可选) 和 xenapi_connection_password" #: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:441 msgid "Could not determine iscsi initiator name" -msgstr "" +msgstr "无法确定iscsi initiator名字" #: 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 "" +msgstr "Compute_service记录为 %s 创建 " #: 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 "" +msgstr "Compute_service记录为 %s 更新 " #: nova/virt/xenapi_conn.py:484 msgid "Host startup on XenServer is not supported." -msgstr "" +msgstr "不支持在XenServer启动主机" #: nova/virt/xenapi_conn.py:498 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)" -msgstr "" +msgstr "无法登录到XenAPI(Dom0磁盘是空么？)" #: nova/virt/xenapi_conn.py:587 #, python-format msgid "Task [%(name)s] %(task)s status: success %(result)s" -msgstr "" +msgstr "任务 [%(name)s] %(task)s 状态：成功 %(result)s" #: nova/virt/xenapi_conn.py:596 #, python-format msgid "Task [%(name)s] %(task)s status: %(status)s %(error_info)s" -msgstr "" +msgstr "任务 [%(name)s] %(task)s 状态：%(status)s %(error_info)s" #: nova/virt/xenapi_conn.py:616 nova/virt/xenapi_conn.py:629 #, python-format msgid "Got exception: %s" -msgstr "" +msgstr "得到异常：%s" #: nova/virt/xenapi_conn.py:655 nova/virt/baremetal/proxy.py:773 #: nova/virt/libvirt/connection.py:2250 msgid "Updating host stats" -msgstr "" +msgstr "正在更新主机状态" #: nova/virt/xenapi_conn.py:666 #, python-format msgid "Unable to get updated status: %s" -msgstr "" +msgstr "无法得到最新的状态：%s" #: nova/virt/xenapi_conn.py:673 #, python-format msgid "Unable to get SR for this host: %s" -msgstr "" +msgstr "无法为主机得到SR：%s" #: nova/scheduler/vsa.py:112 #, python-format msgid "_filter_hosts: %(request_spec)s" -msgstr "" +msgstr "_filter_hosts: %(request_spec)s" #: nova/scheduler/vsa.py:115 #, python-format msgid "Filter hosts for drive type %s" -msgstr "" +msgstr "按照驱动类型 %s 过滤主机" #: nova/scheduler/vsa.py:132 #, python-format msgid "Host %s has no free capacity. Skip" -msgstr "" +msgstr "主机 %s 没有足够的容量。跳过" #: nova/scheduler/vsa.py:137 #, python-format msgid "Filter hosts: %s" -msgstr "" +msgstr "过滤主机：%s" #: nova/scheduler/vsa.py:153 msgid "Must implement host selection mechanism" -msgstr "" +msgstr "必须实现主机选择机制" #: nova/scheduler/vsa.py:163 #, python-format msgid "Maximum number of hosts selected (%d)" -msgstr "" +msgstr "所选择主机的最大数目(%d)" #: nova/scheduler/vsa.py:171 #, python-format msgid "Selected excessive host %(host)s" -msgstr "" +msgstr "选择超过了主机 %(host)s" #: nova/scheduler/vsa.py:211 #, python-format msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s" -msgstr "" +msgstr "提供卷 %(name)s 它的大小为 %(size)s 位置在主机 %(host)s" #: nova/scheduler/vsa.py:239 #, python-format msgid "volume_params %(volume_params)s" -msgstr "" +msgstr "volume_params %(volume_params)s" #: nova/scheduler/vsa.py:244 #, python-format msgid "%(i)d: Volume %(name)s" -msgstr "" +msgstr "%(i)d：卷名%(name)s" #: nova/scheduler/vsa.py:282 #, python-format msgid "Attempting to spawn %(num_volumes)d volume(s)" -msgstr "" +msgstr "正在尝试生产 %(num_volumes)d 个卷" #: nova/scheduler/vsa.py:298 msgid "Error creating volumes" -msgstr "" +msgstr "创建卷失败" #: nova/scheduler/vsa.py:328 #, python-format msgid "Non-VSA volume %d" -msgstr "" +msgstr "Non-VSA 卷 %d" #: nova/scheduler/vsa.py:341 #, python-format msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s" -msgstr "" +msgstr "正在生产卷 %(volume_id)s 它的驱动类型为 %(drive_type)s" #: nova/scheduler/vsa.py:351 msgid "Error creating volume" -msgstr "" +msgstr "创建卷失败" #: nova/scheduler/vsa.py:391 #, python-format msgid "No capability selected for volume of size %(size)s" -msgstr "" +msgstr "没有能力分配大小为 %(size)s 的卷" #: nova/scheduler/vsa.py:411 #, python-format msgid "Host %s:" -msgstr "" +msgstr "主机 %s：" #: nova/scheduler/vsa.py:420 #, python-format @@ -2426,270 +2450,271 @@ "\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. " "Available capacity %(avail)-5s" msgstr "" +"\t驱动 %(qosgrp)-25s：总共 %(total)2s，已用 %(used)2s， 空闲 %(free)2s。可用 %(avail)-5s" #: nova/scheduler/vsa.py:483 #, python-format msgid "" "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)" -msgstr "" +msgstr "\t [ tab] LeastUsedHost：最佳主机： %(best_host)s。(使用的空间 %(min_used)s)" #: nova/scheduler/vsa.py:528 #, python-format msgid "" "\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s " "%(type_str)s)" -msgstr "" +msgstr "\t MostAvailCap：最佳主机： %(best_host)s。 (可用 %(max_avail)s %(type_str)s)" #: nova/console/xvp.py:98 msgid "Rebuilding xvp conf" -msgstr "" +msgstr "重建xvp配置" #: nova/console/xvp.py:116 #, python-format msgid "Re-wrote %s" -msgstr "" +msgstr "重写%s" #: nova/console/xvp.py:121 msgid "Stopping xvp" -msgstr "" +msgstr "停止xvp" #: nova/console/xvp.py:134 msgid "Starting xvp" -msgstr "" +msgstr "正在启动xvp" #: nova/console/xvp.py:141 #, python-format msgid "Error starting xvp: %s" -msgstr "" +msgstr "启动xvp发生错误：%s" #: nova/console/xvp.py:144 msgid "Restarting xvp" -msgstr "" +msgstr "重启xvp" #: nova/console/xvp.py:146 msgid "xvp not running..." -msgstr "" +msgstr "xvp不在运行中" #: nova/virt/baremetal/proxy.py:148 #, python-format msgid "Error encountered when destroying instance '%(name)s': %(ex)s" -msgstr "" +msgstr "销毁实例 '%(name)s' 时遇到错误：%(ex)s" #: nova/virt/baremetal/proxy.py:162 #, python-format msgid "instance %(instance_name)s: deleting instance files %(target)s" -msgstr "" +msgstr "实例 %(instance_name)s：正在删除实例文件 %(target)s" #: nova/virt/baremetal/proxy.py:189 #, python-format msgid "instance %s: rebooted" -msgstr "" +msgstr "实例 %s：重启" #: nova/virt/baremetal/proxy.py:192 msgid "_wait_for_reboot failed" -msgstr "" +msgstr "_wait_for_reboot失败" #: nova/virt/baremetal/proxy.py:222 #, python-format msgid "instance %s: rescued" -msgstr "" +msgstr "实例 %s：已救援" #: nova/virt/baremetal/proxy.py:225 msgid "_wait_for_rescue failed" -msgstr "" +msgstr "_wait_for_rescue 失败" #: nova/virt/baremetal/proxy.py:242 msgid "<============= spawn of baremetal =============>" -msgstr "" +msgstr "<============= 生产裸机=============>" #: nova/virt/baremetal/proxy.py:255 #, python-format msgid "instance %s: is building" -msgstr "" +msgstr "实例 %s：正在创建中" #: nova/virt/baremetal/proxy.py:260 msgid "Key is injected but instance is not running yet" -msgstr "" +msgstr "已经注入密钥但是实例还没有运行" #: nova/virt/baremetal/proxy.py:265 #, python-format msgid "instance %s: booted" -msgstr "" +msgstr "实例 %s：已启动" #: nova/virt/baremetal/proxy.py:268 #, python-format msgid "~~~~~~ current state = %s ~~~~~~" -msgstr "" +msgstr "~~~~~~ 当前状态 = %s ~~~~~~" #: nova/virt/baremetal/proxy.py:269 #, python-format msgid "instance %s spawned successfully" -msgstr "" +msgstr "实例 %s 生产成功" #: nova/virt/baremetal/proxy.py:272 #, python-format msgid "instance %s:not booted" -msgstr "" +msgstr "实例 %s：没有启动" #: nova/virt/baremetal/proxy.py:274 msgid "Bremetal assignment is overcommitted." -msgstr "" +msgstr "过多提交裸机分配" #: nova/virt/baremetal/proxy.py:354 #, python-format msgid "instance %s: Creating image" -msgstr "" +msgstr "实例 %s：正在创建镜像" #: nova/virt/baremetal/proxy.py:475 #, python-format msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s" -msgstr "" +msgstr "实例 %(inst_name)s：将 %(injection)s 注入镜像 %(img_id)s" #: 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 "" +msgstr "实例 %(inst_name)s：忽略向镜像 %(img_id)s 注入数据的错误 (%(e)s)" #: nova/virt/baremetal/proxy.py:529 #, python-format msgid "instance %s: starting toXML method" -msgstr "" +msgstr "实例 %s：开始方法 toXML" #: nova/virt/baremetal/proxy.py:531 #, python-format msgid "instance %s: finished toXML method" -msgstr "" +msgstr "实例 %s：方法toXML 完成" #: 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 "" +msgstr "无法得到CPU的数目，因为这个函数不是给这个平台执行的。这个错误可以被放心忽略。" #: nova/virt/baremetal/proxy.py:714 #, python-format msgid "#### RLK: cpu_arch = %s " -msgstr "" +msgstr "#### RLK: cpu_arch = %s " #: nova/virt/baremetal/proxy.py:746 msgid "Updating!" -msgstr "" +msgstr "正在更新。" #: nova/volume/san.py:114 nova/volume/san.py:152 msgid "Specify san_password or san_private_key" -msgstr "" +msgstr "指定san_password或者san_private_key" #: nova/volume/san.py:157 msgid "san_ip must be set" -msgstr "" +msgstr "san_ip必须设置" #: nova/volume/san.py:321 #, python-format msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s" -msgstr "" +msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s" #: nova/volume/san.py:453 #, python-format msgid "CLIQ command returned %s" -msgstr "" +msgstr "返回CLIQ命令 %s" #: nova/volume/san.py:459 #, python-format msgid "" "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" -msgstr "" +msgstr "CLIQ命令 %(verb)s %(cliq_args)s 错误格式的响应。Result=%(out)s" #: nova/volume/san.py:467 #, python-format msgid "Error running CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s" -msgstr "" +msgstr "在运行CLIQ命令 %(verb)s %(cliq_args)s 时发生错误。输出结果 Result=%(out)s" #: nova/volume/san.py:497 #, python-format msgid "" "Unexpected number of virtual ips for cluster %(cluster_name)s. " "Result=%(_xml)s" -msgstr "" +msgstr "集群 %(cluster_name)s 有意外数量的虚拟 ip 地址。输出结果 Result=%(_xml)s" #: nova/volume/san.py:550 #, python-format msgid "Volume info: %(volume_name)s => %(volume_attributes)s" -msgstr "" +msgstr "卷信息：%(volume_name)s => %(volume_attributes)s" #: nova/volume/driver.py:844 nova/volume/san.py:595 msgid "local_path not supported" -msgstr "" +msgstr "不支持local_path" #: nova/volume/san.py:627 #, python-format msgid "Could not determine project for volume %s, can't export" -msgstr "" +msgstr "无法为卷 %s 确定项目，无法导出" #: nova/volume/san.py:697 #, python-format msgid "Payload for SolidFire API call: %s" -msgstr "" +msgstr "SolidFire API 调用的参数：%s" #: nova/volume/san.py:714 #, python-format msgid "Call to json.loads() raised an exception: %s" -msgstr "" +msgstr "调用 json.loads() 引起异常：%s" #: nova/volume/san.py:719 #, python-format msgid "Results of SolidFire API call: %s" -msgstr "" +msgstr "SolidFire API调用结果：%s" #: nova/volume/san.py:733 #, python-format msgid "Found solidfire account: %s" -msgstr "" +msgstr "找到solidfire帐户：%s" #: nova/volume/san.py:747 #, python-format msgid "solidfire account: %s does not exist, create it..." -msgstr "" +msgstr "solidfire帐户：%s 不存在，正在创建..." #: nova/volume/san.py:805 msgid "Enter SolidFire create_volume..." -msgstr "" +msgstr "进入SolidFire create_volume..." #: nova/volume/san.py:844 msgid "Leaving SolidFire create_volume" -msgstr "" +msgstr "离开SolidFire create_volume" #: nova/volume/san.py:859 msgid "Enter SolidFire delete_volume..." -msgstr "" +msgstr "进入SolidFire delete_volume..." #: nova/volume/san.py:878 #, python-format msgid "Deleting volumeID: %s " -msgstr "" +msgstr "正在删除volumeID：%s " #: nova/volume/san.py:886 msgid "Leaving SolidFire delete_volume" -msgstr "" +msgstr "离开SolidFire delete_volume" #: nova/volume/san.py:889 msgid "Executing SolidFire ensure_export..." -msgstr "" +msgstr "正在执行SolidFire ensure_export..." #: nova/volume/san.py:893 msgid "Executing SolidFire create_export..." -msgstr "" +msgstr "正在执行SolidFire create_export..." #: nova/volume/driver.py:92 #, python-format msgid "Recovering from a failed execute. Try number %s" -msgstr "" +msgstr "从失败的执行中恢复。尝试编号 %s" #: nova/volume/driver.py:102 #, python-format msgid "volume group %s doesn't exist" -msgstr "" +msgstr "卷组 %s 不存在" #: ../nova/volume/driver.py:264 ../nova/volume/driver.py:860 msgid "Skipping ensure_export. No iscsi_target " @@ -2702,142 +2727,142 @@ #: nova/volume/driver.py:327 msgid "ISCSI provider_location not stored, using discovery" -msgstr "" +msgstr "采用discovery，ISCSI provider_location 没有存储" #: nova/volume/driver.py:372 #, python-format msgid "Could not find iSCSI export for volume %s" -msgstr "" +msgstr "无法为卷 %s 找到 iSCSI 导出" #: nova/volume/driver.py:376 #, python-format msgid "ISCSI Discovery: Found %s" -msgstr "" +msgstr "ISCSI Discovery：找到 %s" #: nova/volume/driver.py:449 #, python-format msgid "Cannot confirm exported volume id:%(volume_id)s." -msgstr "" +msgstr "无法确认导出的卷id：%(volume_id)s。" #: nova/volume/driver.py:476 #, python-format msgid "FAKE ISCSI: %s" -msgstr "" +msgstr "FAKE ISCSI: %s" #: nova/volume/driver.py:488 #, python-format msgid "rbd has no pool %s" -msgstr "" +msgstr "RBD没有池 %s" #: nova/volume/driver.py:558 #, python-format msgid "Sheepdog is not working: %s" -msgstr "" +msgstr "Sheepdog 没有工作：%s" #: nova/volume/driver.py:560 msgid "Sheepdog is not working" -msgstr "" +msgstr "Sheepdog 没有工作" #: nova/volume/driver.py:659 nova/volume/driver.py:664 #, python-format msgid "LoggingVolumeDriver: %s" -msgstr "" +msgstr "LoggingVolumeDriver: %s" #: nova/volume/driver.py:699 #, python-format msgid "\tVolume %s is NOT VSA volume" -msgstr "" +msgstr "\t卷 %s 不是VSA 卷" #: nova/volume/driver.py:715 #, python-format msgid "\tFE VSA Volume %s creation - do nothing" -msgstr "" +msgstr "\tFE VSA 卷 %s 的创建 - 什么都不做" #: nova/volume/driver.py:748 #, python-format msgid "VSA BE create_volume for %s failed" -msgstr "" +msgstr "为 %s 的VSA BE create_volume失败" #: nova/volume/driver.py:751 #, python-format msgid "VSA BE create_volume for %s succeeded" -msgstr "" +msgstr "为 %s 的VSA BE create_volume成功" #: nova/volume/driver.py:759 #, python-format msgid "\tFE VSA Volume %s deletion - do nothing" -msgstr "" +msgstr "\tFE VSA 卷 %s 的删除 - 什么都不做" #: nova/volume/driver.py:770 #, python-format msgid "VSA BE delete_volume for %s failed" -msgstr "" +msgstr "为 %s 的VSA BE delete_volume失败" #: nova/volume/driver.py:773 #, python-format msgid "VSA BE delete_volume for %s suceeded" -msgstr "" +msgstr "为 %s 的VSA BE delete_volume成功" #: nova/virt/libvirt/volume.py:152 nova/volume/driver.py:811 #, python-format msgid "iSCSI device not found at %s" -msgstr "" +msgstr "在 %s 未找到iSCSI设备" #: 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 "" +msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s" #: 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 "" +msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）" #: nova/volume/driver.py:837 #, python-format msgid "\tFE VSA Volume %s local path call - call discover" -msgstr "" +msgstr "\tFE VSA 卷 %s 本地路径调用 - 调用discover" #: nova/volume/driver.py:852 #, python-format msgid "\tFE VSA Volume %s ensure export - do nothing" -msgstr "" +msgstr "\tFE VSA Volume %s 确保导出 - 什么都不做" #: nova/volume/driver.py:876 #, python-format msgid "\tFE VSA Volume %s create export - do nothing" -msgstr "" +msgstr "\tFE VSA Volume %s 创建导出 - 什么都不做" #: nova/volume/driver.py:896 #, python-format msgid "\tFE VSA Volume %s remove export - do nothing" -msgstr "" +msgstr "\tFE VSA Volume %s 删除导出 - 什么都不做" #: nova/volume/driver.py:916 #, python-format msgid "VSA BE remove_export for %s failed" -msgstr "" +msgstr "为 %s 的VSA BE remove_export失败" #: nova/volume/driver.py:968 msgid "Failed to retrieve QoS info" -msgstr "" +msgstr "获取QoS信息失败" #: nova/api/openstack/auth.py:91 #, python-format msgid "%(user_id)s could not be found with token '%(token)s'" -msgstr "无法为令牌 '%(token)s' 找到 %(user_id)s" +msgstr "%(user_id)s 通过令牌 '%(token)s' 是找不到的" #: nova/api/openstack/auth.py:135 #, python-format msgid "%(user_id)s must be an admin or a member of %(project_id)s" -msgstr "%(user_id)s 必须是管理员或者 %(project_id)s 的成员" +msgstr "%(user_id)s 必须是 %(project_id)s 的管理员或者成员" #: nova/api/openstack/auth.py:153 msgid "" "Authentication requests must be made against a version root (e.g. /v2)." -msgstr "" +msgstr "认证请求必须针对root版本(例如 /v2)。" #: nova/api/openstack/auth.py:168 #, python-format @@ -2851,40 +2876,40 @@ #: nova/api/openstack/auth.py:238 msgid "User not found with provided API key." -msgstr "没有为提供的API key找到用户。" +msgstr "没有为提供的API密钥找到用户。" #: nova/api/openstack/auth.py:255 #, python-format msgid "Provided API key is valid, but not for user '%(username)s'" -msgstr "提供的API key有效，但并不是给用户 '%(username)s' 的。" +msgstr "提供的API密钥有效，但并不是给用户 '%(username)s' 的。" #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:61 msgid "instance_info_caches tables not dropped" -msgstr "" +msgstr "instance_info_caches 没有删除掉" #: nova/api/openstack/compute/contrib/scheduler_hints.py:41 msgid "Malformed scheduler_hints attribute" -msgstr "非法的scheduler_hints attribute" +msgstr "错误格式的 scheduler_hints 属性" #: nova/tests/api/openstack/compute/contrib/test_vsa.py:58 #, python-format msgid "_create: param=%s" -msgstr "" +msgstr "_create: 参数=%s" #: nova/ipv6/account_identifier.py:42 #, python-format msgid "Bad project_id for to_global_ipv6: %s" -msgstr "" +msgstr "错误的to_global_ipv6 oject_id；%s" #: nova/virt/xenapi/network_utils.py:37 #, python-format msgid "Found non-unique network for name_label %s" -msgstr "" +msgstr "发现不唯一的网络 name_label %s" #: nova/virt/xenapi/network_utils.py:55 #, python-format msgid "Found non-unique network for bridge %s" -msgstr "发现网桥 %s 的网络不唯一" +msgstr "发现桥 %s 的网络不唯一" #: nova/virt/xenapi/network_utils.py:58 #, python-format @@ -2900,41 +2925,41 @@ #: nova/virt/firewall.py:130 #, python-format msgid "Attempted to unfilter instance %s which is not filtered" -msgstr "" +msgstr "试图不过滤没有过滤的实例 %s" #: nova/virt/firewall.py:137 #, python-format msgid "Filters added to instance %s" -msgstr "" +msgstr "过滤器添加给实例 %s" #: nova/virt/firewall.py:139 msgid "Provider Firewall Rules refreshed" -msgstr "" +msgstr "提供者防火墙规则刷新" #: nova/virt/firewall.py:291 #, python-format msgid "Adding security group rule: %r" -msgstr "" +msgstr "添加安全组规则：%r" #: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:88 #, python-format msgid "Adding provider rule: %s" -msgstr "" +msgstr "添加提供者规则：%s" #: nova/virt/libvirt/vif.py:85 #, python-format msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s" -msgstr "" +msgstr "保证vlan %(vlan)s 和桥 %(bridge)s" #: nova/virt/libvirt/vif.py:93 #, python-format msgid "Ensuring bridge %s" -msgstr "" +msgstr "保证桥 %s" #: nova/virt/libvirt/vif.py:152 #, python-format msgid "Failed while unplugging vif of instance '%s'" -msgstr "" +msgstr "移除实例”%s“的虚拟网络设备时失败" #: nova/api/openstack/wsgi.py:134 nova/api/openstack/wsgi.py:537 msgid "cannot understand JSON" @@ -2947,7 +2972,7 @@ #: nova/api/openstack/wsgi.py:542 msgid "too many body keys" -msgstr "" +msgstr "过多主体密钥" #: nova/api/openstack/wsgi.py:580 #, python-format @@ -2961,20 +2986,20 @@ #: nova/api/openstack/wsgi.py:691 msgid "Unrecognized Content-Type provided in request" -msgstr "" +msgstr "请求中提供了无法识别的 Content-Type" #: nova/api/openstack/wsgi.py:695 msgid "No Content-Type provided in request" -msgstr "" +msgstr "请求中没有提供 Content-Type" #: nova/api/openstack/wsgi.py:699 msgid "Empty body provided in request" -msgstr "" +msgstr "请求中没有提供主体" #: nova/api/openstack/wsgi.py:810 #, python-format msgid "There is no such action: %s" -msgstr "" +msgstr "没有该动作：%s" #: nova/api/openstack/wsgi.py:823 msgid "Unsupported Content-Type" @@ -2982,7 +3007,7 @@ #: nova/api/openstack/wsgi.py:835 msgid "Malformed request url" -msgstr "不合法的请求url" +msgstr "错误格式的请求url" #: nova/api/openstack/__init__.py:45 nova/api/openstack/wsgi.py:881 #, python-format @@ -2997,22 +3022,22 @@ #: nova/tests/fake_utils.py:72 #, python-format msgid "Faking execution of cmd (subprocess): %s" -msgstr "" +msgstr "伪执行命令（子进程）：%s" #: nova/tests/fake_utils.py:80 #, python-format msgid "Faked command matched %s" -msgstr "" +msgstr "伪命令匹配 %s" #: nova/tests/fake_utils.py:96 #, python-format msgid "Faked command raised an exception %s" -msgstr "" +msgstr "伪命令引起异常 %s" #: nova/tests/fake_utils.py:101 #, python-format msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'" -msgstr "" +msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'" #: nova/policy.py:30 msgid "JSON file representing policy" @@ -3024,7 +3049,7 @@ #: nova/crypto.py:50 msgid "Filename of root CA" -msgstr "根证书文件名" +msgstr "根证书的文件名" #: nova/crypto.py:53 msgid "Filename of private key" @@ -3032,7 +3057,7 @@ #: nova/crypto.py:56 msgid "Filename of root Certificate Revocation List" -msgstr "根证书撤销列表的文件名称" +msgstr "根证书撤销列表的文件名" #: nova/crypto.py:59 msgid "Where we keep our keys" @@ -3044,157 +3069,157 @@ #: nova/crypto.py:65 msgid "Should we use a CA for each project?" -msgstr "是否所有项目都是用证书授权（CA）？" +msgstr "是否每个项目都使用认证权威？" #: nova/crypto.py:69 #, python-format msgid "Subject for certificate for users, %s for project, user, timestamp" -msgstr "用户证书的标题，%s依次分别为项目，用户，时间戳" +msgstr "用户证书的标题，%s 依次分别为项目，用户，时间戳" #: nova/crypto.py:74 #, python-format msgid "Subject for certificate for projects, %s for project, timestamp" -msgstr "项目证书的标题，%s依次分别为项目，时间戳" +msgstr "项目证书的标题，%s 依次分别为项目，时间戳" #: nova/crypto.py:296 #, python-format msgid "Flags path: %s" -msgstr "Flag所在路径：%s" +msgstr "标记所在路径：%s" #: 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 "" +msgstr "外键约束无法去除" #: 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 "" +msgstr "外键约束无法添加" #: nova/virt/vmwareapi/io_util.py:99 #, python-format msgid "Glance image %s is in killed state" -msgstr "" +msgstr "Glance 镜像 %s 在 killed 状态" #: nova/virt/vmwareapi/io_util.py:107 #, python-format msgid "Glance image %(image_id)s is in unknown state - %(state)s" -msgstr "" +msgstr "Glance 镜像 %(image_id)s 处于未知状态 - %(state)s" #: nova/network/linux_net.py:167 #, python-format msgid "Attempted to remove chain %s which does not exist" -msgstr "" +msgstr "试图移除不存在的链 %s。" #: nova/network/linux_net.py:193 #, python-format msgid "Unknown chain: %r" -msgstr "" +msgstr "未知链：%r" #: nova/network/linux_net.py:216 #, python-format msgid "" "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r %(top)r" -msgstr "" +msgstr "试图移除不存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r" #: nova/network/linux_net.py:336 msgid "IPTablesManager.apply completed with success" -msgstr "" +msgstr "IPTablesManager.apply成功完成" #: nova/network/linux_net.py:587 nova/network/linux_net.py:609 #: nova/network/linux_net.py:651 #, python-format msgid "Instance %(instance_id)s not found" -msgstr "" +msgstr "没有找到实例 %(instance_id)s" #: nova/network/linux_net.py:718 #, python-format msgid "Hupping dnsmasq threw %s" -msgstr "" +msgstr "挂起进程 dnsmasq 时抛出 %s" #: nova/network/linux_net.py:720 #, python-format msgid "Pid %d is stale, relaunching dnsmasq" -msgstr "" +msgstr "Pid %d 过期了，重新启动dnsmasq" #: nova/network/linux_net.py:780 #, python-format msgid "killing radvd threw %s" -msgstr "" +msgstr "杀掉进程 radvd 时抛出 %s" #: nova/network/linux_net.py:782 #, python-format msgid "Pid %d is stale, relaunching radvd" -msgstr "" +msgstr "Pid %d 过期了，重新启动radvd" #: nova/network/linux_net.py:984 #, python-format msgid "Starting VLAN inteface %s" -msgstr "" +msgstr "正在开启VLAN接口 %s" #: nova/network/linux_net.py:1016 #, python-format msgid "Starting Bridge interface for %s" -msgstr "" +msgstr "正在为 %s 开启桥接口" #: nova/virt/disk/nbd.py:63 msgid "No free nbd devices" -msgstr "" +msgstr "没有空闲NBD设备" #: nova/virt/disk/nbd.py:81 #, python-format msgid "qemu-nbd error: %s" -msgstr "" +msgstr "qemu-nbd 错误：%s" #: nova/virt/disk/nbd.py:93 #, python-format msgid "nbd device %s did not show up" -msgstr "" +msgstr "nbd 设备 %s 没有出现" #: nova/virt/xenapi/vm_utils.py:209 #, python-format msgid "Created VM %s..." -msgstr "" +msgstr "创建虚拟机 %s ..." #: nova/virt/xenapi/vm_utils.py:212 #, python-format msgid "Created VM %(instance_name)s as %(vm_ref)s." -msgstr "" +msgstr "已经将虚拟机 %(instance_name)s 创建成 %(vm_ref)s。" #: 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 "" +msgstr "正在为虚拟机 %(vm_ref)s 创建一个特定的CDROM VBD， VDI %(vdi_ref)s ... " #: 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 "" +msgstr "已经为虚拟机 %(vm_ref)s 创建了一个 基于CDROM 的VBD %(vbd_ref)s，VDI为 %(vdi_ref)s。" #: nova/virt/xenapi/vm_utils.py:263 #, python-format msgid "VBD not found in instance %s" -msgstr "" +msgstr "没有找到实例 %s 的VBD" #: nova/virt/xenapi/vm_utils.py:274 #, python-format msgid "Unable to unplug VBD %s" -msgstr "" +msgstr "无法移除 VBD %s" #: nova/virt/xenapi/vm_utils.py:285 #, python-format msgid "Unable to destroy VBD %s" -msgstr "" +msgstr "无法销毁 VBD %s" #: nova/virt/xenapi/vm_utils.py:295 #, python-format msgid "Unable to destroy VDI %s" -msgstr "" +msgstr "无法销毁 VDI %s" #: nova/virt/xenapi/vm_utils.py:312 #, python-format @@ -3202,87 +3227,90 @@ "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on " "%(sr_ref)s." msgstr "" +"创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on " +"%(sr_ref)s。" #: 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 "" +msgstr "在 %(sr_ref)s 上将 VDI %(vdi_to_copy_ref)s 复制成了 VDI %(vdi_ref)s。" #: nova/virt/xenapi/vm_utils.py:329 #, python-format msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s" -msgstr "" +msgstr "从 VDI %(vdi_to_clone_ref)s 克隆了 VDI %(vdi_ref)s" #: nova/virt/xenapi/vm_utils.py:348 #, python-format msgid "No primary VDI found for%(vm_ref)s" -msgstr "" +msgstr "未找到 %(vm_ref)s 的主VDI" #: nova/virt/xenapi/vm_utils.py:355 #, python-format msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..." -msgstr "" +msgstr "正在用标签 ”%(label)s“ 为虚拟机 %(vm_ref)s 做快照..." #: nova/virt/xenapi/vm_utils.py:369 #, python-format msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s." -msgstr "" +msgstr "已经从虚拟机 %(vm_ref)s 里创建了快照 %(template_vm_ref)s" #: nova/virt/xenapi/vm_utils.py:408 #, python-format msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s" -msgstr "" +msgstr "请求xapi 上传 %(vdi_uuids)s 作为镜像ID %(image_id)s" #: 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 "" +msgstr "只能在ext类型的缺省本地SR支持快速克隆。这个系统的SR的类型为 %(sr_type)s。忽略此 cow 标记。" #: nova/virt/xenapi/vm_utils.py:697 #, python-format msgid "Asking xapi to fetch vhd image %(image)s" -msgstr "" +msgstr "请求 xapi 获取 vhd 镜像 %(image)s" #: 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 "" +msgstr "xapi 'download_vhd' 返回 UUID 为 “%(vdi_uuid)s” 的 “%(vdi_type)s” 类型的VDI" #: nova/virt/xenapi/vm_utils.py:754 #, python-format msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d" -msgstr "" +msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d" #: nova/virt/xenapi/vm_utils.py:769 #, python-format msgid "" "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d" msgstr "" +"image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d" #: 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 "" +msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d" #: nova/virt/xenapi/vm_utils.py:796 #, python-format msgid "Fetching image %(image)s" -msgstr "" +msgstr "获取镜像 %(image)s" #: nova/virt/xenapi/vm_utils.py:797 #, python-format msgid "Image Type: %s" -msgstr "" +msgstr "镜像类型：%s" #: nova/virt/xenapi/vm_utils.py:801 msgid "ISO: Found sr possibly containing the ISO image" -msgstr "" +msgstr "ISO：SR可能包含该ISO镜像" #: ../nova/virt/xenapi/vm_utils.py:810 #, python-format @@ -3293,62 +3321,62 @@ #, python-format msgid "" "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes" -msgstr "" +msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节" #: nova/virt/xenapi/vm_utils.py:836 #, python-format msgid "Copying VDI %s to /boot/guest on dom0" -msgstr "" +msgstr "将VDI %s 复制到dom0的/boot/guest下" #: nova/virt/xenapi/vm_utils.py:848 #, python-format msgid "Kernel/Ramdisk VDI %s destroyed" -msgstr "" +msgstr "内核/内存盘 VDI %s 已销毁" #: nova/virt/xenapi/vm_utils.py:858 #, python-format msgid "instance %s: Failed to fetch glance image" -msgstr "" +msgstr "实例 %s：获取Glance镜像失败" #: nova/virt/xenapi/vm_utils.py:897 #, python-format msgid "Detected %(image_type_str)s format for image %(image_ref)s" -msgstr "" +msgstr "为镜像 %(image_ref)s 检测到 %(image_type_str)s 格式" #: nova/virt/xenapi/vm_utils.py:919 #, python-format msgid "Looking up vdi %s for PV kernel" -msgstr "" +msgstr "为PV内核查询vdi %s" #: nova/virt/xenapi/vm_utils.py:937 #, python-format msgid "Unknown image format %(disk_image_type)s" -msgstr "" +msgstr "未知的镜像格式 %(disk_image_type)s" #: nova/virt/xenapi/vm_utils.py:979 #, python-format msgid "VDI %s is still available" -msgstr "" +msgstr "VDI %s 依然可用" #: nova/virt/xenapi/vm_utils.py:1025 #, python-format msgid "(VM_UTILS) xenserver vm state -> |%s|" -msgstr "" +msgstr "(VM_UTILS) xenserver 虚拟机状态 -> |%s|" #: nova/virt/xenapi/vm_utils.py:1027 #, python-format msgid "(VM_UTILS) xenapi power_state -> |%s|" -msgstr "" +msgstr "(VM_UTILS) xenapi power_state -> |%s|" #: nova/virt/xenapi/vm_utils.py:1072 #, python-format msgid "Re-scanning SR %s" -msgstr "" +msgstr "重新扫描SR %s" #: nova/virt/xenapi/vm_utils.py:1103 #, python-format msgid "Flag sr_matching_filter '%s' does not respect formatting convention" -msgstr "" +msgstr "标记sr_matching_filter '%s' 没有遵循格式要求" #: nova/virt/xenapi/vm_utils.py:1121 msgid "" @@ -3356,40 +3384,41 @@ "Please check your configuration and/or configure the flag " "'sr_matching_filter'" msgstr "" +"XenAPI无法找到安装客户实例的Storage Repository。请检查你的配置或者配置标记'sr_matching_filter'" #: nova/virt/xenapi/vm_utils.py:1134 msgid "Cannot find SR of content-type ISO" -msgstr "" +msgstr "无法找到content-type ISO的SR" #: nova/virt/xenapi/vm_utils.py:1142 #, python-format msgid "ISO: looking at SR %(sr_rec)s" -msgstr "" +msgstr "ISO：正在查看SR %(sr_rec)s" #: nova/virt/xenapi/vm_utils.py:1144 msgid "ISO: not iso content" -msgstr "" +msgstr "ISO：非iso内容" #: nova/virt/xenapi/vm_utils.py:1147 msgid "ISO: iso content_type, no 'i18n-key' key" -msgstr "" +msgstr "ISO：iso content_type，没有 'i18n-key' 键" #: nova/virt/xenapi/vm_utils.py:1150 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'" -msgstr "" +msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'" #: nova/virt/xenapi/vm_utils.py:1154 msgid "ISO: SR MATCHing our criteria" -msgstr "" +msgstr "ISO: SR符合标准" #: nova/virt/xenapi/vm_utils.py:1156 msgid "ISO: ISO, looking to see if it is host local" -msgstr "" +msgstr "ISO: ISO, looking to see if it is host local" #: nova/virt/xenapi/vm_utils.py:1159 #, python-format msgid "ISO: PBD %(pbd_ref)s disappeared" -msgstr "" +msgstr "ISO: PBD %(pbd_ref)s 消失了" #: ../nova/virt/xenapi/vm_utils.py:1162 #, python-format @@ -3398,45 +3427,45 @@ #: nova/virt/xenapi/vm_utils.py:1165 msgid "ISO: SR with local PBD" -msgstr "" +msgstr "ISO：含有本地PBD的SR" #: nova/virt/xenapi/vm_utils.py:1187 #, python-format msgid "" "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: %(server)s." -msgstr "" +msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。" #: nova/virt/xenapi/vm_utils.py:1203 #, python-format msgid "Unable to obtain RRD XML updates with server details: %(server)s." -msgstr "" +msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。" #: nova/virt/xenapi/vm_utils.py:1257 #, python-format msgid "Invalid statistics data from Xenserver: %s" -msgstr "" +msgstr "来自Xenserver无效的统计数据：%s" #: nova/virt/xenapi/vm_utils.py:1310 #, python-format msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s" -msgstr "" +msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s" #: 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 "" +msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..." #: nova/virt/xenapi/vm_utils.py:1394 #, python-format msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..." -msgstr "" +msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..." #: nova/virt/xenapi/vm_utils.py:1429 #, python-format msgid "Timeout waiting for device %s to be created" -msgstr "" +msgstr "等待设备 %s 创建超时" #: nova/virt/xenapi/vm_utils.py:1448 #, python-format @@ -3446,141 +3475,141 @@ #: nova/virt/xenapi/vm_utils.py:1450 #, python-format msgid "Creating VBD for VDI %s done." -msgstr "" +msgstr "为VDI %s 创建VBD完成。" #: nova/virt/xenapi/vm_utils.py:1452 #, python-format msgid "Plugging VBD %s ... " -msgstr "" +msgstr "插入VBD %s... " #: nova/virt/xenapi/vm_utils.py:1455 #, python-format msgid "Plugging VBD %s done." -msgstr "" +msgstr "插入VBD %s 完成。" #: nova/virt/xenapi/vm_utils.py:1457 #, python-format msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s" -msgstr "" +msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入" #: nova/virt/xenapi/vm_utils.py:1460 #, python-format msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s" -msgstr "" +msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s" #: nova/virt/xenapi/vm_utils.py:1469 #, python-format msgid "Destroying VBD for VDI %s ... " -msgstr "" +msgstr "正在销毁VDI为 %s 的 VBD " #: nova/virt/xenapi/vm_utils.py:1473 #, python-format msgid "Destroying VBD for VDI %s done." -msgstr "" +msgstr "已经销毁VDI为 %s 的 VBD" #: nova/virt/xenapi/vm_utils.py:1484 msgid "VBD.unplug successful first time." -msgstr "" +msgstr "VBD.unplug 操作第一次成功。" #: nova/virt/xenapi/vm_utils.py:1489 msgid "VBD.unplug rejected: retrying..." -msgstr "" +msgstr "VBD.unplug 操作被拒绝：重试中..." #: nova/virt/xenapi/vm_utils.py:1491 msgid "Not sleeping anymore!" -msgstr "" +msgstr "不再睡眠！" #: nova/virt/xenapi/vm_utils.py:1494 msgid "VBD.unplug successful eventually." -msgstr "" +msgstr "VBD.unplug 操作最终成功。" #: nova/virt/xenapi/vm_utils.py:1497 #, python-format msgid "Ignoring XenAPI.Failure in VBD.unplug: %s" -msgstr "" +msgstr "在 VBD.unplug 操作中忽略XenAPI.Failure：%s" #: nova/virt/xenapi/vm_utils.py:1506 #, python-format msgid "Ignoring XenAPI.Failure %s" -msgstr "" +msgstr "忽略 XenAPI.Failure %s" #: nova/virt/xenapi/vm_utils.py:1520 #, python-format msgid "Running pygrub against %s" -msgstr "" +msgstr "对 %s 运行pygrub" #: nova/virt/xenapi/vm_utils.py:1527 #, python-format msgid "Found Xen kernel %s" -msgstr "" +msgstr "找到Xen内核 %s" #: nova/virt/xenapi/vm_utils.py:1529 msgid "No Xen kernel found. Booting HVM." -msgstr "" +msgstr "没有找到Xen内核。正在启动HVM。" #: nova/virt/xenapi/vm_utils.py:1542 msgid "Partitions:" -msgstr "" +msgstr "分区：" #: nova/virt/xenapi/vm_utils.py:1548 #, python-format msgid " %(num)s: %(ptype)s %(size)d sectors" -msgstr "" +msgstr " %(num)s: %(ptype)s %(size)d sectors" #: nova/virt/xenapi/vm_utils.py:1574 #, python-format msgid "" "Writing partition table %(primary_first)d %(primary_last)d to %(dev_path)s..." -msgstr "" +msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..." #: nova/virt/xenapi/vm_utils.py:1587 #, python-format msgid "Writing partition table %s done." -msgstr "" +msgstr "完成写入分区表 %s 。" #: 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 "" +msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。" #: nova/virt/xenapi/vm_utils.py:1684 msgid "" "XenServer tools are present in this image but are not capable of network " "injection" -msgstr "" +msgstr "该镜像有XenServer工具，但是不能进行网络注入" #: nova/virt/xenapi/vm_utils.py:1688 msgid "XenServer tools are not installed in this image" -msgstr "" +msgstr "没有在该镜像上安装XenServer工具" #: nova/virt/xenapi/vm_utils.py:1705 msgid "Manipulating interface files directly" -msgstr "" +msgstr "直接操作接口文件" #: nova/virt/xenapi/vm_utils.py:1712 #, python-format msgid "Failed to mount filesystem (expected for non-linux instances): %s" -msgstr "" +msgstr "挂载文件系统失败(期望的是非Linux实例)：%s" #: nova/db/sqlalchemy/session.py:87 #, python-format msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left." -msgstr "" +msgstr "SQL连接失败 (%(connstring)s)。还剩 %(attempts)d 次。" #: nova/virt/images.py:95 msgid "'qemu-img info' parsing failed." -msgstr "" +msgstr "'qemu-img info'解析失败" #: nova/virt/images.py:101 #, python-format msgid "fmt=%(fmt)s backed by: %(backing_file)s" -msgstr "" +msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持" #: nova/virt/images.py:114 #, python-format msgid "Converted to raw, but format is now %s" -msgstr "" +msgstr "转化为裸格式，但目前格式是 %s" #: nova/api/ec2/cloud.py:326 #, python-format @@ -3590,17 +3619,17 @@ #: nova/api/ec2/cloud.py:361 #, python-format msgid "Create key pair %s" -msgstr "创建键值对 %s" +msgstr "创建密钥对 %s" #: nova/api/ec2/cloud.py:370 #, python-format msgid "Import key %s" -msgstr "导入key %s" +msgstr "导入密钥 %s" #: nova/api/ec2/cloud.py:388 #, python-format msgid "Delete key pair %s" -msgstr "删除键值对 %s" +msgstr "删除密钥对 %s" #: nova/api/ec2/cloud.py:648 nova/api/ec2/cloud.py:708 msgid "No rule for the specified parameters." @@ -3644,13 +3673,13 @@ #: nova/api/ec2/cloud.py:883 #, python-format msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s" -msgstr "把卷 %(volume_id)s 加载到 %(device)s 的实例 %(instance_id)s 上" +msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s" #: 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 "attribute不支持: %s" +msgstr "属性不支持: %s" #: nova/api/ec2/cloud.py:1046 #, python-format @@ -3674,7 +3703,7 @@ #: nova/api/ec2/cloud.py:1218 #, python-format msgid "Disassociate address %s" -msgstr "解除地址 %s 的关联" +msgstr "取消地址 %s 的关联" #: nova/api/ec2/cloud.py:1243 msgid "Image must be available" @@ -3682,7 +3711,7 @@ #: nova/api/ec2/cloud.py:1264 msgid "Going to start terminating instances" -msgstr "准备开启终止实例" +msgstr "准备开始终止实例" #: nova/api/ec2/cloud.py:1277 #, python-format @@ -3700,12 +3729,12 @@ #: nova/api/ec2/cloud.py:1388 #, python-format msgid "De-registering image %s" -msgstr "解除镜像 %s注册" +msgstr "解除镜像 %s 的注册" #: nova/api/ec2/cloud.py:1415 #, python-format msgid "Registered image %(image_location)s with id %(image_id)s" -msgstr "用 id %(image_id)s注册镜像 %(image_location)s" +msgstr "用id %(image_id)s 注册镜像 %(image_location)s" #: nova/api/ec2/cloud.py:1461 msgid "user or group not specified" @@ -3722,7 +3751,7 @@ #: nova/api/ec2/cloud.py:1467 #, python-format msgid "Updating image %s publicity" -msgstr "" +msgstr "正在更新镜像 %s 的 publicity 属性" #: nova/api/ec2/cloud.py:1524 #, python-format @@ -3732,7 +3761,7 @@ #: nova/api/openstack/extensions.py:191 #, python-format msgid "Loaded extension: %s" -msgstr "Loaded extension: %s" +msgstr "加载的扩展：%s" #: nova/api/openstack/extensions.py:228 #, python-format @@ -3762,17 +3791,17 @@ #: nova/api/openstack/extensions.py:235 #, python-format msgid "Exception loading extension: %s" -msgstr "Exception loading extension: %s" +msgstr "加载扩展发生异常：%s" #: nova/api/openstack/extensions.py:249 #, python-format msgid "Loading extension %s" -msgstr "Loading extension %s" +msgstr "正在加载扩展 %s" #: nova/api/openstack/extensions.py:255 #, python-format msgid "Calling extension factory %s" -msgstr "Calling extension factory %s" +msgstr "调用扩展工厂 %s" #: nova/api/openstack/extensions.py:267 #, python-format @@ -3825,7 +3854,7 @@ #: nova/api/openstack/compute/contrib/security_groups.py:348 #, python-format msgid "Authorize security group ingress %s" -msgstr "验证安全组的输入 %s" +msgstr "授权 %s 安全组入口权限" #: nova/api/openstack/compute/contrib/security_groups.py:363 msgid "Not enough parameters to build a valid rule." @@ -3834,7 +3863,7 @@ #: nova/api/openstack/compute/contrib/security_groups.py:370 #, python-format msgid "This rule already exists in group %s" -msgstr "" +msgstr "这条规则已经存在于组%s 中" #: nova/api/openstack/compute/contrib/security_groups.py:408 msgid "Parent or group id is not integer" @@ -3856,7 +3885,7 @@ #: nova/api/openstack/compute/contrib/security_groups.py:500 #, python-format msgid "Revoke security group ingress %s" -msgstr "撤销安全组输入 %s" +msgstr "撤销 %s 安全组入口权限" #: nova/api/openstack/compute/contrib/security_groups.py:562 #: nova/api/openstack/compute/contrib/security_groups.py:595 @@ -3879,20 +3908,20 @@ #: nova/tests/test_xenapi.py:602 #, python-format msgid "Creating files in %s to simulate guest agent" -msgstr "" +msgstr "在%s 创建文件模拟客户代理" #: nova/tests/test_xenapi.py:613 #, python-format msgid "Removing simulated guest agent files in %s" -msgstr "" +msgstr "移除在 %s 的模拟的客户代理文件" #: nova/tests/fakelibvirt.py:774 msgid "Please extend mock libvirt module to support flags" -msgstr "" +msgstr "请扩展模拟的 libvirt 模块来支持标记" #: nova/tests/fakelibvirt.py:780 msgid "Please extend fake libvirt module to support this auth method" -msgstr "" +msgstr "请扩展伪libvirt模块来支持这种认知方法" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170 msgid "No body provided" @@ -3901,7 +3930,7 @@ #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182 #, python-format msgid "Create VSA %(display_name)s of type %(vc_type)s" -msgstr "创建类型 %(vc_type)s 的VSA %(display_name)s" +msgstr "创建VSA %(display_name)s 类型是 %(vc_type)s" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203 #, python-format @@ -3916,19 +3945,19 @@ #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:251 #, python-format msgid "Disassociate address from VSA %(id)s" -msgstr "把地址与VSA %(id)s解除关联" +msgstr "取消地址与VSA %(id)s关联" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:291 #, python-format msgid "%(obj)s with ID %(id)s not found" -msgstr "没有找到ID是 %(id)s 的 %(obj)s" +msgstr "没有找到 %(obj)s 该对象的ID是 %(id)s" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:297 #, python-format 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。" +msgstr "%(obj)s 的ID是 %(id)s 它属于VSA %(own_vsa_id)s而不是VSA %(vsa_id)s。" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:317 #, python-format @@ -3948,7 +3977,7 @@ #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:336 #, python-format msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s" -msgstr "从VSA ID %(vsa_id)s 为创建 %(size)s GB的卷" +msgstr "创建 %(size)s GB的卷来源是VSA ID %(vsa_id)s" #: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:381 #, python-format @@ -3972,69 +4001,69 @@ #: nova/cloudpipe/pipelib.py:46 msgid "Template for cloudpipe instance boot script" -msgstr "" +msgstr "cloudpipe实例的启动脚本模板" #: nova/cloudpipe/pipelib.py:49 msgid "Network to push into openvpn config" -msgstr "" +msgstr "网络地址已存入openvpn配置" #: nova/cloudpipe/pipelib.py:52 msgid "Netmask to push into openvpn config" -msgstr "" +msgstr "子网掩码已存入openvpn配置" #: nova/cloudpipe/pipelib.py:101 #, python-format msgid "Launching VPN for %s" -msgstr "" +msgstr "启动VPN %s" #: nova/scheduler/scheduler_options.py:67 #, python-format msgid "Could not stat scheduler options file %(filename)s: '%(e)s'" -msgstr "" +msgstr "无法统计调度器的选项文件 %(filename)s：“%(e)s”" #: nova/scheduler/scheduler_options.py:75 #, python-format msgid "Could not decode scheduler options: '%(e)s'" -msgstr "" +msgstr "无法解码调度器的选项：“%(e)s”" #: nova/image/s3.py:296 #, python-format msgid "Failed to download %(image_location)s to %(image_path)s" -msgstr "" +msgstr "把 %(image_location)s 下载到 %(image_path)s失败" #: nova/image/s3.py:315 #, python-format msgid "Failed to decrypt %(image_location)s to %(image_path)s" -msgstr "" +msgstr "解密 %(image_location)s 到 %(image_path)s失败" #: nova/image/s3.py:327 #, python-format msgid "Failed to untar %(image_location)s to %(image_path)s" -msgstr "" +msgstr "解包 %(image_location)s 到 %(image_path)s 失败" #: nova/image/s3.py:340 #, python-format msgid "Failed to upload %(image_location)s to %(image_path)s" -msgstr "" +msgstr "上传 %(image_location)s 到 %(image_path)s 失败" #: nova/image/s3.py:366 #, python-format msgid "Failed to decrypt private key: %s" -msgstr "" +msgstr "解密私钥失败：%s" #: nova/image/s3.py:374 #, python-format msgid "Failed to decrypt initialization vector: %s" -msgstr "" +msgstr "解密初始化vector失败：%s" #: nova/image/s3.py:385 #, python-format msgid "Failed to decrypt image file %(image_file)s: %(err)s" -msgstr "" +msgstr "解密镜像文件 %(image_file)s 失败：%(err)s" #: nova/image/s3.py:397 msgid "Unsafe filenames in image" -msgstr "" +msgstr "镜像中不安全的文件名" #: nova/api/ec2/apirequest.py:64 #, python-format @@ -4044,7 +4073,7 @@ #: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:53 msgid "foreign key constraint couldn't be dropped" -msgstr "" +msgstr "外键约束无法删除" #: nova/api/openstack/__init__.py:43 #, python-format @@ -4070,28 +4099,28 @@ #: nova/api/openstack/__init__.py:135 #, python-format msgid "Extension %(ext_name)s extending resource: %(collection)s" -msgstr "" +msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s" #: nova/api/openstack/common.py:135 nova/api/openstack/common.py:170 msgid "limit param must be an integer" -msgstr "limit param必须是整数" +msgstr "limit 参数必须是整数" #: nova/api/openstack/common.py:138 nova/api/openstack/common.py:174 msgid "limit param must be positive" -msgstr "limit param必须是正数" +msgstr "limit参数必须是正数" #: nova/api/openstack/common.py:164 msgid "offset param must be an integer" -msgstr "offset param必须是整数" +msgstr "offset 参数必须是整数" #: nova/api/openstack/common.py:178 msgid "offset param must be positive" -msgstr "offset param必须是正数" +msgstr "offset 参数必须是正数" #: nova/api/openstack/common.py:202 #, python-format msgid "marker [%s] not found" -msgstr "没有找到marker [%s]" +msgstr "没有找到标记 [%s]" #: nova/api/openstack/common.py:242 #, python-format @@ -4105,7 +4134,7 @@ #: nova/api/openstack/common.py:358 #, python-format msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s" -msgstr "实例处于 %(attr)s %(state)s 无法进行 '%(action)s'" +msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行" #: nova/api/openstack/common.py:361 #, python-format @@ -4122,123 +4151,123 @@ #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:75 msgid "interface column not added to networks table" -msgstr "" +msgstr "interface 列没有加入networks 表中" #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:89 msgid "VIF column not added to fixed_ips table" -msgstr "" +msgstr "VIF 列没有加入到 fixed_ips 表中" #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:99 #, python-format msgid "join list for moving mac_addresses |%s|" -msgstr "" +msgstr "为移动 mac_addresses |%s| 加入列表" #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:123 msgid "Can't downgrade without losing data" -msgstr "" +msgstr "无法不丢失数据地降级" #: nova/virt/baremetal/dom.py:93 msgid "No domains exist." -msgstr "" +msgstr "没有域存在。" #: nova/virt/baremetal/dom.py:95 #, python-format msgid "============= initial domains =========== : %s" -msgstr "" +msgstr "============= 初始域 =========== : %s" #: nova/virt/baremetal/dom.py:99 msgid "Building domain: to be removed" -msgstr "" +msgstr "创建域：将被移除" #: nova/virt/baremetal/dom.py:103 msgid "Not running domain: remove" -msgstr "" +msgstr "没有运行的域：移除" #: nova/virt/baremetal/dom.py:111 msgid "domain running on an unknown node: discarded" -msgstr "" +msgstr "运行在位置结点的域：放弃" #: nova/virt/baremetal/dom.py:127 #, python-format msgid "No such domain (%s)" -msgstr "" +msgstr "没有这个域 (%s)" #: nova/virt/baremetal/dom.py:134 #, python-format msgid "Failed power down Bare-metal node %s" -msgstr "" +msgstr "裸机结点 %s 电源停止失败" #: nova/virt/baremetal/dom.py:143 msgid "deactivate -> activate fails" -msgstr "" +msgstr "deactivate -> activate失败" #: nova/virt/baremetal/dom.py:153 msgid "destroy_domain: no such domain" -msgstr "" +msgstr "destroy_domain：没有该域" #: nova/virt/baremetal/dom.py:154 #, python-format msgid "No such domain %s" -msgstr "" +msgstr "没有该域 %s" #: nova/virt/baremetal/dom.py:161 #, python-format msgid "Domains: %s" -msgstr "" +msgstr "域：%s" #: nova/virt/baremetal/dom.py:163 #, python-format msgid "Nodes: %s" -msgstr "" +msgstr "结点：%s" #: nova/virt/baremetal/dom.py:166 #, python-format msgid "After storing domains: %s" -msgstr "" +msgstr "储存域之后：%s" #: nova/virt/baremetal/dom.py:169 msgid "deactivation/removing domain failed" -msgstr "" +msgstr "域去活/移除失败" #: nova/virt/baremetal/dom.py:176 msgid "===== Domain is being created =====" -msgstr "" +msgstr "===== 域正在创建 =====" #: nova/virt/baremetal/dom.py:179 msgid "Same domain name already exists" -msgstr "" +msgstr "同样的域名已经存在" #: nova/virt/baremetal/dom.py:181 msgid "create_domain: before get_idle_node" -msgstr "" +msgstr "create_domain：在get_idle_node之前" #: nova/virt/baremetal/dom.py:198 #, python-format msgid "Created new domain: %s" -msgstr "" +msgstr "新域创建：%s" #: nova/virt/baremetal/dom.py:213 #, python-format msgid "Failed to boot Bare-metal node %s" -msgstr "" +msgstr "裸机结点 %s 启动失败" #: nova/virt/baremetal/dom.py:222 msgid "No such domain exists" -msgstr "" +msgstr "没有该域" #: nova/virt/baremetal/dom.py:226 #, python-format msgid "change_domain_state: to new state %s" -msgstr "" +msgstr "change_domain_state：新状态 %s" #: nova/virt/baremetal/dom.py:233 #, python-format msgid "Stored fake domains to the file: %s" -msgstr "" +msgstr "把伪域名存到文件中：%s" #: nova/virt/baremetal/dom.py:244 msgid "domain does not exist" -msgstr "" +msgstr "域不存在" #: ../bin/nova-manage.py:381 msgid "" @@ -4288,39 +4317,39 @@ #: nova/tests/test_nova_manage.py:178 msgid "id" -msgstr "" +msgstr "id" #: nova/tests/test_nova_manage.py:179 msgid "IPv4" -msgstr "" +msgstr "IPv4" #: nova/tests/test_nova_manage.py:180 msgid "IPv6" -msgstr "" +msgstr "IPv6" #: nova/tests/test_nova_manage.py:181 msgid "start address" -msgstr "" +msgstr "起始地址" #: nova/tests/test_nova_manage.py:182 msgid "DNS1" -msgstr "" +msgstr "DNS1" #: nova/tests/test_nova_manage.py:183 msgid "DNS2" -msgstr "" +msgstr "DNS2" #: nova/tests/test_nova_manage.py:184 msgid "VlanID" -msgstr "" +msgstr "VlanID" #: nova/tests/test_nova_manage.py:185 msgid "project" -msgstr "" +msgstr "项目" #: nova/tests/test_nova_manage.py:186 msgid "uuid" -msgstr "" +msgstr "uuid" #: ../bin/nova-manage.py:880 msgid "priority" @@ -4658,7 +4687,7 @@ #: nova/tests/integrated/test_login.py:31 #, python-format msgid "flavor: %s" -msgstr "" +msgstr "类型：%s" #: nova/api/openstack/compute/contrib/certificates.py:75 msgid "Only root certificate can be retrieved." @@ -4667,39 +4696,39 @@ #: nova/virt/disk/guestfs.py:39 #, python-format msgid "unsupported partition: %s" -msgstr "" +msgstr "不支持的分区：%s" #: nova/virt/disk/guestfs.py:77 msgid "unknown guestmount error" -msgstr "" +msgstr "未知的guestmount错误" #: nova/network/quantum/manager.py:152 msgid "QuantumManager does not use 'multi_host' parameter." -msgstr "" +msgstr "QuantumManager 没有使用 'multi_host' 参数。" #: nova/network/quantum/manager.py:156 msgid "QuantumManager requires that only one network is created per call" -msgstr "" +msgstr "QuantumManager 要求每次调用仅创建一个网落。" #: nova/network/quantum/manager.py:166 msgid "QuantumManager does not use 'vlan_start' parameter." -msgstr "" +msgstr "QuantumManager 没有使用 'vlan_start' 参数。" #: nova/network/quantum/manager.py:172 msgid "QuantumManager does not use 'vpn_start' parameter." -msgstr "" +msgstr "QuantumManager 没有使用 'vpn_start' 参数。" #: nova/network/quantum/manager.py:176 msgid "QuantumManager does not use 'bridge' parameter." -msgstr "" +msgstr "QuantumManager 没有使用 'bridge' 参数。" #: nova/network/quantum/manager.py:180 msgid "QuantumManager does not use 'bridge_interface' parameter." -msgstr "" +msgstr "QuantumManager 没有使用 'bridge_interface' 参数。" #: nova/network/quantum/manager.py:185 msgid "QuantumManager requires a valid (.1) gateway address." -msgstr "" +msgstr "QuantumManager 要求一个有效的 (.1) 网关地址。" #: nova/network/quantum/manager.py:197 #, python-format @@ -4707,35 +4736,36 @@ "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with " "net-id '%(quantum_net_id)s'" msgstr "" +"无法为租户 '%(q_tenant_id)s' 找到已存在的 net-id是 '%(quantum_net_id)s' 的quantum网络" #: nova/network/quantum/manager.py:243 #, python-format msgid "Network %s has active ports, cannot delete" -msgstr "" +msgstr "网络 %s 存在活跃的端口，无法删除" #: nova/network/quantum/manager.py:289 #, python-format msgid "network allocations for instance %s" -msgstr "" +msgstr "实例 %s 的网络分配" #: nova/network/quantum/manager.py:537 #, python-format msgid "" "port deallocation failed for instance: |%(instance_id)s|, port_id: " "|%(port_id)s|" -msgstr "" +msgstr "实例的端口取消分配失败：|%(instance_id)s|, port_id: |%(port_id)s|" #: nova/network/quantum/manager.py:556 #, python-format msgid "" "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: " "|%(vif_uuid)s|" -msgstr "" +msgstr "实例的ipam取消分配失败：|%(instance_id)s|, vif_uuid: |%(vif_uuid)s|" #: nova/wsgi.py:93 #, python-format msgid "Started %(name)s on %(host)s:%(port)s" -msgstr "在 %(host)s:%(port)s 启动%(name)s" +msgstr "启动%(name)s 位置在 %(host)s:%(port)s" #: nova/wsgi.py:104 msgid "Stopping WSGI server." @@ -4748,7 +4778,7 @@ #: 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" +msgstr "正在启动TCP服务器 %(arg0)s 位置在%(host)s:%(port)s" #: nova/wsgi.py:129 msgid "WSGI server has stopped." @@ -4761,7 +4791,7 @@ #: nova/notifier/list_notifier.py:65 #, python-format msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s." -msgstr "" +msgstr "Problem '%(e)s' 试图发送到通知驱动 %(driver)s。" #: ../bin/nova-dhcpbridge.py:54 msgid "leasing ip" @@ -4789,46 +4819,46 @@ msgid "" "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying again " "in %(fl_intv)d seconds." -msgstr "" +msgstr "%(fl_host)s:%(fl_port)d上的AMQP服务器不可达：%(e)s。 %(fl_intv)d 秒钟后再尝试。" #: nova/rpc/impl_carrot.py:202 #, python-format msgid "" "Unable to connect to AMQP server after %(tries)d tries. Shutting down." -msgstr "" +msgstr "%(tries)d 次尝试后依然无法连接到AMQP服务器。正在关闭。" #: nova/rpc/impl_carrot.py:222 msgid "Reconnected to queue" -msgstr "重新与队列建立连接" +msgstr "重新连接队列" #: nova/rpc/impl_carrot.py:229 #, python-format msgid "Failed to fetch message from queue: %s" -msgstr "" +msgstr "从队列获取消息失败：%s" #: nova/rpc/impl_carrot.py:237 #, python-format msgid "Initing the Adapter Consumer for %s" -msgstr "" +msgstr "为%s初始化适配器消费者(Adapter Consumer)" #: nova/rpc/impl_carrot.py:336 #, python-format msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key" -msgstr "" +msgstr "\"%(exchange)s\" fanout exchange用路由密钥 \"%(key)s\" 创建的" #: nova/rpc/impl_carrot.py:381 msgid "Exception while processing consumer" -msgstr "" +msgstr "处理消费者出现异常" #: nova/rpc/impl_carrot.py:418 #, python-format msgid "Creating \"%(exchange)s\" fanout exchange" -msgstr "" +msgstr "正在创建 \"%(exchange)s\" fanout exchange" #: nova/rpc/impl_carrot.py:645 #, python-format msgid "response %s" -msgstr "回复 %s" +msgstr "响应 %s" #: nova/rpc/impl_carrot.py:654 #, python-format @@ -4843,98 +4873,98 @@ #: nova/auth/manager.py:297 #, python-format msgid "Looking up user: %r" -msgstr "" +msgstr "查找用户：%r" #: nova/auth/manager.py:301 #, python-format msgid "Failed authorization for access key %s" -msgstr "" +msgstr "访问密钥 %s 授权失败" #: nova/auth/manager.py:307 #, python-format msgid "Using project name = user name (%s)" -msgstr "" +msgstr "使用用户名称来作为项目名称 (%s)" #: nova/auth/manager.py:314 #, python-format msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)" -msgstr "" +msgstr "授权失败：没有此项目名称 %(pjid)s (user=%(uname)s)" #: nova/auth/manager.py:323 #, python-format msgid "" "Failed authorization: user %(uname)s not admin and not member of project " "%(pjname)s" -msgstr "" +msgstr "授权失败：用户 %(uname)s 不是管理员，也不是项目 %(pjname)s 的成员" #: nova/auth/manager.py:330 nova/auth/manager.py:342 #, python-format msgid "user.secret: %s" -msgstr "" +msgstr "user.secret: %s" #: nova/auth/manager.py:331 nova/auth/manager.py:343 #, python-format msgid "expected_signature: %s" -msgstr "" +msgstr "expected_signature: %s" #: nova/auth/manager.py:332 nova/auth/manager.py:344 #, python-format msgid "signature: %s" -msgstr "" +msgstr "签名: %s" #: nova/auth/manager.py:334 nova/auth/manager.py:356 #, python-format msgid "Invalid signature for user %s" -msgstr "" +msgstr "用户 %s 的签名无效" #: nova/auth/manager.py:352 #, python-format msgid "host_only_signature: %s" -msgstr "" +msgstr "host_only_signature: %s" #: nova/auth/manager.py:448 msgid "Must specify project" -msgstr "" +msgstr "必须指定项目" #: nova/auth/manager.py:489 #, python-format msgid "Adding role %(role)s to user %(uid)s in project %(pid)s" -msgstr "" +msgstr "为用户 %(uid)s 添加角色 %(role)s 用户位置在%(pid)s 项目里" #: nova/auth/manager.py:492 #, python-format msgid "Adding sitewide role %(role)s to user %(uid)s" -msgstr "" +msgstr "添加全局角色 %(role)s 给用户 %(uid)s" #: nova/auth/manager.py:518 #, python-format msgid "Removing role %(role)s from user %(uid)s on project %(pid)s" -msgstr "" +msgstr "移除用户 %(uid)s 的角色 %(role)s 用户位置是在项目 %(pid)s 里" #: nova/auth/manager.py:521 #, python-format msgid "Removing sitewide role %(role)s from user %(uid)s" -msgstr "" +msgstr "移除全局角色 %(role)s 对象是用户 %(uid)s" #: nova/auth/manager.py:594 #, python-format msgid "Created project %(name)s with manager %(manager_user)s" -msgstr "" +msgstr "创建项目 %(name)s 通过管理员 %(manager_user)s" #: nova/auth/manager.py:612 #, python-format msgid "modifying project %s" -msgstr "" +msgstr "正在修改项目 %s" #: nova/auth/manager.py:624 #, python-format msgid "Adding user %(uid)s to project %(pid)s" -msgstr "" +msgstr "添加用户 %(uid)s 到项目%(pid)s" #: nova/auth/manager.py:645 #, python-format msgid "Remove user %(uid)s from project %(pid)s" -msgstr "" +msgstr "移除用户 %(uid)s 于项目 %(pid)s 中" #: nova/auth/manager.py:675 #, python-format @@ -4944,7 +4974,7 @@ #: nova/auth/manager.py:733 #, python-format msgid "Created user %(rvname)s (admin: %(rvadmin)r)" -msgstr "" +msgstr "已创建用户 %(rvname)s (admin: %(rvadmin)r)" #: nova/auth/manager.py:742 #, python-format @@ -4954,17 +4984,17 @@ #: nova/auth/manager.py:752 #, python-format msgid "Access Key change for user %s" -msgstr "" +msgstr "修改用户 %s 的访问密钥" #: nova/auth/manager.py:754 #, python-format msgid "Secret Key change for user %s" -msgstr "" +msgstr "修改用户 %s 的私钥" #: nova/auth/manager.py:756 #, python-format msgid "Admin status set to %(admin)r for user %(uid)s" -msgstr "" +msgstr "将管理员状态设置为 %(admin)r 目的是针对用户 %(uid)s" #: nova/auth/manager.py:801 #, python-format @@ -4974,100 +5004,100 @@ #: nova/rpc/impl_qpid.py:335 #, python-format msgid "Unable to connect to AMQP server: %s " -msgstr "" +msgstr "无法连接到AMQP服务器：%s " #: nova/rpc/impl_qpid.py:340 #, python-format msgid "Connected to AMQP server on %s" -msgstr "" +msgstr "连接到 %s 的AMQP服务器" #: nova/rpc/impl_qpid.py:348 msgid "Re-established AMQP queues" -msgstr "" +msgstr "重建AMQP队列" #: nova/api/openstack/compute/servers.py:425 #, python-format msgid "Invalid server status: %(status)s" -msgstr "" +msgstr "无效的服务器状态：%(status)s" #: nova/api/openstack/compute/servers.py:433 msgid "Invalid changes-since value" -msgstr "" +msgstr "无效的changes-since值" #: nova/api/openstack/compute/servers.py:483 msgid "Personality file limit exceeded" -msgstr "" +msgstr "超过个性化文件限制" #: nova/api/openstack/compute/servers.py:485 msgid "Personality file path too long" -msgstr "" +msgstr "个性化文件路径太长" #: nova/api/openstack/compute/servers.py:487 msgid "Personality file content too long" -msgstr "" +msgstr "个性化文件内容太长" #: nova/api/openstack/compute/servers.py:500 msgid "Server name is not a string or unicode" -msgstr "" +msgstr "服务器名称不是字符串或者unicode" #: nova/api/openstack/compute/servers.py:504 msgid "Server name is an empty string" -msgstr "" +msgstr "服务器名称是空串" #: nova/api/openstack/compute/servers.py:522 #, python-format msgid "Bad personality format: missing %s" -msgstr "" +msgstr "错误的个性化格式：丢失 %s" #: nova/api/openstack/compute/servers.py:525 msgid "Bad personality format" -msgstr "" +msgstr "损坏的个性化格式" #: nova/api/openstack/compute/servers.py:530 #, python-format msgid "Personality content for %s cannot be decoded" -msgstr "" +msgstr "个性化 %s 的内容无法解码" #: nova/api/openstack/compute/servers.py:545 #, python-format msgid "Bad networks format: network uuid is not in proper format (%s)" -msgstr "" +msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)" #: nova/api/openstack/compute/servers.py:554 #, python-format msgid "Invalid fixed IP address (%s)" -msgstr "" +msgstr "不正确的固定 IP 地址(%s)" #: nova/api/openstack/compute/servers.py:561 #, python-format msgid "Duplicate networks (%s) are not allowed" -msgstr "" +msgstr "不允许重复的网络(%s)" #: nova/api/openstack/compute/servers.py:567 #, python-format msgid "Bad network format: missing %s" -msgstr "" +msgstr "错误的网络格式：丢失%s" #: nova/api/openstack/compute/servers.py:570 msgid "Bad networks format" -msgstr "" +msgstr "错误的网络格式" #: nova/api/openstack/compute/servers.py:582 msgid "Userdata content cannot be decoded" -msgstr "" +msgstr "Userdata 内容无法解码" #: nova/api/openstack/compute/servers.py:589 #: nova/api/openstack/compute/servers.py:596 msgid "accessIPv4 is not proper IPv4 format" -msgstr "" +msgstr "accessIPv4 不是正确的IPv4格式" #: nova/api/openstack/compute/servers.py:628 msgid "Server name is not defined" -msgstr "" +msgstr "服务器名称未定义" #: nova/api/openstack/compute/servers.py:642 msgid "Invalid imageRef provided." -msgstr "" +msgstr "提供了无效的imageRef。" #: nova/api/openstack/compute/servers.py:677 #: nova/api/openstack/compute/servers.py:742 @@ -5085,7 +5115,7 @@ #: nova/api/openstack/compute/servers.py:832 #: nova/api/openstack/compute/servers.py:852 msgid "Instance has not been resized." -msgstr "" +msgstr "实例还没有调整大小。" #: nova/api/openstack/compute/servers.py:838 #, python-format @@ -5112,7 +5142,7 @@ #: nova/api/openstack/compute/servers.py:900 msgid "Unable to locate requested flavor." -msgstr "无法找到请求的风格。" +msgstr "无法找到请求的类型。" #: nova/api/openstack/compute/servers.py:903 msgid "Resize requires a change in size." @@ -5120,7 +5150,7 @@ #: nova/api/openstack/compute/servers.py:927 msgid "Malformed server entity" -msgstr "非正常的服务器实体" +msgstr "错误格式的服务器实体" #: nova/api/openstack/compute/servers.py:934 msgid "Missing imageRef attribute" @@ -5175,7 +5205,7 @@ #: nova/testing/fake/rabbit.py:50 #, python-format msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s" -msgstr "" +msgstr "(%(nm)s) 发布 (键：%(routing_key)s) %(message)s" #: nova/testing/fake/rabbit.py:54 #, python-format @@ -5195,30 +5225,30 @@ #: nova/testing/fake/rabbit.py:96 #, python-format msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s" -msgstr "" +msgstr "把队列 %(queue)s 绑定到 %(exchange)s 采用的键是 %(routing_key)s" #: nova/testing/fake/rabbit.py:133 #, python-format msgid "Getting from %(queue)s: %(message)s" -msgstr "" +msgstr "从队列 %(queue)s 取消息：%(message)s" #: nova/tests/test_vsa.py:57 msgid "Test: Emulate wrong VSA name. Raise" -msgstr "" +msgstr "测试：模拟错误的 VSA 名称。抛出异常" #: nova/tests/test_vsa.py:99 msgid "Test: Emulate DB error. Raise" -msgstr "" +msgstr "测试：模拟数据测试。抛出" #: nova/tests/test_vsa.py:167 #, python-format msgid "Test: user_data = %s" -msgstr "" +msgstr "测试：user_data = %s" #: nova/virt/baremetal/nodes.py:42 #, python-format msgid "Unknown baremetal driver %(d)s" -msgstr "" +msgstr "位置的纯硬件驱动 %(d)s" #: nova/api/openstack/compute/contrib/extended_status.py:61 msgid "Server not found." @@ -5241,7 +5271,7 @@ "命令：%(cmd)s\n" "退出代码：%(exit_code)s\n" "标准输出：%(stdout)r\n" -"标准错误：%(stderr)r" +"标准错误输出：%(stderr)r" #: nova/exception.py:92 msgid "DB exception wrapped." @@ -5257,7 +5287,7 @@ #: nova/exception.py:180 msgid "Failed to paginate through images from image service" -msgstr "" +msgstr "无法在镜像服务中翻页" #: nova/exception.py:184 msgid "Virtual Interface creation failed" @@ -5290,7 +5320,7 @@ #: nova/exception.py:214 msgid "Unacceptable parameters." -msgstr "不能接受的参数。" +msgstr "无法接受的参数。" #: nova/exception.py:219 msgid "Invalid snapshot" @@ -5299,11 +5329,11 @@ #: nova/exception.py:223 #, python-format msgid "Volume %(volume_id)s is not attached to anything" -msgstr "卷 %(volume_id)s 没有与任何东西关联" +msgstr "卷 %(volume_id)s 没有附加任何东西" #: nova/exception.py:227 nova/api/openstack/compute/contrib/keypairs.py:103 msgid "Keypair data is invalid" -msgstr "Keypair数据无效" +msgstr "密钥对数据无效" #: nova/exception.py:231 msgid "Failed to load data into json format" @@ -5316,7 +5346,7 @@ #: nova/exception.py:239 #, python-format msgid "Invalid signature %(signature)s for user %(user)s." -msgstr "针对用户 %(user)s 的无效签名 %(signature)s" +msgstr "无效签名 %(signature)s 针对用户是 %(user)s" #: nova/exception.py:243 msgid "Invalid input received" @@ -5369,15 +5399,15 @@ msgid "" "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason: " "%(reason)s." -msgstr "" -"无法在aggregate %(aggregate_id)s 上执行啊action '%(action)s'。原因： %(reason)s。" +msgstr "无法执行action '%(action)s' 于聚合 %(aggregate_id)s 上。原因： %(reason)s。" #: 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 "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能 %(method)s。" +msgstr "" +"实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能执行 %(method)s。" #: nova/exception.py:295 #, python-format @@ -5392,7 +5422,7 @@ #: nova/exception.py:303 #, python-format msgid "Instance %(instance_id)s is not in rescue mode" -msgstr "实例 %(instance_id)s 不在rescue模式。" +msgstr "实例 %(instance_id)s 不在救援模式。" #: nova/exception.py:307 msgid "Failed to suspend instance" @@ -5400,7 +5430,7 @@ #: nova/exception.py:311 msgid "Failed to resume server" -msgstr "再启动服务器失败" +msgstr "服务器恢复失败" #: nova/exception.py:315 msgid "Failed to reboot instance" @@ -5434,12 +5464,12 @@ #: nova/exception.py:344 msgid "The supplied hypervisor type of is invalid." -msgstr "提供的hypervisor类型无效。" +msgstr "提供的虚拟机管理程序类型无效。" #: nova/exception.py:348 msgid "" "The instance requires a newer hypervisor version than has been provided." -msgstr "该实例需要比当前更新版本的hypervisor。" +msgstr "该实例需要比当前版本更新的虚拟机管理程序。" #: nova/exception.py:353 #, python-format @@ -5506,7 +5536,7 @@ #: nova/exception.py:404 #, python-format msgid "Required flag %(flag)s not set." -msgstr "要求的flag %(flag)s 没有设置。" +msgstr "要求的标记 %(flag)s 没有设置。" #: nova/exception.py:408 #, python-format @@ -5521,7 +5551,7 @@ #: 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" +msgstr "无法找到帐户 %(account_name) on Solidfire 设备" #: nova/exception.py:420 #, python-format @@ -5531,7 +5561,7 @@ #: nova/exception.py:424 #, python-format msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s." -msgstr "卷 %(volume_id)s 针对键 %(metadata_key)s 没有元数据。" +msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。" #: nova/exception.py:429 msgid "Zero volume types found." @@ -5552,7 +5582,7 @@ msgid "" "Volume Type %(volume_type_id)s has no extra specs with key " "%(extra_specs_key)s." -msgstr "" +msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。" #: nova/exception.py:447 #, python-format @@ -5577,7 +5607,7 @@ #: nova/exception.py:463 #, python-format msgid "Could not find a handler for %(driver_type)s volume." -msgstr "无法为 %(driver_type)s 卷找到handler。" +msgstr "无法为 %(driver_type)s 卷找到句柄。" #: nova/exception.py:467 #, python-format @@ -5620,7 +5650,7 @@ #: nova/exception.py:500 msgid "Cannot find SR to read/write VDI." -msgstr "没有找到SR来读写VDI。" +msgstr "没有找到存储库来读写VDI。" #: nova/exception.py:504 #, python-format @@ -5670,7 +5700,7 @@ #: nova/exception.py:541 msgid "Could not find the datastore reference(s) which the VM uses." -msgstr "无法找到虚拟机使用的datastore reference(s)。" +msgstr "无法找到虚拟机使用的数据存储引用。" #: nova/exception.py:545 #, python-format @@ -5706,7 +5736,7 @@ #, python-format msgid "" "Fixed IP address (%(address)s) does not exist in network (%(network_uuid)s)." -msgstr "网络 (%(network_uuid)s) 中不存在固定IP地址 (%(address)s)。" +msgstr "固定IP地址 (%(address)s) 在网络 (%(network_uuid)s) 中不存在。" #: nova/exception.py:575 #, python-format @@ -5772,7 +5802,7 @@ #: nova/exception.py:627 #, python-format msgid "Keypair %(name)s not found for user %(user_id)s" -msgstr "没有为用户 %(user_id)s 找到Keypair %(name)s。" +msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。" #: nova/exception.py:631 #, python-format @@ -5797,26 +5827,26 @@ #: nova/exception.py:647 #, python-format msgid "Could not find binary %(binary)s on host %(host)s." -msgstr "没有在主机 %(host)s 找到二进制 %(binary)s。" +msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。" #: nova/exception.py:651 #, python-format msgid "Auth token %(token)s could not be found." -msgstr "验证令牌 %(token)s 没有找到。" +msgstr "认证令牌 %(token)s 没有找到。" #: nova/exception.py:655 #, python-format msgid "Access Key %(access_key)s could not be found." -msgstr "Access Key %(access_key)s 没有找到。" +msgstr "访问密钥 %(access_key)s 没有找到。" #: nova/exception.py:659 msgid "Quota could not be found" -msgstr "Quota 没有找到。" +msgstr "配额没有找到。" #: nova/exception.py:663 #, python-format msgid "Quota for project %(project_id)s could not be found." -msgstr "没有为项目 %(project_id)s 找到Quota。" +msgstr "没有为项目 %(project_id)s 找到配额。" #: nova/exception.py:667 #, python-format @@ -5827,7 +5857,7 @@ #, python-format msgid "" "Security group %(security_group_id)s not found for project %(project_id)s." -msgstr "没有为项目 %(project_id)s 找到 安全组 %(security_group_id)s。" +msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。" #: nova/exception.py:676 #, python-format @@ -5857,12 +5887,12 @@ #, python-format msgid "" "Migration not found for instance %(instance_id)s with status %(status)s." -msgstr "没有为状态是 %(status)s 的实例 %(instance_id)s 找到迁移。" +msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。" #: nova/exception.py:699 #, python-format msgid "Console pool %(pool_id)s could not be found." -msgstr "Console pool %(pool_id)s 没有找到。" +msgstr "控制台池 %(pool_id)s 没有找到。" #: nova/exception.py:703 #, python-format @@ -5870,29 +5900,28 @@ "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。" +"没有找到类型是 %(console_type)s 的控制台池针对计算主机 %(compute_host)s 在代理主机 %(host)s 上。" #: nova/exception.py:709 #, python-format msgid "Console %(console_id)s could not be found." -msgstr "Console %(console_id)s 没有找到。" +msgstr "控制台%(console_id)s 没有找到。" #: nova/exception.py:713 #, python-format msgid "Console for instance %(instance_id)s could not be found." -msgstr "没有为实例 %(instance_id)s 找到Console。" +msgstr "没有为实例 %(instance_id)s 找到控制台。" #: nova/exception.py:717 #, python-format msgid "" "Console for instance %(instance_id)s in pool %(pool_id)s could not be found." -msgstr "没有为池 %(pool_id)s 中的实例 %(instance_id)s 找到console." +msgstr "没有为实例 %(instance_id)s 在池 %(pool_id)s 中找到控制台。" #: nova/exception.py:722 #, python-format msgid "Invalid console type %(console_type)s " -msgstr "无效的console类型 %(console_type)s " +msgstr "无效的控制台类型 %(console_type)s " #: nova/exception.py:726 msgid "Zero instance types found." @@ -5911,7 +5940,7 @@ #: nova/exception.py:739 #, python-format msgid "Flavor %(flavor_id)s could not be found." -msgstr "风格 %(flavor_id)s没有找到。" +msgstr "类型 %(flavor_id)s 没有找到。" #: nova/exception.py:743 #, python-format @@ -5921,17 +5950,17 @@ #: nova/exception.py:747 #, python-format msgid "Scheduler Host Filter %(filter_name)s could not be found." -msgstr "Scheduler Host Filter %(filter_name)s 没有找到。" +msgstr "调度器主机过滤器 %(filter_name)s 没有找到。" #: nova/exception.py:751 #, python-format msgid "Scheduler cost function %(cost_fn_str)s could not be found." -msgstr "Scheduler cost function %(cost_fn_str)s 没有找到。" +msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。" #: nova/exception.py:756 #, python-format msgid "Scheduler weight flag not found: %(flag_name)s" -msgstr "未找到Scheduler的权重标记：%(flag_name)s" +msgstr "未找到调度器的权重标记：%(flag_name)s" #: nova/exception.py:760 #, python-format @@ -6054,16 +6083,16 @@ #: nova/exception.py:865 #, python-format msgid "%(path)s is on shared storage: %(reason)s" -msgstr "" +msgstr "%(path)s 在共享存储上：%(reason)s" #: nova/exception.py:869 msgid "Migration error" -msgstr "升级错误。" +msgstr "迁移错误" #: nova/exception.py:873 #, python-format msgid "Malformed message body: %(reason)s" -msgstr "格式错误的消息体： %(reason)s" +msgstr "错误格式的消息体： %(reason)s" #: nova/exception.py:877 #, python-format @@ -6130,37 +6159,37 @@ #: nova/exception.py:933 msgid "Quota exceeded" -msgstr "配额超出" +msgstr "超出配额" #: nova/exception.py:937 #, python-format msgid "Aggregate %(aggregate_id)s could not be found." -msgstr "找不到 Aggregate %(aggregate_id)s。" +msgstr "找不到聚合 %(aggregate_id)s。" #: nova/exception.py:941 #, python-format msgid "Aggregate %(aggregate_name)s already exists." -msgstr "Aggregate %(aggregate_name)s 已经存在。" +msgstr "聚合 %(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。" +msgstr "聚合 %(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 的元数据。" +msgstr "聚合 %(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的成员。" +msgstr "主机 %(host)s 已经是另外一个聚合的成员。" #: nova/exception.py:958 #, python-format msgid "Aggregate %(aggregate_id)s already has host %(host)s." -msgstr "Aggregate %(aggregate_id)s已经有主机 %(host)s。" +msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。" #: nova/exception.py:962 msgid "Detected more than one volume with name %(vol_name)" @@ -6202,70 +6231,70 @@ #: 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 "" +msgstr "调用get_project_and_global_net_ids时 project_id必须是非空。" #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65 msgid "create arguments must be positive integers" -msgstr "" +msgstr "创建参数必须是正整数" #: nova/compute/instance_types.py:74 nova/volume/volume_types.py:41 #, python-format msgid "DB error: %s" -msgstr "" +msgstr "数据库错误：%s" #: nova/compute/instance_types.py:84 #, python-format msgid "Instance type %s not found for deletion" -msgstr "" +msgstr "未找到要删除的实例类型 %s" #: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:39 msgid "priority column not added to networks table" -msgstr "" +msgstr "priority列没有加入到 networks 表中" #: nova/virt/libvirt/imagecache.py:149 #, python-format msgid "Instance %(instance)s is backed by %(backing)s" -msgstr "" +msgstr "实例 %(instance)s 由文件 %(backing)s 来备份" #: nova/virt/libvirt/imagecache.py:160 #, python-format msgid "" "Instance %(instance)s is using a backing file %(backing)s which does not " "appear in the image service" -msgstr "" +msgstr "实例 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜像服务里。" #: nova/virt/libvirt/imagecache.py:211 #, python-format msgid "" "%(container_format)s-%(id)s (%(base_file)s): image verification failed" -msgstr "" +msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证失败" #: nova/virt/libvirt/imagecache.py:223 #, python-format msgid "" "%(container_format)s-%(id)s (%(base_file)s): image verification skipped, no " "hash stored" -msgstr "" +msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证跳过，没有散列存储" #: nova/virt/libvirt/imagecache.py:243 #, python-format msgid "Base file too young to remove: %s" -msgstr "" +msgstr "基文件太新不需要删除：%s" #: nova/virt/libvirt/imagecache.py:246 #, python-format msgid "Removing base file: %s" -msgstr "" +msgstr "正在删除基文件：%s" #: nova/virt/libvirt/imagecache.py:253 #, python-format msgid "Failed to remove %(base_file)s, error was %(error)s" -msgstr "" +msgstr "删除 %(base_file)s 失败，错误是 %(error)s" #: nova/virt/libvirt/imagecache.py:265 #, python-format msgid "%(container_format)s-%(id)s (%(base_file)s): checking" -msgstr "" +msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中" #: nova/virt/libvirt/imagecache.py:278 #, python-format @@ -6273,6 +6302,8 @@ "%(container_format)s-%(id)s (%(base_file)s): in use: on this node %(local)d " "local, %(remote)d on other nodes" msgstr "" +"%(container_format)s-%(id)s (%(base_file)s)：正在使用中：本地节点 %(local)d, 远程节点 " +"%(remote)d" #: nova/virt/libvirt/imagecache.py:291 #, python-format @@ -6280,6 +6311,8 @@ "%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base file " "is in use! instances: %(instance_list)s" msgstr "" +"%(container_format)s-%(id)s (%(base_file)s)：警告 -- 使用中缺少基文件! 实例： " +"%(instance_list)s" #: nova/virt/libvirt/imagecache.py:302 #, python-format @@ -6287,88 +6320,89 @@ "%(container_format)s-%(id)s (%(base_file)s): in: on other nodes (%(remote)d " "on other nodes)" msgstr "" +"%(container_format)s-%(id)s (%(base_file)s)：在使用中： 在远程节点 (%(remote)d 上" #: nova/virt/libvirt/imagecache.py:314 #, python-format msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use" -msgstr "" +msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像不在使用中" #: nova/virt/libvirt/imagecache.py:322 #, python-format msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use" -msgstr "" +msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像在使用中" #: nova/virt/libvirt/imagecache.py:351 #, python-format msgid "Skipping verification, no base directory at %s" -msgstr "" +msgstr "跳过验证，在 %s 上没有基础目录" #: nova/virt/libvirt/imagecache.py:355 msgid "Verify base images" -msgstr "" +msgstr "验证基础镜像" #: nova/virt/libvirt/imagecache.py:383 #, python-format msgid "Unknown base file: %s" -msgstr "" +msgstr "未知的基文件：%s" #: nova/virt/libvirt/imagecache.py:388 #, python-format msgid "Active base files: %s" -msgstr "" +msgstr "激活基文件：%s" #: nova/virt/libvirt/imagecache.py:391 #, python-format msgid "Corrupt base files: %s" -msgstr "" +msgstr "损坏的基文件：%s" #: nova/virt/libvirt/imagecache.py:395 #, python-format msgid "Removable base files: %s" -msgstr "" +msgstr "可删除的基文件：%s" #: nova/virt/libvirt/imagecache.py:403 msgid "Verification complete" -msgstr "" +msgstr "确认完成" #: nova/scheduler/distributed_scheduler.py:50 #, python-format msgid "No host selection for %s defined." -msgstr "" +msgstr "没有主机选择所定义的 %s 主题消息" #: nova/scheduler/distributed_scheduler.py:63 #, python-format msgid "Attempting to build %(num_instances)d instance(s)" -msgstr "" +msgstr "尝试创建 %(num_instances)d 个实例" #: nova/scheduler/distributed_scheduler.py:140 msgid "Scheduler only understands Compute nodes (for now)" -msgstr "" +msgstr "调度器只能理解计算节点（暂时）" #: nova/scheduler/distributed_scheduler.py:178 #, python-format msgid "Filtered %(hosts)s" -msgstr "" +msgstr "过滤掉的主机 %(hosts)s" #: nova/scheduler/distributed_scheduler.py:188 #, python-format msgid "Weighted %(weighted_host)s" -msgstr "" +msgstr "加权的主机 %(weighted_host)s" #: nova/volume/manager.py:96 #, python-format msgid "Re-exporting %s volumes" -msgstr "重新输出卷%s" +msgstr "重新导出卷%s" #: nova/volume/manager.py:101 #, python-format msgid "volume %s: skipping export" -msgstr "跳过卷：%s" +msgstr "卷 %s：跳过导出" #: nova/volume/manager.py:107 #, python-format msgid "volume %s: creating" -msgstr "儲存量 %s: 在创造" +msgstr "卷 %s: 创建中" #: nova/volume/manager.py:119 #, python-format @@ -6378,7 +6412,7 @@ #: nova/volume/manager.py:131 #, python-format msgid "volume %s: creating export" -msgstr "卷%s：正在创建" +msgstr "卷%s：正在创建导出" #: nova/volume/manager.py:145 #, python-format @@ -6387,7 +6421,7 @@ #: nova/volume/manager.py:174 msgid "Volume is still attached" -msgstr "卷仍在挂载中" +msgstr "卷仍在附加中" #: nova/volume/manager.py:176 msgid "Volume is not local to this node" @@ -6396,7 +6430,7 @@ #: nova/volume/manager.py:180 #, python-format msgid "volume %s: removing export" -msgstr "卷%s：移除中" +msgstr "卷%s：正在移除导出" #: nova/volume/manager.py:182 #, python-format @@ -6406,7 +6440,7 @@ #: nova/volume/manager.py:185 #, python-format msgid "volume %s: volume is busy" -msgstr "" +msgstr "卷 %s：卷繁忙" #: nova/volume/manager.py:197 #, python-format @@ -6416,54 +6450,54 @@ #: nova/volume/manager.py:204 #, python-format msgid "snapshot %s: creating" -msgstr "" +msgstr "快照 %s：正在创建" #: nova/volume/manager.py:208 #, python-format msgid "snapshot %(snap_name)s: creating" -msgstr "" +msgstr "快照 %(snap_name)s：正在创建" #: nova/volume/manager.py:223 #, python-format msgid "snapshot %s: created successfully" -msgstr "" +msgstr "快照 %s：创建成功" #: nova/volume/manager.py:232 #, python-format msgid "snapshot %s: deleting" -msgstr "" +msgstr "快照 %s：正在删除" #: nova/volume/manager.py:241 #, python-format msgid "snapshot %s: deleted successfully" -msgstr "" +msgstr "快照 %s：删除成功" #: nova/volume/manager.py:323 msgid "Checking volume capabilities" -msgstr "" +msgstr "检查卷能力" #: nova/volume/manager.py:327 #, python-format msgid "New capabilities found: %s" -msgstr "" +msgstr "找到新能力：%s" #: nova/volume/manager.py:338 msgid "Clear capabilities" -msgstr "" +msgstr "清理能力" #: nova/volume/manager.py:342 #, python-format msgid "Notification {%s} received" -msgstr "" +msgstr "收到通知 {%s}" #: nova/volume/api.py:74 nova/volume/api.py:210 msgid "status must be available" -msgstr "" +msgstr "状态必须可用" #: nova/volume/api.py:85 #, python-format msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume" -msgstr "" +msgstr "%(pid)s 的配额超出，尝试创建 %(size)sG 的卷" #: nova/volume/api.py:133 msgid "Volume status must be available" @@ -6473,19 +6507,19 @@ #: nova/volume/volume_types.py:64 #, python-format msgid "Searching by: %s" -msgstr "" +msgstr "搜索条件： %s" #: nova/volume/api.py:213 msgid "already attached" -msgstr "" +msgstr "已经附加" #: nova/volume/api.py:220 msgid "already detached" -msgstr "" +msgstr "已经分离" #: nova/volume/api.py:272 nova/volume/api.py:305 msgid "must be available" -msgstr "" +msgstr "必须可用" #: nova/tests/test_misc.py:114 #, python-format @@ -6493,143 +6527,145 @@ "The following migrations are missing a downgrade:\n" "\t%s" msgstr "" +"下面的迁移缺少了降级：\n" +"\t%s" #: nova/virt/libvirt/connection.py:244 #, python-format msgid "Connecting to libvirt: %s" -msgstr "" +msgstr "正在连接 libvirt：%s" #: nova/virt/libvirt/connection.py:258 msgid "Connection to libvirt broke" -msgstr "" +msgstr "连接 libvirt 失败" #: nova/virt/libvirt/connection.py:362 #, python-format msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s" -msgstr "" +msgstr "销毁时发生错误。Code=%(errcode)s Error=%(e)s" #: nova/virt/libvirt/connection.py:374 #, python-format msgid "" "Error from libvirt during saved instance removal. Code=%(errcode)s " "Error=%(e)s" -msgstr "" +msgstr "删除已保存的实例时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s" #: nova/virt/libvirt/connection.py:385 #, python-format msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s" -msgstr "" +msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s" #: nova/virt/libvirt/connection.py:399 msgid "Instance destroyed successfully." -msgstr "" +msgstr "实例销毁成功。" #: nova/virt/libvirt/connection.py:430 #, python-format msgid "Deleting instance files %(target)s" -msgstr "" +msgstr "删除实例文件 %(target)s" #: nova/virt/libvirt/connection.py:512 msgid "attaching LXC block device" -msgstr "" +msgstr "附加 LXC 块设备" #: nova/virt/libvirt/connection.py:525 msgid "detaching LXC block device" -msgstr "" +msgstr "分离LXC 块设备" #: nova/virt/libvirt/connection.py:676 nova/virt/libvirt/connection.py:820 msgid "During reboot, instance disappeared." -msgstr "" +msgstr "重启过程中，实例消失。" #: nova/virt/libvirt/connection.py:681 msgid "Instance rebooted successfully." -msgstr "" +msgstr "实例成功重启。" #: nova/virt/libvirt/connection.py:778 nova/virt/xenapi/vmops.py:1371 #, python-format msgid "" "Found %(migration_count)d unconfirmed migrations older than " "%(confirm_window)d seconds" -msgstr "" +msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移" #: nova/virt/libvirt/connection.py:782 nova/virt/xenapi/vmops.py:1375 #, python-format msgid "Automatically confirming migration %d" -msgstr "" +msgstr "正在自动确认迁移 %d" #: nova/virt/libvirt/connection.py:809 msgid "Instance is running" -msgstr "" +msgstr "实例在运行" #: nova/virt/libvirt/connection.py:825 msgid "Instance spawned successfully." -msgstr "" +msgstr "实例成功生产。" #: nova/virt/libvirt/connection.py:833 #, python-format msgid "virsh said: %r" -msgstr "" +msgstr "virsh 输出： %r" #: nova/virt/libvirt/connection.py:837 msgid "cool, it's a device" -msgstr "" +msgstr "很酷，这是个设备" #: nova/virt/libvirt/connection.py:848 #, python-format msgid "data: %(data)r, fpath: %(fpath)r" -msgstr "" +msgstr "data：%(data)r, fpath: %(fpath)r" #: nova/virt/libvirt/connection.py:875 msgid "Unable to read LXC console" -msgstr "" +msgstr "无法读取 LXC 控制台" #: nova/virt/libvirt/connection.py:992 msgid "Creating image" -msgstr "" +msgstr "正在创建镜像" #: nova/virt/libvirt/connection.py:1171 #, python-format msgid "Injecting %(injection)s into image %(img_id)s" -msgstr "" +msgstr "向镜像 %(img_id)s 注入 %(injection)s" #: nova/virt/libvirt/connection.py:1179 #, python-format msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)" -msgstr "" +msgstr "忽略向镜像 %(img_id)s (%(e)s) 错误注入的数据" #: nova/virt/libvirt/connection.py:1211 #, python-format msgid "block_device_list %s" -msgstr "" +msgstr "块设备列表 block_device_list %s" #: nova/virt/libvirt/connection.py:1336 msgid "Starting toXML method" -msgstr "" +msgstr "正在启动 toXML 方法" #: nova/virt/libvirt/connection.py:1340 msgid "Finished toXML method" -msgstr "" +msgstr "toXML方法完成" #: 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 "" +msgstr "查找 %(instance_name)s时libvirt出错：[错误代码 %(error_code)s] %(ex)s" #: nova/virt/libvirt/connection.py:1578 msgid "libvirt version is too old (does not support getVersion)" -msgstr "" +msgstr "libvirt版本过旧(不支持getVersion)" #: nova/virt/libvirt/connection.py:1600 #, python-format msgid "'' must be 1, but %d\n" -msgstr "" +msgstr "'' 必须为 1, 但是为 %d\n" #: nova/virt/libvirt/connection.py:1627 #, python-format msgid "topology (%(topology)s) must have %(ks)s" -msgstr "" +msgstr "拓扑 (%(topology)s) 必须含有 %(ks)s" #: nova/virt/libvirt/connection.py:1724 #, python-format @@ -6637,6 +6673,8 @@ "Instance launched has CPU info:\n" "%s" msgstr "" +"已启动实例的CPU信息：\n" +"%s" #: nova/virt/libvirt/connection.py:1727 #, python-format @@ -6644,6 +6682,8 @@ "to xml...\n" ":%s " msgstr "" +"转换成 xml...\n" +"：%s " #: nova/virt/libvirt/connection.py:1730 #, python-format @@ -6654,107 +6694,112 @@ "\n" "Refer to %(u)s" msgstr "" +"CPU 不兼容.\n" +"\n" +"%(ret)s\n" +"\n" +"参考 %(u)s" #: nova/virt/libvirt/connection.py:1787 #, python-format msgid "Timeout migrating for %s. nwfilter not found." -msgstr "" +msgstr "迁移 %s 超时" #: nova/virt/libvirt/connection.py:2007 #, python-format msgid "skipping %(path)s since it looks like volume" -msgstr "" +msgstr "因它像卷，所以跳过 %(path)s" #: nova/virt/libvirt/connection.py:2098 #, python-format msgid "Instance %s: Starting migrate_disk_and_power_off" -msgstr "" +msgstr "实例 %s：开始执行 migrate_disk_and_power_off" #: nova/virt/libvirt/connection.py:2153 #, python-format msgid "During wait running, %s disappeared." -msgstr "" +msgstr "%s 在运行中消失了。" #: nova/virt/libvirt/connection.py:2158 #, python-format msgid "Instance %s running successfully." -msgstr "" +msgstr "实例 %s 成功运行。" #: nova/virt/libvirt/connection.py:2165 #, python-format msgid "Instance %s: Starting finish_migration" -msgstr "" +msgstr "实例 %s：开始执行 finish_migration" #: nova/virt/libvirt/connection.py:2206 #, python-format msgid "Instance %s: Starting finish_revert_migration" -msgstr "" +msgstr "实例 %s：开始执行 finish_revert_migration" #: nova/api/openstack/compute/contrib/keypairs.py:85 msgid "Keypair name must be between 1 and 255 characters long" -msgstr "Keypair名称长度必须在1到255个字符之间" +msgstr "密钥对名称长度必须在1到255个字符之间" #: nova/api/openstack/compute/contrib/keypairs.py:90 #, python-format msgid "Key pair '%s' already exists." -msgstr "Keypair '%s' 已经存在。" +msgstr "密钥对 '%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 "" +msgstr "ESX SOAP 服务器在响应里为托管系统返回一个空的端口组" #: nova/virt/vmwareapi/network_utils.py:155 #, python-format msgid "Creating Port Group with name %s on the ESX host" -msgstr "" +msgstr "正在ESX主机上创建名称为 %s 的端口组" #: nova/virt/vmwareapi/network_utils.py:169 #, python-format msgid "Created Port Group with name %s on the ESX host" -msgstr "" +msgstr "已经在ESX主机上创建了名称为 %s 的端口组" #: nova/db/sqlalchemy/api.py:56 msgid "Use of empty request context is deprecated" -msgstr "" +msgstr "使用空的请求上下文是不推荐的" #: nova/db/sqlalchemy/api.py:188 #, python-format msgid "Unrecognized read_deleted value '%s'" -msgstr "" +msgstr "无法识别的 read_deleted 取值”%s“" #: nova/db/sqlalchemy/api.py:565 nova/db/sqlalchemy/api.py:600 #, python-format msgid "No ComputeNode for %(host)s" -msgstr "" +msgstr "主机 %(host)s 没有计算节点" #: nova/db/sqlalchemy/api.py:4124 nova/db/sqlalchemy/api.py:4150 #, python-format msgid "No backend config with id %(sm_backend_id)s" -msgstr "" +msgstr "没有id为%(sm_backend_id)s的后台配置" #: nova/db/sqlalchemy/api.py:4208 #, python-format msgid "No sm_flavor called %(sm_flavor)s" -msgstr "" +msgstr "没有 sm_flavor 调用 %(sm_flavor)s" #: nova/db/sqlalchemy/api.py:4252 #, python-format msgid "No sm_volume with id %(volume_id)s" -msgstr "" +msgstr "没有id为 %(volume_id)s 的 sm_volume" #: nova/volume/volume_types.py:49 nova/volume/volume_types.py:108 msgid "name cannot be None" -msgstr "" +msgstr "name不能是None" #: nova/volume/volume_types.py:96 msgid "id cannot be None" -msgstr "" +msgstr "id不能是None" #: nova/network/quantum/nova_ipam_lib.py:75 msgid "Error creating network entry" -msgstr "" +msgstr "创建网络入口的错误" #: ../nova/network/quantum/nova_ipam_lib.py:88 #, python-format @@ -6764,7 +6809,7 @@ #: nova/network/quantum/nova_ipam_lib.py:90 #, python-format msgid "No network with net_id = %s" -msgstr "" +msgstr "没有net_id = %s的网络" #: ../nova/network/quantum/nova_ipam_lib.py:230 #, python-format @@ -6782,72 +6827,72 @@ #: nova/api/openstack/compute/server_metadata.py:124 #: nova/api/openstack/compute/server_metadata.py:163 msgid "Server does not exist" -msgstr "" +msgstr "服务器不存在" #: nova/api/openstack/compute/server_metadata.py:143 #: nova/api/openstack/compute/server_metadata.py:156 msgid "Metadata item was not found" -msgstr "" +msgstr "元数据项目未找到" #: nova/scheduler/filters/core_filter.py:45 msgid "VCPUs not set; assuming CPU collection broken" -msgstr "" +msgstr "未设置 VCPUs；假设 CPU 集合损坏了" #: nova/virt/vmwareapi/read_write_util.py:150 #, python-format msgid "" "Exception during HTTP connection close in VMWareHTTpWrite. Exception is %s" -msgstr "" +msgstr "HTTP连接关闭时发生异常 VMWareHTTpWrite. Exception：%s" #: nova/tests/test_volume.py:195 #, python-format msgid "Target %s allocated" -msgstr "" +msgstr "目标 %s 已经分配" #: nova/tests/test_volume.py:383 #, python-format msgid "Cannot confirm exported volume id:%s." -msgstr "" +msgstr "无法确认导出的卷 id：%s。" #: nova/scheduler/driver.py:63 #, python-format msgid "Casted '%(method)s' to volume '%(host)s'" -msgstr "" +msgstr "把“%(method)s”投放在卷%(host)s\"" #: nova/scheduler/driver.py:80 #, python-format msgid "Casted '%(method)s' to compute '%(host)s'" -msgstr "" +msgstr "把“%(method)s”投放在主机 \"%(host)s\"" #: nova/scheduler/driver.py:89 #, python-format msgid "Casted '%(method)s' to network '%(host)s'" -msgstr "" +msgstr "把“%(method)s”投放在网络 \"%(host)s\"" #: nova/scheduler/driver.py:107 #, python-format msgid "Casted '%(method)s' to %(topic)s '%(host)s'" -msgstr "" +msgstr "把“%(method)s”投放在 %(topic)s \"%(host)s\"" #: nova/scheduler/driver.py:181 msgid "Must implement a fallback schedule" -msgstr "" +msgstr "必须实现一个回滚 schedule" #: nova/scheduler/driver.py:314 msgid "Block migration can not be used with shared storage." -msgstr "" +msgstr "块存储迁移无法在共享存储使用" #: 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 "" +msgstr "无法确认tmpfile %(ipath)s 在相同的共享存储的 %(src)s 和 %(dest)s之间。" #: 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 "" +msgstr "主机 %(dest)s 和原先的主机 %(src)s 不兼容。" #: nova/scheduler/driver.py:409 #, python-format @@ -6855,6 +6900,7 @@ "Unable to migrate %(instance_id)s to %(dest)s: Lack of memory(host:%(avail)s " "<= instance:%(mem_inst)s)" msgstr "" +"无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)" #: nova/scheduler/driver.py:465 #, python-format @@ -6862,6 +6908,7 @@ "Unable to migrate %(instance_id)s to %(dest)s: Lack of " "disk(host:%(available)s <= instance:%(necessary)s)" msgstr "" +"无法迁移%(instance_id)s 到 %(dest)s 上：缺少磁盘(主机:%(available)s <= 实例:%(necessary)s)" #: nova/api/openstack/compute/contrib/hosts.py:145 #, python-format @@ -6892,13 +6939,13 @@ #: nova/api/openstack/xmlutil.py:414 msgid "root element selecting a list" -msgstr "" +msgstr "根元素选择列表" #: nova/api/openstack/xmlutil.py:739 #, python-format msgid "" "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s" -msgstr "" +msgstr "模板数不匹配；把slave %(slavetag)s 添加到master %(mastertag)s" #: nova/api/openstack/xmlutil.py:858 msgid "subclasses must implement construct()!" @@ -6907,7 +6954,7 @@ #: nova/virt/vmwareapi/error_util.py:93 #, python-format msgid "Error(s) %s occurred in the call to RetrieveProperties" -msgstr "" +msgstr "调用 RetrieveProperties 时发生错误 %s" #: ../plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py:84 #, python-format @@ -6946,22 +6993,22 @@ #: nova/virt/xenapi/vmops.py:181 #, python-format msgid "Attempted to power on non-existent instance bad instance id %s" -msgstr "" +msgstr "尝试过启动不存在的实例，实例的id %s 不正确" #: nova/virt/xenapi/vmops.py:183 #, python-format msgid "Starting instance %s" -msgstr "" +msgstr "启动实例 %s" #: nova/virt/xenapi/vmops.py:246 #, python-format msgid "instance %s: Failed to spawn" -msgstr "" +msgstr "实例 %s：生产失败" #: nova/virt/xenapi/vmops.py:248 #, python-format msgid "Instance %s failed to spawn - performing clean-up" -msgstr "" +msgstr "实例 %s 生产失败 - 正在进行清理" #. Collect VDI/file resources to clean up; #. These resources will be removed by _handle_spawn_error. @@ -6975,269 +7022,270 @@ msgid "" "Auto configuring disk for instance %(instance_uuid)s, attempting to resize " "partition..." -msgstr "" +msgstr "正在自动配置实例 %(instance_uuid)s 的磁盘，尝试调整分区大小..." #: nova/virt/xenapi/vmops.py:448 #, python-format msgid "Invalid value for injected_files: '%s'" -msgstr "" +msgstr "injected_files无效的值：'%s'" #: nova/virt/xenapi/vmops.py:453 #, python-format msgid "Injecting file path: '%s'" -msgstr "" +msgstr "注入文件路径：'%s'" #: nova/virt/xenapi/vmops.py:459 msgid "Setting admin password" -msgstr "" +msgstr "设置管理员密码" #: nova/virt/xenapi/vmops.py:463 msgid "Resetting network" -msgstr "" +msgstr "重置网络" #: nova/virt/xenapi/vmops.py:470 msgid "Setting VCPU weight" -msgstr "" +msgstr "设置VCPU 权重" #: nova/virt/xenapi/vmops.py:476 #, python-format msgid "Starting VM %s..." -msgstr "" +msgstr "启动虚拟机 %s..." #: nova/virt/xenapi/vmops.py:480 #, python-format msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s." -msgstr "" +msgstr "生产 VM %(instance_uuid)s 创建 %(vm_ref)s." #: nova/virt/xenapi/vmops.py:487 #, python-format msgid "" "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is %(version)s" msgstr "" +"%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本" #: nova/virt/xenapi/vmops.py:490 #, python-format msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s" -msgstr "" +msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的 agent build" #: nova/virt/xenapi/vmops.py:497 #, python-format msgid "Instance %s: waiting for running" -msgstr "" +msgstr "实例 %s：等待运行" #: nova/virt/xenapi/vmops.py:506 #, python-format msgid "Instance %s: running" -msgstr "" +msgstr "实例 %s：运行" #: nova/virt/xenapi/vmops.py:510 msgid "Querying agent version" -msgstr "" +msgstr "查询代理版本" #: nova/virt/xenapi/vmops.py:513 #, python-format msgid "Instance agent version: %s" -msgstr "" +msgstr "实例代理版本：%s" #: nova/virt/xenapi/vmops.py:517 #, python-format msgid "Updating Agent to %s" -msgstr "" +msgstr "把代理更新为 %s" #: nova/virt/xenapi/vmops.py:539 #, python-format msgid "Resources to remove:%s" -msgstr "" +msgstr "将要移除的资源：%s" #: nova/virt/xenapi/vmops.py:550 #, python-format msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)" -msgstr "" +msgstr "移除VDI %(vdi_ref)s(uuid：%(vdi_to_remove)s)" #: nova/virt/xenapi/vmops.py:555 #, python-format msgid "Skipping VDI destroy for %s" -msgstr "" +msgstr "跳过 %s 的VDI的销毁" #: nova/virt/xenapi/vmops.py:564 msgid "Removing kernel/ramdisk files from dom0" -msgstr "" +msgstr "从 dom0 中移除内核/内存盘文件" #: nova/virt/xenapi/vmops.py:593 #, python-format msgid "No opaque_ref could be determined for '%s'." -msgstr "" +msgstr "无法为 '%s' 确定opaque_ref。" #: nova/virt/xenapi/vmops.py:647 #, python-format msgid "Finished snapshot and upload for VM %s" -msgstr "" +msgstr "快照完毕并为虚拟机 %s 上传" #: nova/virt/xenapi/vmops.py:655 #, python-format msgid "Starting snapshot for VM %s" -msgstr "" +msgstr "开始为虚拟机 %s 快照" #: nova/virt/xenapi/vmops.py:664 #, python-format msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s" -msgstr "" +msgstr "无法为实例 %(instance_uuid)s 快照：%(exc)s" #: nova/virt/xenapi/vmops.py:683 msgid "Failed to transfer vhd to new host" -msgstr "" +msgstr "将 vhd 转移到新主机失败" #: nova/virt/xenapi/vmops.py:703 #, python-format msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d" -msgstr "" +msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d" #: nova/virt/xenapi/vmops.py:751 #, python-format msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB" -msgstr "" +msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到 %(new_gb)dGB" #: nova/virt/xenapi/vmops.py:874 #, python-format msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB" -msgstr "" +msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到 %(new_gb)dGB" #: nova/virt/xenapi/vmops.py:882 #, python-format msgid "Resize instance %s complete" -msgstr "" +msgstr "调整实例 %s 的大小完毕" #: nova/virt/xenapi/vmops.py:913 #, python-format msgid "Failed to query agent version: %(resp)r" -msgstr "" +msgstr "查询代理版本失败：%(resp)r" #: nova/virt/xenapi/vmops.py:933 #, python-format msgid "domid changed from %(olddomid)s to %(newdomid)s" -msgstr "" +msgstr "domid 由 %(olddomid)s 改变为 %(newdomid)s" #: nova/virt/xenapi/vmops.py:949 #, python-format msgid "Failed to update agent: %(resp)r" -msgstr "" +msgstr "更新代理失败：%(resp)r" #: nova/virt/xenapi/vmops.py:972 #, python-format msgid "Failed to exchange keys: %(resp)r" -msgstr "" +msgstr "交换钥匙失败：%(resp)r" #: nova/virt/xenapi/vmops.py:988 #, python-format msgid "Failed to update password: %(resp)r" -msgstr "" +msgstr "更新密码失败：%(resp)r" #: nova/virt/xenapi/vmops.py:1015 #, python-format msgid "Failed to inject file: %(resp)r" -msgstr "" +msgstr "注入文件失败：%(resp)r" #: nova/virt/xenapi/vmops.py:1024 #, python-format msgid "VM %(instance_uuid)s already halted,skipping shutdown..." -msgstr "" +msgstr "虚拟机 %(instance_uuid)s 已经终止，跳过关闭..." #: nova/virt/xenapi/vmops.py:1028 #, python-format msgid "Shutting down VM for Instance %(instance_uuid)s" -msgstr "" +msgstr "为实例 %(instance_uuid)s 关闭虚拟机" #: nova/virt/xenapi/vmops.py:1047 msgid "Unable to find VBD for VM" -msgstr "" +msgstr "无法为虚拟机找到VBD" #: nova/virt/xenapi/vmops.py:1068 #, python-format msgid "Destroying VDIs for Instance %(instance_uuid)s" -msgstr "" +msgstr "正在为实例 %(instance_uuid)s 销毁 VDIs" #: nova/virt/xenapi/vmops.py:1126 #, python-format msgid "" "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk " "deletion" -msgstr "" +msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除" #: nova/virt/xenapi/vmops.py:1133 msgid "instance has a kernel or ramdisk but not both" -msgstr "" +msgstr "实例拥有内核或者内存盘，但不是二者均有" #: nova/virt/xenapi/vmops.py:1140 msgid "kernel/ramdisk files removed" -msgstr "" +msgstr "内核/内存盘文件移除了" #: nova/virt/xenapi/vmops.py:1152 #, python-format msgid "Instance %(instance_uuid)s VM destroyed" -msgstr "" +msgstr "实例 %(instance_uuid)s 销毁了" #: nova/virt/xenapi/vmops.py:1170 #, python-format msgid "Destroying VM for Instance %(instance_uuid)s" -msgstr "" +msgstr "正在为实例%(instance_uuid)s 销毁虚拟机" #: nova/virt/xenapi/vmops.py:1185 msgid "VM is not present, skipping destroy..." -msgstr "" +msgstr "虚拟机不存在，跳过销毁..." #: nova/virt/xenapi/vmops.py:1239 #, python-format msgid "Instance is already in Rescue Mode: %s" -msgstr "" +msgstr "实例已处于救援模式：%s" #: nova/virt/xenapi/vmops.py:1311 #, python-format msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds" -msgstr "" +msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启" #: nova/virt/xenapi/vmops.py:1315 #, python-format msgid "Automatically hard rebooting %d" -msgstr "" +msgstr "自动冷重启 %d" #: nova/virt/xenapi/vmops.py:1380 #, python-format msgid "Instance for migration %d not found, skipping" -msgstr "" +msgstr "没有找到为迁移 %d 的实例，正在跳过" #: nova/virt/xenapi/vmops.py:1412 msgid "Could not get bandwidth info." -msgstr "" +msgstr "无法得到带宽信息" #: nova/virt/xenapi/vmops.py:1484 #, python-format msgid "The call to %(method)s returned an error: %(e)s." -msgstr "" +msgstr "对 %(method)s 的调用返回错误：%(e)s。" #: nova/virt/xenapi/vmops.py:1500 #, python-format msgid "injecting network info to xs for vm: |%s|" -msgstr "" +msgstr "为虚拟机注入网络信息到xs：|%s|" #: nova/virt/xenapi/vmops.py:1518 #, python-format msgid "creating vif(s) for vm: |%s|" -msgstr "" +msgstr "正在为虚拟机创建 vif(s)：|%s|" #: nova/virt/xenapi/vmops.py:1527 #, python-format msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s." -msgstr "" +msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。" #: nova/virt/xenapi/vmops.py:1530 #, python-format msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s." -msgstr "" +msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF %(vif_ref)s。" #: nova/virt/xenapi/vmops.py:1559 #, python-format msgid "injecting hostname to xs for vm: |%s|" -msgstr "" +msgstr "为虚拟机注入hostname到xs：|%s|" #: nova/virt/xenapi/vmops.py:1621 #, python-format @@ -7245,42 +7293,44 @@ "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 "" +"%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; " +"args=%(addl_args)r" #: 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 "" +msgstr "超时：调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r" #: 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 "" +msgstr "没有执行：代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r" #: 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 "" +msgstr "%(method)s 的调用返回错误：%(e)s。虚拟机id=%(instance_uuid)s; args=%(args)r" #: nova/virt/xenapi/vmops.py:1841 #, python-format msgid "OpenSSL error: %s" -msgstr "" +msgstr "OpenSSL错误：%s" #: nova/tests/test_volume_types.py:60 #, python-format msgid "Given data: %s" -msgstr "" +msgstr "给定数据：%s" #: nova/tests/test_volume_types.py:61 #, python-format msgid "Result data: %s" -msgstr "" +msgstr "结果数据：%s" #: nova/api/ec2/__init__.py:69 #, python-format @@ -7301,7 +7351,7 @@ msgid "" "Access key %(access_key)s has had %(failures)d failed authentications and " "will be locked out for %(lock_mins)d minutes." -msgstr "" +msgstr "访问密钥 %(access_key)s 有错误 %(failures)d，认证失败将被锁定 %(lock_mins)d 分钟。" #: nova/api/ec2/__init__.py:263 msgid "Signature not provided" @@ -7309,7 +7359,7 @@ #: nova/api/ec2/__init__.py:267 msgid "Access key not provided" -msgstr "访问key没有提供" +msgstr "访问密钥没有提供" #: nova/api/ec2/__init__.py:302 nova/api/ec2/__init__.py:315 msgid "Failure communicating with keystone" @@ -7344,57 +7394,57 @@ #: nova/api/ec2/__init__.py:581 #, python-format msgid "InstanceNotFound raised: %s" -msgstr "引发InstanceNotFound: %s" +msgstr "引起异常 InstanceNotFound: %s" #: nova/api/ec2/__init__.py:587 #, python-format msgid "VolumeNotFound raised: %s" -msgstr "引发VolumeNotFound: %s" +msgstr "引起异常 VolumeNotFound: %s" #: nova/api/ec2/__init__.py:593 #, python-format msgid "SnapshotNotFound raised: %s" -msgstr "引发SnapshotNotFound: %s" +msgstr "引起异常 SnapshotNotFound: %s" #: nova/api/ec2/__init__.py:599 #, python-format msgid "NotFound raised: %s" -msgstr "引起没有找到的错误: %s" +msgstr "引起异常 NotFound: %s" #: nova/api/ec2/__init__.py:602 #, python-format msgid "EC2APIError raised: %s" -msgstr "引发EC2APIError: %s" +msgstr "引起异常 EC2APIError: %s" #: nova/api/ec2/__init__.py:610 #, python-format msgid "KeyPairExists raised: %s" -msgstr "引发KeyPairExists: %s" +msgstr "引起异常 KeyPairExists: %s" #: nova/api/ec2/__init__.py:614 #, python-format msgid "InvalidParameterValue raised: %s" -msgstr "引发InvalidParameterValue: %s" +msgstr "引起异常 InvalidParameterValue: %s" #: nova/api/ec2/__init__.py:618 #, python-format msgid "InvalidPortRange raised: %s" -msgstr "引发InvalidPortRange: %s" +msgstr "引起异常 InvalidPortRange: %s" #: nova/api/ec2/__init__.py:622 #, python-format msgid "NotAuthorized raised: %s" -msgstr "引发NotAuthorized: %s" +msgstr "引起异常 NotAuthorized: %s" #: nova/api/ec2/__init__.py:626 #, python-format msgid "InvalidRequest raised: %s" -msgstr "引发InvalidRequest: %s" +msgstr "引起异常 InvalidRequest: %s" #: nova/api/ec2/__init__.py:635 #, python-format msgid "Unexpected error raised: %s" -msgstr "引发了意外的错误：%s" +msgstr "引起意外的错误：%s" #: nova/api/openstack/compute/contrib/disk_config.py:44 #, python-format @@ -7430,59 +7480,59 @@ #: nova/virt/vmwareapi/vmware_images.py:89 #, python-format msgid "Downloading image %s from glance image server" -msgstr "" +msgstr "正在从glance镜像服务器中下载镜像 %s" #: nova/virt/vmwareapi/vmware_images.py:103 #, python-format msgid "Downloaded image %s from glance image server" -msgstr "" +msgstr "已经从glance镜像服务器中下载镜像 %s" #: nova/virt/vmwareapi/vmware_images.py:108 #, python-format msgid "Uploading image %s to the Glance image server" -msgstr "" +msgstr "正在向Glance镜像服务器上传镜像 %s" #: nova/virt/vmwareapi/vmware_images.py:129 #, python-format msgid "Uploaded image %s to the Glance image server" -msgstr "" +msgstr "已经向Glance镜像服务器上传了镜像 %s" #: nova/virt/vmwareapi/vmware_images.py:139 #, python-format msgid "Getting image size for the image %s" -msgstr "" +msgstr "正在获取镜像 %s 的大小" #: nova/virt/vmwareapi/vmware_images.py:143 #, python-format msgid "Got image size of %(size)s for the image %(image)s" -msgstr "" +msgstr "获得镜像 %(image)s 的大小为 %(size)s" #: nova/vsa/api.py:82 msgid "invalid drive data" -msgstr "" +msgstr "无效的" #: nova/vsa/api.py:105 msgid "drive_name not defined" -msgstr "" +msgstr "没有定义drive_name" #: nova/vsa/api.py:111 #, python-format msgid "invalid drive type name %s" -msgstr "" +msgstr "无效的drive类型名称 %s" #: nova/vsa/api.py:155 msgid "*** Experimental VSA code ***" -msgstr "" +msgstr "*** 用于实验的VSA代码 ***" #: nova/vsa/api.py:158 nova/vsa/api.py:303 #, python-format msgid "Requested number of VCs (%d) is too high. Setting to default" -msgstr "" +msgstr "请求的VCs (%d)数目过大。设置为默认值" #: nova/vsa/api.py:194 #, python-format msgid "Creating VSA: %s" -msgstr "" +msgstr "正在创建VSA：%s" #: nova/vsa/api.py:241 #, python-format @@ -7490,51 +7540,53 @@ "VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d GB, " "type %(vol_type_id)s" msgstr "" +"VSA ID %(vsa_id)d %(vsa_name)s：创建卷 %(vol_name)s，%(vol_size)d GB，类型 " +"%(vol_type_id)s" #: nova/vsa/api.py:272 #, python-format msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s" -msgstr "" +msgstr "VSA ID %(vsa_id)d：更新VSA状态到 %(status)s" #: nova/vsa/api.py:287 #, python-format msgid "VSA ID %(vsa_id)d: Update VSA call" -msgstr "" +msgstr "VSA ID %(vsa_id)d：更新VSA调用" #: nova/vsa/api.py:318 #, python-format msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s." -msgstr "" +msgstr "添加%(add_cnt)s VCs到 %(vsa_name)s。" #: nova/vsa/api.py:324 #, python-format msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s." -msgstr "" +msgstr "从VSA %(vsa_name)s 中删除%(del_cnt)s VCs。" #: nova/vsa/api.py:351 #, python-format msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s" -msgstr "" +msgstr "VSA ID %(vsa_id)s：删除 %(direction)s 卷 %(vol_name)s" #: nova/vsa/api.py:355 #, python-format msgid "Unable to delete volume %s" -msgstr "" +msgstr "无法删除卷 %s" #: nova/vsa/api.py:357 #, python-format msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s" -msgstr "" +msgstr "VSA ID %(vsa_id)s：强迫删除。%(direction)s 卷 %(vol_name)s" #: nova/vsa/api.py:363 #, python-format msgid "Going to try to terminate VSA ID %s" -msgstr "" +msgstr "将要试图终止VSA ID %s" #: nova/vsa/api.py:374 #, python-format msgid "VSA ID %(vsa_id)s: Delete instance %(name)s" -msgstr "" +msgstr "VSA ID %(vsa_id)s：删除实例 %(name)s" #: nova/api/openstack/compute/contrib/multinic.py:52 msgid "Missing 'networkId' argument for addFixedIp" @@ -7558,100 +7610,100 @@ #, python-format msgid "" "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata properties" -msgstr "" +msgstr "%(pid)s 已经超过配额，试图设置 %(num_metadata)s 个元数据属性" #: nova/compute/api.py:160 #, python-format msgid "Quota exceeded for %(pid)s, metadata property key or value too long" -msgstr "" +msgstr "%(pid)s 已经超过配额，元数据属性键或值太长" #: nova/compute/api.py:213 #, python-format msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances" -msgstr "" +msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例" #: nova/compute/api.py:216 msgid "" "Instance quota exceeded. You cannot run any more instances of this type." -msgstr "" +msgstr "超过实例的配额。您无法运行更多此类型的实例。" #: nova/compute/api.py:219 #, python-format msgid "" "Instance quota exceeded. You can only run %s more instances of this type." -msgstr "" +msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。" #: nova/compute/api.py:268 msgid "Creating a raw instance" -msgstr "" +msgstr "正在创建裸实例" #: nova/compute/api.py:270 #, python-format msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s" -msgstr "" +msgstr "使用 Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s" #: nova/compute/api.py:340 #, python-format msgid "Going to run %s instances..." -msgstr "" +msgstr "准备运行 %s 个实例" #: nova/compute/api.py:404 #, python-format msgid "bdm %s" -msgstr "" +msgstr "bdm %s" #: nova/compute/api.py:431 #, python-format msgid "block_device_mapping %s" -msgstr "" +msgstr "block_device_mapping %s" #: nova/compute/api.py:548 #, python-format msgid "Sending create to scheduler for %(pid)s/%(uid)s's" -msgstr "" +msgstr "为 %(pid)s/%(uid)s 向调度器发送创建命令" #: nova/compute/api.py:832 #, python-format msgid "Going to try to soft delete %s" -msgstr "" +msgstr "准备尝试软删除实例 %s" #: nova/compute/api.py:851 #, python-format msgid "No host for instance %s, deleting immediately" -msgstr "" +msgstr "没有托管实例 %s，立刻删除" #: nova/compute/api.py:885 #, python-format msgid "Going to try to terminate %s" -msgstr "" +msgstr "准备尝试终止实例 %s" #: nova/compute/api.py:923 #, python-format msgid "Going to try to stop %s" -msgstr "" +msgstr "准备尝试停止实例 %s" #: nova/compute/api.py:942 #, python-format msgid "Going to try to start %s" -msgstr "" +msgstr "准备尝试启动实例 %s" #: nova/compute/api.py:946 #, python-format msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s" -msgstr "" +msgstr "实例 %(instance_uuid)s 没有停止。(%(vm_state)s" #: nova/compute/api.py:1107 msgid "No compute host specified" -msgstr "" +msgstr "未指定计算宿主机" #: nova/compute/api.py:1110 #, python-format msgid "Unable to find host for Instance %s" -msgstr "" +msgstr "无法找到实例 %s 的宿主机" #: nova/compute/api.py:1352 msgid "flavor_id is None. Assuming migration." -msgstr "" +msgstr "flavor_id为空。假定在迁移。" #: nova/compute/api.py:1360 #, python-format @@ -7659,11 +7711,12 @@ "Old instance type %(current_instance_type_name)s, new instance type " "%(new_instance_type_name)s" msgstr "" +"旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s" #: nova/compute/api.py:1651 #, python-format msgid "multiple fixedips exist, using the first: %s" -msgstr "" +msgstr "存在多个固定IP，使用第一个：%s" #: ../smoketests/run_tests.py:294 msgid "" @@ -7674,11 +7727,11 @@ #: nova/network/quantum/melange_connection.py:95 #, python-format msgid "Server returned error: %s" -msgstr "" +msgstr "服务器返回错误：%s" #: nova/network/quantum/melange_connection.py:97 msgid "Connection error contacting melange service, retrying" -msgstr "" +msgstr "melange服务的连接错误，重试" #: nova/network/quantum/melange_connection.py:107 #, python-format @@ -7687,6 +7740,8 @@ "to this vif |%(vif_id)s| with mac |%(mac_address)s| belonging to " "|%(project_id)s| " msgstr "" +"在网络 |%(network_id)s| 中分配IP地址，该网络属于 |%(network_tenant_id)s|， 分配IP给该vif " +"|%(vif_id)s|， 其中mac是 |%(mac_address)s| 所属项目 |%(project_id)s| " #: ../bin/nova-all.py:62 ../bin/nova-all.py:68 ../bin/nova-all.py:75 #, python-format @@ -7695,87 +7750,88 @@ #: nova/virt/baremetal/tilera.py:185 msgid "free_node...." -msgstr "" +msgstr "free_node..." #: nova/virt/baremetal/tilera.py:216 #, python-format msgid "" "deactivate_node is called for node_id = %(id)s node_ip = " "%(ip)s" -msgstr "" +msgstr "针对node_id = %(id)s node_ip = %(ip)s调用了deactivate_node" #: nova/virt/baremetal/tilera.py:221 msgid "status of node is set to 0" -msgstr "" +msgstr "结点状态设为0" #: nova/virt/baremetal/tilera.py:232 msgid "rootfs is already removed" -msgstr "" +msgstr "rootfs 已经被移除了" #: nova/virt/baremetal/tilera.py:264 msgid "Before ping to the bare-metal node" -msgstr "" +msgstr "在ping裸机节点之前" #: nova/virt/baremetal/tilera.py:317 msgid "activate_node" -msgstr "" +msgstr "activate_node" #: nova/virt/baremetal/tilera.py:331 msgid "Node is unknown error state." -msgstr "" +msgstr "节点处于未知的错误状态。" #: nova/virt/xenapi/volumeops.py:65 msgid "Could not find VDI ref" -msgstr "" +msgstr "找不到VDI ref" #: nova/virt/xenapi/volumeops.py:71 msgid "Error destroying VDI" -msgstr "" +msgstr "销毁VDI出错" #: nova/virt/xenapi/volumeops.py:74 #, python-format msgid "Creating SR %s" -msgstr "" +msgstr "正在创建SR %s" #: nova/virt/xenapi/volumeops.py:77 msgid "Could not create SR" -msgstr "" +msgstr "无法创建SR" #: nova/virt/xenapi/volumeops.py:80 msgid "Could not retrieve SR record" -msgstr "" +msgstr "无法获取SR记录" #: nova/virt/xenapi/volumeops.py:85 #, python-format msgid "Introducing SR %s" -msgstr "" +msgstr "引入SR %s" #: nova/virt/xenapi/volumeops.py:88 msgid "SR found in xapi database. No need to introduce" -msgstr "" +msgstr "在xapi数据库找到SR。无需引入。" #: nova/virt/xenapi/volumeops.py:93 msgid "Could not introduce SR" -msgstr "" +msgstr "无法引入SR" #: nova/virt/xenapi/volumeops.py:97 #, python-format msgid "Checking for SR %s" -msgstr "" +msgstr "检查SR %s" #: nova/virt/xenapi/volumeops.py:107 #, python-format msgid "SR %s not found in the xapi database" -msgstr "" +msgstr "在xapi数据库没有找到SR %s" #: nova/virt/xenapi/volumeops.py:113 msgid "Could not forget SR" -msgstr "" +msgstr "不能忘记SR" #: nova/virt/xenapi/volumeops.py:122 #, python-format msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s" msgstr "" +"Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s" #: nova/virt/xenapi/volumeops.py:174 #, python-format @@ -7790,17 +7846,17 @@ #: nova/virt/xenapi/volumeops.py:195 #, python-format msgid "Unable to attach volume to instance %s" -msgstr "无法挂载卷到虚拟机 %s" +msgstr "无法附加卷到实例 %s" #: nova/virt/xenapi/volumeops.py:198 #, python-format msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s" -msgstr "挂载点 %(mountpoint)s 挂载到虚拟机 %(instance_name)s" +msgstr "挂载点 %(mountpoint)s 附加到实例 %(instance_name)s" #: nova/virt/xenapi/volumeops.py:208 #, python-format msgid "Detach_volume: %(instance_name)s, %(mountpoint)s" -msgstr "卸载_volume: %(instance_name)s, %(mountpoint)s" +msgstr "分离_volume: %(instance_name)s, %(mountpoint)s" #: nova/virt/xenapi/volumeops.py:216 #, python-format @@ -7810,50 +7866,50 @@ #: nova/virt/xenapi/volumeops.py:224 #, python-format msgid "Unable to detach volume %s" -msgstr "无法卸载 %s 卷" +msgstr "无法分离 %s 卷" #: nova/virt/xenapi/volumeops.py:229 #, python-format msgid "Unable to destroy vbd %s" -msgstr "" +msgstr "无法销毁VBD %s" #: nova/virt/xenapi/volumeops.py:236 #, python-format msgid "Error purging SR %s" -msgstr "" +msgstr "净化SR %s 出错" #: nova/virt/xenapi/volumeops.py:238 #, python-format msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s" -msgstr "挂载点 %(mountpoint)s 从虚拟机 %(instance_name)s 卸载" +msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离" #: nova/virt/libvirt/utils.py:235 msgid "Unable to find an open port" -msgstr "" +msgstr "无法找到一个开放端口" #: nova/tests/rpc/common.py:147 #, python-format msgid "Nested received %(queue)s, %(value)s" -msgstr "" +msgstr "嵌套(调用)接收到 %(queue)s, %(value)s" #: nova/tests/rpc/common.py:155 #, python-format msgid "Nested return %s" -msgstr "" +msgstr "嵌套(调用)返回 %s" #: nova/tests/rpc/common.py:173 msgid "RPC backend does not support timeouts" -msgstr "" +msgstr "RPC后台不支持超时" #: nova/tests/rpc/common.py:203 nova/tests/rpc/common.py:209 #, python-format msgid "Received %s" -msgstr "" +msgstr "已接收 %s" #: nova/virt/xenapi/vif.py:103 #, python-format msgid "Found no PIF for device %s" -msgstr "" +msgstr "没有找到设备 %s 的PIF" #: nova/virt/xenapi/vif.py:122 #, python-format @@ -7861,85 +7917,87 @@ "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. " "Expected %(vlan_num)d" msgstr "" +"网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s 有VLAN id %(pif_vlan)d。期待的数目是 " +"%(vlan_num)d" #: nova/compute/utils.py:141 msgid "v4 subnets are required for legacy nw_info" -msgstr "" +msgstr "遗留的网络信息 nw_info 要求使用 IPv4 子网" #: nova/volume/xensm.py:55 #, python-format msgid "SR name = %s" -msgstr "" +msgstr "SR name = %s" #: nova/volume/xensm.py:56 #, python-format msgid "Params: %s" -msgstr "" +msgstr "参数：%s" #: nova/volume/xensm.py:60 #, python-format msgid "Failed to create sr %s...continuing" -msgstr "" +msgstr "创建sr %s失败... 继续" #: nova/volume/xensm.py:62 msgid "Create failed" -msgstr "" +msgstr "创建失败" #: nova/volume/xensm.py:64 #, python-format msgid "SR UUID of new SR is: %s" -msgstr "" +msgstr "新SR的SR UUID：%s" #: nova/volume/xensm.py:71 msgid "Failed to update db" -msgstr "" +msgstr "更新DB失败" #: nova/volume/xensm.py:80 #, python-format msgid "Failed to introduce sr %s...continuing" -msgstr "" +msgstr "引入sr %s 失败... 继续" #: nova/volume/xensm.py:91 #, python-format msgid "Failed to reach backend %d" -msgstr "" +msgstr "到达后台 %d 失败" #: nova/volume/xensm.py:100 msgid "XenSMDriver requires xenapi connection" -msgstr "" +msgstr "XenSMDriver要求xenapi连接" #: nova/volume/xensm.py:110 msgid "Failed to initiate session" -msgstr "" +msgstr "初始化会话失败" #: nova/volume/xensm.py:142 #, python-format msgid "Volume will be created in backend - %d" -msgstr "" +msgstr "卷会在后台创建 - %d" #: nova/volume/xensm.py:154 msgid "Failed to update volume in db" -msgstr "" +msgstr "在数据库更新卷失败" #: nova/volume/xensm.py:157 msgid "Unable to create volume" -msgstr "" +msgstr "无法创建卷" #: nova/volume/xensm.py:171 msgid "Failed to delete vdi" -msgstr "" +msgstr "删除VDI失败" #: nova/volume/xensm.py:177 msgid "Failed to delete volume in db" -msgstr "" +msgstr "在数据库删除卷失败" #: nova/volume/xensm.py:211 msgid "Failed to find volume in db" -msgstr "" +msgstr "没有在数据库找到卷" #: nova/volume/xensm.py:222 msgid "Failed to find backend in db" -msgstr "" +msgstr "没有在数据库中找到后台(backend)" #. Either the methods don't exist in the agent, or they #. have been disabled. diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nss_db.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nss_db.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/nss_db.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/nss_db.po 2012-03-23 07:32:55.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: 2012-02-21 18:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/makedb.c:68 msgid "Convert key to lower case" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/oneconf.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/oneconf.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/oneconf.po 2012-02-23 07:12:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/oneconf.po 2012-03-23 07:33:30.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: 2012-02-22 02:07+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: .././oneconf-service:67 .././oneconf-query:89 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/opcodes.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/opcodes.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/opcodes.po 2012-02-23 07:11:25.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/opcodes.po 2012-03-23 07:32:48.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: 2012-01-27 01:23+0000\n" +"PO-Revision-Date: 2012-03-09 02:28+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: 2012-02-21 17:32+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:21+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: alpha-opc.c:155 msgid "branch operand unaligned" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog.po 2012-03-23 07:33:13.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: 2012-02-21 22:27+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../bin/parsechangelog:146 #, perl-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/Parse-DebianChangelog-Pod.po 2012-03-23 07:33:13.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2005-10-13 02:09+0200\n" "PO-Revision-Date: 2009-10-19 14:25+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 22:27+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../bin/parsechangelog:20 ../lib/Parse/DebianChangelog.pm:22 #: ../lib/Parse/DebianChangelog/ChangesFilters.pm:21 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/parted.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/parted.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/parted.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/parted.po 2012-03-23 07:32:55.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: 2012-01-28 01:05+0000\n" +"PO-Revision-Date: 2012-03-21 00:59+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: 2012-02-21 18:44+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:10+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/argmatch.c:133 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pbbuttonsd.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pbbuttonsd.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pbbuttonsd.po 2012-02-23 07:11:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pbbuttonsd.po 2012-03-23 07:33:11.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: 2012-02-21 21:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/init.c:240 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pidgin-libnotify.po 2012-03-23 07:33:19.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: 2012-02-21 23:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:51+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../src/pidgin-libnotify.c:95 msgid "New messages" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pidgin.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pidgin.po 2012-02-23 07:11:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pidgin.po 2012-03-23 07:33:19.000000000 +0000 @@ -11,16 +11,16 @@ msgstr "" "Project-Id-Version: pidgin HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-05 16:39+0000\n" -"PO-Revision-Date: 2012-01-05 17:42+0000\n" +"POT-Creation-Date: 2012-03-16 16:08+0000\n" +"PO-Revision-Date: 2012-03-16 18:43+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: 2012-02-21 23:48+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:47+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #. Translators may want to transliterate the name. @@ -192,8 +192,8 @@ #: ../libpurple/protocols/mxit/login.c:690 #: ../libpurple/protocols/myspace/user.c:824 #: ../libpurple/protocols/myspace/user.c:885 -#: ../libpurple/protocols/oscar/oscar.c:5251 -#: ../libpurple/protocols/oscar/peer.c:1066 +#: ../libpurple/protocols/oscar/oscar.c:5237 +#: ../libpurple/protocols/oscar/peer.c:1075 #: ../libpurple/protocols/sametime/sametime.c:3472 #: ../libpurple/protocols/sametime/sametime.c:3558 #: ../libpurple/protocols/sametime/sametime.c:5457 @@ -223,12 +223,12 @@ #: ../pidgin/gtkaccount.c:1945 ../pidgin/gtkaccount.c:2480 #: ../pidgin/gtkblist.c:706 ../pidgin/gtkblist.c:3583 #: ../pidgin/gtkblist.c:7334 ../pidgin/gtkcertmgr.c:195 -#: ../pidgin/gtkdialogs.c:880 ../pidgin/gtkdialogs.c:1019 -#: ../pidgin/gtkdialogs.c:1111 ../pidgin/gtkdialogs.c:1131 -#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1177 -#: ../pidgin/gtkdialogs.c:1225 ../pidgin/gtkdialogs.c:1266 -#: ../pidgin/gtkdialogs.c:1322 ../pidgin/gtkdialogs.c:1361 -#: ../pidgin/gtkdialogs.c:1388 ../pidgin/gtkimhtmltoolbar.c:451 +#: ../pidgin/gtkdialogs.c:881 ../pidgin/gtkdialogs.c:1020 +#: ../pidgin/gtkdialogs.c:1112 ../pidgin/gtkdialogs.c:1132 +#: ../pidgin/gtkdialogs.c:1156 ../pidgin/gtkdialogs.c:1178 +#: ../pidgin/gtkdialogs.c:1226 ../pidgin/gtkdialogs.c:1267 +#: ../pidgin/gtkdialogs.c:1323 ../pidgin/gtkdialogs.c:1362 +#: ../pidgin/gtkdialogs.c:1389 ../pidgin/gtkimhtmltoolbar.c:451 #: ../pidgin/gtklog.c:324 ../pidgin/gtkplugin.c:308 ../pidgin/gtkpounce.c:1140 #: ../pidgin/gtkprivacy.c:497 ../pidgin/gtkprivacy.c:513 #: ../pidgin/gtkprivacy.c:538 ../pidgin/gtkprivacy.c:552 @@ -446,24 +446,24 @@ #: ../finch/gntblist.c:2929 ../finch/gntroomlist.c:300 #: ../libpurple/protocols/jabber/jabber.c:1424 #: ../libpurple/protocols/jabber/jabber.c:1428 -#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2432 -#: ../libpurple/protocols/msn/msn.c:2497 ../libpurple/protocols/msn/msn.c:2524 +#: ../libpurple/protocols/msn/msn.c:529 ../libpurple/protocols/msn/msn.c:2411 +#: ../libpurple/protocols/msn/msn.c:2476 ../libpurple/protocols/msn/msn.c:2503 #: ../pidgin/gtkplugin.c:765 ../pidgin/gtkroomlist.c:740 -#: ../pidgin/plugins/disco/gtkdisco.c:552 +#: ../pidgin/plugins/disco/gtkdisco.c:554 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:131 #: ../pidgin/plugins/gevolution/assoc-buddy.c:122 msgid "Name" msgstr "名称" #: ../finch/gntblist.c:794 ../finch/gntblist.c:1735 -#: ../libpurple/protocols/gg/gg.c:1988 ../libpurple/protocols/msn/msn.c:2258 +#: ../libpurple/protocols/gg/gg.c:1988 ../libpurple/protocols/msn/msn.c:2237 #: ../libpurple/protocols/mxit/profile.c:173 #: ../libpurple/protocols/silc/chat.c:612 #: ../libpurple/protocols/silc10/chat.c:590 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704 #: ../libpurple/protocols/zephyr/zephyr.c:797 -#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1130 -#: ../pidgin/gtkdialogs.c:1154 ../pidgin/gtkdialogs.c:1176 +#: ../libpurple/protocols/zephyr/zephyr.c:1180 ../pidgin/gtkdialogs.c:1131 +#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1177 #: ../pidgin/gtkrequest.c:308 msgid "Alias" msgstr "别名" @@ -626,7 +626,7 @@ #: ../libpurple/protocols/jabber/jabber.c:2415 #: ../libpurple/protocols/jabber/jabber.c:2431 #: ../libpurple/protocols/jabber/jabber.c:2445 -#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435 +#: ../libpurple/protocols/msn/msn.c:2244 ../libpurple/protocols/msn/msn.c:2414 #: ../libpurple/protocols/silc/buddy.c:1550 #: ../libpurple/protocols/silc/ops.c:1019 #: ../libpurple/protocols/silc/ops.c:1202 @@ -652,7 +652,7 @@ #: ../libpurple/protocols/oscar/userinfo.c:508 #: ../libpurple/protocols/yahoo/libymsg.c:3874 #: ../libpurple/protocols/yahoo/yahoo_profile.c:709 ../pidgin/gtkblist.c:3832 -#: ../pidgin/gtkblist.c:4287 ../pidgin/gtkprefs.c:2692 +#: ../pidgin/gtkblist.c:4287 ../pidgin/gtkprefs.c:2709 msgid "Idle" msgstr "发呆" @@ -708,7 +708,7 @@ #: ../libpurple/protocols/mxit/login.c:365 #: ../libpurple/protocols/myspace/user.c:823 #: ../libpurple/protocols/myspace/user.c:884 -#: ../libpurple/protocols/oscar/oscar.c:5250 +#: ../libpurple/protocols/oscar/oscar.c:5236 #: ../libpurple/protocols/silc/buddy.c:458 #: ../libpurple/protocols/silc/buddy.c:1198 #: ../libpurple/protocols/silc/chat.c:451 @@ -730,18 +730,18 @@ #: ../libpurple/protocols/yahoo/libymsg.c:4357 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:588 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkblist.c:3582 -#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:879 -#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1110 +#: ../pidgin/gtkcertmgr.c:193 ../pidgin/gtkdialogs.c:880 +#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkdialogs.c:1111 #: ../pidgin/gtkrequest.c:300 ../pidgin/gtkutils.c:1621 #: ../pidgin/gtkutils.c:1641 msgid "OK" msgstr "确定" -#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:874 +#: ../finch/gntblist.c:2807 ../pidgin/gtkdialogs.c:875 msgid "New Instant Message" msgstr "新建聊天" -#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:876 +#: ../finch/gntblist.c:2809 ../pidgin/gtkdialogs.c:877 msgid "" "Please enter the username or alias of the person you would like to IM." msgstr "您想要跟谁聊？请输入他或她的用户名或别名。" @@ -762,7 +762,7 @@ msgid "Join" msgstr "加入" -#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1107 +#: ../finch/gntblist.c:2945 ../pidgin/gtkdialogs.c:1108 msgid "" "Please enter the username or alias of the person whose log you would like to " "view." @@ -831,7 +831,7 @@ #: ../libpurple/protocols/silc/util.c:560 #: ../libpurple/protocols/silc10/silc.c:704 #: ../libpurple/protocols/silc10/util.c:553 -#: ../pidgin/plugins/disco/gtkdisco.c:480 +#: ../pidgin/plugins/disco/gtkdisco.c:482 msgid "Chat" msgstr "聊天" @@ -1563,7 +1563,7 @@ #. Back to instant-apply! I win! BU-HAHAHA! #. Create the window #: ../finch/gntplugin.c:526 ../finch/gntplugin.c:533 ../finch/gntprefs.c:265 -#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2813 +#: ../finch/gntui.c:108 ../pidgin/gtkprefs.c:2830 msgid "Preferences" msgstr "首选项" @@ -1749,12 +1749,12 @@ msgid "Based on keyboard use" msgstr "基于键盘使用" -#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2697 +#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:2714 msgid "From last sent message" msgstr "根据上次发送的消息" #: ../finch/gntprefs.c:97 ../pidgin/gtkprefs.c:1349 ../pidgin/gtkprefs.c:1357 -#: ../pidgin/gtkprefs.c:2696 ../pidgin/gtkprefs.c:2732 +#: ../pidgin/gtkprefs.c:2713 ../pidgin/gtkprefs.c:2749 #: ../pidgin/plugins/win32/winprefs/winprefs.c:310 msgid "Never" msgstr "从不" @@ -1803,12 +1803,12 @@ msgid "Change status to" msgstr "将状态更改为" -#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2784 +#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2801 msgid "Conversations" msgstr "会话" #: ../finch/gntprefs.c:261 ../finch/plugins/gnthistory.c:155 -#: ../pidgin/gtkprefs.c:2208 ../pidgin/gtkprefs.c:2785 +#: ../pidgin/gtkprefs.c:2225 ../pidgin/gtkprefs.c:2802 msgid "Logging" msgstr "聊天记录" @@ -1905,8 +1905,8 @@ #: ../finch/gntsound.c:739 ../finch/gntsound.c:825 ../pidgin/gtkpounce.c:178 #: ../pidgin/gtkpounce.c:189 ../pidgin/gtkpounce.c:318 #: ../pidgin/gtkpounce.c:695 ../pidgin/gtkpounce.c:957 -#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2334 -#: ../pidgin/gtkprefs.c:2432 ../pidgin/gtkprefs.c:2629 +#: ../pidgin/gtkprefs.c:941 ../pidgin/gtkprefs.c:2351 +#: ../pidgin/gtkprefs.c:2449 ../pidgin/gtkprefs.c:2646 msgid "(default)" msgstr "(默认)" @@ -1922,7 +1922,7 @@ msgid "Profiles" msgstr "个人资料" -#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2496 +#: ../finch/gntsound.c:977 ../pidgin/gtkprefs.c:2513 msgid "Automatic" msgstr "自动" @@ -1930,7 +1930,7 @@ msgid "Console Beep" msgstr "终端响铃" -#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2500 +#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:2517 msgid "Command" msgstr "命令" @@ -1956,7 +1956,7 @@ "(%s 代表文件名)" #. Sound options -#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2486 +#: ../finch/gntsound.c:1004 ../pidgin/gtkprefs.c:2503 msgid "Sound Options" msgstr "声音选项" @@ -1965,18 +1965,18 @@ msgstr "对话获得焦点后发声" #: ../finch/gntsound.c:1013 ../pidgin/gtkprefs.c:1347 -#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2531 +#: ../pidgin/gtkprefs.c:1359 ../pidgin/gtkprefs.c:2548 #: ../pidgin/plugins/timestamp_format.c:58 #: ../pidgin/plugins/timestamp_format.c:67 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311 msgid "Always" msgstr "总是" -#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2529 +#: ../finch/gntsound.c:1014 ../pidgin/gtkprefs.c:2546 msgid "Only when available" msgstr "仅当可用时" -#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2530 +#: ../finch/gntsound.c:1015 ../pidgin/gtkprefs.c:2547 msgid "Only when not available" msgstr "仅当不可用时" @@ -1985,12 +1985,12 @@ msgstr "音量(0-100)：" #. Sound events -#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2558 +#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:2575 msgid "Sound Events" msgstr "声音事件" #: ../finch/gntsound.c:1043 ../pidgin/gtknotify.c:1609 -#: ../pidgin/gtkprefs.c:2612 +#: ../pidgin/gtkprefs.c:2629 msgid "Event" msgstr "事件" @@ -2066,18 +2066,18 @@ #: ../libpurple/protocols/novell/novell.c:2969 #: ../libpurple/protocols/novell/novell.c:2975 #: ../libpurple/protocols/novell/novell.c:2981 -#: ../libpurple/protocols/oscar/oscar.c:4794 -#: ../libpurple/protocols/oscar/oscar.c:4803 -#: ../libpurple/protocols/oscar/oscar.c:4811 -#: ../libpurple/protocols/oscar/oscar.c:4819 -#: ../libpurple/protocols/oscar/oscar.c:4827 -#: ../libpurple/protocols/oscar/oscar.c:4835 -#: ../libpurple/protocols/oscar/oscar.c:4844 -#: ../libpurple/protocols/oscar/oscar.c:4852 -#: ../libpurple/protocols/oscar/oscar.c:4859 +#: ../libpurple/protocols/oscar/oscar.c:4780 +#: ../libpurple/protocols/oscar/oscar.c:4789 +#: ../libpurple/protocols/oscar/oscar.c:4797 +#: ../libpurple/protocols/oscar/oscar.c:4805 +#: ../libpurple/protocols/oscar/oscar.c:4813 +#: ../libpurple/protocols/oscar/oscar.c:4821 +#: ../libpurple/protocols/oscar/oscar.c:4830 +#: ../libpurple/protocols/oscar/oscar.c:4838 +#: ../libpurple/protocols/oscar/oscar.c:4845 +#: ../libpurple/protocols/oscar/oscar.c:4857 +#: ../libpurple/protocols/oscar/oscar.c:4864 #: ../libpurple/protocols/oscar/oscar.c:4871 -#: ../libpurple/protocols/oscar/oscar.c:4878 -#: ../libpurple/protocols/oscar/oscar.c:4885 #: ../libpurple/protocols/sametime/sametime.c:3370 #: ../libpurple/protocols/sametime/sametime.c:3376 #: ../libpurple/protocols/sametime/sametime.c:3382 @@ -2143,7 +2143,7 @@ msgid "Certificates" msgstr "证书" -#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2789 +#: ../finch/gntui.c:107 ../pidgin/gtkprefs.c:2806 msgid "Sounds" msgstr "声音" @@ -2327,7 +2327,7 @@ #: ../libpurple/protocols/jabber/jutil.c:659 #: ../libpurple/protocols/mxit/roster.c:53 #: ../libpurple/protocols/novell/novell.c:2856 -#: ../libpurple/protocols/oscar/oscar.c:4717 +#: ../libpurple/protocols/oscar/oscar.c:4703 #: ../libpurple/protocols/oscar/userinfo.c:279 #: ../libpurple/protocols/yahoo/libymsg.c:3876 ../libpurple/status.c:162 #: ../pidgin/gtkblist.c:3877 ../pidgin/gtkblist.c:4264 @@ -2470,10 +2470,10 @@ #: ../libpurple/account.c:2207 ../libpurple/protocols/gg/gg.c:1179 #: ../libpurple/protocols/jabber/buddy.c:778 #: ../libpurple/protocols/jabber/jutil.c:676 -#: ../libpurple/protocols/msn/oim.c:688 +#: ../libpurple/protocols/msn/oim.c:731 #: ../libpurple/protocols/mxit/profile.c:204 #: ../libpurple/protocols/novell/novell.c:2859 ../pidgin/gtkft.c:162 -#: ../pidgin/plugins/disco/gtkdisco.c:468 ../pidgin/plugins/vvconfig.c:145 +#: ../pidgin/plugins/disco/gtkdisco.c:470 ../pidgin/plugins/vvconfig.c:145 msgid "Unknown" msgstr "未知" @@ -3171,23 +3171,23 @@ "No codecs left. Your codec preferences in fs-codecs.conf are too strict." msgstr "没有可用的解码器。您的 fs.codecs.conf 中规则过于严格。" -#: ../libpurple/media/backend-fs2.c:887 +#: ../libpurple/media/backend-fs2.c:880 msgid "A non-recoverable Farsight2 error has occurred." msgstr "发生不可恢复的 Farsight2 错误。" -#: ../libpurple/media/backend-fs2.c:1115 +#: ../libpurple/media/backend-fs2.c:1108 msgid "Error with your microphone" msgstr "您的话筒出现故障" -#: ../libpurple/media/backend-fs2.c:1118 +#: ../libpurple/media/backend-fs2.c:1111 msgid "Error with your webcam" msgstr "您的摄像头出现故障" -#: ../libpurple/media/backend-fs2.c:1125 +#: ../libpurple/media/backend-fs2.c:1118 msgid "Conference error" msgstr "会议出错" -#: ../libpurple/media/backend-fs2.c:1512 +#: ../libpurple/media/backend-fs2.c:1505 #, c-format msgid "Error creating session: %s" msgstr "创建会话出错：%s" @@ -3276,23 +3276,23 @@ #: ../libpurple/protocols/mxit/actions.c:483 #: ../libpurple/protocols/oscar/authorization.c:99 #: ../libpurple/protocols/oscar/oscar.c:1224 -#: ../libpurple/protocols/oscar/oscar.c:4968 -#: ../libpurple/protocols/oscar/oscar.c:5025 -#: ../libpurple/protocols/oscar/oscar.c:5308 -#: ../libpurple/protocols/oscar/oscar.c:5365 ../libpurple/request.h:1498 +#: ../libpurple/protocols/oscar/oscar.c:4954 +#: ../libpurple/protocols/oscar/oscar.c:5011 +#: ../libpurple/protocols/oscar/oscar.c:5294 +#: ../libpurple/protocols/oscar/oscar.c:5351 ../libpurple/request.h:1498 #: ../libpurple/request.h:1508 ../libpurple/request.h:1521 msgid "_Cancel" msgstr "取消(_C)" -#: ../libpurple/plugins/autoaccept.c:208 ../libpurple/plugins/autoaccept.c:274 +#: ../libpurple/plugins/autoaccept.c:208 ../libpurple/plugins/autoaccept.c:278 msgid "Ask" msgstr "询问" -#: ../libpurple/plugins/autoaccept.c:209 ../libpurple/plugins/autoaccept.c:275 +#: ../libpurple/plugins/autoaccept.c:209 ../libpurple/plugins/autoaccept.c:279 msgid "Auto Accept" msgstr "自动接受" -#: ../libpurple/plugins/autoaccept.c:210 ../libpurple/plugins/autoaccept.c:276 +#: ../libpurple/plugins/autoaccept.c:210 ../libpurple/plugins/autoaccept.c:280 msgid "Auto Reject" msgstr "自动拒绝" @@ -3301,7 +3301,7 @@ msgstr "自动接受文件传送..." #. XXX: Is there a better way than this? There really should be. -#: ../libpurple/plugins/autoaccept.c:266 +#: ../libpurple/plugins/autoaccept.c:270 msgid "" "Path to save the files in\n" "(Please provide the full path)" @@ -3309,13 +3309,13 @@ "保存文件的路径\n" "(请提供完整路径)" -#: ../libpurple/plugins/autoaccept.c:271 +#: ../libpurple/plugins/autoaccept.c:275 msgid "" "When a file-transfer request arrives from a user who is\n" "*not* on your buddy list:" msgstr "不在好友列表里的人发来文件传送请求时：" -#: ../libpurple/plugins/autoaccept.c:280 +#: ../libpurple/plugins/autoaccept.c:284 msgid "" "Notify with a popup when an autoaccepted file transfer is complete\n" "(only when there's no conversation with the sender)" @@ -3323,16 +3323,16 @@ "当自动接受的文件传输完成时弹出提示\n" "(仅当没有与发送者进行聊天时)" -#: ../libpurple/plugins/autoaccept.c:285 +#: ../libpurple/plugins/autoaccept.c:289 msgid "Create a new directory for each user" msgstr "为每个用户创建新目录" -#: ../libpurple/plugins/autoaccept.c:289 +#: ../libpurple/plugins/autoaccept.c:293 msgid "Escape the filenames" msgstr "取消文件" -#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2508 -#: ../libpurple/protocols/msn/msn.c:2538 +#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:2487 +#: ../libpurple/protocols/msn/msn.c:2517 msgid "Notes" msgstr "备注" @@ -4296,7 +4296,7 @@ msgstr "出生年" #. gender -#: ../libpurple/protocols/gg/gg.c:598 ../libpurple/protocols/msn/msn.c:2437 +#: ../libpurple/protocols/gg/gg.c:598 ../libpurple/protocols/msn/msn.c:2416 #: ../libpurple/protocols/mxit/actions.c:242 #: ../libpurple/protocols/mxit/login.c:349 #: ../libpurple/protocols/mxit/profile.c:184 @@ -4442,7 +4442,7 @@ #: ../libpurple/protocols/jabber/jutil.c:664 #: ../libpurple/protocols/mxit/roster.c:57 #: ../libpurple/protocols/oscar/oscar.c:159 -#: ../libpurple/protocols/oscar/oscar.c:4877 +#: ../libpurple/protocols/oscar/oscar.c:4863 #: ../libpurple/protocols/sametime/sametime.c:3381 msgid "Do Not Disturb" msgstr "忙碌 - 请勿打扰" @@ -4461,7 +4461,7 @@ #: ../libpurple/protocols/silc10/buddy.c:1496 #: ../libpurple/protocols/yahoo/libymsg.c:4756 #: ../libpurple/protocols/yahoo/libymsg.c:4843 ../libpurple/status.c:166 -#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2728 +#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2745 #: ../pidgin/gtkstatusbox.c:1097 ../pidgin/plugins/themeedit-icon.c:64 msgid "Away" msgstr "离开" @@ -4642,26 +4642,26 @@ msgstr "GG 服务器" #: ../libpurple/protocols/gg/gg.c:2805 -#: ../libpurple/protocols/oscar/oscar.c:5773 +#: ../libpurple/protocols/oscar/oscar.c:5759 msgid "Don't use encryption" msgstr "不使用加密" #: ../libpurple/protocols/gg/gg.c:2806 #: ../libpurple/protocols/jabber/libxmpp.c:277 -#: ../libpurple/protocols/oscar/oscar.c:5771 +#: ../libpurple/protocols/oscar/oscar.c:5757 msgid "Use encryption if available" msgstr "可能时使用加密" #. TODO #: ../libpurple/protocols/gg/gg.c:2810 #: ../libpurple/protocols/jabber/libxmpp.c:276 -#: ../libpurple/protocols/oscar/oscar.c:5772 +#: ../libpurple/protocols/oscar/oscar.c:5758 msgid "Require encryption" msgstr "需要加密" #: ../libpurple/protocols/gg/gg.c:2813 #: ../libpurple/protocols/jabber/libxmpp.c:286 -#: ../libpurple/protocols/oscar/oscar.c:5797 +#: ../libpurple/protocols/oscar/oscar.c:5783 msgid "Connection security" msgstr "连接安全性" @@ -4866,8 +4866,8 @@ #. 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/msn/msn.c:3025 +#: ../libpurple/protocols/oscar/oscar.c:5771 #: ../libpurple/protocols/sametime/sametime.c:5784 #: ../libpurple/protocols/silc/ops.c:1265 #: ../libpurple/protocols/silc/ops.c:1359 @@ -4878,8 +4878,8 @@ msgstr "服务器" #. port to connect to -#: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3051 -#: ../libpurple/protocols/oscar/oscar.c:5788 +#: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3030 +#: ../libpurple/protocols/oscar/oscar.c:5774 #: ../libpurple/protocols/sametime/sametime.c:5793 #: ../libpurple/protocols/silc/silc.c:2197 #: ../libpurple/protocols/silc10/silc.c:1910 @@ -5618,7 +5618,7 @@ #: ../libpurple/protocols/jabber/buddy.c:365 #: ../libpurple/protocols/jabber/buddy.c:1163 -#: ../libpurple/protocols/msn/msn.c:2525 +#: ../libpurple/protocols/msn/msn.c:2504 #: ../libpurple/protocols/novell/novell.c:1497 #: ../libpurple/protocols/silc/ops.c:1027 #: ../libpurple/protocols/silc10/ops.c:1044 @@ -5634,7 +5634,7 @@ #. birthday (required) #: ../libpurple/protocols/jabber/buddy.c:367 #: ../libpurple/protocols/jabber/buddy.c:1053 -#: ../libpurple/protocols/msn/msn.c:2506 +#: ../libpurple/protocols/msn/msn.c:2485 #: ../libpurple/protocols/mxit/actions.c:236 #: ../libpurple/protocols/mxit/login.c:343 #: ../libpurple/protocols/mxit/profile.c:181 @@ -5645,7 +5645,7 @@ #: ../libpurple/protocols/jabber/buddy.c:368 #: ../libpurple/protocols/jabber/buddy.c:1167 #: ../libpurple/protocols/jabber/chat.c:911 ../pidgin/gtkblist.c:3889 -#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:569 +#: ../pidgin/gtkplugin.c:590 ../pidgin/plugins/disco/gtkdisco.c:571 msgid "Description" msgstr "描述" @@ -6076,7 +6076,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1466 #: ../libpurple/protocols/jabber/jabber.c:1477 #: ../pidgin/plugins/disco/gtkdisco.c:307 -#: ../pidgin/plugins/disco/gtkdisco.c:686 +#: ../pidgin/plugins/disco/gtkdisco.c:688 msgid "Register" msgstr "注册" @@ -6130,7 +6130,7 @@ #: ../libpurple/protocols/jabber/jabber.c:2701 #: ../libpurple/protocols/jabber/jabber.c:2744 #: ../libpurple/protocols/jabber/jabber.c:2782 -#: ../libpurple/protocols/oscar/oscar.c:4715 +#: ../libpurple/protocols/oscar/oscar.c:4701 #: ../libpurple/protocols/oscar/userinfo.c:272 msgid "Not Authorized" msgstr "未认证" @@ -6211,12 +6211,12 @@ #: ../libpurple/protocols/jabber/jabber.c:2383 #: ../libpurple/protocols/mxit/roster.c:86 -#: ../libpurple/protocols/oscar/oscar.c:4896 +#: ../libpurple/protocols/oscar/oscar.c:4882 msgid "Mood Name" msgstr "心情名称" #: ../libpurple/protocols/jabber/jabber.c:2384 -#: ../libpurple/protocols/oscar/oscar.c:4897 +#: ../libpurple/protocols/oscar/oscar.c:4883 msgid "Mood Comment" msgstr "心情注释" @@ -6290,7 +6290,7 @@ msgstr "请输入您的新密码" #: ../libpurple/protocols/jabber/jabber.c:2570 -#: ../libpurple/protocols/oscar/oscar.c:5516 +#: ../libpurple/protocols/oscar/oscar.c:5502 #: ../libpurple/protocols/silc/silc.c:1333 #: ../libpurple/protocols/silc10/silc.c:1029 #: ../libpurple/protocols/yahoo/libymsg.c:4211 @@ -6300,7 +6300,7 @@ #. if (js->protocol_options & CHANGE_PASSWORD) { #: ../libpurple/protocols/jabber/jabber.c:2575 -#: ../libpurple/protocols/oscar/oscar.c:5527 +#: ../libpurple/protocols/oscar/oscar.c:5513 #: ../libpurple/protocols/silc/silc.c:1329 #: ../libpurple/protocols/silc10/silc.c:1025 msgid "Change Password..." @@ -7354,20 +7354,20 @@ #. only notify the user about problems adding to the friends list #. * maybe we should do something else for other lists, but it probably #. * won't cause too many problems if we just ignore it -#: ../libpurple/protocols/msn/contact.c:1046 -#: ../libpurple/protocols/msn/contact.c:1142 +#: ../libpurple/protocols/msn/contact.c:1067 +#: ../libpurple/protocols/msn/contact.c:1163 #: ../libpurple/protocols/msn/userlist.c:522 #, c-format msgid "Unable to add \"%s\"." msgstr "无法添加“%s”。" -#: ../libpurple/protocols/msn/contact.c:1047 -#: ../libpurple/protocols/msn/contact.c:1143 +#: ../libpurple/protocols/msn/contact.c:1068 +#: ../libpurple/protocols/msn/contact.c:1164 msgid "Buddy Add error" msgstr "添加好友出错" -#: ../libpurple/protocols/msn/contact.c:1048 -#: ../libpurple/protocols/msn/contact.c:1144 +#: ../libpurple/protocols/msn/contact.c:1069 +#: ../libpurple/protocols/msn/contact.c:1165 msgid "The username specified does not exist." msgstr "指定的用户名不存在。" @@ -7906,31 +7906,31 @@ "SSL support is needed for MSN. Please install a supported SSL library." msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。" -#: ../libpurple/protocols/msn/msn.c:1803 +#: ../libpurple/protocols/msn/msn.c:1782 #, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be valid email addresses." msgstr "无法添加好友 %s，用户名无效。用户名必须是有效的电子邮件地址。" -#: ../libpurple/protocols/msn/msn.c:1805 +#: ../libpurple/protocols/msn/msn.c:1784 #: ../libpurple/protocols/oscar/oscar.c:3709 #: ../libpurple/protocols/oscar/oscar.c:4180 #: ../libpurple/protocols/oscar/oscar.c:4195 msgid "Unable to Add" msgstr "无法添加" -#: ../libpurple/protocols/msn/msn.c:2365 ../libpurple/protocols/msn/msn.c:2707 +#: ../libpurple/protocols/msn/msn.c:2344 ../libpurple/protocols/msn/msn.c:2686 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199 msgid "Error retrieving profile" msgstr "获取配置文件出错" -#: ../libpurple/protocols/msn/msn.c:2429 ../pidgin/plugins/convcolors.c:387 +#: ../libpurple/protocols/msn/msn.c:2408 ../pidgin/plugins/convcolors.c:387 msgid "General" msgstr "常规" -#: ../libpurple/protocols/msn/msn.c:2436 +#: ../libpurple/protocols/msn/msn.c:2415 #: ../libpurple/protocols/mxit/profile.c:296 #: ../libpurple/protocols/myspace/user.c:127 #: ../libpurple/protocols/oscar/userinfo.c:454 @@ -7938,12 +7938,12 @@ msgid "Age" msgstr "年龄" -#: ../libpurple/protocols/msn/msn.c:2438 +#: ../libpurple/protocols/msn/msn.c:2417 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1095 msgid "Occupation" msgstr "职业" -#: ../libpurple/protocols/msn/msn.c:2439 +#: ../libpurple/protocols/msn/msn.c:2418 #: ../libpurple/protocols/myspace/user.c:135 #: ../libpurple/protocols/novell/novell.c:1491 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1075 @@ -7952,194 +7952,194 @@ msgid "Location" msgstr "位置" -#: ../libpurple/protocols/msn/msn.c:2444 ../libpurple/protocols/msn/msn.c:2636 -#: ../libpurple/protocols/msn/msn.c:2642 ../libpurple/protocols/msn/msn.c:2649 +#: ../libpurple/protocols/msn/msn.c:2423 ../libpurple/protocols/msn/msn.c:2615 +#: ../libpurple/protocols/msn/msn.c:2621 ../libpurple/protocols/msn/msn.c:2628 msgid "Hobbies and Interests" msgstr "兴趣爱好" -#: ../libpurple/protocols/msn/msn.c:2450 ../libpurple/protocols/msn/msn.c:2570 -#: ../libpurple/protocols/msn/msn.c:2576 ../libpurple/protocols/msn/msn.c:2583 -#: ../libpurple/protocols/msn/msn.c:2591 ../libpurple/protocols/msn/msn.c:2598 +#: ../libpurple/protocols/msn/msn.c:2429 ../libpurple/protocols/msn/msn.c:2549 +#: ../libpurple/protocols/msn/msn.c:2555 ../libpurple/protocols/msn/msn.c:2562 +#: ../libpurple/protocols/msn/msn.c:2570 ../libpurple/protocols/msn/msn.c:2577 msgid "A Little About Me" msgstr "自我简介" -#: ../libpurple/protocols/msn/msn.c:2467 +#: ../libpurple/protocols/msn/msn.c:2446 msgid "Social" msgstr "社会关系" -#: ../libpurple/protocols/msn/msn.c:2469 +#: ../libpurple/protocols/msn/msn.c:2448 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1085 msgid "Marital Status" msgstr "婚姻状况" -#: ../libpurple/protocols/msn/msn.c:2470 +#: ../libpurple/protocols/msn/msn.c:2449 msgid "Interests" msgstr "兴趣" -#: ../libpurple/protocols/msn/msn.c:2471 +#: ../libpurple/protocols/msn/msn.c:2450 msgid "Pets" msgstr "宠物" -#: ../libpurple/protocols/msn/msn.c:2472 +#: ../libpurple/protocols/msn/msn.c:2451 msgid "Hometown" msgstr "家乡" -#: ../libpurple/protocols/msn/msn.c:2473 +#: ../libpurple/protocols/msn/msn.c:2452 msgid "Places Lived" msgstr "住所" -#: ../libpurple/protocols/msn/msn.c:2474 +#: ../libpurple/protocols/msn/msn.c:2453 msgid "Fashion" msgstr "时尚" -#: ../libpurple/protocols/msn/msn.c:2475 +#: ../libpurple/protocols/msn/msn.c:2454 msgid "Humor" msgstr "心情" -#: ../libpurple/protocols/msn/msn.c:2476 +#: ../libpurple/protocols/msn/msn.c:2455 msgid "Music" msgstr "音乐" -#: ../libpurple/protocols/msn/msn.c:2477 ../libpurple/protocols/msn/msn.c:2658 -#: ../libpurple/protocols/msn/msn.c:2664 +#: ../libpurple/protocols/msn/msn.c:2456 ../libpurple/protocols/msn/msn.c:2637 +#: ../libpurple/protocols/msn/msn.c:2643 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1137 msgid "Favorite Quote" msgstr "格言" -#: ../libpurple/protocols/msn/msn.c:2494 +#: ../libpurple/protocols/msn/msn.c:2473 msgid "Contact Info" msgstr "联系信息" -#: ../libpurple/protocols/msn/msn.c:2495 +#: ../libpurple/protocols/msn/msn.c:2474 msgid "Personal" msgstr "个人信息" -#: ../libpurple/protocols/msn/msn.c:2498 +#: ../libpurple/protocols/msn/msn.c:2477 msgid "Significant Other" msgstr "其它重要的" -#: ../libpurple/protocols/msn/msn.c:2499 +#: ../libpurple/protocols/msn/msn.c:2478 msgid "Home Phone" msgstr "家庭电话" -#: ../libpurple/protocols/msn/msn.c:2500 +#: ../libpurple/protocols/msn/msn.c:2479 msgid "Home Phone 2" msgstr "家庭电话 2" -#: ../libpurple/protocols/msn/msn.c:2501 +#: ../libpurple/protocols/msn/msn.c:2480 #: ../libpurple/protocols/oscar/userinfo.c:464 msgid "Home Address" msgstr "家庭住址" -#: ../libpurple/protocols/msn/msn.c:2502 +#: ../libpurple/protocols/msn/msn.c:2481 msgid "Personal Mobile" msgstr "个人手机" -#: ../libpurple/protocols/msn/msn.c:2503 +#: ../libpurple/protocols/msn/msn.c:2482 msgid "Home Fax" msgstr "家庭传真" -#: ../libpurple/protocols/msn/msn.c:2504 +#: ../libpurple/protocols/msn/msn.c:2483 msgid "Personal Email" msgstr "个人电子邮件" -#: ../libpurple/protocols/msn/msn.c:2505 +#: ../libpurple/protocols/msn/msn.c:2484 msgid "Personal IM" msgstr "个人 IM" -#: ../libpurple/protocols/msn/msn.c:2507 +#: ../libpurple/protocols/msn/msn.c:2486 msgid "Anniversary" msgstr "纪念日" #. Business -#: ../libpurple/protocols/msn/msn.c:2523 +#: ../libpurple/protocols/msn/msn.c:2502 msgid "Work" msgstr "工作" -#: ../libpurple/protocols/msn/msn.c:2526 +#: ../libpurple/protocols/msn/msn.c:2505 #: ../libpurple/protocols/oscar/userinfo.c:482 msgid "Company" msgstr "公司" -#: ../libpurple/protocols/msn/msn.c:2527 +#: ../libpurple/protocols/msn/msn.c:2506 #: ../libpurple/protocols/novell/novell.c:1493 msgid "Department" msgstr "部门" -#: ../libpurple/protocols/msn/msn.c:2528 +#: ../libpurple/protocols/msn/msn.c:2507 msgid "Profession" msgstr "职业" -#: ../libpurple/protocols/msn/msn.c:2529 +#: ../libpurple/protocols/msn/msn.c:2508 msgid "Work Phone" msgstr "工作电话" -#: ../libpurple/protocols/msn/msn.c:2530 +#: ../libpurple/protocols/msn/msn.c:2509 msgid "Work Phone 2" msgstr "办公电话 2" -#: ../libpurple/protocols/msn/msn.c:2531 +#: ../libpurple/protocols/msn/msn.c:2510 #: ../libpurple/protocols/oscar/userinfo.c:472 msgid "Work Address" msgstr "办公地址" -#: ../libpurple/protocols/msn/msn.c:2532 +#: ../libpurple/protocols/msn/msn.c:2511 msgid "Work Mobile" msgstr "办公手机" -#: ../libpurple/protocols/msn/msn.c:2533 +#: ../libpurple/protocols/msn/msn.c:2512 msgid "Work Pager" msgstr "办公寻呼" -#: ../libpurple/protocols/msn/msn.c:2534 +#: ../libpurple/protocols/msn/msn.c:2513 msgid "Work Fax" msgstr "办公传真" -#: ../libpurple/protocols/msn/msn.c:2535 +#: ../libpurple/protocols/msn/msn.c:2514 msgid "Work Email" msgstr "办公电子邮件" -#: ../libpurple/protocols/msn/msn.c:2536 +#: ../libpurple/protocols/msn/msn.c:2515 msgid "Work IM" msgstr "办公 IM" -#: ../libpurple/protocols/msn/msn.c:2537 +#: ../libpurple/protocols/msn/msn.c:2516 msgid "Start Date" msgstr "开始日期" -#: ../libpurple/protocols/msn/msn.c:2607 ../libpurple/protocols/msn/msn.c:2613 -#: ../libpurple/protocols/msn/msn.c:2620 ../libpurple/protocols/msn/msn.c:2627 +#: ../libpurple/protocols/msn/msn.c:2586 ../libpurple/protocols/msn/msn.c:2592 +#: ../libpurple/protocols/msn/msn.c:2599 ../libpurple/protocols/msn/msn.c:2606 msgid "Favorite Things" msgstr "收藏" -#: ../libpurple/protocols/msn/msn.c:2672 +#: ../libpurple/protocols/msn/msn.c:2651 msgid "Last Updated" msgstr "上次更新" -#: ../libpurple/protocols/msn/msn.c:2683 +#: ../libpurple/protocols/msn/msn.c:2662 #: ../libpurple/protocols/silc/ops.c:1043 #: ../libpurple/protocols/silc10/ops.c:1060 msgid "Homepage" msgstr "主页" -#: ../libpurple/protocols/msn/msn.c:2709 +#: ../libpurple/protocols/msn/msn.c:2688 msgid "The user has not created a public profile." msgstr "用户尚未创建公开的个人资料。" -#: ../libpurple/protocols/msn/msn.c:2710 +#: ../libpurple/protocols/msn/msn.c:2689 msgid "" "MSN reported not being able to find the user's profile. This either means " "that the user does not exist, or that the user exists but has not created a " "public profile." msgstr "MSN 找不到用户的个人资料。这可能是因为用户不存在，或者用户没有创建公开的个人资料。" -#: ../libpurple/protocols/msn/msn.c:2714 +#: ../libpurple/protocols/msn/msn.c:2693 msgid "" "Could not find any information in the user's profile. The user most likely " "does not exist." msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。" -#: ../libpurple/protocols/msn/msn.c:2722 +#: ../libpurple/protocols/msn/msn.c:2701 #: ../libpurple/protocols/myspace/user.c:194 #: ../libpurple/protocols/myspace/user.c:197 #: ../libpurple/protocols/oscar/userinfo.c:544 @@ -8156,80 +8156,80 @@ #. *< name #. *< version #. *< summary -#: ../libpurple/protocols/msn/msn.c:3020 ../libpurple/protocols/msn/msn.c:3021 +#: ../libpurple/protocols/msn/msn.c:2999 ../libpurple/protocols/msn/msn.c:3000 msgid "Windows Live Messenger Protocol Plugin" msgstr "Windows Live Messenger 协议插件" -#: ../libpurple/protocols/msn/msn.c:3055 +#: ../libpurple/protocols/msn/msn.c:3034 msgid "Use HTTP Method" msgstr "使用 HTTP 方式" -#: ../libpurple/protocols/msn/msn.c:3060 +#: ../libpurple/protocols/msn/msn.c:3039 msgid "HTTP Method Server" msgstr "HTTP 方式服务器" -#: ../libpurple/protocols/msn/msn.c:3065 +#: ../libpurple/protocols/msn/msn.c:3044 msgid "Show custom smileys" msgstr "显示自定义如下：" -#: ../libpurple/protocols/msn/msn.c:3070 +#: ../libpurple/protocols/msn/msn.c:3049 msgid "Allow direct connections" msgstr "允许直连" -#: ../libpurple/protocols/msn/msn.c:3075 +#: ../libpurple/protocols/msn/msn.c:3054 msgid "Allow connecting from multiple locations" msgstr "允许从多个位置登陆" -#: ../libpurple/protocols/msn/msn.c:3083 +#: ../libpurple/protocols/msn/msn.c:3062 msgid "nudge: nudge a user to get their attention" msgstr "nudge：向用户发送闪屏振动，以便引起他的注意" -#: ../libpurple/protocols/msn/nexus.c:358 +#: ../libpurple/protocols/msn/nexus.c:357 msgid "Windows Live ID authentication:Unable to connect" msgstr "Windows Live ID 验证：无法连接" -#: ../libpurple/protocols/msn/nexus.c:365 +#: ../libpurple/protocols/msn/nexus.c:364 msgid "Windows Live ID authentication:Invalid response" msgstr "Windows Live ID 验证：无效应答" -#: ../libpurple/protocols/msn/notification.c:819 +#: ../libpurple/protocols/msn/notification.c:824 msgid "The following users are missing from your addressbook" msgstr "以下用户不在您的通讯录中" -#: ../libpurple/protocols/msn/notification.c:827 -#: ../libpurple/protocols/msn/notification.c:874 +#: ../libpurple/protocols/msn/notification.c:832 +#: ../libpurple/protocols/msn/notification.c:879 #, c-format msgid "Unknown error (%d): %s" msgstr "未知错误 (%d)： %s" -#: ../libpurple/protocols/msn/notification.c:831 -#: ../libpurple/protocols/msn/notification.c:855 +#: ../libpurple/protocols/msn/notification.c:836 +#: ../libpurple/protocols/msn/notification.c:860 #: ../libpurple/protocols/sametime/sametime.c:4473 msgid "Unable to add user" msgstr "无法添加用户" #. Unknown error! -#: ../libpurple/protocols/msn/notification.c:854 -#: ../libpurple/protocols/msn/notification.c:900 +#: ../libpurple/protocols/msn/notification.c:859 +#: ../libpurple/protocols/msn/notification.c:905 #: ../libpurple/protocols/yahoo/libymsg.c:1997 #, c-format msgid "Unknown error (%d)" msgstr "未知错误 (%d)" -#: ../libpurple/protocols/msn/notification.c:878 -#: ../libpurple/protocols/msn/notification.c:901 +#: ../libpurple/protocols/msn/notification.c:883 +#: ../libpurple/protocols/msn/notification.c:906 msgid "Unable to remove user" msgstr "无法删除用户" -#: ../libpurple/protocols/msn/notification.c:1200 +#: ../libpurple/protocols/msn/notification.c:1205 msgid "Mobile message was not sent because it was too long." msgstr "消息未发出，因为消息太长。" -#: ../libpurple/protocols/msn/notification.c:1202 +#: ../libpurple/protocols/msn/notification.c:1207 msgid "Mobile message was not sent because an unknown error occurred." msgstr "" -#: ../libpurple/protocols/msn/notification.c:2204 +#: ../libpurple/protocols/msn/notification.c:2229 #, c-format msgid "" "The MSN server will shut down for maintenance in %d minute. You will " @@ -8268,6 +8268,27 @@ msgid "Message was not sent because an unknown error occurred." msgstr "消息未发出，因为发生了未知错误。" +#: ../libpurple/protocols/msn/oim.c:671 +#, c-format +msgid "" +"%s (There was an error receiving this message. Converting the encoding from " +"%s to UTF-8 failed.)" +msgstr "" + +#: ../libpurple/protocols/msn/oim.c:686 +#, c-format +msgid "" +"%s (There was an error receiving this message. The charset was %s, but it " +"was not valid UTF-8.)" +msgstr "" + +#: ../libpurple/protocols/msn/oim.c:690 +#, c-format +msgid "" +"%s (There was an error receiving this message. The charset was missing, but " +"it was not valid UTF-8.)" +msgstr "" + #: ../libpurple/protocols/msn/servconn.c:145 msgid "Writing error" msgstr "写入错误" @@ -8553,7 +8574,7 @@ msgstr "" #: ../libpurple/protocols/mxit/actions.c:482 -#: ../libpurple/protocols/oscar/oscar.c:5364 +#: ../libpurple/protocols/oscar/oscar.c:5350 msgid "_Search" msgstr "搜索(_S)" @@ -9755,8 +9776,8 @@ #. #: ../libpurple/protocols/oscar/authorization.c:98 #: ../libpurple/protocols/oscar/oscar.c:1223 -#: ../libpurple/protocols/oscar/oscar.c:4967 -#: ../libpurple/protocols/oscar/oscar.c:5307 ../libpurple/request.h:1498 +#: ../libpurple/protocols/oscar/oscar.c:4953 +#: ../libpurple/protocols/oscar/oscar.c:5293 ../libpurple/request.h:1498 msgid "_OK" msgstr "确定(_O)" @@ -10102,17 +10123,17 @@ msgstr "文件 %s 是 %s，它比最大尺寸 %s 要大。" #: ../libpurple/protocols/oscar/oscar.c:157 -#: ../libpurple/protocols/oscar/oscar.c:4802 +#: ../libpurple/protocols/oscar/oscar.c:4788 msgid "Free For Chat" msgstr "无事闲聊" #: ../libpurple/protocols/oscar/oscar.c:161 -#: ../libpurple/protocols/oscar/oscar.c:4884 +#: ../libpurple/protocols/oscar/oscar.c:4870 msgid "Not Available" msgstr "不可用" #: ../libpurple/protocols/oscar/oscar.c:163 -#: ../libpurple/protocols/oscar/oscar.c:4870 +#: ../libpurple/protocols/oscar/oscar.c:4856 msgid "Occupied" msgstr "琐事缠身" @@ -10127,22 +10148,22 @@ msgstr "隐身" #: ../libpurple/protocols/oscar/oscar.c:171 -#: ../libpurple/protocols/oscar/oscar.c:4810 +#: ../libpurple/protocols/oscar/oscar.c:4796 msgid "Evil" msgstr "" #: ../libpurple/protocols/oscar/oscar.c:173 -#: ../libpurple/protocols/oscar/oscar.c:4818 +#: ../libpurple/protocols/oscar/oscar.c:4804 msgid "Depression" msgstr "沮丧" #: ../libpurple/protocols/oscar/oscar.c:175 -#: ../libpurple/protocols/oscar/oscar.c:4826 +#: ../libpurple/protocols/oscar/oscar.c:4812 msgid "At home" msgstr "在家" #: ../libpurple/protocols/oscar/oscar.c:177 -#: ../libpurple/protocols/oscar/oscar.c:4834 +#: ../libpurple/protocols/oscar/oscar.c:4820 msgid "At work" msgstr "在上班" @@ -10340,7 +10361,7 @@ msgstr "您是否想要将此人加为好友？" #: ../libpurple/protocols/oscar/oscar.c:2043 ../pidgin/gtkroomlist.c:325 -#: ../pidgin/plugins/disco/gtkdisco.c:692 +#: ../pidgin/plugins/disco/gtkdisco.c:694 msgid "_Add" msgstr "添加(_A)" @@ -10620,162 +10641,162 @@ msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats." msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。" -#: ../libpurple/protocols/oscar/oscar.c:4796 +#: ../libpurple/protocols/oscar/oscar.c:4782 msgid "iTunes Music Store Link" msgstr "iTunes 音乐商店链接" -#: ../libpurple/protocols/oscar/oscar.c:4843 +#: ../libpurple/protocols/oscar/oscar.c:4829 msgid "Lunch" msgstr "午餐" -#: ../libpurple/protocols/oscar/oscar.c:4964 +#: ../libpurple/protocols/oscar/oscar.c:4950 #, c-format msgid "Buddy Comment for %s" msgstr "%s 的好友注释" -#: ../libpurple/protocols/oscar/oscar.c:4965 +#: ../libpurple/protocols/oscar/oscar.c:4951 msgid "Buddy Comment:" msgstr "好友注释：" -#: ../libpurple/protocols/oscar/oscar.c:5014 +#: ../libpurple/protocols/oscar/oscar.c:5000 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "您选择了与 %s 进行二人世界直连聊天。" -#: ../libpurple/protocols/oscar/oscar.c:5018 +#: ../libpurple/protocols/oscar/oscar.c:5004 msgid "" "Because this reveals your IP address, it may be considered a security risk. " "Do you wish to continue?" msgstr "由于这样将暴露您的 IP 地址，所以可能带来潜在的隐私风险。您是否想要继续？" -#: ../libpurple/protocols/oscar/oscar.c:5024 -#: ../libpurple/protocols/oscar/peer.c:1065 +#: ../libpurple/protocols/oscar/oscar.c:5010 +#: ../libpurple/protocols/oscar/peer.c:1074 msgid "C_onnect" msgstr "连接(_O)" -#: ../libpurple/protocols/oscar/oscar.c:5062 +#: ../libpurple/protocols/oscar/oscar.c:5048 msgid "You closed the connection." msgstr "您关闭了连接。" -#: ../libpurple/protocols/oscar/oscar.c:5122 +#: ../libpurple/protocols/oscar/oscar.c:5108 msgid "Get AIM Info" msgstr "获得 AIM 信息" #. We only do this if the user is in our buddy list -#: ../libpurple/protocols/oscar/oscar.c:5131 +#: ../libpurple/protocols/oscar/oscar.c:5117 msgid "Edit Buddy Comment" msgstr "编辑好友注释" -#: ../libpurple/protocols/oscar/oscar.c:5139 +#: ../libpurple/protocols/oscar/oscar.c:5125 msgid "Get X-Status Msg" msgstr "获取 X-状态消息" -#: ../libpurple/protocols/oscar/oscar.c:5157 +#: ../libpurple/protocols/oscar/oscar.c:5143 msgid "End Direct IM Session" msgstr "结束二人世界直连聊天" -#: ../libpurple/protocols/oscar/oscar.c:5163 +#: ../libpurple/protocols/oscar/oscar.c:5149 msgid "Direct IM" msgstr "二人世界" -#: ../libpurple/protocols/oscar/oscar.c:5181 +#: ../libpurple/protocols/oscar/oscar.c:5167 msgid "Re-request Authorization" msgstr "重新请求认证" -#: ../libpurple/protocols/oscar/oscar.c:5240 +#: ../libpurple/protocols/oscar/oscar.c:5226 msgid "Require authorization" msgstr "请求认证" -#: ../libpurple/protocols/oscar/oscar.c:5243 +#: ../libpurple/protocols/oscar/oscar.c:5229 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "网络感知（启用它将导致您接收垃圾信息!）" -#: ../libpurple/protocols/oscar/oscar.c:5248 +#: ../libpurple/protocols/oscar/oscar.c:5234 msgid "ICQ Privacy Options" msgstr "ICQ 隐私选项" -#: ../libpurple/protocols/oscar/oscar.c:5305 +#: ../libpurple/protocols/oscar/oscar.c:5291 msgid "Change Address To:" msgstr "将地址更改为：" -#: ../libpurple/protocols/oscar/oscar.c:5338 +#: ../libpurple/protocols/oscar/oscar.c:5324 msgid "you are not waiting for authorization" msgstr "您并不在等候认证" -#: ../libpurple/protocols/oscar/oscar.c:5341 +#: ../libpurple/protocols/oscar/oscar.c:5327 msgid "You are awaiting authorization from the following buddies" msgstr "您正在等待下列好友的认证" -#: ../libpurple/protocols/oscar/oscar.c:5342 +#: ../libpurple/protocols/oscar/oscar.c:5328 msgid "" "You can re-request authorization from these buddies by right-clicking on " "them and selecting \"Re-request Authorization.\"" msgstr "如果您想要向这些好友重新请求认证，只需用鼠标右键单击这些好友，然后单击“重新请求认证”。" -#: ../libpurple/protocols/oscar/oscar.c:5359 +#: ../libpurple/protocols/oscar/oscar.c:5345 msgid "Find Buddy by Email" msgstr "按电子邮件查找好友" -#: ../libpurple/protocols/oscar/oscar.c:5360 +#: ../libpurple/protocols/oscar/oscar.c:5346 msgid "Search for a buddy by email address" msgstr "按电子邮件地址搜索好友" -#: ../libpurple/protocols/oscar/oscar.c:5361 +#: ../libpurple/protocols/oscar/oscar.c:5347 msgid "Type the email address of the buddy you are searching for." msgstr "输入您想要搜索的好友的电子邮件地址。" -#: ../libpurple/protocols/oscar/oscar.c:5522 +#: ../libpurple/protocols/oscar/oscar.c:5508 msgid "Set User Info (web)..." msgstr "设置用户信息(web)..." #. This only happens when connecting with the old-style BUCP login -#: ../libpurple/protocols/oscar/oscar.c:5534 +#: ../libpurple/protocols/oscar/oscar.c:5520 msgid "Change Password (web)" msgstr "更改密码(web)" -#: ../libpurple/protocols/oscar/oscar.c:5541 +#: ../libpurple/protocols/oscar/oscar.c:5527 msgid "Configure IM Forwarding (web)" msgstr "配置聊天转发(web)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:5551 +#: ../libpurple/protocols/oscar/oscar.c:5537 msgid "Set Privacy Options..." msgstr "设置隐私选项..." -#: ../libpurple/protocols/oscar/oscar.c:5555 +#: ../libpurple/protocols/oscar/oscar.c:5541 msgid "Show Visible List" msgstr "显示可见列表" -#: ../libpurple/protocols/oscar/oscar.c:5558 +#: ../libpurple/protocols/oscar/oscar.c:5544 msgid "Show Invisible List" msgstr "显示可见列表" #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:5564 +#: ../libpurple/protocols/oscar/oscar.c:5550 msgid "Confirm Account" msgstr "确认帐号" -#: ../libpurple/protocols/oscar/oscar.c:5568 +#: ../libpurple/protocols/oscar/oscar.c:5554 msgid "Display Currently Registered Email Address" msgstr "显示当前注册的电子邮件地址" -#: ../libpurple/protocols/oscar/oscar.c:5572 +#: ../libpurple/protocols/oscar/oscar.c:5558 msgid "Change Currently Registered Email Address..." msgstr "更改当前注册的电子邮件地址..." -#: ../libpurple/protocols/oscar/oscar.c:5579 +#: ../libpurple/protocols/oscar/oscar.c:5565 msgid "Show Buddies Awaiting Authorization" msgstr "显示正在等候认证的好友" -#: ../libpurple/protocols/oscar/oscar.c:5585 +#: ../libpurple/protocols/oscar/oscar.c:5571 msgid "Search for Buddy by Email Address..." msgstr "按电子邮件搜索好友..." -#: ../libpurple/protocols/oscar/oscar.c:5800 +#: ../libpurple/protocols/oscar/oscar.c:5786 msgid "Use clientLogin" msgstr "使用客户端登录" -#: ../libpurple/protocols/oscar/oscar.c:5805 +#: ../libpurple/protocols/oscar/oscar.c:5791 msgid "" "Always use AIM/ICQ proxy server for\n" "file transfers and direct IM (slower,\n" @@ -10785,30 +10806,30 @@ "代理服务器(较慢，但不会暴露您的 IP \n" "地址)" -#: ../libpurple/protocols/oscar/oscar.c:5810 +#: ../libpurple/protocols/oscar/oscar.c:5796 msgid "Allow multiple simultaneous logins" msgstr "" -#: ../libpurple/protocols/oscar/peer.c:706 +#: ../libpurple/protocols/oscar/peer.c:724 #, c-format msgid "Asking %s to connect to us at %s:%hu for Direct IM." msgstr "请求 %s 连接到 %s：%hu 的二人世界。" -#: ../libpurple/protocols/oscar/peer.c:800 +#: ../libpurple/protocols/oscar/peer.c:809 #, c-format msgid "Attempting to connect to %s:%hu." msgstr "正在试图连接到 %s：%hu。" -#: ../libpurple/protocols/oscar/peer.c:874 +#: ../libpurple/protocols/oscar/peer.c:883 msgid "Attempting to connect via proxy server." msgstr "正在试图通过代理服务器连接。" -#: ../libpurple/protocols/oscar/peer.c:1053 +#: ../libpurple/protocols/oscar/peer.c:1062 #, c-format msgid "%s has just asked to directly connect to %s" msgstr "%s 刚刚请求于 %s 进行二人世界直连聊天" -#: ../libpurple/protocols/oscar/peer.c:1057 +#: ../libpurple/protocols/oscar/peer.c:1066 msgid "" "This requires a direct connection between the two computers and is necessary " "for IM Images. Because your IP address will be revealed, this may be " @@ -12616,7 +12637,7 @@ msgstr "您现在的心情" #: ../libpurple/protocols/silc/silc.c:981 -#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2394 +#: ../libpurple/protocols/silc10/silc.c:677 ../pidgin/gtkprefs.c:2411 #, c-format msgid "Normal" msgstr "普通" @@ -12993,7 +13014,7 @@ msgstr "安全网际实时会议(SILC)协议" #: ../libpurple/protocols/silc/silc.c:2189 -#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2786 +#: ../libpurple/protocols/silc10/silc.c:1902 ../pidgin/gtkprefs.c:2803 msgid "Network" msgstr "网络" @@ -13312,7 +13333,7 @@ msgid "Use proxy" msgstr "使用代理" -#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2787 +#: ../libpurple/protocols/simple/simple.c:2177 ../pidgin/gtkprefs.c:2804 msgid "Proxy" msgstr "代理" @@ -14282,27 +14303,27 @@ msgstr " (%s)" #. 10053 -#: ../libpurple/win32/libc_interface.c:320 +#: ../libpurple/win32/libc_interface.c:364 msgid "Connection interrupted by other software on your computer." msgstr "连接被您计算机上的其他软件中断。" #. 10054 -#: ../libpurple/win32/libc_interface.c:323 +#: ../libpurple/win32/libc_interface.c:367 msgid "Remote host closed connection." msgstr "远程主机关闭了连接。" #. 10060 -#: ../libpurple/win32/libc_interface.c:326 +#: ../libpurple/win32/libc_interface.c:370 msgid "Connection timed out." msgstr "连接超时。" #. 10061 -#: ../libpurple/win32/libc_interface.c:329 +#: ../libpurple/win32/libc_interface.c:373 msgid "Connection refused." msgstr "连接被拒绝。" #. 10048 -#: ../libpurple/win32/libc_interface.c:332 +#: ../libpurple/win32/libc_interface.c:376 msgid "Address already in use." msgstr "此地址已被使用。" @@ -14382,23 +14403,23 @@ msgid "No Proxy" msgstr "无代理" -#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2096 +#: ../pidgin/gtkaccount.c:1006 ../pidgin/gtkprefs.c:2113 msgid "SOCKS 4" msgstr "SOCKS 4" -#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2097 +#: ../pidgin/gtkaccount.c:1012 ../pidgin/gtkprefs.c:2114 msgid "SOCKS 5" msgstr "SOCKS 5" -#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2098 +#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:2115 msgid "Tor/Privacy (SOCKS5)" msgstr "" -#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2099 +#: ../pidgin/gtkaccount.c:1024 ../pidgin/gtkprefs.c:2116 msgid "HTTP" msgstr "HTTP" -#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2100 +#: ../pidgin/gtkaccount.c:1030 ../pidgin/gtkprefs.c:2117 msgid "Use Environmental Settings" msgstr "使用环境设置" @@ -14420,7 +14441,7 @@ msgid "Proxy _type:" msgstr "代理类型(_T)：" -#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2116 +#: ../pidgin/gtkaccount.c:1117 ../pidgin/gtkprefs.c:2133 msgid "_Host:" msgstr "主机(_H)：" @@ -14428,7 +14449,7 @@ msgid "_Port:" msgstr "端口(_P)：" -#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2168 +#: ../pidgin/gtkaccount.c:1138 ../pidgin/gtkprefs.c:2185 msgid "Pa_ssword:" msgstr "密码(_S)：" @@ -15702,7 +15723,7 @@ msgid "Separate IM and Chat windows" msgstr "分离即时消息和聊天窗口" -#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2000 +#: ../pidgin/gtkconv.c:10068 ../pidgin/gtkprefs.c:2009 msgid "New window" msgstr "新建窗口" @@ -16181,16 +16202,12 @@ msgid "Urdu" msgstr "乌尔都语" -#: ../pidgin/gtkdialogs.c:249 +#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:322 msgid "Vietnamese" msgstr "越南语" -#: ../pidgin/gtkdialogs.c:249 -msgid "T.M.Thanh and the Gnome-Vi Team" -msgstr "T.M.Thanh 及Gnome 越南语小组" - -#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:322 -#: ../pidgin/gtkdialogs.c:323 +#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:323 +#: ../pidgin/gtkdialogs.c:324 msgid "Simplified Chinese" msgstr "中文(简体)" @@ -16200,7 +16217,7 @@ msgstr "中文(香港)" #: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255 -#: ../pidgin/gtkdialogs.c:324 +#: ../pidgin/gtkdialogs.c:325 msgid "Traditional Chinese" msgstr "中文(繁体)" @@ -16213,7 +16230,11 @@ msgid "Lithuanian" msgstr "立陶宛语" -#: ../pidgin/gtkdialogs.c:495 +#: ../pidgin/gtkdialogs.c:322 +msgid "T.M.Thanh and the Gnome-Vi Team" +msgstr "T.M.Thanh 及Gnome 越南语小组" + +#: ../pidgin/gtkdialogs.c:496 #, c-format msgid "" "%s is a messaging client based on libpurple which is capable of connecting " @@ -16227,7 +16248,7 @@ "或更高版本许可下发布，允许在此许可下自由地使用、更改和再发布，许可证文本已随 %s 一起发布。%s 的版权属于其贡献者，该列表也随 %s 一起发布。%s " "及其贡献者不对其提供任何担保。

" -#: ../pidgin/gtkdialogs.c:505 +#: ../pidgin/gtkdialogs.c:506 #, c-format msgid "" "Helpful Resources
\t常见问题
\tIRC 频道：#pidgin (irc.freenode.net)
\tXMPP MUC: " "devel@conference.pidgin.im

" -#: ../pidgin/gtkdialogs.c:512 +#: ../pidgin/gtkdialogs.c:513 #, c-format msgid "" "Help from other Pidgin users is available by " @@ -16257,114 +16278,114 @@ "href=\"http://pidgin.im/pipermail/support/\">存档。
我们无法为第三方的协议或者插件提供支持。" "该邮件列表的基本交流语言是英语，虽然您可以使用其他语言进行求助，但响应的人数以及所能提供的帮助会因此而减少。
" -#: ../pidgin/gtkdialogs.c:522 +#: ../pidgin/gtkdialogs.c:523 #, c-format msgid "About %s" msgstr "关于 %s" -#: ../pidgin/gtkdialogs.c:544 +#: ../pidgin/gtkdialogs.c:545 msgid "Build Information" msgstr "编译信息" #. End of not to be translated section -#: ../pidgin/gtkdialogs.c:713 +#: ../pidgin/gtkdialogs.c:714 #, c-format msgid "%s Build Information" msgstr "%s 编译信息" -#: ../pidgin/gtkdialogs.c:734 +#: ../pidgin/gtkdialogs.c:735 msgid "Current Developers" msgstr "当前开发者" -#: ../pidgin/gtkdialogs.c:740 +#: ../pidgin/gtkdialogs.c:741 msgid "Crazy Patch Writers" msgstr "疯狂补丁编写者" -#: ../pidgin/gtkdialogs.c:746 +#: ../pidgin/gtkdialogs.c:747 msgid "Retired Developers" msgstr "退休开发者" -#: ../pidgin/gtkdialogs.c:752 +#: ../pidgin/gtkdialogs.c:753 msgid "Retired Crazy Patch Writers" msgstr "退休的疯狂补丁编写者" -#: ../pidgin/gtkdialogs.c:755 +#: ../pidgin/gtkdialogs.c:756 #, c-format msgid "%s Developer Information" msgstr "%s 开放者信息" -#: ../pidgin/gtkdialogs.c:776 +#: ../pidgin/gtkdialogs.c:777 msgid "Current Translators" msgstr "当前翻译者" -#: ../pidgin/gtkdialogs.c:782 +#: ../pidgin/gtkdialogs.c:783 msgid "Past Translators" msgstr "先前翻译者" -#: ../pidgin/gtkdialogs.c:785 +#: ../pidgin/gtkdialogs.c:786 #, c-format msgid "%s Translator Information" msgstr "%s 翻译者信息" -#: ../pidgin/gtkdialogs.c:796 +#: ../pidgin/gtkdialogs.c:797 #, c-format msgid "%s Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:805 +#: ../pidgin/gtkdialogs.c:806 msgid "Plugin Information" msgstr "" -#: ../pidgin/gtkdialogs.c:861 ../pidgin/gtkdialogs.c:1000 -#: ../pidgin/gtkdialogs.c:1081 +#: ../pidgin/gtkdialogs.c:862 ../pidgin/gtkdialogs.c:1001 +#: ../pidgin/gtkdialogs.c:1082 msgid "_Name" msgstr "名称(_N)" -#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:1005 -#: ../pidgin/gtkdialogs.c:1086 +#: ../pidgin/gtkdialogs.c:867 ../pidgin/gtkdialogs.c:1006 +#: ../pidgin/gtkdialogs.c:1087 msgid "_Account" msgstr "帐号(_A)" -#: ../pidgin/gtkdialogs.c:1013 +#: ../pidgin/gtkdialogs.c:1014 msgid "Get User Info" msgstr "获取用户信息" -#: ../pidgin/gtkdialogs.c:1015 +#: ../pidgin/gtkdialogs.c:1016 msgid "" "Please enter the username or alias of the person whose info you would like " "to view." msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。" -#: ../pidgin/gtkdialogs.c:1105 +#: ../pidgin/gtkdialogs.c:1106 msgid "View User Log" msgstr "查看用户聊天记录" -#: ../pidgin/gtkdialogs.c:1127 +#: ../pidgin/gtkdialogs.c:1128 msgid "Alias Contact" msgstr "给联系人起名" -#: ../pidgin/gtkdialogs.c:1128 +#: ../pidgin/gtkdialogs.c:1129 msgid "Enter an alias for this contact." msgstr "请输入此联系人的别名。" -#: ../pidgin/gtkdialogs.c:1150 +#: ../pidgin/gtkdialogs.c:1151 #, c-format msgid "Enter an alias for %s." msgstr "输入 %s 的别名。" -#: ../pidgin/gtkdialogs.c:1152 +#: ../pidgin/gtkdialogs.c:1153 msgid "Alias Buddy" msgstr "好友别名" -#: ../pidgin/gtkdialogs.c:1173 +#: ../pidgin/gtkdialogs.c:1174 msgid "Alias Chat" msgstr "给聊天起名" -#: ../pidgin/gtkdialogs.c:1174 +#: ../pidgin/gtkdialogs.c:1175 msgid "Enter an alias for this chat." msgstr "请输入此聊天的别名。" -#: ../pidgin/gtkdialogs.c:1213 +#: ../pidgin/gtkdialogs.c:1214 #, c-format msgid "" "You are about to remove the contact containing %s and %d other buddy from " @@ -16374,70 +16395,70 @@ "your buddy list. Do you want to continue?" msgstr[0] "您正要从好友列表中删除 %s 及其他 %d 位联系人。您确定要继续吗？" -#: ../pidgin/gtkdialogs.c:1221 +#: ../pidgin/gtkdialogs.c:1222 msgid "Remove Contact" msgstr "删除联系人" -#: ../pidgin/gtkdialogs.c:1224 +#: ../pidgin/gtkdialogs.c:1225 msgid "_Remove Contact" msgstr "删除联系人(_R)" -#: ../pidgin/gtkdialogs.c:1255 +#: ../pidgin/gtkdialogs.c:1256 #, c-format msgid "" "You are about to merge the group called %s into the group called %s. Do you " "want to continue?" msgstr "您即将把 %s 组合并到 %s 组中。您真的要这么做吗？" -#: ../pidgin/gtkdialogs.c:1262 +#: ../pidgin/gtkdialogs.c:1263 msgid "Merge Groups" msgstr "合并组" -#: ../pidgin/gtkdialogs.c:1265 +#: ../pidgin/gtkdialogs.c:1266 msgid "_Merge Groups" msgstr "合并组(_M)" -#: ../pidgin/gtkdialogs.c:1315 +#: ../pidgin/gtkdialogs.c:1316 #, c-format msgid "" "You are about to remove the group %s and all its members from your buddy " "list. Do you want to continue?" msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗？" -#: ../pidgin/gtkdialogs.c:1318 +#: ../pidgin/gtkdialogs.c:1319 msgid "Remove Group" msgstr "删除组" -#: ../pidgin/gtkdialogs.c:1321 +#: ../pidgin/gtkdialogs.c:1322 msgid "_Remove Group" msgstr "删除组(_R)" -#: ../pidgin/gtkdialogs.c:1354 +#: ../pidgin/gtkdialogs.c:1355 #, c-format msgid "" "You are about to remove %s from your buddy list. Do you want to continue?" msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗？" -#: ../pidgin/gtkdialogs.c:1357 +#: ../pidgin/gtkdialogs.c:1358 msgid "Remove Buddy" msgstr "删除好友" -#: ../pidgin/gtkdialogs.c:1360 +#: ../pidgin/gtkdialogs.c:1361 msgid "_Remove Buddy" msgstr "删除好友(_R)" -#: ../pidgin/gtkdialogs.c:1381 +#: ../pidgin/gtkdialogs.c:1382 #, c-format msgid "" "You are about to remove the chat %s from your buddy list. Do you want to " "continue?" msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗？" -#: ../pidgin/gtkdialogs.c:1384 +#: ../pidgin/gtkdialogs.c:1385 msgid "Remove Chat" msgstr "删除聊天" -#: ../pidgin/gtkdialogs.c:1387 +#: ../pidgin/gtkdialogs.c:1388 msgid "_Remove Chat" msgstr "删除聊天(_R)" @@ -17199,7 +17220,7 @@ msgstr "监视对象" #: ../pidgin/gtkpounce.c:564 ../pidgin/gtkroomlist.c:548 -#: ../pidgin/plugins/disco/gtkdisco.c:651 +#: ../pidgin/plugins/disco/gtkdisco.c:653 msgid "_Account:" msgstr "帐号(_A)：" @@ -17275,7 +17296,7 @@ msgid "Br_owse..." msgstr "浏览(_O)..." -#: ../pidgin/gtkpounce.c:698 ../pidgin/gtkprefs.c:2637 +#: ../pidgin/gtkpounce.c:698 ../pidgin/gtkprefs.c:2654 msgid "Pre_view" msgstr "预览(_V)" @@ -17425,7 +17446,7 @@ msgid "_Hide new IM conversations:" msgstr "隐藏新的 IM 对话(_H)：" -#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2733 +#: ../pidgin/gtkprefs.c:1358 ../pidgin/gtkprefs.c:2750 msgid "When away" msgstr "离开时" @@ -17690,35 +17711,35 @@ msgid "Browser preferences are configured in GNOME preferences" msgstr "代理服务器及浏览器是在 GNOME 首选项中配置的" -#: ../pidgin/gtkprefs.c:1972 +#: ../pidgin/gtkprefs.c:1981 msgid "Browser configuration program was not found." msgstr "未发现浏览器配置程序。" -#: ../pidgin/gtkprefs.c:1975 +#: ../pidgin/gtkprefs.c:1984 msgid "Configure _Browser" msgstr "配置浏览器(_B)" -#: ../pidgin/gtkprefs.c:1988 +#: ../pidgin/gtkprefs.c:1997 msgid "_Browser:" msgstr "浏览器(_B)：" -#: ../pidgin/gtkprefs.c:1996 +#: ../pidgin/gtkprefs.c:2005 msgid "_Open link in:" msgstr "打开链接的方式(_O)：" -#: ../pidgin/gtkprefs.c:1998 +#: ../pidgin/gtkprefs.c:2007 msgid "Browser default" msgstr "浏览器默认" -#: ../pidgin/gtkprefs.c:1999 +#: ../pidgin/gtkprefs.c:2008 msgid "Existing window" msgstr "现有窗口" -#: ../pidgin/gtkprefs.c:2001 +#: ../pidgin/gtkprefs.c:2010 msgid "New tab" msgstr "新建标签" -#: ../pidgin/gtkprefs.c:2018 +#: ../pidgin/gtkprefs.c:2027 #, c-format msgid "" "_Manual:\n" @@ -17727,107 +17748,107 @@ "手动(_M):\n" "(%s 代表 URL)" -#: ../pidgin/gtkprefs.c:2050 +#: ../pidgin/gtkprefs.c:2059 msgid "Proxy Server" msgstr "代理服务器" -#: ../pidgin/gtkprefs.c:2057 +#: ../pidgin/gtkprefs.c:2066 msgid "Proxy preferences are configured in GNOME preferences" msgstr "代理服务器及浏览器是在 GNOME 首选项中配置的" -#: ../pidgin/gtkprefs.c:2071 +#: ../pidgin/gtkprefs.c:2088 msgid "Proxy configuration program was not found." msgstr "未发现代理设定程序。" -#: ../pidgin/gtkprefs.c:2074 +#: ../pidgin/gtkprefs.c:2091 msgid "Configure _Proxy" msgstr "配置代理服务器(_P)" #. This is a global option that affects SOCKS4 usage even with #. * account-specific proxy settings -#: ../pidgin/gtkprefs.c:2089 +#: ../pidgin/gtkprefs.c:2106 msgid "Use remote _DNS with SOCKS4 proxies" msgstr "通过 SOCKS4 代理使用远程 _DNS" -#: ../pidgin/gtkprefs.c:2093 +#: ../pidgin/gtkprefs.c:2110 msgid "Proxy t_ype:" msgstr "代理类型(_T)：" -#: ../pidgin/gtkprefs.c:2095 +#: ../pidgin/gtkprefs.c:2112 msgid "No proxy" msgstr "无代理" -#: ../pidgin/gtkprefs.c:2134 +#: ../pidgin/gtkprefs.c:2151 msgid "P_ort:" msgstr "端口(_O)：" -#: ../pidgin/gtkprefs.c:2150 +#: ../pidgin/gtkprefs.c:2167 msgid "User_name:" msgstr "用户名(_N)：" -#: ../pidgin/gtkprefs.c:2211 +#: ../pidgin/gtkprefs.c:2228 msgid "Log _format:" msgstr "聊天记录格式(_F)：" -#: ../pidgin/gtkprefs.c:2216 +#: ../pidgin/gtkprefs.c:2233 msgid "Log all _instant messages" msgstr "记录所有即时消息(_I)" -#: ../pidgin/gtkprefs.c:2218 +#: ../pidgin/gtkprefs.c:2235 msgid "Log all c_hats" msgstr "记录所有聊天(_H)" -#: ../pidgin/gtkprefs.c:2220 +#: ../pidgin/gtkprefs.c:2237 msgid "Log all _status changes to system log" msgstr "将全部状态都记录到系统日志中(_S)" -#: ../pidgin/gtkprefs.c:2377 +#: ../pidgin/gtkprefs.c:2394 msgid "Sound Selection" msgstr "声音选择" -#: ../pidgin/gtkprefs.c:2388 +#: ../pidgin/gtkprefs.c:2405 #, c-format msgid "Quietest" msgstr "最小" -#: ../pidgin/gtkprefs.c:2390 +#: ../pidgin/gtkprefs.c:2407 #, c-format msgid "Quieter" msgstr "较小" -#: ../pidgin/gtkprefs.c:2392 +#: ../pidgin/gtkprefs.c:2409 #, c-format msgid "Quiet" msgstr "小" -#: ../pidgin/gtkprefs.c:2396 +#: ../pidgin/gtkprefs.c:2413 #, c-format msgid "Loud" msgstr "大" -#: ../pidgin/gtkprefs.c:2398 +#: ../pidgin/gtkprefs.c:2415 #, c-format msgid "Louder" msgstr "较大" -#: ../pidgin/gtkprefs.c:2400 +#: ../pidgin/gtkprefs.c:2417 #, c-format msgid "Loudest" msgstr "最大" -#: ../pidgin/gtkprefs.c:2492 +#: ../pidgin/gtkprefs.c:2509 msgid "_Method:" msgstr "方式(_M)：" -#: ../pidgin/gtkprefs.c:2494 +#: ../pidgin/gtkprefs.c:2511 msgid "Console beep" msgstr "控制台响铃" -#: ../pidgin/gtkprefs.c:2501 +#: ../pidgin/gtkprefs.c:2518 msgid "No sounds" msgstr "无声音" -#: ../pidgin/gtkprefs.c:2514 +#: ../pidgin/gtkprefs.c:2531 #, c-format msgid "" "Sound c_ommand:\n" @@ -17836,84 +17857,84 @@ "声音命令(_O)：\n" "(%s 代表文件名)" -#: ../pidgin/gtkprefs.c:2522 +#: ../pidgin/gtkprefs.c:2539 msgid "M_ute sounds" msgstr "静音(_U)" -#: ../pidgin/gtkprefs.c:2525 +#: ../pidgin/gtkprefs.c:2542 msgid "Sounds when conversation has _focus" msgstr "对话获得焦点后发声(_F)" -#: ../pidgin/gtkprefs.c:2527 +#: ../pidgin/gtkprefs.c:2544 msgid "_Enable sounds:" msgstr "开启声音(_E)：" -#: ../pidgin/gtkprefs.c:2544 +#: ../pidgin/gtkprefs.c:2561 msgid "V_olume:" msgstr "音量(_O)：" -#: ../pidgin/gtkprefs.c:2605 +#: ../pidgin/gtkprefs.c:2622 msgid "Play" msgstr "播放" -#: ../pidgin/gtkprefs.c:2633 +#: ../pidgin/gtkprefs.c:2650 msgid "_Browse..." msgstr "浏览(_B)..." -#: ../pidgin/gtkprefs.c:2641 +#: ../pidgin/gtkprefs.c:2658 msgid "_Reset" msgstr "重置(_R)" -#: ../pidgin/gtkprefs.c:2694 +#: ../pidgin/gtkprefs.c:2711 msgid "_Report idle time:" msgstr "报告发呆时间(_R)：" -#: ../pidgin/gtkprefs.c:2699 +#: ../pidgin/gtkprefs.c:2716 msgid "Based on keyboard or mouse use" msgstr "根据键盘或鼠标使用" -#: ../pidgin/gtkprefs.c:2706 +#: ../pidgin/gtkprefs.c:2723 msgid "_Minutes before becoming idle:" msgstr "更改状态前等几分钟(_M)：" -#: ../pidgin/gtkprefs.c:2712 +#: ../pidgin/gtkprefs.c:2729 msgid "Change to this status when _idle:" msgstr "发呆时更改状态(_I)：" -#: ../pidgin/gtkprefs.c:2730 +#: ../pidgin/gtkprefs.c:2747 msgid "_Auto-reply:" msgstr "自动回复(_A)：" -#: ../pidgin/gtkprefs.c:2734 +#: ../pidgin/gtkprefs.c:2751 msgid "When both away and idle" msgstr "离开和发呆时" #. Signon status stuff -#: ../pidgin/gtkprefs.c:2740 +#: ../pidgin/gtkprefs.c:2757 msgid "Status at Startup" msgstr "启动时的状态" -#: ../pidgin/gtkprefs.c:2742 +#: ../pidgin/gtkprefs.c:2759 msgid "Use status from last _exit at startup" msgstr "启动时使用上次退出时的状态(_E)" -#: ../pidgin/gtkprefs.c:2751 +#: ../pidgin/gtkprefs.c:2768 msgid "Status to a_pply at startup:" msgstr "启动时应用的状态(_P)：" -#: ../pidgin/gtkprefs.c:2775 +#: ../pidgin/gtkprefs.c:2792 msgid "Interface" msgstr "界面" -#: ../pidgin/gtkprefs.c:2781 +#: ../pidgin/gtkprefs.c:2798 msgid "Browser" msgstr "浏览器" -#: ../pidgin/gtkprefs.c:2790 +#: ../pidgin/gtkprefs.c:2807 msgid "Status / Idle" msgstr "状态和发呆" -#: ../pidgin/gtkprefs.c:2791 +#: ../pidgin/gtkprefs.c:2808 msgid "Themes" msgstr "主题" @@ -18540,27 +18561,27 @@ msgid "Add to Buddy List" msgstr "发送好友列表" -#: ../pidgin/plugins/disco/gtkdisco.c:472 +#: ../pidgin/plugins/disco/gtkdisco.c:474 msgid "Gateway" msgstr "离开" -#: ../pidgin/plugins/disco/gtkdisco.c:476 +#: ../pidgin/plugins/disco/gtkdisco.c:478 msgid "Directory" msgstr "聊天记录目录" -#: ../pidgin/plugins/disco/gtkdisco.c:484 +#: ../pidgin/plugins/disco/gtkdisco.c:486 msgid "PubSub Collection" msgstr "声音选择" -#: ../pidgin/plugins/disco/gtkdisco.c:488 +#: ../pidgin/plugins/disco/gtkdisco.c:490 msgid "PubSub Leaf" msgstr "" -#: ../pidgin/plugins/disco/gtkdisco.c:492 +#: ../pidgin/plugins/disco/gtkdisco.c:494 msgid "Other" msgstr "其它" -#: ../pidgin/plugins/disco/gtkdisco.c:500 +#: ../pidgin/plugins/disco/gtkdisco.c:502 msgid "" "\n" "Description: " @@ -18569,11 +18590,11 @@ "描述： " #. Create the window. -#: ../pidgin/plugins/disco/gtkdisco.c:635 +#: ../pidgin/plugins/disco/gtkdisco.c:637 msgid "Service Discovery" msgstr "服务目录信息" -#: ../pidgin/plugins/disco/gtkdisco.c:676 +#: ../pidgin/plugins/disco/gtkdisco.c:678 msgid "_Browse" msgstr "浏览(_B)" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/po4a.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/po4a.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/po4a.po 2012-02-23 07:11:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/po4a.po 2012-03-23 07:33:11.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: po4a@packages.debian.org\n" "POT-Creation-Date: 2010-11-24 01:24+0100\n" "PO-Revision-Date: 2010-04-14 14:25+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 21:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:40+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: ../../lib/Locale/Po4a/Chooser.pm:26 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/polkit-1.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/polkit-1.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/polkit-1.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/polkit-1.po 2012-03-23 07:33:26.000000000 +0000 @@ -0,0 +1,63 @@ +# Chinese (Simplified) translation for policykit-1 +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the policykit-1 package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: policykit-1\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-01-06 12:53+0000\n" +"PO-Revision-Date: 2012-03-12 15:29+0000\n" +"Last-Translator: YunQiang Su \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-03-22 21:47+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#: ../actions/org.freedesktop.policykit.policy.in.h:1 +msgid "Run programs as another user" +msgstr "以其他身份运行程序" + +#: ../actions/org.freedesktop.policykit.policy.in.h:2 +msgid "Authentication is required to run a program as another user" +msgstr "要以其他身份运行程序，您必须通过验证" + +#: ../actions/org.freedesktop.policykit.policy.in.h:3 +msgid "Configure lock down for an action" +msgstr "设置某个动作的锁定状态" + +#: ../actions/org.freedesktop.policykit.policy.in.h:4 +msgid "Authentication is required to configure lock down policy" +msgstr "要设置锁定规则，您必须通过验证" + +#: ../src/examples/org.freedesktop.policykit.examples.pkexec.policy.in.h:1 +msgid "Run the PolicyKit example program Frobnicate" +msgstr "运行 PolicyKit 的示例程序 - Frobnicate" + +#: ../src/examples/org.freedesktop.policykit.examples.pkexec.policy.in.h:2 +msgid "" +"Authentication is required to run the PolicyKit example program Frobnicate " +"(user=$(user), program=$(program), command_line=$(command_line))" +msgstr "" +"要运行 PolicyKit 的示例程序 Frobnicate (用户名=$(user), 程序=$(program), " +"命令行=$(command_line))，您必须通过验证" + +#. Translators: message shown when trying to run a program as root. Do not +#. * translate the $(program) fragment - it will be expanded to the path +#. * of the program e.g. /bin/bash. +#. +#: ../src/programs/pkexec.c:688 +msgid "Authentication is needed to run `$(program)' as the super user" +msgstr "要以超级用户的身份运行“$(program)” 程序，您必须通过验证" + +#. Translators: message shown when trying to run a program as another user. +#. * Do not translate the $(program) or $(user) fragments - the former will +#. * be expanded to the path of the program e.g. "/bin/bash" and the latter +#. * to the user e.g. "John Doe (johndoe)" or "johndoe". +#. +#: ../src/programs/pkexec.c:698 +msgid "Authentication is needed to run `$(program)' as user $(user)" +msgstr "要以$(user)的身份运行“$(program)”程序，您必须通过验证" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/popt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/popt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/popt.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/popt.po 2012-03-23 07:32:56.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: 2012-02-21 18:44+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:10+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: popt.c:47 msgid "unknown errno" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/powertop.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/powertop.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/powertop.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/powertop.po 2012-03-23 07:33:19.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: 2012-02-21 23:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:48+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: process/do_process.cpp:664 msgid " Usage Events/s Category Description\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppconfig.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pppconfig.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppconfig.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pppconfig.po 2012-03-23 07:32: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: 2012-02-21 18:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/pppoeconf.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pppoeconf.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pppoeconf.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pppoeconf.po 2012-03-23 07:32:58.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: 2012-02-21 18:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../pppoeconf:46 msgid "Please become root before running pppoeconf!" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/psmisc.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/psmisc.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/psmisc.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/psmisc.po 2012-03-23 07:32:58.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: 2012-02-21 18:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: src/fuser.c:118 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pulseaudio.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pulseaudio.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/pulseaudio.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/pulseaudio.po 2012-03-23 07:33:17.000000000 +0000 @@ -11,15 +11,15 @@ msgstr "" "Project-Id-Version: pulseaudio.master-tx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-18 20:17+0000\n" +"POT-Creation-Date: 2012-03-22 00:40+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: 2012-02-21 23:22+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3215 #, c-format @@ -416,23 +416,23 @@ msgid "pa_core_new() failed." msgstr "pa_core_new()失败。" -#: ../src/daemon/main.c:1086 +#: ../src/daemon/main.c:1091 msgid "Failed to initialize daemon." msgstr "后台程序初始化失败。" -#: ../src/daemon/main.c:1091 +#: ../src/daemon/main.c:1096 msgid "Daemon startup without any loaded modules, refusing to work." msgstr "后台程序启动未加载任何模块，拒绝工作。" -#: ../src/daemon/main.c:1129 +#: ../src/daemon/main.c:1134 msgid "Daemon startup complete." msgstr "后台程序启动完成。" -#: ../src/daemon/main.c:1135 +#: ../src/daemon/main.c:1140 msgid "Daemon shutdown initiated." msgstr "开始关闭后台程序。" -#: ../src/daemon/main.c:1166 +#: ../src/daemon/main.c:1171 msgid "Daemon terminated." msgstr "后台程序已终止。" @@ -2346,7 +2346,7 @@ #: ../src/modules/alsa/module-alsa-card.c:168 #: ../src/modules/bluetooth/module-bluetooth-device.c:2707 -#: ../src/modules/alsa/alsa-mixer.c:4007 +#: ../src/modules/alsa/alsa-mixer.c:4008 msgid "Off" msgstr "关闭" @@ -2519,105 +2519,105 @@ msgid "%s+%s" msgstr "%s+%s" -#: ../src/modules/alsa/alsa-mixer.c:2602 ../src/modules/alsa/alsa-mixer.c:4567 +#: ../src/modules/alsa/alsa-mixer.c:2602 ../src/modules/alsa/alsa-mixer.c:4568 #, c-format msgid "%s / %s" msgstr "%s / %s" -#: ../src/modules/alsa/alsa-mixer.c:3865 +#: ../src/modules/alsa/alsa-mixer.c:3866 msgid "Analog Mono" msgstr "模拟单声道" -#: ../src/modules/alsa/alsa-mixer.c:3866 +#: ../src/modules/alsa/alsa-mixer.c:3867 msgid "Analog Stereo" msgstr "模拟立体声" -#: ../src/modules/alsa/alsa-mixer.c:3867 +#: ../src/modules/alsa/alsa-mixer.c:3868 msgid "Analog Surround 2.1" msgstr "模拟环绕 2.1" -#: ../src/modules/alsa/alsa-mixer.c:3868 +#: ../src/modules/alsa/alsa-mixer.c:3869 msgid "Analog Surround 3.0" msgstr "模拟环绕 3.0" -#: ../src/modules/alsa/alsa-mixer.c:3869 +#: ../src/modules/alsa/alsa-mixer.c:3870 msgid "Analog Surround 3.1" msgstr "模拟环绕 3.1" -#: ../src/modules/alsa/alsa-mixer.c:3870 +#: ../src/modules/alsa/alsa-mixer.c:3871 msgid "Analog Surround 4.0" msgstr "模拟环绕 4.0" -#: ../src/modules/alsa/alsa-mixer.c:3871 +#: ../src/modules/alsa/alsa-mixer.c:3872 msgid "Analog Surround 4.1" msgstr "模拟环绕 4.1" -#: ../src/modules/alsa/alsa-mixer.c:3872 +#: ../src/modules/alsa/alsa-mixer.c:3873 msgid "Analog Surround 5.0" msgstr "模拟环绕 5.0" -#: ../src/modules/alsa/alsa-mixer.c:3873 +#: ../src/modules/alsa/alsa-mixer.c:3874 msgid "Analog Surround 5.1" msgstr "模拟环绕 5.1" -#: ../src/modules/alsa/alsa-mixer.c:3874 +#: ../src/modules/alsa/alsa-mixer.c:3875 msgid "Analog Surround 6.0" msgstr "模拟环绕 6.0" -#: ../src/modules/alsa/alsa-mixer.c:3875 +#: ../src/modules/alsa/alsa-mixer.c:3876 msgid "Analog Surround 6.1" msgstr "模拟环绕 6.1" -#: ../src/modules/alsa/alsa-mixer.c:3876 +#: ../src/modules/alsa/alsa-mixer.c:3877 msgid "Analog Surround 7.0" msgstr "模拟环绕 7.0" -#: ../src/modules/alsa/alsa-mixer.c:3877 +#: ../src/modules/alsa/alsa-mixer.c:3878 msgid "Analog Surround 7.1" msgstr "模拟环绕 7.1" -#: ../src/modules/alsa/alsa-mixer.c:3878 +#: ../src/modules/alsa/alsa-mixer.c:3879 msgid "Digital Stereo (IEC958)" msgstr "数字立体声（IEC958）" -#: ../src/modules/alsa/alsa-mixer.c:3879 +#: ../src/modules/alsa/alsa-mixer.c:3880 msgid "Digital Passthrough (IEC958)" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:3880 +#: ../src/modules/alsa/alsa-mixer.c:3881 msgid "Digital Surround 4.0 (IEC958/AC3)" msgstr "数字环绕 4.0（IEC958/AC3）" -#: ../src/modules/alsa/alsa-mixer.c:3881 +#: ../src/modules/alsa/alsa-mixer.c:3882 msgid "Digital Surround 5.1 (IEC958/AC3)" msgstr "数字环绕 5.1（IEC958/AC3）" -#: ../src/modules/alsa/alsa-mixer.c:3882 +#: ../src/modules/alsa/alsa-mixer.c:3883 msgid "Digital Stereo (HDMI)" msgstr "数字立体声（HDMI）" -#: ../src/modules/alsa/alsa-mixer.c:3883 +#: ../src/modules/alsa/alsa-mixer.c:3884 msgid "Digital Surround 5.1 (HDMI)" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:4004 +#: ../src/modules/alsa/alsa-mixer.c:4005 msgid "Analog Mono Duplex" msgstr "模拟单声道双工" -#: ../src/modules/alsa/alsa-mixer.c:4005 +#: ../src/modules/alsa/alsa-mixer.c:4006 msgid "Analog Stereo Duplex" msgstr "模拟立体声双工" -#: ../src/modules/alsa/alsa-mixer.c:4006 +#: ../src/modules/alsa/alsa-mixer.c:4007 msgid "Digital Stereo Duplex (IEC958)" msgstr "数字立体声双工（IEC958）" -#: ../src/modules/alsa/alsa-mixer.c:4106 +#: ../src/modules/alsa/alsa-mixer.c:4107 #, c-format msgid "%s Output" msgstr "" -#: ../src/modules/alsa/alsa-mixer.c:4114 +#: ../src/modules/alsa/alsa-mixer.c:4115 #, c-format msgid "%s Input" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/python-apt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/python-apt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/python-apt.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/python-apt.po 2012-03-23 07:32:58.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \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" +"PO-Revision-Date: 2012-03-12 14:35+0000\n" +"Last-Translator: Wang Dianjin \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: 2012-02-21 18:54+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. ChangelogURI #: ../data/templates/Ubuntu.info.in.h:4 @@ -27,12 +27,12 @@ #. Description #: ../data/templates/Ubuntu.info.in:33 msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" +msgstr "Ubuntu 12.04 “Precise Pangolin”" #. Description #: ../data/templates/Ubuntu.info.in:40 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" +msgstr "Ubuntu 12.04 “Precise Pangolin” 的 CD" #. Description #: ../data/templates/Ubuntu.info.in:151 @@ -192,7 +192,7 @@ #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:957 msgid "Canonical-supported free and open-source software" -msgstr "" +msgstr "Canonical 支持的免费和开源软件" #. CompDescription #: ../data/templates/Ubuntu.info.in:959 @@ -202,7 +202,7 @@ #. CompDescriptionLong #: ../data/templates/Ubuntu.info.in:960 msgid "Community-maintained free and open-source software" -msgstr "" +msgstr "社区维护的免费和开源软件" #. CompDescription #: ../data/templates/Ubuntu.info.in:962 @@ -489,7 +489,7 @@ #: ../apt/debfile.py:93 #, python-format msgid "List of control files for '%s' could not be read" -msgstr "" +msgstr "无法读取 %s 的控制文件列表" #: ../apt/debfile.py:211 #, python-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quilt.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/quilt.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quilt.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/quilt.po 2012-03-23 07:32:58.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: quilt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-21 18:55+0000\n" +"POT-Creation-Date: 2012-03-22 18:17+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: 2012-02-21 18:55+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: bin/quilt.in:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quota.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/quota.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/quota.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/quota.po 2012-03-23 07:32: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: 2012-02-21 18:55+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: bylabel.c:253 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/recode.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/recode.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/recode.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/recode.po 2012-03-23 07:32:56.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: 2012-02-21 18:45+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:10+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Basepath: z:\\recode-3.6\n" #: src/main.c:142 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rpm.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/rpm.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rpm.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/rpm.po 2012-03-23 07:32:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:11+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: cliutils.c:20 lib/poptI.c:29 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rrdtool.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/rrdtool.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/rrdtool.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/rrdtool.po 2012-03-23 07:32:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 18:46+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:11+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/rrd_getopt.c:618 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sane-backends.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sane-backends.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sane-backends.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sane-backends.po 2012-03-23 07:32:56.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-05 04:43+0000\n" "PO-Revision-Date: 2009-10-23 14:28+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 18:46+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:11+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../include/sane/saneopts.h:154 #, no-c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/screen-resolution-extra.po 2012-03-23 07:33:21.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: 2012-02-22 00:17+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:08+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../ScreenResolution/ui.py:59 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sed.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sed.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sed.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sed.po 2012-03-23 07:32:58.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: 2012-02-21 18:57+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: sed/compile.c:161 msgid "multiple `!'s" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/shared-mime-info.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/shared-mime-info.po 2012-03-23 07:32:58.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: 2012-02-21 18:57+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: ../freedesktop.org.xml.in.h:1 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sharutils.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sharutils.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sharutils.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sharutils.po 2012-03-23 07:32: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: 2012-02-21 18:58+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: lib/error.c:181 msgid "Unknown system error" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/smart.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/smart.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/smart.po 2012-02-23 07:11:49.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/smart.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,4607 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Funda Wang , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: smart 0.42\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-31 01:00+0100\n" -"PO-Revision-Date: 2010-12-11 06:18+0000\n" -"Last-Translator: Funda Wang \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: 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]" -msgstr "smart 命令 [选项] [参数]" - -#: smart.py:39 smart2.py:42 smart3.py:42 -msgid "" -"\n" -"Action commands:\n" -" update\n" -" install\n" -" reinstall\n" -" upgrade\n" -" remove\n" -" check\n" -" fix\n" -" download\n" -" clean\n" -"\n" -"Query commands:\n" -" search\n" -" query\n" -" newer\n" -" info\n" -" stats\n" -"\n" -"Setup commands:\n" -" config\n" -" channel\n" -" priority\n" -" mirror\n" -" flag\n" -"\n" -"Run \"smart command --help\" for more information.\n" -msgstr "" - -#: smart.py:68 smart2.py:71 smart3.py:71 -msgid "" -"\n" -"smart install --help\n" -"smart install pkgname\n" -"smart --gui\n" -"smart --gui install pkgname\n" -"smart --shell\n" -msgstr "" -"\n" -"smart install --help\n" -"smart install 软件包名称\n" -"smart --gui\n" -"smart --gui install 软件包名称\n" -"smart --shell\n" - -#: smart.py:83 smart2.py:86 smart3.py:86 -msgid "FILE" -msgstr "文件" - -#: smart.py:84 smart2.py:87 smart3.py:87 -msgid "configuration file (default is /config)" -msgstr "配置文件(默认为 /config)" - -#: smart.py:86 smart2.py:89 smart3.py:89 -msgid "DIR" -msgstr "目录" - -#: smart.py:87 smart2.py:90 smart3.py:90 -#, python-format -msgid "data directory (default is %s)" -msgstr "数据目录(默认为 %s)" - -#: smart.py:88 smart2.py:91 smart3.py:91 -msgid "LEVEL" -msgstr "级别" - -#: smart.py:89 smart2.py:92 smart3.py:92 -msgid "set the log level to LEVEL (debug, info, warning, error)" -msgstr "将日志级别设定为[级别](debug、info、 warning、error)" - -#: smart.py:92 smart2.py:95 smart3.py:95 -msgid "use the default graphic interface" -msgstr "使用默认的图形界面" - -#: smart.py:94 smart2.py:97 smart3.py:97 -msgid "use the default shell interface" -msgstr "使用默认的 shell 界面" - -#: smart.py:96 smart2.py:99 smart3.py:99 -msgid "use the quiet interface" -msgstr "" - -#: smart.py:97 smart2.py:100 smart3.py:100 -msgid "NAME" -msgstr "名称" - -#: smart.py:98 smart2.py:101 smart3.py:101 -msgid "use the given interface" -msgstr "使用给定的界面" - -#: smart.py:100 smart2.py:103 smart3.py:103 -msgid "don't respect locking" -msgstr "不遵守锁定" - -#: smart.py:102 smart2.py:105 smart3.py:105 -msgid "OPT" -msgstr "选项" - -#: smart.py:103 smart2.py:106 smart3.py:106 -msgid "set the option given by a name=value pair" -msgstr "通过“名称=值”对来设定选项" - -#: smart.py:113 smart/option.py:161 smart/util/optparse.py:1402 -#: smart/util/optparse.py:1556 smart2.py:116 smart3.py:116 -#, python-format -msgid "no such option: %s" -msgstr "无此选项：%s" - -#: smart.py:139 smart2.py:142 smart3.py:142 -#, python-format -msgid "Invalid option: %s" -msgstr "无效选项：%s" - -#: smart.py:185 smart2.py:188 smart3.py:188 -#, python-format -msgid "error: %s\n" -msgstr "错误：%s\n" - -#: smart.py:194 smart/interfaces/text/interactive.py:200 smart2.py:197 -#: smart3.py:197 -msgid "" -"\n" -"Interrupted\n" -msgstr "" -"\n" -"已中断\n" - -#: smart/__init__.py:38 -msgid "Unknown error" -msgstr "未知错误" - -#: smart/__init__.py:119 -msgid "Unknown log level" -msgstr "未知的日志级别" - -#: smart/__init__.py:130 -msgid "Can't use commands with shell interfaces" -msgstr "shell 界面无法使用命令" - -#: smart/backends/arch/loader.py:241 smart/backends/slack/loader.py:176 -#, python-format -msgid "Invalid package name: %s" -msgstr "无效的软件包名称：%s" - -#: smart/backends/arch/pm.py:63 smart/backends/deb/pm.py:186 -#: smart/backends/rpm/pm.py:55 smart/backends/slack/pm.py:33 -msgid "Committing transaction..." -msgstr "正在提交交易..." - -#: smart/backends/arch/pm.py:72 smart/backends/slack/pm.py:76 -#, python-format -msgid "Upgrading %s" -msgstr "升级 %s" - -#: smart/backends/arch/pm.py:80 smart/backends/slack/pm.py:84 -#, python-format -msgid "Got status %d upgrading %s:" -msgstr "得到状态 %d 在更新 %s 时：" - -#: smart/backends/arch/pm.py:83 smart/backends/slack/pm.py:87 -#, python-format -msgid "Upgrading %s:" -msgstr "升级 %s：" - -#: smart/backends/arch/pm.py:86 smart/backends/rpm/pm.py:316 -#: smart/backends/slack/pm.py:62 -#, python-format -msgid "Installing %s" -msgstr "安装 %s" - -#: smart/backends/arch/pm.py:94 smart/backends/slack/pm.py:70 -#, python-format -msgid "Got status %d installing %s:" -msgstr "得到状态 %d 在安装 %s 时：" - -#: smart/backends/arch/pm.py:97 smart/backends/slack/pm.py:73 -#, python-format -msgid "Installing %s:" -msgstr "安装 %s：" - -#: smart/backends/arch/pm.py:100 smart/backends/deb/pm.py:411 -#: smart/backends/rpm/pm.py:343 smart/backends/rpm/pm.py:357 -#: smart/backends/slack/pm.py:90 -#, python-format -msgid "Removing %s" -msgstr "删除 %s" - -#: smart/backends/arch/pm.py:108 smart/backends/slack/pm.py:98 -#, python-format -msgid "Got status %d removing %s:" -msgstr "得到状态 %d 在移除 %s 时：" - -#: smart/backends/arch/pm.py:111 smart/backends/slack/pm.py:101 -#, python-format -msgid "Removing %s:" -msgstr "删除 %s：" - -#: smart/backends/arch/pm.py:114 -#, python-format -msgid "Operation ( %s ) not handled on package ( %s )" -msgstr "" - -#: smart/backends/deb/pm.py:313 -#, python-format -msgid "Sub-process %s has received a segmentation fault" -msgstr "子进程 %s 收到了段错误" - -#: smart/backends/deb/pm.py:316 -#, python-format -msgid "Sub-process %s returned an error code (%d)" -msgstr "子进程 %s 返回了错误代码(%d)" - -#: smart/backends/deb/pm.py:319 -#, python-format -msgid "Sub-process %s exited unexpectedly" -msgstr "子进程 %s 异常退出" - -#: smart/backends/rpm/base.py:42 -msgid "'rpm' python module is not available" -msgstr "“rpm”python 模块不可用" - -#: smart/backends/rpm/base.py:64 -#, python-format -msgid "Could not create rpm-root at %s: %s" -msgstr "无法在%s: %s创建 rpm-root" - -#: smart/backends/rpm/base.py:70 -#, python-format -msgid "Couldn't initizalize rpm database at %s" -msgstr "无法初始化 %s 的 rpm 数据库" - -#: smart/backends/rpm/base.py:73 -#, python-format -msgid "Initialized new rpm database at %s" -msgstr "在 %s 初始化新 rpm 数据库" - -#: smart/backends/rpm/header.py:465 -msgid "" -"Your rpm module has no support for readHeaderFromFD()!\n" -"As a consequence, Smart will consume extra memory." -msgstr "" -"您的 rpm 模块不支持 readHeaderFromFD()！\n" -"因此 Smart 将使用额外的内存。" - -#: smart/backends/rpm/header.py:564 smart/backends/rpm/header.py:598 -msgid "Package list with no CRPMTAG_FILENAME tag" -msgstr "包列表没有 CRPMTAG_FILENAME 标签" - -#: smart/backends/rpm/pm.py:140 -msgid "Found unbreakable loops:" -msgstr "找到了死循环：" - -#: smart/backends/rpm/pm.py:145 -msgid "Will ask RPM to order it." -msgstr "将请求 RPM 调序。" - -#: smart/backends/rpm/pm.py:210 -#, python-format -msgid "%s requires %s" -msgstr "%s 需要 %s" - -#: smart/backends/rpm/pm.py:212 -#, python-format -msgid "%s conflicts with %s" -msgstr "%s 与 %s 冲突" - -#: smart/backends/rpm/pm.py:300 -#, python-format -msgid "Processing %s in %s" -msgstr "正在处理 %s 在 %s" - -#: smart/backends/rpm/pm.py:301 smart/backends/rpm/pm.py:336 -#, python-format -msgid "Output from %s:" -msgstr "%s 的输出：" - -#: smart/backends/rpm/pm.py:327 -msgid "Preparing..." -msgstr "正在准备..." - -#: smart/backends/rpm/pm.py:341 smart/backends/rpm/pm.py:355 -#, python-format -msgid "Cleaning %s" -msgstr "清理 %s" - -#: smart/backends/rpm/redcarpet.py:310 -#, python-format -msgid "Error parsing %s: %s" -msgstr "分析 %s 时出错：%s" - -#: smart/backends/rpm/synthesis.py:184 smart/channels/rpm_md.py:143 -#, python-format -msgid "" -"Invalid XML file:\n" -" %s\n" -" %s" -msgstr "" - -#: smart/cache.py:200 smart/fetcher.py:1320 smart/fetcher.py:1593 -#: smart/fetcher.py:1636 -msgid "File not found" -msgstr "文件未找到" - -#: smart/cache.py:206 smart/fetcher.py:383 -#, python-format -msgid "Unexpected size (expected %d, got %d)" -msgstr "意外大小(期待 %d，得到 %d)" - -#: smart/cache.py:223 smart/fetcher.py:400 -#, python-format -msgid "Invalid MD5 (expected %s, got %s)" -msgstr "无效的 MD5(期待 %s，得到 %s)" - -#: smart/cache.py:240 smart/fetcher.py:417 -#, python-format -msgid "Invalid SHA256 (expected %s, got %s)" -msgstr "" - -#: smart/cache.py:257 smart/fetcher.py:434 -#, python-format -msgid "Invalid SHA (expected %s, got %s)" -msgstr "无效的 SHA(期待 %s，得到 %s)" - -#: smart/cache.py:669 -msgid "Updating cache..." -msgstr "正在更新缓存..." - -#: smart/channel.py:115 smart/commands/channel.py:198 -#: smart/commands/mirror.py:134 smart/interfaces/gtk/channels.py:213 -#: smart/interfaces/qt/channels.py:193 smart/interfaces/qt4/channels.py:206 -#: smart/sysconfig.py:71 -#, python-format -msgid "File not found: %s" -msgstr "文件未找到：%s" - -#: smart/channel.py:133 smart/interfaces/gtk/channels.py:86 -#: smart/interfaces/gtk/channels.py:367 smart/interfaces/qt/channels.py:82 -#: smart/interfaces/qt/channels.py:337 smart/interfaces/qt4/channels.py:88 -#: smart/interfaces/qt4/channels.py:358 -msgid "Alias" -msgstr "别名" - -#: smart/channel.py:134 -msgid "Unique identification for the channel." -msgstr "频道的唯一标识符。" - -#: smart/channel.py:135 smart/interfaces/gtk/channels.py:88 -#: smart/interfaces/gtk/channels.py:369 smart/interfaces/qt/channels.py:83 -#: smart/interfaces/qt/channels.py:338 smart/interfaces/qt4/channels.py:88 -#: smart/interfaces/qt4/channels.py:358 -msgid "Type" -msgstr "类型" - -#: smart/channel.py:136 -msgid "Channel type" -msgstr "频道类型" - -#: smart/channel.py:137 smart/interfaces/gtk/channels.py:90 -#: smart/interfaces/gtk/channels.py:371 smart/interfaces/qt/channels.py:84 -#: smart/interfaces/qt/channels.py:339 smart/interfaces/qt4/channels.py:88 -#: smart/interfaces/qt4/channels.py:358 -msgid "Name" -msgstr "名称" - -#: smart/channel.py:138 -msgid "Channel name" -msgstr "频道名称" - -#: smart/channel.py:139 -msgid "Manual updates" -msgstr "手动更新" - -#: smart/channel.py:140 -msgid "" -"If set to a true value, the given channel will only be updated when manually " -"selected." -msgstr "若设为真值，仅在手动选中时才更新给定的频道。" - -#: smart/channel.py:142 -msgid "Disabled" -msgstr "已禁用" - -#: smart/channel.py:143 -msgid "If set to a true value, the given channel won't be used." -msgstr "若设为真值，将不使用给定的频道。" - -#: smart/channel.py:145 -msgid "Removable" -msgstr "可移动" - -#: smart/channel.py:146 -msgid "" -"If set to a true value, the given channel will be considered as being " -"available in a removable media (cdrom, etc)." -msgstr "若设为真值，给定的频道将认为是可通过可移动介质(cdrom 等)获取。" - -#: smart/channel.py:151 smart/commands/priority.py:104 -#: smart/interfaces/gtk/interactive.py:824 -#: smart/interfaces/gtk/priorities.py:83 -#: smart/interfaces/qt/interactive.py:755 smart/interfaces/qt/priorities.py:72 -#: smart/interfaces/qt4/interactive.py:753 -msgid "Priority" -msgstr "优先级" - -#: smart/channel.py:152 -msgid "" -"Default priority assigned to all packages available in this channel (0 if " -"not set). If the exact same package is available in more than one channel, " -"the highest priority is used." -msgstr "" - -#: smart/channel.py:169 -#, python-format -msgid "Unable to create channel of type '%s'" -msgstr "无法创建类型为“%s”的频道" - -#: smart/channel.py:182 smart/channel.py:208 -msgid "Channel has no type" -msgstr "频道无类型" - -#: smart/channel.py:185 smart/channel.py:211 -#, python-format -msgid "Unknown channel type: %s" -msgstr "未知的频道类型：%s" - -#: smart/channel.py:195 smart/channel.py:223 -#, python-format -msgid "%s (%s) is a needed field for '%s' channels" -msgstr "" - -#: smart/channel.py:230 smart/util/strtools.py:105 -msgid "true" -msgstr "真" - -#: smart/channel.py:230 smart/util/strtools.py:105 -msgid "y" -msgstr "y" - -#: smart/channel.py:230 smart/interfaces/text/interface.py:71 -#: smart/util/strtools.py:105 -msgid "yes" -msgstr "是" - -#: smart/channel.py:233 smart/util/strtools.py:107 -msgid "false" -msgstr "假" - -#: smart/channel.py:233 smart/util/strtools.py:107 -msgid "n" -msgstr "n" - -#: smart/channel.py:233 smart/interfaces/text/interface.py:72 -#: smart/util/strtools.py:107 -msgid "no" -msgstr "否" - -#: smart/channel.py:236 smart/channel.py:242 smart/channel.py:245 -#, python-format -msgid "Invalid value for '%s' (%s) field: %s" -msgstr "" - -#: smart/channel.py:262 -#, python-format -msgid "Channel '%s' has no type" -msgstr "频道“%s”没有类型" - -#: smart/channel.py:284 -#, python-format -msgid "Invalid channel type '%s'" -msgstr "无效的频道类型“%s”" - -#: smart/channels/apt_deb.py:91 -#, python-format -msgid "Download of Release failed for channel '%s': %s" -msgstr "" - -#: smart/channels/apt_deb.py:98 -#, python-format -msgid "Download of Release.gpg failed for secure channel '%s': %s" -msgstr "" - -#: smart/channels/apt_deb.py:132 smart/channels/apt_rpm.py:131 -#: smart/channels/rpm_md.py:237 smart/channels/slack_site.py:108 -#, python-format -msgid "Channel '%s' has bad signature" -msgstr "频道“%s”的签名无效" - -#: smart/channels/apt_deb.py:135 smart/channels/apt_rpm.py:133 -#: smart/channels/rpm_md.py:240 smart/channels/slack_site.py:110 -#, python-format -msgid "Channel '%s' signed with unknown key" -msgstr "频道“%s”使用了未知密钥签名" - -#: smart/channels/apt_deb.py:272 -#, python-format -msgid "Component '%s' is not in Release file for channel '%s'" -msgstr "组件“%s”未出现于频道“%s”的 Release 文件中" - -#: smart/channels/apt_deb.py:290 smart/channels/apt_rpm.py:62 -#: smart/channels/apt_rpm.py:212 smart/channels/arch_site.py:78 -#: smart/channels/mirrors.py:58 smart/channels/red_carpet.py:64 -#: smart/channels/rpm_hdl.py:60 smart/channels/rpm_md.py:319 -#: smart/channels/slack_site.py:124 smart/channels/up2date_mirrors.py:61 -#: smart/channels/urpmi.py:176 smart/channels/urpmi.py:241 -#: smart/channels/yast2.py:53 -#, python-format -msgid "Failed acquiring information for '%s':" -msgstr "获取“%s”的信息失败：" - -#: smart/channels/apt_deb_info.py:26 -msgid "APT-DEB Repository" -msgstr "APT-DEB 仓库" - -#: smart/channels/apt_deb_info.py:28 -msgid "" -"\n" -"Repositories created for APT-DEB.\n" -msgstr "" -"\n" -"为 APT-DEB 所创建的仓库。\n" - -#: smart/channels/apt_deb_info.py:32 smart/channels/apt_rpm_info.py:32 -#: smart/channels/arch_site_info.py:34 smart/channels/rpm_md_info.py:32 -#: smart/channels/slack_site_info.py:32 smart/channels/urpmi_info.py:32 -#: smart/channels/yast2_info.py:32 -msgid "Base URL" -msgstr "基础 URL" - -#: smart/channels/apt_deb_info.py:33 -msgid "Base URL of repository, where dists/ is located." -msgstr "仓库的基础 URL，即 dist/ 所在地。" - -#: smart/channels/apt_deb_info.py:34 -msgid "Distribution" -msgstr "发行版" - -#: smart/channels/apt_deb_info.py:35 -msgid "Distribution to use." -msgstr "要使用的发行版。" - -#: smart/channels/apt_deb_info.py:36 smart/channels/apt_rpm_info.py:34 -msgid "Components" -msgstr "组件" - -#: smart/channels/apt_deb_info.py:37 smart/channels/apt_rpm_info.py:35 -msgid "Space separated list of components." -msgstr "用空格区分的组件。" - -#: smart/channels/apt_deb_info.py:38 smart/channels/apt_rpm_info.py:36 -#: smart/channels/rpm_md_info.py:36 smart/channels/slack_site_info.py:36 -msgid "Fingerprint" -msgstr "指纹" - -#: smart/channels/apt_deb_info.py:39 smart/channels/apt_rpm_info.py:37 -#: smart/channels/rpm_md_info.py:37 smart/channels/slack_site_info.py:37 -msgid "GPG fingerprint of key signing the channel." -msgstr "用来对频道签名密钥 GPG 指纹。" - -#: smart/channels/apt_deb_info.py:40 -msgid "Keyring" -msgstr "" - -#: smart/channels/apt_deb_info.py:41 -msgid "" -"If provided, channel must necessarily be signed by a key in the GPG keyring " -"at the given path." -msgstr "" - -#: smart/channels/apt_deb_info.py:43 -msgid "Trustdb" -msgstr "" - -#: smart/channels/apt_deb_info.py:44 -msgid "" -"If provided, channel will be checked for a key in the GPG trust database at " -"the given path." -msgstr "" - -#: smart/channels/apt_rpm.py:102 -#, python-format -msgid "Channel '%s' has fingerprint but is not signed" -msgstr "频道“%s”有指纹，但未签名" - -#: smart/channels/apt_rpm.py:165 -#, python-format -msgid "Component '%s' is not in release file for channel '%s'" -msgstr "组件“%s”未出现于频道“%s”的 release 文件中" - -#: smart/channels/apt_rpm_info.py:26 -msgid "APT-RPM Repository" -msgstr "APT-RPM 仓库" - -#: smart/channels/apt_rpm_info.py:28 -msgid "" -"\n" -"Repositories created for APT-RPM.\n" -msgstr "" -"\n" -"为 APT-RPM 所创将的仓库。\n" - -#: smart/channels/apt_rpm_info.py:33 -msgid "Base URL of APT-RPM repository, where base/ is located." -msgstr "APT-RPM 仓库的基础 URL，即 base/ 所在地。" - -#: smart/channels/arch_dir.py:37 smart/channels/deb_dir.py:37 -#: smart/channels/rpm_dir.py:37 smart/channels/slack_dir.py:37 -#, python-format -msgid "Channel '%s' has invalid directory: %s" -msgstr "频道“%s”的目录无效：%s" - -#: smart/channels/arch_dir.py:57 smart/channels/arch_sys.py:50 -#: smart/channels/deb_dir.py:57 smart/channels/deb_sys.py:55 -#: smart/channels/rpm_dir.py:57 smart/channels/rpm_sys.py:50 -#: smart/channels/slack_dir.py:57 smart/channels/slack_sys.py:48 -#, python-format -msgid "%s channels cannot be removable" -msgstr "%s 频道不是可移动的" - -#: smart/channels/arch_dir_info.py:26 -msgid "Archlinux Directory" -msgstr "" - -#: smart/channels/arch_dir_info.py:28 -msgid "" -"\n" -"Local directory with Archlinux packages.\n" -msgstr "" - -#: smart/channels/arch_dir_info.py:32 smart/channels/deb_dir_info.py:32 -#: smart/channels/rpm_dir_info.py:32 smart/channels/slack_dir_info.py:32 -msgid "Directory Path" -msgstr "目录路径" - -#: smart/channels/arch_dir_info.py:33 -msgid "Path of directory containing *.pkg.tar.gz packages." -msgstr "" - -#: smart/channels/arch_dir_info.py:34 smart/channels/deb_dir_info.py:34 -#: smart/channels/rpm_dir_info.py:34 smart/channels/slack_dir_info.py:34 -msgid "Recursive" -msgstr "递归" - -#: smart/channels/arch_dir_info.py:35 smart/channels/deb_dir_info.py:35 -#: smart/channels/rpm_dir_info.py:35 smart/channels/slack_dir_info.py:35 -msgid "Search for files recursively." -msgstr "递归搜索文件。" - -#: smart/channels/arch_site.py:68 smart/channels/rpm_md.py:309 -#, python-format -msgid "" -"Failed to download. You must fetch channel information to acquire needed " -"filelists.\n" -"%s: %s" -msgstr "" -"下载失败。必须取得频道信息来请求文件列表。\n" -"%s：%s" - -#: smart/channels/arch_site_info.py:28 -msgid "Archlinux Repository" -msgstr "" - -#: smart/channels/arch_site_info.py:30 -msgid "" -"\n" -"Remote repository with archlinux packages.\n" -msgstr "" - -#: smart/channels/arch_site_info.py:35 -msgid "Base URL where *.db.tar.gz is located" -msgstr "" - -#: smart/channels/arch_site_info.py:36 -msgid "Tree name" -msgstr "" - -#: smart/channels/arch_site_info.py:37 -msgid "The name of the .db.tar.gz file" -msgstr "" - -#: smart/channels/arch_sys_info.py:28 -msgid "Archlinux Installed Packages" -msgstr "" - -#: smart/channels/arch_sys_info.py:30 -msgid "" -"\n" -"Installed packages in a Archlinux system.\n" -msgstr "" - -#: smart/channels/deb_dir_info.py:26 -msgid "DEB Directory" -msgstr "DEB 目录" - -#: smart/channels/deb_dir_info.py:28 -msgid "" -"\n" -"Local directory with DEB packages.\n" -msgstr "" -"\n" -"DEB 软件包的本地目录。\n" - -#: smart/channels/deb_dir_info.py:33 -msgid "Path of directory containing DEB packages." -msgstr "包含 DEB 软件包的目录路径。" - -#: smart/channels/deb_sys_info.py:26 -msgid "DPKG Installed Packages" -msgstr "DPKG 已安装软件包" - -#: smart/channels/deb_sys_info.py:28 -msgid "" -"\n" -"Installed packages from dpkg status.\n" -msgstr "" -"\n" -"来自 dpkg status 的已安装软件包。\n" - -#: smart/channels/mirrors_info.py:26 -msgid "Mirror Information" -msgstr "镜像信息" - -#: smart/channels/mirrors_info.py:28 -msgid "" -"\n" -"Mirror information file.\n" -msgstr "" -"\n" -"镜像信息文件。\n" - -#: smart/channels/mirrors_info.py:32 smart/channels/up2date_mirrors_info.py:32 -msgid "Mirror File URL" -msgstr "镜像文件 URL" - -#: smart/channels/mirrors_info.py:33 smart/channels/up2date_mirrors_info.py:33 -msgid "URL for the mirror information file" -msgstr "镜像信息文件的 URL" - -#: smart/channels/red_carpet_info.py:26 -msgid "Red Carpet Channel" -msgstr "Red Carpet 频道" - -#: smart/channels/red_carpet_info.py:28 -msgid "" -"\n" -"Channel for the Red Carpet package tool.\n" -msgstr "" -"\n" -"Red Carpet 软件包工具的频道。\n" - -#: smart/channels/red_carpet_info.py:32 smart/channels/rpm_hdl_info.py:32 -msgid "Base URL for packages" -msgstr "软件包的基础 URL" - -#: smart/channels/red_carpet_info.py:33 -msgid "URL where packages are found" -msgstr "软件包所在 URL" - -#: smart/channels/red_carpet_info.py:34 -msgid "URL for packageinfo XML" -msgstr "packageinfo XML 的 URL" - -#: smart/channels/red_carpet_info.py:35 -msgid "" -"URL for packageinfo.xml.gz including filename (option may be ommitted if " -"file is named packageinfo.xml.gz and is inside the base url)" -msgstr "" -"packageinfo.xml.gz 的 URL，包含文件名(如果文件名为 packageinfo.xml.gz，并且位于基础 URL " -"中，则此选项可省略)" - -#: smart/channels/rpm_dir_info.py:26 -msgid "RPM Directory" -msgstr "RPM 目录" - -#: smart/channels/rpm_dir_info.py:28 -msgid "" -"\n" -"Local directory with RPM packages.\n" -msgstr "" -"\n" -"RPM 软件包的本地目录。\n" - -#: smart/channels/rpm_dir_info.py:33 -msgid "Path of directory containing RPM packages." -msgstr "包含 RPM 软件包的目录路径。" - -#: smart/channels/rpm_hdl_info.py:26 -msgid "RPM Header List" -msgstr "RPM 头列表" - -#: smart/channels/rpm_hdl_info.py:28 -msgid "" -"\n" -"Packages from an RPM Header List.\n" -msgstr "" -"\n" -"RPM 头列表的软件包。\n" - -#: smart/channels/rpm_hdl_info.py:33 -msgid "Base URL where package files are found" -msgstr "软件包文件所在的基础 URL" - -#: smart/channels/rpm_hdl_info.py:34 smart/channels/urpmi_info.py:37 -msgid "Header List URL" -msgstr "头列表 URL" - -#: smart/channels/rpm_hdl_info.py:35 -msgid "URL for the header list" -msgstr "头列表 URL" - -#: smart/channels/rpm_md.py:85 -msgid "Could not load meta link. Continuing with base URL only." -msgstr "" - -#: smart/channels/rpm_md.py:121 smart/channels/rpm_md.py:181 -#: smart/channels/urpmi.py:96 -msgid "Could not load mirror list. Continuing with base URL only." -msgstr "" - -#: smart/channels/rpm_md.py:208 -#, python-format -msgid "Failed acquiring release file for '%s':" -msgstr "获取“%s”的 release 文件失败：" - -#: smart/channels/rpm_md.py:216 -#, python-format -msgid "Download of repomd.xml.asc failed for secure channel '%s': %s" -msgstr "" - -#: smart/channels/rpm_md.py:251 -#, python-format -msgid "Primary information not found in repository metadata for '%s'" -msgstr "“%s”的仓库元数据中未找到主要信息" - -#: smart/channels/rpm_md.py:303 -#, python-format -msgid "" -"Failed to download. You must fetch channel information to acquire needed " -"update information.\n" -"%s: %s" -msgstr "" - -#: smart/channels/rpm_md_info.py:26 -msgid "RPM MetaData" -msgstr "RPM MetaData" - -#: smart/channels/rpm_md_info.py:28 -msgid "" -"\n" -"Repository created with the rpm-metadata project.\n" -msgstr "" -"\n" -"rpm-metadata 项目创建的仓库。\n" - -#: smart/channels/rpm_md_info.py:33 -msgid "URL where repodata/ subdirectory is found" -msgstr "repodata/ 子目录的 URL" - -#: smart/channels/rpm_md_info.py:34 -msgid "Mirror list URL" -msgstr "" - -#: smart/channels/rpm_md_info.py:35 -msgid "URL which provides list of mirrors for baseurl" -msgstr "" - -#: smart/channels/rpm_sys_info.py:26 -msgid "RPM Installed Packages" -msgstr "RPM 已安装软件包" - -#: smart/channels/rpm_sys_info.py:28 -msgid "" -"\n" -"Installed packages from the local RPM database.\n" -msgstr "" -"\n" -"本地 RPM 数据库中已安装的软件包。\n" - -#: smart/channels/slack_dir_info.py:26 -msgid "Slackware Directory" -msgstr "" - -#: smart/channels/slack_dir_info.py:28 -msgid "" -"\n" -"Local directory with Slackware packages.\n" -msgstr "" - -#: smart/channels/slack_dir_info.py:33 -msgid "Path of directory containing Slackware packages." -msgstr "" - -#: smart/channels/slack_site_info.py:26 -msgid "Slackware Repository" -msgstr "Slackware 仓库" - -#: smart/channels/slack_site_info.py:28 -msgid "" -"\n" -"Remote repository with slackware packages.\n" -msgstr "" -"\n" -"Slackware 软件包的远程仓库。\n" - -#: smart/channels/slack_site_info.py:33 -msgid "Base URL where PACKAGES.TXT is located" -msgstr "PACKAGES.TXT 所在的基础 URL" - -#: smart/channels/slack_site_info.py:34 -msgid "Compressed" -msgstr "" - -#: smart/channels/slack_site_info.py:35 -msgid "Whether PACKAGES.TXT is gzip compressed" -msgstr "" - -#: smart/channels/slack_sys_info.py:26 -msgid "Slackware Installed Packages" -msgstr "Slackware 已安装软件包" - -#: smart/channels/slack_sys_info.py:28 -msgid "" -"\n" -"Installed packages in a slackware system.\n" -msgstr "" -"\n" -"Slackware 系统中已安装的软件包。\n" - -#: smart/channels/up2date_mirrors_info.py:26 -msgid "Mirror Information (up2date format)" -msgstr "镜像信息(up2date 格式)" - -#: smart/channels/up2date_mirrors_info.py:28 -msgid "" -"\n" -"Mirror information file, in up2date format.\n" -msgstr "" -"\n" -"镜像信息文件，以 up2date 格式给出。\n" - -#: smart/channels/urpmi_info.py:26 -msgid "URPMI Repository" -msgstr "URPMI 仓库" - -#: smart/channels/urpmi_info.py:28 -msgid "" -"\n" -"Repository created for Mandriva's URPMI package manager.\n" -msgstr "" -"\n" -"Mandriva 的 URPMI 软件包管理器所创建的仓库。\n" - -#: smart/channels/urpmi_info.py:33 -msgid "" -"Base URL where packages or the 'list' file are found under. Using ' with " -"' pattern is also supported." -msgstr "软件包或“list”文件所在的基础 URL。使用“with ”模式也同样支持。" - -#: smart/channels/urpmi_info.py:35 -msgid "With directory" -msgstr "" - -#: smart/channels/urpmi_info.py:36 -msgid "Directory path for Base URL" -msgstr "" - -#: smart/channels/urpmi_info.py:38 -msgid "" -"URL for header list (hdlist or synthesis). If it's hdlist.cz inside the " -"given base URL, may be left empty. URLs relative to the Base URL are " -"supported" -msgstr "" -"头列表(hdlist 或综合文件)的 URL。如果 hdlist.cz 位于给出的基础 URL 中，则此参数可省略。支持相对于基础 URL 的相对路径" - -#: smart/channels/urpmi_info.py:41 -msgid "Mirror List URL" -msgstr "" - -#: smart/channels/urpmi_info.py:42 -msgid "URL for mirror list)..." -msgstr "" - -#: smart/channels/urpmi_info.py:49 -msgid "Base URL has 'with', but Header List URL was provided" -msgstr "基础 URL 有“with”，但提供了头列表 URL" - -#: smart/channels/urpmi_info.py:53 -msgid "Base URL has invalid 'with' pattern" -msgstr "基础 URL 的“with”模式无效" - -#: smart/channels/yast2.py:132 -#, python-format -msgid "Invalid package file header (%s)" -msgstr "无效的包文件头 (%s)" - -#: smart/channels/yast2_info.py:26 -msgid "YaST2 Repository" -msgstr "YaST2 仓库" - -#: smart/channels/yast2_info.py:28 -msgid "" -"\n" -"Repositories created for YaST2.\n" -msgstr "" - -#: smart/channels/yast2_info.py:33 -msgid "Base URL of YaST2 repository, where the 'content' file is located." -msgstr "" - -#: smart/channels/yast2_info.py:34 -msgid "Compressed SuSETags" -msgstr "压缩过的 SuSETags" - -#: smart/channels/yast2_info.py:35 -msgid "Use compressed SuSETags metadata." -msgstr "使用压缩过的 SuSETags 的 metadata。" - -#: smart/commands/channel.py:32 -msgid "smart channel [options]" -msgstr "smart channel [选项]" - -#: smart/commands/channel.py:34 -#, python-format -msgid "" -"\n" -"This command allows one to manipulate channels. Channels are\n" -"used as sources of information about installed and available\n" -"packages. Depending on the channel type, a different backend\n" -"is used to handle interactions with the operating system and\n" -"extraction of information from the given channel.\n" -"\n" -"The following channel types are available:\n" -"\n" -"%(types)s\n" -"\n" -"Use --help-type for more information.\n" -msgstr "" -"\n" -"此命令允许对频道进行操纵。频道用于关于已安装和可用软件包的信\n" -"息来源。根据频道类型不同，会使用不同的后端与操作系统进行交互\n" -"以及提取给定频道的信息。\n" -"\n" -"目前支持下列频道类型：\n" -"\n" -"%(types)s\n" -"\n" -"使用 --help-type <类型> 可获得更多信息。\n" - -#: smart/commands/channel.py:48 -msgid "" -"\n" -"smart channel --help-type apt-rpm\n" -"smart channel --add mydb type=rpm-sys name=\"RPM Database\"\n" -"smart channel --add mychannel type=apt-rpm name=\"Some repository\" \\\n" -" baseurl=http://somewhere.com/pub/repos components=extra\n" -"smart channel --set mychannel priority=-100\n" -"smart channel --disable mychannel\n" -"smart channel --remove mychannel\n" -"smart channel --show\n" -"smart channel --show mychannel > mychannel.txt\n" -"smart channel --add ./mychannel.txt\n" -"smart channel --add http://some.url/mychannel.txt\n" -"smart channel --add /mnt/cdrom\n" -msgstr "" -"\n" -"smart channel --help-type apt-rpm\n" -"smart channel --add mydb type=rpm-sys name=\"RPM Database\"\n" -"smart channel --add mychannel type=apt-rpm name=\"Some repository\" \\\n" -" baseurl=http://somewhere.com/pub/repos components=extra\n" -"smart channel --set mychannel priority=-100\n" -"smart channel --disable mychannel\n" -"smart channel --remove mychannel\n" -"smart channel --show\n" -"smart channel --show mychannel > mychannel.txt\n" -"smart channel --add ./mychannel.txt\n" -"smart channel --add http://some.url/mychannel.txt\n" -"smart channel --add /mnt/cdrom\n" - -#: smart/commands/channel.py:103 -msgid "" -"argument is an alias and one or more key=value pairs defining a channel, or " -"a filename/url pointing to a channel description in the same format used by -" -"-show, or a directory path where autodetection will be tried" -msgstr "" -"参数是别名及可定义频道的一个或多个“键=值”对，或者是以与 --show 使用的相同格式所制定的频道描述文件名/URL，或者是可进行自动尝试的目录路径" - -#: smart/commands/channel.py:110 -msgid "" -"argument is an alias, and one or more key=value pairs modifying a channel" -msgstr "参数是别名及可修改频道的一个或多个“键=值”对" - -#: smart/commands/channel.py:113 -msgid "arguments are channel aliases to be removed" -msgstr "参数是要删除的频道别名" - -#: smart/commands/channel.py:115 -msgid "remove all existent channels" -msgstr "删除现有的全部频道" - -#: smart/commands/channel.py:117 -msgid "list all known channel aliases" -msgstr "" - -#: smart/commands/channel.py:119 -msgid "" -"show channels with given aliases, or all channels if no arguments were given" -msgstr "显示给定别名的频道，如果未给出参数则显示全部频道" - -#: smart/commands/channel.py:122 -msgid "show given channels in YAML format" -msgstr "" - -#: smart/commands/channel.py:124 -msgid "edit channels in editor set by $EDITOR" -msgstr "使用 $EDITOR 所设定的编辑器编辑频道" - -#: smart/commands/channel.py:126 -msgid "enable channels with given aliases" -msgstr "启用给定别名的频道" - -#: smart/commands/channel.py:128 -msgid "disable channels with given aliases" -msgstr "禁用给定别名的频道" - -#: smart/commands/channel.py:130 -msgid "execute without asking" -msgstr "执行无需请求确认" - -#: smart/commands/channel.py:132 -msgid "show further information about given type" -msgstr "显示关于给定类型的更多信息" - -#: smart/commands/channel.py:145 smart/interfaces/gtk/channels.py:633 -#: smart/interfaces/qt/channels.py:569 smart/interfaces/qt4/channels.py:626 -msgid "Type:" -msgstr "类型：" - -#: smart/commands/channel.py:149 -msgid "Fields:" -msgstr "字段：" - -#: smart/commands/channel.py:152 -msgid "(*) These fields are necessary for this type." -msgstr "(*) 此类型需要这些字段。" - -#: smart/commands/channel.py:158 -msgid "Can't edit channels information." -msgstr "无法编辑频道信息。" - -#: smart/commands/channel.py:159 smart/sysconfig.py:66 -msgid "Configuration is in readonly mode." -msgstr "配置只读。" - -#: smart/commands/channel.py:186 smart/interfaces/gtk/channels.py:225 -#: smart/interfaces/qt/channels.py:205 smart/interfaces/qt4/channels.py:218 -#, python-format -msgid "Unable to fetch channel description: %s" -msgstr "无法获取频道描述：%s" - -#: smart/commands/channel.py:202 -msgid "Channel has no alias" -msgstr "频道没有别名" - -#: smart/commands/channel.py:206 smart/commands/channel.py:268 -#, python-format -msgid "Argument '%s' has no '='" -msgstr "参数“%s”没有“=”" - -#: smart/commands/channel.py:213 -msgid "Channel information needed" -msgstr "需要频道信息" - -#: smart/commands/channel.py:225 -msgid "Include this channel?" -msgstr "包含此频道吗？" - -#: smart/commands/channel.py:235 -#, python-format -msgid "Channel alias '%s' is already in use." -msgstr "频道别名“%s”已经使用。" - -#: smart/commands/channel.py:237 -msgid "Channel alias: " -msgstr "频道别名： " - -#: smart/commands/channel.py:248 -msgid "Updating removable channels..." -msgstr "正在更新可移动频道..." - -#: smart/commands/channel.py:256 smart/commands/flag.py:110 -#: smart/commands/priority.py:85 smart/commands/priority.py:99 -#: smart/interfaces/text/interactive.py:246 -msgid "Invalid arguments" -msgstr "无效的参数" - -#: smart/commands/channel.py:260 -msgid "First argument must be the channel alias" -msgstr "第一个参数必须是频道别名" - -#: smart/commands/channel.py:264 -#, python-format -msgid "Channel with alias '%s' not found" -msgstr "别名为“%s”的频道未找到" - -#: smart/commands/channel.py:272 -msgid "Can't change the channel type" -msgstr "无法更改频道类型" - -#: smart/commands/channel.py:274 -msgid "Can't change the channel alias" -msgstr "无法更改频道别名" - -#: smart/commands/channel.py:288 -#, python-format -msgid "Remove channel '%s'?" -msgstr "删除频道“%s”吗？" - -#: smart/commands/channel.py:290 smart/commands/channel.py:300 -#: smart/commands/channel.py:307 smart/commands/channel.py:315 -#: smart/commands/channel.py:323 smart/commands/channel.py:337 -#, python-format -msgid "Channel '%s' not found." -msgstr "频道“%s”未找到。" - -#: smart/commands/channel.py:294 -msgid "Remove ALL channels?" -msgstr "删除全部频道吗？" - -#: smart/commands/channel.py:370 smart/commands/channel.py:383 -#: smart/commands/mirror.py:254 smart/interfaces/text/interface.py:138 -msgid "Continue?" -msgstr "继续吗？" - -#: smart/commands/channel.py:380 -#, python-format -msgid "Error in '%s' channel: %s" -msgstr "频道“%s”出错：%s" - -#: smart/commands/check.py:29 -msgid "smart check [options] [package] ..." -msgstr "smart check [选项] [软件包] ..." - -#: smart/commands/check.py:31 -msgid "" -"\n" -"This command will check relations between packages. If no\n" -"packages are explicitly given, all packages in the selected\n" -"channels will be checked. Relations of the checked packages\n" -"will only match packages inside the selected channels.\n" -"\n" -"Use the 'fix' command to fix broken relations of\n" -"installed packages.\n" -msgstr "" - -#: smart/commands/check.py:41 -msgid "" -"\n" -"smart check\n" -"smart check pkgname\n" -"smart check '*kgna*'\n" -"smart check pkgname-1.0\n" -"smart check pkgname-1.0-1\n" -"smart check pkgname1 pkgname2\n" -msgstr "" -"\n" -"智能 检查\n" -"智能 检查 pkgname\n" -"智能 检查 '*kgna*'\n" -"智能 检查 pkgname-1.0\n" -"智能 检查 pkgname-1.0-1\n" -"智能 检查 pkgname1 pkgname2\n" - -#: smart/commands/check.py:55 -msgid "check packages in all channels" -msgstr "检查全部频道中的软件包" - -#: smart/commands/check.py:57 -msgid "check packages which are in at least one installed channel (default)" -msgstr "" - -#: smart/commands/check.py:60 -msgid "check packages which are in at least one non-installed channel" -msgstr "在至少一个未安装的频道中检查包" - -#: smart/commands/check.py:63 -msgid "" -"check packages which are inside the given channels (comma separated aliases)" -msgstr "检查给定频道中的包(逗号分隔的别名)" - -#: smart/commands/check.py:110 -#, python-format -msgid "Channels not found: %s" -msgstr "频道未找到：%s" - -#: smart/commands/check.py:112 -#, python-format -msgid "Channels are disabled: %s" -msgstr "频道已被禁用：%s" - -#: smart/commands/check.py:138 smart/commands/download.py:106 -#: smart/commands/fix.py:98 smart/commands/info.py:84 -#: smart/commands/install.py:128 smart/commands/query.py:175 -#: smart/commands/reinstall.py:101 smart/commands/remove.py:113 -#: smart/commands/upgrade.py:135 smart/interfaces/text/interactive.py:155 -#: smart/interfaces/text/interactive.py:586 -#, python-format -msgid "" -"'%s' matches no packages. Suggestions:\n" -"%s" -msgstr "" -"没有与“%s”匹配的软件包。建议：\n" -"%s" - -#: smart/commands/check.py:142 smart/commands/download.py:110 -#: smart/commands/fix.py:102 smart/commands/info.py:88 -#: smart/commands/install.py:132 smart/commands/query.py:179 -#: smart/commands/reinstall.py:105 smart/commands/remove.py:117 -#: smart/commands/upgrade.py:139 smart/interfaces/text/interactive.py:159 -#: smart/interfaces/text/interactive.py:591 -#, python-format -msgid "'%s' matches no packages" -msgstr "没有与“%s”匹配的软件包" - -#: smart/commands/clean.py:27 -msgid "smart clean [options]" -msgstr "smart clean [选项]" - -#: smart/commands/clean.py:29 -msgid "" -"\n" -"This command cleans the package cache. You can use it to\n" -"delete old unused files that were left behind because of\n" -"an incomplete transaction.\n" -msgstr "" -"\n" -"这个命令用来清空包缓存。您可以\n" -"用它来删除因未完成交易留下的\n" -"无用文件。\n" - -#: smart/commands/clean.py:39 -msgid "remove packages not in other channels" -msgstr "" - -#: smart/commands/clean.py:53 smart/interfaces/gtk/channels.py:268 -#: smart/interfaces/qt/channels.py:238 smart/interfaces/qt4/channels.py:251 -#, python-format -msgid "Directory not found: %s" -msgstr "目录未找到：%s" - -#: smart/commands/clean.py:55 -msgid "Removing cached package files..." -msgstr "正在删除缓存的软件包文件..." - -#: smart/commands/clean.py:76 -#, python-format -msgid "Removed %s" -msgstr "删除 %s" - -#: smart/commands/clean.py:78 -#, python-format -msgid "Can't remove cached package %s: %s" -msgstr "无法删除缓存的软件包 %s：%s" - -#: smart/commands/config.py:28 -msgid "smart config [options]" -msgstr "smart config [选项]" - -#: smart/commands/config.py:30 -msgid "" -"\n" -"This command allows changing the internal configuration\n" -"representation arbitrarily. This is supposed to be used\n" -"by advanced users only, and is generally not needed.\n" -msgstr "" -"\n" -"此命令允许更改随意更改内部配置。此功能只对高级用户有用，\n" -"不推荐普通用户使用。\n" - -#: smart/commands/config.py:36 -msgid "" -"\n" -"smart config --set someoption.suboption=10\n" -"smart config --remove someoption\n" -"smart config --show someoption\n" -"smart config --show\n" -msgstr "" -"\n" -"smart config --set someoption.suboption=10\n" -"smart config --remove someoption\n" -"smart config --show someoption\n" -"smart config --show\n" - -#: smart/commands/config.py:52 -msgid "set given key=value options" -msgstr "设定给定的 key=value 选项" - -#: smart/commands/config.py:54 -msgid "show given options" -msgstr "显示给定的选项" - -#: smart/commands/config.py:56 -msgid "show given options in YAML format" -msgstr "" - -#: smart/commands/config.py:58 -msgid "remove given options" -msgstr "删除给定的选项" - -#: smart/commands/config.py:60 smart/commands/flag.py:89 -#: smart/commands/priority.py:67 -msgid "ignore problems" -msgstr "忽略问题" - -#: smart/commands/config.py:87 -#, python-format -msgid "Invalid --set argument: %s" -msgstr "无效的 --set 参数：%s" - -#: smart/commands/config.py:105 -#, python-format -msgid "Invalid --remove argument: %s" -msgstr "无效的 --remove 参数：%s" - -#: smart/commands/config.py:119 smart/commands/config.py:127 -#: smart/commands/config.py:140 -#, python-format -msgid "Option '%s' not found." -msgstr "选项“%s”未找到。" - -#: smart/commands/download.py:31 -msgid "smart download [options] package ..." -msgstr "smart download [选项] 软件包 ..." - -#: smart/commands/download.py:33 -msgid "" -"\n" -"This command allows downloading one or more given packages.\n" -msgstr "" -"\n" -"此命令允许下载一个或多个给定的软件包。\n" - -#: smart/commands/download.py:37 -msgid "" -"\n" -"smart download pkgname\n" -"smart download '*kgna*'\n" -"smart download pkgname-1.0\n" -"smart download pkgname-1.0-1\n" -"smart download pkgname1 pkgname2\n" -"smart download pkgname --urls 2> pkgname-url.txt\n" -"smart download pkgname --metalink 2> pkgname.metalink\n" -"smart download --from-urls pkgname-url.txt\n" -"smart download --from-urls http://some.url/some/path/somefile\n" -"smart download --from-metalink pkgname.metalink\n" -msgstr "" - -#: smart/commands/download.py:58 -msgid "packages will be saved in given directory" -msgstr "软件包将被保存到给定目录中" - -#: smart/commands/download.py:60 -msgid "pack all downloaded packages in a tarball" -msgstr "" - -#: smart/commands/download.py:62 -msgid "redirect tarball output to given filename" -msgstr "" - -#: smart/commands/download.py:64 -msgid "dump needed urls and don't download packages" -msgstr "列出所需的 URL，而不下载软件包" - -#: smart/commands/download.py:66 -msgid "dump metalink xml and don't download packages" -msgstr "" - -#: smart/commands/download.py:68 -msgid "" -"download files from the given urls and/or from the given files with lists of " -"urls" -msgstr "从给定的 URL 和/或包含 URL 列表的给定文件中下载文件" - -#: smart/commands/download.py:71 -msgid "download files from the given metalink file" -msgstr "" - -#: smart/commands/download.py:79 -msgid "Directory not found:" -msgstr "目录未找到：" - -#: smart/commands/download.py:124 smart/commands/install.py:146 -#, python-format -msgid "%s (for %s) is already installed" -msgstr "%s (适用于 %s)已经安装" - -#: smart/commands/download.py:137 smart/commands/install.py:166 -#, python-format -msgid "" -"There are multiple matches for '%s':\n" -"%s" -msgstr "" -"“%s”有多个匹配：\n" -"%s" - -#: smart/commands/download.py:169 smart/commands/download.py:178 -msgid "Metalink" -msgstr "" - -#: smart/commands/download.py:173 -#, python-format -msgid "Argument is not a file nor url: %s" -msgstr "参数不是文件也不是 URL：%s" - -#: smart/commands/download.py:175 smart/interfaces/gtk/packageinfo.py:294 -#: smart/interfaces/qt/packageinfo.py:141 -#: smart/interfaces/qt4/packageinfo.py:156 -msgid "URLs" -msgstr "URL" - -#: smart/commands/fix.py:29 -msgid "smart fix [options] [package] ..." -msgstr "smart fix [选项] [软件包] ..." - -#: smart/commands/fix.py:31 -msgid "" -"\n" -"This command will try to fix dependencies of installed packages\n" -"which are related to the given packages. Notice that the given\n" -"packages may be currently installed or not. If no packages are\n" -"given, all installed packages will be checked.\n" -msgstr "" - -#: smart/commands/fix.py:38 -msgid "" -"\n" -"smart fix\n" -"smart fix pkgname\n" -"smart fix '*kgna*'\n" -"smart fix pkgname-1.0\n" -"smart fix pkgname-1.0-1\n" -"smart fix pkgname1 pkgname2\n" -msgstr "" - -#: smart/commands/fix.py:52 smart/commands/install.py:54 -#: smart/commands/reinstall.py:50 smart/commands/remove.py:49 -#: smart/commands/upgrade.py:59 -msgid "split operation in steps" -msgstr "将操作拆分为多步进行" - -#: smart/commands/fix.py:54 smart/commands/install.py:56 -#: smart/commands/reinstall.py:52 smart/commands/remove.py:51 -#: smart/commands/upgrade.py:61 -msgid "dump needed urls and don't commit operation" -msgstr "列出所需的 URL，但不提交操作" - -#: smart/commands/fix.py:56 smart/commands/install.py:58 -#: smart/commands/reinstall.py:54 smart/commands/remove.py:53 -#: smart/commands/upgrade.py:63 -msgid "dump metalink xml and don't commit operation" -msgstr "" - -#: smart/commands/fix.py:58 smart/commands/install.py:60 -#: smart/commands/reinstall.py:56 smart/commands/remove.py:55 -#: smart/commands/upgrade.py:65 -msgid "download packages and don't commit operation" -msgstr "下载软件包但不提交操作" - -#: smart/commands/fix.py:60 smart/commands/install.py:62 -#: smart/commands/reinstall.py:58 smart/commands/remove.py:57 -#: smart/commands/upgrade.py:75 -msgid "include additional information about changes,when possible" -msgstr "可能时包含关于更改的额外信息" - -#: smart/commands/fix.py:63 smart/commands/install.py:65 -#: smart/commands/reinstall.py:61 smart/commands/remove.py:60 -#: smart/commands/upgrade.py:80 -msgid "do not ask for confirmation" -msgstr "不请求确认" - -#: smart/commands/fix.py:116 smart/commands/install.py:182 -#: smart/commands/reinstall.py:132 smart/commands/remove.py:140 -#: smart/commands/upgrade.py:164 -msgid "Computing transaction..." -msgstr "正在计算交易..." - -#: smart/commands/fix.py:119 smart/interfaces/text/interactive.py:484 -msgid "No problems to resolve!" -msgstr "没有待解决的问题。" - -#: smart/commands/flag.py:27 -msgid "smart flag [options]" -msgstr "smart flag [选项]" - -#: smart/commands/flag.py:29 -msgid "" -"\n" -"This command allows one to set, remove, and show package flags.\n" -"Package flags are used to tune the behavior of some algorithms\n" -"when dealing with the given packages.\n" -"\n" -"Currently known flags are:\n" -"\n" -" lock - Flagged packages will not be removed, if they\n" -" are currently installed, nor installed, if they\n" -" are currently available.\n" -" new - Flagged packages were considered new packages\n" -" in the repository when the last update was done.\n" -" This flag is automatically manipulated by the\n" -" system.\n" -" auto - Flagged packages were automatically installed\n" -" to satisfy dependencies.\n" -" This flag is automatically manipulated by the\n" -" system.\n" -" multi-version - Flagged packages may have more than one version\n" -" installed in the system at the same time\n" -" (backend dependent).\n" -"\n" -" security - Flagged packages are updates for security errata.\n" -" bugfix - Flagged packages are updates for bugfix errata.\n" -" enhancement - Flagged packages are updates for enhancement errata.\n" -msgstr "" - -#: smart/commands/flag.py:56 -msgid "" -"\n" -"smart flag --show\n" -"smart flag --show new\n" -"smart flag --set lock pkgname\n" -"smart flag --remove lock pkgname\n" -"smart flag --set lock 'pkgname >= 1.0'\n" -"smart flag --remove lock 'pkgname >= 1.0'\n" -msgstr "" -"\n" -"smart flag --show\n" -"smart flag --show new\n" -"smart flag --set lock 软件包名称\n" -"smart flag --remove lock 软件包名称\n" -"smart flag --set lock '软件包名称 >= 1.0'\n" -"smart flag --remove lock '软件包名称 >= 1.0'\n" - -#: smart/commands/flag.py:74 -msgid "" -"set flags given in pairs of flag name/target, where targets may use just the " -"package name, or the package name, relation, and version, such as: lock " -"'python > 1.0'" -msgstr "" -"设定标志，格式为“标志 名称/目标”，此处目标可以仅仅是软件包名称，也可以是软件包名称、关系和版本，比如：lock 'python > 1.0'" - -#: smart/commands/flag.py:79 -msgid "" -"remove flags given in pairs of flag name/target, where targets may use just " -"the package name, or the package name, relation, and version, such as: lock " -"'python > 1.0'" -msgstr "" -"删除标志，格式为“标志 名称/目标”，此处目标可以仅仅是软件包名称，也可以是软件包名称、关系和版本，比如：lock 'python > 1.0'" - -#: smart/commands/flag.py:84 -msgid "" -"show packages with the flags given as arguments or all flags if no argument " -"was given" -msgstr "显示给定参数的标志，如果未给出参数，则显示全部标志" - -#: smart/commands/flag.py:87 -msgid "show given flags in YAML format" -msgstr "" - -#: smart/commands/flag.py:115 -#, python-format -msgid "Invalid target: %s" -msgstr "无效的目标：%s" - -#: smart/commands/info.py:29 -msgid "smart info [options] [package] ..." -msgstr "smart info [选项] [软件包] ..." - -#: smart/commands/info.py:31 -msgid "" -"\n" -"This command will show information about the given packages.\n" -msgstr "" -"\n" -"此命令将显示关于给定软件包的信息。\n" - -#: smart/commands/info.py:35 -msgid "" -"\n" -"smart info pkgname\n" -"smart info pkgname-1.0\n" -"smart info pkgname --urls --paths\n" -msgstr "" -"\n" -"smart info 软件包名称\n" -"smart info 软件包名称-1.0\n" -"smart info 软件包名称 --urls --paths\n" - -#: smart/commands/info.py:46 -msgid "show URLs" -msgstr "显示 URL" - -#: smart/commands/info.py:48 -msgid "show path list" -msgstr "显示路径列表" - -#: smart/commands/info.py:50 -msgid "show change log" -msgstr "" - -#: smart/commands/info.py:116 smart/interfaces/gtk/flags.py:314 -#: smart/interfaces/qt/flags.py:272 smart/interfaces/qt4/flags.py:303 -msgid "Name:" -msgstr "名称：" - -#: smart/commands/info.py:117 -msgid "Version:" -msgstr "版本：" - -#: smart/commands/info.py:118 smart/interfaces/gtk/packageinfo.py:102 -#: smart/interfaces/gtk/priorities.py:242 -#: smart/interfaces/qt/packageinfo.py:68 smart/interfaces/qt/priorities.py:220 -#: smart/interfaces/qt4/packageinfo.py:70 -#: smart/interfaces/qt4/priorities.py:236 -msgid "Priority:" -msgstr "优先级：" - -#: smart/commands/info.py:119 -msgid "Source:" -msgstr "" - -#: smart/commands/info.py:120 smart/interfaces/gtk/packageinfo.py:103 -#: smart/interfaces/qt/packageinfo.py:69 -#: smart/interfaces/qt4/packageinfo.py:71 -msgid "Group:" -msgstr "分组：" - -#: smart/commands/info.py:121 -msgid "License:" -msgstr "" - -#: smart/commands/info.py:122 smart/interfaces/gtk/packageinfo.py:104 -#: smart/interfaces/qt/packageinfo.py:70 -#: smart/interfaces/qt4/packageinfo.py:72 -msgid "Installed Size:" -msgstr "安装后大小：" - -#: smart/commands/info.py:123 smart/interfaces/gtk/packageinfo.py:106 -#: smart/interfaces/qt/packageinfo.py:72 -#: smart/interfaces/qt4/packageinfo.py:74 -msgid "Reference URLs:" -msgstr "参考 URL：" - -#: smart/commands/info.py:132 -msgid "Flags:" -msgstr "标志：" - -#: smart/commands/info.py:134 smart/interfaces/gtk/packageinfo.py:105 -#: smart/interfaces/qt/packageinfo.py:71 -#: smart/interfaces/qt4/packageinfo.py:73 -msgid "Channels:" -msgstr "频道：" - -#: smart/commands/info.py:139 -msgid "Summary:" -msgstr "摘要：" - -#: smart/commands/info.py:140 -msgid "Description:" -msgstr "描述：" - -#: smart/commands/info.py:148 -msgid "URLs:" -msgstr "URL：" - -#: smart/commands/info.py:172 -msgid "Paths:" -msgstr "路径：" - -#: smart/commands/info.py:179 -msgid "Changelog:" -msgstr "" - -#: smart/commands/install.py:31 -msgid "smart install [options] package ..." -msgstr "smart install [选项] 软件包 ..." - -#: smart/commands/install.py:33 -msgid "" -"\n" -"This command will install one or more packages in the\n" -"system. If a new version of an already installed package\n" -"is available, it will be selected for installation.\n" -msgstr "" -"\n" -"此命令将在系统中安装一个或多个软件包。如果已经安装的软件\n" -"包有新版本可用了，则会选择新版本进行安装。\n" - -#: smart/commands/install.py:39 -msgid "" -"\n" -"smart install pkgname\n" -"smart install '*kgna*'\n" -"smart install pkgname-1.0\n" -"smart install pkgname-1.0-1\n" -"smart install pkgname1 pkgname2\n" -"smart install ./somepackage.file\n" -"smart install http://some.url/some/path/somepackage.file\n" -msgstr "" -"\n" -"smart install 软件包名称\n" -"smart install '*包名*'\n" -"smart install 软件包名称-1.0\n" -"smart install 软件包名称-1.0-1\n" -"smart install 软件包名称1 软件包名称2\n" -"smart install ./somepackage.file\n" -"smart install http://some.url/some/path/somepackage.file\n" - -#: smart/commands/install.py:67 smart/commands/remove.py:65 -#: smart/commands/upgrade.py:82 -msgid "dump package names and versions to stderr but don't commit operation" -msgstr "" - -#: smart/commands/install.py:91 smart/control.py:855 -msgid "packages" -msgstr "软件包" - -#: smart/commands/install.py:94 smart/control.py:859 -msgid "Failed to download packages:\n" -msgstr "下载软件包失败：\n" - -#: smart/commands/install.py:112 smart/commands/install.py:178 -#: smart/interfaces/text/interactive.py:281 -#, python-format -msgid "%s is already installed" -msgstr "%s 已经安装" - -#: smart/commands/mirror.py:30 -msgid "smart mirror [options]" -msgstr "smart mirror [选项]" - -#: smart/commands/mirror.py:32 -msgid "" -"\n" -"This command allows one to manipulate mirrors. Mirrors are URLs\n" -"that supposedly provide the same contents as are available in\n" -"other URLs, named origins in this help text. There is no internal\n" -"restriction on the kind of information which is mirrored. Once\n" -"an origin URL is provided, and one or more mirror URLs are\n" -"provided, these mirrors will be considered for any file which\n" -"is going to be fetched from an URL starting with the origin URL.\n" -"Whether the mirror will be chosen or not will depend on the\n" -"history of downloads from this mirror and from other mirrors for\n" -"the same URL, since mirrors are automatically balanced so that\n" -"the fastest mirror and with less errors is chosen. When errors\n" -"occur, the next mirror is tried.\n" -"\n" -"For instance, if a mirror \"http://mirror.url/path/\" is provided\n" -"for the origin \"ftp://origin.url/other/path/\", and a file in\n" -"\"ftp://origin.url/other/path/subpath/somefile\" is going to be\n" -"fetched, the mirror will be considered for being used, and the\n" -"URL \"http://mirror.url/path/subpath/somefile\" will be used if\n" -"the mirror is chosen. Notice that strings are compared and\n" -"replaced without any pre-processing, so that it's possible to\n" -"use URLs ending in prefixes of directory entries.\n" -msgstr "" - -#: smart/commands/mirror.py:56 -msgid "" -"\n" -"smart mirror --show\n" -"smart mirror --add ftp://origin.url/some/path/ http://mirror.url/path/\n" -"smart mirror --remove ftp://origin.url/some/path/ http://mirror.url/path/\n" -"smart mirror --add http://some.url/path/to/mirrors.txt\n" -"smart mirror --sync http://some.url/path/to/mirrors.txt\n" -"smart mirror --clear-history ftp://origin.url/some/path/\n" -"smart mirror --clear-history ftp://mirror.url/path/\n" -"smart mirror --clear-history\n" -msgstr "" - -#: smart/commands/mirror.py:67 -msgid "" -"#\n" -"# Example:\n" -"#\n" -"# http://origin.url/some/path/\n" -"# http://mirror.url/another/path/\n" -"# http://some.mirror.url/to/the/same/content/\n" -"#\n" -"# http://another.origin.url/another/path/\n" -"# http://another.mirror.url/yet/another/path/\n" -"#\n" -msgstr "" - -#: smart/commands/mirror.py:89 -msgid "show current mirrors" -msgstr "显示当前的镜像" - -#: smart/commands/mirror.py:91 -msgid "show current mirrors in YAML format" -msgstr "" - -#: smart/commands/mirror.py:93 -msgid "" -"add to the given origin URL the given mirror URL, provided either in pairs, " -"or in a given file/url in the format used by --show" -msgstr "" - -#: smart/commands/mirror.py:97 -msgid "" -"remove from the given origin URL the given mirror URL, provided either in " -"pairs, or in a given file/url in the format used by --show" -msgstr "" - -#: smart/commands/mirror.py:101 -msgid "remove all mirrors for the given origin URLs" -msgstr "" - -#: smart/commands/mirror.py:103 -msgid "" -"synchronize mirrors from the given file/url, so that origins in the given " -"file will have exactly the specified mirrors" -msgstr "" - -#: smart/commands/mirror.py:107 -msgid "edit mirrors in editor set by $EDITOR" -msgstr "" - -#: smart/commands/mirror.py:109 -msgid "clear history for the given origins/mirrors, or for all mirrors" -msgstr "" - -#: smart/commands/mirror.py:112 -msgid "" -"show current penalities for origins/mirrors, based on the history information" -msgstr "" - -#: smart/commands/mirror.py:126 -msgid "mirror descriptions" -msgstr "镜像描述" - -#: smart/commands/mirror.py:128 -msgid "Failed to download mirror descriptions:\n" -msgstr "下载镜像描述失败：\n" - -#: smart/commands/mirror.py:153 -msgid "Invalid mirrors file" -msgstr "无效的镜像文件" - -#: smart/commands/mirror.py:170 -msgid "Invalid arguments for --add" -msgstr "--add 的参数无效" - -#: smart/commands/mirror.py:180 -msgid "Invalid arguments for --remove" -msgstr "--remove 的参数无效" - -#: smart/commands/mirror.py:184 smart/commands/mirror.py:191 -#, python-format -msgid "Origin not found: %s" -msgstr "" - -#: smart/commands/mirror.py:186 -#, python-format -msgid "Mirror not found: %s" -msgstr "镜像未找到：%s" - -#: smart/commands/newer.py:33 -msgid "smart newer" -msgstr "" - -#: smart/commands/newer.py:35 -msgid "" -"\n" -"This command shows packages that have available upgrades.\n" -msgstr "" - -#: smart/commands/newer.py:39 -msgid "" -"\n" -"smart newer\n" -msgstr "" - -#: smart/commands/newer.py:77 smart/commands/newer.py:89 -#: smart/commands/upgrade.py:185 smart/commands/upgrade.py:196 -msgid "No interesting upgrades available." -msgstr "没有可更新的软件包。" - -#: smart/commands/newer.py:85 smart/commands/upgrade.py:192 -msgid "There are pending upgrades!" -msgstr "有延后的更新。" - -#: smart/commands/newer.py:87 smart/commands/upgrade.py:194 -msgid "There are new upgrades available!" -msgstr "有可用的更新。" - -#: smart/commands/newer.py:124 -msgid "(not installed)" -msgstr "" - -#: smart/commands/newer.py:137 smart/commands/priority.py:104 -#: smart/interfaces/gtk/packageinfo.py:286 -#: smart/interfaces/qt/packageinfo.py:137 -#: smart/interfaces/qt4/packageinfo.py:154 -msgid "Channel" -msgstr "频道" - -#: smart/commands/newer.py:137 smart/interfaces/gtk/legend.py:72 -#: smart/interfaces/gtk/packageinfo.py:443 smart/interfaces/qt/legend.py:59 -#: smart/interfaces/qt/packageinfo.py:204 smart/interfaces/qt4/legend.py:66 -#: smart/interfaces/qt4/packageinfo.py:219 -msgid "Installed" -msgstr "已安装" - -#: smart/commands/newer.py:137 smart/interfaces/gtk/priorities.py:67 -#: smart/interfaces/qt/priorities.py:70 -msgid "Package Name" -msgstr "软件包名称" - -#: smart/commands/newer.py:137 smart/interfaces/gtk/packageinfo.py:288 -#: smart/interfaces/gtk/packageview.py:149 -#: smart/interfaces/qt/packageinfo.py:138 -#: smart/interfaces/qt4/packageinfo.py:154 -msgid "Size" -msgstr "大小" - -#: smart/commands/newer.py:137 smart/interfaces/gtk/changes.py:98 -#: smart/interfaces/qt/changes.py:81 smart/interfaces/qt4/changes.py:84 -msgid "Upgrade" -msgstr "升级" - -#: smart/commands/nothing.py:26 -msgid "smart test [options]" -msgstr "smart test [选项]" - -#: smart/commands/priority.py:27 -msgid "smart priority [options]" -msgstr "smart priority [选项]" - -#: smart/commands/priority.py:29 -msgid "" -"\n" -"This command allows changing the priority of given packages.\n" -"Packages with higher priorities are considered a better option\n" -"even when package versions state otherwise. Using priorities\n" -"one may avoid unwanted upgrades, force downgrades, select\n" -"packages in given channels as preferential, and other kinds\n" -"of interesting setups. When a package has no explicit priority,\n" -"the channel priority is used. The channel priority may be\n" -"changed using the 'channel' command, and defaults to 0 when\n" -"not set.\n" -"\n" -"Notice that negatives priorities must be preceded by '--' in\n" -"the command line, otherwise they'll be interpreted as command\n" -"line options.\n" -msgstr "" - -#: smart/commands/priority.py:45 -msgid "" -"\n" -"smart priority --set pkgname 100\n" -"smart priority --set pkgname mychannel -- -200\n" -"smart priority --remove pkgname\n" -"smart priority --remove pkgname mychannel\n" -"smart priority --show\n" -"smart priority --show pkgname\n" -msgstr "" - -#: smart/commands/priority.py:59 -msgid "set priority" -msgstr "设定优先级" - -#: smart/commands/priority.py:61 -msgid "unset priority" -msgstr "取消优先级" - -#: smart/commands/priority.py:63 -msgid "show priorities" -msgstr "显示优先级" - -#: smart/commands/priority.py:65 -msgid "show priorities in YAML format" -msgstr "" - -#: smart/commands/priority.py:89 -msgid "Invalid priority" -msgstr "无效的优先级" - -#: smart/commands/priority.py:101 -msgid "Priority not found" -msgstr "优先级未找到" - -#: smart/commands/priority.py:104 smart/interfaces/gtk/packageview.py:133 -#: smart/interfaces/qt/packageview.py:56 -#: smart/interfaces/qt4/packageview.py:59 -msgid "Package" -msgstr "软件包" - -#: smart/commands/query.py:33 -msgid "smart query [options] [package] ..." -msgstr "smart query [选项] [软件包] ..." - -#: smart/commands/query.py:35 -msgid "" -"\n" -"This command allows querying the known packages in many\n" -"different ways. Check also the 'search' command.\n" -msgstr "" -"\n" -"此命令允许以多种不同方式查询已知的软件包。另请参见\n" -"“search”命令。\n" - -#: smart/commands/query.py:40 -msgid "" -"\n" -"smart query pkgname\n" -"smart query '*kgnam*'\n" -"smart query pkgname-1.0\n" -"smart query pkgname --show-requires\n" -"smart query --requires libpkg.so --show-providedby\n" -"smart query --installed\n" -"smart query --summary ldap\n" -"smart query --show-format='Name: $name\tVersion: $version\n" -"'\n" -msgstr "" - -#: smart/commands/query.py:59 -msgid "consider only installed packages" -msgstr "只考虑已安装的软件包" - -#: smart/commands/query.py:61 -msgid "consider only the newest package" -msgstr "" - -#: smart/commands/query.py:63 -msgid "consider only installed packages that are duplicated" -msgstr "" - -#: smart/commands/query.py:65 -msgid "consider only installed packages not required by others" -msgstr "" - -#: smart/commands/query.py:67 -msgid "consider only installed packages not in other channels" -msgstr "" - -#: smart/commands/query.py:69 -msgid "show only packages providing the given dependency" -msgstr "只显示提供给定依赖关系的软件包" - -#: smart/commands/query.py:72 -msgid "show only packages requiring the given dependency" -msgstr "只显示需要给定依赖关系的软件包" - -#: smart/commands/query.py:75 -msgid "show only packages conflicting with the given dependency" -msgstr "只显示与给定依赖关系冲突的软件包" - -#: smart/commands/query.py:78 -msgid "show only packages upgrading the given dependency" -msgstr "只显示更新给定依赖关系的软件包" - -#: smart/commands/query.py:81 -msgid "show only packages which match given name" -msgstr "只显示与给定名称匹配的软件包" - -#: smart/commands/query.py:83 -msgid "show only packages which match given group" -msgstr "" - -#: smart/commands/query.py:85 -msgid "show only packages from the given channel" -msgstr "" - -#: smart/commands/query.py:87 -msgid "show only packages with the given flag set" -msgstr "" - -#: smart/commands/query.py:89 -msgid "show only packages which match given summary" -msgstr "只显示与给定摘要匹配的软件包" - -#: smart/commands/query.py:91 -msgid "show only packages which match given description" -msgstr "只显示与给定描述匹配的软件包" - -#: smart/commands/query.py:94 -msgid "" -"show only packages which include the given path in the available meta " -"information" -msgstr "只显示在可用的元信息中包含给定路径的软件包" - -#: smart/commands/query.py:97 -msgid "" -"show only packages which include the given reference url in the available " -"meta information" -msgstr "只显示在可用的元信息中包含给定参考 URL 的软件包" - -#: smart/commands/query.py:101 -msgid "hide package version" -msgstr "隐藏软件包版本" - -#: smart/commands/query.py:103 -msgid "show package summaries" -msgstr "显示软件包摘要" - -#: smart/commands/query.py:105 -msgid "show provides for the given packages" -msgstr "显示给定软件包的提供" - -#: smart/commands/query.py:107 -msgid "show requires for the given packages" -msgstr "显示给定软件包的需要" - -#: smart/commands/query.py:109 -msgid "show requires selecting only pre-dependencies" -msgstr "显示安装前依赖关系的需要" - -#: smart/commands/query.py:111 -msgid "show upgrades for the given packages" -msgstr "显示给定软件包的更新" - -#: smart/commands/query.py:113 -msgid "show conflicts for the given packages" -msgstr "显示给定软件包的冲突" - -#: smart/commands/query.py:115 -msgid "show packages providing dependencies" -msgstr "显示提供依赖关系的软件包" - -#: smart/commands/query.py:117 -msgid "show packages requiring provided information" -msgstr "显示需要所提供信息的软件包" - -#: smart/commands/query.py:119 -msgid "show packages upgrading provided information" -msgstr "显示升级所提供信息的软件包" - -#: smart/commands/query.py:121 -msgid "show packages conflicting with provided information" -msgstr "显示与所提供信息冲突的软件包" - -#: smart/commands/query.py:124 -msgid "show package priority" -msgstr "显示软件包优先级" - -#: smart/commands/query.py:126 -msgid "show channels that include this package" -msgstr "显示包含此软件包的频道" - -#: smart/commands/query.py:128 -msgid "enable all --show-* options" -msgstr "启用全部 --show-* 选项" - -#: smart/commands/query.py:130 -msgid "show using string template" -msgstr "" - -#: smart/commands/query.py:132 -msgid "change output format" -msgstr "更改输出格式" - -#: smart/commands/query.py:134 -msgid "redirect output to given filename" -msgstr "将输出重定向到给定文件名" - -#: smart/commands/query.py:658 -msgid "Provides:" -msgstr "提供：" - -#: smart/commands/query.py:664 smart/interfaces/text/interface.py:192 -msgid "Required By:" -msgstr "被需要：" - -#: smart/commands/query.py:667 smart/commands/query.py:700 -msgid "pre" -msgstr "前" - -#: smart/commands/query.py:678 -msgid "Upgraded By:" -msgstr "升级原因：" - -#: smart/commands/query.py:688 -msgid "Conflicted By:" -msgstr "冲突原因：" - -#: smart/commands/query.py:698 smart/interfaces/text/interface.py:188 -msgid "Requires:" -msgstr "需要：" - -#: smart/commands/query.py:707 smart/commands/query.py:723 -#: smart/commands/query.py:739 -msgid "Provided By:" -msgstr "提供者：" - -#: smart/commands/query.py:717 smart/interfaces/text/interface.py:180 -msgid "Upgrades:" -msgstr "升级：" - -#: smart/commands/query.py:733 smart/interfaces/text/interface.py:196 -msgid "Conflicts:" -msgstr "冲突：" - -#: smart/commands/reinstall.py:30 -msgid "smart reinstall [options] package ..." -msgstr "smart reinstall [选项] 软件包 ..." - -#: smart/commands/reinstall.py:32 -msgid "" -"\n" -"This command will reinstall one or more packages which\n" -"are already installed in the system.\n" -msgstr "" -"\n" -"此命令将重新安装系统中已经安装的一个或多个软件包。\n" - -#: smart/commands/reinstall.py:37 -msgid "" -"\n" -"smart reinstall pkgname\n" -"smart reinstall '*kgnam*'\n" -"smart reinstall pkgname-1.0\n" -"smart reinstall pkgname-1.0-1\n" -"smart reinstall pkgname1 pkgname2\n" -msgstr "" -"\n" -"smart reinstall 软件包名称\n" -"smart reinstall '*包名*'\n" -"smart reinstall 软件包名称-1.0\n" -"smart reinstall 软件包名称-1.0-1\n" -"smart reinstall 软件包名称1 软件包名称2\n" - -#: smart/commands/reinstall.py:127 -#, python-format -msgid "'%s' is not available for reinstallation" -msgstr "“%s”不可重新安装" - -#: smart/commands/reinstall.py:130 smart/commands/remove.py:138 -#: smart/commands/upgrade.py:158 smart/interfaces/text/interactive.py:319 -#: smart/interfaces/text/interactive.py:365 -#: smart/interfaces/text/interactive.py:409 -#, python-format -msgid "'%s' matches no installed packages" -msgstr "已安装的软件包中没有一个与“%s”匹配" - -#: smart/commands/remove.py:29 -msgid "smart remove [options] package ..." -msgstr "smart remove [选项] 软件包 ..." - -#: smart/commands/remove.py:31 -msgid "" -"\n" -"This command will remove one or more packages which\n" -"are currently installed in the system.\n" -msgstr "" -"\n" -"此命令将删除系统中已安装的一个或多个软件包。\n" - -#: smart/commands/remove.py:36 -msgid "" -"\n" -"smart remove pkgname\n" -"smart remove '*kgnam*'\n" -"smart remove pkgname-1.0\n" -"smart remove pkgname-1.0-1\n" -"smart remove pkgname1 pkgname2\n" -msgstr "" -"\n" -"smart remove 软件包名称\n" -"smart remove '*包名*'\n" -"smart remove 软件包名称-1.0\n" -"smart remove 软件包名称-1.0-1\n" -"smart remove 软件包名称1 软件包名称2\n" - -#: smart/commands/remove.py:62 -msgid "use the auto-install information to remove stuff." -msgstr "" - -#: smart/commands/search.py:25 -msgid "smart search expression ..." -msgstr "" - -#: smart/commands/search.py:27 -msgid "" -"\n" -"This command allows searching for the given expressions\n" -"in the name, summary, and description of known packages.\n" -msgstr "" - -#: smart/commands/search.py:32 -msgid "" -"\n" -"smart search ldap\n" -"smart search kernel module\n" -"smart search rpm 'package manager'\n" -"smart search pkgname\n" -"smart search 'pkgn*e'\n" -msgstr "" - -#: smart/commands/stats.py:27 -msgid "smart stats" -msgstr "smart stats" - -#: smart/commands/stats.py:29 -msgid "" -"\n" -"This command will show some statistics.\n" -msgstr "" -"\n" -"此命令将显示一些统计信息。\n" - -#: smart/commands/stats.py:33 -msgid "" -"\n" -"smart stats \n" -msgstr "" -"\n" -"smart stats \n" - -#: smart/commands/stats.py:56 -msgid "Installed Packages:" -msgstr "已安装的软件包：" - -#: smart/commands/stats.py:58 -msgid "Total Packages:" -msgstr "总计软件包：" - -#: smart/commands/stats.py:59 -msgid "Total Provides:" -msgstr "总计提供：" - -#: smart/commands/stats.py:60 -msgid "Total Requires:" -msgstr "总计需要：" - -#: smart/commands/stats.py:61 -msgid "Total Upgrades:" -msgstr "总计升级：" - -#: smart/commands/stats.py:62 -msgid "Total Conflicts:" -msgstr "总计冲突：" - -#: smart/commands/update.py:29 -msgid "smart update [options] [channelalias] ..." -msgstr "smart update [选项] [频道别名] ..." - -#: smart/commands/update.py:31 -msgid "" -"\n" -"This command will update the known information about the\n" -"given channels. If no channels are given, all channels\n" -"which are not disabled or setup for manual updates will\n" -"be updated.\n" -msgstr "" - -#: smart/commands/update.py:38 -msgid "" -"\n" -"smart update\n" -"smart update mychannel\n" -"smart update mychannel1 mychannel2\n" -msgstr "" - -#: smart/commands/update.py:49 -msgid "" -"only update if the last successful update happened before the given delay" -msgstr "" - -#: smart/commands/update.py:77 -#, python-format -msgid "Argument '%s' is not a channel alias." -msgstr "参数“%s”不是频道别名。" - -#: smart/commands/update.py:86 smart/interfaces/text/interactive.py:678 -msgid "Channels have no new packages." -msgstr "频道没有新软件包。" - -#: smart/commands/update.py:95 smart/interfaces/text/interactive.py:687 -#, python-format -msgid "Channels have %d new packages%s" -msgstr "频道有 %d 个新软件包 %s" - -#: smart/commands/upgrade.py:32 -msgid "smart upgrade [options] [package] ..." -msgstr "smart upgrade [选项] [软件包] ..." - -#: smart/commands/upgrade.py:34 -msgid "" -"\n" -"This command will upgrade one or more packages which\n" -"are currently installed in the system. If no packages\n" -"are given, all installed packages will be checked.\n" -"\n" -"If pkgname is prefixed by a '+', it will be installed\n" -"even if it was not currently installed in the system.\n" -"If pkgname is prefixed with a '-', it will be removed.\n" -msgstr "" - -#: smart/commands/upgrade.py:44 -msgid "" -"\n" -"smart upgrade\n" -"smart upgrade pkgname\n" -"smart upgrade '*kgnam*'\n" -"smart upgrade pkgname-1.0\n" -"smart upgrade pkgname-1.0-1\n" -"smart upgrade pkgname1 pkgname2\n" -msgstr "" - -#: smart/commands/upgrade.py:67 -msgid "update channel information before trying to upgrade" -msgstr "试图升级前先更新频道信息" - -#: smart/commands/upgrade.py:70 -msgid "just check if there are upgrades to be done" -msgstr "只是检查是否有可执行的升级" - -#: smart/commands/upgrade.py:72 -msgid "check if there are upgrades to be done, and update the known upgrades" -msgstr "检查是否有可执行的升级，并更新已知的升级" - -#: smart/commands/upgrade.py:78 -msgid "check only upgrades with the given flag set" -msgstr "" - -#: smart/control.py:102 smart/control.py:310 -#, python-format -msgid "There's another channel with alias '%s'" -msgstr "已经存在别名为“%s”的频道" - -#: smart/control.py:124 -#, python-format -msgid "Unable to create channel for file: %s" -msgstr "无法为文件创建频道：%s" - -#: smart/control.py:134 -#, python-format -msgid "Channel not found for '%s'" -msgstr "“%s”的频道未找到" - -#: smart/control.py:167 -#, python-format -msgid "Configuration file not found: %s" -msgstr "配置文件未找到：%s" - -#: smart/control.py:182 -#, python-format -msgid "Can't create datadir at %s" -msgstr "" - -#: smart/control.py:202 -msgid "Saving cache..." -msgstr "正在保存缓存..." - -#: smart/control.py:254 -msgid "Loading cache..." -msgstr "正在装入缓存..." - -#: smart/control.py:335 -msgid "Unable to create channel directory." -msgstr "无法创建频道目录。" - -#: smart/control.py:338 -msgid "The Smart library is already in use by another process." -msgstr "Smart 库正被另一进程占用。" - -#: smart/control.py:340 -msgid "Configuration is in readonly mode!" -msgstr "配置只读。" - -#: smart/control.py:342 -msgid "Channel information is locked for writing." -msgstr "频道信息已被锁定，无法写入。" - -#: smart/control.py:344 -msgid "Can't update channels in readonly mode." -msgstr "只读模式中无法更新频道。" - -#: smart/control.py:346 -msgid "Can't update channels with active readers." -msgstr "无法更新正在获取的频道。" - -#: smart/control.py:382 -#, python-format -msgid "Fetching information for '%s'..." -msgstr "正在获取“%s”的信息..." - -#: smart/control.py:389 smart/control.py:393 -#, python-format -msgid "Failed fetching channel '%s'" -msgstr "获取频道“%s”失败" - -#: smart/control.py:484 smart/control.py:503 smart/control.py:507 -#, python-format -msgid "Package %s is not available for downloading" -msgstr "软件包 %s 不可下载" - -#: smart/control.py:631 -msgid "Creating pack..." -msgstr "" - -#: smart/control.py:840 -#, python-format -msgid "No channel available for package %s" -msgstr "软件包 %s 没有可用的频道" - -#: smart/control.py:1038 -#, python-format -msgid "%s is not available for downloading" -msgstr "%s 不可下载" - -#: smart/fetcher.py:170 -#, python-format -msgid "%s is already in the queue" -msgstr "%s 已在队列中" - -#: smart/fetcher.py:212 smart/fetcher.py:219 -#, python-format -msgid "Fetching %s..." -msgstr "正在获取 %s..." - -#: smart/fetcher.py:221 -msgid "Fetching information..." -msgstr "正在获取信息..." - -#: smart/fetcher.py:302 smart/fetcher.py:612 -msgid "Cancelled" -msgstr "已取消" - -#: smart/fetcher.py:345 -#, python-format -msgid "Unsupported scheme: %s" -msgstr "不支持的大纲：%s" - -#: smart/fetcher.py:362 -msgid "File not found for validation" -msgstr "" - -#: smart/fetcher.py:637 -#, python-format -msgid "Invalid URL: %s" -msgstr "无效的 URL：%s" - -#: smart/fetcher.py:916 -msgid "Media not found" -msgstr "介质未找到" - -#: smart/fetcher.py:1044 smart/fetcher.py:1253 smart/fetcher.py:1865 -msgid "Server reports unexpected size" -msgstr "服务器报告意外大小" - -#: smart/interface.py:51 -#, python-format -msgid "Invalid command '%s'" -msgstr "无效的命令“%s”" - -#: smart/interface.py:98 -msgid "Password" -msgstr "密码" - -#: smart/interface.py:99 -#, python-format -msgid "A password is needed for '%s'." -msgstr "“%s”需要密码。" - -#: smart/interface.py:140 smart/interfaces/gtk/log.py:122 -#: smart/interfaces/qt/log.py:103 smart/interfaces/qt4/log.py:114 -msgid "error" -msgstr "错误" - -#: smart/interface.py:140 smart/interfaces/gtk/log.py:122 -#: smart/interfaces/qt/log.py:103 smart/interfaces/qt4/log.py:114 -msgid "warning" -msgstr "警告" - -#: smart/interface.py:141 smart/interfaces/gtk/log.py:123 -#: smart/interfaces/qt/log.py:104 smart/interfaces/qt4/log.py:115 -msgid "debug" -msgstr "调试" - -#: smart/interface.py:176 -#, python-format -msgid "Interface '%s' not available" -msgstr "界面“%s”不可用" - -#: contrib/smart-applet/smart-applet.py:46 smart/interfaces/gtk/__init__.py:36 -msgid "System has no support for gtk python interface" -msgstr "系统不支持 gtk python 界面" - -#: smart/interfaces/gtk/__init__.py:61 smart/interfaces/qt/__init__.py:54 -#: smart/interfaces/qt4/__init__.py:54 -#, python-format -msgid "Image '%s' not found" -msgstr "未找到图像“%s”" - -#: smart/interfaces/gtk/changes.py:36 smart/interfaces/qt/changes.py:35 -#: smart/interfaces/qt4/changes.py:36 -msgid "Change Summary" -msgstr "更改摘要" - -#: smart/interfaces/gtk/changes.py:97 smart/interfaces/qt/changes.py:80 -#: smart/interfaces/qt4/changes.py:83 -msgid "Downgrade" -msgstr "降级" - -#: smart/interfaces/gtk/changes.py:97 smart/interfaces/gtk/interactive.py:716 -#: smart/interfaces/qt/changes.py:80 smart/interfaces/qt/interactive.py:667 -#: smart/interfaces/qt4/changes.py:83 smart/interfaces/qt4/interactive.py:659 -msgid "Reinstall" -msgstr "重新安装" - -#: smart/interfaces/gtk/changes.py:97 smart/interfaces/gtk/interactive.py:726 -#: smart/interfaces/qt/changes.py:80 smart/interfaces/qt/interactive.py:673 -#: smart/interfaces/qt4/changes.py:83 smart/interfaces/qt4/interactive.py:667 -msgid "Remove" -msgstr "删除" - -#: smart/interfaces/gtk/changes.py:98 smart/interfaces/gtk/interactive.py:707 -#: smart/interfaces/qt/changes.py:81 smart/interfaces/qt/interactive.py:661 -#: smart/interfaces/qt4/changes.py:84 smart/interfaces/qt4/interactive.py:651 -msgid "Install" -msgstr "安装" - -#: smart/interfaces/gtk/changes.py:125 smart/interfaces/gtk/packageinfo.py:590 -#: smart/interfaces/gtk/packageinfo.py:642 smart/interfaces/qt/changes.py:108 -#: smart/interfaces/qt/packageinfo.py:336 -#: smart/interfaces/qt/packageinfo.py:388 smart/interfaces/qt4/changes.py:111 -#: smart/interfaces/qt4/packageinfo.py:352 -#: smart/interfaces/qt4/packageinfo.py:404 -msgid "Upgrades" -msgstr "升级" - -#: smart/interfaces/gtk/changes.py:129 smart/interfaces/qt/changes.py:112 -#: smart/interfaces/qt4/changes.py:115 -msgid "Downgrades" -msgstr "降级" - -#: smart/interfaces/gtk/changes.py:133 smart/interfaces/gtk/changes.py:170 -#: smart/interfaces/gtk/packageinfo.py:591 -#: smart/interfaces/gtk/packageinfo.py:633 smart/interfaces/qt/changes.py:116 -#: smart/interfaces/qt/changes.py:153 smart/interfaces/qt/packageinfo.py:337 -#: smart/interfaces/qt/packageinfo.py:379 smart/interfaces/qt4/changes.py:119 -#: smart/interfaces/qt4/changes.py:156 smart/interfaces/qt4/packageinfo.py:353 -#: smart/interfaces/qt4/packageinfo.py:395 -msgid "Requires" -msgstr "需要" - -#: smart/interfaces/gtk/changes.py:136 smart/interfaces/gtk/changes.py:173 -#: smart/interfaces/gtk/packageinfo.py:608 smart/interfaces/qt/changes.py:119 -#: smart/interfaces/qt/changes.py:156 smart/interfaces/qt/packageinfo.py:354 -#: smart/interfaces/qt4/changes.py:122 smart/interfaces/qt4/changes.py:159 -#: smart/interfaces/qt4/packageinfo.py:370 -msgid "Required By" -msgstr "被需要" - -#: smart/interfaces/gtk/changes.py:141 smart/interfaces/gtk/changes.py:178 -#: smart/interfaces/gtk/packageinfo.py:591 -#: smart/interfaces/gtk/packageinfo.py:651 smart/interfaces/qt/changes.py:124 -#: smart/interfaces/qt/changes.py:161 smart/interfaces/qt/packageinfo.py:337 -#: smart/interfaces/qt/packageinfo.py:397 smart/interfaces/qt4/changes.py:127 -#: smart/interfaces/qt4/changes.py:164 smart/interfaces/qt4/packageinfo.py:353 -#: smart/interfaces/qt4/packageinfo.py:413 -msgid "Conflicts" -msgstr "冲突" - -#: smart/interfaces/gtk/changes.py:151 smart/interfaces/qt/changes.py:134 -#: smart/interfaces/qt4/changes.py:137 -#, python-format -msgid "Reinstall (%d)" -msgstr "重新安装(%d个)" - -#: smart/interfaces/gtk/changes.py:154 smart/interfaces/qt/changes.py:137 -#: smart/interfaces/qt4/changes.py:140 -#, python-format -msgid "Install (%d)" -msgstr "安装(%d个)" - -#: smart/interfaces/gtk/changes.py:156 smart/interfaces/qt/changes.py:139 -#: smart/interfaces/qt4/changes.py:142 -#, python-format -msgid "Upgrade (%d)" -msgstr "升级(%d个)" - -#: smart/interfaces/gtk/changes.py:158 smart/interfaces/qt/changes.py:141 -#: smart/interfaces/qt4/changes.py:144 -#, python-format -msgid "Downgrade (%d)" -msgstr "降级(%d个)" - -#: smart/interfaces/gtk/changes.py:181 smart/interfaces/qt/changes.py:164 -#: smart/interfaces/qt4/changes.py:167 -#, python-format -msgid "Remove (%d)" -msgstr "删除(%d个)" - -#: smart/interfaces/gtk/changes.py:185 smart/interfaces/qt/changes.py:168 -#: smart/interfaces/qt4/changes.py:171 -#, python-format -msgid "Keep (%d)" -msgstr "保留(%d个)" - -#: smart/interfaces/gtk/changes.py:191 smart/interfaces/qt/changes.py:174 -#: smart/interfaces/qt4/changes.py:177 smart/interfaces/text/interface.py:229 -#, python-format -msgid "%s of package files are needed. " -msgstr "需要 %s 个软件包文件。 " - -#: smart/interfaces/gtk/changes.py:193 smart/interfaces/qt/changes.py:176 -#: smart/interfaces/qt4/changes.py:179 smart/interfaces/text/interface.py:232 -#, python-format -msgid "%s will be used." -msgstr "将使用 %s。" - -#: smart/interfaces/gtk/changes.py:196 smart/interfaces/qt/changes.py:179 -#: smart/interfaces/qt4/changes.py:182 smart/interfaces/text/interface.py:235 -#, python-format -msgid "%s will be freed." -msgstr "将释放 %s。" - -#: smart/interfaces/gtk/channels.py:39 smart/interfaces/gtk/interactive.py:256 -#: smart/interfaces/qt/channels.py:56 smart/interfaces/qt/interactive.py:325 -#: smart/interfaces/qt4/channels.py:57 smart/interfaces/qt4/interactive.py:312 -msgid "Channels" -msgstr "频道" - -#: smart/interfaces/gtk/channels.py:84 smart/interfaces/qt/channels.py:81 -#: smart/interfaces/qt4/channels.py:88 -msgid "Pri" -msgstr "" - -#: smart/interfaces/gtk/channels.py:205 smart/interfaces/qt/channels.py:189 -#: smart/interfaces/qt4/channels.py:202 -msgid "Select Channel Description" -msgstr "选择频道描述" - -#: smart/interfaces/gtk/channels.py:219 smart/interfaces/qt/channels.py:199 -#: smart/interfaces/qt4/channels.py:212 -msgid "Description URL" -msgstr "描述 URL" - -#: smart/interfaces/gtk/channels.py:223 smart/interfaces/qt/channels.py:203 -#: smart/interfaces/qt4/channels.py:216 -msgid "channel description" -msgstr "频道描述" - -#: smart/interfaces/gtk/channels.py:260 smart/interfaces/qt/channels.py:234 -#: smart/interfaces/qt4/channels.py:247 -msgid "Select Path" -msgstr "选择路径" - -#: smart/interfaces/gtk/channels.py:287 smart/interfaces/qt/channels.py:257 -#: smart/interfaces/qt4/channels.py:270 -msgid "No channels detected!" -msgstr "未检测到频道。" - -#: smart/interfaces/gtk/channels.py:324 smart/interfaces/qt/channels.py:316 -#: smart/interfaces/qt4/channels.py:332 -msgid "Select Channels" -msgstr "选择频道" - -#: smart/interfaces/gtk/channels.py:432 smart/interfaces/qt/channels.py:397 -#: smart/interfaces/qt4/channels.py:431 -msgid "Edit Channel" -msgstr "编辑频道" - -#: smart/interfaces/gtk/channels.py:518 smart/interfaces/gtk/channels.py:575 -#: smart/interfaces/qt/channels.py:461 smart/interfaces/qt/channels.py:523 -#: smart/interfaces/qt4/channels.py:509 smart/interfaces/qt4/channels.py:572 -#, python-format -msgid "Don't know how to handle %s fields" -msgstr "不知道如何处理 %s 字段" - -#: smart/interfaces/gtk/channels.py:581 smart/interfaces/qt/channels.py:529 -#: smart/interfaces/qt4/channels.py:578 -msgid "Invalid alias!" -msgstr "无效的别名。" - -#: smart/interfaces/gtk/channels.py:584 smart/interfaces/qt/channels.py:532 -#: smart/interfaces/qt4/channels.py:581 -msgid "Alias already in use!" -msgstr "别名已经使用。" - -#: smart/interfaces/gtk/channels.py:607 smart/interfaces/gtk/channels.py:709 -#: smart/interfaces/gtk/channels.py:810 smart/interfaces/qt/channels.py:555 -#: smart/interfaces/qt/channels.py:644 smart/interfaces/qt/channels.py:731 -#: smart/interfaces/qt4/channels.py:604 smart/interfaces/qt4/channels.py:712 -#: smart/interfaces/qt4/channels.py:814 -msgid "New Channel" -msgstr "新建频道" - -#: smart/interfaces/gtk/channels.py:729 smart/interfaces/qt/channels.py:656 -#: smart/interfaces/qt4/channels.py:727 -msgid "Method:" -msgstr "方式：" - -#: smart/interfaces/gtk/channels.py:768 smart/interfaces/qt/channels.py:682 -#: smart/interfaces/qt4/channels.py:762 -msgid "Provide channel information" -msgstr "提供频道信息" - -#: smart/interfaces/gtk/channels.py:770 smart/interfaces/qt/channels.py:684 -#: smart/interfaces/qt4/channels.py:764 -msgid "Read channel description from local path" -msgstr "从本地路径读取频道描述" - -#: smart/interfaces/gtk/channels.py:772 smart/interfaces/qt/channels.py:686 -#: smart/interfaces/qt4/channels.py:766 -msgid "Read channel description from URL" -msgstr "从 URL 读取频道描述" - -#: smart/interfaces/gtk/channels.py:774 smart/interfaces/qt/channels.py:688 -#: smart/interfaces/qt4/channels.py:768 -msgid "Detect channel in media (CDROM, DVD, etc)" -msgstr "检测介质中的频道(CDROM、DVD 等)" - -#: smart/interfaces/gtk/channels.py:776 smart/interfaces/qt/channels.py:690 -#: smart/interfaces/qt4/channels.py:770 -msgid "Detect channel in local path" -msgstr "检测本地路径中的频道" - -#: smart/interfaces/gtk/channels.py:831 smart/interfaces/qt/channels.py:743 -#: smart/interfaces/qt4/channels.py:827 -msgid "Media path:" -msgstr "介质路径：" - -#: smart/interfaces/gtk/channels.py:885 smart/interfaces/qt/channels.py:787 -#: smart/interfaces/qt4/channels.py:875 -msgid "No local media found!" -msgstr "未找到本地介质。" - -#: smart/interfaces/gtk/command.py:58 smart/interfaces/qt/command.py:58 -#: smart/interfaces/qt4/command.py:58 -msgid "Status" -msgstr "状态" - -#: smart/interfaces/gtk/flags.py:35 smart/interfaces/gtk/flags.py:81 -#: smart/interfaces/qt/flags.py:35 smart/interfaces/qt/flags.py:64 -#: smart/interfaces/qt4/flags.py:36 smart/interfaces/qt4/flags.py:72 -msgid "Flags" -msgstr "标志" - -#: smart/interfaces/gtk/flags.py:127 smart/interfaces/qt/flags.py:95 -#: smart/interfaces/qt4/flags.py:113 -msgid "Targets" -msgstr "目标" - -#: smart/interfaces/gtk/flags.py:199 smart/interfaces/gtk/flags.py:243 -#: smart/interfaces/qt/flags.py:167 smart/interfaces/qt/flags.py:209 -#: smart/interfaces/qt4/flags.py:196 smart/interfaces/qt4/flags.py:238 -msgid "Flag already exists!" -msgstr "标志已经存在。" - -#: smart/interfaces/gtk/flags.py:228 smart/interfaces/gtk/flags.py:255 -#: smart/interfaces/gtk/flags.py:260 smart/interfaces/gtk/flags.py:449 -#: smart/interfaces/qt/flags.py:194 smart/interfaces/qt/flags.py:221 -#: smart/interfaces/qt/flags.py:226 smart/interfaces/qt/flags.py:383 -#: smart/interfaces/qt4/flags.py:223 smart/interfaces/qt4/flags.py:250 -#: smart/interfaces/qt4/flags.py:255 smart/interfaces/qt4/flags.py:418 -msgid "Invalid target!" -msgstr "无效的目标。" - -#: smart/interfaces/gtk/flags.py:293 smart/interfaces/qt/flags.py:259 -#: smart/interfaces/qt4/flags.py:288 -msgid "New Flag" -msgstr "新建标志" - -#: smart/interfaces/gtk/flags.py:358 smart/interfaces/qt/flags.py:308 -#: smart/interfaces/qt4/flags.py:340 -msgid "No flag name provided!" -msgstr "未提供标志名称。" - -#: smart/interfaces/gtk/flags.py:374 smart/interfaces/qt/flags.py:324 -#: smart/interfaces/qt4/flags.py:356 -msgid "New Target" -msgstr "新建目标" - -#: smart/interfaces/gtk/flags.py:395 smart/interfaces/qt/flags.py:338 -#: smart/interfaces/qt4/flags.py:372 -msgid "Target:" -msgstr "目标：" - -#: smart/interfaces/gtk/flags.py:405 smart/interfaces/qt/flags.py:346 -#: smart/interfaces/qt4/flags.py:380 -msgid "Examples: \"pkgname\", \"pkgname = 1.0\" or \"pkgname <= 1.0\"" -msgstr "例：“软件包名称”、“软件包名称 = 1.0”或“软件包名称 <= 1.0”" - -#: smart/interfaces/gtk/flags.py:445 smart/interfaces/qt/flags.py:379 -#: smart/interfaces/qt4/flags.py:414 -msgid "No target provided!" -msgstr "未提供目标" - -#: smart/interfaces/gtk/interactive.py:128 -#: smart/interfaces/qt/interactive.py:123 -#: smart/interfaces/qt4/interactive.py:124 -msgid "_File" -msgstr "文件(_F)" - -#: smart/interfaces/gtk/interactive.py:129 -#: smart/interfaces/qt/interactive.py:124 -#: smart/interfaces/qt4/interactive.py:125 -msgid "Update _Selected Channels..." -msgstr "更新选中频道(_S)..." - -#: smart/interfaces/gtk/interactive.py:130 -#: smart/interfaces/qt/interactive.py:125 -#: smart/interfaces/qt4/interactive.py:126 -msgid "Update given channels" -msgstr "更新给定频道" - -#: smart/interfaces/gtk/interactive.py:131 -#: smart/interfaces/qt/interactive.py:126 -#: smart/interfaces/qt4/interactive.py:127 -msgid "_Update Channels" -msgstr "更新频道(_U)" - -#: smart/interfaces/gtk/interactive.py:132 -#: smart/interfaces/qt/interactive.py:127 -#: smart/interfaces/qt4/interactive.py:128 -msgid "Update channels" -msgstr "更新频道" - -#: smart/interfaces/gtk/interactive.py:133 -#: smart/interfaces/qt/interactive.py:128 -#: smart/interfaces/qt4/interactive.py:129 -msgid "_Rebuild Cache" -msgstr "重建缓存(_R)" - -#: smart/interfaces/gtk/interactive.py:134 -#: smart/interfaces/qt/interactive.py:129 -#: smart/interfaces/qt4/interactive.py:130 -msgid "Reload package information" -msgstr "重新装入软件包信息" - -#: smart/interfaces/gtk/interactive.py:135 -#: smart/interfaces/qt/interactive.py:130 -#: smart/interfaces/qt4/interactive.py:131 -msgid "_Execute Changes..." -msgstr "执行更改(_E)..." - -#: smart/interfaces/gtk/interactive.py:136 -#: smart/interfaces/qt/interactive.py:131 -#: smart/interfaces/qt4/interactive.py:132 -msgid "Apply marked changes" -msgstr "应用标出的更改" - -#: smart/interfaces/gtk/interactive.py:137 -#: smart/interfaces/qt/interactive.py:132 -#: smart/interfaces/qt4/interactive.py:133 -msgid "_Quit" -msgstr "退出(_Q)" - -#: smart/interfaces/gtk/interactive.py:138 -#: smart/interfaces/qt/interactive.py:133 -#: smart/interfaces/qt4/interactive.py:134 -msgid "Quit application" -msgstr "退出应用程序" - -#: smart/interfaces/gtk/interactive.py:140 -#: smart/interfaces/qt/interactive.py:135 -#: smart/interfaces/qt4/interactive.py:136 -msgid "_Edit" -msgstr "编辑(_E)" - -#: smart/interfaces/gtk/interactive.py:141 -#: smart/interfaces/qt/interactive.py:136 -#: smart/interfaces/qt4/interactive.py:137 -msgid "_Undo" -msgstr "撤消(_U)" - -#: smart/interfaces/gtk/interactive.py:142 -#: smart/interfaces/qt/interactive.py:137 -#: smart/interfaces/qt4/interactive.py:138 -msgid "Undo last change" -msgstr "撤消上次更改" - -#: smart/interfaces/gtk/interactive.py:143 -#: smart/interfaces/qt/interactive.py:138 -#: smart/interfaces/qt4/interactive.py:139 -msgid "_Redo" -msgstr "重做(_R)" - -#: smart/interfaces/gtk/interactive.py:144 -#: smart/interfaces/qt/interactive.py:139 -#: smart/interfaces/qt4/interactive.py:140 -msgid "Redo last undone change" -msgstr "重做上次撤消的更改" - -#: smart/interfaces/gtk/interactive.py:145 -#: smart/interfaces/qt/interactive.py:140 -#: smart/interfaces/qt4/interactive.py:141 -msgid "Clear Marked Changes" -msgstr "清除标出的更改" - -#: smart/interfaces/gtk/interactive.py:146 -#: smart/interfaces/qt/interactive.py:141 -#: smart/interfaces/qt4/interactive.py:142 -msgid "Clear all changes" -msgstr "清除全部更改" - -#: smart/interfaces/gtk/interactive.py:147 -#: smart/interfaces/qt/interactive.py:142 -#: smart/interfaces/qt4/interactive.py:143 -msgid "Check Installed Packages..." -msgstr "检查已安装的软件包..." - -#: smart/interfaces/gtk/interactive.py:148 -#: smart/interfaces/qt/interactive.py:143 -#: smart/interfaces/qt4/interactive.py:144 -msgid "Check installed packages" -msgstr "检查已安装的软件包" - -#: smart/interfaces/gtk/interactive.py:149 -#: smart/interfaces/qt/interactive.py:144 -#: smart/interfaces/qt4/interactive.py:145 -msgid "Check Uninstalled Packages..." -msgstr "检查已卸载的软件包..." - -#: smart/interfaces/gtk/interactive.py:150 -#: smart/interfaces/qt/interactive.py:145 -#: smart/interfaces/qt4/interactive.py:146 -msgid "Check uninstalled packages" -msgstr "检查已卸载的软件包" - -#: smart/interfaces/gtk/interactive.py:151 -#: smart/interfaces/qt/interactive.py:146 -#: smart/interfaces/qt4/interactive.py:147 -msgid "Check All Packages..." -msgstr "检查全部软件包..." - -#: smart/interfaces/gtk/interactive.py:152 -#: smart/interfaces/qt/interactive.py:147 -#: smart/interfaces/qt4/interactive.py:148 -msgid "Check all packages" -msgstr "检查全部软件包" - -#: smart/interfaces/gtk/interactive.py:153 -#: smart/interfaces/qt/interactive.py:148 -#: smart/interfaces/qt4/interactive.py:149 -msgid "Upgrade _All..." -msgstr "全部升级(_A)..." - -#: smart/interfaces/gtk/interactive.py:154 -#: smart/interfaces/qt/interactive.py:149 -#: smart/interfaces/qt4/interactive.py:150 -msgid "Upgrade all packages" -msgstr "升级全部软件包" - -#: smart/interfaces/gtk/interactive.py:155 -#: smart/interfaces/qt/interactive.py:150 -#: smart/interfaces/qt4/interactive.py:151 -msgid "Fix All _Problems..." -msgstr "修复全部问题(_P)..." - -#: smart/interfaces/gtk/interactive.py:156 -#: smart/interfaces/qt/interactive.py:151 -#: smart/interfaces/qt4/interactive.py:152 -msgid "Fix all problems" -msgstr "修复全部问题" - -#: smart/interfaces/gtk/interactive.py:157 -msgid "Remove Automatic..." -msgstr "" - -#: smart/interfaces/gtk/interactive.py:158 -msgid "Remove packages installed as dependencies" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:159 -#: smart/interfaces/qt/interactive.py:152 -#: smart/interfaces/qt4/interactive.py:153 -msgid "_Find..." -msgstr "查找(_F)..." - -#: smart/interfaces/gtk/interactive.py:160 -#: smart/interfaces/qt/interactive.py:153 -#: smart/interfaces/qt4/interactive.py:154 -msgid "Find packages" -msgstr "查找软件包" - -#: smart/interfaces/gtk/interactive.py:161 -#: smart/interfaces/qt/interactive.py:154 -#: smart/interfaces/qt4/interactive.py:155 -msgid "_Channels" -msgstr "频道(_C)" - -#: smart/interfaces/gtk/interactive.py:162 -#: smart/interfaces/qt/interactive.py:155 -#: smart/interfaces/qt4/interactive.py:156 -msgid "Edit channels" -msgstr "编辑频道" - -#: smart/interfaces/gtk/interactive.py:163 -#: smart/interfaces/qt/interactive.py:156 -#: smart/interfaces/qt4/interactive.py:157 -msgid "_Mirrors" -msgstr "镜像(_M)" - -#: smart/interfaces/gtk/interactive.py:164 -#: smart/interfaces/qt/interactive.py:157 -#: smart/interfaces/qt4/interactive.py:158 -msgid "Edit mirrors" -msgstr "编辑镜像" - -#: smart/interfaces/gtk/interactive.py:165 -#: smart/interfaces/qt/interactive.py:158 -#: smart/interfaces/qt4/interactive.py:159 -msgid "_Flags" -msgstr "标志(_F)" - -#: smart/interfaces/gtk/interactive.py:166 -#: smart/interfaces/qt/interactive.py:159 -#: smart/interfaces/qt4/interactive.py:160 -msgid "Edit package flags" -msgstr "编辑软件包标志" - -#: smart/interfaces/gtk/interactive.py:167 -#: smart/interfaces/qt/interactive.py:160 -#: smart/interfaces/qt4/interactive.py:161 -msgid "_Priorities" -msgstr "优先级(_P)" - -#: smart/interfaces/gtk/interactive.py:168 -#: smart/interfaces/qt/interactive.py:161 -#: smart/interfaces/qt4/interactive.py:162 -msgid "Edit package priorities" -msgstr "编辑软件包优先级" - -#: smart/interfaces/gtk/interactive.py:172 -#: smart/interfaces/qt/interactive.py:163 -#: smart/interfaces/qt4/interactive.py:164 -msgid "_View" -msgstr "查看(_V)" - -#: smart/interfaces/gtk/interactive.py:173 -#: smart/interfaces/qt/interactive.py:164 -#: smart/interfaces/qt4/interactive.py:165 -msgid "_Tree Style" -msgstr "树型样式(_T)" - -#: smart/interfaces/gtk/interactive.py:174 -#: smart/interfaces/qt/interactive.py:165 -#: smart/interfaces/qt4/interactive.py:166 -msgid "_Expand All" -msgstr "全部展开(_E)" - -#: smart/interfaces/gtk/interactive.py:175 -#: smart/interfaces/qt/interactive.py:166 -#: smart/interfaces/qt4/interactive.py:167 -msgid "Expand all items in the tree" -msgstr "展开树中的全部项目" - -#: smart/interfaces/gtk/interactive.py:176 -#: smart/interfaces/qt/interactive.py:167 -#: smart/interfaces/qt4/interactive.py:168 -msgid "_Collapse All" -msgstr "全部折叠(_C)" - -#: smart/interfaces/gtk/interactive.py:177 -#: smart/interfaces/qt/interactive.py:168 -#: smart/interfaces/qt4/interactive.py:169 -msgid "Collapse all items in the tree" -msgstr "折叠树中的全部项目" - -#: smart/interfaces/gtk/interactive.py:178 -#: smart/interfaces/qt/interactive.py:169 -#: smart/interfaces/qt4/interactive.py:170 -msgid "_Summary Window" -msgstr "摘要窗口(_S)" - -#: smart/interfaces/gtk/interactive.py:179 -#: smart/interfaces/qt/interactive.py:170 -#: smart/interfaces/qt4/interactive.py:171 -msgid "Show summary window" -msgstr "显示摘要窗口" - -#: smart/interfaces/gtk/interactive.py:180 -#: smart/interfaces/qt/interactive.py:171 -#: smart/interfaces/qt4/interactive.py:172 -msgid "_Log Window" -msgstr "日志窗口(_L)" - -#: smart/interfaces/gtk/interactive.py:181 -#: smart/interfaces/qt/interactive.py:172 -#: smart/interfaces/qt4/interactive.py:173 -msgid "Show log window" -msgstr "显示日志窗口" - -#: smart/interfaces/gtk/interactive.py:183 -#: smart/interfaces/qt/interactive.py:174 -#: smart/interfaces/qt4/interactive.py:175 -msgid "_Help" -msgstr "帮助(_H)" - -#: smart/interfaces/gtk/interactive.py:184 -#: smart/interfaces/qt/interactive.py:175 -#: smart/interfaces/qt4/interactive.py:176 -msgid "_Icon Legend" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:185 -#: smart/interfaces/qt/interactive.py:176 -#: smart/interfaces/qt4/interactive.py:177 -msgid "Show icon legend" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:186 -#: smart/interfaces/qt/interactive.py:177 -#: smart/interfaces/qt4/interactive.py:178 -msgid "_About" -msgstr "关于(_A)" - -#: smart/interfaces/gtk/interactive.py:187 -#: smart/interfaces/qt/interactive.py:178 -#: smart/interfaces/qt4/interactive.py:179 -msgid "Show about window" -msgstr "显示关于窗口" - -#: smart/interfaces/gtk/interactive.py:240 -#: smart/interfaces/qt/interactive.py:312 -#: smart/interfaces/qt4/interactive.py:299 -msgid "Hide Non-upgrades" -msgstr "隐藏非升级" - -#: smart/interfaces/gtk/interactive.py:241 -msgid "Hide Non-newest" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:242 -#: smart/interfaces/qt/interactive.py:313 -#: smart/interfaces/qt4/interactive.py:300 -msgid "Hide Installed" -msgstr "隐藏已安装" - -#: smart/interfaces/gtk/interactive.py:243 -#: smart/interfaces/qt/interactive.py:314 -#: smart/interfaces/qt4/interactive.py:301 -msgid "Hide Uninstalled" -msgstr "隐藏已卸载" - -#: smart/interfaces/gtk/interactive.py:244 -#: smart/interfaces/qt/interactive.py:315 -#: smart/interfaces/qt4/interactive.py:302 -msgid "Hide Unmarked" -msgstr "隐藏未标出" - -#: smart/interfaces/gtk/interactive.py:245 -#: smart/interfaces/qt/interactive.py:316 -#: smart/interfaces/qt4/interactive.py:303 -msgid "Hide Unlocked" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:246 -#: smart/interfaces/qt/interactive.py:317 -#: smart/interfaces/qt4/interactive.py:304 -msgid "Hide Requested" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:247 -#: smart/interfaces/qt/interactive.py:318 -#: smart/interfaces/qt4/interactive.py:305 -msgid "Hide Old" -msgstr "隐藏旧软件包" - -#: smart/interfaces/gtk/interactive.py:254 -#: smart/interfaces/qt/interactive.py:324 -#: smart/interfaces/qt4/interactive.py:311 -msgid "Groups" -msgstr "分组" - -#: smart/interfaces/gtk/interactive.py:255 -msgid "Separate Groups" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:257 -#: smart/interfaces/qt/interactive.py:326 -#: smart/interfaces/qt4/interactive.py:313 -msgid "Channels & Groups" -msgstr "频道和分组" - -#: smart/interfaces/gtk/interactive.py:258 -#: smart/interfaces/qt/interactive.py:327 -#: smart/interfaces/qt4/interactive.py:314 smart/plugins/channelsync.py:139 -msgid "None" -msgstr "无" - -#: smart/interfaces/gtk/interactive.py:348 -#: smart/interfaces/gtk/interactive.py:426 -#: smart/interfaces/qt/interactive.py:404 -#: smart/interfaces/qt4/interactive.py:396 -msgid "Automatic" -msgstr "自动" - -#: smart/interfaces/gtk/interactive.py:357 -#: smart/interfaces/gtk/interactive.py:431 -#: smart/interfaces/gtk/packageinfo.py:148 -#: smart/interfaces/gtk/packageview.py:152 -#: smart/interfaces/gtk/progress.py:151 smart/interfaces/qt/interactive.py:409 -#: smart/interfaces/qt/packageinfo.py:96 smart/interfaces/qt/progress.py:86 -#: smart/interfaces/qt4/interactive.py:402 -#: smart/interfaces/qt4/packageinfo.py:102 smart/interfaces/qt4/progress.py:92 -msgid "Description" -msgstr "描述" - -#: smart/interfaces/gtk/interactive.py:384 -#: smart/interfaces/qt/interactive.py:388 -#: smart/interfaces/qt4/interactive.py:377 -msgid "Search:" -msgstr "搜索：" - -#: smart/interfaces/gtk/interactive.py:458 -msgid "Group" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:615 -#: smart/interfaces/qt/interactive.py:555 -#: smart/interfaces/qt4/interactive.py:550 -msgid "Apply marked changes now?" -msgstr "现在应用标出的更改吗？" - -#: smart/interfaces/gtk/interactive.py:618 -#: smart/interfaces/qt/interactive.py:558 -#: smart/interfaces/qt4/interactive.py:553 -#: smart/interfaces/text/interactive.py:370 -msgid "No interesting upgrades available!" -msgstr "没有可更新的软件包。" - -#: smart/interfaces/gtk/interactive.py:629 -msgid "No automatic removals possible!" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:738 -#: smart/interfaces/qt/interactive.py:682 -#: smart/interfaces/qt4/interactive.py:678 -msgid "Keep" -msgstr "保留" - -#: smart/interfaces/gtk/interactive.py:747 -#: smart/interfaces/qt/interactive.py:688 -#: smart/interfaces/qt4/interactive.py:686 -msgid "Fix problems" -msgstr "修复问题" - -#: smart/interfaces/gtk/interactive.py:778 -#: smart/interfaces/qt/interactive.py:722 -#: smart/interfaces/qt4/interactive.py:720 -msgid "Unlock this version" -msgstr "解锁此版本" - -#: smart/interfaces/gtk/interactive.py:787 -#: smart/interfaces/qt/interactive.py:729 -#: smart/interfaces/qt4/interactive.py:727 -msgid "Lock this version" -msgstr "锁定此版本" - -#: smart/interfaces/gtk/interactive.py:802 -#: smart/interfaces/qt/interactive.py:741 -#: smart/interfaces/qt4/interactive.py:739 -msgid "Unlock all versions" -msgstr "解锁全部版本" - -#: smart/interfaces/gtk/interactive.py:811 -#: smart/interfaces/qt/interactive.py:748 -#: smart/interfaces/qt4/interactive.py:746 -msgid "Lock all versions" -msgstr "锁定全部版本" - -#: smart/interfaces/gtk/interactive.py:839 -#: smart/interfaces/qt/interactive.py:775 -#: smart/interfaces/qt4/interactive.py:764 -msgid "Checking relations..." -msgstr "正在检查关系..." - -#: smart/interfaces/gtk/interactive.py:842 -#: smart/interfaces/qt/interactive.py:778 -#: smart/interfaces/qt4/interactive.py:767 -msgid "All checked packages have correct relations." -msgstr "检查的全部软件包关系均正确。" - -#: smart/interfaces/gtk/interactive.py:982 -msgid "All" -msgstr "" - -#: smart/interfaces/gtk/interactive.py:1164 -#, python-format -msgid "%d packages, %d installed" -msgstr "" - -#: smart/interfaces/gtk/interface.py:89 -msgid " Continue?" -msgstr " 继续吗？" - -#: smart/interfaces/gtk/interface.py:110 smart/interfaces/qt/interface.py:136 -#: smart/interfaces/qt4/interface.py:129 -msgid "Input" -msgstr "输入" - -#: smart/interfaces/gtk/interface.py:150 smart/interfaces/qt/interface.py:144 -#: smart/interfaces/qt4/interface.py:137 -msgid "Insert one or more of the following removable channels:\n" -msgstr "插入下列可移动介质中的一个或多个：\n" - -#: smart/interfaces/gtk/legend.py:33 smart/interfaces/qt/legend.py:32 -#: smart/interfaces/qt4/legend.py:33 -msgid "Icon Legend" -msgstr "" - -#: smart/interfaces/gtk/legend.py:50 smart/interfaces/qt/legend.py:42 -#: smart/interfaces/qt4/legend.py:44 -msgid "" -"The following icons are used to indicate\n" -"the current status of a package:" -msgstr "" - -#: smart/interfaces/gtk/legend.py:64 smart/interfaces/qt/legend.py:51 -#: smart/interfaces/qt4/legend.py:58 -msgid "Marked for installation" -msgstr "" - -#: smart/interfaces/gtk/legend.py:65 smart/interfaces/qt/legend.py:52 -#: smart/interfaces/qt4/legend.py:59 -msgid "Marked for re-installation" -msgstr "" - -#: smart/interfaces/gtk/legend.py:66 smart/interfaces/qt/legend.py:53 -#: smart/interfaces/qt4/legend.py:60 -msgid "Marked for upgrade" -msgstr "" - -#: smart/interfaces/gtk/legend.py:67 smart/interfaces/qt/legend.py:54 -#: smart/interfaces/qt4/legend.py:61 -msgid "Marked for downgrade" -msgstr "" - -#: smart/interfaces/gtk/legend.py:68 smart/interfaces/qt/legend.py:55 -#: smart/interfaces/qt4/legend.py:62 -msgid "Marked for removal" -msgstr "" - -#: smart/interfaces/gtk/legend.py:69 smart/interfaces/qt/legend.py:56 -#: smart/interfaces/qt4/legend.py:63 -msgid "Not installed" -msgstr "" - -#: smart/interfaces/gtk/legend.py:70 smart/interfaces/qt/legend.py:57 -#: smart/interfaces/qt4/legend.py:64 -msgid "Not installed (new)" -msgstr "" - -#: smart/interfaces/gtk/legend.py:71 smart/interfaces/qt/legend.py:58 -#: smart/interfaces/qt4/legend.py:65 -msgid "Not installed (locked)" -msgstr "" - -#: smart/interfaces/gtk/legend.py:73 smart/interfaces/qt/legend.py:60 -#: smart/interfaces/qt4/legend.py:67 -msgid "Installed (upgradable)" -msgstr "" - -#: smart/interfaces/gtk/legend.py:74 smart/interfaces/qt/legend.py:61 -#: smart/interfaces/qt4/legend.py:68 -msgid "Installed (locked)" -msgstr "" - -#: smart/interfaces/gtk/legend.py:75 smart/interfaces/qt/legend.py:62 -#: smart/interfaces/qt4/legend.py:69 -msgid "Broken" -msgstr "" - -#: smart/interfaces/gtk/log.py:77 smart/interfaces/qt/log.py:54 -#: smart/interfaces/qt4/log.py:55 -msgid "Log" -msgstr "日志" - -#: smart/interfaces/gtk/mirrors.py:32 smart/interfaces/qt/mirrors.py:47 -#: smart/interfaces/qt4/mirrors.py:48 -msgid "Mirrors" -msgstr "镜像" - -#: smart/interfaces/gtk/mirrors.py:65 smart/interfaces/qt/mirrors.py:66 -#: smart/interfaces/qt4/mirrors.py:70 -msgid "Mirror" -msgstr "镜像" - -#: smart/interfaces/gtk/mirrors.py:145 smart/interfaces/qt/mirrors.py:154 -#: smart/interfaces/qt4/mirrors.py:166 -msgid "Origin already exists!" -msgstr "原始 URL 已经存在。" - -#: smart/interfaces/gtk/mirrors.py:152 smart/interfaces/qt/mirrors.py:161 -#: smart/interfaces/qt4/mirrors.py:173 -msgid "Mirror already exists!" -msgstr "镜像已经存在。" - -#: smart/interfaces/gtk/mirrors.py:164 smart/interfaces/qt/mirrors.py:173 -#: smart/interfaces/qt4/mirrors.py:185 -msgid "New Mirror" -msgstr "新建镜像" - -#: smart/interfaces/gtk/mirrors.py:185 smart/interfaces/qt/mirrors.py:187 -#: smart/interfaces/qt4/mirrors.py:202 -msgid "Origin URL:" -msgstr "原始 URL：" - -#: smart/interfaces/gtk/mirrors.py:195 smart/interfaces/qt/mirrors.py:194 -#: smart/interfaces/qt4/mirrors.py:211 -msgid "Mirror URL:" -msgstr "镜像 URL：" - -#: smart/interfaces/gtk/mirrors.py:243 smart/interfaces/qt/mirrors.py:233 -#: smart/interfaces/qt4/mirrors.py:257 -msgid "No origin provided!" -msgstr "未提供原始 URL。" - -#: smart/interfaces/gtk/mirrors.py:247 smart/interfaces/qt/mirrors.py:237 -#: smart/interfaces/qt4/mirrors.py:261 -msgid "No mirror provided!" -msgstr "未提供镜像。" - -#: smart/interfaces/gtk/packageinfo.py:101 -#: smart/interfaces/qt/packageinfo.py:67 -#: smart/interfaces/qt4/packageinfo.py:69 -msgid "Status:" -msgstr "状态：" - -#: smart/interfaces/gtk/packageinfo.py:127 -#: smart/interfaces/gtk/preferences.py:84 -#: smart/interfaces/qt/packageinfo.py:84 -#: smart/interfaces/qt4/packageinfo.py:88 -msgid "General" -msgstr "常规" - -#: smart/interfaces/gtk/packageinfo.py:161 -msgid "Filter:" -msgstr "" - -#: smart/interfaces/gtk/packageinfo.py:240 -#: smart/interfaces/qt/packageinfo.py:110 -#: smart/interfaces/qt4/packageinfo.py:120 -msgid "Content" -msgstr "内容" - -#: smart/interfaces/gtk/packageinfo.py:260 -#: smart/interfaces/qt/packageinfo.py:124 -#: smart/interfaces/qt4/packageinfo.py:138 -msgid "Changelog" -msgstr "" - -#: smart/interfaces/gtk/packageinfo.py:268 -#: smart/interfaces/qt/packageinfo.py:130 -#: smart/interfaces/qt4/packageinfo.py:144 -msgid "Relations" -msgstr "关系" - -#: smart/interfaces/gtk/packageinfo.py:290 -#: smart/interfaces/qt/packageinfo.py:139 -#: smart/interfaces/qt4/packageinfo.py:154 -msgid "URL" -msgstr "URL" - -#: smart/interfaces/gtk/packageinfo.py:443 -#: smart/interfaces/qt/packageinfo.py:204 -#: smart/interfaces/qt4/packageinfo.py:219 -msgid "Available" -msgstr "可用" - -#: smart/interfaces/gtk/packageinfo.py:445 -#: smart/interfaces/qt/packageinfo.py:206 -#: smart/interfaces/qt4/packageinfo.py:221 smart/util/strtools.py:55 -#: smart/util/strtools.py:75 -msgid "Unknown" -msgstr "未知" - -#: smart/interfaces/gtk/packageinfo.py:590 -#: smart/interfaces/gtk/packageinfo.py:623 -#: smart/interfaces/qt/packageinfo.py:336 -#: smart/interfaces/qt/packageinfo.py:369 -#: smart/interfaces/qt4/packageinfo.py:352 -#: smart/interfaces/qt4/packageinfo.py:385 -msgid "Provides" -msgstr "提供" - -#: smart/interfaces/gtk/packageinfo.py:614 -#: smart/interfaces/qt/packageinfo.py:360 -#: smart/interfaces/qt4/packageinfo.py:376 -msgid "Upgraded By" -msgstr "升级原因" - -#: smart/interfaces/gtk/packageinfo.py:620 -#: smart/interfaces/qt/packageinfo.py:366 -#: smart/interfaces/qt4/packageinfo.py:382 -msgid "Conflicted By" -msgstr "冲突原因" - -#: smart/interfaces/gtk/packageview.py:146 -#: smart/interfaces/qt/packageview.py:57 -#: smart/interfaces/qt4/packageview.py:59 -msgid "Version" -msgstr "版本" - -#: smart/interfaces/gtk/priorities.py:33 smart/interfaces/qt/priorities.py:48 -#: smart/interfaces/qt4/priorities.py:49 -msgid "Priorities" -msgstr "优先级" - -#: smart/interfaces/gtk/priorities.py:75 smart/interfaces/qt/priorities.py:71 -msgid "Channel Alias" -msgstr "频道别名" - -#: smart/interfaces/gtk/priorities.py:129 -#: smart/interfaces/gtk/priorities.py:167 -#: smart/interfaces/gtk/priorities.py:177 -#: smart/interfaces/qt/priorities.py:128 smart/interfaces/qt/priorities.py:162 -#: smart/interfaces/qt/priorities.py:171 -#: smart/interfaces/qt4/priorities.py:136 -#: smart/interfaces/qt4/priorities.py:171 -#: smart/interfaces/qt4/priorities.py:180 -msgid "Name/alias pair already exists!" -msgstr "名称/别名对已经存在。" - -#: smart/interfaces/gtk/priorities.py:192 -#: smart/interfaces/qt/priorities.py:187 -#: smart/interfaces/qt4/priorities.py:196 -msgid "Invalid priority!" -msgstr "无效的优先级。" - -#: smart/interfaces/gtk/priorities.py:202 -#: smart/interfaces/qt/priorities.py:195 -#: smart/interfaces/qt4/priorities.py:204 -msgid "New Package Priority" -msgstr "新建软件包优先级" - -#: smart/interfaces/gtk/priorities.py:223 -#: smart/interfaces/qt/priorities.py:209 -#: smart/interfaces/qt4/priorities.py:221 -msgid "Package Name:" -msgstr "软件包名称：" - -#: smart/interfaces/gtk/priorities.py:232 -#: smart/interfaces/qt/priorities.py:214 -#: smart/interfaces/qt4/priorities.py:228 -msgid "Channel Alias:" -msgstr "频道别名：" - -#: smart/interfaces/gtk/priorities.py:292 -#: smart/interfaces/qt/priorities.py:258 -#: smart/interfaces/qt4/priorities.py:281 -msgid "No name provided!" -msgstr "未提供名称。" - -#: smart/interfaces/gtk/priorities.py:312 -#: smart/interfaces/qt/priorities.py:278 -#: smart/interfaces/qt4/priorities.py:301 -msgid "Package Priority" -msgstr "软件包优先级" - -#: smart/interfaces/gtk/priorities.py:352 -#: smart/interfaces/qt/priorities.py:312 -#: smart/interfaces/qt4/priorities.py:341 -msgid "Package:" -msgstr "软件包：" - -#: smart/interfaces/gtk/priorities.py:375 -#: smart/interfaces/qt/priorities.py:352 -#: smart/interfaces/qt4/priorities.py:383 -msgid "Default priority:" -msgstr "默认优先级：" - -#: smart/interfaces/gtk/priorities.py:385 -#: smart/interfaces/qt/priorities.py:359 -#: smart/interfaces/qt4/priorities.py:393 -msgid "Channel default" -msgstr "频道默认值" - -#: smart/interfaces/gtk/priorities.py:390 -#: smart/interfaces/qt/priorities.py:363 -#: smart/interfaces/qt4/priorities.py:398 -msgid "Set to" -msgstr "设定为" - -#: smart/interfaces/gtk/priorities.py:406 -#: smart/interfaces/qt/priorities.py:372 -#: smart/interfaces/qt4/priorities.py:409 -msgid "Channel priority:" -msgstr "频道优先级：" - -#: smart/interfaces/gtk/progress.py:64 smart/interfaces/qt/progress.py:53 -#: smart/interfaces/qt4/progress.py:54 -msgid "Operation Progress" -msgstr "操作进度" - -#: smart/interfaces/gtk/progress.py:115 smart/interfaces/gtk/progress.py:120 -#: smart/interfaces/qt/progress.py:75 smart/interfaces/qt4/progress.py:91 -msgid "Progress" -msgstr "进度" - -#: smart/interfaces/gtk/progress.py:127 smart/interfaces/qt/progress.py:78 -#: smart/interfaces/qt4/progress.py:92 -msgid "Current" -msgstr "当前" - -#: smart/interfaces/gtk/progress.py:133 smart/interfaces/qt/progress.py:80 -#: smart/interfaces/qt4/progress.py:92 -msgid "Total" -msgstr "总计" - -#: smart/interfaces/gtk/progress.py:139 smart/interfaces/qt/progress.py:82 -#: smart/interfaces/qt4/progress.py:92 -msgid "Speed" -msgstr "速度" - -#: smart/interfaces/gtk/progress.py:145 smart/interfaces/qt/progress.py:84 -#: smart/interfaces/qt4/progress.py:92 -msgid "ETA" -msgstr "" - -#: smart/interfaces/gtk/progress.py:251 smart/interfaces/gtk/progress.py:252 -msgid "Done" -msgstr "" - -#: smart/interfaces/qt/__init__.py:34 smart/interfaces/qt4/__init__.py:34 -msgid "System has no support for qt python interface" -msgstr "" - -#: smart/interfaces/qt/changes.py:61 smart/interfaces/qt/channels.py:346 -#: smart/interfaces/qt/channels.py:425 smart/interfaces/qt/channels.py:585 -#: smart/interfaces/qt/channels.py:671 smart/interfaces/qt/channels.py:762 -#: smart/interfaces/qt/interface.py:99 smart/interfaces/qt/mirrors.py:213 -#: smart/interfaces/qt/priorities.py:237 smart/interfaces/qt/progress.py:99 -#: smart/interfaces/qt4/changes.py:63 smart/interfaces/qt4/channels.py:367 -#: smart/interfaces/qt4/channels.py:468 smart/interfaces/qt4/channels.py:649 -#: smart/interfaces/qt4/channels.py:748 smart/interfaces/qt4/channels.py:849 -#: smart/interfaces/qt4/interface.py:92 smart/interfaces/qt4/mirrors.py:236 -#: smart/interfaces/qt4/priorities.py:258 smart/interfaces/qt4/progress.py:103 -msgid "Cancel" -msgstr "" - -#: smart/interfaces/qt/changes.py:63 smart/interfaces/qt/channels.py:349 -#: smart/interfaces/qt/channels.py:428 smart/interfaces/qt/channels.py:588 -#: smart/interfaces/qt/channels.py:674 smart/interfaces/qt/channels.py:759 -#: smart/interfaces/qt/mirrors.py:210 smart/interfaces/qt/priorities.py:240 -#: smart/interfaces/qt4/changes.py:65 smart/interfaces/qt4/channels.py:371 -#: smart/interfaces/qt4/channels.py:472 smart/interfaces/qt4/channels.py:653 -#: smart/interfaces/qt4/channels.py:752 smart/interfaces/qt4/channels.py:845 -#: smart/interfaces/qt4/mirrors.py:232 smart/interfaces/qt4/priorities.py:262 -msgid "OK" -msgstr "" - -#: smart/interfaces/qt/changes.py:71 smart/interfaces/qt/channels.py:111 -#: smart/interfaces/qt/flags.py:128 smart/interfaces/qt/legend.py:75 -#: smart/interfaces/qt/log.py:90 smart/interfaces/qt/mirrors.py:89 -#: smart/interfaces/qt/priorities.py:93 smart/interfaces/qt/priorities.py:299 -#: smart/interfaces/qt4/changes.py:74 smart/interfaces/qt4/channels.py:121 -#: smart/interfaces/qt4/flags.py:154 smart/interfaces/qt4/legend.py:87 -#: smart/interfaces/qt4/log.py:100 smart/interfaces/qt4/mirrors.py:97 -#: smart/interfaces/qt4/priorities.py:100 -#: smart/interfaces/qt4/priorities.py:327 -msgid "Close" -msgstr "" - -#: smart/interfaces/qt/channels.py:91 smart/interfaces/qt/flags.py:71 -#: smart/interfaces/qt/flags.py:102 smart/interfaces/qt/mirrors.py:75 -#: smart/interfaces/qt/priorities.py:79 smart/interfaces/qt4/channels.py:98 -#: smart/interfaces/qt4/flags.py:83 smart/interfaces/qt4/flags.py:123 -#: smart/interfaces/qt4/mirrors.py:81 smart/interfaces/qt4/priorities.py:84 -msgid "New" -msgstr "" - -#: smart/interfaces/qt/channels.py:97 smart/interfaces/qt/flags.py:78 -#: smart/interfaces/qt/flags.py:109 smart/interfaces/qt/mirrors.py:82 -#: smart/interfaces/qt/priorities.py:86 smart/interfaces/qt4/channels.py:105 -#: smart/interfaces/qt4/flags.py:91 smart/interfaces/qt4/flags.py:131 -#: smart/interfaces/qt4/mirrors.py:89 smart/interfaces/qt4/priorities.py:92 -msgid "Delete" -msgstr "" - -#: smart/interfaces/qt/channels.py:104 smart/interfaces/qt4/channels.py:113 -msgid "Edit" -msgstr "" - -#: smart/interfaces/qt/interface.py:81 smart/interfaces/qt/interface.py:96 -#: smart/interfaces/qt/interface.py:113 smart/interfaces/qt4/interface.py:74 -#: smart/interfaces/qt4/interface.py:89 smart/interfaces/qt4/interface.py:106 -msgid "Question..." -msgstr "" - -#: smart/interfaces/qt/interface.py:98 smart/interfaces/qt4/interface.py:91 -msgid "Continue" -msgstr "" - -#: smart/interfaces/qt/log.py:86 smart/interfaces/qt4/log.py:95 -msgid "Clear" -msgstr "" - -#: smart/interfaces/text/interactive.py:72 -msgid "Documented commands (type help ):" -msgstr "有文档的命令(输入 help <主题>)：" - -#: smart/interfaces/text/interactive.py:73 -msgid "Undocumented commands:" -msgstr "无文档的命令：" - -#: smart/interfaces/text/interactive.py:74 -msgid "Miscelaneous help topics:" -msgstr "杂项帮助主题：" - -#: smart/interfaces/text/interactive.py:75 -#, python-format -msgid "*** No help on %s" -msgstr "*** %s 无帮助" - -#: smart/interfaces/text/interactive.py:215 -msgid "What would you expect!? ;-)" -msgstr "您希望得到什么结果!? ;-)" - -#: smart/interfaces/text/interactive.py:218 -msgid "The exit/quit/EOF command returns to the system." -msgstr "exit/quit/EOF 命令可返回到系统。" - -#: smart/interfaces/text/interactive.py:229 -msgid "The shell command offers execution of system commands." -msgstr "shell 命令可执行系统命令。" - -#: smart/interfaces/text/interactive.py:231 -msgid "Usage: shell []" -msgstr "用法：shell [<命令>]" - -#: smart/interfaces/text/interactive.py:232 -msgid " ![]" -msgstr " ![<命令>]" - -#: smart/interfaces/text/interactive.py:240 -msgid "The status command shows currently marked changes." -msgstr "status 命令可显示目前标出的更改。" - -#: smart/interfaces/text/interactive.py:242 -msgid "Usage: status" -msgstr "用法：status" - -#: smart/interfaces/text/interactive.py:248 -msgid "There are no marked changes." -msgstr "没有标出的更改。" - -#: smart/interfaces/text/interactive.py:253 -msgid "The install command marks packages for installation." -msgstr "install 命令可标出要安装的软件包。" - -#: smart/interfaces/text/interactive.py:255 -#: smart/interfaces/text/interactive.py:299 -#: smart/interfaces/text/interactive.py:335 -#: smart/interfaces/text/interactive.py:380 -#: smart/interfaces/text/interactive.py:422 -#: smart/interfaces/text/interactive.py:459 -#: smart/interfaces/text/interactive.py:556 -msgid "Options:" -msgstr "选项：" - -#: smart/interfaces/text/interactive.py:256 -#: smart/interfaces/text/interactive.py:300 -#: smart/interfaces/text/interactive.py:336 -#: smart/interfaces/text/interactive.py:381 -#: smart/interfaces/text/interactive.py:423 -#: smart/interfaces/text/interactive.py:460 -msgid "" -" --explain Include additional information about\n" -" changes, when possible" -msgstr " --explain 可能时包含关于更改的额外信息" - -#: smart/interfaces/text/interactive.py:259 -msgid "Usage: install ..." -msgstr "用法：install <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:286 -#, python-format -msgid "No uninstalled packages matched '%s'" -msgstr "卸载的软件包中没有一个与“%s”匹配" - -#: smart/interfaces/text/interactive.py:297 -msgid "The reinstall command marks packages for reinstallation." -msgstr "reinstall 命令可标出要重新安装的软件包。" - -#: smart/interfaces/text/interactive.py:303 -msgid "Usage: reinstall ..." -msgstr "用法：reinstall <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:321 -#, python-format -msgid "'%s' matches multiple installed packages" -msgstr "已安装的软件包中有多个和“%s”匹配" - -#: smart/interfaces/text/interactive.py:333 -msgid "The upgrade command marks packages for upgrading." -msgstr "upgrade 命令标出要升级的软件包。" - -#: smart/interfaces/text/interactive.py:339 -msgid "Usage: upgrade ..." -msgstr "用法：upgrade <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:378 -msgid "The remove command marks packages for being removed." -msgstr "remove 命令可标出要删除的软件包。" - -#: smart/interfaces/text/interactive.py:384 -msgid "Usage: remove ..." -msgstr "用法：remove <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:420 -msgid "The keep command unmarks currently marked packages." -msgstr "keep 命令可撤消目前对软件包所进行的标记。" - -#: smart/interfaces/text/interactive.py:426 -msgid "Usage: keep ..." -msgstr "用法：keep <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:443 -#, python-format -msgid "'%s' matches no marked packages" -msgstr "已标记的软件包中没有一个与“%s”匹配" - -#: smart/interfaces/text/interactive.py:456 -msgid "" -"The fix command verifies relations of given packages\n" -"and marks the necessary changes for fixing them." -msgstr "" -"fix 命令可验证给定软件包的关系，并标出要修复这些关系\n" -"所必需的更改。" - -#: smart/interfaces/text/interactive.py:463 -msgid "Usage: fix ..." -msgstr "用法：fix <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:492 -msgid "" -"The download command fetches the given packages\n" -"to the local filesystem." -msgstr "download 命令可将给定软件包获取到本地文件系统。" - -#: smart/interfaces/text/interactive.py:495 -msgid "Usage: download ..." -msgstr "用法：download <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:502 -#, python-format -msgid "'%s' matches multiple packages, selecting: %s" -msgstr "“%s”与多个软件包匹配，请选择：%s" - -#: smart/interfaces/text/interactive.py:509 -msgid "The commit command applies marked changes in the system." -msgstr "commit 命令可将所标出的更改应用到系统中。" - -#: smart/interfaces/text/interactive.py:511 -msgid "Usage: commit" -msgstr "用法：commit" - -#: smart/interfaces/text/interactive.py:523 -msgid "The undo command reverts marked changes." -msgstr "undo 命令可撤消所标出的更改。" - -#: smart/interfaces/text/interactive.py:525 -msgid "Usage: undo" -msgstr "用法：undo" - -#: smart/interfaces/text/interactive.py:538 -msgid "The redo command reapplies undone changes." -msgstr "redo 命令可重新应用撤消了的更改。" - -#: smart/interfaces/text/interactive.py:540 -msgid "Usage: redo" -msgstr "用法：redo" - -#: smart/interfaces/text/interactive.py:553 -msgid "" -"The ls command lists packages by name. Wildcards\n" -"are accepted." -msgstr "ls 命令可按名称列出软件包。支持通配符。" - -#: smart/interfaces/text/interactive.py:557 -msgid " -i List only installed packages" -msgstr " -i 只列出已安装的软件包" - -#: smart/interfaces/text/interactive.py:558 -msgid " -n List only new packages" -msgstr " -n 只列出新软件包" - -#: smart/interfaces/text/interactive.py:559 -msgid " -v Show versions" -msgstr " -v 显示版本" - -#: smart/interfaces/text/interactive.py:560 -msgid " -s Show summaries" -msgstr " -s 显示摘要" - -#: smart/interfaces/text/interactive.py:562 -msgid "Usage: ls [options] [] ..." -msgstr "用法：ls [选项] [<字符串>] ..." - -#: smart/interfaces/text/interactive.py:653 -msgid "The update command will update channel information." -msgstr "update 命令可更新频道信息。" - -#: smart/interfaces/text/interactive.py:655 -msgid "Usage: update [] ..." -msgstr "用法：update [<别名>] ..." - -#: smart/interfaces/text/interactive.py:692 -msgid "" -"The flag command allows configuring, removing and\n" -"verifying package flags, and accepts the same options\n" -"available in the command line interface." -msgstr "" -"flag 命令允许配置、删除和验证软件包标志，并接受命令\n" -"行界面中可用的相同选项。" - -#: smart/interfaces/text/interactive.py:696 -msgid "Usage: flag [options]" -msgstr "用法：flag [选项]" - -#: smart/interfaces/text/interactive.py:711 -msgid "" -"The query command allows querying package information,\n" -"and accepts the same options available in the command\n" -"line interface." -msgstr "" -"query 命令允许查询软件包信息，并接受命令行界面中可用\n" -"的相同选项。" - -#: smart/interfaces/text/interactive.py:715 -msgid "Usage: query [options] [] ..." -msgstr "用法：query [选项] [<软件包名称>] ..." - -#: smart/interfaces/text/interactive.py:730 -msgid "The search command allows searching for packages." -msgstr "search 命令允许搜索软件包。" - -#: smart/interfaces/text/interactive.py:732 -msgid "Usage: search ..." -msgstr "用法：search <字符串> ..." - -#: smart/interfaces/text/interactive.py:747 -msgid "The info command shows information about packages." -msgstr "info 命令可显示关于软件包的信息。" - -#: smart/interfaces/text/interactive.py:749 -msgid "Usage: info ..." -msgstr "用法：info <软件包名称> ..." - -#: smart/interfaces/text/interactive.py:764 -msgid "The stats command shows some statistics." -msgstr "stats 命令可显示一些统计信息。" - -#: smart/interfaces/text/interactive.py:766 -msgid "Usage: stats" -msgstr "用法：stats" - -#: smart/interfaces/text/interactive.py:780 -msgid "" -"The check command verifies relations between packages,\n" -"and accepts the same options available in the command\n" -"line interface." -msgstr "" -"check 命令可验证软件包之间的关系，并接受命令行界面中\n" -"的相同选项。" - -#: smart/interfaces/text/interactive.py:784 -msgid "Usage: check [options] [] ..." -msgstr "用法：check [选项] [<软件包名称>] ..." - -#: smart/interfaces/text/interface.py:63 -#, python-format -msgid "%s (Y/n): " -msgstr "%s (Y/n)： " - -#: smart/interfaces/text/interface.py:63 -#, python-format -msgid "%s (y/N): " -msgstr "%s (y/N)： " - -#: smart/interfaces/text/interface.py:78 -#, python-format -msgid "%s (Continue/cancel): " -msgstr "%s ([继续]/取消)： " - -#: smart/interfaces/text/interface.py:80 -#, python-format -msgid "%s (continue/Cancel): " -msgstr "%s (继续/[取消])： " - -#: smart/interfaces/text/interface.py:88 -msgid "continue" -msgstr "继续" - -#: smart/interfaces/text/interface.py:89 -#: smart/interfaces/text/interface.py:103 -msgid "cancel" -msgstr "取消" - -#: smart/interfaces/text/interface.py:94 -#, python-format -msgid "%s (Ok/cancel): " -msgstr "%s ([确定]/取消)： " - -#: smart/interfaces/text/interface.py:94 -#, python-format -msgid "%s (ok/Cancel): " -msgstr "%s (确定/[取消])： " - -#: smart/interfaces/text/interface.py:102 -msgid "ok" -msgstr "确定" - -#: smart/interfaces/text/interface.py:133 -msgid "Insert one or more of the following removable channels:" -msgstr "请插入下列可移动频道中的一个或多个：" - -#: smart/interfaces/text/interface.py:161 -msgid "(installed)" -msgstr "(已安装)" - -#: smart/interfaces/text/interface.py:163 -msgid "(upgraded)" -msgstr "(已升级)" - -#: smart/interfaces/text/interface.py:165 -msgid "(removed)" -msgstr "(已删除)" - -#: smart/interfaces/text/interface.py:167 -msgid "(downgraded)" -msgstr "(已降级)" - -#: smart/interfaces/text/interface.py:184 -msgid "Downgrades:" -msgstr "降级：" - -#: smart/interfaces/text/interface.py:202 -#, python-format -msgid "Kept packages (%d):" -msgstr "保留软件包(%d个)：" - -#: smart/interfaces/text/interface.py:207 -#, python-format -msgid "Upgrading packages (%d):" -msgstr "升级软件包(%d个)：" - -#: smart/interfaces/text/interface.py:212 -#, python-format -msgid "Downgrading packages (%d):" -msgstr "降级软件包(%d个)：" - -#: smart/interfaces/text/interface.py:217 -#, python-format -msgid "Installing packages (%d):" -msgstr "安装软件包(%d个)：" - -#: smart/interfaces/text/interface.py:222 -#, python-format -msgid "Removing packages (%d):" -msgstr "删除软件包(%d个)：" - -#: smart/interfaces/text/interface.py:239 -msgid "Confirm changes?" -msgstr "确认更改吗？" - -#: smart/media.py:190 -msgid "/proc/mounts not found" -msgstr "/proc/mounts 未找到" - -#: smart/option.py:35 smart/util/optparse.py:1136 -msgid "show this help message and exit" -msgstr "显示此帮助信息并退出" - -#: smart/option.py:37 smart/util/optparse.py:1141 -msgid "show program's version number and exit" -msgstr "显示程序的版本号并退出" - -#: smart/option.py:49 -#, python-format -msgid "Usage: %s\n" -msgstr "用法：%s\n" - -#: smart/option.py:54 smart/util/optparse.py:1502 -msgid "options" -msgstr "选项" - -#: smart/option.py:89 -msgid "examples" -msgstr "示例" - -#: smart/option.py:172 smart/util/optparse.py:1374 smart/util/optparse.py:1413 -#, python-format -msgid "%s option requires an argument" -msgstr "%s 选项需要参数" - -#: smart/option.py:174 smart/util/optparse.py:1376 smart/util/optparse.py:1415 -#, python-format -msgid "%s option requires %d arguments" -msgstr "%s 选项需要 %d 个参数" - -#: smart/plugins/aptchannelsync.py:100 smart/plugins/channelsync.py:52 -#: smart/plugins/channelsync.py:88 smart/plugins/channelsync.py:119 -#: smart/plugins/channelsync.py:145 smart/plugins/urpmichannelsync.py:222 -#: smart/plugins/yumchannelsync.py:178 smart/plugins/zyppchannelsync.py:170 -#, python-format -msgid "While using %s: %s" -msgstr "使用 %s 时：%s" - -#: smart/plugins/channelsync.py:83 -#, python-format -msgid "" -"New channel '%s' detected.\n" -"Include it?" -msgstr "" -"检测到了新频道“%s”。\n" -"是否包含此频道？" - -#: smart/plugins/channelsync.py:102 -#, python-format -msgid "Channel in %s has no type." -msgstr "%s 中的频道没有类型。" - -#: smart/plugins/channelsync.py:106 -#, python-format -msgid "" -"Change in channel '%s' detected.\n" -"Old channel:\n" -"\n" -"%s\n" -"\n" -"New channel:\n" -"\n" -"%s\n" -"\n" -"Do you want to replace it?" -msgstr "" -"检测到了频道“%s”发生了更改。\n" -"旧频道：\n" -"\n" -"%s\n" -"\n" -"新频道：\n" -"\n" -"%s\n" -"\n" -"您是否想要替换此频道？" - -#: smart/plugins/channelsync.py:137 -msgid "No" -msgstr "否" - -#: smart/plugins/channelsync.py:137 -msgid "Yes" -msgstr "是" - -#: smart/plugins/channelsync.py:157 -#, python-format -msgid "" -"Change in field '%(label)s' of channel '%(name)s' detected.\n" -"Old value: %(curvalue)s\n" -"New value: %(newvalue)s\n" -"Replace current value?" -msgstr "" -"检测到频道“%(name)s”的字段“%(label)s”发生了更改。\n" -"旧值：%(curvalue)s\n" -"新值：%(newvalue)s\n" -"您是否想要替换当前值？" - -#: smart/plugins/channelsync.py:194 -#, python-format -msgid "" -"Removing channel '%s' was suggested.\n" -"Do you want to remove it?" -msgstr "" -"建议删除频道“%s”。\n" -"您是否想要删除此频道？" - -#: smart/plugins/debdir.py:33 -msgid "Dynamic DEB Directory" -msgstr "动态 DEB 目录" - -#: smart/plugins/rpmdir.py:33 -msgid "Dynamic RPM Directory" -msgstr "动态 RPM 目录" - -#: smart/plugins/yumchannelsync.py:158 -#, python-format -msgid "" -"Yum channel %s does not contain baseurl or mirrorlist addresses. Not syncing." -msgstr "" - -#: smart/plugins/zyppchannelsync.py:139 -#, python-format -msgid "" -"ZYpp channel %s does not contain baseurl or mirrorlist addresses. Not " -"syncing." -msgstr "" - -#: smart/searcher.py:179 -msgid "Invalid string" -msgstr "无效的字符串" - -#: smart/sysconfig.py:82 smart/sysconfig.py:89 smart/sysconfig.py:92 -#, python-format -msgid "Broken configuration file at %s" -msgstr "%s 的配置文件已损坏" - -#: smart/sysconfig.py:83 -#, python-format -msgid "Trying backup at %s" -msgstr "试图在 %s 备份" - -#: smart/transaction.py:541 -#, python-format -msgid "Can't install %s: conflicted package %s is locked" -msgstr "无法安装 %s：冲突软件包 %s 已锁定" - -#: smart/transaction.py:556 -#, python-format -msgid "Can't install %s: it's conflicted by the locked package %s" -msgstr "无法安装 %s：该软件包与已锁定的软件包 %s 相冲突" - -#: smart/transaction.py:571 -#, python-format -msgid "Can't install %s: it can't coexist with %s" -msgstr "无法安装 %s：该软件包无法与 %s 同时存在" - -#: smart/transaction.py:599 smart/transaction.py:804 -#, python-format -msgid "Can't install %s: no package provides %s" -msgstr "无法安装 %s：没有软件包提供 %s" - -#: smart/transaction.py:620 -#, python-format -msgid "Can't remove %s: it's an essential package" -msgstr "无法删除 %s：该软件包是核心软件包" - -#: smart/transaction.py:675 -#, python-format -msgid "Can't remove %s: %s is locked" -msgstr "无法删除 %s：%s 已锁定" - -#: smart/transaction.py:828 smart/transaction.py:925 -#, python-format -msgid "" -"Can't install %s: all packages providing %s failed to install:\n" -"%s" -msgstr "" -"无法安装 %s：提供 %s 的全部软件包安装都失败：\n" -"%s" - -#: smart/transaction.py:888 smart/transaction.py:897 -#, python-format -msgid "Can't remove %s: requiring package %s is locked" -msgstr "无法删除 %s：所需软件包 %s 已锁定" - -#: smart/transaction.py:912 smart/transaction.py:917 -#, python-format -msgid "%s is locked" -msgstr "%s 已锁定" - -#: smart/transaction.py:1023 smart/transaction.py:1794 -#, python-format -msgid "Unsatisfied dependency: %s requires %s" -msgstr "无法满足的依赖关系：%s 需要 %s" - -#: smart/transaction.py:1032 smart/transaction.py:1042 -#: smart/transaction.py:1809 -#, python-format -msgid "Unsatisfied dependency: %s conflicts with %s" -msgstr "无法满足的依赖关系：%s 与 %s 冲突" - -#: smart/transaction.py:1052 smart/transaction.py:1823 -#, python-format -msgid "Package %s can't coexist with %s" -msgstr "软件包 %s 无法与 %s 同时存在" - -#: smart/transaction.py:1088 -#, python-format -msgid "" -"Can't fix %s:\n" -"%s" -msgstr "" -"无法修复 %s：\n" -"%s" - -#: smart/transaction.py:1142 -#, python-format -msgid "Can't install %s: it's locked" -msgstr "无法安装 %s：该软件包已锁定" - -#: smart/transaction.py:1147 -#, python-format -msgid "Can't remove %s: it's locked" -msgstr "无法删除 %s：该软件包已锁定" - -#: smart/transaction.py:1152 -#, python-format -msgid "Can't reinstall %s: it's locked" -msgstr "无法重新安装 %s：该软件包已锁定" - -#: smart/transaction.py:1329 smart/transaction.py:1429 -#, python-format -msgid "No providers for '%s', required by '%s'" -msgstr "无法提供“%s”，该软件包被“%s”所需要" - -#: smart/transaction.py:1346 smart/transaction.py:1355 -#: smart/transaction.py:1466 smart/transaction.py:1475 -#: smart/transaction.py:1493 smart/transaction.py:1524 -#, python-format -msgid "Package '%s' is locked" -msgstr "软件包“%s”已锁定" - -#: smart/transaction.py:1445 -#, python-format -msgid "Can't remove %s, which conflicts with %s" -msgstr "无法删除 %s，因其与 %s 冲突" - -#: smart/transaction.py:1491 smart/transaction.py:1522 -#, python-format -msgid "Package '%s' is not in changeset" -msgstr "软件包“%s”未在更改集中" - -#: smart/uncompress.py:46 -#, python-format -msgid "Unknown compressed file: %s" -msgstr "未知的压缩文件：%s" - -#: smart/uncompress.py:57 -msgid "Unsupported file type" -msgstr "不支持的文件类型" - -#: smart/util/optparse.py:329 -#, python-format -msgid "usage: %s\n" -msgstr "用法：%s\n" - -#: smart/util/optparse.py:348 -msgid "Usage" -msgstr "用法" - -#: smart/util/optparse.py:354 -msgid "integer" -msgstr "整数" - -#: smart/util/optparse.py:355 -msgid "long integer" -msgstr "长整数" - -#: smart/util/optparse.py:356 -msgid "floating-point" -msgstr "浮点数" - -#: smart/util/optparse.py:357 -msgid "complex" -msgstr "复数" - -#: smart/util/optparse.py:365 -#, python-format -msgid "option %s: invalid %s value: %r" -msgstr "选项 %s：无效的 %s 值：%r" - -#: smart/util/optparse.py:373 -#, python-format -msgid "option %s: invalid choice: %r (choose from %s)" -msgstr "" - -#: smart/util/optparse.py:1164 -msgid "%prog [options]" -msgstr "%prog [选项]" - -#: smart/util/optparse.py:1385 -#, python-format -msgid "%s option does not take a value" -msgstr "%s 选项不接受值" - -#: smart/util/optparse.py:1559 -#, python-format -msgid "ambiguous option: %s (%s?)" -msgstr "有歧义的选项：%s (%s?)" - -#: smart/util/ssh.py:53 -msgid "SSH asked for password, but no password is available" -msgstr "SSH 请求密码，但没有可用的密码" - -#: smart/util/strtools.py:65 smart/util/strtools.py:84 -msgid "Stalled" -msgstr "已暂停" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/software-properties.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/software-properties.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/software-properties.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/software-properties.po 2012-03-23 07:33:18.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \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" +"POT-Creation-Date: 2012-03-13 18:16+0000\n" +"PO-Revision-Date: 2012-03-14 19:38+0000\n" +"Last-Translator: Launchpad Translations Administrators \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: 2012-02-21 23:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:32+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../data/com.ubuntu.softwareproperties.policy.in.h:1 msgid "Write Configuration" @@ -229,27 +229,27 @@ msgstr "其他站点..." #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:668 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:847 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:837 msgid "Import key" msgstr "导入密钥" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:671 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:860 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:850 msgid "Error importing selected file" msgstr "导入所选文件时出错" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:861 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:851 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是 GPG 密钥文件或者已经损坏." #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:686 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:873 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:863 msgid "Error removing the key" msgstr "删除密钥时出错" #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:687 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:874 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:864 msgid "" "The key you selected could not be removed. Please report this as a bug." msgstr "您选择的密钥无法删除。请将其作为 bug 提交。" @@ -333,11 +333,11 @@ msgid "Source code" msgstr "源代码" -#: ../softwareproperties/SoftwareProperties.py:490 +#: ../softwareproperties/SoftwareProperties.py:494 msgid "(Source Code)" msgstr "(源代码)" -#: ../softwareproperties/SoftwareProperties.py:496 +#: ../softwareproperties/SoftwareProperties.py:500 msgid "Source Code" msgstr "源代码" @@ -361,25 +361,25 @@ msgid "Active" msgstr "启用" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:673 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:662 msgid "_Add key from paste data" msgstr "从剪贴板数据中添加密钥(_A)" +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:675 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:686 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:697 msgid "Error importing key" msgstr "导入密钥出错" +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:676 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:687 -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:698 msgid "The selected data may not be a GPG key file or it might be corrupt." msgstr "选择的数据可能不是一个 GPG 密钥或者它已经损坏了。" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:739 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:728 msgid "Error scanning the CD" msgstr "扫描光盘出错" -#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:740 +#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:729 msgid "Could not find a suitable CD." msgstr "未能找到合适的 CD。" @@ -582,6 +582,10 @@ msgid "Statistics" msgstr "统计" +#: ../data/gtkbuilder/main.ui.h:39 +msgid "Re_vert" +msgstr "" + #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1 #: ../data/gtkbuilder/dialog-mirror.ui.h:6 msgid " " diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sound-theme-freedesktop.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sound-theme-freedesktop.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sound-theme-freedesktop.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sound-theme-freedesktop.po 2012-03-23 07:33:24.000000000 +0000 @@ -0,0 +1,22 @@ +# Chinese (Simplified) translation for sound-theme-freedesktop +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the sound-theme-freedesktop package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: sound-theme-freedesktop\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-10-21 00:46+0000\n" +"PO-Revision-Date: 2012-03-12 14:15+0000\n" +"Last-Translator: Ye Xiaoxing \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-03-22 21:32+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#: ../index.theme.in.h:1 +msgid "Default" +msgstr "默认" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sp5.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sp5.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sp5.po 2012-02-23 07:11:33.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sp5.po 2012-03-23 07:32:55.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: 2012-02-21 18:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:09+0000\n" +"X-Generator: Launchpad (build 14981)\n" msgid "" "no system identifier could be generated for meta-DTD for architecture %1" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sphinx.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sphinx.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sphinx.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sphinx.po 2012-03-23 07:33:21.000000000 +0000 @@ -8,381 +8,402 @@ msgstr "" "Project-Id-Version: Sphinx 0.6\n" "Report-Msgid-Bugs-To: zhutao.iscas@gmail.com\n" -"POT-Creation-Date: 2010-05-24 23:53+0200\n" -"PO-Revision-Date: 2011-12-05 19:33+0000\n" +"POT-Creation-Date: 2011-09-21 10:06+0200\n" +"PO-Revision-Date: 2012-02-22 23:08+0000\n" "Last-Translator: topman \n" "Language-Team: cn \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:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" -"Generated-By: Babel 0.9.4\n" +"X-Launchpad-Export-Date: 2012-03-22 21:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" +"Generated-By: Babel 0.9.6\n" -#: sphinx/environment.py:106 sphinx/writers/latex.py:184 -#: sphinx/writers/manpage.py:67 +#: sphinx/config.py:81 +#, python-format +msgid "%s %s documentation" +msgstr "" + +#: sphinx/environment.py:119 sphinx/writers/latex.py:190 +#: sphinx/writers/manpage.py:67 sphinx/writers/texinfo.py:203 #, python-format msgid "%B %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/roles.py:174 +#: sphinx/environment.py:1625 +#, python-format +msgid "see %s" +msgstr "" + +#: sphinx/environment.py:1628 #, python-format -msgid "Python Enhancement Proposals!PEP %s" -msgstr "Python 建议文件!PEP %s" +msgid "see also %s" +msgstr "也可以参考 %s" -#: sphinx/builders/changes.py:72 +#: sphinx/roles.py:175 +#, python-format +msgid "Python Enhancement Proposals; PEP %s" +msgstr "Python 建议文件; PEP %s" + +#: sphinx/builders/changes.py:73 msgid "Builtins" msgstr "内置" -#: sphinx/builders/changes.py:74 +#: sphinx/builders/changes.py:75 msgid "Module level" msgstr "模块级别" -#: sphinx/builders/html.py:266 +#: sphinx/builders/html.py:274 #, python-format msgid "%b %d, %Y" msgstr "%Y 年 %m 月 %d 日" -#: sphinx/builders/html.py:285 sphinx/themes/basic/defindex.html:30 +#: sphinx/builders/html.py:293 sphinx/themes/basic/defindex.html:30 msgid "General Index" msgstr "总目录" -#: sphinx/builders/html.py:285 +#: sphinx/builders/html.py:293 msgid "index" msgstr "索引" -#: sphinx/builders/html.py:345 +#: sphinx/builders/html.py:353 msgid "next" msgstr "下一页" -#: sphinx/builders/html.py:354 +#: sphinx/builders/html.py:362 msgid "previous" msgstr "上一页" -#: sphinx/builders/latex.py:151 +#: sphinx/builders/latex.py:141 sphinx/builders/texinfo.py:196 msgid " (in " msgstr "" -#: sphinx/directives/other.py:127 +#: sphinx/directives/other.py:136 msgid "Section author: " msgstr "Section 作者： " -#: sphinx/directives/other.py:129 +#: sphinx/directives/other.py:138 msgid "Module author: " msgstr "模块作者： " -#: sphinx/directives/other.py:131 +#: sphinx/directives/other.py:140 msgid "Code author: " msgstr "" -#: sphinx/directives/other.py:133 +#: sphinx/directives/other.py:142 msgid "Author: " msgstr "作者： " -#: sphinx/directives/other.py:238 +#: sphinx/directives/other.py:215 msgid "See also" msgstr "也可以参考" -#: sphinx/domains/__init__.py:253 +#: sphinx/domains/__init__.py:244 #, python-format msgid "%s %s" msgstr "" -#: sphinx/domains/c.py:51 sphinx/domains/python.py:49 +#: sphinx/domains/c.py:51 sphinx/domains/python.py:95 msgid "Parameters" msgstr "参数" -#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:137 -#: sphinx/domains/python.py:59 +#: sphinx/domains/c.py:54 sphinx/domains/javascript.py:128 +#: sphinx/domains/python.py:107 msgid "Returns" msgstr "返回" -#: sphinx/domains/c.py:56 sphinx/domains/python.py:61 +#: sphinx/domains/c.py:56 sphinx/domains/python.py:109 msgid "Return type" msgstr "返回类型" -#: sphinx/domains/c.py:133 +#: sphinx/domains/c.py:141 #, python-format msgid "%s (C function)" msgstr "%s (C 函数)" -#: sphinx/domains/c.py:135 +#: sphinx/domains/c.py:143 #, python-format msgid "%s (C member)" msgstr "%s (C 成员)" -#: sphinx/domains/c.py:137 +#: sphinx/domains/c.py:145 #, python-format msgid "%s (C macro)" msgstr "%s (C 宏)" -#: sphinx/domains/c.py:139 +#: sphinx/domains/c.py:147 #, python-format msgid "%s (C type)" msgstr "%s (C 类型)" -#: sphinx/domains/c.py:141 +#: sphinx/domains/c.py:149 #, python-format msgid "%s (C variable)" msgstr "%s (C 变量)" -#: sphinx/domains/c.py:171 sphinx/domains/cpp.py:1031 -#: sphinx/domains/javascript.py:166 sphinx/domains/python.py:497 +#: sphinx/domains/c.py:204 sphinx/domains/cpp.py:1060 +#: sphinx/domains/javascript.py:162 sphinx/domains/python.py:559 msgid "function" msgstr "函数" -#: sphinx/domains/c.py:172 sphinx/domains/cpp.py:1032 +#: sphinx/domains/c.py:205 sphinx/domains/cpp.py:1061 msgid "member" msgstr "成员" -#: sphinx/domains/c.py:173 +#: sphinx/domains/c.py:206 msgid "macro" msgstr "" -#: sphinx/domains/c.py:174 sphinx/domains/cpp.py:1033 +#: sphinx/domains/c.py:207 sphinx/domains/cpp.py:1062 msgid "type" msgstr "" -#: sphinx/domains/c.py:175 +#: sphinx/domains/c.py:208 msgid "variable" msgstr "" -#: sphinx/domains/cpp.py:876 +#: sphinx/domains/cpp.py:904 #, python-format msgid "%s (C++ class)" msgstr "" -#: sphinx/domains/cpp.py:891 +#: sphinx/domains/cpp.py:919 #, python-format msgid "%s (C++ type)" msgstr "%s (C++ 类型)" -#: sphinx/domains/cpp.py:910 +#: sphinx/domains/cpp.py:938 #, python-format msgid "%s (C++ member)" msgstr "%s (C++ 成员)" -#: sphinx/domains/cpp.py:962 +#: sphinx/domains/cpp.py:990 #, python-format msgid "%s (C++ function)" msgstr "%s (C++ 函数)" -#: sphinx/domains/cpp.py:1030 sphinx/domains/python.py:499 +#: sphinx/domains/cpp.py:1059 sphinx/domains/javascript.py:163 +#: sphinx/domains/python.py:561 msgid "class" msgstr "" -#: sphinx/domains/javascript.py:117 sphinx/domains/python.py:221 +#: sphinx/domains/javascript.py:106 sphinx/domains/python.py:254 #, python-format msgid "%s() (built-in function)" msgstr "%s() (內置函数)" -#: sphinx/domains/javascript.py:118 sphinx/domains/python.py:285 +#: sphinx/domains/javascript.py:107 sphinx/domains/python.py:318 #, python-format msgid "%s() (%s method)" msgstr "%s() (%s 方法)" -#: sphinx/domains/javascript.py:120 +#: sphinx/domains/javascript.py:109 +#, python-format +msgid "%s() (class)" +msgstr "" + +#: sphinx/domains/javascript.py:111 #, python-format msgid "%s (global variable or constant)" msgstr "" -#: sphinx/domains/javascript.py:122 sphinx/domains/python.py:323 +#: sphinx/domains/javascript.py:113 sphinx/domains/python.py:356 #, python-format msgid "%s (%s attribute)" msgstr "%s (%s 属性)" -#: sphinx/domains/javascript.py:131 +#: sphinx/domains/javascript.py:122 msgid "Arguments" msgstr "" -#: sphinx/domains/javascript.py:134 +#: sphinx/domains/javascript.py:125 msgid "Throws" msgstr "" -#: sphinx/domains/javascript.py:167 sphinx/domains/python.py:498 +#: sphinx/domains/javascript.py:164 sphinx/domains/python.py:560 msgid "data" msgstr "" -#: sphinx/domains/javascript.py:168 sphinx/domains/python.py:504 +#: sphinx/domains/javascript.py:165 sphinx/domains/python.py:566 msgid "attribute" msgstr "属性" -#: sphinx/domains/python.py:53 +#: sphinx/domains/python.py:100 msgid "Variables" msgstr "" -#: sphinx/domains/python.py:56 +#: sphinx/domains/python.py:104 msgid "Raises" msgstr "引发" -#: sphinx/domains/python.py:222 sphinx/domains/python.py:279 -#: sphinx/domains/python.py:291 sphinx/domains/python.py:304 +#: sphinx/domains/python.py:255 sphinx/domains/python.py:312 +#: sphinx/domains/python.py:324 sphinx/domains/python.py:337 #, python-format msgid "%s() (in module %s)" msgstr "%s() (在 %s 模块中)" -#: sphinx/domains/python.py:225 +#: sphinx/domains/python.py:258 #, python-format msgid "%s (built-in variable)" msgstr "%s (內置变量)" -#: sphinx/domains/python.py:226 sphinx/domains/python.py:317 +#: sphinx/domains/python.py:259 sphinx/domains/python.py:350 #, python-format msgid "%s (in module %s)" msgstr "%s() (在 %s 模块中)" -#: sphinx/domains/python.py:242 +#: sphinx/domains/python.py:275 #, python-format msgid "%s (built-in class)" msgstr "%s (內置类)" -#: sphinx/domains/python.py:243 +#: sphinx/domains/python.py:276 #, python-format msgid "%s (class in %s)" msgstr "" -#: sphinx/domains/python.py:283 +#: sphinx/domains/python.py:316 #, python-format msgid "%s() (%s.%s method)" msgstr "%s() (%s.%s 方法)" -#: sphinx/domains/python.py:295 +#: sphinx/domains/python.py:328 #, python-format msgid "%s() (%s.%s static method)" msgstr "%s() (%s.%s 静态方法)" -#: sphinx/domains/python.py:298 +#: sphinx/domains/python.py:331 #, python-format msgid "%s() (%s static method)" msgstr "%s() (%s 静态方法)" -#: sphinx/domains/python.py:308 +#: sphinx/domains/python.py:341 #, python-format msgid "%s() (%s.%s class method)" msgstr "" -#: sphinx/domains/python.py:311 +#: sphinx/domains/python.py:344 #, python-format msgid "%s() (%s class method)" msgstr "" -#: sphinx/domains/python.py:321 +#: sphinx/domains/python.py:354 #, python-format msgid "%s (%s.%s attribute)" msgstr "%s (%s.%s 属性)" -#: sphinx/domains/python.py:366 -msgid "Platforms: " -msgstr "平台 " - -#: sphinx/domains/python.py:372 +#: sphinx/domains/python.py:434 #, python-format msgid "%s (module)" msgstr "%s (模块)" -#: sphinx/domains/python.py:429 +#: sphinx/domains/python.py:491 msgid "Python Module Index" msgstr "" -#: sphinx/domains/python.py:430 +#: sphinx/domains/python.py:492 msgid "modules" msgstr "模块" -#: sphinx/domains/python.py:475 +#: sphinx/domains/python.py:537 msgid "Deprecated" msgstr "已移除" -#: sphinx/domains/python.py:500 sphinx/locale/__init__.py:162 +#: sphinx/domains/python.py:562 sphinx/locale/__init__.py:179 msgid "exception" msgstr "例外" -#: sphinx/domains/python.py:501 +#: sphinx/domains/python.py:563 msgid "method" msgstr "" -#: sphinx/domains/python.py:502 +#: sphinx/domains/python.py:564 msgid "class method" msgstr "" -#: sphinx/domains/python.py:503 +#: sphinx/domains/python.py:565 msgid "static method" msgstr "静态方法" -#: sphinx/domains/python.py:505 sphinx/locale/__init__.py:158 +#: sphinx/domains/python.py:567 sphinx/locale/__init__.py:175 msgid "module" msgstr "模块" -#: sphinx/domains/rst.py:53 +#: sphinx/domains/python.py:695 +msgid " (deprecated)" +msgstr "" + +#: sphinx/domains/rst.py:55 #, python-format msgid "%s (directive)" msgstr "" -#: sphinx/domains/rst.py:55 +#: sphinx/domains/rst.py:57 #, python-format msgid "%s (role)" msgstr "" -#: sphinx/domains/rst.py:103 +#: sphinx/domains/rst.py:106 msgid "directive" msgstr "" -#: sphinx/domains/rst.py:104 +#: sphinx/domains/rst.py:107 msgid "role" msgstr "" -#: sphinx/domains/std.py:68 sphinx/domains/std.py:84 +#: sphinx/domains/std.py:70 sphinx/domains/std.py:86 #, python-format msgid "environment variable; %s" msgstr "环境变量; %s" -#: sphinx/domains/std.py:160 +#: sphinx/domains/std.py:162 #, python-format msgid "%scommand line option; %s" msgstr "%s命令行选项; %s" -#: sphinx/domains/std.py:328 +#: sphinx/domains/std.py:393 msgid "glossary term" msgstr "" -#: sphinx/domains/std.py:329 +#: sphinx/domains/std.py:394 msgid "grammar token" msgstr "" -#: sphinx/domains/std.py:330 +#: sphinx/domains/std.py:395 msgid "reference label" msgstr "" -#: sphinx/domains/std.py:331 +#: sphinx/domains/std.py:396 msgid "environment variable" msgstr "环境变量" -#: sphinx/domains/std.py:332 +#: sphinx/domains/std.py:397 msgid "program option" msgstr "" -#: sphinx/domains/std.py:360 sphinx/themes/basic/genindex-single.html:11 +#: sphinx/domains/std.py:427 sphinx/themes/basic/genindex-single.html:32 #: sphinx/themes/basic/genindex-split.html:11 #: sphinx/themes/basic/genindex-split.html:14 -#: sphinx/themes/basic/genindex.html:11 sphinx/themes/basic/genindex.html:14 -#: sphinx/themes/basic/genindex.html:50 sphinx/themes/basic/layout.html:125 -#: sphinx/writers/latex.py:173 +#: sphinx/themes/basic/genindex.html:32 sphinx/themes/basic/genindex.html:35 +#: sphinx/themes/basic/genindex.html:68 sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:179 sphinx/writers/texinfo.py:456 msgid "Index" msgstr "索引" -#: sphinx/domains/std.py:361 +#: sphinx/domains/std.py:428 msgid "Module Index" msgstr "模块索引" -#: sphinx/domains/std.py:362 sphinx/themes/basic/defindex.html:25 +#: sphinx/domains/std.py:429 sphinx/themes/basic/defindex.html:25 msgid "Search Page" msgstr "搜索页面" -#: sphinx/ext/autodoc.py:917 +#: sphinx/ext/autodoc.py:1002 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:950 +#: sphinx/ext/autodoc.py:1038 #, python-format msgid "alias of :class:`%s`" msgstr "" @@ -400,103 +421,103 @@ msgid "original entry" msgstr "" -#: sphinx/ext/viewcode.py:66 +#: sphinx/ext/viewcode.py:70 msgid "[source]" msgstr "" -#: sphinx/ext/viewcode.py:109 +#: sphinx/ext/viewcode.py:117 msgid "[docs]" msgstr "" -#: sphinx/ext/viewcode.py:123 +#: sphinx/ext/viewcode.py:131 msgid "Module code" msgstr "" -#: sphinx/ext/viewcode.py:129 +#: sphinx/ext/viewcode.py:137 #, python-format msgid "

Source code for %s

" msgstr "" -#: sphinx/ext/viewcode.py:156 +#: sphinx/ext/viewcode.py:164 msgid "Overview: module code" msgstr "" -#: sphinx/ext/viewcode.py:157 +#: sphinx/ext/viewcode.py:165 msgid "

All modules for which code is available

" msgstr "" -#: sphinx/locale/__init__.py:139 +#: sphinx/locale/__init__.py:155 msgid "Attention" msgstr "注意" -#: sphinx/locale/__init__.py:140 +#: sphinx/locale/__init__.py:156 msgid "Caution" msgstr "警告" -#: sphinx/locale/__init__.py:141 +#: sphinx/locale/__init__.py:157 msgid "Danger" msgstr "危险" -#: sphinx/locale/__init__.py:142 +#: sphinx/locale/__init__.py:158 msgid "Error" msgstr "错误" -#: sphinx/locale/__init__.py:143 +#: sphinx/locale/__init__.py:159 msgid "Hint" msgstr "提示" -#: sphinx/locale/__init__.py:144 +#: sphinx/locale/__init__.py:160 msgid "Important" msgstr "重要" -#: sphinx/locale/__init__.py:145 +#: sphinx/locale/__init__.py:161 msgid "Note" msgstr "注解" -#: sphinx/locale/__init__.py:146 +#: sphinx/locale/__init__.py:162 msgid "See Also" msgstr "也可以参考" -#: sphinx/locale/__init__.py:147 +#: sphinx/locale/__init__.py:163 msgid "Tip" msgstr "小技巧" -#: sphinx/locale/__init__.py:148 +#: sphinx/locale/__init__.py:164 msgid "Warning" msgstr "警告" -#: sphinx/locale/__init__.py:152 +#: sphinx/locale/__init__.py:168 #, python-format msgid "New in version %s" msgstr "%s 新版功能" -#: sphinx/locale/__init__.py:153 +#: sphinx/locale/__init__.py:169 #, python-format msgid "Changed in version %s" msgstr "在 %s 版更改" -#: sphinx/locale/__init__.py:154 +#: sphinx/locale/__init__.py:170 #, python-format msgid "Deprecated since version %s" msgstr "%s 版后已移除" -#: sphinx/locale/__init__.py:159 +#: sphinx/locale/__init__.py:176 msgid "keyword" msgstr "关键字" -#: sphinx/locale/__init__.py:160 +#: sphinx/locale/__init__.py:177 msgid "operator" msgstr "操作数" -#: sphinx/locale/__init__.py:161 +#: sphinx/locale/__init__.py:178 msgid "object" msgstr "对象" -#: sphinx/locale/__init__.py:163 +#: sphinx/locale/__init__.py:180 msgid "statement" msgstr "语句" -#: sphinx/locale/__init__.py:164 +#: sphinx/locale/__init__.py:181 msgid "built-in function" msgstr "內置函数" @@ -505,8 +526,8 @@ msgid "Table Of Contents" msgstr "內容目录" -#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:128 -#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:14 +#: sphinx/themes/agogo/layout.html:49 sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:11 sphinx/themes/basic/search.html:20 msgid "Search" msgstr "搜索" @@ -554,15 +575,15 @@ msgid "all functions, classes, terms" msgstr "所的函数，类，术语" -#: sphinx/themes/basic/genindex-single.html:14 +#: sphinx/themes/basic/genindex-single.html:35 #, python-format msgid "Index – %(key)s" msgstr "索引 – %(key)s" -#: sphinx/themes/basic/genindex-single.html:46 +#: sphinx/themes/basic/genindex-single.html:63 #: sphinx/themes/basic/genindex-split.html:24 #: sphinx/themes/basic/genindex-split.html:38 -#: sphinx/themes/basic/genindex.html:56 +#: sphinx/themes/basic/genindex.html:74 msgid "Full index on one page" msgstr "一页的全部索引" @@ -574,39 +595,39 @@ msgid "can be huge" msgstr "可能会很多" -#: sphinx/themes/basic/layout.html:23 +#: sphinx/themes/basic/layout.html:29 msgid "Navigation" msgstr "导航" -#: sphinx/themes/basic/layout.html:113 +#: sphinx/themes/basic/layout.html:122 #, python-format msgid "Search within %(docstitle)s" msgstr "在 %(docstitle)s 中搜索" -#: sphinx/themes/basic/layout.html:122 +#: sphinx/themes/basic/layout.html:131 msgid "About these documents" msgstr "关于这些文档" -#: sphinx/themes/basic/layout.html:131 +#: sphinx/themes/basic/layout.html:140 msgid "Copyright" msgstr "版权所有" -#: sphinx/themes/basic/layout.html:180 +#: sphinx/themes/basic/layout.html:189 #, python-format msgid "© Copyright %(copyright)s." msgstr "© 版权所有 %(copyright)s." -#: sphinx/themes/basic/layout.html:182 +#: sphinx/themes/basic/layout.html:191 #, python-format msgid "© Copyright %(copyright)s." msgstr "© 版权所有 %(copyright)s." -#: sphinx/themes/basic/layout.html:186 +#: sphinx/themes/basic/layout.html:195 #, python-format msgid "Last updated on %(last_updated)s." msgstr "最后更新日期是 %(last_updated)s." -#: sphinx/themes/basic/layout.html:189 +#: sphinx/themes/basic/layout.html:198 #, python-format msgid "" "Created using Sphinx " @@ -635,13 +656,13 @@ msgid "next chapter" msgstr "下一章" -#: sphinx/themes/basic/search.html:18 +#: sphinx/themes/basic/search.html:24 msgid "" "Please activate JavaScript to enable the search\n" " functionality." msgstr "" -#: sphinx/themes/basic/search.html:23 +#: sphinx/themes/basic/search.html:29 msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" @@ -650,16 +671,15 @@ msgstr "" "在这儿，你可以对这些文档进行搜索。向搜索框中输入你所要搜索的关键字并点击\"搜索\"。注意：搜索引擎会自动搜索所有的关键字。将不会搜索到部分关键字的页面." -#: sphinx/themes/basic/search.html:30 +#: sphinx/themes/basic/search.html:36 msgid "search" msgstr "搜索" -#: sphinx/themes/basic/search.html:34 -#: sphinx/themes/basic/static/searchtools.js:489 +#: sphinx/themes/basic/search.html:40 msgid "Search Results" msgstr "搜索结果" -#: sphinx/themes/basic/search.html:36 +#: sphinx/themes/basic/search.html:42 msgid "Your search did not match any results." msgstr "你的搜索没有找到任何的结果." @@ -699,12 +719,12 @@ msgid "Other changes" msgstr "其他更改" -#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:482 -#: sphinx/writers/html.py:487 +#: sphinx/themes/basic/static/doctools.js:154 sphinx/writers/html.py:504 +#: sphinx/writers/html.py:510 msgid "Permalink to this headline" msgstr "永久链接至标题" -#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:87 +#: sphinx/themes/basic/static/doctools.js:160 sphinx/writers/html.py:92 msgid "Permalink to this definition" msgstr "永久链接至目标" @@ -712,35 +732,12 @@ msgid "Hide Search Matches" msgstr "隐藏搜索结果" -#: sphinx/themes/basic/static/searchtools.js:285 -msgid "Searching" -msgstr "搜索中" - -#: sphinx/themes/basic/static/searchtools.js:290 -msgid "Preparing search..." -msgstr "准备搜索..." - -#: sphinx/themes/basic/static/searchtools.js:364 -msgid ", in " -msgstr ", 位于 " - -#: sphinx/themes/basic/static/searchtools.js:491 -msgid "" -"Your search did not match any documents. Please make sure that all words are " -"spelled correctly and that you've selected enough categories." -msgstr "你的搜索没有匹配到任何文档。请确认你所搜索的关键字." - -#: sphinx/themes/basic/static/searchtools.js:493 -#, python-format -msgid "Search finished, found %s page(s) matching the search query." -msgstr "搜索完成， 找到了 %s 页匹配所搜索的关键字" - -#: sphinx/themes/default/static/sidebar.js:66 +#: sphinx/themes/default/static/sidebar.js:69 msgid "Expand sidebar" msgstr "" -#: sphinx/themes/default/static/sidebar.js:79 -#: sphinx/themes/default/static/sidebar.js:106 +#: sphinx/themes/default/static/sidebar.js:82 +#: sphinx/themes/default/static/sidebar.js:110 msgid "Collapse sidebar" msgstr "" @@ -748,22 +745,23 @@ msgid "Contents" msgstr "" -#: sphinx/writers/latex.py:171 +#: sphinx/writers/latex.py:177 msgid "Release" msgstr "发布" -#: sphinx/writers/latex.py:572 sphinx/writers/manpage.py:178 +#: sphinx/writers/latex.py:594 sphinx/writers/manpage.py:182 +#: sphinx/writers/texinfo.py:589 msgid "Footnotes" msgstr "" -#: sphinx/writers/latex.py:641 +#: sphinx/writers/latex.py:676 msgid "continued from previous page" msgstr "" -#: sphinx/writers/latex.py:646 +#: sphinx/writers/latex.py:681 msgid "Continued on next page" msgstr "" -#: sphinx/writers/text.py:422 +#: sphinx/writers/text.py:437 msgid "[image]" msgstr "[图片]" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subdomain_parser.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/subdomain_parser.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subdomain_parser.po 2012-02-23 07:11:57.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/subdomain_parser.po 2012-03-23 07:33:18.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: 2012-02-16 23:43+0000\n" +"PO-Revision-Date: 2012-03-16 00:34+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: 2012-02-21 23:37+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:36+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../parser_include.c:80 msgid "Error couldn't allocate temporary file\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subversion.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/subversion.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/subversion.po 2012-02-23 07:11:34.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/subversion.po 2012-03-23 07:32:56.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: 2012-02-21 18:47+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:12+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudoers.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sudoers.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudoers.po 2012-02-23 07:12:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sudoers.po 2012-03-23 07:33:46.000000000 +0000 @@ -8,14 +8,14 @@ "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n" "POT-Creation-Date: 2011-10-10 15:50-0400\n" "PO-Revision-Date: 2012-01-31 19:22+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-23 01:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: plugins/sudoers/alias.c:122 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudo.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sudo.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sudo.po 2012-02-23 07:12:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sudo.po 2012-03-23 07:33:46.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n" "POT-Creation-Date: 2011-09-27 14:07-0400\n" "PO-Revision-Date: 2011-12-07 23:14+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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: 2012-02-22 06:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-23 01:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: src/error.c:82 src/error.c:86 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/swift.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/swift.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/swift.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/swift.po 2012-03-23 07:33:46.000000000 +0000 @@ -0,0 +1,1066 @@ +# Chinese (Simplified) translation for swift +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the swift package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: swift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-26 23:59+0000\n" +"PO-Revision-Date: 2012-03-02 09:48+0000\n" +"Last-Translator: FULL NAME \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-03-23 01:17+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#: swift/account/auditor.py:52 swift/account/auditor.py:75 +#, python-format +msgid "" +"Since %(time)s: Account audits: %(passed)s passed audit, %(failed)s failed " +"audit" +msgstr "自从 %(time)s：账号审计：%(passed)s 审计通过, %(failed)s 审计失败" + +#: swift/account/auditor.py:100 swift/container/auditor.py:103 +#, python-format +msgid "Audit passed for %s" +msgstr "%s 审计通过" + +#: swift/account/auditor.py:103 +#, python-format +msgid "ERROR Could not get account info %s" +msgstr "发生错误，无法获取账户信息 %s" + +#: swift/account/reaper.py:80 swift/container/updater.py:64 +#, python-format +msgid "Loading account ring from %s" +msgstr "从 %s 加载帐户环" + +#: swift/account/reaper.py:88 swift/obj/updater.py:57 +#, python-format +msgid "Loading container ring from %s" +msgstr "从 %s 加载容器环" + +#: swift/account/reaper.py:96 +#, python-format +msgid "Loading object ring from %s" +msgstr "从 %s 加载对象环" + +#: swift/account/reaper.py:106 +msgid "Daemon started." +msgstr "守护进程已启动”" + +#: swift/account/reaper.py:122 +#, python-format +msgid "Begin devices pass: %s" +msgstr "开始设备扫描：%s" + +#: swift/account/reaper.py:128 swift/common/utils.py:805 +#: swift/obj/updater.py:74 swift/obj/updater.py:113 +#, python-format +msgid "Skipping %s as it is not mounted" +msgstr "因为其没有挂载而跳过 %s" + +#: swift/account/reaper.py:132 +#, python-format +msgid "Devices pass completed: %.02fs" +msgstr "设备扫描完成：%.02fs" + +#: swift/account/reaper.py:215 +#, python-format +msgid "Beginning pass on account %s" +msgstr "开始帐户 %s 扫描" + +#: swift/account/reaper.py:238 +#, python-format +msgid "Exception with containers for account %s" +msgstr "帐户 %s 的容器异常" + +#: swift/account/reaper.py:243 +#, python-format +msgid "Exception with account %s" +msgstr "帐户异常 %s" + +#: swift/account/reaper.py:244 +#, python-format +msgid "Incomplete pass on account %s" +msgstr "未完成帐户 %s 扫描" + +#: swift/account/reaper.py:246 +#, python-format +msgid ", %s containers deleted" +msgstr "，%s 个容器被删除" + +#: swift/account/reaper.py:248 +#, python-format +msgid ", %s objects deleted" +msgstr "，%s 个对象被删除" + +#: swift/account/reaper.py:250 +#, python-format +msgid ", %s containers remaining" +msgstr "，剩余 %s 个容器" + +#: swift/account/reaper.py:253 +#, python-format +msgid ", %s objects remaining" +msgstr "，剩余 %s 个对象" + +#: swift/account/reaper.py:255 +#, python-format +msgid ", %s containers possibly remaining" +msgstr "，可能剩余 %s 个容器" + +#: swift/account/reaper.py:258 +#, python-format +msgid ", %s objects possibly remaining" +msgstr "，可能剩余 %s 个对象" + +#: swift/account/reaper.py:261 +msgid ", return codes: " +msgstr "，返回代码: " + +#: swift/account/reaper.py:265 +#, python-format +msgid ", elapsed: %.02fs" +msgstr "，已过去的：%.02fs" + +#: swift/account/reaper.py:320 swift/account/reaper.py:355 +#: swift/account/reaper.py:406 swift/container/updater.py:277 +#, python-format +msgid "Exception with %(ip)s:%(port)s/%(device)s" +msgstr "%(ip)s 的异常：%(port)s/%(device)s" + +#: swift/account/reaper.py:333 +#, python-format +msgid "" +"Exception with objects for container %(container)s for account %(account)s" +msgstr "帐户 %(account)s 下容器 %(container)s 内的对象异常" + +#: swift/account/server.py:309 swift/container/server.py:397 +#: swift/obj/server.py:597 +#, python-format +msgid "ERROR __call__ error with %(method)s %(path)s " +msgstr "错误 __call__中%(method)s %(path)s 出错 " + +#: swift/auth/server.py:96 swift/common/middleware/swauth.py:94 +msgid "No super_admin_key set in conf file! Exiting." +msgstr "conf文件中没有设置super_admin_key ！退出。" + +#: swift/auth/server.py:152 +#, python-format +msgid "" +"\n" +"THERE ARE ACCOUNTS IN YOUR auth.db THAT DO NOT BEGIN WITH YOUR NEW RESELLER\n" +"PREFIX OF \"%(reseller)s\".\n" +"YOU HAVE A FEW OPTIONS:\n" +" 1. RUN \"swift-auth-update-reseller-prefixes %(db_file)s " +"%(reseller)s\",\n" +" \"swift-init auth-server restart\", AND\n" +" \"swift-auth-recreate-accounts -K ...\" TO CREATE FRESH ACCOUNTS.\n" +" OR\n" +" 2. REMOVE %(db_file)s, RUN \"swift-init auth-server restart\", AND RUN\n" +" \"swift-auth-add-user ...\" TO CREATE BRAND NEW ACCOUNTS THAT WAY.\n" +" OR\n" +" 3. ADD \"reseller_prefix = %(previous)s\" (WITHOUT THE QUOTES) TO YOUR\n" +" proxy-server.conf IN THE [filter:auth] SECTION AND TO YOUR\n" +" auth-server.conf IN THE [app:auth-server] SECTION AND RUN\n" +" \"swift-init proxy-server restart\" AND \"swift-init auth-server " +"restart\"\n" +" TO REVERT BACK TO YOUR PREVIOUS RESELLER PREFIX.\n" +"\n" +" %(note)s\n" +" " +msgstr "" +"\n" +"你的 auth.db 有些账户未采用新的中间商(reseller)前缀\"%(reseller)s\"。\n" +"你有以下几个选择：\n" +"1. 运行 \"swift-auth-update-reseller-prefixes %(db_file)s %(reseller)s\",\n" +" \"swift-init auth-server restart\", 和\n" +" \"swift-auth-recreate-accounts -K ...\" 来创建新的帐户。\n" +"或者\n" +"2. 删除 %(db_file)s, 运行 \"swift-init auth-server restart\", 和运行\n" +" \"swift-auth-add-user ...\" 来创建全新的帐户。\n" +"或者\n" +"3. 添加 \"reseller_prefix = %(previous)s\" (无引号) 到您的\n" +" proxy-server.conf文件中的[filter:auth]段和 \n" +" auth-server.conf 中的[app:auth-server]段，\n" +" 运行\"swift-init proxy-server restart\" 和 \n" +" \"swift-init auth-server restart\"来恢复到您之前的中间商(reseller)前缀。\n" +"\n" +"%(note)s\n" +" " + +#: swift/auth/server.py:173 +msgid "" +"\n" +" SINCE YOUR PREVIOUS RESELLER PREFIX WAS AN EMPTY STRING, IT IS NOT\n" +" RECOMMENDED TO PERFORM OPTION 3 AS THAT WOULD MAKE SUPPORTING MULTIPLE\n" +" RESELLERS MORE DIFFICULT.\n" +" " +msgstr "" +"\n" +" 由于您之前的中间商(reseller)前缀为空字符串，不推荐使用第3个选择，\n" +"否则难以支持多个中间商(reseller)。\n" +" " + +#: swift/auth/server.py:178 +msgid "CRITICAL: " +msgstr "关键： " + +#: swift/auth/server.py:213 +#, python-format +msgid "ERROR attempting to create account %(url)s: %(status)s %(reason)s" +msgstr "尝试创建帐户 %(url)s 产生错误：%(status)s %(reason)s" + +#: swift/auth/server.py:346 +#, python-format +msgid "" +"ALREADY EXISTS create_user(%(account)s, %(user)s, _, %(admin)s, " +"%(reseller_admin)s) [%(elapsed).02f]" +msgstr "" +"create_user(%(account)s，%(user)s，_，%(admin)s，%(reseller_admin)s) " +"[%(elapsed).02f]已经存在了" + +#: swift/auth/server.py:364 +#, python-format +msgid "" +"FAILED create_user(%(account)s, %(user)s, _, %(admin)s, %(reseller_admin)s) " +"[%(elapsed).02f]" +msgstr "" +"create_user(%(account)s，%(user)s，_，%(admin)s，%(reseller_admin)s) " +"[%(elapsed).02f]失败" + +#: swift/auth/server.py:381 +#, python-format +msgid "" +"SUCCESS create_user(%(account)s, %(user)s, _, %(admin)s, %(reseller_admin)s) " +"= %(url)s [%(elapsed).02f]" +msgstr "" +"create_user(%(account)s, %(user)s, _, %(admin)s, %(reseller_admin)s) = " +"%(url)s [%(elapsed).02f]成功" + +#: swift/auth/server.py:656 +msgid "ERROR Unhandled exception in ReST request" +msgstr "错误 ReST请求有未处理的异常" + +#: swift/common/bench.py:85 +#, python-format +msgid "%(complete)s %(title)s [%(fail)s failures], %(rate).01f/s" +msgstr "%(complete)s %(title)s [%(fail)s failures], %(rate).01f/s" + +#: swift/common/bench.py:97 +msgid "CannotSendRequest. Skipping..." +msgstr "CannotSendRequest异常。跳过..." + +#: swift/common/bufferedhttp.py:96 +#, python-format +msgid "" +"HTTP PERF: %(time).5f seconds to %(method)s %(host)s:%(port)s %(path)s)" +msgstr "HTTP PERF: %(time).5f 秒，%(method)s %(host)s:%(port)s %(path)s)" + +#: swift/common/db.py:299 +msgid "Broker error trying to rollback locked connection" +msgstr "代理出错尝试回滚锁定的连接" + +#: swift/common/db.py:754 swift/common/db.py:1221 +#, python-format +msgid "Invalid pending entry %(file)s: %(entry)s" +msgstr "无效的挂起入口 %(file)s: %(entry)s" + +#: swift/common/db_replicator.py:84 +#, python-format +msgid "ERROR reading HTTP response from %s" +msgstr "错误 从 %s 读取HTTP响应" + +#: swift/common/db_replicator.py:123 +#, python-format +msgid "" +"Attempted to replicate %(count)d dbs in %(time).5f seconds (%(rate).5f/s)" +msgstr "尝试在 %(time).5f 秒内 (%(rate).5f/s) 复制 %(count)d 个数据库" + +#: swift/common/db_replicator.py:129 +#, python-format +msgid "Removed %(remove)d dbs" +msgstr "移除 %(remove)d 个数据库" + +#: swift/common/db_replicator.py:130 +#, python-format +msgid "%(success)s successes, %(failure)s failures" +msgstr "%(success)s 个成功，%(failure)s 个失败" + +#: swift/common/db_replicator.py:155 +#, python-format +msgid "ERROR rsync failed with %(code)s: %(args)s" +msgstr "错误 rsync失败 %(code)s: %(args)s" + +#: swift/common/db_replicator.py:205 +#, python-format +msgid "Syncing chunks with %s" +msgstr "正在与 %s 同步数据块" + +#: swift/common/db_replicator.py:213 +#, python-format +msgid "ERROR Bad response %(status)s from %(host)s" +msgstr "错误 来自 %(host)s 的错误响应 %(status)s" + +#: swift/common/db_replicator.py:278 +#, python-format +msgid "ERROR Unable to connect to remote server: %s" +msgstr "错误 无法连接到远程服务器：%s" + +#: swift/common/db_replicator.py:316 +#, python-format +msgid "Replicating db %s" +msgstr "正在复制数据库 %s" + +#: swift/common/db_replicator.py:325 swift/common/db_replicator.py:479 +#, python-format +msgid "Quarantining DB %s" +msgstr "正在隔离数据库 %s" + +#: swift/common/db_replicator.py:328 +#, python-format +msgid "ERROR reading db %s" +msgstr "错误 读取数据库 %s 出错" + +#: swift/common/db_replicator.py:361 +#, python-format +msgid "ERROR Remote drive not mounted %s" +msgstr "错误 远程驱动没有挂载%s" + +#: swift/common/db_replicator.py:363 +#, python-format +msgid "ERROR syncing %(file)s with node %(node)s" +msgstr "错误 与节点 %(node)s 同步 %(file)s 出错" + +#: swift/common/db_replicator.py:405 +msgid "ERROR Failed to get my own IPs?" +msgstr "错误 无法获取我自己的IP？" + +#: swift/common/db_replicator.py:412 +#, python-format +msgid "Skipping %(device)s as it is not mounted" +msgstr "因其没有挂载而跳过 %(device)s" + +#: swift/common/db_replicator.py:420 +msgid "Beginning replication run" +msgstr "开始复制运行" + +#: swift/common/db_replicator.py:425 +msgid "Replication run OVER" +msgstr "复制运行结束" + +#: swift/common/db_replicator.py:436 +msgid "ERROR trying to replicate" +msgstr "错误 尝试去复制" + +#: swift/common/memcached.py:69 +#, python-format +msgid "Timeout %(action)s to memcached: %(server)s" +msgstr "对 memcached 操作 %(action)s 超时: %(server)s" + +#: swift/common/memcached.py:72 +#, python-format +msgid "Error %(action)s to memcached: %(server)s" +msgstr "错误 对 memcached 操作 %(action)s 出错: %(server)s" + +#: swift/common/memcached.py:81 +#, python-format +msgid "Error limiting server %s" +msgstr "服务器 %s 出错次数超出限制" + +#: swift/common/utils.py:88 +#, python-format +msgid "Unable to locate %s in libc. Leaving as a no-op." +msgstr "无法在libc中找到 %s。将它作为no-op。" + +#: swift/common/utils.py:255 +msgid "STDOUT: Connection reset by peer" +msgstr "标准输出：连接被同级别连接者重置" + +#: swift/common/utils.py:257 swift/common/utils.py:260 +#, python-format +msgid "STDOUT: %s" +msgstr "标准输出：%s" + +#: swift/common/utils.py:324 +msgid "Connection refused" +msgstr "拒绝连接" + +#: swift/common/utils.py:326 +msgid "Host unreachable" +msgstr "主机不可达" + +#: swift/common/utils.py:328 +msgid "Connection timeout" +msgstr "连接超时" + +#: swift/common/utils.py:464 +msgid "UNCAUGHT EXCEPTION" +msgstr "未抓取的异常" + +#: swift/common/utils.py:511 +msgid "Error: missing config file argument" +msgstr "错误：缺少配置文件参数" + +#: swift/common/utils.py:516 +#, python-format +msgid "Error: unable to locate %s" +msgstr "错误：无法确定 %s 的位置" + +#: swift/common/utils.py:743 +#, python-format +msgid "Unable to read config file %s" +msgstr "无法读取配置文件 %s" + +#: swift/common/utils.py:749 +#, python-format +msgid "Unable to find %s config section in %s" +msgstr "无法找到 %s 配置部分在 %s 中" + +#: swift/common/middleware/catch_errors.py:39 +#, python-format +msgid "Error: %s" +msgstr "错误：%s" + +#: swift/common/middleware/cname_lookup.py:91 +#, python-format +msgid "Mapped %(given_domain)s to %(found_domain)s" +msgstr "把 %(given_domain)s 映射到 %(found_domain)s" + +#: swift/common/middleware/cname_lookup.py:102 +#, python-format +msgid "Following CNAME chain for %(given_domain)s to %(found_domain)s" +msgstr "顺着 %(given_domain)s 的 CNAME 链到 %(found_domain)s" + +#: swift/common/middleware/ratelimit.py:172 +msgid "Returning 497 because of blacklisting" +msgstr "因列入黑名单返回497" + +#: swift/common/middleware/ratelimit.py:185 +#, python-format +msgid "" +"Ratelimit sleep log: %(sleep)s for %(account)s/%(container)s/%(object)s" +msgstr "Ratelimit 休眠日志：%(account)s/%(container)s/%(object)s 的 %(sleep)s" + +#: swift/common/middleware/ratelimit.py:192 +#, python-format +msgid "Returning 498 because of ops rate limiting (Max Sleep) %s" +msgstr "因 ops 频率限制(最大休眠数) %s 返回498" + +#: swift/common/middleware/ratelimit.py:212 +msgid "Warning: Cannot ratelimit without a memcached client" +msgstr "警告：没有memcached客户端无法ratelimit" + +#: swift/common/middleware/swauth.py:635 +#, python-format +msgid "" +"ERROR: Exception while trying to communicate with " +"%(scheme)s://%(host)s:%(port)s/%(path)s" +msgstr "错误：尝试与 %(scheme)s://%(host)s:%(port)s/%(path)s 交互时出现异常" + +#: swift/container/auditor.py:54 swift/container/auditor.py:78 +#, python-format +msgid "" +"Since %(time)s: Container audits: %(pass)s passed audit, %(fail)s failed " +"audit" +msgstr "自从 %(time)s 起：容器审计：%(pass)s 个通过的审计，%(fail)s 个失败的审计" + +#: swift/container/auditor.py:68 +msgid "Begin container audit \"once\" mode" +msgstr "开启容器审计\"once\"模式" + +#: swift/container/auditor.py:88 +#, python-format +msgid "Container audit \"once\" mode completed: %.02fs" +msgstr "容器审计\"once\"模式完成：%.02fs" + +#: swift/container/auditor.py:106 +#, python-format +msgid "ERROR Could not get container info %s" +msgstr "错误 无法获得容器信息 %s" + +#: swift/container/server.py:114 +#, python-format +msgid "" +"ERROR Account update failed with %(ip)s:%(port)s/%(device)s (will retry " +"later): Response %(status)s %(reason)s" +msgstr "" +"错误 帐户更新失败： %(ip)s:%(port)s/%(device)s (将会重试)：响应 %(status)s %(reason)s" + +#: swift/container/server.py:122 +#, python-format +msgid "" +"ERROR account update failed with %(ip)s:%(port)s/%(device)s (will retry " +"later)" +msgstr "错误 帐户更新失败：%(ip)s:%(port)s/%(device)s (将会重试)" + +#: swift/container/updater.py:78 swift/obj/replicator.py:492 +#, python-format +msgid "%s is not mounted" +msgstr "%s 没有挂载" + +#: swift/container/updater.py:97 +#, python-format +msgid "ERROR with loading suppressions from %s: " +msgstr "错误 从 %s 加载抑制条件： " + +#: swift/container/updater.py:107 +msgid "Begin container update sweep" +msgstr "开始容器更新清理" + +#: swift/container/updater.py:140 +#, python-format +msgid "" +"Container update sweep of %(path)s completed: %(elapsed).02fs, %(success)s " +"successes, %(fail)s failures, %(no_change)s with no changes" +msgstr "" +"容器更新清理 %(path)s 完成：%(elapsed).02fs, %(success)s 个成功, %(fail)s 个失败, " +"%(no_change)s 无更改" + +#: swift/container/updater.py:154 +#, python-format +msgid "Container update sweep completed: %.02fs" +msgstr "容器更新清理完成：%.02fs" + +#: swift/container/updater.py:164 +msgid "Begin container update single threaded sweep" +msgstr "开始容器更新的单线程清理" + +#: swift/container/updater.py:172 +#, python-format +msgid "" +"Container update single threaded sweep completed: %(elapsed).02fs, " +"%(success)s successes, %(fail)s failures, %(no_change)s with no changes" +msgstr "" +"容器更新的单线程清理完成：%(elapsed).02fs, %(success)s 个成功, %(fail)s 个失败, %(no_change)s " +"没有更改" + +#: swift/container/updater.py:224 +#, python-format +msgid "Update report sent for %(container)s %(dbfile)s" +msgstr "为 %(container)s %(dbfile)s 发出更新报告" + +#: swift/container/updater.py:232 +#, python-format +msgid "Update report failed for %(container)s %(dbfile)s" +msgstr "%(container)s %(dbfile)s 的更新报告失败" + +#: swift/container/updater.py:266 +#, python-format +msgid "" +"ERROR account update failed with %(ip)s:%(port)s/%(device)s (will retry " +"later): " +msgstr "错误 %(ip)s 的帐户更新失败：%(port)s/%(device)s (将会重试)： " + +#: swift/obj/auditor.py:61 +#, python-format +msgid "Begin object audit \"%s\" mode" +msgstr "开始对象审计 \"%s\" 模式" + +#: swift/obj/auditor.py:73 +#, python-format +msgid "" +"Since %(start_time)s: Locally: %(passes)d passed audit, %(quars)d " +"quarantined, %(errors)d errors files/sec: %(frate).2f , bytes/sec: " +"%(brate).2f" +msgstr "" +"从 %(start_time)s 起：本地：%(passes)d 个通过的审计，%(quars)d 个被隔离，%(errors)d " +"个错误文件/秒：%(frate).2f，字节/秒：%(brate).2f" + +#: swift/obj/auditor.py:90 +#, python-format +msgid "" +"Object audit \"%(mode)s\" mode completed: %(elapsed).02fs. Total files/sec: " +"%(frate).2f , Total bytes/sec: %(brate).2f " +msgstr "" +"对象审计\"%(mode)s\"模式完成：%(elapsed).02fs。总计 文件/秒：%(frate).2f ，总计 " +"字节/秒：%(brate).2f " + +#: swift/obj/auditor.py:141 +#, python-format +msgid "ERROR Object %(obj)s failed audit and will be quarantined: %(err)s" +msgstr "错误 对象%(obj)s 审计失败将被隔离：%(err)s" + +#: swift/obj/auditor.py:150 +#, python-format +msgid "ERROR Trying to audit %s" +msgstr "错误 试图审计 %s" + +#: swift/obj/replicator.py:182 +msgid "Error hashing suffix" +msgstr "错误 散列后缀" + +#: swift/obj/replicator.py:246 +#, python-format +msgid "Killing long-running rsync: %s" +msgstr "消灭时间过长的rsync：%s" + +#: swift/obj/replicator.py:257 +#, python-format +msgid "Bad rsync return code: %(args)s -> %(ret)d" +msgstr "不恰当的rsync返回代码：%(args)s -> %(ret)d" + +#: swift/obj/replicator.py:261 swift/obj/replicator.py:265 +#, python-format +msgid "Successful rsync of %(src)s at %(dst)s (%(time).03f)" +msgstr "%(dst)s (%(time).03f) %(src)s 成功的rsync" + +#: swift/obj/replicator.py:350 +#, python-format +msgid "Removing partition: %s" +msgstr "移除分区：%s" + +#: swift/obj/replicator.py:353 +msgid "Error syncing handoff partition" +msgstr "错误 同步可接手的分区" + +#: swift/obj/replicator.py:383 +#, python-format +msgid "%(ip)s/%(device)s responded as unmounted" +msgstr "%(ip)s/%(device)s 返回未挂载" + +#: swift/obj/replicator.py:388 +#, python-format +msgid "Invalid response %(resp)s from %(ip)s" +msgstr "从 %(ip)s 返回的无效回复 %(resp)s" + +#: swift/obj/replicator.py:410 +#, python-format +msgid "Error syncing with node: %s" +msgstr "错误 与节点同步：%s" + +#: swift/obj/replicator.py:414 +msgid "Error syncing partition" +msgstr "错误 同步分区" + +#: swift/obj/replicator.py:424 +#, python-format +msgid "" +"%(replicated)d/%(total)d (%(percentage).2f%%) partitions replicated in " +"%(time).2fs (%(rate).2f/sec, %(remaining)s remaining)" +msgstr "" +"在 %(time).2fs 内有%(replicated)d/%(total)d (%(percentage).2f%%) " +"的分区被复制，(%(rate).2f/秒，剩余 %(remaining)s)" + +#: swift/obj/replicator.py:433 +#, python-format +msgid "" +"%(checked)d suffixes checked - %(hashed).2f%% hashed, %(synced).2f%% synced" +msgstr "%(checked)d 个后缀已被检查 - %(hashed).2f%% 被散列，%(synced).2f%%被同步" + +#: swift/obj/replicator.py:439 +#, python-format +msgid "Partition times: max %(max).4fs, min %(min).4fs, med %(med).4fs" +msgstr "Partition times：最大 %(max).4fs，最小 %(min).4fs，平均 %(med).4fs" + +#: swift/obj/replicator.py:446 +#, python-format +msgid "Nothing replicated for %s seconds." +msgstr "为 %s 秒 没有复制任何东西" + +#: swift/obj/replicator.py:475 +msgid "Lockup detected.. killing live coros." +msgstr "检测到Lockup... 消灭活的coros。" + +#: swift/obj/replicator.py:530 +msgid "Ring change detected. Aborting current replication pass." +msgstr "检测到ring改变。中止当前的复制pass" + +#: swift/obj/replicator.py:540 +msgid "Exception in top-level replication loop" +msgstr "最上层的复制循环出现异常" + +#: swift/obj/replicator.py:549 +msgid "Running object replicator in script mode." +msgstr "在文本模式运行对象复制器" + +#: swift/obj/replicator.py:553 swift/obj/replicator.py:565 +#, python-format +msgid "Object replication complete. (%.02f minutes)" +msgstr "对象复制完成。(%.02f 分)" + +#: swift/obj/replicator.py:560 +msgid "Starting object replication pass." +msgstr "开始对象复制pass。" + +#: swift/obj/replicator.py:566 +#, python-format +msgid "Replication sleeping for %s seconds." +msgstr "复制睡眠 %s 秒。" + +#: swift/obj/server.py:313 +#, python-format +msgid "" +"ERROR Container update failed (saving for async update later): %(status)d " +"response from %(ip)s:%(port)s/%(dev)s" +msgstr "错误 容器更新失败(以后将会async更新)：%(status)d 从 %(ip)s 响应：%(port)s/%(dev)s" + +#: swift/obj/server.py:319 +#, python-format +msgid "" +"ERROR container update failed with %(ip)s:%(port)s/%(dev)s (saving for async " +"update later)" +msgstr "错误 %(ip)s 上的容器更新失败：%(port)s/%(dev)s(以后将会async更新)" + +#: swift/obj/updater.py:65 +msgid "Begin object update sweep" +msgstr "开始对象更新清理" + +#: swift/obj/updater.py:89 +#, python-format +msgid "" +"Object update sweep of %(device)s completed: %(elapsed).02fs, %(success)s " +"successes, %(fail)s failures" +msgstr "%(device)s 的对象更新清理完成：%(elapsed).02fs，%(success)s 条成功，%(fail)s 条失败" + +#: swift/obj/updater.py:98 +#, python-format +msgid "Object update sweep completed: %.02fs" +msgstr "对象更新清理完成：%.02fs" + +#: swift/obj/updater.py:105 +msgid "Begin object update single threaded sweep" +msgstr "开始对象更新单线程清理" + +#: swift/obj/updater.py:117 +#, python-format +msgid "" +"Object update single threaded sweep completed: %(elapsed).02fs, %(success)s " +"successes, %(fail)s failures" +msgstr "对象更新单线程清理完成：%(elapsed).02fs，%(success)s 个成功，%(fail)s 个失败" + +#: swift/obj/updater.py:157 +#, python-format +msgid "ERROR Pickle problem, quarantining %s" +msgstr "错误 Pickle 问题，正在隔离 %s" + +#: swift/obj/updater.py:177 +#, python-format +msgid "Update sent for %(obj)s %(path)s" +msgstr "为 %(obj)s %(path)s 发送更新" + +#: swift/obj/updater.py:182 +#, python-format +msgid "Update failed for %(obj)s %(path)s" +msgstr "%(obj)s %(path)s 的更新失败" + +#: swift/obj/updater.py:206 +#, python-format +msgid "ERROR with remote server %(ip)s:%(port)s/%(device)s" +msgstr "远程服务器 %(ip)s 的错误：%(port)s/%(device)s" + +#: swift/proxy/server.py:165 swift/proxy/server.py:629 +#: swift/proxy/server.py:696 swift/proxy/server.py:712 +#: swift/proxy/server.py:721 swift/proxy/server.py:1004 +#: swift/proxy/server.py:1044 swift/proxy/server.py:1089 +msgid "Object" +msgstr "对象" + +#: swift/proxy/server.py:170 +#, python-format +msgid "Could not load object segment %(path)s: %(status)s" +msgstr "无法加载对象segment %(path)s: %(status)s" + +#: swift/proxy/server.py:177 swift/proxy/server.py:210 +#: swift/proxy/server.py:257 +#, python-format +msgid "ERROR: While processing manifest /%(acc)s/%(cont)s/%(obj)s" +msgstr "错误：处理manifest /%(acc)s/%(cont)s/%(obj)s" + +#: swift/proxy/server.py:292 +#, python-format +msgid "%(msg)s %(ip)s:%(port)s" +msgstr "%(msg)s %(ip)s:%(port)s" + +#: swift/proxy/server.py:304 +#, python-format +msgid "ERROR with %(type)s server %(ip)s:%(port)s/%(device)s re: %(info)s" +msgstr "%(type)s 类型的服务器%(ip)s 出错：%(port)s/%(device)s re: %(info)s" + +#: swift/proxy/server.py:328 +#, python-format +msgid "Node error limited %(ip)s:%(port)s (%(device)s)" +msgstr "Node error limited %(ip)s:%(port)s (%(device)s)" + +#: swift/proxy/server.py:388 swift/proxy/server.py:1451 +#: swift/proxy/server.py:1497 swift/proxy/server.py:1545 +#: swift/proxy/server.py:1590 +msgid "Account" +msgstr "帐户" + +#: swift/proxy/server.py:389 +#, python-format +msgid "Trying to get account info for %s" +msgstr "尝试为 %s 获取帐户信息" + +#: swift/proxy/server.py:466 swift/proxy/server.py:740 +#: swift/proxy/server.py:772 swift/proxy/server.py:1214 +#: swift/proxy/server.py:1301 swift/proxy/server.py:1356 +#: swift/proxy/server.py:1413 +msgid "Container" +msgstr "容器" + +#: swift/proxy/server.py:467 +#, python-format +msgid "Trying to get container info for %s" +msgstr "尝试为 %s 获取容器信息" + +#: swift/proxy/server.py:552 +#, python-format +msgid "%(type)s returning 503 for %(statuses)s" +msgstr "%(type)s 为 %(statuses)s 返回503" + +#: swift/proxy/server.py:598 swift/proxy/server.py:697 +#, python-format +msgid "Trying to %(method)s %(path)s" +msgstr "试图 %(method)s %(path)s" + +#: swift/proxy/server.py:627 +msgid "Client disconnected on read" +msgstr "客户为读取断开连接" + +#: swift/proxy/server.py:630 +#, python-format +msgid "Trying to read during GET of %s" +msgstr "在 %s 的GET操作中试图读取" + +#: swift/proxy/server.py:653 +#, python-format +msgid "ERROR %(status)d %(body)s From %(type)s Server" +msgstr "错误 %(status)d 来自 %(type)s 类型服务器的 %(body)s" + +#: swift/proxy/server.py:692 +#, python-format +msgid "ERROR %(status)d %(body)s From Object Server" +msgstr "错误 %(status)d 来自对象服务器的 %(body)s" + +#: swift/proxy/server.py:776 swift/proxy/server.py:783 +#, python-format +msgid "Object manifest GET could not continue listing: %s %s" +msgstr "对象manifest GET无法继续进行列表：%s %s" + +#: swift/proxy/server.py:905 +msgid "Object POST" +msgstr "对象POST" + +#: swift/proxy/server.py:1005 +#, python-format +msgid "Expect: 100-continue on %s" +msgstr "预期：100-continue on %s" + +#: swift/proxy/server.py:1017 +#, python-format +msgid "Object PUT returning 503, %(conns)s/%(nodes)s required connections" +msgstr "对象PUT返回503，%(conns)s/%(nodes)s 要求连接" + +#: swift/proxy/server.py:1045 +#, python-format +msgid "Trying to write to %s" +msgstr "试图向 %s 写入" + +#: swift/proxy/server.py:1049 +#, python-format +msgid "" +"Object PUT exceptions during send, %(conns)s/%(nodes)s required connections" +msgstr "发送时发生对象PUT异常，%(conns)s/%(nodes)s 要求连接" + +#: swift/proxy/server.py:1058 +#, python-format +msgid "ERROR Client read timeout (%ss)" +msgstr "错误 客户读取超时(%ss)" + +#: swift/proxy/server.py:1063 +msgid "ERROR Exception causing client disconnect" +msgstr "错误 异常导致客户连接断开" + +#: swift/proxy/server.py:1068 +msgid "Client disconnected without sending enough data" +msgstr "客户没有发送足够的数据便断开连接" + +#: swift/proxy/server.py:1083 +#, python-format +msgid "ERROR %(status)d %(body)s From Object Server re: %(path)s" +msgstr "错误 %(status)d 来自对象服务器re的 %(body)s：%(path)s" + +#: swift/proxy/server.py:1090 +#, python-format +msgid "Trying to get final status of PUT to %s" +msgstr "试图获取对 %s PUT操作的最终状态" + +#: swift/proxy/server.py:1093 +#, python-format +msgid "Object servers returned %s mismatched etags" +msgstr "对象服务器返回 %s 个不匹配的etags" + +#: swift/proxy/server.py:1101 +msgid "Object PUT" +msgstr "对象PUT操作" + +#: swift/proxy/server.py:1153 +msgid "Object DELETE" +msgstr "对象 DELETE 操作" + +#: swift/proxy/server.py:1302 swift/proxy/server.py:1498 +#, python-format +msgid "Trying to PUT to %s" +msgstr "试图向 %s 进行PUT操作" + +#: swift/proxy/server.py:1314 +msgid "Container PUT" +msgstr "容器 PUT 操作" + +#: swift/proxy/server.py:1357 swift/proxy/server.py:1546 +#, python-format +msgid "Trying to POST %s" +msgstr "试图向 %s 进行 POST 操作" + +#: swift/proxy/server.py:1369 +msgid "Container POST" +msgstr "容器 POST 操作" + +#: swift/proxy/server.py:1414 swift/proxy/server.py:1591 +#, python-format +msgid "Trying to DELETE %s" +msgstr "试图 DELETE 操作 %s" + +#: swift/proxy/server.py:1426 +msgid "Container DELETE" +msgstr "容器 DELETE 操作" + +#: swift/proxy/server.py:1433 +msgid "Returning 503 because not all container nodes confirmed DELETE" +msgstr "因为并不是所有节点都确定DELETE而返回503" + +#: swift/proxy/server.py:1508 +msgid "Account PUT" +msgstr "帐户 PUT 操作" + +#: swift/proxy/server.py:1556 +msgid "Account POST" +msgstr "帐户 POST 操作" + +#: swift/proxy/server.py:1601 +msgid "Account DELETE" +msgstr "帐户 DELETE 操作" + +#: swift/proxy/server.py:1757 +msgid "ERROR Unhandled exception in request" +msgstr "错误 请求中有未处理异常" + +#: swift/stats/access_processor.py:63 swift/stats/stats_processor.py:40 +#, python-format +msgid "Bad line data: %s" +msgstr "错误行数据：%s" + +#: swift/stats/access_processor.py:67 +#, python-format +msgid "Bad server name: found \"%(found)s\" expected \"%(expected)s\"" +msgstr "错误的服务器名称：找到\"%(found)s\"，预想是\"%(expected)s\"" + +#: swift/stats/access_processor.py:75 +#, python-format +msgid "Invalid path: %(error)s from data: %(log)s" +msgstr "无效的路径：来自数据的错误 %(error)s：%(log)s" + +#: swift/stats/access_processor.py:199 +#, python-format +msgid "" +"I found a bunch of bad lines in %(name)s (%(bad)d bad, %(total)d total)" +msgstr "在 %(name)s 中找到许多错误行s( %(bad)d 错误, 总共 %(total)d)" + +#: swift/stats/account_stats.py:55 +msgid "Gathering account stats" +msgstr "收集帐户状态" + +#: swift/stats/account_stats.py:59 +#, python-format +msgid "Gathering account stats complete (%0.2f minutes)" +msgstr "收集帐户状态完成(%0.2f 分)" + +#: swift/stats/account_stats.py:75 +#, python-format +msgid "Device %s is not mounted, skipping." +msgstr "设备 %s 没有挂载，跳过。" + +#: swift/stats/account_stats.py:81 +#, python-format +msgid "Path %s does not exist, skipping." +msgstr "路径 %s 不存在，跳过。" + +#: swift/stats/log_processor.py:62 +#, python-format +msgid "Loaded plugin \"%s\"" +msgstr "加载插件 \"%s\"" + +#: swift/stats/log_processor.py:79 +#, python-format +msgid "Processing %(obj)s with plugin \"%(plugin)s\"" +msgstr "用插件 \"%(plugin)s\" 处理 %(obj)s" + +#: swift/stats/log_processor.py:179 +#, python-format +msgid "Bad compressed data for %s" +msgstr "%s 不恰当的压缩数据" + +#: swift/stats/log_processor.py:240 +msgid "Beginning log processing" +msgstr "开始日志处理" + +#: swift/stats/log_processor.py:278 +#, python-format +msgid "found %d processed files" +msgstr "找到 %d 个处理过的文件" + +#: swift/stats/log_processor.py:283 +#, python-format +msgid "loaded %d files to process" +msgstr "加载 %d 个文件处理" + +#: swift/stats/log_processor.py:286 swift/stats/log_processor.py:360 +#, python-format +msgid "Log processing done (%0.2f minutes)" +msgstr "日志处理完毕(%0.2f 分)" + +#: swift/stats/log_uploader.py:71 +msgid "Uploading logs" +msgstr "正在上载日志" + +#: swift/stats/log_uploader.py:74 +#, python-format +msgid "Uploading logs complete (%0.2f minutes)" +msgstr "上载日志完成(%0.2f 分)" + +#: swift/stats/log_uploader.py:129 +#, python-format +msgid "Unexpected log: %s" +msgstr "未预想到的日志：%s" + +#: swift/stats/log_uploader.py:135 +#, python-format +msgid "Skipping log: %(file)s (< %(cutoff)d seconds old)" +msgstr "跳过日志：%(file)s (< %(cutoff)d 秒)" + +#: swift/stats/log_uploader.py:142 +#, python-format +msgid "Log %s is 0 length, skipping" +msgstr "日志 %s 长度是0，跳过" + +#: swift/stats/log_uploader.py:144 +#, python-format +msgid "Processing log: %s" +msgstr "处理日志：%s" + +#: swift/stats/log_uploader.py:165 +#, python-format +msgid "Uploaded log %(file)s to %(target)s" +msgstr "上载 %(file)s 到 %(target)s" + +#: swift/stats/log_uploader.py:170 +#, python-format +msgid "ERROR: Upload of log %s failed!" +msgstr "错误：日志 %s 上载失败！" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sysstat.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sysstat.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/sysstat.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/sysstat.po 2012-03-23 07:33:11.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: 2012-02-21 21:51+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:41+0000\n" +"X-Generator: Launchpad (build 14981)\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+20120221/data/zh_CN/LC_MESSAGES/system-config-cluster.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/system-config-cluster.po 2012-03-23 07:33:12.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: 2012-02-21 22:10+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:49+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/clui.glade.h:1 msgid "1" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-config-kickstart.po language-pack-zh-hans-base-12.04+20120322/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 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/system-config-kickstart.po 2012-03-23 07:33:11.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: 2012-02-21 21:52+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:41+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../src/RHELPackageGroupList.py:12 msgid "X Window System" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-service.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/system-service.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/system-service.po 2012-02-23 07:12:01.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/system-service.po 2012-03-23 07:33:23.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: 2012-02-22 00:49+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:26+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../backend/com.ubuntu.systemservice.policy.in.h:1 msgid "Get current global proxy" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tar.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tar.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tar.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tar.po 2012-03-23 07:32:58.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: 2012-02-21 18:58+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:19+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnu/argmatch.c:135 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tasksel.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tasksel.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tasksel.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tasksel.po 2012-03-23 07:33:11.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: 2012-02-21 21:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../tasksel.pl:433 msgid "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/texinfo.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/texinfo.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/texinfo.po 2012-02-23 07:11:31.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/texinfo.po 2012-03-23 07:32:54.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: 2012-02-21 18:25+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: gnulib/lib/error.c:125 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tmispell-voikko.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tmispell-voikko.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/tmispell-voikko.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/tmispell-voikko.po 2012-03-23 07:33:17.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: 2012-02-21 23:22+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/charset.cc:73 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/transmission-gtk.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/transmission-gtk.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/transmission-gtk.po 2012-02-23 07:11:56.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/transmission-gtk.po 2012-03-23 07:33:17.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 12:23+0000\n" +"POT-Creation-Date: 2012-03-02 14:32+0000\n" "PO-Revision-Date: 2010-12-26 12:58+0000\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (China) \n" @@ -12,8 +12,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: 2012-02-21 23:24+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../gtk/actions.c:45 msgid "Sort by _Activity" @@ -966,6 +966,7 @@ " John Lin https://launchpad.net/~johnlin119\n" " Jonathan Lumb https://launchpad.net/~jonolumb\n" " Xhacker Liu https://launchpad.net/~xhacker\n" +" ichaochao https://launchpad.net/~i-chaochao-0\n" " netroby.com https://launchpad.net/~netroby.com\n" " yuane https://launchpad.net/~yuane\n" " zeng zhen https://launchpad.net/~tczzjin\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-client.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-client.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-client.po 2012-02-23 07:12:03.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-client.po 2012-03-23 07:33:24.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ubuntuone-client\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-21 05:09+0000\n" +"POT-Creation-Date: 2012-03-21 19:05+0000\n" "PO-Revision-Date: 2011-08-25 01:37+0000\n" "Last-Translator: ZhangCheng \n" "Language-Team: Simplified Chinese \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:39+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../ubuntuone/clientdefs.py.in:39 -#: ../ubuntuone/platform/credentials/__init__.py:69 +#: ../ubuntuone/platform/credentials/__init__.py:80 msgid "" "Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process " "will allow you to create a new account, if you do not yet have one." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po 2012-02-23 07:12:09.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-control-panel.po 2012-03-23 07:33:30.000000000 +0000 @@ -7,48 +7,97 @@ msgstr "" "Project-Id-Version: ubuntuone-control-panel\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-16 16:32+0000\n" +"POT-Creation-Date: 2012-03-21 19:26+0000\n" "PO-Revision-Date: 2011-09-29 16:19+0000\n" "Last-Translator: YunQiang Su \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-22 02:13+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:25+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: ../ubuntuone/controlpanel/gui/__init__.py:74 +#. Undefined variable '_', pylint: disable=E0602 +#. Translatable strings +#: ../ubuntuone/controlpanel/gui/__init__.py:84 +msgid "Your services" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:85 msgid "Always in sync" msgstr "总是同步" -#: ../ubuntuone/controlpanel/gui/__init__.py:75 +#: ../ubuntuone/controlpanel/gui/__init__.py:86 +msgid "" +"If you need to know more about Ubuntu One, then please go to {support_url}" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:88 +msgid "No, continue setting up" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:89 +msgid "" +"You can restart the setup process at any time by clicking on Ubuntu One in " +"your menu." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:91 +msgid "Are you sure you want to cancel setting up Ubuntu One?" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:93 +msgid "Yes, I want to cancel" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:94 +msgid "" +"These are the folders in your cloud. Select the ones you want to sync with " +"this computer." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:96 +msgid "Syncing the cloud to your computer" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:97 +msgid "" +"Okay! Now it's time to choose which folders on this computer you would like " +"to sync to the cloud." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:99 +msgid "Syncing your computer with the cloud" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:100 msgid "Connect to Ubuntu One" msgstr "连接到 Ubuntu One" -#: ../ubuntuone/controlpanel/gui/__init__.py:76 +#: ../ubuntuone/controlpanel/gui/__init__.py:101 msgid "Thunderbird plug-in" msgstr "Thunderbird 插件" -#: ../ubuntuone/controlpanel/gui/__init__.py:77 +#: ../ubuntuone/controlpanel/gui/__init__.py:102 msgid "There was a problem while retrieving the credentials." msgstr "获取证书时遇到问题。" -#: ../ubuntuone/controlpanel/gui/__init__.py:78 +#: ../ubuntuone/controlpanel/gui/__init__.py:103 msgid "View your personal details and service summary" msgstr "查看您的个人信息和服务概要" -#: ../ubuntuone/controlpanel/gui/__init__.py:80 +#: ../ubuntuone/controlpanel/gui/__init__.py:105 msgid "Welcome to Ubuntu One!" msgstr "欢迎使用 Ubuntu One！" -#: ../ubuntuone/controlpanel/gui/__init__.py:81 +#: ../ubuntuone/controlpanel/gui/__init__.py:106 msgid "" "The information could not be retrieved. Maybe your internet connection is " "down?" msgstr "这些信息无法恢复，可能您的网络中断了？" -#: ../ubuntuone/controlpanel/gui/__init__.py:84 -#: ../ubuntuone/controlpanel/gui/__init__.py:160 +#: ../ubuntuone/controlpanel/gui/__init__.py:109 +#: ../ubuntuone/controlpanel/gui/__init__.py:231 msgid "" "The settings could not be changed,\n" "previous values were restored." @@ -56,36 +105,52 @@ "此设置不可更改，\n" "已恢复到默认值。" -#: ../ubuntuone/controlpanel/gui/__init__.py:86 +#: ../ubuntuone/controlpanel/gui/__init__.py:111 msgid "Are you sure you want to remove this device from Ubuntu One?" msgstr "您确定要从 Ubuntu One 中移除该设备？" -#: ../ubuntuone/controlpanel/gui/__init__.py:89 +#: ../ubuntuone/controlpanel/gui/__init__.py:114 msgid "The device could not be removed." msgstr "无法移除设备。" -#: ../ubuntuone/controlpanel/gui/__init__.py:90 +#: ../ubuntuone/controlpanel/gui/__init__.py:115 msgid "Manage devices registered with your personal cloud" msgstr "管理注册在您私云中的设备" -#: ../ubuntuone/controlpanel/gui/__init__.py:92 +#: ../ubuntuone/controlpanel/gui/__init__.py:117 +msgid "This device" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:118 +msgid "Go to the web page to manage your other devices" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:119 +msgid "Other devices" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:120 msgid "The devices connected with your personal cloud are listed below." msgstr "以下设备可以连接到您的私有云。" -#: ../ubuntuone/controlpanel/gui/__init__.py:94 -msgid "Explore" -msgstr "浏览" +#: ../ubuntuone/controlpanel/gui/__init__.py:122 +msgid "Edit your services online" +msgstr "" -#: ../ubuntuone/controlpanel/gui/__init__.py:95 +#: ../ubuntuone/controlpanel/gui/__init__.py:123 +msgid "Edit personal details online" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:124 #, python-format msgid "%(package_name)s could not be installed" msgstr "无法安装软件包 %(package_name)s。" -#: ../ubuntuone/controlpanel/gui/__init__.py:96 +#: ../ubuntuone/controlpanel/gui/__init__.py:125 msgid "Sync another folder with your cloud" msgstr "云同步另一个文件夹" -#: ../ubuntuone/controlpanel/gui/__init__.py:97 +#: ../ubuntuone/controlpanel/gui/__init__.py:126 #, python-format msgid "" "The chosen directory \"%(folder_path)s\" is not valid. \n" @@ -97,16 +162,36 @@ "\n" "请从您的 \"%(home_folder)s\" 目录中选择一个文件夹；不能与现有的云同步文件夹重叠。" -#: ../ubuntuone/controlpanel/gui/__init__.py:102 +#: ../ubuntuone/controlpanel/gui/__init__.py:131 msgid "My personal folders" msgstr "我的私人文件夹" -#: ../ubuntuone/controlpanel/gui/__init__.py:103 +#: ../ubuntuone/controlpanel/gui/__init__.py:132 #, python-format msgid "Shared by %(other_user_display_name)s" msgstr "与 %(other_user_display_name)s 共享" -#: ../ubuntuone/controlpanel/gui/__init__.py:104 +#: ../ubuntuone/controlpanel/gui/__init__.py:133 +msgid "Add a folder from this computer" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:134 +msgid "Manage your cloud folders" +msgstr "管理您的云文件夹" + +#: ../ubuntuone/controlpanel/gui/__init__.py:136 +msgid "Explore" +msgstr "浏览" + +#: ../ubuntuone/controlpanel/gui/__init__.py:137 +msgid "Name" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:138 +msgid "Sync Locally?" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:139 #, python-format msgid "" "The contents of your cloud folder will be merged with your local folder " @@ -116,377 +201,374 @@ "当申请时，您的云端文件夹将与本地文件夹“%(folder_path)s”合并。\n" "您确定要请求这个云端文件夹吗？" -#: ../ubuntuone/controlpanel/gui/__init__.py:108 -msgid "Manage your cloud folders" -msgstr "管理您的云文件夹" +#: ../ubuntuone/controlpanel/gui/__init__.py:143 +msgid "Go to the web for public and private sharing options" +msgstr "" -#: ../ubuntuone/controlpanel/gui/__init__.py:110 +#: ../ubuntuone/controlpanel/gui/__init__.py:145 msgid "" "Select which folders from your cloud you want to sync with this computer" msgstr "选择您想同步到此电脑的云端文件夹" -#: ../ubuntuone/controlpanel/gui/__init__.py:112 +#: ../ubuntuone/controlpanel/gui/__init__.py:147 msgid "Connect" msgstr "连接" -#: ../ubuntuone/controlpanel/gui/__init__.py:113 +#: ../ubuntuone/controlpanel/gui/__init__.py:148 msgid "Connect the file sync service with your personal cloud" msgstr "连接同步服务到您的私云上。" -#: ../ubuntuone/controlpanel/gui/__init__.py:115 +#: ../ubuntuone/controlpanel/gui/__init__.py:150 msgid "File Sync is disabled." msgstr "文件同步已禁用。" -#: ../ubuntuone/controlpanel/gui/__init__.py:116 +#: ../ubuntuone/controlpanel/gui/__init__.py:151 msgid "Disconnect" msgstr "断开连接" -#: ../ubuntuone/controlpanel/gui/__init__.py:117 +#: ../ubuntuone/controlpanel/gui/__init__.py:152 msgid "Disconnect the file sync service from your personal cloud" msgstr "从您的私云上断开文件同步服务。" -#: ../ubuntuone/controlpanel/gui/__init__.py:119 +#: ../ubuntuone/controlpanel/gui/__init__.py:154 msgid "File Sync is disconnected." msgstr "文件同步连接已断开。" -#: ../ubuntuone/controlpanel/gui/__init__.py:120 +#: ../ubuntuone/controlpanel/gui/__init__.py:155 msgid "Enable" msgstr "启用" -#: ../ubuntuone/controlpanel/gui/__init__.py:121 +#: ../ubuntuone/controlpanel/gui/__init__.py:156 msgid "Enable the file sync service" msgstr "开启文件同步服务" -#: ../ubuntuone/controlpanel/gui/__init__.py:122 +#: ../ubuntuone/controlpanel/gui/__init__.py:157 msgid "File Sync error." msgstr "文件同步出错。" -#: ../ubuntuone/controlpanel/gui/__init__.py:123 +#: ../ubuntuone/controlpanel/gui/__init__.py:158 msgid "File Sync is up-to-date." msgstr "文件同步完成。" -#: ../ubuntuone/controlpanel/gui/__init__.py:124 +#: ../ubuntuone/controlpanel/gui/__init__.py:159 msgid "Restart" msgstr "重新启动" -#: ../ubuntuone/controlpanel/gui/__init__.py:125 +#: ../ubuntuone/controlpanel/gui/__init__.py:160 msgid "Restart the file sync service" msgstr "重启文件同步服务" -#: ../ubuntuone/controlpanel/gui/__init__.py:126 +#: ../ubuntuone/controlpanel/gui/__init__.py:161 msgid "File Sync" msgstr "文件同步" -#: ../ubuntuone/controlpanel/gui/__init__.py:127 +#: ../ubuntuone/controlpanel/gui/__init__.py:162 msgid "Start" msgstr "启动" -#: ../ubuntuone/controlpanel/gui/__init__.py:128 +#: ../ubuntuone/controlpanel/gui/__init__.py:163 msgid "Start the file sync service" msgstr "开始文件同步服务" -#: ../ubuntuone/controlpanel/gui/__init__.py:129 +#: ../ubuntuone/controlpanel/gui/__init__.py:164 msgid "File Sync starting..." msgstr "文件同步进行中..." -#: ../ubuntuone/controlpanel/gui/__init__.py:130 +#: ../ubuntuone/controlpanel/gui/__init__.py:165 msgid "Stop" msgstr "停止" -#: ../ubuntuone/controlpanel/gui/__init__.py:131 +#: ../ubuntuone/controlpanel/gui/__init__.py:166 msgid "Stop the file sync service" msgstr "停止文件同步服务" -#: ../ubuntuone/controlpanel/gui/__init__.py:132 +#: ../ubuntuone/controlpanel/gui/__init__.py:167 msgid "File Sync is stopped." msgstr "文件同步已停止。" -#: ../ubuntuone/controlpanel/gui/__init__.py:133 +#: ../ubuntuone/controlpanel/gui/__init__.py:168 msgid "File Sync in progress..." msgstr "正在进行文件同步..." -#: ../ubuntuone/controlpanel/gui/__init__.py:134 +#: ../ubuntuone/controlpanel/gui/__init__.py:169 #, python-format msgid "%(free_space)s available storage" msgstr "可用空间 %(free_space)s" -#: ../ubuntuone/controlpanel/gui/__init__.py:135 +#: ../ubuntuone/controlpanel/gui/__init__.py:170 msgid "Ubuntu One experienced an error" msgstr "" -#: ../ubuntuone/controlpanel/gui/__init__.py:136 +#: ../ubuntuone/controlpanel/gui/__init__.py:171 msgid "Sorry, an error has occurred and Ubuntu One needs to close." msgstr "" -#: ../ubuntuone/controlpanel/gui/__init__.py:138 +#: ../ubuntuone/controlpanel/gui/__init__.py:173 +msgid "Get help online" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:174 +msgid "Get more storage" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:175 #, python-format msgid "Hi %(user_display_name)s" msgstr "和 %(user_display_name)s 打招呼" -#: ../ubuntuone/controlpanel/gui/__init__.py:139 +#: ../ubuntuone/controlpanel/gui/__init__.py:176 +msgid "Install" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:177 #, python-format msgid "" "You need to install the package %(package_name)s in order to enable " "more sync services." msgstr "您需要安装 %(package_name)s 软件包来获取更多的同步服务。" -#: ../ubuntuone/controlpanel/gui/__init__.py:141 +#: ../ubuntuone/controlpanel/gui/__init__.py:179 #, python-format msgid "Install the %(plugin_name)s for the sync service: %(service_name)s" msgstr "安装 %(plugin_name)s 到同步服务：%(service_name)s" -#: ../ubuntuone/controlpanel/gui/__init__.py:143 +#: ../ubuntuone/controlpanel/gui/__init__.py:181 #, python-format msgid "Installation of %(package_name)s in progress" msgstr "正在安装 %(package_name)s" -#: ../ubuntuone/controlpanel/gui/__init__.py:144 +#: ../ubuntuone/controlpanel/gui/__init__.py:182 +msgid "Agree and continue" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:183 +msgid "License Agreement" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:184 +msgid "" +"Ubuntu One Basic is free, while additional service add-ons may be paid for " +"services." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:186 +msgid "Disagree and uninstall" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:187 +msgid "" +"This program is free software: you can redistribute it and/or modify it " +"under the terms of the GNU General Public License version 3, as published by " +"the Free Software Foundation." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:190 +msgid "" +"As free software, this programme is distributed without warranty. See the " +"GNU General Public License for more details at {license_link}" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:193 msgid "Loading..." msgstr "正在加载..." -#: ../ubuntuone/controlpanel/gui/__init__.py:145 +#: ../ubuntuone/controlpanel/gui/__init__.py:194 +msgid "Getting information, please wait..." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:195 +msgid "Calculating..." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:196 +msgid "" +"The folders you have selected to sync take over your {quota_total} space. " +"You can remove some folders or add some extra storage." +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:199 +msgid "Sync these folders on my computer" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:200 +msgid "Space {space_total}" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:201 +msgid "Account information" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:202 +msgid "Devices" +msgstr "设备" + +#: ../ubuntuone/controlpanel/gui/__init__.py:203 +msgid "Folders" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:204 +msgid "Settings" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:205 #, python-format msgid "%(app_name)s Control Panel" msgstr "%(app_name)s 控制面板" -#: ../ubuntuone/controlpanel/gui/__init__.py:146 +#: ../ubuntuone/controlpanel/gui/__init__.py:206 +msgid "Purchased Music" +msgstr "购买的音乐" + +#: ../ubuntuone/controlpanel/gui/__init__.py:208 msgid "My folders" msgstr "我的文件夹" -#: ../ubuntuone/controlpanel/gui/__init__.py:147 +#: ../ubuntuone/controlpanel/gui/__init__.py:209 msgid "[unknown user name]" msgstr "[未知的用户名]" -#: ../ubuntuone/controlpanel/gui/__init__.py:148 -msgid "Purchased Music" -msgstr "购买的音乐" - -#: ../ubuntuone/controlpanel/gui/__init__.py:150 +#: ../ubuntuone/controlpanel/gui/__init__.py:210 #, python-format msgid "" "An internet connection is required to join or sign in to %(app_name)s." msgstr "需要连接互联网以注册或登录 %(app_name)s。" -#: ../ubuntuone/controlpanel/gui/__init__.py:152 +#: ../ubuntuone/controlpanel/gui/__init__.py:212 msgid "No devices to show." msgstr "没有可以显示的设备。" -#: ../ubuntuone/controlpanel/gui/__init__.py:153 +#: ../ubuntuone/controlpanel/gui/__init__.py:213 msgid "No folders to show." msgstr "没有可以显示的文件夹。" -#: ../ubuntuone/controlpanel/gui/__init__.py:154 +#: ../ubuntuone/controlpanel/gui/__init__.py:214 msgid "There is no Ubuntu One pairing record." msgstr "没有 Ubuntu One 的配对记录。" -#: ../ubuntuone/controlpanel/gui/__init__.py:155 +#: ../ubuntuone/controlpanel/gui/__init__.py:215 #, python-format msgid "%(percentage)s used" msgstr "%(percentage)s 已使用" -#: ../ubuntuone/controlpanel/gui/__init__.py:156 +#: ../ubuntuone/controlpanel/gui/__init__.py:216 +msgid "Please wait" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:217 +msgid "Personal details" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:218 #, python-format msgid "Using %(used)s of %(total)s (%(percentage).0f%%)" msgstr "已使用 %(used)s (%(percentage).0f%%) / %(total)s" -#: ../ubuntuone/controlpanel/gui/__init__.py:157 -#, python-format -msgid "%(used)s of %(total)s" -msgstr "%(total)s 中的 %(used)s" +#: ../ubuntuone/controlpanel/gui/__init__.py:219 +msgid "Remove" +msgstr "" -#: ../ubuntuone/controlpanel/gui/__init__.py:158 +#: ../ubuntuone/controlpanel/gui/__init__.py:220 +msgid "Restore" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:221 +msgid "Select sync folders" +msgstr "" + +#: ../ubuntuone/controlpanel/gui/__init__.py:222 msgid "Manage the sync services" msgstr "管理同步服务" -#: ../ubuntuone/controlpanel/gui/__init__.py:159 +#: ../ubuntuone/controlpanel/gui/__init__.py:223 msgid "Enable the sync services for this computer." msgstr "开启这台电脑的同步服务。" -#: ../ubuntuone/controlpanel/gui/__init__.py:162 -msgid "Manage the shares offered to others" -msgstr "管理您给他人的共享" - -#: ../ubuntuone/controlpanel/gui/__init__.py:163 -msgid "Manage permissions for shares made to other users." -msgstr "管理其他用户对共享文件的访问权限。" - -#: ../ubuntuone/controlpanel/gui/__init__.py:164 -#, python-format -msgid "%(package_name)s was successfully installed" -msgstr "软件包 %(package_name)s 安装成功" - -#: ../ubuntuone/controlpanel/gui/__init__.py:165 ../data/gtk/volumes.ui.h:1 -msgid "Sync locally?" -msgstr "同步到本地" - -#: ../ubuntuone/controlpanel/gui/__init__.py:166 -msgid "Value could not be retrieved." -msgstr "无法获取值。" - -#: ../ubuntuone/controlpanel/gui/__init__.py:167 -msgid "Unknown error" -msgstr "未知错误" - -#: ../data/gtk/dashboard.ui.h:1 -msgid "Edit account details" -msgstr "编辑帐户信息" - -#: ../data/gtk/dashboard.ui.h:2 -msgid "Personal details" -msgstr "个人信息" - -#: ../data/gtk/dashboard.ui.h:3 -msgid "Buy storage and plans" -msgstr "购买空间和套餐" - -#: ../data/gtk/dashboard.ui.h:4 -msgid "Your services" -msgstr "您的服务" - -#: ../data/gtk/device.ui.h:1 -msgid "Show activity notifications" -msgstr "显示活动通知" - -#: ../data/gtk/device.ui.h:2 -msgid "Limit file sync bandwidth usage" -msgstr "限制文件同步速度" - -#: ../data/gtk/device.ui.h:3 -msgid "Max upload speed:" -msgstr "最大上传速度：" - -#: ../data/gtk/device.ui.h:4 -msgid "Max download speed:" -msgstr "最大下载速度：" - -#: ../data/gtk/device.ui.h:5 -msgid "KiB/s" -msgstr "KiB/s" - -#: ../data/gtk/install.ui.h:1 -msgid "_Install now" -msgstr "立即安装(_I)" - -#: ../data/gtk/management.ui.h:1 -msgid "Account" -msgstr "帐户" - -#: ../data/gtk/management.ui.h:2 -msgid "Cloud Folders" -msgstr "云文件夹" - -#: ../data/gtk/management.ui.h:3 -msgid "Shares" -msgstr "共享" +#: ../ubuntuone/controlpanel/gui/__init__.py:224 +msgid "Allow all notifications to this device" +msgstr "" -#: ../data/gtk/management.ui.h:4 -msgid "Devices" -msgstr "设备" +#: ../ubuntuone/controlpanel/gui/__init__.py:225 +msgid "Connect automatically when computer starts" +msgstr "" -#: ../data/gtk/management.ui.h:5 -msgid "Services" -msgstr "服务" +#: ../ubuntuone/controlpanel/gui/__init__.py:226 +msgid "Bandwidth Settings" +msgstr "" -#: ../data/gtk/management.ui.h:6 -msgid "Official Support" -msgstr "官方支持" +#: ../ubuntuone/controlpanel/gui/__init__.py:227 +msgid "Please note that your files will not sync if you set bandwidth to 0" +msgstr "" -#: ../data/gtk/management.ui.h:7 -msgid "Community Support" -msgstr "社区支持" +#: ../ubuntuone/controlpanel/gui/__init__.py:229 +msgid "Apply these settings" +msgstr "" -#: ../data/gtk/management.ui.h:8 -msgid "Talk to us on:" -msgstr "与我们联系：" +#: ../ubuntuone/controlpanel/gui/__init__.py:230 +msgid "Default settings" +msgstr "" -#: ../data/gtk/management.ui.h:9 -msgid "http://twitter.com/ubuntuone" -msgstr "http://twitter.com/ubuntuone" +#: ../ubuntuone/controlpanel/gui/__init__.py:233 +msgid "File Sync Settings" +msgstr "" -#: ../data/gtk/management.ui.h:10 -msgid "http://www.facebook.com/ubuntuone" -msgstr "http://www.facebook.com/ubuntuone" +#: ../ubuntuone/controlpanel/gui/__init__.py:234 +msgid "Kilobits per second" +msgstr "" -#: ../data/gtk/overview.ui.h:1 -msgid "" -"The Power of Your Personal " -"Cloud" -msgstr "私有云的功能" +#: ../ubuntuone/controlpanel/gui/__init__.py:235 +msgid "Limit download speed to" +msgstr "" -#: ../data/gtk/overview.ui.h:2 -msgid "" -"Files Anywhere\n" -"Back up and access your files from Ubuntu, " -"Windows, Web or Mobile" +#: ../ubuntuone/controlpanel/gui/__init__.py:236 +msgid "Limit upload speed to" msgstr "" -"随时访问文件\n" -"备份您的文件，并从 Ubuntu、Windows、网络或移动设备上访问" -#: ../data/gtk/overview.ui.h:4 -msgid "" -"Keep Connected\n" -"Unify your contacts across Desktop, Mobile and " -"Web" +#: ../ubuntuone/controlpanel/gui/__init__.py:237 +msgid "Automatically sync all new cloud folders to this computer" msgstr "" -"保持连接\n" -"让您的联系人跨越桌面、手机和网络" -#: ../data/gtk/overview.ui.h:6 -msgid "" -"Rock Out\n" -"Your entire collection follows you around with " -"music streaming to Android and iPhone" +#: ../ubuntuone/controlpanel/gui/__init__.py:239 +msgid "Automatically sync all folders shared with me to this computer" msgstr "" -"随处聆听\n" -"您的全部专辑和音乐与您同行到 Android 和 iPhone" -#: ../data/gtk/overview.ui.h:8 -msgid "" -"Stay Productive\n" -"Keep your Tomboy notes synced" -msgstr "保持生产效率" +#: ../ubuntuone/controlpanel/gui/__init__.py:241 +msgid "Manage the shares offered to others" +msgstr "管理您给他人的共享" -#: ../data/gtk/overview.ui.h:10 -msgid "Learn More" -msgstr "了解更多" +#: ../ubuntuone/controlpanel/gui/__init__.py:242 +msgid "Manage permissions for shares made to other users." +msgstr "管理其他用户对共享文件的访问权限。" -#: ../data/gtk/overview.ui.h:11 -msgid "Join now" -msgstr "立即加入" +#: ../ubuntuone/controlpanel/gui/__init__.py:243 +msgid "Sign in" +msgstr "" -#: ../data/gtk/overview.ui.h:12 -msgid "I already have an account!" -msgstr "我已经有一个账户" +#: ../ubuntuone/controlpanel/gui/__init__.py:244 +#, python-format +msgid "%(package_name)s was successfully installed" +msgstr "软件包 %(package_name)s 安装成功" -#: ../data/gtk/services.ui.h:1 -msgid "Enable File Sync" -msgstr "启用文件同步" +#: ../ubuntuone/controlpanel/gui/__init__.py:245 +msgid "Sync, stream, share" +msgstr "" -#: ../data/gtk/services.ui.h:2 -msgid "" -"Enable and then choose which folders you want to " -"access from the Web or any device you connected to Ubuntu One\n" -"\n" -"Simply drag and drop any file or folder to your Ubuntu One folder on this " -"computer" +#: ../ubuntuone/controlpanel/gui/__init__.py:246 +msgid "Talk to us" msgstr "" -"启用并选择一个目录，您将能从网络或任何连接的设备访问。\n" -"\n" -"轻松在这台计算机上将文件或目录拖至 Ubuntu One 文件夹即可" -#: ../data/gtk/services.ui.h:5 -msgid "_Show me my Ubuntu One folder" -msgstr "显示我的 Ubuntu One 文件夹(_S)" +#: ../ubuntuone/controlpanel/gui/__init__.py:247 +msgid "Value could not be retrieved." +msgstr "无法获取值。" -#: ../data/gtk/services.ui.h:6 -msgid "Enable Contacts Sync" -msgstr "启用联系人同步" +#: ../ubuntuone/controlpanel/gui/__init__.py:248 +msgid "Unknown error" +msgstr "未知错误" -#: ../data/gtk/services.ui.h:7 -msgid "" -"Once enabled, visit the Ubuntu One website to manage your " -"contacts, including Gmail and Facebook import" +#: ../ubuntuone/controlpanel/gui/__init__.py:249 +#, python-format +msgid "%(used)s of %(total)s" +msgstr "%(total)s 中的 %(used)s" + +#: ../ubuntuone/controlpanel/gui/__init__.py:250 +msgid "Quit Ubuntu One" msgstr "" -"启用后，请访问 Ubuntu " -"One 网站 管理您的联系人，包括从 Gmail 和 Facebook 导入的。" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-installer.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-installer.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntuone-installer.po 2012-02-23 07:12:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntuone-installer.po 2012-03-23 07:33:46.000000000 +0000 @@ -7,52 +7,54 @@ msgstr "" "Project-Id-Version: ubuntuone-installer\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-02-15 20:51+0000\n" +"POT-Creation-Date: 2012-03-20 21:51+0000\n" "PO-Revision-Date: 2011-09-28 11:39+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: 2012-02-22 06:47+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-23 01:12+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../ubuntuone-installer.desktop.in.h:1 msgid "Configure and manage your Ubuntu One account" msgstr "配置、管理您的 Ubuntu One 账户" -#: ../ubuntuone/installer/gui.py:98 +#: ../ubuntuone/installer/gui.py:128 msgid "Install Ubuntu One" msgstr "安装 Ubuntu One" -#: ../ubuntuone/installer/gui.py:105 -msgid "Discover the freedom of your personal cloud" -msgstr "自由地探索您的私人云" - -#: ../ubuntuone/installer/gui.py:224 -msgid "Sync" -msgstr "同步" - -#: ../ubuntuone/installer/gui.py:240 -msgid "Sync files across your devices." -msgstr "在您的设备之间同步文件。" - -#: ../ubuntuone/installer/gui.py:254 -msgid "Stream" -msgstr "流媒体" - -#: ../ubuntuone/installer/gui.py:267 -msgid "Stream your music on the move and offline." -msgstr "在移动或离线设备上收听音乐" - -#: ../ubuntuone/installer/gui.py:281 -msgid "Share" -msgstr "分享" - -#: ../ubuntuone/installer/gui.py:294 -msgid "Share with colleagues, friends, and family." -msgstr "和同事、朋友、家人分享" +#: ../ubuntuone/installer/gui.py:135 +msgid "Discover your personal cloud" +msgstr "" + +#: ../ubuntuone/installer/gui.py:182 +msgid "I_nstall" +msgstr "" + +#: ../ubuntuone/installer/gui.py:192 +msgid "Learn more" +msgstr "" + +#: ../ubuntuone/installer/gui.py:277 +msgid "" +"Store files, photos, and music safely in Ubuntu One and access them on any " +"of your devices." +msgstr "" + +#: ../ubuntuone/installer/gui.py:292 +msgid "" +"Upload photos from your mobile instantly, and they're ready to share with " +"friends or post online." +msgstr "" + +#: ../ubuntuone/installer/gui.py:308 +msgid "" +"Stream your music collection to all of your devices and listen to any song - " +"online or offline." +msgstr "" -#: ../ubuntuone/installer/gui.py:313 +#: ../ubuntuone/installer/gui.py:329 msgid "Ubuntu One is installing…" msgstr "Ubuntu One 正在安装中..." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po 2012-02-23 07:12:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntu-sso-client.po 2012-03-23 07:33:30.000000000 +0000 @@ -7,184 +7,469 @@ msgstr "" "Project-Id-Version: ubuntu-sso-client\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-09-19 07:17+0000\n" +"POT-Creation-Date: 2012-03-21 17:03+0000\n" "PO-Revision-Date: 2011-11-08 12:16+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-22 02:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:18+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: ../ubuntu_sso/gtk/gui.py:152 +#. Undefined variable '_', pylint: disable=E0602 +#. all the text that is used in the gui +#: ../ubuntu_sso/utils/ui.py:32 +msgid "By signing up to {app_name} you agree to our {privacy_policy}" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:34 +msgid "By signing up to {app_name} you agree to our {terms_and_conditions}" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:36 +msgid " and {privacy_policy}" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:37 +msgid "Cancel" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:38 msgid "Type the characters above" msgstr "键入上面的字符" -#: ../ubuntu_sso/gtk/gui.py:153 +#: ../ubuntu_sso/utils/ui.py:39 msgid "There was a problem getting the captcha, reloading..." msgstr "获取验证码遇到问题，正在重新载入..." -#: ../ubuntu_sso/gtk/gui.py:155 +#: ../ubuntu_sso/utils/ui.py:41 +#, python-format +msgid "If you can't read this then %(reload_link)s this page" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:43 +msgid "refresh" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:44 +msgid "Reload" +msgstr "刷新" + +#: ../ubuntu_sso/utils/ui.py:45 +msgid "The captcha is a required field" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:46 +msgid "Close window and set up later" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:47 +msgid "Congratulations, {app_name} is installed!" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:48 #, python-format msgid "To connect this computer to %(app_name)s enter your details below." msgstr "要将此计算机连接到 %(app_name)s，在下面输入您的详细信息。" -#: ../ubuntu_sso/gtk/gui.py:157 ../ubuntu_sso/gtk/gui.py:169 -#: ../ubuntu_sso/gtk/gui.py:187 +#: ../ubuntu_sso/utils/ui.py:50 ../ubuntu_sso/utils/ui.py:75 +#: ../ubuntu_sso/utils/ui.py:125 msgid "Email address" msgstr "E-mail 地址" -#: ../ubuntu_sso/gtk/gui.py:158 +#: ../ubuntu_sso/utils/ui.py:51 msgid "Re-type Email address" msgstr "请重新输入电子邮件地址" -#: ../ubuntu_sso/gtk/gui.py:159 +#: ../ubuntu_sso/utils/ui.py:52 +msgid "The email must be a valid email address." +msgstr "必须是有效的电子邮件地址。" + +#: ../ubuntu_sso/utils/ui.py:53 msgid "" "The email addresses don't match, please double check and try entering them " "again." msgstr "电子邮件地址不正确，请再次检查并重新输入。" -#: ../ubuntu_sso/gtk/gui.py:161 -msgid "The email must be a valid email address." -msgstr "必须是有效的电子邮件地址。" +#: ../ubuntu_sso/utils/ui.py:55 +msgid "Email" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:56 +msgid "The email addresses do not match" +msgstr "" -#: ../ubuntu_sso/gtk/gui.py:162 +#: ../ubuntu_sso/utils/ui.py:57 msgid "Enter code verification here" msgstr "在这里输入验证码" -#: ../ubuntu_sso/gtk/gui.py:163 +#: ../ubuntu_sso/utils/ui.py:58 +msgid "Please enter your name" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:59 msgid "The process did not finish successfully." msgstr "过程没有成功完成。" -#: ../ubuntu_sso/gtk/gui.py:164 +#: ../ubuntu_sso/utils/ui.py:61 +msgid "Sign me in with my existing account" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:62 msgid "This field is required." msgstr "此字段必须填写。" -#: ../ubuntu_sso/gtk/gui.py:165 +#: ../ubuntu_sso/utils/ui.py:63 msgid "I've forgotten my password" msgstr "我忘记了密码" -#: ../ubuntu_sso/gtk/gui.py:166 +#: ../ubuntu_sso/utils/ui.py:64 ../ubuntu_sso/utils/ui.py:112 +msgid "Reset password" +msgstr "重设密码" + +#: ../ubuntu_sso/utils/ui.py:65 +msgid "" +"To reset your {app_name} password, enter your registered email address " +"below. We will send instructions to reset your password." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:68 +msgid "Please enter a valid email address" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:69 +msgid "There was a problem accessing the Ubuntu Single Sign On backend." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:71 #, python-format msgid "Create %(app_name)s account" msgstr "创建 %(app_name)s 帐户" -#: ../ubuntu_sso/gtk/gui.py:167 +#: ../ubuntu_sso/utils/ui.py:72 msgid "Loading..." msgstr "装载中..." -#: ../ubuntu_sso/gtk/gui.py:168 +#: ../ubuntu_sso/utils/ui.py:73 +msgid "Getting information, please wait..." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:74 msgid "Already have an account? Click here to sign in" msgstr "已经拥有帐户？点击登录" -#: ../ubuntu_sso/gtk/gui.py:170 +#: ../ubuntu_sso/utils/ui.py:76 #, python-format msgid "Connect to %(app_name)s" msgstr "连接至 %(app_name)s" -#: ../ubuntu_sso/gtk/gui.py:171 ../ubuntu_sso/gtk/gui.py:176 +#: ../ubuntu_sso/utils/ui.py:77 ../ubuntu_sso/utils/ui.py:91 msgid "Password" msgstr "密码" -#: ../ubuntu_sso/gtk/gui.py:172 +#: ../ubuntu_sso/utils/ui.py:79 +msgid "Sign In to {app_name}" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:81 msgid "Name" msgstr "姓名" -#: ../ubuntu_sso/gtk/gui.py:173 +#: ../ubuntu_sso/utils/ui.py:82 +msgid "The name must not be empty." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:83 msgid "Next" msgstr "下一步" -#: ../ubuntu_sso/gtk/gui.py:174 +#: ../ubuntu_sso/utils/ui.py:84 +msgid "Network detection" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:85 +#, python-format +msgid "" +"Are you online? We can't detect an internet connection - you will need to be " +"connected to set up %(app_name)s" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:87 msgid "One moment please..." msgstr "请稍候..." -#: ../ubuntu_sso/gtk/gui.py:175 +#: ../ubuntu_sso/utils/ui.py:88 +msgid "Create a password" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:89 msgid "Your password was successfully changed." msgstr "您的密码修改成功。" -#: ../ubuntu_sso/gtk/gui.py:177 +#: ../ubuntu_sso/utils/ui.py:90 +msgid "At least one number" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:92 msgid "Re-type Password" msgstr "再次输入密码" -#: ../ubuntu_sso/gtk/gui.py:178 +#: ../ubuntu_sso/utils/ui.py:93 msgid "" "The password must have a minimum of 8 characters and include one uppercase " "character and one number." msgstr "密码必须多于 8 字符并且包含一个大写字母和一个数字。" -#: ../ubuntu_sso/gtk/gui.py:180 +#: ../ubuntu_sso/utils/ui.py:95 +msgid "At least 8 characters" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:96 +msgid "Passwords don't match" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:97 msgid "" "The passwords don't match, please double check and try entering them again." msgstr "密码不匹配，请重新输入。" -#: ../ubuntu_sso/gtk/gui.py:182 +#: ../ubuntu_sso/utils/ui.py:99 +msgid "Your password must contain" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:100 msgid "The password is too weak." msgstr "密码强度太弱。" -#: ../ubuntu_sso/gtk/gui.py:183 +#: ../ubuntu_sso/utils/ui.py:101 +msgid "At least one uppercase letter" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:102 +msgid "Privacy Policy" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:103 +msgid "Connecting to:" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:104 +msgid "Proxy Settings" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:105 +msgid "Incorrect login details. Please try again." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:106 +msgid "Please provide login details." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:107 +msgid "You are connecting through a proxy." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:108 +msgid "Get Help With Proxies" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:109 +msgid "Proxy password:" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:110 +msgid "Save and Connect" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:111 +msgid "Proxy username:" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:113 +msgid "" +"A password reset code has been sent to your e-mail. Please enter the code " +"below along with your new password." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:115 +msgid "Retype email" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:116 +msgid "Retype password" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:117 #, python-format msgid "To reset your %(app_name)s password, enter your email address below:" msgstr "重设 %(app_name)s 的密码，请在下方输入您的电子邮件地址：" -#: ../ubuntu_sso/gtk/gui.py:185 -msgid "Reset password" -msgstr "重设密码" +#: ../ubuntu_sso/utils/ui.py:119 +msgid "" +"We are very Sorry! The service that signs you on is not responding right " +"now\n" +"Please try again or come back in a few minutes." +msgstr "" -#: ../ubuntu_sso/gtk/gui.py:186 +#: ../ubuntu_sso/utils/ui.py:122 +msgid "Sorry we did not recognize the email address." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:124 msgid "Reset code" msgstr "重置码" -#: ../ubuntu_sso/gtk/gui.py:188 +#: ../ubuntu_sso/utils/ui.py:127 #, python-format msgid "" "A password reset code has been sent to %(email)s.\n" "Please enter the code below along with your new password." msgstr "一个密码重置码已经发送至 %(email)s。" -#: ../ubuntu_sso/gtk/gui.py:191 -msgid "The process finished successfully. Congratulations!" -msgstr "恭喜！您已成功登陆。" +#: ../ubuntu_sso/utils/ui.py:129 +msgid "Set Up Account" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:130 +msgid "I don't have an account yet - sign me up" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:131 +msgid "Sign In" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:132 +msgid "the appname whose ssl error we are going to show." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:133 +msgid "Certificate details" +msgstr "" -#: ../ubuntu_sso/gtk/gui.py:192 +#: ../ubuntu_sso/utils/ui.py:134 +msgid "Connect" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:135 +msgid "the details ssl certificate we are going to show." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:142 +msgid "Open the SSL certificate UI." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:143 +msgid "SSL Certificate Not Valid" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:144 +msgid "the domain whose ssl certificate we are going to show." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:145 +#, python-format +msgid "" +"You are trying to connect to a proxy server on %(domain)s. This server uses " +"a secure connection, and the SSL certificate is not valid because:" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:148 +msgid "The certificate has not been verified" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:149 +msgid "Do you want to connect to this server?" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:150 +msgid "Get Help With SSL" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:151 +#, python-format +msgid "" +"If you are not sure about this server, do not use it to connect to " +"%(app_name)s." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:153 +msgid "Remember my settings for this certificate." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:154 +msgid "" +"The name on the certificate isn't valid or doesn't match the name of the site" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:156 +msgid "The certificate has expired" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:157 +#, python-format +msgid "You are now logged into %(app_name)s." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:158 +msgid "Surname" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:159 +msgid "Terms of Service" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:160 +msgid "Sign Up to {app_name}" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:161 msgid "Show Terms & Conditions" msgstr "显示使用条款" -#: ../ubuntu_sso/gtk/gui.py:193 +#: ../ubuntu_sso/utils/ui.py:162 +#, python-format msgid "" -"Agreeing to the Ubuntu One Terms & Conditions is required to subscribe." -msgstr "要订阅，必须同意 Ubuntu One 的条款及条件。" +"Agreeing to the %(app_name)s Terms & Conditions is required to subscribe." +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:164 +#, python-format +msgid "You can also find these terms at %(url)s" +msgstr "" + +#: ../ubuntu_sso/utils/ui.py:165 +msgid "Try again" +msgstr "" -#: ../ubuntu_sso/gtk/gui.py:195 +#: ../ubuntu_sso/utils/ui.py:166 msgid "" "There was an error when trying to complete the process. Please check the " "information and try again." msgstr "当试图完成这一进程发生了一个错误。请检查错误信息并重试。" -#: ../ubuntu_sso/gtk/gui.py:197 -msgid "Enter verification code" -msgstr "输入验证码" +#: ../ubuntu_sso/utils/ui.py:168 +msgid "Verification code" +msgstr "" -#: ../ubuntu_sso/gtk/gui.py:198 +#: ../ubuntu_sso/utils/ui.py:169 #, python-format msgid "" "Check %(email)s for an email from Ubuntu Single Sign On. This message " "contains a verification code. Enter the code in the field below and click OK " -"to complete creating your %(app_name)s account" +"to complete creating your %(app_name)s account." msgstr "" -"检查 %(email)s 中一封来自 Ubuntu Single Sign On 的电子邮件。此邮件包含了一个验证码。在下方输入该码并点击 确定 " -"来完成创建 %(app_name)s 账户。" -#: ../ubuntu_sso/gtk/gui.py:203 +#: ../ubuntu_sso/utils/ui.py:173 +msgid "Enter verification code" +msgstr "输入验证码" + +#: ../ubuntu_sso/utils/ui.py:176 #, python-format msgid "I agree with the %(app_name)s terms and conditions" msgstr "我同意 %(app_name)s 的使用条款" -#: ../ubuntu_sso/gtk/gui.py:204 +#: ../ubuntu_sso/utils/ui.py:177 #, python-format msgid "Yes! Email me %(app_name)s tips and updates." msgstr "是的！给我发送 %(app_name)s 的小技巧和更新。" - -#: ../ubuntu_sso/gtk/gui.py:205 -msgid "Reload" -msgstr "刷新" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ubuntu-wallpapers.po 2012-03-23 07:33:20.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: 2012-02-22 00:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:57+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../ubuntu-wallpapers.xml.in.h:1 msgid "Buck Off!" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/udisks.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/udisks.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/udisks.po 2012-02-23 07:12:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/udisks.po 2012-03-23 07:33:29.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: udisks\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-01-04 12:24+0000\n" +"POT-Creation-Date: 2012-03-13 12:44+0000\n" "PO-Revision-Date: 2010-03-18 07:06+0000\n" "Last-Translator: zhangmiao \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-22 01:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:11+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../policy/org.freedesktop.udisks.policy.in.h:1 msgid "Mount a device" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ufw.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ufw.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ufw.po 2012-02-23 07:11:59.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ufw.po 2012-03-23 07:33:21.000000000 +0000 @@ -7,169 +7,168 @@ msgstr "" "Project-Id-Version: ufw\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-03-22 10:34-0500\n" +"POT-Creation-Date: 2012-03-12 20:27-0500\n" "PO-Revision-Date: 2010-12-26 10:51+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: 2012-02-22 00:11+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:03+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/ufw:46 msgid ": Need at least python 2.5)\n" msgstr ": 需要 python 2.5 或以上版本)\n" -#: src/ufw:103 src/frontend.py:554 src/frontend.py:854 +#: src/ufw:103 src/frontend.py:552 src/frontend.py:852 msgid "Aborted" msgstr "已中止" -#: src/applications.py:32 +#: src/applications.py:31 msgid "Profiles directory does not exist" msgstr "配置目录不存在" -#: src/applications.py:64 +#: src/applications.py:63 #, python-format msgid "Skipping '%s': couldn't stat" msgstr "跳过‘%s’：不能进行 stat 操作" -#: src/applications.py:69 +#: src/applications.py:68 #, python-format msgid "Skipping '%s': too big" msgstr "跳过 '%s'：太大" -#: src/applications.py:74 +#: src/applications.py:73 #, python-format msgid "Skipping '%s': too many files read already" msgstr "跳过‘%s’：已经打开太多文件" -#: src/applications.py:84 +#: src/applications.py:83 #, python-format msgid "Skipping '%s': couldn't process" msgstr "跳过 '%s'：不能执行" -#: src/applications.py:91 +#: src/applications.py:90 #, python-format msgid "Skipping '%s': name too long" msgstr "跳过 '%s'：名称太长" -#: src/applications.py:96 +#: src/applications.py:95 #, python-format msgid "Skipping '%s': invalid name" msgstr "跳过 '%s'：非法名称" -#: src/applications.py:102 +#: src/applications.py:101 #, python-format msgid "Skipping '%s': also in /etc/services" msgstr "跳过 '%s'：在 /etc/services 中也存在" -#: src/applications.py:111 +#: src/applications.py:110 #, python-format msgid "Skipping '%s': field too long" msgstr "跳过 '%s'：域太长" -#: src/applications.py:116 +#: src/applications.py:115 #, python-format msgid "Skipping '%(value)s': value too long for '%(field)s'" msgstr "跳过 “%(value)s”： 对于 “%(field)s”来说，值过长" -#: src/applications.py:126 +#: src/applications.py:125 #, python-format msgid "Duplicate profile '%s', using last found" msgstr "重复的配置 “%s”，使用上次发现的配置" -#: src/applications.py:156 +#: src/applications.py:162 #, python-format msgid "Profile '%(fn)s' missing required field '%(f)s'" msgstr "配置 '%(fn)s' 缺少必需的字段 %(f)s'" -#: src/applications.py:161 +#: src/applications.py:167 #, python-format msgid "Profile '%(fn)s' has empty required field '%(f)s'" msgstr "配置 '%(fn)s' 的必需字段 '%(f)s' 为空" -#: src/applications.py:167 +#: src/applications.py:173 #, python-format msgid "No ports found in profile '%s'" msgstr "在配置 “%s” 中没有发现端口" -#: src/applications.py:180 +#: src/applications.py:186 #, python-format msgid "Invalid ports in profile '%s'" msgstr "配置 '%s' 中含有无效的端口" -#: src/backend_iptables.py:87 +#: src/backend_iptables.py:71 msgid "New profiles:" msgstr "新建配置文件:" -#: src/backend_iptables.py:103 src/backend.py:275 +#: src/backend_iptables.py:87 src/backend.py:292 #, python-format msgid "Unsupported policy '%s'" msgstr "策略 '%s' 未被支持" -#: src/backend_iptables.py:107 +#: src/backend_iptables.py:91 #, python-format msgid "Unsupported policy for direction '%s'" msgstr "'%s' 方向不支持的策略" -#: src/backend_iptables.py:165 +#: src/backend_iptables.py:149 #, python-format msgid "Default %(direction)s policy changed to '%(policy)s'\n" msgstr "默认的 %(direction)s 策略更改为 '%(policy)s'\n" -#: src/backend_iptables.py:167 +#: src/backend_iptables.py:151 msgid "(be sure to update your rules accordingly)" msgstr "（请相应地更新你的防火墙规则）" -#: src/backend_iptables.py:174 +#: src/backend_iptables.py:158 msgid "Checking raw iptables\n" msgstr "检查原始的 iptables\n" -#: src/backend_iptables.py:175 +#: src/backend_iptables.py:159 msgid "Checking raw ip6tables\n" msgstr "检查原始的 ip6tables\n" -#: src/backend_iptables.py:178 src/backend_iptables.py:269 -#: src/backend_iptables.py:448 src/backend_iptables.py:459 -#: src/backend_iptables.py:507 -msgid "problem running" -msgstr "运行时出现问题" - -#: src/backend_iptables.py:264 +#: src/backend_iptables.py:245 msgid "Checking iptables\n" msgstr "检查 iptables\n" -#: src/backend_iptables.py:266 +#: src/backend_iptables.py:247 msgid "Checking ip6tables\n" msgstr "检查 ip6tables\n" -#: src/backend_iptables.py:275 +#: src/backend_iptables.py:250 src/backend_iptables.py:429 +#: src/backend_iptables.py:440 src/backend_iptables.py:488 +msgid "problem running" +msgstr "运行时出现问题" + +#: src/backend_iptables.py:256 msgid "Status: inactive" msgstr "状态：不活动" -#: src/backend_iptables.py:411 +#: src/backend_iptables.py:392 msgid "To" msgstr "至" -#: src/backend_iptables.py:412 +#: src/backend_iptables.py:393 msgid "From" msgstr "来自" -#: src/backend_iptables.py:413 +#: src/backend_iptables.py:394 msgid "Action" msgstr "动作" -#: src/backend_iptables.py:428 +#: src/backend_iptables.py:409 msgid "\n" msgstr "\n" -#: src/backend_iptables.py:436 +#: src/backend_iptables.py:417 #, python-format msgid "Default: %(in)s (incoming), %(out)s (outgoing)" msgstr "" -#: src/backend_iptables.py:440 +#: src/backend_iptables.py:421 #, python-format msgid "" "Status: active\n" @@ -178,262 +177,262 @@ "%(app)s%(status)s" msgstr "" -#: src/backend_iptables.py:444 +#: src/backend_iptables.py:425 #, python-format msgid "Status: active%s" msgstr "状态： 激活%s" -#: src/backend_iptables.py:450 src/backend_iptables.py:461 +#: src/backend_iptables.py:431 src/backend_iptables.py:442 msgid "running ufw-init" msgstr "运行 ufw-init" -#: src/backend_iptables.py:474 +#: src/backend_iptables.py:455 msgid "Could not set LOGLEVEL" msgstr "无法设置 LOGLEVEL" -#: src/backend_iptables.py:480 +#: src/backend_iptables.py:461 msgid "Could not load logging rules" msgstr "无法加载日志规则" -#: src/backend_iptables.py:629 src/backend.py:181 +#: src/backend_iptables.py:610 src/backend.py:198 #, python-format msgid "Couldn't open '%s' for reading" msgstr "无法打开 '%s' 进行读操作" -#: src/backend_iptables.py:638 +#: src/backend_iptables.py:619 #, python-format msgid "Skipping malformed tuple (bad length): %s" msgstr "忽略错误的多员组（长度错误）： %s" -#: src/backend_iptables.py:668 +#: src/backend_iptables.py:650 #, python-format msgid "Skipping malformed tuple: %s" msgstr "跳过错误的元组： %s" -#: src/backend_iptables.py:690 src/backend.py:213 +#: src/backend_iptables.py:672 src/backend.py:230 #, python-format msgid "'%s' is not writable" msgstr "" -#: src/backend_iptables.py:830 +#: src/backend_iptables.py:827 msgid "Adding IPv6 rule failed: IPv6 not enabled" msgstr "添加 IPv6 规则失败： IPv6 未被启用" -#: src/backend_iptables.py:834 +#: src/backend_iptables.py:831 #, python-format msgid "Skipping unsupported IPv6 '%s' rule" msgstr "忽略未被支持的 IPv6 '%s' 规则" -#: src/backend_iptables.py:837 +#: src/backend_iptables.py:834 msgid "Must specify 'tcp' or 'udp' with multiple ports" msgstr "必须在复合的端口中指定 'tcp' 或者 'udp'" -#: src/backend_iptables.py:849 +#: src/backend_iptables.py:846 msgid "Skipping IPv6 application rule. Need at least iptables 1.4" msgstr "忽略 IPv6 应用规则。需要 iptables 1.4 以上" -#: src/backend_iptables.py:854 +#: src/backend_iptables.py:851 #, python-format msgid "Invalid position '%d'" msgstr "无效的位置 '%d'" -#: src/backend_iptables.py:858 +#: src/backend_iptables.py:855 msgid "Cannot specify insert and delete" msgstr "无法指定插入和删除" -#: src/backend_iptables.py:861 +#: src/backend_iptables.py:858 #, python-format msgid "Cannot insert rule at position '%d'" msgstr "无法在'%d'处插入规则" -#: src/backend_iptables.py:919 +#: src/backend_iptables.py:916 msgid "Skipping inserting existing rule" msgstr "跳过插入已存在的规则" -#: src/backend_iptables.py:930 src/frontend.py:365 +#: src/backend_iptables.py:927 src/frontend.py:363 msgid "Could not delete non-existent rule" msgstr "无法删除不存在的规则" -#: src/backend_iptables.py:935 +#: src/backend_iptables.py:932 msgid "Skipping adding existing rule" msgstr "跳过添加已经存在的规则" -#: src/backend_iptables.py:951 +#: src/backend_iptables.py:948 msgid "Couldn't update rules file" msgstr "无法更新防火墙规则文件" -#: src/backend_iptables.py:956 +#: src/backend_iptables.py:953 msgid "Rules updated" msgstr "防火墙规则已更新" -#: src/backend_iptables.py:958 +#: src/backend_iptables.py:955 msgid "Rules updated (v6)" msgstr "规则已更新（v6）" -#: src/backend_iptables.py:966 +#: src/backend_iptables.py:963 msgid "Rule inserted" msgstr "规则已插入" -#: src/backend_iptables.py:968 +#: src/backend_iptables.py:965 msgid "Rule updated" msgstr "规则已更新" -#: src/backend_iptables.py:978 +#: src/backend_iptables.py:975 msgid " (skipped reloading firewall)" msgstr " (跳过重新加载的防火墙)" -#: src/backend_iptables.py:981 +#: src/backend_iptables.py:978 msgid "Rule deleted" msgstr "规则已删除" -#: src/backend_iptables.py:984 +#: src/backend_iptables.py:981 msgid "Rule added" msgstr "规则已添加" -#: src/backend_iptables.py:999 src/backend_iptables.py:1087 +#: src/backend_iptables.py:996 src/backend_iptables.py:1084 msgid "Could not update running firewall" msgstr "无法更新正在运行的防火墙" -#: src/backend_iptables.py:1054 +#: src/backend_iptables.py:1051 #, python-format msgid "Could not perform '%s'" msgstr "无法进行’％s'" -#: src/backend_iptables.py:1078 +#: src/backend_iptables.py:1075 msgid "Couldn't update rules file for logging" msgstr "" -#: src/backend_iptables.py:1132 src/backend.py:530 +#: src/backend_iptables.py:1129 src/backend.py:548 #, python-format msgid "Invalid log level '%s'" msgstr "无效的日志级别 '%s'" -#: src/backend_iptables.py:1228 +#: src/backend_iptables.py:1226 #, python-format msgid "Could not find '%s'. Aborting" msgstr "" -#: src/backend_iptables.py:1240 +#: src/backend_iptables.py:1238 #, python-format msgid "'%s' already exists. Aborting" msgstr "'%s' 已存在。正在中止" -#: src/backend_iptables.py:1246 +#: src/backend_iptables.py:1244 #, python-format msgid "Backing up '%(old)s' to '%(new)s'\n" msgstr "" -#: src/backend_iptables.py:1262 src/backend.py:140 +#: src/backend_iptables.py:1260 src/backend.py:157 #, python-format msgid "Couldn't stat '%s'" msgstr "无法在 '%s' 上运行 stat 命令" -#: src/backend_iptables.py:1267 +#: src/backend_iptables.py:1265 #, python-format msgid "WARN: '%s' is world writable" msgstr "" -#: src/backend_iptables.py:1269 +#: src/backend_iptables.py:1267 #, python-format msgid "WARN: '%s' is world readable" msgstr "" -#: src/backend.py:96 +#: src/backend.py:113 msgid "Checks disabled" msgstr "检查被禁用" -#: src/backend.py:102 +#: src/backend.py:119 msgid "ERROR: this script should not be SUID" msgstr "错误： 这个脚本不能被 SUID" -#: src/backend.py:105 +#: src/backend.py:122 msgid "ERROR: this script should not be SGID" msgstr "错误： 这个脚本不能被 SGID" -#: src/backend.py:110 +#: src/backend.py:127 msgid "You need to be root to run this script" msgstr "只有 root 用户才能运行此脚本" -#: src/backend.py:120 +#: src/backend.py:137 #, python-format msgid "'%s' does not exist" msgstr "“%s”不存在" -#: src/backend.py:146 +#: src/backend.py:163 #, python-format msgid "uid is %(uid)s but '%(path)s' is owned by %(st_uid)s" msgstr "uid 是 %(uid)s 但是 '%(path)s' 属于 %(st_uid)s" -#: src/backend.py:153 +#: src/backend.py:170 #, python-format msgid "%s is world writable!" msgstr "%s 是全局可写属性！" -#: src/backend.py:157 +#: src/backend.py:174 #, python-format msgid "%s is group writable!" msgstr "%s 是全组可写属性！" -#: src/backend.py:170 +#: src/backend.py:187 #, python-format msgid "'%(f)s' file '%(name)s' does not exist" msgstr "'%(f)s' 文件 '%(name)s' 不存在" -#: src/backend.py:195 +#: src/backend.py:212 #, python-format msgid "Missing policy for '%s'" msgstr "针对 '%s' 的策略不存在" -#: src/backend.py:200 +#: src/backend.py:217 #, python-format msgid "Invalid policy '%(policy)s' for '%(chain)s'" msgstr "'%(chain)s' 的策略 '%(policy)s' 无效" -#: src/backend.py:207 +#: src/backend.py:224 msgid "Invalid option" msgstr "无效选项" -#: src/backend.py:278 +#: src/backend.py:295 #, python-format msgid "Default application policy changed to '%s'" msgstr "'%s' 的默认应用程序策略已改变" -#: src/backend.py:360 +#: src/backend.py:377 msgid "No rules found for application profile" msgstr "没有发现程序配置的规则" -#: src/backend.py:419 +#: src/backend.py:436 #, python-format msgid "Rules updated for profile '%s'" msgstr "配置 '%s' 的规则已经升级" -#: src/backend.py:425 +#: src/backend.py:442 msgid "Couldn't update application rules" msgstr "不能更新应用程序规则" -#: src/backend.py:447 +#: src/backend.py:464 #, python-format msgid "Found multiple matches for '%s'. Please use exact profile name" msgstr "'%s' 找到了多个匹配。清使用更精确的配置名称。" -#: src/backend.py:448 +#: src/backend.py:466 #, python-format msgid "Could not find a profile matching '%s'" msgstr "无法为 '%s' 找到相匹配的配置" -#: src/backend.py:514 +#: src/backend.py:532 msgid "Logging: " msgstr "日志: " -#: src/backend.py:518 +#: src/backend.py:536 msgid "unknown" msgstr "未知" -#: src/backend.py:548 +#: src/backend.py:566 msgid "Logging disabled" msgstr "日志被禁用" -#: src/backend.py:550 +#: src/backend.py:568 msgid "Logging enabled" msgstr "日志被启用" @@ -482,24 +481,20 @@ msgid "Unsupported direction '%s'" msgstr "不支持的方向 '%s'" -#: src/common.py:346 -msgid "Could not normalize source address" -msgstr "不能标准化源地址" - -#: src/common.py:356 +#: src/common.py:355 msgid "Could not normalize destination address" msgstr "不能标准化目标地址" -#: src/common.py:417 +#: src/common.py:416 msgid "Found exact match" msgstr "找到完全匹配项" -#: src/common.py:421 +#: src/common.py:420 #, python-format msgid "Found non-action/non-logtype match (%(xa)s/%(ya)s %(xl)s/%(yl)s)" msgstr "" -#: src/frontend.py:93 +#: src/frontend.py:90 #, python-format msgid "" "\n" @@ -530,53 +525,53 @@ " %(appdefault)-31s set default application policy\n" msgstr "" -#: src/frontend.py:168 +#: src/frontend.py:162 msgid "n" msgstr "n" -#: src/frontend.py:169 +#: src/frontend.py:163 msgid "y" msgstr "y" -#: src/frontend.py:170 +#: src/frontend.py:164 msgid "yes" msgstr "是" -#: src/frontend.py:215 +#: src/frontend.py:209 msgid "Firewall is active and enabled on system startup" msgstr "在系统启动时启用和激活防火墙" -#: src/frontend.py:222 +#: src/frontend.py:216 msgid "Firewall stopped and disabled on system startup" msgstr "防火墙在系统启动时自动禁用" -#: src/frontend.py:273 +#: src/frontend.py:267 msgid "Could not get listening status" msgstr "无法取得监听状态" -#: src/frontend.py:360 src/frontend.py:458 src/frontend.py:468 +#: src/frontend.py:358 src/frontend.py:456 src/frontend.py:466 #, python-format msgid "Invalid IP version '%s'" msgstr "错误的 IP 协议版本 '%s'" -#: src/frontend.py:391 +#: src/frontend.py:389 msgid "Invalid position '" msgstr "无效位置 '" -#: src/frontend.py:465 +#: src/frontend.py:463 msgid "IPv6 support not enabled" msgstr "IPv6 支持未被启用" -#: src/frontend.py:476 +#: src/frontend.py:474 msgid "Rule changed after normalization" msgstr "标准化后规则被改变" -#: src/frontend.py:500 +#: src/frontend.py:498 #, python-format msgid "Could not back out rule '%s'" msgstr "无法备份规则 '%s'" -#: src/frontend.py:504 +#: src/frontend.py:502 msgid "" "\n" "Error applying application rules." @@ -584,25 +579,25 @@ "\n" "应用规则时出错。" -#: src/frontend.py:506 +#: src/frontend.py:504 msgid " Some rules could not be unapplied." msgstr " 一些规则不能被撤销。" -#: src/frontend.py:508 +#: src/frontend.py:506 msgid " Attempted rules successfully unapplied." msgstr " 成功撤销了对尝试规则的应用。" -#: src/frontend.py:519 +#: src/frontend.py:517 #, python-format msgid "Could not find rule '%s'" msgstr "无法找到规则 '%s'" -#: src/frontend.py:524 src/frontend.py:529 +#: src/frontend.py:522 src/frontend.py:527 #, python-format msgid "Could not find rule '%d'" msgstr "无法找到规则 '%d'" -#: src/frontend.py:541 +#: src/frontend.py:539 #, python-format msgid "" "Deleting:\n" @@ -610,51 +605,51 @@ "Proceed with operation (%(yes)s|%(no)s)? " msgstr "" -#: src/frontend.py:572 +#: src/frontend.py:570 msgid "Unsupported default policy" msgstr "不支持的默认策略" -#: src/frontend.py:599 src/frontend.py:744 +#: src/frontend.py:597 src/frontend.py:742 msgid "Firewall reloaded" msgstr "已经重新载入防火墙" -#: src/frontend.py:601 +#: src/frontend.py:599 msgid "Firewall not enabled (skipping reload)" msgstr "未启用防火墙(跳过重新载入)" -#: src/frontend.py:618 src/frontend.py:632 src/frontend.py:669 +#: src/frontend.py:616 src/frontend.py:630 src/frontend.py:667 msgid "Invalid profile name" msgstr "非法的配置文件名" -#: src/frontend.py:637 src/frontend.py:819 +#: src/frontend.py:635 src/frontend.py:817 #, python-format msgid "Unsupported action '%s'" msgstr "不支持的动作'%s'" -#: src/frontend.py:656 +#: src/frontend.py:654 msgid "Available applications:" msgstr "可用应用程序：" -#: src/frontend.py:677 +#: src/frontend.py:675 #, python-format msgid "Could not find profile '%s'" msgstr "无法找到配置文件 '%s'" -#: src/frontend.py:682 +#: src/frontend.py:680 msgid "Invalid profile" msgstr "非法配置文件" -#: src/frontend.py:685 +#: src/frontend.py:683 #, python-format msgid "Profile: %s\n" msgstr "配置: %s\n" -#: src/frontend.py:686 +#: src/frontend.py:684 #, python-format msgid "Title: %s\n" msgstr "标题：%s\n" -#: src/frontend.py:689 +#: src/frontend.py:687 #, python-format msgid "" "Description: %s\n" @@ -663,178 +658,178 @@ "描述： %s\n" "\n" -#: src/frontend.py:695 +#: src/frontend.py:693 msgid "Ports:" msgstr "端口：" -#: src/frontend.py:697 +#: src/frontend.py:695 msgid "Port:" msgstr "端口:" -#: src/frontend.py:746 +#: src/frontend.py:744 msgid "Skipped reloading firewall" msgstr "跳过重新加载防火墙" -#: src/frontend.py:756 +#: src/frontend.py:754 msgid "Cannot specify 'all' with '--add-new'" msgstr "不能指定 'all' 使用 '--add-new'" -#: src/frontend.py:771 +#: src/frontend.py:769 #, python-format msgid "Unknown policy '%s'" msgstr "未知的策略 '%s'" -#: src/frontend.py:828 +#: src/frontend.py:826 #, python-format msgid "" "Command may disrupt existing ssh connections. Proceed with operation " "(%(yes)s|%(no)s)? " msgstr "" -#: src/frontend.py:841 +#: src/frontend.py:839 #, python-format msgid "" "Resetting all rules to installed defaults. Proceed with operation " "(%(yes)s|%(no)s)? " msgstr "" -#: src/frontend.py:845 +#: src/frontend.py:843 #, python-format msgid "" "Resetting all rules to installed defaults. This may disrupt existing ssh " "connections. Proceed with operation (%(yes)s|%(no)s)? " msgstr "" -#: src/parser.py:109 +#: src/parser.py:107 #, python-format msgid "Cannot insert rule at position '%s'" msgstr "无法在'%s'处插入规则" -#: src/parser.py:147 +#: src/parser.py:145 msgid "Invalid interface clause" msgstr "" -#: src/parser.py:173 +#: src/parser.py:171 msgid "Option 'log' not allowed here" msgstr "此处不允许使用 'log' 选项" -#: src/parser.py:177 +#: src/parser.py:175 msgid "Option 'log-all' not allowed here" msgstr "此处不允许使用 'log-all' 选项" -#: src/parser.py:210 src/parser.py:224 +#: src/parser.py:208 src/parser.py:222 msgid "Bad port" msgstr "错误的端口" -#: src/parser.py:215 src/parser.py:335 +#: src/parser.py:213 src/parser.py:333 msgid "Port ranges must be numeric" msgstr "端口范围必须为数字" -#: src/parser.py:229 src/parser.py:426 +#: src/parser.py:227 src/parser.py:419 #, python-format msgid "Invalid port with protocol '%s'" msgstr "" -#: src/parser.py:233 +#: src/parser.py:231 msgid "Wrong number of arguments" msgstr "参数数目错误" -#: src/parser.py:237 +#: src/parser.py:235 msgid "Need 'to' or 'from' clause" msgstr "需要 'to' 或者 'from' 从句" -#: src/parser.py:252 +#: src/parser.py:250 msgid "Improper rule syntax" msgstr "防火墙规则的语法不正确" -#: src/parser.py:259 +#: src/parser.py:257 #, python-format msgid "Invalid token '%s'" msgstr "无效的标记 '%s'" -#: src/parser.py:268 +#: src/parser.py:266 msgid "Invalid 'proto' clause" msgstr "无效的 'proto' 从句" -#: src/parser.py:280 +#: src/parser.py:278 #, python-format msgid "Invalid '%s' clause" msgstr "" -#: src/parser.py:299 +#: src/parser.py:297 msgid "Invalid 'from' clause" msgstr "无效的 'from' 从句" -#: src/parser.py:318 +#: src/parser.py:316 msgid "Invalid 'to' clause" msgstr "无效的 'to' 从句" -#: src/parser.py:323 +#: src/parser.py:321 #, python-format msgid "Need 'from' or 'to' with '%s'" msgstr "需要 'from' 或者 'to' 使用 '%s'" -#: src/parser.py:347 +#: src/parser.py:345 msgid "Invalid 'port' clause" msgstr "无效的 'port' 从句" -#: src/parser.py:356 +#: src/parser.py:354 msgid "Mixed IP versions for 'from' and 'to'" msgstr "'from' 和 'to' 的 IP 版本不同" -#: src/parser.py:370 src/parser.py:377 src/parser.py:383 +#: src/parser.py:368 src/parser.py:375 src/parser.py:381 msgid "Could not find protocol" msgstr "无法找到协议" -#: src/parser.py:390 +#: src/parser.py:388 msgid "Protocol mismatch (from/to)" msgstr "from 和 to 的协议不匹配" -#: src/parser.py:397 +#: src/parser.py:395 #, python-format msgid "Protocol mismatch with specified protocol %s" msgstr "协议与指定的协议 %s 不匹配" -#: src/parser.py:409 +#: src/parser.py:402 #, python-format msgid "Improper rule syntax ('%s' specified with app rule)" msgstr "不正确的规则语法 ('%s' 是由程序规则指定的)" -#: src/parser.py:416 +#: src/parser.py:409 #, python-format msgid "Invalid IPv6 address with protocol '%s'" msgstr "" -#: src/parser.py:745 +#: src/parser.py:738 #, python-format msgid "Invalid command '%s'" msgstr "" -#: src/parser.py:767 +#: src/parser.py:760 #, python-format msgid "Command '%s' already exists" msgstr "" -#: src/util.py:386 +#: src/util.py:384 msgid "Couldn't find pid (is /proc mounted?)" msgstr "无法找到 pid (/proc 是否已经加载？)" -#: src/util.py:390 +#: src/util.py:388 #, python-format msgid "Couldn't find parent pid for '%s'" msgstr "无法找到 '%s' 的父 pid" -#: src/util.py:400 +#: src/util.py:398 #, python-format msgid "Couldn't find '%s'" msgstr "无法找到 '%s'" -#: src/util.py:406 +#: src/util.py:404 #, python-format msgid "Could not find executable for '%s'" msgstr "无法找到针对 '%s' 的可执行文件" -#: src/util.py:871 +#: src/util.py:876 #, python-format msgid "Could not get statistics for '%s'" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/unattended-upgrades.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/unattended-upgrades.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/unattended-upgrades.po 2012-02-23 07:11:52.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/unattended-upgrades.po 2012-03-23 07:33:13.000000000 +0000 @@ -9,13 +9,13 @@ "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-12-26 18:12+0000\n" "PO-Revision-Date: 2009-09-23 14:19+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer Wang \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-21 22:28+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:59+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../unattended-upgrade:106 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/unity-2d.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/unity-2d.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/unity-2d.po 2012-02-23 07:12:10.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/unity-2d.po 2012-03-23 07:33:32.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: unity-2d\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2011-09-29 11:48+0200\n" +"POT-Creation-Date: 2012-03-06 17:07+0100\n" "PO-Revision-Date: 2011-12-07 22:34+0000\n" "Last-Translator: Xhacker Liu \n" "Language-Team: Chinese (Simplified) \n" @@ -15,141 +15,155 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-22 02:18+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:29+0000\n" +"X-Generator: Launchpad (build 14981)\n" -#: libunity-2d-private/src/launcherdevice.cpp:273 -msgid "Eject" -msgstr "弹出" - -#: libunity-2d-private/src/launcherdevice.cpp:281 -msgid "Safely remove" -msgstr "安全弹出" - -#: libunity-2d-private/src/workspaces.cpp:73 -msgid "Workspaces" -msgstr "工作区" - -#: libunity-2d-private/src/trash.cpp:128 -msgid "Trash" -msgstr "回收站" - -#: libunity-2d-private/src/trash.cpp:208 -#, c-format, qt-plural-format -msgid "%n item in trash" -msgid_plural "%n items in trash" -msgstr[0] "回收站中有 %n 项" - -#: libunity-2d-private/src/trash.cpp:215 -msgid "Empty Trash" -msgstr "清空回收站" - -#: libunity-2d-private/src/launcherapplication.cpp:903 -msgid "Keep in launcher" -msgstr "固定在启动器上" - -#: libunity-2d-private/src/launcherapplication.cpp:903 -msgid "Remove from launcher" -msgstr "从启动器上移除" - -#: libunity-2d-private/src/launcherapplication.cpp:910 -msgid "Quit" -msgstr "退出" - -#: libunity-2d-private/src/unity2dapplication.cpp:151 -msgid "QT_LAYOUT_DIRECTION" -msgstr "LTR" +#: panel/applets/appname/appnameapplet.cpp:364 +msgid "Ubuntu Desktop" +msgstr "" -#: libunity-2d-private/src/bfb.cpp:71 -msgid "Dash home" -msgstr "面板主页" +#: shell/hud/Hud.qml:192 +msgid "Type your Command" +msgstr "" -#: launcher/LauncherList.qml:82 +#: shell/launcher/LauncherList.qml:88 #, qt-format msgid "%1 window opened" msgid_plural "%1 windows opened" msgstr[0] "打开了 %1 个窗口" -#: launcher/LauncherList.qml:85 +#: shell/launcher/LauncherList.qml:91 msgid "not running" msgstr "未运行" -#: places/LensBar.qml:100 -msgid "home" -msgstr "个人主目录" - -#: places/Home.qml:80 -msgid "Shortcuts" -msgstr "快速访问" - -#: places/CategoryHeader.qml:36 +#: shell/dash/CategoryHeader.qml:37 msgid "not expanded" msgstr "未展开" -#: places/CategoryHeader.qml:36 +#: shell/dash/CategoryHeader.qml:37 msgid "expanded" msgstr "已展开" -#: places/CategoryHeader.qml:97 +#: shell/dash/CategoryHeader.qml:81 #, qt-format msgid "See %1 more result" msgid_plural "See %1 more results" msgstr[0] "查看 %1 个更多结果" -#: places/CategoryHeader.qml:99 +#: shell/dash/CategoryHeader.qml:83 msgid "See fewer results" msgstr "显示较少项目" -#: places/FilterLoader.qml:36 -#, qt-format -msgid "Filter %1 active" -msgstr "过滤器 %1 活动中" - -#: places/FilterLoader.qml:38 -#, qt-format -msgid "Filter %1 inactive" -msgstr "过滤器 %1 未激活" - -#: places/FilterLoader.qml:90 -msgid "All" -msgstr "全部" +#: shell/dash/Home.qml:82 +msgid "Shortcuts" +msgstr "快速访问" -#: places/HomeShortcuts.qml:56 +#: shell/dash/HomeShortcuts.qml:47 msgid "Media Apps" msgstr "多媒体程序" -#: places/HomeShortcuts.qml:62 +#: shell/dash/HomeShortcuts.qml:53 msgid "Internet Apps" msgstr "互联网程序" -#: places/HomeShortcuts.qml:68 +#: shell/dash/HomeShortcuts.qml:59 msgid "More Apps" msgstr "更多程序" -#: places/HomeShortcuts.qml:74 +#: shell/dash/HomeShortcuts.qml:65 msgid "Find Files" msgstr "查阅文件" -#: places/HomeShortcuts.qml:81 +#: shell/dash/HomeShortcuts.qml:72 msgid "Browse the Web" msgstr "网络冲浪" -#: places/HomeShortcuts.qml:86 +#: shell/dash/HomeShortcuts.qml:77 msgid "View Photos" msgstr "查看照片" -#: places/HomeShortcuts.qml:92 +#: shell/dash/HomeShortcuts.qml:83 msgid "Check Email" msgstr "查阅邮件" -#: places/HomeShortcuts.qml:97 +#: shell/dash/HomeShortcuts.qml:88 msgid "Listen to Music" msgstr "聆听音乐" -#: places/FilterPane.qml:69 +#: shell/dash/FilterPane.qml:71 msgid "Filter results" msgstr "过滤结果" -#: places/SearchEntry.qml:176 +#: shell/dash/Dash.qml:279 libunity-2d-private/src/lenses.cpp:41 msgid "Search" msgstr "搜索" + +#: shell/dash/FilterLoader.qml:38 +#, qt-format +msgid "Filter %1 active" +msgstr "过滤器 %1 活动中" + +#: shell/dash/FilterLoader.qml:40 +#, qt-format +msgid "Filter %1 inactive" +msgstr "过滤器 %1 未激活" + +#: shell/dash/FilterLoader.qml:86 shell/dash/FilterLoader.qml:92 +msgid "All" +msgstr "全部" + +#. TRANSLATORS: This refers to the direction of text +#. (left-to-right or right-to-left): possible values are LTR or RTL +#: libunity-2d-private/src/unity2dapplication.cpp:170 +msgid "QT_LAYOUT_DIRECTION" +msgstr "LTR" + +#: libunity-2d-private/src/application.cpp:986 +msgid "Keep in launcher" +msgstr "固定在启动器上" + +#: libunity-2d-private/src/application.cpp:986 +msgid "Remove from launcher" +msgstr "从启动器上移除" + +#: libunity-2d-private/src/application.cpp:993 +msgid "Quit" +msgstr "退出" + +#: libunity-2d-private/src/lenses.cpp:41 +msgid "Home" +msgstr "" + +#: libunity-2d-private/src/lenses.cpp:41 +msgid "Home screen" +msgstr "" + +#: libunity-2d-private/src/bfb.cpp:60 +msgid "Dash home" +msgstr "面板主页" + +#: libunity-2d-private/src/workspaces.cpp:73 +msgid "Workspaces" +msgstr "工作区" + +#: libunity-2d-private/src/trash.cpp:128 +msgid "Trash" +msgstr "回收站" + +#: libunity-2d-private/src/trash.cpp:208 +#, c-format, qt-plural-format +msgid "%n item in trash" +msgid_plural "%n items in trash" +msgstr[0] "回收站中有 %n 项" + +#: libunity-2d-private/src/trash.cpp:215 +msgid "Empty Trash" +msgstr "清空回收站" + +#: libunity-2d-private/src/launcherdevice.cpp:273 +msgid "Eject" +msgstr "弹出" + +#: libunity-2d-private/src/launcherdevice.cpp:281 +msgid "Safely remove" +msgstr "安全弹出" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/update-manager.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/update-manager.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/update-manager.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/update-manager.po 2012-03-23 07:32:58.000000000 +0000 @@ -7,33 +7,32 @@ msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-17 03:06+0000\n" -"PO-Revision-Date: 2012-02-16 23:28+0000\n" -"Last-Translator: Qiu Haoyu \n" +"POT-Creation-Date: 2012-03-20 20:39+0000\n" +"PO-Revision-Date: 2012-03-17 06:43+0000\n" +"Last-Translator: ZhangCheng \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: 2012-02-21 19:00+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:20+0000\n" +"X-Generator: Launchpad (build 14981)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:352 ../UpdateManager/Core/utils.py:352 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:208 ../DistUpgrade/distro.py:423 +#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:434 #, python-format msgid "Server for %s" msgstr "%s 的服务器" @@ -41,30 +40,30 @@ #. 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 -#: ../DistUpgrade/distro.py:226 ../DistUpgrade/distro.py:232 -#: ../DistUpgrade/distro.py:248 +#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 +#: ../DistUpgrade/distro.py:246 msgid "Main server" msgstr "主服务器" -#: ../DistUpgrade/distro.py:252 +#: ../DistUpgrade/distro.py:250 msgid "Custom servers" msgstr "自定义服务器" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:131 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "无法计算 sources.list 条目" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:234 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "无法定位任何软件包文件，也许这张不是 Ubuntu 光盘，或者其架构错误？" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:277 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "添加 CD 失败" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:278 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -78,12 +77,12 @@ "错误信息是：\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:130 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "卸载处于不良状态的程序包" -#: ../DistUpgrade/DistUpgradeCache.py:133 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,22 +96,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:231 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "服务器可能已过载" -#: ../DistUpgrade/DistUpgradeCache.py:341 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:342 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "您的系统包含有本软件不能修复的破损软件包，在您继续前请先用新立得或者 apt-get 修复它们。" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:631 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -133,65 +132,65 @@ " * 非 Ubuntu 提供的非官方软件包\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:641 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "很可能发生了一个传输问题，请稍后重试。" -#: ../DistUpgrade/DistUpgradeCache.py:673 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "如果没有应用任何变更，您可以在终端里输入命令‘ubuntu-bug update-manager’来报告这个 bug。" -#: ../DistUpgrade/DistUpgradeCache.py:650 -#: ../UpdateManager/UpdateManager.py:772 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1025 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:700 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "一些软件包认证出错" -#: ../DistUpgrade/DistUpgradeCache.py:701 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "一些软件包无法通过签名验证。这可能是暂时的网络问题，您可以在稍后再试。以下是未认证软件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:721 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "软件包“%s”标记为可移除，但它已在移除黑名单中。" -#: ../DistUpgrade/DistUpgradeCache.py:725 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "必要的软件包“%s”被标记为移除。" -#: ../DistUpgrade/DistUpgradeCache.py:734 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "尝试安装黑名单版本“%s”" -#: ../DistUpgrade/DistUpgradeCache.py:851 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "无法安装 '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:882 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "无法安装一个必需的软件包。请在终端里输入命令‘ubuntu-bug update-manager’来报告这个 bug。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:861 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "无法猜出元软件包" -#: ../DistUpgrade/DistUpgradeCache.py:862 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -203,25 +202,25 @@ "ubuntu 的版本。\n" " 请先用新立得或 APT 安装以上所举软件包中的一个。" -#: ../DistUpgrade/DistUpgradeController.py:86 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeController.py:189 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "Unable to get exclusive lock" msgstr "无法获得排它锁" -#: ../DistUpgrade/DistUpgradeController.py:190 +#: ../DistUpgrade/DistUpgradeController.py:211 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "这通常意味着另一个软件包管理程序(如 apt-get 或 aptitude)正在运行。请先关闭那个程序。" -#: ../DistUpgrade/DistUpgradeController.py:236 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "Upgrading over remote connection not supported" msgstr "不支持通过远程连接升级" -#: ../DistUpgrade/DistUpgradeController.py:237 +#: ../DistUpgrade/DistUpgradeController.py:245 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -233,11 +232,11 @@ "\n" "现在将退出升级。请试试不使用 ssh 的方式。" -#: ../DistUpgrade/DistUpgradeController.py:251 +#: ../DistUpgrade/DistUpgradeController.py:259 msgid "Continue running under SSH?" msgstr "继续在 SSH 下执行？" -#: ../DistUpgrade/DistUpgradeController.py:252 +#: ../DistUpgrade/DistUpgradeController.py:260 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -252,11 +251,11 @@ "如果您选择继续，将在 '%s' 端口上建立额外的 SSH 守护进程。\n" "您想要继续吗？" -#: ../DistUpgrade/DistUpgradeController.py:267 +#: ../DistUpgrade/DistUpgradeController.py:274 msgid "Starting additional sshd" msgstr "正在启用额外的 ssh 守护进程" -#: ../DistUpgrade/DistUpgradeController.py:268 +#: ../DistUpgrade/DistUpgradeController.py:275 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -265,7 +264,7 @@ msgstr "" "为了在失败时更容易恢复，将在端口“%s”开启一个额外的 ssh 守护进程。如果当前运行的 ssh 发生错误，您仍能够通过该额外的 ssh 进行连接。\n" -#: ../DistUpgrade/DistUpgradeController.py:282 +#: ../DistUpgrade/DistUpgradeController.py:283 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -276,29 +275,29 @@ "如果您运行了一个防火墙，可能需要临时打开这个端口。这可能有些危险，因此没有自动进行这个操作。您可以通过类似这样的命令打开端口：\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:339 -#: ../DistUpgrade/DistUpgradeController.py:384 +#: ../DistUpgrade/DistUpgradeController.py:355 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "Can not upgrade" msgstr "无法升级" -#: ../DistUpgrade/DistUpgradeController.py:340 +#: ../DistUpgrade/DistUpgradeController.py:356 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "此工具不支持从 '%s' 到 ‘%s' 的升级。" -#: ../DistUpgrade/DistUpgradeController.py:349 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "Sandbox setup failed" msgstr "安装沙盒失败" -#: ../DistUpgrade/DistUpgradeController.py:350 +#: ../DistUpgrade/DistUpgradeController.py:366 msgid "It was not possible to create the sandbox environment." msgstr "不能创建沙盒环境" -#: ../DistUpgrade/DistUpgradeController.py:356 +#: ../DistUpgrade/DistUpgradeController.py:372 msgid "Sandbox mode" msgstr "沙盒模式" -#: ../DistUpgrade/DistUpgradeController.py:372 +#: ../DistUpgrade/DistUpgradeController.py:373 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -307,17 +306,20 @@ "*No* changes written to a system directory from now until the next reboot " "are permanent." msgstr "" +"本次更新运行在沙盘(测试)模式，所有变更都将写入 '%s' 并会在重启后丢失。\n" +"\n" +"从现在起对系统目录的变更重启后都将 *不复存在* 。" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:401 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "您的 python 安装错误，请修复“/usr/bin/python”符号链接。" -#: ../DistUpgrade/DistUpgradeController.py:411 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "Package 'debsig-verify' is installed" msgstr "已安装软件包“debsig-verify”" -#: ../DistUpgrade/DistUpgradeController.py:412 +#: ../DistUpgrade/DistUpgradeController.py:428 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -326,24 +328,26 @@ "由于安装了上述软件包而无法继续升级。\n" "请使用新立得软件包管理器来移除它，或者先使用 “sudo apt-get remove debsig-verify”卸载后再重新尝试升级。" -#: ../DistUpgrade/DistUpgradeController.py:439 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "Can not write to '%s'" -msgstr "" +msgstr "无法写入 '%s'" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:441 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " "upgrade can not continue.\n" "Please make sure that the system directory is writable." msgstr "" +"无法写入您的系统目录 %s ，升级无法继续。\n" +"请确保系统目录是可写的。" -#: ../DistUpgrade/DistUpgradeController.py:422 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "Include latest updates from the Internet?" msgstr "包括网络上的最新更新？" -#: ../DistUpgrade/DistUpgradeController.py:423 +#: ../DistUpgrade/DistUpgradeController.py:453 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -359,16 +363,16 @@ "升级时间可能加长，但升级结束后，您的系统将是最新的。您也可以选择在升级结束后再进行系统更新。\n" "如果选择\"否\"，就不会使用网络。" -#: ../DistUpgrade/DistUpgradeController.py:647 +#: ../DistUpgrade/DistUpgradeController.py:673 #, python-format msgid "disabled on upgrade to %s" msgstr "已禁止升级到 %s" -#: ../DistUpgrade/DistUpgradeController.py:674 +#: ../DistUpgrade/DistUpgradeController.py:700 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeController.py:675 +#: ../DistUpgrade/DistUpgradeController.py:701 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -384,11 +388,11 @@ "是否依然重写 \"sources.list\" 文件？如果选择“是”，将会把所有 “%s” 升级到 “%s”。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:695 +#: ../DistUpgrade/DistUpgradeController.py:721 msgid "Generate default sources?" msgstr "生成默认的源？" -#: ../DistUpgrade/DistUpgradeController.py:696 +#: ../DistUpgrade/DistUpgradeController.py:722 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -400,33 +404,33 @@ "\n" "是否为“%s”添加默认项？如果选择“否”，将会取消升级。" -#: ../DistUpgrade/DistUpgradeController.py:731 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "Repository information invalid" msgstr "仓库信息无效" -#: ../DistUpgrade/DistUpgradeController.py:757 +#: ../DistUpgrade/DistUpgradeController.py:758 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." -msgstr "" +msgstr "更新软件源时返回了无效文件，已启动错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:738 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeController.py:739 +#: ../DistUpgrade/DistUpgradeController.py:766 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "您的 sources.list 中的一些第三方源被禁用。您可以在升级后用\"软件源\"工具或包管理器来重新启用它们。" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:806 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "软件包存在冲突" -#: ../DistUpgrade/DistUpgradeController.py:782 +#: ../DistUpgrade/DistUpgradeController.py:809 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -438,23 +442,23 @@ "or remove them from the system." msgstr[0] "软件包“%s”处于冲突状态，需要重新安装， 但是没能找到它的存档。请重新手动安装这个软件包或者将其从系统中删除。" -#: ../DistUpgrade/DistUpgradeController.py:830 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeController.py:831 +#: ../DistUpgrade/DistUpgradeController.py:858 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级过程中出错。这通常是一些网络问题，请检查您的网络连接后再试" #. print "on_button_install_clicked" -#: ../DistUpgrade/DistUpgradeController.py:840 -#: ../UpdateManager/UpdateManager.py:577 +#: ../DistUpgrade/DistUpgradeController.py:867 +#: ../UpdateManager/UpdateManager.py:750 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeController.py:867 +#: ../DistUpgrade/DistUpgradeController.py:868 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -467,32 +471,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:869 -#: ../DistUpgrade/DistUpgradeController.py:1610 +#: ../DistUpgrade/DistUpgradeController.py:897 +#: ../DistUpgrade/DistUpgradeController.py:1664 msgid "Calculating the changes" msgstr "正在计算变更" -#. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeController.py:920 +#. ask the user +#: ../DistUpgrade/DistUpgradeController.py:929 msgid "Do you want to start the upgrade?" msgstr "您要开始升级么？" -#: ../DistUpgrade/DistUpgradeController.py:985 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "Upgrade canceled" msgstr "升级已取消" -#: ../DistUpgrade/DistUpgradeController.py:995 +#: ../DistUpgrade/DistUpgradeController.py:996 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "升级将会取消，系统会恢复到原始状态。您可以在之后继续升级。" -#: ../DistUpgrade/DistUpgradeController.py:991 -#: ../DistUpgrade/DistUpgradeController.py:1097 +#: ../DistUpgrade/DistUpgradeController.py:1002 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeController.py:1002 +#: ../DistUpgrade/DistUpgradeController.py:1003 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -500,33 +504,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1049 -#: ../DistUpgrade/DistUpgradeController.py:1085 -#: ../DistUpgrade/DistUpgradeController.py:1190 +#: ../DistUpgrade/DistUpgradeController.py:1087 +#: ../DistUpgrade/DistUpgradeController.py:1124 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "Error during commit" msgstr "确认时出错" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1051 -#: ../DistUpgrade/DistUpgradeController.py:1087 -#: ../DistUpgrade/DistUpgradeController.py:1229 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1126 +#: ../DistUpgrade/DistUpgradeController.py:1268 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" -#: ../DistUpgrade/DistUpgradeController.py:1052 -#: ../DistUpgrade/DistUpgradeController.py:1066 -#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1090 +#: ../DistUpgrade/DistUpgradeController.py:1105 +#: ../DistUpgrade/DistUpgradeController.py:1127 msgid "Could not install the upgrades" msgstr "无法安装升级" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1095 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "更新已取消。您的系统可能处在不稳定状态。正在恢复 (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeController.py:1091 +#: ../DistUpgrade/DistUpgradeController.py:1100 #, python-format msgid "" "\n" @@ -536,27 +540,32 @@ "the files in /var/log/dist-upgrade/ to the bug report.\n" "%s" msgstr "" +"\n" +"\n" +"请使用浏览器到 http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug " +"上报告该错误，不要忘了在报告时附上文件 /var/log/dist-upgrade/。\n" +"%s" -#: ../DistUpgrade/DistUpgradeController.py:1128 +#: ../DistUpgrade/DistUpgradeController.py:1137 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "更新已取消。请检查您的因特网连接或安装媒体，然后再试一遍。 " -#: ../DistUpgrade/DistUpgradeController.py:1178 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeController.py:1179 -#: ../DistUpgrade/DistUpgrade.ui.h:22 +#: ../DistUpgrade/DistUpgradeController.py:1218 +#: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "保持(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1179 +#: ../DistUpgrade/DistUpgradeController.py:1218 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1191 +#: ../DistUpgrade/DistUpgradeController.py:1230 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -564,109 +573,112 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1267 +#: ../DistUpgrade/DistUpgradeController.py:1306 msgid "Required depends is not installed" msgstr "需要的依赖关系未安装" -#: ../DistUpgrade/DistUpgradeController.py:1268 +#: ../DistUpgrade/DistUpgradeController.py:1307 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "需要的依赖关系“%s”未安装 。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1513 -#: ../DistUpgrade/DistUpgradeController.py:1580 +#: ../DistUpgrade/DistUpgradeController.py:1568 +#: ../DistUpgrade/DistUpgradeController.py:1633 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeController.py:1518 +#: ../DistUpgrade/DistUpgradeController.py:1573 msgid "Preparing the upgrade failed" msgstr "升级准备失败" -#: ../DistUpgrade/DistUpgradeController.py:1543 +#: ../DistUpgrade/DistUpgradeController.py:1574 msgid "" -"Preparing the system for the upgrade failed so a bug reporting process " -"isbeing started." -msgstr "" +"Preparing the system for the upgrade failed so a bug reporting process is " +"being started." +msgstr "更新时的系统准备失败，已启动错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:1535 +#: ../DistUpgrade/DistUpgradeController.py:1588 msgid "Getting upgrade prerequisites failed" msgstr "准备升级失败" -#: ../DistUpgrade/DistUpgradeController.py:1558 +#: ../DistUpgrade/DistUpgradeController.py:1589 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" "\n" "Additionally, a bug reporting process is being started." msgstr "" +"系统无法达到升级的前提，升级已停止并已恢复了原系统状态。\n" +"\n" +"另外已启动了错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:1566 +#: ../DistUpgrade/DistUpgradeController.py:1617 msgid "Updating repository information" msgstr "正在更新软件仓库信息" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1624 msgid "Failed to add the cdrom" msgstr "添加光驱失败" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1625 msgid "Sorry, adding the cdrom was not successful." msgstr "对不起，没有成功添加光驱。" -#: ../DistUpgrade/DistUpgradeController.py:1598 +#: ../DistUpgrade/DistUpgradeController.py:1653 msgid "Invalid package information" msgstr "无效的软件包信息" -#: ../DistUpgrade/DistUpgradeController.py:1623 +#: ../DistUpgrade/DistUpgradeController.py:1654 #, python-format msgid "" "After your package information was updated the essential package '%s' can " "not be found anymore so a bug reporting process is being started." -msgstr "" +msgstr "软件包信息升级后再也找不到必需的包 '%s'，因而启动了错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:1616 -#: ../DistUpgrade/DistUpgradeController.py:1664 +#: ../DistUpgrade/DistUpgradeController.py:1670 +#: ../DistUpgrade/DistUpgradeController.py:1723 msgid "Fetching" msgstr "正在获取" -#: ../DistUpgrade/DistUpgradeController.py:1622 -#: ../DistUpgrade/DistUpgradeController.py:1668 +#: ../DistUpgrade/DistUpgradeController.py:1676 +#: ../DistUpgrade/DistUpgradeController.py:1727 msgid "Upgrading" msgstr "正在升级" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1627 -#: ../DistUpgrade/DistUpgradeController.py:1670 -#: ../DistUpgrade/DistUpgradeController.py:1677 -#: ../DistUpgrade/DistUpgradeController.py:1688 +#: ../DistUpgrade/DistUpgradeController.py:1681 +#: ../DistUpgrade/DistUpgradeController.py:1729 +#: ../DistUpgrade/DistUpgradeController.py:1736 +#: ../DistUpgrade/DistUpgradeController.py:1747 msgid "Upgrade complete" msgstr "升级完成" -#: ../DistUpgrade/DistUpgradeController.py:1651 -#: ../DistUpgrade/DistUpgradeController.py:1699 -#: ../DistUpgrade/DistUpgradeController.py:1706 +#: ../DistUpgrade/DistUpgradeController.py:1682 +#: ../DistUpgrade/DistUpgradeController.py:1730 +#: ../DistUpgrade/DistUpgradeController.py:1737 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "升级已完成，但其间出现错误。" -#: ../DistUpgrade/DistUpgradeController.py:1635 +#: ../DistUpgrade/DistUpgradeController.py:1689 msgid "Searching for obsolete software" msgstr "正在搜索废弃的软件" -#: ../DistUpgrade/DistUpgradeController.py:1640 +#: ../DistUpgrade/DistUpgradeController.py:1698 msgid "System upgrade is complete." msgstr "系统升级完成" -#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1748 msgid "The partial upgrade was completed." msgstr "部分升级完成。" -#: ../DistUpgrade/DistUpgradeQuirks.py:168 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms 使用中" -#: ../DistUpgrade/DistUpgradeQuirks.py:169 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -674,26 +686,28 @@ msgstr "您的系统在 /proc/mounts 中使用“evms”卷管理器。“evms”软件不再被支持，请关闭它并重新运行升级。" #: ../DistUpgrade/DistUpgradeQuirks.py:496 -msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." -msgstr "您的显卡可能无法完整地被 Ubuntu 11.04 支持。" +msgid "" +"Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." +msgstr "Ubuntu 12.04 LTS 可能无法完全支持您的显卡。" #: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" -"The support in Ubuntu 11.04 for your intel graphics hardware is limited and " -"you may encounter problems after the upgrade. Do you want to continue with " -"the upgrade?" -msgstr "Ubuntu 11.04 对您的 intel 显卡支持有限。您可能在升级之后会遇到问题，确定要继续升级吗？" - -#: ../DistUpgrade/DistUpgradeQuirks.py:444 -#: ../DistUpgrade/DistUpgradeQuirks.py:472 -#: ../DistUpgrade/DistUpgradeQuirks.py:499 +"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " +"and you may encounter problems after the upgrade. For more information see " +"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to " +"continue with the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "升级过程可能会降低桌面特效，游戏性能以及对显示要求高的程序。" -#: ../DistUpgrade/DistUpgradeQuirks.py:448 -#: ../DistUpgrade/DistUpgradeQuirks.py:476 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -705,7 +719,7 @@ "\n" "您想继续吗？" -#: ../DistUpgrade/DistUpgradeQuirks.py:503 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -717,11 +731,11 @@ "\n" "您想继续吗？" -#: ../DistUpgrade/DistUpgradeQuirks.py:607 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "非 i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:608 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -731,11 +745,11 @@ "您的系统使用的是 i586 或是没有“cmov”扩展的 CPU。所有优化生成的软件包都需要最低 i686 的架构。这样的硬件无法升级到新的 Ubuntu " "发行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "没有 ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:531 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -745,11 +759,11 @@ "您的系统使用的是比 ARMv6 架构旧的 ARM CPU。karmic 中所有软件包构建时进行的优化都需要至少 ARMv6 的 CPU " "架构。在这种硬件基础上无法将您的系统升级到一个新的 Ubuntu 发行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:551 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "无可用的 init" -#: ../DistUpgrade/DistUpgradeQuirks.py:552 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -763,15 +777,15 @@ "\n" "您确定要继续吗？" -#: ../DistUpgrade/DistUpgradeMain.py:48 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "使用 aufs 进行沙盒升级" -#: ../DistUpgrade/DistUpgradeMain.py:50 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "使用所给的路径查找带升级包的 CD-ROM" -#: ../DistUpgrade/DistUpgradeMain.py:56 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -783,7 +797,7 @@ msgid "*DEPRECATED* this option will be ignored" msgstr "*已废弃* 这个选项将被忽略" -#: ../DistUpgrade/DistUpgradeMain.py:62 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "仅执行部分升级(不重写 sources.list)" @@ -791,39 +805,45 @@ msgid "Disable GNU screen support" msgstr "关闭对 GNU screen 的支持" -#: ../DistUpgrade/DistUpgradeMain.py:64 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "设置数据目录" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#: ../DistUpgrade/DistUpgradeViewKDE.py:190 +#: ../DistUpgrade/DistUpgradeViewGtk.py:114 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:117 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 #: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "请将 '%s' 插入光驱 '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:130 -#: ../DistUpgrade/DistUpgradeViewKDE.py:204 +#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:138 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "下载完成" -#: ../DistUpgrade/DistUpgradeViewGtk.py:142 -#: ../DistUpgrade/DistUpgradeViewKDE.py:217 +#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:149 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "正在下载文件 %li/%li 速度 %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:143 -#: ../DistUpgrade/DistUpgradeViewGtk.py:280 -#: ../DistUpgrade/DistUpgradeViewKDE.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:358 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:301 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "大约还要 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:145 -#: ../DistUpgrade/DistUpgradeViewKDE.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "下载第 %li 个文件(共 %li 个文件)" @@ -831,25 +851,29 @@ #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:177 -#: ../DistUpgrade/DistUpgradeViewKDE.py:254 +#: ../DistUpgrade/DistUpgradeViewGtk.py:183 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:186 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "正在应用更改" #. we do not report followup errors from earlier failures -#: ../DistUpgrade/DistUpgradeViewGtk.py:202 -#: ../DistUpgrade/DistUpgradeViewKDE.py:267 +#: ../DistUpgrade/DistUpgradeViewGtk.py:208 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:211 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "依赖关系问题 - 保持未配置状态" -#: ../DistUpgrade/DistUpgradeViewGtk.py:207 -#: ../DistUpgrade/DistUpgradeViewKDE.py:269 +#: ../DistUpgrade/DistUpgradeViewGtk.py:213 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:216 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "无法安装“%s”" -#: ../DistUpgrade/DistUpgradeViewGtk.py:208 -#: ../DistUpgrade/DistUpgradeViewKDE.py:270 +#: ../DistUpgrade/DistUpgradeViewGtk.py:214 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -857,8 +881,9 @@ msgstr "升级将继续进行，但“%s”可能没有工作。请考虑提交关于它的错误报告。" #. self.expander.set_expanded(True) -#: ../DistUpgrade/DistUpgradeViewGtk.py:225 -#: ../DistUpgrade/DistUpgradeViewKDE.py:291 +#: ../DistUpgrade/DistUpgradeViewGtk.py:231 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:234 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -867,20 +892,23 @@ "替换自定义配置文件\n" "“%s”吗？" -#: ../DistUpgrade/DistUpgradeViewGtk.py:226 -#: ../DistUpgrade/DistUpgradeViewKDE.py:292 +#: ../DistUpgrade/DistUpgradeViewGtk.py:232 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "如果选择替换为新版本的配置文件，您将会失去所有已做的修改。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:240 -#: ../DistUpgrade/DistUpgradeViewKDE.py:310 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:253 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "找不到 diff 命令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:445 -#: ../DistUpgrade/DistUpgradeViewText.py:88 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:469 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "出现致命错误" @@ -896,18 +924,21 @@ "upgrade/apt.log 。升级已取消。\n" "您的原始 sources.list 已保存在 /etc/apt/sources.list.distUpgrade 。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:487 msgid "Ctrl-c pressed" msgstr "Crtl+C 被按下" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:488 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "这将取消本次操作且可能使系统处于被破坏的状态。您确定要这样做？" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:611 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:621 msgid "To prevent data loss close all open applications and documents." msgstr "为防止数据丢失，请关闭所有打开的应用程序和文档。" @@ -948,47 +979,47 @@ msgstr "升级 (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:191 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 #: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "改变介质" -#: ../DistUpgrade/DistUpgradeViewKDE.py:322 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "显示差别 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:325 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 隐藏差别" -#: ../DistUpgrade/DistUpgradeViewKDE.py:539 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "错误" -#: ../DistUpgrade/DistUpgradeViewKDE.py:551 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "取消(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:553 -#: ../DistUpgrade/DistUpgradeViewKDE.py:792 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "关闭(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:599 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "显示终端 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:602 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 隐藏终端" -#: ../DistUpgrade/DistUpgradeViewKDE.py:682 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "信息" -#: ../DistUpgrade/DistUpgradeViewKDE.py:732 -#: ../DistUpgrade/DistUpgradeViewKDE.py:775 -#: ../DistUpgrade/DistUpgradeViewKDE.py:778 ../DistUpgrade/DistUpgrade.ui.h:11 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "细节" @@ -997,47 +1028,43 @@ msgid "No longer supported %s" msgstr "不再支持 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:627 -#: ../DistUpgrade/DistUpgradeViewKDE.py:758 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:632 -#: ../DistUpgrade/DistUpgradeViewKDE.py:760 -#: ../DistUpgrade/DistUpgradeViewText.py:169 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "移除(被自动安装的) %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:635 -#: ../DistUpgrade/DistUpgradeViewKDE.py:762 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "安装 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:637 -#: ../DistUpgrade/DistUpgradeViewKDE.py:764 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "升级 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:788 -#: ../DistUpgrade/DistUpgradeViewText.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeViewKDE.py:788 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "重新启动系统以完成升级" -#: ../DistUpgrade/DistUpgradeViewKDE.py:791 ../DistUpgrade/DistUpgrade.ui.h:25 -#: ../data/glade/UpdateManager.ui.h:31 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:26 msgid "_Restart Now" msgstr "现在重启(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1048,29 +1075,29 @@ "\n" "如果取消升级系统可能不稳定，强烈建议您继续升级。" -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "取消升级？" -#: ../DistUpgrade/DistUpgradeView.py:60 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 天" -#: ../DistUpgrade/DistUpgradeView.py:62 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 小时" -#: ../DistUpgrade/DistUpgradeView.py:64 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 分钟" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1085,7 +1112,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:78 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1099,14 +1126,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:93 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:128 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1114,28 +1141,28 @@ msgstr "使用 1Mbit 的 DSL 连接下载需要大约 %s 秒的时间， 使用 56K 的调制解调器连接大约需要 %s 秒时间。" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:132 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "根据您的连接速度，这次下载将要用大约 %s 的时间 " -#: ../DistUpgrade/DistUpgradeView.py:234 ../DistUpgrade/DistUpgrade.ui.h:16 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "正在准备升级" -#: ../DistUpgrade/DistUpgradeView.py:235 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "获得新的软件源" -#: ../DistUpgrade/DistUpgradeView.py:236 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "获取新的软件包" -#: ../DistUpgrade/DistUpgradeView.py:237 ../DistUpgrade/DistUpgrade.ui.h:15 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "正在安装升级" -#: ../DistUpgrade/DistUpgradeView.py:238 ../DistUpgrade/DistUpgrade.ui.h:10 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "正在清理" @@ -1151,25 +1178,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:322 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "将删除 %d 个软件包。" -#: ../DistUpgrade/DistUpgradeView.py:327 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "将安装 %d 个新的软件包。" -#: ../DistUpgrade/DistUpgradeView.py:333 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "将升级 %d 个软件包。" -#: ../DistUpgrade/DistUpgradeView.py:338 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1201,17 +1228,17 @@ msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:349 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "你的系统没有可用升级。升级被取消。" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:363 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。您要现在重启么？" @@ -1228,10 +1255,10 @@ msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:132 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:133 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:132 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:133 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "不能运行升级工具" @@ -1242,66 +1269,66 @@ "using the command 'ubuntu-bug update-manager'." msgstr "这可能是升级工具的一个 bug，请使用命令‘ubuntu-bug update-manager’来报告这个 bug。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:202 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:202 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "升级工具签名" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:205 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:205 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "升级工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "下载失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:235 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:235 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "获取升级信息失败。可能网络有问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:239 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:239 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "认证失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:240 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:240 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "认证升级信息失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:245 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:245 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "提取失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:246 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:246 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "提取升级信息失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:251 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:251 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "验证失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "验证升级程序失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:266 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:272 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:272 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "不能运行升级" @@ -1312,8 +1339,8 @@ "remount without noexec and run the upgrade again." msgstr "可能的原因是系统的 /tmp 目录无可执行权限。请以可执行权限重新挂载该目录，重新升级。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "错误信息是“%s”。" @@ -1329,11 +1356,11 @@ "upgrade/apt.log 。升级已取消。\n" "您的原始 sources.list 已保存在 /etc/apt/sources.list.distUpgrade 。" -#: ../DistUpgrade/DistUpgradeViewText.py:113 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "中止" -#: ../DistUpgrade/DistUpgradeViewText.py:118 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "降级：\n" @@ -1341,33 +1368,33 @@ msgid "To continue please press [ENTER]" msgstr "按 [ENTER] 键以继续" -#: ../DistUpgrade/DistUpgradeViewText.py:150 -#: ../DistUpgrade/DistUpgradeViewText.py:183 -#: ../DistUpgrade/DistUpgradeViewText.py:190 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "继续 [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:150 -#: ../DistUpgrade/DistUpgradeViewText.py:183 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "详细信息[d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:154 -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:200 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:160 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" @@ -1376,26 +1403,26 @@ msgid "No longer supported: %s\n" msgstr "不再支持：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:165 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "移除：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:175 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "安装：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:180 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "升级：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:197 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "继续 [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:218 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1403,15 +1430,15 @@ "为了完成升级，必须重新启动。\n" "如果你选择“是”，系统将会重新启动。" -#: ../DistUpgrade/DistUpgrade.ui.h:20 +#: ../DistUpgrade/DistUpgrade.ui.h:1 msgid "_Cancel Upgrade" msgstr "取消升级(_C)" -#: ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgrade.ui.h:2 msgid "_Resume Upgrade" msgstr "恢复升级(_R)" -#: ../DistUpgrade/DistUpgrade.ui.h:2 +#: ../DistUpgrade/DistUpgrade.ui.h:3 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1421,31 +1448,31 @@ "取消正在运行的升级？\n" "如果您取消升级，系统可能不稳定。强烈建议您继续升级。" -#: ../DistUpgrade/DistUpgrade.ui.h:27 +#: ../DistUpgrade/DistUpgrade.ui.h:6 msgid "_Start Upgrade" msgstr "开始升级(_R)" -#: ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgrade.ui.h:9 msgid "_Replace" msgstr "替换(_R)" -#: ../DistUpgrade/DistUpgrade.ui.h:12 +#: ../DistUpgrade/DistUpgrade.ui.h:10 msgid "Difference between the files" msgstr "文件之间的差别" -#: ../DistUpgrade/DistUpgrade.ui.h:24 +#: ../DistUpgrade/DistUpgrade.ui.h:11 msgid "_Report Bug" msgstr "报告 Bug(_R)" -#: ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgrade.ui.h:12 msgid "_Continue" msgstr "继续(_C)" -#: ../DistUpgrade/DistUpgrade.ui.h:8 +#: ../DistUpgrade/DistUpgrade.ui.h:13 msgid "Start the upgrade?" msgstr "开始升级？" -#: ../DistUpgrade/DistUpgrade.ui.h:5 +#: ../DistUpgrade/DistUpgrade.ui.h:15 msgid "" "Restart the system to complete the upgrade\n" "\n" @@ -1455,7 +1482,7 @@ "\n" "请在继续前保存你的工作。" -#: ../DistUpgrade/DistUpgrade.ui.h:13 +#: ../DistUpgrade/DistUpgrade.ui.h:18 msgid "Distribution Upgrade" msgstr "发行版升级" @@ -1463,46 +1490,46 @@ msgid "Upgrading Ubuntu to version 12.04" msgstr "" -#: ../DistUpgrade/DistUpgrade.ui.h:1 +#: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " msgstr " " -#: ../DistUpgrade/DistUpgrade.ui.h:18 +#: ../DistUpgrade/DistUpgrade.ui.h:22 msgid "Setting new software channels" msgstr "设定新的软件源" -#: ../DistUpgrade/DistUpgrade.ui.h:17 +#: ../DistUpgrade/DistUpgrade.ui.h:24 msgid "Restarting the computer" msgstr "系统正在重新启动" -#: ../DistUpgrade/DistUpgrade.ui.h:19 +#: ../DistUpgrade/DistUpgrade.ui.h:27 msgid "Terminal" msgstr "终端" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:42 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "请稍候，这需要花一些时间。" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:44 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/DistUpgradeFetcher.py:85 +#: ../UpdateManager/DistUpgradeFetcher.py:108 #: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "无法找到发行注记" -#: ../UpdateManager/DistUpgradeFetcher.py:86 +#: ../UpdateManager/DistUpgradeFetcher.py:109 #: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "服务器可能已过载。 " -#: ../UpdateManager/DistUpgradeFetcher.py:96 +#: ../UpdateManager/DistUpgradeFetcher.py:119 #: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "无法下载发行说明" -#: ../UpdateManager/DistUpgradeFetcher.py:97 +#: ../UpdateManager/DistUpgradeFetcher.py:120 #: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "请检查您的互联网连接。" @@ -1513,8 +1540,8 @@ msgstr "升级" #: ../UpdateManager/DistUpgradeFetcherKDE.py:89 -#: ../data/glade/UpdateManager.ui.h:12 -#: ../data/glade/UpgradePromptDialog.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:20 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "发行注记" @@ -1534,20 +1561,20 @@ msgid "File %s of %s" msgstr "文件 %s/%s" -#: ../UpdateManager/ChangelogViewer.py:70 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "在浏览器中打开链接" -#: ../UpdateManager/ChangelogViewer.py:72 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "复制链接到剪贴板" -#: ../UpdateManager/GtkProgress.py:116 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下载文件 %(current)li/%(total)li 速度 %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:121 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下载文件 %(current)li/%(total)li" @@ -1559,14 +1586,24 @@ #: ../UpdateManager/UpdateManager.py:105 msgid "" "You will not get any further security fixes or critical updates. Please " -"upgrade to a later version of Ubuntu Linux." -msgstr "您不会再收到任何安全更新。请升级到更新版本的 Ubuntu。" +"upgrade to a later version of Ubuntu." +msgstr "" -#: ../UpdateManager/UpdateManager.py:827 +#: ../UpdateManager/UpdateManager.py:113 msgid "Upgrade information" msgstr "升级信息" -#: ../UpdateManager/UpdateManager.py:308 +#: ../UpdateManager/UpdateManager.py:226 +#: ../UpdateManagerText/UpdateManagerText.py:32 +msgid "Install" +msgstr "安装" + +#: ../UpdateManager/UpdateManager.py:228 +msgid "Name" +msgstr "" + +#. upload_archive = version_match.group(2).strip() +#: ../UpdateManager/UpdateManager.py:388 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" @@ -1576,7 +1613,7 @@ "No network connection detected, you can not download changelog information." msgstr "未检测到网络连接，您无法下载更新日志。" -#: ../UpdateManager/UpdateManager.py:365 +#: ../UpdateManager/UpdateManager.py:453 msgid "Downloading list of changes..." msgstr "正在下载更新列表..." @@ -1660,7 +1697,8 @@ msgid "The package information was just updated." msgstr "该软件包信息刚刚更新。" -#: ../UpdateManager/UpdateManager.py:505 ../data/glade/UpdateManager.ui.h:23 +#: ../UpdateManager/UpdateManager.py:669 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -1670,41 +1708,21 @@ msgid "Software updates may be available for your computer." msgstr "您的计算机有可用的软件更新。" -#: ../UpdateManager/UpdateManager.py:524 +#: ../UpdateManager/UpdateManager.py:696 msgid "Welcome to Ubuntu" msgstr "欢迎使用 Ubuntu" -#: ../UpdateManager/UpdateManager.py:698 +#: ../UpdateManager/UpdateManager.py:697 msgid "" "These software updates have been issued since this version of Ubuntu was " -"released. If you don't want to install them now, choose \"Update Manager\" " -"from Applications later." -msgstr "这些软件的更新在该版本的 Ubuntu 发行之后被证明有问题。如果您不想现在安装它们，可以在稍后从系统应用“更新管理器”中选择安装。" +"released." +msgstr "" #: ../UpdateManager/UpdateManager.py:700 -msgid "" -"These software updates have been issued since this version of Ubuntu was " -"released. If you don't want to install them now, choose \"Update Manager\" " -"from the Administration Menu later." -msgstr "这些软件的更新在该版本的 Ubuntu 发行之后被证明有问题。如果您不想现在安装它们，可以在稍后从管理员菜单“更新管理器”中选择安装。" - -#: ../UpdateManager/UpdateManager.py:528 -msgid "Software updates are available for this computer" -msgstr "有适合当前系统的软件更新" - -#: ../UpdateManager/UpdateManager.py:705 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from " -"Applications later." -msgstr "如果您不想现在安装，可以今后再从应用程序中打开“更新管理器”。" - -#: ../UpdateManager/UpdateManager.py:529 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from the " -"Administration menu later." -msgstr "如果您不想现在安装，稍后可以在“系统管理”菜单选择“更新管理器”进行安装。" +msgid "Software updates are available for this computer." +msgstr "" -#: ../UpdateManager/UpdateManager.py:578 +#: ../UpdateManager/UpdateManager.py:751 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1714,30 +1732,29 @@ "这个更新需要花去 %s 磁盘上总计 %s 的空间。请在 %s 磁盘上流出 %s 空间。清空您的回收站和临时文件，用“sudo apt-get " "clean”清理以前的安装文件。" -#: ../data/glade/UpdateManager.ui.h:24 +#: ../UpdateManager/UpdateManager.py:776 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "计算机需要重新启动来完成更新。请在继续操作前保存好您的工作。" -#: ../UpdateManager/UpdateManager.py:637 -#: ../UpdateManagerHildon/UpdateManagerHildon.py:114 +#: ../UpdateManager/UpdateManager.py:840 msgid "Reading package information" msgstr "读取软件包信息" -#: ../UpdateManager/UpdateManager.py:863 +#: ../UpdateManager/UpdateManager.py:855 msgid "Connecting..." msgstr "正在连接..." -#: ../UpdateManager/UpdateManager.py:880 +#: ../UpdateManager/UpdateManager.py:872 msgid "You may not be able to check for updates or download new updates." msgstr "您可能无法检查更新或下载新的更新。" -#: ../UpdateManager/UpdateManager.py:750 +#: ../UpdateManager/UpdateManager.py:996 msgid "Could not initialize the package information" msgstr "无法初始化软件包信息" -#: ../UpdateManager/UpdateManager.py:751 +#: ../UpdateManager/UpdateManager.py:997 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1749,7 +1766,7 @@ "\n" "请汇报这个“update-manager”软件包的错误，并且将如下信息包含在报告中：\n" -#: ../UpdateManager/UpdateManager.py:773 +#: ../UpdateManager/UpdateManager.py:1026 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1760,53 +1777,52 @@ "\n" "请汇报这个有关“update-manager”软件包的错误，并且将下列错误信息包含在错误报告中：" -#: ../UpdateManager/UpdateManager.py:796 +#: ../UpdateManager/UpdateManager.py:1051 msgid " (New install)" msgstr " (新安装)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:800 +#: ../UpdateManager/UpdateManager.py:1058 #, python-format msgid "(Size: %s)" msgstr "(大小：%s)" -#: ../UpdateManager/UpdateManager.py:802 +#: ../UpdateManager/UpdateManager.py:1060 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "从版本 %(old_version)s 到 %(new_version)s" -#: ../UpdateManager/UpdateManager.py:806 +#: ../UpdateManager/UpdateManager.py:1064 #, python-format msgid "Version %s" msgstr "版本 %s" -#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:107 +#: ../UpdateManager/UpdateManager.py:1095 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "版本升级目前不可用" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108 +#: ../UpdateManager/UpdateManager.py:1096 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "发行版目前无法更新，请再试一次。服务器报告：'%s'" -#. print "on_button_dist_upgrade_clicked" -#: ../UpdateManager/UpdateManager.py:847 ../check-new-release-gtk:87 +#: ../UpdateManager/UpdateManager.py:1098 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "正在下载发布升级工具" -#: ../UpdateManager/UpdateManager.py:854 +#: ../UpdateManager/UpdateManager.py:1105 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "新的 Ubuntu 发行版 %s 可用" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:893 +#: ../UpdateManager/UpdateManager.py:1144 msgid "Software index is broken" msgstr "软件索引已经损坏" -#: ../UpdateManager/UpdateManager.py:894 +#: ../UpdateManager/UpdateManager.py:1145 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 " @@ -1821,14 +1837,10 @@ msgid "Install All Available Updates" msgstr "安装全部可利用的更新" -#: ../UpdateManagerText/UpdateManagerText.py:26 +#: ../UpdateManagerText/UpdateManagerText.py:31 msgid "Cancel" msgstr "取消" -#: ../UpdateManagerText/UpdateManagerText.py:27 -msgid "Install" -msgstr "安装" - #: ../UpdateManagerText/UpdateManagerText.py:34 msgid "Changelog" msgstr "" @@ -1837,11 +1849,11 @@ msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:45 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "正在建立更新列表" -#: ../UpdateManagerText/UpdateManagerText.py:48 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1865,11 +1877,11 @@ " * 不是由 Ubuntu 提供的非官方软件包\n" " * Ubuntu 预发行版本的普通更改" -#: ../UpdateManagerText/UpdateManagerText.py:117 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "正在下载变更日志" -#: ../UpdateManager/Core/MyCache.py:124 +#: ../UpdateManager/Core/MyCache.py:130 #, python-format msgid "Other updates (%s)" msgstr "其它更新 (%s)" @@ -1891,7 +1903,7 @@ msgid "This update does not come from a source that supports changelogs." msgstr "更新不是来源于支持日志变更的源。" -#: ../UpdateManager/Core/MyCache.py:297 +#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1899,7 +1911,7 @@ "无法下载更新列表。 \n" "请检查您的网络连接。" -#: ../UpdateManager/Core/MyCache.py:286 +#: ../UpdateManager/Core/MyCache.py:315 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1912,7 +1924,7 @@ "请访问 http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "直到变更可用或再试一遍。" -#: ../UpdateManager/Core/MyCache.py:291 +#: ../UpdateManager/Core/MyCache.py:320 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1925,52 +1937,52 @@ "请使用 http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "直到能够访问该列表或稍后再试。" -#: ../UpdateManager/Core/UpdateList.py:50 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "检测发行版失败" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "检查您正在使用哪种系统的时候发生一个错误 “%s”。" -#: ../UpdateManager/Core/UpdateList.py:62 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "重要安全更新" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "推荐更新" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "提前释放的更新" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "发行版升级" -#: ../UpdateManager/Core/UpdateList.py:71 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "其它更新" -#: ../data/glade/UpdateManager.ui.h:6 +#: ../data/gtkbuilder/UpdateManager.ui.h:1 msgid "Starting Update Manager" msgstr "运行升级管理器" -#: ../data/glade/UpdateManager.ui.h:30 +#: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "部分升级(_P)" -#: ../data/glade/UpdateManager.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:4 msgid "Not all updates can be installed" msgstr "没有更新可供安装" -#: ../data/glade/UpdateManager.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:5 msgid "" "Run a partial upgrade, to install as many updates as possible. \n" "\n" @@ -1988,11 +2000,11 @@ " *Ubuntu 不支持的非官方软件包\n" " *Ubuntu 预发布版本的正常变动" -#: ../data/glade/UpdateManager.ui.h:8 +#: ../data/gtkbuilder/UpdateManager.ui.h:12 msgid "Chec_k" msgstr "检查(_K)" -#: ../data/glade/UpdateManager.ui.h:1 +#: ../data/gtkbuilder/UpdateManager.ui.h:13 msgid "" "You must check for updates manually\n" "\n" @@ -2003,33 +2015,33 @@ "\n" "您的系统未自动检测升级，可以通过编辑软件源在网络升级中更改。" -#: ../data/glade/UpdateManager.ui.h:28 +#: ../data/gtkbuilder/UpdateManager.ui.h:16 msgid "_Hide this information in the future" msgstr "不再显示该信息(_H)" -#: ../data/glade/UpdateManager.ui.h:9 +#: ../data/gtkbuilder/UpdateManager.ui.h:17 msgid "Co_ntinue" msgstr "继续(_N)" -#: ../data/glade/UpdateManager.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:18 msgid "Running on battery" msgstr "电池供电" -#: ../data/glade/UpdateManager.ui.h:27 +#: ../data/gtkbuilder/UpdateManager.ui.h:19 msgid "Your system is running on battery. Are you sure you want to continue?" msgstr "您的系统正在使用电池。 您确定要继续吗？" -#: ../data/glade/UpdateManager.ui.h:32 +#: ../data/gtkbuilder/UpdateManager.ui.h:21 msgid "_Upgrade" msgstr "升级(_U)" -#: ../data/glade/UpdateManager.ui.h:22 -#: ../data/glade/UpgradePromptDialog.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:22 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8 msgid "Show progress of individual files" msgstr "显示单个文件进度" -#: ../data/glade/UpdateManager.ui.h:26 ../data/update-manager.desktop.in.h:3 -#: ../data/update-manager-hildon.desktop.in.h:3 +#: ../data/gtkbuilder/UpdateManager.ui.h:23 +#: ../data/update-manager.desktop.in.h:1 msgid "Update Manager" msgstr "更新管理器" @@ -2037,11 +2049,11 @@ msgid "Starting Update Manager" msgstr "正在启动更新管理器" -#: ../data/glade/UpdateManager.ui.h:25 +#: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "升级(_P)" -#: ../data/glade/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "updates" msgstr "更新" @@ -2059,19 +2071,19 @@ msgid "It’s safer to connect the computer to AC power before updating." msgstr "在更新前最好将计算机连接电源。" -#: ../data/glade/UpdateManager.ui.h:29 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "_Install Updates" msgstr "安装更新(_I)" -#: ../data/glade/UpdateManager.ui.h:7 +#: ../data/gtkbuilder/UpdateManager.ui.h:32 msgid "Changes" msgstr "变更" -#: ../data/glade/UpdateManager.ui.h:10 +#: ../data/gtkbuilder/UpdateManager.ui.h:33 msgid "Description" msgstr "描述" -#: ../data/glade/UpdateManager.ui.h:11 +#: ../data/gtkbuilder/UpdateManager.ui.h:34 msgid "Description of update" msgstr "升级描述" @@ -2079,68 +2091,66 @@ msgid "_Settings..." msgstr "设置(_S)..." -#: ../data/glade/UpgradePromptDialog.ui.h:1 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "" "A new version of Ubuntu is available. Would you like to upgrade?" msgstr "有新版本的 Ubuntu 可用。您想升级吗？" -#: ../data/glade/UpgradePromptDialog.ui.h:3 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3 msgid "Don't Upgrade" msgstr "不升级" -#: ../data/glade/UpgradePromptDialog.ui.h:2 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4 msgid "Ask Me Later" msgstr "稍后询问" -#: ../data/glade/UpgradePromptDialog.ui.h:6 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5 msgid "Yes, Upgrade Now" msgstr "是的，现在就升级" -#: ../data/glade/UpgradePromptDialog.ui.h:8 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6 msgid "You have declined to upgrade to the new Ubuntu" msgstr "您已经拒绝升级到新版本的 Ubuntu" -#: ../data/glade/UpgradePromptDialog.ui.h:7 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" "You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "如果您希望以后再升级，可以打开更新管理器，然后点击“升级”。" #: ../data/update-manager.desktop.in.h:2 -#: ../data/update-manager-hildon.desktop.in.h:2 msgid "Software Updates" msgstr "软件更新" -#: ../data/update-manager.desktop.in.h:1 -#: ../data/update-manager-hildon.desktop.in.h:1 +#: ../data/update-manager.desktop.in.h:3 msgid "Show and install available updates" msgstr "显示并安装可用更新" -#: ../update-manager:53 ../do-release-upgrade:33 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "显示版本并退出" -#: ../update-manager:56 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "包含数据文件的文件夹" -#: ../update-manager:59 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "检查是否有新的 Ubuntu 发行版可用" -#: ../update-manager:62 ../do-release-upgrade:36 ../check-new-release-gtk:138 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "验证是否能够升级到最新版本" -#: ../update-manager:66 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "升级到最新版本的 Ubuntu" -#: ../update-manager:73 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "开始时焦点不要定位在图上" -#: ../update-manager:76 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "尝试进行版本升级" @@ -2148,11 +2158,11 @@ msgid "Do not check for updates when starting" msgstr "启动时不检查更新" -#: ../update-manager:80 ../do-release-upgrade:52 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "进行带沙盒 aufs 隔离层的测试升级" -#: ../update-manager:100 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "运行部分升级" @@ -2160,12 +2170,12 @@ msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:40 ../check-new-release-gtk:142 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "尝试通过 $distro-proposed 更新到最新版本。" -#: ../do-release-upgrade:44 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2174,11 +2184,11 @@ "以特定模式升级。\n" "目前支持：用“桌面”为桌面系统，“服务器”为服务器系统升级。" -#: ../do-release-upgrade:50 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "运行指定的前端" -#: ../do-release-upgrade:55 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2196,24 +2206,24 @@ "要获得关于升级的信息，请访问：\n" "%(url)s\n" -#: ../do-release-upgrade:79 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "未发现新版本" -#: ../do-release-upgrade:84 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "有新版本“%s”可供使用" -#: ../do-release-upgrade:85 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "运行“do-release-upgrade”来升级到新版本。" -#: ../check-new-release-gtk:67 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s 升级可用" -#: ../check-new-release-gtk:103 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "您已经拒绝升级到 Ubuntu %s" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/upower.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/upower.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/upower.po 2012-02-23 07:12:08.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/upower.po 2012-03-23 07:33:29.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: 2012-02-22 01:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:11+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../policy/org.freedesktop.upower.policy.in.h:1 msgid "Authentication is required to hibernate the system" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/upstart.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/upstart.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/upstart.po 2012-02-23 07:11:53.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/upstart.po 2012-03-23 07:33:14.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: 2012-02-21 22:41+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:06+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: init/conf.c:356 init/session.c:337 msgid "Unable to load configuration" @@ -63,7 +63,7 @@ msgid "Disconnected from system bus" msgstr "断开和系统总线的连接" -#: init/control.c:370 init/main.c:830 +#: init/control.c:370 init/main.c:694 msgid "Reloading configuration" msgstr "正在重新加载配置" @@ -76,8 +76,8 @@ msgid "Unknown job: %s" msgstr "未知任务: %s" -#: init/control.c:574 init/job_class.c:550 init/job_class.c:749 -#: init/job_class.c:879 init/job_class.c:1014 +#: init/control.c:574 init/job_class.c:552 init/job_class.c:762 +#: init/job_class.c:902 init/job_class.c:1037 msgid "Env must be KEY=VALUE pairs" msgstr "环境变量必须是 KEY=VALUE 对" @@ -171,98 +171,98 @@ msgid "Event failed" msgstr "事件失败" -#: init/job.c:235 +#: init/job.c:246 #, c-format msgid "%s goal changed from %s to %s" msgstr "%s 目标由 %s 变为 %s" -#: init/job.c:306 +#: init/job.c:317 #, c-format msgid "%s state changed from %s to %s" msgstr "%s 状态由 %s 变为 %s" -#: init/job.c:725 init/job.c:763 +#: init/job.c:736 init/job.c:774 msgid "Job failed to start" msgstr "启动作业失败" -#: init/job.c:738 init/job.c:774 +#: init/job.c:749 init/job.c:785 msgid "Job failed while stopping" msgstr "停止作业时失败" -#: init/job.c:750 init/job.c:785 +#: init/job.c:761 init/job.c:796 msgid "Job failed to restart" msgstr "重启作业失败" -#: init/job.c:979 +#: init/job.c:990 msgid "stop" msgstr "停止" -#: init/job.c:981 +#: init/job.c:992 msgid "start" msgstr "开始" -#: init/job.c:983 +#: init/job.c:994 msgid "respawn" msgstr "重产生" -#: init/job.c:1028 +#: init/job.c:1039 msgid "waiting" msgstr "正在等待" -#: init/job.c:1030 +#: init/job.c:1041 msgid "starting" msgstr "开始" -#: init/job.c:1032 init/process.c:80 +#: init/job.c:1043 init/process.c:80 msgid "pre-start" msgstr "预启动" -#: init/job.c:1034 +#: init/job.c:1045 msgid "spawned" msgstr "已产生" -#: init/job.c:1036 init/process.c:82 +#: init/job.c:1047 init/process.c:82 msgid "post-start" msgstr "启动后" -#: init/job.c:1038 +#: init/job.c:1049 msgid "running" msgstr "正在运行" -#: init/job.c:1040 init/process.c:84 +#: init/job.c:1051 init/process.c:84 msgid "pre-stop" msgstr "结束前" -#: init/job.c:1042 +#: init/job.c:1053 msgid "stopping" msgstr "正在停止" -#: init/job.c:1044 +#: init/job.c:1055 msgid "killed" msgstr "杀死" -#: init/job.c:1046 init/process.c:86 +#: init/job.c:1057 init/process.c:86 msgid "post-stop" msgstr "结束后" -#: init/job.c:1129 init/job.c:1204 init/job.c:1280 init/job_class.c:741 -#: init/job_class.c:871 init/job_class.c:1006 +#: init/job.c:1140 init/job.c:1215 init/job.c:1291 init/job_class.c:754 +#: init/job_class.c:894 init/job_class.c:1029 #, c-format msgid "You do not have permission to modify job: %s" msgstr "你无权变更此作业: %s" -#: init/job.c:1137 init/job_class.c:795 +#: init/job.c:1148 init/job_class.c:818 #, c-format msgid "Job is already running: %s" msgstr "作业已运行：%s" -#: init/job.c:1212 init/job.c:1288 init/job_class.c:925 init/job_class.c:1059 +#: init/job.c:1223 init/job.c:1299 init/job_class.c:948 init/job_class.c:1082 #, c-format msgid "Job has already been stopped: %s" msgstr "作业已停止：%s" -#: init/job_class.c:587 init/job_class.c:632 init/job_class.c:917 -#: init/job_class.c:1051 +#: init/job_class.c:600 init/job_class.c:645 init/job_class.c:940 +#: init/job_class.c:1074 #, c-format msgid "Unknown instance: %s" msgstr "未知实例： %s" @@ -285,302 +285,302 @@ msgid "No available ptys" msgstr "" -#: init/job_process.c:491 +#: init/job_process.c:516 #, c-format msgid "Pausing %s (%d) [pre-exec] for debug" msgstr "" -#: init/job_process.c:686 +#: init/job_process.c:718 #, c-format msgid "Failed to open system console: %s" msgstr "无法打开系统控制台： %s" -#: init/job_process.c:992 +#: init/job_process.c:1026 #, c-format msgid "unable to move script fd: %s" msgstr "" -#: init/job_process.c:997 +#: init/job_process.c:1031 #, c-format msgid "unable to open console: %s" msgstr "无法打开控制台：%s" -#: init/job_process.c:1052 +#: init/job_process.c:1086 #, c-format msgid "unable to set \"%s\" resource limit: %s" msgstr "无法设置 “%s” 资源限制：%s" -#: init/job_process.c:1057 +#: init/job_process.c:1091 #, c-format msgid "unable to set priority: %s" msgstr "无法设置优先级：%s" -#: init/job_process.c:1062 +#: init/job_process.c:1096 #, c-format msgid "unable to set oom adjustment: %s" msgstr "无法设置 oom 调整：%s" -#: init/job_process.c:1067 +#: init/job_process.c:1101 #, c-format msgid "unable to change root directory: %s" msgstr "无法更改根目录：%s" -#: init/job_process.c:1072 +#: init/job_process.c:1106 #, c-format msgid "unable to change working directory: %s" msgstr "无法更改工作目录：%s" -#: init/job_process.c:1077 +#: init/job_process.c:1111 #, c-format msgid "unable to set trace: %s" msgstr "无法设置路径：%s" -#: init/job_process.c:1082 +#: init/job_process.c:1116 #, c-format msgid "unable to execute: %s" msgstr "无法执行：%s" -#: init/job_process.c:1087 +#: init/job_process.c:1121 #, c-format msgid "unable to getpwnam: %s" msgstr "" -#: init/job_process.c:1092 +#: init/job_process.c:1126 #, c-format msgid "unable to getgrnam: %s" msgstr "" -#: init/job_process.c:1097 +#: init/job_process.c:1131 msgid "unable to find setuid user" msgstr "" -#: init/job_process.c:1101 +#: init/job_process.c:1135 msgid "unable to find setgid group" msgstr "" -#: init/job_process.c:1105 +#: init/job_process.c:1139 #, c-format msgid "unable to setuid: %s" msgstr "" -#: init/job_process.c:1110 +#: init/job_process.c:1144 #, c-format msgid "unable to setgid: %s" msgstr "" -#: init/job_process.c:1115 +#: init/job_process.c:1149 #, c-format msgid "unable to chown: %s" msgstr "" -#: init/job_process.c:1120 +#: init/job_process.c:1154 #, c-format msgid "unable to open pt master: %s" msgstr "" -#: init/job_process.c:1125 +#: init/job_process.c:1159 #, c-format msgid "unable to unlockpt: %s" msgstr "" -#: init/job_process.c:1130 +#: init/job_process.c:1164 #, c-format msgid "unable to get ptsname: %s" msgstr "" -#: init/job_process.c:1135 +#: init/job_process.c:1169 #, c-format msgid "unable to open pt slave: %s" msgstr "" -#: init/job_process.c:1166 init/job_process.c:1216 +#: init/job_process.c:1200 init/job_process.c:1250 #, c-format msgid "Sending %s signal to %s %s process (%d)" msgstr "" -#: init/job_process.c:1175 init/job_process.c:1225 +#: init/job_process.c:1209 init/job_process.c:1259 #, c-format msgid "Failed to send %s signal to %s %s process (%d): %s" msgstr "" -#: init/job_process.c:1286 +#: init/job_process.c:1320 #, c-format msgid "%s %s process (%d) terminated with status %d" msgstr "%s %s 进程 (%d)以状态 %d 结束" -#: init/job_process.c:1291 +#: init/job_process.c:1325 #, c-format msgid "%s %s process (%d) exited normally" msgstr "%s %s 进程 (%d) 正常退出" -#: init/job_process.c:1306 +#: init/job_process.c:1340 #, c-format msgid "%s %s process (%d) killed by %s signal" msgstr "%s %s 进程 (%d)已经被%s 信号杀死" -#: init/job_process.c:1310 +#: init/job_process.c:1344 #, c-format msgid "%s %s process (%d) killed by signal %d" msgstr "%s %s 进程 (%d)已经被信号 %d杀死" -#: init/job_process.c:1324 +#: init/job_process.c:1358 #, c-format msgid "%s %s process (%d) stopped by %s signal" msgstr "%s %s 进程 (%d) 已通过 %s 信号暂停(stopped)" -#: init/job_process.c:1328 +#: init/job_process.c:1362 #, c-format msgid "%s %s process (%d) stopped by signal %d" msgstr "%s %s 进程 (%d) 已通过信号 %d 暂停(stopped)" -#: init/job_process.c:1342 +#: init/job_process.c:1376 #, c-format msgid "%s %s process (%d) continued by %s signal" msgstr "%s %s 进程 (%d) 已通过 %s 信号继续运行" -#: init/job_process.c:1346 +#: init/job_process.c:1380 #, c-format msgid "%s %s process (%d) continued by signal %d" msgstr "%s %s 进程 (%d) 已通过信号 %d 继续运行" -#: init/job_process.c:1481 +#: init/job_process.c:1515 #, c-format msgid "%s respawning too fast, stopped" msgstr "%s 重新建立过快，停止" -#: init/job_process.c:1487 +#: init/job_process.c:1521 #, c-format msgid "%s %s process ended, respawning" msgstr "%s %s 进程结束, 重新产生" -#: init/job_process.c:1727 +#: init/job_process.c:1787 #, c-format msgid "Failed to set ptrace options for %s %s process (%d): %s" msgstr "为 %s %s 进程 (%d) 设置 ptrace 选项失败：%s" -#: init/job_process.c:1740 init/job_process.c:1935 +#: init/job_process.c:1800 init/job_process.c:1995 #, c-format msgid "Failed to continue traced %s %s process (%d): %s" msgstr "继续追踪 %s %s 进程 (%d) 失败：%s" -#: init/job_process.c:1780 init/job_process.c:1871 init/job_process.c:1926 +#: init/job_process.c:1840 init/job_process.c:1931 init/job_process.c:1986 #, c-format msgid "Failed to detach traced %s %s process (%d): %s" msgstr "分离对 %s %s 进程 (%d) 的追踪失败：%s" -#: init/job_process.c:1820 +#: init/job_process.c:1880 #, c-format msgid "Failed to deliver signal to traced %s %s process (%d): %s" msgstr "传送用以追踪 %s %s 进程 (%d) 的信号失败：%s" -#: init/job_process.c:1855 +#: init/job_process.c:1915 #, c-format msgid "Failed to obtain child process id for %s %s process (%d): %s" msgstr "为 %s %s 进程 (%d) 进程获得子进程 ID 失败：%s" -#: init/job_process.c:1862 +#: init/job_process.c:1922 #, c-format msgid "%s %s process (%d) became new process (%d)" msgstr "%s %s 进程 (%d) 变为新进程 (%d)" -#: init/job_process.c:1921 +#: init/job_process.c:1981 #, c-format msgid "%s %s process (%d) executable changed" msgstr "%s %s 进程 (%d) 可执行性已设置" -#: init/log.c:260 +#: init/log.c:350 msgid "Failed to write to log file" msgstr "" -#: init/main.c:135 +#: init/main.c:131 msgid "specify alternative directory to load configuration files from" msgstr "" -#: init/main.c:138 +#: init/main.c:134 msgid "default value for console stanza" msgstr "" -#: init/main.c:141 +#: init/main.c:137 msgid "specify alternative directory to store job output logs in" msgstr "" -#: init/main.c:144 +#: init/main.c:140 msgid "disable job logging" msgstr "" -#: init/main.c:147 +#: init/main.c:143 msgid "disable user and chroot sessions" msgstr "" -#: init/main.c:150 +#: init/main.c:146 msgid "do not emit any startup event (for testing)" msgstr "" -#: init/main.c:155 +#: init/main.c:151 msgid "use D-Bus session bus rather than system bus (for testing)" msgstr "" -#: init/main.c:158 +#: init/main.c:154 msgid "specify an alternative initial event (for testing)" msgstr "" -#: init/main.c:178 +#: init/main.c:174 msgid "Process management daemon." msgstr "管理守护进程" -#: init/main.c:180 +#: init/main.c:176 msgid "" "This daemon is normally executed by the kernel and given process id 1 to " "denote its special status. When executed by a user process, it will " "actually run /sbin/telinit." msgstr "本守护进程一般是由内核执行，并被赋以进程id 1 以显示其特殊性。当以用户进程执行时，将会实际运行/sbin/telinit" -#: init/main.c:201 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148 +#: init/main.c:197 util/reboot.c:166 util/shutdown.c:363 util/telinit.c:148 msgid "Need to be root" msgstr "只有 root 能够执行" -#: init/main.c:210 +#: init/main.c:206 msgid "Not being executed as init" msgstr "未以init执行" -#: init/main.c:251 +#: init/main.c:247 msgid "Unable to initialize console, will try /dev/null" msgstr "" -#: init/main.c:257 +#: init/main.c:253 msgid "Unable to initialize console as /dev/null" msgstr "" -#: init/main.c:273 init/main.c:687 +#: init/main.c:269 init/main.c:604 msgid "Unable to set root directory" msgstr "不能设置根目录" -#: init/main.c:284 +#: init/main.c:280 msgid "Unable to mount /proc filesystem" msgstr "无法挂载 /proc 文件系统" -#: init/main.c:293 +#: init/main.c:289 msgid "Unable to mount /sys filesystem" msgstr "无法挂载 /sys 文件系统" -#: init/main.c:403 init/main.c:409 +#: init/main.c:392 init/main.c:398 msgid "Unable to set default oom score" msgstr "" -#: init/main.c:428 +#: init/main.c:417 msgid "Unable to listen for private connections" msgstr "不能监听私有连接" -#: init/main.c:461 +#: init/main.c:450 msgid "Unable to setup standard file descriptors" msgstr "" -#: init/main.c:704 +#: init/main.c:621 #, c-format msgid "Caught %s, core dumped" msgstr "捕获 %s ，core dumped" -#: init/main.c:708 +#: init/main.c:625 #, c-format msgid "Caught %s, unable to dump core" msgstr "捕获 %s ，无法dump core" @@ -595,15 +595,15 @@ msgid "Failed to re-execute %s: %s" msgstr "重新执行 %s 失败: %s" -#: init/main.c:847 +#: init/main.c:711 msgid "Reconnecting to system bus" msgstr "正在重新连接系统总线" -#: init/main.c:853 +#: init/main.c:717 msgid "Unable to connect to the system bus" msgstr "无法连接到系统总线" -#: init/main.c:929 +#: init/main.c:793 msgid "invalid console type specified" msgstr "" @@ -615,110 +615,110 @@ msgid "Unable to lookup home directory" msgstr "" -#: util/initctl.c:305 +#: util/initctl.c:309 msgid "Unable to connect to system bus" msgstr "无法连接到系统总线" -#: util/initctl.c:306 +#: util/initctl.c:310 msgid "Unable to connect to session bus" msgstr "" -#: util/initctl.c:315 +#: util/initctl.c:319 #, c-format msgid "%s: --dest given without --system\n" msgstr "%s：在无 --system 时给出了 --dest\n" -#: util/initctl.c:323 +#: util/initctl.c:327 msgid "Unable to connect to Upstart" msgstr "无法连接到 Upstart" -#: util/initctl.c:509 util/initctl.c:644 util/initctl.c:772 util/initctl.c:907 -#: util/initctl.c:1012 +#: util/initctl.c:536 util/initctl.c:671 util/initctl.c:799 util/initctl.c:934 +#: util/initctl.c:1039 util/initctl.c:1353 #, c-format msgid "%s: missing job name\n" msgstr "%s: 缺少任务名\n" -#: util/initctl.c:958 +#: util/initctl.c:985 msgid "Not running" msgstr "未运行" -#: util/initctl.c:1314 +#: util/initctl.c:1418 #, c-format msgid "%s: missing event name\n" msgstr "%s: 缺少事件名\n" -#: util/initctl.c:1511 +#: util/initctl.c:1615 msgid "Invalid job class" msgstr "" -#: util/initctl.c:2108 +#: util/initctl.c:2248 msgid "unknown event" msgstr "" -#: util/initctl.c:2112 +#: util/initctl.c:2252 msgid "unknown job" msgstr "" -#: util/initctl.c:2213 +#: util/initctl.c:2353 msgid "use D-Bus session bus to connect to init daemon (for testing)" msgstr "" -#: util/initctl.c:2215 +#: util/initctl.c:2355 msgid "use D-Bus system bus to connect to init daemon" msgstr "使用 D-Bus 系统总线连接到 init 守护进程" -#: util/initctl.c:2217 +#: util/initctl.c:2357 msgid "destination well-known name on D-Bus bus" msgstr "" -#: util/initctl.c:2230 +#: util/initctl.c:2370 msgid "do not wait for job to start before exiting" msgstr "不等待任务开始就退出" -#: util/initctl.c:2242 +#: util/initctl.c:2382 msgid "do not wait for job to stop before exiting" msgstr "不等待任务结速就退出" -#: util/initctl.c:2254 +#: util/initctl.c:2394 msgid "do not wait for job to restart before exiting" msgstr "不等待任务重启就退出" -#: util/initctl.c:2293 +#: util/initctl.c:2433 msgid "do not wait for event to finish before exiting" msgstr "不等待事件完成就退出" -#: util/initctl.c:2334 +#: util/initctl.c:2474 msgid "" "enumerate list of events and jobs causing job created from job config to " "start/stop" msgstr "" -#: util/initctl.c:2347 +#: util/initctl.c:2487 msgid "ignore specified list of events (comma-separated)" msgstr "" -#: util/initctl.c:2349 +#: util/initctl.c:2489 msgid "Generate warning for any unreachable events/jobs" msgstr "" -#: util/initctl.c:2358 +#: util/initctl.c:2508 msgid "Job" msgstr "任务" -#: util/initctl.c:2365 +#: util/initctl.c:2515 msgid "Event" msgstr "事件" -#: util/initctl.c:2373 util/initctl.c:2385 util/initctl.c:2396 -#: util/initctl.c:2407 util/initctl.c:2414 +#: util/initctl.c:2523 util/initctl.c:2535 util/initctl.c:2546 +#: util/initctl.c:2557 util/initctl.c:2564 msgid "JOB [KEY=VALUE]..." msgstr "JOB [KEY=VALUE]..." -#: util/initctl.c:2374 +#: util/initctl.c:2524 msgid "Start job." msgstr "启动作业。" -#: util/initctl.c:2375 +#: util/initctl.c:2525 msgid "" "JOB is the name of the job that is to be started, this may be followed by " "zero or more environment variables to be defined in the new job.\n" @@ -731,11 +731,11 @@ "\n" "此环境变量也可以用于在作业实例之前做区分，于是就可以决定是开启一个新实例还是一个存在的实例已经存在时返回错误。" -#: util/initctl.c:2386 +#: util/initctl.c:2536 msgid "Stop job." msgstr "停止作业" -#: util/initctl.c:2387 +#: util/initctl.c:2537 msgid "" "JOB is the name of the job that is to be stopped, this may be followed by " "zero or more environment variables to be passed to the job's pre-stop and " @@ -748,11 +748,11 @@ "\n" "此环境变量也可以用于在作业实例之前做区分，由此决定应该结束多个实例中的哪一个。" -#: util/initctl.c:2397 +#: util/initctl.c:2547 msgid "Restart job." msgstr "重启作业" -#: util/initctl.c:2398 +#: util/initctl.c:2548 msgid "" "JOB is the name of the job that is to be restarted, this may be followed by " "zero or more environment variables to be defined in the job after " @@ -765,66 +765,66 @@ "\n" "此环境变量也可以用于在作业实例之前做区分，由此决定应该结束多个实例中的哪一个。" -#: util/initctl.c:2408 +#: util/initctl.c:2558 msgid "Send HUP signal to job." msgstr "向任务发送 HUP 信号。" -#: util/initctl.c:2409 +#: util/initctl.c:2559 msgid "" "JOB is the name of the job that is to be sent the signal, this may be " "followed by zero or more environment variables to distinguish between job " "instances.\n" msgstr "JOB 是要发送信号的任务的名称，后面可以跟 0 个或多个环境变量来区别任务的各个实例。\n" -#: util/initctl.c:2415 +#: util/initctl.c:2565 msgid "Query status of job." msgstr "查询作业状态" -#: util/initctl.c:2416 +#: util/initctl.c:2566 msgid "" "JOB is the name of the job that is to be queried, this may be followed by " "zero or more environment variables to distguish between job instances.\n" msgstr "JOB 是将要查询的作业名，其后可以跟随零或多个环境变量，以在作业实例间区分。\n" -#: util/initctl.c:2422 +#: util/initctl.c:2572 msgid "List known jobs." msgstr "列出已知任务。" -#: util/initctl.c:2423 +#: util/initctl.c:2573 msgid "The known jobs and their current status will be output." msgstr "将会输出已知作业和它们的状态。" -#: util/initctl.c:2426 +#: util/initctl.c:2576 msgid "EVENT [KEY=VALUE]..." msgstr "EVENT [KEY=VALUE]..." -#: util/initctl.c:2427 +#: util/initctl.c:2577 msgid "Emit an event." msgstr "发出一个事件。" -#: util/initctl.c:2428 +#: util/initctl.c:2578 msgid "" "EVENT is the name of an event the init daemon should emit, this may be " "followed by zero or more environment variables to be included in the event.\n" msgstr "EVENT 是 init 守护进程需要发出的一个事件，其后可以跟随零或多个环境变量以包含进此事件。\n" -#: util/initctl.c:2434 +#: util/initctl.c:2584 msgid "Reload the configuration of the init daemon." msgstr "重新加载 init 守护进程的配置。" -#: util/initctl.c:2438 +#: util/initctl.c:2588 msgid "Request the version of the init daemon." msgstr "请求 init 进程版本" -#: util/initctl.c:2441 +#: util/initctl.c:2591 msgid "[PRIORITY]" msgstr "[PRIORITY]" -#: util/initctl.c:2442 +#: util/initctl.c:2592 msgid "Change the minimum priority of log messages from the init daemon" msgstr "改变 init 进程日志信息的最小优先级" -#: util/initctl.c:2444 +#: util/initctl.c:2594 msgid "" "PRIORITY may be one of:\n" " `debug' (messages useful for debugging upstart are logged, equivalent to --" @@ -849,25 +849,25 @@ "\n" "如果没有参数，则输出当前日志级别。" -#: util/initctl.c:2461 util/initctl.c:2467 +#: util/initctl.c:2611 util/initctl.c:2617 msgid "[CONF]" msgstr "" -#: util/initctl.c:2462 +#: util/initctl.c:2612 msgid "Show emits, start on and stop on details for job configurations." msgstr "" -#: util/initctl.c:2463 +#: util/initctl.c:2613 msgid "" "If CONF specified, show configuration details for single job configuration, " "else show details for all jobs configurations.\n" msgstr "" -#: util/initctl.c:2468 +#: util/initctl.c:2618 msgid "Check for unreachable jobs/event conditions." msgstr "" -#: util/initctl.c:2469 +#: util/initctl.c:2619 msgid "" "List all jobs and events which cannot be satisfied by currently available " "job configuration files" @@ -1149,7 +1149,7 @@ msgid "Unable to become daemon" msgstr "无法成为守护进程" -#: extra/upstart-udev-bridge.c:333 extra/upstart-socket-bridge.c:623 +#: extra/upstart-udev-bridge.c:336 extra/upstart-socket-bridge.c:623 msgid "Disconnected from Upstart" msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ureadahead.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ureadahead.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/ureadahead.po 2012-02-23 07:12:06.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/ureadahead.po 2012-03-23 07:33:28.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: 2012-02-22 01:43+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 22:03+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/ureadahead.c:111 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/usbcreator.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/usbcreator.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/usbcreator.po 2012-02-23 07:12:02.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/usbcreator.po 2012-03-23 07:33:23.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: usb-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-13 09:16+0000\n" +"POT-Creation-Date: 2012-03-13 18:22+0000\n" "PO-Revision-Date: 2011-06-26 14:54+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: 2012-02-22 00:51+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:28+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: .././usbcreator/install.py:133 #, python-format @@ -131,60 +131,60 @@ msgid "Checksums do not match." msgstr "校验值不符。" -#: .././usbcreator/frontends/gtk/frontend.py:345 usbcreator-kde.ui.py:12 +#: .././usbcreator/frontends/gtk/frontend.py:347 usbcreator-kde.ui.py:12 msgid "CD-Drive/Image" msgstr "CD 驱动器/映像" -#: .././usbcreator/frontends/gtk/frontend.py:358 +#: .././usbcreator/frontends/gtk/frontend.py:360 #: .././usbcreator/frontends/winui/main_dialog.py:28 usbcreator-kde.ui.py:15 msgid "OS Version" msgstr "操作系统版本" #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. encode to UTF-8 to work around GNOME #620579 -#: .././usbcreator/frontends/gtk/frontend.py:369 +#: .././usbcreator/frontends/gtk/frontend.py:371 #: .././usbcreator/frontends/winui/main_dialog.py:29 usbcreator-kde.ui.py:18 msgid "Size" msgstr "大小" -#: .././usbcreator/frontends/gtk/frontend.py:442 +#: .././usbcreator/frontends/gtk/frontend.py:444 #: .././usbcreator/frontends/kde/frontend.py:368 #: usbcreator/frontends/kde/frontend.py:368 msgid "The device is not large enough to hold this image." msgstr "设备空间不够容纳此映像。" -#: .././usbcreator/frontends/gtk/frontend.py:444 +#: .././usbcreator/frontends/gtk/frontend.py:446 #: .././usbcreator/frontends/kde/frontend.py:370 #: usbcreator/frontends/kde/frontend.py:370 msgid "There is not enough free space for this image." msgstr "没有足够的剩余空间来容纳此映像。" -#: .././usbcreator/frontends/gtk/frontend.py:476 -#: .././usbcreator/frontends/gtk/frontend.py:745 +#: .././usbcreator/frontends/gtk/frontend.py:478 +#: .././usbcreator/frontends/gtk/frontend.py:747 msgid "Erasing..." msgstr "正在擦除..." -#: .././usbcreator/frontends/gtk/frontend.py:481 +#: .././usbcreator/frontends/gtk/frontend.py:483 #: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42 msgid "Erase Disk" msgstr "格式化磁盘" -#: .././usbcreator/frontends/gtk/frontend.py:535 +#: .././usbcreator/frontends/gtk/frontend.py:537 #: .././usbcreator/frontends/winui/main_dialog.py:36 usbcreator-kde.ui.py:30 msgid "Device" msgstr "设备" -#: .././usbcreator/frontends/gtk/frontend.py:551 +#: .././usbcreator/frontends/gtk/frontend.py:553 #: .././usbcreator/frontends/winui/main_dialog.py:37 usbcreator-kde.ui.py:33 msgid "Label" msgstr "卷标" -#: .././usbcreator/frontends/gtk/frontend.py:561 +#: .././usbcreator/frontends/gtk/frontend.py:563 #: .././usbcreator/frontends/winui/main_dialog.py:38 usbcreator-kde.ui.py:36 msgid "Capacity" msgstr "容量" -#: .././usbcreator/frontends/gtk/frontend.py:571 +#: .././usbcreator/frontends/gtk/frontend.py:573 #: .././usbcreator/frontends/winui/main_dialog.py:39 usbcreator-kde.ui.py:39 msgid "Free Space" msgstr "剩余空间" @@ -193,14 +193,14 @@ #. TODO evand 2009-07-28: The list itself needs to be moved into the #. base frontend. #. To be displayed as a list of file type filters. -#: .././usbcreator/frontends/gtk/frontend.py:583 +#: .././usbcreator/frontends/gtk/frontend.py:585 #: .././usbcreator/frontends/winui/frontend.py:177 #: .././usbcreator/frontends/kde/frontend.py:406 #: usbcreator/frontends/kde/frontend.py:406 msgid "CD Images" msgstr "CD 映像" -#: .././usbcreator/frontends/gtk/frontend.py:583 +#: .././usbcreator/frontends/gtk/frontend.py:585 #: .././usbcreator/frontends/winui/frontend.py:178 #: .././usbcreator/frontends/kde/frontend.py:406 #: usbcreator/frontends/kde/frontend.py:406 @@ -209,18 +209,18 @@ #. TODO evand 2009-07-31: Make these the default values in the #. GtkBuilder file. -#: .././usbcreator/frontends/gtk/frontend.py:604 +#: .././usbcreator/frontends/gtk/frontend.py:606 #: .././usbcreator/frontends/winui/install_window.py:28 msgid "Starting up..." msgstr "正在启动..." -#: .././usbcreator/frontends/gtk/frontend.py:633 +#: .././usbcreator/frontends/gtk/frontend.py:635 #: .././usbcreator/frontends/winui/frontend.py:151 #, python-format msgid "%d%% complete (%dm%ss remaining)" msgstr "完成 %d%% (剩余%d分%s秒)" -#: .././usbcreator/frontends/gtk/frontend.py:637 +#: .././usbcreator/frontends/gtk/frontend.py:639 #: .././usbcreator/frontends/winui/frontend.py:155 #, python-format msgid "%d%% complete" @@ -228,7 +228,7 @@ #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. TODO evand 2009-07-28: Better error message. -#: .././usbcreator/frontends/gtk/frontend.py:683 +#: .././usbcreator/frontends/gtk/frontend.py:685 #: .././usbcreator/frontends/winui/frontend.py:85 #: .././usbcreator/frontends/kde/frontend.py:208 #: usbcreator/frontends/kde/frontend.py:208 @@ -237,7 +237,7 @@ #. #-#-#-#-# usbcreator.pot (PACKAGE VERSION) #-#-#-#-# #. TODO information about the device we're about to format. -#: .././usbcreator/frontends/gtk/frontend.py:740 +#: .././usbcreator/frontends/gtk/frontend.py:742 #: .././usbcreator/frontends/kde/frontend.py:515 #: usbcreator/frontends/kde/frontend.py:515 msgid "Are you sure you want to erase the entire disk?" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/util-linux.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/util-linux.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/util-linux.po 2012-02-23 07:11:26.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/util-linux.po 2012-03-23 07:32:48.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 17:34+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 17:23+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: disk-utils/blockdev.c:61 msgid "set read-only" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/virtinst.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/virtinst.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/virtinst.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/virtinst.po 2012-03-23 07:33:20.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: 2012-02-21 23:58+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:54+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: virtinst/CapabilitiesParser.py:104 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/virt-manager.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/virt-manager.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/virt-manager.po 2012-02-23 07:11:58.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/virt-manager.po 2012-03-23 07:33:20.000000000 +0000 @@ -10,15 +10,15 @@ msgstr "" "Project-Id-Version: virt-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-11 19:13+0000\n" -"PO-Revision-Date: 2012-02-11 21:43+0000\n" +"POT-Creation-Date: 2012-03-04 17:07+0000\n" +"PO-Revision-Date: 2012-03-04 19:56+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: 2012-02-21 23:59+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 20:55+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:133 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/vorbis-tools.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/vorbis-tools.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/vorbis-tools.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/vorbis-tools.po 2012-03-23 07:32: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: 2012-02-21 19:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:22+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ogg123/buffer.c:117 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/w3m.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/w3m.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/w3m.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/w3m.po 2012-03-23 07:32: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: 2012-02-21 19:03+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:22+0000\n" +"X-Generator: Launchpad (build 14981)\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wdiff-gnulib.po 2012-03-23 07:33:11.000000000 +0000 @@ -12,13 +12,13 @@ "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" "POT-Creation-Date: 2010-12-05 20:23+0100\n" "PO-Revision-Date: 2011-11-16 01:48+0000\n" -"Last-Translator: 英华 \n" +"Last-Translator: Wylmer 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: 2012-02-21 21:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/error.c:181 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wdiff.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wdiff.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wdiff.po 2012-02-23 07:11:50.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wdiff.po 2012-03-23 07:33:11.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: 2012-02-21 21:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:42+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: src/mdiff.c:376 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wget.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wget.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/wget.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/wget.po 2012-03-23 07:32:59.000000000 +0000 @@ -19,8 +19,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:22+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: lib/error.c:185 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/whois.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/whois.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/whois.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/whois.po 2012-03-23 07:32:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: whois\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-02 12:06+0000\n" +"POT-Creation-Date: 2012-03-07 03:19+0000\n" "PO-Revision-Date: 2010-05-11 11:57+0000\n" "Last-Translator: Feng Liu (Maxim) \n" "Language-Team: Chinese (China) \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:22+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../whois.c:146 @@ -113,26 +113,26 @@ "严重错误: 声明(disclaimer)文本已经被改变。\n" "请升级此程序。\n" -#: ../whois.c:881 +#: ../whois.c:884 #, c-format msgid "Host %s not found." msgstr "没有找到主机 %s。" -#: ../whois.c:891 +#: ../whois.c:894 #, c-format msgid "%s/tcp: unknown service" msgstr "%s/tcp: 未知服务" -#: ../whois.c:966 +#: ../whois.c:969 msgid "Timeout." msgstr "超时。" -#: ../whois.c:972 +#: ../whois.c:975 #, c-format msgid "Interrupted by signal %d..." msgstr "被信号 %d 中断..." -#: ../whois.c:1231 +#: ../whois.c:1234 #, c-format msgid "" "Usage: whois [OPTION]... OBJECT...\n" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xdiagnose.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xdiagnose.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xdiagnose.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xdiagnose.po 2012-03-23 07:33:30.000000000 +0000 @@ -0,0 +1,269 @@ +# Chinese (Simplified) translation for xdiagnose +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the xdiagnose package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: xdiagnose\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-03-20 17:55+0000\n" +"PO-Revision-Date: 2012-03-12 14:19+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-03-22 22:19+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#: ../xdiagnose.desktop.in.h:1 +msgid "xdiagnose" +msgstr "X 诊断工具" + +#: ../xdiagnose.desktop.in.h:2 +msgid "X.org Diagnostic and Repair Utility" +msgstr "X.org 诊断和修复工具" + +#: ../bin/xdiagnose:46 ../bin/dpkg-log-summary:98 +msgid "Show debug messages" +msgstr "显示调试信息" + +#: ../bin/xdiagnose:49 +msgid "Troubleshoot failure to start a graphical X11 session" +msgstr "调试启动 X11 会话时发生的故障" + +#: ../bin/dpkg-log-summary:101 +msgid "List dates on which updates were performed" +msgstr "" + +#: ../bin/dpkg-log-summary:104 +msgid "Only include entries from this date forward (YYYY/MM/DD)" +msgstr "" + +#: ../bin/dpkg-log-summary:107 +msgid "Only include entries from this date and earlier (YYYY/MM/DD)" +msgstr "" + +#: ../data/failsafeXinit.sh:44 +msgid "Failsafe-X" +msgstr "" + +#: ../data/failsafeXinit.sh:59 +msgid "What would you like to do?" +msgstr "" + +#: ../data/failsafeXinit.sh:60 ../data/failsafeXinit.sh:78 +#: ../data/failsafeXinit.sh:90 +msgid "Choice" +msgstr "" + +#: ../data/failsafeXinit.sh:61 +msgid "Run in low-graphics mode for just one session" +msgstr "" + +#: ../data/failsafeXinit.sh:62 +msgid "Reconfigure graphics" +msgstr "" + +#: ../data/failsafeXinit.sh:63 +msgid "Troubleshoot the error" +msgstr "" + +#: ../data/failsafeXinit.sh:64 +msgid "Exit to console login" +msgstr "" + +#. TODO: Only display SELECT_BACKUP if backups are available +#: ../data/failsafeXinit.sh:75 +msgid "Reconfiguration" +msgstr "" + +#: ../data/failsafeXinit.sh:76 +msgid "How would you like to reconfigure your display?" +msgstr "" + +#: ../data/failsafeXinit.sh:79 +msgid "Use default (generic) configuration" +msgstr "" + +#: ../data/failsafeXinit.sh:80 +msgid "Use your backed-up configuration" +msgstr "" + +#: ../data/failsafeXinit.sh:87 +msgid "Troubleshooting" +msgstr "" + +#: ../data/failsafeXinit.sh:88 +msgid "What information would you like to review?" +msgstr "" + +#: ../data/failsafeXinit.sh:91 +msgid "Review the xserver log file" +msgstr "" + +#: ../data/failsafeXinit.sh:92 +msgid "Review the startup errors" +msgstr "" + +#: ../data/failsafeXinit.sh:93 +msgid "Edit configuration file" +msgstr "" + +#: ../data/failsafeXinit.sh:94 +msgid "Archive configuration and logs" +msgstr "" + +#: ../data/failsafeXinit.sh:104 +msgid "" +"A bug report has been written.\\nYou can send it next time you log in." +msgstr "" + +#: ../data/failsafeXinit.sh:106 +msgid "Your bug could not be recorded successfully.\\n" +msgstr "" + +#: ../data/failsafeXinit.sh:109 +#, sh-format +msgid "Cannot file bug: \\$apport_hook is not present." +msgstr "" + +#: ../data/failsafeXinit.sh:118 +msgid "" +"Your config could not be backed up.\\nDo you want to continue anyway?\\n" +msgstr "" + +#: ../data/failsafeXinit.sh:127 +msgid "" +"Your configuration has been restored to default,\\nand your old " +"configuration backed up.\\nPlease restart.\\n" +msgstr "" + +#: ../data/failsafeXinit.sh:129 +msgid "" +"Failure restoring configuration to default.\\nYour config has not been " +"changed." +msgstr "" + +#. Run Alberto's xorg.conf checker (once it's available in main) +#: ../data/failsafeXinit.sh:143 +msgid "Sorry, this option is not implemented yet" +msgstr "" + +#: ../data/failsafeXinit.sh:174 +#, sh-format +msgid "Relevant configuration and log files have been saved to:\\n" +msgstr "" + +#: ../data/failsafeXinit.sh:174 +msgid "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\\n" +msgstr "" + +#: ../data/failsafeXinit.sh:181 +msgid "" +"The system 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 "" + +#: ../data/failsafeXinit.sh:183 +msgid "" +"The system 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 "" + +#: ../data/failsafeXinit.sh:223 +msgid "Stand by one minute while the display restarts..." +msgstr "" + +#: ../xdiagnose/applet.py:37 +msgid "X Diagnostics Settings" +msgstr "" + +#: ../xdiagnose/applet.py:49 +msgid "Debug" +msgstr "" + +#: ../xdiagnose/applet.py:50 +msgid "Extra graphics _debug messages" +msgstr "" + +#: ../xdiagnose/applet.py:51 +msgid "" +"Makes dmesg logs more verbose with details about 3d, plymouth, and monitor " +"detection" +msgstr "" + +#: ../xdiagnose/applet.py:54 +msgid "Display boot messages" +msgstr "" + +#: ../xdiagnose/applet.py:55 +msgid "" +"Removes splash and quiet from kernel options so you can see kernel details " +"during boot" +msgstr "" + +#: ../xdiagnose/applet.py:58 +msgid "Enable automatic crash bug reporting" +msgstr "" + +#: ../xdiagnose/applet.py:59 +msgid "Turns on the Apport crash detection and bug reporting tool" +msgstr "" + +#: ../xdiagnose/applet.py:64 +msgid "Workarounds" +msgstr "" + +#: ../xdiagnose/applet.py:65 +msgid "Disable bootloader _graphics" +msgstr "" + +#: ../xdiagnose/applet.py:66 +msgid "" +"The grub bootloader has a graphics mode using the VESA framebuffer driver " +"which can sometimes interfere with later loading of the proper video driver. " +" Checking this forces grub to use text mode only." +msgstr "" + +#: ../xdiagnose/applet.py:69 +msgid "Disable _VESA framebuffer driver" +msgstr "" + +#: ../xdiagnose/applet.py:70 +msgid "" +"vesafb is loaded early during boot so the boot logo can display, but can " +"cause issues when switching to a real graphics driver. Checking this " +"prevents vesafb from loading so these issues do not occur." +msgstr "" + +#: ../xdiagnose/applet.py:73 +msgid "Disable _PAT memory" +msgstr "" + +#: ../xdiagnose/applet.py:74 +msgid "" +"This pagetable extension can interfere with the memory management of " +"proprietary drivers under certain situations and cause lagging or failures " +"to allocate video memory, so turning it off can prevent those problems." +msgstr "" + +#: ../xdiagnose/applet.py:117 +msgid "View Errors" +msgstr "" + +#: ../xdiagnose/applet.py:121 +msgid "Report an Xorg Bug" +msgstr "" + +#: ../xdiagnose/errors_treeview.py:15 +msgid "Xorg Error Messages" +msgstr "" + +#. create the TreeViewColumn to display the data +#: ../xdiagnose/errors_treeview.py:31 +msgid "Error Message" +msgstr "" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xfsprogs.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xfsprogs.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xfsprogs.po 2012-02-23 07:11:36.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xfsprogs.po 2012-03-23 07:32: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: 2012-02-21 19:05+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:23+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: .././libxcmd/quit.c:42 msgid "exit the program" diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xkeyboard-config.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xkeyboard-config.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xkeyboard-config.po 2012-02-23 07:11:51.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xkeyboard-config.po 2012-03-23 07:33:12.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: 2012-02-21 22:13+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 19:51+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: zh_CN\n" #: ../rules/base.xml.in.h:1 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xscreensaver.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xscreensaver.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xscreensaver.po 2012-02-23 07:11:37.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xscreensaver.po 2012-03-23 07:32: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: 2012-02-21 19:06+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:24+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: ../driver/demo-Gtk-conf.c:882 msgid "Browse..." diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xz.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xz.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/xz.po 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/xz.po 2012-03-23 07:33: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: 2012-02-22 01:14+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: src/xz/args.c:337 #, c-format diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/zeitgeist.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/zeitgeist.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/zeitgeist.po 2012-02-23 07:12:04.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/zeitgeist.po 2012-03-23 07:33: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: 2012-02-22 01:15+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 21:46+0000\n" +"X-Generator: Launchpad (build 14981)\n" "Language: \n" #: ../zeitgeist-daemon.py:72 ../zeitgeist-daemon.py:85 diff -Nru language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/zenmap.po language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/zenmap.po --- language-pack-zh-hans-base-12.04+20120221/data/zh_CN/LC_MESSAGES/zenmap.po 2012-02-23 07:11:35.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/data/zh_CN/LC_MESSAGES/zenmap.po 2012-03-23 07:32: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: 2012-02-21 18:53+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-22 18:16+0000\n" +"X-Generator: Launchpad (build 14981)\n" #: zenmap:58 msgid "Import error" diff -Nru language-pack-zh-hans-base-12.04+20120221/debian/changelog language-pack-zh-hans-base-12.04+20120322/debian/changelog --- language-pack-zh-hans-base-12.04+20120221/debian/changelog 2012-02-23 07:11:24.000000000 +0000 +++ language-pack-zh-hans-base-12.04+20120322/debian/changelog 2012-03-23 07:32:47.000000000 +0000 @@ -1,6 +1,6 @@ -language-pack-zh-hans-base (1:12.04+20120221) precise; urgency=low +language-pack-zh-hans-base (1:12.04+20120322) precise; urgency=low * Initial Release. - -- Ubuntu automatic language-pack builder Thu, 23 Feb 2012 07:11:24 +0000 + -- Ubuntu automatic language-pack builder Fri, 23 Mar 2012 07:32:47 +0000