Merge branch 'master' into colour_functions

INSTALL

@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Sunday April 07, 2013
+Wednesday April 24, 2013
 
 
-Last Updated: Sunday April 07, 2013
 Last Change : Saturday December 08, 2012
+Last Updated: Wednesday April 24, 2013
 
 
   1. Introduction
@@ -1312,6 +1312,10 @@ Double-click the source tarball to unpack it, then cd to the source folder and:
     5.3.1. Optional setup: ccache
     =============================
 
+Xcode 4.4+ note: You will probably not need to install ccache if you are using
+the clang frontend to LLVM compiler, a setup that already provides fairly quick
+compile times.
+
 Setup ccache to significantly speed up compile times after initial build.
 (Switching git branches will again cause longer initial build times unless
 separate build directories are used for each branch.)
@@ -1885,8 +1889,8 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
   -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
   -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
   -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
-  -D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
-  -D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
+  -D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
+  -D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
   -D BISON_EXECUTABLE=/usr/local/bin/bison \
   ..
 
@@ -1900,11 +1904,11 @@ After the initial Terminal configure, you can use ccmake to make further changes
 
 This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.  Remember to change the Qwt version if a
-different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
-installs as a framework, use:
+different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
+as a framework use:
 
-  -D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
-  -D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
+  -D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
+  -D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
 
 If you want to use a newer PostgreSQL client than the default Mac OS X version,
 e.g. install from kyngchaos.com, set the following option to pg_config's path:

doc/INSTALL.html

@@ -77,13 +77,13 @@ label{  background-color: #FFFFCC;
 <DIV CLASS="header" ID="header">
 <H1>Quantum GIS (QGIS)</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Sunday April 07, 2013</H3>
+<H3>Wednesday April 24, 2013</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Sunday April 07, 2013
 Last Change : Saturday December 08, 2012
+Last Updated: Wednesday April 24, 2013
 </P>
 <DIV CLASS="toc">
 
@@ -1857,6 +1857,11 @@ sudo make install
 
 <H3>5.3.1. Optional setup: ccache</H3>
 
+<P>
+<U>Xcode 4.4+ note:</U> You will probably not need to install ccache if you are using
+the clang frontend to LLVM compiler, a setup that already provides fairly quick
+compile times.
+</P>
 <P>
 Setup ccache to significantly speed up compile times after initial build.
 (Switching git branches will again cause longer initial build times unless
@@ -2642,8 +2647,8 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
 -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
 -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
 -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
--D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
--D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
+-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
+-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
 -D BISON_EXECUTABLE=/usr/local/bin/bison \
 ..
 </PRE></div>
@@ -2664,13 +2669,13 @@ ccmake ..
 <P>
 This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.  Remember to change the Qwt version if a
-different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
-installs as a framework, use:
+different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
+as a framework use:
 </P>
 
 <div class="code"><PRE>
--D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
--D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
+-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
+-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
 </PRE></div>
 
 <P>

doc/TRANSLATORS

@@ -1,48 +1,49 @@
 <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:9305 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">100.0</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:9175 unfinished:54 untranslated:76" class="bartodo"><div class="bardone" style="width:98px">98.9</div></div></td><td>Xan Vieiro</td></tr>
-<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:8837 unfinished:171 untranslated:297" class="bartodo"><div class="bardone" style="width:95px">95.9</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:7558 unfinished:669 untranslated:1078" class="bartodo"><div class="bardone" style="width:84px">84.8</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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7014 unfinished:908 untranslated:1383" class="bartodo"><div class="bardone" style="width:80px">80.2</div></div></td><td>Veiko Viil</td></tr>
-<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7106 unfinished:664 untranslated:1535" class="bartodo"><div class="bardone" style="width:79px">79.9</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>
-<tr><td><img src="qrc:/images/flags/sv.png"></td><td>Swedish</td><td><div title="finished:6570 unfinished:1522 untranslated:1213" class="bartodo"><div class="bardone" style="width:78px">78.8</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
-<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:6759 unfinished:1030 untranslated:1516" class="bartodo"><div class="bardone" style="width:78px">78.2</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
-<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:6587 unfinished:1077 untranslated:1641" class="bartodo"><div class="bardone" style="width:76px">76.6</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
-<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:6585 unfinished:1042 untranslated:1678" class="bartodo"><div class="bardone" style="width:76px">76.4</div></div></td><td>Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert</td></tr>
-<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:6587 unfinished:1013 untranslated:1705" class="bartodo"><div class="bardone" style="width:76px">76.2</div></div></td><td>Arthur Nanni</td></tr>
-<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:6587 unfinished:948 untranslated:1770" class="bartodo"><div class="bardone" style="width:75px">75.9</div></div></td><td>Artem Popov</td></tr>
-<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:6587 unfinished:937 untranslated:1781" class="bartodo"><div class="bardone" style="width:75px">75.8</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
-<tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:6512 unfinished:1079 untranslated:1714" class="bartodo"><div class="bardone" style="width:75px">75.8</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
-<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:6448 unfinished:1044 untranslated:1813" class="bartodo"><div class="bardone" style="width:74px">74.9</div></div></td><td>Zoltan Siki</td></tr>
-<tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:6391 unfinished:997 untranslated:1917" class="bartodo"><div class="bardone" style="width:74px">74.0</div></div></td><td>BJ Jang</td></tr>
-<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:6072 unfinished:892 untranslated:2341" class="bartodo"><div class="bardone" style="width:70px">70.0</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
-<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:5738 unfinished:903 untranslated:2664" class="bartodo"><div class="bardone" style="width:66px">66.5</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
-<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5200 unfinished:1175 untranslated:2930" class="bartodo"><div class="bardone" style="width:62px">62.2</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
-<tr><td><img src="qrc:/images/flags/sr_Latn.png"></td><td>Serbian ()</td><td><div title="finished:5106 unfinished:1321 untranslated:2879" class="bartodo"><div class="bardone" style="width:61px">62.0</div></div></td><td>Goran Ivanković</td></tr>
-<tr><td><img src="qrc:/images/flags/sr_Cyrl.png"></td><td>Serbian ()</td><td><div title="finished:5135 unfinished:1217 untranslated:2954" class="bartodo"><div class="bardone" style="width:61px">61.7</div></div></td><td>Goran Ivanković</td></tr>
-<tr><td><img src="qrc:/images/flags/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:3076 unfinished:5071 untranslated:1158" class="bartodo"><div class="bardone" style="width:60px">60.3</div></div></td><td>Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva</td></tr>
-<tr><td><img src="qrc:/images/flags/km.png"></td><td>Central Khmer</td><td><div title="finished:1992 unfinished:6807 untranslated:506" class="bartodo"><div class="bardone" style="width:57px">58.0</div></div></td><td>Khoem Sokhem</td></tr>
-<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4309 unfinished:1274 untranslated:3722" class="bartodo"><div class="bardone" style="width:53px">53.1</div></div></td><td>Januar V. Simarmata, I Made Anombawa</td></tr>
-<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4374 unfinished:982 untranslated:3949" class="bartodo"><div class="bardone" style="width:52px">52.3</div></div></td><td>Zoran Jankovic</td></tr>
-<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:3658 unfinished:1463 untranslated:4184" class="bartodo"><div class="bardone" style="width:47px">47.2</div></div></td><td>Man Chao</td></tr>
-<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3418 unfinished:1463 untranslated:4424" class="bartodo"><div class="bardone" style="width:44px">44.6</div></div></td><td>Сергей Якунин</td></tr>
-<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3263 unfinished:1299 untranslated:4743" class="bartodo"><div class="bardone" style="width:42px">42.0</div></div></td><td>Osman Yilmaz</td></tr>
-<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2180 unfinished:2752 untranslated:4373" class="bartodo"><div class="bardone" style="width:38px">38.2</div></div></td><td>Nung-yao Lin</td></tr>
-<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2404 unfinished:1840 untranslated:5061" class="bartodo"><div class="bardone" style="width:35px">35.7</div></div></td><td>Bùi Hữu Mạnh</td></tr>
-<tr><td><img src="qrc:/images/flags/el_GR.png"></td><td>Greek, Modern (1453-) (Greece)</td><td><div title="finished:2676 unfinished:1033 untranslated:5596" class="bartodo"><div class="bardone" style="width:34px">34.3</div></div></td><td>Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves</td></tr>
-<tr><td><img src="qrc:/images/flags/is.png"></td><td>Icelandic</td><td><div title="finished:2466 unfinished:989 untranslated:5850" class="bartodo"><div class="bardone" style="width:31px">31.8</div></div></td><td>Thordur Ivarsson</td></tr>
-<tr><td><img src="qrc:/images/flags/mn.png"></td><td>Mongolian</td><td><div title="finished:2283 unfinished:1275 untranslated:5747" class="bartodo"><div class="bardone" style="width:31px">31.4</div></div></td><td>Bayarmaa Enkhtur</td></tr>
-<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:1802 unfinished:1658 untranslated:5845" class="bartodo"><div class="bardone" style="width:28px">28.3</div></div></td><td>Lonut Losifescu-Enescu, Bogdan Pacurar</td></tr>
-<tr><td><img src="qrc:/images/flags/ka_GE.png"></td><td>Georgian (Georgia)</td><td><div title="finished:1176 unfinished:1665 untranslated:6464" class="bartodo"><div class="bardone" style="width:21px">21.6</div></div></td><td>Shota Murtskhvaladze, George Machitidze</td></tr>
-<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1256 unfinished:1430 untranslated:6619" class="bartodo"><div class="bardone" style="width:21px">21.2</div></div></td><td>Marko Järvenpää</td></tr>
-<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:707 unfinished:2078 untranslated:6520" class="bartodo"><div class="bardone" style="width:18px">18.8</div></div></td><td>Lubos Balazovic</td></tr>
-<tr><td><img src="qrc:/images/flags/bg.png"></td><td>Bulgarian</td><td><div title="finished:885 unfinished:1620 untranslated:6800" class="bartodo"><div class="bardone" style="width:18px">18.2</div></div></td><td>Захари Савов, Jordan Tzvetkov</td></tr>
-<tr><td><img src="qrc:/images/flags/sq_AL.png"></td><td>Albanian (Albania)</td><td><div title="finished:815 unfinished:1471 untranslated:7019" class="bartodo"><div class="bardone" style="width:16px">16.7</div></div></td><td></td></tr>
-<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:553 unfinished:1671 untranslated:7081" class="bartodo"><div class="bardone" style="width:14px">14.9</div></div></td><td>Anousak Souphavanh, Soukanh Lathsavong</td></tr>
-<tr><td><img src="qrc:/images/flags/lt.png"></td><td>Lithuanian</td><td><div title="finished:414 unfinished:718 untranslated:8173" class="bartodo"><div class="bardone" style="width:8px">8.3</div></div></td><td>Kestas M</td></tr>
-<tr><td><img src="qrc:/images/flags/fa.png"></td><td>Persian</td><td><div title="finished:226 unfinished:344 untranslated:8735" class="bartodo"><div class="bardone" style="width:4px">4.3</div></div></td><td>Mola Pahnadayan</td></tr>
-<tr><td><img src="qrc:/images/flags/ml_IN.png"></td><td>Malayalam (India)</td><td><div title="finished:253 unfinished:289 untranslated:8763" class="bartodo"><div class="bardone" style="width:4px">4.3</div></div></td><td>Vinayan Parameswaran</td></tr>
+<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9382 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
+<tr><td><img src="qrc:/images/flags/bs_BA.png"></td><td>Bosnian (Bosnia and Herzegovina)</td><td><div title="finished:9370 unfinished:0 untranslated:5" class="bartodo"><div class="bardone" style="width:99px">99.9</div></div></td><td>Almir Karabegovic</td></tr>
+<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:9175 unfinished:54 untranslated:76" class="bartodo"><div class="bardone" style="width:98px">98.1</div></div></td><td>Xan Vieiro</td></tr>
+<tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:8924 unfinished:40 untranslated:418" class="bartodo"><div class="bardone" style="width:95px">95.3</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
+<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:8837 unfinished:171 untranslated:297" class="bartodo"><div class="bardone" style="width:95px">95.1</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
+<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:7948 unfinished:65 untranslated:1366" class="bartodo"><div class="bardone" style="width:85px">85.1</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
+<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:7558 unfinished:669 untranslated:1078" class="bartodo"><div class="bardone" style="width:84px">84.1</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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7014 unfinished:908 untranslated:1383" class="bartodo"><div class="bardone" style="width:79px">79.6</div></div></td><td>Veiko Viil</td></tr>
+<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7110 unfinished:664 untranslated:1535" class="bartodo"><div class="bardone" style="width:79px">79.3</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>
+<tr><td><img src="qrc:/images/flags/sv.png"></td><td>Swedish</td><td><div title="finished:6570 unfinished:1522 untranslated:1213" class="bartodo"><div class="bardone" style="width:78px">78.1</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
+<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:6759 unfinished:1030 untranslated:1516" class="bartodo"><div class="bardone" style="width:77px">77.5</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
+<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:6587 unfinished:1077 untranslated:1641" class="bartodo"><div class="bardone" style="width:75px">75.9</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
+<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:6585 unfinished:1042 untranslated:1678" class="bartodo"><div class="bardone" style="width:75px">75.7</div></div></td><td>Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert</td></tr>
+<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:6587 unfinished:1013 untranslated:1705" class="bartodo"><div class="bardone" style="width:75px">75.6</div></div></td><td>Arthur Nanni</td></tr>
+<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:6587 unfinished:948 untranslated:1770" class="bartodo"><div class="bardone" style="width:75px">75.3</div></div></td><td>Artem Popov</td></tr>
+<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:6587 unfinished:937 untranslated:1781" class="bartodo"><div class="bardone" style="width:75px">75.2</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
+<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:6448 unfinished:1044 untranslated:1813" class="bartodo"><div class="bardone" style="width:74px">74.3</div></div></td><td>Zoltan Siki</td></tr>
+<tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:6391 unfinished:997 untranslated:1917" class="bartodo"><div class="bardone" style="width:73px">73.4</div></div></td><td>BJ Jang</td></tr>
+<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:6072 unfinished:892 untranslated:2341" class="bartodo"><div class="bardone" style="width:69px">69.5</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
+<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5200 unfinished:1175 untranslated:2930" class="bartodo"><div class="bardone" style="width:61px">61.7</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
+<tr><td><img src="qrc:/images/flags/sr_Latn.png"></td><td>Serbian ()</td><td><div title="finished:5106 unfinished:1321 untranslated:2879" class="bartodo"><div class="bardone" style="width:61px">61.5</div></div></td><td>Goran Ivanković</td></tr>
+<tr><td><img src="qrc:/images/flags/sr_Cyrl.png"></td><td>Serbian ()</td><td><div title="finished:5135 unfinished:1217 untranslated:2954" class="bartodo"><div class="bardone" style="width:61px">61.2</div></div></td><td>Goran Ivanković</td></tr>
+<tr><td><img src="qrc:/images/flags/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:3076 unfinished:5071 untranslated:1158" class="bartodo"><div class="bardone" style="width:59px">59.8</div></div></td><td>Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva</td></tr>
+<tr><td><img src="qrc:/images/flags/km.png"></td><td>Central Khmer</td><td><div title="finished:1992 unfinished:6807 untranslated:506" class="bartodo"><div class="bardone" style="width:57px">57.5</div></div></td><td>Khoem Sokhem</td></tr>
+<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4309 unfinished:1274 untranslated:3722" class="bartodo"><div class="bardone" style="width:52px">52.7</div></div></td><td>Januar V. Simarmata, I Made Anombawa</td></tr>
+<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4374 unfinished:982 untranslated:3949" class="bartodo"><div class="bardone" style="width:51px">51.9</div></div></td><td>Zoran Jankovic</td></tr>
+<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:3658 unfinished:1463 untranslated:4184" class="bartodo"><div class="bardone" style="width:46px">46.8</div></div></td><td>Man Chao</td></tr>
+<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3418 unfinished:1463 untranslated:4424" class="bartodo"><div class="bardone" style="width:44px">44.2</div></div></td><td>Сергей Якунин</td></tr>
+<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3263 unfinished:1299 untranslated:4743" class="bartodo"><div class="bardone" style="width:41px">41.7</div></div></td><td>Osman Yilmaz</td></tr>
+<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2180 unfinished:2752 untranslated:4373" class="bartodo"><div class="bardone" style="width:37px">37.9</div></div></td><td>Nung-yao Lin</td></tr>
+<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2404 unfinished:1840 untranslated:5061" class="bartodo"><div class="bardone" style="width:35px">35.4</div></div></td><td>Bùi Hữu Mạnh</td></tr>
+<tr><td><img src="qrc:/images/flags/el_GR.png"></td><td>Greek, Modern (1453-) (Greece)</td><td><div title="finished:2676 unfinished:1033 untranslated:5596" class="bartodo"><div class="bardone" style="width:34px">34.0</div></div></td><td>Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves</td></tr>
+<tr><td><img src="qrc:/images/flags/is.png"></td><td>Icelandic</td><td><div title="finished:2466 unfinished:989 untranslated:5850" class="bartodo"><div class="bardone" style="width:31px">31.6</div></div></td><td>Thordur Ivarsson</td></tr>
+<tr><td><img src="qrc:/images/flags/mn.png"></td><td>Mongolian</td><td><div title="finished:2283 unfinished:1275 untranslated:5747" class="bartodo"><div class="bardone" style="width:31px">31.1</div></div></td><td>Bayarmaa Enkhtur</td></tr>
+<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:1802 unfinished:1658 untranslated:5845" class="bartodo"><div class="bardone" style="width:28px">28.0</div></div></td><td>Lonut Losifescu-Enescu, Bogdan Pacurar</td></tr>
+<tr><td><img src="qrc:/images/flags/ka_GE.png"></td><td>Georgian (Georgia)</td><td><div title="finished:1176 unfinished:1665 untranslated:6464" class="bartodo"><div class="bardone" style="width:21px">21.4</div></div></td><td>Shota Murtskhvaladze, George Machitidze</td></tr>
+<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1256 unfinished:1430 untranslated:6619" class="bartodo"><div class="bardone" style="width:21px">21.0</div></div></td><td>Marko Järvenpää</td></tr>
+<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:707 unfinished:2078 untranslated:6520" class="bartodo"><div class="bardone" style="width:18px">18.6</div></div></td><td>Lubos Balazovic</td></tr>
+<tr><td><img src="qrc:/images/flags/bg.png"></td><td>Bulgarian</td><td><div title="finished:885 unfinished:1620 untranslated:6800" class="bartodo"><div class="bardone" style="width:18px">18.1</div></div></td><td>Захари Савов, Jordan Tzvetkov</td></tr>
+<tr><td><img src="qrc:/images/flags/sq_AL.png"></td><td>Albanian (Albania)</td><td><div title="finished:815 unfinished:1471 untranslated:7019" class="bartodo"><div class="bardone" style="width:16px">16.5</div></div></td><td></td></tr>
+<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:553 unfinished:1671 untranslated:7081" class="bartodo"><div class="bardone" style="width:14px">14.8</div></div></td><td>Anousak Souphavanh, Soukanh Lathsavong</td></tr>
+<tr><td><img src="qrc:/images/flags/lt.png"></td><td>Lithuanian</td><td><div title="finished:414 unfinished:718 untranslated:8173" class="bartodo"><div class="bardone" style="width:8px">8.2</div></div></td><td>Kestas M</td></tr>
+<tr><td><img src="qrc:/images/flags/fa.png"></td><td>Persian</td><td><div title="finished:226 unfinished:344 untranslated:8735" class="bartodo"><div class="bardone" style="width:4px">4.2</div></div></td><td>Mola Pahnadayan</td></tr>
+<tr><td><img src="qrc:/images/flags/ml_IN.png"></td><td>Malayalam (India)</td><td><div title="finished:253 unfinished:289 untranslated:8763" class="bartodo"><div class="bardone" style="width:4px">4.2</div></div></td><td>Vinayan Parameswaran</td></tr>
 <tr><td><img src="qrc:/images/flags/ar.png"></td><td>Arabic</td><td><div title="finished:47 unfinished:263 untranslated:8995" class="bartodo"><div class="bardone" style="width:1px">1.9</div></div></td><td>Assem Kamal, Latif Jalil</td></tr>
 <tr><td><img src="qrc:/images/flags/af.png"></td><td>Afrikaans</td><td><div title="finished:0 unfinished:355 untranslated:8950" class="bartodo"><div class="bardone" style="width:1px">1.9</div></div></td><td>Hendrik Bosman</td></tr>
 <tr><td><img src="qrc:/images/flags/he.png"></td><td>Hebrew</td><td><div title="finished:0 unfinished:18 untranslated:9287" class="bartodo"><div class="bardone" style="width:0px">0.1</div></div></td><td></td></tr>

doc/osx.t2t

@@ -163,6 +163,10 @@ sudo make install
 
 === Optional setup: ccache ===
 
+__Xcode 4.4+ note:__ You will probably not need to install ccache if you are using
+the clang frontend to LLVM compiler, a setup that already provides fairly quick
+compile times.
+
 Setup ccache to significantly speed up compile times after initial build.
 (Switching git branches will again cause longer initial build times unless
 separate build directories are used for each branch.)
@@ -777,8 +781,8 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
 -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
 -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
 -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
--D QWT_LIBRARY=/usr/local/qwt-5.2.2/lib/libqwt.dylib \
--D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.2/include \
+-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
+-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/include \
 -D BISON_EXECUTABLE=/usr/local/bin/bison \
 ..
 ```
@@ -795,12 +799,12 @@ ccmake ..
 
 This will automatically find and use the previously installed frameworks, and
 the GRASS application if installed.  Remember to change the Qwt version if a
-different version was installed, and possibly paths, e.g. for Qwt 6.0.1, which
-installs as a framework, use:
+different version was installed, and possibly paths, e.g. for Qwt 6.0.2 installed
+as a framework use:
 
 ```
--D QWT_LIBRARY=/usr/local/qwt-6.0.1/lib/qwt.framework/qwt \
--D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.1/lib/qwt.framework/Headers \
+-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/qwt.framework/qwt \
+-D QWT_INCLUDE_DIR=/usr/local/qwt-6.0.2/lib/qwt.framework/Headers \
 ```
 
 If you want to use a newer PostgreSQL client than the default Mac OS X version,

i18n/qgis_it.ts

@@ -7313,15 +7313,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
         <translation type="obsolete">Errore di connessione: </translation>
     </message>
     <message>
-        <source>## To access Quantum GIS environment from this console
-## use iface object (instance of QgisInterface class).
+        <source>Click on button to restore all tabs from last session.</source>
+        <translation>Clicca sul bottone per riaprire le schede della sessione precedente.</translation>
+    </message>
+    <message>
+        <source>Restore tabs</source>
+        <translation>Riprisitna schede</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>Python %1 on %2
 ## Type help(iface) for more info and list of methods.
-
 </source>
-        <translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
-## usa l&apos;oggetto iface (istanza della classe QgisInterface). 
+        <translation>Python %1 on %2
 ## Digita help(iface) per ottenere più informazioni.
-
 </translation>
     </message>
 </context>

images/images.qrc

@@ -1,14 +1,104 @@
 <RCC>
     <qresource prefix="/images">
-        <file>icons/qgis-icon-16x16.png</file>
         <file alias="last-hackfest.jpg">developers/essen-2012.jpg</file>
+        <file>flags/af.png</file>
+        <file>flags/ar.png</file>
+        <file>flags/bg.png</file>
+        <file>flags/ca_ES.png</file>
+        <file>flags/cs_CZ.png</file>
+        <file>flags/da_DK.png</file>
+        <file>flags/de.png</file>
+        <file>flags/el_GR.png</file>
+        <file>flags/en_US.png</file>
+        <file>flags/es.png</file>
+        <file>flags/et_EE.png</file>
+        <file>flags/eu_ES.png</file>
+        <file>flags/fa.png</file>
+        <file>flags/fi.png</file>
+        <file>flags/fr.png</file>
+        <file>flags/gl_ES.png</file>
+        <file>flags/he.png</file>
+        <file>flags/hr_HR.png</file>
+        <file>flags/hu.png</file>
+        <file>flags/id.png</file>
+        <file>flags/is.png</file>
+        <file>flags/it.png</file>
+        <file>flags/ja.png</file>
+        <file>flags/ka_GE.png</file>
+        <file>flags/km.png</file>
+        <file>flags/ko_KR.png</file>
+        <file>flags/lo.png</file>
+        <file>flags/lt.png</file>
+        <file>flags/lv.png</file>
+        <file>flags/ml_IN.png</file>
+        <file>flags/mn.png</file>
+        <file>flags/nl.png</file>
+        <file>flags/no.png</file>
+        <file>flags/pl_PL.png</file>
+        <file>flags/pt_BR.png</file>
+        <file>flags/pt_PT.png</file>
+        <file>flags/ro.png</file>
+        <file>flags/ru.png</file>
+        <file>flags/sk.png</file>
+        <file>flags/sl_SI.png</file>
+        <file>flags/sq_AL.png</file>
+        <file>flags/sr_Cyrl.png</file>
+        <file>flags/sr_Latn.png</file>
+        <file>flags/sv.png</file>
+        <file>flags/sw.png</file>
+        <file>flags/ta.png</file>
+        <file>flags/th.png</file>
+        <file>flags/tr.png</file>
+        <file>flags/uk.png</file>
+        <file>flags/vi.png</file>
+        <file>flags/xh.png</file>
+        <file>flags/zh_CN.png</file>
+        <file>flags/zh_TW.png</file>
+        <file>icons/qgis-icon-16x16.png</file>
         <file>icons/qgis-icon-60x60.png</file>
-        <file>north_arrows/gpsarrow2.svg</file>
+        <file>north_arrows/default.png</file>
         <file>north_arrows/gpsarrow.svg</file>
+        <file>north_arrows/gpsarrow2.svg</file>
+        <file>splash/splash.png</file>
         <file>themes/default/cap_flat.png</file>
         <file>themes/default/cap_round.png</file>
         <file>themes/default/cap_square.png</file>
         <file>themes/default/clearInput.png</file>
+        <file>themes/default/console/iconAboutConsole.png</file>
+        <file>themes/default/console/iconClassConsole.png</file>
+        <file>themes/default/console/iconClearConsole.png</file>
+        <file>themes/default/console/iconCodepadConsole.png</file>
+        <file>themes/default/console/iconHelpConsole.png</file>
+        <file>themes/default/console/iconHideToolConsole.png</file>
+        <file>themes/default/console/iconIfaceConsole.png</file>
+        <file>themes/default/console/iconOpenConsole.png</file>
+        <file>themes/default/console/iconQtCoreConsole.png</file>
+        <file>themes/default/console/iconQtGuiConsole.png</file>
+        <file>themes/default/console/iconRunConsole.png</file>
+        <file>themes/default/console/iconSaveConsole.png</file>
+        <file>themes/default/console/iconScriptConsole.png</file>
+        <file>themes/default/console/iconSettingsConsole.png</file>
+        <file>themes/default/console/iconSextanteConsole.png</file>
+        <file>themes/default/console/imgHelpConsole.png</file>
+        <file>themes/default/console/imgHelpDialog.png</file>
+        <file>themes/default/console/imgHelpMenu.png</file>
+        <file>themes/default/console/iconTabEditorConsole.png</file>
+        <file>themes/default/console/iconNewTabEditorConsole.png</file>
+        <file>themes/default/console/iconCloseTabEditorConsole.png</file>
+        <file>themes/default/console/iconRestoreTabsConsole.png</file>
+        <file>themes/default/console/iconFileTabsMenuConsole.png</file>
+        <file>themes/default/console/iconShowEditorConsole.png</file>
+        <file>themes/default/console/iconSaveAsConsole.png</file>
+        <file>themes/default/console/iconCutEditorConsole.png</file>
+        <file>themes/default/console/iconCopyEditorConsole.png</file>
+        <file>themes/default/console/iconPasteEditorConsole.png</file>
+        <file>themes/default/console/iconRunScriptConsole.png</file>
+        <file>themes/default/console/iconCommentEditorConsole.png</file>
+        <file>themes/default/console/iconUncommentEditorConsole.png</file>
+        <file>themes/default/console/iconClassTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconMethodTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconFunctionTreeWidgetConsole.png</file>
+        <file>themes/default/console/iconClassBrowserConsole.png</file>
         <file>themes/default/extents.png</file>
         <file>themes/default/favourites.png</file>
         <file>themes/default/geographic.png</file>
@@ -16,26 +106,34 @@
         <file>themes/default/gpsicons/polarchart.svg</file>
         <file>themes/default/grass_location.png</file>
         <file>themes/default/grass_mapset.png</file>
+        <file>themes/default/histogram.png</file>
         <file>themes/default/join_bevel.png</file>
         <file>themes/default/join_miter.png</file>
         <file>themes/default/join_round.png</file>
         <file>themes/default/join_style.svg</file>
+        <file>themes/default/locked.png</file>
+        <file>themes/default/mAction.png</file>
         <file>themes/default/mActionAdd.png</file>
         <file>themes/default/mActionAddAllToOverview.png</file>
         <file>themes/default/mActionAddArrow.png</file>
         <file>themes/default/mActionAddBasicShape.png</file>
+        <file>themes/default/mActionAddGPSLayer.png</file>
+        <file>themes/default/mActionAddHtml.png</file>
         <file>themes/default/mActionAddImage.png</file>
-        <file>themes/default/mActionAddPart.png</file>
         <file>themes/default/mActionAddLayer.png</file>
         <file>themes/default/mActionAddLegend.png</file>
         <file>themes/default/mActionAddMap.png</file>
+        <file>themes/default/mActionAddMssqlLayer.png</file>
         <file>themes/default/mActionAddNonDbLayer.png</file>
         <file>themes/default/mActionAddOgrLayer.png</file>
+        <file>themes/default/mActionAddOracleLayer.png</file>
+        <file>themes/default/mActionAddPart.png</file>
         <file>themes/default/mActionAddRasterLayer.png</file>
         <file>themes/default/mActionAddRing.png</file>
         <file>themes/default/mActionAddSpatiaLiteLayer.png</file>
         <file>themes/default/mActionAddVertex.png</file>
         <file>themes/default/mActionAddWcsLayer.png</file>
+        <file>themes/default/mActionAddWfsLayer.png</file>
         <file>themes/default/mActionAddWmsLayer.png</file>
         <file>themes/default/mActionAlignBottom.png</file>
         <file>themes/default/mActionAlignHCenter.png</file>
@@ -46,9 +144,9 @@
         <file>themes/default/mActionAllEdits.svg</file>
         <file>themes/default/mActionAnnotation.png</file>
         <file>themes/default/mActionArrowDown.png</file>
-        <file>themes/default/mActionArrowUp.png</file>
         <file>themes/default/mActionArrowLeft.png</file>
         <file>themes/default/mActionArrowRight.png</file>
+        <file>themes/default/mActionArrowUp.png</file>
         <file>themes/default/mActionCalculateField.png</file>
         <file>themes/default/mActionCancelAllEdits.svg</file>
         <file>themes/default/mActionCancelEdits.svg</file>
@@ -62,6 +160,8 @@
         <file>themes/default/mActionContextHelp.png</file>
         <file>themes/default/mActionCopySelected.png</file>
         <file>themes/default/mActionCustomProjection.png</file>
+        <file>themes/default/mActionDecreaseBrightness.svg</file>
+        <file>themes/default/mActionDecreaseContrast.svg</file>
         <file>themes/default/mActionDeleteAttribute.png</file>
         <file>themes/default/mActionDeletePart.png</file>
         <file>themes/default/mActionDeleteRing.png</file>
@@ -73,17 +173,18 @@
         <file>themes/default/mActionEditCopy.png</file>
         <file>themes/default/mActionEditCut.png</file>
         <file>themes/default/mActionEditPaste.png</file>
-        <file>themes/default/mActionExpandTree.png</file>
         <file>themes/default/mActionExpandNewTree.png</file>
+        <file>themes/default/mActionExpandTree.png</file>
         <file>themes/default/mActionExportMapServer.png</file>
         <file>themes/default/mActionFileExit.png</file>
         <file>themes/default/mActionFileNew.png</file>
         <file>themes/default/mActionFileOpen.png</file>
         <file>themes/default/mActionFilePrint.png</file>
-        <file>themes/default/mActionFileSaveAs.png</file>
         <file>themes/default/mActionFileSave.png</file>
+        <file>themes/default/mActionFileSaveAs.png</file>
         <file>themes/default/mActionFileSmall.png</file>
         <file>themes/default/mActionFilter.png</file>
+        <file>themes/default/mActionFilter.svg</file>
         <file>themes/default/mActionFolder.png</file>
         <file>themes/default/mActionFormAnnotation.png</file>
         <file>themes/default/mActionFromSelectedFeature.png</file>
@@ -96,17 +197,19 @@
         <file>themes/default/mActionHelpSponsors.png</file>
         <file>themes/default/mActionHideAllLayers.png</file>
         <file>themes/default/mActionIdentify.png</file>
+        <file>themes/default/mActionIncreaseBrightness.svg</file>
+        <file>themes/default/mActionIncreaseContrast.svg</file>
         <file>themes/default/mActionInOverview.png</file>
         <file>themes/default/mActionInvertSelection.png</file>
-        <file>themes/default/mActionLabeling.png</file>
         <file>themes/default/mActionLabel.png</file>
+        <file>themes/default/mActionLabeling.png</file>
         <file>themes/default/mActionLocalCumulativeCutStretch.png</file>
         <file>themes/default/mActionLocalHistogramStretch.png</file>
         <file>themes/default/mActionLowerItems.png</file>
         <file>themes/default/mActionMapTips.png</file>
+        <file>themes/default/mActionMeasure.png</file>
         <file>themes/default/mActionMeasureAngle.png</file>
         <file>themes/default/mActionMeasureArea.png</file>
-        <file>themes/default/mActionMeasure.png</file>
         <file>themes/default/mActionMergeFeatureAttributes.png</file>
         <file>themes/default/mActionMergeFeatures.png</file>
         <file>themes/default/mActionMoveFeature.png</file>
@@ -128,17 +231,15 @@
         <file>themes/default/mActionPanToSelected.png</file>
         <file>themes/default/mActionPanToSelected.svg</file>
         <file>themes/default/mActionPinLabels.svg</file>
-        <file>themes/default/mActionShowRasterCalculator.png</file>
-        <file>themes/default/mAction.png</file>
         <file>themes/default/mActionProjectProperties.png</file>
         <file>themes/default/mActionPropertyItem.png</file>
         <file>themes/default/mActionQgisHomePage.png</file>
         <file>themes/default/mActionRaiseItems.png</file>
-        <file>themes/default/mActionRefresh.png</file>
         <file>themes/default/mActionRedo.png</file>
+        <file>themes/default/mActionRefresh.png</file>
+        <file>themes/default/mActionRemove.png</file>
         <file>themes/default/mActionRemoveAllFromOverview.png</file>
         <file>themes/default/mActionRemoveLayer.png</file>
-        <file>themes/default/mActionRemove.png</file>
         <file>themes/default/mActionRemoveSelectedFeature.png</file>
         <file>themes/default/mActionReshape.png</file>
         <file>themes/default/mActionRollbackAllEdits.svg</file>
@@ -147,27 +248,28 @@
         <file>themes/default/mActionRotateLabel.png</file>
         <file>themes/default/mActionRotateLabel.svg</file>
         <file>themes/default/mActionRotatePointSymbols.png</file>
+        <file>themes/default/mActionSaveAllEdits.svg</file>
         <file>themes/default/mActionSaveAsPDF.png</file>
         <file>themes/default/mActionSaveAsSVG.png</file>
-        <file>themes/default/mActionSaveAllEdits.svg</file>
         <file>themes/default/mActionSaveEdits.svg</file>
         <file>themes/default/mActionSaveMapAsImage.png</file>
         <file>themes/default/mActionScaleBar.png</file>
+        <file>themes/default/mActionSelect.png</file>
         <file>themes/default/mActionSelectedToTop.png</file>
         <file>themes/default/mActionSelectFreehand.png</file>
         <file>themes/default/mActionSelectPan.png</file>
-        <file>themes/default/mActionSelect.png</file>
         <file>themes/default/mActionSelectPolygon.png</file>
         <file>themes/default/mActionSelectPolygon.svg</file>
         <file>themes/default/mActionSelectRadius.png</file>
         <file>themes/default/mActionSelectRectangle.png</file>
-        <file>themes/default/mActionSignPlus.png</file>
-        <file>themes/default/mActionSignMinus.png</file>
         <file>themes/default/mActionShowAllLayers.png</file>
         <file>themes/default/mActionShowBookmarks.png</file>
         <file>themes/default/mActionShowHideLabels.svg</file>
         <file>themes/default/mActionShowPinnedLabels.svg</file>
         <file>themes/default/mActionShowPluginManager.png</file>
+        <file>themes/default/mActionShowRasterCalculator.png</file>
+        <file>themes/default/mActionSignMinus.png</file>
+        <file>themes/default/mActionSignPlus.png</file>
         <file>themes/default/mActionSimplify.png</file>
         <file>themes/default/mActionSplitFeatures.png</file>
         <file>themes/default/mActionSplitFeatures.svg</file>
@@ -175,6 +277,8 @@
         <file>themes/default/mActionTextAnnotation.png</file>
         <file>themes/default/mActionToggleEditing.png</file>
         <file>themes/default/mActionToggleEditing.svg</file>
+        <file>themes/default/mActionTouch.png</file>
+        <file>themes/default/mActionTouch2.png</file>
         <file>themes/default/mActionUndo.png</file>
         <file>themes/default/mActionUngroupItems.png</file>
         <file>themes/default/mActionUnselectAttributes.png</file>
@@ -186,20 +290,20 @@
         <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/mIconClear.svg</file>
         <file>themes/default/mIconClose.png</file>
         <file>themes/default/mIconCollapse.png</file>
         <file>themes/default/mIconConnect.png</file>
-        <file>themes/default/mIconClear.svg</file>
         <file>themes/default/mIconCritical.png</file>
         <file>themes/default/mIconDbSchema.png</file>
         <file>themes/default/mIconDelete.png</file>
+        <file>themes/default/mIconDeselected.svg</file>
         <file>themes/default/mIconEditable.png</file>
         <file>themes/default/mIconEditableEdits.png</file>
         <file>themes/default/mIconExpand.png</file>
+        <file>themes/default/mIconExpressionFilter.svg</file>
+        <file>themes/default/mIconExpressionPreview.svg</file>
+        <file>themes/default/mIconExpressionSelect.svg</file>
         <file>themes/default/mIconFavourites.png</file>
         <file>themes/default/mIconFirst.png</file>
         <file>themes/default/mIconGeometryLayer.png</file>
@@ -208,11 +312,11 @@
         <file>themes/default/mIconLayer.png</file>
         <file>themes/default/mIconLineLayer.png</file>
         <file>themes/default/mIconLock.png</file>
-        <file>themes/default/mIconNew.png</file>
         <file>themes/default/mIconMssql.png</file>
-        <file>themes/default/mIconOracle.png</file>
+        <file>themes/default/mIconNew.png</file>
         <file>themes/default/mIconNext.png</file>
         <file>themes/default/mIconNoPyramid.png</file>
+        <file>themes/default/mIconOracle.png</file>
         <file>themes/default/mIconOws.png</file>
         <file>themes/default/mIconPointLayer.png</file>
         <file>themes/default/mIconPolygonLayer.png</file>
@@ -223,47 +327,70 @@
         <file>themes/default/mIconProjectionProblem.png</file>
         <file>themes/default/mIconProperties.png</file>
         <file>themes/default/mIconPyramid.png</file>
+        <file>themes/default/mIconRaster.png</file>
+        <file>themes/default/mIconRenderingDisabled.png</file>
+        <file>themes/default/mIconRenderingEnabled.png</file>
+        <file>themes/default/mIconSelectAdd.svg</file>
+        <file>themes/default/mIconSelected.svg</file>
+        <file>themes/default/mIconSelectIntersect.svg</file>
+        <file>themes/default/mIconSelectRemove.svg</file>
         <file>themes/default/mIconSpatialite.png</file>
         <file>themes/default/mIconStopRendering.png</file>
-        <file>themes/default/mIconRaster.png</file>
-        <file>themes/default/mIconRenderingEnabled.png</file>
-        <file>themes/default/mIconRenderingDisabled.png</file>
         <file>themes/default/mIconSymbology.png</file>
         <file>themes/default/mIconTableLayer.png</file>
-        <file>themes/default/mIconTimerPause.png</file>
         <file>themes/default/mIconTimerContinue.png</file>
+        <file>themes/default/mIconTimerPause.png</file>
         <file>themes/default/mIconUnknownLayerType.png</file>
         <file>themes/default/mIconVectorLayer.png</file>
         <file>themes/default/mIconWaitingForLayerType.png</file>
+        <file>themes/default/mIconWarn.png</file>
         <file>themes/default/mIconWcs.png</file>
         <file>themes/default/mIconWfs.png</file>
         <file>themes/default/mIconWms.png</file>
         <file>themes/default/mIconWmsLayer.png</file>
-        <file>themes/default/mIconWarn.png</file>
-        <file>themes/default/mIconZoom.png</file>
         <file>themes/default/mIconZip.png</file>
+        <file>themes/default/mIconZoom.png</file>
         <file>themes/default/mMapserverExport.png</file>
+        <file>themes/default/pie-chart.png</file>
         <file>themes/default/plugin.png</file>
+        <file>themes/default/plugins/coordinate_capture/coordinate_capture.png</file>
+        <file>themes/default/plugins/copyright_label.png</file>
+        <file>themes/default/plugins/delimited_text.png</file>
+        <file>themes/default/plugins/dxf2shp_converter.png</file>
+        <file>themes/default/plugins/gps_importer.png</file>
+        <file>themes/default/plugins/gps_importer/create_gpx.png</file>
+        <file>themes/default/plugins/gps_importer/import_gpx.png</file>
+        <file>themes/default/plugins/interpolation.png</file>
+        <file>themes/default/plugins/mapserver_export.png</file>
+        <file>themes/default/plugins/mGeorefRun.png</file>
+        <file>themes/default/plugins/north_arrow.png</file>
+        <file>themes/default/plugins/ogr_converter.png</file>
+        <file>themes/default/plugins/quick_print.png</file>
+        <file>themes/default/plugins/scale_bar.png</file>
+        <file>themes/default/plugins/spit.png</file>
         <file>themes/default/propertyicons/action.png</file>
         <file>themes/default/propertyicons/attributes.png</file>
         <file>themes/default/propertyicons/colormap.png</file>
         <file>themes/default/propertyicons/CRS.png</file>
         <file>themes/default/propertyicons/diagram.png</file>
         <file>themes/default/propertyicons/digitising.png</file>
+        <file>themes/default/propertyicons/display.svg</file>
+        <file>themes/default/propertyicons/gdal.png</file>
         <file>themes/default/propertyicons/general.png</file>
         <file>themes/default/propertyicons/histogram.png</file>
         <file>themes/default/propertyicons/join.png</file>
         <file>themes/default/propertyicons/labels.png</file>
+        <file>themes/default/propertyicons/labels.svg</file>
         <file>themes/default/propertyicons/locale.png</file>
         <file>themes/default/propertyicons/map_tools.png</file>
         <file>themes/default/propertyicons/metadata.png</file>
+        <file>themes/default/propertyicons/metadata.svg</file>
         <file>themes/default/propertyicons/network_and_proxy.png</file>
         <file>themes/default/propertyicons/overlay.png</file>
         <file>themes/default/propertyicons/pyramids.png</file>
         <file>themes/default/propertyicons/rendering.png</file>
         <file>themes/default/propertyicons/symbology.png</file>
         <file>themes/default/propertyicons/transparency.png</file>
-        <file>themes/default/propertyicons/gdal.png</file>
         <file>themes/default/qgis.xpm</file>
         <file>themes/default/rendererCategorizedSymbol.png</file>
         <file>themes/default/rendererGraduatedSymbol.png</file>
@@ -277,276 +404,13 @@
         <file>themes/default/symbologyEdit.png</file>
         <file>themes/default/symbologyRemove.png</file>
         <file>themes/default/symbologyUp.png</file>
+        <file>themes/default/text.png</file>
         <file>themes/default/tracking.png</file>
         <file>themes/default/transformed.png</file>
         <file>themes/default/transp-background_8x8.png</file>
-        <file>themes/default/user.png</file>
-        <file>themes/default/mActionAddHtml.png</file>
-        <file>themes/gis/mActionAddArrow.png</file>
-        <file>themes/gis/mActionAddBasicShape.png</file>
-        <file>themes/gis/mActionAddGPSLayer.png</file>
-        <file>themes/gis/mActionAddHtml.png</file>
-        <file>themes/gis/mActionAddImage.png</file>
-        <file>themes/gis/mActionAddPart.png</file>
-        <file>themes/gis/mActionAddLayer.png</file>
-        <file>themes/gis/mActionAddLegend.png</file>
-        <file>themes/gis/mActionAddMap.png</file>
-        <file>themes/gis/mActionAddOgrLayer.png</file>
-        <file>themes/gis/mActionAddRasterLayer.png</file>
-        <file>themes/gis/mActionAddRing.png</file>
-        <file>themes/gis/mActionAddSpatiaLiteLayer.png</file>
-        <file>themes/gis/mActionAddVertex.png</file>
-        <file>themes/gis/mActionAddWcsLayer.png</file>
-        <file>themes/gis/mActionAddWfsLayer.png</file>
-        <file>themes/gis/mActionAddWmsLayer.png</file>
-        <file>themes/gis/mActionAlignBottom.png</file>
-        <file>themes/gis/mActionAlignHCenter.png</file>
-        <file>themes/gis/mActionAlignLeft.png</file>
-        <file>themes/gis/mActionAlignRight.png</file>
-        <file>themes/gis/mActionAlignTop.png</file>
-        <file>themes/gis/mActionAlignVCenter.png</file>
-        <file>themes/gis/mActionAllEdits.svg</file>
-        <file>themes/gis/mActionAnnotation.png</file>
-        <file>themes/gis/mActionCalculateField.png</file>
-        <file>themes/gis/mActionCancelAllEdits.svg</file>
-        <file>themes/gis/mActionCancelEdits.svg</file>
-        <file>themes/gis/mActionCaptureLine.png</file>
-        <file>themes/gis/mActionCapturePoint.png</file>
-        <file>themes/gis/mActionCapturePolygon.png</file>
-        <file>themes/gis/mActionChangeLabelProperties.png</file>
-        <file>themes/gis/mActionComposerManager.png</file>
-        <file>themes/gis/mActionCopySelected.png</file>
-        <file>themes/gis/mActionDeleteAttribute.png</file>
-        <file>themes/gis/mActionDeletePart.png</file>
-        <file>themes/gis/mActionDeleteRing.png</file>
-        <file>themes/gis/mActionDeleteSelected.png</file>
-        <file>themes/gis/mActionDeleteVertex.png</file>
-        <file>themes/gis/mActionDeselectAll.png</file>
-        <file>themes/gis/mActionDraw.png</file>
-        <file>themes/gis/mActionDuplicateComposer.png</file>
-        <file>themes/gis/mActionEditCopy.png</file>
-        <file>themes/gis/mActionEditCut.png</file>
-        <file>themes/gis/mActionEditPaste.png</file>
-        <file>themes/gis/mActionFileNew.png</file>
-        <file>themes/gis/mActionFileOpen.png</file>
-        <file>themes/gis/mActionFilePrint.png</file>
-        <file>themes/gis/mActionFileSaveAs.png</file>
-        <file>themes/gis/mActionFileSave.png</file>
-        <file>themes/gis/mActionFilter.svg</file>
-        <file>themes/gis/mActionFolder.png</file>
-        <file>themes/gis/mActionFormAnnotation.png</file>
-        <file>themes/gis/mActionGroupItems.png</file>
-        <file>themes/gis/mActionHelpContents.png</file>
-        <file>themes/gis/mActionHideAllLayers.png</file>
-        <file>themes/gis/mActionIdentify.png</file>
-        <file>themes/gis/mActionInOverview.png</file>
-        <file>themes/gis/mActionInvertSelection.png</file>
-        <file>themes/gis/mActionLabeling.png</file>
-        <file>themes/gis/mActionLabel.png</file>
-        <file>themes/gis/mActionLowerItems.png</file>
-        <file>themes/gis/mActionMapTips.png</file>
-        <file>themes/gis/mActionMeasureAngle.png</file>
-        <file>themes/gis/mActionMeasureArea.png</file>
-        <file>themes/gis/mActionMeasure.png</file>
-        <file>themes/gis/mActionMergeFeatureAttributes.png</file>
-        <file>themes/gis/mActionMergeFeatures.png</file>
-        <file>themes/gis/mActionMoveFeature.png</file>
-        <file>themes/gis/mActionMoveItemContent.png</file>
-        <file>themes/gis/mActionMoveItemsToBottom.png</file>
-        <file>themes/gis/mActionMoveItemsToTop.png</file>
-        <file>themes/gis/mActionMoveLabel.png</file>
-        <file>themes/gis/mActionMoveVertex.png</file>
-        <file>themes/gis/mActionNewAttribute.png</file>
-        <file>themes/gis/mActionNewBookmark.png</file>
-        <file>themes/gis/mActionNewComposer.png</file>
-        <file>themes/gis/mActionNewVectorLayer.png</file>
-        <file>themes/gis/mActionNodeTool.png</file>
-        <file>themes/gis/mActionOffsetCurve.png</file>
-        <file>themes/gis/mActionOpenTable.png</file>
-        <file>themes/gis/mActionPan.png</file>
-        <file>themes/gis/mActionPanToSelected.png</file>
-        <file>themes/gis/mActionPanToSelected.svg</file>
-        <file>themes/gis/mActionPinLabels.svg</file>
-        <file>themes/gis/mActionShowRasterCalculator.png</file>
-        <file>themes/gis/mActionRaiseItems.png</file>
-        <file>themes/gis/mActionRedo.png</file>
-        <file>themes/gis/mActionRemoveLayer.png</file>
-        <file>themes/gis/mActionReshape.png</file>
-        <file>themes/gis/mActionRollbackAllEdits.svg</file>
-        <file>themes/gis/mActionRollbackEdits.svg</file>
-        <file>themes/gis/mActionRotateFeature.png</file>
-        <file>themes/gis/mActionRotateLabel.png</file>
-        <file>themes/gis/mActionRotateLabel.svg</file>
-        <file>themes/gis/mActionSaveAsPDF.png</file>
-        <file>themes/gis/mActionSaveAsSVG.png</file>
-        <file>themes/gis/mActionSaveAllEdits.svg</file>
-        <file>themes/gis/mActionSaveEdits.svg</file>
-        <file>themes/gis/mActionSaveMapAsImage.png</file>
-        <file>themes/gis/mActionScaleBar.png</file>
-        <file>themes/gis/mActionSelectedToTop.png</file>
-        <file>themes/gis/mActionSelectFreehand.png</file>
-        <file>themes/gis/mActionSelectPan.png</file>
-        <file>themes/gis/mActionSelect.png</file>
-        <file>themes/gis/mActionSelectPolygon.png</file>
-        <file>themes/gis/mActionSelectPolygon.svg</file>
-        <file>themes/gis/mActionSelectRadius.png</file>
-        <file>themes/gis/mActionSelectRectangle.png</file>
-        <file>themes/gis/mActionShowAllLayers.png</file>
-        <file>themes/gis/mActionShowBookmarks.png</file>
-        <file>themes/gis/mActionShowHideLabels.svg</file>
-        <file>themes/gis/mActionShowPinnedLabels.svg</file>
-        <file>themes/gis/mActionSimplify.png</file>
-        <file>themes/gis/mActionSplitFeatures.png</file>
-        <file>themes/gis/mActionSplitFeatures.svg</file>
-        <file>themes/gis/mActionTextAnnotation.png</file>
-        <file>themes/gis/mActionToggleEditing.png</file>
-        <file>themes/gis/mActionToggleEditing.svg</file>
-        <file>themes/gis/mActionUndo.png</file>
-        <file>themes/gis/mActionUngroupItems.png</file>
-        <file>themes/gis/mActionUnselectAttributes.png</file>
-        <file>themes/gis/mActionZoomActual.png</file>
-        <file>themes/gis/mActionZoomFullExtent.png</file>
-        <file>themes/gis/mActionZoomIn.png</file>
-        <file>themes/gis/mActionZoomLast.png</file>
-        <file>themes/gis/mActionZoomNext.png</file>
-        <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>
-        <file>themes/gis/mIconLineLayer.png</file>
-        <file>themes/gis/mIconPointLayer.png</file>
-        <file>themes/gis/mIconPolygonLayer.png</file>
-        <file>themes/gis/mIconTableLayer.png</file>
-        <file>themes/gis/plugins/coordinate_capture/coordinate_capture.png</file>
-        <file>themes/gis/plugins/copyright_label.png</file>
-        <file>themes/gis/plugins/delimited_text.png</file>
-        <file>themes/gis/plugins/dxf2shp_converter.png</file>
-        <file>themes/gis/plugins/gps_importer/create_gpx.png</file>
-        <file>themes/gis/plugins/gps_importer/import_gpx.png</file>
-        <file>themes/gis/plugins/gps_importer.png</file>
-        <file>themes/gis/plugins/interpolation.png</file>
-        <file>themes/gis/plugins/mapserver_export.png</file>
-        <file>themes/gis/plugins/mGeorefRun.png</file>
-        <file>themes/gis/plugins/north_arrow.png</file>
-        <file>themes/gis/plugins/ogr_converter.png</file>
-        <file>themes/gis/plugins/quick_print.png</file>
-        <file>themes/gis/plugins/scale_bar.png</file>
-        <file>themes/gis/plugins/spit.png</file>
-        <file>splash/splash.png</file>
-        <file>north_arrows/default.png</file>
-        <file>themes/default/locked.png</file>
         <file>themes/default/unlocked.png</file>
-        <file>themes/default/plugins/copyright_label.png</file>
-        <file>themes/default/plugins/north_arrow.png</file>
-        <file>themes/default/plugins/scale_bar.png</file>
-        <file>themes/default/mActionAddWfsLayer.png</file>
-        <file>themes/gis/mIconOws.png</file>
-        <file>themes/gis/mIconVectorLayer.png</file>
-        <file>themes/gis/mIconWcs.png</file>
-        <file>themes/gis/mIconWms.png</file>
-        <file>themes/gis/mIconWfs.png</file>
-        <file>themes/gis/mIconWarn.png</file>
-        <file>themes/gis/mIconSpatialite.png</file>
-        <file>themes/gis/mIconRaster.png</file>
-        <file>themes/gis/mIconPostgis.png</file>
-        <file>themes/gis/mIconMssql.png</file>
-        <file>themes/gis/mIconOracle.png</file>
-        <file>themes/gis/mIconConnect.png</file>
-        <file>themes/gis/mIconDbSchema.png</file>
-        <file>themes/gis/mActionTouch.png</file>
-        <file>themes/default/mActionAddMssqlLayer.png</file>
-        <file>themes/default/mActionAddOracleLayer.png</file>
-        <file>themes/default/mActionTouch.png</file>
-        <file>themes/default/mActionTouch2.png</file>
-        <file>themes/classic/mActionTouch.png</file>
-        <file>flags/af.png</file>
-        <file>flags/ar.png</file>
-        <file>flags/bg.png</file>
-        <file>flags/ca_ES.png</file>
-        <file>flags/cs_CZ.png</file>
-        <file>flags/de.png</file>
-        <file>flags/el_GR.png</file>
-        <file>flags/es.png</file>
-        <file>flags/fa.png</file>
-        <file>flags/fi.png</file>
-        <file>flags/fr.png</file>
-        <file>flags/gl_ES.png</file>
-        <file>flags/he.png</file>
-        <file>flags/hr_HR.png</file>
-        <file>flags/hu.png</file>
-        <file>flags/id.png</file>
-        <file>flags/is.png</file>
-        <file>flags/it.png</file>
-        <file>flags/ja.png</file>
-        <file>flags/ka_GE.png</file>
-        <file>flags/ko_KR.png</file>
-        <file>flags/lo.png</file>
-        <file>flags/lt.png</file>
-        <file>flags/lv.png</file>
-        <file>flags/mn.png</file>
-        <file>flags/nl.png</file>
-        <file>flags/no.png</file>
-        <file>flags/pl_PL.png</file>
-        <file>flags/pt_BR.png</file>
-        <file>flags/pt_PT.png</file>
-        <file>flags/ro.png</file>
-        <file>flags/ru.png</file>
-        <file>flags/sk.png</file>
-        <file>flags/sl_SI.png</file>
-        <file>flags/sq_AL.png</file>
-        <file>flags/sv.png</file>
-        <file>flags/ta.png</file>
-        <file>flags/th.png</file>
-        <file>flags/tr.png</file>
-        <file>flags/uk.png</file>
-        <file>flags/vi.png</file>
-        <file>flags/xh.png</file>
-        <file>flags/zh_CN.png</file>
-        <file>flags/zh_TW.png</file>
-        <file>flags/en_US.png</file>
-        <file>flags/da_DK.png</file>
-        <file>flags/et_EE.png</file>
-        <file>themes/default/text.png</file>
-        <file>themes/default/histogram.png</file>
-        <file>themes/default/pie-chart.png</file>
-        <file>themes/default/console/iconClassConsole.png</file>
-        <file>themes/default/console/iconSaveConsole.png</file>
-        <file>themes/default/console/iconHelpConsole.png</file>
-        <file>themes/default/console/iconSettingsConsole.png</file>
-        <file>themes/default/console/iconOpenConsole.png</file>
-        <file>themes/default/console/iconClearConsole.png</file>
-        <file>themes/default/console/imgHelpDialog.png</file>
-        <file>themes/default/console/iconSextanteConsole.png</file>
-        <file>themes/default/console/iconScriptConsole.png</file>
-        <file>themes/default/console/iconIfaceConsole.png</file>
-        <file>themes/default/console/iconQtCoreConsole.png</file>
-        <file>themes/default/console/iconQtGuiConsole.png</file>
-        <file>themes/default/console/iconRunConsole.png</file>
-        <file>themes/default/console/iconAboutConsole.png</file>
-        <file>themes/default/console/iconCodepadConsole.png</file>
-        <file>themes/default/console/imgHelpConsole.png</file>
-        <file>themes/default/console/imgHelpMenu.png</file>
-        <file>themes/default/console/iconHideToolConsole.png</file>
-        <file>flags/sr_Cyrl.png</file>
-        <file>flags/sr_Latn.png</file>
-        <file>flags/sw.png</file>
-        <file>flags/eu_ES.png</file>
-        <file>flags/ml_IN.png</file>
-        <file>flags/km.png</file>
-        <file>themes/gis/mIconExpressionFilter.svg</file>
-        <file>themes/gis/mIconExpressionPreview.svg</file>
-        <file>themes/gis/mIconExpressionSelect.svg</file>
-        <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>
+        <file>themes/default/user.png</file>
+        <file>flags/bs_BA.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

images/themes/classic/CMakeLists.txt

@@ -1,5 +0,0 @@
-
-FILE (GLOB IMAGES *.png)
-
-INSTALL (FILES ${IMAGES}
-         DESTINATION ${QGIS_DATA_DIR}/themes/classic)

images/themes/default/CMakeLists.txt

@@ -1,8 +1,6 @@
-FILE (GLOB IMAGES *.png)
+ADD_SUBDIRECTORY(plugins)
+
+FILE(GLOB IMAGES *.png *.svg)
 
 INSTALL (FILES ${IMAGES}
          DESTINATION ${QGIS_DATA_DIR}/themes/default)
-
-FILE (GLOB PLUG_IMAGES  plugins/*.png)
-
-INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)