diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-20 08:24:26 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-20 08:24:26 (GMT) |
commit | 3bcbfcfa466890469f3053a3c5987bc2cf85317b (patch) | |
tree | b574a671232994da94acf78ebed6e89a84c82cfc /translations/qt_zh_CN.ts | |
parent | c3937c516b98edffa4792bccde3aa18926082e44 (diff) | |
download | Qt-3bcbfcfa466890469f3053a3c5987bc2cf85317b.zip Qt-3bcbfcfa466890469f3053a3c5987bc2cf85317b.tar.gz Qt-3bcbfcfa466890469f3053a3c5987bc2cf85317b.tar.bz2 |
BT: Update text of About Qt dialog
Add Copyright message as requested by Legal, and update .ts files again.
Reviewed-by: Trust Me
Diffstat (limited to 'translations/qt_zh_CN.ts')
-rw-r--r-- | translations/qt_zh_CN.ts | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts index 061919d..b0a7947 100644 --- a/translations/qt_zh_CN.ts +++ b/translations/qt_zh_CN.ts @@ -1202,7 +1202,7 @@ to <context> <name>QDialogButtonBox</name> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1865"/> + <location filename="../src/gui/dialogs/qmessagebox.cpp" line="+1866"/> <location line="+464"/> <location filename="../src/gui/widgets/qdialogbuttonbox.cpp" line="+561"/> <source>OK</source> @@ -3044,7 +3044,7 @@ Do you want to delete it anyway?</source> <context> <name>QMessageBox</name> <message> - <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1110"/> + <location filename="../src/gui/dialogs/qmessagebox.cpp" line="-1111"/> <source>Help</source> <translation>帮助</translation> </message> @@ -3057,12 +3057,7 @@ Do you want to delete it anyway?</source> <translation>确定</translation> </message> <message> - <location line="+475"/> - <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+33"/> + <location line="+509"/> <source>About Qt</source> <translation>关于Qt</translation> </message> @@ -3071,7 +3066,7 @@ Do you want to delete it anyway?</source> <translation type="obsolete"><p>这个程序使用的是Qt %1版。</p></translation> </message> <message> - <location line="-1604"/> + <location line="-1605"/> <source>Show Details...</source> <translation>显示细节……</translation> </message> @@ -3081,6 +3076,11 @@ Do you want to delete it anyway?</source> <translation>隐藏细节……</translation> </message> <message> + <location line="+1570"/> + <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://www.qtsoftware.com/products/licensing">www.qtsoftware.com/products/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a href="http://www.qtsoftware.com/qt/">www.qtsoftware.com/qt</a> for more information.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a> for more information.</p></source> <translation type="obsolete"><h3>关于Qt</h3>%1<p>Qt是一个用于跨平台应用程序开发的C++工具包。</p><p>对于MS&nbsp;Windows、Mac&nbsp;OS&nbsp;X、Linux和所有主流商业Unix,Qt提供了单一源程序的可移植性。Qt也有用于嵌入式Linux和Windows CE的版本。</p><p>Qt是Nokia的产品。有关更多信息,请参考<a href="http://qtsoftware.com/qt/">qtsoftware.com/qt/</a>。</p></translation> </message> |