Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
volaya committed Jan 4, 2013
2 parents 5c00014 + a572f3c commit a785fd5973edfb37c1e96fa1c4239f1bedcd53b6
Showing with 8,984 additions and 6,750 deletions.
  1. +8 −8 doc/TRANSLATORS
  2. +8,268 −6,417 i18n/qgis_lo.ts
  3. +18 −18 images/images.qrc
  4. BIN images/{ → themes/default}/console/iconAboutConsole.png
  5. BIN images/{ → themes/default}/console/iconClassConsole.png
  6. BIN images/{ → themes/default}/console/iconClearConsole.png
  7. BIN images/{ → themes/default}/console/iconCodepadConsole.png
  8. BIN images/{ → themes/default}/console/iconHelpConsole.png
  9. BIN images/{ → themes/default}/console/iconHideToolConsole.png
  10. BIN images/{ → themes/default}/console/iconIfaceConsole.png
  11. BIN images/{ → themes/default}/console/iconOpenConsole.png
  12. BIN images/{ → themes/default}/console/iconQtCoreConsole.png
  13. BIN images/{ → themes/default}/console/iconQtGuiConsole.png
  14. BIN images/{ → themes/default}/console/iconRunConsole.png
  15. BIN images/{ → themes/default}/console/iconSaveConsole.png
  16. BIN images/{ → themes/default}/console/iconScriptConsole.png
  17. BIN images/{ → themes/default}/console/iconSettingsConsole.png
  18. BIN images/{ → themes/default}/console/iconSextanteConsole.png
  19. BIN images/{ → themes/default}/console/imgHelpConsole.png
  20. BIN images/{ → themes/default}/console/imgHelpDialog.png
  21. BIN images/{ → themes/default}/console/imgHelpMenu.png
  22. +2 −3 python/CMakeLists.txt
  23. +7 −7 python/console/CMakeLists.txt
  24. +26 −0 python/console/__init__.py
  25. +13 −12 python/console/console.py
  26. +15 −15 python/console/console_help/help.htm
  27. +8 −5 python/console/console_output.py
  28. 0 python/console/console_sci.py
  29. +1 −1 python/core/symbology-ng/qgssvgcache.sip
  30. +22 −7 python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
  31. +2 −2 python/plugins/fTools/tools/doEliminate.py
  32. +1 −1 python/plugins/fTools/tools/doRandPoints.py
  33. +1 −1 python/plugins/fTools/tools/doRegPoints.py
  34. +2 −2 python/plugins/fTools/tools/doValidate.py
  35. +4 −4 python/plugins/osm/OsmDatabaseManager.py
  36. +1 −1 python/plugins/osm/OsmDownloadDlg.py
  37. +1 −1 python/plugins/osm/OsmFeatureDW.py
  38. +1 −1 scripts/tsstat.pl
  39. +3 −2 src/app/qgisapp.cpp
  40. +6 −0 src/core/CMakeLists.txt
  41. +7 −0 src/core/composer/qgscomposeritem.cpp
  42. +3 −0 src/core/composer/qgscomposeritem.h
  43. +1 −1 src/core/composer/qgscomposerlegend.cpp
  44. +4 −0 src/core/gps/tok.c
  45. +144 −0 src/core/qgsnetworkreplyparser.cpp
  46. +81 −0 src/core/qgsnetworkreplyparser.h
  47. 0 src/{providers/wfs → core}/qgswfsdata.cpp
  48. +1 −1 src/{providers/wfs → core}/qgswfsdata.h
  49. +70 −67 src/core/raster/qgsrasterfilewriter.cpp
  50. +1 −0 src/core/raster/qgsrasterfilewriter.h
  51. +44 −11 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  52. +3 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  53. +45 −21 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  54. +85 −22 src/core/symbology-ng/qgssvgcache.cpp
  55. +7 −7 src/core/symbology-ng/qgssvgcache.h
  56. +2 −1 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  57. +21 −15 src/providers/gdal/qgsgdalprovider.cpp
  58. +19 −84 src/providers/wcs/qgswcsprovider.cpp
  59. +0 −2 src/providers/wfs/CMakeLists.txt
  60. +10 −0 src/providers/wfs/qgswfscapabilities.cpp
  61. +1 −1 src/providers/wfs/qgswfscapabilities.h
  62. +6 −4 src/providers/wms/qgswmssourceselect.cpp
  63. +3 −0 src/providers/wms/qgswmssourceselect.h
  64. +3 −1 tests/src/core/testqgsrastersublayer.cpp
  65. +13 −4 tests/src/providers/testqgswcsprovider.cpp
@@ -1,13 +1,13 @@
<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:8813 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/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8619 unfinished:28 untranslated:61" class="bartodo"><div class="bardone" style="width:97px">98.0</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:8438 unfinished:22 untranslated:58" class="bartodo"><div class="bardone" style="width:95px">95.9</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/it.png"></td><td>Italian</td><td><div title="finished:7967 unfinished:28 untranslated:515" class="bartodo"><div class="bardone" style="width:90px">90.6</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/de.png"></td><td>German</td><td><div title="finished:8813 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:8619 unfinished:28 untranslated:61" class="bartodo"><div class="bardone" style="width:97px">97.9</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:8438 unfinished:22 untranslated:58" class="bartodo"><div class="bardone" style="width:95px">95.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/it.png"></td><td>Italian</td><td><div title="finished:7967 unfinished:28 untranslated:515" class="bartodo"><div class="bardone" style="width:90px">90.5</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:7316 unfinished:1131 untranslated:109" class="bartodo"><div class="bardone" style="width:89px">89.4</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:7573 unfinished:399 untranslated:543" class="bartodo"><div class="bardone" style="width:88px">88.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:7412 unfinished:461 untranslated:630" class="bartodo"><div class="bardone" style="width:86px">86.7</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:86px">86.7</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:86px">86.6</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7407 unfinished:449 untranslated:647" class="bartodo"><div class="bardone" style="width:86px">86.6</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:7412 unfinished:429 untranslated:662" class="bartodo"><div class="bardone" style="width:86px">86.5</div></div></td><td>Arthur Nanni</td></tr>
<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7412 unfinished:419 untranslated:672" class="bartodo"><div class="bardone" style="width:86px">86.5</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
@@ -16,10 +16,10 @@
<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:7249 unfinished:456 untranslated:798" class="bartodo"><div class="bardone" style="width:84px">84.8</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:7208 unfinished:440 untranslated:855" class="bartodo"><div class="bardone" style="width:84px">84.3</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:6891 unfinished:395 untranslated:1217" class="bartodo"><div class="bardone" style="width:80px">80.4</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:6507 unfinished:323 untranslated:1673" class="bartodo"><div class="bardone" style="width:75px">75.7</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:6507 unfinished:323 untranslated:1673" class="bartodo"><div class="bardone" style="width:75px">75.6</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:5906 unfinished:654 untranslated:1943" class="bartodo"><div class="bardone" style="width:70px">70.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:5610 unfinished:921 untranslated:1989" class="bartodo"><div class="bardone" style="width:68px">68.9</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:5646 unfinished:845 untranslated:2029" class="bartodo"><div class="bardone" style="width:68px">68.9</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:5646 unfinished:845 untranslated:2029" class="bartodo"><div class="bardone" style="width:68px">68.8</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:3913 unfinished:3151 untranslated:1439" class="bartodo"><div class="bardone" style="width:62px">62.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/id.png"></td><td>Indonesian</td><td><div title="finished:4803 unfinished:936 untranslated:2764" class="bartodo"><div class="bardone" style="width:59px">59.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:4914 unfinished:557 untranslated:3032" class="bartodo"><div class="bardone" style="width:58px">58.9</div></div></td><td>Zoran Jankovic</td></tr>
@@ -38,7 +38,7 @@
<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:1100 unfinished:1443 untranslated:6255" class="bartodo"><div class="bardone" style="width:20px">20.7</div></div></td><td>Lonut Losifescu-Enescu, Bogdan Pacurar</td></tr>
<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:736 unfinished:2014 untranslated:5753" class="bartodo"><div class="bardone" style="width:19px">19.8</div></div></td><td>Lubos Balazovic</td></tr>
<tr><td><img src="qrc:/images/flags/sq_AL.png"></td><td>Albanian (Albania)</td><td><div title="finished:844 unfinished:1396 untranslated:6263" class="bartodo"><div class="bardone" style="width:17px">17.5</div></div></td><td></td></tr>
<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:422 unfinished:1677 untranslated:6404" class="bartodo"><div class="bardone" style="width:14px">14.3</div></div></td><td>Anousak Souphavanh</td></tr>
<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:563 unfinished:1654 untranslated:6598" class="bartodo"><div class="bardone" style="width:15px">15.8</div></div></td><td>Anousak Souphavanh, Soukanh Lathsavong</td></tr>
<tr><td><img src="qrc:/images/flags/fa.png"></td><td>Persian</td><td><div title="finished:240 unfinished:319 untranslated:7944" class="bartodo"><div class="bardone" style="width:4px">4.5</div></div></td><td>Mola Pahnadayan</td></tr>
<tr><td><img src="qrc:/images/flags/ar.png"></td><td>Arabic</td><td><div title="finished:47 unfinished:255 untranslated:8201" class="bartodo"><div class="bardone" style="width:1px">2.0</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:341 untranslated:8162" class="bartodo"><div class="bardone" style="width:1px">1.9</div></div></td><td>Hendrik Bosman</td></tr>

0 comments on commit a785fd5

Please sign in to comment.