Skip to content
Permalink
Browse files
merge from trunk r11988:12000
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@12129 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Nov 15, 2009
1 parent de23186 commit d461f7ba9254c0e1f248c9b9d487e706c4937dd7
Showing with 16,923 additions and 14,995 deletions.
  1. +1 −0 AUTHORS
  2. +0 −1 CONTRIBUTORS
  3. +384 −411 i18n/qgis_ar.ts
  4. +398 −393 i18n/qgis_cs_CZ.ts
  5. +407 −374 i18n/qgis_de.ts
  6. +379 −414 i18n/qgis_el_GR.ts
  7. +408 −367 i18n/qgis_es.ts
  8. +4,351 −2,773 i18n/qgis_fr.ts
  9. +379 −414 i18n/qgis_he.ts
  10. +400 −372 i18n/qgis_hu.ts
  11. +390 −397 i18n/qgis_id.ts
  12. +408 −367 i18n/qgis_it.ts
  13. +397 −388 i18n/qgis_ja.ts
  14. +392 −387 i18n/qgis_ka_GE.ts
  15. +393 −384 i18n/qgis_lo.ts
  16. +382 −417 i18n/qgis_lt.ts
  17. +406 −369 i18n/qgis_lv.ts
  18. +396 −391 i18n/qgis_mn.ts
  19. +408 −367 i18n/qgis_nl.ts
  20. +473 −411 i18n/qgis_pl_PL.ts
  21. +403 −390 i18n/qgis_pt_BR.ts
  22. +398 −397 i18n/qgis_ro.ts
  23. +405 −380 i18n/qgis_ru.ts
  24. +400 −387 i18n/qgis_sk.ts
  25. +398 −389 i18n/qgis_sq_AL.ts
  26. +405 −380 i18n/qgis_sv.ts
  27. +408 −367 i18n/qgis_th.ts
  28. +398 −389 i18n/qgis_tr.ts
  29. +385 −384 i18n/qgis_uk.ts
  30. +55 −21 i18n/qgis_vi.ts
  31. +34 −60 i18n/qgis_xh.ts
  32. +55 −37 i18n/qgis_zh_CN.ts
  33. +56 −34 i18n/qgis_zh_TW.ts
  34. +10 −10 src/analysis/interpolation/Bezier3D.cc
  35. +4 −11 src/analysis/interpolation/Bezier3D.h
  36. +265 −262 src/analysis/interpolation/CloughTocherInterpolator.cc
  37. +27 −24 src/analysis/interpolation/NormVecDecorator.cc
  38. +2 −3 src/analysis/interpolation/NormVecDecorator.h
  39. +26 −25 src/analysis/interpolation/TriDecorator.cc
  40. +1 −5 src/analysis/interpolation/TriDecorator.h
  41. +1 −1 src/app/composer/qgscomposerscalebarwidget.cpp
  42. +7 −10 src/app/ogr/qgsnewogrconnection.cpp
  43. +2 −3 src/app/ogr/qgsnewogrconnection.h
  44. +4 −9 src/app/qgsnewconnection.cpp
  45. +2 −3 src/app/qgsnewconnection.h
  46. +3 −0 src/app/qgsnewvectorlayerdialog.cpp
  47. +5 −0 src/helpviewer/CMakeLists.txt
  48. +3 −3 src/plugins/gps_importer/qgsgpsplugingui.h
  49. +8 −6 src/providers/postgres/qgspostgresprovider.cpp
  50. +248 −210 src/ui/qgscomposerpicturewidgetbase.ui
  51. +254 −230 src/ui/qgscomposerscalebarwidgetbase.ui
  52. +53 −40 src/ui/qgsmergeattributesdialogbase.ui
  53. +34 −44 src/ui/qgsmessageviewer.ui
  54. +154 −203 src/ui/qgsnewconnectionbase.ui
  55. +74 −61 src/ui/qgsnewhttpconnectionbase.ui
  56. +115 −166 src/ui/qgsnewogrconnectionbase.ui
  57. +184 −170 src/ui/qgsopenvectorlayerdialogbase.ui
  58. +485 −484 src/ui/qgsoptionsbase.ui
@@ -38,3 +38,4 @@ Borys Jurgiel <borysiasty at aster.pl>
Paolo Cavallini <cavallini at faunalia.it>
Carson J. Q. Farmer <carson dot farmer at gmail dot com>
Lorenzo Masini <lorenxo86@gmail.com>
Werner Macho <werner.macho@gmail.com>
@@ -38,4 +38,3 @@ Germán Carrillo
Milena Nowotarska
Anita Graser
Richard Duivenvoorde
Werner Macho

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -9610,6 +9610,10 @@ Error was:%2</source>
<source>Take rotation from composer map</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsComposerScaleBarWidget</name>
@@ -10082,7 +10086,7 @@ Tốt nhất là bạn khởi động lại QGIS rồi chạy trình biên tập
</message>
<message>
<source>Paper</source>
<translation>Giấy</translation>
<translation type="obsolete">Giấy</translation>
</message>
<message>
<source>Orientation</source>
@@ -10168,6 +10172,10 @@ Tốt nhất là bạn khởi động lại QGIS rồi chạy trình biên tập
<source>Grid style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paper and quality</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsConfigureShortcutsDialog</name>
@@ -18820,15 +18828,15 @@ Thông tin bổ sung về lỗi:
</message>
<message>
<source>OK</source>
<translation>Đồng ý</translation>
<translation type="obsolete">Đồng ý</translation>
</message>
<message>
<source>Cancel</source>
<translation>Hủy bỏ</translation>
<translation type="obsolete">Hủy bỏ</translation>
</message>
<message>
<source>Help</source>
<translation>Trợ giúp</translation>
<translation type="obsolete">Trợ giúp</translation>
</message>
<message>
<source>Connection Information</source>
@@ -18860,15 +18868,15 @@ Thông tin bổ sung về lỗi:
</message>
<message>
<source>Test Connect</source>
<translation>Thử kết nối</translation>
<translation type="obsolete">Thử kết nối</translation>
</message>
<message>
<source>Save Password</source>
<translation>Lưu mật mã</translation>
</message>
<message>
<source>F1</source>
<translation>F1</translation>
<translation type="obsolete">F1</translation>
</message>
<message>
<source>Port</source>
@@ -18922,6 +18930,10 @@ Thông tin bổ sung về lỗi:
<source>SSL mode</source>
<translation>Chế độ SSL</translation>
</message>
<message>
<source>&amp;Test Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsNewHttpConnectionBase</name>
@@ -19009,14 +19021,14 @@ Thông tin bổ sung về lỗi:
<source>If the WMS requires basic authentication, enter a user name and optional password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>User name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password</source>
<translation type="unfinished">Mật mã</translation>
</message>
<message>
<source>&amp;User name</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsNewOgrConnection</name>
@@ -19055,7 +19067,7 @@ Thông tin bổ sung về lỗi:
</message>
<message>
<source>Test Connect</source>
<translation>Thử kết nối</translation>
<translation type="obsolete">Thử kết nối</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;
@@ -19095,18 +19107,18 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>OK</source>
<translation>Đồng ý</translation>
<translation type="obsolete">Đồng ý</translation>
</message>
<message>
<source>Cancel</source>
<translation>Hủy</translation>
<translation type="obsolete">Hủy</translation>
</message>
<message>
<source>Help</source>
<translation>Trợ giúp</translation>
<translation type="obsolete">Trợ giúp</translation>
</message>
<message>
<source>F1</source>
<source>&amp;Test Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -22481,21 +22493,21 @@ primary key) hoặc có một cột oid PostgreSQL.
<message>
<source>Unable to access the %1 relation.
</source>
<translation>Không thể truy cập vào quan hệ %1.
<translation type="obsolete">Không thể truy cập vào quan hệ %1.
</translation>
</message>
<message>
<source>The error message from the database was:
%1.
SQL: %2</source>
<translation>Thông báo lỗi từ CSDL là:
<translation type="obsolete">Thông báo lỗi từ CSDL là:
%1
SQL: %2</translation>
</message>
<message>
<source>Unable to determine table access privileges for the %1 relation.
</source>
<translation>Không thể xác định các quyền ưu tiên truy cập bảng đối với quan hệ %1.
<translation type="obsolete">Không thể xác định các quyền ưu tiên truy cập bảng đối với quan hệ %1.
</translation>
</message>
<message>
@@ -22602,6 +22614,20 @@ có một cột oid PostgreSQL hoặc có một cột ctid với số block
%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to access the %1 relation.
The error message from the database was:
%2.
SQL: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to determine table access privileges for the %1 relation.
The error message from the database was:
%2.
SQL: %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsPostgresProvider::Conn</name>
@@ -23039,7 +23065,7 @@ p, li { white-space: pre-wrap; }(new line)
</message>
<message>
<source>To access Quantum GIS environment from this python console use object from global scope which is an instance of QgisInterface class.&lt;br&gt;Usage e.g.: iface.zoomFull()</source>
<translation>Để truy nhập vào môi trường Quantum GIS từ console python này hãy dùng đối tượng trên phạm vi toàn cục, đây là một &apos;bản thể&apos; của QggisInterface. &lt;br&gt;Cách dùng ví dụ: iface.zoomFull()</translation>
<translation type="obsolete">Để truy nhập vào môi trường Quantum GIS từ console python này hãy dùng đối tượng trên phạm vi toàn cục, đây là một &apos;bản thể&apos; của QggisInterface. &lt;br&gt;Cách dùng ví dụ: iface.zoomFull()</translation>
</message>
<message>
<source>&amp;Execute</source>
@@ -23057,8 +23083,16 @@ p, li { white-space: pre-wrap; }(new line)
<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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; 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;To access Quantum GIS environment from this python console use qgis.utils.iface object which is an instance of QgisInterface class.&lt;br /&gt;Usage e.g.: qgis.utils.iface.zoomFull()&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -5158,6 +5158,10 @@ Error was:%2</source>
<source>Take rotation from composer map</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsComposerScaleBarWidget</name>
@@ -5456,10 +5460,6 @@ Error was:%2</source>
<source>Composition</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paper</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Orientation</source>
<translation type="unfinished"></translation>
@@ -5520,6 +5520,10 @@ Error was:%2</source>
<source>Grid style</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Paper and quality</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsConfigureShortcutsDialog</name>
@@ -10579,10 +10583,6 @@ Extended error information:
<source>Save Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Test Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Name</source>
<translation type="unfinished"></translation>
@@ -10620,19 +10620,7 @@ Extended error information:
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>F1</source>
<source>&amp;Test Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10667,11 +10655,11 @@ Extended error information:
<translation type="unfinished"></translation>
</message>
<message>
<source>User name</source>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Password</source>
<source>&amp;User name</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -10707,10 +10695,6 @@ Extended error information:
<source>Save Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Test Connect</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;
@@ -10748,19 +10732,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>F1</source>
<source>&amp;Test Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -13009,22 +12981,6 @@ p, li { white-space: pre-wrap; }
<source>Unable to access relation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to access the %1 relation.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The error message from the database was:
%1.
SQL: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to determine table access privileges for the %1 relation.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No suitable key column in table</source>
<translation type="unfinished"></translation>
@@ -13177,6 +13133,20 @@ The view you selected has the following columns, none of which satisfy the above
%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to access the %1 relation.
The error message from the database was:
%2.
SQL: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to determine table access privileges for the %1 relation.
The error message from the database was:
%2.
SQL: %3</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QgsPostgresProvider::Conn</name>
@@ -13472,19 +13442,23 @@ Because of this the projection selector will not work...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>To access Quantum GIS environment from this python console use object from global scope which is an instance of QgisInterface class.&lt;br&gt;Usage e.g.: iface.zoomFull()</source>
<source>&gt;&gt;&gt;</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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; 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;To access Quantum GIS environment from this python console use qgis.utils.iface object which is an instance of QgisInterface class.&lt;br /&gt;Usage e.g.: qgis.utils.iface.zoomFull()&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&gt;&gt;&gt;</source>
<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;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans Serif&apos;; font-size:9pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
Loading

0 comments on commit d461f7b

Please sign in to comment.