diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | NEWS | 45 | ||||
-rwxr-xr-x | data/icons/MageiaLive-advert.png | bin | 112324 -> 116000 bytes | |||
-rw-r--r-- | data/icons/MageiaLive-advert.xcf | bin | 0 -> 264577 bytes | |||
-rwxr-xr-x | data/icons/MageiaLive-install.png | bin | 62298 -> 68029 bytes | |||
-rw-r--r-- | data/icons/MageiaLive-install.xcf | bin | 0 -> 260202 bytes | |||
-rwxr-xr-x | draklive-install | 70 | ||||
-rw-r--r-- | po/.tx/config | 2 | ||||
-rw-r--r-- | po/ast.po | 39 | ||||
-rw-r--r-- | po/bg.po | 8 | ||||
-rw-r--r-- | po/cs.po | 13 | ||||
-rw-r--r-- | po/de.po | 8 | ||||
-rw-r--r-- | po/eo.po | 19 | ||||
-rw-r--r-- | po/fi.po | 17 | ||||
-rw-r--r-- | po/he.po | 58 | ||||
-rw-r--r-- | po/hi.po | 15 | ||||
-rw-r--r-- | po/nb.po | 8 | ||||
-rw-r--r-- | po/nl.po | 18 | ||||
-rw-r--r-- | po/pt.po | 29 | ||||
-rw-r--r-- | po/pt_BR.po | 15 | ||||
-rw-r--r-- | po/ru.po | 17 | ||||
-rw-r--r-- | po/sl.po | 6 |
22 files changed, 268 insertions, 121 deletions
@@ -1,5 +1,5 @@ NAME = draklive-install -VERSION = 2.25 +VERSION = 2.33 dli_confdir = ${sysconfdir}/$(NAME).d dli_sysconfigdir = $(dli_confdir)/sysconfig @@ -1,3 +1,48 @@ +2.33 + +- Better look of Mageia Live Install image +- translation updates + +2.32 + +- new artwork for Mageia 9 +- translation updates + +2.31 + +- allow user to specify a specific mirror and downloader when applying + updates at the end of installation +- call mygtk3::flush() more frequently whilst copying the filesystem, + to make the main window more responsive to window events +- use run_program::get_stdout to calculate installed size, to + allow us to respond to check-alive pings whilst waiting +- install callback routine to handle window events whilst waiting + for sub-programs to terminate (mga#31105) + +2.30 + +- on systems with low RAM, remove unwanted packages after install (mga#27872) + (this avoids running out of space in the RAM overlay filesystem) +- translation update + +2.29 + +- revert generate report.bug.xz on exit + +2.28 + +- generate report.bug.xz on exit + +2.27 + +- Artwork for Mga8 + +2.26 + +- fix X connection failure under GNOME/Xwayland +- disable timeout when running gurpmi2 to install updates +- translation updates + 2.25 - add option to install updates diff --git a/data/icons/MageiaLive-advert.png b/data/icons/MageiaLive-advert.png Binary files differindex 4fbebc6..dafe996 100755 --- a/data/icons/MageiaLive-advert.png +++ b/data/icons/MageiaLive-advert.png diff --git a/data/icons/MageiaLive-advert.xcf b/data/icons/MageiaLive-advert.xcf Binary files differnew file mode 100644 index 0000000..a6826ca --- /dev/null +++ b/data/icons/MageiaLive-advert.xcf diff --git a/data/icons/MageiaLive-install.png b/data/icons/MageiaLive-install.png Binary files differindex fd3eec9..6642d73 100755 --- a/data/icons/MageiaLive-install.png +++ b/data/icons/MageiaLive-install.png diff --git a/data/icons/MageiaLive-install.xcf b/data/icons/MageiaLive-install.xcf Binary files differnew file mode 100644 index 0000000..0526a35 --- /dev/null +++ b/data/icons/MageiaLive-install.xcf diff --git a/draklive-install b/draklive-install index b3212c3..996d6e3 100755 --- a/draklive-install +++ b/draklive-install @@ -37,6 +37,21 @@ my $logfile = '/tmp/draklive-install.log'; } } +my $child_pid; +END { + run_program::terminate($child_pid) if $child_pid; +} + +sub wait_loop_callback { + my ($pid) = @_; + $child_pid = $pid; + while (Gtk3::events_pending()) { + Gtk3::main_iteration(); + } + $child_pid = undef; +} +run_program::set_wait_loop_callback(\&wait_loop_callback, 50); + ($::rootwidth, $::rootheight) = (Gtk3::Gdk::Screen::width, Gtk3::Gdk::Screen::height); $::real_windowwidth = $::rootwidth > 800 ? 750 : 600; $::real_windowheight = $::rootheight > 600 ? 500 : 400; @@ -91,13 +106,20 @@ sub install_live() { my $persistent = -e '/run/mgalive/persistent'; + # Don't remove packages from a persistent live system, as they will no + # longer be available for future installs. Don't remove packages from + # a non-persistent live system with insufficient RAM to accomodate the + # changes that will be stored in the upper layer of the overlay file + # system (mga#27872). + my $remove_after_install = $persistent || ram_size_in_MB() < 750; + display_start_message(); init_hds($in, $all_hds, $fstab); ask_partitions_loop($in, $all_hds, $fstab, $copy_source); - remove_unused_packages($in, $copy_source) if !$persistent; + remove_unused_packages($in, $copy_source) if !$remove_after_install; prepare_root($in); copy_root($in, $copy_source); - remove_unused_packages($in, $::prefix) if $persistent; + remove_unused_packages($in, $::prefix) if $remove_after_install; complete_install($in, $all_hds); setup_bootloader($in, $all_hds, $fstab); install_updates($in); @@ -106,6 +128,11 @@ sub install_live() { $in->exit(0); } +sub ram_size_in_MB() { + my @mem_total = map { /(\d+)/ } grep { /^MemTotal:/ } cat_("/proc/meminfo"); + $mem_total[0] / 1024; +} + sub umount_all { my ($fstab, $o_except_swap) = @_; #- make sure nothing is mounted in the new root @@ -262,6 +289,8 @@ sub prepare_root { fs::any::prepare_minimal_root(); #- /media isn't included in the minimal root, and we don't copy it to avoid copying stale mount points mkdir_p("$::prefix/media"); + #- under GNOME/Xwayland, running gurpmi inside the chroot requires connection to the X11 socket in /tmp + run_program::run('mount', '--bind', '/tmp', "$::prefix/tmp"); } sub build_copy_command { @@ -278,7 +307,7 @@ sub get_total_size { state %total; return $total{$source} if $total{$source}; my $_wait = $in->wait_message('', N("Computing total size")); - $total{$source} = first(split(/\s+/, `du -sbx /run/mgalive/ovlsize 2>/dev/null`)); + $total{$source} = first(split(/\s+/, run_program::get_stdout('du', '2>', '/dev/null', '-sbx', '/run/mgalive/ovlsize'))); } sub sync_logs() { @@ -301,6 +330,8 @@ sub copy_root { if ($current <= $total && $current/$total > $previous/$total + 0.001) { $update_progress->('', $current, $total); $previous = $current; + } else { + mygtk3::flush(); } } } @@ -444,12 +475,41 @@ Do you want to setup the update media?")), return 0; }; + require urpm; + require urpm::media; + + my $urpm = urpm->new(); + $urpm->{log} = \&log::l; + urpm::set_files($urpm, $::prefix); + urpm::media::read_config($urpm); + + $in->{packages} = $urpm; + $in->{product_id} = mageia_release_info(); + + require mirror; + require urpm::download; + + my $downloader = sub { + my ($url) = @_; + urpm::download::get_content($urpm, $url); + }; + mirror::register_downloader($downloader); + + my $urpmi_options = { mirror_url => '$MIRRORLIST' }; + try_again: enable_network_connection($in); + any::ask_mirror_and_downloader($in, $urpmi_options); + any::urpmi_set_downloader($in, $urpm, $urpmi_options->{downloader}) || die("Failed to set downloader\n"); + + if ($urpmi_options->{mirror_url} ne '$MIRRORLIST') { + $urpmi_options->{mirror_url} = any::ask_mirror($in, 'distrib', $urpmi_options->{mirror_url}); + } + clean_rpmdb_shared_regions(); - if (any::urpmi_add_all_media($in)) { + if (any::urpmi_add_all_media($in, undef, $urpmi_options->{mirror_url})) { log::l("successfully added update media"); return 1; } @@ -486,7 +546,7 @@ Do you want to install the updates?")), }; my $log_file = '/root/drakx/updates.log'; - run_program::rooted($::prefix, 'gurpmi2', '>>', $log_file, '2>>', $log_file, '--auto-select'); + run_program::raw({ root => $::prefix, timeout => 'never' }, 'gurpmi2', '>>', $log_file, '2>>', $log_file, '--auto-select'); clean_rpmdb_shared_regions(); } diff --git a/po/.tx/config b/po/.tx/config index d32830c..2fbb318 100644 --- a/po/.tx/config +++ b/po/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[mageia.draklive-install] +[o:MageiaLinux:p:mageia:r:draklive-install] file_filter = <lang>.po source_file = draklive-install.pot source_lang = en @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"PO-Revision-Date: 2020-11-06 21:33+0000\n" +"Last-Translator: enolp <enolp@softastur.org>\n" "Language-Team: Asturian (http://www.transifex.com/MageiaLinux/mageia/" "language/ast/)\n" "Language: ast\n" @@ -57,7 +57,7 @@ msgstr "" #: ../draklive-install:280 #, c-format msgid "Computing total size" -msgstr "" +msgstr "Calculando'l tamañu total" #: ../draklive-install:293 ../draklive-install:581 #, c-format @@ -72,22 +72,22 @@ msgstr "" #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "" +msgstr "Tresnando'l programa d'aniciu inicial…" #: ../draklive-install:432 ../draklive-install:471 #, c-format msgid "Updates" -msgstr "" +msgstr "Anovamientos" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "Agora tienes la oportunidá de configurar medios en llinia." #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "Esto permite instalar anovamientos de seguranza." #: ../draklive-install:436 #, c-format @@ -97,21 +97,25 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"Pa configurar esos medios vas precisar una conexón a internet\n" +"que funcione.\n" +"\n" +"¿Quies configurar el mediu d'anovamientos?" #: ../draklive-install:458 #, c-format msgid "Warning" -msgstr "Avisu" +msgstr "Alvertencia" #: ../draklive-install:458 #, c-format msgid "Failure when adding medium" -msgstr "" +msgstr "Hebo un fallu al amestar el mediu" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "" +msgstr "¿Retentar?" #: ../draklive-install:473 #, c-format @@ -125,6 +129,14 @@ msgid "" "\n" "Do you want to install the updates?" msgstr "" +"Agora tienes la oportunidá de baxar los paquetes anovaos. Estos paquetes\n" +"anováronse dempués de llanzar la distribución, puen contener\n" +"igües de fallos y parches de seguranza.\n" +"\n" +"Pa baxar estos paquetes vas precisar tener una conexón a internet que\n" +"funcione.\n" +"\n" +"¿Quies instalar los anovamientos?" #: ../draklive-install:523 #, c-format @@ -156,7 +168,7 @@ msgstr "¿Colar ensin escribir la tabla de particiones?" #: ../draklive-install:552 #, c-format msgid "Do you want to save /etc/fstab modifications?" -msgstr "" +msgstr "¿Quies guardar les modificaciones de /etc/fstab?" #: ../draklive-install:559 #, c-format @@ -172,10 +184,13 @@ msgid "" "Otherwise no entry for mount point %s will be written in fstab.\n" "Quit anyway?" msgstr "" +"Deberíes formatiar la partición %s.\n" +"D'otramiente, nun va escribise nengún puntu de montaxe %s en fstab.\n" +"¿Colar de toes toes?" #: ../mageia-draklive-install.desktop.in.h:1 ../draklive-install.desktop.in.h:1 msgid "Install on Hard Disk" -msgstr "" +msgstr "Instalar nun discu duru" #: ../mageia-draklive-install.desktop.in.h:2 msgid "Install your Mageia live system to disk" @@ -6,12 +6,12 @@ # Boyan Ivanov <boyan17@bulgaria.com>, 2003 # Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000 # Etem Bavarian <mr.cyberpower@gmail.com>, 2015 -# Georgi Georgiev <georgiev_1994@abv.bg>, 2016,2018 +# Georgi Georgiev <georgiev_1994@abv.bg>, 2016,2018,2020 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" +"PO-Revision-Date: 2020-07-20 22:21+0000\n" "Last-Translator: Georgi Georgiev <georgiev_1994@abv.bg>\n" "Language-Team: Bulgarian (http://www.transifex.com/MageiaLinux/mageia/" "language/bg/)\n" @@ -103,12 +103,12 @@ msgstr "Внимание" #: ../draklive-install:458 #, c-format msgid "Failure when adding medium" -msgstr "Грешка при добавяне на образ" +msgstr "Грешка при добавяне на източник" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "" +msgstr "Повторен опит?" #: ../draklive-install:473 #, c-format @@ -3,13 +3,13 @@ # # Translators: # fri, 2015 -# Luděk Janča <joelp@email.cz>, 2016,2020 +# Luděk Janča <joelp@email.cz>, 2016,2020-2021 # fri, 2015,2017 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 08:42+0000\n" +"PO-Revision-Date: 2021-01-04 15:23+0000\n" "Last-Translator: Luděk Janča <joelp@email.cz>\n" "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/" "cs/)\n" @@ -23,7 +23,7 @@ msgstr "" #: ../draklive-install:138 #, c-format msgid "Mageia Live" -msgstr "Mageia Živě" +msgstr "Živá Mageia" #: ../draklive-install:142 #, c-format @@ -63,7 +63,7 @@ msgstr "Probíhá kopírování" #: ../draklive-install:310 #, c-format msgid "Unable to copy files to new root" -msgstr "Nelze zkopírovat soubory do nového kořenu" +msgstr "Nelze zkopírovat soubory do nového kořene" #: ../draklive-install:389 #, c-format @@ -78,7 +78,7 @@ msgstr "Aktualizace" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "Nyní máte příležitost nastavit internetová média." +msgstr "Nyní máte příležitost nastavit online média." #: ../draklive-install:435 #, c-format @@ -145,7 +145,8 @@ msgid "" "Please halt your computer, remove your live system, and restart your " "computer." msgstr "" -"Skončete, prosím, práci s počítačem, odstraňte médium a počítač restartujte." +"Skončete, prosím, práci s počítačem, odstraňte instalační médium a počítač " +"restartujte." #: ../draklive-install:541 #, c-format @@ -4,13 +4,13 @@ # Translators: # Christian Ruesch <cr@rt.fm>, 2013 # Klaus Christian Harke <k.c.harke@gmx.net>, 2020 -# psyca, 2018,2020 +# psyca, 2018,2020,2022 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 19:50+0000\n" -"Last-Translator: psyca\n" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: psyca, 2018,2020,2022\n" "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/" "de/)\n" "Language: de\n" @@ -71,7 +71,7 @@ msgstr "" #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "Initiale Systemstartprogramme vorbereiten..." +msgstr "Initiale Systemstartprogramme vorbereiten ..." #: ../draklive-install:432 ../draklive-install:471 #, c-format @@ -3,15 +3,16 @@ # # Translators: # D. Dale Gulledge <dsplat@rochester.rr.com>, 2000 +# Gilberto F. da Silva, 2022-2023 # Gilberto F da Silva <gfs1989@gmx.net>, 2018 # Vilhelmo Lutermano <vlutermano@free.fr>, 2007 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" -"Language-Team: Esperanto (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: Gilberto F. da Silva, 2022-2023\n" +"Language-Team: Esperanto (http://app.transifex.com/MageiaLinux/mageia/" "language/eo/)\n" "Language: eo\n" "MIME-Version: 1.0\n" @@ -67,7 +68,7 @@ msgstr "Ne eblis kopii dosierojn al nova radiko" #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "" +msgstr "Preparante komencan komencan programon ..." #: ../draklive-install:432 ../draklive-install:471 #, c-format @@ -77,12 +78,12 @@ msgstr "Ĝisdatigoj" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "Vi nun havas la ŝancon agordi interretan registraĵojn." #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "Ĉi tio permesas instali sekurecajn ĝisdatigojn." #: ../draklive-install:436 #, c-format @@ -92,6 +93,10 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"Por agordi tiujn registraĵoj , vi devos havi funkciantan Interreton\n" +"konekto.\n" +"\n" +"Ĉu vi volas agordi la ĝisdatigan registraĵojn?" #: ../draklive-install:458 #, c-format @@ -106,7 +111,7 @@ msgstr "Paneo ĉe aldono de portilo" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "" +msgstr "Ĉu reprovi?" #: ../draklive-install:473 #, c-format @@ -6,6 +6,7 @@ # Esa Linna <denzo@mbnet.fi>, 2004 # Jani Välimaa <wally@mageia.org>, 2011 # wally <wally@mandriva.org>, 2009 +# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023 # Matias Griese <mahagr@utu.fi>, 2001 # Taisto Kuikka <69319@batman.jypoly.fi>, 2003-2004 # Thomas Backlund <tmb@mandrake.org>, 2002-2005 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" -"Language-Team: Finnish (http://www.transifex.com/MageiaLinux/mageia/language/" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023\n" +"Language-Team: Finnish (http://app.transifex.com/MageiaLinux/mageia/language/" "fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -72,7 +73,7 @@ msgstr "Tiedostoja ei voida kopioida uuteen juureen" #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "" +msgstr "Valmistellaan käynnistysohjelmaa..." #: ../draklive-install:432 ../draklive-install:471 #, c-format @@ -82,12 +83,12 @@ msgstr "Päivitykset" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "Sinulla on nyt mahdollisuus asentaa online-medialla." #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "Tämä sallii tietoturvapäivitysten asentamisen." #: ../draklive-install:436 #, c-format @@ -97,6 +98,10 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"Jotta voit asentaa median, sinulla on oltava toimiva yhteys\n" +"Internettiin.\n" +"\n" +"Haluatko asentaa päivitysmedian?" #: ../draklive-install:458 #, c-format @@ -8,14 +8,16 @@ # el-cuco <cuco3001@yahoo.com>, 2003 # Itay Flikier <itayff@gmail.com>, 2005 # nadav mavor <nadav@mavor.com>, 2003 +# Omer I.S. <omeritzicschwartz@gmail.com>, 2020-2021 +# Omer I.S. <omeritzicschwartz@gmail.com>, 2020-2021 # Ram Matityahu <linuxfun@email.com>, 2003 -# Yaron Shahrabani <sh.yaron@gmail.com>, 2020 +# Yaron Shahrabani <sh.yaron@gmail.com>, 2020-2021 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" +"PO-Revision-Date: 2021-07-19 10:49+0000\n" +"Last-Translator: Omer I.S. <omeritzicschwartz@gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/MageiaLinux/mageia/language/" "he/)\n" "Language: he\n" @@ -28,12 +30,12 @@ msgstr "" #: ../draklive-install:138 #, c-format msgid "Mageia Live" -msgstr "Mageia חי" +msgstr "Mageia במצב המחשה" #: ../draklive-install:142 #, c-format msgid "This wizard will help you to install the live distribution." -msgstr "אשף זה יעזור לך להתקין את המערכת על הכונן הקשיח." +msgstr "האשף הזה יעזור לך להתקין את ההפצה באמצעות מצב ההמחשה." #: ../draklive-install:174 ../draklive-install:261 ../draklive-install:332 #, c-format @@ -48,32 +50,32 @@ msgstr "שגיאה" #: ../draklive-install:214 #, c-format msgid "An error occurred" -msgstr "חלה שגיאה" +msgstr "אירעה שגיאה" #: ../draklive-install:238 #, c-format msgid "Not enough space available (%s available while %s are needed)" -msgstr "אין די מקום זמין (%s זמינים בעוד ש- %s דרושים)" +msgstr "אין מספיק שטח פנוי (%s זמינים כאשר %s נחוצים)" #: ../draklive-install:280 #, c-format msgid "Computing total size" -msgstr "מחשב גודל כולל" +msgstr "מתבצע חישוב הגודל הכולל" #: ../draklive-install:293 ../draklive-install:581 #, c-format msgid "Copying in progress" -msgstr "מעתיק את התקליטור לכונן הקשיח" +msgstr "העתקה מתבצעת" #: ../draklive-install:310 #, c-format msgid "Unable to copy files to new root" -msgstr "אין אפשרות להעתיק קבצים אל מחיצת השורש החדשה." +msgstr "אין אפשרות להעתיק את הקבצים אל מחיצת השורש (root) החדשה" #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "" +msgstr "תכנית ההפעלה הראשונית בהכנות..." #: ../draklive-install:432 ../draklive-install:471 #, c-format @@ -83,12 +85,12 @@ msgstr "עדכונים" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "כעת אפשר להגדיר את המאגרים המקוונים." #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "מאפשר לך להתקין עדכוני אבטחה." #: ../draklive-install:436 #, c-format @@ -98,6 +100,9 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"להגדרת המאגרים הללו, יש צורך בחיבור תקין לאינטרנט.\n" +"\n" +"האם להגדיר את מאגרי העדכון?" #: ../draklive-install:458 #, c-format @@ -107,12 +112,12 @@ msgstr "אזהרה" #: ../draklive-install:458 #, c-format msgid "Failure when adding medium" -msgstr "חלה שגיאה בעת הוספת מקור" +msgstr "הוספת המאגרים נכשלה." #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "" +msgstr "לנסות שוב?" #: ../draklive-install:473 #, c-format @@ -130,25 +135,24 @@ msgstr "" "ההפצה,\n" "ועשויות להכיל עדכוני אבטחה ו/או עדכוני תוכנה חשובים.\n" "\n" -"להורדת חבילות אלה נדרש חיבור אינטרנט עובד. האם ברצונך לעדכן את המערכת בשלב " -"זה ?" +"להורדת חבילות אלה נדרש חיבור אינטרנט עובד. האם לעדכן את המערכת בשלב זה?" #: ../draklive-install:523 #, c-format msgid "Congratulations" -msgstr "ברכותינו!" +msgstr "ברכות" #: ../draklive-install:523 #, c-format msgid "" "Please halt your computer, remove your live system, and restart your " "computer." -msgstr "עליך לכבות את המחשב, לשלוף את התקליטור, ולאתחל את המחשב." +msgstr "נא לכבות את מחשבך, לשלוף את מערכת ההמחשה שלך, ולאתחל את מחשבך." #: ../draklive-install:541 #, c-format msgid "Continue anyway?" -msgstr "האם להמשיך בכל זאת?" +msgstr "להמשיך בכל זאת?" #: ../draklive-install:546 #, c-format @@ -158,17 +162,17 @@ msgstr "יציאה ללא שמירה" #: ../draklive-install:546 #, c-format msgid "Quit without writing the partition table?" -msgstr "האם לצאת בלי לשמור את טבלת המחיצות?" +msgstr "לצאת בלי לשמור את טבלת המחיצות?" #: ../draklive-install:552 #, c-format msgid "Do you want to save /etc/fstab modifications?" -msgstr "לשמור את השינויים ל־/etc/fstab?" +msgstr "האם לשמור את השינויים שנעשו ב־/etc/fstab?" #: ../draklive-install:559 #, c-format msgid "You need to reboot for the partition table modifications to take place" -msgstr "יש צורך בהפעלת המחשב מחדש בכדי שהשינויים בטבלת המחיצות יכנסו לתוקף" +msgstr "יש להפעיל את המחשב מחדש כדי שהשינויים בטבלת המחיצות יכנסו לתוקף" #: ../draklive-install:564 #, c-format @@ -177,14 +181,14 @@ msgid "" "Otherwise no entry for mount point %s will be written in fstab.\n" "Quit anyway?" msgstr "" -"עליך לפרמט את המחיצה %s.\n" -"אחרת לא תיכתב כניסה לעיגון %s בקובץ fstab.\n" +"יש לפרמט את המחיצה %s.\n" +"אחרת לא ייכתב ערך לעיגון %s בקובץ fstab.\n" "האם לצאת בכל זאת?" #: ../mageia-draklive-install.desktop.in.h:1 ../draklive-install.desktop.in.h:1 msgid "Install on Hard Disk" -msgstr "התקנה לכונן הקשיח" +msgstr "התקנה על הכונן הקשיח" #: ../mageia-draklive-install.desktop.in.h:2 msgid "Install your Mageia live system to disk" -msgstr "להתקין את מערכת Mageia החיה שלך לכונן" +msgstr "התקנת מערכת Mageia על הכונן מתוך מצב ההמחשה" @@ -2,13 +2,13 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # # Translators: -# Panwar108 <caspian7pena@gmail.com>, 2018-2019 +# Panwar108 <caspian7pena@gmail.com>, 2018-2020 # धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>, 2003-2004 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" +"PO-Revision-Date: 2020-12-05 12:01+0000\n" "Last-Translator: Panwar108 <caspian7pena@gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/" "hi/)\n" @@ -66,7 +66,7 @@ msgstr "नए रुट उपयोक्ता पर फ़ाइलों #: ../draklive-install:389 #, c-format msgid "Preparing initial startup program..." -msgstr "" +msgstr "आरंभिक प्रोग्राम हेतु तैयारी जारी..." #: ../draklive-install:432 ../draklive-install:471 #, c-format @@ -76,12 +76,12 @@ msgstr "अपडेट" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "" +msgstr "अब आप ऑनलाइन मीडिया सेटअप कर सकते हैं।" #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "" +msgstr "इस द्वारा सुरक्षा अपडेट इंस्टॉल करना संभव है।" #: ../draklive-install:436 #, c-format @@ -91,6 +91,9 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" +"इस मीडिया सेटअप हेतु सक्रिय इंटरनेट कनेक्शन आवश्यक है।\n" +"\n" +"क्या आप अपडेट मीडिया सेटअप करना चाहते हैं?" #: ../draklive-install:458 #, c-format @@ -105,7 +108,7 @@ msgstr "मीडिया जोड़ते समय विफलता" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "" +msgstr "पुनः प्रयास करें?" #: ../draklive-install:473 #, c-format @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-29 16:39+0000\n" +"PO-Revision-Date: 2020-09-06 17:10+0000\n" "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/" "language/nb/)\n" @@ -46,7 +46,7 @@ msgstr "Det oppstod en feil" #: ../draklive-install:238 #, c-format msgid "Not enough space available (%s available while %s are needed)" -msgstr "Ikke nok tilgjengelig diskplass (%s ledig, men %s trengs)" +msgstr "Det er ikke nok tilgjengelig diskplass (%s er ledig, men %s trengs)" #: ../draklive-install:280 #, c-format @@ -91,10 +91,10 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" -"For å sette opp disse media, må du a en aktiv Internet \n" +"For å sette opp disse media, må du ha en aktiv Internet \n" "kobling\n" "\n" -".Ønsker du å sette opp media nå?" +"Ønsker du å sette opp media nå?" #: ../draklive-install:458 #, c-format @@ -3,6 +3,8 @@ # # Translators: # Jeroen ten Berge <j.ten.berge@twinbit.nl>, 2002 +# Marcel Pol <marcel@timelord.nl>, 2021 +# Marja van Waes, 2021 # Niels Gras <niels.gras@wanadoo.nl>, 2000 # Peter Bosch <peter.bosch@hccnet.nl>, 2002 # remmy <remco@webconquest.com>, 2011 @@ -11,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" +"PO-Revision-Date: 2021-06-19 20:22+0000\n" +"Last-Translator: Marja van Waes\n" "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/" "nl/)\n" "Language: nl\n" @@ -79,12 +81,12 @@ msgstr "Herzieningen" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "U kunt nu online media instellen." +msgstr "U kunt nu online pakkettendepots instellen." #: ../draklive-install:435 #, c-format msgid "This allows to install security updates." -msgstr "Dat maakt beveiligingsupdates installeren mogelijk." +msgstr "Dat maakt beveiligingsherzieningen installeren mogelijk." #: ../draklive-install:436 #, c-format @@ -94,10 +96,10 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" -"Om deze media in te stellen, dient uw internetverbinding \n" +"Om deze depots in te stellen, dient uw internetverbinding \n" "te werken. \n" "\n" -"Wilt u de updatemedia instellen?" +"Wilt u het pakkettendepot voor herzieningen instellen?" #: ../draklive-install:458 #, c-format @@ -107,7 +109,7 @@ msgstr "Waarschuwing" #: ../draklive-install:458 #, c-format msgid "Failure when adding medium" -msgstr "Medium toevoegen mislukt" +msgstr "Depot toevoegen mislukt" #: ../draklive-install:458 #, c-format @@ -191,4 +193,4 @@ msgstr "Installeer op de harde schijf" #: ../mageia-draklive-install.desktop.in.h:2 msgid "Install your Mageia live system to disk" -msgstr "Het Mageia live systeem op de harde schijf installeren" +msgstr "Uw Mageia-live-systeem op de harde schijf installeren" @@ -9,21 +9,23 @@ # zecas <jjorge@free.fr>, 2005 # José JORGE <jose.jorge@oreka.com>, 2002-2003 # fc2d9c36d73e741383fbbf46a4aac49f_013445b, 2014 +# Manuela Silva <mmsrs@sky.com>, 2021,2023 # Sérgio Marques <smarquespt@gmail.com>, 2012 # Zé <mmodem00@gmail.com>, 2005-2008,2010-2011 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Filip Komar <filip.komar@guest.arnes.si>\n" -"Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: Manuela Silva <mmsrs@sky.com>, 2021,2023\n" +"Language-Team: Portuguese (http://app.transifex.com/MageiaLinux/mageia/" "language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % " +"1000000 == 0 ? 1 : 2;\n" #: ../draklive-install:138 #, c-format @@ -68,7 +70,7 @@ msgstr "A copiar" #: ../draklive-install:310 #, c-format msgid "Unable to copy files to new root" -msgstr "Incapaz de copiar ficheiros para a nova raiz" +msgstr "Não é possível copiar os ficheiros para a nova raiz" #: ../draklive-install:389 #, c-format @@ -83,7 +85,7 @@ msgstr "Atualizações" #: ../draklive-install:434 #, c-format msgid "You now have the opportunity to setup online media." -msgstr "Agora tem oportunidade de configurar uma fonte online." +msgstr "Agora tem a oportunidade para configurar uma fonte ''on-line''." #: ../draklive-install:435 #, c-format @@ -98,7 +100,7 @@ msgid "" "\n" "Do you want to setup the update media?" msgstr "" -"Para configurar estas fontes, terá de ter uma ligação \n" +"Para configurar essas fontes, terá de ter uma ligação \n" "à Internet a funcionar.\n" "\n" "Deseja configurar uma fonte de atualização?" @@ -130,9 +132,9 @@ msgid "" "\n" "Do you want to install the updates?" msgstr "" -"Tem agora a possibilidade de transferir os pacotes de atualização.\n" -"Estes pacotes foram atualizados após o lançamento da distribuição.\n" -"Podem ter correções de segurança ou de erros.\n" +"Agora, tem a possibilidade de transferir os pacotes de atualização.\n" +"Estes pacotes foram atualizados depois do lançamento da distribuição.\n" +"Estes podem ter correções de segurança ou de erros.\n" "\n" "Para transferir estes pacotes, precisará de uma ligação à Internet.\n" "\n" @@ -149,7 +151,8 @@ msgid "" "Please halt your computer, remove your live system, and restart your " "computer." msgstr "" -"Por favor pare o computador, remova o sistema 'live' e reinicie o computador." +"Por favor, pare o computador, remova o sistema \"live\" e reinicie o " +"computador." #: ../draklive-install:541 #, c-format @@ -169,7 +172,7 @@ msgstr "Sair sem gravar a tabela de partições?" #: ../draklive-install:552 #, c-format msgid "Do you want to save /etc/fstab modifications?" -msgstr "Deseja gravar as modificações em /etc/fstab?" +msgstr "Deseja guardar as modificações em /etc/fstab?" #: ../draklive-install:559 #, c-format @@ -188,7 +191,7 @@ msgstr "" "Deve formatar a partição %s.\n" "Caso contrário não será gravada a entrada para o ponto\n" "de montagem %s em fstab.\n" -"Sair mesmo assim?" +"Mesmo assim, sair?" #: ../mageia-draklive-install.desktop.in.h:1 ../draklive-install.desktop.in.h:1 msgid "Install on Hard Disk" diff --git a/po/pt_BR.po b/po/pt_BR.po index c01faae..5822699 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,9 +9,10 @@ # Carlinhos Cecconi <carlinux@terra.com.br>, 2003-2004 # Cristiano Otto Von Trompczynski <cris@mandriva.com>, 2005 # Deivi Lopes Kuhn <deivikuhn@yahoo.com.br>, 2003-2004 -# Marcio Andre Padula <padula1000@gmail.com>, 2013 -# Marcio Andre Padula <padula1000@gmail.com>, 2016 -# Marcio Andre Padula <padula1000@gmail.com>, 2013 +# 3f37d448649cd548fa5a733e33387c2a_dee4ccf, 2013 +# 3f37d448649cd548fa5a733e33387c2a_dee4ccf, 2016 +# Michael Martins <michaelfm21@gmail.com>, 2020 +# 3f37d448649cd548fa5a733e33387c2a_dee4ccf, 2013 # Ricardo de Castilho <cast_brasil@ig.com.br>, 2003 # Sergio Rafael Lemke <sergio@mandriva.com.br>, 2009-2010 # Tiago da Cruz Bezerra <tiagocruz18@uol.com.br>,2002 2003, 2004 @@ -19,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n" +"PO-Revision-Date: 2020-10-03 16:40+0000\n" +"Last-Translator: Michael Martins <michaelfm21@gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/" "mageia/language/pt_BR/)\n" "Language: pt_BR\n" @@ -114,12 +115,12 @@ msgstr "Aviso" #: ../draklive-install:458 #, c-format msgid "Failure when adding medium" -msgstr "Falha Enquanto Adicionava Mídia" +msgstr "Falhou ao adicionar mídia" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "Tentar Novamente ?" +msgstr "Tentar novamente ?" #: ../draklive-install:473 #, c-format @@ -2,16 +2,19 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # # Translators: +# AlexL <loginov.alex.valer@gmail.com>, 2023 # Alice Lafox <alice@lafox.com.ua>, 2003 # Alice Lafox <alice@lafox.net>, 2004-2005 # Pavel Maryanov <acid_jack@ukr.net>, 2002-2003,2005-2006,2008 +# Victor, 2023 +# Victor, 2022 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n" -"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: AlexL <loginov.alex.valer@gmail.com>, 2023\n" +"Language-Team: Russian (http://app.transifex.com/MageiaLinux/mageia/language/" "ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -29,12 +32,12 @@ msgstr "Mageia Live" #: ../draklive-install:142 #, c-format msgid "This wizard will help you to install the live distribution." -msgstr "Этот мастер поможет вам установить live-дистрибутив." +msgstr "Этот мастер поможет вам установить Live-версию дистрибутива." #: ../draklive-install:174 ../draklive-install:261 ../draklive-install:332 #, c-format msgid "Please wait" -msgstr "Подождите, пожалуйста" +msgstr "Пожалуйста, подождите" #: ../draklive-install:202 ../draklive-install:214 ../draklive-install:310 #, c-format @@ -111,7 +114,7 @@ msgstr "Не удалось добавить источник" #: ../draklive-install:458 #, c-format msgid "Retry?" -msgstr "Повторить попытку?" +msgstr "Повторить?" #: ../draklive-install:473 #, c-format @@ -190,4 +193,4 @@ msgstr "Установка на жёсткий диск" #: ../mageia-draklive-install.desktop.in.h:2 msgid "Install your Mageia live system to disk" -msgstr "Установить Mageia LiveCD на жёсткий диск" +msgstr "Установить Live-версию системы Mageia на диск" @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Mageia\n" "POT-Creation-Date: 2020-06-07 22:41+0100\n" -"PO-Revision-Date: 2020-06-08 05:49+0000\n" -"Last-Translator: Filip Komar <filip.komar@guest.arnes.si>\n" -"Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/" +"PO-Revision-Date: 2013-04-04 13:09+0000\n" +"Last-Translator: Filip Komar <filip.komar@guest.arnes.si>, 2011-2012\n" +"Language-Team: Slovenian (http://app.transifex.com/MageiaLinux/mageia/" "language/sl/)\n" "Language: sl\n" "MIME-Version: 1.0\n" |