--- a/eric6/i18n/eric6_es.ts Tue Feb 16 17:12:48 2021 +0100 +++ b/eric6/i18n/eric6_es.ts Tue Feb 16 18:25:47 2021 +0100 @@ -11088,562 +11088,562 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3124"/> + <location filename="../QScintilla/Editor.py" line="3126"/> <source>Open File</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="785"/> + <location filename="../QScintilla/Editor.py" line="787"/> <source>Undo</source> <translation>Deshacer</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="788"/> + <location filename="../QScintilla/Editor.py" line="790"/> <source>Redo</source> <translation>Rehacer</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="791"/> + <location filename="../QScintilla/Editor.py" line="793"/> <source>Revert to last saved state</source> <translation>Volver al último estado guardado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="795"/> + <location filename="../QScintilla/Editor.py" line="797"/> <source>Cut</source> <translation>Cortar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="798"/> + <location filename="../QScintilla/Editor.py" line="800"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="801"/> + <location filename="../QScintilla/Editor.py" line="803"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="809"/> + <location filename="../QScintilla/Editor.py" line="811"/> <source>Indent</source> <translation>Indentar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="812"/> + <location filename="../QScintilla/Editor.py" line="814"/> <source>Unindent</source> <translation>Desindentar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="815"/> + <location filename="../QScintilla/Editor.py" line="817"/> <source>Comment</source> <translation>Pasar a comentario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="818"/> + <location filename="../QScintilla/Editor.py" line="820"/> <source>Uncomment</source> <translation>Sacar de comentario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="821"/> + <location filename="../QScintilla/Editor.py" line="823"/> <source>Stream Comment</source> <translation>Bloque de comentario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="824"/> + <location filename="../QScintilla/Editor.py" line="826"/> <source>Box Comment</source> <translation>Caja de comentario</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="832"/> - <source>Select to brace</source> - <translation>Seleccionar hasta la llave ( '{' o '}' )</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="834"/> + <source>Select to brace</source> + <translation>Seleccionar hasta la llave ( '{' o '}' )</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="836"/> <source>Select all</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="835"/> + <location filename="../QScintilla/Editor.py" line="837"/> <source>Deselect all</source> <translation>Deseleccionar todo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="853"/> + <location filename="../QScintilla/Editor.py" line="855"/> <source>Shorten empty lines</source> <translation>Acortar las líneas vacías</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="860"/> + <location filename="../QScintilla/Editor.py" line="862"/> <source>Use Monospaced Font</source> <translation>Usar fuente monoespaciada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="865"/> + <location filename="../QScintilla/Editor.py" line="867"/> <source>Autosave enabled</source> <translation>Autoguardar habilitado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="908"/> + <location filename="../QScintilla/Editor.py" line="910"/> <source>Close</source> <translation>Cerrar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="914"/> + <location filename="../QScintilla/Editor.py" line="916"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="917"/> + <location filename="../QScintilla/Editor.py" line="919"/> <source>Save As...</source> <translation>Guardar como...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="933"/> + <location filename="../QScintilla/Editor.py" line="935"/> <source>Print</source> <translation>Imprimir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="962"/> - <source>Complete from Document</source> - <translation>Completar desde documento</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="964"/> - <source>Complete from APIs</source> - <translation>Completar desde APIs</translation> + <source>Complete from Document</source> + <translation>Completar desde documento</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="966"/> + <source>Complete from APIs</source> + <translation>Completar desde APIs</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="968"/> <source>Complete from Document and APIs</source> <translation>Completar desde Documento y APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="980"/> + <location filename="../QScintilla/Editor.py" line="982"/> <source>Check</source> <translation>Verificar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1000"/> - <source>Show</source> - <translation>Mostrar</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1002"/> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1004"/> <source>Code metrics...</source> <translation>Métricas de código...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1003"/> - <source>Code coverage...</source> - <translation>Cobertura de código...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1005"/> + <source>Code coverage...</source> + <translation>Cobertura de código...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1007"/> <source>Show code coverage annotations</source> <translation>Mostrar anotaciones de cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1008"/> + <location filename="../QScintilla/Editor.py" line="1010"/> <source>Hide code coverage annotations</source> <translation>Ocultar anotaciones de cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1011"/> + <location filename="../QScintilla/Editor.py" line="1013"/> <source>Profile data...</source> <translation>Datos de profiling...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1024"/> - <source>Diagrams</source> - <translation>Diagramas</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1026"/> - <source>Class Diagram...</source> - <translation>Diagrama de clases...</translation> + <source>Diagrams</source> + <translation>Diagramas</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1028"/> - <source>Package Diagram...</source> - <translation>Diagrama de paquetes...</translation> + <source>Class Diagram...</source> + <translation>Diagrama de clases...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1030"/> - <source>Imports Diagram...</source> - <translation>Diagrama de imports...</translation> + <source>Package Diagram...</source> + <translation>Diagrama de paquetes...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1032"/> + <source>Imports Diagram...</source> + <translation>Diagrama de imports...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1034"/> <source>Application Diagram...</source> <translation>Diagrama de aplicación...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1050"/> + <location filename="../QScintilla/Editor.py" line="1052"/> <source>Languages</source> <translation>Lenguajes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1183"/> + <location filename="../QScintilla/Editor.py" line="1185"/> <source>No Language</source> <translation>Ningún Lenguaje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1208"/> + <location filename="../QScintilla/Editor.py" line="1210"/> <source>Export as</source> <translation>Exportar como</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1230"/> - <source>Toggle bookmark</source> - <translation>Alternar marcador</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1232"/> - <source>Next bookmark</source> - <translation>Nuevo marcador</translation> + <source>Toggle bookmark</source> + <translation>Alternar marcador</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1234"/> - <source>Previous bookmark</source> - <translation>Marcador anterior</translation> + <source>Next bookmark</source> + <translation>Nuevo marcador</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1236"/> + <source>Previous bookmark</source> + <translation>Marcador anterior</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1238"/> <source>Clear all bookmarks</source> <translation>Borrar todos los marcadores</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1310"/> + <location filename="../QScintilla/Editor.py" line="1312"/> <source>Goto syntax error</source> <translation>Ir al error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1314"/> + <location filename="../QScintilla/Editor.py" line="1316"/> <source>Show syntax error message</source> <translation>Ver el mensaje de error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1319"/> + <location filename="../QScintilla/Editor.py" line="1321"/> <source>Clear syntax error</source> <translation>Borrar error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1245"/> - <source>Toggle breakpoint</source> - <translation>Alternar punto de interrupción</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1247"/> + <source>Toggle breakpoint</source> + <translation>Alternar punto de interrupción</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1249"/> <source>Toggle temporary breakpoint</source> <translation>Alternar punto de interrupción temporal</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1250"/> + <location filename="../QScintilla/Editor.py" line="1252"/> <source>Edit breakpoint...</source> <translation>Editar punto de interrupción...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5634"/> + <location filename="../QScintilla/Editor.py" line="5636"/> <source>Enable breakpoint</source> <translation>Activar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1255"/> - <source>Next breakpoint</source> - <translation>Siguiente punto de interrupción</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1257"/> + <source>Next breakpoint</source> + <translation>Siguiente punto de interrupción</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1259"/> <source>Previous breakpoint</source> <translation>Punto de interrupción anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1262"/> + <location filename="../QScintilla/Editor.py" line="1264"/> <source>Clear all breakpoints</source> <translation>Borrar todos los puntos de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1341"/> + <location filename="../QScintilla/Editor.py" line="1343"/> <source>Next uncovered line</source> <translation>Siguiente línea sin cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1345"/> + <location filename="../QScintilla/Editor.py" line="1347"/> <source>Previous uncovered line</source> <translation>Anterior línea sin cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1350"/> + <location filename="../QScintilla/Editor.py" line="1352"/> <source>Next task</source> <translation>Nueva tarea</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1354"/> + <location filename="../QScintilla/Editor.py" line="1356"/> <source>Previous task</source> <translation>Tarea anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1404"/> + <location filename="../QScintilla/Editor.py" line="1406"/> <source>Export source</source> <translation>Exportar fuente</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1404"/> + <location filename="../QScintilla/Editor.py" line="1406"/> <source>No export format given. Aborting...</source> <translation>No se ha proporcionado un formato de exportación. Abortando...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1979"/> + <location filename="../QScintilla/Editor.py" line="1981"/> <source>Modification of Read Only file</source> <translation>Modificación de un archivo de solo lectura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1979"/> + <location filename="../QScintilla/Editor.py" line="1981"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2689"/> + <location filename="../QScintilla/Editor.py" line="2691"/> <source>Printing...</source> <translation>Imprimiendo...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2706"/> - <source>Printing completed</source> - <translation>Impresión completa</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2708"/> + <source>Printing completed</source> + <translation>Impresión completa</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2710"/> <source>Error while printing</source> <translation>Error al imprimir</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2711"/> + <location filename="../QScintilla/Editor.py" line="2713"/> <source>Printing aborted</source> <translation>Impresión cancelada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3066"/> + <location filename="../QScintilla/Editor.py" line="3068"/> <source>File Modified</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3311"/> + <location filename="../QScintilla/Editor.py" line="3313"/> <source>Save File</source> <translation>Guardar archivo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4789"/> + <location filename="../QScintilla/Editor.py" line="4791"/> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4789"/> + <location filename="../QScintilla/Editor.py" line="4791"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5637"/> + <location filename="../QScintilla/Editor.py" line="5639"/> <source>Disable breakpoint</source> <translation>Deshabilitar punto de interrupción</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6012"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6012"/> + <location filename="../QScintilla/Editor.py" line="6014"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6075"/> + <location filename="../QScintilla/Editor.py" line="6077"/> <source>Show Code Coverage Annotations</source> <translation>Mostrar Anotaciones de Cobertura de Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6068"/> + <location filename="../QScintilla/Editor.py" line="6070"/> <source>All lines have been covered.</source> <translation>Todas las líneas han sido cubiertas.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6075"/> + <location filename="../QScintilla/Editor.py" line="6077"/> <source>There is no coverage file available.</source> <translation>No hay archivo de cobertura disponible.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6192"/> + <location filename="../QScintilla/Editor.py" line="6194"/> <source>Profile Data</source> <translation>Datos de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6192"/> + <location filename="../QScintilla/Editor.py" line="6194"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6354"/> + <location filename="../QScintilla/Editor.py" line="6356"/> <source>Syntax Error</source> <translation>Error de sintaxis</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6354"/> + <location filename="../QScintilla/Editor.py" line="6356"/> <source>No syntax error message available.</source> <translation>No hay mensajes de error de sintaxis disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6743"/> + <location filename="../QScintilla/Editor.py" line="6745"/> <source>Macro Name</source> <translation>Nombre de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6743"/> + <location filename="../QScintilla/Editor.py" line="6745"/> <source>Select a macro name:</source> <translation>Seleccione un nombre de macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6771"/> + <location filename="../QScintilla/Editor.py" line="6773"/> <source>Load macro file</source> <translation>Cargar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6813"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Macro files (*.macro)</source> <translation>Archivos de Macro (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6793"/> + <location filename="../QScintilla/Editor.py" line="6795"/> <source>Error loading macro</source> <translation>Error al cargar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6813"/> + <location filename="../QScintilla/Editor.py" line="6815"/> <source>Save macro file</source> <translation>Guardar archivo de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6832"/> <source>Save macro</source> <translation>Guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6845"/> + <location filename="../QScintilla/Editor.py" line="6847"/> <source>Error saving macro</source> <translation>Error al guardar macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6858"/> + <location filename="../QScintilla/Editor.py" line="6860"/> <source>Start Macro Recording</source> <translation>Comenzar grabación de macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6858"/> + <location filename="../QScintilla/Editor.py" line="6860"/> <source>Macro recording is already active. Start new?</source> <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6884"/> + <location filename="../QScintilla/Editor.py" line="6886"/> <source>Macro Recording</source> <translation>Grabando macro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6884"/> + <location filename="../QScintilla/Editor.py" line="6886"/> <source>Enter name of the macro:</source> <translation>Introduzca el nombre de la macro:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7054"/> + <location filename="../QScintilla/Editor.py" line="7056"/> <source>File changed</source> <translation>Archivo modificado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7386"/> + <location filename="../QScintilla/Editor.py" line="7388"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7407"/> - <source>Resources</source> - <translation>Recursos</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7409"/> - <source>Add file...</source> - <translation>Añadir archivo...</translation> + <source>Resources</source> + <translation>Recursos</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="7411"/> - <source>Add files...</source> - <translation>Añadir archivos...</translation> + <source>Add file...</source> + <translation>Añadir archivo...</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="7413"/> + <source>Add files...</source> + <translation>Añadir archivos...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7415"/> <source>Add aliased file...</source> <translation>Añadir archivo con un alias...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7416"/> + <location filename="../QScintilla/Editor.py" line="7418"/> <source>Add localized resource...</source> <translation>Añadir recursos localizados...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7420"/> + <location filename="../QScintilla/Editor.py" line="7422"/> <source>Add resource frame</source> <translation>Añadir ventana de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7439"/> + <location filename="../QScintilla/Editor.py" line="7441"/> <source>Add file resource</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7455"/> + <location filename="../QScintilla/Editor.py" line="7457"/> <source>Add file resources</source> <translation>Añadir archivo de recursos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7484"/> <source>Add aliased file resource</source> <translation>Añadir archivo de recursos con un alias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7548"/> + <location filename="../QScintilla/Editor.py" line="7550"/> <source>Package Diagram</source> <translation>Digrama de paquetes</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7548"/> + <location filename="../QScintilla/Editor.py" line="7550"/> <source>Include class attributes?</source> <translation>¿Incluir atributos de clase?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7570"/> + <location filename="../QScintilla/Editor.py" line="7572"/> <source>Imports Diagram</source> <translation>Diagrama de imports</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7570"/> + <location filename="../QScintilla/Editor.py" line="7572"/> <source>Include imports from external modules?</source> <translation>¿Incluir los imports de módulos externos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7584"/> + <location filename="../QScintilla/Editor.py" line="7586"/> <source>Application Diagram</source> <translation>Diagrama de aplicación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7584"/> + <location filename="../QScintilla/Editor.py" line="7586"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="884"/> + <location filename="../QScintilla/Editor.py" line="886"/> <source>Calltip</source> <translation>Consejo de llamada</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="930"/> + <location filename="../QScintilla/Editor.py" line="932"/> <source>Print Preview</source> <translation>Presentación preliminar</translation> </message> @@ -11653,77 +11653,77 @@ <translation><b>Una Ventana de Edición de Códigos Fuente</b><p>Esta ventana se utiliza para mostrar y editar un archivo de código fuente. Puede abrir tantas como desee. El nombre del archivo se muestra en la barra de título de la ventana.</p><p>Para insertar puntos de interrupción basta con hacer un click en el espacio entre los números de línea y los marcadores de plegado. Pueden editarse con el menú de contexto de los márgenes.</p><p>Para insertar marcadores solo hay que hacer Shift-click en el espacio entre los números de línea y los marcadores de plegado.</p><p>Estas acciones se pueden revertir utilizando el menú de contexto.</p><p>Haciendo Ctrl-click en un marcador de error sintáctico se muestra información sobre el dicho error.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="869"/> + <location filename="../QScintilla/Editor.py" line="871"/> <source>Typing aids enabled</source> <translation>Ayudas al tecleo habilitadas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1140"/> + <location filename="../QScintilla/Editor.py" line="1142"/> <source>End-of-Line Type</source> <translation>Tipo de fin-de-línea</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1144"/> + <location filename="../QScintilla/Editor.py" line="1146"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1151"/> + <location filename="../QScintilla/Editor.py" line="1153"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1158"/> + <location filename="../QScintilla/Editor.py" line="1160"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1099"/> + <location filename="../QScintilla/Editor.py" line="1101"/> <source>Encodings</source> <translation>Codificaciones</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1079"/> + <location filename="../QScintilla/Editor.py" line="1081"/> <source>Guessed</source> <translation>Suposición</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1419"/> + <location filename="../QScintilla/Editor.py" line="1421"/> <source>Alternatives</source> <translation>Alternativas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1435"/> + <location filename="../QScintilla/Editor.py" line="1437"/> <source>Pygments Lexer</source> <translation>Analizador Léxico de Pygments</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1435"/> + <location filename="../QScintilla/Editor.py" line="1437"/> <source>Select the Pygments lexer to apply.</source> <translation>Seleccionar el Analizador Léxico de Pygments.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7913"/> + <location filename="../QScintilla/Editor.py" line="7915"/> <source>Check spelling...</source> <translation>Corrección ortográfica...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="843"/> + <location filename="../QScintilla/Editor.py" line="845"/> <source>Check spelling of selection...</source> <translation>Corrección ortográfica de la selección...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7916"/> - <source>Add to dictionary</source> - <translation>Añadir al diccionario</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7918"/> + <source>Add to dictionary</source> + <translation>Añadir al diccionario</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7920"/> <source>Ignore All</source> <translation>Ignorar Todo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="847"/> + <location filename="../QScintilla/Editor.py" line="849"/> <source>Remove from dictionary</source> <translation>Eliminar del diccionario</translation> </message> @@ -11733,287 +11733,287 @@ <translation><p>El tamaño del archivo <b>{0}</b> es <b>{1} KB</b>. ¿Desea cargarlo de todos modos?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1396"/> + <location filename="../QScintilla/Editor.py" line="1398"/> <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> <translation><p>No hay un exportador disponible para el formato de exportación <b>{0}</b>. Abortando...</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1415"/> + <location filename="../QScintilla/Editor.py" line="1417"/> <source>Alternatives ({0})</source> <translation>Alternativas ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3066"/> + <location filename="../QScintilla/Editor.py" line="3068"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>El archivo <b>{0}</b> tiene cambios sin guardar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3124"/> + <location filename="../QScintilla/Editor.py" line="3126"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser abierto.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3248"/> + <location filename="../QScintilla/Editor.py" line="3250"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no puede ser guardado.<br>Causa: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6784"/> + <location filename="../QScintilla/Editor.py" line="6786"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede leer.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6793"/> + <location filename="../QScintilla/Editor.py" line="6795"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>El archivo de macro <b>{0}</b> está dañado</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6845"/> + <location filename="../QScintilla/Editor.py" line="6847"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de macro <b>{0}</b> no se puede escribir.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7245"/> + <location filename="../QScintilla/Editor.py" line="7247"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7386"/> + <location filename="../QScintilla/Editor.py" line="7388"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7482"/> + <location filename="../QScintilla/Editor.py" line="7484"/> <source>Alias for file <b>{0}</b>:</source> <translation>Alias para el archivo <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1324"/> + <location filename="../QScintilla/Editor.py" line="1326"/> <source>Next warning</source> <translation>Siguiente advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1328"/> + <location filename="../QScintilla/Editor.py" line="1330"/> <source>Previous warning</source> <translation>Anterior advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1332"/> + <location filename="../QScintilla/Editor.py" line="1334"/> <source>Show warning message</source> <translation>Mostrar mensaje de advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1336"/> + <location filename="../QScintilla/Editor.py" line="1338"/> <source>Clear warnings</source> <translation>Limpiar advertencias</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3311"/> + <location filename="../QScintilla/Editor.py" line="3313"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6830"/> + <location filename="../QScintilla/Editor.py" line="6832"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de macro <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6631"/> + <location filename="../QScintilla/Editor.py" line="6633"/> <source>Warning: {0}</source> <translation>Advertencia: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6638"/> + <location filename="../QScintilla/Editor.py" line="6640"/> <source>Error: {0}</source> <translation>Error: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7050"/> + <location filename="../QScintilla/Editor.py" line="7052"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Advertencia:</b> Perderá los cambios si lo reabre.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="926"/> + <location filename="../QScintilla/Editor.py" line="928"/> <source>Open 'rejection' file</source> <translation>Abrir archivo 'de rechazo'</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1036"/> + <location filename="../QScintilla/Editor.py" line="1038"/> <source>Load Diagram...</source> <translation>Cargar Diagrama...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1359"/> + <location filename="../QScintilla/Editor.py" line="1361"/> <source>Next change</source> <translation>Siguiente cambio</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1363"/> + <location filename="../QScintilla/Editor.py" line="1365"/> <source>Previous change</source> <translation>Cambio anterior</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8334"/> + <location filename="../QScintilla/Editor.py" line="8336"/> <source>Sort Lines</source> <translation>Ordenar Líneas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8334"/> + <location filename="../QScintilla/Editor.py" line="8336"/> <source>The selection contains illegal data for a numerical sort.</source> <translation>La selección contiene datos ilegales para una ordenación numérica.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6566"/> + <location filename="../QScintilla/Editor.py" line="6568"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6566"/> + <location filename="../QScintilla/Editor.py" line="6568"/> <source>No warning messages available.</source> <translation>No hay mensajes de advertencia disponibles.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6628"/> + <location filename="../QScintilla/Editor.py" line="6630"/> <source>Style: {0}</source> <translation>Estilo: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="900"/> + <location filename="../QScintilla/Editor.py" line="902"/> <source>New Document View</source> <translation>Nueva Vista de Documento</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="903"/> + <location filename="../QScintilla/Editor.py" line="905"/> <source>New Document View (with new split)</source> <translation>Nueva Vista de Documento (con nueva división)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="990"/> + <location filename="../QScintilla/Editor.py" line="992"/> <source>Tools</source> <translation>Herramientas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1121"/> + <location filename="../QScintilla/Editor.py" line="1123"/> <source>Re-Open With Encoding</source> <translation>Reabrir Con Codificación</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="876"/> + <location filename="../QScintilla/Editor.py" line="878"/> <source>Automatic Completion enabled</source> <translation>Autocompletar habilitado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="956"/> + <location filename="../QScintilla/Editor.py" line="958"/> <source>Complete</source> <translation>Completo</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4921"/> + <location filename="../QScintilla/Editor.py" line="4923"/> <source>Auto-Completion Provider</source> <translation>Proveedor de Autocompletado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4921"/> + <location filename="../QScintilla/Editor.py" line="4923"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de lista de completado'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5200"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>Call-Tips Provider</source> <translation>Proveedor de Call-Tips</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5200"/> + <location filename="../QScintilla/Editor.py" line="5202"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation>El proveedor de call-tips'{0}' ya está registrado. Se ignora la solicitud duplicada.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8423"/> + <location filename="../QScintilla/Editor.py" line="8425"/> <source>Register Mouse Click Handler</source> <translation>Registrar Manejador de Clicks de Ratón</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8423"/> + <location filename="../QScintilla/Editor.py" line="8425"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation>Un manejador de clicks de ratón para "{0}" ya está registrado por "{1}". Abortando solicitud por "{2}"...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="920"/> + <location filename="../QScintilla/Editor.py" line="922"/> <source>Save Copy...</source> <translation>Guardar Copia...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="959"/> + <location filename="../QScintilla/Editor.py" line="961"/> <source>Clear Completions Cache</source> <translation>Limpiar Caché de Completado</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="886"/> + <location filename="../QScintilla/Editor.py" line="888"/> <source>Code Info</source> <translation>Info del Código</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1367"/> + <location filename="../QScintilla/Editor.py" line="1369"/> <source>Clear changes</source> <translation>Limpiar cambios</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="805"/> + <location filename="../QScintilla/Editor.py" line="807"/> <source>Execute Selection In Console</source> <translation>Ejecutar Selección en Consola</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8544"/> + <location filename="../QScintilla/Editor.py" line="8546"/> <source>EditorConfig Properties</source> <translation>Propiedades de EditorConfig</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8544"/> + <location filename="../QScintilla/Editor.py" line="8546"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation><p>Las propiedades de EditorConfig para el archivo <b>{0}</b> no se ha podido cargar.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1271"/> + <location filename="../QScintilla/Editor.py" line="1273"/> <source>Toggle all folds</source> <translation>Recoger/Desplegar los anidamientos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1276"/> + <location filename="../QScintilla/Editor.py" line="1278"/> <source>Toggle all folds (including children)</source> <translation>Recoger/Desplegar todos los anidamientos (inc. hijos)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1281"/> + <location filename="../QScintilla/Editor.py" line="1283"/> <source>Toggle current fold</source> <translation>Recoger/Desplegar el anidamiento actual</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1287"/> + <location filename="../QScintilla/Editor.py" line="1289"/> <source>Expand (including children)</source> <translation>Expandir (incluídos hijos)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1292"/> + <location filename="../QScintilla/Editor.py" line="1294"/> <source>Collapse (including children)</source> <translation>Contraer (incluídos hijos)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1298"/> + <location filename="../QScintilla/Editor.py" line="1300"/> <source>Clear all folds</source> <translation>Limpiar todos los anidamientos</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1179"/> + <location filename="../QScintilla/Editor.py" line="1181"/> <source>Spell Check Languages</source> <translation>Corrección Ortográfica Idiomas</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7044"/> + <location filename="../QScintilla/Editor.py" line="7046"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric. Reread it?</p></source> <translation><p>El archivo <b>{0}</b> ha cambiado mientras estaba abierto en eric. ¿Desea volver a cargarlo?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8738"/> + <location filename="../QScintilla/Editor.py" line="8740"/> <source>Generate Docstring</source> <translation>Generar Docstring</translation> </message> @@ -28784,17 +28784,17 @@ <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3262"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -29469,35 +29469,45 @@ <translation>Hacer Push</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="288"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="288"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="307"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="307"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation><p>¿Desea realmente borrar el marcador <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="323"/> <source>Rename Bookmark</source> <translation>Renombrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="323"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation><p>Introducir el nuevo nombre para el marcador <b>{0}</b>:</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="267"/> + <source>Push Current</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> + <source>Push All</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgBranchInputDialog</name> @@ -31983,1454 +31993,1469 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="117"/> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="117"/> + <source>&New from repository...</source> + <translation>&Nuevo desde repositorio...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> - <source>&New from repository...</source> - <translation>&Nuevo desde repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <source>Show incoming log</source> + <translation>Mostrar log entrante</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138"/> - <source>Show incoming log</source> - <translation>Mostrar log entrante</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/> <source>Show the log of incoming changes</source> <translation>Mostrar el log de los cambios entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <source>Pull changes</source> + <translation>Hacer pull de cambios</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/> - <source>Pull changes</source> - <translation>Hacer pull de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <source>Update from repository</source> + <translation>Hacer update desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <source>&Update from repository</source> + <translation>Hacer &update desde repositorio</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/> - <source>Update from repository</source> - <translation>Hacer update desde repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/> - <source>&Update from repository</source> - <translation>Hacer &update desde repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="175"/> <source>Update the local project from the Mercurial repository</source> <translation>Actualizar el proyecto local desde el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> <source>Commit changes to repository</source> <translation>Hacer commit de los cambios al repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <source>&Commit changes to repository...</source> + <translation>Hacer &commit de los cambios al repositorio...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="186"/> - <source>&Commit changes to repository...</source> - <translation>Hacer &commit de los cambios al repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Hacer commit de los cambios al repositorio</b><p>Envía los cambios del proyecto local al repositorio Mercurial.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <source>Show outgoing log</source> + <translation>Mostrar log saliente</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="202"/> - <source>Show outgoing log</source> - <translation>Mostrar log saliente</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="207"/> <source>Show the log of outgoing changes</source> <translation>Mostrar el log de los cambios salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <source>Push changes</source> + <translation>Hacer push de cambios</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="218"/> - <source>Push changes</source> - <translation>Hacer push de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/> <source>Push changes to a remote repository</source> <translation>Hacer push de cambios hacia un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <source>&Export from repository...</source> + <translation>&Exportar desde repositorio...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> - <source>&Export from repository...</source> - <translation>&Exportar desde repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="265"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="270"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> + <source>Show &difference</source> + <translation>Mostrar &diferencia</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> - <source>Show &difference</source> - <translation>Mostrar &diferencia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="344"/> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <source>Mer&ge changes...</source> + <translation>Hacer mer&ge de los cambios...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> - <source>Mer&ge changes...</source> - <translation>Hacer mer&ge de los cambios...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <source>&Tag in repository...</source> + <translation>Crear un &Tag en el repositorio...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/> - <source>&Tag in repository...</source> - <translation>Crear un &Tag en el repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Create branch</source> <translation>Crear branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <source>Create &branch...</source> + <translation>Crear &branch...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Create &branch...</source> - <translation>Crear &branch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <source>Close branch</source> + <translation>Cerrar branch</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Close branch</source> - <translation>Cerrar branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <source>S&witch...</source> + <translation>Hacer s&witch...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>S&witch...</source> - <translation>Hacer s&witch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> <source>Verify the integrity of the repository</source> <translation>Verificar la integridad del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> <source>Create a .hgignore file with default values</source> <translation>Crear un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <source>Create changegroup...</source> + <translation>Crear changegroup...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> - <source>Create changegroup...</source> - <translation>Crear changegroup...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1872"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Apply changegroups...</source> + <translation>Aplicar changegroups...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> - <source>Apply changegroups...</source> - <translation>Aplicar changegroups...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="838"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <source>Preview changegroup...</source> + <translation>Previsualizar changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source>Identify</source> + <translation>Identificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source>Identify...</source> + <translation>Identificar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <source>Identify the project directory</source> + <translation>Identificar el directorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> - <source>Preview changegroup...</source> - <translation>Previsualizar changegroup...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> - <source>Identify</source> - <translation>Identificar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> - <source>Identify...</source> - <translation>Identificar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Identify the project directory</source> - <translation>Identificar el directorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <source>Push changes (force)</source> + <translation>Hacer push de cambios (force)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234"/> - <source>Push changes (force)</source> - <translation>Hacer push de cambios (force)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> <source>Push changes to a remote repository with force option</source> <translation>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="935"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1683"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2012"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <source>Push new branch</source> + <translation>Hacer push de nueva rama</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source>Push new branch</source> - <translation>Hacer push de nueva rama</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1427"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Show combined configuration settings</source> <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1928"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <source>Import Patch...</source> + <translation>Importar Patch...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> - <source>Import Patch...</source> - <translation>Importar Patch...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1376"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1948"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <source>Export Patches...</source> + <translation>Exportar Patches...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> - <source>Export Patches...</source> - <translation>Exportar Patches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> <source>Export revisions to patch files</source> <translation>Exportar revisiones a archivos de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="977"/> <source>Change the phase of revisions</source> <translation>Cambiar la fase de revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="980"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1968"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="995"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1011"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1983"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Con&flicts resolved</source> <translation>Con&flictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <source>Add...</source> + <translation>Añadir...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>Add</source> - <translation>Añadir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> - <source>Add...</source> - <translation>Añadir...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <source>Remove...</source> + <translation>Eliminar...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068"/> - <source>Remove...</source> - <translation>Eliminar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1073"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1447"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/> + <source>Show Summary</source> + <translation>Mostrar Sumario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/> + <source>Show summary...</source> + <translation>Mostrar Sumario...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/> - <source>Show Summary</source> - <translation>Mostrar Sumario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/> - <source>Show summary...</source> - <translation>Mostrar Sumario...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334"/> <source>Show summary information of the working directory status</source> <translation>Mostrar información sumarial del estado del directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <source>Create unversioned archive...</source> + <translation>Crear archivo sin versionar...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084"/> - <source>Create unversioned archive...</source> - <translation>Crear archivo sin versionar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="908"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1335"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <source>List bookmarks</source> + <translation>Listar marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>List bookmarks</source> - <translation>Listar marcadores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1100"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <source>Define bookmark</source> + <translation>Definir marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> <source>Define a bookmark for the project</source> <translation>Define un marcador para el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> <source>Delete bookmark</source> <translation>Borrar marcador</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <source>Delete bookmark...</source> + <translation>Borrar marcador...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1130"/> - <source>Delete bookmark...</source> - <translation>Borrar marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Delete a bookmark of the project</source> <translation>Borrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <source>Rename bookmark</source> + <translation>Renombrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <source>Rename bookmark...</source> + <translation>Renombrar marcador...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145"/> - <source>Rename bookmark</source> - <translation>Renombrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145"/> - <source>Rename bookmark...</source> - <translation>Renombrar marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> <source>Rename a bookmark of the project</source> <translation>Renombrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1160"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1165"/> <source>Move a bookmark of the project</source> <translation>Mover un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <source>Show incoming bookmarks</source> + <translation>Mostrar marcadores entrantes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> - <source>Show incoming bookmarks</source> - <translation>Mostrar marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1181"/> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source>Pull bookmark</source> + <translation>Pull de marcador</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1193"/> - <source>Pull bookmark</source> - <translation>Pull de marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1198"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <source>Show outgoing bookmarks</source> + <translation>Mostrar marcadores salientes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> - <source>Show outgoing bookmarks</source> - <translation>Mostrar marcadores salientes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1230"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source>Push bookmark</source> + <translation>Push de marcador</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242"/> - <source>Push bookmark</source> - <translation>Push de marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1247"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1406"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1397"/> <source>Branches</source> <translation>Branches</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <source>Re-Merge</source> + <translation>Re-Merge</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> - <source>Re-Merge</source> - <translation>Re-Merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Show conflicts</source> <translation>Mostrar conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Show conflicts...</source> <translation>Mostrar conflictos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="493"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1535"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <source>Pull current bookmark</source> + <translation>Pull del marcador actual</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209"/> - <source>Pull current bookmark</source> - <translation>Pull del marcador actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <source>Push current bookmark</source> + <translation>Push de marcador actual</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1258"/> - <source>Push current bookmark</source> - <translation>Push de marcador actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <source>Delete all backups</source> + <translation>Borrar todas las Copias de Seguridad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1291"/> + <source>Delete all backup bundles stored in the backup area</source> + <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294"/> + <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <source>Stop Copying Session</source> + <translation>Detener la Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023"/> + <source>Stop the interrupted copying session</source> + <translation>Detener la sesión de copia interrumpida</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1033"/> + <source>Abort Copying Session</source> + <translation>Abortar Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <source>Abort the interrupted copying session and rollback</source> + <translation>Abortar la sesión interrumpida de copia y hacer rollback</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1040"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452"/> + <source>Merge Changesets</source> + <translation>Hacer Merge de Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1997"/> + <source>Copy Changesets (Stop)</source> + <translation>Copiar Changesets (Stop)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2012"/> + <source>Copy Changesets (Abort)</source> + <translation>Copiar Changesets (Abortar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <source>Commit Merge</source> + <translation>Commit Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation><b>Hacer commit de un merge</b><p>Ejecuta un commit de un directorio de trabajo en merge</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <source>Abort Merge</source> + <translation>Abortar Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation>Abortar un merge sin commit y perder todos los cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation><b>Abortar merge sin commit</b><p>Aborta un merge sin commit causando que se pierdan todos los cambios.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <source>Commit all the merged changes.</source> + <translation>Hacer commit de los cambios con merge.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source>Push all bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1275"/> - <source>Delete all backups</source> - <translation>Borrar todas las Copias de Seguridad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280"/> - <source>Delete all backup bundles stored in the backup area</source> - <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> - <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> - <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> - <source>Stop Copying Session</source> - <translation>Detener la Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Stop the interrupted copying session</source> - <translation>Detener la sesión de copia interrumpida</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> - <source>Abort Copying Session</source> - <translation>Abortar Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> - <source>Abort the interrupted copying session and rollback</source> - <translation>Abortar la sesión interrumpida de copia y hacer rollback</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> - <source>Merge Changesets</source> - <translation>Hacer Merge de Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1985"/> - <source>Copy Changesets (Stop)</source> - <translation>Copiar Changesets (Stop)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/> - <source>Copy Changesets (Abort)</source> - <translation>Copiar Changesets (Abortar)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> - <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> - <translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> - <source>Commit Merge</source> - <translation>Commit Merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> - <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> - <translation><b>Hacer commit de un merge</b><p>Ejecuta un commit de un directorio de trabajo en merge</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>Abort Merge</source> - <translation>Abortar Merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <source>Abort an uncommitted merge and lose all changes</source> - <translation>Abortar un merge sin commit y perder todos los cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> - <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> - <translation><b>Abortar merge sin commit</b><p>Aborta un merge sin commit causando que se pierdan todos los cambios.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Commit all the merged changes.</source> - <translation>Hacer commit de los cambios con merge.</translation> + <source>Push all bookmarks to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -36107,22 +36132,22 @@ <context> <name>HighlightingStylesFile</name> <message> - <location filename="../Preferences/HighlightingStylesFile.py" line="80"/> + <location filename="../Preferences/HighlightingStylesFile.py" line="88"/> <source>Export Highlighting Styles</source> <translation type="unfinished">Exportar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/HighlightingStylesFile.py" line="80"/> + <location filename="../Preferences/HighlightingStylesFile.py" line="88"/> <source><p>The highlighting styles file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/HighlightingStylesFile.py" line="107"/> + <location filename="../Preferences/HighlightingStylesFile.py" line="115"/> <source>Import Highlighting Styles</source> <translation type="unfinished">Importar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/HighlightingStylesFile.py" line="107"/> + <location filename="../Preferences/HighlightingStylesFile.py" line="115"/> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -44691,7 +44716,7 @@ <translation>Pulsar para abrir una ventana de gráfica para mostrar datos recibidos desde el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="531"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="535"/> <source>Press to connect the selected device</source> <translation>Pulsar para conectar el dispositivo seleccionado</translation> </message> @@ -44701,7 +44726,7 @@ <translation><h3>El package QtSerialPort no está disponible.<br/>Soporte para MicroPython desactivado.</h3></translation> </message> <message numerus="yes"> - <location filename="../MicroPython/MicroPythonWidget.py" line="307"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="310"/> <source>%n supported device(s) detected.</source> <translation> <numerusform>%n dispositivo soportado detectado.</numerusform> @@ -44714,37 +44739,37 @@ <translation type="obsolete">{0} en {1}</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="332"/> <source>No supported devices detected.</source> <translation>No se han detectado dispositivos soportados.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="501"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="505"/> <source>Clear</source> <translation>Limpiar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="503"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="507"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="504"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="508"/> <source>Paste</source> <translation>Pegar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="526"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="530"/> <source>Press to disconnect the current device</source> <translation>Pulsar para desconectar el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="547"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="551"/> <source>No device attached</source> <translation>No hay dispositivo conectado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="547"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="551"/> <source>Please ensure the device is plugged into your computer and selected. It must have a version of MicroPython (or CircuitPython) flashed onto it before anything will work. @@ -44757,212 +44782,212 @@ Finalmente, pulsar el botón de reset del dispositivo y esperar unos pocos segundos antes de intentar de nuevo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="574"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="578"/> <source>Start REPL</source> <translation>Iniciar REPL</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="574"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="578"/> <source><p>The REPL cannot be started.</p><p>Reason: {0}</p></source> <translation><p>El REPL no se puede iniciar.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="976"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> <source>Serial Device Connect</source> <translation>Conexión de Dispositivo en Serie</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="976"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1005"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation><p>No se puede conectar el dispositovo en el puerto de serie <b>{0}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1021"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1050"/> <source>Run Script</source> <translation>Ejecutar Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1004"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1033"/> <source>There is no editor open. Abort...</source> <translation>No hay editor abierto. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1012"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1041"/> <source>The current editor does not contain a script. Abort...</source> <translation>El editor actual no contiene un script. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1021"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1050"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation><p>No se puede ejecutar el script.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1074"/> <source>Open Python File</source> <translation>Abrir Archivo de Python</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1074"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation>Archivos de Python3 (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1090"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1119"/> <source>Start Chart</source> <translation>Iniciar Gráfica</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1090"/> - <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> - <translation><p>No se puede iniciar la gráfica.</p><p>Razón: {0}</p></translation> - </message> - <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1119"/> + <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> + <translation><p>No se puede iniciar la gráfica.</p><p>Razón: {0}</p></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/> <source>Unsaved Chart Data</source> <translation>Datos de Gráfica sin Guardar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1119"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1148"/> <source>The chart contains unsaved data.</source> <translation>La gráfica contiene datos sin guardar.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> <source>Start File Manager</source> <translation>Comenzar Gestor de Archivos</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1199"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation><p>El Gestor de Archivos no se puede iniciar.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1270"/> <source>Show Version</source> <translation>Mostrar Versión</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1244"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1273"/> <source>Show Implementation</source> <translation>Mostrar Implementación</translation> </message> <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1399"/> + <source>Synchronize Time</source> + <translation>Sincronizar Hora</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1281"/> + <source>Show Device Time</source> + <translation>Mostrar Hora del Dispositivo</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1284"/> + <source>Show Local Time</source> + <translation>Mostrar Hora Local</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1617"/> + <source>Compile Python File</source> + <translation>Compilar Archivo de Python</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1637"/> + <source>Compile Current Editor</source> + <translation>Compilar Editor Actual</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1336"/> + <source><h3>Device Version Information</h3></source> + <translation><h3>Información de Versión de Dispositivo</h3></translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/> + <source>No version information available.</source> + <translation>No hay información de versión disponible.</translation> + </message> + <message> + <location filename="../MicroPython/MicroPythonWidget.py" line="1347"/> + <source>Device Version Information</source> + <translation>Información de Versión de Dispositivo</translation> + </message> + <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1370"/> - <source>Synchronize Time</source> - <translation>Sincronizar Hora</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1252"/> - <source>Show Device Time</source> - <translation>Mostrar Hora del Dispositivo</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1255"/> - <source>Show Local Time</source> - <translation>Mostrar Hora Local</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1588"/> - <source>Compile Python File</source> - <translation>Compilar Archivo de Python</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1608"/> - <source>Compile Current Editor</source> - <translation>Compilar Editor Actual</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1307"/> - <source><h3>Device Version Information</h3></source> - <translation><h3>Información de Versión de Dispositivo</h3></translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1316"/> - <source>No version information available.</source> - <translation>No hay información de versión disponible.</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1318"/> - <source>Device Version Information</source> - <translation>Información de Versión de Dispositivo</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>Device Implementation Information</source> <translation>Información de Implementación de Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1345"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation><h3>Información de Implementación de Dispositivo </h3><p>Este dispositivo contiene <b>{0} {1}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1370"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1399"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation><p>La hora del dispositivo conectado está sincronizada con la hora local.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1392"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1421"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Fecha y Hora del Dispositivo</h3><table><tr><td><b>Fecha</b></td><td>{0}</td></tr><tr><td><b>Hora</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1400"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1429"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation><h3>Fecha y Hora del Dispositivo</h3><p>{0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1415"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1444"/> <source>Device Date and Time</source> <translation>Fecha y Hora del Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1428"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1457"/> <source>Local Date and Time</source> <translation>Fecha y Hora Local</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1428"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1457"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Fecha y Hora del Local</h3><table><tr><td><b>Fecha</b></td><td>{0}</td></tr><tr><td><b>Hora</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1496"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1525"/> <source>Error handling device</source> <translation>Error de gestión del dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1496"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1525"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation><p>Ha ocurrido un error al comunicar con el dispositivo conectado.</p><p>Método: {0}</p><p>Mensaje: {1}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1536"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1565"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation>El compilador multiplataforma de MicroPython <b>mpy-cross</b> no se encuentra. Asegúrese de que está en la ruta de búsqueda o configurarlo en la página de configuración de MicroPython.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1558"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1587"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Archivos Python (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1568"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1597"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation>El archivo de Python <b>{0}</b> no existe. Abortando...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1578"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1607"/> <source>'mpy-cross' Output</source> <translation>Salida de 'mpy-cross'</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1601"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1630"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation>El editor actual no contiene un archivo de Python. Abortando...</translation> </message> @@ -44977,52 +45002,52 @@ <translation>Pulsar para abrir un gestor de archivos en el dispositivo seleccionado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1103"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> <source>µPy Chart</source> <translation>Gráfica µPy</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1186"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1215"/> <source>µPy Files</source> <translation>Archivos µPy</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1284"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>Show Documentation</source> <translation>Mostrar Documentación</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1297"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1326"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1258"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1287"/> <source>Show Time</source> <translation>Mostrar Tiempo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1277"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1306"/> <source>Download Firmware</source> <translation>Descargar Firmware</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1471"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/> <source>Date and Time</source> <translation>Fecha y Hora</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1454"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1483"/> <source><table><tr><th></th><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td><b>Date</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Time</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></source> <translation><table><tr><th></th><th>Fecha y Hora Local</th><th>Fecha y Hora del Dispositivo</th></tr><tr><td><b>Fecha</b></td><td align='center'>{0}</td><td align='center'>{2}</td></tr><tr><td><b>Hora</b></td><td align='center'>{1}</td><td align='center'>{3}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1471"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1500"/> <source><table><tr><th>Local Date and Time</th><th>Device Date and Time</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></source> <translation><table><tr><th>Fecha y Hora Local</th><th>Fecha y Hora del Dispositivo</th></tr><tr><td align='center'>{0} {1}</td><td align='center'>{2}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="382"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="386"/> <source>Unknown MicroPython Device</source> <translation>Dispositivo MicroPython Desconocido</translation> </message> @@ -45037,54 +45062,54 @@ <translation type="obsolete">{0} ({1:04x}/{2:04x})</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1294"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1323"/> <source>Ignored Serial Devices</source> <translation>Dispositivos de Serie Ignorados</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1226"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1255"/> <source>Downloads</source> <translation type="unfinished">Descargas</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="312"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="315"/> <source>{0} - {1} ({2})</source> <comment>board name, description, port name</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="354"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="358"/> <source><p>Detected these unknown serial devices</p><ul><li>{0}</li></ul><p>Please report them together with the board name and a short description to <a href="mailto:{1}"> the eric bug reporting address</a> if it is a MicroPython board.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="354"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="358"/> <source>{0} (0x{1:04x}/0x{2:04x})</source> <comment>description, VId, PId</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="382"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="386"/> <source>Would you like to add them to the list of manually configured devices?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1292"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1321"/> <source>Manage Unknown Devices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1693"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1722"/> <source>Add Unknown Devices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1693"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1722"/> <source>Select the devices to be added:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1289"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1318"/> <source>Flash UF2 Device</source> <translation type="unfinished"></translation> </message> @@ -52767,22 +52792,22 @@ <context> <name>ProjectFile</name> <message> - <location filename="../Project/ProjectFile.py" line="72"/> + <location filename="../Project/ProjectFile.py" line="97"/> <source>Save Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFile.py" line="72"/> + <location filename="../Project/ProjectFile.py" line="97"/> <source><p>The project file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFile.py" line="98"/> + <location filename="../Project/ProjectFile.py" line="123"/> <source>Read Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFile.py" line="98"/> + <location filename="../Project/ProjectFile.py" line="123"/> <source><p>The project file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -73889,97 +73914,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="288"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="357"/> <source><h3>CircuitPython Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Switch your device to 'bootloader' mode by double-pressing the reset button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>(If this does not happen, then try shorter or longer pauses between presses.)</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="311"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="380"/> <source><h3>Pi Pico (RP2040) Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Plug in your board while holding the BOOTSEL button.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it).</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="386"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="455"/> <source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="454"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="523"/> <source>Manual Select</source> <translation type="unfinished">Selección Manual</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="555"/> - <source>Reset Instructions:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="499"/> - <source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="522"/> - <source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="532"/> - <source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="557"/> - <source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="569"/> - <source>Flash Instructions:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="594"/> - <source>Boot Volume not found:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="596"/> - <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="602"/> - <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="607"/> - <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../MicroPython/UF2FlashDialog.py" line="624"/> - <source>Multiple Boot Volumes found:</source> + <source>Reset Instructions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="568"/> + <source><h4>No known devices detected.</h4><p>Follow the appropriate instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="591"/> + <source><h4>Flash {0} Firmware</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p><hr/>{1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="601"/> + <source><h4>Potentially UF2 capable devices found</h4><p>Found these potentially UF2 capable devices:</p><ul><li>{0}</li></ul><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../MicroPython/UF2FlashDialog.py" line="626"/> + <source><h4>No known devices detected.</h4><p>Follow the instructions below to set <b>one</b> board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="638"/> + <source>Flash Instructions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="663"/> + <source>Boot Volume not found:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="665"/> + <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="671"/> + <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="676"/> + <source>This volume should have one of these names.</p><ul><li>{0}</li></ul><p>Press <b>Refresh</b> when ready.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="693"/> + <source>Multiple Boot Volumes found:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="695"/> <source><h4>Multiple Boot Volumes were found</h4><p>These volume paths were found.</p><ul><li>{0}</li></ul><p>Please ensure that only one device of a type is ready for flashing. Press <b>Refresh</b> when ready.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="645"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="714"/> <source>Flashing {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="571"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="640"/> <source><h4>Flash method 'manual' selected.</h4><p>Follow the instructions below to flash a device by entering the data manually.</p><ol><li>Change the device to 'bootloader' mode.</li><li>Wait until the device has entered 'bootloader' mode.</li><li>Ensure the boot volume is available (this may require mounting it) and select its path.</li><li>Select the firmware file to be flashed and click the flash button.</li></ol></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="647"/> + <location filename="../MicroPython/UF2FlashDialog.py" line="716"/> <source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source> <translation type="unfinished"></translation> </message> @@ -75072,37 +75097,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="168"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="171"/> <source>Delete Unknown Devices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="150"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="153"/> <source>The selected entries contain some with modified data. Shall they really be deleted?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="168"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="171"/> <source>The list contains some devices with modified data. Shall they really be deleted?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="184"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="187"/> <source>Restore Unknown Devices</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="184"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="187"/> <source>Restoring the list of unknown devices will overwrite all changes made. Do you really want to restore the list?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="247"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="250"/> <source>Unsaved Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/UnknownDevicesDialog.py" line="247"/> + <location filename="../MicroPython/UnknownDevicesDialog.py" line="250"/> <source>The list of devices contains some with modified data.</source> <translation type="unfinished"></translation> </message> @@ -77663,7 +77688,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1450"/> + <location filename="../Utilities/__init__.py" line="1453"/> <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>