Mercurial Repositories > eric / changeset
changeset
Merged with branch 'eric7' to prepare a new release.
Sat, 01 Jan 2022 14:34:29 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 01 Jan 2022 14:34:29 +0100
- branch
- eric7-maintenance
- changeset 8890
- 7b0f8a130d97
- parent 8803
- a46ff6e14264 (diff)
- parent 8889
- 0fe88de52cb2 (current diff)
- child 8891
- 6f8ad0bce8ae
Merged with branch 'eric7' to prepare a new release.
--- a/.hgtags Fri Dec 31 18:33:11 2021 +0100 +++ b/.hgtags Sat Jan 01 14:34:29 2022 +0100 @@ -25,3 +25,4 @@ 7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1 8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11 112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1 +7d6fc4ad380c16efaf86736760aab70c7c30e550 release-21.12
--- a/eric7/i18n/eric7_es.ts Fri Dec 31 18:33:11 2021 +0100 +++ b/eric7/i18n/eric7_es.ts Sat Jan 01 14:34:29 2022 +0100 @@ -18291,10 +18291,8 @@ <source>Generate QtHelp collection files</source> <translation>Generar colección de archivos de QtHelp</translation> </message> - <message> <source>Style sheet (*.css);;All files (*)</source> <translation type="vanished">Hojas de estilos (*.css);; Todos los archivos (*)</translation> - </message> </context> <context> <name>EricdocExecDialog</name>
