e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Mon Jan 10 18:26:39 PST 2000 

(Raster)

use LC_ALL


SVN revision: 1892
This commit is contained in:
Carsten Haitzler 2000-01-10 12:22:58 +00:00
parent d032bb0e51
commit 718a61673b
8 changed files with 75 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -4148,3 +4148,10 @@ Thu Jan 6 12:23:56 PST 2000
(Mandrake)
updated copyrights to say 2000. muahahaha.
-------------------------------------------------------------------------------
Mon Jan 10 18:26:39 PST 2000
(Raster)
use LC_ALL

7
src/actions.c
View File

@ -3776,10 +3776,15 @@ doZoom(void *params)
"Server and thus isn't tested much.\n" "\n"
"It is possible your X Server does not deal well with being\n"
"asked to switch modes quickly and it may hang, glitch,\n"
<<<<<<< actions.c
"display artifacts or perhaps simply refuse to work.\n" "\n"
"This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n"
== == == =
"display artefacts or perhaps simply refuse to work.\n" "\n"
"This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n"
"have to avoid using this feature.\n"));
>>>>>>> 1.49 "have to avoid using this feature.\n"));
EDBUG_RETURN(0);
}
ewin = GetFocusEwin();

6
src/file.c
View File

@ -54,10 +54,10 @@ Etmp(char *s)
n_calls = (unsigned long)time(NULL) + (unsigned long)getpid();
Esnprintf(s, 1024, "%s/TMP_%Xl", UserEDir(), n_calls);
n_calls++;
EDBUG_RETURN_;
<<<<<<<file.c EDBUG_RETURN_}
== == == = EDBUG_RETURN_;
}
void
>>>>>>>1.10 void
md(char *s)
{
EDBUG(9, "md");

21
src/fx.c
View File

@ -254,10 +254,17 @@ FX_ripple_timeout(int val, void *data)
_("\n"
"You have just started the Ripples Effect.\n"
"\n"
<<<<<<< fx.c
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (ie has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"ripples\".\n"
== == == =
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"ripples\".\n"
>>>>>>> 1.10
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
@ -421,10 +428,17 @@ FX_raindrops_timeout(int val, void *data)
_("\n"
"You have just started the Raindrops Effect.\n"
"\n"
<<<<<<< fx.c
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (ie has a background texture or\n"
"image), you will see \"raindrops\" hit the background and\n"
"make little splashes. This Effect can be VERY CPU intensive.\n"
== == == =
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see \"raindrops\" hit the background and\n"
"make little splashes. This Effect can be VERY CPU intensive.\n"
>>>>>>> 1.10
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
@ -716,10 +730,17 @@ FX_Wave_timeout(int val, void *data)
_("\n"
"You have just started the Waves Effect.\n"
"\n"
<<<<<<< fx.c
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid color (ie has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"waves\".\n"
== == == =
"If you look closely on your desktop background, and if it\n"
"doesn't have a solid colour (i.e. has a background texture or\n"
"image), you will see a pool of water at the bottom of your\n"
"screen that reflects everything above it and \"waves\".\n"
>>>>>>> 1.10
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));

11
src/handlers.c
View File

@ -219,8 +219,13 @@ EHandleXError(Display * d, XErrorEvent * ev)
"You will have to quit your current Window Manager first before\n"
"you can successfully run Enlightenment.\n"
"\n"
<<<<<<< handlers.c
"If you haven't edited your user startup files, Enlightenment\n"
"can do that now for you, so when you log in again after\n"
== == == =
"If you haven't edited your user start-up files, Enlightenment\n"
"can do that now for you, so when you log in again after\n"
>>>>>>> 1.12
"quitting your current window manager, you will have\n"
"Enlightenment running.\n"
"\n"
@ -234,9 +239,13 @@ EHandleXError(Display * d, XErrorEvent * ev)
_("YES (edit file)"), "", _("NO (do not edit)"));
Alert(_
("Are you absolutely sure you want to have Enlightenment\n"
<<<<<<< handlers.c
"edit your startup files for you?\n" "\n"
"If your startup files are highly customised this may not\n"
== == == =
"edit your start-up files for you?\n" "\n"
"If your start-up files are highly customised this may not\n"
"work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
>>>>>>> 1.12 "work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
RESET_ALERT;
AddE();
EExit((void *)1);

2
src/main.c
View File

@ -59,7 +59,7 @@ main(int argc, char **argv)
/* Part of gettext stuff */
setlocale(LC_MESSAGES, "");
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);

4
src/memory.c
View File

@ -298,7 +298,11 @@ _("Quit Enlightenment"));
_("Restart Enlightenment"), _("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n"
"\n"
<<<<<<< memory.c
"Re-allocation for %i bytes (%3.0f Kb or %3.1f Mb) did not succeed.\n"
== == == =
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
>>>>>>> 1.14
"\n"
"Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n"

46
src/setup.c
View File

@ -330,8 +330,10 @@ SetupX()
Alert(_("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialise Imlib.\n"
"\n" "This is unusual. Unable to continue.\n" "Exiting.\n"));
RESET_ALERT;
<<<<<<< setup.c
"\n" "This is unusual. Unable to contiune.\n" "Exiting.\n"));
== == == = "\n" "This is unusual. Unable to continue.\n" "Exiting.\n"));
>>>>>>>1.35 RESET_ALERT;
EExit((void *)1);
}
fd = Fnlib_init(id);
@ -342,8 +344,10 @@ SetupX()
Alert(_("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialise Fnlib.\n"
"\n" "This is unusual. Unable to continue.\n" "Exiting.\n"));
RESET_ALERT;
<<<<<<< setup.c
"\n" "This is unusual. Unable to contiune.\n" "Exiting.\n"));
== == == = "\n" "This is unusual. Unable to continue.\n" "Exiting.\n"));
>>>>>>>1.35 RESET_ALERT;
EExit((void *)1);
}
root.win = id->x.root;
@ -430,13 +434,13 @@ SetupX()
/* ok under Xfree Numlock and Scollock are lock modifiers and we need */
/* to hunt them down to mask them out - EVIL EVIL EVIL hack but needed */
{
XModifierKeymap *mod;
XModifierKeymap * mod;
KeyCode nl, sl;
int i;
int masks[8] = {
int masks[8] =
{
ShiftMask, LockMask, ControlMask, Mod1Mask, Mod2Mask, Mod3Mask,
Mod4Mask, Mod5Mask
};
Mod4Mask, Mod5Mask};
mod = XGetModifierMapping(disp);
nl = XKeysymToKeycode(disp, XK_Num_Lock);
@ -611,8 +615,7 @@ SetupX()
static void ChkDir(char *d);
static void
ChkDir(char *d)
static void ChkDir(char *d)
{
if (!isdir(d))
{
@ -646,8 +649,7 @@ ChkDir(char *d)
}
}
void
SetupDirs()
void SetupDirs()
{
char s[1024], ss[1024], *home;
@ -710,8 +712,7 @@ SetupDirs()
EDBUG_RETURN_;
}
void
SetupEnv()
void SetupEnv()
{
char s[1024];
@ -735,9 +736,9 @@ SetupEnv()
return;
}
Window MakeExtInitWin(void)
Window MakeExtInitWin(void)
{
Display *d2;
Display * d2;
Window win;
XGCValues gcv;
GC gc;
@ -746,10 +747,10 @@ Window MakeExtInitWin(void)
CARD32 val;
int format_ret, i;
unsigned long bytes_after, num_ret;
Window *retval;
Window * retval;
XSetWindowAttributes attr;
ImlibData *imd;
ImlibData * imd;
a = XInternAtom(disp, "ENLIGHTENMENT_RESTART_SCREEN", False);
XSync(disp, False);
@ -846,9 +847,9 @@ Window MakeExtInitWin(void)
else
{
Window w2, ww;
char *f, s[1024];
char * f, s[1024];
Pixmap pmap, mask;
ImlibImage *im;
ImlibImage * im;
struct timeval tv;
int dd, x, y;
unsigned int mm;
@ -926,11 +927,10 @@ Window MakeExtInitWin(void)
exit(0);
}
void
SetupUserInitialization(void)
void SetupUserInitialization(void)
{
FILE *f;
FILE * f;
char file[FILEPATH_LEN_MAX];
EDBUG(3, "SetupUserInitialization");