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 bb76aae4c5cbd50224c0955153ff2702ba50774e..87f8d2fa9158ff6a4b06d1c7d2dc973b253a1047 100644 (file)
--- a/langs/en/install/lang_en.c
+++ b/langs/en/install/lang_en.c
@@ -1,7 +1,7 @@
 /*
  * English (en) Data File
  *
- * This file is part of the IPCop Firewall.
+ * This file is part of the IPFire.
  * 
  * IPCop is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
  * along with IPCop; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  * 
+ * (c) IPFire Team  <info@ipfire.org>
+ *
+ * based on work of SmoothWall and IPCop
+ *
  * (c) The SmoothWall Team
  *  
  */
@@ -25,13 +29,21 @@
 
 char *en_tr[] = {
 
+/* TR_ISDN */
+"ISDN",
+/* TR_ERROR_PROBING_ISDN */
+"Unable to scan for ISDN devices.",
+/* TR_PROBING_ISDN */
+"Scanning and configuring ISDN devices.",
+/* TR_MISSING_GREEN_IP */
+"Missing Green IP!",
 /* TR_CHOOSE_FILESYSTEM */
 "Please choose your filesystem:",
 /* TR_NOT_ENOUGH_INTERFACES */
 "Not enough netcards for your choice.\n\nNeeded: %d - Available: %d\n",
 /* TR_INTERFACE_CHANGE */
 "Please choose the interface you wish to change.\n\n",
-/* TR_METCARD_COLOR */
+/* TR_NETCARD_COLOR */
 "Assigned Cards",
 /* TR_REMOVE */
 "Remove",
@@ -48,7 +60,7 @@ char *en_tr[] = {
 /* TR_ERROR_INTERFACES */
 "There are no free interfaces on your system.",
 /* TR_REMOVE_CARD */
-"Should the allocation for the networkcard be deleted?",
+"Should the allocation for the networkcard be deleted? - %s",
 /* TR_JOURNAL_ERROR */
 "Could not create the journal, using fallback to ext2.",
 /* TR_FILESYSTEM */
@@ -92,7 +104,7 @@ char *en_tr[] = {
 /* TR_CONGRATULATIONS_LONG */
 "%s was successfully installed. Please remove any CDROMs in the computer. Setup will now run where you may configure ISDN, network cards, and the system passwords. After Setup has been completed, you should point your web browser at https://%s:444 (or whatever you name your %s), and configure dialup networking (if required) and remote access.",
 /* TR_CONTINUE_NO_SWAP */
-"Your harddisk is very small, but you can continue without any swap. (Use with caution).",
+"Your harddisk is very small, but you can continue with an very small swap. (Use with caution).",
 /* TR_CURRENT_CONFIG */
 "Current config: %s%s",
 /* TR_DEFAULT_GATEWAY */
@@ -212,7 +224,7 @@ char *en_tr[] = {
 /* TR_INSTALLING_LANG_CACHE */
 "Installing language files...",
 /* TR_INTERFACE */
-"%s interface",
+"Interface - %s",
 /* TR_INTERFACE_FAILED_TO_COME_UP */
 "Interface failed to come up.",
 /* TR_INVALID_FIELDS */
@@ -342,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 */
@@ -416,7 +428,7 @@ char *en_tr[] = {
 /* TR_SETTING_SETUP_PASSWORD */
 "TO BE REMOVED",
 /* TR_SETUP_FINISHED */
-"Setup is complete.  Press Ok to reboot.",
+"Setup is complete.  Press Ok.",
 /* TR_SETUP_NOT_COMPLETE */
 "Initial setup was not entirely complete.  You must ensure that Setup is properly finished by running setup again at the shell.",
 /* TR_SETUP_PASSWORD */
@@ -545,5 +557,34 @@ char *en_tr[] = {
 "No",
 /* TR_AS */
 "as",
-}; 
-  
+/* TR_IGNORE */
+"Ignore",
+/* TR_PPP_DIALUP */
+"PPP DIALUP (PPPoE, modem, ATM ...)",
+/* TR_DHCP */
+"DHCP",
+/* TR_DHCP_STARTSERVER */
+"Starting DHCP-server ...",
+/* TR_DHCP_STOPSERVER */
+"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:",
+};