Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-10-18 18:30:14 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost.localdomain> | 2012-10-18 19:06:44 (GMT) |
| commit | b0dcd6dd2465c3432427fc30b073b42ad3cf844e (patch) | |
| tree | 8da22d501c7dfc4d815527f802c1805ffae2e4fb /Swift/QtUI | |
| parent | 58d405a78bf82b9af63a48175ff0039f8cdd290c (diff) | |
| download | swift-b0dcd6dd2465c3432427fc30b073b42ad3cf844e.zip swift-b0dcd6dd2465c3432427fc30b073b42ad3cf844e.tar.bz2 | |
Translation updates.
Fixed some strings and dialog titles.
Updated Dutch translation.
Change-Id: Ia02e617a5dc8725a5bb0d6e0f8419449da0e746f
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtAffiliationEditor.ui | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtConnectionSettings.ui | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtHistoryWindow.ui | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtLoginWindow.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/SConscript | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Swift/QtUI/QtAffiliationEditor.ui b/Swift/QtUI/QtAffiliationEditor.ui index 1447884..0a9b7bf 100644 --- a/Swift/QtUI/QtAffiliationEditor.ui +++ b/Swift/QtUI/QtAffiliationEditor.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Dialog</string> + <string>Edit Affiliations</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index 314e36c..e345f73 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -660,7 +660,7 @@ std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) { buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + "</div>"; } else { - htmlString = "<div id='" + wb_id + "'>" + Qt::escape(contact_) + tr(" would like to start whiteboard chat") + ": <br/>" + + htmlString = "<div id='" + wb_id + "'>" + tr("%1 would like to start a whiteboard chat").arg(Qt::escape(contact_)) + ": <br/>" + buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) + buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) + "</div>"; diff --git a/Swift/QtUI/QtConnectionSettings.ui b/Swift/QtUI/QtConnectionSettings.ui index 4086cba..ee5061f 100644 --- a/Swift/QtUI/QtConnectionSettings.ui +++ b/Swift/QtUI/QtConnectionSettings.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Dialog</string> + <string>Connection Options</string> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> diff --git a/Swift/QtUI/QtHistoryWindow.ui b/Swift/QtUI/QtHistoryWindow.ui index 77d592f..71a4577 100644 --- a/Swift/QtUI/QtHistoryWindow.ui +++ b/Swift/QtUI/QtHistoryWindow.ui @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string>History</string> </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp index c8b40a4..52956bf 100644 --- a/Swift/QtUI/QtLoginWindow.cpp +++ b/Swift/QtUI/QtLoginWindow.cpp @@ -139,7 +139,7 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set layout->addWidget(loginButton_); QLabel* connectionOptionsLabel = new QLabel(this); - connectionOptionsLabel->setText("<a href=\"#\"><font size='-1'>Connection Options</font></a>"); + connectionOptionsLabel->setText("<a href=\"#\"><font size='-1'>" + QObject::tr("Connection Options") + "</font></a>"); connectionOptionsLabel->setTextFormat(Qt::RichText); connectionOptionsLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); layout->addWidget(connectionOptionsLabel); diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 392eed9..cb283bb 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -258,7 +258,7 @@ if ARGUMENTS.get("update_translations", False) : if ARGUMENTS.get("remove_obsolete_translations", False) : remove_obsolete_option = " -no-obsolete" for translation_source in filter(lambda x: not x.endswith("_en.ts"), translation_sources) : - t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent -no-ui-lines -codecfortr utf-8 -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")]) + t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent -codecfortr utf-8 -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")]) myenv.AlwaysBuild(t) # NSIS installation script |