Merge remote-tracking branch 'upstream/master'

qgis · Apr 10, 2013 · e3451bb · e3451bb
2 parents 76f8d60 + 212aea7
commit e3451bb
Show file tree

Hide file tree

Showing 102 changed files with 6,434 additions and 4,100 deletions.
diff --git a/cmake/FindOSGEARTH.cmake b/cmake/FindOSGEARTH.cmake
@@ -44,6 +44,7 @@ ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_
 
 FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR   osgEarth/Common )
 FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR       osgEarth/TileSource )
+FIND_OSGEARTH_INCLUDE( OSGEARTH_ELEVATION_QUERY   osgEarth/ElevationQuery )
 
 ###### libraries ######
 

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -1,7 +1,7 @@
 <style>table {font-size:80%;}th {text-align:left; }.bartodo{ background-color:red;width:100px;height:20px;}.bardone{ background-color:green;width:80px;height:20px;font-size:80%;text-align:center;padding-top:4px;height:16px;color:white;}</style><table><tr><th colspan="2" style="width:250px;">Language</th><th>Finished %</th><th>Translators</th></tr>
 
-<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9357 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.5</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
 <tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:9333 unfinished:32 untranslated:37" class="bartodo"><div class="bardone" style="width:99px">99.4</div></div></td><td>Xan Vieiro</td></tr>
+<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9329 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.2</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
 <tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:9043 unfinished:1 untranslated:3" class="bartodo"><div class="bardone" style="width:96px">96.2</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
 <tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:8438 unfinished:22 untranslated:58" class="bartodo"><div class="bardone" style="width:89px">89.9</div></div></td><td>Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo</td></tr>
 <tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7975 unfinished:28 untranslated:515" class="bartodo"><div class="bardone" style="width:84px">85.0</div></div></td><td>Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla</td></tr>

diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/images/images.qrc b/images/images.qrc
@@ -545,6 +545,8 @@
         <file>themes/gis/mIconSelectAdd.svg</file>
         <file>themes/gis/mIconSelectIntersect.svg</file>
         <file>themes/gis/mIconSelectRemove.svg</file>
+        <file>themes/gis/mIconSelected.svg</file>
+        <file>themes/gis/mIconDeselected.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>