--- a/i18n/eric5_es.ts Sun May 30 18:53:41 2010 +0200 +++ b/i18n/eric5_es.ts Sun May 30 19:50:57 2010 +0200 @@ -14240,17 +14240,17 @@ <translation>Introduzca fecha de fin</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="102"/> <source>Select the field to filter on</source> <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="926"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="948"/> <source>Author</source> <translation>Autor</translation> </message> @@ -14260,112 +14260,112 @@ <translation>Mensaje</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="124"/> <source>Enter the regular expression to filter on</source> <translation>Introduzca la expresión regular de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="182"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> <source>Path</source> <translation>Ruta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="245"/> <source>Copy from</source> <translation>Copiar desde</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> <source>Press to get the next bunch of log entries</source> <translation>Pulse para recuperar el siguiente conjunto de entradas de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> <source>&Next</source> <translation>Siguie&nte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> <source>Enter the limit of entries to fetch</source> <translation>Introduzca el límite de entradas a recuperar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Seleccione para detener el listado de mensajes de log de copy o move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/> <source>Stop on Copy/Move</source> <translation>Detener en copy/move</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="327"/> <source>Press to compare two revisions</source> <translation>Pulse para comparar dos revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="330"/> <source>&Compare Revisions</source> <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="367"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="383"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="418"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="428"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="431"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -14385,65 +14385,80 @@ <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="535"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="535"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="167"/> <source>Branch</source> <translation>Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="380"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="385"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="162"/> <source>Graph</source> <translation>Gráficos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/> <source>Press to generate a diff to the first parent revision</source> <translation>Pulse para generar un diff con la primera revisión padre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="310"/> <source>Diff to Parent &1</source> <translation>Diff con el padre &1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> <source>Press to generate a diff to the second parent revision</source> <translation>Pulse para generar un diff con la segunda revisión padre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="320"/> <source>Diff to Parent &2</source> <translation>Diff con el padre &2</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="72"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="79"/> + <source>Select the branch to filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <source>All</source> + <translation type="unfinished">Todo</translation> + </message> </context> <context> <name>HgLogDialog</name>