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

qgis · Jun 10, 2012 · d4256fe · d4256fe
2 parents 3c746c7 + ed801a4
commit d4256fe
Show file tree

Hide file tree

Showing 40 changed files with 1,587 additions and 1,528 deletions.
diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -84,8 +84,8 @@ always welcome for indicating possible mistakes.
 
 You can download this document as part of the Quantum GIS 'User and 
 Installation Guide' in HTML and PDF format via http://www.qgis.org. A current 
-version is also available at the wiki, see:
-http://www.qgis.org/wiki/Installation_Guide 
+version is also available at:
+http://www.qgis.org/api/INSTALL.html
 
 Translations of this document can also be downloaded at the documentation area 
 of the Quantum GIS project at http://www.qgis.org. More information is 

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -5,13 +5,13 @@
 <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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7740 unfinished:1 untranslated:1" class="bartodo"><div class="bardone" style="width:99px">100.0</div></div></td><td>Veiko Viil</td></tr>
+<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7739 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">100.0</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</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/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7723 unfinished:0 untranslated:19" class="bartodo"><div class="bardone" style="width:99px">99.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/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/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>

diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -142,27 +142,23 @@ directory or add their respective directories to your PATH.
 
 === Packaging ===
 
-To create a windows 'all in one' standalone  package ''under ubuntu'' (yes you
-read correctly) do the following:
+To create a standalone installer there is a perl script named 'creatensis.pl'
+in 'qgis/ms-windows/osgeo4w'.  It downloads all required packages from OSGeo4W
+and repackages them into an installer using NSIS.
 
-```
-sudo apt-get install nsis
-```
 
-Now 
+The script can either be run on Windows, but also can be run on Linux.
 
-```
-cd qgis/ms-windows/osgeo4w
-```
+On Debian/Ubuntu you can just install the 'nsis' package.
 
-And run the nsis creation script:
+NSIS for Windows can be downloaded at:
 
-```
-creatensis.pl
-```
+	http://nsis.sourceforge.net
+
+And Perl for Windows (including other requirements like 'wget', 'unzip', 'tar'
+and 'bzip2') is available at:
 
-When the script completes, it should have created a QGIS installer executable
-in the ms-windows directory (using the QGIS binaries from OSGEO4W). 
+	http://cygwin.com
 
 === Packaging your own build of QGIS ===
 

diff --git a/doc/msys.t2t b/doc/msys.t2t
@@ -110,12 +110,12 @@ make install
 /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
 successfull install, they're not needed anymore.
 
-=== Subversion ===
+=== git ===
 
-In order to check out QGIS sources from the repository, you need Subversion
-client. This installer should work fine:
+In order to check out QGIS sources from the repository, you need a git client.
+This installer should work fine:
 
-http://www.sliksvn.com/pub/Slik-Subversion-1.6.13-win32.msi
+http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe
 
 === CMake ===
 
@@ -133,16 +133,10 @@ md c:\dev\cpp
 cd c:\dev\cpp 
 ```
 
-Check out sources from SVN:
+Check out sources from GIT:
 
-For svn trunk:
-``` 
-svn co https://svn.osgeo.org/qgis/trunk/qgis 
-```
-
-For svn 1.5 branch
 ```
-svn co https://svn.osgeo.org/qgis/branches/Release-1_5_0 qgis1.5.0
+git clone git://github.com/qgis/Quantum-GIS.git
 ```
 
 === Compiling ===