diff -r fbb3616f6bd3 -r 13aa04c979d7 src/eric7/i18n/eric7_es.ts --- a/src/eric7/i18n/eric7_es.ts Mon Dec 12 19:50:37 2022 +0100 +++ b/src/eric7/i18n/eric7_es.ts Tue Dec 13 14:03:13 2022 +0100 @@ -2925,10 +2925,10 @@ <translation>Ejecutar Test...</translation> </message> <message> - <location filename="../UI/Browser.py" line="609" /> - <location filename="../UI/Browser.py" line="601" /> - <location filename="../UI/Browser.py" line="591" /> - <location filename="../UI/Browser.py" line="582" /> + <location filename="../UI/Browser.py" line="613" /> + <location filename="../UI/Browser.py" line="605" /> + <location filename="../UI/Browser.py" line="595" /> + <location filename="../UI/Browser.py" line="586" /> <location filename="../UI/Browser.py" line="298" /> <location filename="../UI/Browser.py" line="259" /> <source>Show Mime-Type</source> @@ -3012,122 +3012,122 @@ <translation>Línea {0}</translation> </message> <message> - <location filename="../UI/Browser.py" line="583" /> + <location filename="../UI/Browser.py" line="587" /> <source>The mime type of the file could not be determined.</source> <translation>El mime type del archivo no se puede determinar.</translation> </message> <message> - <location filename="../UI/Browser.py" line="602" /> - <location filename="../UI/Browser.py" line="592" /> + <location filename="../UI/Browser.py" line="606" /> + <location filename="../UI/Browser.py" line="596" /> <source>The file has the mime type <b>{0}</b>.</source> <translation>El archivo tiene el mime type <b>{0}</b>.</translation> </message> <message> - <location filename="../UI/Browser.py" line="610" /> + <location filename="../UI/Browser.py" line="614" /> <source>The file has the mime type <b>{0}</b>.<br/> Shall it be added to the list of text mime types?</source> <translation>El archivo tiene el mime type <b>{0}</b>.<br/> ¿Añadirlo a la lista de mime types?</translation> </message> <message> - <location filename="../UI/Browser.py" line="708" /> + <location filename="../UI/Browser.py" line="712" /> <source>New toplevel directory</source> <translation>Nuevo directorio raíz</translation> </message> <message> - <location filename="../UI/Browser.py" line="944" /> - <location filename="../UI/Browser.py" line="932" /> - <location filename="../UI/Browser.py" line="923" /> + <location filename="../UI/Browser.py" line="948" /> + <location filename="../UI/Browser.py" line="936" /> + <location filename="../UI/Browser.py" line="927" /> <source>New Directory</source> <translation>Nuevo Directorio</translation> </message> <message> - <location filename="../UI/Browser.py" line="924" /> + <location filename="../UI/Browser.py" line="928" /> <source>Name for new directory:</source> <translation>Nombre para el nuevo directorio:</translation> </message> <message> - <location filename="../UI/Browser.py" line="971" /> - <location filename="../UI/Browser.py" line="933" /> + <location filename="../UI/Browser.py" line="975" /> + <location filename="../UI/Browser.py" line="937" /> <source>A file or directory named <b>{0}</b> exists already. Aborting...</source> <translation>Un archivo o directorio con nombre <b>{0}</b> ya existe. Abortando...</translation> </message> <message> - <location filename="../UI/Browser.py" line="945" /> + <location filename="../UI/Browser.py" line="949" /> <source><p>The directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El directorio <b>{0}</b> no se ha podido crear.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/Browser.py" line="983" /> - <location filename="../UI/Browser.py" line="970" /> - <location filename="../UI/Browser.py" line="961" /> + <location filename="../UI/Browser.py" line="987" /> + <location filename="../UI/Browser.py" line="974" /> + <location filename="../UI/Browser.py" line="965" /> <source>New File</source> <translation>Nuevo Archivo</translation> </message> <message> - <location filename="../UI/Browser.py" line="962" /> + <location filename="../UI/Browser.py" line="966" /> <source>Name for new file:</source> <translation>Nombre para el nuevo archivo:</translation> </message> <message> - <location filename="../UI/Browser.py" line="984" /> + <location filename="../UI/Browser.py" line="988" /> <source><p>The file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido crear.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/Browser.py" line="1013" /> + <location filename="../UI/Browser.py" line="1017" /> <source>Do you really want to move this file to the trash?</source> <translation>¿Desea realmente mover este archivo a la papelera?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1016" /> + <location filename="../UI/Browser.py" line="1020" /> <source>Do you really want to delete this file?</source> <translation>¿Desea realmente borrar este archivo?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1101" /> - <location filename="../UI/Browser.py" line="1027" /> - <location filename="../UI/Browser.py" line="1019" /> + <location filename="../UI/Browser.py" line="1105" /> + <location filename="../UI/Browser.py" line="1031" /> + <location filename="../UI/Browser.py" line="1023" /> <source>Delete File</source> <translation>Borrar Archivo</translation> </message> <message> - <location filename="../UI/Browser.py" line="1102" /> - <location filename="../UI/Browser.py" line="1028" /> + <location filename="../UI/Browser.py" line="1106" /> + <location filename="../UI/Browser.py" line="1032" /> <source><p>The selected file <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>El archivo seleccionado <b>{0}</b> no se ha podido borrar.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/Browser.py" line="1045" /> + <location filename="../UI/Browser.py" line="1049" /> <source>Do you really want to move this directory to the trash?</source> <translation>¿Desea realmente mover este directorio a la papelera?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1050" /> + <location filename="../UI/Browser.py" line="1054" /> <source>Do you really want to delete this directory?</source> <translation>¿Desea realmente borrar este directorio?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1064" /> - <location filename="../UI/Browser.py" line="1053" /> + <location filename="../UI/Browser.py" line="1068" /> + <location filename="../UI/Browser.py" line="1057" /> <source>Delete Directory</source> <translation>Borrar Directorio</translation> </message> <message> - <location filename="../UI/Browser.py" line="1065" /> + <location filename="../UI/Browser.py" line="1069" /> <source><p>The selected directory <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>El directorio seleccionado <b>{0}</b> no se ha podido borrar.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/Browser.py" line="1086" /> + <location filename="../UI/Browser.py" line="1090" /> <source>Do you really want to move these files to the trash?</source> <translation>¿Desea realmente mover estos archivos a la papelera?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1089" /> + <location filename="../UI/Browser.py" line="1093" /> <source>Do you really want to delete these files?</source> <translation>¿Desea realmente borrar estos archivos?</translation> </message> <message> - <location filename="../UI/Browser.py" line="1092" /> + <location filename="../UI/Browser.py" line="1096" /> <source>Delete Files</source> <translation>Borrar Archivos</translation> </message> @@ -21462,7 +21462,7 @@ <translation>El proceso git ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1632" /> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209" /> <source>The git process did not finish within 30s.</source> <translation>El proceso git no terminó en un plazo de 30s.</translation> @@ -21503,27 +21503,27 @@ <translation>Clonando proyecto desde un repositorio Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="422" /> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="423" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="479" /> <source>Committing changes to Git repository</source> <translation>Haciendo commit de cambios al repositorio Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="538" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="540" /> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="539" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="541" /> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar hacer switch a <b>{0}</b>?</p></translation> </message> @@ -21533,108 +21533,108 @@ <translation>Sincronizando con el repositorio Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="615" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="613" /> <source>Adding files/directories to the Git repository</source> <translation>Añadiendo archivos/directorios al repositorio Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="687" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="683" /> <source>Removing files/directories from the Git repository</source> <translation>Eliminando archivos/directorios del repositorio Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="752" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="746" /> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="868" /> <source>Unstage files/directories</source> <translation>Sacar archivos/directorios del área de preparación (unstage)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="931" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="920" /> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="910" /> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="911" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios de estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="932" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="922" /> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="938" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="928" /> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="992" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="980" /> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1022" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1008" /> <source>Master branch head</source> <translation>Master branch head</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1244" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1224" /> <source>Git Command</source> <translation>Comando de Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1346" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1326" /> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Commit</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1330" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1356" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1336" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1342" /> + <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1347" /> + <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1352" /> + <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Fecha</b></td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1357" /> + <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> + <translation><tr><td><b>Autor del Commit</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1362" /> - <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> + <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> + <translation><tr><td><b>Fecha de Commit</b></td><td>{0}</td></tr></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1367" /> - <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> - <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1372" /> - <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Fecha</b></td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1377" /> - <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> - <translation><tr><td><b>Autor del Commit</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382" /> - <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> - <translation><tr><td><b>Fecha de Commit</b></td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1387" /> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Asunto</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1373" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -21649,459 +21649,459 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1467" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1447" /> <source>Create {0} file</source> <translation>Crear archivo {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1468" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1448" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1532" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1512" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1495" /> <source>Git Copy</source> <translation>Git Copy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1516" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1496" /> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>La copia del directorio <b>{0}</b> ha fallado.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1533" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1513" /> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>La copia del archivo <b>{0}</b> ha fallado.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2772" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1658" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2712" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1634" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1728" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1704" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1702" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1689" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678" /> <source>Git Side-by-Side Difference</source> <translation>Git mostrar Diferencias Lado a Lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1729" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1703" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1783" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1755" /> <source>Fetching from a remote Git repository</source> <translation>Haciendo fetch desde un repositorio Git remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1821" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1791" /> <source>Pulling from a remote Git repository</source> <translation>Haciendo pull desde un repositorio Git remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1862" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1830" /> <source>Pushing to a remote Git repository</source> <translation>Haciendo push a un repositorio Git remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1888" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1854" /> <source>Committing failed merge</source> <translation>Haciendo commit de un merge fallido</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1915" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879" /> <source>Aborting uncommitted/failed merge</source> <translation>Abortando merge fallido/sin commit</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1909" /> + <source>Applying patch</source> + <translation>Aplicando patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1942" /> + <source>Check patch files</source> + <translation>Comprobar archivos de parche</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1945" /> - <source>Applying patch</source> - <translation>Aplicando patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1980" /> - <source>Check patch files</source> - <translation>Comprobar archivos de parche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1983" /> <source>Apply patch files</source> <translation>Aplicar archivos de parche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2065" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2025" /> <source>Tagging in the Git repository</source> <translation>Haciendo tag en el repositorio Git</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2270" /> + <source>Branching in the Git repository</source> + <translation>Haciendo branch en el repositorio Git</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2312" /> - <source>Branching in the Git repository</source> - <translation>Haciendo branch en el repositorio Git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2356" /> <source>Delete Remote Branch</source> <translation>Borrar Branch Remota</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2333" /> <source>Current Branch</source> <translation>Branch Actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2380" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2334" /> <source><p>The current branch is <b>{0}</b>.</p></source> <translation><p>La branch actual es <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2428" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2380" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2362" /> <source>Create Bundle</source> <translation>Crear Bundle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2412" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2364" /> <source>Git Bundle Files (*.bundle)</source> <translation>Archivos de Git Bundle (*.bundle)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2429" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2381" /> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de Git bundle <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2427" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2416" /> <source>Verify Bundle</source> <translation>Verificar Bundle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2616" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2567" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2499" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2560" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2513" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2418" /> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation>Archivos de Git Bundle (*.bundle);;Todos los archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2508" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2497" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2456" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2445" /> <source>List Bundle Heads</source> <translation>Listar Bundle Heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2614" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2565" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2511" /> <source>Apply Bundle</source> <translation>Aplicar Bundle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2635" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2586" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2579" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2532" /> <source>Applying a bundle file (fetch)</source> <translation>Aplicando un archivo de bundle (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2878" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2716" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2814" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2658" /> <source>Git Bisect ({0})</source> <translation>Git Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2771" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2711" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2817" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2800" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2782" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2757" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2740" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2722" /> <source>Create Bisect Replay File</source> <translation>Crear Archivo de Bisect Replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2784" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2724" /> <source>Git Bisect Replay Files (*.replay)</source> <translation>Archivos de Git Bisect Replay (*.replay)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2801" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2741" /> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de Git bisect replay <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2818" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2758" /> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation><p>El archivo<b>{0}</b> no puede ser escrito.<br />Razón: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2839" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2777" /> <source>Edit Bisect Replay File</source> <translation>Editar Archivo de Bisect Replay</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2869" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2841" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2805" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2779" /> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation>Archivos de Git Bisect Replay (*.replay);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2867" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2803" /> <source>Bisect Replay</source> <translation>Repetir Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3225" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3043" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3147" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2977" /> <source>Show Remote Info</source> <translation>Mostrar Info Remota</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3103" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3033" /> <source>Rename Remote Repository</source> <translation>Renombrar Repositorio Remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3104" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3034" /> <source>Enter new name for remote repository:</source> <translation>Introducir el nuevo nombre para el repositorio remoto:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3249" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3169" /> <source>Show Shortlog</source> <translation>Mostrar Shortlog</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3308" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3226" /> <source>Cherry-pick</source> <translation>Cherry-pick</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3337" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3253" /> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3362" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3276" /> <source>Copy Changesets (Quit)</source> <translation>Copiar Changesets (Salir)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3388" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3300" /> <source>Copy Changesets (Cancel)</source> <translation>Copiar Changesets (Cancelar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3378" /> <source>Saving stash</source> <translation>Guardando stash (guardado rápido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3682" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3580" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3418" /> <source>Show Stash</source> <translation>Mostrar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3641" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3590" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3548" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3581" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3541" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3492" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3452" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3419" /> <source>Select a stash (empty for latest stash):</source> <translation>Seleccionar un stash (dejar en blanco para el último stash):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3589" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3547" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3491" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3451" /> <source>Restore Stash</source> <translation>Restaurar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3603" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3465" /> <source>Restoring stash</source> <translation>Restaurando Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3640" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3540" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3529" /> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3530" /> <source>Enter a branch name to restore a stash to:</source> <translation>Introducir un nombre de branch sobre la que restaurar un stash:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3655" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3555" /> <source>Creating branch</source> <translation>Creando branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3693" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3591" /> <source>Delete Stash</source> <translation>Borrar Stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3694" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3592" /> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation>¿Desea realmente borrar el stash <b>{0}</b>?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3704" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3602" /> <source>Deleting stash</source> <translation>Borrando stash</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3726" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3622" /> <source>Delete All Stashes</source> <translation>Borrar todos los Stashes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3623" /> <source>Do you really want to delete all stashes?</source> <translation>¿Desea realmente borrar todos los stashes?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629" /> <source>Deleting all stashes</source> <translation>Borrando todos los stashes</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3689" /> + <source>Showing the combined configuration settings</source> + <translation>Mostrando los ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3711" /> + <source>Verifying the integrity of the Git repository</source> + <translation>Verificando la integridad del repositorio Git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732" /> + <source>Performing Repository Housekeeping</source> + <translation>Llevando a cabo Reorganización del Repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773" /> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Estadísticas</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3775" /> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3780" /> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3786" /> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3792" /> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3797" /> - <source>Showing the combined configuration settings</source> - <translation>Mostrando los ajustes de configuración combinados</translation> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3803" /> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3809" /> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3814" /> + <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Espacio en disco utilizado por archivos basura: </td><td>{0} KiB</td></tr></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3821" /> - <source>Verifying the integrity of the Git repository</source> - <translation>Verificando la integridad del repositorio Git</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3844" /> - <source>Performing Repository Housekeeping</source> - <translation>Llevando a cabo Reorganización del Repositorio</translation> + <source><p><b>No statistics available.</b></p></source> + <translation><p><b>No hay estadísticas disponibles.</b></p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3887" /> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Estadísticas</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3889" /> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos sueltos: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3894" /> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos sueltos: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3900" /> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de objetos empaquetados: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3906" /> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Número de paquetes: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3911" /> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por objetos empaquetados: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3917" /> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Objetos empaquetados en espera de pruning: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3923" /> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Archivos basura: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3928" /> - <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Espacio en disco utilizado por archivos basura: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3935" /> - <source><p><b>No statistics available.</b></p></source> - <translation><p><b>No hay estadísticas disponibles.</b></p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4003" /> <source>Creating Archive</source> <translation>Creando Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4045" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3927" /> <source>Add Submodule</source> <translation>Añadir Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4113" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3993" /> <source>List Submodules</source> <translation>Listar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4114" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3994" /> <source>No submodules defined for the project.</source> <translation>El proyecto no tiene submódulos definidos.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4127" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4007" /> <source>All</source> <translation>Todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4131" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4011" /> <source>Submodule Path</source> <translation>Ruta del Submódulo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4132" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012" /> <source>Select a submodule path:</source> <translation>Seleccionar ruta del submódulo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4183" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4061" /> <source>Initialize Submodules</source> <translation>Inicializar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4218" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4094" /> <source>Unregister Submodules</source> <translation>Desregistrar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4292" /> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4251" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4125" /> <source>Update Submodules</source> <translation>Actualizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4324" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4194" /> <source>Synchronize Submodules</source> <translation>Sincronizar Submódulos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4380" /> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4248" /> <source>Submodules Summary</source> <translation>Resumen de Submódulos</translation> </message> @@ -22504,22 +22504,22 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="126" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="129" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="127" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="213" /> + <source>Changed by skipped commit</source> + <translation>Cambiado por un commit omitido</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="215" /> - <source>Changed by skipped commit</source> - <translation>Cambiado por un commit omitido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitBlameDialog.py" line="217" /> <source>Commit cannot be skipped</source> <translation>El commit no se puede omitir</translation> </message> @@ -23062,12 +23062,12 @@ <context> <name>GitDescribeDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="120" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="118" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="121" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py" line="119" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -23630,7 +23630,7 @@ <translation>Hacer Tag del commit seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1898" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1896" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="340" /> <source>Branch</source> <translation>Branch</translation> @@ -23651,9 +23651,9 @@ <translation>Crear una nueva branch desde el commit seleccionado y cambiar el árbol de trabajo a ella.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1959" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1870" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1847" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1957" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1868" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1845" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="356" /> <source>Switch</source> <translation>Hacer switch</translation> @@ -23664,7 +23664,7 @@ <translation>Cambiar el directorio de trabajo al commit seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1986" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1984" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="364" /> <source>Show Short Log</source> <translation>Mostrar Shortlog</translation> @@ -23716,94 +23716,94 @@ <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1347" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1345" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Diferencias lado a lado con Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1361" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1359" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparación lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1807" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1805" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1960" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1871" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1808" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1958" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1869" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1806" /> <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/vcsGit/GitLogBrowserDialog.py" line="1987" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1848" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1985" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1846" /> <source>Select a branch</source> <translation>Seleccionar una branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1937" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1899" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1897" /> <source>Select a default branch</source> <translation>Seleccionar la branch por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="1934" /> <source>Branch & Switch</source> <translation>Branch & Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2166" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2164" /> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2167" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2165" /> <source>'{0}' was not found.</source> <translation>No se ha encontrado '{0}'.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2211" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2209" /> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2223" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2221" /> <source>Differences to Parent {0}</source> <translation>Diferencias con Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2239" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2237" /> <source>Diff to Parent {0}</source> <translation>Diff con Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2262" /> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2414" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2396" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2429" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2412" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2394" /> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2398" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2396" /> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2415" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2413" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2432" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py" line="2430" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> @@ -24399,14 +24399,14 @@ <context> <name>GitPatchStatisticsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="118" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="85" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="123" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="119" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py" line="86" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -26630,12 +26630,12 @@ <translation>Pulsar para actualizar la lista de commits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="198" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="203" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="199" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py" line="204" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -26848,12 +26848,12 @@ <translation>Pulsar para actualizar la vista de repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="149" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="152" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py" line="150" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -27196,7 +27196,7 @@ <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="383" /> <source>%n file(s) changed</source> <translation> <numerusform>%n archivo cambiado</numerusform> @@ -27204,7 +27204,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="386" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n línea insertada</numerusform> @@ -27212,7 +27212,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="391" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py" line="389" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n línea borrada</numerusform> @@ -27376,7 +27376,7 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="676" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="674" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="195" /> <source>Commit</source> <translation>Commit</translation> @@ -27407,7 +27407,7 @@ <translation>Eliminar selección de todo del commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="719" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="717" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="210" /> <source>Add</source> <translation>Añadir</translation> @@ -27438,7 +27438,7 @@ <translation>Todos los cambios fuera del area de preparación (stage) para los archivos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="874" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="872" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="226" /> <source>Differences</source> <translation>Diferencias</translation> @@ -27459,7 +27459,7 @@ <translation>Muestra las diferencias de la entrada seleccionada lado a lado en un diálogo separado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="810" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="808" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="244" /> <source>Revert</source> <translation>Revertir</translation> @@ -27470,7 +27470,7 @@ <translation>Revertir cambios de archivos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="791" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="789" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="253" /> <source>Forget Missing</source> <translation>Olvidar elementos perdidos</translation> @@ -27481,7 +27481,7 @@ <translation>Olvidar los archivos perdidos seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="839" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="837" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="257" /> <source>Restore Missing</source> <translation>Restore sobre elementos perdidos</translation> @@ -27518,108 +27518,108 @@ <translation>Git Status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="424" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="427" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="425" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="606" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="470" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="604" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="468" /> <source>all</source> <translation>todo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="677" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="675" /> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="720" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="718" /> <source>There are no unversioned entries available/selected.</source> <translation>No hay entradas sin versionar disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="743" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="741" /> <source>Stage</source> <translation>Área de Preparación (Stage)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="742" /> <source>There are no stageable entries available/selected.</source> <translation>No hay entradas que se puedan llevar al área de preparación (stage) disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="767" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="765" /> <source>Unstage</source> <translation>Unstage (sacar del área de preparación)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="768" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="766" /> <source>There are no unstageable entries available/selected.</source> <translation>No hay entradas que se puedan sacar del área de preparación (unstage) disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="840" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="790" /> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="809" /> <source>There are no uncommitted, unstaged changes available/selected.</source> <translation>No hay cambios sin commit, fuera del área de preparación, disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="875" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="873" /> <source>There are no uncommitted changes available/selected.</source> <translation>No hay cambios pendientes de commit disponibles/seleccionados.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="925" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="901" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="923" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="899" /> <source>Working Tree to Staging Area</source> <translation>Árbol de Trabajo a Área de Preparación (Staging Area)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="902" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="900" /> <source>Staging Area to HEAD Commit</source> <translation>Área de Preparación (Staging Area) a HEAD Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="926" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="903" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="924" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="901" /> <source>Working Tree to HEAD Commit</source> <translation>Árbol de Trabajo a HEAD Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="930" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="907" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="928" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="905" /> <source>Differences Side-by-Side</source> <translation>Diferencias Lado a Lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="931" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="908" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="929" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="906" /> <source>Select the compare method.</source> <translation>Seleccioanr el método compare.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1239" /> + <source>Revert selected lines</source> + <translation>Revertir Líneas Seleccionadas</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1241" /> - <source>Revert selected lines</source> - <translation>Revertir Líneas Seleccionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1243" /> <source>Revert hunk</source> <translation>Revertir Fragmento (Hunk)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1248" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="1246" /> <source>Are you sure you want to revert the selected changes?</source> <translation>¿Realmente desea revertir los cambios seleccionados?</translation> </message> @@ -27937,54 +27937,54 @@ <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="44" /> <source>up-to-date</source> <translation>actualizados</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="45" /> + <source>not initialized</source> + <translation>no inicializados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="46" /> + <source>different to index</source> + <translation>diferentes del índice</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="47" /> - <source>not initialized</source> - <translation>no inicializados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="48" /> - <source>different to index</source> - <translation>diferentes del índice</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="49" /> <source>merge conflicts</source> <translation>conflictos de merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="54" /> + <source>Refresh</source> + <translation>Actualizar</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="56" /> - <source>Refresh</source> - <translation>Actualizar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="58" /> <source>Press to refresh the status display</source> <translation>Pulsar para actualizar el status visualizado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="99" /> <source>The process {0} did not finish within 30 seconds.</source> <translation>El proceso {0} no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="109" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="105" /> <source>The process {0} finished with an error. Error: {1}</source> <translation>El proceso {0} terminó con error. Error: {1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="112" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py" line="133" /> <source>unknown</source> <translation>desconocido</translation> </message> @@ -28200,15 +28200,15 @@ <p>Muestra una lista de los tags o branches del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="102" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="109" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="0" /> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="102" /> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="109" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.ui" line="0" /> <source>Name</source> <translation>Nombre</translation> @@ -28259,25 +28259,35 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="103" /> <source>Annotation Message</source> <translation>Mensaje de Anotación</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="100" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="107" /> <source>Git Branches List</source> <translation>Listado de Git Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="140" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="145" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="141" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="146" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="336" /> + <source>current branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py" line="339" /> + <source>checked out in linked worktree</source> + <translation type="unfinished" /> + </message> </context> <context> <name>GitTagDialog</name> @@ -48143,53 +48153,53 @@ <context> <name>MicroPythonDevice</name> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="243" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="263" /> <source>RP2040 based</source> <translation>Basada en RP2040</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="250" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="270" /> <source>Generic Board</source> <translation>Placa Genérica</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="368" /> - <location filename="../MicroPython/MicroPythonDevices.py" line="357" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="388" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="377" /> <source>Unknown Device</source> <translation>Dispositivo Desconocido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="489" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="509" /> <source>Unsupported Device</source> <translation>Dispositivo no soportado</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="499" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="519" /> <source>REPL is not supported by this device.</source> <translation>REPL no soportado por este dispositivo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="518" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="538" /> <source>Plotter is not supported by this device.</source> <translation>Plotter no soportado por este dispositivo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="537" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="557" /> <source>Running scripts is not supported by this device.</source> <translation>La ejecución de scripts no está soportada por este dispositivo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="556" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="576" /> <source>File Manager is not supported by this device.</source> <translation>El Gestor de Archovos no está soportado por este dispositivo.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="601" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="621" /> <source>Select Device Directory</source> <translation>Seleccionar Directorio para Dispositivo</translation> </message> <message> - <location filename="../MicroPython/MicroPythonDevices.py" line="602" /> + <location filename="../MicroPython/MicroPythonDevices.py" line="622" /> <source>Select the directory for the connected device:</source> <translation>Seleccionar el directorio para el dispositivo conectado:</translation> </message> @@ -82114,122 +82124,122 @@ <translation>Actualizar</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="508" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="550" /> <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><h3>Placa CircuitPython</h3><p>Para preparar la placa para flashear seguir estos pasos:</p><ol><li>Cambiar el dispositivo a modo 'bootloader' pulsando dos veces el botón de reset.</li><li>Esperar hasta que el dispositivo entre en modo 'bootloader'.</li><li>(Si esto no ocurre, intentar pausas entre pulsado más largas o más cortas.)</li><li>Asegurar que el volumen de arranque está disponible (esto puede requerir de su montaje).</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flash.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="565" /> - <location filename="../MicroPython/UF2FlashDialog.py" line="533" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="607" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="575" /> <source><h3>Pi Pico (RP2040) Board</h3><p>In order to prepare the board for flashing follow these steps:</p><ol><li>Enter 'bootloader' mode (board <b>without</b> RESET button):<ul><li>Plug in your board while holding the BOOTSEL button.</li></ul>Enter 'bootloader' mode (board <b>with</b> RESET button):<ul><li>hold down RESET</li><li>hold down BOOTSEL</li><li>release RESET</li><li>release BOOTSEL</li></ul></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><h3>Placa Pi Pico (RP2040)</h3><p>Para preparar la placa para flashing seguir estos pasos:</p><ol><li>Entrar en modo 'bootloader' (placa <b>sin</b> botón RESET):<ul><li>Conectar la placa mientras se mantiene pulsado el botón BOOTSEL.</li></ul>Entrar en modo 'bootloader' (placa <b>con</b> botón RESET):<ul><li>mantener pulsado RESET</li><li>mantener pulsado BOOTSEL</li><li>soltar RESET</li><li>soltar BOOTSEL</li></ul></li><li>Esperar hasta que el dispositivo haya entrado en modo 'bootloader'.</li><li>Asegurar que el volumen de arranque está disponible (esto puedo requerir su montaje).</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flash.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="641" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="683" /> <source>'{0}' Board</source> <translation>Placa '{0}'</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="675" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="717" /> <source>MicroPython/CircuitPython Files (*.uf2);;All Files (*)</source> <translation>Archivos MicroPython/CircuitPython(*.uf2);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="744" /> - <location filename="../MicroPython/UF2FlashDialog.py" line="733" /> - <location filename="../MicroPython/UF2FlashDialog.py" line="724" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="786" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="775" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="766" /> <source>Manual Select</source> <translation>Selección Manual</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="843" /> - <location filename="../MicroPython/UF2FlashDialog.py" line="811" /> - <location filename="../MicroPython/UF2FlashDialog.py" line="788" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="885" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="853" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="830" /> <source>Reset Instructions:</source> <translation>Instrucciones de Reset:</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="790" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="832" /> <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><h4>No se han detectado dispositivos conocidos.</h4><p>Seguir las instrucciones apropiadas debajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="814" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="856" /> <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><h4>Flashear {0} Firmware</h4><p>Seguir las instrucciones de bajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p><hr/>{1}</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="824" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="866" /> <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><h4>Encontrados dispositivos con capacidad potencial UF2</h4><p>Encontrados estos dispositivos con capacidad potencial UF2:</p><ul><li>{0}</li></ul><p>Seguir las instrucciones debajo para establecer <b>una</b> placa en modo 'bootloader' mode. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="845" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="887" /> <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><h4>No se han detectado dispositivos conocidos.</h4><p>Seguir las instrucciones apropiadas debajo para establecer <b>una</b> placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="857" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="899" /> <source>Flash Instructions:</source> <translation>Instrucciones de Flash:</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="859" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="901" /> <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><h4>Seleccionado método 'manual' de Flash.</h4><p>Seguir las instrucciones debajo para flashear un dispositivo introduciendo manualmente los datos.</p><ol><li>Cambiar el dispositivo a modo 'bootloader'.</li><li>Esperar hasta que el dispositivo haya entrado en modo 'bootloader'.</li><li>Asegurar que el volumen de arranque está disponible (esto puede requerir de su montaje) y seleccionar su ruta.</li><li>Seleccionar el archivo de firmware a flashear y hacer click en el botón de flashear.</li></ol></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="884" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="926" /> <source>Boot Volume not found:</source> <translation>Volumen de Arranque no encontrado:</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="886" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="928" /> <source><h4>No Boot Volume detected.</h4><p>Please ensure that the boot volume of the device to be flashed is available. </source> <translation><h4>No se ha encontrado un Volumen de Arranque.</h4><p>Por favor, asegurar que el volumen de arranque del dispositivo a flashear está disponible. </translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="892" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="934" /> <source>This volume should be named <b>{0}</b>. Press <b>Refresh</b> when ready.</p></source> <translation>Este volumen se debería llamar <b>{0}</b>. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="897" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="939" /> <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>Este volumen debería tener uno de los siguientes nombres.</p><ul><li>{0}</li></ul><p>Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="904" /> - <source><h4>Reset Instructions</h4><p>Follow the instructions below to set the board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> - <translation><h4>Instrucciones para Restablecer</h4><p>Seguir las instrucciones de debajo para establecer la placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="923" /> - <source>Multiple Boot Volumes found:</source> - <translation>Múltiples Volúmenes de Arranque encontrados:</translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="925" /> - <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><h4>Se han encontrado múltiples Volúmes de Arranque</h4><p>Esas rutas de volumen se han encontrado.</p><ul><li>{0}</li></ul><p>Por favor, asegurar que solamente un dispositivo de cada tipo está listo para flashear. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> - </message> - <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="944" /> - <source>Flashing Firmware</source> - <translation>Flasheando Firmware</translation> - </message> - <message> <location filename="../MicroPython/UF2FlashDialog.py" line="946" /> + <source><h4>Reset Instructions</h4><p>Follow the instructions below to set the board into 'bootloader' mode. Press <b>Refresh</b> when ready.</p></source> + <translation><h4>Instrucciones para Restablecer</h4><p>Seguir las instrucciones de debajo para establecer la placa en modo 'bootloader'. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="965" /> + <source>Multiple Boot Volumes found:</source> + <translation>Múltiples Volúmenes de Arranque encontrados:</translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="967" /> + <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><h4>Se han encontrado múltiples Volúmes de Arranque</h4><p>Esas rutas de volumen se han encontrado.</p><ul><li>{0}</li></ul><p>Por favor, asegurar que solamente un dispositivo de cada tipo está listo para flashear. Pulsar <b>Actualizar</b> cuando esté listo.</p></translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="986" /> + <source>Flashing Firmware</source> + <translation>Flasheando Firmware</translation> + </message> + <message> + <location filename="../MicroPython/UF2FlashDialog.py" line="988" /> <source><p>Flashing the selected firmware to the device. Please wait until the device resets automatically.</p></source> <translation><p>Flasheando el firmware seleccionado al dispositivo. Por favor, esperar hasta que el dispositivo haga reset automáticamente.</p></translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="953" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="995" /> <source>Flashing {0}</source> <translation>Flasheando {0}</translation> </message> <message> - <location filename="../MicroPython/UF2FlashDialog.py" line="955" /> + <location filename="../MicroPython/UF2FlashDialog.py" line="997" /> <source><p>Flashing the {0} firmware to the device. Please wait until the device resets automatically.</p></source> <translation><p>Flasheando el firmware {0} al dispositivo. Por favor, esperar hasta que el dispositivo haga reset automáticamente.</p></translation> </message>