Commit e334b5ce authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

git: add more UI context marker for strings, fix some style

GIT_SILENT
parent cbecbd37
......@@ -14,7 +14,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Configure Name and Email for Git</string>
<string comment="@title:window">Configure Name and Email for Git</string>
</property>
<layout class="QVBoxLayout" name="_2">
<item>
......@@ -32,7 +32,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Name:</string>
<string comment="@label:textbox">&amp;Name:</string>
</property>
<property name="buddy">
<cstring>nameEdit</cstring>
......@@ -45,7 +45,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Emai&amp;l:</string>
<string comment="@label:textbox">Emai&amp;l:</string>
</property>
<property name="buddy">
<cstring>emailEdit</cstring>
......@@ -75,7 +75,7 @@
<item>
<widget class="QCheckBox" name="globalCheckBox">
<property name="text">
<string>Write to global config</string>
<string comment="@option:check">Write to global config</string>
</property>
</widget>
</item>
......
......@@ -233,11 +233,11 @@ void GitPlugin::additionalMenuEntries(QMenu* menu, const QList<QUrl>& urls)
QDir dir=urlDir(urls);
bool hasSt = hasStashes(dir);
menu->addAction(i18n("Rebase"), this, SLOT(ctxRebase()));
menu->addSeparator()->setText(i18n("Git Stashes"));
menu->addAction(i18n("Stash Manager"), this, SLOT(ctxStashManager()))->setEnabled(hasSt);
menu->addAction(i18n("Push Stash"), this, SLOT(ctxPushStash()));
menu->addAction(i18n("Pop Stash"), this, SLOT(ctxPopStash()))->setEnabled(hasSt);
menu->addAction(i18nc("@action:inmenu", "Rebase"), this, SLOT(ctxRebase()));
menu->addSeparator()->setText(i18nc("@title:menu", "Git Stashes"));
menu->addAction(i18nc("@action:inmenu", "Stash Manager"), this, SLOT(ctxStashManager()))->setEnabled(hasSt);
menu->addAction(i18nc("@action:inmenu", "Push Stash"), this, SLOT(ctxPushStash()));
menu->addAction(i18nc("@action:inmenu", "Pop Stash"), this, SLOT(ctxPopStash()))->setEnabled(hasSt);
}
void GitPlugin::ctxRebase()
......
......@@ -36,7 +36,7 @@ using namespace KDevelop;
RebaseDialog::RebaseDialog(GitPlugin* plugin, const QUrl &repository, QWidget* parent)
: QDialog(parent), m_plugin(plugin), m_repository(repository)
{
setWindowTitle(i18n("Branch selection"));
setWindowTitle(i18nc("@title:window", "Branch Selection"));
m_ui = new Ui::RebaseDialog();
m_ui->setupUi(this);
......
......@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Rebase</string>
<string comment="@title:window">Rebase</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Base branch:</string>
<string comment="@label:listbox">Base branch:</string>
</property>
<property name="buddy">
<cstring>branches</cstring>
......@@ -37,7 +37,7 @@
<item row="0" column="2">
<widget class="QPushButton" name="rebaseButton">
<property name="text">
<string>Rebase</string>
<string comment="@action:button">Rebase</string>
</property>
</widget>
</item>
......@@ -57,7 +57,7 @@
<item row="2" column="2">
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Cancel</string>
<string comment="@action:button">Cancel</string>
</property>
</widget>
</item>
......
......@@ -39,7 +39,7 @@ using namespace KDevelop;
StashManagerDialog::StashManagerDialog(const QDir& stashed, GitPlugin* plugin, QWidget* parent)
: QDialog(parent), m_plugin(plugin), m_dir(stashed)
{
setWindowTitle(i18n("Stash Manager"));
setWindowTitle(i18nc("@title:window", "Stash Manager"));
m_mainWidget = new QWidget(this);
m_ui = new Ui::StashManager;
......@@ -119,7 +119,7 @@ void StashManagerDialog::dropClicked()
void StashManagerDialog::branchClicked()
{
QString branchName = QInputDialog::getText(this, i18n("KDevelop - Git Stash"), i18n("Select a name for the new branch:"));
QString branchName = QInputDialog::getText(this, i18nc("@title:window", "Git Stash"), i18nc("@label:textbox", "Name for the new branch:"));
if(!branchName.isEmpty())
runStash(QStringList{QStringLiteral("branch"), branchName, selection()});
......
......@@ -13,31 +13,31 @@
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="1">
<widget class="QPushButton" name="apply">
<property name="whatsThis">
<string>Applies stash's patch</string>
<property name="toolTip">
<string comment="@info:tooltip">Apply stash's patch</string>
</property>
<property name="text">
<string>Apply</string>
<string comment="@action:button">Apply</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pop">
<property name="whatsThis">
<string>Applies stash's patch and drops the stash</string>
<property name="toolTip">
<string comment="@info:tooltip">Apply stash's patch and drop the stash</string>
</property>
<property name="text">
<string>Pop</string>
<string comment="@action:button">Pop</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="branch">
<property name="whatsThis">
<string>Creates a new branch and applies the stash there, then it drops the stash.</string>
<property name="toolTip">
<string comment="@info:tooltip">Create a new branch and apply the stash there, then drop the stash</string>
</property>
<property name="text">
<string>Branch</string>
<string comment="@action:button">Branch</string>
</property>
</widget>
</item>
......@@ -56,21 +56,21 @@
</item>
<item row="5" column="1">
<widget class="QPushButton" name="drop">
<property name="whatsThis">
<string>Removes the selected branch</string>
<property name="toolTip">
<string comment="@info:tooltip">Remove the selected branch</string>
</property>
<property name="text">
<string>Drop</string>
<string comment="@action:button">Drop</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="show">
<property name="whatsThis">
<string>Show the contents of the stash</string>
<property name="toolTip">
<string comment="@info:tooltip">Show the content of the stash</string>
</property>
<property name="text">
<string>Show</string>
<string comment="@action:button">Show</string>
</property>
</widget>
</item>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment