浏览代码

msg typo: occured -> occurred

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57334 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 11 年之前
父节点
当前提交
070eaa1a92
共有 48 个文件被更改,包括 109 次插入109 次删除
  1. 1 1
      lib/gis/copy_file.c
  2. 2 2
      lib/raster/open.c
  3. 2 2
      locale/po/grassmods_ar.po
  4. 2 2
      locale/po/grassmods_cs.po
  5. 2 2
      locale/po/grassmods_de.po
  6. 2 2
      locale/po/grassmods_el.po
  7. 2 2
      locale/po/grassmods_es.po
  8. 2 2
      locale/po/grassmods_fr.po
  9. 2 2
      locale/po/grassmods_it.po
  10. 2 2
      locale/po/grassmods_ja.po
  11. 2 2
      locale/po/grassmods_ko.po
  12. 2 2
      locale/po/grassmods_lv.po
  13. 2 2
      locale/po/grassmods_pl.po
  14. 2 2
      locale/po/grassmods_pt.po
  15. 2 2
      locale/po/grassmods_pt_br.po
  16. 2 2
      locale/po/grassmods_ro.po
  17. 2 2
      locale/po/grassmods_ru.po
  18. 2 2
      locale/po/grassmods_sl.po
  19. 2 2
      locale/po/grassmods_th.po
  20. 2 2
      locale/po/grassmods_tr.po
  21. 2 2
      locale/po/grassmods_vi.po
  22. 2 2
      locale/po/grassmods_zh.po
  23. 3 3
      locale/po/grasswxpy_cs.po
  24. 3 3
      locale/po/grasswxpy_de.po
  25. 3 3
      locale/po/grasswxpy_el.po
  26. 3 3
      locale/po/grasswxpy_es.po
  27. 3 3
      locale/po/grasswxpy_fr.po
  28. 3 3
      locale/po/grasswxpy_id.po
  29. 3 3
      locale/po/grasswxpy_it.po
  30. 3 3
      locale/po/grasswxpy_ja.po
  31. 3 3
      locale/po/grasswxpy_lv.po
  32. 3 3
      locale/po/grasswxpy_ml.po
  33. 3 3
      locale/po/grasswxpy_pl.po
  34. 3 3
      locale/po/grasswxpy_pt.po
  35. 3 3
      locale/po/grasswxpy_pt_br.po
  36. 3 3
      locale/po/grasswxpy_ro.po
  37. 3 3
      locale/po/grasswxpy_ru.po
  38. 3 3
      locale/po/grasswxpy_th.po
  39. 3 3
      locale/po/grasswxpy_tr.po
  40. 3 3
      locale/po/grasswxpy_vi.po
  41. 3 3
      locale/po/grasswxpy_zh.po
  42. 2 2
      raster/r.mapcalc/main.c
  43. 1 1
      raster/r.viewshed/rbbst.cpp
  44. 1 1
      scripts/v.db.droptable/v.db.droptable.py
  45. 1 1
      scripts/v.in.gps/v.in.gpsbabel
  46. 2 2
      scripts/v.in.mapgen/v.in.mapgen.py
  47. 1 1
      testsuite/raster/raster_md5test.sh
  48. 1 1
      testsuite/raster/rmapcalc_test.sh

+ 1 - 1
lib/gis/copy_file.c

@@ -28,7 +28,7 @@
  * \param infile  String containing path to source file
  * \param outfile String containing path to destination file
  * 
- * \return 1 on success; 0 if an error occured (warning will be printed)
+ * \return 1 on success; 0 if an error occurred (warning will be printed)
  **/
 
 int G_copy_file(const char *infile, const char *outfile)

+ 2 - 2
lib/raster/open.c

@@ -760,7 +760,7 @@ int Rast_map_is_fp(const char *name, const char *mapset)
 
    Determines if the raster map is floating point or integer. Returns
    DCELL_TYPE for double maps, FCELL_TYPE for float maps, CELL_TYPE for
-   integer maps, -1 if error has occured
+   integer maps, -1 if error has occurred
 
    \param name map name 
    \param mapset mapset where map <i>name</i> lives
@@ -799,7 +799,7 @@ RASTER_MAP_TYPE Rast_map_type(const char *name, const char *mapset)
 
    Determines if the raster map is floating point or integer. Returns
    DCELL_TYPE for double maps, FCELL_TYPE for float maps, CELL_TYPE for
-   integer maps, -1 if error has occured
+   integer maps, -1 if error has occurred
 
    \param fd file descriptor
 

+ 2 - 2
locale/po/grassmods_ar.po

@@ -6151,11 +6151,11 @@ msgid "parse error"
 msgstr "الملف الراسترى المدخل"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_cs.po

@@ -6302,11 +6302,11 @@ msgid "parse error"
 msgstr "Chyba prametru"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "Chyba ve výpočtu čísel s plovoucí desetinnou čárkou"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Přetečení je započítáno ve výpočtu"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_de.po

@@ -6378,11 +6378,11 @@ msgid "parse error"
 msgstr "Parameterfehler"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "Während der Berechnung sind Fließkomma-Fehler aufgetreten."
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Überlauf während der Berechnung."
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_el.po

@@ -5931,11 +5931,11 @@ msgid "parse error"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_es.po

@@ -6335,11 +6335,11 @@ msgid "parse error"
 msgstr "Parámetros"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "Hubo error(es) de coma flotante en el cálculo"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Hubo desbordamiento en el cálculo"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_fr.po

@@ -6677,11 +6677,11 @@ msgid "parse error"
 msgstr "%d erreurs de mise à jour"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 # c-format

+ 2 - 2
locale/po/grassmods_it.po

@@ -5896,11 +5896,11 @@ msgid "parse error"
 msgstr "Parametri"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_ja.po

@@ -6157,11 +6157,11 @@ msgid "parse error"
 msgstr "セパレーション"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "計算中に浮動小数点エラーが発生しました"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "計算がオーバーフローしました"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_ko.po

@@ -5962,11 +5962,11 @@ msgid "parse error"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_lv.po

@@ -6106,11 +6106,11 @@ msgid "parse error"
 msgstr "%d papildinājuma/atjauninājuma kļūda\n"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_pl.po

@@ -5878,11 +5878,11 @@ msgid "parse error"
 msgstr "raster"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_pt.po

@@ -6374,11 +6374,11 @@ msgid "parse error"
 msgstr "Parâmetros do agrupamento\n"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_pt_br.po

@@ -6338,11 +6338,11 @@ msgid "parse error"
 msgstr "Parâmetros do agrupamento\n"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_ro.po

@@ -5620,11 +5620,11 @@ msgid "parse error"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_ru.po

@@ -6301,11 +6301,11 @@ msgid "parse error"
 msgstr "Ошибка параметра"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "Ошибка(и) во время вычислений с плавающей точкой"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Возникло переполнение во время вычислений"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_sl.po

@@ -6207,11 +6207,11 @@ msgid "parse error"
 msgstr "%d napak med posodabljanjem\n"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_th.po

@@ -6185,11 +6185,11 @@ msgid "parse error"
 msgstr "ตัวแปร"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "การคำนวน ปรากฎว่า Floating point ผิดพลาด"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "การคำนวน ปรากฎว่า Overflow"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_tr.po

@@ -6031,11 +6031,11 @@ msgid "parse error"
 msgstr "ayrıştırma hatası"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "Hesaplamada kayar nokta hata(ları)sı oluştu"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Hesaplamada taşma oluştu"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_vi.po

@@ -6313,11 +6313,11 @@ msgid "parse error"
 msgstr "raster"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr "(Các) lỗi dấu chấm động xảy ra trong tính toán"
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr "Tràn bộ nhớ xảy ra trong quá trình tính toán"
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 2 - 2
locale/po/grassmods_zh.po

@@ -6215,11 +6215,11 @@ msgid "parse error"
 msgstr "%d 条记录更新时发生错误"
 
 #: ../raster/r.mapcalc/main.c:164
-msgid "Floating point error(s) occured in the calculation"
+msgid "Floating point error(s) occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/main.c:169
-msgid "Overflow occured in the calculation"
+msgid "Overflow occurred in the calculation"
 msgstr ""
 
 #: ../raster/r.mapcalc/evaluate.c:140

+ 3 - 3
locale/po/grasswxpy_cs.po

@@ -1779,14 +1779,14 @@ msgstr "Výstup příkazů"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1798,7 +1798,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_de.po

@@ -1731,14 +1731,14 @@ msgstr "Befehlsausgabe in '%s' gespeichert"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1750,7 +1750,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_el.po

@@ -1684,14 +1684,14 @@ msgstr "Οι επιλογές αποθηκεύτηκαν στο αρχείο '%s
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1703,7 +1703,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_es.po

@@ -1785,14 +1785,14 @@ msgstr "Salida de la orden."
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1804,7 +1804,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_fr.po

@@ -1755,14 +1755,14 @@ msgstr "Historique des commandes enregistré dans '%s'"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1774,7 +1774,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_id.po

@@ -1855,14 +1855,14 @@ msgstr "Output perintah"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1874,7 +1874,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_it.po

@@ -1744,14 +1744,14 @@ msgstr "Output dei comandi salvati in '%s'"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1763,7 +1763,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_ja.po

@@ -1772,14 +1772,14 @@ msgstr "コマンド出力 "
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1791,7 +1791,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_lv.po

@@ -1675,14 +1675,14 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1694,7 +1694,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_ml.po

@@ -1762,14 +1762,14 @@ msgstr "ആജ്ഞയുടെ ഉത്പന്നം"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1781,7 +1781,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_pl.po

@@ -1691,14 +1691,14 @@ msgstr "Wynik polecenia zapisano w '%s'"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1710,7 +1710,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_pt.po

@@ -1859,14 +1859,14 @@ msgstr "Saída de comando"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1878,7 +1878,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_pt_br.po

@@ -1886,14 +1886,14 @@ msgstr "Saída de comando"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1905,7 +1905,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_ro.po

@@ -1709,14 +1709,14 @@ msgstr "Comanda de intrare salvată ca '%s'"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1728,7 +1728,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_ru.po

@@ -1830,14 +1830,14 @@ msgstr "Результат команды"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1849,7 +1849,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_th.po

@@ -1752,14 +1752,14 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1771,7 +1771,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_tr.po

@@ -1823,14 +1823,14 @@ msgstr "Komut Çıktısı"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1842,7 +1842,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_vi.po

@@ -1822,14 +1822,14 @@ msgstr "Đầu ra của lệnh"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1841,7 +1841,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 3 - 3
locale/po/grasswxpy_zh.po

@@ -1795,14 +1795,14 @@ msgstr "命令运行结果输出"
 #: ../gui/wxpython/gui_core/mapwindow.py:104
 #, python-format
 msgid ""
-"Error occured during calling of handler: %s \n"
+"Error occurred during calling of handler: %s \n"
 "Handler was unregistered."
 msgstr ""
 
 #: ../gui/wxpython/gui_core/mapwindow.py:173
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered."
 msgstr ""
 
@@ -1814,7 +1814,7 @@ msgstr ""
 #: ../gui/wxpython/gui_core/mapwindow.py:202
 #, python-format
 msgid ""
-"Error occured during unregistration of handler: %s \n"
+"Error occurred during unregistration of handler: %s \n"
 "                                        Handler was unregistered"
 msgstr ""
 

+ 2 - 2
raster/r.mapcalc/main.c

@@ -161,12 +161,12 @@ int main(int argc, char **argv)
     all_ok = 1;
 
     if (floating_point_exception_occurred) {
-	G_warning(_("Floating point error(s) occured in the calculation"));
+	G_warning(_("Floating point error(s) occurred in the calculation"));
 	all_ok = 0;
     }
 
     if (overflow_occurred) {
-	G_warning(_("Overflow occured in the calculation"));
+	G_warning(_("Overflow occurred in the calculation"));
 	all_ok = 0;
     }
 

+ 1 - 1
raster/r.viewshed/rbbst.cpp

@@ -645,7 +645,7 @@ double find_max_value_within_key(TreeNode * root, double maxKey, double angle, d
     TreeNode *keyNode = search_for_node(root, maxKey);
 
     if (keyNode == NIL) {
-	/*fprintf(stderr, "key node not found. error occured!\n");
+	/*fprintf(stderr, "key node not found. error occurred!\n");
 	   //there is no point in the structure with key < maxKey */
 	/*node not found */
 	G_fatal_error(_("Attempt to find node with key=%f failed"), maxKey);

+ 1 - 1
scripts/v.db.droptable/v.db.droptable.py

@@ -75,7 +75,7 @@ def main():
 
     if grass.write_command('db.execute', stdin = "DROP TABLE %s" % table, input = '-',
                            database = database, driver = driver) != 0:
-	grass.fatal(_("An error occured while running db.execute"))
+	grass.fatal(_("An error occurred while running db.execute"))
 
     grass.run_command('v.db.connect', flags = 'd', map = map, layer = layer)
 

+ 1 - 1
scripts/v.in.gps/v.in.gpsbabel

@@ -654,7 +654,7 @@ EOF
 	if [ $? -eq 0 ] ; then
 	    g.message message="Line vector <$NAME> successfully created."
 	else
-	    g.message -e message='An error occured on creating <$NAME>, please check!'
+	    g.message -e message='An error occurred on creating <$NAME>, please check!'
 	    exit 1
 	fi
 

+ 2 - 2
scripts/v.in.mapgen/v.in.mapgen.py

@@ -126,7 +126,7 @@ def main():
                 try:
                     outf.write(" %.15g %.15g %.15g\n" % tuple(map(float, point)))
                 except ValueError:
-                    grass.fatal(_("An error occured on line '%s', exiting.") % line.strip())
+                    grass.fatal(_("An error occurred on line '%s', exiting.") % line.strip())
             outf.write(" 1 %d\n" % cat)
             cat += 1       
     else:
@@ -194,7 +194,7 @@ VERTI:
         grass.message(_("Importing with v.in.ascii...")) 
         if grass.run_command('v.in.ascii', flags = do3D, input = digfile,
 			     output = name, format = 'standard') != 0:
-            grass.fatal(_('An error occured on creating "%s", please check') % name)
+            grass.fatal(_('An error occurred on creating "%s", please check') % name)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

+ 1 - 1
testsuite/raster/raster_md5test.sh

@@ -76,7 +76,7 @@ finalcleanup()
 check_exit_status()
 {
  if [ $1 -ne 0 ] ; then
-  echo "An error occured."
+  echo "An error occurred."
   cleanup ; finalcleanup
   exit 1
  fi

+ 1 - 1
testsuite/raster/rmapcalc_test.sh

@@ -71,7 +71,7 @@ finalcleanup()
 check_exit_status()
 {
  if [ $1 -ne 0 ] ; then
-  echo "An error occured."
+  echo "An error occurred."
   cleanup ; finalcleanup
   exit 1
  fi