Merge pull request #792 from lynxlynxlynx/master

Translation update, combobox fix and triviality
qgis · Aug 8, 2013 · d5e2d39 · d5e2d39
2 parents 1a18fba + a523fa5
commit d5e2d39
Show file tree

Hide file tree

Showing 4 changed files with 602 additions and 554 deletions.
diff --git a/cmake/FindQsci.py b/cmake/FindQsci.py
@@ -38,7 +38,7 @@
 try:
     from PyQt4.Qsci import QSCINTILLA_VERSION_STR
     VER = QSCINTILLA_VERSION_STR
-except ImportError, e:
+except ImportError:
     VER = ""
 
 

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -18,7 +18,7 @@
 <tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:8517 unfinished:131 untranslated:1333" class="bartodo"><div class="bardone" style="width:85px">86.0</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/it.png"></td><td>Italian</td><td><div title="finished:7379 unfinished:771 untranslated:1831" class="bartodo"><div class="bardone" style="width:77px">77.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/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7219 unfinished:978 untranslated:1784" class="bartodo"><div class="bardone" style="width:77px">77.2</div></div></td><td>Arthur Nanni</td></tr>
-<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:7278 unfinished:531 untranslated:2171" class="bartodo"><div class="bardone" style="width:75px">75.6</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
+<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:7278 unfinished:531 untranslated:2171" class="bartodo"><div class="bardone" style="width:75px">75.6</div></div></td><td>Jože Detečnik, Dejan Gregor, Jaka Kranjc</td></tr>
 <tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:6555 unfinished:1111 untranslated:2314" class="bartodo"><div class="bardone" style="width:71px">71.2</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:6058 unfinished:1222 untranslated:2700" class="bartodo"><div class="bardone" style="width:66px">66.8</div></div></td><td>Zoltan Siki</td></tr>
 <tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:6245 unfinished:823 untranslated:2913" class="bartodo"><div class="bardone" style="width:66px">66.7</div></div></td><td>Lubos Balazovic, Jana Kormanikova, Ivan Mincik</td></tr>