more help updates and ui cleanups from Milena

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13576 c8812cc2-4d05-0410-92ff-de0c093fc19c

resources/context_help/QgsOptions-en_US

@@ -34,8 +34,12 @@ By default, QGIS does not display any features for a layer until the entire laye
 <a name="map">
 <h4>Map tools</h4>
 </a>
+<h5>Identify</h5>
 The <label>Mode</label> setting determines which layers will be shown by the <label>Identify</label> tool. By switching to <label>Top down</label> instead of <label>Current layer</label> attributes for all identifiable layers will be shown with the <label>Identify</label> tool.
-
+<h5>Measure tool</h5>
+Here you can set an elipsoid for distance calculations, measurement units and preferred color of rubberband.
+<h5>Panning and zooming</h5>
+Allows to define mouse wheel action and zoom factor.
 <a name="over">
 <h4>Overlay</h4>
 </a>
@@ -44,10 +48,17 @@ Define placement algorithm for labels. Choose between <label>central point (fast
 <a name="digit">
 <h4>Digitizing</h4>
 </a>
-In the <label>Digitizing</label> tab you can define a general, project wide snapping tolerance. <p>
-You can select between <label>to vertex</label>, <label>to segment</label> or <label>to vertex and segment</label> as default snap mode. You can also define a default snapping tolerance and a search radius for vertex edits. The tolerance can be set either in map units or in pixels. The advantage of choosing pixels, is that the snapping tolerance doesn't have to be changed after zoom operations. <p>
+<h5>Rubberband</h5>
+In the <label>Digitizing</label> tab you can define settings for digitizing line width and color.
+<h5>Snapping</h5>
+Here you can define a general, project wide snapping tolerance. <p>
+You can select between <label>To vertex</label>, <label>To segment</label> or <label>To vertex and segment</label> as default snap mode. You can also define a default snapping tolerance and a search radius for vertex edits. The tolerance can be set either in map units or in pixels. The advantage of choosing pixels, is that the snapping tolerance doesn't have to be changed after zoom operations. <p>
 A layer based snapping tolerance can be defined by choosing <label>Settings</label> (or <label>File</label>)
 > <label>Project Properties...</label>. In the <label>General</label> tab, section <label>Digitize</label> you can click on <label>Snapping options...</label> to enable and adjust snapping mode and tolerance on a layer basis.
+<h5>Vertex markers</h5>
+You can define marker style as <label>Semi transparent circle</label>, <label>Cross</label> or <label>None</label> and size; you can also set showing markers only for selected features.
+<h5>Enter atribute values</h5>
+By default, after digitizing a new feature, QGIS asks you to enter attribute values for that feature. Ticking <label>Suppress attributes pop-up windows after each created feature</label> allows you to enter the attributes later.
 <a name="crs">
 <h4>CRS</h4>
 </a>

resources/context_help/QgsPgSourceSelect-en_US

@@ -4,8 +4,9 @@ This dialog allows you to add PostGIS layers (tables with a geometry column) to
 <a href="#connect">Connections</a><br/>
 <a href="#add">Adding Layers</a><br/>
 <a href="#filter">Filtering a Layer</a><br/>
+<a href="#search">Search options</a><br/>
 
-<a name="connect">
+<a href="#connect">
 <h4>Connections</h4>
 </a>
 <ul>
@@ -27,5 +28,9 @@ To add a layer:
 <a name="filter">
 <h4>Filtering a Layer</h4>
 </a>
-To filter a layer before adding it to the map, double click on its name. This will open the Query Builder, allowing you to build up a SQL statement to use in filtering the records.
+To filter a layer before adding it to the map, double click on its name or use <label>Build query</label> button. This will open the Query Builder, allowing you to build up a SQL statement to use in filtering the records.
 
+<a name="search">
+<h4>Search options</h4>
+</a>
+Ticking <label>Search options</label> enables additional options for searching in different column types and using 2 search modes: <label>Wildcard</label> or <label>RegExp</label>.

resources/context_help/QgsPgSourceSelect-pl_PL

@@ -1,16 +1,16 @@
 <h3>Dodaj tabelę PostGIS</h3>
 Okno dialogowe pozwalające na dodanie warstw PostGIS (tabel z kolumną geometrii) do okna mapy QGIS.
 <p>
-<a href="#connect">Połączenia</a><br/>
+<a href="#connect">Połączenia z PostgreSQL</a><br/>
 <a href="#add">Dodawanie warstw</a><br/>
 <a href="#filter">Filtrowanie warstwy</a><br/>
 
 <a name="connect">
-<h4>Połączenia</h4>
+<h4>Połączenia z PostgreSQL</h4>
 </a>
 <ul>
 <li>Wybierz połączenie z bazą z rozwijalnej listy i kliknij <label>Połącz</label>.
-<li>Jeśli nie ma żadnych dostępnych połączeń, wybierz przycisk <label>Nowy</label>, aby utworzyć połączenie do swojej bazy.
+<li>Jeśli nie ma żadnych dostępnych połączeń, wybierz przycisk <label>Nowe</label>, aby utworzyć połączenie do swojej bazy.
 <li>Aby zmodyfikować połączenie, kliknij przycisk <label>Edytuj</label>.
 </ul>
 <a name="add">
@@ -27,5 +27,5 @@ Aby dodać warstwę:
 <a name="filter">
 <h4>Filtrowanie warstwy</h4>
 </a>
-Aby ustawić filtr na warstwie przed dodaniem jej do mapy, podwójnie kliknij jej nazwę. Otworzy się okno zapytań SQL, w którym możesz utworzyć zapytanie filtrujące.
+Aby ustawić filtr na warstwie przed dodaniem jej do mapy, podwójnie kliknij jej nazwę lub użyj przycisku <label>Stwórz zapytanie</label>. Otworzy się okno zapytań SQL, w którym możesz utworzyć zapytanie filtrujące.
 

resources/context_help/QgsProjectProperties-pl_PL

@@ -6,6 +6,7 @@ To okno umożliwia zdefiniowanie wielu parametrów związanych z <label>Projekte
 
 <a name="general">
 <h4>Zakładka Ogólne</h4>
+</a>
 <table border=1>
 <tr>
 <td>Tytuł projektu</td><td>Opisowy tytuł projektu. Będzie on wyświetlany na pasku tytułowym okna QGIS</td>

resources/context_help/QgsVectorLayerProperties-pl_PL

@@ -1,14 +1,123 @@
 <h3>Właściwości warstwy wektorowej</h3>
 Okno dialogowe pozwala na pracę z ustawieniami i właściwościami warstwy wektorowej. Dostępnych jest pięć zakładek:
+
+<p>
+<a href="#symbology">Symbology</a><br/>
+<a href="#labels">Labels</a><br/>
+<a href="#attributes">Attributes</a><br/>
+<a href="#general">General</a><br/>
+<a href="#metadata">Metadata</a><br/>
+<a href="#actions">Actions</a><br/>
+<a href="#diagram">Diagram Overlay</a><br/>
+
+<a name="symbology">
+<h4>Symbolika</h4>
+</a>
+Aby zmienić styl wyświetlania warstwy, kliknij na nazwie warstwy w legendzie dwa razy. Pojawi się okno dialogowe <label>Właściwości warstwy</label>.<p>
+Za pomocą tego dialogu możesz nadawać style warstwie wektorowej. W zależności od wybranej opcji wizualizacji, możesz również dokonać klasyfikacji obiektów na warstwie.
+
+<h5>Typ legendy</h5>
+QGIS obsługuje wiele sposobów wizualizacji danych. Obecnie dostępne są następujące: 
+<ul>
+<li><label>Symbol pojedynczy</label> - do wyświetlania wszystkich obiektów na warstwie stosowany jest ten sam styl.
+<li><label>Symbol stopniowy</label> - obiekty znajdujące się na jednej warstwie są wyświetlane za pomocą różnych symboli na podstawie klasyfikacji wartości konkretnego pola.
+<li><label>Wartość ciągła</label> - obiekty warstwy są wyświetlane za pomocą skali barw na podstawie klasyfikacji wartości wybranego pola numerycznego. 
+<li><label>Wartość unikalna</label> - obiekty są klasyfikowane na podstawie unikalnych wartości wybranego pola a każda wartość przybiera inny symbol.
+</ul>
+
+<h5>Nowa symbolizacja</h5>
+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.
+
+<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/>
+If you wish to always use a particular style whenever the layer is loaded, use the <label>Save As Default</label> button to make your style the default. Also, if you make changes to the style that you are not happy with, use the <label>Restore Default Style</label> button to revert to your default style.
+
+<a name="labels">
+<h4>Labels</h4>
+</a>
+The Labels tab allows you to enable labeling features and control a number of options related to fonts, placement, style, alignment and buffering.<br/>
+Check the <label>Display labels</label> checkbox to enable labeling.
+
+<h5>Basic Label options</h5>
+Choose the field to label with.<p>
+Select the use the <label>Font</label> and  <label>Color</label> buttons to set the font and color. You can also change the angle and the placement of the text-label.<p>
+If have labels extending over several lines, check <label>Multiline labels?</label>. QGIS will check for a true line return in your label field and insert the line breaks accordingly. A true line return is a single character \n, (not two separate characters, like a backlash \ followed by the character n).
+
+<h5>Placement</h5>
+Change the label placement by selecting one of the radio buttons in the <label>Placement</label> group.
+
+<h5>Font size units</h5>
+The <label>Font size units</label> allows you to select between <label>Points</label> or <label>Map units</label>.
+
+<h5>Buffer labels</h5>
+To buffer the labels means putting a backdrop around them to make them stand out better. To buffer the lakes labels:
 <ol>
-<li><a href="#symbology">Symbolika</a></li>
-<li><a href="#general">Ogólne</a></li>
-<li><a href="#metadata">Metadane</a></li>
-<li><a href="#labels">Etykiety</a></li>
-<li><a href="#actions">Akcje</a></li>
+<li>Click the <label>Buffer Labels</label> checkbox to enable buffering.
+<li>Choose a size for the buffer using the spin box.
+<li>Choose a color by clicking on <label>Color</label> and choosing your favorite from the color selector. You can also set some transparency for the buffer if you prefer.
+<li>Click <label>Apply</label> to see if you like the changes.
 </ol>
+Notice you can also specify the buffer size in map
+units if that works out better for you.
+
+<h5>Data defined placement, properties, buffer, position</h5>
+The remaining entries inside the <label>Label</label> tab allow you control the appearance of the labels using attributes stored in the layer. The entries beginning with <label>Data defined</label> allow you to set all the parameters for the labels using fields in the layer.
+
+
+<a name="attributes">
+<h4>Attributes</h4>
+</a>
+Within the <label>Attributes</label> tab the attributes of the selected dataset can be manipulated. The buttons <label>New Column</label> and <label>Delete Column</label> can be used, when the dataset is in editing mode. The OGR library supports to add new columns, but not to remove them, if you have a GDAL version >= 1.6 installed. Otherwise only columns from PostGIS layers can be edited.<p>
+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>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>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.
+<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.
+<li><label>Enumeration</label> Opens a combo box with values that can be used within the columns type. This is currently only supported by the postgres provider.
+<li><label>Immutable</label> The immutable attribute column is read-only. The user is not able to modify the content.
+</ul>
+
+<a name="general">
+<h4>General</h4>
+</a>
+The General tab allows you to change the display name, set scale dependent rendering options, create a spatial index of the vector file (only for OGR supported formats and PostGIS) and view or change the projection of the specific vetor layer.<p>
+If your vector layer has been loaded from a PostgreSQL / PostGIS datastore, you can also alter the underlying SQL for the layer - either by hand editing the SQL on this tab or by invoking the <label>Query Builder</label>.
+
+<h5>Subset</h5>
+The <label>Query Builder</label> button allows you to create a subset of the features in the layer.
+
+<a name="metadata">
+<h4>Metadata</h4>
+</a>
+The <label>Metadata</label> tab contains information about the layer, including specifics about the type and location, number of features, feature type, and the editing capabilities. The Layer Spatial Reference System section, providing projection information, is displayed on this tab. This is a quick way to get information about the layer.
+
+<a name="actions">
+<h4>Actions</h4>
+</a>
+QGIS provides the ability to perform an action based on the attributes of a feature. This can be used to perform any number of actions, for example, running a program with arguments built from theattributes of a feature or passing parameters to a web reporting tool. <br/>
+Actions are useful when you frequently want to run an external application or view a web page based on one or more values in your vector layer. An example is performing a search based on an attribute value.<p>
+See the User Guide for further information.
+
+<h5>Using Actions</h5>
+Actions can be invoked from either the <label>Identify Results</label> dialog or an <label>Attribute Table</label> dialog.
+
+<a name="diagram">
+<h4>Diagram Overlay</h4>
+</a>
+The Diagram tab allows you to add a grahic overlay to a vector layer. To activate this feature, open the <label>Plugin Manager</label> and select the <label>Diagram Overlay’</label> plugin. After this, there is a new tab in the vector <label>Layer Properties</label> dialog where the settings for diagrams may be entered.<p>
+The current implementation of diagrams provides support for pie- and barcharts and for linear scaling
+of the diagram size according to a classification attribute.
+
+
+
 <a name="symbology">
-<h4>Symbolika</h4>
 </a>
 
 <a name="general">

src/ui/qgsoptionsbase.ui

@@ -141,7 +141,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Digitising</string>
+       <string>Digitizing</string>
       </property>
       <property name="textAlignment">
        <set>AlignHCenter|AlignVCenter|AlignCenter</set>
@@ -873,7 +873,7 @@
           <item>
            <widget class="QLabel" name="mAlgorithmLabel">
             <property name="text">
-             <string>Placement algorithm:</string>
+             <string>Placement algorithm</string>
             </property>
            </widget>
           </item>
@@ -1431,7 +1431,7 @@
           <item row="5" column="0" rowspan="2" colspan="5">
            <widget class="QGroupBox" name="grpUrlExclude">
             <property name="title">
-             <string>Exclude URLs (starting with):</string>
+             <string>Exclude URLs (starting with)</string>
             </property>
             <property name="flat">
              <bool>true</bool>
@@ -1551,7 +1551,7 @@
          <item>
           <widget class="QLabel" name="mNetworkTimeoutLabel">
            <property name="text">
-            <string>Timeout for network requests (ms):</string>
+            <string>Timeout for network requests (ms)</string>
            </property>
           </widget>
          </item>

src/ui/qgsrasterlayerpropertiesbase.ui

@@ -900,7 +900,7 @@
        <item row="2" column="0" colspan="2">
         <widget class="QLabel" name="lblMinMaxEstimateWarning">
          <property name="text">
-          <string>Note:</string>
+          <string>Note</string>
          </property>
         </widget>
        </item>
@@ -1602,7 +1602,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>Columns:</string>
+            <string>Columns</string>
            </property>
           </widget>
          </item>
@@ -1615,7 +1615,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>Rows:</string>
+            <string>Rows</string>
            </property>
           </widget>
          </item>
@@ -1628,7 +1628,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>No Data:</string>
+            <string>No Data</string>
            </property>
           </widget>
          </item>