Skip to content
Permalink
Browse files

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

  • Loading branch information
jef-n committed Jun 10, 2012
2 parents 3c746c7 + ed801a4 commit d4256fe4b024a7c948eae7cc89f6fc3cc285b1bf
Showing with 1,587 additions and 1,528 deletions.
  1. +2 −2 doc/INSTALL.t2t
  2. +3 −3 doc/TRANSLATORS
  3. +11 −15 doc/msvc.t2t
  4. +6 −12 doc/msys.t2t
  5. +197 −197 i18n/qgis_de.ts
  6. +483 −432 i18n/qgis_et_EE.ts
  7. +401 −348 i18n/qgis_nl.ts
  8. +171 −151 i18n/qgis_pl_PL.ts
  9. +1 −1 python/plugins/fTools/__init__.py
  10. +42 −59 python/plugins/plugin_installer/installer_data.py
  11. +23 −31 python/plugins/plugin_installer/installer_gui.py
  12. +10 −43 python/plugins/plugin_installer/qgsplugininstallerbase.ui
  13. +1 −1 resources/customization.xml
  14. +1 −1 src/app/ogr/qgsogrhelperfunctions.cpp
  15. +12 −8 src/app/qgsmergeattributesdialog.cpp
  16. +6 −6 src/core/composer/qgscomposerarrow.cpp
  17. +6 −6 src/core/composer/qgscomposeritem.cpp
  18. +2 −2 src/core/composer/qgscomposerlegend.cpp
  19. +11 −11 src/core/composer/qgscomposermap.cpp
  20. +2 −2 src/core/composer/qgscomposerpicture.cpp
  21. +7 −7 src/core/composer/qgscomposerscalebar.cpp
  22. +3 −3 src/core/composer/qgscomposershape.cpp
  23. +2 −2 src/core/composer/qgscomposertable.cpp
  24. +5 −5 src/core/composer/qgscomposition.cpp
  25. +1 −2 src/core/pal/costcalculator.cpp
  26. +1 −2 src/core/pal/feature.cpp
  27. +4 −4 src/core/pal/pal.cpp
  28. +12 −12 src/core/qgsdiagramrendererv2.cpp
  29. +5 −5 src/core/qgslabel.cpp
  30. +4 −4 src/core/qgsmaplayer.cpp
  31. +2 −2 src/core/qgsvectorlayer.cpp
  32. +2 −2 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  33. +3 −3 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  34. +1 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  35. +9 −9 src/gui/qgsannotationitem.cpp
  36. +3 −0 src/gui/qgsprojectionselector.cpp
  37. +8 −8 src/mapserver/qgswmsserver.cpp
  38. +110 −124 src/plugins/heatmap/heatmapguibase.ui
  39. +2 −2 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
  40. +12 −0 src/providers/wfs/qgswfsprovider.cpp
@@ -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
@@ -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>
@@ -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 ===

@@ -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 ===

0 comments on commit d4256fe

Please sign in to comment.
You can’t perform that action at this time.