Skip to content

Commit d4256fe

Browse files
jef-njef-n
committedJun 10, 2012
Merge remote-tracking branch 'origin/master' into wmts
·
ltr-3_40Before-merge-new_vector_api
2 parents 3c746c7 + ed801a4 commit d4256fe

40 files changed

+1587
-1528
lines changed
 

‎doc/INSTALL.t2t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ always welcome for indicating possible mistakes.
8484

8585
You can download this document as part of the Quantum GIS 'User and
8686
Installation Guide' in HTML and PDF format via http://www.qgis.org. A current
87-
version is also available at the wiki, see:
88-
http://www.qgis.org/wiki/Installation_Guide
87+
version is also available at:
88+
http://www.qgis.org/api/INSTALL.html
8989

9090
Translations of this document can also be downloaded at the documentation area
9191
of the Quantum GIS project at http://www.qgis.org. More information is

‎doc/TRANSLATORS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<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>
66
<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>
77
<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>
8+
<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>
9+
<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>
810
<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>
11+
<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>
912
<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>
1013
<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>
11-
<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>
1214
<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>
13-
<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>
14-
<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>
1515
<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>
1616
<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>
1717
<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>

‎doc/msvc.t2t

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,27 +142,23 @@ directory or add their respective directories to your PATH.
142142

143143
=== Packaging ===
144144

145-
To create a windows 'all in one' standalone package ''under ubuntu'' (yes you
146-
read correctly) do the following:
145+
To create a standalone installer there is a perl script named 'creatensis.pl'
146+
in 'qgis/ms-windows/osgeo4w'. It downloads all required packages from OSGeo4W
147+
and repackages them into an installer using NSIS.
147148

148-
```
149-
sudo apt-get install nsis
150-
```
151149

152-
Now
150+
The script can either be run on Windows, but also can be run on Linux.
153151

154-
```
155-
cd qgis/ms-windows/osgeo4w
156-
```
152+
On Debian/Ubuntu you can just install the 'nsis' package.
157153

158-
And run the nsis creation script:
154+
NSIS for Windows can be downloaded at:
159155

160-
```
161-
creatensis.pl
162-
```
156+
http://nsis.sourceforge.net
157+
158+
And Perl for Windows (including other requirements like 'wget', 'unzip', 'tar'
159+
and 'bzip2') is available at:
163160

164-
When the script completes, it should have created a QGIS installer executable
165-
in the ms-windows directory (using the QGIS binaries from OSGEO4W).
161+
http://cygwin.com
166162

167163
=== Packaging your own build of QGIS ===
168164

‎doc/msys.t2t

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ make install
110110
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
111111
successfull install, they're not needed anymore.
112112

113-
=== Subversion ===
113+
=== git ===
114114

115-
In order to check out QGIS sources from the repository, you need Subversion
116-
client. This installer should work fine:
115+
In order to check out QGIS sources from the repository, you need a git client.
116+
This installer should work fine:
117117

118-
http://www.sliksvn.com/pub/Slik-Subversion-1.6.13-win32.msi
118+
http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe
119119

120120
=== CMake ===
121121

@@ -133,16 +133,10 @@ md c:\dev\cpp
133133
cd c:\dev\cpp
134134
```
135135

136-
Check out sources from SVN:
136+
Check out sources from GIT:
137137

138-
For svn trunk:
139-
```
140-
svn co https://svn.osgeo.org/qgis/trunk/qgis
141-
```
142-
143-
For svn 1.5 branch
144138
```
145-
svn co https://svn.osgeo.org/qgis/branches/Release-1_5_0 qgis1.5.0
139+
git clone git://github.com/qgis/Quantum-GIS.git
146140
```
147141

148142
=== Compiling ===

0 commit comments

Comments
 (0)
Please sign in to comment.