Merge branch 'master' into heatmap_kernels

qgis · Mar 17, 2013 · bf45cb2 · bf45cb2
2 parents ec01afb + 9a81fa7
commit bf45cb2
Show file tree

Hide file tree

Showing 157 changed files with 15,480 additions and 3,768 deletions.
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:9047 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:98px">99.0</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:98px">98.9</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
-<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9040 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:98px">98.9</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:8530 unfinished:170 untranslated:347" class="bartodo"><div class="bardone" style="width:94px">94.2</div></div></td><td>Xan Vieiro</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:92px">92.4</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:87px">87.4</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
@@ -186,6 +186,10 @@
         <file>themes/default/mActionZoomOut.png</file>
         <file>themes/default/mActionZoomToLayer.png</file>
         <file>themes/default/mActionZoomToSelected.png</file>
+        <file>themes/default/mActionIncreaseBrightness.svg</file>
+        <file>themes/default/mActionDecreaseBrightness.svg</file>
+        <file>themes/default/mActionIncreaseContrast.svg</file>
+        <file>themes/default/mActionDecreaseContrast.svg</file>
         <file>themes/default/mIconClose.png</file>
         <file>themes/default/mIconCollapse.png</file>
         <file>themes/default/mIconConnect.png</file>
@@ -406,6 +410,10 @@
         <file>themes/gis/mActionZoomOut.png</file>
         <file>themes/gis/mActionZoomToLayer.png</file>
         <file>themes/gis/mActionZoomToSelected.png</file>
+        <file>themes/gis/mActionIncreaseBrightness.svg</file>
+        <file>themes/gis/mActionDecreaseBrightness.svg</file>
+        <file>themes/gis/mActionIncreaseContrast.svg</file>
+        <file>themes/gis/mActionDecreaseContrast.svg</file>
         <file>themes/gis/mIconClose.png</file>
         <file>themes/gis/mIconEditable.png</file>
         <file>themes/gis/mIconEditableEdits.png</file>