feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Translation fixes in the ClearCase plugin.

Browse Source 
- Add translator's comments.
- Capitalize Dialog titles.
- Replace Qt Designer's generated rich text (hardcoded font)
  by simple HTML.
- Remove exclamation marks (do not shout at users).

Change-Id: I01623a336dfd7bdf24f7d5c0d3a2ed48454d8205
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-08-27 12:24:23 +02:00
committed by Tobias Hunger
parent c5745c6e78
commit cb87ce786b
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clearcase/checkoutdialog.ui
View File

@@ -91,7 +91,7 @@
<item> <item>
<widget class="QCheckBox" name="hijackedCheckBox"> <widget class="QCheckBox" name="hijackedCheckBox">
<property name="text"> <property name="text">
<string>Use &amp;Hijacked file</string> <string extracomment="Hijack: Unset read-only flag without check-out. This is used for local changes which the user does not want to commit.">Use &amp;Hijacked file</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>

8
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -710,7 +710,7 @@ void ClearCasePlugin::undoHijackCurrent()
Ui::UndoCheckOut unhijackUi; Ui::UndoCheckOut unhijackUi;
QDialog unhijackDlg; QDialog unhijackDlg;
unhijackUi.setupUi(&unhijackDlg); unhijackUi.setupUi(&unhijackDlg);
unhijackDlg.setWindowTitle(tr("Undo hijack file")); unhijackDlg.setWindowTitle(tr("Undo Hijack File"));
unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of '%1'?") unhijackUi.lblMessage->setText(tr("Do you want to undo hijack of '%1'?")
.arg(QDir::toNativeSeparators(fileName))); .arg(QDir::toNativeSeparators(fileName)));
if (unhijackDlg.exec() != QDialog::Accepted) if (unhijackDlg.exec() != QDialog::Accepted)
@@ -1185,7 +1185,7 @@ ClearCaseResponse
ClearCaseResponse response; ClearCaseResponse response;
if (executable.isEmpty()) { if (executable.isEmpty()) {
response.error = true; response.error = true;
response.message = tr("No ClearCase executable specified!"); response.message = tr("No ClearCase executable specified.");
return response; return response;
} }
@@ -1269,7 +1269,7 @@ bool ClearCasePlugin::vcsOpen(const QString &workingDir, const QString &fileName
(fi.isWritable() || s_statusMap[relFile].status == FileStatus::Unknown)) (fi.isWritable() || s_statusMap[relFile].status == FileStatus::Unknown))
QtConcurrent::run(&sync, topLevel, QStringList(relFile)).waitForFinished(); QtConcurrent::run(&sync, topLevel, QStringList(relFile)).waitForFinished();
if (s_statusMap[relFile].status == FileStatus::CheckedOut) { if (s_statusMap[relFile].status == FileStatus::CheckedOut) {
QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out!")); QMessageBox::information(0, tr("ClearCase Checkout"), tr("File is already checked out."));
return true; return true;
} }
bool isHijacked = (s_statusMap[relFile].status & FileStatus::Hijacked); bool isHijacked = (s_statusMap[relFile].status & FileStatus::Hijacked);
@@ -1492,7 +1492,7 @@ bool ClearCasePlugin::vcsAdd(const QString &workingDir, const QString &fileName)
bool ClearCasePlugin::vcsDelete(const QString &workingDir, const QString &fileName) bool ClearCasePlugin::vcsDelete(const QString &workingDir, const QString &fileName)
{ {
const QString title(tr("ClearCase Remove Element")); const QString title(tr("ClearCase Remove Element"));
if (QMessageBox::warning(0, title, tr("This operation is irreversible! Are you sure?"), if (QMessageBox::warning(0, title, tr("This operation is irreversible. Are you sure?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
return true; return true;

2
src/plugins/clearcase/settingspage.ui
View File

@@ -161,7 +161,7 @@
<item row="9" column="0"> <item row="9" column="0">
<widget class="QLabel" name="indexOnlyVOBsLabel"> <widget class="QLabel" name="indexOnlyVOBsLabel">
<property name="text"> <property name="text">
<string>&amp;Index only VOBs:</string> <string extracomment="VOB: Versioned Object Base">&amp;Index only VOBs:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>indexOnlyVOBsEdit</cstring> <cstring>indexOnlyVOBsEdit</cstring>

2
src/plugins/clearcase/undocheckout.ui
View File

@@ -63,7 +63,7 @@
</palette> </palette>
</property> </property>
<property name="text"> <property name="text">
<string>The file was changed!</string> <string>The file was changed.</string>
</property> </property>
</widget> </widget>
</item> </item>

3
src/plugins/clearcase/versionselector.cpp
View File

@@ -45,6 +45,9 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message
{ {
ui->setupUi(this); ui->setupUi(this);
ui->headerLabel->setText(ui->headerLabel->text().arg(fileName)); ui->headerLabel->setText(ui->headerLabel->text().arg(fileName));
ui->loadedText->setHtml(tr("<html><head/><body><p><b>NOTE: You will not be able to check in "
"this file without merging the changes (not supported by the "
"plugin)</b></p></body></html>"));
m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text); m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text);
QString line; QString line;
while (!m_stream->atEnd() && !line.contains(QLatin1String("1) Loaded version"))) while (!m_stream->atEnd() && !line.contains(QLatin1String("1) Loaded version")))

12
src/plugins/clearcase/versionselector.ui
View File

@@ -75,15 +75,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QTextEdit" name="loadedText"> <widget class="QTextEdit" name="loadedText"/>
<property name="html">
<string>&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:'MS Shell Dlg 2'; font-size:8.25pt; 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;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;NOTE: You will not be able to check in this file without merging the changes (not supported by the plugin)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@@ -113,7 +105,7 @@ p, li { white-space: pre-wrap; }
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="updatedCreatedOnHeaderLabel"> <widget class="QLabel" name="updatedCreatedOnHeaderLabel">
<property name="text"> <property name="text">
<string>Created On:</string> <string extracomment="Date">Created On:</string>
</property> </property>
</widget> </widget>
</item> </item>