From fb994fa5e76803c0953f2efec200ca4993451fb9 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Fri, 30 Jan 2015 10:59:56 +0000 Subject: [PATCH] Rename Ride to Activity .. across the code, except where it clearly is a ride e.g. importing PowerTap or SRM --- src/AboutDialog.cpp | 2 +- src/AddIntervalDialog.cpp | 4 +-- src/Aerolab.cpp | 2 +- src/AnalysisSidebar.cpp | 16 ++++++------ src/BasicRideMetrics.cpp | 4 +-- src/BatchExportDialog.cpp | 4 +-- src/BestIntervalDialog.cpp | 2 +- src/BlankState.cpp | 4 +-- src/CPPlot.cpp | 10 ++++---- src/Colors.cpp | 10 ++++---- src/ConfigDialog.cpp | 2 +- src/CriticalPowerWindow.cpp | 8 +++--- src/DownloadRideDialog.cpp | 14 +++++----- src/FixMoxy.cpp | 2 +- src/GcScopeBar.cpp | 4 +-- src/GcUpgrade.cpp | 8 +++--- src/GcWindowRegistry.cpp | 2 +- src/GenerateHeatMapDialog.cpp | 4 +-- src/HistogramWindow.cpp | 4 +-- src/JouleDevice.cpp | 10 ++++---- src/KmlRideFile.cpp | 2 +- src/LTMPopup.cpp | 10 ++++---- src/MainWindow.cpp | 44 ++++++++++++++++---------------- src/ManualRideDialog.cpp | 6 ++--- src/ManualRideFile.cpp | 2 +- src/MergeActivityWizard.cpp | 4 +-- src/MoxyDevice.cpp | 4 +-- src/Pages.cpp | 4 +-- src/PowerHist.cpp | 4 +-- src/PowerTapDevice.cpp | 4 +-- src/RideFile.cpp | 2 +- src/RideImportWizard.cpp | 4 +-- src/RideMetadata.cpp | 2 +- src/Route.cpp | 8 +++--- src/SaveDialogs.cpp | 2 +- src/ScatterWindow.cpp | 6 ++--- src/ShareDialog.cpp | 30 +++++++++++----------- src/SplitActivityWizard.cpp | 48 +++++++++++++++++------------------ src/TPDownloadDialog.cpp | 6 ++--- src/TPUploadDialog.cpp | 2 +- src/TabView.cpp | 2 +- src/TreeMapWindow.cpp | 2 +- src/TwitterDialog.cpp | 4 +-- src/Views.cpp | 2 +- src/WorkoutWizard.cpp | 8 +++--- 45 files changed, 164 insertions(+), 164 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 694ab177f..a3d906bbc 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -70,7 +70,7 @@ AboutPage::AboutPage(Context *context) : context(context) "

Source code can be obtained from
" "" "http://goldencheetah.org/." - "

Ride files and other data are stored in
" + "

Activity files and other data are stored in
" "%2" "

Trademarks used with permission
" "TSS, NP, IF courtesy of " diff --git a/src/AddIntervalDialog.cpp b/src/AddIntervalDialog.cpp index cfbb49a41..a37eb3927 100644 --- a/src/AddIntervalDialog.cpp +++ b/src/AddIntervalDialog.cpp @@ -241,7 +241,7 @@ AddIntervalDialog::AddIntervalDialog(Context *context) : QHBoxLayout *buttonLayout = new QHBoxLayout; buttonLayout->addStretch(); - addButton = new QPushButton(tr("&Add to Ride")); + addButton = new QPushButton(tr("&Add to Activity")); buttonLayout->addWidget(addButton); buttonLayout->addStretch(); mainLayout->addLayout(buttonLayout); @@ -422,7 +422,7 @@ AddIntervalDialog::createClicked() { const RideFile *ride = context->ride ? context->ride->ride() : NULL; if (!ride) { - QMessageBox::critical(this, tr("Select Ride"), tr("No ride selected!")); + QMessageBox::critical(this, tr("Select Activity"), tr("No activity selected!")); return; } diff --git a/src/Aerolab.cpp b/src/Aerolab.cpp index a01f55252..947561d15 100644 --- a/src/Aerolab.cpp +++ b/src/Aerolab.cpp @@ -907,7 +907,7 @@ QString Aerolab::estimateCdACrr(RideItem *rideItem) errMsg = tr("Altitude and Power data must be present"); } } else { - errMsg = tr("No ride selected"); + errMsg = tr("No activity selected"); } return errMsg; } diff --git a/src/AnalysisSidebar.cpp b/src/AnalysisSidebar.cpp index b309cec0c..54e735ce3 100644 --- a/src/AnalysisSidebar.cpp +++ b/src/AnalysisSidebar.cpp @@ -79,7 +79,7 @@ AnalysisSidebar::AnalysisSidebar(Context *context) : QWidget(context->mainWindow activityLayout->setContentsMargins(0,0,0,0); activityLayout->addWidget(rideNavigator); - activityItem = new GcSplitterItem(tr("Rides"), iconFromPNG(":images/sidebar/folder.png"), this); + activityItem = new GcSplitterItem(tr("Activities"), iconFromPNG(":images/sidebar/folder.png"), this); QAction *activityAction = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this); activityItem->addAction(activityAction); connect(activityAction, SIGNAL(triggered(void)), this, SLOT(analysisPopup())); @@ -211,10 +211,10 @@ AnalysisSidebar::showActivityMenu(const QPoint &pos) QAction *revertRide = new QAction(tr("Revert to Saved version"), rideNavigator); connect(revertRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(revertRide())); - QAction *actDeleteRide = new QAction(tr("Delete Ride"), rideNavigator); + QAction *actDeleteRide = new QAction(tr("Delete Activity"), rideNavigator); connect(actDeleteRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(deleteRide())); - QAction *actSplitRide = new QAction(tr("Split Ride"), rideNavigator); + QAction *actSplitRide = new QAction(tr("Split Activity"), rideNavigator); connect(actSplitRide, SIGNAL(triggered(void)), context->mainWindow, SLOT(splitRide())); if (rideItem->isDirty() == true) { @@ -225,7 +225,7 @@ AnalysisSidebar::showActivityMenu(const QPoint &pos) menu.addAction(actDeleteRide); menu.addAction(actSplitRide); #ifdef GC_HAVE_ICAL - QAction *actUploadCalendar = new QAction(tr("Upload Ride to Calendar"), rideNavigator); + QAction *actUploadCalendar = new QAction(tr("Upload Activity to Calendar"), rideNavigator); connect(actUploadCalendar, SIGNAL(triggered(void)), context->mainWindow, SLOT(uploadCalendar())); menu.addAction(actUploadCalendar); #endif @@ -403,9 +403,9 @@ AnalysisSidebar::addIntervals() } else { if (!context->ride || !context->ride->ride()) - QMessageBox::critical(this, tr("Find Intervals"), tr("No ride selected")); + QMessageBox::critical(this, tr("Find Intervals"), tr("No activity selected")); else - QMessageBox::critical(this, tr("Find Intervals"), tr("Current ride contains no data")); + QMessageBox::critical(this, tr("Find Intervals"), tr("Current activity contains no data")); } } @@ -450,9 +450,9 @@ AnalysisSidebar::findPowerPeaks() } else { if (!context->ride || !context->ride->ride()) - QMessageBox::critical(this, tr("Find Power Peaks"), tr("No ride selected")); + QMessageBox::critical(this, tr("Find Power Peaks"), tr("No activity selected")); else - QMessageBox::critical(this, tr("Find Power Peaks"), tr("Current ride contains no data")); + QMessageBox::critical(this, tr("Find Power Peaks"), tr("Current activity contains no data")); } } diff --git a/src/BasicRideMetrics.cpp b/src/BasicRideMetrics.cpp index e9216bbb4..70f80473e 100644 --- a/src/BasicRideMetrics.cpp +++ b/src/BasicRideMetrics.cpp @@ -35,10 +35,10 @@ class RideCount : public RideMetric { RideCount() { setSymbol("ride_count"); - setInternalName("Rides"); + setInternalName("Activities"); } void initialize() { - setName(tr("Rides")); + setName(tr("Activities")); setMetricUnits(tr("")); setImperialUnits(tr("")); } diff --git a/src/BatchExportDialog.cpp b/src/BatchExportDialog.cpp index 3fdc6830c..5268dca71 100644 --- a/src/BatchExportDialog.cpp +++ b/src/BatchExportDialog.cpp @@ -28,7 +28,7 @@ BatchExportDialog::BatchExportDialog(Context *context) : QDialog(context->mainWi { setAttribute(Qt::WA_DeleteOnClose); //setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); // must stop using this flag! - setWindowTitle(tr("Ride Batch Export")); + setWindowTitle(tr("Activity Batch Export")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Activity_BatchExport)); @@ -171,7 +171,7 @@ BatchExportDialog::okClicked() appsettings->setValue(GC_BE_LASTDIR, dirName->text()); appsettings->setValue(GC_BE_LASTFMT, format->currentIndex()); exportFiles(); - status->setText(QString(tr("%1 rides exported, %2 failed or skipped.")).arg(exports).arg(fails)); + status->setText(QString(tr("%1 activities exported, %2 failed or skipped.")).arg(exports).arg(fails)); ok->setText(tr("Finish")); } else if (ok->text() == "Abort" || ok->text() == tr("Abort")) { diff --git a/src/BestIntervalDialog.cpp b/src/BestIntervalDialog.cpp index 32366c8e5..35d837ef6 100644 --- a/src/BestIntervalDialog.cpp +++ b/src/BestIntervalDialog.cpp @@ -151,7 +151,7 @@ BestIntervalDialog::findClicked() { const RideFile *ride = context->ride ? context->ride->ride() : NULL; if (!ride) { - QMessageBox::critical(this, tr("Select Ride"), tr("No ride selected!")); + QMessageBox::critical(this, tr("Select Activity"), tr("No activity selected!")); return; } diff --git a/src/BlankState.cpp b/src/BlankState.cpp index 7b8eb91c3..a3cd85c2c 100644 --- a/src/BlankState.cpp +++ b/src/BlankState.cpp @@ -141,8 +141,8 @@ BlankStatePage::addToShortCuts(ShortCut shortCut) BlankStateAnalysisPage::BlankStateAnalysisPage(Context *context) : BlankStatePage(context) { dontShow->setChecked(appsettings->cvalue(context->athlete->cyclist, GC_BLANK_ANALYSIS, false).toBool()); - welcomeTitle->setText(tr("Rides")); - welcomeText->setText(tr("No ride ?\nLet's start with some data.")); + welcomeTitle->setText(tr("Activities")); + welcomeText->setText(tr("No files ?\nLet's start with some data.")); img->setIcon(QPixmap(":images/analysis.png")); img->setIconSize(QSize(800,330)); diff --git a/src/CPPlot.cpp b/src/CPPlot.cpp index 520e7a493..e748b3061 100644 --- a/src/CPPlot.cpp +++ b/src/CPPlot.cpp @@ -612,8 +612,8 @@ CPPlot::plotModel() heatCurve->setSamples(time, heat); heatCurve->setYAxis(yRight); setAxisScale(yRight, 0, 100); // fine if only heat is shown and percentage Scale will be fixed if shown - if (showPercent) setAxisTitle(yRight, tr("Percent of Best / Heat Rides")); - else setAxisTitle(yRight, tr("Heat Rides")); + if (showPercent) setAxisTitle(yRight, tr("Percent of Best / Heat Activities")); + else setAxisTitle(yRight, tr("Heat Activities")); heatCurve->attach(this); } @@ -1319,7 +1319,7 @@ CPPlot::plotRide(RideItem *rideItem) setAxisScale(yRight, 0, max); // always 100 // set the right titles in case both Heat and Percent of best is show - if (showHeat) setAxisTitle(yRight, tr("Percent of Best / Heat Rides")); + if (showHeat) setAxisTitle(yRight, tr("Percent of Best / Heat Activities")); else setAxisTitle(yRight, tr("Percent of Best")); } else { @@ -1330,7 +1330,7 @@ CPPlot::plotRide(RideItem *rideItem) maxNonZero > 0 ? maxNonZero-1 : 0); // Set the YAxis Title if Heat is active - if (showHeat) setAxisTitle(yRight, tr("Heat Rides")); + if (showHeat) setAxisTitle(yRight, tr("Heat Activities")); } } @@ -1483,7 +1483,7 @@ CPPlot::pointHover(QwtPlotCurve *curve, int index) } // no units for Heat Curve - if (curve == heatCurve) units2 = QString(tr("Rides")); + if (curve == heatCurve) units2 = QString(tr("Activities")); // for speed series add pace with units according to settings if (criticalSeries == CriticalPowerWindow::kph) { diff --git a/src/Colors.cpp b/src/Colors.cpp index 8fae14bb2..23ac82d4c 100644 --- a/src/Colors.cpp +++ b/src/Colors.cpp @@ -62,12 +62,12 @@ void GCColor::setupColors() // (c++0x not supported by Qt currently and not planned for 4.8 or 5.0) Colors init[CNUMOFCFGCOLORS+1] = { { tr("Plot Background"), "COLORPLOTBACKGROUND", QColor(52,52,52) }, - { tr("Ride Plot Background"), "COLORRIDEPLOTBACKGROUND", QColor(52,52,52) }, + { tr("Performance Plot Background"), "COLORRIDEPLOTBACKGROUND", QColor(52,52,52) }, { tr("Trend Plot Background"), "COLORTRENDPLOTBACKGROUND", Qt::black }, { tr("Train Plot Background"), "COLORTRAINPLOTBACKGROUND", Qt::black }, { tr("Plot Symbols"), "COLORRIDEPLOTSYMBOLS", Qt::cyan }, - { tr("Ride Plot X Axis"), "COLORRIDEPLOTXAXIS", Qt::blue }, - { tr("Ride Plot Y Axis"), "COLORRIDEPLOTYAXIS", Qt::red }, + { tr("Performance Plot X Axis"), "COLORRIDEPLOTXAXIS", Qt::blue }, + { tr("Performance Plot Y Axis"), "COLORRIDEPLOTYAXIS", Qt::red }, { tr("Plot Thumbnail Background"), "COLORPLOTTHUMBNAIL", Qt::gray }, { tr("Plot Title"), "COLORPLOTTITLE", Qt::black }, { tr("Plot Selection Pen"), "COLORPLOTSELECT", Qt::blue }, @@ -138,7 +138,7 @@ void GCColor::setupColors() { tr("Chart Bar Unselected"), "CTILEBAR", Qt::gray }, { tr("Chart Bar Selected"), "CTILEBARSELECT", Qt::yellow }, { tr("ToolBar Background"), "CTOOLBAR", Qt::white }, - { tr("Ride History Group"), "CRIDEGROUP", QColor(236,246,255) }, + { tr("Activity History Group"), "CRIDEGROUP", QColor(236,246,255) }, { tr("SpinScan Left"), "CSPINSCANLEFT", Qt::gray }, { tr("SpinScan Right"), "CSPINSCANRIGHT", Qt::cyan }, { tr("Temperature"), "COLORTEMPERATURE", Qt::yellow }, @@ -147,7 +147,7 @@ void GCColor::setupColors() { tr("Left Balance"), "CBALANCELEFT", QColor(178,0,0) }, { tr("Right Balance"), "CBALANCERIGHT", QColor(128,0,50) }, { tr("W' Balance"), "CWBAL", Qt::red }, - { tr("Ride CP Curve"), "CRIDECP", Qt::red }, + { tr("CP Curve"), "CRIDECP", Qt::red }, { tr("Aerobic TISS"), "CATISS", Qt::magenta }, { tr("Anaerobic TISS"), "CANTISS", Qt::cyan }, { tr("Left Torque Effectiveness"), "CLTE", Qt::cyan }, diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp index f7752d375..17af22072 100644 --- a/src/ConfigDialog.cpp +++ b/src/ConfigDialog.cpp @@ -219,7 +219,7 @@ void ConfigDialog::saveClicked() // if so we will restart, if not I'll revert to current directory QMessageBox msgBox; msgBox.setText(tr("You changed the location of the athlete library")); - msgBox.setInformativeText(tr("This is where all new athletes and their ride files " + msgBox.setInformativeText(tr("This is where all new athletes and their files " "will now be stored.\n\nCurrent athlete data will no longer be " "available and GoldenCheetah will need to restart for the change to take effect." "\n\nDo you want to apply and restart GoldenCheetah?")); diff --git a/src/CriticalPowerWindow.cpp b/src/CriticalPowerWindow.cpp index dc3a2edff..e3277d1b2 100644 --- a/src/CriticalPowerWindow.cpp +++ b/src/CriticalPowerWindow.cpp @@ -208,12 +208,12 @@ CriticalPowerWindow::CriticalPowerWindow(Context *context, bool rangemode) : cl->addRow(shadies, shadeIntervalsCheck); ridePlotStyleCombo = new QComboBox(this); - ridePlotStyleCombo->addItem(tr("Ride Mean Max")); - ridePlotStyleCombo->addItem(tr("Ride Centile")); - ridePlotStyleCombo->addItem(tr("No Ride")); + ridePlotStyleCombo->addItem(tr("Activity Mean Max")); + ridePlotStyleCombo->addItem(tr("Activity Centile")); + ridePlotStyleCombo->addItem(tr("No Activity")); cl->addWidget(new QLabel("")); //spacing - cl->addRow(new QLabel(tr("Current Ride")), ridePlotStyleCombo); + cl->addRow(new QLabel(tr("Current Activity")), ridePlotStyleCombo); // model config // 2 or 3 point model ? diff --git a/src/DownloadRideDialog.cpp b/src/DownloadRideDialog.cpp index c7a3fe76f..228319636 100644 --- a/src/DownloadRideDialog.cpp +++ b/src/DownloadRideDialog.cpp @@ -35,7 +35,7 @@ DownloadRideDialog::DownloadRideDialog(Context *context, bool embedded) : action(actionIdle), embedded(embedded) { setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(tr("Download Ride Data")); + setWindowTitle(tr("Download Data")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Activity_Download)); @@ -64,7 +64,7 @@ DownloadRideDialog::DownloadRideDialog(Context *context, bool embedded) : progressLabel->setTextFormat(Qt::PlainText); downloadButton = new QPushButton(tr("&Download"), this); - eraseRideButton = new QPushButton(tr("&Erase Ride(s)"), this); + eraseRideButton = new QPushButton(tr("&Erase Data"), this); rescanButton = new QPushButton(tr("&Rescan"), this); cancelButton = new QPushButton(tr("&Cancel"), this); closeButton = new QPushButton(tr("&Close"), this); @@ -301,10 +301,10 @@ DownloadRideDialog::downloadClicked() connect( device.data(), SIGNAL(updateProgress(QString)), this, SLOT(updateProgress(QString))); if (devtype->canPreview()) { - updateStatus(tr("Getting ride list ...")); + updateStatus(tr("Getting list ...")); if( ! device->preview( err ) ){ - QMessageBox::information(this, tr("Get ride list failed"), err); + QMessageBox::information(this, tr("Get list failed"), err); updateAction( actionIdle ); emit downloadEnds(); @@ -367,8 +367,8 @@ DownloadRideDialog::downloadClicked() if (QFile::exists(filepath)) { if (QMessageBox::warning( this, - tr("Ride Already Downloaded"), - tr("The ride starting at %1 appears to have already " + tr("Activity Already Downloaded"), + tr("The activity starting at %1 appears to have already " "been downloaded. Do you want to overwrite the " "previous download?") .arg(files.at(i).startTime.toString()), @@ -451,7 +451,7 @@ DownloadRideDialog::downloadClicked() } else { QMessageBox::critical( this, tr("Error"), - tr("The ride %1 could not be converted to " + tr("The activity %1 could not be converted to " "GoldenCheetah .JSON file format.") .arg(filename) ); updateStatus(tr(".JSON conversion error: file %1") diff --git a/src/FixMoxy.cpp b/src/FixMoxy.cpp index e5b58b7ed..36dec0bca 100644 --- a/src/FixMoxy.cpp +++ b/src/FixMoxy.cpp @@ -51,7 +51,7 @@ class FixMoxyConfig : public DataProcessorConfig return(QString(tr("When recording from the Moxy in Speed and" " cadence mode the SmO2 and tHb data is sent as" " cadence and speed respectively. This tool will" - " update the ride file to move the values from speed" + " update the activity file to move the values from speed" " and cadence into the Moxy series." ))); } diff --git a/src/GcScopeBar.cpp b/src/GcScopeBar.cpp index 74f38dbf7..7a8ff455c 100644 --- a/src/GcScopeBar.cpp +++ b/src/GcScopeBar.cpp @@ -90,7 +90,7 @@ GcScopeBar::GcScopeBar(Context *context) : QWidget(context->mainWindow), context #endif - anal->setText(tr("Rides")); + anal->setText(tr("Activities")); anal->setWidth(70); anal->setChecked(true); layout->addWidget(anal); @@ -129,7 +129,7 @@ GcScopeBar::GcScopeBar(Context *context) : QWidget(context->mainWindow), context int width = fontMetric.width(tr("Trends")); home->setWidth(width+20); - width = fontMetric.width(tr("Rides")); + width = fontMetric.width(tr("Activities")); anal->setWidth(width+20); width = fontMetric.width(tr("Train")); diff --git a/src/GcUpgrade.cpp b/src/GcUpgrade.cpp index 82e91078b..132841702 100644 --- a/src/GcUpgrade.cpp +++ b/src/GcUpgrade.cpp @@ -725,11 +725,11 @@ GcUpgradeExecuteDialog::GcUpgradeExecuteDialog(QString athlete) : QDialog(NULL, "by adding a set of subdirectories which hold the different types " "of GoldenCheetah files.

" "The new structure is:
" - "-> Activity/Ride files: /activities
" + "-> Activity files: /activities
" "-> Configuration files: /config
" "-> Download files: /downloads
" "-> Import files: /imports
" - "-> Backups of Activity/Ride files: /bak
" + "-> Backups of Activity files: /bak
" "-> Workout related files: /workouts
" "-> Cache files: /cache
" "-> Calendar files: /calendar
" @@ -741,11 +741,11 @@ GcUpgradeExecuteDialog::GcUpgradeExecuteDialog(QString athlete) : QDialog(NULL, "The upgrade process will create the new directory structure and move " "the existing files to the new directories as needed. During the upgrade " - "all activity/ride files will be converted to GoldenCheetah's native " + "all activity files will be converted to GoldenCheetah's native " "file format .JSON and moved to the
/activities folder. The source files " "are moved to the /imports folder.

" "Starting with version 3.2 all downloads from devices or imported " - "activity/ride files will be converted to GoldenCheetah's file " + "activity files will be converted to GoldenCheetah's file " "format during import/download. The original files will be stored - depending on the source - " "in /downloads or
/imports folder.

" "

Please make sure that you have done a backup of your athlete data " diff --git a/src/GcWindowRegistry.cpp b/src/GcWindowRegistry.cpp index c1f2a2c6e..76c0f475d 100644 --- a/src/GcWindowRegistry.cpp +++ b/src/GcWindowRegistry.cpp @@ -74,7 +74,7 @@ GcWindowRegistry::initialize() //{ VIEW_HOME, tr("Weekly Summary"),GcWindowTypes::WeeklySummary },// DEPRECATED { VIEW_HOME|VIEW_DIARY, tr("Critical Mean Maximal"),GcWindowTypes::CriticalPowerSummary }, //{ VIEW_HOME|VIEW_DIARY, tr("Performance Manager"),GcWindowTypes::PerformanceManager }, - { VIEW_ANALYSIS|VIEW_INTERVAL, tr("Ride Summary"),GcWindowTypes::RideSummary }, + { VIEW_ANALYSIS|VIEW_INTERVAL, tr("Activity Summary"),GcWindowTypes::RideSummary }, { VIEW_ANALYSIS, tr("Details"),GcWindowTypes::MetadataWindow }, { VIEW_ANALYSIS, tr("Summary and Details"),GcWindowTypes::Summary }, { VIEW_ANALYSIS, tr("Editor"),GcWindowTypes::RideEditor }, diff --git a/src/GenerateHeatMapDialog.cpp b/src/GenerateHeatMapDialog.cpp index 5f506897a..f68251fc5 100644 --- a/src/GenerateHeatMapDialog.cpp +++ b/src/GenerateHeatMapDialog.cpp @@ -28,7 +28,7 @@ GenerateHeatMapDialog::GenerateHeatMapDialog(Context *context) : QDialog(context { setAttribute(Qt::WA_DeleteOnClose); //setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); // must stop using this flag! - setWindowTitle(tr("Ride Heat Map Generator")); + setWindowTitle(tr("Heat Map Generator")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Tools_CreateHeatMap)); @@ -159,7 +159,7 @@ GenerateHeatMapDialog::okClicked() ok->setText(tr("Abort")); appsettings->setValue(GC_BE_LASTDIR, dirName->text()); generateNow(); - status->setText(QString(tr("%1 rides exported, %2 failed or skipped.")).arg(exports).arg(fails)); + status->setText(QString(tr("%1 activities exported, %2 failed or skipped.")).arg(exports).arg(fails)); ok->setText(tr("Finish")); } else if (ok->text() == "Abort" || ok->text() == tr("Abort")) { diff --git a/src/HistogramWindow.cpp b/src/HistogramWindow.cpp index 1802f3c39..c4b8816b0 100644 --- a/src/HistogramWindow.cpp +++ b/src/HistogramWindow.cpp @@ -123,8 +123,8 @@ HistogramWindow::HistogramWindow(Context *context, bool rangemode) : GcChartWind cl->addWidget(new QLabel("")); // spacing // default to data series! - data = new QRadioButton(tr("Ride Data Samples")); - metric = new QRadioButton(tr("Ride Metrics")); + data = new QRadioButton(tr("Data Samples")); + metric = new QRadioButton(tr("Metrics")); data->setChecked(true); metric->setChecked(false); QHBoxLayout *radios = new QHBoxLayout; diff --git a/src/JouleDevice.cpp b/src/JouleDevice.cpp index f5ab26a9b..c16675988 100644 --- a/src/JouleDevice.cpp +++ b/src/JouleDevice.cpp @@ -142,7 +142,7 @@ JouleDevice::download( const QDir &tmpdir, return false; for (int i=0; i255?trainings.at(i).id-255:trainings.at(i).id); int id2 = (trainings.at(i).id>255?trainings.at(i).id%255:0); @@ -351,8 +351,8 @@ JouleDevice::getUnitFreeSpace(QString &memory, QString &err) bool JouleDevice::getDownloadableRides(QList &rides, bool isJouleGPS, QString &err) { - emit updateStatus(tr("Read ride summary...")); - if (JOULE_DEBUG) printf("Read ride summary\n"); + emit updateStatus(tr("Read summary...")); + if (JOULE_DEBUG) printf("Read summary\n"); JoulePacket request(READ_RIDE_SUMMARY); @@ -383,7 +383,7 @@ JouleDevice::getDownloadableRides(QList &rides, bool isJou rides.append(ride); } } - emit updateStatus(QString(tr("%1 detailed rides")).arg(rides.count())); + emit updateStatus(QString(tr("%1 detailed activities")).arg(rides.count())); return true; } return false; @@ -409,7 +409,7 @@ JouleDevice::cleanup( QString &err ) { return false; for (int i=0; i255?trainings.at(i).id-255:trainings.at(i).id); int id2 = (trainings.at(i).id>255?trainings.at(i).id%255:0); diff --git a/src/KmlRideFile.cpp b/src/KmlRideFile.cpp index bd50edbe6..537d537ee 100644 --- a/src/KmlRideFile.cpp +++ b/src/KmlRideFile.cpp @@ -289,7 +289,7 @@ KmlFileReader::writeRideFile(Context *, const RideFile * ride, QFile &file) cons // setup trip folder (shown on lhs of google earth FolderPtr folder = kmldom::KmlFactory::GetFactory()->CreateFolder(); - folder->set_name(QObject::tr("Bike Rides").toStdString()); + folder->set_name(QObject::tr("Activities").toStdString()); document->add_feature(folder); // Create a track for the entire ride diff --git a/src/LTMPopup.cpp b/src/LTMPopup.cpp index a0107213a..d6c2193cd 100644 --- a/src/LTMPopup.cpp +++ b/src/LTMPopup.cpp @@ -45,7 +45,7 @@ LTMPopup::LTMPopup(Context *context) : QWidget(context->mainWindow), context(con QFont titleFont; titleFont.setPointSize(14); titleFont.setBold(true); - title = new QLabel(tr("No Ride Selected")); + title = new QLabel(tr("No activity Selected")); title->setFont(titleFont); title->setFixedHeight(30); mainLayout->addWidget(title); @@ -175,7 +175,7 @@ LTMPopup::setData(Specification spec, const RideMetric *metric, QString title) rides->hide(); metrics->hide(); notes->hide(); - title = tr("No ride selected"); + title = tr("No activity selected"); } else { // one or more rides rides->show(); @@ -340,17 +340,17 @@ LTMPopup::setData(LTMSettings &settings, QDate start, QDate end, QTime time) rides->hide(); metrics->hide(); notes->hide(); - _title = tr("No ride selected"); + _title = tr("No activity selected"); } else { // one or more rides rides->show(); metrics->show(); notes->show(); // give some extrat info - if (count > 1) _title += QString(tr(" (%1 rides)")).arg(count); + if (count > 1) _title += QString(tr(" (%1 activities)")).arg(count); } - if (nonRideMetrics) _title += QString(tr(" / non ride-related metrics skipped")); + if (nonRideMetrics) _title += QString(tr(" / non activity-related metrics skipped")); setTitle(_title); rideSelected(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 255311a90..3d5b2c457 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -407,7 +407,7 @@ MainWindow::MainWindow(const QDir &home) compose->setIconSize(isize); compose->setFixedHeight(25); compose->setStyle(toolStyle); - compose->setToolTip(tr("Create Manual Ride")); + compose->setToolTip(tr("Create Manual Activity")); compose->setPalette(metal); connect(compose, SIGNAL(clicked(bool)), this, SLOT(manualRide())); HelpWhatsThis *helpCompose = new HelpWhatsThis(compose); @@ -445,8 +445,8 @@ MainWindow::MainWindow(const QDir &home) actbuttons->setSelectionBehavior(QtSegmentControl::SelectNone); //wince. spelling. ugh actbuttons->setFixedHeight(25); actbuttons->setSegmentToolTip(0, tr("Find Intervals...")); - actbuttons->setSegmentToolTip(1, tr("Split Ride...")); - actbuttons->setSegmentToolTip(2, tr("Delete Ride")); + actbuttons->setSegmentToolTip(1, tr("Split Activity...")); + actbuttons->setSegmentToolTip(2, tr("Delete Activity")); actbuttons->setPalette(metal); connect(actbuttons, SIGNAL(segmentSelected(int)), this, SLOT(actionClicked(int))); @@ -580,7 +580,7 @@ MainWindow::MainWindow(const QDir &home) QMenu *rideMenu = menuBar()->addMenu(tr("A&ctivity")); rideMenu->addAction(tr("&Download from device..."), this, SLOT(downloadRide()), tr("Ctrl+D")); rideMenu->addAction(tr("&Import from file..."), this, SLOT (importFile()), tr ("Ctrl+I")); - rideMenu->addAction(tr("&Manual ride entry..."), this, SLOT(manualRide()), tr("Ctrl+M")); + rideMenu->addAction(tr("&Manual entry..."), this, SLOT(manualRide()), tr("Ctrl+M")); rideMenu->addSeparator (); shareAction = new QAction(tr("Share Online..."), this); shareAction->setShortcut(tr("Ctrl+U")); @@ -595,16 +595,16 @@ MainWindow::MainWindow(const QDir &home) #endif #ifdef GC_HAVE_KQOAUTH - tweetAction = new QAction(tr("Tweet Ride"), this); + tweetAction = new QAction(tr("Tweet activity"), this); connect(tweetAction, SIGNAL(triggered(bool)), this, SLOT(tweetRide())); rideMenu->addAction(tweetAction); #endif rideMenu->addSeparator (); - rideMenu->addAction(tr("&Save ride"), this, SLOT(saveRide()), tr("Ctrl+S")); - rideMenu->addAction(tr("D&elete ride..."), this, SLOT(deleteRide())); - rideMenu->addAction(tr("Split &ride..."), this, SLOT(splitRide())); - rideMenu->addAction(tr("Combine rides..."), this, SLOT(mergeRide())); + rideMenu->addAction(tr("&Save activity"), this, SLOT(saveRide()), tr("Ctrl+S")); + rideMenu->addAction(tr("D&elete activity..."), this, SLOT(deleteRide())); + rideMenu->addAction(tr("Split &activity..."), this, SLOT(splitRide())); + rideMenu->addAction(tr("Combine activities..."), this, SLOT(mergeRide())); rideMenu->addSeparator (); HelpWhatsThis *helpRideMenu = new HelpWhatsThis(rideMenu); @@ -627,7 +627,7 @@ MainWindow::MainWindow(const QDir &home) #ifdef GC_HAVE_ICAL optionsMenu->addSeparator(); - optionsMenu->addAction(tr("Upload Ride to Calendar"), this, SLOT(uploadCalendar()), tr ("")); + optionsMenu->addAction(tr("Upload Activity to Calendar"), this, SLOT(uploadCalendar()), tr ("")); //optionsMenu->addAction(tr("Import Calendar..."), this, SLOT(importCalendar()), tr ("")); // planned for v3.1 //optionsMenu->addAction(tr("Export Calendar..."), this, SLOT(exportCalendar()), tr ("")); // planned for v3.1 optionsMenu->addAction(tr("Refresh Calendar"), this, SLOT(refreshCalendar()), tr ("")); @@ -688,7 +688,7 @@ MainWindow::MainWindow(const QDir &home) //connect(showhideSidebar, SIGNAL(triggered(bool)), this, SLOT(showSidebar(bool))); viewMenu->addSeparator(); - viewMenu->addAction(tr("Rides"), this, SLOT(selectAnalysis())); + viewMenu->addAction(tr("Activities"), this, SLOT(selectAnalysis())); viewMenu->addAction(tr("Trends"), this, SLOT(selectHome())); #ifdef GC_HAVE_INTERVALS viewMenu->addAction(tr("Intervals"), this, SLOT(selectInterval())); @@ -1266,7 +1266,7 @@ void MainWindow::exportRide() { if (currentTab->context->ride == NULL) { - QMessageBox::critical(this, tr("Select Ride"), tr("No ride selected!")); + QMessageBox::critical(this, tr("Select Activity"), tr("No activity selected!")); return; } @@ -1277,7 +1277,7 @@ MainWindow::exportRide() allFormats << QString("%1 (*.%2)").arg(rff.description(suffix)).arg(suffix); QString suffix; // what was selected? - QString fileName = QFileDialog::getSaveFileName(this, tr("Export Ride"), QDir::homePath(), allFormats.join(";;"), &suffix); + QString fileName = QFileDialog::getSaveFileName(this, tr("Export Activity"), QDir::homePath(), allFormats.join(";;"), &suffix); if (fileName.length() == 0) return; @@ -1292,7 +1292,7 @@ MainWindow::exportRide() if (result == false) { QMessageBox oops(QMessageBox::Critical, tr("Export Failed"), - tr("Failed to export ride, please check permissions")); + tr("Failed to export activity, please check permissions")); oops.exec(); } } @@ -1333,8 +1333,8 @@ MainWindow::saveRide() if (currentTab->context->ride) saveRideSingleDialog(currentTab->context, currentTab->context->ride); // will signal save to everyone else { - QMessageBox oops(QMessageBox::Critical, tr("No Ride To Save"), - tr("There is no currently selected ride to save.")); + QMessageBox oops(QMessageBox::Critical, tr("No Activity To Save"), + tr("There is no currently selected activity to save.")); oops.exec(); return; } @@ -1361,9 +1361,9 @@ MainWindow::splitRide() if (currentTab->context->ride && currentTab->context->ride->ride() && currentTab->context->ride->ride()->dataPoints().count()) (new SplitActivityWizard(currentTab->context))->exec(); else { if (!currentTab->context->ride || !currentTab->context->ride->ride()) - QMessageBox::critical(this, tr("Split Ride"), tr("No ride selected")); + QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected")); else - QMessageBox::critical(this, tr("Split Ride"), tr("Current ride contains no data to split")); + QMessageBox::critical(this, tr("Split Activity"), tr("Current activity contains no data to split")); } } @@ -1373,9 +1373,9 @@ MainWindow::mergeRide() if (currentTab->context->ride && currentTab->context->ride->ride() && currentTab->context->ride->ride()->dataPoints().count()) (new MergeActivityWizard(currentTab->context))->exec(); else { if (!currentTab->context->ride || !currentTab->context->ride->ride()) - QMessageBox::critical(this, tr("Split Ride"), tr("No ride selected")); + QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected")); else - QMessageBox::critical(this, tr("Split Ride"), tr("Current ride contains no data to merge")); + QMessageBox::critical(this, tr("Split Activity"), tr("Current activity contains no data to merge")); } } @@ -1385,13 +1385,13 @@ MainWindow::deleteRide() RideItem *_item = currentTab->context->ride; if (_item==NULL) { - QMessageBox::critical(this, tr("Delete Ride"), tr("No ride selected!")); + QMessageBox::critical(this, tr("Delete Activity"), tr("No activity selected!")); return; } RideItem *item = static_cast(_item); QMessageBox msgBox; - msgBox.setText(tr("Are you sure you want to delete the ride:")); + msgBox.setText(tr("Are you sure you want to delete the activity:")); msgBox.setInformativeText(item->fileName); QPushButton *deleteButton = msgBox.addButton(tr("Delete"),QMessageBox::YesRole); msgBox.setStandardButtons(QMessageBox::Cancel); diff --git a/src/ManualRideDialog.cpp b/src/ManualRideDialog.cpp index da03d15ab..62db2b96e 100644 --- a/src/ManualRideDialog.cpp +++ b/src/ManualRideDialog.cpp @@ -117,7 +117,7 @@ ManualRideDialog::deriveFactors() ManualRideDialog::ManualRideDialog(Context *context) : context(context) { setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(tr("Manual Ride Entry")); + setWindowTitle(tr("Manual Entry")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Activity_Manual)); #ifdef Q_OS_MAC @@ -136,7 +136,7 @@ ManualRideDialog::ManualRideDialog(Context *context) : context(context) // BASIC DATA // ride start date and start time - QLabel *dateLabel = new QLabel(tr("Ride date:"), this); + QLabel *dateLabel = new QLabel(tr("Date:"), this); dateEdit = new QDateEdit(this); dateEdit->setDate(QDate::currentDate()); @@ -523,7 +523,7 @@ ManualRideDialog::okClicked() // work it out -- they may actually want to keep an existing ride, so we shouldn't // rename it silently. QMessageBox oops(QMessageBox::Critical, tr("Unable to save"), - tr("There is already an ride with the same start time or you do not have permissions to save a file.")); + tr("There is already an activity with the same start time or you do not have permissions to save a file.")); oops.exec(); } } diff --git a/src/ManualRideFile.cpp b/src/ManualRideFile.cpp index a61d21366..fcca2c900 100644 --- a/src/ManualRideFile.cpp +++ b/src/ManualRideFile.cpp @@ -25,7 +25,7 @@ #include "cmath" static int manualFileReaderRegistered = - RideFileFactory::instance().registerReader("man", "Manual Ride File", new ManualFileReader()); + RideFileFactory::instance().registerReader("man", "Manual File", new ManualFileReader()); RideFile *ManualFileReader::openRideFile(QFile &file, QStringList &errors, QList*) const { diff --git a/src/MergeActivityWizard.cpp b/src/MergeActivityWizard.cpp index 9f8e6f724..50be8e48c 100644 --- a/src/MergeActivityWizard.cpp +++ b/src/MergeActivityWizard.cpp @@ -1164,10 +1164,10 @@ MergeConfirm::MergeConfirm(MergeActivityWizard *parent) : QWizardPage(parent), w QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("Press Finish to update the current ride with " + QLabel *label = new QLabel(tr("Press Finish to update the current activity with " " the combined data.\n\n" "The changes will be saved and cannot be undone.\n\n" - "If you press continue the ride will be saved, if you " + "If you press continue the activity will be saved, if you " "do not want to continue either go back and change " "the settings or press cancel to abort.")); label->setWordWrap(true); diff --git a/src/MoxyDevice.cpp b/src/MoxyDevice.cpp index 396e46864..1e5116892 100644 --- a/src/MoxyDevice.cpp +++ b/src/MoxyDevice.cpp @@ -253,7 +253,7 @@ MoxyDevice::download( const QDir &tmpdir, if (rows > 30) { // we have one file anyway - emit updateStatus(QString(tr("Ride #%1: %2")).arg(++nfiles).arg(file.startTime.toString("d-MMM-yy hh:mm"))); + emit updateStatus(QString(tr("File #%1: %2")).arg(++nfiles).arg(file.startTime.toString("d-MMM-yy hh:mm"))); tmpFile->close(); files << file; @@ -307,7 +307,7 @@ MoxyDevice::download( const QDir &tmpdir, if (rows > 30) { // we have one file anyway - emit updateStatus(QString(tr("Ride #%1: %2")).arg(++nfiles).arg(file.startTime.toString("d-MMM-yy hh:mm"))); + emit updateStatus(QString(tr("File #%1: %2")).arg(++nfiles).arg(file.startTime.toString("d-MMM-yy hh:mm"))); tmpFile->close(); files << file; diff --git a/src/Pages.cpp b/src/Pages.cpp index 88fdeb12a..630d495bb 100644 --- a/src/Pages.cpp +++ b/src/Pages.cpp @@ -1386,10 +1386,10 @@ ColorsPage::ColorsPage(QWidget *parent) : QWidget(parent) antiAliased = new QCheckBox; antiAliased->setChecked(appsettings->value(this, GC_ANTIALIAS, true).toBool()); #ifndef Q_OS_MAC - QLabel *rideScrollLabel = new QLabel(tr("Ride Scrollbar")); + QLabel *rideScrollLabel = new QLabel(tr("Activity Scrollbar")); rideScroll = new QCheckBox; rideScroll->setChecked(appsettings->value(this, GC_RIDESCROLL, true).toBool()); - QLabel *rideHeadLabel = new QLabel(tr("Ride Headings")); + QLabel *rideHeadLabel = new QLabel(tr("Activity Headings")); rideHead = new QCheckBox; rideHead->setChecked(appsettings->value(this, GC_RIDEHEAD, true).toBool()); #endif diff --git a/src/PowerHist.cpp b/src/PowerHist.cpp index 71e9867b6..ac408284c 100644 --- a/src/PowerHist.cpp +++ b/src/PowerHist.cpp @@ -1738,9 +1738,9 @@ PowerHist::setData(Specification specification, QString totalMetric, QString dis setAxisTitle(yLeft, QString(tr("Total %1")).arg(tm->name())); if (m->units(context->athlete->useMetricUnits) != "") - setAxisTitle(xBottom, QString(tr("%1 of Ride (%2)")).arg(m->name()).arg(xunits)); + setAxisTitle(xBottom, QString(tr("%1 of Activity (%2)")).arg(m->name()).arg(xunits)); else - setAxisTitle(xBottom, QString(tr("%1 of Ride")).arg(m->name())); + setAxisTitle(xBottom, QString(tr("%1 of Activity")).arg(m->name())); // dont show legend in metric mode //XXX legend()->hide(); diff --git a/src/PowerTapDevice.cpp b/src/PowerTapDevice.cpp index 2403fa272..d91c93703 100644 --- a/src/PowerTapDevice.cpp +++ b/src/PowerTapDevice.cpp @@ -198,7 +198,7 @@ PowerTapDevice::download( const QDir &tmpdir, for (size_t i = 0; i < sizeof(header); ++i) records.append(header[i]); - emit updateStatus( tr("Reading ride data...") ); + emit updateStatus( tr("Reading data...") ); if(m_Cancelled) { err = tr("download cancelled"); return false; @@ -319,7 +319,7 @@ PowerTapDevice::download( const QDir &tmpdir, } } if (!time_set) { - err = tr("Failed to find ride time."); + err = tr("Failed to find start time."); tmp.setAutoRemove(true); return false; } diff --git a/src/RideFile.cpp b/src/RideFile.cpp index cbee50ee7..8f98b9a34 100644 --- a/src/RideFile.cpp +++ b/src/RideFile.cpp @@ -1524,7 +1524,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 Ride File Name"), + tr("Invalid File Name"), tr("Invalid date/time in filename:\n%1\nSkipping file...").arg(name) ); return false; diff --git a/src/RideImportWizard.cpp b/src/RideImportWizard.cpp index 9694c8a34..6d6e40c1a 100644 --- a/src/RideImportWizard.cpp +++ b/src/RideImportWizard.cpp @@ -208,7 +208,7 @@ RideImportWizard::init(QList files, Context * /*mainWindow*/) // connect(overFiles, SIGNAL(clicked()), this, SLOT(overClicked())); // deprecate for this release... XXX // title & headings - setWindowTitle(tr("Import Ride Files")); + setWindowTitle(tr("Import Files")); QTableWidgetItem *filenameHeading = new QTableWidgetItem; filenameHeading->setText(tr("Filename")); tableWidget->setHorizontalHeaderItem(0, filenameHeading); @@ -742,7 +742,7 @@ RideImportWizard::todayClicked(int index) // More than a days worth of rides so can't squeeze into a single day! if (totalduration > (24 * 3600)) { - QMessageBox::warning ( this, tr ( "Invalid Selection" ), tr ( "More than 24hrs of rides to fit into a day" )); + QMessageBox::warning ( this, tr ( "Invalid Selection" ), tr ( "More than 24hrs of activities to fit into a day" )); return; } diff --git a/src/RideMetadata.cpp b/src/RideMetadata.cpp index 0b2f4fd20..327b390ef 100644 --- a/src/RideMetadata.cpp +++ b/src/RideMetadata.cpp @@ -121,7 +121,7 @@ RideMetadata::warnDateTime(QDateTime datetime) QString conflict = context->athlete->home->activities().canonicalPath() + "/" + targetnosuffix + "." + suffix; if (QFile(conflict).exists() && QFileInfo(conflict).fileName() != rideItem()->fileName) { - 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"); + 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"); return; // only warn on the first conflict! } } diff --git a/src/Route.cpp b/src/Route.cpp index ca74a060b..b14a50ad0 100644 --- a/src/Route.cpp +++ b/src/Route.cpp @@ -105,7 +105,7 @@ RouteSegment::parseRideFileName(Context *context, const QString &name, QString * QTime time(rx.cap(5).toInt(), rx.cap(6).toInt(),rx.cap(7).toInt()); if ((! date.isValid()) || (! time.isValid())) { QMessageBox::warning(context->mainWindow, - tr("Invalid Ride File Name"), + tr("Invalid File Name"), tr("Invalid date/time in filename:\n%1\nSkipping file...").arg(name)); return false; } @@ -244,7 +244,7 @@ RouteSegment::searchRouteInRide(RideFile* ride, bool freememory, QTextStream* ou if (n == this->getPoints().count()-1){ // OK //Add the interval and continue search - *out << " >>> Route identified in ride: " << name << " start: " << start << " stop: " << stop << " (distance " << precision << "km)\r\n"; + *out << " >>> Route identified in: " << name << " start: " << start << " stop: " << stop << " (distance " << precision << "km)\r\n"; this->addRideForRideFile(ride, start, stop, precision); candidate = true; *out << " search again..." << "\r\n"; @@ -290,7 +290,7 @@ RouteSegment::searchRouteInAllRides(Context* context) while (iterator.hasNext()) { QString name = iterator.next(); QFile file(context->athlete->home->activities().canonicalPath() + "/" + name); - out << "Opening ride: " << name; + out << "Opening: " << name; RideFile *ride = NULL; @@ -337,7 +337,7 @@ RouteSegment::searchRouteInAllRides(Context* context) // stop logging out << "SEARCH NEW ROUTE ENDS: " << QDateTime::currentDateTime().toString() + "\r\n"; - QMessageBox::information(context->mainWindow, tr("Route"), tr("This route '%1' was found %2 times in %3 rides.").arg(this->getName()).arg(this->getRides().count()).arg(processed)); + QMessageBox::information(context->mainWindow, tr("Route"), tr("This route '%1' was found %2 times in %3 activities.").arg(this->getName()).arg(this->getRides().count()).arg(processed)); log.close(); } diff --git a/src/SaveDialogs.cpp b/src/SaveDialogs.cpp index fe2964d86..c76026def 100644 --- a/src/SaveDialogs.cpp +++ b/src/SaveDialogs.cpp @@ -205,7 +205,7 @@ SaveSingleDialogWidget::SaveSingleDialogWidget(MainWindow *mainWindow, Context * QVBoxLayout *mainLayout = new QVBoxLayout(this); // Warning text - warnText = new QLabel(tr("WARNING\n\nYou have made changes to ") + rideItem->fileName + tr(" If you want to save\nthem, we need to convert the ride to GoldenCheetah\'s\nnative format. Should we do so?\n")); + warnText = new QLabel(tr("WARNING\n\nYou have made changes to ") + rideItem->fileName + tr(" If you want to save\nthem, we need to convert to GoldenCheetah\'s\nnative format. Should we do so?\n")); mainLayout->addWidget(warnText); // Buttons diff --git a/src/ScatterWindow.cpp b/src/ScatterWindow.cpp index c137c646b..135539a14 100644 --- a/src/ScatterWindow.cpp +++ b/src/ScatterWindow.cpp @@ -189,9 +189,9 @@ ScatterWindow::ScatterWindow(Context *context) : cl->addRow(frame); compareMode = new QComboBox(this); - compareMode->addItem(tr("All intervals/rides")); - compareMode->addItem(tr("First intervals/rides on X-axis")); - compareMode->addItem(tr("First intervals/rides on Y-axis")); + compareMode->addItem(tr("All intervals/activities")); + compareMode->addItem(tr("First intervals/activities on X-axis")); + compareMode->addItem(tr("First intervals/activities on Y-axis")); cl->addRow(new QLabel(tr("Compare mode")), compareMode); compareMode->setCurrentIndex(0); diff --git a/src/ShareDialog.cpp b/src/ShareDialog.cpp index 449e928f2..cde936814 100644 --- a/src/ShareDialog.cpp +++ b/src/ShareDialog.cpp @@ -87,7 +87,7 @@ static QByteArray zCompress(const QByteArray &source) ShareDialog::ShareDialog(Context *context, RideItem *item) : context(context) { - setWindowTitle(tr("Share your ride")); + setWindowTitle(tr("Share your activity")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Activity_Share)); @@ -174,7 +174,7 @@ ShareDialog::ShareDialog(Context *context, RideItem *item) : groupBox1->setLayout(vbox1); mainLayout->addWidget(groupBox1); - QGroupBox *groupBox2 = new QGroupBox(tr("Choose a name for your ride: ")); + QGroupBox *groupBox2 = new QGroupBox(tr("Choose a name for your activity: ")); titleEdit = new QLineEdit(); @@ -252,7 +252,7 @@ ShareDialog::ShareDialog(Context *context, RideItem *item) : QHBoxLayout *buttonLayout = new QHBoxLayout; - uploadButton = new QPushButton(tr("&Upload Ride"), this); + uploadButton = new QPushButton(tr("&Upload Activity"), this); buttonLayout->addWidget(uploadButton); closeButton = new QPushButton(tr("&Close"), this); buttonLayout->addStretch(); @@ -362,7 +362,7 @@ ShareDialog::doUploader( ShareDialogUploader *uploader ) QVBoxLayout *layoutLabel = new QVBoxLayout(); QLabel *label = new QLabel(); - label->setText(tr("This Ride is marked as already on %1. Are you sure you want to upload it?") + label->setText(tr("This activity is marked as already on %1. Are you sure you want to upload it?") .arg(uploader->name()) ); layoutLabel->addWidget(label); @@ -442,7 +442,7 @@ StravaUploader::upload() void StravaUploader::requestUploadStrava() { - parent->progressLabel->setText(tr("Upload ride to Strava...")); + parent->progressLabel->setText(tr("Upload activity to Strava...")); parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount); int year = ride->fileName.left(4).toInt(); @@ -517,7 +517,7 @@ StravaUploader::requestUploadStrava() networkManager->post(request, multiPart); parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount); - parent->progressLabel->setText(tr("Upload ride... Sending to Strava")); + parent->progressLabel->setText(tr("Upload... Sending to Strava")); eventLoop->exec(); } @@ -585,7 +585,7 @@ void StravaUploader::requestVerifyUpload() { parent->progressBar->setValue(0); - parent->progressLabel->setText(tr("Ride processing...")); + parent->progressLabel->setText(tr("Processing...")); // reconnect for verify networkManager->disconnect(); @@ -687,7 +687,7 @@ RideWithGpsUploader::upload() void RideWithGpsUploader::requestUploadRideWithGPS() { - parent->progressLabel->setText(tr("Upload ride...")); + parent->progressLabel->setText(tr("Upload...")); parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount); QEventLoop eventLoop; @@ -775,7 +775,7 @@ RideWithGpsUploader::requestUploadRideWithGPS() request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount); - parent->progressLabel->setText(tr("Upload ride... Sending to RideWithGPS")); + parent->progressLabel->setText(tr("Upload... Sending to RideWithGPS")); networkMgr.post( request, out.toLatin1()); eventLoop.exec(); @@ -879,7 +879,7 @@ CyclingAnalyticsUploader::upload() void CyclingAnalyticsUploader::requestUploadCyclingAnalytics() { - parent->progressLabel->setText(tr("Upload ride to CyclingAnalytics...")); + parent->progressLabel->setText(tr("Upload to CyclingAnalytics...")); parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount); QEventLoop eventLoop; @@ -927,7 +927,7 @@ CyclingAnalyticsUploader::requestUploadCyclingAnalytics() networkMgr.post(request, multiPart); parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount); - parent->progressLabel->setText(tr("Upload ride... Sending to CyclingAnalytics")); + parent->progressLabel->setText(tr("Upload... Sending to CyclingAnalytics")); eventLoop.exec(); } @@ -1032,7 +1032,7 @@ SelfLoopsUploader::upload() void SelfLoopsUploader::requestUploadSelfLoops() { - parent->progressLabel->setText(tr("Upload ride to Selfloops...")); + parent->progressLabel->setText(tr("Upload to Selfloops...")); parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount); QEventLoop eventLoop; @@ -1078,7 +1078,7 @@ SelfLoopsUploader::requestUploadSelfLoops() networkMgr.post(request, multiPart); parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount); - parent->progressLabel->setText(tr("Upload ride... Sending to Selfloops")); + parent->progressLabel->setText(tr("Upload... Sending to Selfloops")); eventLoop.exec(); } @@ -1312,7 +1312,7 @@ GarminUploader::requestUploadGarmin() { qDebug() << "requestUploadGarmin()"; - parent->progressLabel->setText(tr("Upload ride to Garmin Connect...")); + parent->progressLabel->setText(tr("Upload to Garmin Connect...")); parent->progressBar->setValue(parent->progressBar->value()+10/parent->shareSiteCount); QEventLoop eventLoop; @@ -1355,7 +1355,7 @@ GarminUploader::requestUploadGarmin() networkMgr.post(request, multiPart); parent->progressBar->setValue(parent->progressBar->value()+30/parent->shareSiteCount); - parent->progressLabel->setText(tr("Upload ride... Sending to Garmin Connect")); + parent->progressLabel->setText(tr("Upload... Sending to Garmin Connect")); eventLoop.exec(); } diff --git a/src/SplitActivityWizard.cpp b/src/SplitActivityWizard.cpp index 3ff3d66d9..ae77c1b48 100644 --- a/src/SplitActivityWizard.cpp +++ b/src/SplitActivityWizard.cpp @@ -43,7 +43,7 @@ SplitActivityWizard::SplitActivityWizard(Context *context) : QWizard(context->ma setMinimumWidth(600); // title - setWindowTitle(tr("Split Ride")); + setWindowTitle(tr("Split Activity")); // help HelpWhatsThis *help = new HelpWhatsThis(this); @@ -159,7 +159,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // we have a candidate segments.append(RideFileInterval(segmentStart, segmentEnd, - QString(tr("Ride Segment #%1")).arg(++counter))); + QString(tr("Activity Segment #%1")).arg(++counter))); } segmentEnd = segmentStart = p->secs; @@ -178,7 +178,7 @@ SplitActivityWizard::setIntervalsList(SplitSelect *selector) // we have a candidate segments.append(RideFileInterval(segmentStart, segmentEnd, - QString(tr("Ride Segment #%1")).arg(++counter))); + QString(tr("Activity Segment #%1")).arg(++counter))); } @@ -225,7 +225,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 Ride"))); + tr("Entire Activity"))); // now fold in the ride intervals segments.append(rideItem->ride()->intervals()); @@ -246,7 +246,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 Ride")); + interval.name == tr("Entire Activity")); // disable checkbox editing (i.e. mandatory split) at gaps in recording // we have turned this off from user requests, may reinstate or choose @@ -450,22 +450,22 @@ SplitActivityWizard::conflicts(QDateTime datetime) // welcome SplitWelcome::SplitWelcome(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { - setTitle(tr("Split Ride")); + setTitle(tr("Split Activity")); setSubTitle(tr("Lets get started")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("This wizard will help you split the current ride " - "into multiple rides\n\n" + QLabel *label = new QLabel(tr("This wizard will help you split the current activity " + "into multiple activities\n\n" "The wizard will identify segments of uninterrupted " - "ride and allow you to select which ones to " - "save as new rides. You will also be able to " + "activity and allow you to select which ones to " + "save as new activities. You will also be able to " "select any currently defined intervals too.\n\n" - "If the newly created ride clashes with an existing " - "ride (same date and time) then the wizard will adjust " + "If the newly created activity clashes with an existing " + "activity (same date and time) then the wizard will adjust " "the start time by one or more seconds to avoid losing or " - "overwriting any existing rides.")); + "overwriting any existing data.")); label->setWordWrap(true); layout->addWidget(label); @@ -476,20 +476,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 ride?")); + setSubTitle(tr("Do you want to keep the original?")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("If you want to keep the current ride then you " + QLabel *label = new QLabel(tr("If you want to keep the current activity then you " "should ensure you have clicked on the \"Keep original " - "ride\" check box below.\n\n" - "If you do not choose to keep the original ride " + "\" check box below.\n\n" + "If you do not choose to keep the original " "it will be backed up before removing it from the " - "ride history.\n\n")); + "history.\n\n")); label->setWordWrap(true); - keepOriginal = new QCheckBox(tr("Keep original ride"), this); + keepOriginal = new QCheckBox(tr("Keep original"), this); keepOriginal->setChecked(wizard->keepOriginal); warning = new QLabel(this); @@ -517,7 +517,7 @@ SplitParameters::SplitParameters(SplitActivityWizard *parent) : QWizardPage(pare QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - QLabel *label = new QLabel(tr("This wizard will find segments of ride to save " + QLabel *label = new QLabel(tr("This wizard will find segments of the activity 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 " @@ -575,7 +575,7 @@ SplitKeep::setWarning() if (wizard->hasBackup(wizard->rideItem->fileName) != "") { - warning->setText(tr("WARNING: The current ride will be backed up and " + warning->setText(tr("WARNING: The current activity will be backed up and " "removed, but a backup already exists. The existing " "backup will therefore be overwritten.")); return; @@ -588,7 +588,7 @@ SplitKeep::setWarning() SplitSelect::SplitSelect(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Select Split Markers")); - setSubTitle(tr("Ride will be split between marker points selected")); + setSubTitle(tr("Activity will be split between marker points selected")); QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -663,7 +663,7 @@ SplitSelect::refreshMarkers() SplitConfirm::SplitConfirm(SplitActivityWizard *parent) : QWizardPage(parent), wizard(parent) { setTitle(tr("Confirm")); - setSubTitle(tr("Split ride cannot be undone")); + setSubTitle(tr("Split activity cannot be undone")); setCommitPage(true); setButtonText(QWizard::CommitButton, tr("Confirm")); @@ -840,7 +840,7 @@ SplitConfirm::validatePage() // now make this page the last (so we can see what was done) setTitle(tr("Completed")); - setSubTitle(tr("Split Ride Completed")); + setSubTitle(tr("Split Activity Completed")); wizard->done = true; diff --git a/src/TPDownloadDialog.cpp b/src/TPDownloadDialog.cpp index 7ca4ac228..aaca50fd5 100644 --- a/src/TPDownloadDialog.cpp +++ b/src/TPDownloadDialog.cpp @@ -112,7 +112,7 @@ TPDownloadDialog::completedAthlete(QString errorStr, QListsetCalendarPopup(true); // Buttons - refreshButton = new QPushButton(tr("Refresh Ride List"), this); + refreshButton = new QPushButton(tr("Refresh List"), this); cancelButton = new QPushButton(tr("Close"),this); downloadButton = new QPushButton(tr("Download"),this); @@ -179,7 +179,7 @@ TPDownloadDialog::completedAthlete(QString errorStr, QListsetChecked(Qt::Unchecked); syncMode = new QComboBox(this); - syncMode->addItem(tr("Keep all do not delete any rides")); + syncMode->addItem(tr("Keep all do not delete")); syncMode->addItem(tr("Keep TP.com but delete Local")); syncMode->addItem(tr("Keep Local but delete TP.com")); QHBoxLayout *syncList = new QHBoxLayout; @@ -270,7 +270,7 @@ TPDownloadDialog::cancelClicked() void TPDownloadDialog::refreshClicked() { - progressLabel->setText(tr("Downloading ride list...")); + progressLabel->setText(tr("Downloading list...")); progressBar->setMinimum(0); progressBar->setMaximum(1); progressBar->setValue(0); diff --git a/src/TPUploadDialog.cpp b/src/TPUploadDialog.cpp index c52018ed4..532095c1c 100644 --- a/src/TPUploadDialog.cpp +++ b/src/TPUploadDialog.cpp @@ -55,7 +55,7 @@ context(context), cyclist(cyclist), ride(ride) uploading = true; int size = uploader->upload(context, ride); - statusLabel->setText(QString(tr("Uploading ride (%1 bytes)...")).arg(size)); + statusLabel->setText(QString(tr("Uploading (%1 bytes)...")).arg(size)); setMinimumWidth(250); } diff --git a/src/TabView.cpp b/src/TabView.cpp index 504799e8a..8dac83d16 100644 --- a/src/TabView.cpp +++ b/src/TabView.cpp @@ -60,7 +60,7 @@ TabView::TabView(Context *context, int type) : splitter->setOpaqueResize(true); // redraw when released, snappier UI stack->insertWidget(0, splitter); // splitter always at index 0 - QString heading = tr("Compare Rides and Intervals"); + QString heading = tr("Compare Activities and Intervals"); if (type == VIEW_HOME) heading = tr("Compare Date Ranges"); mainSplitter = new ViewSplitter(Qt::Vertical, heading, this); diff --git a/src/TreeMapWindow.cpp b/src/TreeMapWindow.cpp index 1b014d047..a9e90e4b9 100644 --- a/src/TreeMapWindow.cpp +++ b/src/TreeMapWindow.cpp @@ -304,7 +304,7 @@ TreeMapWindow::cellClicked(QString f1, QString f2) const RideMetricFactory &factory = RideMetricFactory::instance(); const RideMetric *metric = factory.rideMetric(settings.symbol); - ltmPopup->setData(spec, metric, QString(tr("%1 ride%2")).arg(count).arg(count == 1 ? "" : tr("s"))); + ltmPopup->setData(spec, metric, QString(tr("%1 activities"))); popup->show(); } diff --git a/src/TwitterDialog.cpp b/src/TwitterDialog.cpp index 0cea8b80f..c626b7d95 100644 --- a/src/TwitterDialog.cpp +++ b/src/TwitterDialog.cpp @@ -31,7 +31,7 @@ TwitterDialog::TwitterDialog(Context *context, RideItem *item) : { ride = item; setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(tr("Tweet Your Ride")); + setWindowTitle(tr("Tweet Activity")); QVBoxLayout *mainLayout = new QVBoxLayout(this); QGroupBox *groupBox = new QGroupBox(tr("Choose which metrics you wish to tweet: ")); @@ -72,7 +72,7 @@ TwitterDialog::TwitterDialog(Context *context, RideItem *item) : twitterMetricLayout->addWidget(twitterLengthLabel); QHBoxLayout *buttonLayout = new QHBoxLayout; - tweetButton = new QPushButton(tr("&Tweet Ride"), this); + tweetButton = new QPushButton(tr("&Tweet Activity"), this); buttonLayout->addWidget(tweetButton); cancelButton = new QPushButton(tr("&Cancel"), this); buttonLayout->addWidget(cancelButton); diff --git a/src/Views.cpp b/src/Views.cpp index 8dc9f5a15..faadfd4f1 100644 --- a/src/Views.cpp +++ b/src/Views.cpp @@ -30,7 +30,7 @@ AnalysisView::AnalysisView(Context *context, QStackedWidget *controls) : TabView(context, VIEW_ANALYSIS) { analSidebar = new AnalysisSidebar(context); - HomeWindow *a = new HomeWindow(context, "analysis", "Rides"); + HomeWindow *a = new HomeWindow(context, "analysis", "Activities"); controls->addWidget(a->controls()); controls->setCurrentIndex(0); BlankStateAnalysisPage *b = new BlankStateAnalysisPage(context); diff --git a/src/WorkoutWizard.cpp b/src/WorkoutWizard.cpp index 75b5a613a..8e87edc90 100644 --- a/src/WorkoutWizard.cpp +++ b/src/WorkoutWizard.cpp @@ -236,10 +236,10 @@ void WorkoutTypePage::initializePage() if (hackContext->rideItem()) { QString s = hackContext->rideItem()->ride()->startTime().toLocalTime().toString(); - QString importStr = tr("Import Selected Ride (") + s + ")"; + QString importStr = tr("Import Selected Activity (") + s + ")"; importRadioButton = new QRadioButton((importStr)); } else { - importRadioButton = new QRadioButton(tr("No ride selected")); + importRadioButton = new QRadioButton(tr("No activity selected")); } QVBoxLayout *groupBoxLayout = new QVBoxLayout(); @@ -635,7 +635,7 @@ void ImportPage::initializePage() { setTitle(tr("Workout Wizard")); - setSubTitle(tr("Import current ride as a Gradient Ride (slope based)")); + setSubTitle(tr("Import current activity as a Gradient ride (slope based)")); setFinalPage(true); QVBoxLayout *layout = new QVBoxLayout(); plot = new WorkoutPlot(); @@ -658,7 +658,7 @@ void ImportPage::initializePage() layout->addWidget(plot,1); QGroupBox *spinGroupBox = new QGroupBox(); - spinGroupBox->setTitle(tr("Ride Smoothing Parameters")); + spinGroupBox->setTitle(tr("Smoothing Parameters")); QLabel *gradeLabel = new QLabel(tr("Maximum Grade")); gradeBox = new QSpinBox(); gradeBox->setValue(5);