diff options
Diffstat (limited to 'perl-install/install')
24 files changed, 411 insertions, 690 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile index 8b2e25827..6b6a88a24 100644 --- a/perl-install/install/Makefile +++ b/perl-install/install/Makefile @@ -52,9 +52,10 @@ install_pms: get_needed_files: xs # generate installer system: - REP4PMS=$(REP4PMS) ../../tools/install-xml-file-list share/list.xml $(DEST) - mkdir -p $(DEST)/usr/sbin + mkdir -p $(DEST)/{usr/,}{,s}bin + for dir in /lib /lib64; do [[ -d $$dir ]] && mkdir -p $(DEST){,/usr}$$dir; done || : /usr/lib/dracut/modules.d/30convertfs/convertfs.sh $(DEST) + REP4PMS=$(REP4PMS) ../../tools/install-xml-file-list share/list.xml $(DEST) chmod u-s -R $(DEST) # for mount/umount share/generate-xlocales $(DEST) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index cda1e05a9..a5e8baa12 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,32 @@ +Version 17.24 - 23 March 2016 + +- fix build on ia32 +- add 'virtualbox' & 'vmware' flags for rpmsrate +- use systemd-detect-virt for detecting virtualization technology + +Version 17.23 - 22 March 2016 + +- do not include twice webkit2gtk library +- prevent usrmove files to remain +- remove swrast (too big just to fix a gtk+ warning...) + +Version 17.21 - 21 March 2016 + +- load evdev (thus fixing a crash) +- load psmouse (it is now modular) +- use WebKit2 instead of WebKit1 for displaying help content (mga#15031) + +Version 17.20 - 18 March 2016 + +- prevent slow boot on first boot (mga#16684) +- partionning: + o fix partitions not initially displayed (mga#17564) + +Version 17.19 - 24 February 2016 + +- detect nvme devices as block devices (mga#17743) +- detect partitions on nvme devices (mga#17743) + Version 17.18.1 - 10 February 2016 - bootloader: diff --git a/perl-install/install/help/po/fi.po b/perl-install/install/help/po/fi.po index 63456bdfe..ade225f43 100644 --- a/perl-install/install/help/po/fi.po +++ b/perl-install/install/help/po/fi.po @@ -16,6 +16,7 @@ msgstr "" "PO-Revision-Date: 2005-04-03 20:59+0300\n" "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n" "Language-Team: Finnish <fi@li.org>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -130,7 +131,8 @@ msgstr "Haluatko käyttää tätä ominaisuutta?" #: ../help.pm:57 #, c-format msgid "" -"Listed here are the existing Linux partitions detected on your hard disk drive.\n" +"Listed here are the existing Linux partitions detected on your hard disk " +"drive.\n" "You can keep the choices made by the wizard, since they are good for most\n" "common installations. If you make any changes, you must at least define a\n" "root partition (\"/\"). Do not choose too small a partition or you will not\n" @@ -140,13 +142,16 @@ msgid "" "\n" "Each partition is listed as follows: \"Name\", \"Capacity\".\n" "\n" -"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n" +"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number" +"\",\n" "\"partition number\" (for example, \"hda1\").\n" "\n" -"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n" +"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard " +"disk drive and\n" "\"sd\" if it is a SCSI hard disk drive.\n" "\n" -"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n" +"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For " +"IDE\n" "hard disk drives:\n" "\n" " * \"a\" means \"master hard disk drive on the primary IDE controller\";\n" @@ -157,7 +162,8 @@ msgid "" "\n" " * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n" "\n" -"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n" +"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" " +"means\n" "\"second lowest SCSI ID\", etc." msgstr "" "Tässä on listaus olemassa olevista tunnistetuista Linux-osioista\n" @@ -689,13 +695,15 @@ msgstr "" #, fuzzy, c-format msgid "" "You now need to decide where you want to install the Mageia\n" -"operating system on your hard disk drive. If your hard disk drive is empty or if an\n" +"operating system on your hard disk drive. If your hard disk drive is empty " +"or if an\n" "existing operating system is using all the available space you will have to\n" "partition the drive. Basically, partitioning a hard disk drive means to\n" "logically divide it to create the space needed to install your new\n" "Mageia system.\n" "\n" -"Because the process of partitioning a hard disk drive is usually irreversible\n" +"Because the process of partitioning a hard disk drive is usually " +"irreversible\n" "and can lead to data losses, partitioning can be intimidating and stressful\n" "for the inexperienced user. Fortunately, DrakX includes a wizard which\n" "simplifies this process. Before continuing with this step, read through the\n" @@ -708,12 +716,14 @@ msgid "" "drive(s). If you use this option there will be no further prompts.\n" "\n" " * \"%s\". The wizard has detected one or more existing Linux partitions on\n" -"your hard disk drive. If you want to use them, choose this option. You will then\n" +"your hard disk drive. If you want to use them, choose this option. You will " +"then\n" "be asked to choose the mount points associated with each of the partitions.\n" "The legacy mount points are selected by default, and for the most part it's\n" "a good idea to keep them.\n" "\n" -" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n" +" * \"%s\". If Microsoft Windows is installed on your hard disk drive and " +"takes\n" "all the space available on it, you will have to create free space for\n" "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n" "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n" @@ -736,7 +746,8 @@ msgid "" "\n" " !! If you choose this option, all data on your disk will be deleted. !!\n" "\n" -" * \"%s\". This option appears when the hard disk drive is entirely taken by\n" +" * \"%s\". This option appears when the hard disk drive is entirely taken " +"by\n" "Microsoft Windows. Choosing this option will simply erase everything on the\n" "drive and begin fresh, partitioning everything from scratch.\n" "\n" @@ -1031,16 +1042,19 @@ msgid "" "At this point, you need to choose which partition(s) will be used for the\n" "installation of your Mageia system. If partitions have already been\n" "defined, either from a previous installation of GNU/Linux or by another\n" -"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n" +"partitioning tool, you can use existing partitions. Otherwise, hard disk " +"drive\n" "partitions must be defined.\n" "\n" -"To create partitions, you must first select a hard disk drive. You can select\n" +"To create partitions, you must first select a hard disk drive. You can " +"select\n" "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n" "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n" "\n" "To partition the selected hard disk drive, you can use these options:\n" "\n" -" * \"%s\": this option deletes all partitions on the selected hard disk drive\n" +" * \"%s\": this option deletes all partitions on the selected hard disk " +"drive\n" "\n" " * \"%s\": this option enables you to automatically create ext4 and swap\n" "partitions in the free space of your hard disk drive\n" @@ -1065,7 +1079,8 @@ msgid "" "unmount removable media such as floppies and CD-ROMs.\n" "\n" " * \"%s\": use this option if you wish to use a wizard to partition your\n" -"hard disk drive. This is recommended if you do not have a good understanding of\n" +"hard disk drive. This is recommended if you do not have a good understanding " +"of\n" "partitioning.\n" "\n" " * \"%s\": use this option to cancel your changes.\n" @@ -1073,7 +1088,8 @@ msgid "" " * \"%s\": allows additional actions on partitions (type, options, format)\n" "and gives more information about the hard disk drive.\n" "\n" -" * \"%s\": when you are finished partitioning your hard disk drive, this will\n" +" * \"%s\": when you are finished partitioning your hard disk drive, this " +"will\n" "save your changes back to disk.\n" "\n" "When defining the size of a partition, you can finely set the partition\n" @@ -1197,20 +1213,24 @@ msgstr "Vaihda vakio-/asiantuntijatilan välillä" #: ../help.pm:536 #, fuzzy, c-format msgid "" -"More than one Microsoft partition has been detected on your hard disk drive.\n" +"More than one Microsoft partition has been detected on your hard disk " +"drive.\n" "Please choose the one which you want to resize in order to install your new\n" "Mageia operating system.\n" "\n" "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n" "\"Capacity\".\n" "\n" -"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n" +"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive " +"number\",\n" "\"partition number\" (for example, \"hda1\").\n" "\n" -"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n" +"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk " +"drive and\n" "\"sd\" if it is a SCSI hard disk drive.\n" "\n" -"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n" +"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With " +"IDE\n" "hard disk drives:\n" "\n" " * \"a\" means \"master hard disk drive on the primary IDE controller\";\n" @@ -1221,10 +1241,12 @@ msgid "" "\n" " * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n" "\n" -"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n" +"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" " +"means\n" "\"second lowest SCSI ID\", etc.\n" "\n" -"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n" +"\"Windows name\" is the letter of your hard disk drive under Windows (the " +"first\n" "disk or partition is called \"C:\")." msgstr "" "Useampi kuin yksi Microsoft-osio on löydetty kiintolevyltäsi. Ole hyvä\n" @@ -1283,7 +1305,8 @@ msgid "" " * \"%s\". For the most part, this completely wipes out the old system.\n" "However, depending on your partitioning scheme, you can prevent some of\n" "your existing data (notably \"home\" directories) from being over-written.\n" -"If you wish to change how your hard disk drives are partitioned, or to change\n" +"If you wish to change how your hard disk drives are partitioned, or to " +"change\n" "the filesystem, you should use this option.\n" "\n" " * \"%s\". This installation class allows you to update the packages\n" @@ -1844,8 +1867,10 @@ msgstr "" #, c-format msgid "" "Click on \"%s\" if you want to delete all data and partitions present on\n" -"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n" -"to recover any data and partitions present on this hard disk drive, including\n" +"this hard disk drive. Be careful, after clicking on \"%s\", you will not be " +"able\n" +"to recover any data and partitions present on this hard disk drive, " +"including\n" "any Windows data.\n" "\n" "Click on \"%s\" to quit this operation without losing data and partitions\n" diff --git a/perl-install/install/help/po/zh_CN.po b/perl-install/install/help/po/zh_CN.po index 0e309574e..fdb983a8b 100644 --- a/perl-install/install/help/po/zh_CN.po +++ b/perl-install/install/help/po/zh_CN.po @@ -12,6 +12,7 @@ msgstr "" "PO-Revision-Date: 2006-04-22 15:41+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n" "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,9 +26,9 @@ msgid "" "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n" "button will reboot your computer." msgstr "" -"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mageia发行" -"版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重" -"新启动您的计算机。" +"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mageia发行版。如果" +"您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重新启动您" +"的计算机。" #: ../help.pm:20 #, c-format @@ -116,7 +117,8 @@ msgstr "您要使用此特性吗?" #: ../help.pm:57 #, c-format msgid "" -"Listed here are the existing Linux partitions detected on your hard disk drive.\n" +"Listed here are the existing Linux partitions detected on your hard disk " +"drive.\n" "You can keep the choices made by the wizard, since they are good for most\n" "common installations. If you make any changes, you must at least define a\n" "root partition (\"/\"). Do not choose too small a partition or you will not\n" @@ -126,13 +128,16 @@ msgid "" "\n" "Each partition is listed as follows: \"Name\", \"Capacity\".\n" "\n" -"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n" +"\"Name\" is structured: \"hard disk drive type\", \"hard disk drive number" +"\",\n" "\"partition number\" (for example, \"hda1\").\n" "\n" -"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard disk drive and\n" +"\"Hard disk drive type\" is \"hd\" if your hard disk drive is an IDE hard " +"disk drive and\n" "\"sd\" if it is a SCSI hard disk drive.\n" "\n" -"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n" +"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". For " +"IDE\n" "hard disk drives:\n" "\n" " * \"a\" means \"master hard disk drive on the primary IDE controller\";\n" @@ -143,7 +148,8 @@ msgid "" "\n" " * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n" "\n" -"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n" +"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" " +"means\n" "\"second lowest SCSI ID\", etc." msgstr "" "在此列出了您硬盘上已有的 Linux\n" @@ -183,8 +189,8 @@ msgid "" "CD at hand, just click on \"%s\", the corresponding packages will not be\n" "installed." msgstr "" -"Mageia 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, " -"DrakX 将弹出当前\n" +"Mageia 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, DrakX 将弹" +"出当前\n" "CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就" "不会安装相应的软件包了。" @@ -640,13 +646,15 @@ msgstr "" #, fuzzy, c-format msgid "" "You now need to decide where you want to install the Mageia\n" -"operating system on your hard disk drive. If your hard disk drive is empty or if an\n" +"operating system on your hard disk drive. If your hard disk drive is empty " +"or if an\n" "existing operating system is using all the available space you will have to\n" "partition the drive. Basically, partitioning a hard disk drive means to\n" "logically divide it to create the space needed to install your new\n" "Mageia system.\n" "\n" -"Because the process of partitioning a hard disk drive is usually irreversible\n" +"Because the process of partitioning a hard disk drive is usually " +"irreversible\n" "and can lead to data losses, partitioning can be intimidating and stressful\n" "for the inexperienced user. Fortunately, DrakX includes a wizard which\n" "simplifies this process. Before continuing with this step, read through the\n" @@ -659,12 +667,14 @@ msgid "" "drive(s). If you use this option there will be no further prompts.\n" "\n" " * \"%s\". The wizard has detected one or more existing Linux partitions on\n" -"your hard disk drive. If you want to use them, choose this option. You will then\n" +"your hard disk drive. If you want to use them, choose this option. You will " +"then\n" "be asked to choose the mount points associated with each of the partitions.\n" "The legacy mount points are selected by default, and for the most part it's\n" "a good idea to keep them.\n" "\n" -" * \"%s\". If Microsoft Windows is installed on your hard disk drive and takes\n" +" * \"%s\". If Microsoft Windows is installed on your hard disk drive and " +"takes\n" "all the space available on it, you will have to create free space for\n" "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n" "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n" @@ -687,7 +697,8 @@ msgid "" "\n" " !! If you choose this option, all data on your disk will be deleted. !!\n" "\n" -" * \"%s\". This option appears when the hard disk drive is entirely taken by\n" +" * \"%s\". This option appears when the hard disk drive is entirely taken " +"by\n" "Microsoft Windows. Choosing this option will simply erase everything on the\n" "drive and begin fresh, partitioning everything from scratch.\n" "\n" @@ -919,8 +930,8 @@ msgstr "" "\n" "\n" "选择\"%s\"将显示一个清单, 其中列出的地方都提供了更新软件包。您应该选择离您地" -"理位置较近的镜像。之后会出现一个可以下载的软件包选择树：复查选项, 然后单击\"%" -"s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。" +"理位置较近的镜像。之后会出现一个可以下载的软件包选择树：复查选项, 然后单击" +"\"%s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。" # DO NOT BOTHER TO MODIFY HERE, SEE: #: ../help.pm:450 @@ -943,8 +954,8 @@ msgstr "" "包含关键数据, 或者将直接暴露于 Internet\n" "之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n" "\n" -"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mageia 控制中心" -"的一部分 draksec\n" +"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mageia 控制中心的一部分 " +"draksec\n" "来更改安全级别。\n" "\n" "请在\"%s\"域中填入要负责安全的人的电子邮件地址。安全信息将被发送到该地址。" @@ -961,16 +972,19 @@ msgid "" "At this point, you need to choose which partition(s) will be used for the\n" "installation of your Mageia system. If partitions have already been\n" "defined, either from a previous installation of GNU/Linux or by another\n" -"partitioning tool, you can use existing partitions. Otherwise, hard disk drive\n" +"partitioning tool, you can use existing partitions. Otherwise, hard disk " +"drive\n" "partitions must be defined.\n" "\n" -"To create partitions, you must first select a hard disk drive. You can select\n" +"To create partitions, you must first select a hard disk drive. You can " +"select\n" "the disk for partitioning by clicking on ``hda'' for the first IDE drive,\n" "``hdb'' for the second, ``sda'' for the first SCSI drive and so on.\n" "\n" "To partition the selected hard disk drive, you can use these options:\n" "\n" -" * \"%s\": this option deletes all partitions on the selected hard disk drive\n" +" * \"%s\": this option deletes all partitions on the selected hard disk " +"drive\n" "\n" " * \"%s\": this option enables you to automatically create ext4 and swap\n" "partitions in the free space of your hard disk drive\n" @@ -995,7 +1009,8 @@ msgid "" "unmount removable media such as floppies and CD-ROMs.\n" "\n" " * \"%s\": use this option if you wish to use a wizard to partition your\n" -"hard disk drive. This is recommended if you do not have a good understanding of\n" +"hard disk drive. This is recommended if you do not have a good understanding " +"of\n" "partitioning.\n" "\n" " * \"%s\": use this option to cancel your changes.\n" @@ -1003,7 +1018,8 @@ msgid "" " * \"%s\": allows additional actions on partitions (type, options, format)\n" "and gives more information about the hard disk drive.\n" "\n" -" * \"%s\": when you are finished partitioning your hard disk drive, this will\n" +" * \"%s\": when you are finished partitioning your hard disk drive, this " +"will\n" "save your changes back to disk.\n" "\n" "When defining the size of a partition, you can finely set the partition\n" @@ -1023,8 +1039,8 @@ msgid "" "To get information about the different filesystem types available, please\n" "read the ext2FS chapter from the ``Reference Manual''.\n" msgstr "" -"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mageia 系统。如" -"果已经定义了分区, 不管是先前安装的 GNU/Linux\n" +"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mageia 系统。如果已经定" +"义了分区, 不管是先前安装的 GNU/Linux\n" "还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定" "义。\n" "\n" @@ -1115,20 +1131,24 @@ msgstr "在正常/专家模式间切换" #: ../help.pm:536 #, fuzzy, c-format msgid "" -"More than one Microsoft partition has been detected on your hard disk drive.\n" +"More than one Microsoft partition has been detected on your hard disk " +"drive.\n" "Please choose the one which you want to resize in order to install your new\n" "Mageia operating system.\n" "\n" "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n" "\"Capacity\".\n" "\n" -"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive number\",\n" +"\"Linux name\" is structured: \"hard disk drive type\", \"hard disk drive " +"number\",\n" "\"partition number\" (for example, \"hda1\").\n" "\n" -"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk drive and\n" +"\"Hard disk drive type\" is \"hd\" if your hard dive is an IDE hard disk " +"drive and\n" "\"sd\" if it is a SCSI hard disk drive.\n" "\n" -"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n" +"\"Hard disk drive number\" is always a letter after \"hd\" or \"sd\". With " +"IDE\n" "hard disk drives:\n" "\n" " * \"a\" means \"master hard disk drive on the primary IDE controller\";\n" @@ -1139,10 +1159,12 @@ msgid "" "\n" " * \"d\" means \"slave hard disk drive on the secondary IDE controller\".\n" "\n" -"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n" +"With SCSI hard disk drives, an \"a\" means \"lowest SCSI ID\", a \"b\" " +"means\n" "\"second lowest SCSI ID\", etc.\n" "\n" -"\"Windows name\" is the letter of your hard disk drive under Windows (the first\n" +"\"Windows name\" is the letter of your hard disk drive under Windows (the " +"first\n" "disk or partition is called \"C:\")." msgstr "" "在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n" @@ -1196,7 +1218,8 @@ msgid "" " * \"%s\". For the most part, this completely wipes out the old system.\n" "However, depending on your partitioning scheme, you can prevent some of\n" "your existing data (notably \"home\" directories) from being over-written.\n" -"If you wish to change how your hard disk drives are partitioned, or to change\n" +"If you wish to change how your hard disk drives are partitioned, or to " +"change\n" "the filesystem, you should use this option.\n" "\n" " * \"%s\". This installation class allows you to update the packages\n" @@ -1210,8 +1233,7 @@ msgid "" msgstr "" "仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n" "\n" -"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mageia 系" -"统：\n" +"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mageia 系统：\n" "\n" " *\n" "\"%s\"：总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现" @@ -1222,8 +1244,8 @@ msgstr "" "系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可" "用, 与标准安装类似。\n" "\n" -"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mageia 系统上工作正常。不" -"推荐在先于 \"8.1\" 版本的\n" +"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mageia 系统上工作正常。不推荐在先" +"于 \"8.1\" 版本的\n" "Mageia 系统上执行升级。" # DO NOT BOTHER TO MODIFY HERE, SEE: @@ -1317,8 +1339,8 @@ msgstr "" "\n" "关于 UTF-8 (Unicode) 支持：Unicode 是一种新的字符编码, 该编码可支持所有现存的" "语言。但是, 在 GNU/Linux 下完全支持\n" -"Unicode, 仍然在开发和完善中。由此原因, Mageia 会根据用户的选择是否使" -"用 UTF-8：\n" +"Unicode, 仍然在开发和完善中。由此原因, Mageia 会根据用户的选择是否使用 " +"UTF-8：\n" "\n" " * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、" "泰语、希腊语、土耳其语及大多数 iso-8859-2\n" @@ -1333,9 +1355,9 @@ msgstr "" "项\"%s\"。\n" "\n" "\n" -"请注意, 系统没有限制您只能选择一种额外的语言。您可以选择多种语言, 甚至选择\"%" -"s\"框表明您想要安装全部语言。选择支持某种语言, 意味着同时安装该语言的翻译、字" -"体、拼写检查程序等等。\n" +"请注意, 系统没有限制您只能选择一种额外的语言。您可以选择多种语言, 甚至选择" +"\"%s\"框表明您想要安装全部语言。选择支持某种语言, 意味着同时安装该语言的翻" +"译、字体、拼写检查程序等等。\n" "\n" "要在系统中所安装的不同语言之间切换, 请以 \"root\" 身份执行 \"/usr/sbin/" "localedrake\"\n" @@ -1675,8 +1697,8 @@ msgstr "" "\n" " * \"%s\"：如果您觉得检测的配置有错, 可以点击\"%s\"来更改与该卡关联的参数。\n" "\n" -" * \"%s\"：默认情况下, DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768" -"\"\n" +" * \"%s\"：默认情况下, DrakX 会将您的图形界面配置为 \"800x600\" 或 " +"\"1024x768\"\n" "分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n" "\n" " * \"%s\"：如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印" @@ -1727,8 +1749,10 @@ msgstr "" #, c-format msgid "" "Click on \"%s\" if you want to delete all data and partitions present on\n" -"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n" -"to recover any data and partitions present on this hard disk drive, including\n" +"this hard disk drive. Be careful, after clicking on \"%s\", you will not be " +"able\n" +"to recover any data and partitions present on this hard disk drive, " +"including\n" "any Windows data.\n" "\n" "Click on \"%s\" to quit this operation without losing data and partitions\n" @@ -1815,8 +1839,8 @@ msgstr "<- 上一步" #~ "trust\n" #~ "everybody who uses your computer, you can choose to have \"%s\"." #~ msgstr "" -#~ "要保卫您的 GNU/Linux 系统, 现在是最关键的一步：您需要输入 \"root\" 密码。" -#~ "\"Root\"\n" +#~ "要保卫您的 GNU/Linux 系统, 现在是最关键的一步：您需要输入 \"root\" 密" +#~ "码。\"Root\"\n" #~ "是系统管理员, 而且是唯一有权进行更新、添加用户、更改泛系统配置等操作的用" #~ "户。简言之, \"root\"\n" #~ "可以做任何事！这就是为什么您必须选择难于猜测的密码：如果您的密码太简单了, " diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index af60f7e0f..0c23ba92d 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -732,6 +732,12 @@ sub main { # perl_checker: require install::steps_stdio require "install/steps_$o->{interactive}.pm" if $o->{interactive}; + # psmouse is now modular: + eval { modules::load("psmouse") }; + + #- FIXME loading evdev should prevent crash of following line + eval { modules::load("evdev") }; + #- needed before accessing floppy (in case of usb floppy) modules::load_category($o->{modules_conf}, 'bus/usb'); diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 5026fa732..f44802309 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -10,6 +10,7 @@ lvm2 mdadm mdmon mount mount.nfs umount xz + systemd-detect-virt udevadm <!-- needed by mouse::detect & stage2 --> @@ -101,10 +102,9 @@ <from dir="/usr/libexec"> Xorg Xorg.wrap -</from> - -<from dir="/usr/LIB/dri"> - swrast_dri.so + <!-- needed by WebKit-4.0.typelib --> + webkit2gtk-4.0/WebKitNetworkProcess + webkit2gtk-4.0/WebKitWebProcess </from> <!-- needed by Gtk3 introspection --> @@ -119,10 +119,10 @@ GModule-2.0.typelib GObject-2.0.typelib Gtk-3.0.typelib - JavaScriptCore-3.0.typelib <!-- needed by WebKit-3.0.typelib --> + JavaScriptCore-4.0.typelib <!-- needed by WebKit-4.0.typelib --> Pango-1.0.typelib - Soup-2.4.typelib <!-- needed by WebKit-3.0.typelib --> - WebKit-3.0.typelib + Soup-2.4.typelib <!-- needed by WebKit-4.0.typelib --> + WebKit2-4.0.typelib xlib-2.0.typelib </from> @@ -240,8 +240,11 @@ <!-- needed by dmraid --> libdmraid-events-isw.so - <!-- needed fro Gtk3-WebKit --> - libwebkitgtk-3.0.so.0 + <!-- needed fro Gtk3-WebKit2 --> + <from expand="glob"> + libwebkit2gtk-4.0.so.?? + </from> + webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so </from> </filter> @@ -592,7 +595,7 @@ perl-Glib perl-Glib-Object-Introspection perl-Gtk3 - perl-Gtk3-WebKit + perl-Gtk3-WebKit2 perl-Locale-gettext perl-MDK-Common perl-Pango diff --git a/perl-install/install/share/po/ast.po b/perl-install/install/share/po/ast.po index 24a4a00f9..f95559326 100644 --- a/perl-install/install/share/po/ast.po +++ b/perl-install/install/share/po/ast.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# enolp <enolp@softastur.org>, 2015 +# enolp <enolp@softastur.org>, 2015-2016 # Ḷḷumex03 <tornes@opmbx.org>, 2014 # Ḷḷumex03 <tornes@opmbx.org>, 2014 # Softastur <alministradores@softastur.org>, 2009 @@ -12,10 +12,10 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-26 19:01+0000\n" -"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" -"Language-Team: Asturian (http://www.transifex.com/projects/p/mageia/language/" -"ast/)\n" +"PO-Revision-Date: 2016-03-23 01:13+0000\n" +"Last-Translator: enolp <enolp@softastur.org>\n" +"Language-Team: Asturian (http://www.transifex.com/MageiaLinux/mageia/" +"language/ast/)\n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +70,7 @@ msgstr "¡Gracies!" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "¡Se llibre!" +msgstr "¡Sé llibre!" #: any.pm:151 #, c-format @@ -721,9 +721,9 @@ msgid "Graphical Environment" msgstr "Entornu gráficu" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Estación de trabayu" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1240,9 +1240,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Configurando preseos IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1442,14 +1442,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "nun puede amestase'l preséu" +msgstr "Fallu cuando s'amestaba'l mediu" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Reintentalo" +msgstr "¿Reintentar?" #: steps_interactive.pm:770 #, c-format @@ -1737,22 +1737,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Colar" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "Estación de trabayu KDE" - -#~ msgid "Plasma Desktop" -#~ msgstr "Escritoriu Plasma" - -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "L'escritoriu Plasma, l'entornu gráficu básicu con una coleición de " -#~ "ferramientes" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/ca.po b/perl-install/install/share/po/ca.po index 1c82b3a26..99e6b7c9b 100644 --- a/perl-install/install/share/po/ca.po +++ b/perl-install/install/share/po/ca.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2016-01-19 16:35+0000\n" -"Last-Translator: Davidmp <medipas@gmail.com>\n" +"PO-Revision-Date: 2016-03-18 12:50+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/" "ca/)\n" "Language: ca\n" diff --git a/perl-install/install/share/po/cs.po b/perl-install/install/share/po/cs.po index 428f13950..2bfa5ff22 100644 --- a/perl-install/install/share/po/cs.po +++ b/perl-install/install/share/po/cs.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2016-01-03 13:28+0000\n" -"Last-Translator: fri\n" +"PO-Revision-Date: 2016-02-09 13:04+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/" "cs/)\n" "Language: cs\n" diff --git a/perl-install/install/share/po/da.po b/perl-install/install/share/po/da.po index 305f7c7a5..60c069184 100644 --- a/perl-install/install/share/po/da.po +++ b/perl-install/install/share/po/da.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-26 19:12+0000\n" +"PO-Revision-Date: 2016-02-09 08:39+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Danish (http://www.transifex.com/MageiaLinux/mageia/language/" "da/)\n" @@ -704,9 +704,9 @@ msgid "Graphical Environment" msgstr "Grafisk miljø" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Arbejdsmaskine" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1215,9 +1215,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Konfigurerer IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1416,14 +1416,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "kan ikke tilføje medie" +msgstr "Fejl ved tilføjelse af medie" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Prøv igen" +msgstr "Forsøg igen?" #: steps_interactive.pm:770 #, c-format @@ -1710,12 +1710,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Afslut" - -#~ msgid "CD-ROM" -#~ msgstr "Cd-rom" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE-arbejdsmaskine" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/eo.po b/perl-install/install/share/po/eo.po index d7bb27038..aba16c695 100644 --- a/perl-install/install/share/po/eo.po +++ b/perl-install/install/share/po/eo.po @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-21 04:07+0000\n" +"PO-Revision-Date: 2016-02-09 08:39+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" -"Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/" +"Language-Team: Esperanto (http://www.transifex.com/MageiaLinux/mageia/" "language/eo/)\n" "Language: eo\n" "MIME-Version: 1.0\n" @@ -708,9 +708,9 @@ msgid "Graphical Environment" msgstr "Grafika medio" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Laborstacio" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1215,9 +1215,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Konfiguras IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1420,12 +1420,12 @@ msgstr "" #: steps_interactive.pm:762 #, c-format msgid "Failure when adding medium" -msgstr "" +msgstr "Paneo ĉe aldono de portilo" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Reprovu" +msgstr "" #: steps_interactive.pm:770 #, c-format @@ -1711,12 +1711,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Eliro" - -#~ msgid "CD-ROM" -#~ msgstr "KD-ROMo" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE Laborstacio" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po index 78ba87f9d..e49d21f0d 100644 --- a/perl-install/install/share/po/fi.po +++ b/perl-install/install/share/po/fi.po @@ -1,26 +1,25 @@ -# DrakX-fi - Finnish Translation -# -# Copyright (C) 2002,2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -# Copyright (C) 2002 Mandriva -# Copyright (C) 2011 Mageia -# -# Matias Griese <mahagr@utu.fi>, 2001. -# Taisto Kuikka <69319@batman.jypoly.fi>, 2003,2004. -# Esa Linna <denzo@mbnet.fi>, 2004. -# Thomas Backlund <tmb@mandrake.org>, 2002, 2003, 2004, 2005. -# Thomas Backlund <tmb@mandriva.org>, 2006, 2008. -# Anssi Hannula <anssi@mandriva.org>, 2007, 2008. -# Jani Välimaa <wally@mandriva.org>, 2009. -# Jani Välimaa <wally@mageia.org>, 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Anssi Hannula <anssi@mandriva.org>, 2007-2008 +# Esa Linna <denzo@mbnet.fi>, 2004 +# Jani Välimaa <wally@mageia.org>, 2011 +# wally <wally@mandriva.org>, 2009 +# Matias Griese <mahagr@utu.fi>, 2001 +# Taisto Kuikka <69319@batman.jypoly.fi>, 2003-2004 +# Thomas Backlund <tmb@mandrake.org>, 2002-2005 +# Thomas Backlund <tmb@mandriva.org>, 2006,2008 msgid "" msgstr "" -"Project-Id-Version: DrakX-fi\n" +"Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2011-05-21 23:25+0300\n" -"Last-Translator: Jani Välimaa <wally@mageia.org>\n" -"Language-Team: Finnish <mageia-i18n@mageia.org>\n" +"PO-Revision-Date: 2016-02-09 08:39+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"Language-Team: Finnish (http://www.transifex.com/MageiaLinux/mageia/language/" +"fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,9 +42,9 @@ msgid "Your choice!" msgstr "" #: ../../advertising/04_IM_mageia.pl:1 -#, fuzzy, c-format +#, c-format msgid "Office tools" -msgstr "Toimistotyöasema" +msgstr "" #: ../../advertising/05_IM_mageia.pl:1 #, c-format @@ -244,9 +243,9 @@ msgid "Here you can enable more media if you want." msgstr "" #: any.pm:499 -#, fuzzy, c-format +#, c-format msgid "This medium provides package updates for medium \"%s\"" -msgstr "Ohita kaikki paketit medialta \"%s\"" +msgstr "" #: any.pm:597 #, c-format @@ -714,9 +713,9 @@ msgid "Graphical Environment" msgstr "Graafinen ympäristö" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Työasema" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -740,37 +739,36 @@ msgstr "" "Graafinen ympäristö käyttäjäystävällisillä sovelluksilla ja työkaluilla." #: share/meta-task/compssUsers.pl:164 -#, fuzzy, c-format +#, c-format msgid "XFCE Workstation" -msgstr "KDE-työasema" +msgstr "" #: share/meta-task/compssUsers.pl:165 -#, fuzzy, c-format +#, c-format msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" msgstr "" -"Graafinen ympäristö käyttäjäystävällisillä sovelluksilla ja työkaluilla." #: share/meta-task/compssUsers.pl:169 -#, fuzzy, c-format +#, c-format msgid "MATE Workstation" -msgstr "GNOME-työasema" +msgstr "" #: share/meta-task/compssUsers.pl:174 -#, fuzzy, c-format +#, c-format msgid "Cinnamon Workstation" -msgstr "Työasema" +msgstr "" #: share/meta-task/compssUsers.pl:175 -#, fuzzy, c-format +#, c-format msgid "A graphical environment based on GNOME" -msgstr "Graafinen ympäristö" +msgstr "" #: share/meta-task/compssUsers.pl:179 -#, fuzzy, c-format +#, c-format msgid "LXQt Desktop" -msgstr "LXDE-työpöytä" +msgstr "" #: share/meta-task/compssUsers.pl:181 #, c-format @@ -783,11 +781,9 @@ msgid "Enlightenment e17 Desktop" msgstr "" #: share/meta-task/compssUsers.pl:186 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment with a dedicated following" msgstr "" -"Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen ympäristö " -"käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla." #: share/meta-task/compssUsers.pl:189 #, c-format @@ -795,11 +791,9 @@ msgid "LXDE Desktop" msgstr "LXDE-työpöytä" #: share/meta-task/compssUsers.pl:191 -#, fuzzy, c-format +#, c-format msgid "A lightweight fast graphical environment" msgstr "" -"Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen ympäristö " -"käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla." #: share/meta-task/compssUsers.pl:194 #, c-format @@ -807,9 +801,9 @@ msgid "Other Graphical Desktops" msgstr "Muut graafiset työpöytäympäristöt" #: share/meta-task/compssUsers.pl:195 -#, fuzzy, c-format +#, c-format msgid "Window Maker, Fvwm, etc" -msgstr "Window Maker, Enlightenment, FVWM jne." +msgstr "" #: share/meta-task/compssUsers.pl:218 #, c-format @@ -921,7 +915,6 @@ msgstr "Asenna %s KDE-työpöytäympäristöllä" msgid "Install %s GNOME Desktop" msgstr "Asenna %s GNOME-työpöytäympäristöllä" -# Asennuksen sivuvalikko #: steps_gtk.pm:255 #, c-format msgid "Custom install" @@ -967,7 +960,6 @@ msgstr "Yksittäisten pakettien valinta" msgid "Unselect All" msgstr "Poista valinnat" -# mat #: steps_gtk.pm:376 steps_interactive.pm:534 #, c-format msgid "Total size: %d / %d MB" @@ -978,7 +970,6 @@ msgstr "Koko yhteensä: %d / %d Mt" msgid "Version: " msgstr "Versio: " -# mat #: steps_gtk.pm:422 #, c-format msgid "Size: " @@ -1073,7 +1064,6 @@ msgstr "Lataa / tallenna pakettivalinnat" msgid "Updating package selection" msgstr "Päivitetään pakettien valintoja" -# Asennuksen sivuvalikko #: steps_gtk.pm:521 #, c-format msgid "Minimal install" @@ -1116,7 +1106,6 @@ msgid_plural "%d packages" msgstr[0] "%d paketti" msgstr[1] "%d pakettia" -# Asennuksen sivuvalikko #: steps_gtk.pm:684 steps_interactive.pm:834 steps_list.pm:43 #, c-format msgid "Summary" @@ -1240,9 +1229,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Etsitään IDE-levyjä" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1342,9 +1331,9 @@ msgid "With X" msgstr "Graafisella käyttöliittymällä" #: steps_interactive.pm:579 -#, fuzzy, c-format +#, c-format msgid "Install recommended packages" -msgstr "Asenna ehdotetut paketit" +msgstr "" #: steps_interactive.pm:580 #, c-format @@ -1357,9 +1346,9 @@ msgid "Truly minimal install (especially no urpmi)" msgstr "Vähimmäisasennus (ei edes urpmi:a)" #: steps_interactive.pm:633 -#, fuzzy, c-format +#, c-format msgid "Preparing upgrade..." -msgstr "Valmistellaan käynnistyslatainta..." +msgstr "" #: steps_interactive.pm:643 #, c-format @@ -1441,14 +1430,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "median lisääminen epäonnistui" +msgstr "Virhe lisättäessä lähdettä" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Yritä uudelleen" +msgstr "Yritä uudelleen?" #: steps_interactive.pm:770 #, c-format @@ -1556,9 +1545,9 @@ msgstr "" #. -PO: This is NOT the boot loader (just the kernel initrds)!!!! #: steps_interactive.pm:1065 -#, fuzzy, c-format +#, c-format msgid "Preparing initial startup program..." -msgstr "Valmistellaan asennusta" +msgstr "" #: steps_interactive.pm:1066 #, c-format @@ -1574,7 +1563,6 @@ msgstr "" "Tällä turvallisuustasolla pääsy Windows-osion tiedostoihin on rajoitettu " "pääkäyttäjälle." -# mat #: steps_interactive.pm:1114 #, c-format msgid "Insert a blank floppy in drive %s" @@ -1606,7 +1594,6 @@ msgstr "Onnittelut" msgid "Reboot" msgstr "Käynnistä uudelleen" -# Asennuksen sivuvalikko #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!! #: steps_list.pm:16 #, c-format @@ -1704,7 +1691,6 @@ msgid "" "Bootloader" msgstr "Käynnistyslatain" -# Asennuksen sivuvalikko #: steps_list.pm:40 steps_list.pm:41 #, c-format msgid "" @@ -1712,7 +1698,6 @@ msgid "" "Configure X" msgstr "X-palvelin" -# Asennuksen sivuvalikko #: steps_list.pm:42 #, c-format msgid "" @@ -1740,205 +1725,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Lopetus" - -#~ msgid "CD-ROM" -#~ msgstr "CD/DVD-levy" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE-työasema" - -#, fuzzy -#~ msgid "Plasma Desktop" -#~ msgstr "Mukautettu" - -#, fuzzy -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat " -#~ "työkalut" - -#~ msgid "IDE" -#~ msgstr "IDE" - -#~ msgid "Preparing bootloader..." -#~ msgstr "Valmistellaan käynnistyslatainta..." - -#~ msgid "" -#~ "A lightweight & fast graphical environment with user-friendly set of " -#~ "applications and desktop tools" -#~ msgstr "" -#~ "Kevyt ja nopea, etenkin minikannettaville suunniteltu, graafinen " -#~ "ympäristö käyttäjäystävällisillä työkaluilla ja työpöytäsovelluksilla." - -#, fuzzy -#~ msgid "RazorQT Desktop" -#~ msgstr "Mukautettu" - -#~ msgid "" -#~ "No free space for 1MB bootstrap! Install will continue, but to boot your " -#~ "system, you'll need to create the bootstrap partition in DiskDrake" -#~ msgstr "" -#~ "1 Mt:n käynnistyslohkoa varten ei löydy vapaata tilaa! Asennusta " -#~ "jatketaan, mutta käynnistyslohko-osio pitää luoda DiskDrakella " -#~ "järjestelmän käynnistämiseksi." - -#~ msgid "" -#~ "You'll need to create a PPC PReP Boot bootstrap! Install will continue, " -#~ "but to boot your system, you'll need to create the bootstrap partition in " -#~ "DiskDrake" -#~ msgstr "" -#~ "PPC PReP Boot bootstrap täytyy luoda! Asennusta jatketaan, mutta " -#~ "käynnistyslohko-osio pitää luoda DiskDrakella järjestelmän " -#~ "käynnistämiseksi." - -#~ msgid "" -#~ "You appear to have an OldWorld or Unknown machine, the yaboot bootloader " -#~ "will not work for you. The install will continue, but you'll need to use " -#~ "BootX or some other means to boot your machine. The kernel argument for " -#~ "the root fs is: root=%s" -#~ msgstr "" -#~ "Tietokone on vanhanaikainen tai tuntematon, joten Yaboot-käynnistyslatain " -#~ "ei toimi. Asennus jatkuu, mutta koneen käynnistämiseen täytyy käyttää " -#~ "BootX:ää tai jotain muuta keinoa. Ytimen parametrit root-" -#~ "tiedostojärjestelmälle ovat root=%s" - -#~ msgid "Welcome" -#~ msgstr "Tervetuloa" - -#~ msgid "Select All" -#~ msgstr "Valitse kaikki" - -#~ msgid "Bad package" -#~ msgstr "Viallinen paketti" - -#, fuzzy -#~ msgid "Preparing boot images..." -#~ msgstr "Valmistellaan käynnistyslatainta..." - -#~ msgid "Mageia, the new Linux distribution" -#~ msgstr "Mageia, uusi Linux-jakelu" - -#~ msgid "" -#~ "_: Keep these entry short\n" -#~ "Networking" -#~ msgstr "Verkko" - -#~ msgid "Your desktop on a USB key" -#~ msgstr "Työpöytä USB-tikulla" - -#~ msgid "The 100%% open source Mageia distribution" -#~ msgstr "Mageia - 100%% vapaan lähdekoodin jakelu" - -#~ msgid "Explore Linux easily with Mageia One" -#~ msgstr "Tutustu Linuxiin helposti Mageia One:n avulla" - -#~ msgid "A full Mageia desktop, with support" -#~ msgstr "Käyttäjätuella varustettu täysi Mageia -jakelu" - -#~ msgid "Mageia: distributions for everybody's needs" -#~ msgstr "Mageia: jakeluja jokaisen tarpeisiin" - -#~ msgid "" -#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, " -#~ "gnumeric), pdf viewers, etc" -#~ msgstr "" -#~ "Toimisto-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta " -#~ "(kspread, gnumeric), pdf-lukijat jne" - -#~ msgid "" -#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n" -#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If " -#~ "you choose to proceed, \n" -#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE " -#~ "configuration settings. \n" -#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n" -#~ "please reboot your system and upgrade using the Mandriva update applet." -#~ msgstr "" -#~ "Havaittiin KDE 3.5 ja järjestelmää ollaan päivittämässä versioon\n" -#~ "%s. Asennusohjelma ei kuitenkaan\n" -#~ "osaa säilyttää KDE:n versiota 3.5 päivityksen yhteydessä.\n" -#~ "Jos asennusta jatketaan, asennetaan KDE 3:n tilalle KDE 4 ja\n" -#~ "kaikki KDE:n henkilökohtaiset asetukset menetetään. Jotta\n" -#~ "järjestelmä voidaan päivittää ja henkilökohtaiset asetukset\n" -#~ "säilyttää, täytyy tietokone käynnistää uudelleen ja järjestelmä\n" -#~ "päivittää käyttämällä Mandrivan päivityssovelmaa\n" -#~ "(Mandriva Update)." - -#~ msgid "Proceed" -#~ msgstr "Jatka" - -#~ msgid "retrieval of [%s] failed" -#~ msgstr "[%s] lataaminen epäonnistui" - -#~ msgid "Downloading file %s..." -#~ msgstr "Haetaan tiedosto %s ..." - -#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported" -#~ msgstr "" -#~ "Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu." - -#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported" -#~ msgstr "" -#~ "Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu." - -#~ msgid "" -#~ "You have selected the following server(s): %s\n" -#~ "\n" -#~ "\n" -#~ "These servers are activated by default. They do not have any known " -#~ "security\n" -#~ "issues, but some new ones could be found. In that case, you must make " -#~ "sure\n" -#~ "to upgrade as soon as possible.\n" -#~ "\n" -#~ "\n" -#~ "Do you really want to install these servers?\n" -#~ msgstr "" -#~ "Olet valinnut seuraavat palvelimet: %s\n" -#~ "\n" -#~ "\n" -#~ "Nämä palvelimet otetaan oletuksena käyttöön. Niissä ei ole tunnettuja \n" -#~ "turvallisuusaukkoja, mutta sellaisia voi löytyä ajan mittaan. Mikäli " -#~ "niin \n" -#~ "tapahtuu, sinun pitäisi päivittää kyseiset palvelimet niin nopeasti " -#~ "kuin \n" -#~ "suinkin mahdollista.\n" -#~ "\n" -#~ "\n" -#~ "Haluatko todella asentaa nämä palvelimet?\n" - -#~ msgid "IceWm Desktop" -#~ msgstr "IceWm Työpöytä" - -#~ msgid "Contacting the mirror to get the list of available packages..." -#~ msgstr "Yhdistetään peilipalvelimeen uusimman pakettilistan saamiseksi..." - -#~ msgid "Unable to contact mirror %s" -#~ msgstr "Yhteyttä peilipalvelimeen %s ei voitu muodostaa" - -#~ msgid "Generate auto install floppy" -#~ msgstr "Luo automaattinen asennuslevyke" - -#~ msgid "" -#~ "The auto install can be fully automated if wanted,\n" -#~ "in that case it will take over the hard disk drive!!\n" -#~ "(this is meant for installing on another box).\n" -#~ "\n" -#~ "You may prefer to replay the installation.\n" -#~ msgstr "" -#~ "Automaattinen asennus voi olla täysin automatisoitu,\n" -#~ "jos niin halutaan. Siinä tapauksessa asennus täyttää\n" -#~ "koko kiintolevyn! (tarkoitettu toisen koneen asentamiseksi),\n" -#~ "\n" -#~ "Ehkä haluat mieluummin toistaa asennuksen.\n" - -#~ msgid "Replay" -#~ msgstr "Toista" - -#~ msgid "Automated" -#~ msgstr "Automaattinen" - -#~ msgid "Save packages selection" -#~ msgstr "Tallenna pakettien valinta" diff --git a/perl-install/install/share/po/hu.po b/perl-install/install/share/po/hu.po index e7f04b344..6951028fd 100644 --- a/perl-install/install/share/po/hu.po +++ b/perl-install/install/share/po/hu.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-11-21 14:46+0000\n" -"Last-Translator: Zoltan Siposs <zoltan.siposs@gmail.com>\n" +"PO-Revision-Date: 2016-03-01 09:25+0000\n" +"Last-Translator: Csaba Mészáros <pingvin@y2k.hu>\n" "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/" "language/hu/)\n" "Language: hu\n" @@ -717,9 +717,9 @@ msgid "Graphical Environment" msgstr "Grafikus környezet" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Munkaállomás" +msgstr "Plasma Munkaállomás" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1235,12 +1235,12 @@ msgstr "" #: steps_interactive.pm:264 #, c-format msgid "CD/DVD" -msgstr "" +msgstr "CD/DVD" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "IDE beállítások" +msgstr "CD/DVD konfigurálása" #: steps_interactive.pm:354 #, c-format @@ -1444,14 +1444,14 @@ msgstr "" "Beállítsuk most a frissítési tárolót?" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "sikertelen a csomagforrás hozzáadása" +msgstr "Nem sikerült felvenni az adatforrást" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Újra" +msgstr "Ismét?" #: steps_interactive.pm:770 #, c-format @@ -1737,21 +1737,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Kilépés" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE munkaállomás" - -#~ msgid "Plasma Desktop" -#~ msgstr "Plasma Desktop" - -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "A Plasma Desktop, az alap grafikus környezet néhány kiegészítő eszközzel." - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po index 897338df2..b341c5a8b 100644 --- a/perl-install/install/share/po/id.po +++ b/perl-install/install/share/po/id.po @@ -10,7 +10,7 @@ # erwiensamantha <erwiensamantha@gmail.com>, 2005 # Firdaus <dausnux@gmail.com>, 2005 # Kelana <nk@telkom.net>, 1999 -# Kiki <kiki.syahadat@yahoo.co.id>, 2014-2015 +# Kiki <kiki.syahadat@yahoo.co.id>, 2013-2015 # Kiki <kiki.syahadat@yahoo.co.id>, 2013 # Kiki Syahadat <kiki.syahadat@yahoo.co.id, 2012 # Kiki <kiki.syahadat@yahoo.co.id>, 2013 @@ -20,9 +20,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-21 13:27+0000\n" -"Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/" +"PO-Revision-Date: 2016-02-09 13:04+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/" "language/id/)\n" "Language: id\n" "MIME-Version: 1.0\n" @@ -726,9 +726,9 @@ msgid "Graphical Environment" msgstr "Lingkungan Grafis" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Workstation" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1246,9 +1246,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Mengkonfigurasi IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1450,14 +1450,14 @@ msgstr "" "Apakah Anda ingin mengatur media update?" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "tidak bisa menambah media" +msgstr "Kesalahan ketika menambahkan media" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Coba lagi" +msgstr "Coba lagi?" #: steps_interactive.pm:770 #, c-format @@ -1743,22 +1743,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Keluar" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "Workstation KDE" - -#~ msgid "Plasma Desktop" -#~ msgstr "Desktop Plasma" - -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "Desktop Plasma, lingkungan grafis dasar dengan sekumpulan peralatan yang " -#~ "menyertainya" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/it.po b/perl-install/install/share/po/it.po index 691194989..0b9ff6a81 100644 --- a/perl-install/install/share/po/it.po +++ b/perl-install/install/share/po/it.po @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-26 19:12+0000\n" +"PO-Revision-Date: 2016-02-09 13:04+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/" +"Language-Team: Italian (http://www.transifex.com/MageiaLinux/mageia/language/" "it/)\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -719,9 +719,9 @@ msgid "Graphical Environment" msgstr "Ambiente grafico" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Postazione di lavoro" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1239,9 +1239,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Sto configurando IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1440,14 +1440,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "impossibile aggiungere la fonte" +msgstr "Errore nell'aggiunta della fonte" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Riprova" +msgstr "Riprovare?" #: steps_interactive.pm:770 #, c-format @@ -1734,22 +1734,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Esci" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "Postazione di lavoro grafica con KDE" - -#~ msgid "Plasma Desktop" -#~ msgstr "Desktop Plasma" - -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "Il desktop Plasma, l'ambiente grafico di base con una collezione di " -#~ "strumenti che lo accompagnano" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/ja.po b/perl-install/install/share/po/ja.po index 8b108c03b..a078c3b5b 100644 --- a/perl-install/install/share/po/ja.po +++ b/perl-install/install/share/po/ja.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-26 19:12+0000\n" +"PO-Revision-Date: 2016-02-09 08:39+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/" "language/ja/)\n" @@ -704,9 +704,9 @@ msgid "Graphical Environment" msgstr "グラフィカル環境" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "ワークステーション" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1207,9 +1207,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "IDE を設定" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1405,14 +1405,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "メディアを追加できません" +msgstr "メディアの追加に失敗しました" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "再試行" +msgstr "やり直しますか？" #: steps_interactive.pm:770 #, c-format @@ -1699,12 +1699,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "終了" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE ワークステーション" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/lt.po b/perl-install/install/share/po/lt.po index cc3f35c8c..06844a8e5 100644 --- a/perl-install/install/share/po/lt.po +++ b/perl-install/install/share/po/lt.po @@ -4,13 +4,14 @@ # # Translators: # Moo, 2015 +# Moo, 2015-2016 # Mykolas Norvai-as <Myka@centras.lt>, 2002 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-12-20 22:56+0000\n" +"PO-Revision-Date: 2016-03-06 21:52+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/MageiaLinux/mageia/" "language/lt/)\n" @@ -39,7 +40,7 @@ msgstr "" #: ../../advertising/04_IM_mageia.pl:1 #, c-format msgid "Office tools" -msgstr "" +msgstr "Biuro įrankiai" #: ../../advertising/05_IM_mageia.pl:1 #, c-format @@ -310,7 +311,7 @@ msgstr "" #: any.pm:1402 #, c-format msgid "File already exists. Overwrite it?" -msgstr "" +msgstr "Failas jau yra. Perrašyti jį?" #: any.pm:1406 #, c-format @@ -376,7 +377,7 @@ msgstr "Išjungiamas tinklas" #: media.pm:407 #, c-format msgid "Please wait, retrieving file" -msgstr "" +msgstr "Prašome palaukti, gaunamas failas" #: media.pm:714 #, c-format @@ -448,7 +449,7 @@ msgstr "Įvyko klaida:" #: pkgs.pm:403 #, c-format msgid "A fatal error occurred: %s." -msgstr "" +msgstr "Įvyko lemtinga klaida: %s." #: pkgs.pm:897 pkgs.pm:939 #, c-format @@ -699,9 +700,9 @@ msgid "Graphical Environment" msgstr "Grafinė aplinka" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "KDE darbo stotis" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1203,9 +1204,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Nustatome IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1402,12 +1403,12 @@ msgstr "" #: steps_interactive.pm:762 #, c-format msgid "Failure when adding medium" -msgstr "" +msgstr "Klaida, pridedant laikmeną" #: steps_interactive.pm:762 #, c-format msgid "Retry?" -msgstr "" +msgstr "Bandyti dar kartą?" #: steps_interactive.pm:770 #, c-format @@ -1681,9 +1682,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Išeiti" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/pt_BR.po b/perl-install/install/share/po/pt_BR.po index eec19184a..f4611ef18 100644 --- a/perl-install/install/share/po/pt_BR.po +++ b/perl-install/install/share/po/pt_BR.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2016-01-13 02:28+0000\n" -"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n" +"PO-Revision-Date: 2016-02-09 13:05+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/" "mageia/language/pt_BR/)\n" "Language: pt_BR\n" diff --git a/perl-install/install/share/po/ro.po b/perl-install/install/share/po/ro.po index b78c3f793..94bd737f0 100644 --- a/perl-install/install/share/po/ro.po +++ b/perl-install/install/share/po/ro.po @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-29 14:31+0000\n" -"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/" -"ro/)\n" +"PO-Revision-Date: 2016-02-09 13:04+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/" +"language/ro/)\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -719,9 +719,9 @@ msgid "Graphical Environment" msgstr "Mediu grafic de lucru" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Stație de lucru" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1240,9 +1240,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Se configurează IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1443,14 +1443,14 @@ msgstr "" "Sigur doriți să configurați mediile de actualizare?" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "mediul nu poate fi adăugat" +msgstr "Adăugare de mediu eșuată" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Reîncearcă" +msgstr "Reîncercați?" #: steps_interactive.pm:770 #, c-format @@ -1737,21 +1737,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Ieșire" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "Stație de lucru KDE" - -#~ msgid "Plasma Desktop" -#~ msgstr "Birou Plasma" - -#~ msgid "" -#~ "The Plasma Desktop, the basic graphical environment with a collection of " -#~ "accompanying tools" -#~ msgstr "" -#~ "Biroul Plasma, mediul grafic de bază cu o colecție de unelte asociate" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/sq.po b/perl-install/install/share/po/sq.po index b823ad6d1..b788c62c4 100644 --- a/perl-install/install/share/po/sq.po +++ b/perl-install/install/share/po/sq.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ardit Dani <ardit.dani@gmail.com>, 2014-2015 +# Ardit Dani <ardit.dani@gmail.com>, 2014-2016 # Naim Daka <naim70@freesurf.ch>, 2002-2003 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-06-10 17:51+0000\n" +"PO-Revision-Date: 2016-03-21 15:36+0000\n" "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n" "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/" "language/sq/)\n" @@ -714,9 +714,9 @@ msgid "Graphical Environment" msgstr "Mjedis Grafikë" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "Stacion punues" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -770,7 +770,7 @@ msgstr "Një mjedis grafik i bazuar në GNOME" #: share/meta-task/compssUsers.pl:179 #, c-format msgid "LXQt Desktop" -msgstr "" +msgstr "LXQt Desktop" #: share/meta-task/compssUsers.pl:181 #, c-format @@ -790,7 +790,7 @@ msgstr "" #: share/meta-task/compssUsers.pl:189 #, c-format msgid "LXDE Desktop" -msgstr "" +msgstr "LXDE Desktop" #: share/meta-task/compssUsers.pl:191 #, c-format @@ -835,17 +835,17 @@ msgstr "" #: share/meta-task/compssUsers.pl:231 #, c-format msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..." -msgstr "" +msgstr "Vegla monitorimi, llogaritje procesesh, tcpdump, nmap, ..." #: share/meta-task/compssUsers.pl:235 #, c-format msgid "Mageia Wizards" -msgstr "Magjistari Mageia" +msgstr "Udhëzuesi Mageia" #: share/meta-task/compssUsers.pl:236 #, c-format msgid "Wizards to configure server" -msgstr "Magjistarët për të konfiguruar serverin" +msgstr "Udhëzuesi për konfigurim serverin" #: steps.pm:85 #, c-format @@ -864,7 +864,7 @@ msgid "" "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" "\"\n" msgstr "" -"Disa pako me rëndësi nuk janë instalur në mënyrë korrekte.\n" +"Disa paketa me rëndësi nuk janë instalur në mënyrë korrekte.\n" "Është e mundur që cdrom-i apo lexuesi cdrom të jetë në defekt.\n" "Verifikoni cdrom-in në një kompjuter të instalur, duke shtypur urdhërin " "\"rpm -qpl media/main/*.rpm\"\n" @@ -896,11 +896,10 @@ msgid "" "%s. If that occurs, you can try a text install instead. For this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" -"Kompjuteri i juaj posedon sasi të vogël të memorisë. Ju mund të ndesheni me\n" +"Kompjuteri juaj posedon sasi të vogël të memorjes. Ju mund të ndesheni me\n" "disa probleme gjatë instalimit të %s. Nëse kjo ndodhë, ju\n" -"mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni mbi\n" -"`F1' kut të niseni me një nisje të udhëzuar në CDROM, dhe fytni urdhërin " -"`text'." +"mund të vazhdoni në një instalim në modë teksti. Për këtë shtypni `F1' kut " +"të ndizet në CDROM, dhe shtypni `text'." #: steps_gtk.pm:242 steps_gtk.pm:754 #, c-format @@ -910,12 +909,12 @@ msgstr "" #: steps_gtk.pm:253 #, c-format msgid "Install %s KDE Desktop" -msgstr "" +msgstr "Instalo %s KDE Desktop" #: steps_gtk.pm:254 #, c-format msgid "Install %s GNOME Desktop" -msgstr "" +msgstr "Instalo %s GNOME Desktop" #: steps_gtk.pm:255 #, c-format @@ -1216,12 +1215,12 @@ msgstr "" #: steps_interactive.pm:264 #, c-format msgid "CD/DVD" -msgstr "" +msgstr "CD/DVD" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "Konfigurimi i IDE" +msgstr "Konfigurimi CD/DVD" #: steps_interactive.pm:354 #, c-format @@ -1333,7 +1332,7 @@ msgstr "Instalim tejet minimal (në veçanti pa urpmi)" #: steps_interactive.pm:633 #, c-format msgid "Preparing upgrade..." -msgstr "" +msgstr "Përgatitje përmirësim..." #: steps_interactive.pm:643 #, c-format @@ -1415,14 +1414,14 @@ msgid "" msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "e pamundur shtimi medies" +msgstr "" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "Riprovo" +msgstr "Riprovo?" #: steps_interactive.pm:770 #, c-format @@ -1713,12 +1712,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "Braktise" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "Stacioni punues KDE" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/share/po/sv.po b/perl-install/install/share/po/sv.po index 0cc54b1ef..b9dc1ae9c 100644 --- a/perl-install/install/share/po/sv.po +++ b/perl-install/install/share/po/sv.po @@ -7,7 +7,7 @@ # Kenneth Krekula, 2005 # Kenneth Krekula <kenneth.krekula@kiruna.se>, 2007 # Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013 -# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2014-2016 +# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013-2016 # Lars Westergren <lars.westergren@home.se>, 2003-2005 # Magnus Björklöf <bjorklof@nic.fi>, 2003 # Mattias Dahlberg <voz@home.se>, 2001-2002 @@ -20,9 +20,8 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2016-01-07 06:50+0000\n" -"Last-Translator: Kristoffer Grundström <kristoffer.grundstrom1983@gmail." -"com>\n" +"PO-Revision-Date: 2016-02-09 13:05+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/" "sv/)\n" "Language: sv\n" diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po index c4251bf99..d5cf39975 100644 --- a/perl-install/install/share/po/zh_CN.po +++ b/perl-install/install/share/po/zh_CN.po @@ -8,14 +8,15 @@ # Jesse Kuang <kjx@mandriva.com>, 2002 # Shiyu Tang <shiyutang@netscape.net>, 2003-2004 # xiao wenming <xwm-citcc5@hotmail.com>, 2015 +# zwpwjwtz <zwpwjwtz@126.com>, 2016 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-02-13 05:25+0000\n" -"Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/" +"PO-Revision-Date: 2016-03-08 13:43+0000\n" +"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -31,17 +32,17 @@ msgstr "加入我们！" #: ../../advertising/02_IM_mageia.pl:1 #, c-format msgid "Make it yours!" -msgstr "" +msgstr "得心应手" #: ../../advertising/03_IM_mageia.pl:1 #, c-format msgid "Your choice!" -msgstr "" +msgstr "你的选择！" #: ../../advertising/04_IM_mageia.pl:1 #, c-format msgid "Office tools" -msgstr "" +msgstr "办公工具" #: ../../advertising/05_IM_mageia.pl:1 #, c-format @@ -51,17 +52,17 @@ msgstr "家庭娱乐" #: ../../advertising/06_IM_mageia.pl:1 #, c-format msgid "For kids" -msgstr "" +msgstr "给孩子们的……" #: ../../advertising/07_IM_mageia.pl:1 #, c-format msgid "For family!" -msgstr "" +msgstr "给家人的……" #: ../../advertising/08_IM_mageia.pl:1 #, c-format msgid "For developers!" -msgstr "" +msgstr "给开发者的……" #: ../../advertising/09_IM_mageia.pl:1 #, c-format @@ -71,7 +72,7 @@ msgstr "谢谢！" #: ../../advertising/10_IM_mageia.pl:1 #, c-format msgid "Be Free!" -msgstr "" +msgstr "一切自由！" #: any.pm:151 #, c-format @@ -177,34 +178,34 @@ msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确 #: any.pm:391 #, c-format msgid "Core Release" -msgstr "" +msgstr "Core 发布" #: any.pm:393 #, c-format msgid "Tainted Release" -msgstr "" +msgstr "Tainted 发布" #: any.pm:395 #, c-format msgid "Nonfree Release" -msgstr "" +msgstr "Nonfree 发布" #: any.pm:433 #, c-format msgid "" "Some hardware on your machine needs some non free firmwares in order for the " "free software drivers to work." -msgstr "" +msgstr "您的机器上有一些硬件需要非自由固件来支持驱动（自由软件）运行。" #: any.pm:434 #, c-format msgid "You should enable \"%s\"" -msgstr "" +msgstr "您应当启用“%s”" #: any.pm:472 #, c-format msgid "\"%s\" contains the various pieces of the systems and its applications" -msgstr "" +msgstr "“%s”包含系统及其应用的各种部件" #: any.pm:473 #, c-format @@ -217,29 +218,30 @@ msgid "" "It also contains firmwares needed for certain devices to operate (eg: some " "ATI/AMD graphic cards, some network cards, some RAID cards, ...)" msgstr "" +"它也包含支持特定设备运行的固件（如：一些 ATI/AMD 显卡、网卡和 RAID 卡）" #: any.pm:475 #, c-format msgid "" "\"%s\" contains software that can not be distributed in every country due to " "software patents." -msgstr "" +msgstr "“%s”包含因软件专利问题无法在所有国家分发的软件" #: any.pm:476 #, c-format msgid "" "It also contains software from \"%s\" rebuild with additional capabilities." -msgstr "" +msgstr "它也包含由“%s”重新构建，并加入了额外功能的软件" #: any.pm:482 #, c-format msgid "Here you can enable more media if you want." -msgstr "" +msgstr "此处您可以启用更多媒体。" #: any.pm:499 #, c-format msgid "This medium provides package updates for medium \"%s\"" -msgstr "" +msgstr "这些媒体提供了来自媒体“%s”的软件包更新" #: any.pm:597 #, c-format @@ -422,7 +424,7 @@ msgstr "或许有用" #: pkgs.pm:102 #, c-format msgid "Getting package information from XML meta-data..." -msgstr "" +msgstr "从 XML元数据获取软件包信息……" #: pkgs.pm:111 #, c-format @@ -701,9 +703,9 @@ msgid "Graphical Environment" msgstr "图形环境" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "工作站" +msgstr "Plasma 工作站" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -734,7 +736,7 @@ msgstr "XFCE 工作者" msgid "" "A lighter graphical environment with user-friendly set of applications and " "desktop tools" -msgstr "" +msgstr "一个轻量级的图形化环境，包含了用户友好的应用程序和桌面工具。" #: share/meta-task/compssUsers.pl:169 #, c-format @@ -759,7 +761,7 @@ msgstr "LXQt桌面" #: share/meta-task/compssUsers.pl:181 #, c-format msgid "A next generation QT port of the lightweight desktop environment" -msgstr "" +msgstr "轻量级桌面环境的 QT 移植版本" #: share/meta-task/compssUsers.pl:184 #, c-format @@ -769,7 +771,7 @@ msgstr "Enlightenment e17 桌面" #: share/meta-task/compssUsers.pl:186 #, c-format msgid "A lightweight fast graphical environment with a dedicated following" -msgstr "" +msgstr "轻便、快捷、专注的图形化环境" #: share/meta-task/compssUsers.pl:189 #, c-format @@ -1204,12 +1206,12 @@ msgstr "" #: steps_interactive.pm:264 #, c-format msgid "CD/DVD" -msgstr "" +msgstr "CD/DVD" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "配置 IDE" +msgstr "配置 CD/DVD" #: steps_interactive.pm:354 #, c-format @@ -1385,12 +1387,12 @@ msgstr "更新" #: steps_interactive.pm:740 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "您现在可以配置在线媒体。" #: steps_interactive.pm:741 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "允许安装安全更新。" #: steps_interactive.pm:742 #, c-format @@ -1400,16 +1402,19 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"要安装这些媒体，您需要确保互联网连接正常。\n" +"\n" +"您希望安装更新媒体吗？" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "无法添加介质" +msgstr "添加介质失败" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "重试" +msgstr "重试一次吗?" #: steps_interactive.pm:770 #, c-format @@ -1689,18 +1694,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "退出" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE 工作站" - -#~ msgid "Plasma Desktop" -#~ msgstr "Plasma 桌面" - -#~ msgid "IDE" -#~ msgstr "IDE" - -#~ msgid "Preparing bootloader..." -#~ msgstr "正在准备引导程序..." diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po index 644ffa8ba..30de29849 100644 --- a/perl-install/install/share/po/zh_TW.po +++ b/perl-install/install/share/po/zh_TW.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-02 14:54+0100\n" -"PO-Revision-Date: 2015-05-28 13:40+0000\n" -"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/" +"PO-Revision-Date: 2016-02-09 13:05+0000\n" +"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/" "language/zh_TW/)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -699,9 +699,9 @@ msgid "Graphical Environment" msgstr "圖形環境" #: share/meta-task/compssUsers.pl:152 -#, fuzzy, c-format +#, c-format msgid "Plasma Workstation" -msgstr "工作站" +msgstr "" #: share/meta-task/compssUsers.pl:153 #, c-format @@ -1204,9 +1204,9 @@ msgid "CD/DVD" msgstr "" #: steps_interactive.pm:264 -#, fuzzy, c-format +#, c-format msgid "Configuring CD/DVD" -msgstr "正在設定 IDE" +msgstr "" #: steps_interactive.pm:354 #, c-format @@ -1402,14 +1402,14 @@ msgstr "" "您想要設定更新來源嗎?" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Failure when adding medium" -msgstr "無法新增媒體" +msgstr "新增媒體時發生錯誤" #: steps_interactive.pm:762 -#, fuzzy, c-format +#, c-format msgid "Retry?" -msgstr "重試" +msgstr "重試？" #: steps_interactive.pm:770 #, c-format @@ -1689,15 +1689,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "離開" - -#~ msgid "CD-ROM" -#~ msgstr "CD-ROM" - -#~ msgid "KDE Workstation" -#~ msgstr "KDE 工作站" - -#~ msgid "Plasma Desktop" -#~ msgstr "Plasma 桌面" - -#~ msgid "IDE" -#~ msgstr "IDE" diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 35aa93f9b..a58b70b7c 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -485,6 +485,14 @@ Consoles 1,3,4,7 may also contain interesting information"; harddrake::autoconf::cpufreq(); harddrake::autoconf::floppy(); + # prevent slow boot on first boot: + my $cfg_file = "$::prefix/etc/sysconfig/harddrake2/kernel"; + if (-f $cfg_file) { + my %kernel_config = getVarsFromSh($cfg_file); + $kernel_config{IS_LAPTOP} = bool2text(detect_devices::isLaptop()); + setVarsInSh($cfg_file, \%kernel_config); + } + #- for mandrake_firstime touch "$::prefix/var/lock/TMP_1ST"; |