diff --git a/NEWS b/NEWS index 762f31ade4..666439e82a 100644 --- 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 22e10bc9af..aa53e9a6d1 100644 --- 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 < - * 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 9c1249c6e8..36add72bf6 100644 --- 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 7d467f16af..9654234883 100644 --- 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 27ed618a1b..07d361bd54 100644 --- 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 3e6b2120e7..1d83070bd1 100644 --- 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 7b87066ae4..2d24ff50e4 100644 --- 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 ceb84880cd..a30e71d794 100644 --- 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 bb91165e34..1e36875345 100644 --- 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 66164ddba9..6a7136cb0c 100644 --- 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 e7b1216327..614b6b2f89 100644 --- 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 7c6601df8a..4888e850da 100644 --- 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 b1db0f80ad..216fb65b6a 100644 --- 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 93ba5154f2..130dda3e8d 100644 --- 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 b821e4b9d6..7be6e4681b 100644 --- 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 9a5502bc19..05a96c9102 100644 --- 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 9e11b8b1e1..b80ff86848 100644 --- 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 42e9f1c432..1dc026e8d2 100644 --- 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 f0131091fd..ccdef408a5 100644 --- 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 e0195ad565..c7265bcde9 100644 --- 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 8206b2c818..6a6cd0ef96 100644 --- 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 5a819f8b22..13fcc242b3 100644 --- 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 1e27865e92..b9a0f861a0 100644 --- 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 306233a61b..aff6b9f203 100644 --- 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 9563a08d5b..bbe3452587 100644 --- 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 dde390bc24..0f96160a8f 100644 --- 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 d743d6be68..71c70ea0b3 100644 --- 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 b090fa5bed..3dce3806bf 100644 --- 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 c919de78bc..dad26ec5f5 100644 --- 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 e37561d970..d003ad87f6 100644 --- 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 ec04abf032..d48a2d9de8 100644 --- 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 0a304cd935..f3950bd0a8 100644 --- 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 760939379f..de757d0fb7 100644 --- 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 31894354b2..128853e922 100644 --- 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 09b41b0562..7bdfb508b3 100644 --- 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 0137db6254..f9dd95551a 100644 --- 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 d7ccf04821..59d3eff212 100644 --- 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 e547778ff2..3bad72077d 100644 --- 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 f254e7261e..bacece9627 100644 --- 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 a695a71d68..bb85fb512c 100644 --- 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 3f1cc6318e..0f02129147 100644 --- 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 5db3889375..615d974f2c 100644 --- 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 9f247a5543..4f6a975957 100644 --- 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 f799587177..06fa0dfcf1 100644 --- 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 1fbe8256eb..3cf797969d 100644 --- 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 fbe1d30744..9c51af7697 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -91,7 +91,7 @@ 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. +and jump the cursor to the location in the document where the error occurred. diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp index 467f04bd84..9327613dfd 100644 --- 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 7691fe3b32..20088386f9 100644 --- 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"); } }