Merged remote changes.

Sat, 09 Mar 2013 15:44:37 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 09 Mar 2013 15:44:37 +0100
changeset 2470
206ff86e34c8
parent 2469
20d2166280bb (current diff)
parent 2467
33f1bcfdd65e (diff)
child 2472
4860fe0ed4a6

Merged remote changes.

--- a/E5Gui/E5ModelMenu.py	Sat Mar 09 15:43:46 2013 +0100
+++ b/E5Gui/E5ModelMenu.py	Sat Mar 09 15:44:37 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
+from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint
 from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, QPixmap
 
 import UI.PixmapCache
@@ -378,7 +378,10 @@
         drag = QDrag(self)
         drag.setMimeData(self.__model.mimeData([idx]))
         actionRect = self.actionGeometry(act)
-        drag.setPixmap(QPixmap.grabWidget(self, actionRect))
+        if qVersion() >= "5.0.0":
+            drag.setPixmap(self.grab(actionRect))
+        else:
+            drag.setPixmap(QPixmap.grabWidget(self, actionRect))
         
         if drag.exec_() == Qt.MoveAction:
             row = idx.row()
--- a/E5Gui/E5ModelToolBar.py	Sat Mar 09 15:43:46 2013 +0100
+++ b/E5Gui/E5ModelToolBar.py	Sat Mar 09 15:44:37 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
+from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent
 from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, QToolButton
 
 
@@ -241,7 +241,10 @@
         drag = QDrag(self)
         drag.setMimeData(self.__model.mimeData([idx]))
         actionRect = self.actionGeometry(act)
-        drag.setPixmap(QPixmap.grabWidget(self, actionRect))
+        if qVersion() >= "5.0.0":
+            drag.setPixmap(self.grab(actionRect))
+        else:
+            drag.setPixmap(QPixmap.grabWidget(self, actionRect))
         
         if drag.exec_() == Qt.MoveAction:
             row = idx.row()
--- a/Tools/UIPreviewer.py	Sat Mar 09 15:43:46 2013 +0100
+++ b/Tools/UIPreviewer.py	Sat Mar 09 15:44:37 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing the UI Previewer main window.
 """
 
-from PyQt4.QtCore import QDir, QFileInfo, QEvent, QSize, Qt
+from PyQt4.QtCore import qVersion, QDir, QFileInfo, QEvent, QSize, Qt
 from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, QCursor, \
     QPrinter, QKeySequence, QPrintDialog, QWhatsThis, QPixmap, QImageWriter, QPainter, \
     QDialog, QScrollArea, qApp, QApplication, QStyleFactory, QFrame, QMainWindow, \
@@ -447,7 +447,10 @@
             ext = defaultExt
             fname.append(".{0}".format(defaultExt.lower()))
         
-        pix = QPixmap.grabWidget(self.mainWidget)
+        if qVersion() >= "5.0.0":
+            pix = self.mainWidget.grab()
+        else:
+            pix = QPixmap.grabWidget(self.mainWidget)
         self.__updateChildren(self.lastStyle)
         if not pix.save(fname, str(ext)):
             E5MessageBox.critical(self,
@@ -466,7 +469,10 @@
             return
         
         cb = QApplication.clipboard()
-        cb.setPixmap(QPixmap.grabWidget(self.mainWidget))
+        if qVersion() >= "5.0.0":
+            cb.setPixmap(self.mainWidget.grab())
+        else:
+            cb.setPixmap(QPixmap.grabWidget(self.mainWidget))
         self.__updateChildren(self.lastStyle)
     
     def __printImage(self):
@@ -554,7 +560,10 @@
             marginX *= 2
             width = printer.width() - marginX * 2
             height = printer.height() - marginY * 2
-        img = QPixmap.grabWidget(self.mainWidget).toImage()
+        if qVersion() >= "5.0.0":
+            img = self.mainWidget.grab().toImage()
+        else:
+            img = QPixmap.grabWidget(self.mainWidget).toImage()
         self.__updateChildren(self.lastStyle)
         p.drawImage(marginX, marginY,
                     img.scaled(width, height,
Binary file i18n/eric5_es.qm has changed
--- a/i18n/eric5_es.ts	Sat Mar 09 15:43:46 2013 +0100
+++ b/i18n/eric5_es.ts	Sat Mar 09 15:44:37 2013 +0100
@@ -2647,11 +2647,6 @@
         <translation>Pulse para limpiar la lista de hosts</translation>
     </message>
     <message>
-        <location filename="Cooperation/ChatWidget.py" line="480"/>
-        <source>Cut</source>
-        <translation type="obsolete">Cortar</translation>
-    </message>
-    <message>
         <location filename="Cooperation/ChatWidget.py" line="485"/>
         <source>Cut all</source>
         <translation>Cortar todo</translation>
@@ -7255,7 +7250,7 @@
     <message>
         <location filename="E5Network/E5SslCertificatesInfoDialog.ui" line="14"/>
         <source>SSL Certificate Info</source>
-        <translation type="unfinished">Información del Certificado SSL</translation>
+        <translation>Información del Certificado SSL</translation>
     </message>
 </context>
 <context>
@@ -7263,87 +7258,87 @@
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="23"/>
         <source>&lt;h2&gt;Certificate Information&lt;/h2&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h2&gt;Información del Certificado&lt;/h2&gt;</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="32"/>
         <source>Certificate Chain:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cadena de Certificados:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="51"/>
         <source>This certificated has been blacklisted.</source>
-        <translation type="unfinished">Este certificado está en una lista negra.</translation>
+        <translation>Este certificado está en una lista negra.</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="61"/>
         <source>&lt;b&gt;Issued for:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Emitido para:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="168"/>
         <source>Common Name (CN):</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre Común (CN):</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="188"/>
         <source>Organization (O):</source>
-        <translation type="unfinished"></translation>
+        <translation>Organización (O):</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="208"/>
         <source>Organizational Unit (OU):</source>
-        <translation type="unfinished"></translation>
+        <translation>Unidad Organizacional (OU):</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="128"/>
         <source>Serialnumber:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de serie:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="161"/>
         <source>&lt;b&gt;Issued by:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Emitido por:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="241"/>
         <source>&lt;b&gt;Validity:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Validez:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="248"/>
         <source>Issued on:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emitido a:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="268"/>
         <source>Expires on:</source>
-        <translation type="unfinished"></translation>
+        <translation>Expira en:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="288"/>
         <source>This certificate is not valid yet or has expired.</source>
-        <translation type="unfinished">Este certificado no es válido aún o ha expirado.</translation>
+        <translation>Este certificado no es válido aún o ha expirado.</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="308"/>
         <source>&lt;b&gt;Fingerprints:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Fingerprints:&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="315"/>
         <source>SHA1-Fingerprint:</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA1-Fingerprint:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.ui" line="335"/>
         <source>MD5-Fingerprint:</source>
-        <translation type="unfinished"></translation>
+        <translation>MD5-Fingerprint:</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslCertificatesInfoWidget.py" line="149"/>
         <source>&lt;not part of the certificate&gt;</source>
-        <translation type="unfinished">&lt;no es parte del certificado&gt;</translation>
+        <translation>&lt;no es parte del certificado&gt;</translation>
     </message>
 </context>
 <context>
@@ -7390,148 +7385,69 @@
     </message>
 </context>
 <context>
-    <name>E5SslInfoDialog</name>
-    <message>
-        <location filename="E5Network/E5SslInfoDialog.ui" line="14"/>
-        <source>SSL Certificate Info</source>
-        <translation type="obsolete">Información del Certificado SSL</translation>
-    </message>
-</context>
-<context>
     <name>E5SslInfoWidget</name>
     <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="17"/>
-        <source>This certificated has been blacklisted.</source>
-        <translation type="obsolete">Este certificado está en una lista negra.</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="24"/>
-        <source>&lt;b&gt;Issued for&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Emitido para&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="118"/>
-        <source>Common Name (CN)</source>
-        <translation type="obsolete">Nombre Común (CN)</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="138"/>
-        <source>Organization (O)</source>
-        <translation type="obsolete">Organización (O)</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="158"/>
-        <source>Organizational Unit (OU)</source>
-        <translation type="obsolete">Unidad Organizacional (OU)</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="91"/>
-        <source>Serialnumber</source>
-        <translation type="obsolete">Número de serie</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="111"/>
-        <source>&lt;b&gt;Issued by&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Emitido por&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="178"/>
-        <source>&lt;b&gt;Validity&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Validez&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="185"/>
-        <source>Issued on</source>
-        <translation type="obsolete">Emitido a</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="205"/>
-        <source>Expires on</source>
-        <translation type="obsolete">Expira en</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="225"/>
-        <source>This certificate is not valid yet or has expired.</source>
-        <translation type="obsolete">Este certificado no es válido aún o ha expirado.</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="232"/>
-        <source>&lt;b&gt;Fingerprints&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Fingerprints&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="239"/>
-        <source>SHA1-Fingerprint</source>
-        <translation type="obsolete">SHA1-Fingerprint</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.ui" line="259"/>
-        <source>MD5-Fingerprint</source>
-        <translation type="obsolete">MD5-Fingerprint</translation>
-    </message>
-    <message>
-        <location filename="E5Network/E5SslInfoWidget.py" line="111"/>
-        <source>&lt;not part of the certificate&gt;</source>
-        <translation type="obsolete">&lt;no es parte del certificado&gt;</translation>
-    </message>
-    <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="56"/>
         <source>Identity</source>
-        <translation type="unfinished">Identidad</translation>
+        <translation>Identidad</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="66"/>
         <source>Warning: this site is NOT carrying a certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Advertencia:este sitio NO tiene ningún certificado.</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="79"/>
         <source>The certificate for this site is valid and has been verified by:
 {0}</source>
-        <translation type="unfinished"></translation>
+        <translation>El certificado para este sitio es válido y ha sido verificado por:
+{0}</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="91"/>
         <source>Certificate Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Información del Certificado</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="105"/>
         <source>Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Encriptación</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="116"/>
         <source>Your connection to &quot;{0}&quot; is NOT encrypted.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>La conexión a &quot;{0}&quot; NO está encriptada.
+</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="125"/>
         <source>Your connection to &quot;{0}&quot; is encrypted.</source>
-        <translation type="unfinished"></translation>
+        <translation>La conexión a &quot;{0}&quot; está encriptada.</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="141"/>
         <source>unknown</source>
-        <translation type="unfinished">desconocido</translation>
+        <translation>desconocido</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="147"/>
         <source>It uses protocol: {0}</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa el protocolo: {0}</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="153"/>
         <source>It is encrypted using {0} at {1} bits, with {2} for message authentication and {3} as key exchange mechanism.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Está encriptado utilizando {0} a {1} bits, con{2} como mensaje de autenticación y {3} como mecanismo de intercambio de claves.
+
+</translation>
     </message>
     <message>
         <location filename="E5Network/E5SslInfoWidget.py" line="84"/>
         <source>The certificate for this site is NOT valid.</source>
-        <translation type="unfinished"></translation>
+        <translation>El certificado para este sitio NO es válido.</translation>
     </message>
 </context>
 <context>
@@ -9513,43 +9429,33 @@
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
-        <source>Extensions of previewable files:</source>
-        <translation type="obsolete">Extensiones de archivos previsualizables:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
-        <source>Enter the filename extensions of files that may be previewed in the web browser (separated by a space)</source>
-        <translation type="obsolete">Introducir las extensiones de nombre de archivo de archivos que pueden ser previsualizados en el navegador web (separados por un espacio)</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="451"/>
         <source>Extensions of HTML files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensiones de archivos HTML:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="458"/>
         <source>Enter the filename extensions of HTML files that may be previewed (separated by a space)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir las extensiones de nombre de archivo para archivos de HTML que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="465"/>
         <source>Extensions of Markdown files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensiones de archivos de Markdown:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="472"/>
         <source>Enter the filename extensions of Markdown files that may be previewed (separated by a space)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir las extensiones de nombre de archivo para archivos de Markdown que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="479"/>
         <source>Extensions of ReST files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensiones de archivos ReST:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorFilePage.ui" line="486"/>
         <source>Enter the filename extensions of ReStructuredText files that may be previewed (separated by a space)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir las extensiones de nombre de archivo para archivos de ReStructuredText que pueden ser previsualizados (separadas por un espacio)</translation>
     </message>
 </context>
 <context>
@@ -16064,16 +15970,6 @@
         <translation>Si la política de caché está establecida a navegación offline, solamente estarán disponibles las páginas en caché local.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/HelpBrowserWV.py" line="490"/>
-        <source>SSL Certificate Info</source>
-        <translation type="obsolete">Información del Certificado SSL</translation>
-    </message>
-    <message>
-        <location filename="Helpviewer/HelpBrowserWV.py" line="490"/>
-        <source>There is no SSL Certificate Info available.</source>
-        <translation type="obsolete">No hay información disponible para el Certificado SSL.</translation>
-    </message>
-    <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="198"/>
         <source>Resending POST request</source>
         <translation>Reenviando solicitud POST</translation>
@@ -16106,12 +16002,12 @@
     <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="503"/>
         <source>SSL Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Información de SSL</translation>
     </message>
     <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="503"/>
         <source>This site does not contain SSL information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este sitio no contiene información SSL.</translation>
     </message>
 </context>
 <context>
@@ -20630,13 +20526,8 @@
     </message>
     <message>
         <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/>
-        <source>Enter the url path of the repository</source>
-        <translation type="obsolete">Introduzca la ruta-url del repositorio</translation>
-    </message>
-    <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/>
         <source>Enter the url path of the repository (without protocol part)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la ruta url del repositorio (sin la parte de protocolo)</translation>
     </message>
 </context>
 <context>
@@ -25932,11 +25823,6 @@
         <translation>&lt;p&gt;Los contenidos de mensajes no se han podido guardar en &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Network/IRC/IrcChannelWidget.py" line="1157"/>
-        <source>Cut</source>
-        <translation type="obsolete">Cortar</translation>
-    </message>
-    <message>
         <location filename="Network/IRC/IrcChannelWidget.py" line="1165"/>
         <source>Copy</source>
         <translation>Copiar</translation>
@@ -26710,11 +26596,6 @@
         <translation>&lt;p&gt;Los contenidos de mensajes no se han podido guardar en &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Network/IRC/IrcNetworkWidget.py" line="398"/>
-        <source>Cut</source>
-        <translation type="obsolete">Cortar</translation>
-    </message>
-    <message>
         <location filename="Network/IRC/IrcNetworkWidget.py" line="392"/>
         <source>Copy</source>
         <translation>Copiar</translation>
@@ -32282,17 +32163,17 @@
     <message>
         <location filename="UI/Previewer.py" line="400"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;No hay vista previa disponible para este tipo de archivo.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="UI/Previewer.py" line="475"/>
         <source>&lt;p&gt;Markdown preview requires the &lt;b&gt;python-markdown&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager or see &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;installation instructions.&lt;/a&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;La previsualización de Markdown requiere el package &lt;b&gt;python-markdown&lt;/b&gt;.&lt;br/&gt;Instalar con el gestor de paquetes o ver &lt;a href=&quot;http://pythonhosted.org/Markdown/install.html&quot;&gt;las instrucciones de instalación.&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="UI/Previewer.py" line="458"/>
         <source>&lt;p&gt;ReStructuredText preview requires the &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Install it with your package manager or see &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;this page.&lt;/a&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;La previsualización de ReStructuredText requiere el package &lt;b&gt;python-docutils&lt;/b&gt; package.&lt;br/&gt;Installar con el gestor de paquetes o ver &lt;a href=&quot;http://pypi.python.org/pypi/docutils&quot;&gt;esta página .&lt;/a&gt;&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -32300,42 +32181,42 @@
     <message>
         <location filename="UI/Previewer.ui" line="37"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation>about:blank</translation>
     </message>
     <message>
         <location filename="UI/Previewer.ui" line="45"/>
         <source>Select to enable JavaScript for HTML previews</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para habilitar JavaScript para las previsualizaciones de HTML</translation>
     </message>
     <message>
         <location filename="UI/Previewer.ui" line="48"/>
         <source>Enable JavaScript</source>
-        <translation type="unfinished">Habilitar JavaScript</translation>
+        <translation>Habilitar JavaScript</translation>
     </message>
     <message>
         <location filename="UI/Previewer.ui" line="55"/>
         <source>Select to enable support for Server Side Includes</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar para habilitar soporte para includes del lado del Servidor</translation>
     </message>
     <message>
         <location filename="UI/Previewer.ui" line="58"/>
         <source>Enable Server Side Includes</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar Includes del lado del Servidor</translation>
     </message>
     <message>
         <location filename="UI/Previewer.py" line="266"/>
         <source>Preview - {0}</source>
-        <translation type="unfinished"></translation>
+        <translation>Previsualizar - {0}</translation>
     </message>
     <message>
         <location filename="UI/Previewer.py" line="268"/>
         <source>Preview</source>
-        <translation type="unfinished">Vista Previa</translation>
+        <translation>Vista Previa</translation>
     </message>
     <message>
         <location filename="UI/Previewer.py" line="227"/>
         <source>&lt;p&gt;No preview available for this type of file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;No hay vista previa disponible para este tipo de archivo.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -40400,8 +40281,8 @@
         <location filename="Snapshot/SnapshotTimer.py" line="99"/>
         <source>Snapshot will be taken in %n seconds</source>
         <translation>
+            <numerusform>El pantallazo se tomará en %n segundo</numerusform>
             <numerusform>El pantallazo se tomará en %n segundos</numerusform>
-            <numerusform></numerusform>
         </translation>
     </message>
 </context>
@@ -43565,11 +43446,6 @@
         <translation>Seleccionar Directorio del Proyecto</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="68"/>
-        <source>Enter the url path of the module in the repository</source>
-        <translation type="obsolete">Introducir la ruta url del módulo en el repositorio</translation>
-    </message>
-    <message>
         <location filename="Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="71"/>
         <source>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</source>
         <translation>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Introduzca la URL del módulo. Para un repositorio con disposición estándar, no debe contener la parte trunk, tags o branches.&lt;/p&gt;</translation>
@@ -43592,7 +43468,7 @@
     <message>
         <location filename="Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="68"/>
         <source>Enter the url path of the module in the repository (without protocol part)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la ruta url del módulo en el repositorio (sin la parte de protocolo)</translation>
     </message>
 </context>
 <context>
@@ -43679,11 +43555,6 @@
         <translation>Seleccionar la url del repositorio a traves de un diálogo de selección de directorio o del navegador de repositorios</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="107"/>
-        <source>Enter the url path of the module in the repository</source>
-        <translation type="obsolete">Introducir la ruta url del módulo en el repositorio</translation>
-    </message>
-    <message>
         <location filename="Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="110"/>
         <source>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</source>
         <translation>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Introduzca la URL del módulo. Para un repositorio con disposición estándar, no debe contener la parte trunk, tags o branches.&lt;/p&gt;</translation>
@@ -43696,7 +43567,7 @@
     <message>
         <location filename="Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="107"/>
         <source>Enter the url path of the module in the repository (without protocol part)</source>
-        <translation type="unfinished"></translation>
+        <translation>Introducir la ruta url del módulo en el repositorio (sin la parte de protocolo)</translation>
     </message>
 </context>
 <context>
@@ -56916,11 +56787,6 @@
 <context>
     <name>eric5</name>
     <message>
-        <location filename="eric5.py" line="248"/>
-        <source>Importing packages...</source>
-        <translation type="obsolete">Importando paquetes...</translation>
-    </message>
-    <message>
         <location filename="eric5.py" line="253"/>
         <source>Generating Main Window...</source>
         <translation>Generando Ventana Principal...</translation>
@@ -56928,7 +56794,7 @@
     <message>
         <location filename="eric5.py" line="248"/>
         <source>Starting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Comenzando...</translation>
     </message>
 </context>
 <context>

eric ide

mercurial