public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66304ea8bb378c918280df2ddb3349db25aad38f
Date: Wed, 30 Jan 2013 13:41:39 +0100	[thread overview]
Message-ID: <20130130124139.707E1200B5@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2749 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  66304ea8bb378c918280df2ddb3349db25aad38f (commit)
      from  8807eeaf8d0b952bd38b2c7df634c3fdecf2e7b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 66304ea8bb378c918280df2ddb3349db25aad38f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 30 13:41:13 2013 +0100

    installer: Add bigger warning that all data will be destroyed during the installation process.

-----------------------------------------------------------------------

Summary of changes:
 langs/de/install/lang_de.c | 2 +-
 langs/en/install/lang_en.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c
index 6c8c7e5..85db867 100644
--- a/langs/de/install/lang_de.c
+++ b/langs/de/install/lang_de.c
@@ -358,7 +358,7 @@ char *de_tr[] = {
 /* TR_PHONENUMBER_CANNOT_BE_EMPTY */
 "Die Telefonnummer darf nicht leer sein.",
 /* TR_PREPARE_HARDDISK */
-"Das Installationsprogramm wird jetzt die Festplatte %s vorbereiten. Zunächst wird die Festplatte partitioniert. Danach wird auf den Partitionen ein Dateisystem erstellt.",
+"Das Installationsprogramm wird jetzt die Festplatte %s vorbereiten. Zunächst wird die Festplatte partitioniert. Danach wird auf den Partitionen ein Dateisystem erstellt.\n\nALLE DATEN AUF DEM LAUFWERK WERDEN GELÖSCHT. Einverstanden?",
 /* TR_PRESS_OK_TO_REBOOT */
 "Drücken Sie Ok, um neu zu starten.",
 /* TR_PRIMARY_DNS */
diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c
index 4415205..87f8d2f 100644
--- a/langs/en/install/lang_en.c
+++ b/langs/en/install/lang_en.c
@@ -354,7 +354,7 @@ char *en_tr[] = {
 /* TR_PHONENUMBER_CANNOT_BE_EMPTY */
 "Phone number cannot be empty.",
 /* TR_PREPARE_HARDDISK */
-"The installation program will now prepare the harddisk on %s. First the disk will be partitioned, and then the partitions will have a filesystem put on them.",
+"The installation program will now prepare the harddisk on %s. First the disk will be partitioned, and then the partitions will have a filesystem put on them.\n\nALL DATA ON THE DISK WILL BE DESTROYED. Do you agree to continue?",
 /* TR_PRESS_OK_TO_REBOOT */
 "Press Ok to reboot.",
 /* TR_PRIMARY_DNS */


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2013-01-30 12:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130130124139.707E1200B5@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox