[debian-edu-commits] debian-edu/ 01/01: Improve handling of too small disks even further after testing.
Petter Reinholdtsen
pere at moszumanska.debian.org
Tue Sep 30 07:25:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
pere pushed a commit to branch master
in repository debian-edu-install.
commit 0916f3dd5a31a0410bb260f89eb58ca454b72010
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Tue Sep 30 09:24:39 2014 +0200
Improve handling of too small disks even further after testing.
---
debian/changelog | 4 +-
debian/debian-edu-profile-udeb.dirs | 1 -
debian/debian-edu-profile-udeb.templates | 3 -
debian/po/ca.po | 10 +---
debian/po/cs.po | 23 ++++----
debian/po/da.po | 21 +++----
debian/po/de.po | 21 +++----
debian/po/el.po | 45 +++++++-------
debian/po/es.po | 29 ++++-----
debian/po/eu.po | 10 +---
debian/po/fi.po | 10 +---
debian/po/fr.po | 20 +++----
debian/po/gl.po | 10 +---
debian/po/id.po | 19 +++---
debian/po/it.po | 21 +++----
debian/po/ja.po | 21 +++----
debian/po/lv.po | 10 +---
debian/po/nb.po | 21 +++----
debian/po/nl.po | 21 +++----
debian/po/nn.po | 69 +++++++++++++++-------
debian/po/pl.po | 19 +++---
debian/po/pt.po | 21 +++----
debian/po/pt_BR.po | 10 +---
debian/po/ro.po | 21 +++----
debian/po/ru.po | 19 +++---
debian/po/se.po | 10 +---
debian/po/sk.po | 19 +++---
debian/po/sv.po | 21 +++----
debian/po/templates.pot | 12 +---
debian/po/tr.po | 19 +++---
debian/po/vi.po | 10 +---
debian/po/zh_CN.po | 18 +++---
debian/po/zh_TW.po | 19 +++---
debian/rules | 1 -
lib/partman/commit.d/05debian-edu-too-small | 6 --
.../not-enough-space.d/01debian-edu-install-udeb | 2 +-
tools/report-if-disk-too-small | 6 +-
37 files changed, 258 insertions(+), 364 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a477c6b..36ac16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
debian-edu-install (1.805) UNRELEASED; urgency=low
* Add partman/not-enough-space.d hook to provide warning before the
- partitioning take place if the disk is too small.
+ partitioning take place if the disk is too small. Rephase debconf
+ dialog text to reflect this new and more safe behaviour and remove
+ the old partman/commit.d hook to only check once for disk space.
-- Petter Reinholdtsen <pere at debian.org> Tue, 30 Sep 2014 00:29:06 +0200
diff --git a/debian/debian-edu-profile-udeb.dirs b/debian/debian-edu-profile-udeb.dirs
index 13b34db..8237152 100644
--- a/debian/debian-edu-profile-udeb.dirs
+++ b/debian/debian-edu-profile-udeb.dirs
@@ -8,5 +8,4 @@ usr/lib/debian-edu-install
lib/partman/recipes
lib/partman/recipes-powerpc-powermac_newworld
lib/partman/recipes-powerpc-prep
-lib/partman/commit.d
lib/partman/not-enough-space.d
diff --git a/debian/debian-edu-profile-udeb.templates b/debian/debian-edu-profile-udeb.templates
index 8bf97e8..2bf98d0 100644
--- a/debian/debian-edu-profile-udeb.templates
+++ b/debian/debian-edu-profile-udeb.templates
@@ -152,9 +152,6 @@ _Description: Available disk space is too small. Abort the installation?
Please choose whether you want to abort the installation or continue
without setting up the recommended partitioning setup
.
- The Debian Edu installer already has executed some disk setup commands.
- Previous content of your disk might already have been destroyed by this.
- .
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.
diff --git a/debian/po/ca.po b/debian/po/ca.po
index f63de3a..2b0a1da 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debaian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2010-12-06 16:05+0100\n"
"Last-Translator: Hector Oron <zumbi at debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -325,14 +325,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 5e9f046..0ae4e14 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-05-22 15:23+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-04 15:24+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -335,16 +335,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Instalátor Debian Edu již provedl některé příkazy pro rozdělení disku. Je "
-"možné, že tím už byl předchozí obsah disku smazán."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -371,8 +361,8 @@ msgid ""
"and will be aborted."
msgstr ""
"Pro instalaci Debian Edu pomocí PXE a netinst CD je vyžadováno síťové "
-"připojení. Síťové připojení nebylo nalezeno a tudíž nelze pokračovat "
-"v instalaci."
+"připojení. Síťové připojení nebylo nalezeno a tudíž nelze pokračovat v "
+"instalaci."
#. Type: text
#. Description
@@ -416,6 +406,13 @@ msgstr ""
"instalace skončila úspěšně."
#~ 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 ""
+#~ "Instalátor Debian Edu již provedl některé příkazy pro rozdělení disku. Je "
+#~ "možné, že tím už byl předchozí obsah disku smazán."
+
+#~ 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"
diff --git a/debian/po/da.po b/debian/po/da.po
index 124f61f..04f7c73 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-05 05:26+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -314,17 +314,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu-installationsprogrammet har allerede udført nogle kommandoer for "
-"diskopsætningen. Tidligere indhold på din disk er måske allerede nu ødelagt "
-"på grund af dette."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -394,3 +383,11 @@ msgid ""
msgstr ""
"Dette vises for udviklingsversionen for at gøre det klart, at installationen "
"lykkedes."
+
+#~ 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 ""
+#~ "Debian Edu-installationsprogrammet har allerede udført nogle kommandoer "
+#~ "for diskopsætningen. Tidligere indhold på din disk er måske allerede nu "
+#~ "ødelagt på grund af dette."
diff --git a/debian/po/de.po b/debian/po/de.po
index 730db31..878cc5b 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 0.682~svn61027\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-04 00:49+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -322,17 +322,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Der Debian-Edu Installer hat bereits einige Partitionierungs-Kommandos "
-"ausgeführt. Dadurch wurden vorhandene Daten auf der Festplatte eventuell "
-"bereits zerstört."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -402,3 +391,11 @@ msgid ""
msgstr ""
"Dies wird für die Entwicklungs-Version angezeigt, um klar zu machen, dass "
"die Installation erfolgreich war."
+
+#~ 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 ""
+#~ "Der Debian-Edu Installer hat bereits einige Partitionierungs-Kommandos "
+#~ "ausgeführt. Dadurch wurden vorhandene Daten auf der Festplatte eventuell "
+#~ "bereits zerstört."
diff --git a/debian/po/el.po b/debian/po/el.po
index ebfcc72..4cf9386 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: popularity_el\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2014-08-26 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2007-11-30 16:55+0200\n"
"Last-Translator: Panagiotis Georgakopoulos <pankgeorg at gmail.org>\n"
"Language-Team: Greek translation team <debian-l10n-greek at lists.debian.org>\n"
@@ -129,8 +129,10 @@ msgstr ""
" - Αυτόνομο Σύστημα: Για χρήση σε μηχανήματα εκτός του δικτύου Debian Edu.\n"
" Περιλαμβάνει GUI (Γραφικό Περιβάλλον) και δεν είναι συμβατό\n"
" με άλλα προφίλ.\n"
-" - Μινιμαλιστική Εγκατάσταση: Για συστήματα πλήρως ενσωματωμένα στο δίκτυο Debian\n"
-" Edu που όμως περιλαμβάνουν μόνο το βασικό σύστημα, χωρίς Γραφικό \n"
+" - Μινιμαλιστική Εγκατάσταση: Για συστήματα πλήρως ενσωματωμένα στο δίκτυο "
+"Debian\n"
+" Edu που όμως περιλαμβάνουν μόνο το βασικό σύστημα, χωρίς "
+"Γραφικό \n"
" Περιβάλλον (GUI)."
#. Type: error
@@ -310,14 +312,15 @@ msgid ""
msgstr ""
"Κάποια απαιτούμενα αρχεία δεν μπόρεσαν να εγκατασταθούν. Αυτά ήταν "
"${PACKAGES}.Ελέξτε το /var/log/syslog μήπως υπάρχει κάποια πληροφορία για το "
-"τι συνέβη. Το εγκατεστημένο σύστημα δεν θα δουλεύει σωστά, οπότε η εγκατάσταση "
-"ακυρώθηκε, συνεπώς το σύστημα θα επανεκκινηθεί."
+"τι συνέβη. Το εγκατεστημένο σύστημα δεν θα δουλεύει σωστά, οπότε η "
+"εγκατάσταση ακυρώθηκε, συνεπώς το σύστημα θα επανεκκινηθεί."
#. Type: boolean
#. Description
#: ../debian-edu-profile-udeb.templates:18001
msgid "Available disk space is too small. Abort the installation?"
-msgstr "Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής. Ακύρωση της Εγκατάστασης;"
+msgstr ""
+"Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής. Ακύρωση της Εγκατάστασης;"
#. Type: boolean
#. Description
@@ -335,24 +338,13 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Το πρόγραμμα εγκατάστασης του Debian Edu έχει ήδη εκτελέσει λειτουργίες "
-"εγκατάστασης επί του σκληρού δίσκου. Συνεπώς είναι πιθανό προηγούμενα "
-"περιεχόμενα του δίσκου να έχουν ήδη καταστραφεί."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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 ""
-"Αν επιλέξετε να συνεχίσετε, θα χρησιμοποιηθεί ένα μοναδικό διαμέρισμα για "
-"τα αρχεία και του συστήματος και των χρηστών. Παρακαλούμε σημειώστε πως η "
-"επιλογή αυτή είναι πιθανό να δημιουργήσει προβλήματα σταθερότητας μετά από "
+"Αν επιλέξετε να συνεχίσετε, θα χρησιμοποιηθεί ένα μοναδικό διαμέρισμα για τα "
+"αρχεία και του συστήματος και των χρηστών. Παρακαλούμε σημειώστε πως η "
+"επιλογή αυτή είναι πιθανό να δημιουργήσει προβλήματα σταθερότητας μετά από "
"κάποιο καιρό."
#. Type: text
@@ -373,10 +365,8 @@ msgid ""
"and will be aborted."
msgstr ""
"Προκειμένου να εγκαταστήσετε το Debian Edu μέσω PXE και το CD NETINST, είναι "
-"απαραίτητη η σύνδεση στο δίκτου. Λόγω απώλειας αυτής, η εγκατάσταση δε δύναται να "
-"συνεχιστεί και άρα ακυρώνεται. "
-
-
+"απαραίτητη η σύνδεση στο δίκτου. Λόγω απώλειας αυτής, η εγκατάσταση δε "
+"δύναται να συνεχιστεί και άρα ακυρώνεται. "
#. Type: text
#. Description
@@ -420,3 +410,10 @@ msgstr ""
"Το μήνυμα αυτό εμφανίζεται στην έκδοση υπό ανάπτυξη για να καταστήσει σαφές "
"Το γεγονός ότι η εγκατάσταση ολοκληρώθηκε με επιτυχία. "
+#~ 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 ""
+#~ "Το πρόγραμμα εγκατάστασης του Debian Edu έχει ήδη εκτελέσει λειτουργίες "
+#~ "εγκατάστασης επί του σκληρού δίσκου. Συνεπώς είναι πιθανό προηγούμενα "
+#~ "περιεχόμενα του δίσκου να έχουν ήδη καταστραφεί."
diff --git a/debian/po/es.po b/debian/po/es.po
index af145a3..b31f770 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 1.517~svn68851\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2012-01-04 14:14-0600\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -178,8 +178,8 @@ msgstr "La instalación «Independiente» es en parte manual"
#: ../debian-edu-profile-udeb.templates:4001
msgid ""
"The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning. You are now sent to the "
-"debian-installer main menu. Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning. You are now sent to the debian-"
+"installer main menu. Select \"Change debconf priority\", and choose "
"priority \"high\" to enable the automatic installation again."
msgstr ""
"La instalación de «Independiente» no es automática como la de otros "
@@ -250,8 +250,8 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:9001
msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure "
-"popularity-contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure popularity-"
+"contest\"."
msgstr ""
"Puede cambiar esta decisión ejecutando más tarde «dpkg-reconfigure "
"popularity-contest»."
@@ -347,17 +347,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"El isntalador de Debian Edu ha ejecutado ciertos comandos para la adecuación "
-"de disco. El contenido anterior del disco podría haber sido eliminado por "
-"este procedimiento."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -427,3 +416,11 @@ msgid ""
msgstr ""
"Esto se visualiza en la versión de desarrollo para informar que la "
"instalación fué exitosa."
+
+#~ 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 ""
+#~ "El isntalador de Debian Edu ha ejecutado ciertos comandos para la "
+#~ "adecuación de disco. El contenido anterior del disco podría haber sido "
+#~ "eliminado por este procedimiento."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 2edc055..64d072d 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install_1.517~svn68851_eu\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2010-10-09 13:02+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
"Language-Team: Basque <debian-l10n-basque at lists.debian.org>\n"
@@ -316,14 +316,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 101b781..2ad9c84 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -41,7 +41,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2010-10-17 21:16+0300\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -346,14 +346,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 66502e0..399e355 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-02 01:14+0200\n"
"Last-Translator: jipege <jean-pierregiraud at neuf.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -329,16 +329,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"L'outil d'installation de Debian Edu a déjà commencé à configurer le disque. "
-"Il est possible que le contenu antérieur de celui-ci ait déjà été effacé."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -410,6 +400,14 @@ msgstr ""
"l'installation s'est bien terminée."
#~ 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 ""
+#~ "L'outil d'installation de Debian Edu a déjà commencé à configurer le "
+#~ "disque. Il est possible que le contenu antérieur de celui-ci ait déjà été "
+#~ "effacé."
+
+#~ 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"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 4a8b3df..0103f10 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2009-11-07 20:27+0100\n"
"Last-Translator: Marce Villarino <mvillarino at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -338,14 +338,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/id.po b/debian/po/id.po
index a901611..7d59c27 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 1.524\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-05-29 23:35+0700\n"
"Last-Translator: T. Surya Fajri <kilelme at gmail.com>\n"
"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian at lists."
@@ -314,16 +314,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Instalatur Debian Edu telah menjalankan beberapa perintah pengaturan disk. "
-"Isi disk anda sebelumnya mungkin sudah terhapus karenanya."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -395,6 +385,13 @@ msgstr ""
"telah berhasil."
#~ 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 ""
+#~ "Instalatur Debian Edu telah menjalankan beberapa perintah pengaturan "
+#~ "disk. Isi disk anda sebelumnya mungkin sudah terhapus karenanya."
+
+#~ 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"
diff --git a/debian/po/it.po b/debian/po/it.po
index abea735..de68fa9 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -39,7 +39,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-02 18:23+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -352,17 +352,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Il programma di installazione di Debian Edu ha già eseguito alcuni comandi "
-"di configurazione del disco. Il contenuto precedente del disco potrebbe già "
-"essere stato distrutto. "
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -434,6 +423,14 @@ msgstr ""
"l'installazione ha avuto successo. "
#~ 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 ""
+#~ "Il programma di installazione di Debian Edu ha già eseguito alcuni "
+#~ "comandi di configurazione del disco. Il contenuto precedente del disco "
+#~ "potrebbe già essere stato distrutto. "
+
+#~ 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"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index a2586cf..b3e4dbc 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-01 09:10+0900\n"
"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -323,17 +323,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu インストーラはすでにいくつかのディスクセットアップコマンドを実行済"
-"みです。これにより、あなたのディスクの以前の内容はすでに消失しているかもしれ"
-"ません。"
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -403,3 +392,11 @@ msgid ""
msgstr ""
"開発バージョンではインストールが成功したことを明確にするためにこのように表示"
"しています。"
+
+#~ 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 ""
+#~ "Debian Edu インストーラはすでにいくつかのディスクセットアップコマンドを実"
+#~ "行済みです。これにより、あなたのディスクの以前の内容はすでに消失しているか"
+#~ "もしれません。"
diff --git a/debian/po/lv.po b/debian/po/lv.po
index f9a41c9..994aed7 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: lv\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2006-12-01 18:14+0000\n"
"Last-Translator: Aigars Mahinovs <aigarius at debian.org>\n"
"Language-Team: Latvian <>\n"
@@ -319,14 +319,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 2451eb5..6d8823e 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-01 21:20+0200\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -336,17 +336,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu-installasjonen har allerede utført noen kommandoer for å sette "
-"opp disken. Tidligere innhold på disken din kan allerede være ødelagt på "
-"grunn av dette."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -416,3 +405,11 @@ msgid ""
msgstr ""
"Dette blir vist for utviklingsversjonen for å gjøre det klart at "
"installasjonen var vellykket."
+
+#~ 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 ""
+#~ "Debian Edu-installasjonen har allerede utført noen kommandoer for å sette "
+#~ "opp disken. Tidligere innhold på disken din kan allerede være ødelagt på "
+#~ "grunn av dette."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 42c0bd1..25268ea 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 1.520\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2012-01-06 15:12+0100\n"
"Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -316,17 +316,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Het installatieprogramma van Debian Edu heeft al enkele commando's voor "
-"schijfconfiguratie uitgevoerd. De oude inhoud van uw schijf is hierdoor "
-"mogelijk al vernietigd."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -397,6 +386,14 @@ msgid ""
msgstr ""
#~ 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 ""
+#~ "Het installatieprogramma van Debian Edu heeft al enkele commando's voor "
+#~ "schijfconfiguratie uitgevoerd. De oude inhoud van uw schijf is hierdoor "
+#~ "mogelijk al vernietigd."
+
+#~ 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"
diff --git a/debian/po/nn.po b/debian/po/nn.po
index 02d3538..7f6a1c8 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2014-02-27 00:07+0100\n"
"Last-Translator: Kjetil Torgrim Homme <kjetilho at ifi.uio.no>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -143,7 +143,10 @@ msgid ""
"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 "«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»."
+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
@@ -182,7 +185,12 @@ msgid ""
"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 starta 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
@@ -201,7 +209,11 @@ msgid ""
"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 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."
+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
@@ -210,7 +222,10 @@ msgid ""
"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 bli køyrt eit skript som sender inn rapport til distribusjonsutviklarane. Den innsamla statistikken kan sjåast 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
@@ -218,7 +233,9 @@ msgstr "Viss du vel å delta, vil det ein gong i veka bli køyrt eit skript som
msgid ""
"This choice can be later modified by running \"dpkg-reconfigure popularity-"
"contest\"."
-msgstr "Du kan seinare endra valet ditt 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
@@ -282,7 +299,11 @@ msgid ""
"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 "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."
+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
@@ -297,15 +318,10 @@ 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 "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
-#: ../debian-edu-profile-udeb.templates:18001
-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 "Debian Edu-installasjonen har allereie utført operasjonar på disken. Tidlegare innhald kan vera øydelagt av desse."
+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
@@ -314,7 +330,9 @@ msgid ""
"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 "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."
+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
@@ -332,7 +350,10 @@ msgid ""
"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 "For å installera Debian Edu med PXE og NETINST CD, må ei nettverksoppkopling vera tilgjengeleg. Inga slik vart funnen, så installasjonen kan ikkje halda fram."
+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
@@ -371,5 +392,13 @@ msgstr "Nokre feil vart funne under installasjonen"
msgid ""
"This is shown for the development version to make it clear that the "
"installation was successful."
-msgstr "Dette vert vist i utviklingsversjonen for å gjera det klart at installasjonen var vellukka."
-
+msgstr ""
+"Dette vert vist i utviklingsversjonen for å gjera det klart at "
+"installasjonen var vellukka."
+
+#~ 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 ""
+#~ "Debian Edu-installasjonen har allereie utført operasjonar på disken. "
+#~ "Tidlegare innhald kan vera øydelagt av desse."
diff --git a/debian/po/pl.po b/debian/po/pl.po
index b505c5a..943f1f3 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -39,7 +39,7 @@ msgid ""
msgstr ""
"Project-Id-Version: popularity-contest\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-13 16:34+0200\n"
"Last-Translator: Miroslaw Gabrus <mirekgab at wp.pl>\n"
"Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -351,16 +351,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Instalator Debian Edu już wykonał jakieś operacje na dysku. Poprzednia "
-"zawartość dysku mogła już zostać zniszczona."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -431,6 +421,13 @@ msgstr ""
"Ten komunikat pokazywany jest w wersji deweloperskiej aby potwierdzić, że "
"instalacja powiodła się."
+#~ 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 ""
+#~ "Instalator Debian Edu już wykonał jakieś operacje na dysku. Poprzednia "
+#~ "zawartość dysku mogła już zostać zniszczona."
+
#, fuzzy
#~ msgid "Something went wrong during the Debian Edu install process"
#~ msgstr "Coś poszło nie tak podczas instalacji Debian Edu."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 831ac60..710461d 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-03 21:16+0100\n"
"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -324,17 +324,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"O instalador de Debian Edu já executou alguns comandos de configuração do "
-"disco. O conteúdo anterior do seu disco poderá já ter sido destruído por "
-"isso."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -406,6 +395,14 @@ msgstr ""
"instalação teve sucesso."
#~ 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 ""
+#~ "O instalador de Debian Edu já executou alguns comandos de configuração do "
+#~ "disco. O conteúdo anterior do seu disco poderá já ter sido destruído por "
+#~ "isso."
+
+#~ 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"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index a5f088b..e5b26bf 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -36,7 +36,7 @@ msgid ""
msgstr ""
"Project-Id-Version: popularity_contest\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2006-09-18 03:28-0300\n"
"Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -342,14 +342,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/ro.po b/debian/po/ro.po
index c10489f..2c188c0 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-05-30 11:35+0200\n"
"Last-Translator: Victor Nițu <victor at debian.org.ro>\n"
"Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -320,17 +320,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Programul de instalare Debian Edu a executat deja câteva comenzi de "
-"configurare a discului fix. Conținutul anterior al acestuia a fost probabil "
-"deteriorat deja."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -400,3 +389,11 @@ msgid ""
msgstr ""
"Afișat doar pentru versiunea de dezvoltare, pentru a asigura că instalarea a "
"avut succes."
+
+#~ 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 ""
+#~ "Programul de instalare Debian Edu a executat deja câteva comenzi de "
+#~ "configurare a discului fix. Conținutul anterior al acestuia a fost "
+#~ "probabil deteriorat deja."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 940b341..6f85c37 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 1.711\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-05-29 20:38+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -320,16 +320,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Установщик Debian Edu уже выполнил некоторые операции по настройке диска. Из-"
-"за этого ранее имевшееся содержимое диска уже могло быть уничтожено."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -401,6 +391,13 @@ msgstr ""
"установка прошла успешно."
#~ 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 ""
+#~ "Установщик Debian Edu уже выполнил некоторые операции по настройке диска. "
+#~ "Из-за этого ранее имевшееся содержимое диска уже могло быть уничтожено."
+
+#~ 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"
diff --git a/debian/po/se.po b/debian/po/se.po
index bdf304e..3f21988 100644
--- a/debian/po/se.po
+++ b/debian/po/se.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: se.po\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2010-10-12 21:18+0200\n"
"Last-Translator: Børre Gaup <>\n"
"Language-Team: Northern Sami <i18n-sme at lister.ping.uio.no>\n"
@@ -317,14 +317,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index f6af0a6..693f557 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2014-08-26 10:35+0200\n"
"Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
"Language-Team: slovenčina <debian-l10n-slovak at lists.debian.org>\n"
@@ -312,16 +312,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Inštalátor Debian Edu už vykonal niektoré z príkazov na nastavenie disku. Je "
-"možné, že predošlý obsah vášho disku už je týmto zničený."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -393,6 +383,13 @@ msgstr ""
"úspešná."
#~ 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 ""
+#~ "Inštalátor Debian Edu už vykonal niektoré z príkazov na nastavenie disku. "
+#~ "Je možné, že predošlý obsah vášho disku už je týmto zničený."
+
+#~ 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"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index ed51043..5adee8e 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-28 11:54+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -317,17 +317,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Installationen av Debian Edu har redan exekverat några kommandon för "
-"anpassning av hårddisken. Tidigare innehåll på hårddisken kan därför ha "
-"förstörts i och med detta."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -399,6 +388,14 @@ msgstr ""
"installationen fungerade korrekt."
#~ 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 ""
+#~ "Installationen av Debian Edu har redan exekverat några kommandon för "
+#~ "anpassning av hårddisken. Tidigare innehåll på hårddisken kan därför ha "
+#~ "förstörts i och med detta."
+
+#~ 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"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b133af1..5d25804 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -269,14 +269,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 4a3e92f..a58ea1a 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2012-02-29 16:59+0200\n"
"Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
"Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -314,16 +314,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu kurulum programı halihazırda bazı disk kurulum komutlarını "
-"çalıştırdı. Bu nedenle diskinizin önceki içeriği silinmiş olabilir."
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -392,6 +382,13 @@ msgid ""
msgstr ""
#~ 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 ""
+#~ "Debian Edu kurulum programı halihazırda bazı disk kurulum komutlarını "
+#~ "çalıştırdı. Bu nedenle diskinizin önceki içeriği silinmiş olabilir."
+
+#~ 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"
diff --git a/debian/po/vi.po b/debian/po/vi.po
index b650356..6884529 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 1.517~svn68851\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2010-10-08 16:52+1030\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <>\n"
@@ -306,14 +306,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 73f11e3..fc35c7b 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-install 10n\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2013-06-01 22:35+0800\n"
"Last-Translator: Ji ZhengYu <zhengyuji at gmail.com>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
@@ -303,15 +303,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu 安装程序已经执行了某些安装命令。您磁盘中原有内容可能已经被清除。"
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -379,6 +370,13 @@ msgid ""
msgstr "这是为开发版而显示的，此信息只是为了证明已经成功安装完毕。"
#~ 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 ""
+#~ "Debian Edu 安装程序已经执行了某些安装命令。您磁盘中原有内容可能已经被清"
+#~ "除。"
+
+#~ 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"
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 24cf4da..d45eb28 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2013-06-07 21:30+0200\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
"PO-Revision-Date: 2014-02-26 18:19+0800\n"
"Last-Translator: Franklin Weng <franklin at goodhorse.idv.tw>\n"
"Language-Team: zh_TW <zh-l10n at lists.linux.org.tw>\n"
@@ -297,16 +297,6 @@ msgstr ""
#. Description
#: ../debian-edu-profile-udeb.templates:18001
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 ""
-"Debian Edu 安裝程式已經執行了這個磁碟設定指令。先前位於磁碟中的內容已經被這指"
-"令所更動。"
-
-#. Type: boolean
-#. Description
-#: ../debian-edu-profile-udeb.templates:18001
-msgid ""
"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."
@@ -374,6 +364,13 @@ msgid ""
msgstr "這個訊息是開發版本才會顯示，確定安裝已完成。"
#~ 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 ""
+#~ "Debian Edu 安裝程式已經執行了這個磁碟設定指令。先前位於磁碟中的內容已經被"
+#~ "這指令所更動。"
+
+#~ 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"
diff --git a/debian/rules b/debian/rules
index 21c5b52..dc64f28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,6 @@ install-debian-edu-profile-udeb: install-common
$(INSTALL_DATA) preseed-values/defaults.$$profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install ; \
done
$(MAKE) install-partman-recipes DESTDIR=$(CURDIR)/debian/debian-edu-profile-udeb
- $(INSTALL) lib/partman/commit.d/* $(CURDIR)/debian/debian-edu-profile-udeb/lib/partman/commit.d
$(INSTALL) lib/partman/not-enough-space.d/01debian-edu-install-udeb $(CURDIR)/debian/debian-edu-profile-udeb/lib/partman/not-enough-space.d/01debian-edu-install-udeb
$(INSTALL) lib/debian-edu-common $(CURDIR)/debian/debian-edu-profile-udeb/lib/
$(INSTALL) debian-edu-profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/bin
diff --git a/lib/partman/commit.d/05debian-edu-too-small b/lib/partman/commit.d/05debian-edu-too-small
deleted file mode 100755
index 7b773b0..0000000
--- a/lib/partman/commit.d/05debian-edu-too-small
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Handle too small disks here until the hook requested in #653305
-# is available. Then too small disks can be detected before the disk
-# content is affected.
-exec report-if-disk-too-small
diff --git a/lib/partman/not-enough-space.d/01debian-edu-install-udeb b/lib/partman/not-enough-space.d/01debian-edu-install-udeb
index a5b423a..5c7d590 100755
--- a/lib/partman/not-enough-space.d/01debian-edu-install-udeb
+++ b/lib/partman/not-enough-space.d/01debian-edu-install-udeb
@@ -7,4 +7,4 @@ recipe="$1"
free_size="$2"
min_size="$3"
-exec report-if-disk-too-small
+exec report-if-disk-too-small "$recipe" "$free_size" "$min_size"
diff --git a/tools/report-if-disk-too-small b/tools/report-if-disk-too-small
index 7e07d2c..89e4112 100755
--- a/tools/report-if-disk-too-small
+++ b/tools/report-if-disk-too-small
@@ -1,5 +1,9 @@
#!/bin/sh
+recipe="$1"
+free_size="$2"
+min_size="$3"
+
. /usr/share/debconf/confmodule
# Report too small disks.
@@ -8,7 +12,7 @@
if [ ! -f /tmp/ignore-too-small ] && \
grep -q 'too small for expert recipe' /var/log/syslog ; then
- logger -t debian-edu-install "Disk to small, asking if installation should be aborted"
+ logger -t debian-edu-install "Disk to small (recipe=$recipe free_size=$free_size min_size=$min_size), asking if installation should be aborted"
# Remove backup choice from dialog
db_capb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git
More information about the debian-edu-commits
mailing list