aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--e-util/e-plugin.c2
-rw-r--r--mail/mail-mt.c2
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c2
-rw-r--r--po/sl.po2
-rw-r--r--po/sr.po2
-rw-r--r--po/sr@Latn.po2
-rw-r--r--po/sv.po4
8 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cb32ffe20..f999becd87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-21 Jens Seidel <jseidel@cvs.gnome.org>
+
+ * e-util/e-plugin.c:
+ * mail/mail-mt.c:
+ * plugins/sa-junk-plugin/em-junk-filter.c: Fixed the typo
+ "occured" (also in all effected PO files to avoid fuzzyness)
+
2005-08-21 Francisco Javier F. Serrador <serrador@cvs.gnome.org>
* widgets/misc/e-canvas-background.c:
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index a60aa7bafd..6335695ca4 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -460,7 +460,7 @@ e_plugin_add_load_path(const char *path)
* Scan the search path, looking for plugin definitions, and load them
* into memory.
*
- * Return value: Returns -1 if an error occured.
+ * Return value: Returns -1 if an error occurred.
**/
int
e_plugin_load_plugins(void)
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index b971496b0f..c21d3008b1 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -258,7 +258,7 @@ void mail_msg_check_error(void *msg)
/* we key on the operation pointer, which is at least accurate enough
for the operation type, although it could be on a different object. */
if (g_hash_table_lookup(active_errors, m->ops)) {
- g_warning("Error occured while existing dialogue active:\n%s", camel_exception_get_description(&m->ex));
+ g_warning("Error occurred while existing dialogue active:\n%s", camel_exception_get_description(&m->ex));
return;
}
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index c608b7e535..612404104a 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -559,7 +559,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out) != 0;
if (!rv && out && !strcmp (out->data, "0/0\n")) {
- /* an error occured */
+ /* an error occurred */
if (em_junk_sa_respawn_spamd ()) {
g_byte_array_set_size (out, 0);
diff --git a/po/sl.po b/po/sl.po
index de4ed253a7..7766f35183 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -29504,7 +29504,7 @@ msgstr "Velikost ročice"
#~ msgstr "Nisem povezaqn z gnome-pilot daemonom"
#~ msgid ""
-#~ "An error occured when trying to fetch\n"
+#~ "An error occurred when trying to fetch\n"
#~ "pilot list from the gnome-pilot daemon"
#~ msgstr ""
#~ "Ob prenašanju seznama pilotov z gnome-pilot\n"
diff --git a/po/sr.po b/po/sr.po
index 30f1926d08..4f5f6094b2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -24608,7 +24608,7 @@ msgstr "%s (%d предмета)"
#~ msgstr "Није могуће састављање података за потпис: %s"
#~ msgid ""
-#~ "The following error occured while migrating your mail data:\n"
+#~ "The following error occurred while migrating your mail data:\n"
#~ "%s"
#~ msgstr ""
#~ "Догодила се наредна грешка при преносу података ваше поште:\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index f6f204bb99..c716741176 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -24608,7 +24608,7 @@ msgstr "%s (%d predmeta)"
#~ msgstr "Nije moguće sastavljanje podataka za potpis: %s"
#~ msgid ""
-#~ "The following error occured while migrating your mail data:\n"
+#~ "The following error occurred while migrating your mail data:\n"
#~ "%s"
#~ msgstr ""
#~ "Dogodila se naredna greška pri prenosu podataka vaše pošte:\n"
diff --git a/po/sv.po b/po/sv.po
index 05301b429a..fb836d4293 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@
# meeting = sammanträde
# event = evenemang
#
-# $Id: sv.po,v 1.214 2005/08/10 14:22:52 menthos Exp $
+# $Id: sv.po,v 1.215 2005/08/21 19:35:00 jseidel Exp $
#
msgid ""
msgstr ""
@@ -38555,7 +38555,7 @@ msgstr "Handtagspopupfönster"
#~ msgstr "Inte ansluten till gnome-pilot-demonen"
#~ msgid ""
-#~ "An error occured when trying to fetch\n"
+#~ "An error occurred when trying to fetch\n"
#~ "pilot list from the gnome-pilot daemon"
#~ msgstr ""
#~ "Ett fel inträffade vid hämtning av\n"