--- a/i18n/eric5_es.ts Thu Aug 09 19:13:46 2012 +0200 +++ b/i18n/eric5_es.ts Sun Aug 12 12:50:29 2012 +0200 @@ -312,45 +312,55 @@ <context> <name>AdBlockSubscription</name> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="245"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> <source>Load subscription rules</source> <translation>Cargar reglas de la suscripción</translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="322"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> <source>Downloading subscription rules</source> <translation>Descargando reglas de la suscripción</translation> </message> <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="324"/> + <source>Got empty subscription rules.</source> + <translation>El conjunto de reglas de suscripción está vacío.</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> + <source>Saving subscription rules</source> + <translation>Guardando reglas de la suscripción</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="244"/> + <source>Unable to open adblock file '{0}' for reading.</source> + <translation>No ha sido posible abrir el archivo de AdBlock '{0}' en modo lectura.</translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <source>Adblock file '{0}' does not start with [Adblock.</source> + <translation type="obsolete">El archivo de AdBlock '{0}' no comienza con [Adblock.</translation> + </message> + <message> <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="314"/> - <source>Got empty subscription rules.</source> - <translation>El conjunto de reglas de suscripción está vacío.</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="342"/> - <source>Saving subscription rules</source> - <translation>Guardando reglas de la suscripción</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="237"/> - <source>Unable to open adblock file '{0}' for reading.</source> - <translation>No ha sido posible abrir el archivo de AdBlock '{0}' en modo lectura.</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="245"/> - <source>Adblock file '{0}' does not start with [Adblock.</source> - <translation>El archivo de AdBlock '{0}' no comienza con [Adblock.</translation> - </message> - <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="304"/> <source><p>Subscription rules could not be downloaded.</p><p>Error: {0}</p></source> <translation><p>Las reglas de la subscrición no han podido ser descargadas.</p><p>Error: {0}</p></translation> </message> <message> - <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="342"/> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="402"/> <source>Unable to open adblock file '{0}' for writing.</source> <translation>No ha sido posible abrir el archivo de AdBlock '{0}' en modo escritura.</translation> </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="252"/> + <source>AdBlock file '{0}' does not start with [Adblock.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/AdBlock/AdBlockSubscription.py" line="382"/> + <source><p>AdBlock subscription <b>{0}</b> has a wrong checksum.<br/>Found: {1}<br/>Calculated: {2}<br/>Use it anyway?</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>AdBlockTreeWidget</name> @@ -46743,50 +46753,55 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="112"/> <source>Transplant Changesets</source> <translation>Trasplantar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="38"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="52"/> <source>Transplant changesets from another branch</source> <translation>Hacer rebase de changesets de otra branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="41"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="55"/> <source><b>Transplant Changesets</b><p>This transplants changesets from another branch on top of the current working directory with the log of the original changeset.</p></source> <translation><b>Transplantar Changesets</b><p>Transplanta changesets de otra branch sobre el directorio de trabajo actual con el log del changeset original.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="53"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="67"/> <source>Continue the last transplant session after repair</source> <translation>Continuar la última sesión de trasplante despues de reparar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="85"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="103"/> <source>Transplant</source> <translation>Transplantar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="126"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="126"/> <source>Transplant Changesets (Continue)</source> <translation>Trasplantar Changesets (Continuar)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="63"/> <source>Continue Transplant Session</source> <translation>Continuar Sesión de Trasplantar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="70"/> <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> <translation><b>Continuar Sesión de Transplantar</b><p>Continua la ultima sesión de transplantar despues de reparar.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="88"/> + <source>Transplant is deprecated</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TrayStarter</name>