# HG changeset patch # User Aleksej Bobylev # Date 1479591692 -7200 # Node ID e109c12473dbb3c270a4ca82d226c4d9a3b23b92 # Parent a540897ec1897d994b1ddeb490abe103bb744aad Update translations. diff -r a540897ec189 -r e109c12473db Makefile --- a/Makefile Mon Oct 31 10:06:04 2016 +0000 +++ b/Makefile Sat Nov 19 23:41:32 2016 +0200 @@ -5,7 +5,7 @@ DOCDIR?=/usr/share/doc DESTDIR?= TAZPANEL?=/var/www/tazpanel -LINGUAS?=el es fr pt_BR sv ru +LINGUAS?=de el es fr pt_BR ru sv zh_CN PACKAGE = tazinst VERSION := $(shell grep ^VERSION ${PACKAGE} | cut -d '=' -f 2) diff -r a540897ec189 -r e109c12473db po/installer/installer.pot --- a/po/installer/installer.pot Mon Oct 31 10:06:04 2016 +0000 +++ b/po/installer/installer.pot Sat Nov 19 23:41:32 2016 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installer.cgi \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-09 17:07+0300\n" +"POT-Creation-Date: 2016-11-19 23:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r a540897ec189 -r e109c12473db po/installer/zh_CN.po --- a/po/installer/zh_CN.po Mon Oct 31 10:06:04 2016 +0000 +++ b/po/installer/zh_CN.po Sat Nov 19 23:41:32 2016 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: installer.cgi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-16 17:09+0000\n" +"POT-Creation-Date: 2016-11-19 23:38+0200\n" "PO-Revision-Date: 2014-07-14 19:18+0800\n" "Last-Translator: rhsky \n" "Language-Team: rhsky \n" @@ -18,11 +18,35 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.6.5\n" -#: installer.cgi:52 +#: installer.cgi:20 +#, fuzzy +msgid "TazPanel - Installer" +msgstr "SliTaz 安装软件" + +#: installer.cgi:42 installer.cgi:45 +#, fuzzy +msgid "Installation" +msgstr "安装" + +#: installer.cgi:47 installer.cgi:102 installer.cgi:750 +msgid "Install SliTaz" +msgstr "安装 SliTaz" + +#: installer.cgi:49 +#, fuzzy +msgid "Upgrade system" +msgstr "升级" + +#: installer.cgi:51 +#, fuzzy +msgid "Evaluate SliTaz" +msgstr "升级 SliTaz" + +#: installer.cgi:67 msgid "Welcome to the SliTaz Installer!" msgstr "欢迎使用 SliTaz 安装工具!" -#: installer.cgi:53 +#: installer.cgi:69 msgid "" "The SliTaz Installer installs or upgrades SliTaz to a hard disk drive from a " "device like a Live-CD or LiveUSB key, from a SliTaz ISO file, or from the " @@ -31,25 +55,32 @@ " SliTaz 系统安装软件 可以从类似光盘、USB 存储设备安装或升级本地或直接从网络下" "载的系统镜像到硬盘上。" -#: installer.cgi:56 +#: installer.cgi:73 +msgid "" +"Windows™ users can evaluate SliTaz in the directory \\slitaz on their " +"hard disk." +msgstr "" + +#: installer.cgi:76 msgid "Which type of installation do you want to start?" msgstr "你想选择哪种类型的安装?" -#: installer.cgi:64 +#: installer.cgi:86 installer.cgi:172 msgid "Install" msgstr "安装" -#: installer.cgi:65 +#: installer.cgi:89 +#, fuzzy msgid "" "Install SliTaz on a partition of your hard disk drive. If you decide to " "format your partition, all data will be lost. If you do not format, all data " -"except for any existing /home directory will be removed, the home directory " -"will be kept as is." +"except for any existing /home directory will be removed (the home directory " +"will be kept as is)." msgstr "" "安装系统到你硬盘的一个分区。如果你想格式化你的分区,所有数据会丢失。如果你不" "格式化,除了 /home 文件夹的数据保持不变,其他数据会被移动。" -#: installer.cgi:69 +#: installer.cgi:93 msgid "" "Before installation, you may need to create or resize partitions on your " "hard disk drive in order to make space for SliTaz GNU/Linux. You can " @@ -58,19 +89,15 @@ "开始安装系统前,你可能需要创建或调整你的硬盘分区来预留足够的空间给 SliTaz " "GNU/Linux 系统。你可以使用图形化界面的 Gparted 分区工具。" -#: installer.cgi:74 installer.cgi:576 -msgid "Install SliTaz" -msgstr "安装 SliTaz" - -#: installer.cgi:75 +#: installer.cgi:101 msgid "Proceed to a new SliTaz installation" msgstr "开始新的 SliTaz 安装" -#: installer.cgi:82 +#: installer.cgi:115 msgid "Upgrade" msgstr "升级" -#: installer.cgi:83 +#: installer.cgi:118 msgid "" "Upgrade an already installed SliTaz system on your hard disk drive. Your /" "home /etc /var/www directories will be kept, all other directories will be " @@ -80,31 +107,62 @@ "升级你硬盘上已安装的 SliTaz 系统。 你的 /home /etc /var/www 几个文件夹会保持" "不变,其它目录会被移除。老系统中添加的软件会在你联网后自动升级。" -#: installer.cgi:89 installer.cgi:585 +#: installer.cgi:127 +msgid "Upgrade an existing SliTaz system" +msgstr "升级已安装的 SliTaz 系统" + +#: installer.cgi:128 installer.cgi:760 msgid "Upgrade SliTaz" msgstr "升级 SliTaz" -#: installer.cgi:90 -msgid "Upgrade an existing SliTaz system" -msgstr "升级已安装的 SliTaz 系统" +#: installer.cgi:141 +msgid "Evaluate: Without Partitioning / Formating" +msgstr "" -#: installer.cgi:106 +#: installer.cgi:144 +msgid "SliTaz and Windows™ can coexist in the same partition." +msgstr "" + +#: installer.cgi:145 +msgid "" +"SliTaz will be in the %s directory like UMSDOS used to do in the previous " +"century..." +msgstr "" + +#: installer.cgi:154 +msgid "ISO image file full path" +msgstr "" + +#: installer.cgi:155 +msgid "set %s for a physical CD-ROM" +msgstr "" + +#: installer.cgi:158 +#, fuzzy +msgid "Target partition" +msgstr "home 分区" + +#: installer.cgi:160 +#, fuzzy +msgid "Choose a partition" +msgstr "home 分区" + +#: installer.cgi:195 msgid "Partitioning" msgstr "分区" -#: installer.cgi:108 +#: installer.cgi:198 +#, fuzzy msgid "" "On most used systems, the hard drive is already dedicated to partitions for " -"Windows™, or Linux, or another operating system. You'll " -"need to resize these partitions in order to make space for SliTaz GNU/Linux. " -"SliTaz will co-exist with other operating systems already installed on your " -"hard drive." +"Windows™, or Linux, or another operating system. You'll need to resize " +"these partitions in order to make space for SliTaz GNU/Linux. SliTaz will co-" +"exist with other operating systems already installed on your hard drive." msgstr "" -"大多数使用的系统,硬盘已经为 Windows™, Linux或其它系统分好" -"区了。你需要调整分区来预留空间给 SliTaz 系统。SliTaz 可以与你硬盘上的系统并存" -"的。" +"大多数使用的系统,硬盘已经为 Windows™, Linux或其它系统分好区了。你需要调整" +"分区来预留空间给 SliTaz 系统。SliTaz 可以与你硬盘上的系统并存的。" -#: installer.cgi:113 +#: installer.cgi:203 msgid "" "The amount of space needed depends on how much software you plan to install " "and how much space you require for users. It's conceivable that you could " @@ -114,16 +172,17 @@ "系统占用空间大小取决于你准备安装多少软件,准备为用户预留多少空间。你可以在" "300 M甚至更小的空间运行最小的 SliTaz 系统,但是完美运行的话需要2G空间。" -#: installer.cgi:117 +#: installer.cgi:207 +#, fuzzy msgid "" -"A separate home partition, and a partition that will be used as Linux swap " +"A separate home partition and a partition that will be used as Linux swap " "space may be created if needed. SliTaz detects and uses swap partitions " "automatically." msgstr "" "单独的 home 分区 和 Linux Swap 分区需要的话会被创建。 SliTaz 会判断并自动调" "用 swap 分区。" -#: installer.cgi:122 +#: installer.cgi:211 msgid "" "You can graphically manage your partitions with GParted. GParted is a " "partition editor for graphically managing your disk partitions. GParted " @@ -132,7 +191,7 @@ "你可以使用图形界面的分区工具 Gparted 。 Gparted 是一款图形化管理硬盘分区的软" "件。 它也可以创建、删除、调整大小、确保数据不丢失下复制分区。" -#: installer.cgi:126 +#: installer.cgi:215 msgid "" "GParted supports ext2, ext3, ext4, linux swap, ntfs and fat32 filesystems " "right out of the box. Support for xjs, jfs, hfs and other filesystems is " @@ -143,227 +202,232 @@ "持 xjs, jfs, hfs 和其它格式,但是这些格式需要你先安装相关的软件包如 " "xfsprogs, jfsutils, linux-hfs 等。" -#: installer.cgi:134 +#: installer.cgi:226 +msgid "Launch GParted, the partition editor tool" +msgstr "加载 Gparted 分区工具" + +#: installer.cgi:227 msgid "Execute GParted" msgstr "运行 Gparted" -#: installer.cgi:135 -msgid "Launch GParted, the partition editor tool" -msgstr "加载 Gparted 分区工具" - -#: installer.cgi:136 +#: installer.cgi:232 msgid "Continue installation" msgstr "继续安装" -#: installer.cgi:137 +#: installer.cgi:234 msgid "" "Once you've made room for SliTaz on your drive, you should be able to " "continue installation." msgstr "只要你硬盘上为 SliTaz 预留了空间,你就可以继续安装。" -#: installer.cgi:161 +#: installer.cgi:259 msgid "LiveCD" msgstr "LiveCD" -#: installer.cgi:163 +#: installer.cgi:261 msgid "Use the SliTaz LiveCD" msgstr "使用 SliTaz LiveCD" -#: installer.cgi:171 +#: installer.cgi:269 msgid "LiveUSB:" msgstr "LiveUSB:" -#: installer.cgi:173 +#: installer.cgi:271 msgid "Enter the partition where SliTaz Live is located on your USB Key" msgstr "输入保存 SliaTaz 系统的 USB存储分区" -#: installer.cgi:187 +#: installer.cgi:286 msgid "ISO file:" msgstr "ISO 镜像文件:" -#: installer.cgi:189 +#: installer.cgi:288 msgid "Select a SliTaz ISO file located on a local disk" msgstr "选择本地存储上的 SliTaz 镜像文件" -#: installer.cgi:195 installer.cgi:202 +#: installer.cgi:294 installer.cgi:301 msgid "Select an ISO or enter the full path to the ISO file" msgstr "选择 ISO 镜像 或输入镜像完整路径" -#: installer.cgi:214 +#: installer.cgi:313 msgid "Web:" msgstr "网络:" -#: installer.cgi:216 +#: installer.cgi:315 msgid "Select a SliTaz version on the Web" msgstr "从网站上选择一个 SliTaz 版本" -#: installer.cgi:223 installer.cgi:230 +#: installer.cgi:322 installer.cgi:329 msgid "Select a version or enter the full URL to an ISO file" msgstr "选择版本或输入完整镜像文件链接" -#: installer.cgi:246 +#: installer.cgi:345 msgid "Existing SliTaz partition to upgrade:" msgstr "已存在 SliTaz 系统分区升级" -#: installer.cgi:247 +#: installer.cgi:346 msgid "Specify the partition containing the system to upgrade" msgstr "指定存储系统的分区进行升级" -#: installer.cgi:251 +#: installer.cgi:350 msgid "Install SliTaz to partition:" msgstr "安装 SliTaz 系统岛分区:" -#: installer.cgi:252 +#: installer.cgi:351 msgid "Specify the partition where to install SliTaz" msgstr "指定安装 SliTaz 系统的分区" -#: installer.cgi:276 -msgid "Options" -msgstr "选项" - -#: installer.cgi:283 +#: installer.cgi:380 msgid "home partition" msgstr "home 分区" -#: installer.cgi:285 +#: installer.cgi:384 msgid "Separate partition for %s:" msgstr "单独的 %s 分区" -#: installer.cgi:286 +#: installer.cgi:385 msgid "Specify the partition containing %s" msgstr "指定含有 %s 的分区" -#: installer.cgi:307 +#: installer.cgi:416 msgid "Hostname" msgstr "主机名" -#: installer.cgi:309 +#: installer.cgi:419 msgid "Set Hostname to:" msgstr "设置主机名为:" -#: installer.cgi:310 +#: installer.cgi:420 msgid "Hostname configuration allows you to specify the machine name" msgstr "主机名配置允许你指定机器名字" -#: installer.cgi:316 +#: installer.cgi:426 msgid "Name of your system" msgstr "系统名称" -#: installer.cgi:326 +#: installer.cgi:443 msgid "Root superuser" msgstr "Root 超级用户" -#: installer.cgi:328 +#: installer.cgi:446 msgid "Root password:" msgstr "Root 密码:" -#: installer.cgi:329 +#: installer.cgi:447 msgid "Enter the password for root" msgstr "输入 root 密码" -#: installer.cgi:335 +#: installer.cgi:453 msgid "Password of root" msgstr "root 密码" -#: installer.cgi:344 +#: installer.cgi:469 msgid "User" msgstr "用户名" -#: installer.cgi:346 +#: installer.cgi:472 msgid "User login:" msgstr "用户名登录" -#: installer.cgi:347 +#: installer.cgi:473 msgid "Enter the name of the first user" msgstr "请输入第一个用户名" -#: installer.cgi:353 +#: installer.cgi:479 msgid "Name of the first user" msgstr "第一个用户名" -#: installer.cgi:364 +#: installer.cgi:494 msgid "User password:" msgstr "用户密码:" -#: installer.cgi:365 +#: installer.cgi:495 msgid "The password for default user" msgstr "默认用户密码" -#: installer.cgi:371 +#: installer.cgi:501 msgid "Password of the first user" msgstr "第一个用户密码" -#: installer.cgi:380 +#: installer.cgi:518 msgid "Bootloader" msgstr "引导" -#: installer.cgi:386 +#: installer.cgi:526 msgid "Install a bootloader." msgstr "安装引导" -#: installer.cgi:387 +#: installer.cgi:527 msgid "" "Usually you should answer yes, unless you want to install a bootloader by " "hand yourself." msgstr "通常你需要回答 yes ,除非你想自己手动安装引导。" -#: installer.cgi:404 +#: installer.cgi:548 msgid "Enable Windows Dual-Boot." msgstr "开启 Windows 双重引导" -#: installer.cgi:405 +#: installer.cgi:549 +#, fuzzy msgid "" -"At start-up, you will be asked whether you want to boot into Windows™ " +"At start-up, you will be asked whether you want to boot into Windows™ " "or SliTaz GNU/Linux." -msgstr "" -"电脑开启时,你会被询问选择引导进入 Windows™ 或 SliTaz GNU/Linux 。" +msgstr "电脑开启时,你会被询问选择引导进入 Windows™ 或 SliTaz GNU/Linux 。" -#: installer.cgi:416 +#: installer.cgi:564 msgid "Errors found. Please check your settings." msgstr "发现错误。请检查你的设置。" -#: installer.cgi:426 +#: installer.cgi:577 msgid "Select source media:" msgstr "选择源媒介:" -#: installer.cgi:432 +#: installer.cgi:584 msgid "Select destination" msgstr "选择目的地" -#: installer.cgi:461 +#: installer.cgi:594 +msgid "Options" +msgstr "选项" + +#: installer.cgi:622 msgid "Checking settings..." msgstr "检查设置……" -#: installer.cgi:533 +#: installer.cgi:689 +msgid "Proceeding to: %s" +msgstr "" + +#: installer.cgi:707 msgid "Errors encountered." msgstr "错误" -#: installer.cgi:546 +#: installer.cgi:720 msgid "Process completed!" msgstr "安装过程完成!" -#: installer.cgi:552 +#: installer.cgi:726 msgid "" "Installation is now finished, you can exit the installer or reboot on your " "new SliTaz GNU/Linux operating system." msgstr "安装已经完成,你可以退出安装软件或重启你的 SliTaz GNU/Linux 新系统。" -#: installer.cgi:561 +#: installer.cgi:736 msgid "Tazinst log" msgstr "Tazinst 日志" -#: installer.cgi:577 +#: installer.cgi:752 +#, fuzzy msgid "" "You're going to install SliTaz on a partition of your hard disk drive. If " "you decide to format your HDD, all data will be lost. If you do not format, " -"all data except for any existing /home directory will be removed, the home " -"directory will be kept as is." +"all data except for any existing /home directory will be removed (the home " +"directory will be kept as is)." msgstr "" "你即将安装 SliTaz 系统到你的硬盘分区。如果你想格式花你的硬盘,所有数据会丢" "失。若果你不格式化,除了已经存在与 /home 目录下的会被保留,其它数据都会被移" "除、" -#: installer.cgi:586 +#: installer.cgi:762 msgid "" "You're going to upgrade an already installed SliTaz system on your hard disk " "drive. Your /home /etc /var/www directories will be kept, all other " @@ -373,108 +437,102 @@ "你即将升级已经安装在你硬盘上的系统。你的 /home /etc /var/www 目录会被保留,其" "它目录都会被移除。你老系统中安装的软件包在联网时会自动升级。" -#: installer.cgi:601 +#: installer.cgi:779 msgid "Back to partitioning" msgstr "返回分区过程" -#: installer.cgi:603 +#: installer.cgi:781 msgid "Back to entering settings" msgstr "返回设置" -#: installer.cgi:605 installer.cgi:617 installer.cgi:632 +#: installer.cgi:783 installer.cgi:796 installer.cgi:813 msgid "Back to Installer Start Page" msgstr "返回安装开始页面" -#: installer.cgi:609 +#: installer.cgi:788 msgid "Proceed to SliTaz installation" msgstr "开始 SliTaz 安装" -#: installer.cgi:611 +#: installer.cgi:790 msgid "Installation complete. You can now restart" msgstr "安装完成。你可以现在重启了。" -#: installer.cgi:613 +#: installer.cgi:792 msgid "Installation failed. See log" msgstr "安装失败。请查看日志文件" -#: installer.cgi:615 +#: installer.cgi:794 msgid "Continue installation." msgstr "继续安装" -#: installer.cgi:646 +#: installer.cgi:826 msgid "A web page that points a browser to a different page after 2 seconds" msgstr "2秒后一个网页会跳转到不同的页面。" -#: installer.cgi:652 +#: installer.cgi:832 +#, fuzzy msgid "" "If your browser doesn't automatically redirect within a few seconds, you may " -"want to go there manually" +"want to go there manually [here]" msgstr "如果你的浏览没有自动跳转,你需要手动打开。" -#: installer.cgi:654 -msgid "here" -msgstr "这里" - -#: installer.cgi:669 installer.cgi:681 installer.cgi:694 +#: installer.cgi:849 installer.cgi:861 installer.cgi:874 msgid "Tazinst Error" msgstr "Tazinst 错误" -#: installer.cgi:670 +#: installer.cgi:850 msgid "%s, the backend to %s is missing." msgstr "%s, %s 安装工具的后台进程丢失." -#: installer.cgi:671 installer.cgi:864 +#: installer.cgi:851 installer.cgi:864 msgid "Any installation can not be done without %s." msgstr "没有 %s,任何安装都不能完成的." -#: installer.cgi:672 +#: installer.cgi:852 msgid "Check %s permissions, or reinstall the %s package." msgstr "检察 %s 权限,或重新安装 %s 软件包。" -#: installer.cgi:682 +#: installer.cgi:862 msgid "%s, the %s backend, is not at the minimum required version." msgstr "%s, %s 软件后台进程,不是要求的最低版本。" -#: installer.cgi:685 installer.cgi:698 +#: installer.cgi:865 installer.cgi:878 msgid "Reinstall the %s package, or use %s in CLI mode." msgstr "重新安装 %s 软件包或使用 %s 的 CLI 模式" -#: installer.cgi:695 +#: installer.cgi:875 msgid "" "%s, the %s backend, is at a higher version than the maximum authorized by " "the %s." msgstr "%s, %s 软件后台进程,版本已经高过 %s 要求版本。" -#: installer.cgi:697 +#: installer.cgi:877 #, fuzzy msgid "Any installation cannot be done." msgstr "没有 tazinst ,任何安装都不能完成的." -#: installer.cgi:825 installer.cgi:873 +#: installer.cgi:995 installer.cgi:1052 msgid "None" msgstr "无" -#: installer.cgi:899 +#: installer.cgi:1071 msgid "Do not format" msgstr "不格式化" -#: installer.cgi:901 +#: installer.cgi:1073 msgid "" "To format this partition, select a filesystem, usually it's safe to use ext4" msgstr "格式化分区,请选择格式,通常使用 ext4 格式更安全" -#: installer.cgi:903 +#: installer.cgi:1075 msgid "Formatting option:" msgstr "格式化选项:" -#: installer.cgi:952 installer.cgi:1023 -msgid "SliTaz Installer" -msgstr "SliTaz 安装软件" +#~ msgid "here" +#~ msgstr "这里" -#: installer.cgi:1039 -msgid "Copyright" -msgstr "版权" +#~ msgid "Copyright" +#~ msgstr "版权" -#: installer.cgi:1042 -msgid "BSD License" -msgstr "BSD 许可文件" +#~ msgid "BSD License" +#~ msgstr "BSD 许可文件" diff -r a540897ec189 -r e109c12473db po/slitaz-installer/slitaz-installer.pot --- a/po/slitaz-installer/slitaz-installer.pot Mon Oct 31 10:06:04 2016 +0000 +++ b/po/slitaz-installer/slitaz-installer.pot Sat Nov 19 23:41:32 2016 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: slitaz-installer \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-09 17:07+0300\n" +"POT-Creation-Date: 2016-11-19 23:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r a540897ec189 -r e109c12473db po/slitaz-installer/zh_CN.po --- a/po/slitaz-installer/zh_CN.po Mon Oct 31 10:06:04 2016 +0000 +++ b/po/slitaz-installer/zh_CN.po Sat Nov 19 23:41:32 2016 +0200 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: slitaz-installer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-16 17:09+0000\n" +"POT-Creation-Date: 2016-11-19 23:38+0200\n" "PO-Revision-Date: 2014-07-14 20:19+0800\n" "Last-Translator: rhsky \n" "Language-Team: LANGUAGE \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.6.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: zh_CN\n" #: slitaz-installer:23 msgid "Welcome to the slitaz-installer." @@ -93,10 +93,11 @@ msgstr "已安装系统分区的升级:" #: slitaz-installer:52 +#, fuzzy msgid "" "Only the filesystems actually installed on your system are listed. If you " "intend to use another filesystem, you have to install it before. Unless you " -"know what you are doing, it's safe to use ext2, ext3 or ext4." +"know what you are doing, it is safe to use ext2, ext3 or ext4." msgstr "" "只有你系统中已经安装的文件系统格式被列出。如果你想使用其它的文件系统,你需要" "提前安装。除非你知道你在做什么,安全起见,请使用 ext2, ext3 或 ext4。" @@ -220,9 +221,10 @@ msgstr "你需要选择安装一个兼容大多数系统的引导。" #: slitaz-installer:106 +#, fuzzy msgid "" "If you want to use an existing bootloader installation, skip this step and " -"configure your bootloader to boot SliTaz (refer to your bootloader's " +"configure your bootloader to boot SliTaz (refer to your bootloader " "documentation on how to do this)." msgstr "" "如果你想使用已经存在的引导,请跳过此步并配置引导来启动 SliTaz (请参考你的引" @@ -263,8 +265,7 @@ msgstr "错误2:" #: slitaz-installer:132 -msgid "" -"The lightweight SliTaz HDD installer '%s' is missing." +msgid "The lightweight SliTaz HDD installer '%s' is missing." msgstr "轻量级 SliTaz 硬盘安装工具 %s 丢失。" #: slitaz-installer:133 @@ -343,12 +344,12 @@ msgstr "" #: slitaz-installer:325 slitaz-installer:379 -msgid "Ok" -msgstr "确认" +msgid "Next" +msgstr "" #: slitaz-installer:326 slitaz-installer:353 slitaz-installer:380 -msgid "Cancel" -msgstr "取消" +msgid "Back" +msgstr "" #: slitaz-installer:352 slitaz-installer:411 msgid "Yes" @@ -362,6 +363,10 @@ msgid "Summary" msgstr "" +#: slitaz-installer:419 +msgid "SliTaz install cancelled." +msgstr "" + #: slitaz-installer:567 msgid "SliTaz Installer" msgstr "" @@ -389,3 +394,9 @@ #: slitaz-installer:588 msgid "Process not completed" msgstr "" + +#~ msgid "Ok" +#~ msgstr "确认" + +#~ msgid "Cancel" +#~ msgstr "取消" diff -r a540897ec189 -r e109c12473db po/tazinst/tazinst.pot --- a/po/tazinst/tazinst.pot Mon Oct 31 10:06:04 2016 +0000 +++ b/po/tazinst/tazinst.pot Sat Nov 19 23:41:32 2016 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazInst \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-09 17:07+0300\n" +"POT-Creation-Date: 2016-11-19 23:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r a540897ec189 -r e109c12473db po/tazinst/zh_CN.po --- a/po/tazinst/zh_CN.po Mon Oct 31 10:06:04 2016 +0000 +++ b/po/tazinst/zh_CN.po Sat Nov 19 23:41:32 2016 +0200 @@ -7,210 +7,227 @@ msgstr "" "Project-Id-Version: TazInst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-16 17:09+0000\n" +"POT-Creation-Date: 2016-11-19 23:38+0200\n" "PO-Revision-Date: 2014-07-14 21:29+0800\n" "Last-Translator: rhsky \n" "Language-Team: rhsky \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.6.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: zh_CN\n" -#: tazinst:60 +#: tazinst:59 msgid "Fresh install on a HDD" msgstr "硬盘上纯净安装" -#: tazinst:61 +#: tazinst:60 msgid "Upgrade an existing system" msgstr "升级已存的系统" -#: tazinst:65 +#: tazinst:64 msgid "LiveCD" msgstr "LiveCD" -#: tazinst:66 +#: tazinst:65 msgid "LiveUSB" msgstr "LiveUSB" -#: tazinst:67 +#: tazinst:66 msgid "ISO image on a local drive" msgstr "本地存储的 ISO 镜像文件" -#: tazinst:68 +#: tazinst:67 msgid "ISO image on the Internet" msgstr "网络 ISO 镜像" -#: tazinst:72 +#: tazinst:71 msgid "B-tree file system (Oracle)" msgstr "B-tree 文件系统(Orcale)" -#: tazinst:73 +#: tazinst:72 msgid "Second extended filesystem (Linux)" msgstr "第二个扩展文件系统(Linux)" -#: tazinst:74 +#: tazinst:73 msgid "Third extended filesystem (Linux)" msgstr "第三个扩展文件系统(Linux)" -#: tazinst:75 +#: tazinst:74 msgid "Fourth extended file system (Linux)" msgstr "第四个扩展文件系统(Linux)" -#: tazinst:76 +#: tazinst:75 msgid "Journaled File System (IBM)" msgstr "Journaled 文件系统 (IBM)" -#: tazinst:77 +#: tazinst:76 msgid "File system of the MINIX operating system" msgstr "MINIX 运行系统文件系统" -#: tazinst:78 +#: tazinst:77 msgid "Journaled computer file system (Namesys)" msgstr "Journaled 电脑文件系统 (Namesys)" -#: tazinst:79 +#: tazinst:78 msgid "Journaling file system (Silicon Graphics, Inc.)" msgstr "Journaling 文件系统 (Silicon Graphics, Inc.)" -#: tazinst:83 +#: tazinst:82 msgid "Automatic selection" msgstr "自动选择" -#: tazinst:84 -msgid "GRUB legacy bootoader" +#: tazinst:83 +#, fuzzy +msgid "GRUB legacy bootloader" msgstr "GRUB 引导" -#: tazinst:85 +#: tazinst:84 msgid "Lightweight bootloader" msgstr "轻量级引导" -#: tazinst:92 +#: tazinst:91 msgid "Stable release" msgstr "稳定版本" -#: tazinst:94 +#: tazinst:93 msgid "Stable version without nested subsets" msgstr "无嵌套稳定版本" -#: tazinst:96 +#: tazinst:95 msgid "Stable text-only version (8.1MB)" msgstr "文本格式稳定版本(8.1 M)" -#: tazinst:98 +#: tazinst:97 msgid "Stable basic graphic version without graphic apps" msgstr "无图形应用图形界面稳定版本" -#: tazinst:100 +#: tazinst:99 msgid "Stable basic graphic version with only GTK" msgstr "只有 GTK 基本图形稳定版本" -#: tazinst:102 +#: tazinst:101 msgid "Development version for testing latest features" msgstr "最新特性测试开发版本" -#: tazinst:104 +#: tazinst:103 msgid "Bleeding edge development version updated every day" msgstr "每日尝鲜开发版本" +#: tazinst:114 tazinst:138 tazinst:150 +msgid "SliTaz GNU/Linux Installer - Version: %s" +msgstr "" + #: tazinst:115 msgid "Usage:" msgstr "用法:" -#: tazinst:121 +#: tazinst:116 msgid "%s [command] " msgstr "%s [command] " -#: tazinst:123 +#: tazinst:117 msgid "Commands:" msgstr "命令:" -#: tazinst:124 +#: tazinst:119 msgid "Create a new install file." msgstr "创建新的安装文件" -#: tazinst:125 +#: tazinst:120 msgid "Change value of a setting." msgstr "改变设置" -#: tazinst:126 +#: tazinst:121 msgid "Clear a setting." msgstr "清除设置" -#: tazinst:127 +#: tazinst:122 msgid "Get the value of a setting." msgstr "获取设置" -#: tazinst:128 +#: tazinst:123 msgid "Check settings." msgstr "检查设置" -#: tazinst:129 +#: tazinst:124 msgid "Print a short help on settings" msgstr "打印设置简短帮助说明" -#: tazinst:130 +#: tazinst:125 msgid "List system resources." msgstr "列出系统资源" -#: tazinst:131 +#: tazinst:126 msgid "Execute a SliTaz installation." msgstr "运行 SliTaz 安装" -#: tazinst:132 +#: tazinst:127 msgid "Display log file contents." msgstr "显示日志文件内同" -#: tazinst:133 +#: tazinst:128 msgid "Clean install and log files." msgstr "清除安装和日志文件" -#: tazinst:134 +#: tazinst:129 msgid "Print version and exit." msgstr "打印版本并退出" -#: tazinst:135 +#: tazinst:130 msgid "Print this short usage." msgstr "打印这个简短用法" -#: tazinst:146 -msgid "Error: Missing parameter." -msgstr "错误:参数丢失" - #: tazinst:140 -msgid "Unknown command." +#, fuzzy +msgid "'%s': Unknown command!" msgstr "未知命令" #: tazinst:142 -msgid "Run: '%s' to get a list of available commands" +#, fuzzy +msgid "Run: '%s' to get a list of available commands." msgstr "运行:%s 获取可用命令列表" -#: tazinst:177 +#: tazinst:152 +msgid "'%s': Unknown option!" +msgstr "" + +#: tazinst:154 +#, fuzzy +msgid "Please select one of these options:" +msgstr "请选择一个选项:%s" + +#: tazinst:173 msgid "Warning: file already exists." msgstr "注意;文件已经存在" -#: tazinst:184 -msgid "Error: Can't create file." +#: tazinst:180 +#, fuzzy +msgid "Error: Cannot create file." msgstr "错误:文件不能创建" -#: tazinst:282 tazinst:287 +#: tazinst:278 tazinst:283 msgid "Error: Unable to read install file." msgstr "错误:不能读取安装文件" -#: tazinst:392 +#: tazinst:355 +msgid "Error: '%s' unknown setting." +msgstr "" + +#: tazinst:383 msgid "Error: Unable to write to install file." msgstr "错误:不能写入安装文件" -#: tazinst:446 +#: tazinst:443 msgid "Deleting install file: %s" msgstr "删除安装文件:%s" -#: tazinst:448 +#: tazinst:445 msgid "Error: Unable to delete install file." msgstr "错误:不能删除安装文件" -#: tazinst:463 +#: tazinst:460 msgid "" "You must be the root user (system administrator) to install SliTaz, please " "use 'su' to get a root SHell and restart installation." @@ -218,47 +235,48 @@ "你必须是根用户(系统管理员),才可以安装 SliTaz ,请使用 “su”命令来获取根权限" "并重新安装。" -#: tazinst:474 +#: tazinst:471 msgid "Another instance of tazinst is running." msgstr "另一个 tazinst 已在运行。" -#: tazinst:488 +#: tazinst:485 msgid "Error: '%s' Invalid keyword." msgstr "错误:%s 无效的关键字" -#: tazinst:489 +#: tazinst:486 msgid "Select one of these options: %s." msgstr "请选择一个选项:%s" -#: tazinst:490 +#: tazinst:487 msgid "For more information, see tazinst Manual." msgstr "可以通过查看 tazinst 手册来获取更多信息。" -#: tazinst:504 +#: tazinst:502 msgid "Error: Partition not found." msgstr "错误:未发现分区" -#: tazinst:505 +#: tazinst:503 msgid "To see available partitions, run '%s'." msgstr "运行,查看可用分区 %s" -#: tazinst:519 +#: tazinst:518 msgid "Error: Source file not found." msgstr "错误:源文件未找到" -#: tazinst:534 +#: tazinst:533 msgid "Error: invalid URL." msgstr "错误:无效的链接" -#: tazinst:549 -msgid "Error: multiple assignations for a disk. Please check your settings." +#: tazinst:548 +#, fuzzy +msgid "Error: multiple assignations for a disk." msgstr "错误:多个磁盘分配,请检查你的设置。" -#: tazinst:563 +#: tazinst:562 msgid "Error: password too long." msgstr "错误:密码过长" -#: tazinst:568 +#: tazinst:567 msgid "Error: Unallowed characters in password." msgstr "错误:密码中含有不允许的字符" @@ -282,19 +300,20 @@ msgid "%s Error: Invalid chars." msgstr "%s 错误:无效字符" -#: tazinst:609 +#: tazinst:611 msgid "Error: Dualboot set with no bootloader." msgstr "错误:双引导设置缺少引导器" -#: tazinst:623 +#: tazinst:625 msgid "Error: Unsupported Partition Table." msgstr "错误:不支持的分区表" -#: tazinst:627 -msgid "Error: No disk selected, can't install any bootloader." +#: tazinst:630 +#, fuzzy +msgid "Error: No disk selected, cannot install any bootloader." msgstr "错误:磁盘未选择,不能安装引导" -#: tazinst:745 +#: tazinst:748 msgid "The Source setting depends on the type of media:" msgstr "源设置依赖于媒介类型:" @@ -306,96 +325,94 @@ msgid "Type: %s" msgstr "请输入:%s" -#: tazinst:755 +#: tazinst:758 +msgid "List of settings:" +msgstr "设置列表:" + +#: tazinst:760 msgid "Mode of install" msgstr "安装模式" -#: tazinst:756 +#: tazinst:761 msgid "Media containing the SliTaz source files" msgstr "存储系统源文件的媒介" -#: tazinst:757 +#: tazinst:762 msgid "Source file containing SliTaz" msgstr "含有 SliTaz 系统的源文件" -#: tazinst:758 +#: tazinst:763 msgid "The name of the target partition" msgstr "目的分区名称" -#: tazinst:759 +#: tazinst:764 msgid "Format of the target partition" msgstr "格式化目的分区" -#: tazinst:760 +#: tazinst:765 msgid "Separate home partition" msgstr "独立 home 分区" -#: tazinst:761 +#: tazinst:766 msgid "Format of the root partition" msgstr "格式化根分区" -#: tazinst:762 tazinst:805 +#: tazinst:767 tazinst:811 msgid "Name of the system" msgstr "系统名称" -#: tazinst:763 tazinst:807 +#: tazinst:768 tazinst:813 msgid "Superuser password" msgstr "超级用户密码" -#: tazinst:764 tazinst:809 +#: tazinst:769 tazinst:815 msgid "First user name" msgstr "第一个用户名" -#: tazinst:765 tazinst:811 +#: tazinst:770 tazinst:817 msgid "First user password" msgstr "第一个用户密码" -#: tazinst:766 +#: tazinst:771 msgid "Install a bootloader" msgstr "安装引导" -#: tazinst:767 -msgid "Partition to duaboot Windows from" +#: tazinst:772 +#, fuzzy +msgid "Partition to dualboot Windows from" msgstr "双引导 Window 来自" -#: tazinst:768 -msgid "List of settings:" -msgstr "设置列表:" - -#: tazinst:786 -msgid "Automatically set" +#: tazinst:790 +#, fuzzy +msgid "CD. Automatically set" msgstr "自动设置" -#: tazinst:788 +#: tazinst:793 msgid "USB partition. For a list, type: %s" msgstr "USB 分区。获取列表请输入:%s" -#: tazinst:790 +#: tazinst:796 msgid "ISO file name. For a list, type: %s" msgstr "镜像文件名字。获取列表请输入:%s" -#: tazinst:816 +#: tazinst:822 msgid "Partition containing Windows, or 'auto'" msgstr "含 Windows 分区或“auto”" -#: tazinst:1120 +#: tazinst:1127 #, fuzzy msgid "No mirror list found, run %s." msgstr "没有找到镜像列表,请运行 tazpkg 重新获取" -#: tazinst:1132 +#: tazinst:1139 msgid "Downloading: %s" msgstr "下载中:%s" -#: tazinst:1139 +#: tazinst:1146 msgid "Download completed." msgstr "下载完成" -#: tazinst:1141 -msgid "Download failed." -msgstr "下载失败" - -#: tazinst:1150 +#: tazinst:1157 #, fuzzy msgid "Installing package %s to the current system." msgstr "安装软件包到现在的系统%s" @@ -404,300 +421,338 @@ msgid "Cannot install %s." msgstr "" -#: tazinst:1160 +#: tazinst:1167 #, fuzzy msgid "Adding package %s to the target system..." msgstr "添加软件包到目的系统%s" -#: tazinst:1201 +#: tazinst:1182 +msgid "=== Tazinst: started on %s ===" +msgstr "" + +#: tazinst:1208 msgid "Process not completed" msgstr "过程未完成" -#: tazinst:1202 tazinst:1206 +#: tazinst:1209 tazinst:1213 msgid "Error: %s" msgstr "错误:%s" -#: tazinst:1218 +#: tazinst:1216 +msgid "=== Tazinst error on %s ===" +msgstr "" + +#: tazinst:1225 msgid "Internal error" msgstr "内部错误" -#: tazinst:1223 +#: tazinst:1230 msgid "Cancelled by user" msgstr "用户取消" -#: tazinst:1244 +#: tazinst:1251 msgid "Using files from %s." msgstr "使用的文件来自%s" -#: tazinst:1246 -msgid "%s: Mount failed" +#: tazinst:1253 +#, fuzzy +msgid "%s: Mount failed." msgstr "%s:挂载失败" -#: tazinst:1255 +#: tazinst:1262 msgid "Using files from USB device..." msgstr "使用 USB 设备的文件……" -#: tazinst:1260 +#: tazinst:1267 msgid "Using files from USB device %s." msgstr "使用 USB 设备的文件%s" -#: tazinst:1262 +#: tazinst:1269 msgid "%s: Failed to mount USB device." msgstr "%s:挂载 USB 设备失败" -#: tazinst:1277 +#: tazinst:1284 msgid "md5sum error, file corrupted." msgstr "md5sum 验证错误,文件已损坏" -#: tazinst:1280 +#: tazinst:1287 msgid "%s: md5 file not found, cannot check integrity." msgstr "%s:md5 文件未发现,不能验证完整性" -#: tazinst:1285 +#: tazinst:1292 msgid "Using files from ISO %s." msgstr "使用 ISO 镜像文件 %s" -#: tazinst:1287 +#: tazinst:1294 msgid "%s: Failed to mount ISO." msgstr "%s:加载镜像文件失败" -#: tazinst:1309 tazinst:1393 +#: tazinst:1316 tazinst:1404 msgid "Creating mount point: %s..." msgstr "创建挂载点:%s" -#: tazinst:1325 +#: tazinst:1332 msgid "Checking installation media..." msgstr "检查安装媒介……" -#: tazinst:1328 +#: tazinst:1335 msgid "Invalid source" msgstr "无效的源" -#: tazinst:1330 +#: tazinst:1337 msgid "Installation media checked ok" msgstr "安装媒介检查正常" -#: tazinst:1342 +#: tazinst:1349 msgid "Format %s (%s)" msgstr "格式化 %s (%s)" -#: tazinst:1366 +#: tazinst:1354 tazinst:1366 +msgid "Formatting has failed" +msgstr "" + +#: tazinst:1373 msgid "Preparing target partition..." msgstr "准备目的分区……" -#: tazinst:1370 +#: tazinst:1377 +#, fuzzy +msgid "Partition is already mounted, unmounting." +msgstr "分区已使用" + +#: tazinst:1381 msgid "Partition is already in use." msgstr "分区已使用" -#: tazinst:1378 +#: tazinst:1389 msgid "%s: The partition will be cleaned..." msgstr "%s:分区即将被清理……" -#: tazinst:1387 +#: tazinst:1398 msgid "%s: The partition will be kept..." msgstr "%s:分区保持……" -#: tazinst:1402 +#: tazinst:1413 msgid "%s: Unable to mount partition" msgstr "%s:无法挂载分区" -#: tazinst:1416 +#: tazinst:1427 msgid "Unmounting target partition: %s" msgstr "卸载目的分区:%s" -#: tazinst:1422 +#: tazinst:1433 msgid "Unmounting: %s" msgstr "卸载:%s" -#: tazinst:1426 +#: tazinst:1437 msgid "Unlinking: %s" msgstr "解开:%s" -#: tazinst:1432 +#: tazinst:1443 msgid "Ejecting CD-ROM..." msgstr "弹出光驱……" -#: tazinst:1441 +#: tazinst:1452 msgid "" "Process completed. You can now restart (reboot) from your SliTaz GNU/Linux " "system." msgstr "过程完成。可以重启系统了。来自你的 SliTaz 系统" -#: tazinst:1446 +#: tazinst:1454 +msgid "=== Tazinst ended on %s ===" +msgstr "" + +#: tazinst:1457 msgid "Copying log to %s" msgstr "复制日志到 %s" -#: tazinst:1482 +#: tazinst:1493 msgid "No bootloader to install." msgstr "没有安装引导" -#: tazinst:1576 tazinst:1680 +#: tazinst:1587 tazinst:1691 msgid "Enabling Windows dual-boot" msgstr "开启 Windows 双引导" -#: tazinst:1599 +#: tazinst:1610 msgid "Installing GRUB on: %s" msgstr "安装 grub 到:%s" -#: tazinst:1604 +#: tazinst:1611 +msgid "GRUB not found" +msgstr "" + +#: tazinst:1615 msgid "Setting the boot flag" msgstr "设置启动标示" -#: tazinst:1609 tazinst:1737 +#: tazinst:1620 tazinst:1748 msgid "Copying splash image" msgstr "复制 splash 镜像" -#: tazinst:1699 +#: tazinst:1710 msgid "Installing Syslinux" msgstr "安装 syslinux" -#: tazinst:1713 +#: tazinst:1720 +msgid "Syslinux not found" +msgstr "" + +#: tazinst:1724 msgid "Setting the boot flag on" msgstr "设置启动标示" -#: tazinst:1717 +#: tazinst:1727 +msgid "mbr.bin not found" +msgstr "" + +#: tazinst:1728 msgid "Installing MBR" msgstr "安装 mbr" -#: tazinst:1721 +#: tazinst:1732 msgid "Setting the legacy_boot flag on" msgstr "设置启动标示" -#: tazinst:1730 +#: tazinst:1741 msgid "Installing GPTMBR" msgstr "安装 gptmbr" -#: tazinst:1770 +#: tazinst:1742 +msgid "gptmbr.bin not found" +msgstr "" + +#: tazinst:1781 msgid "Cleaning the root partition (%s)..." msgstr "清除根分区(%s)……" -#: tazinst:1779 tazinst:2051 +#: tazinst:1790 tazinst:2063 msgid "keeping /home found on: %s" msgstr ":保留 /home 到:%s" -#: tazinst:1784 tazinst:2077 +#: tazinst:1795 tazinst:2077 msgid "removing target: %s" msgstr "移除目标:%s" -#: tazinst:1803 +#: tazinst:1813 msgid "Kernel name not found, falling back to: %s" msgstr "找不到内核,回滚到:%s" -#: tazinst:1807 +#: tazinst:1819 msgid "install_kernel: %s" msgstr "安装内核:%s" -#: tazinst:1893 +#: tazinst:1905 msgid "Restoring directory: /home..." msgstr "恢复 /home 目录……" -#: tazinst:1899 +#: tazinst:1911 msgid "Adding / partition and CHECK_FS to file %s..." msgstr "添加 / 分区并检查 %s……" -#: tazinst:1902 +#: tazinst:1914 msgid "Configuring host name: %s" msgstr "设置主机名:%s" -#: tazinst:1965 +#: tazinst:1977 msgid "Configuring partition to be used as /home: %s" msgstr "设置 /home 分区:%s" -#: tazinst:1984 +#: tazinst:1996 msgid "Installing SliTaz on: %s" msgstr "安装 SliTaz 到:%s" -#: tazinst:1985 tazinst:2164 +#: tazinst:1997 tazinst:2176 msgid "Checking settings..." msgstr "检查设置……" -#: tazinst:1989 tazinst:2168 +#: tazinst:2001 tazinst:2180 msgid "Preparing source media..." msgstr "准备源媒介……" -#: tazinst:1992 tazinst:2171 +#: tazinst:2004 tazinst:2183 msgid "Preparing target disk..." msgstr "准备安装目的磁盘……" -#: tazinst:1995 +#: tazinst:2007 msgid "Cleaning the root partition if necessary..." msgstr "如有必要,清除根分区……" -#: tazinst:1998 tazinst:2180 +#: tazinst:2010 tazinst:2192 msgid "Extracting the root system..." msgstr "解压根系统……" -#: tazinst:2001 tazinst:2186 +#: tazinst:2013 tazinst:2198 msgid "Installing the Kernel..." msgstr "安装内核……" -#: tazinst:2004 +#: tazinst:2016 msgid "Preconfiguring the system..." msgstr "重设系统……" -#: tazinst:2007 +#: tazinst:2019 msgid "Configuring root and default user account..." msgstr "设置根用户和默认用户……" -#: tazinst:2010 +#: tazinst:2022 msgid "Configuring /home..." msgstr "设置 /home……" -#: tazinst:2013 +#: tazinst:2025 msgid "Checking bootloader installation..." msgstr "检查引导安装……" -#: tazinst:2016 tazinst:2195 +#: tazinst:2028 tazinst:2207 msgid "Files installation completed" msgstr "文件安装完成" -#: tazinst:2030 +#: tazinst:2042 msgid "Preparing upgrade of SliTaz release: %s" msgstr "准备升级 SliTaz :%s" -#: tazinst:2032 +#: tazinst:2044 msgid "" "%s: This partition doesn't appear to contain a valid SliTaz system, the " "file: %s doesn't exist." msgstr "%s:这个分区没有安装有效地 SliTaz 系统,%s 不存在" -#: tazinst:2055 +#: tazinst:2067 msgid "keeping /etc found on: %s" msgstr "保留 /etc 到:%s" -#: tazinst:2059 +#: tazinst:2071 msgid "keeping /var/www found on: %s" msgstr "保留 /var/www 到:%s" -#: tazinst:2086 +#: tazinst:2098 msgid "backups restored: %s" msgstr "备份恢复到:%s" -#: tazinst:2093 +#: tazinst:2105 msgid "backups saved in %s" msgstr "备份保存在 %s" -#: tazinst:2100 +#: tazinst:2112 msgid "Checking the availability of packages..." msgstr "检查可获取的软件包……" -#: tazinst:2113 +#: tazinst:2125 msgid "Installing packages..." msgstr "安装软件包……" -#: tazinst:2115 +#: tazinst:2127 msgid "packages to install: 0" msgstr "已安装软件:0" -#: tazinst:2120 +#: tazinst:2132 msgid "Installing: %s..." msgstr "安装:%s……" -#: tazinst:2129 +#: tazinst:2141 msgid "Installation of packages complete..." msgstr "软件包安装完成……" -#: tazinst:2138 +#: tazinst:2150 msgid "Creating package lists..." msgstr "创建软件包列表……" @@ -705,7 +760,7 @@ msgid "%s: done" msgstr "%s:完成" -#: tazinst:2151 +#: tazinst:2163 msgid "" "The list of available packages on the mirror could not be downloaded. No " "missing packages will be reinstalled now, but you can do so later by looking " @@ -714,26 +769,32 @@ "镜像上的软件包列表无法下载。现在不能安装丢失的软件,但你可以稍后通过检查来完" "成:" -#: tazinst:2163 +#: tazinst:2175 msgid "Upgrading SliTaz on: %s" msgstr "升级 SliTaz :%s" -#: tazinst:2174 +#: tazinst:2186 msgid "Searching for %s..." msgstr "搜索 %s……" -#: tazinst:2177 +#: tazinst:2189 msgid "Backup /etc, /home and the packages list..." msgstr "备份 /etc, /home 和软件宝列表……" -#: tazinst:2183 +#: tazinst:2195 msgid "Restoring configuration files..." msgstr "恢复配置文件……" -#: tazinst:2189 +#: tazinst:2201 msgid "Upgrading added packages..." msgstr "升级额外的软件包……" -#: tazinst:2192 +#: tazinst:2204 msgid "Bootloader..." msgstr "引导……" + +#~ msgid "Error: Missing parameter." +#~ msgstr "错误:参数丢失" + +#~ msgid "Download failed." +#~ msgstr "下载失败"