Skip to content

Commit

Permalink
merge from trunk r11988:12000
Browse files Browse the repository at this point in the history 
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 d461f7b
Show file tree
Hide file tree
Showing 58 changed files with 16,923 additions and 14,995 deletions.
1 change: 1 addition & 0 deletions AUTHORS
View file
Expand Up @@ -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>
1 change: 0 additions & 1 deletion CONTRIBUTORS
View file
Expand Up @@ -38,4 +38,3 @@ Germán Carrillo
Milena Nowotarska
Anita Graser
Richard Duivenvoorde
Werner Macho
795 changes: 384 additions & 411 deletions i18n/qgis_ar.ts
View file

Large diffs are not rendered by default.

791 changes: 398 additions & 393 deletions i18n/qgis_cs_CZ.ts
View file

Large diffs are not rendered by default.

781 changes: 407 additions & 374 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

793 changes: 379 additions & 414 deletions i18n/qgis_el_GR.ts
View file

Large diffs are not rendered by default.

775 changes: 408 additions & 367 deletions i18n/qgis_es.ts
View file

Large diffs are not rendered by default.

7,124 changes: 4,351 additions & 2,773 deletions i18n/qgis_fr.ts
View file

Large diffs are not rendered by default.

793 changes: 379 additions & 414 deletions i18n/qgis_he.ts
View file

Large diffs are not rendered by default.

772 changes: 400 additions & 372 deletions i18n/qgis_hu.ts
View file

Large diffs are not rendered by default.

787 changes: 390 additions & 397 deletions i18n/qgis_id.ts
View file

Large diffs are not rendered by default.

775 changes: 408 additions & 367 deletions i18n/qgis_it.ts
View file

Large diffs are not rendered by default.

785 changes: 397 additions & 388 deletions i18n/qgis_ja.ts
View file

Large diffs are not rendered by default.

779 changes: 392 additions & 387 deletions i18n/qgis_ka_GE.ts
View file

Large diffs are not rendered by default.

777 changes: 393 additions & 384 deletions i18n/qgis_lo.ts
View file

Large diffs are not rendered by default.

799 changes: 382 additions & 417 deletions i18n/qgis_lt.ts
View file

Large diffs are not rendered by default.

775 changes: 406 additions & 369 deletions i18n/qgis_lv.ts
View file

Large diffs are not rendered by default.

787 changes: 396 additions & 391 deletions i18n/qgis_mn.ts
View file

Large diffs are not rendered by default.

775 changes: 408 additions & 367 deletions i18n/qgis_nl.ts
View file

Large diffs are not rendered by default.

884 changes: 473 additions & 411 deletions i18n/qgis_pl_PL.ts
View file

Large diffs are not rendered by default.

793 changes: 403 additions & 390 deletions i18n/qgis_pt_BR.ts
View file

Large diffs are not rendered by default.

795 changes: 398 additions & 397 deletions i18n/qgis_ro.ts
View file

Large diffs are not rendered by default.

785 changes: 405 additions & 380 deletions i18n/qgis_ru.ts
View file

Large diffs are not rendered by default.

787 changes: 400 additions & 387 deletions i18n/qgis_sk.ts
View file

Large diffs are not rendered by default.

787 changes: 398 additions & 389 deletions i18n/qgis_sq_AL.ts
View file

Large diffs are not rendered by default.

785 changes: 405 additions & 380 deletions i18n/qgis_sv.ts
View file

Large diffs are not rendered by default.

775 changes: 408 additions & 367 deletions i18n/qgis_th.ts
View file

Large diffs are not rendered by default.

787 changes: 398 additions & 389 deletions i18n/qgis_tr.ts
View file

Large diffs are not rendered by default.

769 changes: 385 additions & 384 deletions i18n/qgis_uk.ts
View file

Large diffs are not rendered by default.

76 changes: 55 additions & 21 deletions i18n/qgis_vi.ts
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
94 changes: 34 additions & 60 deletions i18n/qgis_xh.ts
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit d461f7b

Please sign in to comment.