<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39725 >
Upon inspection, more errors found. Only LOG_NORMAL should be translated.
Committed trunk revision 13665.
Committed S2_2 revision 13666.
Index: client/gui-sdl/gui_string.c
===================================================================
--- client/gui-sdl/gui_string.c (revision 13664)
+++ client/gui-sdl/gui_string.c (working copy)
@@ -170,7 +170,7 @@
}
if ((str->font = load_font(str->ptsize)) == NULL) {
- freelog(LOG_ERROR, _("Error in create_string16: Aborting ..."));
+ freelog(LOG_ERROR, "create_string16: load_font failed");
FC_FREE(str);
return str;
}
@@ -222,7 +222,7 @@
SDL_Surface *pText = create_text_surf_from_str16(pString);
if (alphablit(pText, NULL, pDest, &dst_rect) < 0) {
- freelog(LOG_ERROR, _("Couldn't blit text to display: %s"),
+ freelog(LOG_ERROR, "write_text16: couldn't blit text to display: %s",
SDL_GetError());
FREESURFACE(pText);
return -1;
@@ -260,8 +260,8 @@
if ((pText = SDL_DisplayFormat(pTmp)) == NULL) {
freelog(LOG_ERROR,
- _("Error in SDL_create_str16_surf: Couldn't convert text "
- "to display format: %s"), SDL_GetError());
+ "SDL_create_str16_surf: couldn't convert text "
+ "to display format: %s", SDL_GetError());
pText = pTmp;
} else {
FREESURFACE( pTmp );
@@ -277,9 +277,9 @@
if (pText != NULL) {
freelog(LOG_DEBUG,
- _("SDL_create_str16_surf: Font is generally %d big, and "
- "string is %hd big"), TTF_FontHeight(pString->font), pText->h);
- freelog(LOG_DEBUG, _("SDL_create_str16_surf: String is %d lenght"),
+ "SDL_create_str16_surf: Font is generally %d big, and "
+ "string is %hd big", TTF_FontHeight(pString->font), pText->h);
+ freelog(LOG_DEBUG, "SDL_create_str16_surf: String is %d length",
pText->w);
} else {
freelog(LOG_DEBUG, "SDL_create_str16_surf: pText NULL");
@@ -569,7 +569,7 @@
}
if ((pBuf = load_font(new_ptsize)) == NULL) {
- freelog(LOG_ERROR, _("Error in change_ptsize: Change ptsize failed"));
+ freelog(LOG_ERROR, "change_ptsize: load_font failed");
return;
}
@@ -617,7 +617,7 @@
/* Load Font */
if ((font_tmp = TTF_OpenFont(pFont_with_FullPath, ptsize)) == NULL) {
freelog(LOG_ERROR,
- _("Error in load_font: Couldn't load %d pt font from %s: %s"),
+ "load_font: Couldn't load %d pt font from %s: %s",
ptsize, pFont_with_FullPath, SDL_GetError());
return font_tmp;
}
@@ -658,7 +658,7 @@
if (Sizeof_Font_TAB == 0) {
freelog(LOG_ERROR,
- _("Error in unload_font: Trying unload from empty Font ARRAY"));
+ "unload_font: Trying unload from empty Font ARRAY");
return;
}
@@ -672,8 +672,8 @@
if (index == Sizeof_Font_TAB) {
freelog(LOG_ERROR,
- _("Error in unload_font: Trying unload Font which is "
- "not included in Font ARRAY"));
+ "unload_font: Trying unload Font which is "
+ "not included in Font ARRAY");
return;
}
Index: client/audio.c
===================================================================
--- client/audio.c (revision 13664)
+++ client/audio.c (working copy)
@@ -122,12 +122,12 @@
}
if (!plugins[i].init()) {
- freelog(LOG_ERROR, _("Plugin %s found but can't be initialized."), name);
+ freelog(LOG_ERROR, "Plugin %s found, but can't be initialized.", name);
return FALSE;
}
selected_plugin = i;
- freelog(LOG_VERBOSE, _("Plugin '%s' is now selected"),
+ freelog(LOG_VERBOSE, "Plugin '%s' is now selected",
plugins[selected_plugin].name);
return TRUE;
}
@@ -171,7 +171,7 @@
return NULL;
}
- freelog(LOG_ERROR, _("Couldn't find soundset \"%s\" trying \"%s\"."),
+ freelog(LOG_ERROR, "Couldn't find soundset \"%s\", trying \"%s\".",
soundset_name, soundset_default);
return soundspec_fullname(soundset_default);
}
@@ -188,33 +188,31 @@
if (strcmp(prefered_plugin_name, "none") == 0) {
/* We explicitly choose none plugin, silently skip the code below */
- freelog(LOG_VERBOSE, _("Proceeding with sound support disabled"));
+ freelog(LOG_VERBOSE, "Proceeding with sound support disabled.");
tagfile = NULL;
return;
}
if (num_plugins_used == 1) {
/* We only have the dummy plugin, skip the code but issue an advertise */
- freelog(LOG_NORMAL, _("No real audio plugin present, "
- "proceeding with sound support disabled"));
- freelog(LOG_NORMAL,
- _("For sound support, install SDL_mixer"));
- freelog(LOG_NORMAL, _("http://www.libsdl.org/";
- "projects/SDL_mixer/index.html"));
+ freelog(LOG_NORMAL, _("No real audio plugin present."));
+ freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
+ freelog(LOG_NORMAL, _("For sound support, install SDL_mixer"));
+ freelog(LOG_NORMAL, "http://www.libsdl.org/projects/SDL_mixer/index.html";);
tagfile = NULL;
return;
}
if (!spec_name) {
- freelog(LOG_FATAL, _("No sound spec-file given!"));
+ freelog(LOG_FATAL, "No sound spec-file given!");
exit(EXIT_FAILURE);
}
freelog(LOG_VERBOSE, "Initializing sound using %s...", spec_name);
filename = soundspec_fullname(spec_name);
if (!filename) {
- freelog(LOG_ERROR, _("Cannot find sound spec-file \"%s\"."), spec_name);
- freelog(LOG_ERROR, _("To get sound you need to download a sound set!"));
- freelog(LOG_ERROR, _("Get sound sets from <%s>."),
+ freelog(LOG_ERROR, "Cannot find sound spec-file \"%s\".", spec_name);
+ freelog(LOG_NORMAL, _("To get sound you need to download a sound set!"));
+ freelog(LOG_NORMAL, _("Get sound sets from <%s>."),
"ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets";);
- freelog(LOG_ERROR, _("Will continue with disabled sounds."));
+ freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
tagfile = NULL;
return;
}
@@ -225,18 +223,18 @@
file_capstr = secfile_lookup_str(tagfile, "soundspec.options");
if (!has_capabilities(us_capstr, file_capstr)) {
- freelog(LOG_FATAL, _("sound spec-file appears incompatible:"));
- freelog(LOG_FATAL, _("file: \"%s\""), filename);
- freelog(LOG_FATAL, _("file options: %s"), file_capstr);
- freelog(LOG_FATAL, _("supported options: %s"), us_capstr);
+ freelog(LOG_FATAL, "sound spec-file appears incompatible:");
+ freelog(LOG_FATAL, " file: \"%s\"", filename);
+ freelog(LOG_FATAL, " file options: %s", file_capstr);
+ freelog(LOG_FATAL, " supported options: %s", us_capstr);
exit(EXIT_FAILURE);
}
if (!has_capabilities(file_capstr, us_capstr)) {
- freelog(LOG_FATAL, _("sound spec-file claims required option(s)"
- " which we don't support:"));
- freelog(LOG_FATAL, _("file: \"%s\""), filename);
- freelog(LOG_FATAL, _("file options: %s"), file_capstr);
- freelog(LOG_FATAL, _("supported options: %s"), us_capstr);
+ freelog(LOG_FATAL, "sound spec-file claims required option(s)"
+ " which we don't support:");
+ freelog(LOG_FATAL, " file: \"%s\"", filename);
+ freelog(LOG_FATAL, " file options: %s", file_capstr);
+ freelog(LOG_FATAL, " supported options: %s", us_capstr);
exit(EXIT_FAILURE);
}
@@ -246,18 +244,18 @@
if (prefered_plugin_name[0] != '\0') {
if (!audio_select_plugin(prefered_plugin_name))
- freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
+ freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
return;
}
#ifdef AUDIO_SDL
if (audio_select_plugin("sdl")) return;
#endif
- freelog(LOG_ERROR,
+ freelog(LOG_NORMAL,
_("No real audio subsystem managed to initialize!"));
- freelog(LOG_ERROR,
- _("Perhaps there is some misconfigurationg or bad permissions"));
- freelog(LOG_NORMAL, _("Proceeding with sound support disabled"));
+ freelog(LOG_NORMAL,
+ _("Perhaps there is some misconfiguration or bad permissions"));
+ freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
}
/**************************************************************************
@@ -279,7 +277,7 @@
} else {
fullpath = datafilename(soundfile);
if (!fullpath) {
- freelog(LOG_ERROR, _("Cannot find audio file %s"), soundfile);
+ freelog(LOG_ERROR, "Cannot find audio file %s", soundfile);
}
}
}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
