Skip to content
Permalink
Browse files

Merge remote branch 'origin/master' into wcs2

  • Loading branch information
blazek committed Aug 7, 2012
2 parents e9afc7b + 829f672 commit 0fc62dd443794e6c626bc8aa52b6337c80c1f03d
Showing with 2,489 additions and 484 deletions.
  1. +21 −21 doc/TRANSLATORS
  2. +375 −311 i18n/qgis_gl_ES.ts
  3. +4 −2 images/images.qrc
  4. +105 −0 images/themes/default/mActionFreezeLabels.svg
  5. +90 −0 images/themes/default/mActionShowFrozenLabels.svg
  6. +570 −0 images/themes/gis/mActionFreezeLabels.svg
  7. +600 −0 images/themes/gis/mActionShowFrozenLabels.svg
  8. +2 −2 src/app/qgisapp.cpp
  9. +4 −2 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  10. +107 −46 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  11. +17 −18 src/core/symbology-ng/qgsvectorcolorrampv2.h
  12. +29 −5 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  13. +0 −1 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
  14. +12 −2 src/ui/qgscptcitycolorrampv2dialogbase.ui
  15. +66 −48 src/ui/qgsvectorlayerpropertiesbase.ui
  16. +2 −1 tests/src/core/testqgsrasterlayer.cpp
  17. +27 −25 tests/src/core/testqgsstylev2.cpp
  18. BIN tests/testdata/control_images/expected_raster_colorRamp3/expected_raster_colorRamp3.png
  19. +64 −0 tests/testdata/cpt-city/cb/COPYING.xml
  20. +11 −0 tests/testdata/cpt-city/cb/DESC.xml
  21. +9 −0 tests/testdata/cpt-city/cb/div/DESC.xml
  22. +15 −0 tests/testdata/cpt-city/cb/div/PiYG_03.svg
  23. +17 −0 tests/testdata/cpt-city/cb/div/PiYG_04.svg
  24. +19 −0 tests/testdata/cpt-city/cb/div/PiYG_05.svg
  25. +21 −0 tests/testdata/cpt-city/cb/div/PiYG_06.svg
  26. +23 −0 tests/testdata/cpt-city/cb/div/PiYG_07.svg
  27. +25 −0 tests/testdata/cpt-city/cb/div/PiYG_08.svg
  28. +27 −0 tests/testdata/cpt-city/cb/div/PiYG_09.svg
  29. +29 −0 tests/testdata/cpt-city/cb/div/PiYG_10.svg
  30. +31 −0 tests/testdata/cpt-city/cb/div/PiYG_11.svg
  31. +28 −0 tests/testdata/cpt-city/gmt/COPYING.xml
  32. +9 −0 tests/testdata/cpt-city/gmt/DESC.xml
  33. +41 −0 tests/testdata/cpt-city/gmt/GMT_panoply.svg
  34. +9 −0 tests/testdata/cpt-city/jjg/DESC.xml
  35. +16 −0 tests/testdata/cpt-city/jjg/misc/COPYING.xml
  36. +9 −0 tests/testdata/cpt-city/jjg/misc/DESC.xml
  37. +55 −0 tests/testdata/cpt-city/jjg/misc/temperature.svg
@@ -1,30 +1,30 @@
<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/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8059 unfinished:7 untranslated:15" class="bartodo"><div class="bardone" style="width:99px">99.8</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:8061 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.8</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:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.8</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/ja.png"></td><td>Japanese</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.8</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.8</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:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.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/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.8</div></div></td><td>Arthur Nanni</td></tr>
<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.8</div></div></td><td>Artem Popov</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7736 unfinished:0 untranslated:5" class="bartodo"><div class="bardone" style="width:95px">95.7</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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7639 unfinished:159 untranslated:92" class="bartodo"><div class="bardone" style="width:95px">95.5</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:7686 unfinished:1 untranslated:54" class="bartodo"><div class="bardone" style="width:95px">95.1</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:7666 unfinished:0 untranslated:75" class="bartodo"><div class="bardone" style="width:94px">94.9</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:7576 unfinished:6 untranslated:159" class="bartodo"><div class="bardone" style="width:93px">93.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:7432 unfinished:149 untranslated:271" class="bartodo"><div class="bardone" style="width:92px">92.9</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:7214 unfinished:16 untranslated:511" class="bartodo"><div class="bardone" style="width:89px">89.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:6676 unfinished:99 untranslated:1211" class="bartodo"><div class="bardone" style="width:83px">83.2</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:6053 unfinished:437 untranslated:1496" class="bartodo"><div class="bardone" style="width:77px">77.6</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:8054 unfinished:16 untranslated:19" class="bartodo"><div class="bardone" style="width:99px">99.7</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:8061 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.7</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:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</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/ja.png"></td><td>Japanese</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</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:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</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/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</div></div></td><td>Arthur Nanni</td></tr>
<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:7741 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:95px">95.7</div></div></td><td>Artem Popov</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7736 unfinished:0 untranslated:5" class="bartodo"><div class="bardone" style="width:95px">95.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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7639 unfinished:159 untranslated:92" class="bartodo"><div class="bardone" style="width:95px">95.4</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:7686 unfinished:1 untranslated:54" class="bartodo"><div class="bardone" style="width:95px">95.0</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:7666 unfinished:0 untranslated:75" class="bartodo"><div class="bardone" style="width:94px">94.8</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:7576 unfinished:6 untranslated:159" class="bartodo"><div class="bardone" style="width:93px">93.7</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:7432 unfinished:149 untranslated:271" class="bartodo"><div class="bardone" style="width:92px">92.8</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:7214 unfinished:16 untranslated:511" class="bartodo"><div class="bardone" style="width:89px">89.3</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:6676 unfinished:99 untranslated:1211" class="bartodo"><div class="bardone" style="width:83px">83.1</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:6053 unfinished:437 untranslated:1496" class="bartodo"><div class="bardone" style="width:77px">77.5</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:5027 unfinished:588 untranslated:2126" class="bartodo"><div class="bardone" style="width:65px">65.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:5157 unfinished:172 untranslated:2412" class="bartodo"><div class="bardone" style="width:64px">64.9</div></div></td><td>Zoran Jankovic</td></tr>
<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:5157 unfinished:172 untranslated:2412" class="bartodo"><div class="bardone" style="width:64px">64.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:4776 unfinished:844 untranslated:2121" class="bartodo"><div class="bardone" style="width:64px">64.3</div></div></td><td></td></tr>
<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:4321 unfinished:800 untranslated:2620" class="bartodo"><div class="bardone" style="width:58px">58.4</div></div></td><td>Man Chao</td></tr>
<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3710 unfinished:1008 untranslated:3023" class="bartodo"><div class="bardone" style="width:52px">52.1</div></div></td><td>Сергей Якунин</td></tr>
<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3875 unfinished:613 untranslated:3253" class="bartodo"><div class="bardone" style="width:51px">51.7</div></div></td><td>Osman Yilmaz</td></tr>
<tr><td><img src="qrc:/images/flags/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:1917 unfinished:4027 untranslated:1797" class="bartodo"><div class="bardone" style="width:48px">48.6</div></div></td><td>Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira</td></tr>
<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2545 unfinished:2466 untranslated:2903" class="bartodo"><div class="bardone" style="width:46px">46.8</div></div></td><td>Nung-yao Lin</td></tr>
<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2545 unfinished:2466 untranslated:2903" class="bartodo"><div class="bardone" style="width:46px">46.7</div></div></td><td>Nung-yao Lin</td></tr>
<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2936 unfinished:1309 untranslated:3496" class="bartodo"><div class="bardone" style="width:44px">44.4</div></div></td><td>Bùi Hữu Mạnh</td></tr>
<tr><td><img src="qrc:/images/flags/el_GR.png"></td><td>Greek, Modern (1453-) (Greece)</td><td><div title="finished:3053 unfinished:730 untranslated:3958" class="bartodo"><div class="bardone" style="width:42px">42.3</div></div></td><td>Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves</td></tr>
<tr><td><img src="qrc:/images/flags/is.png"></td><td>Icelandic</td><td><div title="finished:2966 unfinished:418 untranslated:4357" class="bartodo"><div class="bardone" style="width:39px">39.3</div></div></td><td>Thordur Ivarsson</td></tr>
@@ -33,8 +33,8 @@
<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1586 unfinished:1085 untranslated:5070" class="bartodo"><div class="bardone" style="width:26px">26.3</div></div></td><td>Marko Jarvenpaa</td></tr>
<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:1767 unfinished:708 untranslated:5511" class="bartodo"><div class="bardone" style="width:26px">26.2</div></div></td><td>Preben Lisby</td></tr>
<tr><td><img src="qrc:/images/flags/ka_GE.png"></td><td>Georgian (Georgia)</td><td><div title="finished:1372 unfinished:1296 untranslated:5073" class="bartodo"><div class="bardone" style="width:24px">25.0</div></div></td><td>Shota Murtskhvaladze, George Machitidze</td></tr>
<tr><td><img src="qrc:/images/flags/bg.png"></td><td>Bulgarian</td><td><div title="finished:1075 unfinished:1513 untranslated:5458" class="bartodo"><div class="bardone" style="width:22px">22.7</div></div></td><td>Захари Савов, Jordan Tzvetkov</td></tr>
<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:770 unfinished:1865 untranslated:5106" class="bartodo"><div class="bardone" style="width:21px">21.1</div></div></td><td>Lubos Balazovic</td></tr>
<tr><td><img src="qrc:/images/flags/bg.png"></td><td>Bulgarian</td><td><div title="finished:1075 unfinished:1513 untranslated:5458" class="bartodo"><div class="bardone" style="width:22px">22.6</div></div></td><td>Захари Савов, Jordan Tzvetkov</td></tr>
<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:770 unfinished:1865 untranslated:5106" class="bartodo"><div class="bardone" style="width:21px">21.0</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:883 unfinished:1228 untranslated:5630" class="bartodo"><div class="bardone" style="width:18px">18.5</div></div></td><td></td></tr>
<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:437 unfinished:1547 untranslated:5757" class="bartodo"><div class="bardone" style="width:14px">15.0</div></div></td><td>Anousak Souphavanh</td></tr>
<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:218 unfinished:966 untranslated:6557" class="bartodo"><div class="bardone" style="width:8px">8.7</div></div></td><td>Lonut Losifescu-Enescu</td></tr>

0 comments on commit 0fc62dd

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