merge from trunk r12050:12100

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@12132 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 15, 2009 · 6ffdd1ae84eae791efeb3cc385c2d98a3879ffbb · 6ffdd1a
1 parent 23c86a1
commit 6ffdd1ae84eae791efeb3cc385c2d98a3879ffbb
diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts
diff --git a/i18n/qgis_hu.ts b/i18n/qgis_hu.ts
diff --git a/i18n/qgis_id.ts b/i18n/qgis_id.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_ka_GE.ts b/i18n/qgis_ka_GE.ts
diff --git a/i18n/qgis_lo.ts b/i18n/qgis_lo.ts
diff --git a/i18n/qgis_lt.ts b/i18n/qgis_lt.ts
diff --git a/i18n/qgis_lv.ts b/i18n/qgis_lv.ts
diff --git a/i18n/qgis_mn.ts b/i18n/qgis_mn.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_pl_PL.ts b/i18n/qgis_pl_PL.ts
diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts
diff --git a/i18n/qgis_ro.ts b/i18n/qgis_ro.ts
diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts
diff --git a/i18n/qgis_sk.ts b/i18n/qgis_sk.ts
diff --git a/i18n/qgis_sq_AL.ts b/i18n/qgis_sq_AL.ts
diff --git a/i18n/qgis_sv.ts b/i18n/qgis_sv.ts
diff --git a/i18n/qgis_th.ts b/i18n/qgis_th.ts
diff --git a/i18n/qgis_tr.ts b/i18n/qgis_tr.ts
diff --git a/i18n/qgis_uk.ts b/i18n/qgis_uk.ts
diff --git a/i18n/qgis_vi.ts b/i18n/qgis_vi.ts

         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Forces labels on, regardless of collisions. Available only for cached labels.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Force</source>
         <translation type="unfinished"></translation>

         <source>Partials</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Dump</source>
         <translation type="unfinished"></translation>

         <source>Symbolset path</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Forces labels on, regardless of collisions. Available only for cached labels.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QgsMarkerDialogBase</name>

     <name>visualThread</name>
     <message>
         <source>Observed mean distance : </source>
-        <translation type="unfinished">Khoảng cách trung bình ghi nhận được:</translation>
+        <translation type="obsolete">Khoảng cách trung bình ghi nhận được:</translation>
     </message>
     <message>
         <source>Expected mean distance : </source>
-        <translation type="unfinished">Khoảng cách trung bình mong đợi:</translation>
+        <translation type="obsolete">Khoảng cách trung bình mong đợi:</translation>
     </message>
     <message>
         <source>Nearest neighbour index : </source>
-        <translation type="unfinished">Chỉ mục lân cận gần nhất :</translation>
+        <translation type="obsolete">Chỉ mục lân cận gần nhất :</translation>
     </message>
     <message>
         <source>Feature %1 contains an unnested hole</source>

         <translation type="unfinished">Đối tượng %1 có thứ tự nốt không đúng</translation>
     </message>
     <message>
-        <source>Max. len: </source>
+        <source>Max. len:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Min. len:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean. len:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filled:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Empty:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Min. len: </source>
+        <source>N:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean. len: </source>
+        <source>Mean:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filled: </source>
+        <source>StdDev:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Empty: </source>
+        <source>Sum:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>N: </source>
+        <source>Min:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean: </source>
+        <source>Max:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>StdDev: </source>
+        <source>CV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sum: </source>
+        <source>Number of unique values:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Min: </source>
+        <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Max: </source>
+        <source>Median:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CV: </source>
+        <source>Observed mean distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number of unique values: </source>
+        <source>Expected mean distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Range: </source>
+        <source>Nearest neighbour index:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Median: </source>
+        <source>Z-Score:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/qgis_xh.ts b/i18n/qgis_xh.ts
@@ -10414,14 +10414,6 @@ Do you want to overwrite it?</source>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Forces labels on, regardless of collisions. Available only for cached labels.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Force</source>
         <translation type="unfinished"></translation>
@@ -10442,14 +10434,6 @@ p, li { white-space: pre-wrap; }
         <source>Partials</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Dump</source>
         <translation type="unfinished"></translation>
@@ -10481,6 +10465,14 @@ p, li { white-space: pre-wrap; }
         <source>Symbolset path</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Forces labels on, regardless of collisions. Available only for cached labels.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QgsMeasureBase</name>

 <context>
     <name>visualThread</name>
     <message>
-        <source>Observed mean distance : </source>
+        <source>Feature %1 contains an unnested hole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expected mean distance : </source>
+        <source>Feature %1 is not closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nearest neighbour index : </source>
+        <source>Feature %1 is self intersecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Feature %1 contains an unnested hole</source>
+        <source>Feature %1 has incorrect node ordering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Feature %1 is not closed</source>
+        <source>Max. len:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Feature %1 is self intersecting</source>
+        <source>Min. len:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Feature %1 has incorrect node ordering</source>
+        <source>Mean. len:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Max. len: </source>
+        <source>Empty:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Min. len: </source>
+        <source>N:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean. len: </source>
+        <source>Mean:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filled: </source>
+        <source>StdDev:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Empty: </source>
+        <source>Sum:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>N: </source>
+        <source>Min:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mean: </source>
+        <source>Max:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>StdDev: </source>
+        <source>CV:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sum: </source>
+        <source>Number of unique values:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Min: </source>
+        <source>Range:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Max: </source>
+        <source>Median:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CV: </source>
+        <source>Observed mean distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number of unique values: </source>
+        <source>Expected mean distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Range: </source>
+        <source>Nearest neighbour index:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Median: </source>
+        <source>Z-Score:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>