[GRASS-SVN] r57334 - in grass/trunk: lib/gis lib/raster locale/po raster/r.mapcalc raster/r.viewshed scripts/v.db.droptable scripts/v.in.gps scripts/v.in.mapgen testsuite/raster
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jul 31 16:26:22 PDT 2013
Author: neteler
Date: 2013-07-31 16:26:22 -0700 (Wed, 31 Jul 2013)
New Revision: 57334
Modified:
grass/trunk/lib/gis/copy_file.c
grass/trunk/lib/raster/open.c
grass/trunk/locale/po/grassmods_ar.po
grass/trunk/locale/po/grassmods_cs.po
grass/trunk/locale/po/grassmods_de.po
grass/trunk/locale/po/grassmods_el.po
grass/trunk/locale/po/grassmods_es.po
grass/trunk/locale/po/grassmods_fr.po
grass/trunk/locale/po/grassmods_it.po
grass/trunk/locale/po/grassmods_ja.po
grass/trunk/locale/po/grassmods_ko.po
grass/trunk/locale/po/grassmods_lv.po
grass/trunk/locale/po/grassmods_pl.po
grass/trunk/locale/po/grassmods_pt.po
grass/trunk/locale/po/grassmods_pt_br.po
grass/trunk/locale/po/grassmods_ro.po
grass/trunk/locale/po/grassmods_ru.po
grass/trunk/locale/po/grassmods_sl.po
grass/trunk/locale/po/grassmods_th.po
grass/trunk/locale/po/grassmods_tr.po
grass/trunk/locale/po/grassmods_vi.po
grass/trunk/locale/po/grassmods_zh.po
grass/trunk/locale/po/grasswxpy_cs.po
grass/trunk/locale/po/grasswxpy_de.po
grass/trunk/locale/po/grasswxpy_el.po
grass/trunk/locale/po/grasswxpy_es.po
grass/trunk/locale/po/grasswxpy_fr.po
grass/trunk/locale/po/grasswxpy_id.po
grass/trunk/locale/po/grasswxpy_it.po
grass/trunk/locale/po/grasswxpy_ja.po
grass/trunk/locale/po/grasswxpy_lv.po
grass/trunk/locale/po/grasswxpy_ml.po
grass/trunk/locale/po/grasswxpy_pl.po
grass/trunk/locale/po/grasswxpy_pt.po
grass/trunk/locale/po/grasswxpy_pt_br.po
grass/trunk/locale/po/grasswxpy_ro.po
grass/trunk/locale/po/grasswxpy_ru.po
grass/trunk/locale/po/grasswxpy_th.po
grass/trunk/locale/po/grasswxpy_tr.po
grass/trunk/locale/po/grasswxpy_vi.po
grass/trunk/locale/po/grasswxpy_zh.po
grass/trunk/raster/r.mapcalc/main.c
grass/trunk/raster/r.viewshed/rbbst.cpp
grass/trunk/scripts/v.db.droptable/v.db.droptable.py
grass/trunk/scripts/v.in.gps/v.in.gpsbabel
grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py
grass/trunk/testsuite/raster/raster_md5test.sh
grass/trunk/testsuite/raster/rmapcalc_test.sh
Log:
msg typo: occured -> occurred
Modified: grass/trunk/lib/gis/copy_file.c
===================================================================
--- grass/trunk/lib/gis/copy_file.c 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/lib/gis/copy_file.c 2013-07-31 23:26:22 UTC (rev 57334)
@@ -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)
Modified: grass/trunk/lib/raster/open.c
===================================================================
--- grass/trunk/lib/raster/open.c 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/lib/raster/open.c 2013-07-31 23:26:22 UTC (rev 57334)
@@ -760,7 +760,7 @@
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 @@
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
Modified: grass/trunk/locale/po/grassmods_ar.po
===================================================================
--- grass/trunk/locale/po/grassmods_ar.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_ar.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6151,11 +6151,11 @@
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
Modified: grass/trunk/locale/po/grassmods_cs.po
===================================================================
--- grass/trunk/locale/po/grassmods_cs.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_cs.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6302,11 +6302,11 @@
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
Modified: grass/trunk/locale/po/grassmods_de.po
===================================================================
--- grass/trunk/locale/po/grassmods_de.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_de.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6378,11 +6378,11 @@
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
Modified: grass/trunk/locale/po/grassmods_el.po
===================================================================
--- grass/trunk/locale/po/grassmods_el.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_el.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -5931,11 +5931,11 @@
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
Modified: grass/trunk/locale/po/grassmods_es.po
===================================================================
--- grass/trunk/locale/po/grassmods_es.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_es.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6335,11 +6335,11 @@
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
Modified: grass/trunk/locale/po/grassmods_fr.po
===================================================================
--- grass/trunk/locale/po/grassmods_fr.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_fr.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6677,11 +6677,11 @@
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
Modified: grass/trunk/locale/po/grassmods_it.po
===================================================================
--- grass/trunk/locale/po/grassmods_it.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_it.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -5896,11 +5896,11 @@
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
Modified: grass/trunk/locale/po/grassmods_ja.po
===================================================================
--- grass/trunk/locale/po/grassmods_ja.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_ja.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6157,11 +6157,11 @@
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
Modified: grass/trunk/locale/po/grassmods_ko.po
===================================================================
--- grass/trunk/locale/po/grassmods_ko.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_ko.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -5962,11 +5962,11 @@
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
Modified: grass/trunk/locale/po/grassmods_lv.po
===================================================================
--- grass/trunk/locale/po/grassmods_lv.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_lv.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6106,11 +6106,11 @@
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
Modified: grass/trunk/locale/po/grassmods_pl.po
===================================================================
--- grass/trunk/locale/po/grassmods_pl.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_pl.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -5878,11 +5878,11 @@
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
Modified: grass/trunk/locale/po/grassmods_pt.po
===================================================================
--- grass/trunk/locale/po/grassmods_pt.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_pt.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6374,11 +6374,11 @@
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
Modified: grass/trunk/locale/po/grassmods_pt_br.po
===================================================================
--- grass/trunk/locale/po/grassmods_pt_br.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_pt_br.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6338,11 +6338,11 @@
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
Modified: grass/trunk/locale/po/grassmods_ro.po
===================================================================
--- grass/trunk/locale/po/grassmods_ro.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_ro.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -5620,11 +5620,11 @@
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
Modified: grass/trunk/locale/po/grassmods_ru.po
===================================================================
--- grass/trunk/locale/po/grassmods_ru.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_ru.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6301,11 +6301,11 @@
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
Modified: grass/trunk/locale/po/grassmods_sl.po
===================================================================
--- grass/trunk/locale/po/grassmods_sl.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_sl.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6207,11 +6207,11 @@
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
Modified: grass/trunk/locale/po/grassmods_th.po
===================================================================
--- grass/trunk/locale/po/grassmods_th.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_th.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6185,11 +6185,11 @@
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
Modified: grass/trunk/locale/po/grassmods_tr.po
===================================================================
--- grass/trunk/locale/po/grassmods_tr.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_tr.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6031,11 +6031,11 @@
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
Modified: grass/trunk/locale/po/grassmods_vi.po
===================================================================
--- grass/trunk/locale/po/grassmods_vi.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_vi.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6313,11 +6313,11 @@
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
Modified: grass/trunk/locale/po/grassmods_zh.po
===================================================================
--- grass/trunk/locale/po/grassmods_zh.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grassmods_zh.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -6215,11 +6215,11 @@
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
Modified: grass/trunk/locale/po/grasswxpy_cs.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_cs.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_cs.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1779,14 +1779,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_de.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_de.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_de.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1731,14 +1731,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_el.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_el.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_el.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1684,14 +1684,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_es.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_es.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_es.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1785,14 +1785,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_fr.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_fr.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_fr.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1755,14 +1755,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_id.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_id.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_id.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1855,14 +1855,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_it.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_it.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_it.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1744,14 +1744,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_ja.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_ja.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_ja.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1772,14 +1772,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_lv.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_lv.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_lv.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1675,14 +1675,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_ml.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_ml.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_ml.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1762,14 +1762,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_pl.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_pl.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_pl.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1691,14 +1691,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_pt.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_pt.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_pt.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1859,14 +1859,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_pt_br.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_pt_br.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_pt_br.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1886,14 +1886,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_ro.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_ro.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_ro.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1709,14 +1709,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_ru.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_ru.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_ru.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1830,14 +1830,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_th.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_th.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_th.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1752,14 +1752,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_tr.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_tr.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_tr.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1823,14 +1823,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_vi.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_vi.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_vi.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1822,14 +1822,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/locale/po/grasswxpy_zh.po
===================================================================
--- grass/trunk/locale/po/grasswxpy_zh.po 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/locale/po/grasswxpy_zh.po 2013-07-31 23:26:22 UTC (rev 57334)
@@ -1795,14 +1795,14 @@
#: ../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 @@
#: ../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 ""
Modified: grass/trunk/raster/r.mapcalc/main.c
===================================================================
--- grass/trunk/raster/r.mapcalc/main.c 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/raster/r.mapcalc/main.c 2013-07-31 23:26:22 UTC (rev 57334)
@@ -161,12 +161,12 @@
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;
}
Modified: grass/trunk/raster/r.viewshed/rbbst.cpp
===================================================================
--- grass/trunk/raster/r.viewshed/rbbst.cpp 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/raster/r.viewshed/rbbst.cpp 2013-07-31 23:26:22 UTC (rev 57334)
@@ -645,7 +645,7 @@
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);
Modified: grass/trunk/scripts/v.db.droptable/v.db.droptable.py
===================================================================
--- grass/trunk/scripts/v.db.droptable/v.db.droptable.py 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/scripts/v.db.droptable/v.db.droptable.py 2013-07-31 23:26:22 UTC (rev 57334)
@@ -75,7 +75,7 @@
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)
Modified: grass/trunk/scripts/v.in.gps/v.in.gpsbabel
===================================================================
--- grass/trunk/scripts/v.in.gps/v.in.gpsbabel 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/scripts/v.in.gps/v.in.gpsbabel 2013-07-31 23:26:22 UTC (rev 57334)
@@ -654,7 +654,7 @@
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
Modified: grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py
===================================================================
--- grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py 2013-07-31 23:26:22 UTC (rev 57334)
@@ -126,7 +126,7 @@
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 @@
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()
Modified: grass/trunk/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/trunk/testsuite/raster/raster_md5test.sh 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/testsuite/raster/raster_md5test.sh 2013-07-31 23:26:22 UTC (rev 57334)
@@ -76,7 +76,7 @@
check_exit_status()
{
if [ $1 -ne 0 ] ; then
- echo "An error occured."
+ echo "An error occurred."
cleanup ; finalcleanup
exit 1
fi
Modified: grass/trunk/testsuite/raster/rmapcalc_test.sh
===================================================================
--- grass/trunk/testsuite/raster/rmapcalc_test.sh 2013-07-31 17:53:12 UTC (rev 57333)
+++ grass/trunk/testsuite/raster/rmapcalc_test.sh 2013-07-31 23:26:22 UTC (rev 57334)
@@ -71,7 +71,7 @@
check_exit_status()
{
if [ $1 -ne 0 ] ; then
- echo "An error occured."
+ echo "An error occurred."
cleanup ; finalcleanup
exit 1
fi
More information about the grass-commit
mailing list