From: <ow...@us...> - 2007-10-31 08:11:07
|
Revision: 605 http://ipcop.svn.sourceforge.net/ipcop/?rev=605&view=rev Author: owes Date: 2007-10-31 01:11:10 -0700 (Wed, 31 Oct 2007) Log Message: ----------- Prepare more texts for lang database. Try different approac for lang selection, still does not look pretty. Modified Paths: -------------- ipcop/trunk/src/installer/installer.c ipcop/trunk/src/installer/language.c Modified: ipcop/trunk/src/installer/installer.c =================================================================== --- ipcop/trunk/src/installer/installer.c 2007-10-31 07:10:52 UTC (rev 604) +++ ipcop/trunk/src/installer/installer.c 2007-10-31 08:11:10 UTC (rev 605) @@ -47,8 +47,7 @@ int assumed_default_network = -1; //future use? char *values[] = { "http://192.168.10.203/iso", NULL }; /* pointers for the values. */ -/*TR*/ - statuswindow(60, 4, get_title(), gettext("Searching Networks.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_SEARCH_NETWORKS")); for (i = 0; i < nummodules; i++) { if (module_type[i] == hw_network_ctrl) @@ -94,8 +93,7 @@ snprintf(string, STRING_SIZE, "/bin/wget -O /tmp/"SNAME "-" VERSION "-varlog.tar.gz %s/" SNAME "-" VERSION "-varlog.tar.gz", message); -/*TR*/ - statuswindow(60, 4, get_title(), gettext("Downloading tarballs.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_DOWNLOADING_IMAGE")); if (!mysystem(string)) { snprintf(string, STRING_SIZE, @@ -103,8 +101,6 @@ SNAME "-" VERSION "-config.tar.gz", message); if (!mysystem(string)) { - // do not test for squashfs, might be absent - // owes: is this really true ? What do we do if squashfs is absent ? snprintf(string, STRING_SIZE, "/bin/wget -O /tmp/"SNAME "-" VERSION ".tar.gz %s/" SNAME "-" VERSION ".tar.gz", message); @@ -173,24 +169,21 @@ fprintf(flog, "Couldn't create /dev/cdrom\n"); } -/*TR*/ - statuswindow(60, 4, get_title(), gettext("Mounting CDROM.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_MOUNTING_CDROM")); /* we should retry here */ if (mysystem("/bin/mount -o ro /dev/cdrom /cdrom")) { fprintf(flog, "Failed to mount CDROM\n"); -/*TR*/ newtWinMessage(get_title(), gettext("TR_OK"), gettext("TR_CDROM_ERROR")); newtPopWindow(); continue; } - statuswindow(60, 4, get_title(), gettext("Copying over temporary files.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_COPYING_TEMP_FILES")); // copy files to /tmp if (mysystem("/bin/cp /cdrom/"SNAME "-" VERSION "-varlog.tar.gz /tmp")) { fprintf(flog, "Failed to copy from CDROM\n"); -/*TR*/ newtWinMessage(get_title(), gettext("TR_OK"), gettext("TR_CDROM_FILE_ERROR")); newtPopWindow(); continue; @@ -234,8 +227,8 @@ char *cmd_line_parm; // Choose the disk to use -/*TR*/ rc = newtWinMenu(gettext("Select Hard Disk"), -/*TR*/ gettext("Select the device you wish to use for the installation."), + rc = newtWinMenu(gettext("TR_SELECT_HARDDISK"), + gettext("TR_SELECT_DEVICE_FOR_INSTALLATION"), 50, 5, 5, 8, harddisklist, ddisk, @@ -288,7 +281,6 @@ printf("Failed to open /dev/tty5 for logging\n"); exit(0); } - fstderr = freopen("/dev/tty6", "w+", stderr); // read the parameters from the kernel cmdline @@ -314,6 +306,7 @@ // first things first, installer language setlanguage(kv); + /* Starting here we have a language selected, use gettext to get translated texts */ char *install_status = gettext("TR_INSTALLATION_CANCELED"); @@ -342,8 +335,7 @@ fprintf(flog, "Skip SCSI detection\n"); } -/*TR*/ - statuswindow(60, 4, get_title(), gettext("Probing Hardware.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_PROBING_HARDWARE")); // find nics cdrom harddisk & floppies scanhardware(nopcmcia, nousb); @@ -407,8 +399,7 @@ // /harddisk/boot sometimes mounted // /harddisk/var/log sometimes mounted -/*TR*/ - statuswindow(60, 4, get_title(), gettext("Creating IPCop configuration.... Please Wait!")); + statuswindow(60, 4, get_title(), gettext("TR_CREATING_CONFIG")); /* Mount filesystems necessary??? */ mysystem("/bin/mount -n -t sysfs none /harddisk/sys"); @@ -447,7 +438,7 @@ // All done, just have to unmount everything... statuswindow(60, 4, get_title(), -/*TR*/ gettext("Unmounting Filesystems.... Please Wait!")); + gettext("TR_UNMOUNTING")); mysystem("/bin/umount -n /harddisk/dev"); mysystem("/bin/umount -n /harddisk/proc"); Modified: ipcop/trunk/src/installer/language.c =================================================================== --- ipcop/trunk/src/installer/language.c 2007-10-31 07:10:52 UTC (rev 604) +++ ipcop/trunk/src/installer/language.c 2007-10-31 08:11:10 UTC (rev 605) @@ -1,5 +1,5 @@ /* - * lang.c: Language selection + * language.c: Language selection * * This program is distributed under the terms of the GNU General Public * Licence. See the file COPYING for details. @@ -26,16 +26,16 @@ char *langnames[] = { "English (British)", NULL }; char *install_locale[] = { "en_GB", NULL }; #else - char *langnames[] = { "Portugu\xEAs (Brazil)", "Cestina", + char *langnames[] = { "Português (Brazil)", "Cestina", "Dansk", "Deutsch", - "English (British)", "Espa\xF1ol", - "Fran\xE7ais", "Hellenic", + "English (British)", "Español", + "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", - "Portugu\xEAs", "Soomali", + "Português", "Soomali", "Suomi", "Svenska", - "T\xFCrk\xE7e", "Tieng Viet", + "Türkçe", "Tieng Viet", NULL }; char *install_locale[] = { "pt_BR", "cs_CZ", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |