Mercurial Repositories > eric / changeset
changeset
Merged Spanish translations update and released them.
Sat, 05 Sep 2015 12:01:13 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 05 Sep 2015 12:01:13 +0200
- changeset 4432
- 340f8d23aa6d
- parent 4425
- 2f51c66b3120 (diff)
- parent 4431
- cf9fe740a8ad (current diff)
- child 4434
- 8ba11cf46483
Merged Spanish translations update and released them.
| i18n/eric6_es.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric6_es.ts | file | annotate | diff | comparison | revisions |
--- a/DataViews/CodeMetrics.py Thu Sep 03 11:20:40 2015 +0200 +++ b/DataViews/CodeMetrics.py Sat Sep 05 12:01:13 2015 +0200 @@ -244,9 +244,13 @@ stats.inc('nloc') elif tok.type == COMMENT: stats.inc('comments') + if tok.line.strip() == tok.text: + stats.inc('commentlines') elif tok.type == EMPTY: if parser.tokenlist[idx - 1].type == token.OP: stats.inc('nloc') + elif parser.tokenlist[idx - 1].type == COMMENT: + continue else: stats.inc('empty') elif tok.type == INDENT: @@ -261,6 +265,8 @@ summarize(total, 'lines', parser.lines) summarize(total, 'bytes', len(text)) summarize(total, 'comments', stats.getCounter('TOTAL ', 'comments')) + summarize(total, 'commentlines', + stats.getCounter('TOTAL ', 'commentlines')) summarize(total, 'empty lines', stats.getCounter('TOTAL ', 'empty')) summarize(total, 'non-commentary lines', stats.getCounter('TOTAL ', 'nloc'))
--- a/DataViews/CodeMetricsDialog.py Thu Sep 03 11:20:40 2015 +0200 +++ b/DataViews/CodeMetricsDialog.py Sat Sep 05 12:01:13 2015 +0200 @@ -75,9 +75,13 @@ @param values values to be displayed (list) @return the generated item """ - itm = QTreeWidgetItem(parent) - for col in range(len(values)): - itm.setData(col, Qt.DisplayRole, values[col]) + data = [values[0]] + for value in values[1:]: + try: + data.append("{0:5}".format(int(value))) + except ValueError: + data.append(value) + itm = QTreeWidgetItem(parent, data) for col in range(1, 7): itm.setTextAlignment(col, Qt.Alignment(Qt.AlignRight)) return itm @@ -186,8 +190,6 @@ self.__resizeResultColumns() # now do the summary stuff - docstrings = total['lines'] - total['comments'] - \ - total['empty lines'] - total['non-commentary lines'] self.__createSummaryItem(self.tr("files"), loc.toString(total['files'])) self.__createSummaryItem(self.tr("lines"), @@ -196,12 +198,12 @@ loc.toString(total['bytes'])) self.__createSummaryItem(self.tr("comments"), loc.toString(total['comments'])) + self.__createSummaryItem(self.tr("comment lines"), + loc.toString(total['commentlines'])) self.__createSummaryItem(self.tr("empty lines"), loc.toString(total['empty lines'])) self.__createSummaryItem(self.tr("non-commentary lines"), loc.toString(total['non-commentary lines'])) - self.__createSummaryItem(self.tr("documentation lines"), - loc.toString(docstrings)) self.__resizeSummaryColumns() self.__finish() @@ -216,7 +218,7 @@ """ counters = stats.counters.get(identifier, {}) v = [] - for key in ('start', 'end', 'lines', 'nloc', 'comments', 'empty'): + for key in ('start', 'end', 'lines', 'nloc', 'commentlines', 'empty'): if counters.get(key, 0): v.append(loc.toString(counters[key])) else:
--- a/Plugins/PluginSyntaxChecker.py Thu Sep 03 11:20:40 2015 +0200 +++ b/Plugins/PluginSyntaxChecker.py Sat Sep 05 12:01:13 2015 +0200 @@ -84,7 +84,7 @@ lambda: [], # No options lambda: ['.js'], lambda fn, problems: - self.syntaxCheckService.syntaxChecked.emit(fn, problems), # __IGNORE_WARNING__ + self.syntaxCheckService.syntaxChecked.emit(fn, problems), self.syntaxCheckService.serviceErrorJavaScript) def __initialize(self):
--- a/i18n/eric6_es.ts Thu Sep 03 11:20:40 2015 +0200 +++ b/i18n/eric6_es.ts Sat Sep 05 12:01:13 2015 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es"> +<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1906,8 +1905,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="151"/> @@ -1980,8 +1979,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>Abrir en Nueva &Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Abrir en Nueva &Pestaña<byte value="x9"/>Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="104"/> @@ -2855,39 +2854,34 @@ <translation>Muestra el progreso del cálculo de métricas</translation> </message> <message> - <location filename="../DataViews/CodeMetricsDialog.py" line="191"/> + <location filename="../DataViews/CodeMetricsDialog.py" line="193"/> <source>files</source> <translation>archivos</translation> </message> <message> - <location filename="../DataViews/CodeMetricsDialog.py" line="193"/> - <source>lines</source> - <translation>líneas</translation> - </message> - <message> <location filename="../DataViews/CodeMetricsDialog.py" line="195"/> - <source>bytes</source> - <translation>bytes</translation> + <source>lines</source> + <translation>líneas</translation> </message> <message> <location filename="../DataViews/CodeMetricsDialog.py" line="197"/> - <source>comments</source> - <translation>comentarios</translation> + <source>bytes</source> + <translation>bytes</translation> </message> <message> <location filename="../DataViews/CodeMetricsDialog.py" line="199"/> - <source>empty lines</source> - <translation>líneas vacias</translation> - </message> - <message> - <location filename="../DataViews/CodeMetricsDialog.py" line="201"/> - <source>non-commentary lines</source> - <translation>líneas no comentadas</translation> + <source>comments</source> + <translation>comentarios</translation> </message> <message> <location filename="../DataViews/CodeMetricsDialog.py" line="203"/> - <source>documentation lines</source> - <translation>líneas de documentación</translation> + <source>empty lines</source> + <translation>lineas vacías</translation> + </message> + <message> + <location filename="../DataViews/CodeMetricsDialog.py" line="205"/> + <source>non-commentary lines</source> + <translation>líneas no comentadas</translation> </message> <message> <location filename="../DataViews/CodeMetricsDialog.py" line="52"/> @@ -2919,6 +2913,11 @@ <source>%v/%m Files</source> <translation>%v/%m Archivos</translation> </message> + <message> + <location filename="../DataViews/CodeMetricsDialog.py" line="201"/> + <source>comment lines</source> + <translation>líneas de documentación</translation> + </message> </context> <context> <name>CodeStyleCheckerDialog</name> @@ -16157,7 +16156,7 @@ <name>HelpBrowser</name> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1175"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Abrir enlace en Nueva Pestaña Ctrl+LMB (botón izquierdo del ratón)</translation> </message> <message> @@ -17441,11 +17440,6 @@ <translation>Seleccionar para habilitar plugins en páginas web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="260"/> - <source>Enable Plugins</source> - <translation type="obsolete">Habilitar Plugins</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="456"/> <source>Browser Cache</source> <translation>Caché del navegador</translation> @@ -19315,16 +19309,6 @@ <translation>VirusTotal</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1839"/> - <source><h2>File search</h2><p>In order to search for the last VirusTotal report on a given file just enter its hash. Currently the allowed hashes are MD5, SHA1 and SHA256. You can also search for a particular file report by typing in its permalink id.</p><h2>URL search</h2><p>URL searches are simple, just type in the given URL, the application will normalize it and compare it with the entries in VirusTotal's database. Alternatively you may enter the MD5 hash of an URL preceded by "url:", e.g. url:7f911bbcf618f052ac6b9928600d2820.</p><h2>User search</h2><p>Do you want to know whether a friend has a VT Community account? Simply type in his nick preceded by the symbol "@", e.g. @EmilianoMartinez.</p><h2>Search through comments</h2><p>The comments in VT Community may often help in disinfecting your PC or may proof themselves useful when analysing a particular malware sample, comment tags enable users to search through the VT Community reviews. The standard file tags are: {0} The standard URL tags are: {1}User generated tags are preceded by the symbol "#", e.g. #disinfect.</p></source> - <translation type="obsolete"><h2>Búsqueda de archivo</h2><p>Para buscar el último informe de VirusTotal en un archivo dado, solamente introduzca su hash. Los hashes permitidos actualmente son MD5, SHA1 y SHA256. Tambien puede buscar un informe para un archivo concreto introduciendo su permalink id.</p><h2>Búsqueda de URL</h2><p>Las búsquedas de URL son sencillas, simplemente introduzca la URL concreta, la aplicación la normalizará y comparará contra las entradas en la base de datos de VirusTotal. Alternativamente se puede introducir el hash MD5 de una URL precedido por "url:", por ejemplo url:7f911bbcf618f052ac6b9928600d2820.</p><h2>Búsqueda de Usuario</h2><p>¿Desea saber si un amigo tiene cuenta Community de VT? Simplemente teclee su nick precedido por el símbolo "@",por ejemplo. @EmilianoMartinez.</p><h2>Búsqueda a través de comentarios</h2><p>Los comentarios en la Comunidad de VT pueden a menudo ser útiles en la desinfección de su PC, o bien pueden demostrar su utilidad al analizar una muestra en particular de malware, las etiquetas de comentario habilitan a los usuarios a través de las revisiones de la Comunidad de VT. Las etiquetas estándar de archivo son: {0} Las etiquetas estándar de URL son: {1} Las etiquetas generadas por los usuarios se preceden del símbolo "#", por ejemplo. #disinfect.</p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1887"/> - <source>Search VirusTotal</source> - <translation type="obsolete">Buscar VirusTotal</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1882"/> <source>Scan current site</source> <translation>Analizar sitio actual</translation> @@ -34219,16 +34203,6 @@ <translation>Al terminar una descarga con éxito</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="173"/> - <source>HTTP-Proxy:</source> - <translation type="obsolete">HTTP-Proxy:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="223"/> - <source>HTTPS-Proxy:</source> - <translation type="obsolete">HTTPS-Proxy:</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="291"/> <source>FTP-Proxy</source> <translation>FTP-Proxy</translation> @@ -58581,11 +58555,6 @@ <translation>Asis&tentes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3317"/> - <source>&Tools</source> - <translation type="obsolete">&Herramientas</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2444"/> <source>Select Tool Group</source> <translation>Seleccionar Grupo de Herramientas</translation> @@ -64261,11 +64230,6 @@ <translation>Se ha alcanzado el límite de solicitudes.</translation> </message> <message> - <location filename="../Helpviewer/VirusTotalApi.py" line="90"/> - <source>Invalid key given.</source> - <translation type="obsolete">Se ha proporcionado una clave no válida.</translation> - </message> - <message> <location filename="../Helpviewer/VirusTotal/VirusTotalApi.py" line="101"/> <source>Requested item is not present.</source> <translation>El elemento solicitado no está presente.</translation>
