ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/user_strings_unix.cpp

Comparing SheepShaver/src/Unix/user_strings_unix.cpp (file contents):
Revision 1.14 by gbeauche, 2005-11-27T16:01:59Z vs.
Revision 1.17 by gbeauche, 2006-05-01T22:33:34Z

#	Line 26 | Line 26
26		user_string_def platform_strings[] = {
27		// Common strings that have a platform-specific variant
28		{STR_VOLUME_IS_MOUNTED_WARN, "The volume '%s' is mounted under Linux. Basilisk II will try to unmount it."},
29	<	{STR_EXTFS_CTRL, "Linux Root"},
30	<	{STR_EXTFS_NAME, "Linux Directory Tree"},
31	<	{STR_EXTFS_VOLUME_NAME, "Linux"},
29	>	{STR_EXTFS_CTRL, "Unix Root"},
30	>	{STR_EXTFS_NAME, "Unix Directory Tree"},
31	>	{STR_EXTFS_VOLUME_NAME, "Unix"},
32
33		// Purely platform-specific strings
34		{STR_NO_DEV_ZERO_ERR, "Cannot open /dev/zero: %s."},
#	Line 42 | Line 42 | user_string_def platform_strings[] = {
42		{STR_DR_EMULATOR_MMAP_ERR, "Cannot map DR Emulator: %s."},
43		{STR_SHEEP_MEM_MMAP_ERR, "Cannot map SheepShaver Data area: %s."},
44		{STR_SIGALTSTACK_ERR, "Cannot install alternate signal stack (%s). It seems that you need a newer kernel."},
45	<	{STR_SIGSEGV_INSTALL_ERR, "Cannot install SIGSEGV handler: %s."},
46	<	{STR_SIGILL_INSTALL_ERR, "Cannot install SIGILL handler: %s."},
47	<	{STR_SIGUSR2_INSTALL_ERR, "Cannot install SIGUSR2 handler (%s). It seems that you need a newer libc."},
45	>	{STR_SIG_INSTALL_ERR, "Cannot install %s handler (%s)."},
46		{STR_NO_XSERVER_ERR, "Cannot connect to X server %s."},
47		{STR_NO_XVISUAL_ERR, "Cannot obtain appropriate X visual."},
48		{STR_UNSUPP_DEPTH_ERR, "Unsupported color depth of screen."},
49		{STR_PROC_CPUINFO_WARN, "Cannot open /proc/cpuinfo (%s). Assuming 100MHz PowerPC 604."},
50	+	{STR_BLOCKING_NET_SOCKET_WARN, "Cannot set non-blocking I/O to net socket (%s). Ethernet will not be available."},
51		{STR_NO_SHEEP_NET_DRIVER_WARN, "Cannot open %s (%s). Ethernet will not be available."},
52		{STR_SHEEP_NET_ATTACH_WARN, "Cannot attach to Ethernet card (%s). Ethernet will not be available."},
53		{STR_TUN_TAP_CONFIG_WARN, "Cannot configure TUN/TAP device (%s). Ethernet will not be available."},
#	Line 85 | Line 84 | user_string_def platform_strings[] = {
84		{STR_OPEN_WINDOW_ERR, "Cannot open Mac window."},
85		{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
86
87	+	{STR_NO_B2_EXE_FOUND, "Could not start %s (%s)."},
88	+
89		{-1, NULL}      // End marker
90		};
91

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines