8 changes: 4 additions & 4 deletions src/libkstapp/histogramtab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>662</width>
<height>229</height>
<width>660</width>
<height>227</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -114,7 +114,7 @@
<string>The lower limit of the lowest bin. Values below this limit will not be counted in any bin.</string>
</property>
<property name="text">
<string>-10.0</string>
<string notr="true">-10.0</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -149,7 +149,7 @@
<string>The upper limit of the highest bin. Values above this limit will not be counted in any bin.</string>
</property>
<property name="text">
<string>10.0</string>
<string notr="true">10.0</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/imagetab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
</color>
</property>
<property name="si" stdset="0">
<string>image contour color</string>
<string notr="true">image contour color</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/labelcreator.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label bold</string>
<string notr="true">label bold</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -136,7 +136,7 @@
<string comment="The color of the object">Color</string>
</property>
<property name="si" stdset="0">
<string>label color</string>
<string notr="true">label color</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -178,7 +178,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label italic</string>
<string notr="true">label italic</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/labeldimensionstab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<cstring>_rotation</cstring>
</property>
<property name="si" stdset="0">
<string>geo X</string>
<string notr="true">geo X</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -110,7 +110,7 @@
<cstring>_x</cstring>
</property>
<property name="si" stdset="0">
<string>pos X</string>
<string notr="true">pos X</string>
</property>
</widget>
</item>
Expand All @@ -129,7 +129,7 @@
<cstring>_y</cstring>
</property>
<property name="si" stdset="0">
<string>pos Y</string>
<string notr="true">pos Y</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/labelitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace Kst {
LabelItem::LabelItem(View *parent, const QString& txt)
: ViewItem(parent), _labelRc(0), _dirty(true), _text(txt), _height(0), _resized(false),
_dataRelativeDimValid(false), _fixleft(false), _serialOfLastChange(0) {
setTypeName("Label");
setTypeName(tr("Label", "a label in a plot"));
setFixedSize(true);
setLockAspectRatio(true);
setAllowedGripModes(Move | Resize | Rotate /*| Scale*/);
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/labelpropertiestab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label italic</string>
<string notr="true">label italic</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="Kst::ColorButton" name="_labelColor">
<property name="si" stdset="0">
<string>label color</string>
<string notr="true">label color</string>
</property>
</widget>
</item>
Expand All @@ -96,7 +96,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label bold</string>
<string notr="true">label bold</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/labeltab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label bold</string>
<string notr="true">label bold</string>
</property>
</widget>
</item>
Expand All @@ -81,14 +81,14 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>label italic</string>
<string notr="true">label italic</string>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="Kst::ColorButton" name="_globalLabelColor">
<property name="si" stdset="0">
<string>label color</string>
<string notr="true">label color</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/layoutboxitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LayoutBoxItem::LayoutBoxItem(View *parent)
: ViewItem(parent) {
setAllowsLayout(false);

setTypeName("Layout Box");
setTypeName(tr("Layout Box", "a box for laying out other items"));
storePen(Qt::NoPen);
setBrush(Qt::NoBrush);
setAllowedGripModes(Move);
Expand Down
8 changes: 4 additions & 4 deletions src/libkstapp/layouttab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<cstring>_horMargin</cstring>
</property>
<property name="si" stdset="0">
<string>layout horizontal margin</string>
<string notr="true">layout horizontal margin</string>
</property>
</widget>
</item>
Expand All @@ -51,7 +51,7 @@
<cstring>_verMargin</cstring>
</property>
<property name="si" stdset="0">
<string>layout vertical margin</string>
<string notr="true">layout vertical margin</string>
</property>
</widget>
</item>
Expand All @@ -77,7 +77,7 @@
<cstring>_horSpacing</cstring>
</property>
<property name="si" stdset="0">
<string>layout horizontal spacing</string>
<string notr="true">layout horizontal spacing</string>
</property>
</widget>
</item>
Expand All @@ -103,7 +103,7 @@
<cstring>_verSpacing</cstring>
</property>
<property name="si" stdset="0">
<string>layout vertical spacing</string>
<string notr="true">layout vertical spacing</string>
</property>
</widget>
</item>
Expand Down
8 changes: 4 additions & 4 deletions src/libkstapp/legenditem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Kst {

LegendItem::LegendItem(PlotItem *parentPlot)
: ViewItem(parentPlot->view()), _plotItem(parentPlot), _auto(true), _verticalDisplay(true) {
setTypeName("Legend");
setTypeName(tr("Legend", "a legend in a plot"));

_initializeShortName();

Expand Down Expand Up @@ -127,17 +127,17 @@ void LegendItem::paint(QPainter *painter) {
QString y_label = label_info.name;
if (!sameYUnits) {
if (!label_info.units.isEmpty()) {
y_label = tr("%1 \\[%2\\]").arg(y_label).arg(label_info.units);
y_label = tr("%1 \\[%2\\]", "axis labels. %1 is quantity, %2 is units. eg Time [s]. '[' must be escaped.").arg(y_label).arg(label_info.units);
}
}
if (!y_label.isEmpty()) {
LabelInfo xlabel_info = relation->xLabelInfo();
if (!sameX) {
label = tr("%1 vs %2").arg(y_label).arg(xlabel_info.name);
label = tr("%1 vs %2", "describes a plot. %1 is X axis. %2 is Y axis").arg(y_label).arg(xlabel_info.name);
} else if (xlabel_info.quantity.isEmpty()) {
label = y_label;
} else if (xlabel_info.quantity != xlabel_info.name) {
label = tr("%1 vs %2").arg(y_label).arg(xlabel_info.name);
label = tr("%1 vs %2", "describes a plot. %1 is X axis. %2 is Y axis").arg(y_label).arg(xlabel_info.name);
} else {
label = y_label;
}
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/legendtab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>legend bold</string>
<string notr="true">legend bold</string>
</property>
</widget>
</item>
Expand All @@ -291,14 +291,14 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>legend italic</string>
<string notr="true">legend italic</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="Kst::ColorButton" name="_labelColor">
<property name="si" stdset="0">
<string>legend color</string>
<string notr="true">legend color</string>
</property>
</widget>
</item>
Expand Down
8 changes: 4 additions & 4 deletions src/libkstapp/linedimensionstab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<cstring>_p1X</cstring>
</property>
<property name="si" stdset="0">
<string>pos X</string>
<string notr="true">pos X</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -60,7 +60,7 @@
<cstring>_p2X</cstring>
</property>
<property name="si" stdset="0">
<string>geo X</string>
<string notr="true">geo X</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -112,7 +112,7 @@
<cstring>_p2Y</cstring>
</property>
<property name="si" stdset="0">
<string>geo Y</string>
<string notr="true">geo Y</string>
</property>
</widget>
</item>
Expand All @@ -131,7 +131,7 @@
<cstring>_p1Y</cstring>
</property>
<property name="si" stdset="0">
<string>pos Y</string>
<string notr="true">pos Y</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/lineedititem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace Kst {

LineEditItem::LineEditItem(View *parent) : ViewItem(parent), _lineEdit(new QLineEdit),_proxy(new QGraphicsProxyWidget(this)) {
setTypeName("LineEdit");
setTypeName(tr("LineEdit", "scripting interface for editing lines"));
setBrush(Qt::white);
applyDialogDefaultsStroke();
applyDialogDefaultsFill();
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/lineitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Kst {
LineItem::LineItem(View *parent)
: ViewItem(parent), _lineEditDialog(0) {
_created = false;
setTypeName("Line");
setTypeName(tr("Line", "a line in a picture"));
setAllowedGrips(RightMidGrip | LeftMidGrip);
setAllowedGripModes(Resize);
setAllowsLayout(false);
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/logwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void LogWidget::logAdded(const Debug::LogMessage& msg) {
return;
}

append(tr("%1<b>%2</b> %3").arg(sym).arg(msg.date.toString()).arg(msg.msg));
append(QString("%1<b>%2</b> %3").arg(sym).arg(msg.date.toString()).arg(msg.msg));
}


Expand Down
12 changes: 6 additions & 6 deletions src/libkstapp/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void MainWindow::open() {
QAction* MainWindow::createRecentFileAction(const QString& filename, int idx, const QString& name, const char* openslot)
{
QAction* action = new QAction(this);
QString text = tr("&%1 %2").arg(idx).arg(name);
QString text = tr("&%1 %2", "Part of a list. %1 is an index. %2 is a file name").arg(idx).arg(name);
action->setText(text);
action->setData(filename);
action->setStatusTip(filename);
Expand Down Expand Up @@ -961,13 +961,13 @@ void MainWindow::createActions() {
// ***************************** File actions ******************************** //
_openAct = new QAction(tr("&Open..."), this);
_openAct->setStatusTip(tr("Open a new session"));
_openAct->setShortcut(tr("Ctrl+O"));
_openAct->setShortcut(tr("Ctrl+O", "Shortcut for Open"));
_openAct->setIcon(QPixmap(":document-open.png"));
connect(_openAct, SIGNAL(triggered()), this, SLOT(open()));

_saveAct = new QAction(tr("&Save"), this);
_saveAct->setStatusTip(tr("Save the current session"));
_saveAct->setShortcut(tr("Ctrl+S"));
_saveAct->setShortcut(tr("Ctrl+S", "Shortcut for Save"));
_saveAct->setIcon(QPixmap(":document-save.png"));
connect(_saveAct, SIGNAL(triggered()), this, SLOT(save()));

Expand Down Expand Up @@ -1020,17 +1020,17 @@ void MainWindow::createActions() {
connect(_closeTabAct, SIGNAL(triggered()), tabWidget(), SLOT(closeCurrentView()));

_exitAct = new QAction(tr("E&xit"), this);
_exitAct->setShortcut(tr("Ctrl+Q"));
_exitAct->setShortcut(tr("Ctrl+Q", "Shortcut for Quit"));
_exitAct->setStatusTip(tr("Exit the application"));
_exitAct->setIcon(QPixmap(":application-exit.png"));
connect(_exitAct, SIGNAL(triggered()), this, SLOT(close()));

// ************************** Edit Actions ******************************* //
_undoAct = _undoGroup->createUndoAction(this);
_undoAct->setShortcut(tr("Ctrl+Z"));
_undoAct->setShortcut(tr("Ctrl+Z", "Shortcut for undo"));
_undoAct->setIcon(QPixmap(":edit-undo.png"));
_redoAct = _undoGroup->createRedoAction(this);
_redoAct->setShortcut(tr("Ctrl+Shift+Z"));
_redoAct->setShortcut(tr("Ctrl+Shift+Z", "Shortcut for redo"));
_redoAct->setIcon(QPixmap(":edit-redo.png"));

// ********************* View Actions ********************************** //
Expand Down
12 changes: 6 additions & 6 deletions src/libkstapp/markerstab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ MarkersTab::MarkersTab(QWidget *parent)
setupUi(this);
setTabTitle(tr("Markers"));

_markerLineStyle->addItem("SolidLine", (int)Qt::SolidLine);
_markerLineStyle->addItem("DashLine", (int)Qt::DashLine);
_markerLineStyle->addItem("DotLine", (int)Qt::DotLine);
_markerLineStyle->addItem("DashDotLine", (int)Qt::DashDotLine);
_markerLineStyle->addItem("DashDotDotLine", (int)Qt::DashDotDotLine);
_markerLineStyle->addItem("CustomDashLine", (int)Qt::CustomDashLine);
_markerLineStyle->addItem(tr("Solid Line", "Pen type"), (int)Qt::SolidLine);
_markerLineStyle->addItem(tr("Dash Line", "Pen type"), (int)Qt::DashLine);
_markerLineStyle->addItem(tr("Dot Line", "Pen type"), (int)Qt::DotLine);
_markerLineStyle->addItem(tr("Dash Dot Line", "Pen type"), (int)Qt::DashDotLine);
_markerLineStyle->addItem(tr("Dash Dot Dot Line", "Pen type"), (int)Qt::DashDotDotLine);
_markerLineStyle->addItem(tr("Custom Dash Line", "Pen type"), (int)Qt::CustomDashLine);

connect(_curveMarkers, SIGNAL(stateChanged(int)), this, SLOT(update()));
connect(_vectorMarkers, SIGNAL(stateChanged(int)), this, SLOT(update()));
Expand Down
8 changes: 4 additions & 4 deletions src/libkstapp/markerstab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>611</width>
<height>551</height>
<width>609</width>
<height>549</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
Expand Down Expand Up @@ -195,7 +195,7 @@
<item row="0" column="3">
<widget class="Kst::ColorButton" name="_markerLineColor">
<property name="si" stdset="0">
<string>marker color</string>
<string notr="true">marker color</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -243,7 +243,7 @@
</size>
</property>
<property name="text">
<string>SHOULD NOT BE VISIBLE</string>
<string notr="true">SHOULD NOT BE VISIBLE</string>
</property>
</widget>
</item>
Expand Down
28 changes: 16 additions & 12 deletions src/libkstapp/matrixtab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>514</width>
<height>621</height>
<width>512</width>
<height>619</height>
</rect>
</property>
<layout class="QGridLayout">
Expand Down Expand Up @@ -87,7 +87,7 @@
</size>
</property>
<property name="text">
<string>0</string>
<string notr="true">0</string>
</property>
</widget>
</item>
Expand All @@ -106,7 +106,7 @@
</size>
</property>
<property name="text">
<string>1</string>
<string notr="true">1</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -170,7 +170,7 @@
</size>
</property>
<property name="text">
<string>0</string>
<string notr="true">0</string>
</property>
</widget>
</item>
Expand All @@ -189,7 +189,7 @@
</size>
</property>
<property name="text">
<string>1</string>
<string notr="true">1</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -286,7 +286,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="_gradientZAtMin"/>
<widget class="QLineEdit" name="_gradientZAtMin">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel6_2">
Expand Down Expand Up @@ -343,7 +347,7 @@
<item row="0" column="3">
<widget class="QLineEdit" name="_gradientZAtMax">
<property name="text">
<string>100</string>
<string notr="true">100</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -487,7 +491,7 @@
<string>C&amp;ount from end</string>
</property>
<property name="si" stdset="0">
<string>count X From End</string>
<string notr="true">count X From End</string>
</property>
</widget>
</item>
Expand All @@ -506,7 +510,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>read x to end</string>
<string notr="true">read x to end</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -563,7 +567,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>read Y To End</string>
<string notr="true">read Y To End</string>
</property>
</widget>
</item>
Expand All @@ -579,7 +583,7 @@
<string>Count from en&amp;d</string>
</property>
<property name="si" stdset="0">
<string>count Y From End</string>
<string notr="true">count Y From End</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/overridelabeltab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>override label italic</string>
<string notr="true">override label italic</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -135,7 +135,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>override label bold</string>
<string notr="true">override label bold</string>
</property>
</widget>
</item>
Expand All @@ -155,7 +155,7 @@
<bool>false</bool>
</property>
<property name="si" stdset="0">
<string>override label color</string>
<string notr="true">override label color</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/pictureitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PictureItem::PictureItem(View *parent, const QImage &image)
if (!image.isNull()) {
_image = QPixmap::fromImage(image);
}
setTypeName("Picture");
setTypeName(tr("Picture", "a picture or an image"));
setLockAspectRatio(true);
//setLockAspectRatioFixed(true);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/plotitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ PlotItem::PlotItem(View *parent)
_plotPixmapDirty(true),
_i_per(0)
{
setTypeName("Plot");
setTypeName(tr("Plot", "a plot of data"));
_initializeShortName();

setBrush(Qt::white);
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/plotrenderitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ QString PlotRenderItem::topLabel() const {
} else if ((!label_info.name.isEmpty()) && (!label_info.quantity.isEmpty())) {
LabelInfo xlabel_info = relationList().at(0)->xLabelInfo();
if ((!xlabel_info.name.isEmpty()) && (!xlabel_info.quantity.isEmpty())) {
label = tr("%1 vs %2").arg(label_info.name).arg(xlabel_info.name);
label = tr("%1 vs %2", "describes a plot. %1 is X axis. %2 is Y axis").arg(label_info.name).arg(xlabel_info.name);
} else {
label = label_info.name;
}
Expand Down
4 changes: 2 additions & 2 deletions src/libkstapp/scalartab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<cstring>_field</cstring>
</property>
<property name="si" stdset="0">
<string>Data Source Field</string>
<string notr="true">Data Source Field</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -122,7 +122,7 @@
<cstring>_fieldRV</cstring>
</property>
<property name="si" stdset="0">
<string>data vector field</string>
<string notr="true">data vector field</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/sharedaxisboxitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ SharedAxisBoxItem::SharedAxisBoxItem(View *parent)
_xAxisZoomMode(PlotAxis::Auto),
_yAxisZoomMode(PlotAxis::Auto),
_sharedIsDirty(false) {
setTypeName("Shared Axis Box");
setTypeName(tr("Shared Axis Box", "plots inside a shared axis box share the same axis"));
setBrush(Qt::transparent);

_breakAction = new QAction(tr("Break Shared Axis Box"), this);
Expand Down
64 changes: 32 additions & 32 deletions src/libkstapp/stroketab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,38 @@ StrokeTab::StrokeTab(QWidget *parent)
setupUi(this);
setTabTitle(tr("Stroke"));

_style->addItem("NoPen", (int)Qt::NoPen);
_style->addItem("SolidLine", (int)Qt::SolidLine);
_style->addItem("DashLine", (int)Qt::DashLine);
_style->addItem("DotLine", (int)Qt::DotLine);
_style->addItem("DashDotLine", (int)Qt::DashDotLine);
_style->addItem("DashDotDotLine", (int)Qt::DashDotDotLine);
_style->addItem("CustomDashLine", (int)Qt::CustomDashLine);

_brushStyle->addItem("NoBrush", (int)Qt::NoBrush);
_brushStyle->addItem("SolidPattern", (int)Qt::SolidPattern);
_brushStyle->addItem("Dense1Pattern", (int)Qt::Dense1Pattern);
_brushStyle->addItem("Dense2Pattern", (int)Qt::Dense2Pattern);
_brushStyle->addItem("Dense3Pattern", (int)Qt::Dense3Pattern);
_brushStyle->addItem("Dense4Pattern", (int)Qt::Dense4Pattern);
_brushStyle->addItem("Dense5Pattern", (int)Qt::Dense5Pattern);
_brushStyle->addItem("Dense6Pattern", (int)Qt::Dense6Pattern);
_brushStyle->addItem("Dense7Pattern", (int)Qt::Dense7Pattern);
_brushStyle->addItem("HorPattern", (int)Qt::HorPattern);
_brushStyle->addItem("VerPattern", (int)Qt::VerPattern);
_brushStyle->addItem("CrossPattern", (int)Qt::CrossPattern);
_brushStyle->addItem("BDiagPattern", (int)Qt::BDiagPattern);
_brushStyle->addItem("FDiagPattern", (int)Qt::FDiagPattern);
_brushStyle->addItem("DiagCrossPattern", (int)Qt::DiagCrossPattern);

_joinStyle->addItem("MiterJoin", Qt::MiterJoin);
_joinStyle->addItem("BevelJoin", Qt::BevelJoin);
_joinStyle->addItem("RoundJoin", Qt::RoundJoin);
_joinStyle->addItem("SvgMiterJoin", Qt::SvgMiterJoin);

_capStyle->addItem("FlatCap", Qt::FlatCap);
_capStyle->addItem("SquareCap", Qt::SquareCap);
_capStyle->addItem("RoundCap", Qt::RoundCap);
_style->addItem(tr("No Pen", "Pen type"), (int)Qt::NoPen);
_style->addItem(tr("Solid Line", "Pen type"), (int)Qt::SolidLine);
_style->addItem(tr("Dash Line", "Pen type"), (int)Qt::DashLine);
_style->addItem(tr("Dot Line", "Pen type"), (int)Qt::DotLine);
_style->addItem(tr("Dash Dot Line", "Pen type"), (int)Qt::DashDotLine);
_style->addItem(tr("Dash Dot Dot Line", "Pen type"), (int)Qt::DashDotDotLine);
_style->addItem(tr("Custom Dash Line", "Pen type"), (int)Qt::CustomDashLine);

_brushStyle->addItem(tr("No Brush", "Brush type"), (int)Qt::NoBrush);
_brushStyle->addItem(tr("Solid Pattern", "Brush type"), (int)Qt::SolidPattern);
_brushStyle->addItem(tr("Dense Pattern 1", "Brush type"), (int)Qt::Dense1Pattern);
_brushStyle->addItem(tr("Dense Pattern 2", "Brush type"), (int)Qt::Dense2Pattern);
_brushStyle->addItem(tr("Dense Pattern 3", "Brush type"), (int)Qt::Dense3Pattern);
_brushStyle->addItem(tr("Dense Pattern 4", "Brush type"), (int)Qt::Dense4Pattern);
_brushStyle->addItem(tr("Dense Pattern 5", "Brush type"), (int)Qt::Dense5Pattern);
_brushStyle->addItem(tr("Dense Pattern 6", "Brush type"), (int)Qt::Dense6Pattern);
_brushStyle->addItem(tr("Dense Pattern 7", "Brush type"), (int)Qt::Dense7Pattern);
_brushStyle->addItem(tr("Horizontal Pattern", "Brush type"), (int)Qt::HorPattern);
_brushStyle->addItem(tr("Vertical Pattern", "Brush type"), (int)Qt::VerPattern);
_brushStyle->addItem(tr("Cross Pattern", "Brush type"), (int)Qt::CrossPattern);
_brushStyle->addItem(tr("Diagonal Pattern 1", "Brush type"), (int)Qt::BDiagPattern);
_brushStyle->addItem(tr("Diagonal Pattern 2", "Brush type"), (int)Qt::FDiagPattern);
_brushStyle->addItem(tr("Diagonal Cross Pattern", "Brush type"), (int)Qt::DiagCrossPattern);

_joinStyle->addItem(tr("Miter Join", "line join style"), Qt::MiterJoin);
_joinStyle->addItem(tr("Bevel Join", "line join style"), Qt::BevelJoin);
_joinStyle->addItem(tr("Round Join", "line join style"), Qt::RoundJoin);
_joinStyle->addItem(tr("SVG Miter Join", "line join style based on SVG files"), Qt::SvgMiterJoin);

_capStyle->addItem(tr("Flat Cap", "line cap style"), Qt::FlatCap);
_capStyle->addItem(tr("Square Cap", "line cap style"), Qt::SquareCap);
_capStyle->addItem(tr("Round Cap", "line cap style"), Qt::RoundCap);

connect(_style, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
connect(_width, SIGNAL(valueChanged(double)), this, SIGNAL(modified()));
Expand Down
12 changes: 6 additions & 6 deletions src/libkstapp/stroketab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<cstring>_style</cstring>
</property>
<property name="si" stdset="0">
<string>stroke style</string>
<string notr="true">stroke style</string>
</property>
</widget>
</item>
Expand All @@ -49,7 +49,7 @@
<cstring>_width</cstring>
</property>
<property name="si" stdset="0">
<string>stroke width</string>
<string notr="true">stroke width</string>
</property>
</widget>
</item>
Expand All @@ -72,7 +72,7 @@
<item row="2" column="1">
<widget class="Kst::ColorButton" name="_brushColor">
<property name="si" stdset="0">
<string>stroke brush color</string>
<string notr="true">stroke brush color</string>
</property>
</widget>
</item>
Expand All @@ -88,7 +88,7 @@
<cstring>_brushStyle</cstring>
</property>
<property name="si" stdset="0">
<string>stroke brush style</string>
<string notr="true">stroke brush style</string>
</property>
</widget>
</item>
Expand All @@ -107,7 +107,7 @@
<cstring>_joinStyle</cstring>
</property>
<property name="si" stdset="0">
<string>stroke join style</string>
<string notr="true">stroke join style</string>
</property>
</widget>
</item>
Expand All @@ -126,7 +126,7 @@
<cstring>_capStyle</cstring>
</property>
<property name="si" stdset="0">
<string>stroke cap style</string>
<string notr="true">stroke cap style</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstapp/svgitem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ SvgItem::SvgItem(View *parent, const QString &file)
} else {
_svg = new QSvgRenderer();
}
setTypeName("Svg");
setTypeName(tr("Svg", "an svg picture"));
setLockAspectRatio(true);
//setLockAspectRatioFixed(true);
}
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/themedialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>theme italic</string>
<string notr="true">theme italic</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="Kst::ColorButton" name="_labelColor">
<property name="si" stdset="0">
<string>theme color</string>
<string notr="true">theme color</string>
</property>
</widget>
</item>
Expand All @@ -129,7 +129,7 @@
<bool>true</bool>
</property>
<property name="si" stdset="0">
<string>theme bold</string>
<string notr="true">theme bold</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/libkstapp/vectordialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ VectorTab::VectorTab(ObjectStore *store, QWidget *parent)
siHack->hide();
siHack->setBuddy(_updateBox);
siHack->setText("update type");
_updateBox->addItem("Time interval");
_updateBox->addItem("Change detection");
_updateBox->addItem("Don't update");
_updateBox->addItem(tr("Time Interval", "update periodically"));
_updateBox->addItem(tr("Change Detection", "update when a change is detected"));
_updateBox->addItem(tr("No Update", "do not update the file"));
updateUpdateBox();
connect(_updateBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTypeActivated(int)));
connect(_updateBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(modified()));
Expand Down
20 changes: 10 additions & 10 deletions src/libkstapp/vectortab.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>741</width>
<height>548</height>
<width>739</width>
<height>546</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
Expand Down Expand Up @@ -103,7 +103,7 @@
<string>The minimum value of the independent variable.</string>
</property>
<property name="text">
<string>-10.0</string>
<string notr="true">-10.0</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -132,7 +132,7 @@
<string>The maximum value of the independent variable.</string>
</property>
<property name="text">
<string>10.0</string>
<string notr="true">10.0</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -276,7 +276,7 @@
</size>
</property>
<property name="si" stdset="0">
<string>updateInterval</string>
<string notr="true">updateInterval</string>
</property>
</widget>
</item>
Expand All @@ -299,11 +299,6 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>Kst::DataRange</class>
<extends>QWidget</extends>
<header>datarange.h</header>
</customwidget>
<customwidget>
<class>Kst::ComboBox</class>
<extends>QComboBox</extends>
Expand All @@ -314,6 +309,11 @@
<extends>QWidget</extends>
<header>datasourceselector.h</header>
</customwidget>
<customwidget>
<class>Kst::DataRange</class>
<extends>QWidget</extends>
<header>datarange.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>_generatedVectorGroup</tabstop>
Expand Down
2 changes: 1 addition & 1 deletion src/libkstmath/curve.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ LabelInfo Curve::titleInfo() const {


QString Curve::propertyString() const {
return tr("%1 vs %2").arg(yVector()->Name()).arg(xVector()->Name());
return tr("%1 vs %2", "a plot of arg1 vs arg2").arg(yVector()->Name()).arg(xVector()->Name());
}


Expand Down
21 changes: 7 additions & 14 deletions src/libkstmath/plotdefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,10 @@ struct AxisDisplay {
const AxisInterpretation AxisInterpretations[] = {
{ QT_TRANSLATE_NOOP("AxisTab", "Julian Year"), AXIS_INTERP_YEAR },
{ QT_TRANSLATE_NOOP("AxisTab", "Standard C time"), AXIS_INTERP_CTIME },
//{ QT_TRANSLATE_NOOP3("AxisTab", "JD", "Julian Date"), AXIS_INTERP_JD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "MJD", "Modified Julian Date"), AXIS_INTERP_MJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "RJD", "Reduced Julian Date"), AXIS_INTERP_RJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "TAI", "Temps Atomique International"), AXIS_INTERP_AIT },
{ QT_TRANSLATE_NOOP("AxisTab", "JD"), AXIS_INTERP_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "MJD"), AXIS_INTERP_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "RJD"), AXIS_INTERP_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "TAI"), AXIS_INTERP_AIT },
{ QT_TRANSLATE_NOOP("AxisTab", "Julian Date"), AXIS_INTERP_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "Modified Julian Date"), AXIS_INTERP_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "Reduced Julian Date"), AXIS_INTERP_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "International Atomic Time (TAI)"), AXIS_INTERP_AIT },
{ QT_TRANSLATE_NOOP("AxisTab", "Excel time (Windows)"), AXIS_INTERP_EXCEL }
};

Expand All @@ -70,12 +66,9 @@ const AxisDisplay AxisDisplays[] = {
{ QT_TRANSLATE_NOOP("AxisTab", "DD/MM/YYYY HH:MM:SS.SS"), AXIS_DISPLAY_DDMMYYHHMMSS_SS },
{ QT_TRANSLATE_NOOP("AxisTab", "<Qt Text Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS },
{ QT_TRANSLATE_NOOP("AxisTab", "<Qt Local Date> HH:MM:SS.SS"), AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS },
//{ QT_TRANSLATE_NOOP3("AxisTab", "JD", "Julian Date"), AXIS_DISPLAY_JD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "MJD", "Modified Julian Date"), AXIS_DISPLAY_MJD },
//{ QT_TRANSLATE_NOOP3("AxisTab", "RJD", "Reduced Julian Date"), AXIS_DISPLAY_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "JD"), AXIS_DISPLAY_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "MJD"), AXIS_DISPLAY_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "RJD"), AXIS_DISPLAY_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "Julian Date"), AXIS_DISPLAY_JD },
{ QT_TRANSLATE_NOOP("AxisTab", "Modified Julian Date"), AXIS_DISPLAY_MJD },
{ QT_TRANSLATE_NOOP("AxisTab", "Reduced Julian Date"), AXIS_DISPLAY_RJD },
{ QT_TRANSLATE_NOOP("AxisTab", "Formatted String"), AXIS_DISPLAY_QTDATETIME_FORMAT }
};

Expand Down
6 changes: 3 additions & 3 deletions src/plugins/dataobject/effectivebandwidth/effectivebandwidthconfig.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>430</width>
<height>107</height>
<width>428</width>
<height>109</height>
</rect>
</property>
<property name="minimumSize">
Expand Down Expand Up @@ -125,7 +125,7 @@
</sizepolicy>
</property>
<property name="text">
<string>K</string>
<string comment="Abbreviation for Kelvin (unit)">K</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dataobject/shift/shift.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ QString ShiftSource::_automaticDescriptiveName() const {
QString ShiftSource::descriptionTip() const {
QString tip;

tip = tr("Shift: %1\n dX: %2\n").arg(Name()).arg(scalar()->value());
tip = tr("Shift: %1\n dX: %2\n", "Phase shift. dX is the amount of the shift").arg(Name()).arg(scalar()->value());

tip += tr("\nInput: %1").arg(vector()->descriptionTip());
return tip;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/filters/unwind/filterunwind.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ QString FilterUnwindSource::_automaticDescriptiveName() const {
QString FilterUnwindSource::descriptionTip() const {
QString tip;

tip = tr("Unwind Filter: %1\n %2 - %3\n Step: %4 %").arg(Name()).arg(minimumScalar()->value()).arg(maximumScalar()->value()).arg(stepScalar()->value());
tip = tr("Unwind Filter: %1\n %2 - %3\n Step: %4 %", "%2 - %3 specifies a numerical range").arg(Name()).arg(minimumScalar()->value()).arg(maximumScalar()->value()).arg(stepScalar()->value());

tip += tr("\nInput: %1").arg(vector()->descriptionTip());
return tip;
Expand Down
6 changes: 3 additions & 3 deletions src/widgets/curveappearance.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<string>If &quot;Show Lines&quot; is checked, the selected line style.</string>
</property>
<property name="si" stdset="0">
<string>line style</string>
<string notr="true">line style</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -206,7 +206,7 @@
</sizepolicy>
</property>
<property name="si" stdset="0">
<string>curve bar fill</string>
<string notr="true">curve bar fill</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -294,7 +294,7 @@
</sizepolicy>
</property>
<property name="si" stdset="0">
<string>curve head color</string>
<string notr="true">curve head color</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/curveplacement.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<bool>false</bool>
</property>
<property name="si" stdset="0">
<string>place In Existing Plot</string>
<string notr="true">place In Existing Plot</string>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/datarange.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<item row="0" column="3">
<widget class="QComboBox" name="_startUnits">
<property name="si" stdset="0">
<string>start units</string>
<string notr="true">start units</string>
</property>
</widget>
</item>
Expand All @@ -233,7 +233,7 @@
<bool>false</bool>
</property>
<property name="si" stdset="0">
<string>range units</string>
<string notr="true">range units</string>
</property>
</widget>
</item>
Expand Down
10 changes: 5 additions & 5 deletions src/widgets/fftoptions.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>741</width>
<height>198</height>
<width>739</width>
<height>196</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
Expand Down Expand Up @@ -263,7 +263,7 @@
<string>The sample rate at which the measurements were acquired, for proper normalization.</string>
</property>
<property name="text">
<string>60.0</string>
<string notr="true">60.0</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -298,7 +298,7 @@
<string>The units of the Data Vector - for automatic labels.</string>
</property>
<property name="text">
<string>V</string>
<string comment="Abbreviation for Volts">V</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -330,7 +330,7 @@
<string>The units for the sample rate. Used for automatic labels.</string>
</property>
<property name="text">
<string>Hz</string>
<string comment="Abbreviation for Hertz (unit)">Hz</string>
</property>
</widget>
</item>
Expand Down