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

qgis · Jun 12, 2012 · f276fde · f276fde
2 parents ef60f81 + e85d9b8
commit f276fde
Show file tree

Hide file tree

Showing 64 changed files with 31,176 additions and 28,197 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS b/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

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/doc/news.t2t b/doc/news.t2t
@@ -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

diff --git a/i18n/qgis_af.ts b/i18n/qgis_af.ts
diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_bg.ts b/i18n/qgis_bg.ts
diff --git a/i18n/qgis_ca_ES.ts b/i18n/qgis_ca_ES.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_da_DK.ts b/i18n/qgis_da_DK.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
@@ -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>
@@ -14616,11 +14624,11 @@ Should the existing classes be deleted before classification?</source>
     </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
@@ -23089,6 +23097,14 @@ http://my.host.com/cgi-bin/mapserv.exe</translation>
         <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>
@@ -26559,7 +26575,7 @@ Tiene que reiniciar Quantum GIS para recargarlo.</translation>
     </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>
@@ -26674,11 +26690,11 @@ Tiene que reiniciar Quantum GIS para recargarlo.</translation>
     </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>
@@ -33516,7 +33532,8 @@ Should the existing classes be deleted before classification?</source>
     <message>
         <source>Commit errors:
   %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Errores al acometer:
+  %1</translation>
     </message>
 </context>
 <context>