diff options
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rw-r--r-- | perl-install/NEWS | 6 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 8 | ||||
| -rw-r--r-- | perl-install/install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 8 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/share/list.xml | 12 | ||||
| -rw-r--r-- | perl-install/install/share/po/zh_CN.po | 36 | ||||
| -rw-r--r-- | perl-install/install/share/po/zh_TW.po | 36 | ||||
| -rw-r--r-- | perl-install/share/po/zh_CN.po | 70 | ||||
| -rw-r--r-- | perl-install/share/po/zh_TW.po | 89 | ||||
| -rw-r--r-- | perl-install/standalone/po/sv.po | 4 | ||||
| -rw-r--r-- | perl-install/standalone/po/zh_CN.po | 6 | ||||
| -rw-r--r-- | perl-install/standalone/po/zh_TW.po | 8 |
16 files changed, 127 insertions, 167 deletions
diff --git a/images/Makefile b/images/Makefile index e97ab5d45..abbbbfb44 100644 --- a/images/Makefile +++ b/images/Makefile @@ -2,7 +2,7 @@ include ../Makefile.config VERSION=2.91 PRODUCT=drakx-installer-images -KERNELS=$(shell rpm -qf /lib/modules/4.*) +KERNELS=$(shell rpm -qf /lib/modules/6.*) IMAGES_DEST = $(ROOTDEST)/install/images diff --git a/perl-install/Makefile b/perl-install/Makefile index ced9a8a3b..0fe946485 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -68,7 +68,7 @@ tar: clean $(info $(PACKAGE)-$(PKGVERSION).tar.xz is ready) tag: - git tag $(VERSION) + git tag -a $(VERSION) -m "$(VERSION)" # rules to build a distributable rpm diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index 6f45650de..9883c6e60 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -1,5 +1,5 @@ # -*- Makefile -*- -VERSION:=18.67 +VERSION:=18.68 SUDO = sudo TMPDIR = /tmp diff --git a/perl-install/NEWS b/perl-install/NEWS index 63d87aacc..273b00e91 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,9 @@ +- install rpm's /usr/lib/rpm/sysusers.sh to stage2 image by default +- Drop i586 bits + +Version 18.68 - 28 April 2024 +- Updated translations + Version 18.67 - 5 January 2024 - Updated translations diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 15201a057..9aff9306c 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1420,14 +1420,6 @@ sub BIGMEM() { arch() !~ /x86_64/ && $> == 0 && dmi_detect_memory() > 4 * 1024; } -sub is_i586() { - return 0 if arch() !~ /86/; - my $cpuinfo = cat_('/proc/cpuinfo'); - $cpuinfo =~ /^cpu family\s*:\s*(\d+)/m && $1 < 6 || - $cpuinfo =~ /^model name\s*:\s*Transmeta.* TM5800/m || # mdvbz#37866 - !has_cpu_flag('cmov') || !has_cpu_flag('pae'); -} - sub is_arm_openrd_client() { to_bool(cat_('/proc/cpuinfo') =~ /OpenRD Client/); } diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile index aea57f78d..273cd934b 100644 --- a/perl-install/install/Makefile +++ b/perl-install/install/Makefile @@ -28,7 +28,7 @@ tar: $(info $(PRODUCT)-$(VERSION).tar.xz is ready) tag: - git tag $(VERSION) + git tag -a $(VERSION) -m "$(VERSION)" install: $(MAKE) full_stage2 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 702af331a..18c280175 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,10 @@ -- Adapt to rpm-4.19 +- install rpm's /usr/lib/rpm/sysusers.sh to stage2 image by default +- Drop i586 bits + +Version 18.68 - 28 April 2024 +- Adapt to rpm-4.19.1 +- Fix debug build +- Updated translations Version 18.67 - 5 January 2024 diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index b095d8d41..a9692e225 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -160,8 +160,6 @@ sub _bestKernel_extensions { my ($o_match_all_hardware) = @_; $::o->{kernel_extension} ? $::o->{kernel_extension} : - $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') : - detect_devices::is_i586() ? '-desktop586' : _is_kernelServer_needed() ? '-server' : '-desktop'; } @@ -174,7 +172,6 @@ sub bestKernelPackage { if (!@kernels) { #- fallback on most generic kernel if the suitable one is not available - #- (only kernel-desktop586-latest is available on Dual ISO for i586) my @fallback_exts = _bestKernel_extensions('force'); @kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @fallback_exts; } diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 9c18a3ae9..8b11b0af5 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -291,10 +291,15 @@ /usr/share/doc/installer-help/ </mode> /usr/share/libDrakX/pixmaps + /usr/lib/rpm/rpmrc - /usr/lib/rpm/rpmpopt-4.19.0 + <from expand="glob"> + /usr/lib/rpm/rpmpopt-* + </from> + /usr/lib/rpm/sysusers.sh /usr/lib/rpm/mageia/macros /usr/lib/rpm/macros + /usr/share/pci.ids /usr/share/usb.ids /usr/share/locale/UTF-8 @@ -332,10 +337,9 @@ <if set="DEBUG_INSTALL"> /usr/libexec/gdb <from expand="glob"> - /usr/include/python3.*/pyconfig.h + /usr/include/python3.*/pyconfig-*.h /usr/LIB/libpython3.*so /usr/LIB/python3.*/abc.py - /usr/LIB/python3.*/_bootlocale.py /usr/LIB/python3.*/codecs.py /usr/LIB/python3.*/_collections_abc.py /usr/LIB/python3.*/contextlib.py @@ -352,7 +356,6 @@ /usr/LIB/python3.*/functools.py /usr/LIB/python3.*/genericpath.py /usr/LIB/python3.*/heapq.py - /usr/LIB/python3.*/imp.py /usr/LIB/python3.*/io.py /usr/LIB/python3.*/keyword.py /usr/LIB/python3.*/linecache.py @@ -360,7 +363,6 @@ /usr/LIB/python3.*/os.py /usr/LIB/python3.*/posixpath.py /usr/LIB/python3.*/reprlib.py - /usr/LIB/python3.*/re.py /usr/LIB/python3.*/site.py /usr/LIB/python3.*/_sitebuiltins.py /usr/LIB/python3.*/sre_compile.py diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po index 6823bd1bb..87886bf5a 100644 --- a/perl-install/install/share/po/zh_CN.po +++ b/perl-install/install/share/po/zh_CN.po @@ -4,7 +4,7 @@ # # Translators: # Danny Zeng <danny@zeng.com.cn>, 2000,2002 -# Dmitry <dmitrydmitry761@gmail.com>, 2021 +# Dmitry <dmitrydmitry761@gmail.com>, 2021,2024 # Funda Wang <fundawang@linux.net.cn>, 2002-2005 # Jesse Kuang <kjx@mandriva.com>, 2002 # Shiyu Tang <shiyutang@netscape.net>, 2003-2004 @@ -15,9 +15,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-21 21:16+0000\n" -"PO-Revision-Date: 2021-08-22 18:23+0000\n" -"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:31+0000\n" +"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>, 2021,2024\n" +"Language-Team: Chinese (China) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -823,8 +823,8 @@ msgstr "" msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" -"\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*." +"rpm\"\n" msgstr "" "一些重要软件包没有正确的安装。\n" "您的光盘或者驱动器可能有缺陷。\n" @@ -1388,9 +1388,9 @@ msgstr "" "您希望安装更新媒体吗？" #: steps_interactive.pm:767 -#, fuzzy, c-format +#, c-format msgid "That downloader could not be installed" -msgstr "即将安装下列软件包" +msgstr "无法安装此引导加载程序" #: steps_interactive.pm:767 steps_interactive.pm:784 #, c-format @@ -1663,23 +1663,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "退出" - -#, c-format -#~ msgid "URL of the mirror?" -#~ msgstr "镜像的 URL?" - -#, c-format -#~ msgid "URL must start with ftp:// or http://" -#~ msgstr "URL 必须以 ftp:// 或 http:// 开始" - -#, c-format -#~ msgid "Contacting %s web site to get the list of available mirrors..." -#~ msgstr "正在连接 %s 网站获得可用镜像的列表..." - -#, c-format -#~ msgid "Failed contacting %s web site to get the list of available mirrors" -#~ msgstr "连接 %s 网站以获得可用镜像的列表失败" - -#, c-format -#~ msgid "Choose a mirror from which to get the packages" -#~ msgstr "选择一个镜像网站来取得软件包" diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po index 109f37b2d..8aecc4968 100644 --- a/perl-install/install/share/po/zh_TW.po +++ b/perl-install/install/share/po/zh_TW.po @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-21 21:16+0000\n" -"PO-Revision-Date: 2019-06-07 08:35+0000\n" -"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:31+0000\n" +"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>, 2018\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_TW/)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -819,8 +819,8 @@ msgstr "" msgid "" "Some important packages did not get installed properly.\n" "Either your cdrom drive or your cdrom is defective.\n" -"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm" -"\"\n" +"Check the cdrom on an installed computer using \"rpm -qpl media/main/*." +"rpm\"\n" msgstr "" "有某些重要的軟體套件沒有妥善安裝。\n" "可能是您的光碟機或者是光碟片有缺陷。\n" @@ -1021,7 +1021,7 @@ msgstr "正在更新軟體套件選擇" #: steps_gtk.pm:524 #, c-format msgid "Toggle between hierarchical and flat package list" -msgstr "" +msgstr "在包的分层列表和平面列表之间切换" #: steps_gtk.pm:530 #, c-format @@ -1382,9 +1382,9 @@ msgstr "" "您想要設定更新來源嗎?" #: steps_interactive.pm:767 -#, fuzzy, c-format +#, c-format msgid "That downloader could not be installed" -msgstr "下列的軟體套件將會安裝" +msgstr "无法安装此引导加载程序" #: steps_interactive.pm:767 steps_interactive.pm:784 #, c-format @@ -1657,23 +1657,3 @@ msgid "" "_: Keep these entry short\n" "Exit" msgstr "離開" - -#, c-format -#~ msgid "URL of the mirror?" -#~ msgstr "映像站的 URL？" - -#, c-format -#~ msgid "URL must start with ftp:// or http://" -#~ msgstr "URL 開頭必須是 ftp:// 或 http://" - -#, c-format -#~ msgid "Contacting %s web site to get the list of available mirrors..." -#~ msgstr "請到 %s 網站取得鏡像站台清單..." - -#, c-format -#~ msgid "Failed contacting %s web site to get the list of available mirrors" -#~ msgstr "到 %s 網站取得鏡像站台清單失敗" - -#, c-format -#~ msgid "Choose a mirror from which to get the packages" -#~ msgstr "選取要用來抓取軟體套件的 FTP 鏡像站" diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po index ff57be227..0bedc5d32 100644 --- a/perl-install/share/po/zh_CN.po +++ b/perl-install/share/po/zh_CN.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2023-04-17 13:26+0100\n" -"PO-Revision-Date: 2021-08-22 18:29+0000\n" -"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:34+0000\n" +"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>, 2021\n" +"Language-Team: Chinese (China) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -204,9 +204,9 @@ msgid "Bootloader Configuration" msgstr "引导程序配置" #: any.pm:532 -#, fuzzy, c-format +#, c-format msgid "Install Options" -msgstr "安装失败" +msgstr "" #: any.pm:533 #, c-format @@ -234,9 +234,9 @@ msgid "rEFInd banner" msgstr "" #: any.pm:545 -#, fuzzy, c-format +#, c-format msgid "Mageia theme" -msgstr "Mageia" +msgstr "" #: any.pm:546 any.pm:1602 #, c-format @@ -244,9 +244,9 @@ msgid "Custom" msgstr "自定义" #: any.pm:564 -#, fuzzy, c-format +#, c-format msgid "No scaling" -msgstr "禁止共享" +msgstr "" #: any.pm:565 #, c-format @@ -773,9 +773,9 @@ msgid "URL of the mirror?" msgstr "镜像的 URL?" #: any.pm:1880 -#, fuzzy, c-format +#, c-format msgid "URL must start with ftp:// or http:// or https://" -msgstr "URL 必须以 ftp:// 或 http:// 开始" +msgstr "" #: any.pm:1898 #, c-format @@ -805,22 +805,22 @@ msgstr "取消" #: any.pm:1977 #, c-format msgid "Mirror choice" -msgstr "" +msgstr "镜像选择" #: any.pm:1982 -#, fuzzy, c-format +#, c-format msgid "Automatic" -msgstr "自动检测" +msgstr "自动" #: any.pm:1983 -#, fuzzy, c-format +#, c-format msgid "Specific" -msgstr "指定选项" +msgstr "" #: any.pm:1988 -#, fuzzy, c-format +#, c-format msgid "Downloader" -msgstr "引导程序" +msgstr "" #: authentication.pm:24 #, c-format @@ -2694,8 +2694,8 @@ msgid "" "\n" "Be careful: this operation is dangerous. If you have not already done so, " "you first need to exit the installation, run \"chkdsk c:\" from a Command " -"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk" -"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " +"Prompt under Microsoft Windows® (beware, running graphical program " +"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " "optionally run defrag, then restart the installation. You should also backup " "your data.\n" "\n" @@ -3167,9 +3167,9 @@ msgid "cpu # " msgstr "CPU # " #: harddrake/sound.pm:235 harddrake/sound.pm:320 harddrake/sound.pm:426 -#, fuzzy, c-format +#, c-format msgid "Couldn't install the required packages" -msgstr "无法安装 %s 软件包!" +msgstr "" #: harddrake/sound.pm:236 harddrake/sound.pm:321 harddrake/sound.pm:427 #, c-format @@ -3187,9 +3187,9 @@ msgid "There's no known driver for your sound card (%s)" msgstr "没有已知的驱动程序可以用在您的声卡(%s)上" #: harddrake/sound.pm:517 -#, fuzzy, c-format +#, c-format msgid "You need to reboot for changes to take effect" -msgstr "您需要注销后重新登录才能让更改生效" +msgstr "您需要重新启动才能让更改生效" #: harddrake/sound.pm:522 #, c-format @@ -3206,19 +3206,19 @@ msgid "" msgstr "" #: harddrake/sound.pm:541 -#, fuzzy, c-format +#, c-format msgid "Select the sound server" -msgstr "启动 X 字体服务器。" +msgstr "" #: harddrake/sound.pm:551 -#, fuzzy, c-format +#, c-format msgid "PulseAudio" -msgstr "启用 PulseAudio" +msgstr "" #: harddrake/sound.pm:552 -#, fuzzy, c-format +#, c-format msgid "PulseAudio with Glitch-Free mode" -msgstr "使用无干扰模式" +msgstr "" #: harddrake/sound.pm:553 #, c-format @@ -3241,9 +3241,9 @@ msgid "Troubleshooting" msgstr "疑难解答" #: harddrake/sound.pm:571 -#, fuzzy, c-format +#, c-format msgid "Your card uses the <b>\"%s\"</b> driver\n" -msgstr "您的设备卡使用“%s”驱动" +msgstr "" #: harddrake/sound.pm:581 #, c-format @@ -3284,9 +3284,9 @@ msgid "" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol" -"\" (generic) will launch graphical applications to allow you to view your " -"sound devices and adjust volume levels\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and " +"\"pavucontrol\" (generic) will launch graphical applications to allow you to " +"view your sound devices and adjust volume levels\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n" diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po index 0a1f6304f..a216c48ab 100644 --- a/perl-install/share/po/zh_TW.po +++ b/perl-install/share/po/zh_TW.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2023-04-17 13:26+0100\n" -"PO-Revision-Date: 2019-06-07 00:28+0000\n" -"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:34+0000\n" +"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>, 2013,2015-2019\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_TW/)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -201,9 +201,9 @@ msgid "Bootloader Configuration" msgstr "開機載入程式組態設定" #: any.pm:532 -#, fuzzy, c-format +#, c-format msgid "Install Options" -msgstr "安裝失敗" +msgstr "" #: any.pm:533 #, c-format @@ -211,14 +211,14 @@ msgid "Install or update rEFInd in the EFI system partition" msgstr "在 EFI 系統分割區中安裝或更新 eEFInd" #: any.pm:535 any.pm:794 -#, fuzzy, c-format +#, c-format msgid "Install in /EFI/BOOT (removable device or workaround for some BIOSs)" -msgstr "安裝到 /EFI/BOOT (適用於某些 BIOSs)" +msgstr "安装在 /EFI/BOOT（可移动设备或某些 BIOS 的解决方法）" #: any.pm:537 #, c-format msgid "Configure rEFInd to store its variables in the EFI NVRAM" -msgstr "" +msgstr "配置 rEFInd 以将其变量存储在 EFI NVRAM 中" #: any.pm:539 #, c-format @@ -231,9 +231,9 @@ msgid "rEFInd banner" msgstr "" #: any.pm:545 -#, fuzzy, c-format +#, c-format msgid "Mageia theme" -msgstr "Mageia" +msgstr "" #: any.pm:546 any.pm:1602 #, c-format @@ -241,9 +241,9 @@ msgid "Custom" msgstr "自訂" #: any.pm:564 -#, fuzzy, c-format +#, c-format msgid "No scaling" -msgstr "不分享" +msgstr "" #: any.pm:565 #, c-format @@ -382,6 +382,9 @@ msgid "" "operating systems from the grub2 boot menu, but reducing the time needed for " "installing kernel updates" msgstr "" +"取消选择此选项可停止对其他操作系统的 grub2 扫描，这将阻止它们包含在 grub2 引" +"导菜单中。 安装后也可以取消选择该选项，从 grub2 启动菜单中删除其他操作系统，" +"但减少安装内核更新所需的时间" #: any.pm:1059 #, c-format @@ -767,9 +770,9 @@ msgid "URL of the mirror?" msgstr "映像站的 URL？" #: any.pm:1880 -#, fuzzy, c-format +#, c-format msgid "URL must start with ftp:// or http:// or https://" -msgstr "URL 開頭必須是 ftp:// 或 http://" +msgstr "" #: any.pm:1898 #, c-format @@ -799,22 +802,22 @@ msgstr "取消" #: any.pm:1977 #, c-format msgid "Mirror choice" -msgstr "" +msgstr "鏡像站台選擇" #: any.pm:1982 -#, fuzzy, c-format +#, c-format msgid "Automatic" -msgstr "自動偵測" +msgstr "自動" #: any.pm:1983 -#, fuzzy, c-format +#, c-format msgid "Specific" -msgstr "指定選項" +msgstr "" #: any.pm:1988 -#, fuzzy, c-format +#, c-format msgid "Downloader" -msgstr "開機載入器" +msgstr "" #: authentication.pm:24 #, c-format @@ -2686,8 +2689,8 @@ msgid "" "\n" "Be careful: this operation is dangerous. If you have not already done so, " "you first need to exit the installation, run \"chkdsk c:\" from a Command " -"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk" -"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " +"Prompt under Microsoft Windows® (beware, running graphical program " +"\"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), " "optionally run defrag, then restart the installation. You should also backup " "your data.\n" "\n" @@ -3159,9 +3162,9 @@ msgid "cpu # " msgstr "CPU 編號" #: harddrake/sound.pm:235 harddrake/sound.pm:320 harddrake/sound.pm:426 -#, fuzzy, c-format +#, c-format msgid "Couldn't install the required packages" -msgstr "無法安裝 %s 軟體套件！" +msgstr "" #: harddrake/sound.pm:236 harddrake/sound.pm:321 harddrake/sound.pm:427 #, c-format @@ -3179,9 +3182,9 @@ msgid "There's no known driver for your sound card (%s)" msgstr "您使用的音效卡尚未有已知的驅動程式 (%s)" #: harddrake/sound.pm:517 -#, fuzzy, c-format +#, c-format msgid "You need to reboot for changes to take effect" -msgstr "您必須登出之後重新登入才能讓變動生效" +msgstr "您需要重新開機以便讓異動的設定生效" #: harddrake/sound.pm:522 #, c-format @@ -3198,19 +3201,19 @@ msgid "" msgstr "" #: harddrake/sound.pm:541 -#, fuzzy, c-format +#, c-format msgid "Select the sound server" -msgstr "啟動 X 字型伺服器。" +msgstr "" #: harddrake/sound.pm:551 -#, fuzzy, c-format +#, c-format msgid "PulseAudio" -msgstr "啟用 PulseAudio" +msgstr "" #: harddrake/sound.pm:552 -#, fuzzy, c-format +#, c-format msgid "PulseAudio with Glitch-Free mode" -msgstr "使用無干擾(Glitch-Free)模式" +msgstr "" #: harddrake/sound.pm:553 #, c-format @@ -3233,9 +3236,9 @@ msgid "Troubleshooting" msgstr "解決問題" #: harddrake/sound.pm:571 -#, fuzzy, c-format +#, c-format msgid "Your card uses the <b>\"%s\"</b> driver\n" -msgstr "您的介面卡使用「%s」驅動程式" +msgstr "" #: harddrake/sound.pm:581 #, c-format @@ -3278,9 +3281,9 @@ msgid "" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and \"pavucontrol" -"\" (generic) will launch graphical applications to allow you to view your " -"sound devices and adjust volume levels\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) and " +"\"pavucontrol\" (generic) will launch graphical applications to allow you to " +"view your sound devices and adjust volume levels\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" will check that PulseAudio is running.\n" @@ -3331,8 +3334,8 @@ msgstr "" "\n" "\n" "\n" -"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) 和 \"pavucontrol" -"\" (通用) 會開啟圖形應用程式讓您檢視您的音效裝置並調整音量。\n" +"- \"kmix\" (KDE), \"gnome-control-center sound\" (GNOME) 和 " +"\"pavucontrol\" (通用) 會開啟圖形應用程式讓您檢視您的音效裝置並調整音量。\n" "\n" "\n" "- \"ps aux | grep pulseaudio\" 可以檢查 PulseAudio 是否運作。\n" @@ -6907,9 +6910,3 @@ msgstr "" #, c-format msgid "Installation failed" msgstr "安裝失敗" - -#~ msgid "" -#~ "If grub2 takes too long to install, you can use this option to skip " -#~ "detecting other OSes and make it fast" -#~ msgstr "" -#~ "如果 grub2 花太久時間安裝，您可以用這個選項跳過偵測其他系統來加快速度" diff --git a/perl-install/standalone/po/sv.po b/perl-install/standalone/po/sv.po index fda360f01..5c3b39911 100644 --- a/perl-install/standalone/po/sv.po +++ b/perl-install/standalone/po/sv.po @@ -2925,8 +2925,8 @@ msgid "" "More info in the driver's manual page. Run the command \"man sane-%s\" to " "read it." msgstr "" -"Mer information finns i drivrutinens manualsida. Kör kommandot \"man sane %s" -"\" för att läsa manualen." +"Mer information finns i drivrutinens manualsida. Kör kommandot \"man sane " +"%s\" för att läsa manualen." #: scannerdrake:406 scannerdrake:415 #, c-format diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po index ff4e26d0a..41061544a 100644 --- a/perl-install/standalone/po/zh_CN.po +++ b/perl-install/standalone/po/zh_CN.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2018-11-04 21:27+0000\n" -"PO-Revision-Date: 2021-08-22 18:46+0000\n" -"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>\n" -"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:36+0000\n" +"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>, 2021\n" +"Language-Team: Chinese (China) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff --git a/perl-install/standalone/po/zh_TW.po b/perl-install/standalone/po/zh_TW.po index a9800c053..9c3755a1c 100644 --- a/perl-install/standalone/po/zh_TW.po +++ b/perl-install/standalone/po/zh_TW.po @@ -2,16 +2,16 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # # Translators: -# byStarTW (pan93412) <pan93412@gmail.com>, 2018 +# pan93412 <pan93412@gmail.com>, 2018 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2018 # You-Cheng Hsieh <yochenhsieh@gmail.com>, 2013,2016-2018 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2018-11-04 21:27+0000\n" -"PO-Revision-Date: 2018-12-13 13:37+0000\n" -"Last-Translator: byStarTW (pan93412) <pan93412@gmail.com>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:36+0000\n" +"Last-Translator: pan93412 <pan93412@gmail.com>, 2018\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/MageiaLinux/mageia/" "language/zh_TW/)\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" |