&results, QString totalMetric, QString d
setAxisTitle(yLeft, QString(tr("Total %1")).arg(tm->name()));
if (m->units(context->athlete->useMetricUnits) != "")
- setAxisTitle(xBottom, QString(tr("%1 of Activity (%2)")).arg(m->name()).arg(xunits));
+ setAxisTitle(xBottom, QString(tr("%1 of Ride (%2)")).arg(m->name()).arg(xunits));
else
- setAxisTitle(xBottom, QString(tr("%1 of Activity")).arg(m->name()));
+ setAxisTitle(xBottom, QString(tr("%1 of Ride")).arg(m->name()));
}
void
diff --git a/src/RideFile.cpp b/src/RideFile.cpp
index fd89470e4..fb817363b 100644
--- a/src/RideFile.cpp
+++ b/src/RideFile.cpp
@@ -922,7 +922,7 @@ RideFile::parseRideFileName(const QString &name, QDateTime *dt)
QTime time(rx.cap(5).toInt(), rx.cap(6).toInt(),rx.cap(7).toInt());
if ((! date.isValid()) || (! time.isValid())) {
QMessageBox::warning(NULL,
- tr("Invalid Activity File Name"),
+ tr("Invalid Ride File Name"),
tr("Invalid date/time in filename:\n%1\nSkipping file...").arg(name)
);
return false;
diff --git a/src/RideMetadata.cpp b/src/RideMetadata.cpp
index 537d5b37e..11ff9ab80 100644
--- a/src/RideMetadata.cpp
+++ b/src/RideMetadata.cpp
@@ -119,7 +119,7 @@ RideMetadata::warnDateTime(QDateTime datetime)
QString conflict = context->athlete->home.absolutePath() + "/" + targetnosuffix + "." + suffix;
if (QFile(conflict).exists() && QFileInfo(conflict).fileName() != rideItem()->fileName) {
- QMessageBox::warning(this, "Date/Time Entry", "An activity already exists with that date/time, if you do not change it then you will overwrite and lose existing data");
+ QMessageBox::warning(this, "Date/Time Entry", "A ride already exists with that date/time, if you do not change it then you will overwrite and lose existing data");
return; // only warn on the first conflict!
}
}
diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp
index fb2b3e3a1..09abd00e5 100644
--- a/src/RideSummaryWindow.cpp
+++ b/src/RideSummaryWindow.cpp
@@ -769,13 +769,13 @@ RideSummaryWindow::htmlSummary() const
// "n of x activities" shown in header of list when filtered
summary += ("" +
QString("%1 of %2").arg(activities).arg(data.count())
- + (data.count() == 1 ? tr(" activity") : tr(" activities")) +
+ + (data.count() == 1 ? tr(" ride") : tr(" rides")) +
"
");
} else {
// just "n activities" shown in header of list when not filtered
summary += ("
" +
- QString("%1").arg(activities) + (activities == 1 ? tr(" activity") : tr(" activities")) +
+ QString("%1").arg(activities) + (activities == 1 ? tr(" ride") : tr(" rides")) +
"
");
}
diff --git a/src/SplitActivityWizard.cpp b/src/SplitActivityWizard.cpp
index ff6efa200..4fe6dc73f 100644
--- a/src/SplitActivityWizard.cpp
+++ b/src/SplitActivityWizard.cpp
@@ -24,7 +24,7 @@
// Minimum gap in recording to find a natural break to split
static const double defaultMinimumGap = 1; // 1 minute
-// Minimum size of segment to identify as a new activity
+// Minimum size of segment to identify as a new ride
static const double defaultMinimumSegmentSize = 5; // 5 minutes
// Main wizard
@@ -42,7 +42,7 @@ SplitActivityWizard::SplitActivityWizard(Context *context) : QWizard(context->ma
setMinimumWidth(600);
// title
- setWindowTitle(tr("Split Activity"));
+ setWindowTitle(tr("Split Ride"));
// set ride - unconst since we will wipe it away eventually
rideItem = const_cast(context->currentRideItem());
@@ -154,7 +154,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector)
// we have a candidate
segments.append(RideFileInterval(segmentStart, segmentEnd,
- QString(tr("Activity Segment #%1")).arg(++counter)));
+ QString(tr("Ride Segment #%1")).arg(++counter)));
}
segmentEnd = segmentStart = p->secs;
@@ -173,7 +173,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector)
// we have a candidate
segments.append(RideFileInterval(segmentStart, segmentEnd,
- QString(tr("Activity Segment #%1")).arg(++counter)));
+ QString(tr("Ride Segment #%1")).arg(++counter)));
}
@@ -186,21 +186,21 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector)
double lastsecs = rideItem->ride()->dataPoints().first()->secs;
int gapnum = 0;
- foreach(RideFileInterval activity, segments) {
- if (activity.start > lastsecs) {
+ foreach(RideFileInterval ride, segments) {
+ if (ride.start > lastsecs) {
// we have a gap
gapnum++;
// add to gap list
RideFileInterval *gap = new RideFileInterval(lastsecs,
- activity.start,
+ ride.start,
QString(tr("Gap in recording #%1")).arg(gapnum));
gaps.append(gap);
// add to interval list
segments.append(RideFileInterval(*gap));
}
- lastsecs = activity.stop;
+ lastsecs = ride.stop;
}
if (lastsecs < rideItem->ride()->dataPoints().last()->secs) {
// gap at the end
@@ -220,7 +220,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector)
// so we can mark the start and stop for splitting
segments.insert(0, RideFileInterval(rideItem->ride()->dataPoints().first()->secs,
rideItem->ride()->dataPoints().last()->secs,
- tr("Entire Activity")));
+ tr("Entire Ride")));
// now fold in the ride intervals
segments.append(rideItem->ride()->intervals());
@@ -241,7 +241,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector)
// we set these intervals as checked by default
bool checkit = (interval.name.startsWith(tr("Gap in recording")) ||
- interval.name == tr("Entire Activity"));
+ interval.name == tr("Entire Ride"));
// disable checkbox editing (i.e. mandatory split) at gaps in recording
// we have turned this off from user requests, may reinstate or choose
@@ -445,22 +445,22 @@ SplitActivityWizard::conflicts(QDateTime datetime)
// welcome
SplitWelcome::SplitWelcome(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent)
{
- setTitle(tr("Split Activity"));
+ setTitle(tr("Split Ride"));
setSubTitle(tr("Lets get started"));
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
- QLabel *label = new QLabel(tr("This wizard will help you split the current activity "
- "into multiple activities\n\n"
+ QLabel *label = new QLabel(tr("This wizard will help you split the current ride "
+ "into multiple rides\n\n"
"The wizard will identify segments of uninterrupted "
- "activity and allow you to select which ones to "
- "save as new activities. You will also be able to "
+ "ride and allow you to select which ones to "
+ "save as new rides. You will also be able to "
"select any currently defined intervals too.\n\n"
- "If the newly created activity clashes with an existing "
- "activity (same date and time) then the wizard will adjust "
+ "If the newly created ride clashes with an existing "
+ "ride (same date and time) then the wizard will adjust "
"the start time by one or more seconds to avoid losing or "
- "overwriting any existing activities."));
+ "overwriting any existing rides."));
label->setWordWrap(true);
layout->addWidget(label);
@@ -471,20 +471,20 @@ SplitWelcome::SplitWelcome(SplitActivityWizard *parent) : QWizardPage(parent), w
SplitKeep::SplitKeep(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent)
{
setTitle(tr("Keep original"));
- setSubTitle(tr("Do you want to keep the original activity?"));
+ setSubTitle(tr("Do you want to keep the original ride?"));
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
- QLabel *label = new QLabel(tr("If you want to keep the current activity then you "
+ QLabel *label = new QLabel(tr("If you want to keep the current ride then you "
"should ensure you have clicked on the \"Keep original "
- "activity\" check box below.\n\n"
- "If you do not choose to keep the original activity "
+ "ride\" check box below.\n\n"
+ "If you do not choose to keep the original ride "
"it will be backed up before removing it from the "
- "activity history.\n\n"));
+ "ride history.\n\n"));
label->setWordWrap(true);
- keepOriginal = new QCheckBox(tr("Keep original activity"), this);
+ keepOriginal = new QCheckBox(tr("Keep original ride"), this);
keepOriginal->setChecked(wizard->keepOriginal);
warning = new QLabel(this);
@@ -512,7 +512,7 @@ SplitParameters::SplitParameters(SplitActivityWizard *parent) : QWizardPage(pare
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
- QLabel *label = new QLabel(tr("This wizard will find segments of activity to save "
+ QLabel *label = new QLabel(tr("This wizard will find segments of ride to save "
"by looking for gaps in recording. \n\n"
"You can define the minimum length, in time, a gap "
"in recording should be in order to mark the end of "
@@ -583,7 +583,7 @@ SplitKeep::setWarning()
SplitSelect::SplitSelect(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent)
{
setTitle(tr("Select Split Markers"));
- setSubTitle(tr("Activity will be split between marker points selected"));
+ setSubTitle(tr("Ride will be split between marker points selected"));
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
@@ -658,7 +658,7 @@ SplitSelect::refreshMarkers()
SplitConfirm::SplitConfirm(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent)
{
setTitle(tr("Confirm"));
- setSubTitle(tr("Split Activity cannot be undone"));
+ setSubTitle(tr("Split ride cannot be undone"));
setCommitPage(true);
setButtonText(QWizard::CommitButton, tr("Confirm"));
@@ -686,7 +686,7 @@ SplitConfirm::initializePage()
foreach(long mark, wizard->marks) points.append(mark); // marks are indexes to ensure absolute accuracy
qSort(points.begin(), points.end());
- // Create a new activity for each marked segment
+ // Create a new ride for each marked segment
long lastmark = -1;
foreach(long mark, points) {
@@ -812,7 +812,7 @@ SplitConfirm::validatePage()
current->setText(5, tr("Removed"));
}
- // whizz through and create each new activity
+ // whizz through and create each new ride
int off = wizard->keepOriginal ? 0 : 1; // skip first line to remove or not?
for(int i=0; iactivities.count(); i++) {
@@ -830,7 +830,7 @@ SplitConfirm::validatePage()
// now make this page the last (so we can see what was done)
setTitle(tr("Completed"));
- setSubTitle(tr("Split Activity Completed"));
+ setSubTitle(tr("Split Ride Completed"));
wizard->done = true;