From 5c67dd94610d50f57622104a20e4cf13559b5955 Mon Sep 17 00:00:00 2001 From: dockes Date: Fri, 25 Nov 2005 10:26:35 +0000 Subject: [PATCH] install translations to share/recoll/translations --- src/qtgui/main.cpp | 28 +++++++++------ src/qtgui/recoll_fr.ts | 82 +++++++++++++++++++++++++++++++++++++++++- src/recollinstall.in | 4 ++- 3 files changed, 101 insertions(+), 13 deletions(-) diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp index d48f27a8..c47d024e 100644 --- a/src/qtgui/main.cpp +++ b/src/qtgui/main.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: main.cpp,v 1.18 2005-11-25 10:02:36 dockes Exp $ (C) 2005 J.F.Dockes"; +static char rcsid[] = "@(#$Id: main.cpp,v 1.19 2005-11-25 10:26:35 dockes Exp $ (C) 2005 J.F.Dockes"; #endif #include @@ -28,6 +28,8 @@ using Rcl::AdvSearchData; #include "recollmain.h" +static const char *recollsharedir = "/usr/local/share/recoll"; + RclConfig *rclconfig; Rcl::Db *rcldb; int recollNeedsExit; @@ -111,12 +113,6 @@ int main( int argc, char ** argv ) qt.load( QString( "qt_" ) + QTextCodec::locale(), "." ); a.installTranslator( &qt ); - // Translations for Recoll - QTranslator translator( 0 ); - // QTextCodec::locale() returns $LANG - translator.load( QString("recoll_") + QTextCodec::locale(), "." ); - a.installTranslator( &translator ); - // Restore some settings from previous session QSettings settings; settings.setPath("Recoll.org", "Recoll"); @@ -128,7 +124,6 @@ int main( int argc, char ** argv ) RecollMain w; mainWindow = &w; w.resize(s); - string reason; rclconfig = recollinit(recollCleanup, sigcleanup, reason); @@ -149,13 +144,24 @@ int main( int argc, char ** argv ) exit(1); } + // Translations for Recoll + string translatdir = string(recollsharedir); + path_cat(translatdir, "translations"); + QTranslator translator( 0 ); + // QTextCodec::locale() returns $LANG + translator.load( QString("recoll_") + QTextCodec::locale(), + translatdir.c_str() ); + a.installTranslator( &translator ); + showicons = false; rclconfig->getConfParam("showicons", &showicons); rclconfig->getConfParam("iconsdir", iconsdir); - if (iconsdir.empty()) - iconsdir = "/usr/local/share/recoll/images"; - else + if (iconsdir.empty()) { + iconsdir = string(recollsharedir); + path_cat(iconsdir, "images"); + } else { iconsdir = path_tildexpand(iconsdir); + } if (!maketmpdir(tmpdir)) { QMessageBox::critical(0, "Recoll", diff --git a/src/qtgui/recoll_fr.ts b/src/qtgui/recoll_fr.ts index c1b0d146..aeef31c0 100644 --- a/src/qtgui/recoll_fr.ts +++ b/src/qtgui/recoll_fr.ts @@ -5,6 +5,22 @@ Configuration problem: Problème de configuration: + + No db directory in configuration + Répertoire de la base de données non défini dans la configuration + + + Cannot create temporary directory + Impossible de créer le répertoire temporaire + + + Could not open database in + Impossible d'ouvrir la base dans + + + . Starting indexation + . Démarrage de l'indexation + Preview @@ -52,6 +68,18 @@ Clear Effacer + + Can't turn doc into internal rep for + Impossible de créer une représentation interne pour + + + Creating preview text + Création du texte pour la prévisualisation + + + Loading preview text into editor + Chargement du texte de la prévisualisation + RecollMain @@ -101,12 +129,64 @@ Help - Aide + Aide About Recoll À propos de Recoll + + &Tools + &Outils + + + &Help + &Aide + + + Ctrl+Q + Ctrl+Q + + + Doc History + Historique documents + + + Indexing in progress + Indexation en cours + + + No external viewer configured for mime type + Pas de visualiseur défini pour le type mime + + + Executing: [ + Exécution de: [ + + + <b>Displaying results starting at index %1 (maximum set size %2)</b></p> + <b>Affichage des résultats à partir de l'indice %1 (taille maximum estimée %2)</b></p> + + + Cannot retrieve document info from database + Impossible d'accéder au document dans la base + + + Cannot access document file: + Impossible d'accéder au fichier du document: + + + Preview + Previsualisation + + + Warning + Attention + + + Can't create preview window + Impossible de créer la fenetre de visualisation + advsearch diff --git a/src/recollinstall.in b/src/recollinstall.in index 5e62bb0e..f4f474e6 100755 --- a/src/recollinstall.in +++ b/src/recollinstall.in @@ -30,7 +30,8 @@ if test $# = 1 ; then ${PREFIX}/share \ ${PREFIX}/share/recoll \ ${PREFIX}/share/recoll/examples \ - ${PREFIX}/share/recoll/images + ${PREFIX}/share/recoll/images \ + ${PREFIX}/share/recoll/translations do test -d $d || mkdir $d || exit 1 done @@ -45,6 +46,7 @@ if test $# = 1 ; then ${PREFIX}/share/recoll/examples/ || exit 1 ${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1 + ${INSTALL} qtgui/recoll*.qm ${PREFIX}/share/recoll/translations || exit 1 exit 0