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

Tue Dec 21 08:02:15 PST 1999 

(Raster)

add in patches from 2 AUTHORS for internationalisation...


SVN revision: 1710
This commit is contained in:
Carsten Haitzler 1999-12-21 08:09:27 +00:00
parent 8b745084dc
commit aaafb5a652
27 changed files with 2853 additions and 2866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -4070,3 +4070,10 @@ Thu Dec 16 18:28:59 PST 1999
(Mandrake)
this is a test commit to see if the list works again.
-------------------------------------------------------------------------------
Tue Dec 21 08:02:15 PST 1999
(Raster)
add in patches from 2 AUTHORS for internationalisation...

4
src/E.h
View File

@ -244,13 +244,13 @@ int Esnprintf(va_alist);
/* This is a start to providing internationalization by means */
/* of gettext */
/* #ifdef HAVE_GETTEXT */
#include <locale.h>
#include <libintl.h>
#define _(String) gettext (String)
/* #define _(String) gettext (String) */
/* #endif */
#define TT_VALID( handle ) ( ( handle ).z != NULL )
#ifndef MAX

72
src/actions.c
View File

@ -660,7 +660,7 @@ runApp(char *exe, char *params)
#else
if (_fnisabs((char *)exe))
#endif
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -668,7 +668,7 @@ runApp(char *exe, char *params)
(char *)exe);
/* relative path */
else
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -688,7 +688,7 @@ runApp(char *exe, char *params)
{
/* can execute it */
if (canexec((char *)path))
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -699,7 +699,7 @@ runApp(char *exe, char *params)
"into this.\n"), (char *)path);
/* not executable file */
else
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -715,7 +715,7 @@ runApp(char *exe, char *params)
{
/* its a dir */
if (isdir((char *)path))
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -723,7 +723,7 @@ runApp(char *exe, char *params)
"a directory.\n"), (char *)path);
/* its not a file or a dir */
else
DialogAlertOK(gettext
DialogAlertOK(_
("There was an error running the program:\n"
"%s\n"
"This program could not be executed.\n"
@ -3136,7 +3136,7 @@ doAbout(void *params)
{
char stuff[255];
Esnprintf(stuff, sizeof(stuff), gettext("About Enlightenment %s"),
Esnprintf(stuff, sizeof(stuff), _("About Enlightenment %s"),
ENLIGHTENMENT_VERSION);
DialogSetTitle(d, stuff);
}
@ -3152,29 +3152,29 @@ doAbout(void *params)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
gettext("Welcome to the "
ENLIGHTENMENT_VERSION
" version\n"
"of the Enlightenment "
"window manager.\n Enlightenment is still under "
"development, but\n"
"we have tried to iron out all the bugs "
"that\nwe can find. If "
"you find a bug in the software,\n please do "
"not hesitate to send "
"in a bug report.\nSee \"Help\" for information "
"on joining the\n"
"mailing list.\n"
"\n"
"This code last updated on:\n"
E_CHECKOUT_DATE "\n"
"\n"
"Good luck. We hope you enjoy the software.\n"
"\n"
"The Rasterman - raster@rasterman.com\n"
"Mandrake - mandrake@mandrake.net\n"));
_("Welcome to the "
ENLIGHTENMENT_VERSION
" version\n"
"of the Enlightenment "
"window manager.\n Enlightenment is still under "
"development, but\n"
"we have tried to iron out all the bugs "
"that\nwe can find. If "
"you find a bug in the software,\n please do "
"not hesitate to send "
"in a bug report.\nSee \"Help\" for information "
"on joining the\n"
"mailing list.\n"
"\n"
"This code last updated on:\n"
E_CHECKOUT_DATE "\n"
"\n"
"Good luck. We hope you enjoy the software.\n"
"\n"
"The Rasterman - raster@rasterman.com\n"
"Mandrake - mandrake@mandrake.net\n"));
DialogAddButton(d, gettext("OK"), NULL, 1);
DialogAddButton(d, _("OK"), NULL, 1);
ShowDialog(d);
params = NULL;
@ -3327,7 +3327,7 @@ doConfigure(void *params)
if (ewin)
{
ChooseGroupDialog(ewin,
gettext
_
(" Pick the group the window will belong to: \n"),
GROUP_SELECT_ALL_EXCEPT_EWIN,
ACTION_ADD_TO_GROUP);
@ -3678,7 +3678,7 @@ doAddToGroup(void *params)
if (!current_group)
{
ChooseGroupDialog(ewin,
gettext
_
("\n There's no current group at the moment. \n"
" The current group is the last one you created, \n"
" and it exists until you create a new one or break \n"
@ -3712,7 +3712,7 @@ doRemoveFromGroup(void *params)
EDBUG_RETURN(0);
ChooseGroupDialog(ewin,
gettext
_
(" Select the group to remove the window from. "),
GROUP_SELECT_EWIN_ONLY, ACTION_REMOVE_FROM_GROUP);
@ -3738,7 +3738,7 @@ doBreakGroup(void *params)
EDBUG_RETURN(0);
ChooseGroupDialog(ewin,
gettext(" Select the group to break "),
_(" Select the group to break "),
GROUP_SELECT_EWIN_ONLY, ACTION_BREAK_GROUP);
SaveGroups();
@ -3765,12 +3765,12 @@ doZoom(void *params)
if (f)
{
fprintf(f,
gettext
_
("You have been warned about the dangers of Zoom mode\n"));
fclose(f);
}
DIALOG_OK(gettext("Warning !!!"),
gettext
DIALOG_OK(_("Warning !!!"),
_
("This feature is heavily reliant on a feature of your\n"
"X Server called the Vid Mode Extension. This feature exists\n"
"in XFree86 Servers, but is not a heavily used part of the\n"

8
src/alert.c
View File

@ -175,13 +175,13 @@ ShowAlert(char *text)
str2 = RestartText;
str3 = ExitText;
if (!title)
title = gettext("Enlightenment Error");
title = _("Enlightenment Error");
if (!str1)
str1 = gettext("Ignore");
str1 = _("Ignore");
if (!str2)
str2 = gettext("Restart");
str2 = _("Restart");
if (!str3)
str3 = gettext("Exit");
str3 = _("Exit");
#define DRAW_BOX_OUT(mdd, mgc, mwin, mx, my, mw, mh) \
if (colorful) { \

4098
src/borders.c
View File

File diff suppressed because it is too large Load Diff

8
src/comms.c
View File

@ -2206,10 +2206,10 @@ HandleComms(XEvent * ev)
char buf[FILEPATH_LEN_MAX];
Esnprintf(buf, sizeof(buf),
gettext("Received Unknown Client Message.\n"
"Client Name: %s\n" "Client Version: %s\n"
"Message Contents:\n\n" "%s\n"), s1, s2, s);
DIALOG_OK(gettext("E IPC Error"), buf);
_("Received Unknown Client Message.\n"
"Client Name: %s\n" "Client Version: %s\n"
"Message Contents:\n\n" "%s\n"), s1, s2, s);
DIALOG_OK(_("E IPC Error"), buf);
AUDIO_PLAY("SOUND_ERROR_IPC");
}
}

322
src/config.c
View File

@ -239,13 +239,13 @@ Config_Text(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -436,14 +436,14 @@ Config_Text(FILE * ConfigFile)
&ts->bg_col.r, &ts->bg_col.g, &ts->bg_col.b);
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current Text"
" definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current Text"
" definition:\n"
"%s\nWill ignore and continue...\n"), s);
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a text block. Outcome is likely not good.\n"));
}
@ -474,13 +474,13 @@ Config_Slideout(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -515,14 +515,14 @@ Config_Slideout(FILE * ConfigFile)
}
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current Text "
"definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current Text "
"definition:\n"
"%s\nWill ignore and continue...\n"), s);
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Slideout block. Outcome is likely not good.\n"));
}
@ -554,7 +554,7 @@ Config_Control(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (i1 != CONFIG_INVALID)
@ -562,7 +562,7 @@ Config_Control(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -794,14 +794,14 @@ Config_Control(FILE * ConfigFile)
break;
default:
RecoverUserConfig();
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current Control "
"definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current Control "
"definition:\n"
"%s\nWill ignore and continue...\n"), s);
}
}
RecoverUserConfig();
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Control block. Outcome is likely not good.\n"));
}
@ -828,13 +828,13 @@ Config_MenuStyle(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -912,7 +912,7 @@ Config_MenuStyle(FILE * ConfigFile)
break;
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Menu block. Outcome is likely not good.\n"));
}
@ -946,13 +946,13 @@ Config_Menu(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -1146,7 +1146,7 @@ Config_Menu(FILE * ConfigFile)
break;
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Menu block. Outcome is likely not good.\n"));
}
@ -1188,13 +1188,13 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -1284,7 +1284,7 @@ BorderPartLoad(FILE * ConfigFile, char type, Border * b)
break;
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a BorderPart block. Outcome is likely not good.\n"));
}
@ -1317,13 +1317,13 @@ Config_Border(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -1375,7 +1375,7 @@ Config_Border(FILE * ConfigFile)
}
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Main Border block. Outcome is likely not good.\n"));
}
@ -1423,7 +1423,7 @@ Config_Button(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (i1 != CONFIG_INVALID)
@ -1431,7 +1431,7 @@ Config_Button(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
i1 = CONFIG_INVALID;
}
@ -1594,7 +1594,7 @@ Config_Button(FILE * ConfigFile)
Efree(name);
RecoverUserConfig();
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Button block. Outcome is likely not good.\n"));
@ -1639,7 +1639,7 @@ Config_Desktop(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (ii1 != CONFIG_INVALID)
@ -1647,7 +1647,7 @@ Config_Desktop(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
ii1 = CONFIG_INVALID;
}
@ -1851,7 +1851,7 @@ Config_Desktop(FILE * ConfigFile)
Efree(bg2);
RecoverUserConfig();
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Desktop block. Outcome is likely not good.\n"));
@ -1887,13 +1887,13 @@ Config_ECursor(FILE * ConfigFile)
else if (ii1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (ii1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -1931,7 +1931,7 @@ Config_ECursor(FILE * ConfigFile)
Efree(name);
if (file)
Efree(file);
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading a Desktop block. Outcome is likely not good.\n"));
}
@ -1944,7 +1944,7 @@ Config_Iconbox(FILE * ConfigFile)
int i1;
int fields;
Alert(gettext("Easter Egg! Iconboxes aren't implemented yet.\n"));
Alert(_("Easter Egg! Iconboxes aren't implemented yet.\n"));
while (GetLine(s, sizeof(s), ConfigFile))
{
@ -1957,13 +1957,13 @@ Config_Iconbox(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -1975,7 +1975,7 @@ Config_Iconbox(FILE * ConfigFile)
break;
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading an Iconbox block. Outcome is likely not good.\n"));
}
@ -2011,7 +2011,7 @@ Config_Sound(FILE * ConfigFile)
AddItem(sc, sc->name, 0, LIST_TYPE_SCLASS);
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading an Sound block. Outcome is likely not good.\n"));
}
@ -2053,7 +2053,7 @@ Config_ActionClass(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (i1 != CONFIG_INVALID)
@ -2061,7 +2061,7 @@ Config_ActionClass(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -2265,10 +2265,10 @@ Config_ActionClass(FILE * ConfigFile)
break;
default:
RecoverUserConfig();
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current"
" ActionClass definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current"
" ActionClass definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
@ -2279,7 +2279,7 @@ Config_ActionClass(FILE * ConfigFile)
if (action_tooltipstring)
Efree(action_tooltipstring);
RecoverUserConfig();
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading an Action Class block. Outcome is likely not good.\n"));
}
@ -2310,13 +2310,13 @@ Config_ImageClass(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -2479,14 +2479,14 @@ Config_ImageClass(FILE * ConfigFile)
ICToRead = ic->sticky_active.disabled;
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"ImageClass definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"ImageClass definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading an ImageClass block. Outcome is likely not good.\n"));
}
@ -2527,7 +2527,7 @@ Config_ColorModifier(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (i1 != CONFIG_INVALID)
@ -2535,7 +2535,7 @@ Config_ColorModifier(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -2727,10 +2727,10 @@ Config_ColorModifier(FILE * ConfigFile)
break;
default:
RecoverUserConfig();
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
" ColorModifier definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
" ColorModifier definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
@ -2751,7 +2751,7 @@ Config_ColorModifier(FILE * ConfigFile)
Efree(by);
RecoverUserConfig();
Alert(gettext
Alert(_
("Warning: Configuration appears to have ended before we were\n"
"Done loading an ColorModifier block.\n"
"Outcome is likely not good.\n"));
@ -2791,13 +2791,13 @@ Config_ToolTip(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -2845,15 +2845,15 @@ Config_ToolTip(FILE * ConfigFile)
LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"ToolTip definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"ToolTip definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
"Done loading an ToolTip block. Outcome is likely not good.\n"));
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an ToolTip block. Outcome is likely not good.\n"));
}
@ -2884,14 +2884,14 @@ Config_FX(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
return;
}
}
RecoverUserConfig();
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
"Done loading an FX block. Outcome is likely not good.\n"));
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an FX block. Outcome is likely not good.\n"));
}
void
@ -2926,16 +2926,16 @@ Config_Extras(FILE * ConfigFile)
return;
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"Extras definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"Extras definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
RecoverUserConfig();
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
"Done loading an Extras block. Outcome is likely not good.\n"));
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an Extras block. Outcome is likely not good.\n"));
}
void
@ -2961,7 +2961,7 @@ Config_Ibox(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
switch (i1)
{
@ -3024,16 +3024,16 @@ Config_Ibox(FILE * ConfigFile)
return;
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"Iconbox definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"Iconbox definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
RecoverUserConfig();
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
"Done loading an Iconbox block. Outcome is likely not good.\n"));
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an Iconbox block. Outcome is likely not good.\n"));
}
void
@ -3062,13 +3062,13 @@ Config_WindowMatch(FILE * ConfigFile)
else if (i1 == CONFIG_CLOSE)
{
if (fields != 1)
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
else if (i1 != CONFIG_INVALID)
{
if (fields != 2)
{
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -3139,14 +3139,14 @@ Config_WindowMatch(FILE * ConfigFile)
bm->make_sticky = atoi(s2);
break;
default:
Alert(gettext("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"WindowMatch definition:\n"
"%s\nWill ignore and continue...\n"), s);
Alert(_("Warning: unable to determine what to do with\n"
"the following text in the middle of current "
"WindowMatch definition:\n"
"%s\nWill ignore and continue...\n"), s);
break;
}
}
Alert(gettext("Warning: Configuration appears to have ended before we were\n"
Alert(_("Warning: Configuration appears to have ended before we were\n"
"Done loading an WindowMatch block. Outcome is likely not good.\n"));
}
@ -3195,14 +3195,14 @@ OpenConfigFileForReading(char *path, char preprocess)
if ((!have_epp) && (!(isfile(epp_path)) && (canexec(epp_path))))
{
Alert(gettext("Help! Cannot find epp!\n"
"Enlightenment is looking for epp here:\n"
"%s\n"
"This is a FATAL ERROR.\n"
Alert(_("Help! Cannot find epp!\n"
"Enlightenment is looking for epp here:\n"
"%s\n"
"This is a FATAL ERROR.\n"
"This is probably due to either the program not existing or\n"
"it not being able to be executed by you.\n"),
"it not being able to be executed by you.\n"),
epp_path);
doExit(gettext("error"));
doExit(_("error"));
}
else
have_epp = 1;
@ -3384,7 +3384,7 @@ LoadOpenConfigFile(FILE * ConfigFile)
if (fields != 1)
{
RecoverUserConfig();
Alert(gettext("CONFIG: ignoring extra data in \"%s\"\n"), s);
Alert(_("CONFIG: ignoring extra data in \"%s\"\n"), s);
}
}
else if (i1 != CONFIG_INVALID)
@ -3392,7 +3392,7 @@ LoadOpenConfigFile(FILE * ConfigFile)
if (fields != 2)
{
RecoverUserConfig();
Alert(gettext("CONFIG: missing required data in \"%s\"\n"),
Alert(_("CONFIG: missing required data in \"%s\"\n"),
s);
}
}
@ -3402,33 +3402,33 @@ LoadOpenConfigFile(FILE * ConfigFile)
{
if (!is_autosave)
{
ASSIGN_ALERT(gettext("Theme versioning ERROR"),
gettext("Restart with Defaults"),
" ", gettext("Abort and Exit"));
Alert(gettext("ERROR:\n"
"\n"
"The configuration for the theme you are "
"running is\n"
"incompatible. It's config revision is %i. "
"It needs to\n"
"be marked as being revision %i\n"
"\n"
"Please contact the theme author or "
"maintainer and\n"
"inform them that in order for their theme "
"to function\n"
"with this version of Enlightenment, they "
"have to\n"
"update it to the current settings, and "
"then match\n"
"the revision number.\n"
"\n"
"If the theme revision is higher than "
"Enlightenment's\n"
"it may be that you haven't upgraded "
"Enlightenment for\n"
ASSIGN_ALERT(_("Theme versioning ERROR"),
_("Restart with Defaults"),
" ", _("Abort and Exit"));
Alert(_("ERROR:\n"
"\n"
"The configuration for the theme you are "
"running is\n"
"incompatible. It's config revision is %i. "
"It needs to\n"
"be marked as being revision %i\n"
"\n"
"Please contact the theme author or "
"maintainer and\n"
"inform them that in order for their theme "
"to function\n"
"with this version of Enlightenment, they "
"have to\n"
"update it to the current settings, and "
"then match\n"
"the revision number.\n"
"\n"
"If the theme revision is higher than "
"Enlightenment's\n"
"it may be that you haven't upgraded "
"Enlightenment for\n"
"a while and this theme takes advantages of new\n"
"features in Enlightenment in new versions.\n"),
"features in Enlightenment in new versions.\n"),
e_cfg_ver, min_e_cfg_ver);
RESET_ALERT;
doExit("restart_theme DEFAULT");
@ -3436,24 +3436,24 @@ LoadOpenConfigFile(FILE * ConfigFile)
else
{
mode.autosave = 0;
ASSIGN_ALERT(gettext("User Config Version ERROR"),
gettext("Restart with Defaults"),
" ", gettext("Abort and Exit"));
Alert(gettext("ERROR:\n"
"\n"
"The settings you are using are "
"incompatible with\n"
"this version of Enlightenment.\n"
"It's revision is %i It needs to be revision "
"%i to\n"
"be compatible.\n"
"\n"
"If you just upgraded to a new version of E\n"
ASSIGN_ALERT(_("User Config Version ERROR"),
_("Restart with Defaults"),
" ", _("Abort and Exit"));
Alert(_("ERROR:\n"
"\n"
"The settings you are using are "
"incompatible with\n"
"this version of Enlightenment.\n"
"It's revision is %i It needs to be revision "
"%i to\n"
"be compatible.\n"
"\n"
"If you just upgraded to a new version of E\n"
"Restarting with Defaults will remove your current\n"
"user preferences and start cleanly with system\n"
"defaults. You can then modify your "
"configuration to\n"
"your liking again safely.\n"),
"defaults. You can then modify your "
"configuration to\n"
"your liking again safely.\n"),
e_cfg_ver, min_e_cfg_ver);
RESET_ALERT;
doExit("restart");
@ -3653,17 +3653,17 @@ LoadEConfig(char *themelocation)
rm(ss);
mv(s, ss);
if (!isfile(ss))
Alert(gettext("WARNING!\n"
"There was an error writing the file:\n"
"%s\n"
"This may be due to lack of disk space, quota or\n"
"filesystem permissions.\n"), ss);
Alert(_("WARNING!\n"
"There was an error writing the file:\n"
"%s\n"
"This may be due to lack of disk space, quota or\n"
"filesystem permissions.\n"), ss);
}
strcpy(themename, themelocation);
theme = FindTheme(themelocation);
if (!theme)
{
Alert(gettext
Alert(_
("Enlightenment has just experienced some major problems in\n"
"attempting to load the theme you specified or the default\n"
"configuration directory:\n" "%s/config/\n"
@ -3731,7 +3731,7 @@ LoadEConfig(char *themelocation)
if ((i > 0) && (!p) && (!init_win_ext))
{
p =
CreateProgressbar(gettext("Enlightenment Starting..."), 400,
CreateProgressbar(_("Enlightenment Starting..."), 400,
16);
if (p)
ShowProgressbar(p);
@ -4159,11 +4159,11 @@ RecoverUserConfig(void)
{
if (is_autosave)
{
ASSIGN_ALERT(gettext("Recover system config?"),
gettext("Yes, Attempt recovery"),
gettext("Restart and try again"),
gettext("Quit and give up"));
Alert(gettext
ASSIGN_ALERT(_("Recover system config?"),
_("Yes, Attempt recovery"),
_("Restart and try again"),
_("Quit and give up"));
Alert(_
("Enlightenment has encountered parsing errors in your autosaved\n"
"configuration.\n" "\n"
"This may be due to filing system errors, Minor bugs or"

8
src/desktops.c
View File

@ -1106,7 +1106,7 @@ InitDesktopControls()
if (i > 0)
{
ac->tooltipstring =
duplicate(gettext
duplicate(_
("Hold down the mouse button " "and drag\n"
"the mouse to be able to " "drag the desktop\n"
"back and forth.\n" "Click right mouse button "
@ -1118,7 +1118,7 @@ InitDesktopControls()
else
{
ac->tooltipstring =
duplicate(gettext
duplicate(_
("This is the Root desktop.\n"
"You cannot drag the " "root desktop around.\n"
"Click right mouse button "
@ -1140,7 +1140,7 @@ InitDesktopControls()
Esnprintf(param, 3, "%i", i);
AddToAction(a, ACTION_DESKTOP_RAISE, param);
ac2->tooltipstring =
duplicate(gettext
duplicate(_
("Click here to raise this desktop\n"
"to the top.\n"));
}
@ -1156,7 +1156,7 @@ InitDesktopControls()
Esnprintf(param, 3, "%i", i);
AddToAction(a, ACTION_DESKTOP_LOWER, param);
ac3->tooltipstring =
duplicate(gettext
duplicate(_
("Click here to lower this desktop\n"
"to the bottom.\n"));
}

2
src/dialog.c
View File

@ -301,7 +301,7 @@ DialogAlertOK(char *fmt,...)
va_start(ap, fmt);
Evsnprintf(text, 10240, fmt, ap);
va_end(ap);
ASSIGN_ALERT(gettext("Attention !!!"), gettext("OK"), " ", " ");
ASSIGN_ALERT(_("Attention !!!"), _("OK"), " ", " ");
Alert(text);
RESET_ALERT;
}

88
src/fx.c
View File

@ -251,17 +251,17 @@ FX_ripple_timeout(int val, void *data)
gc = XCreateGC(disp, fx_ripple_win, GCSubwindowMode, &gcv);
gc1 = XCreateGC(disp, fx_ripple_win, 0L, &gcv);
if (!before)
DIALOG_OK(gettext("Starting up Ripples FX..."),
gettext("\n"
"You have just started the Ripples Effect.\n"
"\n"
DIALOG_OK(_("Starting up Ripples FX..."),
_("\n"
"You have just started the Ripples Effect.\n"
"\n"
"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"
"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 \"ripples\".\n"
"\n"
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
"it off.\n"));
before = 1;
}
if (fx_ripple_count == 0)
@ -384,53 +384,53 @@ FX_raindrops_timeout(int val, void *data)
if (!id->x.shm)
{
DIALOG_OK(gettext("Unable to display raindrops"),
gettext("\n"
DIALOG_OK(_("Unable to display raindrops"),
_("\n"
"Enlightenment is unable to display raindrops on this\n"
"display because Shared memory is not available on this\n"
"X-Server.\n"
"\n"
"X-Server.\n"
"\n"
"This may be due to Enlightenment being a remote client\n"
"running over the network, a MIT-SHM incapable X-server,\n"
"having run out of SHM ID's on the system or Shared\n"
"Memory support being turned off in Imlib\n"
"\n"
"having run out of SHM ID's on the system or Shared\n"
"Memory support being turned off in Imlib\n"
"\n"
"You may correct this by either running `imlib_config'\n"
"or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
"and editing it, enabling shared memory.\n"
"\n"));
"and editing it, enabling shared memory.\n"
"\n"));
return;
}
if (!id->x.shmp)
{
DIALOG_OK(gettext("Unable to display raindrops"),
gettext("\n"
DIALOG_OK(_("Unable to display raindrops"),
_("\n"
"Enlightenment is unable to display raindrops on this\n"
"display because shared pixmaps are not available on this\n"
"X-Server.\n"
"\n"
"This may be due to either the X-Server not implementing\n"
"X-Server.\n"
"\n"
"This may be due to either the X-Server not implimenting\n"
"shared pixmaps, or shared pixmaps being disabled in\n"
"Imlib's configuration.\n"
"\n"
"Imlib's configuration.\n"
"\n"
"You may correct this by either running `imlib_config'\n"
"or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
"and editing it, enabling shared pixmaps.\n"
"\n"));
"and editing it, enabling shared pixmaps.\n"
"\n"));
return;
}
if (!before)
DIALOG_OK(gettext("Starting up Raindrops FX..."),
gettext("\n"
"You have just started the Raindrops Effect.\n"
"\n"
DIALOG_OK(_("Starting up Raindrops FX..."),
_("\n"
"You have just started the Raindrops Effect.\n"
"\n"
"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"
"doesn't have a solid color (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"
"\n"
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
"it off.\n"));
before = 1;
if (first)
{
@ -715,17 +715,17 @@ FX_Wave_timeout(int val, void *data)
gc = XCreateGC(disp, fx_wave_win, GCSubwindowMode, &gcv);
gc1 = XCreateGC(disp, fx_wave_win, 0L, &gcv);
if (!before)
DIALOG_OK(gettext("Starting up Waves FX..."),
gettext("\n"
"You have just started the Waves Effect.\n"
"\n"
DIALOG_OK(_("Starting up Waves FX..."),
_("\n"
"You have just started the Waves Effect.\n"
"\n"
"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"
"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"
"\n"
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
"it off.\n"));
before = 1;
}
@ -881,12 +881,12 @@ FX_imagespinner_timeout(int val, void *data)
else
fx_imagespinner_imd = id;
if (!before)
DIALOG_OK(gettext("Starting up imagespinners FX..."),
gettext("\n"
"You have just started the imagespinners Effect.\n"
"\n"
DIALOG_OK(_("Starting up imagespinners FX..."),
_("\n"
"You have just started the imagespinners Effect.\n"
"\n"
"To disable this effect just select this option again to toggle\n"
"it off.\n"));
"it off.\n"));
before = 1;
}
/* do stuff here */

30
src/groups.c
View File

@ -114,8 +114,8 @@ BuildWindowGroup(EWin ** ewins, int num)
AddEwinToGroup(ewins[i], g);
else
{
DIALOG_OK(gettext("Cannot comply"),
gettext
DIALOG_OK(_("Cannot comply"),
_
("Iconboxes and Pagers are disallowed from being\n"
"members of a group. You cannot add these windows\n"
"to a group.\n"));
@ -147,8 +147,8 @@ AddEwinToGroup(EWin * ewin, Group * g)
}
else
{
DIALOG_OK(gettext("Cannot comply"),
gettext
DIALOG_OK(_("Cannot comply"),
_
("Iconboxes and Pagers are disallowed from being\n"
"members of a group. You cannot add these windows\n"
"to a group.\n"));
@ -600,8 +600,8 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
if ((num_groups == 0)
&& (action == ACTION_BREAK_GROUP || action == ACTION_REMOVE_FROM_GROUP))
{
DIALOG_OK(gettext("Window Group Error"),
gettext
DIALOG_OK(_("Window Group Error"),
_
("\n This window currently does not belong to any groups. \n"
" You can only destroy groups or remove windows from groups \n"
" through a window that actually belongs to at least one group.\n\n"));
@ -609,16 +609,16 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
}
if ((num_groups == 0) && (group_select == GROUP_SELECT_ALL_EXCEPT_EWIN))
{
DIALOG_OK(gettext("Window Group Error"),
gettext("\n Currently, no groups exist or this window \n"
" already belongs to all existing groups. \n"
" You have to start other groups first. \n\n"));
DIALOG_OK(_("Window Group Error"),
_("\n Currently, no groups exist or this window \n"
" already belongs to all existing groups. \n"
" You have to start other groups first. \n\n"));
return;
}
if (!tmp_groups)
{
DIALOG_OK(gettext("Window Group Error"),
gettext
DIALOG_OK(_("Window Group Error"),
_
("\n Currently, no groups exist. You have to start a group first.\n\n"));
return;
}
@ -634,7 +634,7 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
AUDIO_PLAY("SOUND_SETTINGS_GROUP");
d = CreateDialog("GROUP_SELECTION");
DialogSetTitle(d, gettext("Window Group Selection"));
DialogSetTitle(d, _("Window Group Selection"));
table = DialogInitItem(d);
DialogItemTableSetOptions(table, 2, 0, 0, 0);
@ -691,8 +691,8 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, gettext("OK"), ChooseGroup, 1);
DialogAddButton(d, gettext("Close"), ChooseGroup, 1);
DialogAddButton(d, _("OK"), ChooseGroup, 1);
DialogAddButton(d, _("Close"), ChooseGroup, 1);
DialogSetExitFunction(d, ChooseGroup, 2, d);
DialogBindKey(d, "Escape", ChooseGroupEscape, 0, d);
DialogBindKey(d, "Return", ChooseGroup, 0, d);

76
src/handlers.c
View File

@ -56,14 +56,14 @@ HandleSigIll(int num)
num = 0;
if (disp)
UngrabX();
DialogAlert(gettext("Enlightenment performed an Illegal Instruction.\n"
"\n"
"This most likely is due to you having installed an run a\n"
DialogAlert(_("Enlightenment performed an Illegal Instruction.\n"
"\n"
"This most likely is due to you having installed an run a\n"
"binary of Enlightenment that was compiled for a make or model\n"
"of CPU not 100% identical or compatible with yours. Please\n"
"either obtain the correct package for your system, or\n"
"re-compile Enlightenment and possibly any support libraries\n"
"that you got in binary format to run Enlightenment.\n"));
"of CPU not 100%% identical or compatible with yours. Please\n"
"either obtain the correct package for your system, or\n"
"re-compile enlightenment and possibly any support libraries\n"
"that you got in binary format to run Enlightenment.\n"));
doExit("error");
EDBUG_RETURN_;
}
@ -84,16 +84,16 @@ HandleSigFpe(int num)
num = 0;
if (disp)
UngrabX();
DialogAlert(gettext("Enlightenment caused a Floating Point Exception.\n"
"\n"
DialogAlert(_("Enlightenment caused a Floating Point Exception.\n"
"\n"
"This means that Enlightenment or support library routines it calls\n"
"have performed an illegal mathematical operation (most likely\n"
"dividing a number by zero). This is most likely a bug. It is\n"
"recommended to restart now. If you wish to help fix this please\n"
"compile Enlightenment with debugging symbols in and run\n"
"compile Enlightenment with debugging symbols in and run\n"
"Enlightenment under gdb so you can backtrace for where it died and\n"
"send in a useful bug report with backtrace information and variable\n"
"dumps etc.\n"));
"dumps etc.\n"));
doExit("error");
EDBUG_RETURN_;
}
@ -109,16 +109,16 @@ HandleSigSegv(int num)
loop_count++;
if (disp)
UngrabX();
DialogAlert(gettext("Enlightenment caused Segment Violation (Segfault)\n"
"\n"
DialogAlert(_("Enlightenment caused Segment Violation (Segfault)\n"
"\n"
"This means that Enlightenment or support library routines it calls\n"
"have accessed areas of your system's memory that they are not\n"
"allowed access to. This is most likely a bug. It is recommended to\n"
"restart now. If you wish to help fix this please compile\n"
"restart now. If you wish to help fix this please compile\n"
"Enlightenment with debugging symbols in and run Enlightenment\n"
"under gdb so you can backtrace for where it died and send in a\n"
"useful bug report with backtrace information and variable\n"
"dumps etc.\n"));
"dumps etc.\n"));
abort();
num = 0;
EDBUG_RETURN_;
@ -193,11 +193,11 @@ HandleSigBus(int num)
num = 0;
if (disp)
UngrabX();
DialogAlert(gettext("Enlightenment caused Bus Error.\n"
"\n"
DialogAlert(_("Enlightenment caused Bus Error.\n"
"\n"
"It is suggested you check your hardware and OS installation.\n"
"It is highly unusual to cause Bus Errors on operational\n"
"hardware.\n"));
"It is highly unusual to cause Bus Errors on operational\n"
"hardware.\n"));
EDBUG_RETURN_;
}
@ -212,29 +212,29 @@ EHandleXError(Display * d, XErrorEvent * ev)
{
if ((!no_overwrite) && (mode.xselect))
{
ASSIGN_ALERT(gettext("Another Window Manager is already running"),
gettext("OK (edit file)"),
"", gettext("Cancel (do NOT edit)"));
Alert(gettext("Another Window Manager is already running.\n"
"\n"
ASSIGN_ALERT(_("Another Window Manager is already running"),
_("OK (edit file)"),
"", _("Cancel (do NOT edit)"));
Alert(_("Another Window Manager is already running.\n"
"\n"
"You will have to quit your current Window Manager first before\n"
"you can successfully run Enlightenment.\n"
"\n"
"you can successfully run Enlightenment.\n"
"\n"
"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"
"quitting your current window manager, you will have\n"
"Enlightenment running.\n"
"\n"
"If you want to do this, click OK, otherwise hit cancel\n"
"to abort this operation and edit the files by hand.\n"
"\n"
"WARNING WARNING WARNING WARNING!\n"
"\n"
"quitting your current window manager, you will have\n"
"Enlightenment running.\n"
"\n"
"If you want to do this, click OK, otherwise hit cancel\n"
"to abort this operation and edit the files by hand.\n"
"\n"
"WARNING WARNING WARNING WARNING!\n"
"\n"
"It is possible that this MAY not properly edit your files.\n"));
ASSIGN_ALERT(gettext("Are you sure?"),
gettext("YES (edit file)"),
"", gettext("NO (do not edit)"));
Alert(gettext
ASSIGN_ALERT(_("Are you sure?"),
_("YES (edit file)"),
"", _("NO (do not edit)"));
Alert(_
("Are you absolutely sure you want to have Enlightenment\n"
"edit your startup files for you?\n" "\n"
"If your startup files are highly customized this may not\n"

8
src/iconify.c
View File

@ -2422,19 +2422,19 @@ IB_ShowMenu(Iconbox * ib, int x, int y)
DestroyMenu(p_menu);
p_menu = CreateMenu();
AddTitleToMenu(p_menu, gettext("Iconbox Options"));
AddTitleToMenu(p_menu, _("Iconbox Options"));
p_menu->name = duplicate("__IBOX_MENU");
p_menu->style =
FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
Esnprintf(s, sizeof(s), "iconbox %s", ib->name);
mi =
CreateMenuItem(gettext("This Iconbox Settings..."), NULL, ACTION_CONFIG,
CreateMenuItem(_("This Iconbox Settings..."), NULL, ACTION_CONFIG,
s, NULL);
AddItemToMenu(p_menu, mi);
mi = CreateMenuItem(gettext("Close Iconbox"), NULL, ACTION_KILL, NULL, NULL);
mi = CreateMenuItem(_("Close Iconbox"), NULL, ACTION_KILL, NULL, NULL);
AddItemToMenu(p_menu, mi);
mi =
CreateMenuItem(gettext("Create New Iconbox"), NULL, ACTION_CREATE_ICONBOX,
CreateMenuItem(_("Create New Iconbox"), NULL, ACTION_CREATE_ICONBOX,
NULL, NULL);
AddItemToMenu(p_menu, mi);
AddItem(p_menu, p_menu->name, 0, LIST_TYPE_MENU);

18
src/ipc.c
View File

@ -4702,13 +4702,13 @@ IPC_Help(char *params, Client * c)
buf[0] = 0;
buf2[0] = 0;
numIPC = sizeof(IPCArray) / sizeof(IPCStruct);
Esnprintf(buf, sizeof(buf), gettext("Enlightenment IPC Commands Help"));
Esnprintf(buf, sizeof(buf), _("Enlightenment IPC Commands Help"));
if (!params)
{
strcat(buf, gettext("\ncommands currently available:\n"));
strcat(buf, _("\ncommands currently available:\n"));
strcat(buf,
gettext("use \"help all\" for descriptions of each command\n"
_("use \"help all\" for descriptions of each command\n"
"use \"help <command>\" for an individual description\n\n"));
commandname_list = Emalloc(numIPC * sizeof(char *));
@ -4745,10 +4745,10 @@ IPC_Help(char *params, Client * c)
{
if (!strcmp(params, "all"))
{
strcat(buf, gettext("\ncommands currently available:\n"));
strcat(buf, gettext("use \"help <command>\" "
"for an individual description\n"));
strcat(buf, gettext("<command> : <description>\n"));
strcat(buf, _("\ncommands currently available:\n"));
strcat(buf, _("use \"help <command>\" "
"for an individual description\n"));
strcat(buf, _("<command> : <description>\n"));
for (i = 0; i < numIPC; i++)
{
strcat(buf, IPCArray[i].commandname);
@ -4855,8 +4855,8 @@ IPC_Version(char *params, Client * c)
buf[0] = 0;
Esnprintf(buf, sizeof(buf),
gettext("Enlightenment Version : %s\n"
"code is current to : %s\n"),
_("Enlightenment Version : %s\n"
"code is current to : %s\n"),
ENLIGHTENMENT_VERSION, E_CHECKOUT_DATE);
/* Esnprintf(buf, sizeof(buf),
* "Enlightenment Version : %s\n"

12
src/main.c
View File

@ -59,7 +59,7 @@ main(int argc, char **argv)
/* Part of gettext stuff */
setlocale(LC_ALL, "");
setlocale(LC_MESSAGES, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@ -86,10 +86,10 @@ main(int argc, char **argv)
lists = memset(lists, 0, (sizeof(List) * LIST_TYPE_COUNT));
/* Set up all the text bits that belong on the GSOD */
AssignTitleText(gettext("Enlightenment Message Dialog"));
AssignIgnoreText(gettext("Ignore this"));
AssignRestartText(gettext("Restart Enlightenment"));
AssignExitText(gettext("Quit Enlightenment"));
AssignTitleText(_("Enlightenment Message Dialog"));
AssignIgnoreText(_("Ignore this"));
AssignRestartText(_("Restart Enlightenment"));
AssignExitText(_("Quit Enlightenment"));
/* We'll set up what the buttons do now, too */
AssignRestartFunction(doExit, "restart");
@ -175,7 +175,7 @@ main(int argc, char **argv)
(!strcmp("-version", argv[j])) ||
(!strcmp("--version", argv[j])) || (!strcmp("-v", argv[j])))
{
printf(gettext
printf(_
("Enlightenment Version: %s\nLast updated on: %s\n"),
ENLIGHTENMENT_VERSION, E_CHECKOUT_DATE);
exit(0);

100
src/memory.c
View File

@ -192,23 +192,23 @@ __Emalloc(int size, const char *file, int line)
{
if (disp)
UngrabX();
ASSIGN_ALERT(gettext("Cannot allocate enough memory"),
gettext("Ignore this"),
gettext("Restart Enlightenment"),
gettext("Quit Enlightenment"));
Alert(gettext("WARNING!!!!!!\n"
"\n"
"Allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
"\n"
"Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n"
ASSIGN_ALERT(_("Cannot allocate enough memory"),
_("Ignore this"),
_("Restart Enlightenment"),
_("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n"
"\n"
"Allocation for %i bytes (%3.0f Kb or %3.1f Mb) did not succeed.\n"
"\n"
"Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n"
"real and virtual memory and is unable to satisfy the request.\n"
"\n"
"If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n"
"\n"
"If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n"
"Enlightenment to use less resources by turning features off.\n"
"\n"
"The malloc requested was at %s, line %d\n "),
"\n"
"The malloc requested was at %s, line %d\n "),
size, (float)size / 1024, (float)size / (1024 * 1024), file,
line);
RESET_ALERT;
@ -273,11 +273,11 @@ __Erealloc(void *ptr, int size, const char *file, int line)
{
if (disp)
UngrabX();
ASSIGN_ALERT(gettext
ASSIGN_ALERT(_
("Error in reallocating memory that hasn't been allocated"),
gettext("Ignore this"), gettext("Restart Enlightenment"),
gettext("Quit Enlightenment"));
Alert(gettext
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB)\n"
"for pointer %x is attempting to re-allocate memory for a\n"
@ -294,23 +294,23 @@ __Erealloc(void *ptr, int size, const char *file, int line)
{
if (disp)
UngrabX();
ASSIGN_ALERT(gettext("Cannot allocate enough memory"),
gettext("Ignore this"),
gettext("Restart Enlightenment"),
gettext("Quit Enlightenment"));
Alert(gettext("WARNING!!!!!!\n"
"\n"
"Re-allocation for %i bytes (%3.0f kB or %3.1f MB) did not succeed.\n"
"\n"
"Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n"
ASSIGN_ALERT(_("Cannot allocate enough memory"),
_("Ignore this"),
_("Restart Enlightenment"),
_("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n"
"\n"
"Re-allocation for %i bytes (%3.0f Kb or %3.1f Mb) did not succeed.\n"
"\n"
"Either this is a bug where ridiculous amounts of memory\n"
"are being allocated, or your system has run out of both\n"
"real and virtual memory and is unable to satisfy the request.\n"
"\n"
"If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n"
"\n"
"If you have a low memory system it is suggested to either\n"
"purchase more memory, increase SWAP space, or reconfigure\n"
"Enlightenment to use less resources by turning features off.\n"
"\n"
"The realloc requested was at %s, line %d\n "),
"\n"
"The realloc requested was at %s, line %d\n "),
size, (float)size / 1024, (float)size / (1024 * 1024), file,
line);
RESET_ALERT;
@ -375,11 +375,11 @@ __Efree(void *ptr, const char *file, int line)
{
if (disp)
UngrabX();
ASSIGN_ALERT(gettext
ASSIGN_ALERT(_
("Error in freeing memory that hasn't been allocated"),
gettext("Ignore this"), gettext("Restart Enlightenment"),
gettext("Quit Enlightenment"));
Alert(gettext
_("Ignore this"), _("Restart Enlightenment"),
_("Quit Enlightenment"));
Alert(_
("WARNING!!!!!!\n" "\n"
"freeing for pointer %x is attempting to free memory for a\n"
"memory chunk that has not been allocated, or has already been\n"
@ -393,19 +393,19 @@ __Efree(void *ptr, const char *file, int line)
{
if (disp)
UngrabX();
ASSIGN_ALERT(gettext("Error in attempting to free NULL pointer"),
gettext("Ignore this (safe)"),
gettext("Restart Enlightenment"),
gettext("Quit Enlightenment"));
Alert(gettext("WARNING!!!!!!\n"
"\n"
"Enlightenment attempted to free a NULL pointer.\n"
"\n"
"This is definitely a bug. Please report it.\n"
ASSIGN_ALERT(_("Error in attempting to free NULL pointer"),
_("Ignore this (safe)"),
_("Restart Enlightenment"),
_("Quit Enlightenment"));
Alert(_("WARNING!!!!!!\n"
"\n"
"Enlightenment attempted to free a NULL pointer.\n"
"\n"
"This is definitely a bug. Please report it.\n"
"It is safe to ignore this error and continue running Enlightenment.\n"
"\n"
"The pointer value was %x.\n"
"The error occurred at %s, line %d.\n"), ptr, file, line);
"\n"
"The pointer value was %x.\n"
"The error occured at %s, line %d.\n"), ptr, file, line);
RESET_ALERT;
EDBUG_RETURN_;
}

10
src/menus.c
View File

@ -1915,7 +1915,7 @@ CreateMenuFromDesktops(char *name, MenuStyle * ms)
mm->style = ms;
Esnprintf(s, sizeof(s), "%i", j);
mi =
CreateMenuItem(gettext("Go to this Desktop"), NULL, ACTION_GOTO_DESK,
CreateMenuItem(_("Go to this Desktop"), NULL, ACTION_GOTO_DESK,
s, NULL);
AddItemToMenu(mm, mi);
for (i = 0; i < num; i++)
@ -1932,7 +1932,7 @@ CreateMenuFromDesktops(char *name, MenuStyle * ms)
}
}
mm->parent = m;
Esnprintf(s, sizeof(s), gettext("Desktop %i"), j);
Esnprintf(s, sizeof(s), _("Desktop %i"), j);
mi = CreateMenuItem(s, NULL, 0, NULL, mm);
AddItemToMenu(m, mi);
}
@ -1995,11 +1995,11 @@ CreateMenuFromGroups(char *name, MenuStyle * ms)
mm->style = ms;
Esnprintf(s, sizeof(s), "%i", lst[i]->members[0]->client.win);
mi =
CreateMenuItem(gettext("Show/Hide this group"), NULL,
CreateMenuItem(_("Show/Hide this group"), NULL,
ACTION_SHOW_HIDE_GROUP, s, NULL);
AddItemToMenu(mm, mi);
mi =
CreateMenuItem(gettext("Iconify this group"), NULL,
CreateMenuItem(_("Iconify this group"), NULL,
ACTION_ICONIFY, s, NULL);
AddItemToMenu(mm, mi);
@ -2012,7 +2012,7 @@ CreateMenuFromGroups(char *name, MenuStyle * ms)
AddItemToMenu(mm, mi);
}
mm->parent = m;
Esnprintf(s, sizeof(s), gettext("Group %i"), i);
Esnprintf(s, sizeof(s), _("Group %i"), i);
mi = CreateMenuItem(s, NULL, 0, NULL, mm);
AddItemToMenu(m, mi);
}

84
src/misc.c
View File

@ -58,30 +58,30 @@ BlumFlimFrub(void)
#endif
if (!exists(s))
{
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's utility executable cannot be found at:\n"
"\n"
"%s\n"
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's utility executable cannot be found at:\n"
"\n"
"%s\n"
"This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n"
"correctly.\n"
"\n"
"correctly.\n"
"\n"
"The reason this could be missing is due to badly created\n"
"packages, someone manually deleting that program or perhaps\n"
"an error in installing Enlightenment.\n"), s);
"an error in installing Enlightenment.\n"), s);
EExit(NULL);
}
if (!canexec(s))
{
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's dox executable is not able to be executed:\n"
"\n"
"%s\n"
"\n"
"%s\n"
"This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure dox is installed\n"
"correctly.\n"), s);
"correctly.\n"), s);
EExit(NULL);
}
Esnprintf(s, sizeof(s), "%s/dox", ENLIGHTENMENT_BIN);
@ -96,17 +96,17 @@ BlumFlimFrub(void)
#endif
if (!exists(s))
{
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's documentation is not present or correctly installed\n"
"\n"
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's documentation is not present or correctly installed\n"
"\n"
"This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n"
"correctly.\n"
"\n"
"correctly.\n"
"\n"
"The reason this could be missing is due to badly created\n"
"packages, someone manually deleting those files or perhaps\n"
"an error in installing Enlightenment.\n"));
"an error in installing Enlightenment.\n"));
EExit(NULL);
}
}
@ -120,16 +120,16 @@ BlumFlimFrub(void)
#endif
if (!exists(s))
{
Alert(gettext("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's DEFAULT installed theme is missing or inadequately\n"
"configured to be a useful DEFAULT theme.\n"
"\n"
Alert(_("!!!!!!!! ERROR ERROR ERROR ERROR !!!!!!!!\n"
"\n"
"Enlightenment's DEFAULT installed theme is missing or inadequately\n"
"configured to be a useful DEFAULT theme.\n"
"\n"
"This is a fatal error and Enlightenment will cease to run.\n"
"Please rectify this situation and ensure it is installed\n"
"correctly. The DEFAULT theme Enlightenment comes with normally\n"
"is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n"
"theme.\n"));
"is BrushedMetal-Tigert and this theme is adequate for a DEFAULT\n"
"theme.\n"));
EExit(NULL);
}
}
@ -420,95 +420,95 @@ SanitiseThemeDir(char *dir)
Esnprintf(s, sizeof(s), "%s/%s", dir, "borders.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a borders.cfg file\n");
badreason = _("Theme does not contain a borders.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "buttons.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a buttons.cfg file\n");
badreason = _("Theme does not contain a buttons.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "colormodifiers.cfg");
if (!isfile(s))
{
badreason =
gettext("Theme does not contain a colormodifiers.cfg file\n");
_("Theme does not contain a colormodifiers.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "cursors.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a cursors.cfg file\n");
badreason = _("Theme does not contain a cursors.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "desktops.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a desktops.cfg file\n");
badreason = _("Theme does not contain a desktops.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "imageclasses.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a imageclasses.cfg file\n");
badreason = _("Theme does not contain a imageclasses.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "init.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a init.cfg file\n");
badreason = _("Theme does not contain a init.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "menustyles.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a menustyles.cfg file\n");
badreason = _("Theme does not contain a menustyles.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "slideouts.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a slideouts.cfg file\n");
badreason = _("Theme does not contain a slideouts.cfg file\n");
return 0;
}
#ifndef __EMX__ /* OS/2 Team will compile ESound after XMMS project */
Esnprintf(s, sizeof(s), "%s/%s", dir, "sound.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a sound.cfg file\n");
badreason = _("Theme does not contain a sound.cfg file\n");
return 0;
}
#endif
Esnprintf(s, sizeof(s), "%s/%s", dir, "tooltips.cfg");
if (!isfile(s))
{
badreason = gettext("Theme does not contain a tooltips.cfg file\n");
badreason = _("Theme does not contain a tooltips.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "windowmatches.cfg");
if (!isfile(s))
{
badreason =
gettext("Theme does not contain a windowmatches.cfg file\n");
_("Theme does not contain a windowmatches.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "menus.cfg");
if (isfile(s))
{
badreason = gettext("Theme contains a menus.cfg file\n");
badreason = _("Theme contains a menus.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "control.cfg");
if (isfile(s))
{
badreason = gettext("Theme contains a control.cfg file\n");
badreason = _("Theme contains a control.cfg file\n");
return 0;
}
Esnprintf(s, sizeof(s), "%s/%s", dir, "keybindings.cfg");
if (isfile(s))
{
badreason = gettext("Theme contains a keybindings.cfg file\n");
badreason = _("Theme contains a keybindings.cfg file\n");
return 0;
}
return 1;

10
src/modules.c
View File

@ -135,15 +135,15 @@ ModuleErrorCodeToString(int error_code)
{
case MODULE_ALREADY_LOADED:
return (gettext("Module is Already Loaded.\n"));
return (_("Module is Already Loaded.\n"));
case MODULE_LOAD_FAIL:
return (gettext("Module Failed During Load.\n"));
return (_("Module Failed During Load.\n"));
case MODULE_UNLOAD_FAIL:
return (gettext("Module Unload Failed.\n"));
return (_("Module Unload Failed.\n"));
case MODULE_NOT_LOADED:
return (gettext("Module is not Loaded.\n"));
return (_("Module is not Loaded.\n"));
default:
return (gettext("Unknown Module Error.\n"));
return (_("Unknown Module Error.\n"));
}

74
src/pager.c
View File

@ -525,49 +525,49 @@ CreatePager(void)
{
SettingsPager();
DIALOG_OK
(gettext("Warning!"),
gettext("\n"
"You seem to have an X Server capable of Shared Memory\n"
(_("Warning!"),
_("\n"
"You seem to have an X Server capable of Shared Memory\n"
"but it is incapable of doing ZPixmap Shared pixmaps\n"
"(The server does not claim to be able to do them).\n"
"\n"
"The pager in Enlightenment will run slowly in snapshot\n"
"\n"
"The pager in enlightenment will run slowly in snapshot\n"
"mode if you continue to use that mode of the pager\n"
"under these conditions.\n"
"\n"
"It is suggested you change the settings on your pager to\n"
"disable snapshots to improve performance.\n"
"\n"));
"under these conditions.\n"
"\n"
"It is suggested you change the settings on your pager to\n"
"disable snapshots to improve performance.\n"
"\n"));
}
else
DIALOG_OK
(gettext("Warning!"),
gettext("\n"
"Your X Server is capable of doing Shared Memory but you do\n"
"not have Shared Pixmaps enabled in your Imlib configuration.\n"
"\n"
"Please enable Shared Pixmaps in your Imlib configuration\n"
"then restart Enlightenment to gain better performance for\n"
"the pagers when snapshot mode is enabled.\n"
"\n"));
(_("Warning!"),
_("\n"
"Your X Server is capable of doing Shared Memory but you do\n"
"not have Shared Pixmaps enabled in your Imlib configuration.\n"
"\n"
"Please enable Shared Pixmaps in your Imlib configuration\n"
"then restart enlightenment to gain better performance for\n"
"the pagers when snapshot mode is enabled.\n"
"\n"));
}
}
else
{
SettingsPager();
DIALOG_OK
(gettext("Warning!"),
gettext("\n"
(_("Warning!"),
_("\n"
"You seem to be running Enlightenment over a network Connection\n"
"or on an X Server that does not support Shared Memory, or you\n"
"have disabled MIT-SHM Shared memory in your Imlib configuration.\n"
"have disabled MIT-SHM Shared memory in your Imlib configuration.\n"
"This means the Enlightenment Pager will perform slowly and use\n"
"more system resources than it would when Shared Memory is\n"
"available.\n"
"\n"
"To improve performance please either enable MIT-SHM Shared Memory\n"
"available.\n"
"\n"
"To improve performance please either enable MIT-SHM Shared Memory\n"
"in your Imlib config, if you disabled it, or disable Pager\n"
"snapshots.\n" "\n"));
"snapshots.\n" "\n"));
}
did_dialog = 1;
}
@ -1266,25 +1266,25 @@ PagerShowMenu(Pager * p, int x, int y)
if (pw_menu)
DestroyMenu(pw_menu);
pw_menu = CreateMenu();
AddTitleToMenu(pw_menu, gettext("Window Options"));
AddTitleToMenu(pw_menu, _("Window Options"));
pw_menu->name = duplicate("__DESK_WIN_MENU");
pw_menu->style =
FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
Esnprintf(s, sizeof(s), "%i", ewin->client.win);
mi = CreateMenuItem(gettext("Iconify"), NULL, ACTION_ICONIFY, s, NULL);
mi = CreateMenuItem(_("Iconify"), NULL, ACTION_ICONIFY, s, NULL);
AddItemToMenu(pw_menu, mi);
mi = CreateMenuItem(gettext("Close"), NULL, ACTION_KILL, s, NULL);
mi = CreateMenuItem(_("Close"), NULL, ACTION_KILL, s, NULL);
AddItemToMenu(pw_menu, mi);
mi =
CreateMenuItem(gettext("Annihilate"), NULL, ACTION_KILL_NASTY, s,
CreateMenuItem(_("Annihilate"), NULL, ACTION_KILL_NASTY, s,
NULL);
AddItemToMenu(pw_menu, mi);
mi =
CreateMenuItem(gettext("Stick / Unstick"), NULL, ACTION_STICK, s,
CreateMenuItem(_("Stick / Unstick"), NULL, ACTION_STICK, s,
NULL);
AddItemToMenu(pw_menu, mi);
@ -1297,35 +1297,35 @@ PagerShowMenu(Pager * p, int x, int y)
if (p_menu)
DestroyMenu(p_menu);
p_menu = CreateMenu();
AddTitleToMenu(p_menu, gettext("Desktop Options"));
AddTitleToMenu(p_menu, _("Desktop Options"));
p_menu->name = duplicate("__DESK_MENU");
p_menu->style =
FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
mi =
CreateMenuItem(gettext("Pager Settings..."), NULL, ACTION_CONFIG, "pager",
CreateMenuItem(_("Pager Settings..."), NULL, ACTION_CONFIG, "pager",
NULL);
AddItemToMenu(p_menu, mi);
mi =
CreateMenuItem(gettext("Snapshotting On"), NULL, ACTION_SET_PAGER_SNAP,
CreateMenuItem(_("Snapshotting On"), NULL, ACTION_SET_PAGER_SNAP,
"1", NULL);
AddItemToMenu(p_menu, mi);
mi =
CreateMenuItem(gettext("Snapshotting Off"), NULL, ACTION_SET_PAGER_SNAP,
CreateMenuItem(_("Snapshotting Off"), NULL, ACTION_SET_PAGER_SNAP,
"0", NULL);
AddItemToMenu(p_menu, mi);
if (SNAP)
{
mi =
CreateMenuItem(gettext("High Quality On"), NULL,
CreateMenuItem(_("High Quality On"), NULL,
ACTION_SET_PAGER_HIQ, "1", NULL);
AddItemToMenu(p_menu, mi);
mi =
CreateMenuItem(gettext("High Quality Off"), NULL,
CreateMenuItem(_("High Quality Off"), NULL,
ACTION_SET_PAGER_HIQ, "0", NULL);
AddItemToMenu(p_menu, mi);
}

46
src/session.c
View File

@ -243,12 +243,12 @@ SaveWindowStates(void)
rm(ss);
mv(s, ss);
if (!isfile(ss))
Alert(gettext("There was an error writing the clients "
"session save file.\n"
"You may have run out of disk "
"space, not have permission\n"
"to write to your filing system "
"or other similar problems.\n"));
Alert(_("There was an error writing the clients "
"session save file.\n"
"You may have run out of disk "
"space, not have permission\n"
"to write to your filing system "
"or other similar problems.\n"));
}
Efree(lst);
}
@ -434,7 +434,7 @@ autosave(void)
rm(GetGenericSMFile());
mv(s, GetGenericSMFile());
if (!isfile(GetGenericSMFile()))
Alert(gettext
Alert(_
("There was an error saving your autosave data - filing\n"
"system problems.\n"));
/*
@ -1023,16 +1023,16 @@ ProcessICEMSGS(void)
if (status == IceProcessMessagesIOError)
{
/* Less of the hope.... E survives */
DialogAlert(gettext("ERROR!\n"
"\n"
"Lost the Session Manager that was there?\n"
DialogAlert(_("ERROR!\n"
"\n"
"Lost the Session Manager that was there?\n"
"Here here session manager... come here... want a bone?\n"
"Oh come now! Stop sulking! Bugger. Oh well. "
"Will continue without\n"
"a session manager.\n"
"\n"
"I'll survive somehow.\n"
"\n" "\n" "... I hope.\n"));
"Oh come now! Stop sulking! Bugger. Oh well. "
"Will continue without\n"
"a session manager.\n"
"\n"
"I'll survive somehow.\n"
"\n" "\n" "... I hope.\n"));
SmcCloseConnection(sm_conn, 0, NULL);
sm_conn = NULL;
sm_fd = -1;
@ -1163,14 +1163,14 @@ doSMExit(void *params)
{
AUDIO_PLAY("SOUND_LOGOUT");
d = CreateDialog("LOGOUT_DIALOG");
DialogSetTitle(d, gettext("Are you sure?"));
DialogSetTitle(d, _("Are you sure?"));
DialogSetText(d,
gettext("\n"
"\n"
" Are you sure you wish to log out ? \n"
"\n" "\n"));
DialogAddButton(d, gettext(" Yes, Log Out "), LogoutCB, 1);
DialogAddButton(d, gettext(" No "), NULL, 1);
_("\n"
"\n"
" Are you sure you wish to log out ? \n"
"\n" "\n"));
DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1);
DialogAddButton(d, _(" No "), NULL, 1);
DialogBindKey(d, "Escape", CB_SettingsEscape, 1, d);
DialogBindKey(d, "Return", LogoutCB, 0, d);
}

472
src/settings.c
View File

File diff suppressed because it is too large Load Diff

96
src/setup.c
View File

@ -218,7 +218,7 @@ SetupX()
/* if cannot connect to display */
if (!disp)
{
Alert(gettext
Alert(_
("Enlightenment cannot connect to the display nominated by\n"
"your shell's DISPLAY environment variable. You may set this\n"
"variable to indicate which display name Enlightenment is to\n"
@ -291,15 +291,15 @@ SetupX()
/* Check for the Shape Extension */
if (!XShapeQueryExtension(disp, &shape_event_base, &shape_error_base))
{
ASSIGN_ALERT(gettext("X server setup error"),
"", "", gettext("Quit Enlightenment"));
Alert(gettext("FATAL ERROR:\n"
"\n"
"This Xserver does not support the Shape extension.\n"
"This is required for Enlightenment to run.\n"
"\n"
"Your Xserver probably is too old or mis-configured.\n"
"\n" "Exiting.\n"));
ASSIGN_ALERT(_("X server setup error"),
"", "", _("Quit Enlightenment"));
Alert(_("FATAL ERROR:\n"
"\n"
"This Xserver does not support the Shape extension.\n"
"This is required for Enlightenment to run.\n"
"\n"
"Your Xserver probably is too old or mis-configured.\n"
"\n" "Exiting.\n"));
RESET_ALERT;
EExit((void *)1);
}
@ -325,26 +325,26 @@ SetupX()
id = Imlib_init(disp);
if (!id)
{
ASSIGN_ALERT(gettext("Imlib initialization error"),
"", "", gettext("Quit Enlightenment"));
Alert(gettext("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialize Imlib.\n"
"\n"
"This is unusual. Unable to continue.\n" "Exiting.\n"));
ASSIGN_ALERT(_("Imlib initialisation error"),
"", "", _("Quit Enlightenment"));
Alert(_("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialise Imlib.\n"
"\n"
"This is unusual. Unable to contiune.\n" "Exiting.\n"));
RESET_ALERT;
EExit((void *)1);
}
fd = Fnlib_init(id);
if (!fd)
{
ASSIGN_ALERT(gettext("X server setup error"),
"", "", gettext("Quit Enlightenment"));
Alert(gettext("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialize Fnlib.\n"
"\n"
"This is unusual. Unable to continue.\n" "Exiting.\n"));
ASSIGN_ALERT(_("X server setup error"),
"", "", _("Quit Enlightenment"));
Alert(_("FATAL ERROR:\n"
"\n"
"Enlightenment is unable to initialise Fnlib.\n"
"\n"
"This is unusual. Unable to contiune.\n" "Exiting.\n"));
RESET_ALERT;
EExit((void *)1);
}
@ -401,15 +401,15 @@ SetupX()
/* warn, if necessary about X version problems */
if (ProtocolVersion(disp) != 11)
{
ASSIGN_ALERT(gettext("X server version error"),
gettext("Ignore this error"),
"", gettext("Quit Enlightenment"));
Alert(gettext("WARNING:\n"
"This is not an X11 Xserver. It in fact talks the X%i protocol.\n"
"This may mean Enlightenment will either not function, or\n"
"function incorrectly. If it is later than X11, then your\n"
"server is one the author of Enlightenment neither have\n"
"access to, nor have heard of.\n"),
ASSIGN_ALERT(_("X server version error"),
_("Ignore this error"),
"", _("Quit Enlightenment"));
Alert(_("WARNING:\n"
"This is not an X11 Xserver. It infact talks the X%i protocol.\n"
"This may mean Enlightenment will either not function, or\n"
"function incorrectly. If it is later than X11, then your\n"
"server is one the author of Enlightenment neither have\n"
"access to, nor have heard of.\n"),
ProtocolVersion(disp));
RESET_ALERT;
}
@ -621,33 +621,33 @@ ChkDir(char *d)
{
if (!isdir(d))
{
Alert(gettext("The directory %s is apparently not a directory\n"
"This is a fatal condition.\n"
"Please remove this file\n"), d);
Alert(_("The directory %s is apparently not a directory\n"
"This is a fatal condition.\n"
"Please remove this file\n"), d);
EExit((void *)1);
}
if (!canexec(d))
{
Alert(gettext("Do not have execute access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
Alert(_("Do not have execute access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
if (!canread(d))
{
Alert(gettext("Do not have read access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
Alert(_("Do not have read access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
if (!canwrite(d))
{
Alert(gettext("Do not have write access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
Alert(_("Do not have write access to %s\n"
"This is a fatal condition.\n"
"Please check the ownership and permissions of this\n"
"directory and take steps to rectify this.\n"), d);
EExit((void *)1);
}
}

26
src/snaps.c
View File

@ -402,7 +402,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Location"));
DialogItemCheckButtonSetText(di, _("Location"));
DialogItemCheckButtonSetState(di, tmp_snap_location);
DialogItemCheckButtonSetPtr(di, &tmp_snap_location);
@ -410,7 +410,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Border style"));
DialogItemCheckButtonSetText(di, _("Border style"));
DialogItemCheckButtonSetState(di, tmp_snap_border);
DialogItemCheckButtonSetPtr(di, &tmp_snap_border);
@ -418,7 +418,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Size"));
DialogItemCheckButtonSetText(di, _("Size"));
DialogItemCheckButtonSetState(di, tmp_snap_size);
DialogItemCheckButtonSetPtr(di, &tmp_snap_size);
@ -426,7 +426,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Desktop"));
DialogItemCheckButtonSetText(di, _("Desktop"));
DialogItemCheckButtonSetState(di, tmp_snap_desktop);
DialogItemCheckButtonSetPtr(di, &tmp_snap_desktop);
@ -434,7 +434,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Shaded state"));
DialogItemCheckButtonSetText(di, _("Shaded state"));
DialogItemCheckButtonSetState(di, tmp_snap_shade);
DialogItemCheckButtonSetPtr(di, &tmp_snap_shade);
@ -442,7 +442,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Sticky state"));
DialogItemCheckButtonSetText(di, _("Sticky state"));
DialogItemCheckButtonSetState(di, tmp_snap_sticky);
DialogItemCheckButtonSetPtr(di, &tmp_snap_sticky);
@ -450,7 +450,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, gettext("Stacking layer"));
DialogItemCheckButtonSetText(di, _("Stacking layer"));
DialogItemCheckButtonSetState(di, tmp_snap_layer);
DialogItemCheckButtonSetPtr(di, &tmp_snap_layer);
@ -470,7 +470,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di,
gettext
_
("Restart application on login"));
DialogItemCheckButtonSetState(di, tmp_snap_cmd);
DialogItemCheckButtonSetPtr(di, &tmp_snap_cmd);
@ -494,7 +494,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di,
gettext
_
("Remember this window's group(s)"));
DialogItemCheckButtonSetState(di, tmp_snap_group);
DialogItemCheckButtonSetPtr(di, &tmp_snap_group);
@ -506,9 +506,9 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, gettext("OK"), CB_ApplySnap, 1);
DialogAddButton(d, gettext("Apply"), CB_ApplySnap, 0);
DialogAddButton(d, gettext("Cancel"), CB_ApplySnap, 1);
DialogAddButton(d, _("OK"), CB_ApplySnap, 1);
DialogAddButton(d, _("Apply"), CB_ApplySnap, 0);
DialogAddButton(d, _("Cancel"), CB_ApplySnap, 1);
DialogSetExitFunction(d, CB_ApplySnap, 2, d);
DialogBindKey(d, "Escape", CB_ApplySnapEscape, 0, d);
DialogBindKey(d, "Return", CB_ApplySnap, 0, d);
@ -837,7 +837,7 @@ SaveSnapInfo(void)
rm(buf);
mv(s, buf);
if (!isfile(buf))
Alert(gettext("Error saving snaps file\n"));
Alert(_("Error saving snaps file\n"));
SaveGroups();
}

18
src/sound.c
View File

@ -50,12 +50,12 @@ LoadWav(char *file)
find = FindFile(file);
if (!find)
{
DIALOG_PARAM_OK(gettext("Error finding sound file"));
DIALOG_PARAM_OK(_("Error finding sound file"));
DIALOG_PARAM
gettext("Warning! Enlightenment was unable "
"to load the\nfollowing sound file:\n%s\n"
"Enlightenment will continue to operate, but you\n"
"may wish to check your configuration settings.\n"), file
_("Warning! Enlightenment was unable "
"to load the\nfollowing sound file:\n%s\n"
"Enlightenment will continue to operate, but you\n"
"may wish to check your configuration settings.\n"), file
DIALOG_PARAM_END;
EDBUG_RETURN(NULL);
}
@ -259,10 +259,10 @@ SoundInit()
sound_fd = fd;
else
{
ASSIGN_ALERT(gettext("Error initializing sound"),
gettext("OK"), " ", " ");
Alert(gettext
("Audio was enabled for Enlightenment but there was an error\n"
ASSIGN_ALERT(_("Error initialising sound"),
_("OK"), " ", " ");
Alert(_
("Audio was enabled for Enlightenemnt but there was an error\n"
"communicating with the audio server (Esound). Audio will\n"
"now be disabled.\n"));
RESET_ALERT;

20
src/theme.c
View File

@ -290,7 +290,7 @@ FindTheme(char *theme)
char *ret = NULL;
EDBUG(6, "FindTheme");
badreason = gettext("Unknown\n");
badreason = _("Unknown\n");
if (!theme[0])
{
#ifndef __EMX__
@ -313,7 +313,7 @@ FindTheme(char *theme)
if (exists(s))
ret = ExtractTheme(s);
else
badreason = gettext("Theme file/directory does not exist\n");
badreason = _("Theme file/directory does not exist\n");
if (!ret)
{
#ifndef __EMX__
@ -325,7 +325,7 @@ FindTheme(char *theme)
if (exists(s))
ret = ExtractTheme(s);
else
badreason = gettext("Theme file/directory does not exist\n");
badreason = _("Theme file/directory does not exist\n");
if (!ret)
{
ret = GetDefaultTheme();
@ -345,12 +345,12 @@ BadThemeDialog(void)
return;
Esnprintf(s, sizeof(s),
gettext("The theme:\n"
"%s\n"
_("The theme:\n"
"%s\n"
"Is a badly formed theme package and is thus not being used.\n"
"Enlightenment has fallen back to using the DEFAULT theme.\n"
"\n"
"The reason this theme is bad is:\n"
"%s"), badtheme, badreason);
DIALOG_OK(gettext("Bad Theme"), s);
"Enlightenment has fallen back to using the DEFAULT theme.\n"
"\n"
"The reason this theme is bad is:\n"
"%s"), badtheme, badreason);
DIALOG_OK(_("Bad Theme"), s);
}

2
src/update.c
View File

@ -163,7 +163,7 @@ CheckForNewMOTD(int val, void *data)
if (MOTD)
{
DIALOG_OK(gettext("Enlightenment's message of the day"),
DIALOG_OK(_("Enlightenment's message of the day"),
MOTD);
Efree(MOTD);
}