Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into wmts

  • Loading branch information
jef-n committed Jun 12, 2012
2 parents ef60f81 + e85d9b8 commit f276fdee6cec17e24b0e354e4f54733d3f42a805
Showing with 31,176 additions and 28,197 deletions.
  1. +2,383 −0 ChangeLog
  2. +6 −6 NEWS
  3. +47 −47 doc/TRANSLATORS
  4. +3 −3 doc/news.t2t
  5. +653 −649 i18n/qgis_af.ts
  6. +653 −649 i18n/qgis_ar.ts
  7. +653 −649 i18n/qgis_bg.ts
  8. +652 −652 i18n/qgis_ca_ES.ts
  9. +530 −513 i18n/qgis_cs_CZ.ts
  10. +649 −649 i18n/qgis_da_DK.ts
  11. +370 −366 i18n/qgis_de.ts
  12. +657 −641 i18n/qgis_el_GR.ts
  13. +25 −8 i18n/qgis_es.ts
  14. +424 −411 i18n/qgis_et_EE.ts
  15. +654 −646 i18n/qgis_fa.ts
  16. +653 −649 i18n/qgis_fi.ts
  17. +662 −638 i18n/qgis_fr.ts
  18. +431 −430 i18n/qgis_gl_ES.ts
  19. +652 −652 i18n/qgis_he.ts
  20. +657 −637 i18n/qgis_hr_HR.ts
  21. +530 −513 i18n/qgis_hu.ts
  22. +661 −637 i18n/qgis_id.ts
  23. +653 −649 i18n/qgis_is.ts
  24. +545 −521 i18n/qgis_it.ts
  25. +436 −423 i18n/qgis_ja.ts
  26. +655 −643 i18n/qgis_ka_GE.ts
  27. +1,997 −1,919 i18n/qgis_ko_KR.ts
  28. +652 −652 i18n/qgis_lo.ts
  29. +652 −652 i18n/qgis_lt.ts
  30. +118 −110 i18n/qgis_lv.ts
  31. +657 −649 i18n/qgis_mn.ts
  32. +5 −1 i18n/qgis_nl.ts
  33. +652 −652 i18n/qgis_no.ts
  34. +685 −656 i18n/qgis_pl_PL.ts
  35. +435 −422 i18n/qgis_pt_BR.ts
  36. +661 −637 i18n/qgis_pt_PT.ts
  37. +652 −652 i18n/qgis_ro.ts
  38. +541 −521 i18n/qgis_ru.ts
  39. +655 −643 i18n/qgis_sk.ts
  40. +661 −637 i18n/qgis_sl_SI.ts
  41. +652 −652 i18n/qgis_sq_AL.ts
  42. +657 −637 i18n/qgis_sr_CS-Latn.ts
  43. +655 −643 i18n/qgis_sv.ts
  44. +652 −652 i18n/qgis_ta.ts
  45. +657 −637 i18n/qgis_th.ts
  46. +659 −643 i18n/qgis_tr.ts
  47. +657 −637 i18n/qgis_uk.ts
  48. +656 −640 i18n/qgis_vi.ts
  49. +652 −652 i18n/qgis_xh.ts
  50. +652 −652 i18n/qgis_zh_CN.ts
  51. +655 −643 i18n/qgis_zh_TW.ts
  52. +0 −5 python/plugins/GdalTools/GdalTools.py
  53. +1 −1 python/plugins/db_manager/__init__.py
  54. +10 −4 python/plugins/db_manager/db_plugins/plugin.py
  55. +3 −1 python/plugins/db_manager/dlg_add_geometry_column.py
  56. +3 −1 python/plugins/db_manager/dlg_create_table.py
  57. +1 −1 python/plugins/db_manager/dlg_import_vector.py
  58. +2 −2 scripts/tsstat.pl
  59. +6 −5 src/app/composer/qgscomposer.cpp
  60. +12 −3 src/app/qgisapp.cpp
  61. +2 −0 src/core/qgsproviderregistry.cpp
  62. +9 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  63. +3 −1 src/providers/postgres/qgspostgresprovider.cpp
  64. +3 −0 src/ui/qgisapp.ui
2,383 ChangeLog

Large diffs are not rendered by default.

12 NEWS
@@ -1,6 +1,6 @@
Quantum GIS (QGIS) News
Change history for the QGIS Project
Saturday May 26, 2012
Tuesday June 12, 2012


------------------------------------------------------------------------
@@ -58,8 +58,8 @@ Saturday May 26, 2012
------------------------------------------------------------------------


Last Updated: Saturday May 26, 2012
Last Change : Saturday May 26, 2012
Last Updated: Tuesday June 12, 2012
Last Change : Tuesday June 12, 2012


1. Whats new in Version 1.8.0 'Lisboa'?
@@ -83,7 +83,7 @@ key new features.
- Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
- Offset Curves - a new digitising tool for creating offset curves was added.
- Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking coloured relief maps.
- Ellipse renderer symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows to set all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows to set all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- New scale selector with predefined scales
- Option to add layers to selected or active group
- Pan To Selected tool
@@ -230,8 +230,8 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
4. Whats new in Version 1.7.0 'Wroclaw'?
========================================

This release is named after the town of Wrocław in Poland. The Department of
Climatology and Atmosphere Protection, University of Wrocław kindly hosted our
This release is named after the town of Wroclaw in Poland. The Department of
Climatology and Atmosphere Protection, University of Wroclaw kindly hosted our
developer meeting in November 2010. Please note that this is a release in
our 'cutting edge' release series. As such it contains new features and extends
the programmatic interface over QGIS 1.0.x and QGIS 1.6.0. As with any

Large diffs are not rendered by default.

@@ -58,7 +58,7 @@ key new features.
- Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
- Offset Curves - a new digitising tool for creating offset curves was added.
- Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking coloured relief maps.
- Ellipse renderer symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows to set all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows to set all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
- New scale selector with predefined scales
- Option to add layers to selected or active group
- Pan To Selected tool
@@ -205,8 +205,8 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]

=Whats new in Version 1.7.0 'Wroclaw'?=

This release is named after the town of Wrocław in Poland. The Department of
Climatology and Atmosphere Protection, University of Wrocław kindly hosted our
This release is named after the town of Wroclaw in Poland. The Department of
Climatology and Atmosphere Protection, University of Wroclaw kindly hosted our
developer meeting in November 2010. Please note that this is a release in
our 'cutting edge' release series. As such it contains new features and extends
the programmatic interface over QGIS 1.0.x and QGIS 1.6.0. As with any

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -7365,7 +7365,7 @@ Probablemente está viendo este mensaje porque no tiene establecida la variable
</message>
<message>
<source>INGRES</source>
<translation>INGRES</translation>
<translation type="obsolete">INGRES</translation>
</message>
<message>
<source>MySQL</source>
@@ -7869,6 +7869,10 @@ Error(%2): %3</translation>
<source>Creation of OGR data source %1 failed: %2</source>
<translation>Falló la creación de la fuente de datos OGR %1: %2</translation>
</message>
<message>
<source>Ingres</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QextSerialPort</name>
@@ -9762,7 +9766,7 @@ Por favor, contacte con los desarrolladores.</translation>
</message>
<message>
<source>&amp;Window</source>
<translation>&amp;Ventana</translation>
<translation type="obsolete">&amp;Ventana</translation>
</message>
<message>
<source>
@@ -10616,6 +10620,10 @@ Esta copia de QGIS se ha creado sin capacidad para SpatialLite.</translation>
<source>Cannot read style: %1</source>
<translation>No se puede leer el estilo: %1</translation>
</message>
<message>
<source>Window</source>
<translation>Ventana</translation>
</message>
</context>
<context>
<name>QgisAppBase</name>
</message>
<message>
<source>inverse transform</source>
<translation type="unfinished"></translation>
<translation>transformación inversa</translation>
</message>
<message>
<source>forward transform</source>
<translation type="unfinished"></translation>
<translation>transformación hacia adelante</translation>
</message>
<message>
<source>%1 of
<source>Sum</source>
<translation>Suma</translation>
</message>
<message>
<source>Skip attribute</source>
<translation>Omitir atributo</translation>
</message>
<message>
<source>Skipped</source>
<translation>Omitido</translation>
</message>
</context>
<context>
<name>QgsMergeAttributesDialogBase</name>
</message>
<message>
<source>You are about to add several plugin repositories that are neither authorized nor supported by the Quantum GIS team. Plugin authors generally make efforts to ensure that their work is useful and safe, however, we can assume no responsibility for them.</source>
<translation>Está a punto de añadir varios repositorios de complementos que no están autorizados ni mantenidos por el equipo de Quantum GIS. Los autores de complementos normalmente hacen esfuerzos para asegurar que su trabajo es útil y seguro, sin embargo, no podemos asumir ninguna responsabilidad por ellos.</translation>
<translation type="obsolete">Está a punto de añadir varios repositorios de complementos que no están autorizados ni mantenidos por el equipo de Quantum GIS. Los autores de complementos normalmente hacen esfuerzos para asegurar que su trabajo es útil y seguro, sin embargo, no podemos asumir ninguna responsabilidad por ellos.</translation>
</message>
</context>
<context>
</message>
<message>
<source>Add third party plugin repositories to the list</source>
<translation>Añadir repositorios de terceros a la lista</translation>
<translation type="obsolete">Añadir repositorios de terceros a la lista</translation>
</message>
<message>
<source>Add 3rd party repositories</source>
<translation>Añadir repositorios de terceros</translation>
<translation type="obsolete">Añadir repositorios de terceros</translation>
</message>
<message>
<source>Add a new plugin repository</source>
<message>
<source>Commit errors:
%1</source>
<translation type="unfinished"></translation>
<translation>Errores al acometer:
%1</translation>
</message>
</context>
<context>

0 comments on commit f276fde

Please sign in to comment.
You can’t perform that action at this time.