typo fixes and german function help update

qgis · Sep 26, 2012 · b86453a · b86453a
1 parent fefb3d0
commit b86453a
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 11 deletions.
diff --git a/python/core/symbology-ng/qgsstylev2.sip b/python/core/symbology-ng/qgsstylev2.sip
@@ -268,7 +268,7 @@ class QgsStyleV2
 
     //! updates the properties of an existing symbol/colorramp
     /*!
-     *  \note This should not be called seperately, only called through addSymbol or addColorRamp
+     *  \note This should not be called separately, only called through addSymbol or addColorRamp
      *  \param type is either SymbolEntity or ColorrampEntity
      *  \param name is the name of an existing symbol or a color ramp
      *  \return Success state of the update operation

diff --git a/python/plugins/sextante/help/_sources/3rdParty.txt b/python/plugins/sextante/help/_sources/3rdParty.txt
@@ -303,7 +303,7 @@ GRASS
 
 Configuring GRASS is not much different from configuring SAGA. First,
 the path to the GRASS folder has to be defined, but only if you are
-running Windows. Additionaly, a shell interpreter (usually msys.exe,
+running Windows. Additionally, a shell interpreter (usually msys.exe,
 which can be found in most GRASS for Windows distributions) has to be
 defined and its path set up as well. 
 

diff --git a/python/plugins/sextante/help/modeler.html b/python/plugins/sextante/help/modeler.html
@@ -248,7 +248,7 @@ <h2>About available algorithms<a class="headerlink" href="#about-available-algor
 if the number of output layers cannot be know in advance), then it is
 not possible to use it within a model, and thus does not appear in the
 list of them that you can find in the modeler dialog.</p>
-<p>Additionaly, you will see some algorithms in the modeler that are not
+<p>Additionally, you will see some algorithms in the modeler that are not
 found in the toolbox. This algorithms are meant to be used exclusively
 as part of a model, and they are of no interest in a different context.
 The <em>Calculator</em> algorithm is an example of that. It is just a simple
@@ -346,4 +346,4 @@ <h3>Navigation</h3>
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
     </div>
   </body>
-</html>
+</html>
diff --git a/python/plugins/sextante/pymorph/mmorph.py b/python/plugins/sextante/pymorph/mmorph.py
@@ -563,7 +563,7 @@ def randomcolor(X):
     Returns
     -------
     y : 3d-array of uint8 of shape (h, w, 3)
-        Colour image.
+        Color image.
     """
     from numpy import take, reshape, shape, dstack
     from numpy.random import rand
@@ -644,7 +644,7 @@ def overlay(X, red=None, green=None, blue=None, magenta=None, yellow=None, cyan=
 
     Returns
     -------
-    Y : Colour image (in HxWx3 format)
+    Y : Color image (in HxWx3 format)
     """
     from numpy import dstack
     if isbinary(X): X = gray(X,'uint8')

diff --git a/resources/function_help/$scale-de_DE b/resources/function_help/$scale-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $scale</h3>
+Liefert den aktuellen Maßstab der Kartenanzeige.
+<br>
+Hinweis: Die Funktion ist nur in einigen Zusammenhängen verfügbar und sonst 0.
+<h4>Syntax</h4>
+<code>$scale</code><br>
+
+<h4>Beispiel</h4>
+<!-- Show example of function.-->
+<code>$scale &rarr; 10000</code><br>
+
+
diff --git a/resources/function_help/coalesce-de_DE b/resources/function_help/coalesce-de_DE
@@ -0,0 +1,18 @@
+<h3>Funktion coalesce()</h3>
+Liefert den ersten Wert, der nicht NULL ist, einer Ausdruckliste.
+<br>
+Diese Funktion kann beliebig viele Argumente haben.
+<h4>Syntax</h4>
+<code>coalesce(ausdruck1, ausdruck2...)</code><br>
+
+<h4>Argumente</h4>
+<code>ausdruck</code> - ein gültige Ausdruck jeden Typs
+<br>
+
+<h4>Beispiel</h4>
+<!-- Show example of function.-->
+<code>coalesce(NULL, 2) &rarr; 2</code><br>
+<code>coalesce(NULL, 2, 3) &rarr; 2</code><br>
+<code>coalesce(7, NULL, 3*2) &rarr; 7</code><br><br>
+<code>coalesce("attributA", "anderesFeld", 'FEHLER') &rarr; Wert des Attributs attributA falls es nicht NULL ist,
+ sonst der Wert des Attributes "anderesFeld" oder die Zeichenkette 'FEHLER', wenn beide NULL sind.</code><br>
diff --git a/resources/function_help/format_number-de_DE b/resources/function_help/format_number-de_DE
@@ -0,0 +1,15 @@
+<h3>Funktion format_number()</h3>
+Liefert eine mit dem lokalen Tausendertrenner versehene Zahl zurück und
+beschränkt die Zahl auch auf die angegebene Anzahl von Nachkommastellen.
+<h4>Syntax</h4>
+<code>format_number(zahl,nachkommastellen)</code><br>
+
+<h4>Argumente</h4>
+<code>zahl</code> - ist Zahl. Die zu formatierende Zahl
+<br>
+<code>places</code> - ist Ganzzahl. Die Anzahl der Nachkommastellen.
+
+<h4>Beispiel</h4>
+<!-- Show example of function.-->
+<code>format_number(10000000.332,2) &rarr; 10.000.000,33</code>
+
diff --git a/resources/function_help/round-de_DE b/resources/function_help/round-de_DE
@@ -0,0 +1,20 @@
+<h3>Funktion round()</h3>
+Rundet eine Zahl auf eine gegebene Anzahl von Nachkommastellen.
+<br>
+Dies Funktion kann ein oder zwei Argumente haben.
+<h4>Syntax</h4>
+<code>round(zahl,stellen)</code><br>
+<code>round(zahl)</code><br>
+
+<h4>Argumente</h4>
+<code>zahl</code> - ist eine Zahl. Die Zahl die gerundet werden soll.
+<br>
+<code>stellen</code> - ist Ganzahl. Die Anzahl der Nachkommastellen auf die gerundet werden soll. Kann negativ sein.
+
+<h4>Beispiel</h4>
+<!-- Show example of function.-->
+<code>round(1234.567, 2) &rarr; 1234.57</code><br>
+Um zur nächsten ganzen Zahl zu runden: <code>round(zahl)</code><br>
+<code>round(1234.567) &rarr; 1235</code><br>
+
+
diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -2,7 +2,7 @@
 
 
 RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
-EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c"
+EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat|Exception_to_GPL_for_Qt.txt|sqlite3.c|debian/build|ms-windows/osgeo4w|ChangeLog|src/plugins/grass/qtermwidget|src/app/gps/qwtpolar-1.0"
 
 egrep --exclude-dir=.git --color=always "$RE" -ir .  | egrep -iv "$EX"
 egrep --exclude-dir=.git --color=always "$RE" -i resources/context_help/*-en_US
diff --git a/scripts/spelling.dat b/scripts/spelling.dat
@@ -458,3 +458,4 @@ vaild:valid
 opps:oops
 arount:around
 acheive:achieve
+specifed:specified
diff --git a/src/analysis/network/qgsgraph.h b/src/analysis/network/qgsgraph.h
@@ -147,7 +147,7 @@ class ANALYSIS_EXPORT QgsGraph
     int addArc( int outVertexIdx, int inVertexIdx, const QVector< QVariant >& properties );
 
     /**
-     * retrun vertex count
+     * return vertex count
      */
     int vertexCount() const;
 
@@ -162,7 +162,7 @@ class ANALYSIS_EXPORT QgsGraph
     int arcCount() const;
 
     /**
-     * retrun edge at index
+     * return edge at index
      */
     const QgsGraphArc& arc( int idx ) const;
 

diff --git a/src/plugins/roadgraph/exportdlg.cpp b/src/plugins/roadgraph/exportdlg.cpp
@@ -92,7 +92,7 @@ QgsVectorLayer* RgExportDlg::mapLayer() const
   }
   else
   {
-    // retrun selected layer
+    // return selected layer
     myLayer = dynamic_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( layerId ) );
   }
 

diff --git a/src/plugins/roadgraph/shortestpathwidget.h b/src/plugins/roadgraph/shortestpathwidget.h
@@ -103,7 +103,7 @@ class RgShortestPathWidget : public QDockWidget
 
   private:
     /**
-     * retrun path as a graph
+     * return path as a graph
      */
     QgsGraph* getPath( QgsPoint& p1, QgsPoint& p2 );