Author: marguerite Date: 2014-09-25 18:16:44 +0200 (Thu, 25 Sep 2014) New Revision: 89461 Modified: trunk/lcn/zh_CN/po/software-opensuse-org.zh_CN.po trunk/lcn/zh_CN/po/zypp.zh_CN.po trunk/lcn/zh_CN/po/zypper.zh_CN.po Log: [cn]update Modified: trunk/lcn/zh_CN/po/software-opensuse-org.zh_CN.po =================================================================== --- trunk/lcn/zh_CN/po/software-opensuse-org.zh_CN.po 2014-09-25 12:02:37 UTC (rev 89460) +++ trunk/lcn/zh_CN/po/software-opensuse-org.zh_CN.po 2014-09-25 16:16:44 UTC (rev 89461) @@ -13,7 +13,7 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-09-17 16:11+0000\n" -"PO-Revision-Date: 2014-06-21 13:27+0800\n" +"PO-Revision-Date: 2014-09-26 00:15+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" "Language: zh_TW\n" @@ -47,11 +47,27 @@ msgid "64 Bit PC" msgstr "64 位计算机" -msgid "<a href=\"http://activedoc.opensuse.org/book/opensuse-start-up\">openSUSE startup guide</a>" -msgstr "<a href=\"http://activedoc.opensuse.org/book/opensuse-startup/\">openSUSE 入门指南</a>" +msgid "" +"<a href=\"http://activedoc.opensuse.org/book/opensuse-start-up\">openSUSE " +"startup guide</a>" +msgstr "" +"<a href=\"http://activedoc.opensuse.org/book/opensuse-startup/\">openSUSE " +"入门指南</a>" -msgid "<a href=\"http://en.opensuse.org/SDB:Metalink\">Metalink</a> is an open standard that bundles the various ways (FTP/HTTP/BitTorrent) to get files into one format for easier downloads. This makes it good for downloading ISOs; particularly for people who can't use P2P because of restrictions from their ISP or University. It can deliver very fast download speeds since most clients support multiple connections, to multiple mirrors, automatically. In addition, it can do automatic error detection, and correction. It needs a special client to handle it though." -msgstr "<a href=\"http://zh.opensuse.org/SDB:Metalink\">Metalink</a> 是一种开源标准，它将多种撷取文件的方式 (FTP/HTTP/BT) 捆绑成了一种格式以方便下载。这使得它非常适合下载 ISO; 尤其是对于那些由于他们的 ISP 或大学限制而不能使用 P2P 的人来说。它可以提供非常快的下载速度，因为它的大多数客户端均支持自动多点连接，以及从多镜像下载。还有，它能自动查错并纠错。然而您需要特殊的客户端才能使用它。" +msgid "" +"<a href=\"http://en.opensuse.org/SDB:Metalink\">Metalink</a> is an open " +"standard that bundles the various ways (FTP/HTTP/BitTorrent) to get files " +"into one format for easier downloads. This makes it good for downloading " +"ISOs; particularly for people who can't use P2P because of restrictions from " +"their ISP or University. It can deliver very fast download speeds since most " +"clients support multiple connections, to multiple mirrors, automatically. In " +"addition, it can do automatic error detection, and correction. It needs a " +"special client to handle it though." +msgstr "" +"<a href=\"http://zh.opensuse.org/SDB:Metalink\">Metalink</a> " +"是一种开源标准，它将多种撷取文件的方式 (FTP/HTTP/BT) 捆绑成了一种格式以方便下载。这使得它非常适合下载 ISO; 尤其是对于那些由于他们的 " +"ISP 或大学限制而不能使用 P2P 的人来说。它可以提供非常快的下载速度，因为它的大多数客户端均支持自动多点连接，以及从多镜像下载。还有，它能自动查错并纠" +"错。然而您需要特殊的客户端才能使用它。" msgid "<a href=\"http://en.opensuse.org/openSUSE:License\">License</a>" msgstr "<a href=\"http://en.opensuse.org/openSUSE:License\">授权许可</a>" @@ -65,10 +81,14 @@ msgid "<b>official update</b>" msgstr "<b>官方升级版本</b>" -msgid "A GNOME desktop you can run from %s or from USB stick.<br/>Can be installed as is (no upgrade)." +msgid "" +"A GNOME desktop you can run from %s or from USB stick.<br/>Can be installed " +"as is (no upgrade)." msgstr "可以在 %s 或 U 盘中运行的 GNOME 桌面。<br/>可用于安装 (不能用于升级，语言包需另装)。" -msgid "A KDE desktop you can run from %s or from USB stick.<br/>Can be installed as is (no upgrade)." +msgid "" +"A KDE desktop you can run from %s or from USB stick.<br/>Can be installed as " +"is (no upgrade)." msgstr "可在 %s 或 U 盘中运行的 KDE 桌面。<br/>可用于安装 (不能用于升级，语言包需另装)。" msgid "Add repository and install manually" @@ -77,7 +97,9 @@ msgid "Add-On Downloads (optional)" msgstr "扩展下载 (可选)" -msgid "After having successfully downloaded the ISO image(s), create a bootable USB stick or burn the image(s) to a DVD (or a CD if the chosen image fits)." +msgid "" +"After having successfully downloaded the ISO image(s), create a bootable USB " +"stick or burn the image(s) to a DVD (or a CD if the chosen image fits)." msgstr "在成功下载 ISO 映像后，创建一个可引导 U 盘或将映像刻录到一张 DVD (若所选映像够小也可以刻录到 CD) 上。" msgid "" @@ -85,12 +107,15 @@ " and will not be spread to third parties. We store the data to\n" " inform the users if a new version is available. All requests have\n" " to be screened to fulfill the US export embargo. More information\n" -" about the embargo and a list of countries at wikipedia <a href='http://en.wikipedia.org/wiki/United_States_embargoes'>http://en.wikipedia.org/wiki/United_States_embargoes</a>." +" about the embargo and a list of countries at wikipedia <a " +"href='http://en.wikipedia.org/wiki/United_States_embargoes'>" +"http://en.wikipedia.org/wiki/United_States_embargoes</a>." msgstr "" "全部数据仅用于投递 openSUSE 推广材料且不会扩散给第三方。\n" "我们存根数据是为了通知用户新版资讯。\n" "全部邮寄请求都必须被美国出口禁运组织审查。\n" -"关于禁运和禁运国家名单的更多信息可参考维基百科 <a href='http://en.wikipedia.org/wiki/United_States_embargoes'>http://en.wikipedia.org/wiki/United_States_embargoes</a> 词条。" +"关于禁运和禁运国家名单的更多信息可参考维基百科 <a href='http://en.wikipedia.org/wiki/United_States_em" +"bargoes'>http://en.wikipedia.org/wiki/United_States_embargoes</a> 词条。" msgid "An internal error happened :-(" msgstr "发生了一个内部错误呦 :-(" @@ -104,7 +129,10 @@ msgid "BitTorrent" msgstr "BitTorrent 种子" -msgid "Boot from the DVD, CD or USB stick. In case your computer does not automatically boot from the chosen device, open the BIOS setup to allow booting from it." +msgid "" +"Boot from the DVD, CD or USB stick. In case your computer does not " +"automatically boot from the chosen device, open the BIOS setup to allow " +"booting from it." msgstr "从 DVD、CD 或 U 盘引导。若您的计算机没有自动从所选设备引导，请打开 BIOS 设置并允许从该设备引导。" msgid "Bronze Sponsor" @@ -122,7 +150,10 @@ msgid "Category" msgstr "分类" -msgid "Choose an installation medium by clicking it and hit the Download button to start the download. Optionally choose your computer type or an alternative download method." +msgid "" +"Choose an installation medium by clicking it and hit the Download button to " +"start the download. Optionally choose your computer type or an alternative " +"download method." msgstr "通过点击来选择安装介质，然后点击下载按钮来开始下载。另外您也可以选择您的计算机架构或者额外的下载方式。" msgid "Click to Download" @@ -131,7 +162,9 @@ msgid "Community" msgstr "社区" -msgid "Contains a large collection of software for desktop or server use.<br/>Suitable for installation or upgrade." +msgid "" +"Contains a large collection of software for desktop or server use.<br/>" +"Suitable for installation or upgrade." msgstr "包含桌面或服务器使用的一篮子软件。<br/>适用于安装或升级。" msgid "Countdown" @@ -197,7 +230,9 @@ msgid "Downloads" msgstr "下载" -msgid "Downloads the installation system and all packages from online repositories.<br/>Suitable for installation or upgrade." +msgid "" +"Downloads the installation system and all packages from online repositories.<" +"br/>Suitable for installation or upgrade." msgstr "从在线软件源下载安装系统和全部软件包。<br/>适用于安装或升级。" msgid "Expand all sections ('e')" @@ -218,8 +253,13 @@ msgid "For <strong>%s</strong> run the following:" msgstr "对于 <strong>%s</strong>，请运行以下命令：" -msgid "For <strong>Arch Linux</strong>, edit /etc/pacman.conf and add the following (note that the order of repositories in pacman.conf is important, since pacman always downloads the first found package):" -msgstr "对于 <strong>Arch Linux</strong>，请编辑 /etc/pacman.conf 并添加以下内容 (注意 pacman.conf 中的软件源顺序是很重要的，因为 pacman 总是会下载第一个找到的软件包)：" +msgid "" +"For <strong>Arch Linux</strong>, edit /etc/pacman.conf and add the following " +"(note that the order of repositories in pacman.conf is important, since " +"pacman always downloads the first found package):" +msgstr "" +"对于 <strong>Arch Linux</strong>，请编辑 /etc/pacman.conf 并添加以下内容 (注意 pacman.conf " +"中的软件源顺序是很重要的，因为 pacman 总是会下载第一个找到的软件包)：" msgid "Games" msgstr "游戏" @@ -248,8 +288,12 @@ msgid "How to Proceed" msgstr "如何进行" -msgid "If you want to use a direct link but live in a place in the world where our download redirector has not enough information to redirect to the fastest mirror, you can pick a mirror yourself." -msgstr "若您想要使用直接链接，但却居住在世界上的某个神秘角落以至于我们的下载中转器没有足够的关于该位置的信息来把您中转到最快的镜像，这时您可以自行选择一个镜像。" +msgid "" +"If you want to use a direct link but live in a place in the world where our " +"download redirector has not enough information to redirect to the fastest " +"mirror, you can pick a mirror yourself." +msgstr "" +"若您想要使用直接链接，但却居住在世界上的某个神秘角落以至于我们的下载中转器没有足够的关于该位置的信息来把您中转到最快的镜像，这时您可以自行选择一个镜像。" msgid "Image:" msgstr "映像：" @@ -271,8 +315,10 @@ msgid "" "Join the fast-growing community, put openSUSE into more hands by\n" -" getting the latest PromoDVD for your group, non-profit organization, school\n" -" university or event like LUG meetings, installfests, and conferences.\n" +" getting the latest PromoDVD for your group, non-profit organization, " +"school\n" +" university or event like LUG meetings, installfests, and " +"conferences.\n" " Promo DVDs help to increase awareness and visibility of openSUSE!" msgstr "" "快来加入快速壮大的社区，为您的社团、非盈利组织、学校、大学，\n" @@ -280,8 +326,14 @@ "把 openSUSE 送给更多的人吧。\n" "推广 DVD 能帮助提高 openSUSE 的知名度和可视性！" -msgid "Konqueror of KDE 3 is unfortunately unmaintained and its javascript implementation contains bugs that make it impossible to use with this page. Please make sure you have javascript disabled before you <a href='%s'>continue</a>." -msgstr "KDE 3 中的 Konqueror 很不幸没人维护了，它的 javascript 实现有 bug，使其无法正常渲染此页面。您在<a href='%s'>继续</a>前请确保禁用了 javascript。" +msgid "" +"Konqueror of KDE 3 is unfortunately unmaintained and its javascript " +"implementation contains bugs that make it impossible to use with this page. " +"Please make sure you have javascript disabled before you <a href='%s'>" +"continue</a>." +msgstr "" +"KDE 3 中的 Konqueror 很不幸没人维护了，它的 javascript 实现有 bug，使其无法正常渲染此页面。您在<a href='%s'>" +"继续</a>前请确保禁用了 javascript。" # label for language selection msgid "Language" @@ -290,15 +342,13 @@ msgid "Last searches:" msgstr "最后搜索：" -#, fuzzy #| msgid "32 Bit PC" msgid "Legacy 32 Bit PC" -msgstr "32 位计算机" +msgstr "老式 32 位计算机" -#, fuzzy #| msgid "32 Bit PC" msgid "Legacy 32 Bit PC" -msgstr "32 位计算机" +msgstr "老式 32 位计算机" msgid "Live GNOME" msgstr "GNOME LiveCD" @@ -306,8 +356,12 @@ msgid "Live KDE" msgstr "KDE LiveCD" -msgid "Many applications can verify the checksum of a download. To verify your download can be important as it verifies you really have got the ISO file you wanted to download and not some broken version." -msgstr "许多程序都可以校验下载文件的 checksum。校验您下载的文件挺重要的，因为它可以校验您是否真的撷取到了您想要下载的 ISO 文件而不是一些损坏的版本。" +msgid "" +"Many applications can verify the checksum of a download. To verify your " +"download can be important as it verifies you really have got the ISO file you " +"wanted to download and not some broken version." +msgstr "" +"许多程序都可以校验下载文件的 checksum。校验您下载的文件挺重要的，因为它可以校验您是否真的撷取到了您想要下载的 ISO 文件而不是一些损坏的版本。" msgid "Metalink" msgstr "Metalink" @@ -315,14 +369,30 @@ msgid "More information on burning the ISO file to CD/DVD" msgstr "更多关于刻录 ISO 文件到 CD/DVD 上的信息" -msgid "More information on creating a <a href='http://en.opensuse.org/Live_USB_stick'>bootable USB stick</a>" +msgid "" +"More information on creating a <a href='http://en.opensuse.org/Live_USB_stick'" +">bootable USB stick</a>" msgstr "更多关于创建<a href='http://zh.opensuse.org/Live_USB_stick'>可引导 U 盘</a> 的信息" -msgid "More information on downloading openSUSE is available from the <a href=\"http://en.opensuse.org/SDB:Download_help\">Download Help</a> and <a href=\"http://en.opensuse.org/SDB:Network_installation\">Network Installation</a> pages in our <a href=\"http://en.opensuse.org/Portal:Documentation\">Documentation Wiki</a>." -msgstr "更多关于下载 openSUSE 的信息可以看一看我们<a href=\"http://zh.opensuse.org/Category:SDB:安装\">维基的支持数据库专题</a>上的 <a href=\"http://zh.opensuse.org/SDB:下载帮助\">下载帮助</a> ，以及 <a href=\"http://zh.opensuse.org/SDB:网络安装方式\">网络安装</a> 页面。" +msgid "" +"More information on downloading openSUSE is available from the <a " +"href=\"http://en.opensuse.org/SDB:Download_help\">Download Help</a> and <a " +"href=\"http://en.opensuse.org/SDB:Network_installation\">Network " +"Installation</a> pages in our <a href=\"http://en.opensuse.org/Portal:Document" +"ation\">Documentation Wiki</a>." +msgstr "" +"更多关于下载 openSUSE 的信息可以看一看我们<a href=\"http://zh.opensuse.org/Category:SDB:安装\">" +"维基的支持数据库专题</a>上的 <a href=\"http://zh.opensuse.org/SDB:下载帮助\">下载帮助</a> ，以及 <a " +"href=\"http://zh.opensuse.org/SDB:网络安装方式\">网络安装</a> 页面。" -msgid "Most new computers support <a href=\"http://en.wikipedia.org/wiki/X86-64\">x86-64</a> (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it. So you need to check wikipedia if you want to be sure your computer supports it." -msgstr "许多新计算机都支持 <a href=\"http://en.wikipedia.org/wiki/X86-64\">x86_64</> (也叫做 AMD64 或 Intel64)，但是一些笔记本/上网本处理器可能不支持它。所以若您想要确保您的计算机支持它，您需要自己去维基百科上确认一下。" +msgid "" +"Most new computers support <a href=\"http://en.wikipedia.org/wiki/X86-64\">" +"x86-64</a> (also known as AMD64 and Intel64), but some laptop processors and " +"netbook processors do not support it. So you need to check wikipedia if you " +"want to be sure your computer supports it." +msgstr "" +"许多新计算机都支持 <a href=\"http://en.wikipedia.org/wiki/X86-64\">x86_64</> (也叫做 " +"AMD64 或 Intel64)，但是一些笔记本/上网本处理器可能不支持它。所以若您想要确保您的计算机支持它，您需要自己去维基百科上确认一下。" msgid "Multimedia" msgstr "多媒体" @@ -379,25 +449,33 @@ msgstr "白金赞助商" msgid "" -"Please be aware that the following packages are from unofficial repositories.\n" -" That means they are not reviewed by openSUSE and may contain unstable or experimental software." +"Please be aware that the following packages are from unofficial " +"repositories.\n" +" That means they are not reviewed by openSUSE and may contain unstable or " +"experimental software." msgstr "" "请留神以下软件包来自于非官方的软件源。\n" "这意味着它们没有被 openSUSE 复核过，因此可能携带不稳定或实验性的软件。" -msgid "Please enter a <b>brief</b> reason (in English!) why you need the DVDs and provide a link of the event/purpose." +msgid "" +"Please enter a <b>brief</b> reason (in English!) why you need the DVDs and " +"provide a link of the event/purpose." msgstr "请输入一个<b>简短</b>的需要 DVD 的理由(英文) 并提供一个事件/目的的链接。" msgid "Please enter more than 2 characters" msgstr "请输入至少两个字符" -msgid "Please note that this is not the latest openSUSE release. You can get the latest version <a href='/'>here</a>. " +msgid "" +"Please note that this is not the latest openSUSE release. You can get the " +"latest version <a href='/'>here</a>. " msgstr "请注意这不是最新版本的 openSUSE。您可以在<a href='/'>这儿</a>获取最新版本。 " msgid "" "Promo DVDs and all the related artwork -labels and sleeve- can be\n" -" downloaded from the <a href=\"http://download.opensuse.org/promodvd/\">promodvd\n" -" download directory %s</a>. Keep in mind that this is a special version of openSUSE,\n" +" downloaded from the <a href=\"http://download.opensuse.org/promodvd/\"" +">promodvd\n" +" download directory %s</a>. Keep in mind that this is a special " +"version of openSUSE,\n" " namely designed for promotional distribution." msgstr "" "推广 DVD 和全部相关的艺术作品 - 盘面标签和封套 - 可在\n" @@ -416,7 +494,9 @@ msgid "Rescue" msgstr "救援系统 (基于 Xfce 桌面)" -msgid "Rescue system that you can run from CD or from USB stick.<br/>Can not be used for installation or upgrade." +msgid "" +"Rescue system that you can run from CD or from USB stick.<br/>Can not be used " +"for installation or upgrade." msgstr "可在 CD 或 U 盘中运行的救援系统。<br/>不能用于安装或升级。" msgid "Search" @@ -455,8 +535,13 @@ msgid "Silver Sponsor" msgstr "白银赞助商" -msgid "Some of the live distributions based on openSUSE. Those interested in trying to build their own derivatives can take a look at <a href=\"http://susestudio.com/\">SUSE Studio</a>." -msgstr "一些还活着的基于 openSUSE 的发行版。对尝试制作自己的 openSUSE 衍生版本感兴趣的人可以看一看 <a href=\"http://susestudio.com/\">SuSE Studio</a>。" +msgid "" +"Some of the live distributions based on openSUSE. Those interested in trying " +"to build their own derivatives can take a look at <a " +"href=\"http://susestudio.com/\">SUSE Studio</a>." +msgstr "" +"一些还活着的基于 openSUSE 的发行版。对尝试制作自己的 openSUSE 衍生版本感兴趣的人可以看一看 <a " +"href=\"http://susestudio.com/\">SuSE Studio</a>。" msgid "Source" msgstr "源代码" @@ -485,20 +570,46 @@ msgid "Support" msgstr "支持" -msgid "The installation process is available in many languages but, for most of them, the translation of the applications is not included in the image. If you want your openSUSE system to support some additional language, you need to download it from the Internet during the installation or any time after it. If you have easy access to the Internet you do not need this CD, but if you are planning to install openSUSE in some machine with no Internet connection, it will provide you access to all the available translations." -msgstr "安装过程可以多种语言进行，但是，对多数语言来讲，应用程序的翻译并没有收录在映像中。若您想要您的 openSUSE 系统支持一些额外语言，您需要在安装时或安装后从互联网下载该语言的翻译。若您能够轻松地访问互联网，那么您并不需要此 CD; 但是若您打算在某些没有互联网连接的计算机上安装 openSUSE，该 CD 可以让您接触到全部可用语言的翻译。" +msgid "" +"The installation process is available in many languages but, for most of " +"them, the translation of the applications is not included in the image. If " +"you want your openSUSE system to support some additional language, you need " +"to download it from the Internet during the installation or any time after " +"it. If you have easy access to the Internet you do not need this CD, but if " +"you are planning to install openSUSE in some machine with no Internet " +"connection, it will provide you access to all the available translations." +msgstr "" +"安装过程可以多种语言进行，但是，对多数语言来讲，应用程序的翻译并没有收录在映像中。若您想要您的 openSUSE " +"系统支持一些额外语言，您需要在安装时或安装后从互联网下载该语言的翻译。若您能够轻松地访问互联网，那么您并不需要此 CD; " +"但是若您打算在某些没有互联网连接的计算机上安装 openSUSE，该 CD 可以让您接触到全部可用语言的翻译。" msgid "Then run the following as <strong>root</strong>" msgstr "然后以根用户 <strong>root</strong> 身份运行以下命令：" -msgid "There is no openSUSE release in testing phase at the moment. <br/> If you want to use bleeding edge software, please use <a href='http://en.opensuse.org/Portal:Factory'>openSUSE Factory</a>." -msgstr "目前没有处在测试阶段的 openSUSE 版本。<br/>若您想要使用最前沿的软件，请使用 <a href='http://zh.opensuse.org/Portal:Factory'>openSUSE 工厂版</a>。" +msgid "" +"There is no openSUSE release in testing phase at the moment. <br/> If you " +"want to use bleeding edge software, please use <a " +"href='http://en.opensuse.org/Portal:Factory'>openSUSE Factory</a>." +msgstr "" +"目前没有处在测试阶段的 openSUSE 版本。<br/>若您想要使用最前沿的软件，请使用 <a " +"href='http://zh.opensuse.org/Portal:Factory'>openSUSE 工厂版</a>。" -msgid "This CD contains free software distributed under proprietary licence not allowing its inclusion to main installation media together with free open-source software. All software from this CD could be downloaded from NON-OSS repository." -msgstr "此 CD 收录了在私有许可证下发布，因此不允许与自由开源软件一起放置于主安装介质内的免费软件。此 CD 中的全部软件都能从 NON-OSS 源中下载。" +msgid "" +"This CD contains free software distributed under proprietary licence not " +"allowing its inclusion to main installation media together with free " +"open-source software. All software from this CD could be downloaded from " +"NON-OSS repository." +msgstr "" +"此 CD 收录了在私有许可证下发布，因此不允许与自由开源软件一起放置于主安装介质内的免费软件。此 CD 中的全部软件都能从 NON-OSS 源中下载。" -msgid "This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though. openSUSE does not support processors before Pentium - the live CDs even support only i686 (Pentium Pro and later)." -msgstr "这个版本可以在全部计算机上运行，包括那些支持 64 位的计算机。若您有大于 3GB 的内存，您可能会倾向于选择 64 位的版本。openSUSE 不支持奔腾之前的处理器 - live CD 甚至只支持 i686 (奔腾专业版和之后的处理器)。" +msgid "" +"This version runs on all PCs including those that support 64 Bit. If you have " +"more than 3 GB of RAM you should prefer the 64 Bit version though. openSUSE " +"does not support processors before Pentium - the live CDs even support only " +"i686 (Pentium Pro and later)." +msgstr "" +"这个版本可以在全部计算机上运行，包括那些支持 64 位的计算机。若您有大于 3GB 的内存，您可能会倾向于选择 64 位的版本。openSUSE " +"不支持奔腾之前的处理器 - live CD 甚至只支持 i686 (奔腾专业版和之后的处理器)。" msgid "Top 1-click downloads:" msgstr "流行的一键安装：" @@ -515,11 +626,28 @@ msgid "Unsupported distributions:" msgstr "不受官方支持的发行版：" -msgid "User manuals are available from <a href=\"http://activedoc.opensuse.org\">activedoc.opensuse.org</a>, for example the <a href=\"http://activedoc.opensuse.org/book/opensuse-start-up/\">Official Start-Up Guide</a>." -msgstr "用户手册可从 <a href=\"http://activedoc.opensuse.org\">activedoc.opensuse.org</a> 获取，例如<a href=\"http://activedoc.opensuse.org/book/opensuse-startup/\">官方入门指南</a>。" +msgid "" +"User manuals are available from <a href=\"http://activedoc.opensuse.org\">" +"activedoc.opensuse.org</a>, for example the <a " +"href=\"http://activedoc.opensuse.org/book/opensuse-start-up/\">Official " +"Start-Up Guide</a>." +msgstr "" +"用户手册可从 <a href=\"http://activedoc.opensuse.org\">activedoc.opensuse.org</a> " +"获取，例如<a href=\"http://activedoc.opensuse.org/book/opensuse-startup/\">官方入门指南<;" +"/a>。" -msgid "Using <a href=\"http://en.opensuse.org/SDB:BitTorrent\">BitTorrent</a> is recommended on slow links, especially when downloading the DVD image. BitTorrent downloads have several benefits, the clients protect against data corruption and you help relieving the load on the servers by participating in the upload - if enough people participate it will also be faster than the centralized servers - for everybody. Whatsmore, it allows you to stop the download at any time and resume it later." -msgstr "对于网速较慢的人，推荐使用 <a href=\"http://zh.opensuse.org/SDB:BitTorrent\">BitTorrent 种子</a>，尤其是下载 DVD 映像时。BT 有诸多好处，客户端能防止数据损坏，并且您还可以通过参与上传来降低服务器的负载。若参与的人数足够多，它甚至比中央服务器还快，对每个人都快。更赞的是，您可以随时停止下载，在有时间时再续传。" +msgid "" +"Using <a href=\"http://en.opensuse.org/SDB:BitTorrent\">BitTorrent</a> is " +"recommended on slow links, especially when downloading the DVD image. " +"BitTorrent downloads have several benefits, the clients protect against data " +"corruption and you help relieving the load on the servers by participating in " +"the upload - if enough people participate it will also be faster than the " +"centralized servers - for everybody. Whatsmore, it allows you to stop the " +"download at any time and resume it later." +msgstr "" +"对于网速较慢的人，推荐使用 <a href=\"http://zh.opensuse.org/SDB:BitTorrent\">BitTorrent " +"种子</a>，尤其是下载 DVD 映像时。BT 有诸多好处，客户端能防止数据损坏，并且您还可以通过参与上传来降低服务器的负载。若参与的人数足够多，它甚至比中" +"央服务器还快，对每个人都快。更赞的是，您可以随时停止下载，在有时间时再续传。" msgid "Verify your download before use" msgstr "请在使用前校验您下载的文件" @@ -533,29 +661,52 @@ msgid "" "We would like you, to keep us informed about your usage of the DVDs, so we\n" " can help you to promote your organization, event or school on our\n" -" <a href='http://news.opensuse.org' title='news.opensuse.org'>news page</a>\n" -" or other resources. (Hint! We love photos. Take lots of them!). Please contact us at\n" -" <a href='mailto:opensuse-marketing@opensuse.org'>opensuse-marketing@opensuse.org</a>\n" +" <a href='http://news.opensuse.org' title='news.opensuse.org'>news " +"page</a>\n" +" or other resources. (Hint! We love photos. Take lots of them!). " +"Please contact us at\n" +" <a href='mailto:opensuse-marketing@opensuse.org'>" +"opensuse-marketing@opensuse.org</a>\n" " to discuss promotion and/or other ways we can assist you." msgstr "" "我们期待您，知会我们您对 DVD 的使用情况，\n" -"这样我们能够帮助您在我们的<a href='http://news.opensuse.org' title='news.opensuse.org'>新闻页面</a>\n" +"这样我们能够帮助您在我们的<a href='http://news.opensuse.org' title='news.opensuse.org'>" +"新闻页面</a>\n" "或其它资源中推广您的组织、事件或学校。\n" "(嘤嘤嘤！我们爱美图！多拍点嘛！)。\n" -"请用 <a href='mailto:opensuse-marketing@opensuse.org'>opensuse-marketing@opensuse.org</a>\n" +"请用 <a href='mailto:opensuse-marketing@opensuse.org'>" +"opensuse-marketing@opensuse.org</a>\n" "联系我们来讨论推广和/或其它我们可协助您的方式。" -msgid "When downloading images other than the CD for network installation, it is <i>strongly</i> recommended to use a proper download manager to reduce the risk of corrupted data." +msgid "" +"When downloading images other than the CD for network installation, it is <i>" +"strongly</i> recommended to use a proper download manager to reduce the risk " +"of corrupted data." msgstr "当下载映像而不是网络安装 CD 时，<i>强烈</i>建议使用下载管理器来降低数据损坏的风险。" -msgid "You can add the repository key to apt. Keep in mind that the owner of the key may distribute updates, packages and repositories that your system will trust (<a href=\"%s\">more information</a>). To add the key, run:" -msgstr "您可以把软件源金钥添加到 apt。记住该金钥的拥有者将能够分发您的系统将会信任的更新、软件包和软件源 (<a href=\"%s\">更多信息</a>)。要添加该金钥，请运行：" +msgid "" +"You can add the repository key to apt. Keep in mind that the owner of the key " +"may distribute updates, packages and repositories that your system will trust " +"(<a href=\"%s\">more information</a>). To add the key, run:" +msgstr "" +"您可以把软件源金钥添加到 apt。记住该金钥的拥有者将能够分发您的系统将会信任的更新、软件包和软件源 (<a href=\"%s\">更多信息</a>" +")。要添加该金钥，请运行：" -msgid "You could try to extend your search to development packages or search for another base distribution (currently )." +msgid "" +"You could try to extend your search to development packages or search for " +"another base distribution (currently )." msgstr "您可尝试将搜索条件扩展到开发软件包或搜索另一个基础发行版中的软件包 (目前)。" -msgid "You could verify the file in the process of downloading. For example a checksum (SHA256) will be used automatically if you choose <a href='http://en.opensuse.org/SDB:Metalink'>Metalink</a> in the field above and use the add-on DownThemAll! in <a href='http://en.opensuse.org/Firefox'>Firefox</a>." -msgstr "你可以在下载进行时校验文件。例如若您在上面框中选择了 <a href='http://zh.opensuse.org/SDB:Metalink'>Metalink</a> 下载方式，并使用 <a href='http://zh.opensuse.org/Firefox'>Firefox</a> 的 DownThemAll! 插件下载，就会自动使用 SHA256 checksum 验证。" +msgid "" +"You could verify the file in the process of downloading. For example a " +"checksum (SHA256) will be used automatically if you choose <a " +"href='http://en.opensuse.org/SDB:Metalink'>Metalink</a> in the field above " +"and use the add-on DownThemAll! in <a href='http://en.opensuse.org/Firefox'>" +"Firefox</a>." +msgstr "" +"你可以在下载进行时校验文件。例如若您在上面框中选择了 <a href='http://zh.opensuse.org/SDB:Metalink'>" +"Metalink</a> 下载方式，并使用 <a href='http://zh.opensuse.org/Firefox'>Firefox</a> 的 " +"DownThemAll! 插件下载，就会自动使用 SHA256 checksum 验证。" msgid "gpg signature" msgstr "GPG 签名" @@ -576,7 +727,9 @@ msgstr "http://zh.opensuse.org/SDB:下载帮助" msgid "http://en.opensuse.org/SDB:Download_help#Burn_the_ISO_image.28s.29" -msgstr "http://zh.opensuse.org/SDB:下载帮助#.E7.83.A7.E5.BD.95_ISO_.E6.98.A0.E5.83.8F.E6.A1.A3" +msgstr "" +"http://zh.opensuse.org/SDB:下载帮助#.E7.83.A7.E5.BD.95_ISO_.E6.98.A0.E5.83.8F.E6.A" +"1.A3" msgid "http://en.opensuse.org/openSUSE:Submitting_bug_reports" msgstr "http://zh.opensuse.org/openSUSE:Submitting_bug_reports" @@ -596,7 +749,9 @@ msgid "https://doc.opensuse.org/release-notes/x86_64/openSUSE/13.2/" msgstr "https://doc.opensuse.org/release-notes/x86_64/openSUSE/13.2/" -msgid "is still the most commonly used checksum. Many ISO burners display it right before burning." +msgid "" +"is still the most commonly used checksum. Many ISO burners display it right " +"before burning." msgstr "依然是最常用的 checksum。许多 ISO 刻录程序会在开始刻录前显示它。" msgid "is the less known but more secure checksum than md5." @@ -605,7 +760,9 @@ msgid "md5 checksum" msgstr "md5 checksum" -msgid "offers the most security as you can verify who signed it. It should be <tt>%s</tt>." +msgid "" +"offers the most security as you can verify who signed it. It should be <tt>%" +"s</tt>." msgstr "提供了最大安全性，您可以校验是谁签发了它。签发人应该是 <tt>%s</tt>。" msgid "openSUSE Countdown" @@ -614,7 +771,9 @@ msgid "openSUSE Derivatives" msgstr "openSUSE 衍生版本" -msgid "openSUSE is available via http (direct link) or BitTorrent. The CD for network installation is only available via http." +msgid "" +"openSUSE is available via http (direct link) or BitTorrent. The CD for " +"network installation is only available via http." msgstr "openSUSE 可以籍 http(直接链接) 或 BitTorrent 种子撷取。网络安装 CD 只能通过直接链接下载。" msgid "openSUSE only supports PCs with 32 Bits and 64 Bits." Modified: trunk/lcn/zh_CN/po/zypp.zh_CN.po =================================================================== --- trunk/lcn/zh_CN/po/zypp.zh_CN.po 2014-09-25 12:02:37 UTC (rev 89460) +++ trunk/lcn/zh_CN/po/zypp.zh_CN.po 2014-09-25 16:16:44 UTC (rev 89461) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-05 01:13+0200\n" -"PO-Revision-Date: 2014-06-10 12:24+0800\n" +"POT-Creation-Date: 2014-09-18 15:45+0200\n" +"PO-Revision-Date: 2014-09-26 00:16+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: zypp/solver/detail/SATResolver.cc:1102 +#: zypp/solver/detail/SATResolver.cc:1144 msgid "" "\n" "uninstallable providers: " @@ -55,37 +55,37 @@ msgid "%s already executed as %s)" msgstr "%s 早已作为 %s 执行了)" -#: zypp/solver/detail/SATResolver.cc:1044 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s 与 %s 冲突，后者由 %s 提供" -#: zypp/solver/detail/SATResolver.cc:997 +#: zypp/solver/detail/SATResolver.cc:1039 #, c-format msgid "%s does not belong to a distupgrade repository" msgstr "%s 不属于发行版升级源" -#: zypp/solver/detail/SATResolver.cc:1001 +#: zypp/solver/detail/SATResolver.cc:1043 #, c-format msgid "%s has inferior architecture" msgstr "%s 架构不对应" -#: zypp/solver/detail/SATResolver.cc:1029 +#: zypp/solver/detail/SATResolver.cc:1071 #, c-format msgid "%s is not installable" msgstr "%s 不可安装" -#: zypp/solver/detail/SATResolver.cc:1025 +#: zypp/solver/detail/SATResolver.cc:1067 #, c-format msgid "%s is provided by the system and cannot be erased" msgstr "%s 由系统提供，无法擦除" -#: zypp/solver/detail/SATResolver.cc:1049 +#: zypp/solver/detail/SATResolver.cc:1091 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s 淘汰了 %s，后者由 %s 提供" -#: zypp/solver/detail/SATResolver.cc:1090 +#: zypp/solver/detail/SATResolver.cc:1132 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s 依赖 %s，但无法提供此依赖" @@ -125,7 +125,7 @@ msgid "Adangme" msgstr "阿当梅语" -#: zypp/RepoManager.cc:1406 +#: zypp/RepoManager.cc:1451 #, c-format msgid "Adding repository '%s'" msgstr "正在添加软件源 '%s'" @@ -354,7 +354,7 @@ msgstr "新西兰南岛诸语言 (其它)" #. !\todo add comma to the message for the next release -#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1689 +#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1690 #, c-format msgid "Authentication required for '%s'" msgstr "'%s' 需要认证" @@ -618,7 +618,7 @@ msgid "Buginese" msgstr "布吉语" -#: zypp/RepoManager.cc:1107 +#: zypp/RepoManager.cc:1152 #, c-format msgid "Building repository '%s' cache" msgstr "正在构建软件源 '%s' 的缓存" @@ -676,56 +676,56 @@ msgid "Can't acquire the mutex lock" msgstr "无法取得 mutex 锁定" -#: zypp/ExternalProgram.cc:351 +#: zypp/ExternalProgram.cc:344 #, c-format msgid "Can't chdir to '%s' (%s)." msgstr "无法 chdir 到 '%s' (%s)。" -#: zypp/ExternalProgram.cc:350 +#: zypp/ExternalProgram.cc:343 #, c-format msgid "Can't chdir to '%s' inside chroot '%s' (%s)." msgstr "无法 chir 到 '%s'，它在 chroot '%s' (%s) 中。" -#: zypp/ExternalProgram.cc:340 +#: zypp/ExternalProgram.cc:333 #, c-format msgid "Can't chroot to '%s' (%s)." msgstr "无法 chroot 到 '%s' (%s)。" -#: zypp/RepoManager.cc:964 zypp/RepoManager.cc:1071 zypp/RepoManager.cc:1121 +#: zypp/RepoManager.cc:1009 zypp/RepoManager.cc:1116 zypp/RepoManager.cc:1166 #, c-format msgid "Can't create %s" msgstr "无法创建 %s" -#: zypp/RepoManager.cc:1127 +#: zypp/RepoManager.cc:1172 #, c-format msgid "Can't create cache at %s - no writing permissions." msgstr "无法在 %s 创建缓存 - 无写入权限。" -#: zypp/RepoManager.cc:972 +#: zypp/RepoManager.cc:1017 msgid "Can't create metadata cache directory." msgstr "无法创建元数据缓存文件夹。" #. TranslatorExplanation '%s' is a filename -#: zypp/RepoManager.cc:1583 zypp/RepoManager.cc:1772 +#: zypp/RepoManager.cc:1628 zypp/RepoManager.cc:1817 #, c-format msgid "Can't delete '%s'" msgstr "无法删除 '%s'" #. don't want to get here -#: zypp/ExternalProgram.cc:363 +#: zypp/ExternalProgram.cc:356 #, c-format msgid "Can't exec '%s' (%s)." msgstr "无法执行 '%s' (%s)。" -#: zypp/RepoManager.cc:1571 zypp/RepoManager.cc:1647 +#: zypp/RepoManager.cc:1616 zypp/RepoManager.cc:1692 msgid "Can't figure out where the repo is stored." msgstr "找不到软件源存储位置。" -#: zypp/RepoManager.cc:1760 zypp/RepoManager.cc:2111 +#: zypp/RepoManager.cc:1805 zypp/RepoManager.cc:2173 msgid "Can't figure out where the service is stored." msgstr "找不到服务存储位置。" -#: zypp/ExternalProgram.cc:371 +#: zypp/ExternalProgram.cc:364 #, c-format msgid "Can't fork (%s)." msgstr "无法派生 (%s)。" @@ -739,8 +739,8 @@ msgstr "无法初始化递归的 mutex" #. TranslatorExplanation '%s' is a filename -#: zypp/RepoManager.cc:575 zypp/RepoManager.cc:1445 zypp/RepoManager.cc:1527 -#: zypp/RepoManager.cc:1601 zypp/RepoManager.cc:1666 zypp/RepoManager.cc:1784 +#: zypp/RepoManager.cc:602 zypp/RepoManager.cc:1490 zypp/RepoManager.cc:1572 +#: zypp/RepoManager.cc:1646 zypp/RepoManager.cc:1711 zypp/RepoManager.cc:1829 #, c-format msgid "Can't open file '%s' for writing." msgstr "无法打开并写入 '%s' 文件。" @@ -750,12 +750,12 @@ msgid "Can't open lock file: %s" msgstr "无法打开锁定文件：%s" -#: zypp/ExternalProgram.cc:266 +#: zypp/ExternalProgram.cc:259 #, c-format msgid "Can't open pipe (%s)." msgstr "无法打开管道 (%s)。" -#: zypp/ExternalProgram.cc:255 +#: zypp/ExternalProgram.cc:248 #, c-format msgid "Can't open pty (%s)." msgstr "无法打开 pty (%s)。" @@ -792,6 +792,14 @@ msgid "Cannot find available loop device to mount the image file from '%s'" msgstr "找不到可用 loop 设备以挂载来自 '%s' 的映像文件" +#: zypp/RepoManager.cc:226 +msgid "Cannot read repo directory '%1%': Permission denied" +msgstr "无法读取源文件夹 '%1%': 权限被拒" + +#: zypp/RepoManager.cc:244 +msgid "Cannot read repo file '%1%': Permission denied" +msgstr "无法读取源文件 '%1%': 权限被拒" + #: zypp/media/MediaException.cc:67 #, c-format msgid "Cannot write file '%s'." @@ -959,16 +967,16 @@ msgid "Colombia" msgstr "哥伦比亚" -#: zypp/ExternalProgram.cc:497 +#: zypp/ExternalProgram.cc:490 #, c-format msgid "Command exited with status %d." msgstr "命令退出，状态 %d。" -#: zypp/ExternalProgram.cc:522 +#: zypp/ExternalProgram.cc:515 msgid "Command exited with unknown error." msgstr "命令退出，未知错误。" -#: zypp/ExternalProgram.cc:517 +#: zypp/ExternalProgram.cc:510 #, c-format msgid "Command was killed by signal %d (%s)." msgstr "命令已被信号 %d (%s) 杀死。" @@ -1309,7 +1317,7 @@ #. on ftp file-not-found(bnc #335906). Instead we'll check another types #. before throwing. #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1231 zypp/RepoManager.cc:2177 +#: zypp/RepoManager.cc:1276 zypp/RepoManager.cc:2239 #, c-format msgid "Error trying to read from '%s'" msgstr "试图读取 '%s' 出错" @@ -1349,7 +1357,7 @@ msgid "Ewondo" msgstr "埃翁多语" -#: zypp/RepoManager.cc:1191 +#: zypp/RepoManager.cc:1236 #, c-format msgid "Failed to cache repo (%d)." msgstr "缓存软件源 (%d) 失败。" @@ -1369,13 +1377,13 @@ msgstr "未能把 %s 挂载到 %s" #. TranslatorExplanation %s = name of the package being processed. -#: zypp/repo/PackageProvider.cc:255 +#: zypp/repo/PackageProvider.cc:286 #, c-format msgid "Failed to provide Package %s. Do you want to retry retrieval?" msgstr "未能提供软件包 %s。您想要重试撷取吗？" #. TranslatorExplanation '%s' is a pathname -#: zypp/RepoManager.cc:227 zypp/RepoManager.cc:620 zypp/RepoManager.cc:1318 +#: zypp/RepoManager.cc:234 zypp/RepoManager.cc:647 zypp/RepoManager.cc:1363 #: zypp/repo/PluginServices.cc:49 #, c-format msgid "Failed to read directory '%s'" @@ -1888,8 +1896,8 @@ msgid "Hausa" msgstr "豪撒语" -#: zypp/solver/detail/SATResolver.cc:1015 -#: zypp/solver/detail/SATResolver.cc:1019 +#: zypp/solver/detail/SATResolver.cc:1057 +#: zypp/solver/detail/SATResolver.cc:1061 msgid "Have you enabled all requested repositories?" msgstr "您启用了全部请求的软件源了吗？" @@ -2134,7 +2142,7 @@ msgstr "无效的正则表达式 '%s'：regcomp 返回 %d" #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1513 +#: zypp/RepoManager.cc:1558 #, c-format msgid "Invalid repo file name at '%s'" msgstr "无效的源文件名于 '%s'" @@ -3205,7 +3213,7 @@ msgstr "古奥斯曼诸语言" #. TranslatorExplanation %s = package being checked for integrity -#: zypp/repo/PackageProvider.cc:149 +#: zypp/repo/PackageProvider.cc:151 #, c-format msgid "" "Package %s seems to be corrupted during transfer. Do you want to retry " @@ -3466,12 +3474,12 @@ msgid "Relative path not allowed if authority exists" msgstr "若存在认证则不允许相对路径" -#: zypp/RepoManager.cc:1552 +#: zypp/RepoManager.cc:1597 #, c-format msgid "Removing repository '%s'" msgstr "正在移除软件源 '%s'" -#: zypp/RepoManager.cc:255 +#: zypp/RepoManager.cc:267 msgid "Repository alias cannot start with dot." msgstr "软件源别名不能以点开头。" @@ -3662,7 +3670,7 @@ msgid "Serer" msgstr "塞雷尔语" -#: zypp/RepoManager.cc:266 +#: zypp/RepoManager.cc:278 msgid "Service alias cannot start with dot." msgstr "服务别名不能以点开头。" @@ -4053,8 +4061,8 @@ msgid "This action is being run by another program already." msgstr "此动作正在由另一个程序运行着。" -#: zypp/solver/detail/SATResolver.cc:1237 -#: zypp/solver/detail/SATResolver.cc:1258 +#: zypp/solver/detail/SATResolver.cc:1279 +#: zypp/solver/detail/SATResolver.cc:1300 msgid "This request will break your system!" msgstr "此请求将破坏您的系统！" @@ -4266,7 +4274,7 @@ msgid "Undetermined" msgstr "未确定的语种" -#: zypp/RepoManager.cc:1201 +#: zypp/RepoManager.cc:1246 msgid "Unhandled repository type" msgstr "未处理的软件源类型" @@ -4295,7 +4303,7 @@ msgstr "未知国家或地区：" #. TranslatorExplanation '%s' is an URL -#: zypp/RepoManager.cc:1284 zypp/RepoManager.cc:2185 +#: zypp/RepoManager.cc:1329 zypp/RepoManager.cc:2247 #, c-format msgid "Unknown error reading from '%s'" msgstr "读取 '%s' 遇到未知错误" @@ -4317,7 +4325,7 @@ #. translators: Cleanup a repository previously owned by a meanwhile unknown (deleted) service. #. %1% = service name #. %2% = repository name -#: zypp/RepoManager.cc:671 +#: zypp/RepoManager.cc:729 msgid "Unknown service '%1%': Removing orphaned service repository '%2%'" msgstr "未知服务 '%1%'：正在移除孤立的服务软件源 '%2%'" @@ -4428,7 +4436,7 @@ msgid "Virgin Islands, U.S." msgstr "美属维尔京群岛" -#: zypp/media/MediaCurl.cc:1003 +#: zypp/media/MediaCurl.cc:1004 msgid "" "Visit the Novell Customer Center to check whether your registration is valid " "and has not expired." @@ -4569,15 +4577,15 @@ msgid "Zuni" msgstr "祖尼语" -#: zypp/repo/PackageProvider.cc:384 +#: zypp/repo/PackageProvider.cc:415 msgid "applydeltarpm check failed." msgstr "应用差异 RPM 检查失败。" -#: zypp/repo/PackageProvider.cc:394 +#: zypp/repo/PackageProvider.cc:425 msgid "applydeltarpm failed." msgstr "应用差异 RPM 失败。" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1387 #, c-format msgid "architecture change of %s to %s" msgstr "架构从 %s 变更到 %s" @@ -4588,12 +4596,12 @@ msgid "break %s by ignoring some of its dependencies" msgstr "通过忽略一些依赖关系来破坏 %s " -#: zypp/solver/detail/SATResolver.cc:1039 +#: zypp/solver/detail/SATResolver.cc:1081 #, c-format msgid "cannot install both %s and %s" msgstr "无法同时安装 %s 和 %s" -#: zypp/solver/detail/SATResolver.cc:1008 +#: zypp/solver/detail/SATResolver.cc:1050 msgid "conflicting requests" msgstr "冲突的请求" @@ -4602,47 +4610,47 @@ msgid "created backup %s" msgstr "已创建备份 %s" -#: zypp/solver/detail/SATResolver.cc:1374 +#: zypp/solver/detail/SATResolver.cc:1416 #, c-format msgid "deinstallation of %s" msgstr "卸载 %s" -#: zypp/solver/detail/SATResolver.cc:1092 +#: zypp/solver/detail/SATResolver.cc:1134 msgid "deleted providers: " msgstr "删除的提供者：" -#: zypp/solver/detail/SATResolver.cc:1265 +#: zypp/solver/detail/SATResolver.cc:1307 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "不询问就删除全部提供 %s 的解析项" -#: zypp/solver/detail/SATResolver.cc:1243 +#: zypp/solver/detail/SATResolver.cc:1285 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "不询问就安装一个提供 %s 的解析项" -#: zypp/solver/detail/SATResolver.cc:1186 +#: zypp/solver/detail/SATResolver.cc:1228 #, c-format msgid "do not forbid installation of %s" msgstr "不禁止安装 %s" -#: zypp/solver/detail/SATResolver.cc:1166 -#: zypp/solver/detail/SATResolver.cc:1202 +#: zypp/solver/detail/SATResolver.cc:1208 +#: zypp/solver/detail/SATResolver.cc:1244 #, c-format msgid "do not install %s" msgstr "不安装 %s" -#: zypp/solver/detail/SATResolver.cc:1278 +#: zypp/solver/detail/SATResolver.cc:1320 #, c-format msgid "do not install most recent version of %s" msgstr "不安装最新版本的 %s" -#: zypp/solver/detail/SATResolver.cc:1161 +#: zypp/solver/detail/SATResolver.cc:1203 #, c-format msgid "do not keep %s installed" msgstr "不保留 %s" -#: zypp/solver/detail/SATResolver.cc:1338 +#: zypp/solver/detail/SATResolver.cc:1380 #, c-format msgid "downgrade of %s to %s" msgstr "降级 %s 到 %s" @@ -4651,12 +4659,12 @@ msgid "generally ignore of some dependecies" msgstr "通常忽略一些依赖关系" -#: zypp/solver/detail/SATResolver.cc:1238 -#: zypp/solver/detail/SATResolver.cc:1259 +#: zypp/solver/detail/SATResolver.cc:1280 +#: zypp/solver/detail/SATResolver.cc:1301 msgid "ignore the warning of a broken system" msgstr "忽略损坏系统的警告" -#: zypp/solver/detail/SATResolver.cc:1354 +#: zypp/solver/detail/SATResolver.cc:1396 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4665,17 +4673,17 @@ "安装 %s (包括厂商变更)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1346 #, c-format msgid "install %s despite the inferior architecture" msgstr "尽管架构不对应仍安装 %s" -#: zypp/solver/detail/SATResolver.cc:1318 +#: zypp/solver/detail/SATResolver.cc:1360 #, c-format msgid "install %s from excluded repository" msgstr "从排除的软件源安装 %s" -#: zypp/solver/detail/SATResolver.cc:1054 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format msgid "installed %s obsoletes %s provided by %s" msgstr "已安装的 %s 淘汰了 %s，后者由 %s 提供" @@ -4684,18 +4692,18 @@ msgid "invalid" msgstr "无效" -#: zypp/solver/detail/SATResolver.cc:1181 #: zypp/solver/detail/SATResolver.cc:1223 +#: zypp/solver/detail/SATResolver.cc:1265 #, c-format msgid "keep %s" msgstr "保留 %s" -#: zypp/solver/detail/SATResolver.cc:1299 +#: zypp/solver/detail/SATResolver.cc:1341 #, c-format msgid "keep %s despite the inferior architecture" msgstr "保留 %s，即使架构不对应" -#: zypp/solver/detail/SATResolver.cc:1313 +#: zypp/solver/detail/SATResolver.cc:1355 #, c-format msgid "keep obsolete %s" msgstr "保留已淘汰的 %s" @@ -4708,27 +4716,27 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection：无法设置 dbus 连接" -#: zypp/solver/detail/SATResolver.cc:1034 +#: zypp/solver/detail/SATResolver.cc:1076 #, c-format msgid "nothing provides %s needed by %s" msgstr "没有什么能提供 %s，而它为 %s 所需" -#: zypp/solver/detail/SATResolver.cc:1014 +#: zypp/solver/detail/SATResolver.cc:1056 #, c-format msgid "nothing provides requested %s" msgstr "没有什么能提供所需的 %s" -#: zypp/solver/detail/SATResolver.cc:1018 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format msgid "package %s does not exist" msgstr "软件包 %s 不存在" -#: zypp/solver/detail/SATResolver.cc:1005 +#: zypp/solver/detail/SATResolver.cc:1047 #, c-format msgid "problem with installed package %s" msgstr "已安装的 %s 软件包有问题" -#: zypp/solver/detail/SATResolver.cc:1363 +#: zypp/solver/detail/SATResolver.cc:1405 #, c-format msgid "replacement of %s with %s" msgstr "将 %s 用 %s 取代" @@ -4765,16 +4773,16 @@ "rpm 已将 %s 另存为 %s。\n" "以下是前 25 行差异：\n" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1100 #, c-format msgid "solvable %s conflicts with %s provided by itself" msgstr "可解析项 %s 与自身提供的 %s 冲突" -#: zypp/solver/detail/SATResolver.cc:1011 +#: zypp/solver/detail/SATResolver.cc:1053 msgid "some dependency problem" msgstr "一些依赖性问题" -#: zypp/solver/detail/SATResolver.cc:1104 +#: zypp/solver/detail/SATResolver.cc:1146 msgid "uninstallable providers: " msgstr "不可安装的提供者：" @@ -4786,7 +4794,7 @@ msgid "unsupported" msgstr "不支持" -#: zypp/solver/detail/SATResolver.cc:1022 +#: zypp/solver/detail/SATResolver.cc:1064 msgid "unsupported request" msgstr "不支持的请求" Modified: trunk/lcn/zh_CN/po/zypper.zh_CN.po =================================================================== --- trunk/lcn/zh_CN/po/zypper.zh_CN.po 2014-09-25 12:02:37 UTC (rev 89460) +++ trunk/lcn/zh_CN/po/zypper.zh_CN.po 2014-09-25 16:16:44 UTC (rev 89461) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-31 01:13+0200\n" +"POT-Creation-Date: 2014-09-18 15:46+0200\n" "PO-Revision-Date: 2014-09-04 15:19+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Traditional <opensuse-zh@opensuse.org>\n" @@ -64,10 +64,6 @@ msgstr "类型为 '%s' 的信息尚未实现。" #: src/info.cc:193 src/info.cc:337 src/info.cc:416 -msgid "Catalog: " -msgstr "软件名录： " - -#: src/info.cc:193 src/info.cc:337 src/info.cc:416 msgid "Repository: " msgstr "软件源：" @@ -176,7 +172,7 @@ #. translators: name (general header) #: src/info.cc:357 src/repos.cc:853 src/repos.cc:941 src/repos.cc:1073 #: src/repos.cc:2480 src/update.cc:262 src/update.cc:502 src/update.cc:688 -#: src/Zypper.cc:5131 src/search.cc:57 src/search.cc:69 src/search.cc:252 +#: src/Zypper.cc:5130 src/search.cc:57 src/search.cc:69 src/search.cc:252 #: src/search.cc:345 src/search.cc:464 src/search.cc:606 src/search.cc:678 #: src/locks.cc:40 msgid "Name" @@ -220,7 +216,7 @@ msgid "End of Support" msgstr "支持终止" -#: src/info.cc:441 src/info.cc:449 src/info.cc:481 +#: src/info.cc:441 src/info.cc:449 src/info.cc:480 msgid "undefined" msgstr "未定义" @@ -236,15 +232,15 @@ msgid "Update Repositories" msgstr "更新软件源" -#: src/info.cc:463 +#: src/info.cc:462 msgid "Content Id" msgstr "内容 ID" -#: src/info.cc:470 +#: src/info.cc:469 msgid "Provided by enabled repository" msgstr "由已启用的软件源提供" -#: src/info.cc:476 +#: src/info.cc:475 msgid "Not provided by any enabled repository" msgstr "任何已启用的软件源都没有提供它" @@ -365,14 +361,16 @@ msgid "" "There is an update candidate '%s' for '%s', but it does not match the " "specified version, architecture, or repository." -msgstr "有一个更新候选 '%s' 可供 '%s' 使用，但它不匹配指定的版本、架构或软件源。" +msgstr "" +"有一个更新候选 '%s' 可供 '%s' 使用，但它不匹配指定的版本、架构或软件源。" #: src/RequestFeedback.cc:132 #, c-format msgid "" "There is an update candidate for '%s', but it is from a different vendor. " "Use '%s' to install this candidate." -msgstr "有一个 '%s' 的更新候选，但它来自一个不同的厂商。请使用 '%s' 安装此候选。" +msgstr "" +"有一个 '%s' 的更新候选，但它来自一个不同的厂商。请使用 '%s' 安装此候选。" #: src/RequestFeedback.cc:145 #, c-format @@ -681,7 +679,8 @@ msgid_plural "" "The following %d packages are recommended, but will not be installed because " "they are unwanted (were manually removed before):" -msgstr[0] "推荐以下 %d 个软件包，但不会安装，因为它们是不需要的 (曾经手动移除过)：" +msgstr[0] "" +"推荐以下 %d 个软件包，但不会安装，因为它们是不需要的 (曾经手动移除过)：" #: src/Summary.cc:896 #, c-format @@ -1576,7 +1575,7 @@ msgid "Target initialization failed:" msgstr "目标初始化失败：" -#: src/repos.cc:833 src/Zypper.cc:4218 +#: src/repos.cc:833 src/Zypper.cc:4217 msgid "Running 'zypper refresh' as root might resolve the problem." msgstr "以 root 身份运行 'zypper refresh' 或许会解决该问题。" @@ -1595,7 +1594,7 @@ msgid "Disabled" msgstr "已禁用" -#: src/repos.cc:930 src/repos.cc:1072 src/repos.cc:2479 src/Zypper.cc:5131 +#: src/repos.cc:930 src/repos.cc:1072 src/repos.cc:2479 src/Zypper.cc:5130 msgid "Alias" msgstr "别名" @@ -1805,7 +1804,7 @@ "URIs (see below) point to a valid repository:" msgstr "无法确定软件源类型。请检查定义的 URI (见下) 是否指向了有效的软件源：" -#: src/repos.cc:1651 src/Zypper.cc:3071 +#: src/repos.cc:1651 src/Zypper.cc:3080 msgid "Can't find a valid repository at given location:" msgstr "未能在给定位置找到有效的软件源：" @@ -1873,7 +1872,8 @@ msgid "" "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for " "details." -msgstr "它是一个 .repo 文件吗？ 细节请参考 http://en.opensuse.org/Standards/RepoInfo" +msgstr "" +"它是一个 .repo 文件吗？ 细节请参考 http://en.opensuse.org/Standards/RepoInfo" #: src/repos.cc:1814 msgid "Problem encountered while trying to read the file at the specified URI" @@ -1898,7 +1898,8 @@ msgid "" "Cannot change alias of '%s' repository. The repository belongs to service " "'%s' which is responsible for setting its alias." -msgstr "无法修改软件源 '%s' 的别名。该软件源属于服务 '%s' ，该服务负责设置其别名。" +msgstr "" +"无法修改软件源 '%s' 的别名。该软件源属于服务 '%s' ，该服务负责设置其别名。" #: src/repos.cc:1908 #, c-format @@ -2203,17 +2204,6 @@ msgid "Problem occured while reading the installed packages:" msgstr "读取已安装软件包时发生问题：" -#. list name, exact match -#: src/repos.cc:3317 -msgid "" -"ZENworks Management Daemon is running.\n" -"WARNING: this command will not synchronize changes.\n" -"Use rug or yast2 for that." -msgstr "" -"ZENworks 管理守护程序正在运行。\n" -"警告：此命令不会同步修改。\n" -"请用 rug 或者 yast2 同步。" - #. translators: %d is the number of needed patches #: src/update.cc:71 #, c-format @@ -2228,15 +2218,11 @@ msgid_plural "%d security patches" msgstr[0] "%d 个安全补丁" -#. translators: catalog (rug's word for repository) (header) -#: src/update.cc:261 src/update.cc:496 src/search.cc:53 src/search.cc:344 -#: src/locks.cc:42 -msgid "Catalog" -msgstr "软件名录" - +#. translators: package's repository (header) #. translators: package's repository (header) -#: src/update.cc:261 src/update.cc:496 src/search.cc:77 src/search.cc:344 -#: src/search.cc:466 src/search.cc:605 src/search.cc:674 src/locks.cc:44 +#: src/update.cc:261 src/update.cc:496 src/search.cc:53 src/search.cc:77 +#: src/search.cc:344 src/search.cc:466 src/search.cc:605 src/search.cc:674 +#: src/locks.cc:42 src/locks.cc:44 msgid "Repository" msgstr "软件源" @@ -4042,7 +4028,8 @@ "download [选项] <软件包>...\n" "下载通过命令行指定的 RPM 到本地文件夹。\n" "软件包默认将下载到 libzypp 软件包缓存文件夹\n" -"(/var/cache/zypp/packages; 非 root 用户则是 $XDG_CACHE_HOME/zypp/packages)，\n" +"(/var/cache/zypp/packages; 非 root 用户则是 $XDG_CACHE_HOME/zypp/" +"packages)，\n" "但这可以使用全局的 --pkg-cache-dir 选项修改。\n" "将会为每个 zypper 试图下载的软件包以 XML 输出写入一个<下载结果>节点。\n" "成功后本地路径可在 'download-result/localpath@path' 中找到。\n" @@ -4165,15 +4152,15 @@ "\n" "此命令的实现是虚假的，总是返回 0。\n" -#: src/Zypper.cc:2797 src/Zypper.cc:5117 +#: src/Zypper.cc:2797 src/Zypper.cc:5116 msgid "Unexpected program flow." msgstr "意外程序流。" -#: src/Zypper.cc:2824 +#: src/Zypper.cc:2833 msgid "Non-option program arguments: " msgstr "无选项程序参数：" -#: src/Zypper.cc:2879 +#: src/Zypper.cc:2888 msgid "" "PackageKit is blocking zypper. This happens if you have an updater applet or " "other software management application using PackageKit running." @@ -4181,20 +4168,20 @@ "PackageKit 正屏蔽着 zypper。这发生在若您已运行了一个使用 PackageKit 的升级挂" "件或其他软件管理程序时。" -#: src/Zypper.cc:2885 +#: src/Zypper.cc:2894 msgid "Tell PackageKit to quit?" msgstr "通知 PackageKit 退出吗？" -#: src/Zypper.cc:2894 +#: src/Zypper.cc:2903 msgid "PackageKit is still running (probably busy)." msgstr "PackageKit 仍在运行 (或许正忙)。" -#: src/Zypper.cc:2896 +#: src/Zypper.cc:2905 msgid "Try again?" msgstr "重试吗？" #. TranslatorExplanation this is a hedgehog, paint another animal, if you want -#: src/Zypper.cc:2949 +#: src/Zypper.cc:2958 msgid "" " \\\\\\\\\\\n" " \\\\\\\\\\\\\\__o\n" @@ -4204,26 +4191,26 @@ " \\\\\\\\\\\\\\__o\n" "__\\\\\\\\\\\\\\'/_" -#: src/Zypper.cc:2976 +#: src/Zypper.cc:2985 msgid "Root privileges are required for refreshing services." msgstr "刷新服务需要有 root 特权。" -#: src/Zypper.cc:3003 src/Zypper.cc:3123 src/Zypper.cc:3360 +#: src/Zypper.cc:3012 src/Zypper.cc:3130 src/Zypper.cc:3365 msgid "Root privileges are required for modifying system services." msgstr "修改系统服务需要有 root 特权。" -#: src/Zypper.cc:3072 +#: src/Zypper.cc:3081 msgid "" "Could not determine the type of the repository. Check if the specified URI " "points to a valid repository." msgstr "无法确定软件源类型。请检查指定的 URI 是否指向了一个有效的软件源。" -#: src/Zypper.cc:3104 +#: src/Zypper.cc:3111 #, c-format msgid "'%s' is not a valid service type." msgstr "`%s' 不是一个有效的服务类型。" -#: src/Zypper.cc:3106 +#: src/Zypper.cc:3113 #, c-format msgid "See '%s' or '%s' to get a list of known service types." msgstr "请参考 '%s' 或 '%s' 获取已知服务类型列表。" @@ -4232,116 +4219,116 @@ #. followed by ms command help text which will explain it #. translators: aggregate option is e.g. "--all". This message will be #. followed by mr command help text which will explain it -#: src/Zypper.cc:3135 src/Zypper.cc:3514 +#: src/Zypper.cc:3142 src/Zypper.cc:3516 msgid "Alias or an aggregate option is required." msgstr "需要别名或者一个合计选项。" -#: src/Zypper.cc:3169 +#: src/Zypper.cc:3176 #, c-format msgid "Service '%s' not found." msgstr "未找到服务 '%s'。" -#: src/Zypper.cc:3205 src/Zypper.cc:3359 src/Zypper.cc:3445 src/Zypper.cc:3501 +#: src/Zypper.cc:3212 src/Zypper.cc:3364 src/Zypper.cc:3448 src/Zypper.cc:3503 msgid "Root privileges are required for modifying system repositories." msgstr "修改系统软件源需要有 root 特权。" -#: src/Zypper.cc:3260 src/Zypper.cc:3628 +#: src/Zypper.cc:3267 src/Zypper.cc:3630 msgid "Too few arguments." msgstr "参数太少。" -#: src/Zypper.cc:3284 +#: src/Zypper.cc:3291 msgid "" "If only one argument is used, it must be a URI pointing to a .repo file." msgstr "如果只用一个参数，那么它必须是一个指向 .repo 文件的 URI。" -#: src/Zypper.cc:3314 +#: src/Zypper.cc:3321 #, c-format msgid "Cannot use %s together with %s. Using the %s setting." msgstr "无法同时使用 %s 和 %s。正在使用 %s 设置。" -#: src/Zypper.cc:3337 +#: src/Zypper.cc:3342 msgid "Specified type is not a valid repository type:" msgstr "指定的类型不是一个有效的软件源类型：" -#: src/Zypper.cc:3339 +#: src/Zypper.cc:3344 #, c-format msgid "See '%s' or '%s' to get a list of known repository types." msgstr "请参考 '%s' 或 '%s' 获取已知软件源类型列表。" -#: src/Zypper.cc:3367 src/Zypper.cc:4705 src/utils/messages.cc:48 +#: src/Zypper.cc:3372 src/Zypper.cc:4704 src/utils/messages.cc:48 msgid "Required argument missing." msgstr "缺失所需参数。" #. translators: %s is the supplied command line argument which #. for which no repository counterpart was found -#: src/Zypper.cc:3395 +#: src/Zypper.cc:3398 #, c-format msgid "Repository '%s' not found by alias, number or URI." msgstr "通过别名、编号或 URI 都未找到软件源 '%s'。" #. translators: %s is the supplied command line argument which #. for which no service counterpart was found -#: src/Zypper.cc:3418 +#: src/Zypper.cc:3421 #, c-format msgid "Service '%s' not found by alias, number or URI." msgstr "通过别名、编号或 URI 都未找到服务 '%s'。" -#: src/Zypper.cc:3452 +#: src/Zypper.cc:3455 msgid "Too few arguments. At least URI and alias are required." msgstr "参数太少。至少需要 URI 和别名。" -#: src/Zypper.cc:3477 +#: src/Zypper.cc:3479 #, c-format msgid "Repository '%s' not found." msgstr "未找到软件源 '%s'。" -#: src/Zypper.cc:3547 +#: src/Zypper.cc:3549 #, c-format msgid "Repository %s not found." msgstr "未找到软件源 %s。" -#: src/Zypper.cc:3567 +#: src/Zypper.cc:3569 msgid "Root privileges are required for refreshing system repositories." msgstr "刷新系统软件源需要有 root 特权。" -#: src/Zypper.cc:3574 +#: src/Zypper.cc:3576 #, c-format msgid "The '%s' global option has no effect here." msgstr "全局选项 '%s' 在此无效。" -#: src/Zypper.cc:3582 +#: src/Zypper.cc:3584 #, c-format msgid "Arguments are not allowed if '%s' is used." msgstr "若使用 '%s' 则不允许使用参数。" -#: src/Zypper.cc:3608 +#: src/Zypper.cc:3610 msgid "Root privileges are required for cleaning local caches." msgstr "清理本地缓存需要有 root 特权。" -#: src/Zypper.cc:3629 +#: src/Zypper.cc:3631 msgid "At least one package name is required." msgstr "需要至少一个软件包名称。" -#: src/Zypper.cc:3639 +#: src/Zypper.cc:3641 msgid "Root privileges are required for installing or uninstalling packages." msgstr "安装或卸载软件包需要有 root 特权。" #. translators: rug related message, shown if #. 'zypper in --entire-catalog foorepo someargument' is specified -#: src/Zypper.cc:3656 +#: src/Zypper.cc:3658 msgid "Ignoring arguments, marking the entire repository." msgstr "忽略参数，标记整个软件源。" -#: src/Zypper.cc:3666 +#: src/Zypper.cc:3668 #, c-format msgid "Unknown package type: %s" msgstr "未知软件包类型：%s" -#: src/Zypper.cc:3677 +#: src/Zypper.cc:3679 msgid "Cannot uninstall patches." msgstr "无法卸载补丁。" -#: src/Zypper.cc:3678 +#: src/Zypper.cc:3680 msgid "" "Installed status of a patch is determined solely based on its dependencies.\n" "Patches are not installed in sense of copied files, database records,\n" @@ -4350,107 +4337,107 @@ "一款补丁的安装情况完全取决于其依赖关系。\n" "因此仅仅是复制文件、数据库记录或其它东西并不代表安装了补丁。" -#: src/Zypper.cc:3689 +#: src/Zypper.cc:3691 msgid "Uninstallation of a source package not defined and implemented." msgstr "目前未定义也未实现源代码包的卸载。" -#: src/Zypper.cc:3710 +#: src/Zypper.cc:3712 #, c-format msgid "'%s' looks like an RPM file. Will try to download it." msgstr "'%s' 貌似是一个 RPM 文件，将尝试下载之。" -#: src/Zypper.cc:3723 +#: src/Zypper.cc:3725 #, c-format msgid "Problem with the RPM file specified as '%s', skipping." msgstr "指定为 '%s' 的 RPM 文件有问题，正在跳过。" -#: src/Zypper.cc:3748 +#: src/Zypper.cc:3750 #, c-format msgid "Problem reading the RPM header of %s. Is it an RPM file?" msgstr "读取 %s 的 RPM 头部出现问题。它是一个 RPM 文件吗？" -#: src/Zypper.cc:3773 +#: src/Zypper.cc:3775 msgid "Plain RPM files cache" msgstr "纯 RPM 文件缓存" -#: src/Zypper.cc:3790 +#: src/Zypper.cc:3792 msgid "No valid arguments specified." msgstr "未指定有效的参数。" -#: src/Zypper.cc:3804 src/Zypper.cc:3947 +#: src/Zypper.cc:3806 src/Zypper.cc:3949 msgid "" "No repositories defined. Operating only with the installed resolvables. " "Nothing can be installed." msgstr "未定义软件源。只能操作已安装的可解析项。不能安装新东西。" #. translators: meaning --capability contradicts --force/--name -#: src/Zypper.cc:3842 src/Zypper.cc:4464 +#: src/Zypper.cc:3844 src/Zypper.cc:4463 #, c-format msgid "%s contradicts %s" msgstr "%s 与 %s 冲突" #. translators: meaning --force with --capability -#: src/Zypper.cc:3851 +#: src/Zypper.cc:3853 #, c-format msgid "%s cannot currently be used with %s" msgstr "%s 目前不能和 %s 一起使用" -#: src/Zypper.cc:3895 +#: src/Zypper.cc:3897 msgid "Source package name is a required argument." msgstr "源代码包名称是一个必需的参数。" -#: src/Zypper.cc:3993 +#: src/Zypper.cc:3992 msgid "Mode is set to 'match-exact'" msgstr "模式已设为精确匹配" -#: src/Zypper.cc:4017 src/Zypper.cc:4379 src/Zypper.cc:4485 src/Zypper.cc:4733 -#: src/Zypper.cc:4801 src/Zypper.cc:4846 +#: src/Zypper.cc:4016 src/Zypper.cc:4378 src/Zypper.cc:4484 src/Zypper.cc:4732 +#: src/Zypper.cc:4800 src/Zypper.cc:4845 #, c-format msgid "Unknown package type '%s'." msgstr "未知软件包类型 '%s'。" -#: src/Zypper.cc:4040 +#: src/Zypper.cc:4039 #, c-format msgid "Specified repository '%s' is disabled." msgstr "已禁用指定软件源 '%s'。" -#: src/Zypper.cc:4173 src/search.cc:594 +#: src/Zypper.cc:4172 src/search.cc:594 msgid "No packages found." msgstr "未找到软件包。" -#: src/Zypper.cc:4216 +#: src/Zypper.cc:4215 msgid "Problem occurred initializing or executing the search query" msgstr "初始化或执行搜索查询出现问题" -#: src/Zypper.cc:4217 +#: src/Zypper.cc:4216 msgid "See the above message for a hint." msgstr "请参考以上消息汲取灵感。" #. translators: Running as 'rug', cannot use 'best-effort' option. -#: src/Zypper.cc:4400 src/Zypper.cc:4531 +#: src/Zypper.cc:4399 src/Zypper.cc:4530 #, c-format msgid "Running as '%s', cannot use '%s' option." msgstr "正以 '%s' 运行，无法使用 '%s' 选项。" -#: src/Zypper.cc:4408 +#: src/Zypper.cc:4407 #, c-format msgid "Cannot use %s together with %s." msgstr "无法同时使用 %s 和 %s。" -#: src/Zypper.cc:4441 +#: src/Zypper.cc:4440 msgid "Root privileges are required for updating packages." msgstr "更新软件包需要有 root 特权。" -#: src/Zypper.cc:4492 src/Zypper.cc:4500 src/Zypper.cc:4617 +#: src/Zypper.cc:4491 src/Zypper.cc:4499 src/Zypper.cc:4616 msgid "Operation not supported." msgstr "不支持该操作。" -#: src/Zypper.cc:4493 +#: src/Zypper.cc:4492 #, c-format msgid "To update installed products use '%s'." msgstr "要更新已安装的产品请使用 '%s'。" -#: src/Zypper.cc:4502 +#: src/Zypper.cc:4501 #, c-format msgid "" "Zypper does not keep track of installed source packages. To install the " @@ -4459,16 +4446,16 @@ "Zypper 不会追踪已安装的源软件包。要安装最新的源软件包和它的编译依赖，请使用 " "'%s'。" -#: src/Zypper.cc:4520 +#: src/Zypper.cc:4519 msgid "" "Cannot use multiple types when specific packages are given as arguments." msgstr "当指定软件包作为参数给出时不能使用多种类型。" -#: src/Zypper.cc:4657 +#: src/Zypper.cc:4656 msgid "Root privileges are required for performing a distribution upgrade." msgstr "执行发行版升级需要有 root 特权。" -#: src/Zypper.cc:4678 +#: src/Zypper.cc:4677 #, c-format msgid "" "You are about to do a distribution upgrade with all enabled repositories. " @@ -4478,64 +4465,64 @@ "您正要使用全部已启用软件源进行发行版升级。继续前请确保这些源之间相互兼容。参" "考 '%s' 获知更多关于此命令的信息。" -#: src/Zypper.cc:4708 src/utils/messages.cc:40 src/utils/messages.cc:50 +#: src/Zypper.cc:4707 src/utils/messages.cc:40 src/utils/messages.cc:50 #: src/utils/messages.cc:68 msgid "Usage" msgstr "用法" -#: src/Zypper.cc:4763 src/Zypper.cc:4824 +#: src/Zypper.cc:4762 src/Zypper.cc:4823 msgid "Root privileges are required for adding of package locks." msgstr "添加软件包锁定需要有 root 特权。" -#: src/Zypper.cc:4892 +#: src/Zypper.cc:4891 #, c-format msgid "Removed %lu lock." msgid_plural "Removed %lu locks." msgstr[0] "已移除 %lu 锁定。" -#: src/Zypper.cc:4919 +#: src/Zypper.cc:4918 #, c-format msgid "Distribution Label: %s" msgstr "发行版标签: %s" -#: src/Zypper.cc:4921 +#: src/Zypper.cc:4920 #, c-format msgid "Short Label: %s" msgstr "短标签：%s" -#: src/Zypper.cc:4967 +#: src/Zypper.cc:4966 #, c-format msgid "%s matches %s" msgstr "%s 匹配 %s" -#: src/Zypper.cc:4969 +#: src/Zypper.cc:4968 #, c-format msgid "%s is newer than %s" msgstr "%s 较 %s 新" -#: src/Zypper.cc:4971 +#: src/Zypper.cc:4970 #, c-format msgid "%s is older than %s" msgstr "%s 较 %s 旧" -#: src/Zypper.cc:5044 src/source-download.cc:220 +#: src/Zypper.cc:5043 src/source-download.cc:220 #, c-format msgid "Insufficient privileges to use download directory '%s'." msgstr "权限不足以使用下载文件夹 '%s'。" -#: src/Zypper.cc:5102 +#: src/Zypper.cc:5101 msgid "This command only makes sense in the zypper shell." msgstr "此命令只有在 zypper 壳层中才有意义。" -#: src/Zypper.cc:5114 +#: src/Zypper.cc:5113 msgid "You already are running zypper's shell." msgstr "您已在运行 zypper 的壳层了。" -#: src/Zypper.cc:5131 +#: src/Zypper.cc:5130 msgid "Description" msgstr "描述" -#: src/Zypper.cc:5190 +#: src/Zypper.cc:5189 msgid "Resolvable Type" msgstr "可解析项类型" @@ -4688,7 +4675,8 @@ msgid "" "Some of the dependencies of installed packages are broken. In order to fix " "these dependencies, the following actions need to be taken:" -msgstr "已安装软件包的某些依赖关系已损坏。要修复这些依赖关系，需要执行以下动作：" +msgstr "" +"已安装软件包的某些依赖关系已损坏。要修复这些依赖关系，需要执行以下动作：" #: src/solve-commit.cc:612 msgid "Root privileges are required to fix broken package dependencies." @@ -5329,7 +5317,8 @@ msgid "" "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." -msgstr "若您未使用终端运行 zypper，请用 '%s' 全局选项以使 zypper 对提示使用默认回答。" +msgstr "" +"若您未使用终端运行 zypper，请用 '%s' 全局选项以使 zypper 对提示使用默认回答。" #: src/utils/misc.cc:99 msgid "package" @@ -5489,6 +5478,21 @@ msgid "Option '%s' overrides '%s'." msgstr "选项 '%s' 覆盖了 '%s'。" +#~ msgid "Catalog: " +#~ msgstr "软件名录： " + +#~ msgid "" +#~ "ZENworks Management Daemon is running.\n" +#~ "WARNING: this command will not synchronize changes.\n" +#~ "Use rug or yast2 for that." +#~ msgstr "" +#~ "ZENworks 管理守护程序正在运行。\n" +#~ "警告：此命令不会同步修改。\n" +#~ "请用 rug 或者 yast2 同步。" + +#~ msgid "Catalog" +#~ msgstr "软件名录" + #~ msgid "Retrieving patch rpm" #~ msgstr "正在撷取补丁 rpm" -- To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org