Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / langs / en / install / lang_en.c

diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c
index 2977a20439524dc6580c46d594457f7241296168..87f8d2fa9158ff6a4b06d1c7d2dc973b253a1047 100644 (file)
--- 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 */
@@ -560,17 +560,31 @@ char *en_tr[] = {
 /* TR_IGNORE */
 "Ignore",
 /* TR_PPP_DIALUP */
-"PPP DIALUP (PPPoE, Modem, ATM ...)",
+"PPP DIALUP (PPPoE, modem, ATM ...)",
 /* TR_DHCP */
 "DHCP",
 /* TR_DHCP_STARTSERVER */
-"Starting DHCP-Server ...",
+"Starting DHCP-server ...",
 /* TR_DHCP_STOPSERVER */
-"Stopping DHCP-Server ...",
+"Stopping DHCP-server ...",
 /* TR_LICENSE_ACCEPT */
 "I accept this license.",
 /* TR_LICENSE_NOT_ACCEPTED */
 "License not accepted. Exit!",
-
-}; 
-  
+/* TR_EXT2FS_DESCR */
+"Ext2 - Filesystem without journal (suggested for flashdrives)",
+/* TR_EXT3FS_DESCR */
+"Ext3 - Filesystem with journal",
+/* TR_EXT4FS_DESCR */
+"Ext4 - Filesystem with journal",
+/* TR_REISERFS_DESCR */
+"ReiserFS - Filesystem with journal",
+/* TR_NO_LOCAL_SOURCE */
+"No local source media found. Starting download.",
+/* TR_DOWNLOADING_ISO */
+"Downloading Installation-Image ...",
+/* TR_DOWNLOAD_ERROR */
+"Error while downloading!",
+/* TR_DHCP_FORCE_MTU */
+"Force DHCP mtu:",
+};