diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-18 08:55:12 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-18 08:55:12 (GMT) |
commit | 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 (patch) | |
tree | bd512c46f6672a9b359e98b8dd62956072929623 /translations/linguist_untranslated.ts | |
parent | e018b82432055d9a5f13be7c17e31502830b9fa7 (diff) | |
download | Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.zip Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.tar.gz Qt-5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96.tar.bz2 |
Fix the About Qt dialog text to be truthful, post-LGPL
Update the text of the About Qt dialog, as directed by Legal. Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations. This change includes updated .ts files
to correct the source strings, but no updated translations.
This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.
Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.
Diffstat (limited to 'translations/linguist_untranslated.ts')
-rw-r--r-- | translations/linguist_untranslated.ts | 150 |
1 files changed, 74 insertions, 76 deletions
diff --git a/translations/linguist_untranslated.ts b/translations/linguist_untranslated.ts index 5690378..ae3ff20 100644 --- a/translations/linguist_untranslated.ts +++ b/translations/linguist_untranslated.ts @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0"> +<!DOCTYPE TS> +<TS version="2.0"> <context> <name></name> <message> - <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+29"/> + <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="+59"/> <source>(New Entry)</source> <translation type="unfinished"></translation> </message> @@ -11,7 +12,7 @@ <context> <name>AboutDialog</name> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1318"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="+1357"/> <source>Qt Linguist</source> <translation type="unfinished"></translation> </message> @@ -19,7 +20,7 @@ <context> <name>BatchTranslationDialog</name> <message> - <location filename="../tools/linguist/linguist/batchtranslationdialog.cpp" line="+49"/> + <location filename="../tools/linguist/linguist/batchtranslationdialog.cpp" line="+79"/> <source>Batch Translation of '%1' - Qt Linguist</source> <translation type="unfinished"></translation> </message> @@ -109,7 +110,7 @@ <context> <name>DataModel</name> <message> - <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+184"/> + <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+214"/> <source><qt>Duplicate messages found in '%1':</source> <translation type="unfinished"></translation> </message> @@ -129,15 +130,26 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+121"/> + <location line="+70"/> + <source>Linguist does not know the plural rules for '%1'. +Will assume a single universal form.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+56"/> <source>Cannot create '%2': %1</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+56"/> + <source>Universal Form</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ErrorsView</name> <message> - <location filename="../tools/linguist/linguist/errorsview.cpp" line="+46"/> + <location filename="../tools/linguist/linguist/errorsview.cpp" line="+76"/> <source>Accelerator possibly superfluous in translation.</source> <translation type="unfinished"></translation> </message> @@ -274,7 +286,7 @@ <context> <name>LRelease</name> <message numerus="yes"> - <location filename="../tools/linguist/shared/qm.cpp" line="+653"/> + <location filename="../tools/linguist/shared/qm.cpp" line="+715"/> <source> Generated %n translation(s) (%1 finished and %2 unfinished) </source> <translation type="unfinished"> @@ -572,11 +584,6 @@ </message> <message> <location/> - <source>Ctrl+L</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>P&rev</source> <translation type="unfinished"></translation> </message> @@ -592,11 +599,6 @@ </message> <message> <location/> - <source>Ctrl+Shift+L</source> - <translation type="unfinished"></translation> - </message> - <message> - <location/> <source>&Done and Next</source> <translation type="unfinished"></translation> </message> @@ -743,13 +745,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1965"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-2004"/> <source></source> <comment>This is the application's main window.</comment> <translation></translation> </message> <message> - <location line="+165"/> + <location line="+195"/> <source>Source text</source> <translation type="unfinished"></translation> </message> @@ -802,39 +804,39 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+124"/> + <location line="+125"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> + <location line="+32"/> <location line="+22"/> - <location line="+20"/> <source>Loading File - Qt Linguist</source> <translation type="unfinished"></translation> </message> <message> - <location line="-19"/> + <location line="-21"/> <source>The file '%1' does not seem to be related to the currently open file(s) '%2'. Close the open file(s) first?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <location line="+22"/> <source>The file '%1' does not seem to be related to the file '%2' which is being loaded as well. Skip loading the first named file?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+49"/> + <location line="+61"/> <source>%n translation unit(s) loaded.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location line="+92"/> + <location line="+93"/> <source>Related files (%1);;</source> <translation type="unfinished"></translation> </message> @@ -844,20 +846,20 @@ Skip loading the first named file?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <location line="+30"/> + <location line="+10"/> + <location line="+31"/> <source>File saved.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+14"/> - <location line="+1184"/> + <location line="+15"/> + <location line="+1164"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>Release</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1183"/> + <location line="-1163"/> <source>Qt message files for released applications (*.qm) All files (*)</source> <translation type="unfinished"></translation> @@ -920,7 +922,7 @@ All files (*)</source> <message> <location line="+17"/> <location line="+278"/> - <location line="+60"/> + <location line="+40"/> <location line="+24"/> <location line="+22"/> <location line="+516"/> @@ -932,7 +934,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1224"/> + <location line="-1204"/> <location line="+102"/> <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> @@ -1027,27 +1029,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source> Open Source Edition</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>This version of Qt Linguist is part of the Qt Open Source Edition, for use in the development of Open Source applications. Qt is a comprehensive C++ framework for cross-platform application development.<br/><br/>You need a commercial Qt license for development of proprietary (closed source) applications. Please see <tt>http://qtsoftware.com/company/model.html</tt> for an overview of Qt licensing.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>This program is licensed to you under the terms of the Qt %1 License Agreement. For details, see the license file that came with this software distribution.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> + <location line="+6"/> <source><center><img src=":/images/splash.png"/></img><p>%1</p></center><p>Qt Linguist is a tool for adding translations to Qt applications.</p><p>%2</p><p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p></source> <translation type="unfinished"></translation> </message> @@ -1230,7 +1212,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+312"/> + <location line="+314"/> <source>All</source> <translation type="unfinished"></translation> </message> @@ -1410,7 +1392,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-524"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-526"/> <location filename="../tools/linguist/linguist/mainwindow.ui"/> <source>&Batch Translation...</source> <translation type="unfinished"></translation> @@ -1431,11 +1413,21 @@ All files (*)</source> <source>Ctrl+T</source> <translation type="unfinished"></translation> </message> + <message> + <location/> + <source>Ctrl+J</source> + <translation type="unfinished"></translation> + </message> + <message> + <location/> + <source>Ctrl+Shift+J</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageEditor</name> <message> - <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+42"/> + <location filename="../tools/linguist/linguist/messageeditor.cpp" line="+72"/> <source>German</source> <translation type="unfinished"></translation> </message> @@ -1529,7 +1521,7 @@ Line: %2</source> <context> <name>MessageModel</name> <message> - <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+861"/> + <location filename="../tools/linguist/linguist/messagemodel.cpp" line="+832"/> <source>Completion status for %1</source> <translation type="unfinished"></translation> </message> @@ -1552,7 +1544,7 @@ Line: %2</source> <context> <name>MsgEdit</name> <message> - <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-547"/> + <location filename="../tools/linguist/linguist/messageeditor.cpp" line="-577"/> <source></source> <comment>This is the right panel of the main window.</comment> <translation></translation> @@ -1661,7 +1653,7 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="-114"/> + <location filename="../tools/linguist/linguist/phrasebookbox.cpp" line="-144"/> <source></source> <comment>Go to Phrase > Edit Phrase Book... The dialog that pops up is a PhraseBookBox.</comment> <translation></translation> @@ -1670,7 +1662,7 @@ Line: %2</source> <context> <name>PhraseModel</name> <message> - <location filename="../tools/linguist/linguist/phrasemodel.cpp" line="+87"/> + <location filename="../tools/linguist/linguist/phrasemodel.cpp" line="+117"/> <source>Source phrase</source> <translation type="unfinished"></translation> </message> @@ -1688,7 +1680,7 @@ Line: %2</source> <context> <name>PhraseView</name> <message> - <location filename="../tools/linguist/linguist/phraseview.cpp" line="+91"/> + <location filename="../tools/linguist/linguist/phraseview.cpp" line="+121"/> <source>Insert</source> <translation type="unfinished"></translation> </message> @@ -1716,7 +1708,7 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1296"/> + <location filename="../tools/linguist/linguist/mainwindow.cpp" line="-1279"/> <source>Translation files (%1);;</source> <translation type="unfinished"></translation> </message> @@ -1726,37 +1718,38 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1086"/> + <location filename="../tools/linguist/linguist/messagemodel.cpp" line="-1118"/> <location line="+18"/> - <location line="+101"/> + <location line="+67"/> + <location line="+39"/> <location line="+17"/> <location line="+15"/> - <location filename="../tools/linguist/linguist/phrase.cpp" line="+166"/> + <location filename="../tools/linguist/linguist/phrase.cpp" line="+196"/> <source>Qt Linguist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/cpp.cpp" line="+1039"/> + <location filename="../tools/linguist/shared/cpp.cpp" line="+1072"/> <source>C++ source files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/java.cpp" line="+624"/> + <location filename="../tools/linguist/shared/java.cpp" line="+646"/> <source>Java source files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/po.cpp" line="+584"/> + <location filename="../tools/linguist/shared/po.cpp" line="+651"/> <source>GNU Gettext localization files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/qscript.cpp" line="+2369"/> + <location filename="../tools/linguist/shared/qscript.cpp" line="+2399"/> <source>Qt Script source files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/ts.cpp" line="+617"/> + <location filename="../tools/linguist/shared/ts.cpp" line="+752"/> <source>Qt translation sources (format 1.1)</source> <translation type="unfinished"></translation> </message> @@ -1767,11 +1760,11 @@ Line: %2</source> </message> <message> <location line="+9"/> - <source>Qt translation sources</source> + <source>Qt translation sources (latest format)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/ui.cpp" line="+171"/> + <location filename="../tools/linguist/shared/ui.cpp" line="+213"/> <source>Qt Designer form files</source> <translation type="unfinished"></translation> </message> @@ -1781,15 +1774,20 @@ Line: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../tools/linguist/shared/xliff.cpp" line="+778"/> + <location filename="../tools/linguist/shared/xliff.cpp" line="+817"/> <source>XLIFF localization files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../tools/linguist/shared/qph.cpp" line="+192"/> + <source>Qt Linguist 'Phrase Book'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SourceCodeView</name> <message> - <location filename="../tools/linguist/linguist/sourcecodeview.cpp" line="+40"/> + <location filename="../tools/linguist/linguist/sourcecodeview.cpp" line="+70"/> <source><i>Source code not available</i></source> <translation type="unfinished"></translation> </message> @@ -1932,7 +1930,7 @@ Line: %2</source> <context> <name>TranslationSettingsDialog</name> <message> - <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+38"/> + <location filename="../tools/linguist/linguist/translationsettingsdialog.cpp" line="+68"/> <source>Any Country</source> <translation type="unfinished"></translation> </message> |