--- a/i18n/eric5_es.ts Fri Jun 03 13:01:16 2011 +0200
+++ b/i18n/eric5_es.ts Sat Jun 04 11:53:15 2011 +0200
@@ -1822,7 +1822,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="195"/>
<source>Bookmarks</source>
<translation type="unfinished">Marcadores</translation>
</message>
@@ -2888,12 +2888,12 @@
<translation>Gestor de Plugins</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="133"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="296"/>
<source>Printer</source>
<translation>Impresora</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationDialog.py" line="296"/>
+ <location filename="Preferences/ConfigurationDialog.py" line="170"/>
<source>Python</source>
<translation>Python</translation>
</message>
@@ -5666,22 +5666,22 @@
<context>
<name>DownloadItem</name>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="20"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="26"/>
<source>Icon</source>
<translation>Icono</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="35"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="41"/>
<source>Filename</source>
<translation>Nombre de archivo</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="57"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="63"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="72"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="78"/>
<source>Press to repeat the download</source>
<translation>Pulse para repetir la descarga</translation>
</message>
@@ -5691,12 +5691,12 @@
<translation type="obsolete">...</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="95"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="101"/>
<source>Press to cancel the download</source>
<translation>Pulse para cancelar la descarga</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="105"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="111"/>
<source>Press to open the downloaded file</source>
<translation>Pulse para abrir el archivo descargado</translation>
</message>
@@ -5711,65 +5711,78 @@
<translation type="obsolete"><p>Está a punto de descargar el archivo <b>{0}</b>.</p><p>¿Qué desea hacer?</p></translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="203"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="206"/>
<source>Download canceled: {0}</source>
<translation>Descarga cancelada: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="193"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="196"/>
<source>Save File</source>
<translation>Guardar archivo</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="222"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="225"/>
<source>Download directory ({0}) couldn't be created.</source>
<translation>El directorio de descargas ({0}) no ha podido ser creado.</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="390"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="395"/>
<source>Error opening save file: {0}</source>
<translation>Error al abrir el fichero a guardar: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="399"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="407"/>
<source>Error saving: {0}</source>
<translation>Error al guardar: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="411"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="419"/>
<source>Network Error: {0}</source>
<translation>Error de Red: {0}</translation>
</message>
<message>
<location filename="Helpviewer/Download/DownloadItem.py" line="519"/>
<source>{0} of {1} ({2}/sec) - {3}</source>
- <translation>{0} de {1} ({2}/sec) - {3}</translation>
- </message>
- <message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="520"/>
+ <translation type="obsolete">{0} de {1} ({2}/sec) - {3}</translation>
+ </message>
+ <message>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="528"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
<location filename="Helpviewer/Download/DownloadItem.py" line="528"/>
<source>{0} downloaded</source>
- <translation>{0} descargado</translation>
- </message>
- <message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="531"/>
+ <translation type="obsolete">{0} descargado</translation>
+ </message>
+ <message>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="541"/>
<source>{0} of {1} - Stopped</source>
<translation>{0} de {1} - Parado</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.py" line="181"/>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="184"/>
<source>VirusTotal scan scheduled: {0}</source>
<translation>Scan de VirusTotal programado: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Download/DownloadItem.ui" line="82"/>
+ <location filename="Helpviewer/Download/DownloadItem.ui" line="88"/>
<source>Press to pause the download</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="527"/>
+ <source>{0} of {1} ({2}/sec)
+{3}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Helpviewer/Download/DownloadItem.py" line="536"/>
+ <source>{0} downloaded
+SHA1: {1}
+MD5: {2}</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>DownloadManager</name>
@@ -11571,12 +11584,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/>
<source>Fetch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="82"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
@@ -12434,7 +12447,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="99"/>
<source>GPG</source>
<translation type="unfinished"></translation>
</message>
@@ -12460,105 +12473,120 @@
<context>
<name>HelpAppearancePage</name>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="16"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="17"/>
<source><b>Configure help viewer appearance</b></source>
<translation><b>Configurar apariencia del visor de ayuda</b></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="36"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="37"/>
<source>Fonts</source>
<translation>Fuentes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="42"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="43"/>
<source>Press to select the standard font</source>
<translation>Pulse para seleccionar la fuente estándar</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="45"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="46"/>
<source>Standard Font</source>
<translation>Fuente Estándar</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="55"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="56"/>
<source>Times 16</source>
<translation>Times 16</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="68"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="69"/>
<source>Press to select the fixed-width font</source>
<translation>Pulse para seleccionar la fuente de ancho fijo</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="71"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="72"/>
<source>Fixed-Width Font</source>
<translation>Fuente de Ancho Fijo</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="81"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="82"/>
<source>Courier 13</source>
<translation>Courier 13</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="142"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="143"/>
<source>Images</source>
<translation>Imágenes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="148"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="149"/>
<source>Select to load images</source>
<translation>Seleccione para cargar imágenes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="151"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="152"/>
<source>Load images</source>
<translation>Cargar imágenes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="161"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="162"/>
<source>Style Sheet</source>
<translation>Hoja de Estilo</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="167"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="168"/>
<source>User Style Sheet:</source>
<translation>Hoja de Estilo de Usuario:</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="174"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="175"/>
<source>Enter the file name of a user style sheet</source>
<translation>Introduzca el nombre del archivo de la hoja de estilos de usuario</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="181"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="182"/>
<source>Select the user style sheet via a file selection dialog</source>
<translation>Seleccione el archivo de hoja de estilos de usuario utilizando un diálogo de selección de archivo</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="184"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="104"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/>
<source>Select Style Sheet</source>
<translation>Seleccionar Hoja de Estilos</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="97"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="98"/>
<source>Colours</source>
<translation>Colores</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="103"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="104"/>
<source>Background colour of secure URLs:</source>
<translation>Color de fondo de URLs seguras:</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="116"/>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="117"/>
<source>Select the background colour for secure URLs.</source>
<translation>Seleccione el color de fondo para las URLs seguras.</translation>
</message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/>
+ <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source>
+ <translation type="unfinished"><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración se activarán la siguiente vez que se ejecute la aplicacion.</font></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="215"/>
+ <source>Tabs</source>
+ <translation type="unfinished">Pestañas</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="221"/>
+ <source>Show only one close button instead of one for each tab</source>
+ <translation type="unfinished">Mostrar solamente un boton de cerrar en lugar de uno por cada pestaña</translation>
+ </message>
</context>
<context>
<name>HelpBrowser</name>
@@ -13500,17 +13528,17 @@
<translation> MB</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="491"/>
<source>Printing</source>
<translation>Imprimiendo</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="497"/>
<source>Select to print background colours and images</source>
<translation>Seleccionar para imprimir los colores de fondo y las imágenes</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="461"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="500"/>
<source>Print background colours and images</source>
<translation>Imprimir colores de fondo e imágenes</translation>
</message>
@@ -13719,6 +13747,21 @@
<source>Enable access keys</source>
<translation>Habilitar claves de acceso</translation>
</message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="452"/>
+ <source>Web Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="458"/>
+ <source>Language:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="465"/>
+ <source>Select the language to be used for web searches</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HelpWebPage</name>
@@ -19287,132 +19330,132 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/>
<source>Select to specify a revision by number</source>
<translation type="unfinished">Seleccionar para especificar una revisión por número</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/>
<source>Number</source>
<translation type="unfinished">Número</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/>
<source>Enter a revision number</source>
<translation type="unfinished">Introduzca un número de revisión</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/>
<source>Select to specify a revision by changeset id</source>
<translation type="unfinished">Seleccionar para especificar una revisión por changeset id</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/>
- <source>Id:</source>
- <translation type="unfinished">Id:</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/>
- <source>Enter a changeset id</source>
- <translation type="unfinished">Introduzca un changeset id</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/>
+ <source>Id:</source>
+ <translation type="unfinished">Id:</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/>
+ <source>Enter a changeset id</source>
+ <translation type="unfinished">Introduzca un changeset id</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/>
<source>Select to specify a revision by a tag</source>
<translation type="unfinished">Seleccionar para especificar una revisión por tag</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/>
<source>Tag:</source>
<translation type="unfinished">Tag:</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/>
<source>Enter a tag name</source>
<translation type="unfinished">Introduzca un nombre de tag</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/>
<source>Select to specify a revision by a branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/>
<source>Branch:</source>
<translation type="unfinished">Branch:</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/>
<source>Enter a branch name</source>
<translation type="unfinished">Introducir un nombre de branch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/>
<source>Select to specify a revision by a bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/>
<source>Bookmark:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/>
<source>Enter a bookmark name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/>
<source>&Destination Revision</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/>
<source>Select tip revision of repository</source>
<translation type="unfinished">Seleccionar revisión tip del repositorio</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/>
<source>TIP</source>
<translation type="unfinished">TIP</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/>
<source>Select to collapse the rebased changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/>
- <source>Collapse Changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/>
- <source>Select to keep the original changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/>
- <source>Keep Original Changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/>
+ <source>Collapse Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/>
+ <source>Select to keep the original changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/>
+ <source>Keep Original Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/>
<source>Select to keep the original branch names</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/>
<source>Keep Original Branch Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/>
<source>Select to detach the source from its original branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/>
<source>Detach Source</source>
<translation type="unfinished"></translation>
</message>
@@ -25245,7 +25288,7 @@
<context>
<name>OpenSearchEngineModel</name>
<message>
- <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="135"/>
+ <location filename="Helpviewer/OpenSearch/OpenSearchEngineModel.py" line="136"/>
<source><strong>Provides contextual suggestions</strong></source>
<translation><strong>Proporciona sugerencias contextuales</strong></translation>
</message>
@@ -26559,17 +26602,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="936"/>
+ <location filename="Preferences/__init__.py" line="937"/>
<source>Export Preferences</source>
<translation>Exportar Preferencias</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="963"/>
+ <location filename="Preferences/__init__.py" line="964"/>
<source>Import Preferences</source>
<translation>Importar Preferencias</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="963"/>
+ <location filename="Preferences/__init__.py" line="964"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
</message>
@@ -29634,7 +29677,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="124"/>
<source>Purge</source>
<translation type="unfinished"></translation>
</message>
@@ -32420,7 +32463,7 @@
<context>
<name>RebaseProjectHelper</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/>
<source>Rebase Changesets</source>
<translation type="unfinished"></translation>
</message>
@@ -32465,22 +32508,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="99"/>
<source>Rebase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="121"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/>
<source>Rebase Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/>
<source>Rebase Changesets (Abort)</source>
<translation type="unfinished"></translation>
</message>
@@ -41490,7 +41533,7 @@
<context>
<name>TransplantProjectHelper</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/>
<source>Transplant Changesets</source>
<translation type="unfinished"></translation>
</message>
@@ -41515,17 +41558,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/>
<source>Transplant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/>
<source>Transplant Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
@@ -42457,35 +42500,40 @@
<context>
<name>UserAgentMenu</name>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="43"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="45"/>
<source>Default</source>
<translation>Por defecto</translation>
</message>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="55"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="59"/>
<source>Other...</source>
<translation>Otro...</translation>
</message>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/>
<source>Custom user agent</source>
<translation>Agente de usuario personalizado</translation>
</message>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="78"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="76"/>
<source>User agent:</source>
<translation>Agente de Usuario:</translation>
</message>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/>
<source>Parsing default user agents</source>
<translation>Interpretando agentes de usuario por defecto</translation>
</message>
<message>
- <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="123"/>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="147"/>
<source><p>Error parsing default user agents.</p><p>{0}</p></source>
<translation><p>Error al interpretar agentes de usuario por defecto.</p><p>{0}</p></translation>
</message>
+ <message>
+ <location filename="Helpviewer/UserAgent/UserAgentMenu.py" line="136"/>
+ <source>Various</source>
+ <translation type="unfinished">Varios</translation>
+ </message>
</context>
<context>
<name>UserInterface</name>
@@ -44427,17 +44475,17 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1001"/>
+ <location filename="Utilities/__init__.py" line="1023"/>
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1187"/>
+ <location filename="Utilities/__init__.py" line="1209"/>
<source>Python2 interpreter not configured.</source>
<translation>Intérprete de Python2 no configurado.</translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1233"/>
+ <location filename="Utilities/__init__.py" line="1255"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation>El intérprete de Python2 no terminó en un plazo de 30s.</translation>
</message>
