stable update proposal: debian-edu-install 1.723
Ref <URL: http://wiki.debian.org/DebianEdu/ArchivePolicy > here is a
update proposal for the stable release of Debian Edu.
This fixes two fatal installation problems with PXE and ISO installs
(APT signature problem and too small minimal partitioning), update the
translations and trim the uploader list to better reflect the current
realities.
I've tested the version in wheezy-test, and the installation work with
this change in place. This version is also uploaded to unstable.
diff -Nru debian-edu-install-1.721/debian/changelog debian-edu-install-1.723/debian/changelog
--- debian-edu-install-1.721/debian/changelog 2013-10-05 21:49:47.000000000 +0200
+++ debian-edu-install-1.723/debian/changelog 2014-03-07 08:45:02.000000000 +0100
@@ -1,3 +1,38 @@
+debian-edu-install (1.723) unstable; urgency=low
+
+ [ Petter Reinholdtsen ]
+ * Drop Patrick Winnertz as uploader. Thank you for your good work!
+ * Drop Vagrant Cascadian as uploader, on his request.
+ * Make sure to call 'apt-get update' after installing debian-edu-
+ archive-keyring and before trying to install packages from our APT
+ repository, to make apt aware of the signatures in our repository.
+ Fixes fatal installation error in PXE and ISO installs.
+
+ -- Petter Reinholdtsen <pere@debian.org> Fri, 07 Mar 2014 08:44:43 +0100
+
+debian-edu-install (1.722) unstable; urgency=low
+
+ * Updated traditional chineze (zh_TW) translation from Franklin Weng
+ (Closes: #740152).
+ * Updated Norwegian Nynorsk (nn) translation from Kjetil Torgrim Homme.
+ * Remove misleading comment in cs.po, it.po, lv.po, nn.po, pl.po,
+ pt.po and pt_BR.po claiming the files are generated.
+
+ -- Petter Reinholdtsen <pere@debian.org> Thu, 27 Feb 2014 17:18:59 +0100
+
+debian-edu-install (1.722~svn82645) unstable; urgency=low
+
+ [ Petter Reinholdtsen ]
+ * Make sure Debian Edu version 5.0.6+edu1 is recognized as an old
+ version and upgraded in /etc/debian-edu/config. Found on
+ gnashbuild1.skolelinux.no upgraded to Debian Edu Wheezy. Similar
+ for '6.0.7+edu+r1' found on most skolelinux.no-machines.
+ * Increase minimum partition size of Minimal installs for / from 128
+ to 320 MiB, for /usr from 512 to 3456 and for /var from 512 to
+ 1280 to match the disk space needed by the current setup.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sun, 15 Dec 2013 14:41:09 +0100
+
debian-edu-install (1.721) unstable; urgency=low
[ Petter Reinholdtsen ]
@@ -11,6 +46,13 @@
-- Holger Levsen <holger@debian.org> Sat, 05 Oct 2013 21:49:43 +0200
+debian-edu-install (1.720+deb7u1) wheezy; urgency=low
+
+ * No change upload targeted at wheezy-proposed-update for the upcoming 7.2
+ release.
+
+ -- Holger Levsen <holger@debian.org> Sat, 05 Oct 2013 21:54:51 +0200
+
debian-edu-install (1.720) unstable; urgency=low
* Change version number from 7.1+edu0~b2 to 7.1+edu0 in preparation of the
diff -Nru debian-edu-install-1.721/debian/control debian-edu-install-1.723/debian/control
--- debian-edu-install-1.721/debian/control 2013-07-13 10:58:32.000000000 +0200
+++ debian-edu-install-1.723/debian/control 2014-03-02 23:09:53.000000000 +0100
@@ -5,8 +5,6 @@
Uploaders: Petter Reinholdtsen <pere@debian.org>,
Steffen Joeris <white@debian.org>,
Holger Levsen <holger@debian.org>,
- Patrick Winnertz <winnie@debian.org>,
- Vagrant Cascadian <vagrant@debian.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>,
Andreas B. Mundt <andi.mundt@web.de>,
Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
diff -Nru debian-edu-install-1.721/debian/debian-edu-install.postinst debian-edu-install-1.723/debian/debian-edu-install.postinst
--- debian-edu-install-1.721/debian/debian-edu-install.postinst 2013-09-17 22:30:12.000000000 +0200
+++ debian-edu-install-1.723/debian/debian-edu-install.postinst 2013-10-22 11:39:22.000000000 +0200
@@ -134,10 +134,10 @@
for i in $oldversions '3.0r0 terra' '3.0r1 terra' '4.0r0 luna alpha1' \
'5.0r0+edu0 alpha' '5.0.0+edu0 alpha' '5.0.1+edu0 alpha' \
'5.0.2+edu0 alpha' '5.0.3+edu0 alpha' '5.0.3+edu0 rc1' \
- '5.0.4+edu0 rc2' '5.0.4+edu0' '6.0.0+edu0 alpha' \
+ '5.0.4+edu0 rc2' '5.0.4+edu0' '5.0.6+edu1' '6.0.0+edu0 alpha' \
'6.0.3+edu0 beta1' '6.0.3+edu0 beta2' '6.0.3+edu0 beta3' \
'6.0.4+edu0 beta3' '6.0.4+edu0 rc1' '6.0.4+edu0 rc2' \
- '6.0.4+edu0 rc3' '6.0.4+edu+r0' \
+ '6.0.4+edu0 rc3' '6.0.4+edu+r0' '6.0.7+edu+r1' \
'7.0.0+edu+alpha0' '7.0.0+edu+alpha2' '7.0.0+edu+alpha3' \
'7.1+edu0~a3' '7.1+edu0~b0' '7.1+edu0~b1' '7.1+edu0~b2'
do
diff -Nru debian-edu-install-1.721/debian/po/cs.po debian-edu-install-1.723/debian/po/cs.po
--- debian-edu-install-1.721/debian/po/cs.po 2013-06-13 13:38:00.000000000 +0200
+++ debian-edu-install-1.723/debian/po/cs.po 2014-02-27 07:45:21.000000000 +0100
@@ -1,8 +1,4 @@
# #-#-#-#-# cs.po.newstring (debian-installer) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/cs.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
#
# Czech messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
diff -Nru debian-edu-install-1.721/debian/po/it.po debian-edu-install-1.723/debian/po/it.po
--- debian-edu-install-1.721/debian/po/it.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/it.po 2014-02-27 07:46:52.000000000 +0100
@@ -1,5 +1,6 @@
# translation of it.po to italian
-# ----it.po (debian-installer) --------it.po (nn) --------it.po (debian-edu-install) ----Translators, if you are not familiar with the PO format, gettext
+# ----it.po (debian-edu-install) ----
+# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
# this format, e.g. by running:
# info -n '(gettext)PO Files'
@@ -8,15 +9,10 @@
# /usr/share/doc/po-debconf/README-trans
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
# Developers do not need to manually edit POT or PO files.
-# ----it.po.newstring (nn) ----THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/nn.po
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
-# Norwegian Nynorsk messages for debian-installer.
+# ----it.po.newstring (nn) ----
# Copyright (C) 2003 Software in the Public Interest, Inc.
# This file is distributed under the same license as debian-installer.
-# ----it.po.newstring (debian-installer) ----THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/it.po
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
+# ----it.po.newstring (debian-installer) ----
# Italian messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
# This file is distributed under the same license as debian-installer.
diff -Nru debian-edu-install-1.721/debian/po/lv.po debian-edu-install-1.723/debian/po/lv.po
--- debian-edu-install-1.721/debian/po/lv.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/lv.po 2014-02-27 07:47:16.000000000 +0100
@@ -1,4 +1,3 @@
-# #-#-#-#-# lv.po (nn) #-#-#-#-#
# #-#-#-#-# lv.po (debian-edu-install) #-#-#-#-#
#
# Translators, if you are not familiar with the PO format, gettext
@@ -13,24 +12,7 @@
#
# Developers do not need to manually edit POT or PO files.
#
-# #-#-#-#-# lv.po.newstring (nn) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/nn.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
-#
-# translation of nn.po to Norwegian Nynorsk
-# translation of debian-installer.po to Norwegian nynorsk
-# Norwegian Nynorsk messages for debian-installer.
-# Copyright (C) 2003 Software in the Public Interest, Inc.
-# This file is distributed under the same license as debian-installer.
-# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005, 2006.
-#
# #-#-#-#-# lv.po.newstring (lv) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/lv.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
#
# translation of lv.po to Latvian
# Aigars Mahinovs <aigarius@debian.org>, 2006.
diff -Nru debian-edu-install-1.721/debian/po/nn.po debian-edu-install-1.723/debian/po/nn.po
--- debian-edu-install-1.721/debian/po/nn.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/nn.po 2014-02-27 10:42:39.000000000 +0100
@@ -1,9 +1,6 @@
# #-#-#-#-# nn.po (nn) #-#-#-#-#
# translation of nn.po to Norwegian Nynorsk
-# Norwegian Nynorsk messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST#
# This file is distributed under the same license as debian-installer.
# #-#-#-#-# nn.po (nn) #-#-#-#-#
# Translators, if you are not familiar with the PO format, gettext
@@ -23,10 +20,10 @@
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: debian-edu-install@packages.debian.org\n"
"POT-Creation-Date: 2013-06-07 21:30+0200\n"
-"PO-Revision-Date: 2010-10-07 23:17+0200\n"
-"Last-Translator: Jan Roar Roed <janroed@gmail.com>\n"
-"Language-Team: American English <i18n-nb@lister.ping.uio.no>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-02-27 00:07+0100\n"
+"Last-Translator: Kjetil Torgrim Homme <kjetilho@ifi.uio.no>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -93,7 +90,7 @@
#. Description
#: ../debian-edu-profile-udeb.templates:2002
msgid "Profiles determine how the machine can be used out-of-the-box:"
-msgstr "Profila styrer korleis maskina kan bli brukt ut-av-boksen:"
+msgstr "Profilar styrer korleis maskina kan bli brukt ut-av-boksen:"
#. Type: multiselect
#. Description
@@ -116,21 +113,22 @@
" - Minimal: fully integrated into the Debian Edu network but\n"
" contains only a basic system without any GUI."
msgstr ""
-" - Hovudtenar: reservert for Debian EDU tenaren. Den inkluderar\n"
-" ikkje eit GUI (Grafisk brukargrensesnitt). Det bør \n"
-" berre brukast ein hovudtenar på eit Debian Edu\n"
-" nettverk.\n"
-" - Arbeidsstasjon: for normale maskinar på Debian Edu-netta.\n"
-" - Vandrande arbeidsstasjon: datamaskinar på Debian-Edu-netta\n"
-" som nokon gonger brukast utanfor nettverket. Desse har "
-"gjerne ein brukar\n"
+" - Hovudtenar: Reservert for Debian Edu-tenaren. Inkluderer ikkje\n"
+" eit GUI (grafisk brukargrensesnitt). Der bør vera\n"
+" berre éin hovudtenar på eit Debian Edu-nettverk.\n"
+" - Arbeidsstasjon:\n"
+" For normale maskiner på Debian Edu-netta.\n"
+" - Vandrande arbeidsstasjon:\n"
+" Datamaskiner på Debian Edu-netta som nokon gonger\n"
+" brukast utanfor nettverket. Desse har gjerne éin\n"
+" brukar.\n"
" - Tynnklienttenar:\n"
-" inkluderar 'Arbeidsstasjon' og treng to nettverkskort.\n"
-" - frittståande: For maksinar meint for bruk utanfor Debian Edu\n"
-" nettverket. Det inkluderar eit GUI og kjem i konfilkt med\n"
-" andre profilar.\n"
-" - Minimal: Integrert i Debian Edu nettverket men inneheld berre\n"
-" eit enkelt system utan noko GUI."
+" Inkluderer 'Arbeidsstasjon' og treng to nettverkskort.\n"
+" - Frittståande: For maskiner meint for bruk utanfor Debian Edu-\n"
+" nettverket. Det inkluderer eit GUI og kjem i konflikt\n"
+" med andre profilar.\n"
+" - Minimal: Integrert i Debian Edu nettverket men inneheld berre\n"
+" eit enkelt system utan noko GUI."
#. Type: error
#. Description
@@ -145,10 +143,7 @@
"The Standalone profile cannot be installed together with any other profile "
"on the same machine. Please either only choose Standalone or any other "
"combination excluding Standalone."
-msgstr ""
-"Den «Frittståande»-profilen kan ikkje installerast saman med andre profilar "
-"på den same maskina. Du må velje «Frittståande» åleine, eller ein "
-"kombinasjon av dei andre utan «Frittståande»."
+msgstr "«Frittståande»-profilen kan ikkje installerast saman med andre profilar på éi maskin. Du må velja «Frittståande» åleine, eller ein kombinasjon av dei andre utan «Frittståande»."
#. Type: note
#. Description
@@ -177,7 +172,7 @@
#: ../debian-edu-profile-udeb.templates:6001
#: ../debian-edu-profile-udeb.templates:7001
msgid "Really use the automatic partitioning tool?"
-msgstr "Vil du verkeleg bruke det automatiske partisjoneringsverktøyet?"
+msgstr "Vil du verkeleg bruka det automatiske partisjoneringsverktøyet?"
#. Type: boolean
#. Description
@@ -187,12 +182,7 @@
"THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
"data that are not backed up, you may want to stop now in order to do a "
"backup. In that case, you'll have to restart the installation later."
-msgstr ""
-"Denne operasjonen vil øydeleggja partisjonstabellen på alle diskane i "
-"maskina. EIN GONG TIL: DU ER I FERD MED Å SLETTA ALLE HARDDISKANE I MASKINA! "
-"Dersom du har lagra viktig informasjon utan å ha kopi nokon annan stad, bør "
-"du stogga no for å sikra innhaldet på diskane. I så fall må du starte "
-"installasjonen om att seinare."
+msgstr "Denne operasjonen vil øydeleggja partisjonstabellen på alle diskane i maskina. EIN GONG TIL: DU ER I FERD MED Å SLETTA ALLE HARDDISKANE I MASKINA! Dersom du har lagra viktig informasjon utan å ha kopi nokon annan stad, bør du stogga no for å sikra innhaldet på diskane. I så fall må du starta installasjonen om att seinare."
#. Type: text
#. Description
@@ -211,11 +201,7 @@
"statistics about the most used packages on this system. This information "
"influences decisions such as which packages should go on the first "
"distribution CD."
-msgstr ""
-"Systemet kan anonymt forsyne utviklarane av distribusjonen med statistikk "
-"over dei mest brukte pakkane på dette systemet. Denne informasjonen påverkar "
-"avgjerdsler om slike ting som kva for pakkar som bør bli med på den første "
-"CDen i distribusjonen."
+msgstr "Systemet kan anonymt forsyna utviklarane av distribusjonen med statistikk over dei mest brukte pakkane på dette systemet. Denne informasjonen påverkar avgjerdsler om slike ting som kva for pakkar som bør bli med på den første CDen i distribusjonen."
#. Type: boolean
#. Description
@@ -224,10 +210,7 @@
"If you choose to participate, the automatic submission script will run once "
"every week, sending statistics to the distribution developers. The collected "
"statistics can be viewed on http://popcon.debian.org/.";
-msgstr ""
-"Viss du vel å delta vil det ein gong i veka automatisk bli køyrt eit skript "
-"som sender inn rapport til distribusjonsutviklarane. Den innsamla "
-"statistikken kan lesast på http://popcon.debian.org/.";
+msgstr "Viss du vel å delta, vil det ein gong i veka bli køyrt eit skript som sender inn rapport til distribusjonsutviklarane. Den innsamla statistikken kan sjåast på http://popcon.debian.org/.";
#. Type: boolean
#. Description
@@ -235,23 +218,21 @@
msgid ""
"This choice can be later modified by running \"dpkg-reconfigure popularity-"
"contest\"."
-msgstr ""
-"Du kan seinare endre det du vel her ved å køyra kommandoen «dpkg-reconfigure "
-"popularity-contest»."
+msgstr "Du kan seinare endra valet ditt ved å køyra kommandoen «dpkg-reconfigure popularity-contest»."
#. Type: text
#. Description
#. Debian Edu main server menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:10001
msgid "Debian Edu Main Server"
-msgstr "Debian-Edu Hovudtenar"
+msgstr "Debian Edu Hovudtenar"
#. Type: text
#. Description
#. Debian Edu ltsp server menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:11001
msgid "Debian Edu Thin Client Server"
-msgstr "Debian-Edu Tynnklienttenar"
+msgstr "Debian Edu Tynnklienttenar"
#. Type: text
#. Description
@@ -265,33 +246,33 @@
#. Debian Edu combo main+ltsp menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:13001
msgid "Debian Edu Main Server and Thin Client Server"
-msgstr "Debian-Edu Hovudtenar og Tynnklienttenar"
+msgstr "Debian Edu Hovudtenar og tynnklienttenar"
#. Type: text
#. Description
#. Debian Edu combo main+ws menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:14001
msgid "Debian Edu Main Server and Workstation"
-msgstr "Debian-Edu Hovudtenar og Arbeidsstasjon"
+msgstr "Debian Edu Hovudtenar og arbeidsstasjon"
#. Type: text
#. Description
#. Debian Edu minimal menu entry for partman recipe.
#: ../debian-edu-profile-udeb.templates:15001
msgid "Debian Edu Minimal"
-msgstr "Debian Edu minimal profil"
+msgstr "Debian Edu Minimal profil"
#. Type: title
#. Description
#: ../debian-edu-profile-udeb.templates:16001
msgid "Debian Edu package installation failed"
-msgstr "Innstallasjonen av Debian Edu pakken feila"
+msgstr "Installasjonen av Debian Edu-pakken feila"
#. Type: error
#. Description
#: ../debian-edu-profile-udeb.templates:17001
msgid "Installation of required packages failed"
-msgstr "Installasjonen av påkrevde pakker feila"
+msgstr "Installasjonen av påkravde pakkar feila"
#. Type: error
#. Description
@@ -301,17 +282,13 @@
"Check /var/log/syslog if there is some information why this happened. The "
"installed system is not going to work properly, so the installation was "
"aborted and the system will be rebooted now."
-msgstr ""
-"Nokon påkrevde pakkar feila unnder innstallasjonen. Desse pakkane var "
-"${PACKAGES}. Sjå i /var/log/syslog etter informasjon om kvifor dette hende. "
-"Det innstallerte systemet vil ikkje verka skikkeleg, så innstallasjonen vart "
-"avbrotenog system vil no starta på nytt."
+msgstr "Installasjonen av nokre påkravde pakkar feila. Desse pakkane var ${PACKAGES}. Sjå i /var/log/syslog etter informasjon om kvifor dette hende. Det installerte systemet vil ikkje verka skikkeleg, så installasjonen vart avbroten og systemet vil no starta på nytt."
#. Type: boolean
#. Description
#: ../debian-edu-profile-udeb.templates:18001
msgid "Available disk space is too small. Abort the installation?"
-msgstr ""
+msgstr "For lite tilgjengeleg diskplass. Avbryta installasjonen?"
#. Type: boolean
#. Description
@@ -320,7 +297,7 @@
"The available disk space is too small for the selected profiles. Please "
"choose whether you want to abort the installation or continue without "
"setting up the recommended partitioning setup"
-msgstr ""
+msgstr "Der er for lite tilgjengeleg diskplass for den valde profilen. Vil du avbryta installasjonen eller halda fram utan det tilrådde partisjoneringsoppsettet?"
#. Type: boolean
#. Description
@@ -328,7 +305,7 @@
msgid ""
"The Debian Edu installer already has executed some disk setup commands. "
"Previous content of your disk might already have been destroyed by this."
-msgstr ""
+msgstr "Debian Edu-installasjonen har allereie utført operasjonar på disken. Tidlegare innhald kan vera øydelagt av desse."
#. Type: boolean
#. Description
@@ -337,7 +314,7 @@
"If you choose to continue, one single partition will be used for all system "
"files _and_ user files. Note that this can cause stability problems after a "
"while."
-msgstr ""
+msgstr "Om du vel å halda fram, vil éin partisjon bli brukt for alle system- _og_ brukar-filer. Dette kan føra til stabilitetsproblem etter ei stund."
#. Type: text
#. Description
@@ -346,7 +323,7 @@
#: ../debian-edu-profile-udeb.templates:19001
#: ../debian-edu-profile-udeb.templates:20001
msgid "Missing required network connectivity"
-msgstr ""
+msgstr "Manglar naudsynt nettverksoppkopling"
#. Type: error
#. Description
@@ -355,7 +332,7 @@
"To install Debian Edu using PXE and NETINST CD, network connectivity is "
"required. It is currently missing, so this installation can not continue "
"and will be aborted."
-msgstr ""
+msgstr "For å installera Debian Edu med PXE og NETINST CD, må ei nettverksoppkopling vera tilgjengeleg. Inga slik vart funnen, så installasjonen kan ikkje halda fram."
#. Type: text
#. Description
@@ -368,7 +345,7 @@
#. Description
#: ../debian-edu-install.templates:1001
msgid "Some errors were found during installation"
-msgstr "Nokre feil blei funne under installasjonen"
+msgstr "Nokre feil vart funne under installasjonen"
#. Type: error
#. Description
@@ -380,15 +357,13 @@
#. Description
#: ../debian-edu-install.templates:1001
msgid "Consider reporting them to the Debian Edu developers."
-msgstr "Du må gjerne rapportere dei til utviklarane av Debian Edu."
+msgstr "Du må gjerne rapportera dei til utviklarane av Debian Edu."
#. Type: note
#. Description
#: ../debian-edu-install.templates:2001
-#, fuzzy
-#| msgid "Some errors were found during installation"
msgid "No errors were found during installation"
-msgstr "Nokre feil blei funne under installasjonen"
+msgstr "Nokre feil vart funne under installasjonen"
#. Type: note
#. Description
@@ -396,288 +371,5 @@
msgid ""
"This is shown for the development version to make it clear that the "
"installation was successful."
-msgstr ""
-
-#~ msgid ""
-#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
-#~ " include any GUI (Graphical User Interface). There\n"
-#~ " should only be one such server on a Debian Edu\n"
-#~ " network.\n"
-#~ " - Workstation: for normal machines on the Debian Edu network.\n"
-#~ " - Roaming Workstation: for single user machines on the Debian Edu\n"
-#~ " network which some times travel outside the network.\n"
-#~ " - Thin Client Server:\n"
-#~ " includes 'Workstation' and requires two network\n"
-#~ " cards.\n"
-#~ " - Standalone: for machines meant to be used outside the Debian Edu\n"
-#~ " network. It includes a GUI and conflicts with other\n"
-#~ " profiles."
-#~ msgstr ""
-#~ " - Hovudtenar: sat av for Debian Edus tenar. Han inkluderer ikkje\n"
-#~ " eit grafisk brukargrensesnitt. Det skal berre vere ein "
-#~ "slik \n"
-#~ " tenar i eit Debian Edu-nettverk\n"
-#~ " - Arbeidsstasjon: for normale maskinar på Debian Edu-netta.\n"
-#~ " -Vandrande arbeidsstasjon: datamaskinar på Debian-Edu-netta\n"
-#~ " som nokon gonger brukast utanfor nettverket. Desse har "
-#~ "gjerne ein brukar\n"
-#~ " - Tynnklienttener:\n"
-#~ " inkluderar «Arbeidsstasjon» og krev to nettkort\n"
-#~ " - Frittståande: for maskiner som er meint å bli brukt utanfor Debian\n"
-#~ " Edu-nettverka. Dei inkluderer grafisk brukar-\n"
-#~ " grensesnitt, og kjem i konflikt med andre profilar."
-
-#, fuzzy
-#~ msgid "Something went wrong during the Debian Edu install process"
-#~ msgstr "Noko gjekk gale under installasjonen av Debian Edu."
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report the error using <URL:http://bugs.skolelinux.org/>, and "
-#~ "remember to attach the content of /var/log/installer.log to the bug "
-#~ "report."
-#~ msgstr ""
-#~ "Meld gjerne frå om feilen til <URL:http://bugs.skolelinux.org/>, og hugs "
-#~ "å leggja ved innhaldet av fila /var/log/installer.log saman med "
-#~ "feilmeldinga."
-
-#~ msgid "These are the reported errors:"
-#~ msgstr "Følgjande feil vart registrerte:"
-
-#~ msgid "${errorlist}"
-#~ msgstr "${errorlist}"
-
-#~ msgid "Make sure the Installation CD is in the CD tray"
-#~ msgstr "Sjekk at installasjons-CD-en er i CD-spelaren"
-
-#~ msgid ""
-#~ "The installation is mostly automatic and will use the CD if it is "
-#~ "available in the CD tray, but will fail if the CD is missing. Please "
-#~ "make sure the CD is in the CD tray now."
-#~ msgstr ""
-#~ "Installasjonen er stort sett automatisk, og vil bruka CD-en dersom han er "
-#~ "i CD-spelaren, men vil mislukkast dersom han manglar. Sjå til at CD-en er "
-#~ "i CD-spelaren no."
-
-#~ msgid "The machine will now reboot"
-#~ msgstr "Maskina vil no starta på nytt"
-
-#~ msgid ""
-#~ "To ensure that all services and applications start correctly, the machine "
-#~ "now needs to reboot."
-#~ msgstr ""
-#~ "For at alle tenestene og programma skal starta opp rett, må maskina "
-#~ "startast på nytt."
-
-#~ msgid ""
-#~ "The profiles you choose determine how the machine can be used out-of-the-"
-#~ "box. You can choose several profiles, but you have to choose at least one."
-#~ msgstr ""
-#~ "Dei profilane du vel avgjer korleis maskina skal kunna brukast etter "
-#~ "installasjonen. Du kan velja fleire profilar, men du er nøydd til å velja "
-#~ "minst éin."
-
-#, fuzzy
-#~ msgid ""
-#~ "Every Debian Edu network needs one, and only one machine running the "
-#~ "'Main-Server' profile to provides the (network) services. This profile "
-#~ "does not include a Graphical User Interface(=GUI), if you want a GUI you "
-#~ "will need to include the 'Workstation' profile or 'Thin-Client-Server'."
-#~ msgstr ""
-#~ "Kvart Debian Edu-nettverk treng éi og berre éi maskin med profilen "
-#~ "«Hovudtenar». Denne maskina vil tilby tenester som trengst for at "
-#~ "nettverket skal fungera (hovudsakleg filtilgang og LDAP). Sidan denne "
-#~ "maskina skal ta vare på alle datafilene, treng ho mykje harddiskplass. "
-#~ "Dersom du installerer denne profilen åleine, vil du få ei maskin utan "
-#~ "grafisk brukargrensesnitt. Dersom du vil ha eit grafisk "
-#~ "brukargrensesnitt, må du i tillegg installera ein av profilane "
-#~ "«Arbeidsstasjon» eller «Tynnklienttenar»."
-
-#, fuzzy
-#~ msgid ""
-#~ "Machines running the 'Workstation' profile are normal machines where "
-#~ "users logging in are authenticated against the machine running the 'Main-"
-#~ "Server' profile, which also stores their home directories."
-#~ msgstr ""
-#~ "Maskiner med profilen «Arbeidsstasjon» fungerer som heilt vanlege "
-#~ "maskiner. Brukarar som loggar på ein arbeidsstasjon vert autentiserte mot "
-#~ "hovudtenaren. Dokumenta og dei personlege innstillingane deira ligg på "
-#~ "heimeområda på hovudtenaren."
-
-#, fuzzy
-#~ msgid ""
-#~ "Machines running the 'Thin-Client-Server' profile need to have two "
-#~ "network cards. This profile includes the 'Workstation' profile."
-#~ msgstr ""
-#~ "Maskiner med profilen «Tynnklienttenar» vil ta i mot tilkoplingar frå "
-#~ "tynne klientar. Denne profilen inneheld profilen «Arbeidsstasjon». Ein "
-#~ "tynnklienttenar skal ha to nettverkskort, for å hindra for høg trafikk på "
-#~ "nettverket. Alle dei tre profilane kan installerast på den same maskina."
-
-#, fuzzy
-#~ msgid ""
-#~ "The profile 'Standalone' includes a GUI and is ment to be used outside "
-#~ "the Debian Edu network only. It cannot be installed together with other "
-#~ "profiles."
-#~ msgstr "Profilen «Frittståande» kan berre brukast åleine"
-
-#, fuzzy
-#~ msgid ""
-#~ "You can choose several profiles, but you have to choose at least one."
-#~ msgstr ""
-#~ "Dei profilane du vel avgjer korleis maskina skal kunna brukast etter "
-#~ "installasjonen. Du kan velja fleire profilar, men du er nøydd til å velja "
-#~ "minst éin."
-
-#, fuzzy
-#~ msgid ""
-#~ "Every Debian Edu network needs one, and only one machine running the "
-#~ "'Main-Server' profile to provides the (network) services."
-#~ msgstr ""
-#~ "Kvart Debian Edu-nettverk treng éi og berre éi maskin med profilen "
-#~ "«Hovudtenar». Denne maskina vil tilby tenester som trengst for at "
-#~ "nettverket skal fungera (hovudsakleg filtilgang og LDAP). Sidan denne "
-#~ "maskina skal ta vare på alle datafilene, treng ho mykje harddiskplass. "
-#~ "Dersom du installerer denne profilen åleine, vil du få ei maskin utan "
-#~ "grafisk brukargrensesnitt. Dersom du vil ha eit grafisk "
-#~ "brukargrensesnitt, må du i tillegg installera ein av profilane "
-#~ "«Arbeidsstasjon» eller «Tynnklienttenar»."
-
-#, fuzzy
-#~ msgid ""
-#~ "Machines running the 'Workstation' profile are normal machines where "
-#~ "users logging in are authenticated against the 'Main-Server'."
-#~ msgstr ""
-#~ "Maskiner med profilen «Arbeidsstasjon» fungerer som heilt vanlege "
-#~ "maskiner. Brukarar som loggar på ein arbeidsstasjon vert autentiserte mot "
-#~ "hovudtenaren. Dokumenta og dei personlege innstillingane deira ligg på "
-#~ "heimeområda på hovudtenaren."
-
-#~ msgid "Barebone"
-#~ msgstr "Nedstrippa"
-
-#~ msgid ""
-#~ "Every Debian Edu network needs one, and only one machine running the "
-#~ "'Main-Server' profile. This machine provides the (network) services "
-#~ "(mainly file/network and LDAP), so without this machine the network does "
-#~ "not work. Since this machine will hold all data files it will need a lot "
-#~ "of harddisk space. Installing this option solely results in a machine "
-#~ "without a Graphical User Interface(=GUI), if you want a GUI you'll need "
-#~ "to include the workstation profile or 'Thin-Client-Server'."
-#~ msgstr ""
-#~ "Kvart Debian Edu-nettverk treng éi og berre éi maskin med profilen "
-#~ "«Hovudtenar». Denne maskina vil tilby tenester som trengst for at "
-#~ "nettverket skal fungera (hovudsakleg filtilgang og LDAP). Sidan denne "
-#~ "maskina skal ta vare på alle datafilene, treng ho mykje harddiskplass. "
-#~ "Dersom du installerer denne profilen åleine, vil du få ei maskin utan "
-#~ "grafisk brukargrensesnitt. Dersom du vil ha eit grafisk "
-#~ "brukargrensesnitt, må du i tillegg installera ein av profilane "
-#~ "«Arbeidsstasjon» eller «Tynnklienttenar»."
-
-#~ msgid ""
-#~ "Machines running the 'Workstation' profile are normal machines. Users "
-#~ "logging on a workstation are authenticated by the machine running the "
-#~ "'Main-Server' profile, and have their documents and personal settings "
-#~ "stored in home directories on the machine running the 'Main-Server' "
-#~ "profile."
-#~ msgstr ""
-#~ "Maskiner med profilen «Arbeidsstasjon» fungerer som heilt vanlege "
-#~ "maskiner. Brukarar som loggar på ein arbeidsstasjon vert autentiserte mot "
-#~ "hovudtenaren. Dokumenta og dei personlege innstillingane deira ligg på "
-#~ "heimeområda på hovudtenaren."
-
-#~ msgid ""
-#~ "Machines running the 'Thin-Client-Server' profile are able to accept thin "
-#~ "client connections. This profile includes the 'Workstation' profile to "
-#~ "provide the applications also installed on a regular workstation. To "
-#~ "prevent network congestion, machines running this profile need to have "
-#~ "two network cards. All three profiles named so far can be installed on "
-#~ "the same machine."
-#~ msgstr ""
-#~ "Maskiner med profilen «Tynnklienttenar» vil ta i mot tilkoplingar frå "
-#~ "tynne klientar. Denne profilen inneheld profilen «Arbeidsstasjon». Ein "
-#~ "tynnklienttenar skal ha to nettverkskort, for å hindra for høg trafikk på "
-#~ "nettverket. Alle dei tre profilane kan installerast på den same maskina."
-
-#~ msgid ""
-#~ "The profile 'Standalone' cannot be installed on the same machine "
-#~ "together with any of the profiles 'Main-Server', 'Thin-Client-Server' or "
-#~ "'Workstation'."
-#~ msgstr ""
-#~ "Profilen «Frittståande» kan ikkje installerast på same maskin saman med "
-#~ "nokon av profilane «Hovudtenar», «Tynnklienttenar», eller "
-#~ "«Arbeidsstasjon»."
-
-#~ msgid ""
-#~ "Machines running the 'Standalone' profile are meant to be run outside the "
-#~ "Debian Edu network (e.g. in the homes of pupils and teachers) as a "
-#~ "standalone machine."
-#~ msgstr ""
-#~ "Maskiner med profilen «Frittståande» er det meininga å køyra på utanfor "
-#~ "Debian Edu-nettverk som frittståande maskiner, til dømes heime hos "
-#~ "elevane og lærarane."
-
-#~ msgid ""
-#~ "The 'Barebone' profile is a poor installation for admins, so that they "
-#~ "can choose what they want to install. It has network connection and is "
-#~ "integrated into the debian-edu network."
-#~ msgstr ""
-#~ "Den «Nedstrippa» profilen er meint for administratorar som sjølve vil "
-#~ "velja kva dei skal installera. Maskina vert kopla til og integrert i "
-#~ "Debian Edu-nettverket."
-
-#, fuzzy
-#~ msgid ""
-#~ "As it is a variant of the 'Standalone' profile it cannot be installed "
-#~ "together with other profiles."
-#~ msgstr "Profilen «Frittståande» kan berre brukast åleine"
-
-#, fuzzy
-#~ msgid ""
-#~ "The profile 'Standalone' includes a GUI and cannot be installed on the "
-#~ "same machine together with any of the other profiles. These machines are "
-#~ "ment to be run outside the Debian Edu network only."
-#~ msgstr ""
-#~ "Profilen «Frittståande» kan ikkje installerast på same maskin saman med "
-#~ "nokon av profilane «Hovudtenar», «Tynnklienttenar», eller "
-#~ "«Arbeidsstasjon»."
-
-#~ msgid "Please choose which profiles will apply to this machine."
-#~ msgstr "Vel kva for profilar du vil bruka på denne maskina."
-
-#~ msgid "Skip questions until package install (debian-edu)"
-#~ msgstr "Hopp over spørsmål før pakkeinstallasjonen (debian-edu)"
-
-#~ msgid "Skip questions until password (debian-edu)"
-#~ msgstr "Hopp over spørsmål før passord (debian-edu)"
-
-#~ msgid "Skip manual package selection (debian-edu)"
-#~ msgstr "Hopp over manuelle pakkeval (debian-edu)"
-
-#~ msgid "Check installed system (debian-edu)"
-#~ msgstr "Sjekk det installerte systemet (debian-edu)"
-
-#~ msgid "Set up packages (debian-edu)"
-#~ msgstr "Set opp pakkane (debian-edu)"
-
-#~ msgid "Finish install (debian-edu)"
-#~ msgstr "Gjer ferdig installasjon (debian-edu)"
-
-#~ msgid "Ask for a CD (debian-edu)"
-#~ msgstr "Spør etter CD (debian-edu)"
-
-#~ msgid "Select packages to install (debian-edu)"
-#~ msgstr "Vel pakkar som skal installerast (debian-edu)"
-
-#~ msgid "Re-enter interactive mode for password prompt (debian-edu)"
-#~ msgstr ""
-#~ "Gå tilbake til interaktiv modus for spørsmål om passord (debian-edu)"
-
-#~ msgid "Get installation profile (debian-edu)"
-#~ msgstr "Hent installasjonsprofil (debian-edu)"
-
-#~ msgid "Check for and report installation errors (debian-edu)"
-#~ msgstr "Sjå etter og rapporter installasjonsfeil (debian-edu)"
+msgstr "Dette vert vist i utviklingsversjonen for å gjera det klart at installasjonen var vellukka."
-#~ msgid "Override defaults with profile (debian-edu)"
-#~ msgstr "Overstyr standardval med profilen (debian-edu)"
diff -Nru debian-edu-install-1.721/debian/po/pl.po debian-edu-install-1.723/debian/po/pl.po
--- debian-edu-install-1.721/debian/po/pl.po 2013-06-18 12:37:28.000000000 +0200
+++ debian-edu-install-1.723/debian/po/pl.po 2014-02-27 07:47:57.000000000 +0100
@@ -1,5 +1,3 @@
-# #-#-#-#-# pl.po (debian-installer) #-#-#-#-#
-# #-#-#-#-# pl.po (nn) #-#-#-#-#
# #-#-#-#-# pl.po (0.0.1) #-#-#-#-#
#
# Translators, if you are not familiar with the PO format, gettext
@@ -14,24 +12,7 @@
#
# Developers do not need to manually edit POT or PO files.
#
-# #-#-#-#-# pl.po.newstring (nn) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/nn.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
-#
-# translation of nn.po to Norwegian Nynorsk
-# translation of debian-installer.po to Norwegian nynorsk
-# Norwegian Nynorsk messages for debian-installer.
-# Copyright (C) 2003 Software in the Public Interest, Inc.
-# This file is distributed under the same license as debian-installer.
-# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005, 2006.
-#
# #-#-#-#-# pl.po.newstring (debian-installer) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/pl.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
#
# Polish messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
diff -Nru debian-edu-install-1.721/debian/po/pt_BR.po debian-edu-install-1.723/debian/po/pt_BR.po
--- debian-edu-install-1.721/debian/po/pt_BR.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/pt_BR.po 2014-02-27 07:48:39.000000000 +0100
@@ -1,8 +1,5 @@
-# #-#-#-#-# pt_BR.po (debian-installer) #-#-#-#-#
-# #-#-#-#-# pt_BR.po (nn) #-#-#-#-#
# #-#-#-#-# pt_BR.po (pt_BR) #-#-#-#-#
# translation of pt_BR.po to Português Brasileiro
-# translation of pt_BR.po to Português brasileiro
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -18,25 +15,6 @@
# Aracnus <aracnus@skolelinux.no>, 2004.
# Frederico Goncalves Guimaraes <aracnus@skolelinux.no>, 2004, 2005.
#
-# #-#-#-#-# pt_BR.po.newstring (nn) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/nn.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
-#
-# translation of nn.po to Norwegian Nynorsk
-# translation of debian-installer.po to Norwegian nynorsk
-# Norwegian Nynorsk messages for debian-installer.
-# Copyright (C) 2003 Software in the Public Interest, Inc.
-# This file is distributed under the same license as debian-installer.
-# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005, 2006.
-#
-# #-#-#-#-# pt_BR.po.newstring (debian-installer) #-#-#-#-#
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/pt_BR.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
-#
# This file is distributed under the same license as debian-installer.
#
# #-#-#-#-# pt_BR.po (popularity_contest) #-#-#-#-#
diff -Nru debian-edu-install-1.721/debian/po/pt.po debian-edu-install-1.723/debian/po/pt.po
--- debian-edu-install-1.721/debian/po/pt.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/pt.po 2014-02-27 07:49:00.000000000 +0100
@@ -1,9 +1,5 @@
# #-#-#-#-# pt.po (debian-edu-install 0.646) #-#-#-#-#
# Portuguese translation of debian-edu-install
-# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
-# packages/po/nn.po
-#
-# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
#
# Portuguese messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
diff -Nru debian-edu-install-1.721/debian/po/zh_TW.po debian-edu-install-1.723/debian/po/zh_TW.po
--- debian-edu-install-1.721/debian/po/zh_TW.po 2013-06-09 11:37:38.000000000 +0200
+++ debian-edu-install-1.723/debian/po/zh_TW.po 2014-02-27 17:20:22.000000000 +0100
@@ -9,8 +9,8 @@
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: debian-edu-install@packages.debian.org\n"
"POT-Creation-Date: 2013-06-07 21:30+0200\n"
-"PO-Revision-Date: 2011-12-30 18:19+0800\n"
-"Last-Translator: Andrew Lee <ajqlee@debian.org>\n"
+"PO-Revision-Date: 2014-02-26 18:19+0800\n"
+"Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
"Language-Team: zh_TW <zh-l10n@lists.linux.org.tw>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@
#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
#: ../debian-edu-profile-udeb.templates:2001
msgid "Roaming Workstation"
-msgstr "漫遊工作站(Workstation)"
+msgstr "漫遊工作站(Roaming Workstation)"
#. Type: multiselect
#. Choices
@@ -144,7 +144,7 @@
"priority \"high\" to enable the automatic installation again."
msgstr ""
"為了更方便手動進行磁碟分割，目前獨立主機安裝模式不像其他安裝模式一樣完全自動"
-"化。現在你將進入 Debian 安裝程式主選單。您可以選擇“變更 debconf 優先權配置”，"
+"化。現在您將進入 Debian 安裝程式主選單。您可以選擇“變更 debconf 優先權配置”，"
"然後再選擇優先權“高”，這樣就可以回到自動安裝模式。"
#. Type: text
@@ -166,7 +166,7 @@
"backup. In that case, you'll have to restart the installation later."
msgstr ""
"這個操作將會破壞機器上所有磁碟分割表。注意！！這將會完全清除這台機器上的所有"
-"內容！如果你還有重要資料尚未備份，你可能會需要先停止安裝，然後做好備份，稍後"
+"內容！如果您還有重要資料尚未備份，您可能會需要先停止安裝，然後做好備份，稍後"
"在重頭開始安裝。"
#. Type: text
@@ -198,7 +198,7 @@
"every week, sending statistics to the distribution developers. The collected "
"statistics can be viewed on http://popcon.debian.org/.";
msgstr ""
-"如果你選擇參與這個勘查計畫，遞呈程式(script)將自動會每週執行一次，並將套件安"
+"如果您選擇參與這個勘查計畫，遞呈程式(script)將自動會每週執行一次，並將套件安"
"裝資料送給開發者。收集到的統計資料可以在 http://popcon.debian.org/ 上瀏覽。"
#. Type: boolean
@@ -285,18 +285,13 @@
#. Type: boolean
#. Description
#: ../debian-edu-profile-udeb.templates:18001
-#, fuzzy
-#| msgid ""
-#| "The available disk space is too small for the selected profiles. Do you "
-#| "want to continue without setting up the recommended partitioning setup, "
-#| "or abort the installation?"
msgid ""
"The available disk space is too small for the selected profiles. Please "
"choose whether you want to abort the installation or continue without "
"setting up the recommended partitioning setup"
msgstr ""
-"磁碟可用空間不足以完成所選取的安裝模式。您打算忽略建議的分割區設定繼續進行安"
-"裝程序，或者要中斷？"
+"磁碟可用空間不足以完成所選取的安裝模式。請決定您是要中止安裝程式，還是忽略建"
+"議的分割區設定繼續進行安裝？"
#. Type: boolean
#. Description
@@ -316,7 +311,7 @@
"files _and_ user files. Note that this can cause stability problems after a "
"while."
msgstr ""
-"假如你選擇繼續，所有系統檔案_與_使用者檔案將會共用同一個磁碟分割區。這樣可能"
+"假如您選擇繼續，所有系統檔案_與_使用者檔案將會共用同一個磁碟分割區。這樣可能"
"會造成穩定性的潛在問題。"
#. Type: text
@@ -326,7 +321,7 @@
#: ../debian-edu-profile-udeb.templates:19001
#: ../debian-edu-profile-udeb.templates:20001
msgid "Missing required network connectivity"
-msgstr ""
+msgstr "網路連線已遺失"
#. Type: error
#. Description
@@ -336,6 +331,8 @@
"required. It is currently missing, so this installation can not continue "
"and will be aborted."
msgstr ""
+"要用 PXE 與網路安裝光碟（NetInst CD）來安裝 Debian Edu 需要網路連線。目前沒有"
+"網路連線，因此無法繼續安裝。"
#. Type: text
#. Description
@@ -365,10 +362,8 @@
#. Type: note
#. Description
#: ../debian-edu-install.templates:2001
-#, fuzzy
-#| msgid "Some errors were found during installation"
msgid "No errors were found during installation"
-msgstr "安裝過程發生錯誤"
+msgstr "安裝過程沒有發生錯誤"
#. Type: note
#. Description
@@ -376,7 +371,7 @@
msgid ""
"This is shown for the development version to make it clear that the "
"installation was successful."
-msgstr ""
+msgstr "這個訊息是開發版本才會顯示，確定安裝已完成。"
#~ msgid ""
#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
diff -Nru debian-edu-install-1.721/lib/partman/common/97minimal debian-edu-install-1.723/lib/partman/common/97minimal
--- debian-edu-install-1.721/lib/partman/common/97minimal 2013-07-05 12:35:56.000000000 +0200
+++ debian-edu-install-1.723/lib/partman/common/97minimal 2013-12-12 22:44:05.000000000 +0100
@@ -11,7 +11,7 @@
filesystem{ ext4 }
mountpoint{ /boot } .
-128 5000 1024 ext4
+320 5000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -19,7 +19,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-512 1000 4096 ext4
+3456 1000 6144 ext4
$lvmok{ }
method{ format }
format{ }
@@ -27,7 +27,7 @@
filesystem{ ext4 }
mountpoint{ /usr } .
-512 2500 4096 ext4
+1280 2500 4096 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-1.721/lib/partman/recipes/97minimal debian-edu-install-1.723/lib/partman/recipes/97minimal
--- debian-edu-install-1.721/lib/partman/recipes/97minimal 2013-09-17 22:33:37.000000000 +0200
+++ debian-edu-install-1.723/lib/partman/recipes/97minimal 2013-12-12 22:56:02.000000000 +0100
@@ -10,7 +10,7 @@
filesystem{ ext4 }
mountpoint{ /boot } .
-128 5000 1024 ext4
+320 5000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -18,7 +18,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-512 1000 4096 ext4
+3456 1000 6144 ext4
$lvmok{ }
method{ format }
format{ }
@@ -26,7 +26,7 @@
filesystem{ ext4 }
mountpoint{ /usr } .
-512 2500 4096 ext4
+1280 2500 4096 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-1.721/lib/partman/recipes-powerpc-powermac_newworld/97minimal debian-edu-install-1.723/lib/partman/recipes-powerpc-powermac_newworld/97minimal
--- debian-edu-install-1.721/lib/partman/recipes-powerpc-powermac_newworld/97minimal 2013-09-17 22:33:37.000000000 +0200
+++ debian-edu-install-1.723/lib/partman/recipes-powerpc-powermac_newworld/97minimal 2013-12-12 22:56:02.000000000 +0100
@@ -15,7 +15,7 @@
filesystem{ ext4 }
mountpoint{ /boot } .
-128 5000 1024 ext4
+320 5000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -23,7 +23,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-512 1000 4096 ext4
+3456 1000 6144 ext4
$lvmok{ }
method{ format }
format{ }
@@ -31,7 +31,7 @@
filesystem{ ext4 }
mountpoint{ /usr } .
-512 2500 4096 ext4
+1280 2500 4096 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-1.721/lib/partman/recipes-powerpc-prep/97minimal debian-edu-install-1.723/lib/partman/recipes-powerpc-prep/97minimal
--- debian-edu-install-1.721/lib/partman/recipes-powerpc-prep/97minimal 2013-09-17 22:33:37.000000000 +0200
+++ debian-edu-install-1.723/lib/partman/recipes-powerpc-prep/97minimal 2013-12-12 22:56:02.000000000 +0100
@@ -15,7 +15,7 @@
filesystem{ ext4 }
mountpoint{ /boot } .
-128 5000 1024 ext4
+320 5000 1024 ext4
$lvmok{ }
method{ format }
format{ }
@@ -23,7 +23,7 @@
filesystem{ ext4 }
mountpoint{ / } .
-512 1000 4096 ext4
+3456 1000 6144 ext4
$lvmok{ }
method{ format }
format{ }
@@ -31,7 +31,7 @@
filesystem{ ext4 }
mountpoint{ /usr } .
-512 2500 4096 ext4
+1280 2500 4096 ext4
$lvmok{ }
method{ format }
format{ }
diff -Nru debian-edu-install-1.721/pre-pkgsel debian-edu-install-1.723/pre-pkgsel
--- debian-edu-install-1.721/pre-pkgsel 2013-04-21 12:22:56.000000000 +0200
+++ debian-edu-install-1.723/pre-pkgsel 2014-03-07 07:51:47.000000000 +0100
@@ -14,6 +14,24 @@
logger -t edu-pre-pkgsel "error: $*"
}
+# Install required packages, report fatal error and reboot if it fail.
+install_required_pkg() {
+ p="$1"
+ if apt-install $p ; then
+ :
+ else
+ template=debian-edu-install/errors-pkg-installation
+ db_subst $template PACKAGES "$p"
+ db_fset $template seen false
+ db_capb "" # Disable "Go Back" button
+ db_settitle $template-title
+ db_input critical $template || [ $? -eq 30 ]
+ db_go
+ db_capb backup
+ reboot
+ fi
+}
+
load_proxy_conf
# Initialize etckeeper early
@@ -57,26 +75,17 @@
edu-etcvcs commit
log "asking for a few extra packages to be installed"
-# debian-edu-archive-keyring - our local archive keyring
-# education-tasks - education tasksel tasks
-# debian-edu-install - the debian-edu preseeding files
-failed=""
-for p in debian-edu-archive-keyring education-tasks debian-edu-install
-do
- if apt-install $p ; then
- :
- else
- template=debian-edu-install/errors-pkg-installation
- db_subst $template PACKAGES "$p"
- db_fset $template seen false
- db_capb "" # Disable "Go Back" button
- db_settitle $template-title
- db_input critical $template || [ $? -eq 30 ]
- db_go
- db_capb backup
- reboot
- fi
-done
+
+# our local archive keyring, update apt database after it is installed
+install_required_pkg debian-edu-archive-keyring
+# Update mirrors using the latest keys
+in-target apt-get update
+
+# education tasksel tasks
+install_required_pkg education-tasks
+
+# the debian-edu preseeding files
+install_required_pkg debian-edu-install
edu-etcvcs commit
diff -Nru debian-edu-install-1.721/README debian-edu-install-1.723/README
--- debian-edu-install-1.721/README 2013-10-03 12:00:08.000000000 +0200
+++ debian-edu-install-1.723/README 2013-12-12 22:55:51.000000000 +0100
@@ -146,13 +146,13 @@
Profile minimal (none):
- Partition amd64 DVD i386 CD i386 DVD
- 2007-07-20
- ------------------------------------------------------
- / 76
- /boot 18
- /var 579
- /usr 188
+ Partition amd64 DVD amd64 CD i386 CD i386 DVD
+ 2013-12-12 2007-07-20
+ ------------------------------------------------------------------
+ / 180 76
+ /boot 33 18
+ /var 864 579
+ /usr 2403 188
Testing translations
====================
diff -Nru debian-edu-install-1.721/update-partman-recipes debian-edu-install-1.723/update-partman-recipes
--- debian-edu-install-1.721/update-partman-recipes 2013-10-03 12:00:08.000000000 +0200
+++ debian-edu-install-1.723/update-partman-recipes 2013-12-12 22:56:02.000000000 +0100
@@ -1,2 +1,2 @@
-Last made update-partman-recipes to. 26. sep. 14:51:57 +0200 2013 for:
-94edultsp
+Last made update-partman-recipes to. 12. des. 22:56:02 +0100 2013 for:
+97minimal
Reply to: