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

qgis · Jun 7, 2012 · 3c746c7 · 3c746c7
2 parents 38d15f1 + 77d3ab9
commit 3c746c7
Show file tree

Hide file tree

Showing 12 changed files with 2,168 additions and 1,956 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Friday May 11, 2012
+Tuesday June 05, 2012
 
 
-Last Updated: Friday May 11, 2012
-Last Change : Friday May 11, 2012
+Last Updated: Tuesday June 05, 2012
+Last Change : Tuesday June 05, 2012
 
 
   1. Introduction
@@ -576,14 +576,16 @@ Advanced Installation):
 
 - expat
 - fcgi
-- gdal17
+- gdal
 - grass
 - gsl-devel
 - iconv
 - pyqt4
 - qt4-devel
 - qwt5-devel-qt4
 - sip
+- spatialite
+- libspatialindex-devel
 
 This will also select packages the above packages depend on.
 

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -3,19 +3,19 @@
 <tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:7742 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/it.png"></td><td>Italian</td><td><div title="finished:7742 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.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>
 <tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:7742 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</div></div></td><td>Artem Popov</td></tr>
+<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:7741 unfinished:0 untranslated:1" class="bartodo"><div class="bardone" style="width:99px">100.0</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
+<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7741 unfinished:0 untranslated:1" class="bartodo"><div class="bardone" style="width:99px">100.0</div></div></td><td>Arthur Nanni</td></tr>
 <tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7737 unfinished:0 untranslated:5" class="bartodo"><div class="bardone" style="width:99px">99.9</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</td></tr>
-<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7717 unfinished:25 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.8</div></div></td><td>Arthur Nanni, Christian Ferreira, Leandro Kaut</td></tr>
-<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:7716 unfinished:11 untranslated:15" class="bartodo"><div class="bardone" style="width:99px">99.7</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
 <tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:7685 unfinished:1 untranslated:56" class="bartodo"><div class="bardone" style="width:99px">99.3</div></div></td><td>Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann</td></tr>
 <tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:7671 unfinished:0 untranslated:71" class="bartodo"><div class="bardone" style="width:99px">99.1</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
 <tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7563 unfinished:53 untranslated:126" class="bartodo"><div class="bardone" style="width:98px">98.0</div></div></td><td>Veiko Viil</td></tr>
 <tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:7581 unfinished:6 untranslated:155" class="bartodo"><div class="bardone" style="width:97px">98.0</div></div></td><td>Zoltan Siki</td></tr>
+<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7397 unfinished:11 untranslated:334" class="bartodo"><div class="bardone" style="width:95px">95.6</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
 <tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7364 unfinished:21 untranslated:357" class="bartodo"><div class="bardone" style="width:95px">95.3</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/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:7183 unfinished:18 untranslated:541" class="bartodo"><div class="bardone" style="width:92px">92.9</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
-<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:6662 unfinished:341 untranslated:739" class="bartodo"><div class="bardone" style="width:88px">88.3</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
 <tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:6151 unfinished:433 untranslated:1158" class="bartodo"><div class="bardone" style="width:82px">82.2</div></div></td><td>BJ Jang</td></tr>
 <tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:6091 unfinished:239 untranslated:1412" class="bartodo"><div class="bardone" style="width:80px">80.2</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
-<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:5041 unfinished:682 untranslated:2019" class="bartodo"><div class="bardone" style="width:69px">69.5</div></div></td><td>Xan Vieiro</td></tr>
+<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:5569 unfinished:612 untranslated:1561" class="bartodo"><div class="bardone" style="width:75px">75.9</div></div></td><td>Xan Vieiro</td></tr>
 <tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:5032 unfinished:588 untranslated:2122" class="bartodo"><div class="bardone" style="width:68px">68.8</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:5162 unfinished:171 untranslated:2409" class="bartodo"><div class="bardone" style="width:67px">67.8</div></div></td><td>Zoran Jankovic</td></tr>
 <tr><td><img src="qrc:/images/flags/sr_CS-Latn.png"></td><td>Serbian ()</td><td><div title="finished:4781 unfinished:843 untranslated:2118" class="bartodo"><div class="bardone" style="width:67px">67.2</div></div></td><td></td></tr>

diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -44,14 +44,16 @@ For the QGIS build you need to install following packages from OSGeo4W (select
 
 - expat
 - fcgi
-- gdal17
+- gdal
 - grass
 - gsl-devel
 - iconv
 - pyqt4
 - qt4-devel
 - qwt5-devel-qt4
 - sip
+- spatialite
+- libspatialindex-devel
 -
 
 This will also select packages the above packages depend on.