Correct the spelling of "occured" to "occurred"

diff --git a/NEWS b/NEWS
index 762f31ade4802d2c6a631db6a7a4af9867787309..666439e82a5fe927ca8472d82c4f8bb8a8d05c35 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -356,7 +356,7 @@ What's new in version 1.5.5?
 This release further improves the stability and usability of the
 application. Besides this, it also introduces some new features.  Most
 notably, LyX is now prepared to be compiled with Qt 4.4 that has just
-been released: the stability issues that occured in previous versions
+been released: the stability issues that occurred in previous versions
 of LyX when compiled against Qt 4.4 have been resolved.
 
 

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 22e10bc9afa9c6ef926f9401d97bac472c5965f1..aa53e9a6d14f7211466a5ee0b5f2405bf0f41a03 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -91,7 +91,7 @@ AC_MSG_ERROR([cannot find $1. Please check that the $2 library
 
 
 dnl Usage: LYX_CHECK_WARNINGS  Displays a warning message if a LYX_WARNING
-dnl   has occured previously.
+dnl   has occurred previously.
 AC_DEFUN([LYX_CHECK_WARNINGS],[
 if test x$lyx_warning = xyes; then
 cat <<EOF

diff --git a/development/attic/changelogs/ChangeLog-1.txt b/development/attic/changelogs/ChangeLog-1.txt
index 364f2c21686806ed60646a12646fd78c1c032b46..89d6eb6139fd24bc575d0c131be975bc811b12c0 100644 (file)
--- a/development/attic/changelogs/ChangeLog-1.txt
+++ b/development/attic/changelogs/ChangeLog-1.txt
@@ -10287,7 +10287,7 @@
 
 2000-02-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
-       * WorkArea, Painter, LyXScreen: Fixed the crash that occured on
+       * WorkArea, Painter, LyXScreen: Fixed the crash that occurred on
        resize due to wrong pixmap beeing used. Also took the opurtunity
        to make the LyXScreen stateless on regard to WorkArea and some
        general cleanup in the same files.

diff --git a/development/attic/changelogs/OLD-CHANGES b/development/attic/changelogs/OLD-CHANGES
index 9c1249c6e880bf6a0e2af68e7b8fad3ae9fd2972..36add72bf62efd5fc7b482f74caedafc3eadb07a 100644 (file)
--- a/development/attic/changelogs/OLD-CHANGES
+++ b/development/attic/changelogs/OLD-CHANGES
@@ -2847,7 +2847,7 @@ since 0.11.8(-2)
 - Updated README file. (Asger)
 - Comment about -sDEVICE=x11alpha in system.lyxrc.in added. (Asger)
 - Help text updated with the new -xpos and -ypos parameters. (Asger)
-- Fixed small bug that occured if you provided background_color, but not
+- Fixed small bug that occurred if you provided background_color, but not
   selection_color. (Asger)
 - Made margins in the main window smaller so that the editing area is
   bigger. Should improve usage on small screen. (Asger)
@@ -3838,7 +3838,7 @@ since 1.05
 since 1.04
 - new font handling (saver and more variable) since
   a lot of segementationt faults (that nowbody told
-  me :-( ) occured on systems that had other fonts
+  me :-( ) occurred on systems that had other fonts
   installed.
 - less bugs (specifying a file at the commandline,
   user defined preambles, generated tex-code)

diff --git a/po/ar.po b/po/ar.po
index 7d467f16afdfb3e214bf5665d17b65c018760ecd..9654234883e5c84e20ad1062338114fbfd862c56 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -25360,7 +25360,7 @@ msgstr "خطأ مراجعة التحكم."
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "حدث خطا أثناء تشغيل %1$s"
 

diff --git a/po/bg.po b/po/bg.po
index 27ed618a1bac7f2811962cc302219c1d32519e9e..07d361bd549620d288a11015a0410dd42d36e4d6 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -31599,7 +31599,7 @@ msgstr "Система за контрол на версиите"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Грешка при четене "
 

diff --git a/po/ca.po b/po/ca.po
index 3e6b2120e777c70984eff129f8f7b440750092dc..1d83070bd13b3e399c1dbfcb78ee2418f8b77cb9 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -26636,7 +26636,7 @@ msgstr "Control de versions"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/cs.po b/po/cs.po
index 7b87066ae435c02dcd29f57628e6027e78e8ba79..2d24ff50e4df967545a6ef5a4f80c7b02035f0de 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -25430,7 +25430,7 @@ msgstr "Chyba správy verzí."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Nastala chyba při spuštění příkazu:\n"

diff --git a/po/da.po b/po/da.po
index ceb84880cdd2946cac189fe8a60a9704446fcd49..a30e71d7946a3bf968671573034bb3612b46b71e 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -26570,7 +26570,7 @@ msgstr "Versionsstyringsfejl."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Et problem opstod under kørslen af kommandoen:\n"

diff --git a/po/de.po b/po/de.po
index bb91165e3456a05c76f413c02729b59a6f22f350..1e36875345865883b39bae11079bf3f72086b1da 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -25695,7 +25695,7 @@ msgstr "Fehler der Versionskontrolle."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Bei der Ausführung des Befehls\n"

diff --git a/po/el.po b/po/el.po
index 66164ddba9c8d9519078a323ec908496248ee330..6a7136cb0cdf0f9d8c20a86e29ba09962be18c48 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -26037,7 +26037,7 @@ msgstr "Σφάλμα ελέγχου αναθεώρησης."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Σφάλμα κατά την εκτέλεση της εντολής:\n"

diff --git a/po/en.po b/po/en.po
index e7b12163273242b2b1c749097605f567bd1b781d..614b6b2f8955b4e8edfb77bec6b67221d46ddd8e 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -24745,7 +24745,7 @@ msgstr ""
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/es.po b/po/es.po
index 7c6601df8a14a96271a514b922b6103fbebf759b..4888e850daa0f06123dd249b29b957994a749703 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -25529,7 +25529,7 @@ msgstr "Error de control de revisión."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Ha habido algún problema al ejecutar el comando:\n"

diff --git a/po/eu.po b/po/eu.po
index b1db0f80ade9b9bce585dd13437edd4af0b3c6ce..216fb65b6a5641bad318abbc731d6a9b2d04d5f3 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -26101,7 +26101,7 @@ msgstr "Berrikuspenaren kontrolaren errorea."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Errorea gertatu da komandoa exekutatzean:\n"

diff --git a/po/fi.po b/po/fi.po
index 93ba5154f263b74f067055a4bf83f92324821bfb..130dda3e8defd4767ee50b536e7d4461bb8e5177 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -26856,7 +26856,7 @@ msgstr "Versiohallinta"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Muunnosskriptin %1$s suorittaminen epäonnistui."
 

diff --git a/po/fr.po b/po/fr.po
index b821e4b9d6fc861cba57dd42537756cfbac7cd56..7be6e4681babe76e80a49eef831a1713357bdb8d 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -25922,7 +25922,7 @@ msgstr "Erreur de contrôle de version."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Une erreur s'est produite lors de l'exécution de la commande :\n"

diff --git a/po/gl.po b/po/gl.po
index 9a5502bc1929ecafec9813181c8eaae507c04437..05a96c9102fe291b800a8d2783dce99a5ed13a2e 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -26838,7 +26838,7 @@ msgstr "Controlo de versións"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Aconteceu un erro entanto rodaba %1$s"
 

diff --git a/po/he.po b/po/he.po
index 9e11b8b1e12daed3470bcc202247c3126984a639..b80ff86848a633753af6747f6d18e3f8819ec968 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -26368,7 +26368,7 @@ msgstr "בקרת גרסה"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "ארעה שגיאה בזמן הרצת %1$s"
 

diff --git a/po/hu.po b/po/hu.po
index 42e9f1c43212127574b6194a0742d950394ffa72..1dc026e8d2f398af74b3ffcece7f19d24915d24b 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -26235,7 +26235,7 @@ msgstr "Verziókövetési parancs hiba."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Valamilyen hiba történt a következő parancs futtatásakor:\n"

diff --git a/po/ia.po b/po/ia.po
index f0131091fd57358da0a30319241e9a92886dfbf0..ccdef408a53a1aecf0575fb8bf8b3512b950387e 100644 (file)
--- a/po/ia.po
+++ b/po/ia.po
@@ -25588,7 +25588,7 @@ msgstr "Error de controlo revision."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Alcun problema occurreva durante le execution del commando:\n"

diff --git a/po/id.po b/po/id.po
index e0195ad565af41be2d99f613e168cce01e0d9775..c7265bcde944f84865093229976fc92d8e064428 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -25912,7 +25912,7 @@ msgstr "Kesalahan Kontrol Revisi."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Terjadi masalah ketika menjalankan perintah:\n"

diff --git a/po/it.po b/po/it.po
index 8206b2c818457869afd8ba0790b1df6e1769e821..6a6cd0ef9634dbad885b9f77c6dd9eaecad0506e 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -26773,7 +26773,7 @@ msgstr "Errore di controllo revisione."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Si è verificato un problema eseguendo il comando:\n"

diff --git a/po/ja.po b/po/ja.po
index 5a819f8b22206426fec0548985b388d31e00d543..13fcc242b30d9b15e05af83ef85eac04d01ab4ec 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -25333,7 +25333,7 @@ msgstr "更新管理エラー。"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "コマンド「%1$s」を実行している間に\n"

diff --git a/po/ko.po b/po/ko.po
index 1e27865e922291281ea4dcd610c99f1f9f5d6184..b9a0f861a0ace47d4a34cb9a386c4f13a57571b6 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -25419,7 +25419,7 @@ msgstr "bind 파일을 고르시오"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/nb.po b/po/nb.po
index 306233a61b867c234efa6f638b62ffe83ad2d0c7..aff6b9f203f1e48cc7c6420a5e87184b6320479b 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -25484,7 +25484,7 @@ msgstr "Feil med revisjonskontrollen"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Noe gikk galt med denne kommandoen:\n"

diff --git a/po/nl.po b/po/nl.po
index 9563a08d5be8e2a118a985c7d8a06241dc457c66..bbe3452587a39332356dff0b64e7015bc7edc2dd 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -25839,7 +25839,7 @@ msgstr ""
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/nn.po b/po/nn.po
index dde390bc240a4ab96a68adc4cdd5b511652d6daa..0f96160a8fda84baa59cd315ee0332dc0940f469 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -25807,7 +25807,7 @@ msgstr "Feil ved versjonkontrollen."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Vi fekk ein feil når vi køyrde %1$s"
 

diff --git a/po/pl.po b/po/pl.po
index d743d6be68c6c018289391554860c5c4e0df2ad2..71c70ea0b3c56e058def479d9211fa8fbe729ffd 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -26391,7 +26391,7 @@ msgstr "Błąd kontroli wersji."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Pojawił się problem podczas wykonywania polecenia:\n"

diff --git a/po/pt.po b/po/pt.po
index b090fa5bed09c343b55093bbc0efefeb62352c77..3dce3806bf65ea62d65182f38451ad8f24ec5e07 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -25526,7 +25526,7 @@ msgstr "Erro de controlo de revisão."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Ocorreu algum problema enquanto corria o comando:\n"

diff --git a/po/ro.po b/po/ro.po
index c919de78bc51ea32ce91854ec79e3f659cdbd628..dad26ec5f5e63b5062685be46e6b40e60fb91f9a 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -26514,7 +26514,7 @@ msgstr "Controlul versiunii|v"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/ru.po b/po/ru.po
index e37561d9702c5553882ab30977392b1b08d3ec73..d003ad87f6ea27ae0979af8860b4f99d9d34a6a8 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -26870,7 +26870,7 @@ msgstr "Ошибка системы контроля версий"
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Во время выполнения команды возникла проблема:\n"

diff --git a/po/sk.po b/po/sk.po
index ec04abf032e2e7a3d373b6065b76137a69858009..d48a2d9de87f8655c84fa7702be776e8b59f8556 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -25419,7 +25419,7 @@ msgstr "Chyba kontroly správy verzií."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Problém pri prevádzke príkazu:\n"

diff --git a/po/sl.po b/po/sl.po
index 0a304cd9350e2352d5eea1c6e78d9f9c56c2d5ce..f3950bd0a8b8ed66aa6e464323cc99f6baa4d102 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -27378,7 +27378,7 @@ msgstr "Nadzor različic"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Napaka med branjem "
 

diff --git a/po/sr.po b/po/sr.po
index 760939379fba04265e9fc4e0a894a78034f8690a..de757d0fb7441a5aa23232ec5a4db623fd623a03 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -25955,7 +25955,7 @@ msgstr "Revizija kontrole greške."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 

diff --git a/po/sv.po b/po/sv.po
index 31894354b21ebf92f81835634fb900d995f83632..128853e9227c3303d8644e57ffb86014db608011 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -25657,7 +25657,7 @@ msgstr "Revideringshanteringsfel."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Något problem uppstod vid körning av kommandot:\n"

diff --git a/po/tr.po b/po/tr.po
index 09b41b0562c517795a61f4e879e85621e2b9d707..7bdfb508b3b70c090c9750201249b7ad94a3c236 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -26305,7 +26305,7 @@ msgstr "Sürüm yönetim hatası."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "'%1$s' komutu çalıştırılırken bir hata oluştu."
 

diff --git a/po/uk.po b/po/uk.po
index 0137db625495e2bebb015e53fb51e96e3d5e2dec..f9dd95551a3c414f12837aacddda00e19f578100 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -25514,7 +25514,7 @@ msgstr "Помилка керування версіями."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "Під час виконання команди сталися певні негаразди:\n"

diff --git a/po/wa.po b/po/wa.po
index d7ccf048216fb904e2863222913eae69de25e594..59d3eff2126d6d1469c2c8fe9f90c2f5db526d2e 100644 (file)
--- a/po/wa.po
+++ b/po/wa.po
@@ -27633,7 +27633,7 @@ msgstr "Shûre li modeye%t"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "Dj' a aroké come dji sayîve do lere "
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e547778ff262a443fb319996aae9847289e58dc4..3bad72077dcfea320ce4ccd42681669dc957f921 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -26232,7 +26232,7 @@ msgstr "版本控制"
 #: src/VCBackend.cpp:61
 #, fuzzy, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr "执行 %1$s 出错"
 

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f254e7261eb6fc764942d3acf025f559d8dcd913..bacece962702980016908aaed90d1bb20c9ac715 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -25345,7 +25345,7 @@ msgstr "版本控制錯誤."
 #: src/VCBackend.cpp:61
 #, c-format
 msgid ""
-"Some problem occured while running the command:\n"
+"Some problem occurred while running the command:\n"
 "'%1$s'."
 msgstr ""
 "執行以下命令時發生問題:\n"

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a695a71d68512f15658a8d1619e451a307a455c5..bb85fb512cfb390291047875b167c19500714f0f 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1526,7 +1526,7 @@ bool Buffer::write(ostream & ofs) const
        // how to check if close went ok?
        // Following is an attempt... (BE 20001011)
 
-       // good() returns false if any error occured, including some
+       // good() returns false if any error occurred, including some
        //        formatting error.
        // bad()  returns true if something bad happened in the buffer,
        //        which should include file system full errors.

diff --git a/src/Cursor.h b/src/Cursor.h
index 3f1cc6318e5f714a2981c99c9cd56ee07e33b2ff..0f02129147a9e6e5017b5a3ee53e12c9ec9eb908 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -339,7 +339,7 @@ public:
         */
        void noScreenUpdate() const;
        /// fix cursor in circumstances that should never happen.
-       /// \retval true if a fix occured.
+       /// \retval true if a fix occurred.
        bool fixIfBroken();
        /// Repopulate the slices insets from bottom to top. Useful
        /// for stable iterators or Undo data.

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 5db38893750d1cd4445b23b0a4bf16762ca20c06..615d974f2cd0e54ca4d3525bb0d1989cdf559802 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -44,7 +44,7 @@ private:
                          error_desc(desc),
                          error_text(text),
                          child_name(fname) {}
-               /// what line in the TeX file the error occured in
+               /// what line in the TeX file the error occurred in
                int error_in_line;
                /// The kind of error
                docstring error_desc;

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 9f247a55435ff951b38245dcb26b21e15843ee8e..4f6a975957e1e54a809a3269bfae49b76b008419 100644 (file)
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -805,7 +805,7 @@ bool Text::cursorDownParagraph(Cursor & cur)
 void Text::fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where)
 {
        // Do nothing if cursor is not in the paragraph where the
-       // deletion occured,
+       // deletion occurred,
        if (cur.pit() != where.pit())
                return;
 

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index f799587177d719ce57717cb8de1fa43c2aab6fbb..06fa0dfcf153b20e9e95344408b3bb74deb8916c 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -58,7 +58,7 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError
                owner_->setBusy(false);
        if (ret && reportError)
                frontend::Alert::error(_("Revision control error."),
-                       bformat(_("Some problem occured while running the command:\n"
+                       bformat(_("Some problem occurred while running the command:\n"
                                  "'%1$s'."),
                        from_utf8(cmd)));
        return ret;

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 1fbe8256eb39f9e82325e4fd2a37434a9eadb0e2..3cf797969d56b9de6e3f45bbb9f9a722aaeb7cfe 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2990,7 +2990,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
                        LyXVC::CommandResult ret = buffer->lyxvc().checkIn(log);
                        dr.setMessage(log);
                        // Only skip reloading if the checkin was cancelled or
-                       // an error occured before the real checkin VCS command
+                       // an error occurred before the real checkin VCS command
                        // was executed, since the VCS might have changed the
                        // file even if it could not checkin successfully.
                        if (ret == LyXVC::ErrorCommand || ret == LyXVC::VCSuccess)

diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui
index fbe1d30744823026caa31efadfa8dea8244b1c31..9c51af76973ecd31d62b5559bfdf9f84e199ab36 100644 (file)
--- a/src/frontends/qt4/ui/ErrorListUi.ui
+++ b/src/frontends/qt4/ui/ErrorListUi.ui
@@ -91,7 +91,7 @@
     <widget class="QListWidget" name="errorsLW" >
      <property name="toolTip" >
       <string>Selecting an error will show the error message in the panel below, 
-and jump the cursor to the location in the document where the error occured.</string>
+and jump the cursor to the location in the document where the error occurred.</string>
      </property>
     </widget>
    </item>

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 467f04bd8409db36c1f5fc60780082eb964bab1a..9327613dfdedda784546aaf2f0fb99651f77fdd9 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -577,7 +577,7 @@ QString SystemcallPrivate::errorMessage() const
                        break;
                case QProcess::UnknownError:
                default:
-                       message = "An unknown error occured.";
+                       message = "An unknown error occurred.";
                        break;
        }
        return message;

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 7691fe3b321cb1e3bf32b7516bc97f02584662aa..20088386f943a5b4559c77f1ae1eb5ceb7baa4d0 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -502,7 +502,7 @@ FileName const createLyXTmpDir(FileName const & deflt)
                // dir inside deflt.
                return createTmpDir(deflt, "lyx_tmpdir");
        } else {
-               // some other error occured.
+               // some other error occurred.
                return createTmpDir(package().system_temp_dir(), "lyx_tmpdir");
        }
 }