From 8b4301256e1c53747e9bc2f4ac8e9a95284c7002 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 9 Mar 2012 08:24:11 +0100 Subject: [PATCH] GUI: fixed a few issues with string translations --- src/qtgui/i18n/recoll_cs.ts | 24 +++- src/qtgui/i18n/recoll_de.ts | 28 ++-- src/qtgui/i18n/recoll_es.ts | 250 +++++++++++++++++++++--------------- src/qtgui/i18n/recoll_fr.ts | 20 ++- src/qtgui/i18n/recoll_it.ts | 28 ++-- src/qtgui/i18n/recoll_lt.ts | 28 ++-- src/qtgui/i18n/recoll_ru.ts | 24 +++- src/qtgui/i18n/recoll_tr.ts | 28 ++-- src/qtgui/i18n/recoll_uk.ts | 28 ++-- src/qtgui/i18n/recoll_xx.ts | 28 ++-- src/qtgui/rclmain.ui | 2 +- src/qtgui/restable.cpp | 53 ++++---- src/qtgui/restable.h | 4 +- website/release-1.17.html | 4 + 14 files changed, 323 insertions(+), 226 deletions(-) diff --git a/src/qtgui/i18n/recoll_cs.ts b/src/qtgui/i18n/recoll_cs.ts index 423580fd..46f89775 100644 --- a/src/qtgui/i18n/recoll_cs.ts +++ b/src/qtgui/i18n/recoll_cs.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -987,6 +989,10 @@ Chcete spustit dialog s nastavením? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1026,10 +1032,6 @@ Chcete spustit dialog s nastavením? File date - - Ipath - - Keywords @@ -1058,6 +1060,10 @@ Chcete spustit dialog s nastavením? Date and time + + Ipath + + ResList @@ -1162,11 +1168,11 @@ Chcete spustit dialog s nastavením? Add " - Přidat " + Přidat " " column - " sloupec + " sloupec Save table to CSV file @@ -1212,6 +1218,10 @@ Chcete spustit dialog s nastavením? &Save as CSV &Uložit jako CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_de.ts b/src/qtgui/i18n/recoll_de.ts index 1a0a2ca1..6d1dd772 100644 --- a/src/qtgui/i18n/recoll_de.ts +++ b/src/qtgui/i18n/recoll_de.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -976,6 +978,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1015,10 +1021,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1047,6 +1049,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1149,14 +1155,6 @@ Do you want to start the preferences dialog ? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1201,6 +1199,10 @@ Do you want to start the preferences dialog ? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_es.ts b/src/qtgui/i18n/recoll_es.ts index 8f01b660..243f10d0 100644 --- a/src/qtgui/i18n/recoll_es.ts +++ b/src/qtgui/i18n/recoll_es.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -35,7 +37,7 @@ Bad multiplier suffix in size filter - + Sufijo multiplicador incorrecto en filtro de tamaño @@ -130,26 +132,26 @@ Minimum size. You can use k/K,m/M,g/G as multipliers - + Tamaño mínimo. Puede utilizar k/K, m/M o g/G como multiplicadores Min. Size - + Tamaño Mínimo Maximum size. You can use k/K,m/M,g/G as multipliers - + Tamaño máximo. Puede utilizar k/K, m/M o g/G como multiplicadores Max. Size - + Tamaño máximo CronToolW Cron Dialog - + Ventana de Cron <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -162,19 +164,28 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For example, entering <span style=" font-family:'Courier New,courier';">*</span> in <span style=" font-style:italic;">Days, </span><span style=" font-family:'Courier New,courier';">12,19</span> in <span style=" font-style:italic;">Hours</span> and <span style=" font-family:'Courier New,courier';">15</span> in <span style=" font-style:italic;">Minutes</span> would start recollindex every day at 12:15 AM and 7:15 PM</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A schedule with very frequent activations is probably less efficient than real time indexing.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Recoll</span> horario de indexado por lotes (cron) </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Cada campo puede contener un comodín (*), un valor numérico único, listas separadas por comas (1,3,5) y rangos (1-7). Más generalmente, los campos serán usados <span style=" font-style:italic;">tal como son</span> dentro del fichero crontab, y toda la sintaxis crontab puede ser usada, ver crontab(5).</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Por ejemplo, ingresar <span style=" font-family:'Courier New,courier';">*</span> en <span style=" font-style:italic;">Días, </span><span style=" font-family:'Courier New,courier';">12,19</span> en <span style=" font-style:italic;">Horas</span> y <span style=" font-family:'Courier New,courier';">15</span> en <span style=" font-style:italic;">Minutos</span> iniciaría recollindex cada día a las 12:15 AM y 7:15 PM</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Un horario con activaciones frecuentes es probablemente menos eficiente que el indexado en tiempo real.</p></body></html> Days of week (* or 0-7, 0 or 7 is Sunday) - + Días de la semana (* o 0-7, 0 o 7 es Domingo) Hours (* or 0-23) - + Horas (* o 0-23) Minutes (0-59) - + Minutos (0-59) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -182,37 +193,41 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Click <span style=" font-style:italic;">Disable</span> to stop automatic batch indexing, <span style=" font-style:italic;">Enable</span> to activate it, <span style=" font-style:italic;">Cancel</span> to change nothing.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Presione <span style=" font-style:italic;">Deshabilitar</span> para detener el indexado por lotes automático, <span style=" font-style:italic;">Habilitar</span> para activarlo, <span style=" font-style:italic;">Cancelar</span> para no cambiar nada.</p></body></html> Enable - Habilitar + Habilitar Disable - + Deshabilitar It seems that manually edited entries exist for recollindex, cannot edit crontab - + Parece ser que existen entradas para recollindex editadas manualmente, no se puede editar crontab Error installing cron entry. Bad syntax in fields ? - + Error al instalar entrada de cron. Sintaxis incorrecta en los campos? EditDialog Dialog - + Ventana de diálogo FirstIdxDialog First indexing setup - + Primera configuración de indexado <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -224,34 +239,42 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If you want more control, use the following links to adjust the indexing configuration and schedule.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These tools can be accessed later from the <span style=" font-style:italic;">Preferences</span> menu.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Parece ser que el índice para esta configuración no existe.</span><br /><br />Si solamente desea indexar su directorio personal con un conjunto de valores iniciales razonables, presione el botón <span style=" font-style:italic;">Iniciar indexación ahora</span>. Es posible ajustar los detalles más tarde.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Si necesita más control, use los enlaces siguientes para ajustar la configuración de indexación y el horario.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Estas herramientas pueden ser accedidas luego desde el menú <span style=" font-style:italic;">Preferencias</span>.</p></body></html> Indexing configuration - + Configuración de indexación This will let you adjust the directories you want to index, and other parameters like excluded file paths or names, default character sets, etc. - + Esto le permite ajustar los directorios que quiere indexar y otros parámetros, como rutas de ficheros o nombres excluidos, conjuntos de caracteres estandar, etc. Indexing schedule - + Horario de indexación This will let you chose between batch and real-time indexing, and set up an automatic schedule for batch indexing (using cron). - + Esto le permite escoger entre indexación en tiempo real y por lotes, y configurar un horario automático para indexar por lotes (utilizando cron). Start indexing now - + Iniciar indexación ahora IdxSchedW Index scheduling setup - + Configuración de horario de indexación <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -262,34 +285,41 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Reading the manual may help you to decide between these approaches (press F1). </p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This tool can help you set up a schedule to automate batch indexing runs, or start real time indexing when you log in (or both, which rarely makes sense). </p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La indexación de <span style=" font-weight:600;">Recoll</span> puede ejecutarse permanentemente, indexando ficheros cuando cambian, o puede ejecutarse en intervalos discretos. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Leer el manual puede ayudarle a decidir entre estos dos métodos (presione F1).</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Esta herramienta puede ayudarle a configurar un horario para automatizar la ejecución de indexación por lotes, o iniciar la indexación en tiempo real cuando inicia la sesión (o ambos, lo cual rara vez tiene sentido).</p></body></html> Cron scheduling - + Horario de Cron The tool will let you decide at what time indexing should run and will install a crontab entry. - + Esta herramiente le permite decidir a qué hora la indexación se ejecutará e instalará una entrada en el crontab. Real time indexing start up - + Inicio de la indexación en tiempo real Decide if real time indexing will be started when you log in (only for the default index). - + Decida si la indexación en tiempo real será ejecutada cuando inicie la sesión (solo para el índice estándar). ListDialog Dialog - + Ventana de diálogo GroupBox - + Cuadro de grupo @@ -364,11 +394,11 @@ Click Cancel if you want to edit the configuration file before indexing starts, Cannot create temporary directory: - + No se puede crear directorio temporal: Error while loading file - + Error al cargar fichero @@ -469,7 +499,7 @@ Click Cancel if you want to edit the configuration file before indexing starts, RTIToolW Real time indexing automatic start - + Inicio automático de la indexación en tiempo real <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> @@ -478,51 +508,56 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Recoll</span> indexing can be set up to run as a daemon, updating the index as files change, in real time. You gain an always up to date index, but system resources are used permanently.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">La indexación de <span style=" font-weight:600;">Recoll</span> puede configurarse para ejecutar como un demonio, actualizando el índice cuando los ficheros cambian, en tiempo real. Obtiene un índice actualizado siempre, pero recursos del sistema son utilizados permanentemente.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> Start indexing daemon with my desktop session. - + Iniciar el demonio de indexación con mi sesión de escritorio. Also start indexing daemon right now. - + También iniciar demonio de indexación ahora mismo. Replacing: - + Reemplazando: Replacing file - + Reemplazando fichero Can't create: - + No se puede crear: Warning - Advertencia + Advertencia Could not execute recollindex - + No se puede ejecutar recollindex Deleting: - + Borrando: Deleting file - + Borrando fichero Removing autostart - + Eliminando autoinicio Autostart file deleted. Kill current process too ? - + Fichero de autoinicio borrado. Detener el proceso actual también? @@ -720,67 +755,67 @@ Do you want to start the preferences dialog ? None - + Ninguno Updating - + Actualizando Done - + Hecho Monitor - + Monitor Indexing failed - + Indexación falló The current indexing process was not started from this interface. Click Ok to kill it anyway, or Cancel to leave it alone - + El proceso de indexación actual no se inicio desde esta interfaz. Presione Ok para detenerlo, o Cancelar para dejarlo ejecutar Erasing index - + Borrando índice Reset the index and start from scratch ? - + Restaurar el índice e iniciar desde cero? Query in progress.<br>Due to limitations of the indexing library,<br>cancelling will exit the program - + Consulta en progreso.<br>Debido a limitaciones en la librería de indexación,<br>cancelar terminará el programa Error - + Error Index not open - + Índice no está abierto Index query error - + Error de consulta del índice Indexed Mime Types - + Tipos MIME indexados Content has been indexed for these mime types: - + Los contenidos han sido indexados para estos tipos MIME: Index not up to date for this file. Refusing to risk showing the wrong entry. Click Ok to update the index for this file, then re-run the query when indexing is done. Else, Cancel. - + Índice no actualizado para este fichero. No mostrado para evitar utilizar la entrada errónea. Presione Ok para actualizar el índice para este fichero, luego ejecute la consulta de nuevo cuando la indexación termine. En caso contrario, presione Cancelar. Can't update index: indexer running - + No se puede actualizar el índice: indexador en ejecución @@ -967,90 +1002,98 @@ Do you want to start the preferences dialog ? &Rebuild index - + &Reconstruir índice &Show indexed types - + &Mostrar tipos indexados Shift+PgUp - + Mayúsculas+RePág &Indexing schedule - + &Horario de indexación + + + E&xternal index dialog + Configuración de índices e&xternos RecollModel Abstract - + Resumen Author - + Autor Document size - + Tamaño del documento Document date - + Fecha del documento File size - + Tamaño del fichero File name - Nombre de fichero + Nombre de fichero File date - + Fecha del fichero Ipath - + Ipath Keywords - + Palabras clave Mime type - Tipo MIME + Tipo MIME Original character set - + Conjunto de caracteres original Relevancy rating - + Calificación de relevancia Title - + Título URL - + URL Mtime - + Fecha Mod Date - + Fecha Date and time - + Fecha y hora + + + Ipath + Ipath @@ -1152,11 +1195,11 @@ Do you want to start the preferences dialog ? Add " - Añadir " + Añadir " " column - " columna + " columna Save table to CSV file @@ -1202,6 +1245,10 @@ Do you want to start the preferences dialog ? &Save as CSV &Guardar como CSV + + Add "%1" column + Añadir columna "%1" + ResTableDetailArea @@ -1385,7 +1432,7 @@ Use el enlace <b>Mostrar Consulta</b> en caso de duda sobre el resul No field - No hay campo + Ningún campo @@ -1486,7 +1533,7 @@ Use el enlace <b>Mostrar Consulta</b> en caso de duda sobre el resul Choose - + Elegir @@ -1914,54 +1961,57 @@ Puede ser lento para documentos grandes. Style sheet - + Hoja de estilo Opens a dialog to select the style sheet file - + Abre una ventana de diálogo para seleccionar la hoja de estilos Choose - + Elegir Resets the style sheet to default - + Restablecer la hoja de estilo al valor por defecto Lines in PRE text are not folded. Using BR loses some indentation. - + Líneas en texto PRE no se parten. Al usar BR se pierde indentación. Use <PRE> tags instead of <BR>to display plain text as html in preview. - + Use etiquetas <PRE> en lugar de <BR> para desplegar texto corriente como html en la vista previa. Result List - + Lista de resultados Edit result paragraph format string - + Editar texto de formato para el párrafo de resultados Edit result page html header insert - + Editar encabezado html insertado en página de resultados Date format (strftime(3)) - + Formato de fecha (strftime(3)) Frequency percentage threshold over which we do not use terms inside autophrase. Frequent terms are a major performance issue with phrases. Skipped terms augment the phrase slack, and reduce the autophrase efficiency. The default value is 2 (percent). - + Umbral de porcentaje de frequencia sobre el cuál no utilizamos términos dentro de la autofrase. +Los términos frequentes son un problema importante de desempeño con las frases. +Términos omitidos aumenta la holgura de la frase, y reducen la eficiencia de la autofrase. +El valor por defecto es 2 (por ciento). Autophrase term frequency threshold percentage - + Porcentaje del umbral de frequencia de términos de autofrase diff --git a/src/qtgui/i18n/recoll_fr.ts b/src/qtgui/i18n/recoll_fr.ts index b111167d..98d1a0fa 100644 --- a/src/qtgui/i18n/recoll_fr.ts +++ b/src/qtgui/i18n/recoll_fr.ts @@ -1,6 +1,6 @@ - + AdvSearch @@ -996,6 +996,10 @@ Voulez vous démarrer le dialogue de préférences ? &Indexing schedule &Planning d'indexation + + E&xternal index dialog + Configuration des index e&xternes + RecollModel @@ -1029,7 +1033,7 @@ Voulez vous démarrer le dialogue de préférences ? Ipath - Ipath + Ipath Keywords @@ -1067,6 +1071,10 @@ Voulez vous démarrer le dialogue de préférences ? Date and time Date et heure + + Ipath + Ipath + ResList @@ -1179,11 +1187,11 @@ Voulez vous démarrer le dialogue de préférences ? Add " - Ajouter " + Ajouter " " column - " colonne + " colonne Save table to CSV file @@ -1229,6 +1237,10 @@ Voulez vous démarrer le dialogue de préférences ? &Save as CSV &Sauvegarder en CSV + + Add "%1" column + Ajouter une colonne "%1" + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_it.ts b/src/qtgui/i18n/recoll_it.ts index 3994b9b1..3c17e1cd 100644 --- a/src/qtgui/i18n/recoll_it.ts +++ b/src/qtgui/i18n/recoll_it.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -975,6 +977,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1014,10 +1020,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1046,6 +1048,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1148,14 +1154,6 @@ Do you want to start the preferences dialog ? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1200,6 +1198,10 @@ Do you want to start the preferences dialog ? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_lt.ts b/src/qtgui/i18n/recoll_lt.ts index dd2d0f1f..57c20642 100644 --- a/src/qtgui/i18n/recoll_lt.ts +++ b/src/qtgui/i18n/recoll_lt.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -985,6 +987,10 @@ Ar norėtumete iššaukti nustatymų langą? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1024,10 +1030,6 @@ Ar norėtumete iššaukti nustatymų langą? File date - - Ipath - - Keywords @@ -1056,6 +1058,10 @@ Ar norėtumete iššaukti nustatymų langą? Date and time + + Ipath + + ResList @@ -1166,14 +1172,6 @@ Ar norėtumete iššaukti nustatymų langą? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1218,6 +1216,10 @@ Ar norėtumete iššaukti nustatymų langą? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_ru.ts b/src/qtgui/i18n/recoll_ru.ts index 1f95092a..cdf8772d 100644 --- a/src/qtgui/i18n/recoll_ru.ts +++ b/src/qtgui/i18n/recoll_ru.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -991,6 +993,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1030,10 +1036,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1062,6 +1064,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1174,11 +1180,11 @@ Do you want to start the preferences dialog ? Add " - Добавить столбец " + Добавить столбец " " column - " + " Save table to CSV file @@ -1224,6 +1230,10 @@ Do you want to start the preferences dialog ? &Save as CSV &Сохранить как CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_tr.ts b/src/qtgui/i18n/recoll_tr.ts index 05c539fe..9308eee5 100644 --- a/src/qtgui/i18n/recoll_tr.ts +++ b/src/qtgui/i18n/recoll_tr.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -976,6 +978,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1015,10 +1021,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1047,6 +1049,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1149,14 +1155,6 @@ Do you want to start the preferences dialog ? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1201,6 +1199,10 @@ Do you want to start the preferences dialog ? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_uk.ts b/src/qtgui/i18n/recoll_uk.ts index 1826fdab..1edbcdda 100644 --- a/src/qtgui/i18n/recoll_uk.ts +++ b/src/qtgui/i18n/recoll_uk.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -991,6 +993,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -1030,10 +1036,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1062,6 +1064,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1172,14 +1178,6 @@ Do you want to start the preferences dialog ? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1224,6 +1222,10 @@ Do you want to start the preferences dialog ? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/i18n/recoll_xx.ts b/src/qtgui/i18n/recoll_xx.ts index ed51a722..8e442eda 100644 --- a/src/qtgui/i18n/recoll_xx.ts +++ b/src/qtgui/i18n/recoll_xx.ts @@ -1,4 +1,6 @@ - + + + AdvSearch @@ -949,6 +951,10 @@ Do you want to start the preferences dialog ? &Indexing schedule + + E&xternal index dialog + + RecollModel @@ -980,10 +986,6 @@ Do you want to start the preferences dialog ? File date - - Ipath - - Keywords @@ -1020,6 +1022,10 @@ Do you want to start the preferences dialog ? Date and time + + Ipath + + ResList @@ -1118,14 +1124,6 @@ Do you want to start the preferences dialog ? &Delete column - - Add " - - - - " column - - Save table to CSV file @@ -1170,6 +1168,10 @@ Do you want to start the preferences dialog ? &Save as CSV + + Add "%1" column + + ResTableDetailArea diff --git a/src/qtgui/rclmain.ui b/src/qtgui/rclmain.ui index a5b799b9..f04f86cb 100644 --- a/src/qtgui/rclmain.ui +++ b/src/qtgui/rclmain.ui @@ -403,7 +403,7 @@ - External index dialog + E&xternal index dialog External index dialog diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index 6f99b942..edc30043 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -205,26 +205,7 @@ static string datetimegetter(const string&, const Rcl::Doc& doc) } // Static map to translate from internal column names to displayable ones -map RecollModel::o_displayableFields = - create_map - ("abstract", QT_TR_NOOP("Abstract")) - ("author", QT_TR_NOOP("Author")) - ("dbytes", QT_TR_NOOP("Document size")) - ("dmtime", QT_TR_NOOP("Document date")) - ("fbytes", QT_TR_NOOP("File size")) - ("filename", QT_TR_NOOP("File name")) - ("fmtime", QT_TR_NOOP("File date")) - ("ipath", QT_TR_NOOP(" Ipath")) - ("keywords", QT_TR_NOOP("Keywords")) - ("mtype", QT_TR_NOOP("Mime type")) - ("origcharset", QT_TR_NOOP("Original character set")) - ("relevancyrating", QT_TR_NOOP("Relevancy rating")) - ("title", QT_TR_NOOP("Title")) - ("url", QT_TR_NOOP("URL")) - ("mtime", QT_TR_NOOP("Mtime")) - ("date", QT_TR_NOOP("Date")) - ("datetime", QT_TR_NOOP("Date and time")) - ; +map RecollModel::o_displayableFields; FieldGetter *RecollModel::chooseGetter(const string& field) { @@ -249,6 +230,25 @@ string RecollModel::baseField(const string& field) RecollModel::RecollModel(const QStringList fields, QObject *parent) : QAbstractTableModel(parent), m_ignoreSort(false) { + // Initialize the translated map for column headers + o_displayableFields["abstract"] = tr("Abstract"); + o_displayableFields["author"] = tr("Author"); + o_displayableFields["dbytes"] = tr("Document size"); + o_displayableFields["dmtime"] = tr("Document date"); + o_displayableFields["fbytes"] = tr("File size"); + o_displayableFields["filename"] = tr("File name"); + o_displayableFields["fmtime"] = tr("File date"); + o_displayableFields["ipath"] = tr("Ipath"); + o_displayableFields["keywords"] = tr("Keywords"); + o_displayableFields["mtype"] = tr("Mime type"); + o_displayableFields["origcharset"] = tr("Original character set"); + o_displayableFields["relevancyrating"] = tr("Relevancy rating"); + o_displayableFields["title"] = tr("Title"); + o_displayableFields["url"] = tr("URL"); + o_displayableFields["mtime"] = tr("Mtime"); + o_displayableFields["date"] = tr("Date"); + o_displayableFields["datetime"] = tr("Date and time"); + // Add dynamic "stored" fields to the full column list. This // could be protected to be done only once, but it's no real // problem @@ -257,7 +257,7 @@ RecollModel::RecollModel(const QStringList fields, QObject *parent) for (set::const_iterator it = stored.begin(); it != stored.end(); it++) { if (o_displayableFields.find(*it) == o_displayableFields.end()) { - o_displayableFields[*it] = *it; + o_displayableFields[*it] = QString::fromUtf8(it->c_str()); } } } @@ -344,12 +344,12 @@ QVariant RecollModel::headerData(int idx, Qt::Orientation orientation, } if (orientation == Qt::Horizontal && role == Qt::DisplayRole && idx < int(m_fields.size())) { - map::const_iterator it = + map::const_iterator it = o_displayableFields.find(m_fields[idx]); if (it == o_displayableFields.end()) return QString::fromUtf8(m_fields[idx].c_str()); else - return QString::fromUtf8(it->second.c_str()); + return it->second; } return QVariant(); } @@ -865,7 +865,7 @@ void ResTable::createHeaderPopupMenu(const QPoint& pos) if (m_popcolumn < 0) return; - const map& allfields = m_model->getAllFields(); + const map& allfields = m_model->getAllFields(); const vector& fields = m_model->getFields(); QMenu *popup = new QMenu(this); @@ -879,12 +879,11 @@ void ResTable::createHeaderPopupMenu(const QPoint& pos) popup->addSeparator(); QAction *act; - for (map::const_iterator it = allfields.begin(); + for (map::const_iterator it = allfields.begin(); it != allfields.end(); it++) { if (std::find(fields.begin(), fields.end(), it->first) != fields.end()) continue; - act = new QAction(tr("Add \"")+tr(it->second.c_str())+tr("\" column"), - popup); + act = new QAction(tr("Add \"%1\" column").arg(it->second), popup); act->setData(QString::fromUtf8(it->first.c_str())); connect(act, SIGNAL(triggered(bool)), this , SLOT(addColumn())); popup->addAction(act); diff --git a/src/qtgui/restable.h b/src/qtgui/restable.h index b1cb6140..0d29ba2b 100644 --- a/src/qtgui/restable.h +++ b/src/qtgui/restable.h @@ -50,7 +50,7 @@ public: virtual RefCntr getDocSource() {return m_source;} virtual void deleteColumn(int); virtual const vector& getFields() {return m_fields;} - virtual const map& getAllFields() + virtual const map& getAllFields() { return o_displayableFields; } @@ -71,7 +71,7 @@ private: mutable RefCntr m_source; vector m_fields; vector m_getters; - static map o_displayableFields; + static map o_displayableFields; bool m_ignoreSort; FieldGetter* chooseGetter(const string&); HiliteData m_hdata; diff --git a/website/release-1.17.html b/website/release-1.17.html index 69cb7283..a5d0aefa 100644 --- a/website/release-1.17.html +++ b/website/release-1.17.html @@ -60,6 +60,10 @@ of a webkit-based result list), but relatively few obvious changes for the casual user.

+

Note to packagers: you need to either depend on + libqt4-webkit or run configure --disable-webkit (1st option + preferred if possible of course).

+
  • Search: Recoll now supports filtering on file sizes. This