diff --git a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp index 5e235c2e..307529f4 100644 --- a/src/common/rclconfig.cpp +++ b/src/common/rclconfig.cpp @@ -1013,7 +1013,6 @@ void RclConfig::initFrom(const RclConfig& r) #include #include -#include #include #include diff --git a/src/common/rclinit.cpp b/src/common/rclinit.cpp index c3eb7f01..de7e78e8 100644 --- a/src/common/rclinit.cpp +++ b/src/common/rclinit.cpp @@ -92,7 +92,7 @@ RclConfig *recollinit(RclInitFlags flags, } // Make sure the locale is set. This is only for converting file names - // to utf8 for indexation. + // to utf8 for indexing. setlocale(LC_CTYPE, ""); return config; diff --git a/src/index/fsindexer.cpp b/src/index/fsindexer.cpp index 8f53a1ae..5f99eb82 100644 --- a/src/index/fsindexer.cpp +++ b/src/index/fsindexer.cpp @@ -394,7 +394,7 @@ FsIndexer::processone(const std::string &fn, const struct stat *stp, return FsTreeWalker::FtwOk; } - // File name transcoded to utf8 for indexation. + // File name transcoded to utf8 for indexing. string charset = m_config->getDefCharset(true); // If this fails, the file name won't be indexed, no big deal // Note that we used to do the full path here, but I ended up believing diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp index e0601fa5..3be775f3 100644 --- a/src/index/recollindex.cpp +++ b/src/index/recollindex.cpp @@ -24,9 +24,6 @@ static char rcsid[] = "@(#$Id: recollindex.cpp,v 1.38 2008-10-14 06:07:42 dockes #include #include #include -#include -#include -#include #include #include @@ -165,10 +162,10 @@ static const char usage [] = " Print help\n" "recollindex [-z] \n" " Index everything according to configuration file\n" -" -z : reset database before starting indexation\n" +" -z : reset database before starting indexing\n" #ifdef RCL_MONITOR "recollindex -m [-w ] -x [-D]\n" -" Perform real time indexation. Don't become a daemon if -D is set.\n" +" Perform real time indexing. Don't become a daemon if -D is set.\n" " -w sets number of seconds to wait before starting.\n" #ifndef DISABLE_X11MON " -x disables exit on end of x11 session\n" diff --git a/src/qtgui/i18n/recoll_de.ts b/src/qtgui/i18n/recoll_de.ts index ed2d65cd..449f9074 100644 --- a/src/qtgui/i18n/recoll_de.ts +++ b/src/qtgui/i18n/recoll_de.ts @@ -194,7 +194,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. . Drücken Sie Abbrechen, um die Konfigurationsdatei vor dem Start der Indizierung anzupassen oder OK um mit der Indizierung zu beginnen. diff --git a/src/qtgui/i18n/recoll_fr.ts b/src/qtgui/i18n/recoll_fr.ts index b25e8bf4..14e63494 100644 --- a/src/qtgui/i18n/recoll_fr.ts +++ b/src/qtgui/i18n/recoll_fr.ts @@ -193,7 +193,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. Cliquer Annuler pour pouvoir éditer le fichier de configuration avant que l'indexation ne démarre, ou Ok pour continuer. diff --git a/src/qtgui/i18n/recoll_it.ts b/src/qtgui/i18n/recoll_it.ts index 205a47e8..19473d13 100644 --- a/src/qtgui/i18n/recoll_it.ts +++ b/src/qtgui/i18n/recoll_it.ts @@ -194,7 +194,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. Clicca 'Annulla' se vuoi editare il file di configurazione prima di iniziare l'indicizzazione, oppure 'OK' se vuoi procedere. diff --git a/src/qtgui/i18n/recoll_ru.ts b/src/qtgui/i18n/recoll_ru.ts index 975f872c..2f6cd90b 100644 --- a/src/qtgui/i18n/recoll_ru.ts +++ b/src/qtgui/i18n/recoll_ru.ts @@ -199,7 +199,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. . Нажмите "Отменить", если хотите исправить файл конфигурации до начала индексирования, или "OK" для продолжения. diff --git a/src/qtgui/i18n/recoll_tr.ts b/src/qtgui/i18n/recoll_tr.ts index dc8224d1..ff88bdb0 100644 --- a/src/qtgui/i18n/recoll_tr.ts +++ b/src/qtgui/i18n/recoll_tr.ts @@ -150,7 +150,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. . İndekseleme başlamadan yapılandırmayı düzenlemek için İptal düğmesine basın ya da Tamam düğmesine basarak işleme izin verin. diff --git a/src/qtgui/i18n/recoll_uk.ts b/src/qtgui/i18n/recoll_uk.ts index 811be6d2..e57a4717 100644 --- a/src/qtgui/i18n/recoll_uk.ts +++ b/src/qtgui/i18n/recoll_uk.ts @@ -194,7 +194,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. . Натисніть Відміна, якщо бажаєте відредагувати конфіґурацію до початку індексування, чи OK для продовження. diff --git a/src/qtgui/i18n/recoll_xx.ts b/src/qtgui/i18n/recoll_xx.ts index 9a307375..cb64710a 100644 --- a/src/qtgui/i18n/recoll_xx.ts +++ b/src/qtgui/i18n/recoll_xx.ts @@ -141,7 +141,7 @@ . -Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed. +Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed. diff --git a/src/qtgui/idxthread.cpp b/src/qtgui/idxthread.cpp index e3252230..b803b77a 100644 --- a/src/qtgui/idxthread.cpp +++ b/src/qtgui/idxthread.cpp @@ -73,7 +73,7 @@ void IdxThread::run() m_interrupted = false; indexingstatus = IDXTS_NULL; // We have to make a copy of the config (setKeydir changes - // it during indexation) + // it during indexing) RclConfig *myconf = new RclConfig(*cnf); int loglevel; myconf->setKeyDir(""); diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index 2af8f1ec..e7f498e3 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -359,7 +359,7 @@ void RclMain::initDbOpen() QString::fromLocal8Bit(rclconfig->getDbDir().c_str()) + qApp->translate("Main", ".\n" - "Click Cancel if you want to edit the configuration file before indexation starts, or Ok to let it proceed."), + "Click Cancel if you want to edit the configuration file before indexing starts, or Ok to let it proceed."), "Ok", "Cancel", 0, 0)) { case 0: // Ok: indexing is going to start. diff --git a/src/rcldb/rcldb.h b/src/rcldb/rcldb.h index 3520396e..a19316ba 100644 --- a/src/rcldb/rcldb.h +++ b/src/rcldb/rcldb.h @@ -135,7 +135,7 @@ class Db { /** Remove documents that no longer exist in the file system. This * depends on the update map, which is built during - * indexation (needUpdate()). + * indexing (needUpdate()). * * This should only be called after a full walk of * the file system, else the update map will not be complete, and diff --git a/src/rcldb/rcldoc.h b/src/rcldb/rcldoc.h index 4292f1ed..0dc11ca9 100644 --- a/src/rcldb/rcldoc.h +++ b/src/rcldb/rcldoc.h @@ -50,7 +50,7 @@ class Doc { string url; // Transcoded version of the simple file name for SFN-prefixed - // specific file name indexation + // specific file name indexing // Index: set by DbIndexer::processone string utf8fn; diff --git a/website/BUGS.html b/website/BUGS.html index 8652fe5f..b3423622 100644 --- a/website/BUGS.html +++ b/website/BUGS.html @@ -106,20 +106,18 @@

recoll 1.13.02

-
  • Fix stemming which was completely broken in the 1.13 - series. The stemming database was not - created at all. Things would sort of work as long as an older stemming - database was around (which is why this was not discovered earlier.
    • +
  • Stemming does not work in the 1.13 series. The stemming + database was not created at all. Things would sort of work as + long as an older stemming database was around (which is why + this was not discovered earlier.
  • Fix the lyx filter to properly handle embedded white space in file paths.
    • -

    recoll 1.13.01 + xapian 1.0.16

    - -
  • The GUI display is completely garbled under - Qt 4.6.1 and newer. This is a Qt bug, and a workaround was put - in place in Recoll 1.13.02 for Qt 4.6.1. If you are using a - newer version and the problem is still there, you can fix the +
  • The GUI display is garbled under Qt 4.6.1 and newer. This is + a Qt bug, and a workaround was put in place in Recoll 1.13.02 + for Qt 4.6.1. If you are using a newer version and the problem + is still there, you can fix the 4.6.1 fix to hopefully work with your Qt version: edit qtgui/rclmain_w.h, around line 37 (there is only one instance), change: @@ -495,7 +493,7 @@
  • All directories and files with names beginning with a dot were ignored by the skippedNames directive in the default recoll.conf file from - older versions (no indexation of mozilla or thunderbird email !). An + older versions (no indexing of mozilla or thunderbird email !). An upgrade will not fix this (it will not modify an existing configuration). You need to edit recoll.conf by hand and remove the .* from skippedNames.
    • diff --git a/website/BUGS.txt b/website/BUGS.txt index 11eda4e2..94cfa30e 100644 --- a/website/BUGS.txt +++ b/website/BUGS.txt @@ -339,7 +339,7 @@
  • All directories and files with names beginning with a dot were ignored by the skippedNames directive in the default recoll.conf file from - older versions (no indexation of mozilla or thunderbird email !). An + older versions (no indexing of mozilla or thunderbird email !). An upgrade will not fix this (it will not modify an existing configuration). You need to edit recoll.conf by hand and remove the .* from skippedNames.
    • diff --git a/website/CHANGES.html b/website/CHANGES.html index 0efd144e..7222e7a8 100644 --- a/website/CHANGES.html +++ b/website/CHANGES.html @@ -35,7 +35,10 @@

    Provide a set of configuration defaults so that compilation has a chance to succeed on unknown systems.

    Install icon to the pixmaps directory.

    -

    Fixed bugs

    +

    Fixes stemming, which was broken for all previous 1.13 + releases.

    +

    Bugs fixed between 1.13.02 + and 1.13.04.

    1.13.02

    This version has a single fix to work around a problem in the @@ -702,9 +705,9 @@

    1.3.3 2006-04-04

    • Implement specific search on file names with wildcard - support. Indexation can optionally process all file names or only those - with mime types supported for normal indexation. UPDATING: you need a - full re-indexation to take advantage of this. + support. Indexing can optionally process all file names or only those + with mime types supported for normal indexing. UPDATING: you need a + full re-indexing to take advantage of this.
    • Use links and a right-click popup menu to replace confusing use of mouse clicks and double-clicks inside the result list.
    • The 'example' configuration files are now used as default, and are not