Message info
 
To:kde-commits@kde.org From:Jekyll Wu Subject:[konsole] src: Krazy fix: add the missing KUIT context marker Date:Sun, 18 Mar 2012 15:57:56 +0100 (CET)
 

Git commit 663e342aa84f0dc4c2e67243f4a46ab31ed394bf by Jekyll Wu.
Committed on 18/03/2012 at 15:14.
Pushed by jekyllwu into branch 'master'.

Krazy fix: add the missing KUIT context marker

M +1 -1 src/ColorSchemeEditor.cpp
M +7 -7 src/MainWindow.cpp
M +2 -2 src/ViewContainer.cpp

http://commits.kde.org/konsole/663e342aa84f0dc4c2e67243f4a46ab31ed394bf

diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index 7ffa7b0..19b36cc 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -204,7 +204,7 @@ void ColorSchemeEditor::setupColorTable(const ColorScheme* colors)
QTableWidgetItem* colorItem = new QTableWidgetItem();
colorItem->setBackground(table[row].color);
colorItem->setFlags(colorItem->flags() & ~Qt::ItemIsEditable & ~Qt::ItemIsSelectable);
- colorItem->setToolTip(i18n("Click to choose different color"));
+ colorItem->setToolTip(i18nc("@info:tooltip", "Click to choose color"));

_ui->colorTable->setItem(row, 0, nameItem);
_ui->colorTable->setItem(row, 1, colorItem);
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 10c2d86..7b0cab5 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -274,7 +274,7 @@ void MainWindow::setupActions()
KAction* menuAction = 0;

// File Menu
- _newTabMenuAction = new KActionMenu(KIcon("tab-new"), i18n("&New Tab"), collection);
+ _newTabMenuAction = new KActionMenu(KIcon("tab-new"), i18nc("@action:inmenu", "&New Tab"), collection);
_newTabMenuAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T));
_newTabMenuAction->setShortcutConfigurable(true);
_newTabMenuAction->setAutoRepeat(false);
@@ -283,26 +283,26 @@ void MainWindow::setupActions()

menuAction = collection->addAction("clone-tab");
menuAction->setIcon( KIcon("tab-duplicate") );
- menuAction->setText( i18n("&Clone Tab") );
+ menuAction->setText( i18nc("@action:inmenu", "&Clone Tab") );
menuAction->setShortcut( QKeySequence() );
menuAction->setAutoRepeat( false );
connect(menuAction, SIGNAL(triggered()), this, SLOT(cloneTab()));

menuAction = collection->addAction("new-window");
menuAction->setIcon(KIcon("window-new"));
- menuAction->setText(i18n("New &Window"));
+ menuAction->setText(i18nc("@action:inmenu", "New &Window"));
menuAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N));
menuAction->setAutoRepeat(false);
connect(menuAction, SIGNAL(triggered()), this, SLOT(newWindow()));

menuAction = collection->addAction("close-window");
menuAction->setIcon(KIcon("window-close"));
- menuAction->setText(i18n("Close Window"));
+ menuAction->setText(i18nc("@action:inmenu", "Close Window"));
menuAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Q));
connect(menuAction, SIGNAL(triggered()), this, SLOT(close()));

// Bookmark Menu
- KActionMenu* bookmarkMenu = new KActionMenu(i18n("&Bookmarks") , collection);
+ KActionMenu* bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks") , collection);
_bookmarkHandler = new BookmarkHandler(collection , bookmarkMenu->menu() , true , this);
collection->addAction("bookmark" , bookmarkMenu);
connect(_bookmarkHandler , SIGNAL(openUrls(QList<KUrl>)) , this , SLOT(openUrls(QList<KUrl>)));
@@ -320,7 +320,7 @@ void MainWindow::setupActions()
KStandardAction::preferences(this, SLOT(showSettingsDialog()), collection);

menuAction = collection->addAction("manage-profiles");
- menuAction->setText(i18n("Manage Profiles..."));
+ menuAction->setText(i18nc("@action:inmenu", "Manage Profiles..."));
menuAction->setIcon(KIcon("configure"));
connect(menuAction, SIGNAL(triggered()), this, SLOT(showManageProfilesDialog()));

@@ -521,7 +521,7 @@ bool MainWindow::queryClose()
"Do you still want to quit?",
"There are %1 tabs open in this window. "
"Do you still want to quit?", openTabs),
- i18n("Confirm Close"),
+ i18nc("@title", "Confirm Close"),
KStandardGuiItem::quit(),
KGuiItem(i18n("Close Current Tab"), "tab-close"),
KStandardGuiItem::cancel(),
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index a6ee43d..293b21c 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -458,12 +458,12 @@ TabbedViewContainer::TabbedViewContainer(NavigationPosition position , QObject*
// The 'new tab' and 'close tab' button
_newTabButton = new QToolButton(_containerWidget);
_newTabButton->setIcon(KIcon("tab-new"));
- _newTabButton->setToolTip(i18n("Open a new tab"));
+ _newTabButton->setToolTip(i18nc("@info:tooltip", "Create new tab"));
_newTabButton->adjustSize();

_closeTabButton = new QToolButton(_containerWidget);
_closeTabButton->setIcon(KIcon("tab-close"));
- _closeTabButton->setToolTip(i18n("Close the current tab"));
+ _closeTabButton->setToolTip(i18nc("@info:tooltip", "Close current tab"));
_closeTabButton->adjustSize();

// 'new tab' button is initially hidden. It will be shown when setFeatures()