[SCM] qgis branch, master, updated. upstream/2.0.1-13442-g4a15bef
Bas Couwenberg
sebastic at xs4all.nl
Sat Sep 28 16:26:22 UTC 2013
The following commit has been merged in the master branch:
commit 818ea420b7279c727d1a8102c76f383ab5db1b07
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Sep 28 15:52:04 2013 +0200
Update typo patches. Don't include typo in changelog.
diff --git a/debian/changelog b/debian/changelog
index 0a57ddd..d996ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,8 @@ qgis (2.0.1-1) UNRELEASED; urgency=low
* Remove automatically generated files on clean.
* Add lintian overrides for no-fortify-functions false positive.
* Add lintian overrides for binaries-have-file-conflict false positive.
- * Add patch to fix 'an other' typo.
- * Add patch to fix 'allows to' typo.
+ * Add patch to fix 'another' typo.
+ * Add patch to fix 'allows one to' typo.
* Add Keywords for desktop files.
* Update copyright for qgis-providers-common resources.
* Don't install extra license files.
diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch
index 6f948c0..2140cea 100644
--- a/debian/patches/allows-to-typo.patch
+++ b/debian/patches/allows-to-typo.patch
@@ -1,1344 +1,1890 @@
-Description: Fix 'allows to' typo, replace with 'allows one to'.
+Description: Fix 'allows to' typos.
Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-09-27
--- a/i18n/qgis_bs_BA.ts
+++ b/i18n/qgis_bs_BA.ts
-@@ -55561,7 +55561,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -14313,7 +14313,7 @@ Puatanja do korisniÄke DB: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Omogućava postavljanje numeriÄkih vrijednosti u specifiÄnom rasponu. Dodat za editovanje može biti ili klizaÄ ili spin okvir.</translation>
+ </message>
+ <message>
+@@ -55561,7 +55561,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -56053,7 +56053,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -56053,7 +56053,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -56138,7 +56138,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -56138,7 +56138,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -56183,7 +56183,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -56183,9 +56183,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -56218,7 +56218,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -56218,7 +56218,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -56570,7 +56570,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_cs_CZ.ts
+++ b/i18n/qgis_cs_CZ.ts
-@@ -64068,7 +64068,7 @@ Note: Experimental plugins are generally unsuitable for production use. These pl
+@@ -18143,7 +18143,7 @@ Chyba byla:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Umožňuje nastavit ÄÃselné hodnoty z urÄeného rozsahu. Editovacà doplnÄ›k může být jak posuvnÃk tak otoÄný voliÄ.</translation>
+ </message>
+ <message>
+@@ -64068,7 +64068,7 @@ Note: Experimental plugins are generally
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -64560,7 +64560,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -64560,7 +64560,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -64645,7 +64645,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -64645,7 +64645,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64690,7 +64690,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64690,9 +64690,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64725,7 +64725,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64725,7 +64725,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -64987,7 +64987,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_da_DK.ts
+++ b/i18n/qgis_da_DK.ts
-@@ -57684,7 +57684,7 @@ At definere et brugerdefineret CRS kræver en god forståelse for Proj.4-projekt
+@@ -15041,7 +15041,7 @@ Bruger-DB-sti: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Tillader at sætte numeriske værdi fra det angivne interval. Redigeringswidget'en kan enten være en skyder eller et spinfelt.</translation>
+ </message>
+ <message>
+@@ -57684,7 +57684,7 @@ At definere et brugerdefineret CRS kræv
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -58790,7 +58790,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -58790,7 +58790,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -59129,7 +59129,7 @@ Forbindelserne, du definerer, vil blive huske til fremtidig brug og tilgængelig
+@@ -59129,7 +59129,7 @@ Forbindelserne, du definerer, vil blive
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -59474,7 +59474,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -59474,7 +59474,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -59519,7 +59519,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -59519,9 +59519,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -59554,7 +59554,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -59554,7 +59554,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60279,7 +60279,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_de.ts
+++ b/i18n/qgis_de.ts
-@@ -50451,7 +50451,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -12944,7 +12944,7 @@ Fehler war:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Erlaubt die Eingabe von Werten eines gegebenen Bereichs. Dieses Bearbeitungselement kann entweder ein Schieber oder ein Drehfeld sein.</translation>
+ </message>
+ <message>
+@@ -50451,7 +50451,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -50514,7 +50514,7 @@ Um den Feldrechner zu öffnen, müssen Sie den Vektorlayer zuvor in den Bearbeit
+@@ -50514,7 +50514,7 @@ Um den Feldrechner zu öffnen, müssen S
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -51709,7 +51709,7 @@ Hinweis: Experimentelle Erweiterungen sind grundsätzliche für den Produktivein
+@@ -51709,7 +51709,7 @@ Hinweis: Experimentelle Erweiterungen si
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -52028,7 +52028,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -52028,7 +52028,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -52073,7 +52073,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -52073,9 +52073,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -52108,7 +52108,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -52108,7 +52108,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -52982,7 +52982,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_el_GR.ts
+++ b/i18n/qgis_el_GR.ts
-@@ -56813,7 +56813,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -16209,7 +16209,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>ΕπιτÏÎπει να Ïυθμίσετε αÏιθμητικÎÏ‚ τιμÎÏ‚ από Îνα συγκεκÏιμÎνο εÏÏος. Η επεξεÏγασία widget μποÏεί να είναι είτε Îνα slider ή Îνα πεÏιστÏεφόμενο πλαίσιο.</translation>
+ </message>
+ <message>
+@@ -56813,7 +56813,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -57305,7 +57305,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -57305,7 +57305,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -57390,7 +57390,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -57390,7 +57390,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -57435,7 +57435,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -57435,9 +57435,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -57470,7 +57470,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -57470,7 +57470,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -57822,7 +57822,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_en.ts
+++ b/i18n/qgis_en.ts
-@@ -49739,7 +49739,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -12663,7 +12663,7 @@ User DB Path: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -49739,7 +49739,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -50231,7 +50231,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -50231,7 +50231,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -50316,7 +50316,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -50316,7 +50316,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -50361,7 +50361,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -50361,9 +50361,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -50396,7 +50396,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -50396,7 +50396,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -50748,7 +50748,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_es.ts
+++ b/i18n/qgis_es.ts
-@@ -54630,7 +54630,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -15886,7 +15886,7 @@ El error fue: %2</translation>
+ <translation>Muestra un cuadro combinado que contiene valores de atributos usados para la clasificación.</translation>
+ </message>
+ <message>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permite establecer valores numéricos dentro de un intervalo especificado. El control de edición puede ser un deslizador o un cuadro con flechas.</translation>
+ </message>
+ <message>
+@@ -54630,7 +54630,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -54675,7 +54675,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -54675,9 +54675,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -54710,7 +54710,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -54710,7 +54710,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -54865,7 +54865,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -54865,7 +54865,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -56049,7 +56049,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -55752,7 +55752,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -56049,7 +56049,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -57132,7 +57132,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -57132,7 +57132,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -57177,7 +57177,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -57177,9 +57177,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -57212,7 +57212,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -57212,7 +57212,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -57735,7 +57735,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -57735,7 +57735,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_et_EE.ts
+++ b/i18n/qgis_et_EE.ts
-@@ -60673,7 +60673,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15687,7 +15687,7 @@ Kasutaja AB andmebaas: %8</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Lubab lisada numbreid määratud vahemikus. Redigeerimisseade võib olla kas liugur või kerimiskast.</translation>
+ </message>
+ <message>
+@@ -60673,7 +60673,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -61165,7 +61165,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -61165,7 +61165,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -61250,7 +61250,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -61250,7 +61250,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -61295,7 +61295,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -61295,9 +61295,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -61330,7 +61330,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -61330,7 +61330,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -61682,7 +61682,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_eu.ts
+++ b/i18n/qgis_eu.ts
-@@ -52861,7 +52861,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -13462,7 +13462,7 @@ Erabiltzaile.-DBaren bidea:%9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Tarte jakin bateko zenbakizko balioak ezartzea ahalbidetzen du. Edizio-widgeta graduatzaile bat edo biratze-lakuki bat izan daiteke.</translation>
+ </message>
+ <message>
+@@ -52861,7 +52861,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -53411,7 +53411,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -53411,7 +53411,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -53496,7 +53496,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -53496,7 +53496,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -53541,7 +53541,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -53541,9 +53541,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -53576,7 +53576,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -53576,7 +53576,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -53928,7 +53928,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_fa.ts
+++ b/i18n/qgis_fa.ts
-@@ -53493,7 +53493,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -14570,7 +14570,7 @@ User DB Path: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -53493,7 +53493,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -53578,7 +53578,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -53578,7 +53578,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -53623,7 +53623,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -53623,9 +53623,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -53658,7 +53658,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -53658,7 +53658,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -54051,7 +54051,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -54051,7 +54051,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -54240,7 +54240,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_fi.ts
+++ b/i18n/qgis_fi.ts
-@@ -60453,7 +60453,7 @@ This plugin supports basic HTML markup tags for formatting text. For example:
+@@ -16466,7 +16466,7 @@ Virhe oli:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Sallii numeeristen arvojen asettamisen määritellyillä raja-arvoilla. Muokkausvälineenä voidaan käyttää joko liukusäädintä tai askellusruutua.</translation>
+ </message>
+ <message>
+@@ -60453,7 +60453,7 @@ This plugin supports basic HTML markup t
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -61111,7 +61111,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -61111,7 +61111,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -61156,7 +61156,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -61156,9 +61156,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -61191,7 +61191,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -61191,7 +61191,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -61638,7 +61638,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -61638,7 +61638,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
+@@ -61780,7 +61780,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_fr.ts
+++ b/i18n/qgis_fr.ts
-@@ -64862,7 +64862,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -18048,7 +18048,7 @@ L'erreur est : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permet de définir les valeurs numériques depuis une plage spécifiée.</translation>
+ </message>
+ <message>
+@@ -64862,7 +64862,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64907,7 +64907,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64907,9 +64907,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64942,7 +64942,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64942,7 +64942,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -65207,7 +65207,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -65207,7 +65207,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -65657,7 +65657,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -65657,7 +65657,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -66374,7 +66374,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -66374,7 +66374,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -66419,7 +66419,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -66419,9 +66419,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -66454,7 +66454,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -66454,7 +66454,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -66872,7 +66872,7 @@ La définition de SRC personnalisés dans QGIS requiert une bonne compréhension
+@@ -66872,7 +66872,7 @@ La définition de SRC personnalisés dan
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -67068,7 +67068,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_gl.ts
+++ b/i18n/qgis_gl.ts
-@@ -60546,7 +60546,7 @@ Nota: Os plugins experimentais xeralmente non son adecuados para o seu uso en pr
+@@ -15652,7 +15652,7 @@ Ruta da BD de usuario: %8
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permite fixar valores numéricos dende un rango especÃfico. a aplicación de edición pode ser tanto un deslizador coma un cadro de selección.</translation>
+ </message>
+ <message>
+@@ -60546,7 +60546,7 @@ Nota: Os plugins experimentais xeralment
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -61103,7 +61103,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -61103,7 +61103,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -61148,7 +61148,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -61148,9 +61148,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -61183,7 +61183,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -61183,7 +61183,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -62209,7 +62209,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -62209,7 +62209,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -62587,7 +62587,7 @@ Unha descrición detallada de como proceder cos datos vectoriais é relatada no
+@@ -62587,7 +62587,7 @@ Unha descrición detallada de como proce
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -62945,7 +62945,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_hr_HR.ts
+++ b/i18n/qgis_hr_HR.ts
-@@ -59847,7 +59847,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15934,7 +15934,7 @@ Pogreška je:%2</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="obsolete">DopuÅ¡ta postavljanje numeriÄkih vrijednosti iz zadanog opsega. NaÄin ureÄ‘ivanja može biti klizaÄ ili spin box.</translation>
+ </message>
+ <message>
+@@ -15978,7 +15978,7 @@ Pogreška je:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -59847,7 +59847,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -60339,7 +60339,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -60339,7 +60339,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -60424,7 +60424,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -60424,7 +60424,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -60469,7 +60469,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -60469,9 +60469,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -60504,7 +60504,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -60504,7 +60504,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60856,7 +60856,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_hu.ts
+++ b/i18n/qgis_hu.ts
-@@ -62780,7 +62780,7 @@ Note: Experimental plugins are generally unsuitable for production use. These pl
+@@ -17347,7 +17347,7 @@ A mező URL-t tartalamz</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Egy megadott tartományba esÅ‘ értékek beállÃtását teszi lehetÅ‘vé. A szerkesztÅ‘ elem lehet csúszka vagy spin box.</translation>
+ </message>
+ <message>
+@@ -62780,7 +62780,7 @@ Note: Experimental plugins are generally
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -63715,7 +63715,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -63715,7 +63715,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -64038,7 +64038,7 @@ A beállÃtott kapcsolatokat a QGIS megÅ‘rzi és az <label>Adatbázisok<
+@@ -64038,7 +64038,7 @@ A beállÃtott kapcsolatokat a QGIS megÅ
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -64206,7 +64206,7 @@ that will be automatically deleted after running.</li>
+@@ -64206,7 +64206,7 @@ that will be automatically deleted after
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -64383,7 +64383,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -64383,7 +64383,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64428,7 +64428,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64428,9 +64428,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64463,7 +64463,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64463,7 +64463,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -64522,7 +64522,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -64522,7 +64522,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64567,7 +64567,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64567,9 +64567,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64602,7 +64602,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64602,7 +64602,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -64900,7 +64900,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_id.ts
+++ b/i18n/qgis_id.ts
-@@ -57880,7 +57880,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15049,7 +15049,7 @@ Kesalahan pada:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Izinkan satu ke satu kesatuan nilai numerik dari rentang yang ditentukan. Widget edit dapat berupa slider atau spin box.</translation>
+ </message>
+ <message>
+@@ -57880,7 +57880,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -58378,7 +58378,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -58378,7 +58378,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -58507,7 +58507,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -58507,7 +58507,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -58552,7 +58552,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -58552,9 +58552,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -58587,7 +58587,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -58587,7 +58587,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -58889,7 +58889,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_is.ts
+++ b/i18n/qgis_is.ts
-@@ -55685,7 +55685,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -14690,7 +14690,7 @@ Villan var: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -55685,7 +55685,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -56177,7 +56177,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -56177,7 +56177,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -56262,7 +56262,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -56262,7 +56262,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -56307,7 +56307,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -56307,9 +56307,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -56342,7 +56342,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -56342,7 +56342,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -56694,7 +56694,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_it.ts
+++ b/i18n/qgis_it.ts
-@@ -59032,7 +59032,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -15160,7 +15160,7 @@ Questo è il widget predefinito per le o
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permette di definire un numero di valori per un intervallo specifico. Il widget di modica può utilizzare uno slider o uno spin box.</translation>
+ </message>
+ <message>
+@@ -59032,7 +59032,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -59077,7 +59077,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -59077,9 +59077,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -59112,7 +59112,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -59112,7 +59112,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -59344,7 +59344,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -59344,7 +59344,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -59740,7 +59740,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -59740,7 +59740,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -59994,7 +59994,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -59994,7 +59994,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -60039,7 +60039,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -60039,9 +60039,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -60074,7 +60074,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -60074,7 +60074,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -60188,7 +60188,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -60188,9 +60188,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -60223,7 +60223,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -60223,7 +60223,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -62169,7 +62169,7 @@ Pressing the <label>Calculate</label> button will run the shortest p
+@@ -61957,7 +61957,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -62169,7 +62169,7 @@ Pressing the <label>Calculate</
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_ja.ts
+++ b/i18n/qgis_ja.ts
-@@ -50692,7 +50692,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -12942,7 +12942,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>指定ã•ã‚ŒãŸç¯„囲ã®æ•°å€¤ã‚’è¨å®šã™ã‚‹ã“ã¨ãŒè¨±ã•ã‚Œã‚‹ã€‚ã“ã®ç·¨é›†ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯ã‚¹ãƒ©ã‚¤ãƒ€ãƒ¼ã¨ã‚¹ãƒ”ンボックスを利用ã§ãる。</translation>
+ </message>
+ <message>
+@@ -50692,7 +50692,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -50780,7 +50780,7 @@ The vector layer needs to be in editing mode, before you can click on the <la
+@@ -50780,7 +50780,7 @@ The vector layer needs to be in editing
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -52283,7 +52283,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -52283,7 +52283,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -52328,7 +52328,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -52328,9 +52328,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -52363,7 +52363,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -52363,7 +52363,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -52887,7 +52887,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_km.ts
+++ b/i18n/qgis_km.ts
-@@ -51790,7 +51790,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -13714,7 +13714,7 @@ User DB Path: %9
+ </translation>
+ </message>
+ <message>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished">
+ </translation>
+ </message>
+@@ -51790,7 +51790,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -52481,7 +52481,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -52010,7 +52010,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -52481,7 +52481,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -52526,7 +52526,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -52526,9 +52526,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -52561,7 +52561,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -52561,7 +52561,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -52812,7 +52812,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -52812,7 +52812,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_ko_KR.ts
+++ b/i18n/qgis_ko_KR.ts
-@@ -64007,7 +64007,7 @@ QGISì—ì„œ ì‚¬ìš©ìž ì •ì˜ ì¢Œí‘œê³„ë¥¼ 만들기 위해서는 Proj.4 투ì˜
+@@ -18202,7 +18202,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>ì§€ì •ëœ ë²”ìœ„ì—ì„œ 수치를 ì„¤ì •í• ìˆ˜ 있습니다. ì´ íŽ¸ì§‘ ìœ„ì ¯ì€ ìŠ¬ë¼ì´ë”나 스핀 ìƒìžì— ìžˆì„ ìˆ˜ 있습니다.</translation>
+ </message>
+ <message>
+@@ -64007,7 +64007,7 @@ QGISì—ì„œ ì‚¬ìš©ìž ì •ì˜ ì¢Œí‘œê³„ë¥¼
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -64545,7 +64545,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -64545,7 +64545,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64590,7 +64590,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64590,9 +64590,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64625,7 +64625,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64625,7 +64625,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -65640,7 +65640,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -65640,7 +65640,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -66190,7 +66190,7 @@ Note: Experimental plugins are generally unsuitable for production use. These pl
+@@ -66190,7 +66190,7 @@ Note: Experimental plugins are generally
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -66532,7 +66532,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_lv.ts
+++ b/i18n/qgis_lv.ts
-@@ -50726,7 +50726,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -13998,7 +13998,7 @@ Kļūda bija %2</translation>
+ <translation>AttÄ“lo kombinÄ“to logu, kas satur attribÅ«tu vÄ“rtÄ«bas, kuras izmanto klasifikÄcijai.</translation>
+ </message>
+ <message>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -50726,7 +50726,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -51417,7 +51417,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -50946,7 +50946,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -51417,7 +51417,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -51462,7 +51462,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -51462,9 +51462,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -51497,7 +51497,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -51497,7 +51497,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -51748,7 +51748,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -51748,7 +51748,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_mn.ts
+++ b/i18n/qgis_mn.ts
-@@ -55182,7 +55182,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -14437,7 +14437,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -55182,7 +55182,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -55674,7 +55674,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -55674,7 +55674,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -55759,7 +55759,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -55759,7 +55759,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -55804,7 +55804,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -55804,9 +55804,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -55839,7 +55839,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -55839,7 +55839,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -56191,7 +56191,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_nb_NO.ts
+++ b/i18n/qgis_nb_NO.ts
-@@ -50120,7 +50120,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -12857,7 +12857,7 @@ User DB Path: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -50120,7 +50120,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -50612,7 +50612,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -50612,7 +50612,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -50697,7 +50697,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -50697,7 +50697,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -50742,7 +50742,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -50742,9 +50742,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -50777,7 +50777,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -50777,7 +50777,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -51129,7 +51129,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_nl.ts
+++ b/i18n/qgis_nl.ts
-@@ -46782,7 +46782,7 @@ Er was een probleem met uw symbolen database.</translation>
+@@ -15105,7 +15105,7 @@ Foutmelding: %2</translation>
+ <translation>Toont een selectielijst met attribuutwaarden gebruikt voor classificatie.</translation>
+ </message>
+ <message>
+- <source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="obsolete">Toestaan dat een numerieke waarde uit een 'range' wordt gekozen. De aanpas-'widget' can een schuiver of een spinbox zijn.</translation>
+ </message>
+ <message>
+@@ -15205,7 +15205,7 @@ Foutmelding: %2</translation>
+ <translation>Waarde-relatie</translation>
+ </message>
+ <message>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Biedt de mogelijkheid om numerieke waarden in te voeren als een reeks. Dit kan zowel met een schuifbalk als een "spin box".</translation>
+ </message>
+ <message>
+@@ -46782,7 +46782,7 @@ Er was een probleem met uw symbolen data
<translation>Elementen en Kaarten verplaatsen in de 'Print Composer'</translation>
</message>
<message>
@@ -1347,7 +1893,7 @@ Last-Update: 2013-09-27
<translation type="obsolete">In de Layouter-knoppenbalk vind je twee knoppen voor het verplaatsen van elementen. De linker (een selectie-pijl met een handje) selecteert en verschuift elementen in de layout. Na het selecteren van een element met deze tool kun je het ook verschuiven met de pijltjes-toetsen. Voor het nauwkeurig plaatsen gebruik je het <strong>Positie en Grootte...</strong>-dialoogvenster, dat te vinden is in tabblad <strong>Onderdeel → Item-opties → Positie en Grootte...</strong>. Voor handiger plaatsen kun je ook het verankeringspunt opgeven in dit dialoogvenster. Met de andere verplaatsknop (een wereldbol met handje) kan de kaart binnen een kaart-element worden verschoven.</translation>
</message>
<message>
-@@ -48833,7 +48833,7 @@ Moeten de bestaande klassen worden verwijderd voor de nieuwe klassificatie?</tra
+@@ -48833,7 +48833,7 @@ Moeten de bestaande klassen worden verwi
<translation>Laag</translation>
</message>
<message>
@@ -1356,146 +1902,203 @@ Last-Update: 2013-09-27
<translation type="obsolete">Dit maakt het mogelijk om de aanmaak van bepaalde attributen te voorkomen, met bepaald OGR drivers (bv DGN, DXF) die dit niet ondersteunen.</translation>
</message>
<message>
-@@ -53687,7 +53687,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -53687,7 +53687,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -54510,7 +54510,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -54039,7 +54039,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -54510,7 +54510,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -54555,7 +54555,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -54555,9 +54555,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -54590,7 +54590,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -54590,7 +54590,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -54847,7 +54847,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -54847,7 +54847,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_pl_PL.ts
+++ b/i18n/qgis_pl_PL.ts
-@@ -62481,7 +62481,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -17112,7 +17112,7 @@ BÅ‚Ä…d brzmi:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Umożliwia zdefiniowanie wartości z określonego zakresu. Widżet edycji może być suwakiem lub obrotowy.</translation>
+ </message>
+ <message>
+@@ -62481,7 +62481,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -62526,7 +62526,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -62526,9 +62526,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -62561,7 +62561,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -62561,7 +62561,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -62900,7 +62900,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -62900,7 +62900,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -62945,7 +62945,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -62945,9 +62945,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -62980,7 +62980,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -62980,7 +62980,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -63040,7 +63040,7 @@ QGIS obsługuje wiele sposobów wizualizacji danych. Obecnie dostępne są nast
+@@ -63040,7 +63040,7 @@ QGIS obsługuje wiele sposobów wizualiz
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -63085,7 +63085,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -63085,9 +63085,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen ’unique value’ as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If editable is activated, a line edit is shown with autocompletion support, otherwise a combo box is used.
-@@ -63223,7 +63223,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the comboo box. You can define values manually or load them from a layer or a csv file.
+@@ -63223,7 +63223,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -64456,7 +64456,7 @@ Pressing the <label>Calculate</label> button will run the shortest p
+@@ -64340,7 +64340,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -64456,7 +64456,7 @@ Pressing the <label>Calculate</
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_pt_BR.ts
+++ b/i18n/qgis_pt_BR.ts
-@@ -56192,7 +56192,7 @@ NANNI AS, DESCOVI FILHO L, VIRTUOSO MA, MONTENEGRO D, WILLRICH G, MACHADO PH, SP
+@@ -17866,7 +17866,7 @@ Caminho DB usuário: %8
+ <translation>Campo somente leitura que gera uma UUID se vazio.</translation>
+ </message>
+ <message>
+- <source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="obsolete">Permite agrupar valores numéricos a partir de um intervalo especÃfico. The edit widget can be either a slider or a spin box.</translation>
+ </message>
+ <message>
+@@ -17910,7 +17910,7 @@ Caminho DB usuário: %8
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permite agrupar valores numéricos a partir de um intervalo especÃfico. O objeto de edição pode ser sempre um deslizador ou caixa de giro.</translation>
+ </message>
+ <message>
+@@ -56192,7 +56192,7 @@ NANNI AS, DESCOVI FILHO L, VIRTUOSO MA,
<translation>Movendo elementos e mapas no Compositor de Impressão</translation>
</message>
<message>
@@ -1513,433 +2116,580 @@ Last-Update: 2013-09-27
<translation type="obsolete">Isto permite suprimir a criação de atributos como alguns drivers OGR (eg. DGN, DXF) não suportados.</translation>
</message>
<message>
-@@ -63961,7 +63961,7 @@ Este diálogo permite você definir as configurações para a conexão para base
+@@ -63961,7 +63961,7 @@ Este diálogo permite você definir as c
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -64339,7 +64339,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -64339,7 +64339,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64384,7 +64384,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64384,9 +64384,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64419,7 +64419,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64419,7 +64419,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -64647,7 +64647,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -64647,7 +64647,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -65042,7 +65042,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -65042,7 +65042,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -65095,7 +65095,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -65095,7 +65095,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</translation>
-@@ -65298,7 +65298,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -65298,7 +65298,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -65343,7 +65343,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -65343,9 +65343,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -65378,7 +65378,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -65378,7 +65378,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -65438,7 +65438,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -65438,7 +65438,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -65483,7 +65483,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -65483,9 +65483,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -65518,7 +65518,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -65518,7 +65518,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -67316,7 +67316,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_pt_PT.ts
+++ b/i18n/qgis_pt_PT.ts
-@@ -63977,7 +63977,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -17527,7 +17527,7 @@ Caminho DB de utilizador: %8
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Permite agrupar valores numéricos a partir de um intervalo especÃfico. A ferramenta de edição pode de barra deslizante ou caixa de rotação.</translation>
+ </message>
+ <message>
+@@ -63977,7 +63977,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64022,7 +64022,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64022,9 +64022,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64057,7 +64057,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64057,7 +64057,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -64226,7 +64226,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -64226,7 +64226,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -64552,7 +64552,7 @@ The field calculator allows you to update fields with expressions.
+@@ -64275,7 +64275,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -64552,7 +64552,7 @@ The field calculator allows you to updat
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/i18n/qgis_ro.ts
+++ b/i18n/qgis_ro.ts
-@@ -55726,7 +55726,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -14995,7 +14995,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -55726,7 +55726,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -56218,7 +56218,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -56218,7 +56218,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -56303,7 +56303,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -56303,7 +56303,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -56348,7 +56348,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -56348,9 +56348,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -56383,7 +56383,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -56383,7 +56383,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -56735,7 +56735,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_ru.ts
+++ b/i18n/qgis_ru.ts
-@@ -57898,7 +57898,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -14963,7 +14963,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>ПозволÑет ввод чиÑловых значений из указанного диапазона. Ðлемент Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть ползунком или полем ввода.</translation>
+ </message>
+ <message>
+@@ -57898,7 +57898,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -57943,7 +57943,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -57943,9 +57943,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -57978,7 +57978,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -57978,7 +57978,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -58094,7 +58094,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -58094,7 +58094,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -58489,7 +58489,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -58489,7 +58489,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -58620,7 +58620,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -58620,7 +58620,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -58665,7 +58665,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -58665,9 +58665,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -58700,7 +58700,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -58700,7 +58700,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -59681,7 +59681,7 @@ Click on one of the icons along the top of the composer window to select what ty
+@@ -59681,7 +59681,7 @@ Click on one of the icons along the top
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -60243,7 +60243,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_sk.ts
+++ b/i18n/qgis_sk.ts
-@@ -55426,7 +55426,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -14298,7 +14298,7 @@ Chyba bola: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Umožňuje nastaviÅ¥ numerické hodnoty z vybraného rozsahu. EditaÄným grafickým prvkom môže byÅ¥ posuvnÃk alebo ÄÃselnÃk.</translation>
+ </message>
+ <message>
+@@ -55426,7 +55426,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -55471,7 +55471,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -55471,9 +55471,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -55506,7 +55506,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -55506,7 +55506,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -56007,7 +56007,7 @@ Note: Experimental plugins are generally unsuitable for production use. These pl
+@@ -56007,7 +56007,7 @@ Note: Experimental plugins are generally
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -56741,7 +56741,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -56630,7 +56630,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+@@ -56741,7 +56741,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -56786,7 +56786,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -56786,9 +56786,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -56821,7 +56821,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -56821,7 +56821,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -56910,7 +56910,7 @@ For more complex searches use the <label>Advanced search</label>. Th
+@@ -56910,7 +56910,7 @@ For more complex searches use the <la
<a name="Field">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
You have to bring the vector layer in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
-@@ -57304,7 +57304,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -57304,7 +57304,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
--- a/i18n/qgis_sl_SI.ts
+++ b/i18n/qgis_sl_SI.ts
-@@ -64268,7 +64268,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -17746,7 +17746,7 @@ Napaka je:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Dovoli nastaviti Å¡tevilÄne vrednosti za doloÄeno obmoÄje. Gradnik za urejanje je lahko drsnik ali vrtilni koleÅ¡Äek.</translation>
+ </message>
+ <message>
+@@ -64268,7 +64268,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -64313,7 +64313,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -64313,9 +64313,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -64348,7 +64348,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -64348,7 +64348,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
-@@ -64620,7 +64620,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -64620,7 +64620,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -64880,7 +64880,7 @@ which are described and illustrated on <a href="http://en.wikipedia.org/
+@@ -64880,7 +64880,7 @@ which are described and illustrated on &
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
+@@ -65610,7 +65610,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_sr_Cyrl.ts
+++ b/i18n/qgis_sr_Cyrl.ts
-@@ -58431,7 +58431,7 @@ Should the existing classes be deleted before classification?</source>
+@@ -18726,7 +18726,7 @@ Greška je:%2</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="obsolete">Дозвољава поÑтављање нумеричких вредноÑти из подразумеваног опÑега. Ðачин едитовања може бити клизач или "spin box".</translation>
+ </message>
+ <message>
+@@ -18770,7 +18770,7 @@ Greška je:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -58431,7 +58431,7 @@ Should the existing classes be deleted b
<translation type="unfinished">Размера</translation>
</message>
<message>
@@ -1948,54 +2698,84 @@ Last-Update: 2013-09-27
<translation type="obsolete">Потврђивањем ове опције атрибути Ñе не креирају.</translation>
</message>
<message>
-@@ -63227,7 +63227,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -63227,7 +63227,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -63719,7 +63719,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -63719,7 +63719,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -63804,7 +63804,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -63804,7 +63804,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -63849,7 +63849,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -63849,9 +63849,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -63884,7 +63884,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -63884,7 +63884,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -64236,7 +64236,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_sr_Latn.ts
+++ b/i18n/qgis_sr_Latn.ts
-@@ -58397,7 +58397,7 @@ Trebaju li postojeće klase biti izbrisane pre klasifikacije?</translation>
+@@ -18728,7 +18728,7 @@ Greška je:%2</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <source>Allows to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="obsolete">Dozvoljava postavljanje numeriÄkih vrednosti iz podrazumevanog opsega. NaÄin editovanja može biti klizaÄ ili "spin box".</translation>
+ </message>
+ <message>
+@@ -18772,7 +18772,7 @@ Greška je:%2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -58397,7 +58397,7 @@ Trebaju li postojeće klase biti izbrisa
<translation type="unfinished">Razmera</translation>
</message>
<message>
@@ -2004,380 +2784,539 @@ Last-Update: 2013-09-27
<translation type="obsolete">Potvrđivanjem ove opcije atributi se ne kreiraju.</translation>
</message>
<message>
-@@ -63197,7 +63197,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -63197,7 +63197,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -63689,7 +63689,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -63689,7 +63689,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -63774,7 +63774,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -63774,7 +63774,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -63819,7 +63819,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -63819,9 +63819,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -63854,7 +63854,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -63854,7 +63854,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -64206,7 +64206,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_sv.ts
+++ b/i18n/qgis_sv.ts
-@@ -59599,7 +59599,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -15594,7 +15594,7 @@ felet var: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Gör det möjligt att ställa in numeriska värden från ett intervall. Redigeringsfunktionen kan vara antingen ett dragreglage eller en snurra.</translation>
+ </message>
+ <message>
+@@ -59599,7 +59599,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -59631,7 +59631,7 @@ The vector layer needs to be in editing mode, before you can click on the <la
+@@ -59631,7 +59631,7 @@ The vector layer needs to be in editing
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -59899,7 +59899,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -59899,7 +59899,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -59944,7 +59944,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -59944,9 +59944,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -59979,7 +59979,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -59979,7 +59979,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60919,7 +60919,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_th.ts
+++ b/i18n/qgis_th.ts
-@@ -59743,7 +59743,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -16152,7 +16152,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>ยà¸à¸¡à¹ƒà¸«à¹‰à¸à¸³à¸«à¸™à¸”เป็นค่าตัวเลขà¹à¸¥à¹‰à¸§à¸•à¸±à¸§à¸„วบคุมจะเลืà¸à¸™à¹„ด้</translation>
+ </message>
+ <message>
+@@ -59743,7 +59743,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -60235,7 +60235,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -60235,7 +60235,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -60320,7 +60320,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -60320,7 +60320,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -60365,7 +60365,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -60365,9 +60365,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -60400,7 +60400,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -60400,7 +60400,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60752,7 +60752,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_tr.ts
+++ b/i18n/qgis_tr.ts
-@@ -57778,7 +57778,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15641,7 +15641,7 @@ Hata ÅŸuydu: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -57778,7 +57778,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -58270,7 +58270,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -58270,7 +58270,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -58355,7 +58355,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -58355,7 +58355,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -58400,7 +58400,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -58400,9 +58400,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -58435,7 +58435,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -58435,7 +58435,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -58787,7 +58787,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_uk.ts
+++ b/i18n/qgis_uk.ts
-@@ -59432,7 +59432,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -16057,7 +16057,7 @@ Error was:%2</source>
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>ДозволÑÑ” вÑтановити чиÑлові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· зазначеного діапазону. Віджет Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ðµ бути повзунком чи полем вводу.</translation>
+ </message>
+ <message>
+@@ -59432,7 +59432,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -59924,7 +59924,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -59924,7 +59924,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -60009,7 +60009,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -60009,7 +60009,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -60054,7 +60054,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -60054,9 +60054,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -60089,7 +60089,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -60089,7 +60089,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60441,7 +60441,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_vi.ts
+++ b/i18n/qgis_vi.ts
-@@ -57630,7 +57630,7 @@ Note: Experimental plugins are generally unsuitable for production use. These pl
+@@ -14925,7 +14925,7 @@ User DB Path: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>Cho phép thiết láºp các giá trị số từ má»™t miá»n chỉ định. Widget chỉnh sá»a có thể là há»™p thanh trượt hoặc xoay.</translation>
+ </message>
+ <message>
+@@ -57630,7 +57630,7 @@ Note: Experimental plugins are generally
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -58122,7 +58122,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -58122,7 +58122,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -58207,7 +58207,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -58207,7 +58207,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -58252,7 +58252,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -58252,9 +58252,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -58287,7 +58287,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -58287,7 +58287,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -58549,7 +58549,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_zh_CN.ts
+++ b/i18n/qgis_zh_CN.ts
-@@ -59118,7 +59118,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15547,7 +15547,7 @@ SVGæœç´¢è·¯å¾„： %7
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation>å…许人们在指定的范围内设置数值。该编辑控件å¯ä»¥æ˜¯ä¸€ä¸ªæ»‘å—或旋钮。</translation>
+ </message>
+ <message>
+@@ -59118,7 +59118,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -59612,7 +59612,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -59612,7 +59612,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -59697,7 +59697,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -59697,7 +59697,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -59742,7 +59742,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -59742,9 +59742,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -59777,7 +59777,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -59777,7 +59777,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -60129,7 +60129,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/i18n/qgis_zh_TW.ts
+++ b/i18n/qgis_zh_TW.ts
-@@ -58661,7 +58661,7 @@ Defining a custom CRS in QGIS requires a good understanding of the Proj.4 projec
+@@ -15845,7 +15845,7 @@ User DB Path: %9
+ </message>
+ <message>
+ <location filename="../src/ui/qgsattributetypeedit.ui" line="195"/>
+- <source>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
++ <source>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+@@ -58661,7 +58661,7 @@ Defining a custom CRS in QGIS requires a
No matter if selected text contains the interpreter prompt (>>>, ...). Input area pane is the interactive
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
-@@ -59153,7 +59153,7 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -59153,7 +59153,7 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
</source>
-@@ -59238,7 +59238,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -59238,7 +59238,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -59283,7 +59283,7 @@ Within the <label>Attributes</label> tab the attributes of the selec
+@@ -59283,9 +59283,9 @@ Within the <label>Attributes</l
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -59318,7 +59318,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -59318,7 +59318,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
+@@ -59670,7 +59670,7 @@ The <label>Mode</label> sett
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
--- a/python/plugins/GdalTools/tools/GdalTools_utils.py
+++ b/python/plugins/GdalTools/tools/GdalTools_utils.py
@@ -765,7 +765,7 @@ class GdalConfig:
@@ -2385,89 +3324,92 @@ Last-Update: 2013-09-27
return shortName
-# class which allows to create version objects and compare them
-+# class which allows one to create version objects and compare them
++# class which allows creating version objects and compare them
class Version:
def __init__(self, ver):
self.vers = ('0', '0', '0')
--- a/python/plugins/processing/otb/description/doc/BlockMatching.html
+++ b/python/plugins/processing/otb/description/doc/BlockMatching.html
-@@ -20,13 +20,13 @@ href="CookBookse17.html#CookBooksu72.html" >up</a>] </p></div>
+@@ -20,13 +20,13 @@ href="CookBookse17.html#CookBooksu72.htm
<!--l. 3334--><p class="noindent" >Performs block-matching to estimate pixel-wise disparities between two images
<h5 class="subsubsectionHead"><a
id="x98-4770004.7.1"></a>Detailed description</h5>
-<!--l. 3336--><p class="noindent" >This application allows to performs block-matching to estimate pixel-wise disparities between two images.
-The application allows to choose the block-matching method to use. It also allows to input masks (related to
-+<!--l. 3336--><p class="noindent" >This application allows one to performs block-matching to estimate pixel-wise disparities between two images.
-+The application allows one to choose the block-matching method to use. It also allows one to input masks (related to
++<!--l. 3336--><p class="noindent" >This application allows performing block-matching to estimate pixel-wise disparities between two images.
++The application allows choosing the block-matching method to use. It also allows inputting masks (related to
the left and right input image) of pixels for which the disparity should be investigated. Additionally,
two criteria can be optionally used to disable disparity investigation for some pixel: a no-data
-value, and a threshold on the local variance. This allows to speed-up computation by avoiding to
-+value, and a threshold on the local variance. This allows one to speed-up computation by avoiding to
++value, and a threshold on the local variance. This allows speeding-up computation by avoiding to
investigate disparities that will not be reliable anyway. For efficiency reasons, if the optimal metric
values image is desired, it will be concatenated to the output image (which will then have three
bands : horizontal disparity, vertical disparity and metric value). One can split these images
-@@ -433,7 +433,7 @@ class="content">Parameters table for Pixel-wise Block-Matching.</span></div><!--
+@@ -433,7 +433,7 @@ class="content">Parameters table for Pix
<!--l. 3394--><p class="noindent" ><span class="paragraphHead"><a
id="x98-4790004.7.1"></a><span
class="ptmb7t-">Input and output data</span></span>
-This group of parameters allows to set the input and output images.
-+This group of parameters allows one to set the input and output images.
++This group of parameters allows setting the input and output images.
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Left input image: </span>The left input image (reference)
-@@ -457,25 +457,25 @@ class="ptmb7t-">Output optimal metric values as well: </span>If used,
+@@ -457,25 +457,25 @@ class="ptmb7t-">Output optimal metric
<!--l. 3408--><p class="noindent" ><span class="paragraphHead"><a
id="x98-4800004.7.1"></a><span
class="ptmb7t-">Image masking parameters</span></span>
-This group of parameters allows to determine the masking parameters to prevent disparities estimation for
-+This group of parameters allows one to determine the masking parameters to prevent disparities estimation for
++This group of parameters allows determining the masking parameters to prevent disparities estimation for
some pixels of the left image
<ul class="itemize1">
<li class="itemize"><span
-class="ptmb7t-">Discard left pixels from mask image: </span>This parameter allows to provide a custom mask for
-+class="ptmb7t-">Discard left pixels from mask image: </span>This parameter allows one to provide a custom mask for
++class="ptmb7t-">Discard left pixels from mask image: </span>This parameter allows providing a custom mask for
the left image.Block matching will be only perform on pixels inside the mask.
</li>
<li class="itemize"><span
-class="ptmb7t-">Discard right pixels from mask image: </span>This parameter allows to provide a custom mask
-+class="ptmb7t-">Discard right pixels from mask image: </span>This parameter allows one to provide a custom mask
++class="ptmb7t-">Discard right pixels from mask image: </span>This parameter allows providing a custom mask
for the right image.Block matching will be perform only on pixels inside the mask.
</li>
<li class="itemize"><span
-class="ptmb7t-">Discard pixels with no-data value: </span>This parameter allows to discard pixels whose value is
-+class="ptmb7t-">Discard pixels with no-data value: </span>This parameter allows one to discard pixels whose value is
++class="ptmb7t-">Discard pixels with no-data value: </span>This parameter allows discarding pixels whose value is
equal to the user-defined no-data value.
</li>
<li class="itemize"><span
-class="ptmb7t-">Discard pixels with low local variance: </span>This parameter allows to discard pixels whose local
-+class="ptmb7t-">Discard pixels with low local variance: </span>This parameter allows one to discard pixels whose local
++class="ptmb7t-">Discard pixels with low local variance: </span>This parameter allows discarding pixels whose local
variance is too small (the size of the neighborhood is given by the radius parameter)
</li></ul>
<!--l. 3420--><p class="noindent" ><span class="paragraphHead"><a
--- a/python/plugins/processing/otb/description/doc/ColorMapping.html
+++ b/python/plugins/processing/otb/description/doc/ColorMapping.html
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Color Mapping</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maps an input grayscale image into 8-bits RGB using look-up tables.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows to map an input grayscale into a 8-bits RGB image using three different methods.
--The custom method allows to apply a custom look-up table to a labeled image. The look-up table is loaded from a text file where each line describes an entry. The typical use of this method is to colorise a classification map.
--The continuous method allows to map a range of values in a scalar input image into a colored image using continuous look-up table, in order to enhance image interpretation. Several look-up tables can ben chosen with different color ranges.
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Color Mapping</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maps an input grayscale image into 8-bits RGB using look-up tables.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows one to map an input grayscale into a 8-bits RGB image using three different methods.
-+-The custom method allows one to apply a custom look-up table to a labeled image. The look-up table is loaded from a text file where each line describes an entry. The typical use of this method is to colorise a classification map.
-+-The continuous method allows one to map a range of values in a scalar input image into a colored image using continuous look-up table, in order to enhance image interpretation. Several look-up tables can ben chosen with different color ranges.
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Color Mapping</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maps an input grayscale image into 8-bits RGB using look-up tables.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows mapping an input grayscale into a 8-bits RGB image using three different methods.
++-The custom method allows applying a custom look-up table to a labeled image. The look-up table is loaded from a text file where each line describes an entry. The typical use of this method is to colorise a classification map.
++-The continuous method allows mapping a range of values in a scalar input image into a colored image using continuous look-up table, in order to enhance image interpretation. Several look-up tables can ben chosen with different color ranges.
-The segmentation method is dedicated to segmentation labeled outputs where each segment correspond to a unique labeled. It computes an optimal look-up table such that color difference between adjacent segmented regions is maximised.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>Input image filename</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>Output image filename</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Color mapping method (-method): </span>Selection of color mapping methods and their parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Color mapping with custom labeled look-up table: </span>Apply a user-defined look-up table to a labeled image. Look-up table is loaded from a text file.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Look-up table file (-lut): </span>An ASCII file containing the look-up table
with one color per line
(for instance the line '1 255 0 0' means that all pixels with label 1 will be replaced by RGB color 255 0 0)
+-Lines beginning with a # are ignored</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Color mapping with continuous look-up table: </span>Apply a continuous look-up table to a range of input values.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Look-up tables (-lut): </span>Available look-up tables.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Red: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Green: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Blue: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Grey: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Hot: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Cool: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Spring: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Summer: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Autumn: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Winter: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Copper: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Jet: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] HSV: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] OverUnder: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Relief: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Mapping range lower value (-min): </span>Set the lower input value of the mapping range.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Mapping range higher value (-max): </span>Set the higher input value of the mapping range.</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Color mapping with a look-up table optimised for segmentation: </span>Compute an optimal look-up table such that neighbouring labels in a segmentation are mapped to highly contrasted colors.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Background label (-background): </span>Value of the background label</p></li></ul></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The segmentation method does not support streaming, and thus large images.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ImageSVMClassifier application</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: clLabeledImageQB123_1.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: clLabeledFancyImageQB123_1.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Color mapping method: custom</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Look-up table file: Classification/ColorTable.txt</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_ColorMapping -in clLabeledImageQB123_1.tif -out clLabeledFancyImageQB123_1.tif -method custom -method.custom.lut Classification/ColorTable.txt</p></ul></body></html>
+\ No newline at end of file
++Lines beginning with a # are ignored</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Color mapping with continuous look-up table: </span>Apply a continuous look-up table to a range of input values.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Look-up tables (-lut): </span>Available look-up tables.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Red: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Green: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Blue: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Grey: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Hot: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Cool: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Spring: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Summer: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Autumn: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Winter: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Copper: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Jet: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] HSV: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] OverUnder: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Relief: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Mapping range lower value (-min): </span>Set the lower input value of the mapping range.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Mapping range higher value (-max): </span>Set the higher input value of the mapping range.</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Color mapping with a look-up table optimised for segmentation: </span>Compute an optimal look-up table such that neighbouring labels in a segmentation are mapped to highly contrasted colors.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Background label (-background): </span>Value of the background label</p></li></ul></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The segmentation method does not support streaming, and thus large images.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ImageSVMClassifier application</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: clLabeledImageQB123_1.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: clLabeledFancyImageQB123_1.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Color mapping method: custom</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Look-up table file: Classification/ColorTable.txt</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_ColorMapping -in clLabeledImageQB123_1.tif -out clLabeledFancyImageQB123_1.tif -method custom -method.custom.lut Classification/ColorTable.txt</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/DisparityMapToElevationMap.html
+++ b/python/plugins/processing/otb/description/doc/DisparityMapToElevationMap.html
-@@ -220,7 +220,7 @@ class="content">Parameters table for Disparity map to elevation map.</span></div
+@@ -220,7 +220,7 @@ class="content">Parameters table for Dis
<!--l. 3561--><p class="noindent" ><span class="paragraphHead"><a
id="x99-4900004.7.2"></a><span
class="ptmb7t-">Input and output data</span></span>
-This group of parameters allows to set the input and output images and grids.
-+This group of parameters allows one to set the input and output images and grids.
++This group of parameters allows setting the input and output images and grids.
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Input disparity map: </span>The input disparity map (horizontal disparity in first band, vertical in
@@ -2476,16 +3418,16 @@ Last-Update: 2013-09-27
id="x99-4940004.7.2"></a><span
class="ptmb7t-">Elevation management</span></span>
-This group of parameters allows to manage elevation values. Supported formats are SRTM, DTED or any
-+This group of parameters allows one to manage elevation values. Supported formats are SRTM, DTED or any
++This group of parameters allows managing elevation values. Supported formats are SRTM, DTED or any
geotiff processed by the DEM import application Available choices are:
<ul class="itemize1">
<li class="itemize"><span
-@@ -278,7 +278,7 @@ class="ptmb7t-">Geoid File: </span>Use a geoid grid to get the height above the
+@@ -278,7 +278,7 @@ class="ptmb7t-">Geoid File: </span>Use
class="ptmb7t-">Average Elevation</span>
<ul class="itemize2">
<li class="itemize"><span
-class="ptmb7t-">Average Elevation: </span>This parameter allows to pick up an average elevation for all the
-+class="ptmb7t-">Average Elevation: </span>This parameter allows one to pick up an average elevation for all the
++class="ptmb7t-">Average Elevation: </span>This parameter allows picking up an average elevation for all the
points of the image.</li></ul>
</li></ul>
<!--l. 3597--><p class="noindent" ><span class="paragraphHead"><a
@@ -2496,45 +3438,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2549,7 +3491,7 @@ Last-Update: 2013-09-27
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
@@ -2560,7 +3502,7 @@ Last-Update: 2013-09-27
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
@@ -2569,7 +3511,7 @@ Last-Update: 2013-09-27
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
@@ -2578,7 +3520,7 @@ Last-Update: 2013-09-27
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
@@ -2593,23 +3535,23 @@ Last-Update: 2013-09-27
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Hyperspectral data unmixing</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Estimate abundance maps from an hyperspectral image and a set of endmembers.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Hyperspectral</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The application applies a linear unmixing algorithm to an hyperspectral data cube. This method supposes that the mixture between materials in the scene is macroscopic and simulate a linear mixing model of spectra.
The Linear Mixing Model (LMM) acknowledges that reflectance spectrum associated with each pixel is a linear combination of pure materials in the recovery area, commonly known as endmembers.Endmembers can be estimated using the VertexComponentAnalysis application.
-The application allows to estimate the abundance maps with several algorithms : Unconstrained Least Square (ucls), Fully Constrained Least Square (fcls),Image Space Reconstruction Algorithm (isra) and Non-negative constrained Least Square (ncls) and Minimum Dispersion Constrained Non Negative Matrix Factorization (MDMDNMF).
-+The application allows one to estimate the abundance maps with several algorithms : Unconstrained Least Square (ucls), Fully Constrained Least Square (fcls),Image Space Reconstruction Algorithm (isra) and Non-negative constrained Least Square (ncls) and Minimum Dispersion Constrained Non Negative Matrix Factorization (MDMDNMF).
++The application allow estimating the abundance maps with several algorithms : Unconstrained Least Square (ucls), Fully Constrained Least Square (fcls),Image Space Reconstruction Algorithm (isra) and Non-negative constrained Least Square (ncls) and Minimum Dispersion Constrained Non Negative Matrix Factorization (MDMDNMF).
</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image Filename (-in): </span>The hyperspectral data cube to unmix</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>The output abundance map</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input endmembers (-ie): </span>The endmembers (estimated pure pixels) to use for unmixing. Must be stored as a multispectral image, where each pixel is interpreted as an endmember</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Unmixing algorithm (-ua): </span>The algorithm to use for unmixing</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] UCLS: </span>Unconstrained Least Square</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] FCLS: </span>Fully constrained Least Square</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] NCLS: </span>Non-negative constrained Least Square</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] ISRA: </span>Image Space Reconstruction Algorithm</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] MDMDNMF: </span>Minimum Dispersion Constrained Non Negative Matrix Factorization</p><ul></ul></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">VertexComponentAnalysis</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image Filename: hsi_cube.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: HyperspectralUnmixing.tif double</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input endmembers: endmembers.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Unmixing algorithm: ucls</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_HyperspectralUnmixing -in hsi_cube.tif -out HyperspectralUnmixing.tif double -ie endmembers.tif -ua ucls</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/ImageSVMClassifier.html
+++ b/python/plugins/processing/otb/description/doc/ImageSVMClassifier.html
@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Image SVM Classification</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Performs a SVM classification of the input image according to a SVM model file.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application performs a SVM image classification based on a SVM model file (*.svm extension) produced by the TrainSVMImagesClassifier application. Pixels of the output image will contain the class label decided by the SVM classifier. The input pixels can be optionnaly centered and reduced according to the statistics file produced by the ComputeImagesStatistics application. An optional input mask can be provided, in which case only input image pixels whose corresponding mask value is greater than 0 will be classified. The remaining of pixels will be given the label 0 in the output image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input Image to classify.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Mask (-mask): </span>The mask allows to restrict classification of the input image to the area where mask pixel values are greater than 0.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] SVM Model file (-svm): </span>A SVM model file.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Statistics file (-imstat): </span>A XML file containing mean and standard deviation to center and reduce samples before classification.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>Output image labeled with class labels</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The input image must have the same type, order and number of bands than the images used to produce the statistics file and the SVM model file. If a statistics file was used during training by the TrainSVMImagesClassifier, it is mandatory to use the same statistics file for classification. If an input mask is used, its size must match the input image size.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">TrainSVMImagesClassifier, ValidateSVMImagesClassifier, ComputeImagesStatistics</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SVM Model file: clsvmModelQB1.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: otbConcatenateImages.png uchar</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_ImageSVMClassifier -in QB_1_ortho.tif -svm clsvmModelQB1.svm -imstat clImageStatisticsQB1.xml -out otbConcatenateImages.png uchar</p></ul></body></html>
\ No newline at end of file
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Image SVM Classification</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Performs a SVM classification of the input image according to a SVM model file.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application performs a SVM image classification based on a SVM model file (*.svm extension) produced by the TrainSVMImagesClassifier application. Pixels of the output image will contain the class label decided by the SVM classifier. The input pixels can be optionnaly centered and reduced according to the statistics file produced by the ComputeImagesStatistics application. An optional input mask can be provided, in which case only input image pixels whose corresponding mask value is greater than 0 will be classified. The remaining of pixels will be given the label 0 in the output image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input Image to classify.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Mask (-mask): </span>The mask allows one to restrict classification of the input image to the area where mask pixel values are greater than 0.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] SVM Model file (-svm): </span>A SVM model file.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Statistics file (-imstat): </span>A XML file containing mean and standard deviation to center and reduce samples before classification.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>Output image labeled with class labels</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The input image must have the same type, order and number of bands than the images used to produce the statistics file and the SVM model file. If a statistics file was used during training by the TrainSVMImagesClassifier, it is mandatory to use the same statistics file for classification. If an input mask is used, its size must match the input image size.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">TrainSVMImagesClassifier, ValidateSVMImagesClassifier, ComputeImagesStatistics</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SVM Model file: clsvmModelQB1.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: otbConcatenateImages.png uchar</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_ImageSVMClassifier -in QB_1_ortho.tif -svm clsvmModelQB1.svm -imstat clImageStatisticsQB1.xml -out otbConcatenateImages.png uchar</p></ul></body></html>
-\ No newline at end of file
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Image SVM Classification</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Performs a SVM classification of the input image according to a SVM model file.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Learning</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application performs a SVM image classification based on a SVM model file (*.svm extension) produced by the TrainSVMImagesClassifier application. Pixels of the output image will contain the class label decided by the SVM classifier. The input pixels can be optionnaly centered and reduced according to the statistics file produced by the ComputeImagesStatistics application. An optional input mask can be provided, in which case only input image pixels whose corresponding mask value is greater than 0 will be classified. The remaining of pixels will be given the label 0 in the output image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input Image to classify.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Mask (-mask): </span>The mask allows restricting classification of the input image to the area where mask pixel values are greater than 0.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] SVM Model file (-svm): </span>A SVM model file.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Statistics file (-imstat): </span>A XML file containing mean and standard deviation to center and reduce samples before classification.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>Output image labeled with class labels</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The input image must have the same type, order and number of bands than the images used to produce the statistics file and the SVM model file. If a statistics file was used during training by the TrainSVMImagesClassifier, it is mandatory to use the same statistics file for classification. If an input mask is used, its size must match the input image size.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">TrainSVMImagesClassifier, ValidateSVMImagesClassifier, ComputeImagesStatistics</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SVM Model file: clsvmModelQB1.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: otbConcatenateImages.png uchar</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_ImageSVMClassifier -in QB_1_ortho.tif -svm clsvmModelQB1.svm -imstat clImageStatisticsQB1.xml -out otbConcatenateImages.png uchar</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/LineSegmentDetection.html
+++ b/python/plugins/processing/otb/description/doc/LineSegmentDetection.html
@@ -1,3 +1,3 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Line segment detection application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detect line segments in raster</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Feature Extraction</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application detects locally straight contours in a image. It is based on Burns, Hanson, and Riseman method and use an a contrario validation approach (Desolneux, Moisan, and Morel). The algorithm was published by Rafael Gromponevon Gioi, Jérémie Jakubowicz, Jean-Michel Morel and Gregory Randall.
- The given approach compute gradient and level lines of the image and detects aligned points in line support region. The application allows to export the detected lines in a vector data.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Detected lines (-out): </span> Output detected line segments (vector data).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Digital Elevation Model directory (-dem): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] No rescaling in [0, 255] (-norescale): </span></p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">On Line demonstration of the LSD algorithm is available here: http://www.ipol.im/pub/algo/gjmr_line_segment_detector/
-+ The given approach compute gradient and level lines of the image and detects aligned points in line support region. The application allows one to export the detected lines in a vector data.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Detected lines (-out): </span> Output detected line segments (vector data).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Digital Elevation Model directory (-dem): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] No rescaling in [0, 255] (-norescale): </span></p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">On Line demonstration of the LSD algorithm is available here: http://www.ipol.im/pub/algo/gjmr_line_segment_detector/
- </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Suburb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Detected lines: LineSegmentDetection.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_LineSegmentDetection -in QB_Suburb.png -out LineSegmentDetection.shp</p></ul></body></html>
+-</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Suburb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Detected lines: LineSegmentDetection.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_LineSegmentDetection -in QB_Suburb.png -out LineSegmentDetection.shp</p></ul></body></html>
\ No newline at end of file
++ The given approach compute gradient and level lines of the image and detects aligned points in line support region. The application allows exporting the detected lines in a vector data.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Detected lines (-out): </span> Output detected line segments (vector data).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Digital Elevation Model directory (-dem): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] No rescaling in [0, 255] (-norescale): </span></p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">On Line demonstration of the LSD algorithm is available here: http://www.ipol.im/pub/algo/gjmr_line_segment_detector/
++</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Suburb.png</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Detected lines: LineSegmentDetection.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_LineSegmentDetection -in QB_Suburb.png -out LineSegmentDetection.shp</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/MeanShiftSegmentation.html
+++ b/python/plugins/processing/otb/description/doc/MeanShiftSegmentation.html
@@ -18,7 +18,7 @@
@@ -2617,45 +3559,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2666,45 +3608,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2713,32 +3655,29 @@ Last-Update: 2013-09-27
@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Multi Resolution Pyramid Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Build a multi-resolution pyramid of the image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Conversion, Image Manipulation, Image MultiResolution, Util</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application builds a multi-resolution pyramid of the input image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>will be used to get the prefix and the extension of the images to write</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Number Of Levels (-level): </span>Number of levels in the pyramid (default is 1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-sfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-vfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Use Fast Scheme (-fast): </span>If used, this option allows to speed-up computation by iteratively subsampling previous level of pyramid instead of processing the full input.</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: multiResolutionImage.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Number Of Levels: 1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 2</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 0.6</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use Fast Scheme: false</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_MultiResolutionPyramid -in QB_Toulouse_Ortho_XS.tif -out multiResolutionImage.tif -level 1 -sfactor 2 -vfactor 0.6 -fast false</p></ul></body></html>
\ No newline at end of file
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Multi Resolution Pyramid Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Build a multi-resolution pyramid of the image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Conversion, Image Manipulation, Image MultiResolution, Util</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application builds a multi-resolution pyramid of the input image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>will be used to get the prefix and the extension of the images to write</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Number Of Levels (-level): </span>Number of levels in the pyramid (default is 1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-sfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-vfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Use Fast Scheme (-fast): </span>If used, this option allows one to speed-up computation by iteratively subsampling previous level of pyramid instead of processing the full input.</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: multiResolutionImage.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Number Of Levels: 1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 2</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 0.6</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use Fast Scheme: false</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_MultiResolutionPyramid -in QB_Toulouse_Ortho_XS.tif -out multiResolutionImage.tif -level 1 -sfactor 2 -vfactor 0.6 -fast false</p></ul></body></html>
-\ No newline at end of file
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Multi Resolution Pyramid Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Build a multi-resolution pyramid of the image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Conversion, Image Manipulation, Image MultiResolution, Util</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application builds a multi-resolution pyramid of the input image.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>will be used to get the prefix and the extension of the images to write</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Number Of Levels (-level): </span>Number of levels in the pyramid (default is 1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-sfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Subsampling factor (-vfactor): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Use Fast Scheme (-fast): </span>If used, this option allows speeding-up computation by iteratively subsampling previous level of pyramid instead of processing the full input.</p></li></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image: multiResolutionImage.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Number Of Levels: 1</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 2</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Subsampling factor: 0.6</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use Fast Scheme: false</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_MultiResolutionPyramid -in QB_Toulouse_Ortho_XS.tif -out multiResolutionImage.tif -level 1 -sfactor 2 -vfactor 0.6 -fast false</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/OpticalCalibration.html
+++ b/python/plugins/processing/otb/description/doc/OpticalCalibration.html
@@ -1,6 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Optical calibration application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The application allows to convert pixel values from DN (for Digital Numbers) to physically interpretable and comparable values.Calibrated values are called surface reflectivity and its values lie in the range [0, 1].
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Optical calibration application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The application allows one to convert pixel values from DN (for Digital Numbers) to physically interpretable and comparable values.Calibrated values are called surface reflectivity and its values lie in the range [0, 1].
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Optical calibration application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The application allows converting pixel values from DN (for Digital Numbers) to physically interpretable and comparable values.Calibrated values are called surface reflectivity and its values lie in the range [0, 1].
The first level is called Top Of Atmosphere (TOA) reflectivity. It takes into account the sensor gain, sensor spectral response and the solar illumination.
The second level is called Top Of Canopy (TOC) reflectivity. In addition to sensor gain and solar illumination, it takes into account the optical thickness of the atmosphere, the atmospheric pressure, the water vapor amount, the ozone amount, as well as the composition and amount of aerosol gasses.
It is also possible to indicate an AERONET file which contains atmospheric parameters (version 1 and version 2 of Aeronet file are supported.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image Filename (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image Filename (-out): </span>Calibrated Image Filename</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available RAM (-ram): </span>Available RAM</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Calibration Level (-level): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] TOA : Top Of Atmosphere: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] TOC : Top Of Canopy (EXPERIMENTAL): </span></p><ul></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Convert to milli reflectance (-milli): </span>Output milli-reflectance instead of reflectance.
-This allows to put save the image in integer pixel type (in the range [0, 1000] instead of floating point in the range [0, 1].</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Relative Spectral Response File (-rsr): </span>Sensor relative spectral response file
-By default the application gets these informations in the metadata</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Atmospheric parameters (-atmo): </span>This group allows to set the atmospheric parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Aerosol Model (-aerosol): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] No Aerosol Model: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Continental: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Maritime: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Urban: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Desertic: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Ozone Amount (-oz): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Water Vapor Amount (-wa): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Atmospheric Pressure (-pressure): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aerosol Optical Thickness (-opt): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aeronet File (-aeronet): </span>Aeronet file containing atmospheric parameters</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The OTB CookBook</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image Filename: WV2_MUL_ROI_1000_100.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image Filename: OpticalCalibration.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration Level: toa</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OpticalCalibration -in WV2_MUL_ROI_1000_100.tif -out OpticalCalibration.tif -level toa</p></ul></body></html>
\ No newline at end of file
-+This allows one to put save the image in integer pixel type (in the range [0, 1000] instead of floating point in the range [0, 1].</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Relative Spectral Response File (-rsr): </span>Sensor relative spectral response file
-+By default the application gets these informations in the metadata</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Atmospheric parameters (-atmo): </span>This group allows one to set the atmospheric parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Aerosol Model (-aerosol): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] No Aerosol Model: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Continental: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Maritime: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Urban: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Desertic: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Ozone Amount (-oz): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Water Vapor Amount (-wa): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Atmospheric Pressure (-pressure): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aerosol Optical Thickness (-opt): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aeronet File (-aeronet): </span>Aeronet file containing atmospheric parameters</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The OTB CookBook</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image Filename: WV2_MUL_ROI_1000_100.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image Filename: OpticalCalibration.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration Level: toa</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OpticalCalibration -in WV2_MUL_ROI_1000_100.tif -out OpticalCalibration.tif -level toa</p></ul></body></html>
-\ No newline at end of file
++This allows saving the image in integer pixel type (in the range [0, 1000] instead of floating point in the range [0, 1].</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Relative Spectral Response File (-rsr): </span>Sensor relative spectral response file
++By default the application gets these informations in the metadata</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Atmospheric parameters (-atmo): </span>This group allows setting the atmospheric parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Aerosol Model (-aerosol): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] No Aerosol Model: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Continental: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Maritime: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Urban: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Desertic: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Ozone Amount (-oz): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Water Vapor Amount (-wa): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Atmospheric Pressure (-pressure): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aerosol Optical Thickness (-opt): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Aeronet File (-aeronet): </span>Aeronet file containing atmospheric parameters</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The OTB CookBook</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image Filename: WV2_MUL_ROI_1000_100.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Image Filename: OpticalCalibration.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Calibration Level: toa</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OpticalCalibration -in WV2_MUL_ROI_1000_100.tif -out OpticalCalibration.tif -level toa</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/OrthoRectification.html
+++ b/python/plugins/processing/otb/description/doc/OrthoRectification.html
@@ -1,3 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Ortho-rectification application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows to ortho-rectify optical images from supported sensors.
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Ortho-rectification application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows one to ortho-rectify optical images from supported sensors.
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">Ortho-rectification application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application allows ortho-rectifing optical images from supported sensors.
</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Image Manipulation, Geometry</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">An inverse sensor model is built from the input image metadata to convert geographical to raw geometry coordinates. This inverse sensor model is then combined with the chosen map projection to build a global coordinate mapping grid. Last, this grid is used to resample using the chosen interpolation algorithm. A Digital Elevation Model can be specified to account for terrain deformations.
-In case of SPOT5 images, the sensor model can be approximated by an RPC model in order to speed-up computation.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows to set the input and output images.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input image to ortho-rectify</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>The ortho-rectified output image</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Output Map Projection (-map): </span>Parameters of the ouptut map projection.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Universal Trans-Mercator (UTM): </span>A system of transverse mercator projections dividing the surface of Earth between 80S and 84N latitude.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Zone number (-zone): </span>The zone number ranges from 1 to 60 and allows to define the transverse mercator projection (along with the hemisphere)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Northern Hemisphere (-hem): </span>The transverse mercator projections are defined by their zone number as well as the hemisphere. Activate this parameter if your image is in the northern hemisphere.</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Lambert II Etendu: </span>This is a Lambert Conformal Conic projection mainly used in France.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] EPSG Code: </span>This code is a generic way of identifying map projections, and allows to specify a large amount of them. See www.spatialreference.org to find which EPSG code is associated to your projection;</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] EPSG Code (-code): </span>See www.spatialreference.org to find which EPSG code is associated to your projection</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Output Image Grid (-outputs): </span>This group of parameters allows to define the grid on which the input image will be resampled.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Parameters estimation modes (-mode): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] User Defined: </span>This mode allows you to fully modify default values.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Size from Spacing: </span>This mode allows you to automatically compute the optimal image size from given spacing (pixel size) values</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Spacing from Size: </span>This mode allows you to automatically compute the optimal image spacing (pixel size) from the given size</p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left X (-ulx): </span>Cartographic X coordinate of upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left Y (-uly): </span>Cartographic Y coordinate of the upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size X (-sizex): </span>Size of projected image along X (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size Y (-sizey): </span>Size of projected image along Y (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size X (-spacingx): </span>Size of each pixel along X axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size Y (-spacingy): </span>Size of each pixel along Y axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Force isotropic spacing by default (-isotropic): </span>Default spacing (pixel size) values are estimated from the sensor modeling of the image. It can therefore result in a non-isotropic spacing. This option allows you to force default values to be isotropic (in this case, the minimum of spacing in both direction is applied. Values overriden by user are not affected by this option.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows to manage elevation values in the ortho-rectification process.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows to select a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Interpolation (-interpolator): </span>This group of parameters allows to define how the input image will be interpolated during resampling.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Nearest Neighbor interpolation: </span>Nearest neighbor interpolation leads to poor image quality, but it is very fast.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear interpolation: </span>Linear interpolation leads to average image quality but is quite fast</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Bicubic interpolation: </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Radius for bicubic interpolation (-radius): </span>This parameter allows to control the size of the bicubic interpolation filter. If the target pixel size is higher than the input pixel size, increasing this parameter will reduce aliasing artefacts.</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Speed optimization parameters (-opt): </span>This group of parameters allows to optimize processing time.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] RPC modeling (points per axis) (-rpc): </span>Enabling RPC modeling allows to speed-up SPOT5 ortho-rectification. Value is the number of control points per axis for RPC estimation</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available memory for processing (in MB) (-ram): </span>This allows to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Resampling grid spacing (-gridspacing): </span>Resampling is done according to a coordinate mapping grid, whose pixel size is set by this parameter. The closer to the output spacing this parameter is, the more precise will be the ortho-rectified image, but increasing this parameter allows to reduce processing time.</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Supported sensors are SPOT5 (TIF format), Ikonos, Quickbird, Worldview2, GeoEye.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ortho-rectification chapter from the OTB Software Guide</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OrthoRectification</p></ul></body></html>
\ No newline at end of file
-+In case of SPOT5 images, the sensor model can be approximated by an RPC model in order to speed-up computation.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows one to set the input and output images.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input image to ortho-rectify</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>The ortho-rectified output image</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Output Map Projection (-map): </span>Parameters of the ouptut map projection.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Universal Trans-Mercator (UTM): </span>A system of transverse mercator projections dividing the surface of Earth between 80S and 84N latitude.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Zone number (-zone): </span>The zone number ranges from 1 to 60 and allows one to define the transverse mercator projection (along with the hemisphere)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Northern Hemisphere (-hem): </span>The transverse mercator projections are defined by their zone number as well as the hemisphere. Activate this parameter if your image is in the northern hemisphere.</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Lambert II Etendu: </span>This is a Lambert Conformal Conic projection mainly used in France.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] EPSG Code: </span>This code is a generic way of identifying map projections, and allows one to specify a large amount of them. See www.spatialreference.org to find which EPSG code is associated to your projection;</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] EPSG Code (-code): </span>See www.spatialreference.org to find which EPSG code is associated to your projection</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Output Image Grid (-outputs): </span>This group of parameters allows one to define the grid on which the input image will be resampled.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Parameters estimation modes (-mode): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] User Defined: </span>This mode allows you to fully modify default values.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Size from Spacing: </span>This mode allows you to automatically compute the optimal image size from given spacing (pixel size) values</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Spacing from Size: </span>This mode allows you to automatically compute the optimal image spacing (pixel size) from the given size</p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left X (-ulx): </span>Cartographic X coordinate of upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left Y (-uly): </span>Cartographic Y coordinate of the upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size X (-sizex): </span>Size of projected image along X (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size Y (-sizey): </span>Size of projected image along Y (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size X (-spacingx): </span>Size of each pixel along X axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size Y (-spacingy): </span>Size of each pixel along Y axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Force isotropic spacing by default (-isotropic): </span>Default spacing (pixel size) values are estimated from the sensor modeling of the image. It can therefore result in a non-isotropic spacing. This option allows you to force default values to be isotropic (in this case, the minimum of spacing in both direction is applied. Values overriden by user are not affected by this option.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows one to manage elevation values in the ortho-rectification process.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows one to select a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Interpolation (-interpolator): </span>This group of parameters allows one to define how the input image will be interpolated during resampling.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Nearest Neighbor interpolation: </span>Nearest neighbor interpolation leads to poor image quality, but it is very fast.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear interpolation: </span>Linear interpolation leads to average image quality but is quite fast</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Bicubic interpolation: </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Radius for bicubic interpolation (-radius): </span>This parameter allows one to control the size of the bicubic interpolation filter. If the target pixel size is higher than the input pixel size, increasing this parameter will reduce aliasing artefacts.</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Speed optimization parameters (-opt): </span>This group of parameters allows one to optimize processing time.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] RPC modeling (points per axis) (-rpc): </span>Enabling RPC modeling allows one to speed-up SPOT5 ortho-rectification. Value is the number of control points per axis for RPC estimation</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available memory for processing (in MB) (-ram): </span>This allows one to set the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Resampling grid spacing (-gridspacing): </span>Resampling is done according to a coordinate mapping grid, whose pixel size is set by this parameter. The closer to the output spacing this parameter is, the more precise will be the ortho-rectified image, but increasing this parameter allows one to reduce processing time.</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Supported sensors are SPOT5 (TIF format), Ikonos, Quickbird, Worldview2, GeoEye.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ortho-rectification chapter from the OTB Software Guide</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OrthoRectification</p></ul></body></html>
-\ No newline at end of file
++In case of SPOT5 images, the sensor model can be approximated by an RPC model in order to speed-up computation.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows setting the input and output images.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image (-in): </span>The input image to ortho-rectify</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Image (-out): </span>The ortho-rectified output image</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Output Map Projection (-map): </span>Parameters of the ouptut map projection.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Universal Trans-Mercator (UTM): </span>A system of transverse mercator projections dividing the surface of Earth between 80S and 84N latitude.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Zone number (-zone): </span>The zone number ranges from 1 to 60 and allows defining the transverse mercator projection (along with the hemisphere)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Northern Hemisphere (-hem): </span>The transverse mercator projections are defined by their zone number as well as the hemisphere. Activate this parameter if your image is in the northern hemisphere.</p></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Lambert II Etendu: </span>This is a Lambert Conformal Conic projection mainly used in France.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] EPSG Code: </span>This code is a generic way of identifying map projections, and allows specifying a large amount of them. See www.spatialreference.org to find which EPSG code is associated to your projection;</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] EPSG Code (-code): </span>See www.spatialreference.org to find which EPSG code is associated to your projection</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Output Image Grid (-outputs): </span>This group of parameters allows defining the grid on which the input image will be resampled.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Parameters estimation modes (-mode): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] User Defined: </span>This mode allows you to fully modify default values.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Size from Spacing: </span>This mode allows you to automatically compute the optimal image size from given spacing (pixel size) values</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Automatic Spacing from Size: </span>This mode allows you to automatically compute the optimal image spacing (pixel size) from the given size</p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left X (-ulx): </span>Cartographic X coordinate of upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Upper Left Y (-uly): </span>Cartographic Y coordinate of the upper-left corner (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size X (-sizex): </span>Size of projected image along X (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Size Y (-sizey): </span>Size of projected image along Y (in pixels)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size X (-spacingx): </span>Size of each pixel along X axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Pixel Size Y (-spacingy): </span>Size of each pixel along Y axis (meters for cartographic projections, degrees for geographic ones)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Force isotropic spacing by default (-isotropic): </span>Default spacing (pixel size) values are estimated from the sensor modeling of the image. It can therefore result in a non-isotropic spacing. This option allows you to force default values to be isotropic (in this case, the minimum of spacing in both direction is applied. Values overriden by user are not affected by this option.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows managing elevation values in the ortho-rectification process.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows selecting a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] Interpolation (-interpolator): </span>This group of parameters allows defining how the input image will be interpolated during resampling.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Nearest Neighbor interpolation: </span>Nearest neighbor interpolation leads to poor image quality, but it is very fast.</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear interpolation: </span>Linear interpolation leads to average image quality but is quite fast</p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Bicubic interpolation: </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Radius for bicubic interpolation (-radius): </span>This parameter allows controlling the size of the bicubic interpolation filter. If the target pixel size is higher than the input pixel size, increasing this parameter will reduce aliasing artefacts.</p></li></ul></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Speed optimization parameters (-opt): </span>This group of parameters allows optimizing processing time.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] RPC modeling (points per axis) (-rpc): </span>Enabling RPC modeling allows speeding-up SPOT5 ortho-rectification. Value is the number of control points per axis for RPC estimation</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Available memory for processing (in MB) (-ram): </span>This allows setting the maximum amount of RAM available for processing. As the writing task is time consuming, it is better to write large pieces of data, which can be achieved by increasing this parameter (pay attention to your system capabilities)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Resampling grid spacing (-gridspacing): </span>Resampling is done according to a coordinate mapping grid, whose pixel size is set by this parameter. The closer to the output spacing this parameter is, the more precise will be the ortho-rectified image, but increasing this parameter allows reducing processing time.</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Supported sensors are SPOT5 (TIF format), Ikonos, Quickbird, Worldview2, GeoEye.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ortho-rectification chapter from the OTB Software Guide</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_OrthoRectification</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentation.html
+++ b/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentation.html
@@ -18,7 +18,7 @@
@@ -2746,45 +3685,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2795,45 +3734,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2844,39 +3783,37 @@ Last-Update: 2013-09-27
- The training vector data must contain polygons with a positive integer field representing the class label. Name of the field can be set using the "Class label field" parameter. Training and validation sample lists are built such that each class is equally represented in the two lists. One parameter allows to control the ratio between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and validation sets per class and per image.
- Several SVM classifier parameters cas be set. The kernel function which defined the feature space (for example if the kernel is a Gaussian radial basis function kernel the corresponding feature space of infinite dimensions). To allow some flexibility in separating the classes, SVM models have a cost parameter, C, that controls the trade off between allowing training errors and forcing rigid margins. It creates a soft margin that permits some misclassifications. Increasing the value of C increases the cost of misclassifying points and forces the creation of a more accurate model that may not generalize well. Classifier parameters can also be optimize.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows to set input and output data.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image List (-il): </span>A list of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Vector Data List (-vd): </span>A list of vector data sample used to train the estimator.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM repository (-dem): </span>Path to SRTM repository</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] XML image statistics file (-imstat): </span>Filename of an XML file containing mean and standard deviation of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output SVM model (-out): </span>Output SVM model</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Training and validation samples parameters (-sample): </span>This group of parameters allows to set training and validation sample lists parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum training sample size (-mt): </span>Maximum size of the training sample (default = -1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum validation sample size (-mv): </span>Maximum size of the validation sample (default = -1)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] training and validation sample ratio (-vtr): </span>Ratio between training and validation sample (0.0 = all training, 1.0 = all validation) default = 0.5.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Name of the discrimination field (-vfn): </span>Name of the field using to discriminate class in the vector data files.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] SVM classifier parameters (-svm): </span>This group of parameters allows to set SVM classifier parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] SVM Kernel Type (-k): </span>SVM Kernel Type.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Gaussian radial basis function: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Polynomial: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Sigmoid: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Control trade off between training errors and forcing rigid margins. (-c): </span>SVM models have a cost parameter C.(1 by default).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] parameters optimization (-opt): </span>SVM parameters optimization</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image List: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector Data List: VectorData_QB1.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">XML image statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output SVM model: svmModelQB1_allOpt.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum validation sample size: 100</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">training and validation sample ratio: 0.5</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">parameters optimization: true</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_TrainSVMImagesClassifier -io.il QB_1_ortho.tif -io.vd VectorData_QB1.shp -io.imstat clImageStatisticsQB1.xml -io.out svmModelQB1_allOpt.svm -sample.mv 100 -sample.vtr 0.5 -svm.opt true</p></ul></body></html>
\ No newline at end of file
-+ The training vector data must contain polygons with a positive integer field representing the class label. Name of the field can be set using the "Class label field" parameter. Training and validation sample lists are built such that each class is equally represented in the two lists. One parameter allows one to control the ratio between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and validation sets per class and per image.
-+ Several SVM classifier parameters cas be set. The kernel function which defined the feature space (for example if the kernel is a Gaussian radial basis function kernel the corresponding feature space of infinite dimensions). To allow some flexibility in separating the classes, SVM models have a cost parameter, C, that controls the trade off between allowing training errors and forcing rigid margins. It creates a soft margin that permits some misclassifications. Increasing the value of C increases the cost of misclassifying points and forces the creation of a more accurate model that may not generalize well. Classifier parameters can also be optimize.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows one to set input and output data.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image List (-il): </span>A list of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Vector Data List (-vd): </span>A list of vector data sample used to train the estimator.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM repository (-dem): </span>Path to SRTM repository</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] XML image statistics file (-imstat): </span>Filename of an XML file containing mean and standard deviation of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output SVM model (-out): </span>Output SVM model</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Training and validation samples parameters (-sample): </span>This group of parameters allows one to set training and validation sample lists parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum training sample size (-mt): </span>Maximum size of the training sample (default = -1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum validation sample size (-mv): </span>Maximum size of the validation sample (default = -1)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] training and validation sample ratio (-vtr): </span>Ratio between training and validation sample (0.0 = all training, 1.0 = all validation) default = 0.5.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Name of the discrimination field (-vfn): </span>Name of the field using to discriminate class in the vector data files.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] SVM classifier parameters (-svm): </span>This group of parameters allows one to set SVM classifier parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] SVM Kernel Type (-k): </span>SVM Kernel Type.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Gaussian radial basis function: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Polynomial: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Sigmoid: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Control trade off between training errors and forcing rigid margins. (-c): </span>SVM models have a cost parameter C.(1 by default).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] parameters optimization (-opt): </span>SVM parameters optimization</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image List: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector Data List: VectorData_QB1.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">XML image statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output SVM model: svmModelQB1_allOpt.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum validation sample size: 100</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">training and validation sample ratio: 0.5</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">parameters optimization: true</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_TrainSVMImagesClassifier -io.il QB_1_ortho.tif -io.vd VectorData_QB1.shp -io.imstat clImageStatisticsQB1.xml -io.out svmModelQB1_allOpt.svm -sample.mv 100 -sample.vtr 0.5 -svm.opt true</p></ul></body></html>
-\ No newline at end of file
++ The training vector data must contain polygons with a positive integer field representing the class label. Name of the field can be set using the "Class label field" parameter. Training and validation sample lists are built such that each class is equally represented in the two lists. One parameter allows controlling the ratio between the number of samples in training and validation sets. Two parameters allow to manage the size of the training and validation sets per class and per image.
++ Several SVM classifier parameters cas be set. The kernel function which defined the feature space (for example if the kernel is a Gaussian radial basis function kernel the corresponding feature space of infinite dimensions). To allow some flexibility in separating the classes, SVM models have a cost parameter, C, that controls the trade off between allowing training errors and forcing rigid margins. It creates a soft margin that permits some misclassifications. Increasing the value of C increases the cost of misclassifying points and forces the creation of a more accurate model that may not generalize well. Classifier parameters can also be optimize.</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span>This group of parameters allows setting input and output data.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Image List (-il): </span>A list of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Vector Data List (-vd): </span>A list of vector data sample used to train the estimator.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM repository (-dem): </span>Path to SRTM repository</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] XML image statistics file (-imstat): </span>Filename of an XML file containing mean and standard deviation of input images.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output SVM model (-out): </span>Output SVM model</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Training and validation samples parameters (-sample): </span>This group of parameters allows setting training and validation sample lists parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum training sample size (-mt): </span>Maximum size of the training sample (default = -1).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Maximum validation sample size (-mv): </span>Maximum size of the validation sample (default = -1)</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] training and validation sample ratio (-vtr): </span>Ratio between training and validation sample (0.0 = all training, 1.0 = all validation) default = 0.5.</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Name of the discrimination field (-vfn): </span>Name of the field using to discriminate class in the vector data files.</p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] SVM classifier parameters (-svm): </span>This group of parameters allows setting SVM classifier parameters.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[choice] SVM Kernel Type (-k): </span>SVM Kernel Type.</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Linear: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Gaussian radial basis function: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Polynomial: </span></p><ul></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Sigmoid: </span></p><ul></ul></li></ul></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Control trade off between training errors and forcing rigid margins. (-c): </span>SVM models have a cost parameter C.(1 by default).</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] parameters optimization (-opt): </span>SVM parameters optimization</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Image List: QB_1_ortho.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector Data List: VectorData_QB1.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">XML image statistics file: clImageStatisticsQB1.xml</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output SVM model: svmModelQB1_allOpt.svm</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum validation sample size: 100</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">training and validation sample ratio: 0.5</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">parameters optimization: true</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_TrainSVMImagesClassifier -io.il QB_1_ortho.tif -io.vd VectorData_QB1.shp -io.imstat clImageStatisticsQB1.xml -io.out svmModelQB1_allOpt.svm -sample.mv 100 -sample.vtr 0.5 -svm.opt true</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/VectorDataExtractROIApplication.html
+++ b/python/plugins/processing/otb/description/doc/VectorDataExtractROIApplication.html
@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">VectorData Extract ROI Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform an extract ROI on the input vector data according to the input image extent</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector data Manipulation</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application extract the VectorData features belonging to a region specified by the support image envelope</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Vector data (-vd): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Support image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Vector data (-out): </span></p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows to manage elevation values in the VectorData projection process</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows to select a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Vector data: roads.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Support image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Vector data: apTvUtVectorDataExtractROIApplicationTest.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_VectorDataExtractROIApplication -io.vd roads.shp -io.in QB_Toulouse_Ortho_XS.tif -io.out apTvUtVectorDataExtractROIApplicationTest.shp</p></ul></body></html>
\ No newline at end of file
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">VectorData Extract ROI Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform an extract ROI on the input vector data according to the input image extent</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector data Manipulation</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application extract the VectorData features belonging to a region specified by the support image envelope</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Vector data (-vd): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Support image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Vector data (-out): </span></p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows one to manage elevation values in the VectorData projection process</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows one to select a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Vector data: roads.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Support image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Vector data: apTvUtVectorDataExtractROIApplicationTest.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_VectorDataExtractROIApplication -io.vd roads.shp -io.in QB_Toulouse_Ortho_XS.tif -io.out apTvUtVectorDataExtractROIApplicationTest.shp</p></ul></body></html>
-\ No newline at end of file
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//ENhttp://www.w3.org/TR/REC-html40/strict.dtd"><html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"></style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"><p align="center" style=" 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;"><span style=" font-size:x-large;">VectorData Extract ROI Application</span></p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Brief Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Perform an extract ROI on the input vector data according to the input image extent</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Tags</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Vector data Manipulation</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Long Description</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This application extract the VectorData features belonging to a region specified by the support image envelope</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Parameters</span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Input and output data (-io): </span></p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Input Vector data (-vd): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Support image (-in): </span></p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] Output Vector data (-out): </span></p></li></ul></li><br /><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[group] Elevation management (-elev): </span>This group of parameters allows managing elevation values in the VectorData projection process</p><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New, courier'; font-weight:600;"; >[param] DEM directory (-dem): </span>This parameter allows selecting a directory containing Digital Elevation Model tiles. Supported formats are SRTM, DTED or any geotiff processed by the DEM import application</p></li></ul></li><br /></ul><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Limitations</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">None</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Authors</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">OTB-Team</p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">See also</span></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p><p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:large; font-weight:600;"><span style=" font-size:large;">Example of use</span></p><ul><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Parameters to set value:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Input Vector data: roads.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Support image: QB_Toulouse_Ortho_XS.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Output Vector data: apTvUtVectorDataExtractROIApplicationTest.shp</p></li></ul></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><li>Command line to execute:</li></p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New, courier';">otbcli_VectorDataExtractROIApplication -io.vd roads.shp -io.in QB_Toulouse_Ortho_XS.tif -io.out apTvUtVectorDataExtractROIApplicationTest.shp</p></ul></body></html>
--- a/python/plugins/processing/otb/description/doc/VectorDataReprojection.html
+++ b/python/plugins/processing/otb/description/doc/VectorDataReprojection.html
-@@ -19,12 +19,12 @@ href="#tailCookBooksu47.html">tail</a>] [<a
+@@ -19,12 +19,12 @@ href="#tailCookBooksu47.html">tail</a>]
href="CookBookse12.html#CookBooksu47.html" >up</a>] </p></div>
<h4 class="subsectionHead"><span class="titlemark">4.2.4 </span> <a
id="x68-2190004.2.4"></a>Vector Data reprojection</h4>
-<!--l. 989--><p class="noindent" >This application allows to reproject a vector data using support image projection reference, or a user
-+<!--l. 989--><p class="noindent" >This application allows one to reproject a vector data using support image projection reference, or a user
++<!--l. 989--><p class="noindent" >This application allows reprojecting vector data using a support image projection reference, or a user
specified map projection<br
class="newline" />
<h5 class="subsubsectionHead"><a
id="x68-2200004.2.4"></a>Detailed description</h5>
-<!--l. 991--><p class="noindent" >This application allows to reproject a vector data using support image projection reference, or a user given
-+<!--l. 991--><p class="noindent" >This application allows one to reproject a vector data using support image projection reference, or a user given
++<!--l. 991--><p class="noindent" >This application allows reprojecting vector data using a support image projection reference, or a user given
map projection.<br
class="newline" />If given, image keywordlist can be added to reprojected vectordata.
<h5 class="subsubsectionHead"><a
-@@ -259,7 +259,7 @@ class="ptmb7t-">Output Cartographic Map Projection: </span>Parameters of the ou
+@@ -259,7 +259,7 @@ class="ptmb7t-">Output Cartographic Map
to be used.
</li>
<li class="itemize"><span
-class="ptmb7t-">Zone number: </span>The zone number ranges from 1 to 60 and allows to define the
-+class="ptmb7t-">Zone number: </span>The zone number ranges from 1 to 60 and allows one to define the
++class="ptmb7t-">Zone number: </span>The zone number ranges from 1 to 60 and allows defining the
transverse mercator projection (along with the hemisphere)
</li>
<li class="itemize"><span
@@ -2887,45 +3824,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2936,45 +3873,45 @@ Last-Update: 2013-09-27
<h5 class="subsubsectionHead"><a
id="x112-6000004.9.3"></a>Detailed description</h5>
-<!--l. 4558--><p class="noindent" >This application allows to perform various segmentation algorithms on an multispectral image.Available
-+<!--l. 4558--><p class="noindent" >This application allows one to perform various segmentation algorithms on an multispectral image.Available
++<!--l. 4558--><p class="noindent" >This application allows performing various segmentation algorithms on an multispectral image.Available
segmentation algorithms are two different versions of Mean-Shift segmentation algorithm (one being
multi-threaded), simple pixel based connected components according to a user-defined criterion, and
watershed from the gradient of the intensity (norm of spectral bands vector). The application has two
-@@ -36,8 +36,8 @@ vector file or database. The input image is split into tiles (whose size can be
+@@ -36,8 +36,8 @@ vector file or database. The input image
parameter), and each tile is loaded, segmented with the chosen algorithm, vectorized, and written
into the output file or database. This piece-wise behavior ensure that memory will never get
overloaded, and that images of any size can be processed. There are few more options in the vector
-mode. The simplify option allows to simplify the geometry (i.e. remove nodes in polygons)
-according to a user-defined tolerance. The stitch option allows to application to try to stitch
-+mode. The simplify option allows one to simplify the geometry (i.e. remove nodes in polygons)
-+according to a user-defined tolerance. The stitch option allows one to application to try to stitch
++mode. The simplify option allows simplifying the geometry (i.e. remove nodes in polygons)
++according to a user-defined tolerance. The stitch option allows the application to try to stitch
together polygons corresponding to segmented region that may have been split by the tiling
scheme.
<h5 class="subsubsectionHead"><a
-@@ -486,7 +486,7 @@ Choice of processing mode, either raster or large-scale. Available choices are:
+@@ -486,7 +486,7 @@ Choice of processing mode, either raster
<ul class="itemize1">
<li class="itemize"><span
class="ptmb7t-">Tile-based large-scale segmentation with vector output</span>: In this mode, the application will output a
- vector file or database, and process the input image piecewise. This allows to perform segmentation
-+ vector file or database, and process the input image piecewise. This allows one to perform segmentation
++ vector file or database, and process the input image piecewise. This allows performing segmentation
of very large images.
<ul class="itemize2">
<li class="itemize"><span
-@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </span>The output vector file or database (
+@@ -494,7 +494,7 @@ class="ptmb7t-">Output vector file: </s
by OGR)
</li>
<li class="itemize"><span
-class="ptmb7t-">Writing mode for the output vector file: </span>This allows to set the writing behaviour for
-+class="ptmb7t-">Writing mode for the output vector file: </span>This allows one to set the writing behaviour for
++class="ptmb7t-">Writing mode for the output vector file: </span>This allows setting the writing behaviour for
the output vector file. Please note that the actual behaviour depends on the file format.
</li>
<li class="itemize"><span
-@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </span>Objects whose size is below the min
+@@ -515,7 +515,7 @@ class="ptmb7t-">Minimum object size: </
</li>
<li class="itemize"><span
class="ptmb7t-">Simplify polygons: </span>Simplify polygons according to a given tolerance (in pixel). This
- option allows to reduce the size of the output file or database.
-+ option allows one to reduce the size of the output file or database.
++ option allows reducing the size of the output file or database.
</li>
<li class="itemize"><span
class="ptmb7t-">Layer name: </span>Name of the layer in the vector file or database (default is Layer).
@@ -2985,57 +3922,60 @@ Last-Update: 2013-09-27
python shell for input commands.<br>To access to the python file editor use the
<label>Show editor</label> button
- from the toolbar. The editor allows to edit and save python file and it offers basic functionality
-+ from the toolbar. The editor allows one to edit and save python file and it offers basic functionality
++ from the toolbar. The editor allows you to edit and save a python file and it offers basic functionality
for managing your code (comment and
uncomment code, check syntax, share the code via codepad.org and much more).
</p>
--- a/resources/context_help/QgsAttributeTableDialog
+++ b/resources/context_help/QgsAttributeTableDialog
-@@ -46,6 +46,6 @@ To edit values, you first have to switch the layer to editing mode. To switch to
+@@ -46,6 +46,6 @@ To edit values, you first have to switch
<a name="FieldCalc">
<h4>Field Calculator</h4>
</a>
-The <label>Field Calculator</label> button in the attribute table allows to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
-+The <label>Field Calculator</label> button in the attribute table allows one to perform calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
++The <label>Field Calculator</label> button in the attribute table allows performing calculations on basis of existing attribute values or defined functions, e.g. to calculate length or area of geometry features.<br>
The results can be written to a new attribute column or it can be used to update values in an already existing column.<br>
The vector layer needs to be in editing mode, before you can click on the <label>Field calculator</label> icon to open the dialog.
--- a/resources/context_help/QgsVectorLayerProperties
+++ b/resources/context_help/QgsVectorLayerProperties
-@@ -28,7 +28,7 @@ QGIS supports a number of symbology renderers to control how vector features are
+@@ -28,7 +28,7 @@ QGIS supports a number of symbology rend
Click <label>New symbology</label> button to use new symbology implementation for the layer.
<h5>Vector transparency</h5>
-QGIS allows to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
-+QGIS allows one to set a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
++QGIS allows setting a transparency for every vector layer. This can be done with the slider <label>Transparency</label>. This is very useful for overlaying several vector layers.
<h5>Saving styles</h5>
Once you have styled your layer you also could save your layer-style to a separate file (with *.qml ending). To do this, use the button <label>Save Style...</label>. No need to say that <label>Load Style...</label> loads your saved layer-style-file.<br/>
-@@ -73,7 +73,7 @@ Within the <label>Attributes</label> tab the attributes of the selected data set
+@@ -73,9 +73,9 @@ Within the <label>Attributes</label> tab
The <label>Toggle editing mode</label> button toggles this mode.<p>
Within the Attributes tab you also find an edit widget column. This column can be used to define values or a range of values that are allowed to be added to the specific attribute table column. If you click on the <label>edit widget</label> button, a dialog opens, where you can define different widgets. These widgets are:<br/>
<ul>
-<li><label>Line edit</label> an edit field which allows to enter simple text (or restrict to numbers for numeric attributes).
-+<li><label>Line edit</label> an edit field which allows one to enter simple text (or restrict to numbers for numeric attributes).
++<li><label>Line edit</label> an edit field which allows entering simple text (or restrict to numbers for numeric attributes).
<li><label>Classification</label> Displays a combo box with the values used for classification, if you have chosen <label>unique value</label> as legend type in the symbology tab of the properties dialog.
- <li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
+-<li><label>Range</label> Allows to set numeric values from a specific range. The edit widget can be either a slider or a spin box.
++<li><label>Range</label> Allows setting numeric values from a specific range. The edit widget can be either a slider or a spin box.
<li><label>Unique value</label> The user can select one of the values already used in the attribute table. If <label>editable</label> is activated, a line edit is shown with auto completion support, but additional values are possible, otherwise a combo box is used.
-@@ -108,7 +108,7 @@ Actions are useful when you frequently want to run an external application or vi
+ <li><label>File name</label> Simplifies the selection by adding a file chooser dialog.
+ <li><label>Value map</label> a combo box with predefined items. The value is stored in the attribute, the description is shown in the combo box. You can define values manually or load them from a layer or a csv file.
+@@ -108,7 +108,7 @@ Actions are useful when you frequently w
The new implementation of actions uses the QGIS expression engine to do evaluations. Each expression is evaluated and replaced by its result at runtime.<p>
An expression must be enclosed between <code>[%</code> and <code>%]</code> - the GUI has some buttons which do that for you automatically.
-The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
-+The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows one to write an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
++The <label>Insert expression...</label> button launches the <label>Expression builder</label> which allows writing an expression easily, the <label>Insert field</label> button inserts into the action a placeholder like <code>[% "fieldname" %]</code> where fieldname is the name of the field selected in the field dropdown list.<p>
See the User Guide for further information.
--- a/src/analysis/interpolation/DualEdgeTriangulation.cc
+++ b/src/analysis/interpolation/DualEdgeTriangulation.cc
-@@ -1595,7 +1595,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
+@@ -1595,7 +1595,7 @@ void DualEdgeTriangulation::eliminateHor
while ( true )
{
- bool swaped = false;//flag which allows to exit the loop
-+ bool swaped = false;//flag which allows one to exit the loop
++ bool swaped = false;//flag which allows exiting the loop
bool* control = new bool[mHalfEdge.count()];//controlarray
for ( int i = 0; i <= mHalfEdge.count() - 1; i++ )
@@ -3046,18 +3986,18 @@ Last-Update: 2013-09-27
- for raster layers shows value of underlying pixel
- for vector layers shows feature attributes within search radius
- (allows to edit values when vector layer is in editing mode)
-+ (allows one to edit values when vector layer is in editing mode)
++ (allows editing values when vector layer is in editing mode)
*/
class QgsMapToolIdentifyAction : public QgsMapToolIdentify
{
--- a/src/app/qgsmaptooloffsetcurve.cpp
+++ b/src/app/qgsmaptooloffsetcurve.cpp
-@@ -121,7 +121,7 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QMouseEvent * e )
+@@ -121,7 +121,7 @@ void QgsMapToolOffsetCurve::canvasReleas
QgsFeature f;
f.setGeometry( mModifiedGeometry );
- //add empty values for all fields (allows to insert attribute values via the feature form in the same session)
-+ //add empty values for all fields (allows one to insert attribute values via the feature form in the same session)
++ //add empty values for all fields (allows inserting attribute values via the feature form in the same session)
QgsAttributes attrs( vlayer->pendingFields().count() );
const QgsFields& fields = vlayer->pendingFields();
for ( int idx = 0; idx < fields.count(); ++idx )
@@ -3068,7 +4008,7 @@ Last-Update: 2013-09-27
class QgsPointRotationItem;
-/**A class that allows to interactively manipulate the value of the rotation field(s) for point layers*/
-+/**A class that allows one to interactively manipulate the value of the rotation field(s) for point layers*/
++/**A class that allows interactively manipulating the value of the rotation field(s) for point layers*/
class QgsMapToolRotatePointSymbols: public QgsMapToolEdit
{
Q_OBJECT
@@ -3079,29 +4019,419 @@ Last-Update: 2013-09-27
- for raster layers shows value of underlying pixel
- for vector layers shows feature attributes within search radius
- (allows to edit values when vector layer is in editing mode)
-+ (allows one to edit values when vector layer is in editing mode)
++ (allows editing values when vector layer is in editing mode)
*/
class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
{
--- a/src/plugins/grass/qtermwidget/kb-layouts/linux.keytab
+++ b/src/plugins/grass/qtermwidget/kb-layouts/linux.keytab
-@@ -7,7 +7,7 @@ keyboard "Linux console"
+@@ -7,8 +7,8 @@ keyboard "Linux console"
# --------------------------------------------------------------
#
-# This configuration table allows to customize the
-+# This configuration table allows one to customize the
- # meaning of the keys.
+-# meaning of the keys.
++# This configuration table allows customizing the meaning of
++# the keys.
#
# The syntax is that each entry has the form :
+ #
--- a/src/plugins/grass/qtermwidget/kb-layouts/vt420pc.keytab
+++ b/src/plugins/grass/qtermwidget/kb-layouts/vt420pc.keytab
-@@ -21,7 +21,7 @@ keyboard "DEC VT420 Terminal"
+@@ -21,8 +21,8 @@ keyboard "DEC VT420 Terminal"
# --------------------------------------------------------------
#
-# This configuration table allows to customize the
-+# This configuration table allows one to customize the
- # meaning of the keys.
+-# meaning of the keys.
++# This configuration table allows customizing the meaning of
++# the keys.
#
# The syntax is that each entry has the form :
+ #
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1900,7 +1900,7 @@ Alexander Bruy <alexander.bruy at gmail.com
+
+ Alexander Bruy <alexander.bruy at gmail.com> 2013-08-06
+
+- [sextante] allow to select multiple geometry types for ParameterVector
++ [sextante] allow selecting multiple geometry types for ParameterVector
+
+ Minoru Akagi <akaginch at gmail.com> 2013-07-18
+
+@@ -5626,7 +5626,7 @@ Juergen E. Fischer <jef at norbit.de> 2013-
+ more edit widget fixes:
+ - handle editable state in drag&drop forms like in automatically generated
+ forms
+- - allow to set minimum size of webview "edit" widgets.
++ - allow setting minimum size of webview "edit" widgets.
+
+ Borys Jurgiel <info at borysjurgiel.pl> 2013-06-05
+
+@@ -6625,7 +6625,7 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Merge pull request #555 from olivierdalang/SaveSqlQueriesInDbManager
+
+- [FEATURE] DBManager: allow to store SQL queries in the project file
++ [FEATURE] DBManager: allow storing SQL queries in the project file
+
+ Juergen E. Fischer <jef at norbit.de> 2013-05-22
+
+@@ -6827,10 +6827,10 @@ Salvatore Larosa <lrssvtml at gmail.com> 20
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-05-20
+
+- [pyqgis-console] allow to disable automatic parentheses insertion from settings:
++ [pyqgis-console] allow disabling automatic parentheses insertion from settings:
+ - fix: add Shift+Insert to paste action
+ - fix: set default Monospaced font at the first start
+- - allow to save state for console splitter
++ - allow saving state for console splitter
+ - fix for mousePressEvent into console
+
+ Juergen E. Fischer <jef at norbit.de> 2013-05-20
+@@ -7071,7 +7071,7 @@ Radim Blazek <radim.blazek at gmail.com> 20
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-05-15
+
+- [pyqgis-console] allow to disable the object inspector from settings (default it is disabled)
++ [pyqgis-console] allow disabling the object inspector from settings (default it is disabled)
+ - fixes some translation string
+
+ Marco Hugentobler <marco.hugentobler at sourcepole.ch> 2013-05-15
+@@ -8569,7 +8569,7 @@ D'Hont René-Luc <rldhont at gmail.com> 201
+
+ olivierdalang <olivier.dalang at gmail.com> 2013-04-24
+
+- [FEATURE] allows to store SQL queries in the DB manager
++ [FEATURE] allows storing SQL queries in the DB manager
+
+ Radim Blazek <radim.blazek at gmail.com> 2013-04-24
+
+@@ -8707,7 +8707,7 @@ Chris Crook <ccrook at linz.govt.nz> 2013-0
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-04-22
+
+- [pyqgis-console] allows to handle non-ascii chars in script file name
++ [pyqgis-console] allows handling non-ascii chars in script file name
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-04-22
+
+@@ -8738,7 +8738,7 @@ Minoru Akagi <akaginch at gmail.com> 2013-0
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-04-22
+
+- [pyqgis-console] fix - allows to apply the console settings at all the tabs
++ [pyqgis-console] fix - allows applying the console settings at all the tabs
+
+ nyalldawson <nyall.dawson at gmail.com> 2013-04-22
+
+@@ -8811,7 +8811,7 @@ Salvatore Larosa <lrssvtml at gmail.com> 20
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-04-17
+
+ [pyqgis-console] added a python object browser for editor
+- - allow to save state for splitters
++ - allow saving state for splitters
+ - minor fixes and cleanup
+
+ Salvatore Larosa <lrssvtml at gmail.com> 2013-04-20
+@@ -8934,7 +8934,7 @@ Matthias Kuhn <matthias.kuhn at gmx.ch> 201
+ * QgsVectorLayerCache did sometimes cache features which did not contain all information which needs to be cached and therefore corrupting the cache and leading to incomplete cache hits.
+ * Add a unit test for the cache problem
+ * Fix QgsCacheIndexFeatureId
+- * QgsAbstractCacheIndex::getCacheIterator now produces a QgsFeatureIterator (instead of a list of Feature Ids). This allows to combine a mixed response, partly satisfied by the cache and partly by an additional query to the backend.
++ * QgsAbstractCacheIndex::getCacheIterator now produces a QgsFeatureIterator (instead of a list of Feature Ids). This allows combining a mixed response, partly satisfied by the cache and partly by an additional query to the backend.
+
+ D'Hont René-Luc <rldhont at gmail.com> 2013-04-19
+
+@@ -9995,7 +9995,7 @@ Alexander Bruy <alexander.bruy at gmail.com
+
+ Alexander Bruy <alexander.bruy at gmail.com> 2013-04-11
+
+- [sextante] allow to run models with no parameters (partially reverts
++ [sextante] allow running models with no parameters (partially reverts
+ 4e5c660823)
+
+ Alexander Bruy <alexander.bruy at gmail.com> 2013-04-11
+@@ -11220,7 +11220,7 @@ Matthias Kuhn <matthias.kuhn at gmx.ch> 201
+ Matthias Kuhn <matthias.kuhn at gmx.ch> 2013-01-28
+
+ Add a select by expression dialog.
+- Allow to change the current selection based on a QgsExpression
++ Allow changing the current selection based on a QgsExpression
+ * Select (clear and select)
+ * Add to selection
+ * Remove from selection
+@@ -13950,7 +13950,7 @@ Juergen E. Fischer <jef at norbit.de> 2013-
+ olivierdalang <olivier.dalang at gmail.com> 2013-01-29
+
+ [feature] added draw background checkbox in composer items
+- (this allow to workaround the non-opaque background bug with atlas and is more consistent with the frame settings) )
++ (this allows working around the non-opaque background bug with atlas and is more consistent with the frame settings) )
+
+ Larry Shaffer <larrys at dakotacarto.com> 2013-01-26
+
+@@ -16347,7 +16347,7 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2012-12-05
+
+- import vector layer: allow to create single-part geometries from shapefile (follow 08e844f6d06)
++ import vector layer: allow creating single-part geometries from shapefile (follow 08e844f6d06)
+
+ Alexander Bruy <alexander.bruy at gmail.com> 2012-12-05
+
+@@ -16367,9 +16367,9 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2012-12-05
+
+- dbmanager: allow to import layer from canvas (fix #6824),
++ dbmanager: allow importing layer from canvas (fix #6824),
+ add dialog to choose vector file to be imported (fix #6825),
+- allow to export table to vector file (fix #6826)
++ allow exporting table to vector file (fix #6826)
+
+ Thanks to Silvio Grosso for the sponsorship!
+
+@@ -17116,7 +17116,7 @@ Etienne Tourigny <etourigny.dev at gmail.co
+
+ Etienne Tourigny <etourigny.dev at gmail.com> 2012-10-07
+
+- allow to convert cpt-city ramps to standard gradients ramps, keeping author and license info in xml props ; allow to convert gradient ramps to/from discrete/continuous ramps and use float instead of integer stops
++ allow converting cpt-city ramps to standard gradients ramps, keeping author and license info in xml props ; allow converting gradient ramps to/from discrete/continuous ramps and use float instead of integer stops
+
+ Etienne Tourigny <etourigny.dev at gmail.com> 2012-09-22
+
+@@ -19373,7 +19373,7 @@ Arunmozhi <aruntheguy at gmail.com> 2012-10
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2012-10-07
+
+ python console: fix key events and text selection,
+- do not allow to move cursor out of the edition zone (except for selection),
++ do not allow moving cursor out of the edition zone (except for selection),
+ cleanup (remove unused functions and vars)
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2012-10-07
+@@ -21588,7 +21588,7 @@ Etienne Tourigny <etourigny.dev at gmail.co
+
+ Etienne Tourigny <etourigny.dev at gmail.com> 2012-09-10
+
+- allow to expand/collapse when clicking on title
++ allow expanding/collapsing when clicking on title
+
+ Larry Shaffer <larrys at dakotacarto.com> 2012-09-10
+
+@@ -22220,11 +22220,11 @@ Nathan Woodrow <madmanwoo at gmail.com> 201
+
+ Merge pull request #221 from szekerest/master
+
+- Specify port 1433 for FreeTDS by default. Allow to specify server/database/uid/password when the driver setting is present
++ Specify port 1433 for FreeTDS by default. Allow specifying server/database/uid/password when the driver setting is present
+
+ szekerest <szekerest at gmail.com> 2012-09-03
+
+- Specify port 1433 for FreeTDS by default. Allow to specify server/database/uid/password when the driver setting is present (fixes #6259, fixes #6263)
++ Specify port 1433 for FreeTDS by default. Allow specifying server/database/uid/password when the driver setting is present (fixes #6259, fixes #6263)
+
+ Matthias Kuhn <matthias.kuhn at gmx.ch> 2012-09-03
+
+@@ -23237,7 +23237,7 @@ Juergen E. Fischer <jef at norbit.de> 2012-
+
+ Juergen E. Fischer <jef at norbit.de> 2012-08-16
+
+- allow to ignore (OGR's interpretation of ) shape file encoding (might fix #5911)
++ allow ignoring (OGR's interpretation of ) shape file encoding (might fix #5911)
+
+ Larry Shaffer <larrys at dakotacarto.com> 2012-08-16
+
+@@ -28540,7 +28540,7 @@ Juergen E. Fischer <jef at norbit.de> 2012-
+ wmts fixes:
+ - [FEATURE] add support for CRS:27 and CRS:83 in QgsCoordinateReferenceSystem
+ - fix axis orientation for CRS:84
+- - respect inverted axis orientation in WMTS and allow to ignore it for WMS 1.3/WMTS
++ - respect inverted axis orientation in WMTS and allow ignoring it for WMS 1.3/WMTS
+ - fix: only consider valid TileMatrixSetLimits
+
+ Juergen E. Fischer <jef at norbit.de> 2012-05-16
+@@ -31595,7 +31595,7 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Etienne Tourigny <etourigny.dev at gmail.com> 2012-03-08
+
+- allow to use loaded layers as input files (instead of file selector) for GDALTools Build Virtual Raster
++ allow using loaded layers as input files (instead of file selector) for GDALTools Build Virtual Raster
+
+ Juergen E. Fischer <jef at norbit.de> 2012-03-09
+
+@@ -31739,7 +31739,7 @@ Juergen E. Fischer <jef at norbit.de> 2012-
+
+ Alexander Bruy <alexander.bruy at gmail.com> 2012-03-06
+
+- [FEATURE] fTools: allow to calculate extent not only for whole layer but
++ [FEATURE] fTools: allow calculating extent not only for whole layer but
+ for individual features too
+
+ Juergen E. Fischer <jef at norbit.de> 2012-03-06
+@@ -31968,7 +31968,7 @@ Marco Hugentobler <marco.hugentobler at sou
+
+ Juergen E. Fischer <jef at norbit.de> 2012-02-23
+
+- [FEATURE] allow to specify FEATURE_COUNT for WMS GetFeatureInfo
++ [FEATURE] allow specifying FEATURE_COUNT for WMS GetFeatureInfo
+
+ Juergen E. Fischer <jef at norbit.de> 2012-02-23
+
+@@ -32322,7 +32322,7 @@ Juergen E. Fischer <jef at norbit.de> 2012-
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2012-02-11
+
+- allow to choose input directory in GdalTools Merge tool (fix #4930)
++ allow choosing input directory in GdalTools Merge tool (fix #4930)
+
+ Juergen E. Fischer <jef at norbit.de> 2012-02-11
+
+@@ -33289,7 +33289,7 @@ Nathan Woodrow <woodrow.nathan at gmail.com
+
+ Juergen E. Fischer <jef at norbit.de> 2012-01-17
+
+- fix setting of icon size and allow to set global fontsize
++ fix setting of icon size and allow setting global fontsize
+
+ Juergen E. Fischer <jef at norbit.de> 2012-01-17
+
+@@ -34874,7 +34874,7 @@ Martin Dobias <wonder.sk at gmail.com> 2011
+
+ Juergen E. Fischer <jef at norbit.de> 2011-11-30
+
+- [FEATURE] allow to disable SelectAtId capability for PostgreSQL provider to
++ [FEATURE] allow disabling SelectAtId capability for PostgreSQL provider to
+ force usage of the attribute table memory model. Apparently the memory model
+ was completely disfunctional before. Fixes included, but it probably needs
+ more testing.
+@@ -36959,7 +36959,7 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2011-08-18
+
+- [FEATURE] Allow to import a vector layer from canvas to SL database
++ [FEATURE] Allow importing a vector layer from canvas to SL database
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2011-08-18
+
+@@ -37056,7 +37056,7 @@ Giuseppe Sucameli <brush.tyler at gmail.com
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2011-08-18
+
+- [FEATURE] Allow to import a vector layer from canvas to SL database
++ [FEATURE] Allow importing a vector layer from canvas to SL database
+
+ Giuseppe Sucameli <brush.tyler at gmail.com> 2011-08-18
+
+@@ -43836,7 +43836,7 @@ jef <jef at c8812cc2-4d05-0410-92ff-de0c093
+
+ brushtyler <brushtyler at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2011-02-19
+
+- Merged the source select UIs for both PG and SL to allow to use a subset query loading a SL layer
++ Merged the source select UIs for both PG and SL to allow using a subset query loading a SL layer
+
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@15214 c8812cc2-4d05-0410-92ff-de0c093fc19c
+@@ -54532,7 +54532,7 @@ jef <jef at c8812cc2-4d05-0410-92ff-de0c093
+
+ jef <jef at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2010-03-20
+
+- [FEATURE] allow to hide deprecated CRSes
++ [FEATURE] allow hiding deprecated CRSes
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@13125 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
+@@ -63630,7 +63630,7 @@ macho <macho at c8812cc2-4d05-0410-92ff-de0
+
+ gcontreras <gcontreras at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2009-08-21
+
+- Fix for Ticket #1881. This allows to change the srs for wms based in geoserver.
++ Fix for Ticket #1881. This allows changing the srs for wms based in geoserver.
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@11460 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
+@@ -72697,7 +72697,7 @@ telwertowski <telwertowski at c8812cc2-4d05
+
+ timlinux <timlinux at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-08-30
+
+- Disable quickprint plugin for release - will redeploy if time allows to convert to new composer code
++ Disable quickprint plugin for release - will redeploy if time allows converting to new composer code
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@9222 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
+@@ -89726,7 +89726,7 @@ g_j_m <g_j_m at c8812cc2-4d05-0410-92ff-de0
+
+ mhugent <mhugent at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2006-08-18
+
+- Changed the selection behaviour of the attribute table. The repaintRequest signal is now only emitted if the mouse button is released and if the selected rows have changed. This minimises repaint events and allows to selecting multiple rows with mouse drag without generating a seperate repaint event for each new row
++ Changed the selection behaviour of the attribute table. The repaintRequest signal is now only emitted if the mouse button is released and if the selected rows have changed. This minimises repaint events and allows selecting multiple rows with mouse drag without generating a seperate repaint event for each new row
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@5706 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
+--- a/doc/news.t2t
++++ b/doc/news.t2t
+@@ -149,7 +149,7 @@ key new features.
+ - Menu Re-organisation - The menus were re-organised a little - we now have separate menus for Vector and Raster and many plugins were updated to place their menus in the new Vector and Raster top level menus.
+ - Offset Curves - a new digitising tool for creating offset curves was added.
+ - Terrain Analysis Plugin - a new core plugin was added for doing terrain analysis - and it can make really good looking coloured relief maps.
+-- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows to set all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
++- Ellipse renderer - symbollayer to render ellipse shapes (and also rectangles, triangles, crosses by specifying width and height). Moreover, the symbol layer allows setting all parameters (width, height, colors, rotation, outline with) from data fields, in mm or map units
+ - New scale selector with predefined scales
+ - Option to add layers to selected or active group
+ - Pan To Selected tool
+--- a/python/plugins/db_manager/README
++++ b/python/plugins/db_manager/README
+@@ -1,7 +1,7 @@
+ DB Manager * Copyright (c) 2011 Giuseppe Sucameli
+
+ DB Manager is a database manager plugin for QGIS.
+-It allows to you to show the DBs contents and run query on them.
++It allows you to show the DBs contents and run queries on them.
+
+ In this moment DB Manager supports the following DBMS backends:
+ - PostgreSQL/PostGIS through the psycopg2 pymodule
+--- a/resources/context_help/QgsOptions
++++ b/resources/context_help/QgsOptions
+@@ -39,7 +39,7 @@ The <label>Mode</label> setting determin
+ <h5>Measure tool</h5>
+ Here you can set an ellipsoid for distance calculations, measurement units and preferred color of rubber band.
+ <h5>Panning and zooming</h5>
+-Allows to define mouse wheel action and zoom factor.
++Allows defining mouse wheel action and zoom factor.
+ <a name="over">
+ <h4>Overlay</h4>
+ </a>
+--- a/resources/customization.xml
++++ b/resources/customization.xml
+@@ -1593,7 +1593,7 @@
+ <widget objectName="editableUniqueValues" class="QCheckBox" label="Editable"/>
+ </widget>
+ <widget objectName="rangePage" class="QWidget" label="">
+- <widget objectName="rangeLabel" class="QLabel" label="Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box."/>
++ <widget objectName="rangeLabel" class="QLabel" label="Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box."/>
+ <widget objectName="rangeWidget" class="QComboBox" label=""/>
+ <widget objectName="minimumLabel" class="QLabel" label="Minimum"/>
+ <widget objectName="maximumLabel" class="QLabel" label="Maximum"/>
+--- a/src/gui/attributetable/qgsattributetablemodel.h
++++ b/src/gui/attributetable/qgsattributetablemodel.h
+@@ -265,7 +265,7 @@ class GUI_EXPORT QgsAttributeTableModel:
+
+ /** The currently cached column */
+ int mCachedField;
+- /** Allows to cache one specific column (used for sorting) */
++ /** Allows caching one specific column (used for sorting) */
+ QHash<QgsFeatureId, QVariant> mFieldCache;
+ };
+
+--- a/src/ui/qgsattributetypeedit.ui
++++ b/src/ui/qgsattributetypeedit.ui
+@@ -192,7 +192,7 @@
+ <item>
+ <widget class="QLabel" name="rangeLabel">
+ <property name="text">
+- <string>Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box.</string>
++ <string>Allows setting numeric values from a specified range. The edit widget can be either a slider or a spin box.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
diff --git a/debian/patches/an-other-typo.patch b/debian/patches/an-other-typo.patch
index 70c9a29..7b50d1c 100644
--- a/debian/patches/an-other-typo.patch
+++ b/debian/patches/an-other-typo.patch
@@ -45,7 +45,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_de.ts
+++ b/i18n/qgis_de.ts
-@@ -36346,7 +36346,7 @@ QGIS muß neugestartet werden, um sie erneut zu laden.</translation>
+@@ -36346,7 +36346,7 @@ QGIS muß neugestartet werden, um sie er
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -65,7 +65,7 @@ Last-Update: 2013-09-27
<translation type="obsolete">ΑδÏνατη η δημιουÏγία ενός GPX αÏχείου με το Ï„ÏÎχον όνομα. Î Ïοσπαθήστε ξανά με διαφοÏετικό όνομα ή σε διαφοÏετικό φάκελο.</translation>
</message>
<message>
-@@ -42116,7 +42116,7 @@ You need to restart Quantum GIS in order to reload it.</source>
+@@ -42116,7 +42116,7 @@ You need to restart Quantum GIS in order
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -76,7 +76,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_en.ts
+++ b/i18n/qgis_en.ts
-@@ -35995,7 +35995,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -35995,7 +35995,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -107,7 +107,7 @@ Last-Update: 2013-09-27
<message>
--- a/i18n/qgis_et_EE.ts
+++ b/i18n/qgis_et_EE.ts
-@@ -43321,7 +43321,7 @@ Kas soovid neist loobuda kohe? Kui sa ei ole kindel mida teha, siis arvatavasti
+@@ -43321,7 +43321,7 @@ Kas soovid neist loobuda kohe? Kui sa ei
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -129,7 +129,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_fa.ts
+++ b/i18n/qgis_fa.ts
-@@ -39091,7 +39091,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -39091,7 +39091,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -233,7 +233,7 @@ Last-Update: 2013-09-27
<translation type="obsolete">Get ekki búið til GPX skrá með þessu nafni. Prófaðu aftur með öðru nafni eða à öðru skráarsafni.</translation>
</message>
<message>
-@@ -40273,7 +40273,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -40273,7 +40273,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -244,7 +244,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_it.ts
+++ b/i18n/qgis_it.ts
-@@ -41870,7 +41870,7 @@ metterei "questa" al posto di "vostra" (ght)
+@@ -41870,7 +41870,7 @@ metterei "questa" al posto di
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -255,7 +255,7 @@ Last-Update: 2013-09-27
</message>
--- a/i18n/qgis_ja.ts
+++ b/i18n/qgis_ja.ts
-@@ -36344,7 +36344,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -36344,7 +36344,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -297,7 +297,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_lv.ts
+++ b/i18n/qgis_lv.ts
-@@ -36396,7 +36396,7 @@ Jums ir nepiecieÅ¡ams pÄrstartÄ“t Quantum GIS, lai varÄ“tu sÄkt izmantot Å¡o s
+@@ -36396,7 +36396,7 @@ Jums ir nepiecieÅ¡ams pÄrstartÄ“t Quant
<translation type="unfinished"></translation>
</message>
<message>
@@ -308,7 +308,7 @@ Last-Update: 2013-09-27
<message>
--- a/i18n/qgis_mn.ts
+++ b/i18n/qgis_mn.ts
-@@ -39721,7 +39721,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -39721,7 +39721,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -319,7 +319,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_nb_NO.ts
+++ b/i18n/qgis_nb_NO.ts
-@@ -36266,7 +36266,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -36266,7 +36266,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -359,7 +359,7 @@ Last-Update: 2013-09-27
<translation type="obsolete">Nie można utworzyć pliku GPX o podanej nazwie. Podaj inną nazwę lub zmień katalog.</translation>
</message>
<message>
-@@ -44339,7 +44339,7 @@ Musisz włączyć ponownie program QGIS, żeby ją przeładować.</translation>
+@@ -44339,7 +44339,7 @@ Musisz włączyć ponownie program QGIS,
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -410,7 +410,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_ro.ts
+++ b/i18n/qgis_ro.ts
-@@ -40279,7 +40279,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -40279,7 +40279,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -432,7 +432,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_sk.ts
+++ b/i18n/qgis_sk.ts
-@@ -39477,7 +39477,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -39477,7 +39477,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -441,7 +441,7 @@ Last-Update: 2013-09-27
<translation><h3>Neplatné zásuvné moduly</h3><p>Zásuvné moduly v tomto zozname sú <b>poÅ¡kodené alebo nekompatibilné</b> s VaÅ¡ou verziou QGISu.</p><p>KliknutÃm na ľubovoľný zásuvný modul QGIS zobrazà (ak je to možné) viac informáciÃ.</p><p>Hlavnou prÃÄinou neplatných zásuvných modulov je to, že daný zásuvný modul nie je vytvorený pre danú verziu QGISu. Inú verziu aplikácie si môžete stiahnuÅ¥ zo stránky <a href="http://plugins.qgis.org">plugins.qgis.org</a>.</p><p>ÄŽalÅ¡ou Äastou prÃÄinou je to, že zásuvný modul jazyka Python potrebuje isté externé knižnice. NainÅ¡talovaÅ¥ si ich môžete sami v závislosti od Vášho operaÄného systému. Po správnej inÅ¡talácii by mal zásuvný modul fungovaÅ¥.</p></translation>
</message>
<message>
-@@ -39485,7 +39485,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -39485,7 +39485,7 @@ You need to restart QGIS in order to rel
<translation type="obsolete"><h3>Nové zásuvné moduly</h3><p>Tu vidÃte <b>najnovÅ¡ie</b> zásuvné moduly, ktoré môžu byÅ¥ nainÅ¡talované.</p></translation>
</message>
<message>
@@ -534,7 +534,7 @@ Last-Update: 2013-09-27
</context>
--- a/i18n/qgis_tr.ts
+++ b/i18n/qgis_tr.ts
-@@ -41948,7 +41948,7 @@ You need to restart QGIS in order to reload it.</source>
+@@ -41948,7 +41948,7 @@ You need to restart QGIS in order to rel
</message>
<message>
<location filename="../src/app/pluginmanager/qgspluginmanager_texts.cpp" line="75"/>
@@ -639,7 +639,7 @@ Last-Update: 2013-09-27
--- a/src/app/pluginmanager/qgspluginmanager_texts.cpp
+++ b/src/app/pluginmanager/qgspluginmanager_texts.cpp
-@@ -84,7 +84,7 @@ Click on an individual plugin; if possible QGIS shows you more information.\
+@@ -84,7 +84,7 @@ Click on an individual plugin; if possib
\
<p>\
The main reasons to have invalid plugins is that this plugin is not build \
@@ -700,3 +700,14 @@ Last-Update: 2013-09-27
* @note added in 1.5 */
bool crosses( const QgsGeometry* geometry ) const;
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -74649,7 +74649,7 @@ telwertowski <telwertowski at c8812cc2-4d05
+
+ timlinux <timlinux at c8812cc2-4d05-0410-92ff-de0c093fc19c> 2008-07-08
+
+- Proving that my Polish is just as good as an other South Africans, I hereby declare ticket #927 fixed. Live long and prosper.
++ Proving that my Polish is just as good as other South Africans, I hereby declare ticket #927 fixed. Live long and prosper.
+
+ git-svn-id: http://svn.osgeo.org/qgis/trunk@8742 c8812cc2-4d05-0410-92ff-de0c093fc19c
+
--
The Quantum GIS in Debian project
More information about the Pkg-grass-devel
mailing list