Author: cazfi
Date: Sat Jan 23 08:32:19 2016
New Revision: 31547
URL: http://svn.gna.org/viewcvs/freeciv?rev=31547&view=rev
Log:
Replaced all occurrences of word "occured" with "occurred"
Seen in Debian lintian reports
See bug #24331
Modified:
branches/S2_5/client/control.c
branches/S2_5/client/gui-gtk-2.0/gui_stuff.c
branches/S2_5/client/gui-gtk-3.0/gui_stuff.c
branches/S2_5/common/mapimg.c
branches/S2_5/common/scriptcore/luascript.c
branches/S2_5/m4/ac_path_lib.m4
branches/S2_5/m4/gtk-2.0.m4
branches/S2_5/m4/gtk-3.0.m4
branches/S2_5/m4/imlib.m4
branches/S2_5/m4/sdl.m4
branches/S2_5/m4/sdl2.m4
branches/S2_5/server/cityturn.c
branches/S2_5/server/sernet.c
branches/S2_5/utility/registry_ini.c
branches/S2_5/utility/section_file.c
Modified: branches/S2_5/client/control.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/control.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/client/control.c (original)
+++ branches/S2_5/client/control.c Sat Jan 23 08:32:19 2016
@@ -2666,7 +2666,7 @@
do_real_unit_nuke, data, client_nuke_data_destroy);
} else {
/* We didn't sent the packets, that mean that the route was nil, or
- * an internal error occured. Process nuke units now. */
+ * an internal error occurred. Process nuke units now. */
do_real_unit_nuke(data);
client_nuke_data_destroy(data);
}
Modified: branches/S2_5/client/gui-gtk-2.0/gui_stuff.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/gui_stuff.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/gui_stuff.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/gui_stuff.c Sat Jan 23 08:32:19 2016
@@ -1103,7 +1103,7 @@
/**************************************************************************
Convenience function to add a column to a GtkTreeView. Returns the added
- column, or NULL if an error occured.
+ column, or NULL if an error occurred.
**************************************************************************/
GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title,
GType gtype, int model_index)
Modified: branches/S2_5/client/gui-gtk-3.0/gui_stuff.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_stuff.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/gui_stuff.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_stuff.c Sat Jan 23 08:32:19 2016
@@ -1067,7 +1067,7 @@
/**************************************************************************
Convenience function to add a column to a GtkTreeView. Returns the added
- column, or NULL if an error occured.
+ column, or NULL if an error occurred.
**************************************************************************/
GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title,
GType gtype, int model_index)
Modified: branches/S2_5/common/mapimg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/mapimg.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/common/mapimg.c (original)
+++ branches/S2_5/common/mapimg.c Sat Jan 23 08:32:19 2016
@@ -1509,7 +1509,7 @@
if (!img_save(pimg, mapimgfile, path)) {
/* If one of the mapimg format/toolkit combination fail, return
- * FALSE, i.e. an error occured. */
+ * FALSE, i.e. an error occurred. */
ret = FALSE;
}
}
Modified: branches/S2_5/common/scriptcore/luascript.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/scriptcore/luascript.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/common/scriptcore/luascript.c (original)
+++ branches/S2_5/common/scriptcore/luascript.c Sat Jan 23 08:32:19 2016
@@ -499,7 +499,7 @@
/*****************************************************************************
Evaluate a Lua function call or loaded script on the stack.
- Return nonzero if an error occured.
+ Return nonzero if an error occurred.
If available pass the source code string as code, else NULL.
Modified: branches/S2_5/m4/ac_path_lib.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/ac_path_lib.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/ac_path_lib.m4 (original)
+++ branches/S2_5/m4/ac_path_lib.m4 Sat Jan 23 08:32:19 2016
@@ -298,7 +298,7 @@
echo "***" >>error.]DOWN[test
fi
echo "*** The test program failed to compile or link. See
the file" >>error.]DOWN[test
- echo "*** config.log for the exact error that occured. This
usually" >>error.]DOWN[test
+ echo "*** config.log for the exact error that occurred. This
usually" >>error.]DOWN[test
echo "*** means UP was not installed, was incorrectly
installed" >>error.]DOWN[test
echo "*** or that you have moved UP since it was installed.
In" >>error.]DOWN[test
echo "*** the latter case, you may want to edit the
$LDOWN[]_config" >>error.]DOWN[test
@@ -338,7 +338,7 @@
echo "*** If you have an old version installed, it is best to
remove" >>error.]DOWN[test
echo "*** it, although you may also be able to get things to work by"
>>error.]DOWN[test
echo "*** modifying LD_LIBRARY_PATH" >>error.]DOWN[test],[ echo "***
The test program failed to compile or link. See the file" >>error.]DOWN[test
- echo "*** config.log for the exact error that occured. This usually"
>>error.]DOWN[test
+ echo "*** config.log for the exact error that occurred. This
usually" >>error.]DOWN[test
echo "*** means UP was incorrectly installed or that you have"
>>error.]DOWN[test
echo "*** moved UP since it was installed. In the latter case,"
>>error.]DOWN[test
echo "*** you may want to edit the $LDOWN[]_config script:"
>>error.]DOWN[test
Modified: branches/S2_5/m4/gtk-2.0.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/gtk-2.0.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/gtk-2.0.m4 (original)
+++ branches/S2_5/m4/gtk-2.0.m4 Sat Jan 23 08:32:19 2016
@@ -168,7 +168,7 @@
echo "***"
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH" ],[ echo "*** The test program failed to compile or link. See
the file config.log for the"
- echo "*** exact error that occured. This usually means GTK+ is
incorrectly installed."])
+ echo "*** exact error that occurred. This usually means GTK+ is
incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
Modified: branches/S2_5/m4/gtk-3.0.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/gtk-3.0.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/gtk-3.0.m4 (original)
+++ branches/S2_5/m4/gtk-3.0.m4 Sat Jan 23 08:32:19 2016
@@ -181,7 +181,7 @@
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file
config.log for the"
- echo "*** exact error that occured. This usually means GTK+ is
incorrectly installed."])
+ echo "*** exact error that occurred. This usually means GTK+ is
incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
Modified: branches/S2_5/m4/imlib.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/imlib.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/imlib.m4 (original)
+++ branches/S2_5/m4/imlib.m4 Sat Jan 23 08:32:19 2016
@@ -145,7 +145,7 @@
echo "***"
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See
the file config.log for the"
- echo "*** exact error that occured. This usually means IMLIB was
incorrectly installed"
+ echo "*** exact error that occurred. This usually means IMLIB was
incorrectly installed"
echo "*** or that you have moved IMLIB since it was installed. In
the latter case, you"
echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
@@ -280,7 +280,7 @@
echo "***"
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See
the file config.log for the"
- echo "*** exact error that occured. This usually means IMLIB was
incorrectly installed"
+ echo "*** exact error that occurred. This usually means IMLIB was
incorrectly installed"
echo "*** or that you have moved IMLIB since it was installed. In
the latter case, you"
echo "*** may want to edit the imlib-config script: $IMLIB_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
Modified: branches/S2_5/m4/sdl.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/sdl.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/sdl.m4 (original)
+++ branches/S2_5/m4/sdl.m4 Sat Jan 23 08:32:19 2016
@@ -162,7 +162,7 @@
echo "***"
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See
the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was
incorrectly installed"
+ echo "*** exact error that occurred. This usually means SDL was
incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the
latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
Modified: branches/S2_5/m4/sdl2.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/sdl2.m4?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/m4/sdl2.m4 (original)
+++ branches/S2_5/m4/sdl2.m4 Sat Jan 23 08:32:19 2016
@@ -185,7 +185,7 @@
echo "*** If you have an old version installed, it is best to remove
it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file
config.log for the"
- echo "*** exact error that occured. This usually means SDL2 was
incorrectly installed"
+ echo "*** exact error that occurred. This usually means SDL2 was
incorrectly installed"
echo "*** or that you have moved SDL2 since it was installed. In the
latter case, you"
echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
Modified: branches/S2_5/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Sat Jan 23 08:32:19 2016
@@ -2698,7 +2698,7 @@
Do the migrations between the cities that overlap, if the growth of the
target city is not blocked due to a missing improvement or missing food.
- Returns TRUE if migration occured.
+ Returns TRUE if migration occurred.
**************************************************************************/
static bool do_city_migration(struct city *pcity_from,
struct city *pcity_to)
Modified: branches/S2_5/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/sernet.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/server/sernet.c (original)
+++ branches/S2_5/server/sernet.c Sat Jan 23 08:32:19 2016
@@ -300,7 +300,7 @@
lost_connection_to_client(pconn);
close_connection(pconn);
}
- } while (0 < num); /* May some errors occured, let's check. */
+ } while (0 < num); /* May some errors occurred, let's check. */
}
/****************************************************************************
Modified: branches/S2_5/utility/registry_ini.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/registry_ini.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/utility/registry_ini.c (original)
+++ branches/S2_5/utility/registry_ini.c Sat Jan 23 08:32:19 2016
@@ -1685,7 +1685,7 @@
for(i = 0; i < *dim; i++) {
if (!secfile_lookup_bool(secfile, vec + i, "%s,%d", fullpath, (int) i)) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
@@ -1832,7 +1832,7 @@
for(i = 0; i < *dim; i++) {
if (!secfile_lookup_int(secfile, vec + i, "%s,%d", fullpath, (int) i)) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
@@ -1940,7 +1940,7 @@
if (!(vec[i] = secfile_lookup_str(secfile, "%s,%d",
fullpath, (int) i))) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
@@ -2080,7 +2080,7 @@
by_name_fn, "%s,%d",
fullpath, (int) i)) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
@@ -2263,7 +2263,7 @@
by_name_fn, "%s,%d",
fullpath, (int) i)) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
@@ -2477,7 +2477,7 @@
if (!secfile_lookup_enum_data(secfile, vec + i, bitwise, name_fn, data,
"%s,%d", fullpath, (int) i)) {
SECFILE_LOG(secfile, NULL,
- "An error occured when looking up to \"%s,%d\" entry.",
+ "An error occurred when looking up to \"%s,%d\" entry.",
fullpath, (int) i);
free(vec);
*dim = 0;
Modified: branches/S2_5/utility/section_file.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/section_file.c?rev=31547&r1=31546&r2=31547&view=diff
==============================================================================
--- branches/S2_5/utility/section_file.c (original)
+++ branches/S2_5/utility/section_file.c Sat Jan 23 08:32:19 2016
@@ -31,7 +31,7 @@
#define DEBUG_ENTRIES(...) /* log_debug(__VA_ARGS__); */
/**************************************************************************
- Returns the last error which occured in a string. It never returns NULL.
+ Returns the last error which occurred in a string. It never returns NULL.
**************************************************************************/
const char *secfile_error(void)
{
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
