Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
ccrook committed May 24, 2013
2 parents 2c55326 + 6227475 commit 1902af567d378f9b75c3fce47bf4cdab395f7941
Showing with 3,188 additions and 2,390 deletions.
  1. +5 −5 doc/TRANSLATORS
  2. +3,181 −2,383 i18n/qgis_sv.ts
  3. +2 −2 src/ui/qgisapp.ui
@@ -1,16 +1,16 @@
<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:9729 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/de.png"></td><td>German</td><td><div title="finished:9729 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:9499 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:97px">97.6</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:9408 unfinished:42 untranslated:179" class="bartodo"><div class="bardone" style="width:96px">96.9</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:9391 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:96px">96.5</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
<tr><td><img src="qrc:/images/flags/bs_BA.png"></td><td>Bosnian (Bosnia and Herzegovina)</td><td><div title="finished:9370 unfinished:0 untranslated:5" class="bartodo"><div class="bardone" style="width:96px">96.3</div></div></td><td>Almir Karabegovic</td></tr>
<tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:8924 unfinished:40 untranslated:418" class="bartodo"><div class="bardone" style="width:91px">91.9</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
<tr><td><img src="qrc:/images/flags/sv.png"></td><td>Swedish</td><td><div title="finished:7802 unfinished:943 untranslated:985" class="bartodo"><div class="bardone" style="width:85px">85.0</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:8079 unfinished:209 untranslated:1341" class="bartodo"><div class="bardone" style="width:84px">84.1</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/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:7948 unfinished:65 untranslated:1366" class="bartodo"><div class="bardone" style="width:82px">82.0</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7717 unfinished:306 untranslated:1443" class="bartodo"><div class="bardone" style="width:80px">80.9</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:7365 unfinished:751 untranslated:1513" class="bartodo"><div class="bardone" style="width:79px">79.6</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/sv.png"></td><td>Swedish</td><td><div title="finished:7109 unfinished:1230 untranslated:1290" class="bartodo"><div class="bardone" style="width:79px">79.4</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7268 unfinished:711 untranslated:1650" class="bartodo"><div class="bardone" style="width:78px">78.4</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/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7014 unfinished:908 untranslated:1383" class="bartodo"><div class="bardone" style="width:76px">76.8</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:6925 unfinished:752 untranslated:1952" class="bartodo"><div class="bardone" style="width:75px">75.0</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>
@@ -22,14 +22,14 @@
<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5200 unfinished:1175 untranslated:2930" class="bartodo"><div class="bardone" style="width:59px">59.5</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:5106 unfinished:1321 untranslated:2879" class="bartodo"><div class="bardone" style="width:59px">59.3</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:5135 unfinished:1217 untranslated:2954" class="bartodo"><div class="bardone" style="width:59px">59.0</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:3076 unfinished:5071 untranslated:1158" class="bartodo"><div class="bardone" style="width:57px">57.7</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/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:3133 unfinished:5046 untranslated:1126" class="bartodo"><div class="bardone" style="width:58px">58.1</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/km.png"></td><td>Central Khmer</td><td><div title="finished:1992 unfinished:6807 untranslated:506" class="bartodo"><div class="bardone" style="width:55px">55.5</div></div></td><td>Khoem Sokhem</td></tr>
<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4309 unfinished:1274 untranslated:3722" class="bartodo"><div class="bardone" style="width:50px">50.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:4374 unfinished:982 untranslated:3949" class="bartodo"><div class="bardone" style="width:50px">50.0</div></div></td><td>Zoran Jankovic</td></tr>
<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:3658 unfinished:1463 untranslated:4184" class="bartodo"><div class="bardone" style="width:45px">45.1</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:3418 unfinished:1463 untranslated:4424" class="bartodo"><div class="bardone" style="width:42px">42.7</div></div></td><td>Сергей Якунин</td></tr>
<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3418 unfinished:1463 untranslated:4424" class="bartodo"><div class="bardone" style="width:42px">42.6</div></div></td><td>Сергей Якунин</td></tr>
<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3263 unfinished:1299 untranslated:4743" class="bartodo"><div class="bardone" style="width:40px">40.2</div></div></td><td>Osman Yilmaz</td></tr>
<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2180 unfinished:2752 untranslated:4373" class="bartodo"><div class="bardone" style="width:36px">36.6</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:2180 unfinished:2752 untranslated:4373" class="bartodo"><div class="bardone" style="width:36px">36.5</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:2404 unfinished:1840 untranslated:5061" class="bartodo"><div class="bardone" style="width:34px">34.2</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:2676 unfinished:1033 untranslated:5596" class="bartodo"><div class="bardone" style="width:32px">32.8</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:2466 unfinished:989 untranslated:5850" class="bartodo"><div class="bardone" style="width:30px">30.4</div></div></td><td>Thordur Ivarsson</td></tr>

2 comments on commit 1902af5

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied May 24, 2013

Please use git pull --rebase before pushing.

@ccrook

This comment has been minimized.

Copy link
Contributor Author

@ccrook ccrook replied May 24, 2013

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