20 changes: 10 additions & 10 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEAD>
<META NAME="generator" CONTENT="http://txt2tags.org">
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<TITLE>Quantum GIS (QGIS)</TITLE>
<TITLE>QGIS</TITLE>

<!-- Included style.css -->
<STYLE TYPE="text/css">
Expand Down Expand Up @@ -75,7 +75,7 @@
<BODY>

<DIV CLASS="header" ID="header">
<H1>Quantum GIS (QGIS)</H1>
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Wednesday April 24, 2013</H3>
</DIV>
Expand Down Expand Up @@ -106,7 +106,7 @@ <H3>Wednesday April 24, 2013</H3>
<UL>
<LI><A HREF="#toc14">4.1. Building with Microsoft Visual Studio</A>
<LI><A HREF="#toc15">4.2. Building using MinGW</A>
<LI><A HREF="#toc16">4.3. Creation of MSYS environment for compilation of Quantum GIS</A>
<LI><A HREF="#toc16">4.3. Creation of MSYS environment for compilation of QGIS</A>
</UL>
<LI><A HREF="#toc17">Building on MacOS X</A>
<UL>
Expand Down Expand Up @@ -140,10 +140,10 @@ <H1>1. Introduction</H1>

<P>
This document is the original installation guide of the described software
Quantum GIS. The software and hardware descriptions named in this
QGIS. The software and hardware descriptions named in this
document are in most cases registered trademarks and are therefore subject
to the legal requirements. Quantum GIS is subject to the GNU General Public
License. Find more information on the Quantum GIS Homepage:
to the legal requirements. QGIS is subject to the GNU General Public
License. Find more information on the QGIS Homepage:
<A HREF="http://www.qgis.org">http://www.qgis.org</A>
</P>
<P>
Expand All @@ -155,14 +155,14 @@ <H1>1. Introduction</H1>
always welcome for indicating possible mistakes.
</P>
<P>
You can download this document as part of the Quantum GIS 'User and
You can download this document as part of the QGIS 'User and
Installation Guide' in HTML and PDF format via <A HREF="http://www.qgis.org">http://www.qgis.org</A>. A current
version is also available at:
<A HREF="http://www.qgis.org/api/INSTALL.html">http://www.qgis.org/api/INSTALL.html</A>
</P>
<P>
Translations of this document can also be downloaded at the documentation area
of the Quantum GIS project at <A HREF="http://www.qgis.org">http://www.qgis.org</A>. More information is
of the QGIS project at <A HREF="http://www.qgis.org">http://www.qgis.org</A>. More information is
available via <A HREF="http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner">http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner</A>.
</P>
<P>
Expand Down Expand Up @@ -1282,7 +1282,7 @@ <H3>4.2.5. git</H3>
<H3>4.2.6. CMake</H3>

<P>
CMake is build system used by Quantum GIS. Download it from here:
CMake is build system used by QGIS. Download it from here:
</P>
<P>
<A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe</A>
Expand Down Expand Up @@ -1395,7 +1395,7 @@ <H3>4.2.12. Create the installation package: (optional)</H3>
</P>

<A NAME="toc16"></A>
<H2>4.3. Creation of MSYS environment for compilation of Quantum GIS</H2>
<H2>4.3. Creation of MSYS environment for compilation of QGIS</H2>

<H3>4.3.1. Initial setup</H3>

Expand Down
12 changes: 6 additions & 6 deletions doc/INSTALL.t2t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Quantum GIS (QGIS)
QGIS
Building QGIS from source - step by step
%%date(%A %B %d, %Y)

Expand Down Expand Up @@ -71,10 +71,10 @@ Last Change : %%mtime(%A %B %d, %Y)
= Introduction =

This document is the original installation guide of the described software
Quantum GIS. The software and hardware descriptions named in this
QGIS. The software and hardware descriptions named in this
document are in most cases registered trademarks and are therefore subject
to the legal requirements. Quantum GIS is subject to the GNU General Public
License. Find more information on the Quantum GIS Homepage:
to the legal requirements. QGIS is subject to the GNU General Public
License. Find more information on the QGIS Homepage:
http://www.qgis.org

The details, that are given in this document have been written and verified
Expand All @@ -84,13 +84,13 @@ liable to any duties or guarantees. The editors and publishers do not take
any responsibility or liability for failures and their consequences. You are
always welcome for indicating possible mistakes.

You can download this document as part of the Quantum GIS 'User and
You can download this document as part of the QGIS 'User and
Installation Guide' in HTML and PDF format via http://www.qgis.org. A current
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
of the QGIS project at http://www.qgis.org. More information is
available via http://wiki.qgis.org/qgiswiki/DocumentationWritersCorner.

Please visit http://qgis.org for information on joining our mailing lists
Expand Down
22 changes: 11 additions & 11 deletions doc/TRANSLATORS
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<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:9630 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/ja.png"></td><td>Japanese</td><td><div title="finished:9462 unfinished:33 untranslated:120" class="bartodo"><div class="bardone" style="width:98px">98.4</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9623 unfinished:3 untranslated:3" 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/ja.png"></td><td>Japanese</td><td><div title="finished:9408 unfinished:42 untranslated:179" class="bartodo"><div class="bardone" style="width:97px">97.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:9384 unfinished:2 untranslated:5" class="bartodo"><div class="bardone" style="width:97px">97.5</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:9367 unfinished:23 untranslated:109" class="bartodo"><div class="bardone" style="width:97px">97.4</div></div></td><td>Xan Vieiro</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:97px">97.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:92px">92.9</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:8125 unfinished:202 untranslated:1287" class="bartodo"><div class="bardone" style="width:85px">85.4</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/fr.png"></td><td>French</td><td><div title="finished:8079 unfinished:209 untranslated:1341" class="bartodo"><div class="bardone" style="width:84px">85.0</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.9</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:81px">81.7</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:7408 unfinished:743 untranslated:1463" class="bartodo"><div class="bardone" style="width:80px">80.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/sv.png"></td><td>Swedish</td><td><div title="finished:7151 unfinished:1225 untranslated:1238" class="bartodo"><div class="bardone" style="width:80px">80.6</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:7423 unfinished:643 untranslated:1239" class="bartodo"><div class="bardone" style="width:80px">80.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:77px">77.5</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:6965 unfinished:744 untranslated:1905" class="bartodo"><div class="bardone" style="width:76px">76.2</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:6478 unfinished:1071 untranslated:2065" class="bartodo"><div class="bardone" style="width:72px">72.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:6478 unfinished:992 untranslated:2144" class="bartodo"><div class="bardone" style="width:72px">72.4</div></div></td><td>Artem Popov</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:80px">80.4</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:80px">80.2</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:79px">79.2</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:77px">77.6</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.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:6441 unfinished:1074 untranslated:2114" class="bartodo"><div class="bardone" style="width:72px">72.5</div></div></td><td>Arthur Nanni</td></tr>
<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:6448 unfinished:1044 untranslated:1813" class="bartodo"><div class="bardone" style="width:72px">72.4</div></div></td><td>Zoltan Siki</td></tr>
<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:6441 unfinished:995 untranslated:2193" class="bartodo"><div class="bardone" style="width:72px">72.1</div></div></td><td>Artem Popov</td></tr>
<tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:6391 unfinished:997 untranslated:1917" class="bartodo"><div class="bardone" style="width:71px">71.5</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:6072 unfinished:892 untranslated:2341" class="bartodo"><div class="bardone" style="width:67px">67.7</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
<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:60px">60.1</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
Expand All @@ -37,8 +37,8 @@
<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:1802 unfinished:1658 untranslated:5845" class="bartodo"><div class="bardone" style="width:27px">27.3</div></div></td><td>Lonut Losifescu-Enescu, Bogdan Pacurar</td></tr>
<tr><td><img src="qrc:/images/flags/ka_GE.png"></td><td>Georgian (Georgia)</td><td><div title="finished:1176 unfinished:1665 untranslated:6464" class="bartodo"><div class="bardone" style="width:20px">20.9</div></div></td><td>Shota Murtskhvaladze, George Machitidze</td></tr>
<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1256 unfinished:1430 untranslated:6619" class="bartodo"><div class="bardone" style="width:20px">20.5</div></div></td><td>Marko Järvenpää</td></tr>
<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:669 unfinished:2063 untranslated:6882" class="bartodo"><div class="bardone" style="width:17px">17.7</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:885 unfinished:1620 untranslated:6800" class="bartodo"><div class="bardone" style="width:17px">17.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:663 unfinished:2063 untranslated:6903" class="bartodo"><div class="bardone" style="width:17px">17.6</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:815 unfinished:1471 untranslated:7019" class="bartodo"><div class="bardone" style="width:16px">16.1</div></div></td><td></td></tr>
<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:553 unfinished:1671 untranslated:7081" class="bartodo"><div class="bardone" style="width:14px">14.4</div></div></td><td>Anousak Souphavanh, Soukanh Lathsavong</td></tr>
<tr><td><img src="qrc:/images/flags/lt.png"></td><td>Lithuanian</td><td><div title="finished:1043 unfinished:473 untranslated:7789" class="bartodo"><div class="bardone" style="width:13px">13.3</div></div></td><td>Kestas M</td></tr>
Expand Down
8 changes: 4 additions & 4 deletions doc/index.dox
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
/* $Id:$ */
#endif /* DOXYGEN_SKIP */

/*! \mainpage Quantum GIS
/*! \mainpage QGIS

\section index_intro Introduction
\htmlonly<img src="http://hub.qgis.org/projects/quantum-gis/repository/revisions/master/entry/images/icons/qgis-icon-60x60.png" alt="QGIS"
align="left"><a href="http://qgis.org">Quantum GIS</a>\endhtmlonly\latexonly
Quantum GIS \endlatexonly (QGIS) is a user friendly Open Source Geographic
align="left"><a href="http://qgis.org">QGIS</a>\endhtmlonly\latexonly
QGIS \endlatexonly is a user friendly Open Source Geographic
Information System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS
supports vector, raster, and database formats. QGIS is licensed under the GNU
General Public License. QGIS lets you browse and create map data on your
Expand All @@ -21,7 +21,7 @@ welcome.

\section index_APIStability Earlier versions of the API

Earlier version of the documentation are also available on the Quantum GIS
Earlier version of the documentation are also available on the QGIS
website:

<ul>
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<a href="http://qgis.org"><img src="images/qgis_new_80pct.png" border=0></a>
</td>
<td valign="center">
<span class="header">Quantum GIS Documentation</span><br>
<span class="header">QGIS Documentation</span><br>
<span class="subheader">Use Help inside functions or:</span><br>
<span class="warning">You can find a <a href="http://www.qgis.org/en/documentation/manuals.html">PDF manual of the current version</a> on the QGIS website.</span>
</td>
Expand Down
4 changes: 2 additions & 2 deletions doc/msys.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe

=== CMake ===

CMake is build system used by Quantum GIS. Download it from here:
CMake is build system used by QGIS. Download it from here:

http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe

Expand Down Expand Up @@ -208,7 +208,7 @@ Now using windows explorer, enter the win_build directory in your QGIS source
tree. Read the READMEfile there and follow the instructions. Next right click
on qgis.nsi and choose the option 'Compile NSIS Script'.

== Creation of MSYS environment for compilation of Quantum GIS ==
== Creation of MSYS environment for compilation of QGIS ==

=== Initial setup ===

Expand Down
4 changes: 2 additions & 2 deletions doc/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEAD>
<META NAME="generator" CONTENT="http://txt2tags.org">
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<TITLE>Quantum GIS (QGIS) News</TITLE>
<TITLE>QGIS News</TITLE>

<!-- Included style.css -->
<STYLE TYPE="text/css">
Expand Down Expand Up @@ -75,7 +75,7 @@
<BODY>

<DIV CLASS="header" ID="header">
<H1>Quantum GIS (QGIS) News</H1>
<H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2>
<H3>Saturday May 26, 2012</H3>
</DIV>
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Quantum GIS (QGIS) News
QGIS News
Change history for the QGIS Project
%%date(%A %B %d, %Y)

Expand Down
1,008 changes: 645 additions & 363 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

949 changes: 850 additions & 99 deletions i18n/qgis_es.ts

Large diffs are not rendered by default.

3,124 changes: 1,975 additions & 1,149 deletions i18n/qgis_fr.ts

Large diffs are not rendered by default.

3,226 changes: 2,074 additions & 1,152 deletions i18n/qgis_it.ts

Large diffs are not rendered by default.

3,063 changes: 1,935 additions & 1,128 deletions i18n/qgis_ja.ts

Large diffs are not rendered by default.

13,395 changes: 9,667 additions & 3,728 deletions i18n/qgis_pl_PL.ts

Large diffs are not rendered by default.

3,066 changes: 1,908 additions & 1,158 deletions i18n/qgis_pt_BR.ts

Large diffs are not rendered by default.

3,283 changes: 2,112 additions & 1,171 deletions i18n/qgis_ru.ts

Large diffs are not rendered by default.

3,059 changes: 1,846 additions & 1,213 deletions i18n/qgis_sk.ts

Large diffs are not rendered by default.

3,043 changes: 1,862 additions & 1,181 deletions i18n/qgis_sv.ts

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions python/console/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
ADD_SUBDIRECTORY(help)

SET (QGIS_CONSOLE_DIR ${QGIS_DATA_DIR}/python/console)
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)

SET(PY_CONSOLE_FILES
console.py
console_sci.py
console_help.py
console_settings.py
console_output.py
console_editor.py
Expand Down
7 changes: 2 additions & 5 deletions python/console/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@
from console_sci import ShellScintilla
from console_output import ShellOutputScintilla
from console_editor import EditorTabWidget
from console_help import HelpDialog
from console_settings import optionsDialog
from qgis.core import QgsApplication
from qgis.core import QgsApplication, QgsContextHelp
from qgis.gui import QgsFilterLineEdit

import sys
Expand Down Expand Up @@ -93,7 +92,6 @@ def __init__(self, parent=None):
self.settings = QSettings()

self.options = optionsDialog(self)
self.helpDlg = HelpDialog(self)

self.shell = ShellScintilla(self)
self.setFocusProxy(self.shell)
Expand Down Expand Up @@ -675,8 +673,7 @@ def saveAsScriptFile(self):
self.updateTabListScript(pathFileName, action='remove')

def openHelp(self):
self.helpDlg.show()
self.helpDlg.activateWindow()
QgsContextHelp.run( "PythonConsole" )

def openSettings(self):
self.options.exec_()
Expand Down
54 changes: 0 additions & 54 deletions python/console/console_help.py

This file was deleted.

82 changes: 0 additions & 82 deletions python/console/console_help.ui

This file was deleted.

201 changes: 0 additions & 201 deletions python/console/help/help.htm

This file was deleted.

4 changes: 1 addition & 3 deletions python/console/help/i18n/de_DE.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ i18n_dict = {
"header.title" : "Python Console für QGIS",
"header.subject" : "Python Console auf PyQScintilla2 basierend",
"header.subject.main" : "Das Objekt qgis.utils.iface (Instanz der Klasse QgisInterface) ermöglicht den Zugriff \
quf die Quantum GIS Umgebung von der Konsole aus. \
auf die QGIS-Umgebung von der Konsole aus. \
Über den defür bestimmten Knopf in der Werkzeugleiste \
kann die Klasse QgisInterface geladen werden.",
"features" : "Funktionen",
Expand All @@ -24,6 +24,4 @@ i18n_dict = {
"toolbar.script.save" : "Speichern eines Pythonscripts.",
"toolbar.help" : "Hilfe",
"toolbar.run" : "Zum Ausführen eines Befehlt (wie Eingabe von Enter)",
"thanks" : "Dank",
"thanks.text" : "Danke an Larry Shaffer für die API-Dateien."
};
10 changes: 5 additions & 5 deletions python/console/help/i18n/en_US.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
i18n_dict = {
"header.title" : "Python Console for QGIS",
"header.subject" : "Python Console based on PyQScintilla2.",
"header.subject.main" : "To access Quantum GIS environment from this console \
"header.subject.main" : "To access the QGIS environment from this console \
use qgis.utils.iface object (instance of QgisInterface class). \
To import the class QgisInterface can also use the dedicated \
button on the toolbar on the left.",
Expand All @@ -18,12 +18,12 @@ i18n_dict = {
"features.a" : "CTRL+SPACE to view the auto-completion list.",
"features.b" : "CTRL+ALT+SPACE to view the command history list.",
"features.c" : "Saves the command history by typing '_save' or closing the widget. \
This command saves the history command in the file ~/.qgis/console_history.txt",
"features.d" : "Clears the command history by typing '_clear'. \
This command clears the command history from file ~/.qgis/console_history.txt",
This command saves the history command in the file ~/.qgis2/console_history.txt",
"features.d" : "Clears the command history by typing <b>_clear</b>. \
This command clears the command history from file ~/.qgis2/console_history.txt",
"features.e" : "Clears completely command history by typing '_clearAll'. \
This command clears completely the command history. It has an irreversible effect.",
"features.api.doc" : "Open Quantum GIS API documentation by typing '_api'.",
"features.api.doc" : "Open QGIS API documentation by typing '_api'.",
"features.pyqgis.doc" : "Open PyQGIS Cookbook by typing '_pyqgis'.",
"toolbar" : "Toolbar",
"toolbar.title" : "The following is a description of the tools in the toolbar:",
Expand Down
2 changes: 1 addition & 1 deletion python/console/help/i18n/it_IT.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
i18n_dict = {
"header.title" : "Console Python per QGIS",
"header.subject" : "Console Python basata su PyQScintilla2.",
"header.subject.main" : "Per accedere all'ambiente Quantum GIS da questa console \
"header.subject.main" : "Per accedere all'ambiente QGIS da questa console \
usa l'oggetto qgis.utils.iface (istanza della classe QgisInterface). \
Per importare la classe QgisInterface puoi usare anche il bottone dedicato che si trova \
sulla toolbar.",
Expand Down
4 changes: 2 additions & 2 deletions python/console/help/i18n/ru_RU.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
i18n_dict = {
"header.title" : "Консоль Python для QGIS",
"header.subject" : "Консоль Python на основе PyQScintilla2.",
"header.subject.main" : "Для доступа к окружению Quantum GIS из консоли \
"header.subject.main" : "Для доступа к окружению QGIS из консоли \
используйте объект qgis.utils.iface (экземпляр класса QgisInterface). \
Также можно испортировать класс QgisInterface при помощи специальной \
кнопки на панели инструментов слева.",
Expand All @@ -23,7 +23,7 @@ i18n_dict = {
Очищает содержимое файла ~/.qgis/console_history.txt",
"features.e" : "Полная очистка истории введённых команд при помощи метода '_clearAll'. \
Вызов метода приведёт к полной очистке истории введённых команд. Эту операцию нельзя отменить.",
"features.api.doc" : "Открытие API-документации Quantum GIS API при помощи метода '_api'.",
"features.api.doc" : "Открытие API-документации QGIS API при помощи метода '_api'.",
"features.pyqgis.doc" : "Открытие Поваренной книги разработчика PyQGIS при помощи метода '_pyqgis'.",
"toolbar" : "Панель инструментов",
"toolbar.title" : "На панели инструментов расположены следующие кнопки:",
Expand Down
4 changes: 2 additions & 2 deletions python/core/qgis.sip
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! \mainpage Quantum GIS
/*! \mainpage QGIS
*
* \section about About QGIS
* Quantum GIS (QGIS) is a user friendly Open Source Geographic Information
* QGIS is a user friendly Open Source Geographic Information
* System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS supports
* vector, raster, and database formats. QGIS is licensed under the GNU Public
* License.
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/GdalTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def initGui( self ):
if not valid: return
if int( self.QgisVersion ) < 1:
QMessageBox.warning( self.iface.getMainWindow(), "Gdal Tools",
QCoreApplication.translate( "GdalTools", "Quantum GIS version detected: " ) +unicode( self.QgisVersion )+".xx\n"
QCoreApplication.translate( "GdalTools", "QGIS version detected: " ) +unicode( self.QgisVersion )+".xx\n"
+ QCoreApplication.translate( "GdalTools", "This version of Gdal Tools requires at least QGIS version 1.0.0\nPlugin will not be enabled." ) )
return None

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/fTools/fTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def updateThemeIcons(self, theme):
def initGui(self):
if int(self.QgisVersion) < 1:
QMessageBox.warning(self.iface.getMainWindow(), "fTools",
QCoreApplication.translate("fTools", "Quantum GIS version detected: ") +unicode(self.QgisVersion)+".xx\n"
QCoreApplication.translate("fTools", "QGIS version detected: ") +unicode(self.QgisVersion)+".xx\n"
+ QCoreApplication.translate("fTools", "This version of fTools requires at least QGIS version 1.0.0\nPlugin will not be enabled."))
return None
QObject.connect(self.iface, SIGNAL("currentThemeChanged (QString)"), self.updateThemeIcons)
Expand Down
20 changes: 10 additions & 10 deletions python/plugins/plugin_installer/installer_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ def populateMostWidgets(self):
if repositories.all()[key]["valid"]:
a.setToolTip(0,self.tr("This repository is disabled"))
else:
a.setToolTip(0,self.tr("This repository is blocked due to incompatibility with your Quantum GIS version"))
a.setToolTip(0,self.tr("This repository is blocked due to incompatibility with your QGIS version"))
for i in [0,1,2]:
a.setForeground(i,QBrush(QColor(Qt.gray)))
for i in [0,1,2]:
Expand Down Expand Up @@ -417,8 +417,8 @@ def populatePluginTree(self):
"orphan" : self.tr("This plugin is installed, but I can't find it in any enabled repository"),
"new" : self.tr("This plugin is not installed and is seen for the first time"),
"newer" : self.tr("This plugin is installed and is newer than its version available in a repository"),
"incompatible" : self.tr("This plugin is incompatible with your Quantum GIS version and probably won't work."),
"dependent" : self.tr("The required Python module is not installed.\nFor more information, please visit its homepage and Quantum GIS wiki."),
"incompatible" : self.tr("This plugin is incompatible with your QGIS version and probably won't work."),
"dependent" : self.tr("The required Python module is not installed.\nFor more information, please visit its homepage and QGIS wiki."),
"broken" : self.tr("This plugin seems to be broken.\nIt has been installed but can't be loaded.\nHere is the error message:")}
statuses ={"not installed" : self.tr("not installed", "singular"),
"installed" : self.tr("installed", "singular"),
Expand Down Expand Up @@ -465,7 +465,7 @@ def addItem(p):
descTip = statusTips[p["error"]] + "\n" + p["error_details"]
statusTip = descTip
elif p["error"] == "incompatible":
desc = self.tr("This plugin requires a newer version of Quantum GIS") + " (" + self.tr("at least")+ " " + p["error_details"] + ")"
desc = self.tr("This plugin requires a newer version of QGIS") + " (" + self.tr("at least")+ " " + p["error_details"] + ")"
descTip = statusTips[p["error"]]
statusTip = descTip
elif p["error"] == "dependent":
Expand Down Expand Up @@ -662,13 +662,13 @@ def installPlugin(self, key, quiet=False):
infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Plugin reinstalled successfully"))
reloadPlugin(key)
else:
infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Python plugin reinstalled.\nYou need to restart Quantum GIS in order to reload it."))
else: infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Python plugin reinstalled.\nYou need to restart Quantum GIS in order to reload it."))
infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Python plugin reinstalled.\nYou need to restart QGIS in order to reload it."))
else: infoString = (self.tr("Plugin reinstalled successfully"), self.tr("Python plugin reinstalled.\nYou need to restart QGIS in order to reload it."))
if quiet:
infoString = (None, None)
else:
if plugin["error"] == "incompatible":
message = self.tr("The plugin is designed for a newer version of Quantum GIS. The minimum required version is:")
message = self.tr("The plugin is designed for a newer version of QGIS. The minimum required version is:")
message += " <b>" + plugin["error_details"] + "</b>"
elif plugin["error"] == "dependent":
message = self.tr("The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it:")
Expand Down Expand Up @@ -761,7 +761,7 @@ def uninstallPlugin(self,key):
plugins.rebuild()
self.populatePluginTree()
if QGIS_14: QMessageBox.information(self, self.tr("Plugin uninstalled successfully"), self.tr("Plugin uninstalled successfully"))
else: QMessageBox.information(self, self.tr("Plugin uninstalled successfully"), self.tr("Python plugin uninstalled. Note that you may need to restart Quantum GIS in order to remove it completely."))
else: QMessageBox.information(self, self.tr("Plugin uninstalled successfully"), self.tr("Python plugin uninstalled. Note that you may need to restart QGIS in order to remove it completely."))
history.markChange(key,'D')


Expand Down Expand Up @@ -813,7 +813,7 @@ def changePluginPolicy(self, state):
# ----------------------------------------- #
#def addKnownRepositories(self):
#""" update list of known repositories - in the future it will be replaced with an online fetching """
#message = self.tr("You are about to add several plugin repositories that are neither authorized nor supported by the Quantum GIS team. Plugin authors generally make efforts to ensure that their work is useful and safe, however, we can assume no responsibility for them.")
#message = self.tr("You are about to add several plugin repositories that are neither authorized nor supported by the QGIS team. Plugin authors generally make efforts to ensure that their work is useful and safe, however, we can assume no responsibility for them.")
#if QMessageBox.question(self, self.tr("QGIS Python Plugin Installer"), message, QMessageBox.Ok, QMessageBox.Abort) == QMessageBox.Ok:
#repositories.addKnownRepos()
## refresh lists and populate widgets
Expand Down Expand Up @@ -872,7 +872,7 @@ def editRepository(self):
dlg.labelInfo.setText("")
else:
dlg.checkBoxEnabled.setEnabled(False)
dlg.labelInfo.setText(self.tr("This repository is blocked due to incompatibility with your Quantum GIS version"))
dlg.labelInfo.setText(self.tr("This repository is blocked due to incompatibility with your QGIS version"))
dlg.labelInfo.setFrameShape(QFrame.Box)
if not dlg.exec_():
return # nothing to do if cancelled
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/plugin_installer/qgsplugininstallerbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; If this function is enabled, QGIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
6 changes: 3 additions & 3 deletions qgis.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.TH QGIS 1 "March 9, 2011"
.SH NAME
qgis \- Quantum GIS Geographic Information System
qgis \- QGIS Geographic Information System
.SH SYNOPSIS
.B qgis [--snapshot
.I filename]
Expand Down Expand Up @@ -36,7 +36,7 @@ qgis \- Quantum GIS Geographic Information System
.br
See OPTIONS for a full description.
.SH DESCRIPTION
Quantum GIS (QGIS) is a cross platform, Free and Open Source Geographic
QGIS is a cross platform, Free and Open Source Geographic
Information System (GIS). Supported platforms include Linux/Unix, Mac OS X and
Microsoft Windows. QGIS supports vector, raster, and database formats. QGIS is
licensed under the GNU General Public License.
Expand Down Expand Up @@ -113,7 +113,7 @@ layers in a PostgreSQL database and GRASS vector/raster data.

.SH FILES
.TP
.B ~/.config/QuantumGIS/qgis.conf
.B ~/.config/QGIS/qgis.conf
QGIS preferences file. This file stores windows size/location, loaded plugins,
user options, and other application settings.
.SH BUGS
Expand Down
159 changes: 159 additions & 0 deletions resources/context_help/PythonConsole
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Help Python Console</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

<style>
body{
font-family: 'Trebuchet MS', sans-serif;
font-size : 12px;
}
#header{
background: #f6f6f6;
border-bottom: 3px solid #000;
width: 100%;
}
#headerTool td{
background: #f6f6f6;
/*width: 100%;*/
}
._titleP {
padding: 5px;
font-size: 15px;
font-weight: bold;
color: #000;
}
._title {
font-size: 20px;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<table id="header">
<tr>
<td>
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
</td>
<td>
<span class="_title">#header.title#</span>
</td>
</tr>
</table>
<table>
<tr>
<td>
<p align="justify">
#header.subject#
<br><br>
#header.subject.main#
</p>
</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
</tr>
<tr>
<td>
<p align="justify">
#header.subject.A#
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
#header.subject.B#
</p>
</td>
</tr>
</table>
<table id="header">
<tr>
<td>
<span class="_titleP">#features#</span>
</td>
</tr>
</table>
<p align="justify">
<ul>
<li>#features.title#
<ol>
<li>Python</li>
<li>PyQGIS-master</li>
<li>PyQt4</li>
<li>QScintilla2</li>
<li>osgeo-gdal-ogr</li>
</ol>
</li>
<br>
<li>#features.a#</li>
<br>
<li>#features.b#</li>
<br>
<li>#features.api.doc#</li>
<br>
<li>#features.pyqgis.doc#</li>
<br>
<li>#features.c#</li>
<br>
<li>#features.d#</li>
<br>
<li>#features.e#</li>
</ul>
</p>
<table id="header">
<tr>
<td>
<span class="_titleP">#toolbar#</span>
</td>
</tr>
</table>
<p>#toolbar.title#</p>
<table width="100%" border="0" id="headerTool">
<tr>
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
<td colspan="2">#toolbar.clear#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
<td>#toolbar.iface#</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
<td>#toolbar.sextante#</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
<td>#toolbar.qtcore#</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
<td>#toolbar.qtgui#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
<td>#toolbar.script.open#</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
<td>#toolbar.script.save#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
<td colspan="2">#toolbar.settings#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
<td colspan="2">#toolbar.help#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
<td colspan="2">#toolbar.run#</td>
</tr>
</table>
</body>
</html>
165 changes: 165 additions & 0 deletions resources/context_help/PythonConsole-de_DE
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Help Python Console</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

<style>
body{
font-family: 'Trebuchet MS', sans-serif;
font-size : 12px;
}
#header{
background: #f6f6f6;
border-bottom: 3px solid #000;
width: 100%;
}
#headerTool td{
background: #f6f6f6;
/*width: 100%;*/
}
._titleP {
padding: 5px;
font-size: 15px;
font-weight: bold;
color: #000;
}
._title {
font-size: 20px;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<table id="header">
<tr>
<td>
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
</td>
<td>
<span class="_title">Python Console für QGIS</span>
</td>
</tr>
</table>
<table>
<tr>
<td>
<p align="justify">
Python Console auf PyQScintilla2 basierend
<br><br>
Das Objekt qgis.utils.iface (Instanz der Klasse QgisInterface) ermöglicht den Zugriff
auf die QGIS-Umgebung von der Konsole aus.
Über den defür bestimmten Knopf in der Werkzeugleiste
kann die Klasse QgisInterface geladen werden.
</p>
</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
</tr>
<tr>
<td>
<p align="justify">
#header.subject.A#
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
#header.subject.B#
</p>
</td>
</tr>
</table>
<table id="header">
<tr>
<td>
<span class="_titleP">Funktionen</span>
</td>
</tr>
</table>
<p align="justify">
<ul>
<li>Auto-Vervollständigung und Syntaxhervorhebung der folgenden Programmierschnittstellen:
<ol>
<li>Python</li>
<li>PyQGIS-master</li>
<li>PyQt4</li>
<li>QScintilla2</li>
<li>osgeo-gdal-ogr</li>
</ol>
</li>
<br>
<li>Strg+Leertaste zur Anzeige der Verfolgständigungsliste.</li>
<br>
<li>Strg+Alt+Leertaste um die Befehlshistorie anzuzeigen.</li>
<br>
<li>#features.api.doc#</li>
<br>
<li>#features.pyqgis.doc#</li>
<br>
<li>Zum Speichern der Befehlshistorie '_save' eingeben oder das Konsolfenster schließen.
Dieser Befehl speichert die Historie in ~/.qgis/console_history.txt</li>
<br>
<li>Zum Löschen der Befehlshistorie '_clear' eingeben.
Dieser Befehl löscht die Befehlshistorie aus ~/.qgis/console_history.txt</li>
<br>
<li>Zum kompletten Löschen der Befehlshistorie '_clearAll' eingeben.
Dieser Befehl löscht die ganze Befehlshistorie. Er ist nicht zurückzunehmen.</li>
</ul>
</p>
<table id="header">
<tr>
<td>
<span class="_titleP">Werkzeugleiste</span>
</td>
</tr>
</table>
<p>Im folgende Beschreibungen der Werkzeuge in der Leiste:</p>
<table width="100%" border="0" id="headerTool">
<tr>
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
<td colspan="2">Löschen der Python-Konsole</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
<td>Import der Klasse iface</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
<td>Import der Klasse Sextante</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
<td>#toolbar.qtcore#</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
<td>#toolbar.qtgui#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
<td>Laden eines Pythonscripts in die Konsole</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
<td>Speichern eines Pythonscripts.</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
<td colspan="2">#toolbar.settings#</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
<td colspan="2">Hilfe</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
<td colspan="2">Zum Ausführen eines Befehlt (wie Eingabe von Enter)</td>
</tr>
</table>
</body>
</html>
171 changes: 171 additions & 0 deletions resources/context_help/PythonConsole-en_US
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Help Python Console</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

<style>
body{
font-family: 'Trebuchet MS', sans-serif;
font-size : 12px;
}
#header{
background: #f6f6f6;
border-bottom: 3px solid #000;
width: 100%;
}
#headerTool td{
background: #f6f6f6;
/*width: 100%;*/
}
._titleP {
padding: 5px;
font-size: 15px;
font-weight: bold;
color: #000;
}
._title {
font-size: 20px;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<table id="header">
<tr>
<td>
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
</td>
<td>
<span class="_title">Python Console for QGIS</span>
</td>
</tr>
</table>
<table>
<tr>
<td>
<p align="justify">
Python Console based on PyQScintilla2.
<br><br>
To access the QGIS environment from this console
use qgis.utils.iface object (instance of QgisInterface class).
To import the class QgisInterface can also use the dedicated
button on the toolbar on the left.
</p>
</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
</tr>
<tr>
<td>
<p align="justify">
The console is split in two main panes, output and input areas.
Both are resizable by using the horizontal splitter.
Output area pane is a widget read-only which shows the commands output.
You can drag and drop or copy text into input area
(no matter if selected text contains >>> or ...).
Use 'Share on codepad' from contextual menu for sharing snippets code.
The context menu looks like the image below.
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
Input area pane is the interactive python shell for input commands.
</p>
</td>
</tr>
</table>
<table id="header">
<tr>
<td>
<span class="_titleP">Features</span>
</td>
</tr>
</table>
<p align="justify">
<ul>
<li>Auto-completion and highlighting syntax for the following APIs:
<ol>
<li>Python</li>
<li>PyQGIS-master</li>
<li>PyQt4</li>
<li>QScintilla2</li>
<li>osgeo-gdal-ogr</li>
</ol>
</li>
<br>
<li>CTRL+SPACE to view the auto-completion list.</li>
<br>
<li>CTRL+ALT+SPACE to view the command history list.</li>
<br>
<li>Open QGIS API documentation by typing '_api'.</li>
<br>
<li>Open PyQGIS Cookbook by typing '_pyqgis'.</li>
<br>
<li>Saves the command history by typing '_save' or closing the widget.
This command saves the history command in the file ~/.qgis2/console_history.txt</li>
<br>
<li>Clears the command history by typing <b>_clear</b>.
This command clears the command history from file ~/.qgis2/console_history.txt</li>
<br>
<li>Clears completely command history by typing '_clearAll'.
This command clears completely the command history. It has an irreversible effect.</li>
</ul>
</p>
<table id="header">
<tr>
<td>
<span class="_titleP">Toolbar</span>
</td>
</tr>
</table>
<p>The following is a description of the tools in the toolbar:</p>
<table width="100%" border="0" id="headerTool">
<tr>
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
<td colspan="2">Tool to clear python console</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
<td>Tool to import iface class</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
<td>Tool to import Sextante class</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
<td>Tool to import PyQt4.QtCore class</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
<td>Tool to import PyQt4.QtGui class</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
<td>Tool to open a python script and load in console</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
<td>Tool to save a python script</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
<td colspan="2">Settings</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
<td colspan="2">Help</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
<td colspan="2">Run command (like Enter key pressed)</td>
</tr>
</table>
</body>
</html>
172 changes: 172 additions & 0 deletions resources/context_help/PythonConsole-it_IT
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Help Python Console</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

<style>
body{
font-family: 'Trebuchet MS', sans-serif;
font-size : 12px;
}
#header{
background: #f6f6f6;
border-bottom: 3px solid #000;
width: 100%;
}
#headerTool td{
background: #f6f6f6;
/*width: 100%;*/
}
._titleP {
padding: 5px;
font-size: 15px;
font-weight: bold;
color: #000;
}
._title {
font-size: 20px;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<table id="header">
<tr>
<td>
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
</td>
<td>
<span class="_title">Console Python per QGIS</span>
</td>
</tr>
</table>
<table>
<tr>
<td>
<p align="justify">
Console Python basata su PyQScintilla2.
<br><br>
Per accedere all'ambiente QGIS da questa console
usa l'oggetto qgis.utils.iface (istanza della classe QgisInterface).
Per importare la classe QgisInterface puoi usare anche il bottone dedicato che si trova
sulla toolbar.
</p>
</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
</tr>
<tr>
<td>
<p align="justify">
La console è divisa in due riquadri principali, uno per i comandi di input l'altro per
quelli di output. Entrambi possono essere ridimensionate.
L'area di output non è editabile, visualizza solo l'output del comando
eseguito nella shell.
È possibile fare il drag&drop o copiare il testo direttamente nell'area di input
(il prompt >>> o ... viene filtrato automaticamente).
Usa 'Share on codepad' dal menu contestuale per condividere pezzi di codice.
Il menu contestuale si presenta come l'immagine sotto.
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
L'area di input è la shell interrattiva di Python.
</p>
</td>
</tr>
</table>
<table id="header">
<tr>
<td>
<span class="_titleP">Funzionalità</span>
</td>
</tr>
</table>
<p align="justify">
<ul>
<li>Completamento automatico ed evidenziazione della sintassi per le seguenti APIs:
<ol>
<li>Python</li>
<li>PyQGIS-master</li>
<li>PyQt4</li>
<li>QScintilla2</li>
<li>osgeo-gdal-ogr</li>
</ol>
</li>
<br>
<li>CTRL+SPACE per visualizzare la lista per l'autocompletamento di classi e metodi.</li>
<br>
<li>CTRL+ALT+SPACE per visualizzare la lista della cronologia dei comandi.</li>
<br>
<li>Apri la documentazione completa sulle API di QuantumGIS digitando '_api'.</li>
<br>
<li>Apri il Cookbook PyQGIS digitando '_pyqgis'.</li>
<br>
<li>Possibilità di salvare la cronologia dei comandi digitando '_save' o semplicemente chiudendo il widget.
La cronologia verrà salvata all'interno del file ~/.qgis/console_history.txt</li>
<br>
<li>Possibilità di cancellare la storia dei comandi digitando '_clear'.
La cronologia verrà cancellata dal file ~/.qgis/console_history.txt</li>
<br>
<li>Possibilità di cancellare completamente la cronologia dei comandi digitando '_clearAll'.
La cronologia verrà cancellata sia dal file che dalla memoria temporanea.</li>
</ul>
</p>
<table id="header">
<tr>
<td>
<span class="_titleP">Toolbar</span>
</td>
</tr>
</table>
<p>Di seguito la descrizione dei comandi disponibile nella toolbar:</p>
<table width="100%" border="0" id="headerTool">
<tr>
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
<td colspan="2">Strumento per pulire la console</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
<td>Strumento per importare la classe iface, per accedere all'ambiente QGIS</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
<td>Strumento per importare la classe Sextante</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
<td>Strumento per importare la classe PyQt4.QtCore</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
<td>Strumento per importare la classe PyQt4.QtGui</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
<td>Strumento per aprire un script python da eseguire in console</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
<td>Strumento per salvare uno script python sul disco</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
<td colspan="2">Impostazioni</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
<td colspan="2">Aiuto</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
<td colspan="2">Esegui comando (simile al tasto <Invio>)</td>
</tr>
</table>
</body>
</html>
171 changes: 171 additions & 0 deletions resources/context_help/PythonConsole-ru_RU
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Help Python Console</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

<style>
body{
font-family: 'Trebuchet MS', sans-serif;
font-size : 12px;
}
#header{
background: #f6f6f6;
border-bottom: 3px solid #000;
width: 100%;
}
#headerTool td{
background: #f6f6f6;
/*width: 100%;*/
}
._titleP {
padding: 5px;
font-size: 15px;
font-weight: bold;
color: #000;
}
._title {
font-size: 20px;
font-weight: bold;
color: #000;
}
</style>
</head>
<body>
<table id="header">
<tr>
<td>
<img src="qrc:/images/themes/default/console/imgHelpDialog.png" />
</td>
<td>
<span class="_title">Консоль Python для QGIS</span>
</td>
</tr>
</table>
<table>
<tr>
<td>
<p align="justify">
Консоль Python на основе PyQScintilla2.
<br><br>
Для доступа к окружению QGIS из консоли
используйте объект qgis.utils.iface (экземпляр класса QgisInterface).
Также можно испортировать класс QgisInterface при помощи специальной
кнопки на панели инструментов слева.
</p>
</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/imgHelpConsole.png" /></td>
</tr>
<tr>
<td>
<p align="justify">
Консоль разделена на две части: поля ввода и вывода.
Размер полей можно изменять двигая горизонтальный разделитель.
Поле вывода доступно только для чтения, здесь отображаются результаты выполнения команд.
Текст в поле ввода можно перетаскивать или копировать
(при этом наличие в тексте символов >>> или ... не критично).
Для обмена фрагментами кода используйте пункт 'Share on codepad' контекстного меню.
Контекстное меню показано на рисунке ниже.
<img src="qrc:/images/themes/default/console/imgHelpMenu.png"><br>
Поле ввода предоставляет доступ к интерактивному интерпретатору Python и предназначена для ввода команд.
</p>
</td>
</tr>
</table>
<table id="header">
<tr>
<td>
<span class="_titleP">Возможности</span>
</td>
</tr>
</table>
<p align="justify">
<ul>
<li>Автодополнение и подсветка синтаксиса для следующих API:
<ol>
<li>Python</li>
<li>PyQGIS-master</li>
<li>PyQt4</li>
<li>QScintilla2</li>
<li>osgeo-gdal-ogr</li>
</ol>
</li>
<br>
<li>CTRL+SPACE для вызова списка автодополнения.</li>
<br>
<li>CTRL+ALT+SPACE для просмотра истории команд.</li>
<br>
<li>Открытие API-документации QGIS API при помощи метода '_api'.</li>
<br>
<li>Открытие Поваренной книги разработчика PyQGIS при помощи метода '_pyqgis'.</li>
<br>
<li>Сохранение истории введённых команд при помощи метода '_save' или при закрытии консоли.
История команд сохраняется в файле ~/.qgis/console_history.txt</li>
<br>
<li>Очистка истории введённых команд при помощи метода '_clear'.
Очищает содержимое файла ~/.qgis/console_history.txt</li>
<br>
<li>Полная очистка истории введённых команд при помощи метода '_clearAll'.
Вызов метода приведёт к полной очистке истории введённых команд. Эту операцию нельзя отменить.</li>
</ul>
</p>
<table id="header">
<tr>
<td>
<span class="_titleP">Панель инструментов</span>
</td>
</tr>
</table>
<p>На панели инструментов расположены следующие кнопки:</p>
<table width="100%" border="0" id="headerTool">
<tr>
<td><img src="qrc:/images/themes/default/console/iconClearConsole.png" /></td>
<td colspan="2">Очистить консоль</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconClassConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconIfaceConsole.png" /></td>
<td>Импортировать класс iface</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSextanteConsole.png" /></td>
<td>Импортировать класс Sextante</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtCoreConsole.png" /></td>
<td>импортировать модуль PyQt4.QtCore</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconQtGuiConsole.png" /></td>
<td>Импортировать модуль PyQt4.QtGui</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconScriptConsole.png" /></td>
<td><img src="qrc:/images/themes/default/console/iconOpenConsole.png" /></td>
<td>Загрузить скрипт Pythоn</td>
</tr>
<tr>
<td></td>
<td><img src="qrc:/images/themes/default/console/iconSaveConsole.png" /></td>
<td>Сохранить скрипт Python</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconSettingsConsole.png" /></td>
<td colspan="2">Настройки</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconHelpConsole.png" /></td>
<td colspan="2">Справка</td>
</tr>
<tr>
<td><img src="qrc:/images/themes/default/console/iconRunConsole.png" /></td>
<td colspan="2">выполнить команду (действие аналогично нажатию клавиши Enter)</td>
</tr>
</table>
</body>
</html>
2 changes: 1 addition & 1 deletion resources/context_help/RgShortestPathWidget-en_US
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3>Finding shortest path</h3>
<p>Road graph is a C++ plugin for Quantum GIS, that calculates the shortest path between two points on any line layer and plots this path over the road network. Before using the plugin to configure it. This can be done in the menu <label>Plugins &rarr; Road graph &rarr; Settings</label></p>
<p>Road graph is a C++ plugin for QGIS, that calculates the shortest path between two points on any line layer and plots this path over the road network. Before using the plugin to configure it. This can be done in the menu <label>Plugins &rarr; Road graph &rarr; Settings</label></p>
<p>
<a href="#howto">How to</a><br/>
</p>
Expand Down
4 changes: 2 additions & 2 deletions resources/customization.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1357,8 +1357,8 @@
<widget class="QTabWidget" label="" objectName="tabWidget">
<widget class="QWidget" label="About" objectName="Widget2">
<widget class="QLabel" label="" objectName="qgisIcon"/>
<widget class="QLabel" label="&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; p, li { white-space: pre-wrap; } &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:x-large;&quot;&gt;Quantum GIS (QGIS)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;" objectName="TextLabel4"/>
<widget class="QLabel" label="Quantum GIS is licensed under the GNU General Public License" objectName="label"/>
<widget class="QLabel" label="&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; p, li { white-space: pre-wrap; } &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt; &lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:x-large;&quot;&gt;QGIS&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;" objectName="TextLabel4"/>
<widget class="QLabel" label="QGIS is licensed under the GNU General Public License" objectName="label"/>
<widget class="QLabel" label="http://www.gnu.org/licenses" objectName="label_2"/>
<widget class="QPushButton" label="QGIS Home Page" objectName="btnQgisHome"/>
<widget class="QPushButton" label="Join our user mailing list" objectName="btnQgisUser"/>
Expand Down
23 changes: 17 additions & 6 deletions scripts/integrate_function_help.pl
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,28 @@
"es_ES" => "es",
);

my @lang;
my @context;

foreach (@ARGV) {
if( /-lang=(.*)/ ) {
push @lang, $1;
}

if( /-context=(.*)/ ) {
push @context, $1;
}
}


my %langs;
my %src;
for my $f (<resources/{function_help,context_help}/*-*>) {
my ($context,$id,$lang) = $f =~ m#^resources/(function_help|context_help)/(.+)-(.+)$#;

next if @lang && !grep($lang, @lang);
next if @context && !grep($context, @context);

die "lang undefined in $f" unless defined $lang;
$langs{$lang}{ts} = "";

Expand All @@ -35,12 +52,6 @@
}

delete $langs{en_US};
if( @ARGV ) {
foreach my $l (keys %langs) {
next if grep $l, @ARGV;
delete $langs{$l};
}
}

my $cmd = "scripts/update_ts_files.sh";
foreach my $l (keys %langs) {
Expand Down
62 changes: 62 additions & 0 deletions scripts/replace-console-i18n.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!/usr/bin/perl

use strict;
use warnings;

my %src;

for my $f (<python/console/help/i18n/*.properties>) {
my($lang) = $f =~ m#python/console/help/i18n/(.+)\.properties$#;
print "$f [$lang]\n";

my $title;
my $str;

open F, $f;
while( my $l = <F>) {
$l =~ s/\s+$//;
if( $l =~ /\\$/ ) {
$l =~ s/\\$/\n/;
while(<F>) {
s/\\\s*$/\n/;
$l .= $_;
last if /",$/;
}
}

next if $l =~ /^i18n_dict/;
next if $l =~ /^};$/;

if( ($title, $str) = $l =~ /"([^"]+)"\s*:\s*"([^"]*)",?$/m ) {
#print "TITLE:$title STR:$str\n";
$src{$lang}{$title} = $str;
} else {
die "$lang:|$l| not parsed";
}
}
close F;
}

open F, "resources/context_help/PythonConsole";
my $src = join("", <F>);
close F;

foreach my $lang (keys %src) {
my $dst = $src;

my %t;
foreach my $title ( keys %{ $src{$lang} } ) {
my $d = $src{$lang}{$title};

die "dst for $title undefined" unless defined $d;

my $dst0 = $dst;
$dst =~ s/#$title#/$d/gm;

warn "$lang.$title [$d] not replaced\n$dst" if $dst0 eq $dst;
}

open F, ">resources/context_help/PythonConsole-$lang";
print F $dst;
close F;
}
4 changes: 2 additions & 2 deletions src/app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ typedef SInt32 SRefCon;
*/
void usage( std::string const & appName )
{
std::cerr << "Quantum GIS - " << VERSION << " '" << RELEASE_NAME << "' ("
std::cerr << "QGIS - " << VERSION << " '" << RELEASE_NAME << "' ("
<< QGSVERSION << ")\n"
<< "Quantum GIS (QGIS) is a viewer for spatial data sets, including\n"
<< "QGIS is a viewer for spatial data sets, including\n"
<< "raster and vector data.\n"
<< "Usage: " << appName << " [options] [FILES]\n"
<< " options:\n"
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ const int AFTER_RECENT_PATHS = 321;
*/
static void setTitleBarText_( QWidget & qgisApp )
{
QString caption = QgisApp::tr( "Quantum GIS " );
QString caption = QgisApp::tr( "QGIS " );

if ( QString( QGis::QGIS_VERSION ).endsWith( "Master" ) )
{
Expand Down Expand Up @@ -447,7 +447,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
QMessageBox::critical(
this,
tr( "Multiple Instances of QgisApp" ),
tr( "Multiple instances of Quantum GIS application object detected.\nPlease contact the developers.\n" ) );
tr( "Multiple instances of QGIS application object detected.\nPlease contact the developers.\n" ) );
abort();
}

Expand Down Expand Up @@ -582,7 +582,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
#endif

// set application's caption
QString caption = tr( "Quantum GIS - %1 ('%2')" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME );
QString caption = tr( "QGIS - %1 ('%2')" ).arg( QGis::QGIS_VERSION ).arg( QGis::QGIS_RELEASE_NAME );
setWindowTitle( caption );

QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString::null, QgsMessageLog::INFO );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgspluginregistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void QgsPluginRegistry::loadPythonPlugin( QString packageName )
// if plugin is not compatible, disable it
if ( ! isPythonPluginCompatible( packageName ) )
{
QgsMessageLog::logMessage( QObject::tr( "Plugin \"%1\" is not compatible with this version of Quantum GIS.\nIt will be disabled." ).arg( packageName ),
QgsMessageLog::logMessage( QObject::tr( "Plugin \"%1\" is not compatible with this version of QGIS.\nIt will be disabled." ).arg( packageName ),
QObject::tr( "Plugins" ) );
settings.setValue( "/PythonPlugins/" + packageName, false );
return;
Expand Down
19 changes: 9 additions & 10 deletions src/app/qgstipfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ QgsTipFactory::QgsTipFactory() : QObject()
// it its worth the time Ill move this data
// into a sqlite database...
QgsTip myTip;
myTip.setTitle( tr( "Quantum GIS is open source" ) );
myTip.setContent( tr( "Quantum GIS is open source software."
myTip.setTitle( tr( "QGIS is open source" ) );
myTip.setContent( tr( "QGIS is open source software."
" This means that the software source code can be freely viewed"
" and modified. The GPL places a restriction that any modifications"
" you make must be made available in source form to whoever you give"
" modified versions to, and that you can not create a new version of"
" Quantum GIS under a 'closed source' license. Visit"
" QGIS under a 'closed source' license. Visit"
" <a href=\"http://qgis.org\"> the QGIS home page (http://qgis.org)</a>"
" for more information." ) );
addGenericTip( myTip );
Expand All @@ -41,7 +41,7 @@ QgsTipFactory::QgsTipFactory() : QObject()
myTip.setContent( tr( "If you write a scientific paper or any other article"
" that refers to QGIS we would love to include your work"
" in the <a href=\"http://www.qgis.org/en/community/qgis-case-studies.html\">case studies section</a> of"
" the Quantum GIS home page (http://http://www.qgis.org/en/community/qgis-case-studies.html)."
" the QGIS home page (http://http://www.qgis.org/en/community/qgis-case-studies.html)."
) );
addGenericTip( myTip );
myTip.setTitle( tr( "Become an QGIS translator" ) );
Expand All @@ -63,11 +63,10 @@ QgsTipFactory::QgsTipFactory() : QObject()
) );
addGuiTip( myTip );
myTip.setTitle( tr( "Is it 'QGIS' or 'Quantum GIS'?" ) );
myTip.setContent( tr( "Both are correct. For articles we suggest you write 'Quantum GIS (QGIS) is ....'"
" and then refer to it as QGIS thereafter."
myTip.setContent( tr( "Both used to be correct, but we recently decided to just use 'QGIS'. For articles we suggest you write 'QGIS is ....'"
) );
addGenericTip( myTip );
myTip.setTitle( tr( "How do I refer to Quantum GIS?" ) );
myTip.setTitle( tr( "How do I refer to QGIS?" ) );
myTip.setContent( tr( "QGIS is spelled in all caps."
" We have various subprojects of the QGIS project"
" and it will help to avoid confusion if you refer to each by"
Expand Down Expand Up @@ -177,16 +176,16 @@ QgsTipFactory::QgsTipFactory() : QObject()
myTip.setTitle( tr( "Sponsor QGIS" ) );
myTip.setContent( tr( "If QGIS is saving you money or you like our work and"
" have the financial ability to help, please consider sponsoring the"
" development of Quantum GIS. We use money from sponsors to pay for"
" development of QGIS. We use money from sponsors to pay for"
" travel and costs related to our bi-annual hackfests, and to generally"
" support the goals of our project. Please see the <a"
" href=\"http://qgis.org/en/sponsorship.html\">QGIS Sponsorship Web"
" Page</a> for more details."
) );
addGenericTip( myTip );
// by gsherman
myTip.setTitle( tr( "Quantum GIS has Plugins!" ) );
myTip.setContent( tr( "Quantum GIS has plugins that extend its functionality."
myTip.setTitle( tr( "QGIS has Plugins!" ) );
myTip.setContent( tr( "QGIS has plugins that extend its functionality."
" QGIS ships with some core plugins you can explore from the"
" Plugins->Manage Plugins menu. In addition there are over 150"
" Python plugins contributed by the user community that can be"
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgshttptransaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ bool QgsHttpTransaction::getSynchronously( QByteArray &respondedContent, int red
{
header.setValue( "Host", QString( "%1:%2" ).arg( qurl.host() ).arg( qurl.port() ) );
}
// Set the user agent to Quantum GIS plus the version name
header.setValue( "User-agent", QString( "Quantum GIS - " ) + VERSION );
// Set the user agent to QGIS plus the version name
header.setValue( "User-agent", QString( "QGIS - " ) + VERSION );
// Set the host in the QHttp object
http->setHost( qurl.host(), qurl.port( HTTP_PORT_DEFAULT ) );
// Set the username and password if supplied for this connection
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgscomposerview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
if ( composition() )
{
QgsComposerLabel* newLabelItem = new QgsComposerLabel( composition() );
newLabelItem->setText( tr( "Quantum GIS" ) );
newLabelItem->setText( tr( "QGIS" ) );
newLabelItem->adjustSizeToText();
newLabelItem->setSceneRect( QRectF( snappedScenePoint.x(), snappedScenePoint.y(), newLabelItem->rect().width(), newLabelItem->rect().height() ) );
composition()->addComposerLabel( newLabelItem );
Expand Down
6 changes: 3 additions & 3 deletions src/helpviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SET (HELP_UIS qgshelpviewerbase.ui)

SET (HELP_MOC_HDRS qgshelpviewer.h)

#SET (HELP_RCCS qgsgps_plugin.qrc)
SET (HELP_RCCS ../../images/images.qrc)

IF (WIN32)
IF (MSVC)
Expand Down Expand Up @@ -48,9 +48,9 @@ QT4_WRAP_UI (HELP_UIS_H ${HELP_UIS})

QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})

#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})

ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H} ${HELP_RCC_SRCS})

INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core
Expand Down
2 changes: 1 addition & 1 deletion src/helpviewer/qgshelpviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void QgsHelpViewer::showHelp( QString help )
QString myStyle = QgsApplication::reportStyleSheet();
QString helpContents = "<head><style>" + myStyle + "</style></head><body>" + help + "</body>";
webView->setHtml( helpContents );
setWindowTitle( tr( "Quantum GIS Help" ) );
setWindowTitle( tr( "QGIS Help" ) );

#ifndef WIN32
setWindowState( windowState() & ~Qt::WindowMinimized );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/coordinate_capture/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Coordinate Capture Plugin for Quantum GIS
Coordinate Capture Plugin for QGIS

Tim Sutton 2008

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/qgisplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/*! Quantum GIS - Plugin API
/*! QGIS - Plugin API
*
* \section about About QGis Plugins
* Plugins provide additional functionality to QGis. Plugins must
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spatialquery/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Spatial Query Plugin for Quantum GIS
Spatial Query Plugin for QGIS

Luiz Motta and Diego Moreira 2009

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/qgsspit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ void QgsSpit::dbConnect()

if ( conn )
{
PGresult *res = PQexec( conn, "SET application_name='Quantum GIS'" );
PGresult *res = PQexec( conn, "SET application_name='QGIS'" );
if ( PQresultStatus( res ) != PGRES_COMMAND_OK )
{
PQclear( res );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/gpx/gpsdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void QgsGPSData::writeXML( QTextStream& stream )
{
stream.setCodec( QTextCodec::codecForName( "UTF8" ) );
stream << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
<< "<gpx version=\"1.0\" creator=\"Quantum GIS\">\n";
<< "<gpx version=\"1.0\" creator=\"QGIS\">\n";
for ( WaypointIterator wIter = waypoints.begin();
wIter != waypoints.end(); ++wIter )
wIter->writeXML( stream );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/qgsoracleprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,7 @@ QgsVectorLayerImport::ImportError QgsOracleProvider::createEmptyLayer(

if ( !exec( qry, QString( "INSERT"
" INTO sdo_coord_ref_system(srid,coord_ref_sys_name,coord_ref_sys_kind,legacy_wktext,is_valid,is_legacy,information_source)"
" VALUES (%1,%2,%3,%4,'TRUE','TRUE','GDAL/OGR via Quantum GIS')" )
" VALUES (%1,%2,%3,%4,'TRUE','TRUE','GDAL/OGR via QGIS')" )
.arg( srid )
.arg( quotedValue( srs->description() ) )
.arg( quotedValue( srs->geographicFlag() ? "GEOGRAPHIC2D" : "PROJECTED" ) )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresconn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ QgsPostgresConn::QgsPostgresConn( QString conninfo, bool readOnly )

if ( mPostgresqlVersion >= 90000 )
{
PQexecNR( "SET application_name='Quantum GIS'" );
PQexecNR( "SET application_name='QGIS'" );
}

/* Check to see if we have GEOS support and if not, warn the user about
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ bool QgsPostgresProvider::determinePrimaryKey()
}
else
{
QgsMessageLog::logMessage( tr( "The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables." ), tr( "PostGIS" ) );
QgsMessageLog::logMessage( tr( "The table has no column suitable for use as a key. QGIS requires a primary key, a PostgreSQL oid column or a ctid for tables." ), tr( "PostGIS" ) );
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ QgsSqlAnywhereProvider::QgsSqlAnywhereProvider( QString const &uri )
showMessageBox( tr( "No suitable key column" ),
tr( "The source relation %1 has no column suitable "
"for use as a unique key.\n\n"
"Quantum GIS requires that the relation has an integer "
"QGIS requires that the relation has an integer "
"column no larger than 32 bits containing unique values. "
) .arg( mQuotedTableName ) );
closeDb();
Expand Down Expand Up @@ -1517,7 +1517,7 @@ QgsSqlAnywhereProvider::checkLayerType()
if ( mGeomType == QGis::WKBUnknown )
{
showMessageBox( tr( "Unknown geometry type" ),
tr( "Column %1 has a geometry type of %2, which Quantum GIS does not currently support." )
tr( "Column %1 has a geometry type of %2, which QGIS does not currently support." )
.arg( mQuotedTableName + "(" + mGeometryColumn + ")" )
.arg( geomType ) );
return false;
Expand All @@ -1526,7 +1526,7 @@ QgsSqlAnywhereProvider::checkLayerType()
if ( !foundSrid )
{
showMessageBox( tr( "Mixed Spatial Reference Systems" ),
tr( "Column %1 is not restricted to a single SRID, which Quantum GIS requires." )
tr( "Column %1 is not restricted to a single SRID, which QGIS requires." )
.arg( mQuotedTableName + "(" + mGeometryColumn + ")" ) );
return false;
}
Expand Down Expand Up @@ -1820,7 +1820,7 @@ QgsSqlAnywhereProvider::checkSrs()
// use ST_Srid() to convert, since coordinate systems match
projStr = QString( ".ST_SRID( %1 )" ).arg( projSrid );
projMsg = tr(
"Because Quantum GIS supports only planar data, "
"Because QGIS supports only planar data, "
"the SQL Anywhere data provider will "
"transform the data to the compatible planar "
"projection (SRID=%1)."
Expand All @@ -1837,7 +1837,7 @@ QgsSqlAnywhereProvider::checkSrs()
ymax = 180;
projStr = QString( ".ST_Transform( %1 )" ).arg( projSrid );
projMsg = tr(
"Because Quantum GIS supports only planar data "
"Because QGIS supports only planar data "
"and no compatible planar projection was found, "
"the SQL Anywhere data provider will attempt to "
"transform the data to planar WGS 84 (SRID=%1)."
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wcs/qgswcscapabilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ bool QgsWcsCapabilities::parseCapabilitiesDom( QByteArray const &xml, QgsWcsCapa
{
mErrorTitle = tr( "Version not supported" );
mErrorFormat = "text/plain";
mError = tr( "WCS server version %1 is not supported by Quantum GIS (supported versions: 1.0.0, 1.1.0, 1.1.2)" )
mError = tr( "WCS server version %1 is not supported by QGIS (supported versions: 1.0.0, 1.1.0, 1.1.2)" )
.arg( mVersion );

QgsLogger::debug( "WCS version: " + mError );
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgsabout.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>About Quantum GIS</string>
<string>About QGIS</string>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
Expand Down Expand Up @@ -58,7 +58,7 @@
<string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:x-large;&quot;&gt;Quantum GIS (QGIS)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:x-large;&quot;&gt;QGIS&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand All @@ -83,7 +83,7 @@ p, li { white-space: pre-wrap; }
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Quantum GIS is licensed under the GNU General Public License</string>
<string>QGIS is licensed under the GNU General Public License</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgssponsorsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;We work really hard to make this nice software for you. See all the cool features it has? Get a warm fuzzy feeling when you use it? Quantum GIS is a labour of love by a dedicated team of developers. We want you to copy &amp;amp; share it and put it in the hands of as many people as possible. If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the &lt;/span&gt;&lt;a href=&quot;http://qgis.org/en/sponsorship.html&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;QGIS Sponsorship Web Page&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; for more details. In the &lt;/span&gt;&lt;a href=&quot;http://qgis.org/en/sponsorship/sponsors.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Sponsors page&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; you can see the fine people and companies that are helping us financially - a great big 'thank you' to you all!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt;We work really hard to make this nice software for you. See all the cool features it has? Get a warm fuzzy feeling when you use it? QGIS is a labour of love by a dedicated team of developers. We want you to copy &amp;amp; share it and put it in the hands of as many people as possible. If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of QGIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the &lt;/span&gt;&lt;a href=&quot;http://qgis.org/en/sponsorship.html&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;QGIS Sponsorship Web Page&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; for more details. In the &lt;/span&gt;&lt;a href=&quot;http://qgis.org/en/sponsorship/sponsors.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Sponsors page&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:10pt;&quot;&gt; you can see the fine people and companies that are helping us financially - a great big 'thank you' to you all!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
Expand Down