1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
|
Description: Fix 'occured' typo, replace with 'occurred'.
Author: Bas Couwenberg <sebastic@debian.org>
--- a/ChangeLog
+++ b/ChangeLog
@@ -8266,7 +8266,7 @@
2003-06-18 Jonathan Coles <jonathan@intevation.de>
- * setup.py: Fix a few problems that occured under Windows.
+ * setup.py: Fix a few problems that occurred under Windows.
2003-06-18 Jonathan Coles <jonathan@intevation.de>
--- a/Extensions/importAPR/apr.py
+++ b/Extensions/importAPR/apr.py
@@ -196,7 +196,7 @@ class APR_TClr(ODBBaseObject):
def GetThubanColor(self):
"""Return a Thuban Color object; returns None if a problem
- occured.
+ occurred.
"""
if hasattr(self, 'Red') or hasattr(self, 'Green') or \
hasattr(self, 'Blue'):
--- a/Extensions/ogr/ogrstart.py
+++ b/Extensions/ogr/ogrstart.py
@@ -110,7 +110,7 @@ def open_db(context):
if not has_layers:
canvas.FitMapToWindow()
except:
- # Some error occured while initializing the layer
+ # Some error occurred while initializing the layer
context.mainwindow.RunMessageBox(_("Add Layer from database"),
_("Can't open the database table '%s'")
% dbtable)
@@ -154,7 +154,7 @@ def OpenFileShapestore(mainwindow, sessi
store = ogrshapes.OGRFileShapeStore(session, filename, layername)
return store
except:
- # Some error occured while initializing the layer
+ # Some error occurred while initializing the layer
mainwindow.RunMessageBox(_("Open datasource"),
_("Can't open the datasource '%s'")
% filename)
@@ -182,7 +182,7 @@ def OpenDBShapestore(session, dbconn, la
id_column = id_column)
return store
except:
- # Some error occured while initializing the layer
+ # Some error occurred while initializing the layer
context.mainwindow.RunMessageBox(_("Open datasource"),
_("Can't open the datasource '%s'")
% filename)
--- a/Extensions/wms/capabilities.py
+++ b/Extensions/wms/capabilities.py
@@ -86,7 +86,7 @@ class WMSCapabilities(WMSClient, WMSCapa
retrieve particular information from the fetched or loaded
capabilities XML.
- If an error occured during processing an error text is assigned to
+ If an error occurred during processing an error text is assigned to
self.errorMsg. If everything went fine, this variable is set to
None. The current value can be retrieved by the getErrorMsg()
method.
--- a/Extensions/wms/layer.py
+++ b/Extensions/wms/layer.py
@@ -92,7 +92,7 @@ class WMSLayer(BaseLayer):
title -- Title of this layer.
url -- URL of the WMS-Server wich must contain '?'
- If an error occured, self.error_msg is a string describing
+ If an error occurred, self.error_msg is a string describing
the problem(s). Else, self.error_msg is None.
"""
BaseLayer.__init__(self, title, visible = True, projection = None)
--- a/Thuban/UI/mainwindow.py
+++ b/Thuban/UI/mainwindow.py
@@ -663,7 +663,7 @@ class MainWindow(DockFrame):
geometry_column = geo_column)
layer = Layer(title, store)
except:
- # Some error occured while initializing the layer
+ # Some error occurred while initializing the layer
traceback.print_exc(file=sys.stderr)
self.RunMessageBox(_("Add Layer from database"),
_("Can't open the database table '%s'")
--- a/Thuban/UI/projdialog.py
+++ b/Thuban/UI/projdialog.py
@@ -388,7 +388,7 @@ class ProjFrame(NonModalNonParentDialog)
def __ShowError(self, filename, errstr):
wx.MessageDialog(self,
- _("The following error occured:\n") +
+ _("The following error occurred:\n") +
filename + "\n" + errstr,
_("Error"), wx.OK | wx.ICON_ERROR).ShowModal()
--- a/libraries/thuban/gdalwarp.cpp
+++ b/libraries/thuban/gdalwarp.cpp
@@ -340,7 +340,7 @@ static CPLErr GetImageData(GDALDataset *
if (ret == CE_Failure)
{
PyErr_Format(PyExc_IOError,
- "An unknown error occured while reading band %i in %s",
+ "An unknown error occurred while reading band %i in %s",
i, pszSrcFilename);
break;
}
@@ -386,7 +386,7 @@ static CPLErr GetImageData(GDALDataset *
if (ret == CE_Failure)
{
PyErr_Format(PyExc_IOError,
- "An unknown error occured while reading band 1 in %s", pszSrcFilename);
+ "An unknown error occurred while reading band 1 in %s", pszSrcFilename);
break;
}
@@ -431,7 +431,7 @@ static CPLErr GetImageData(GDALDataset *
if (ret == CE_Failure)
{
PyErr_Format(PyExc_IOError,
- "An unknown error occured while reading band 1 in %s",
+ "An unknown error occurred while reading band 1 in %s",
pszSrcFilename);
break;
}
--- a/po/cs.po
+++ b/po/cs.po
@@ -1626,7 +1626,7 @@ msgid "Export"
msgstr "Export"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "Byla zjitna nsledujc chyba:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/de.po
+++ b/po/de.po
@@ -1633,7 +1633,7 @@ msgid "Export"
msgstr "Export"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "Der folgende Fehler trat auf:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/es.po
+++ b/po/es.po
@@ -1633,7 +1633,7 @@ msgid "Export"
msgstr "Exportar"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "Ocurrió el error siguiente:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/fr.po
+++ b/po/fr.po
@@ -1633,7 +1633,7 @@ msgid "Export"
msgstr "Exporter"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "L'erreur suivante s'est produite:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/hu.po
+++ b/po/hu.po
@@ -1625,7 +1625,7 @@ msgid "Export"
msgstr "Exportls"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "A kvetkez hiba trtnt:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/it.po
+++ b/po/it.po
@@ -1642,7 +1642,7 @@ msgid "Export"
msgstr "Esporta"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "Si è verificato il seguente errore:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1635,7 +1635,7 @@ msgid "Export"
msgstr "Exportar"
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr "O seguinte erro ocorreu:\n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/ru.po
+++ b/po/ru.po
@@ -1636,7 +1636,7 @@ msgid "Export"
msgstr ""
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr " : \n"
#: ../Thuban/UI/projdialog.py:393
--- a/po/thuban.pot
+++ b/po/thuban.pot
@@ -1587,7 +1587,7 @@ msgid "Export"
msgstr ""
#: ../Thuban/UI/projdialog.py:391
-msgid "The following error occured:\n"
+msgid "The following error occurred:\n"
msgstr ""
#: ../Thuban/UI/projdialog.py:393
|