"+tr("Important:")+" " diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 87e8b85f..33b7e309 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -1108,7 +1108,7 @@ QString Daily::getMachineSettings(Day * day) { Machine * cpap = day->machine(MT_CPAP); if (cpap && day->hasEnabledSessions(MT_CPAP)) { html="
| %1 | ||||
| %1 | ||||
| "+tr("Please Note: All settings shown below are based on assumptions that nothing has changed since previous days.")+" | ||||
| "+tr("Machine Settings Unavailable")+" |
"+STR_MessageBox_Warning+": "+tr("For some reason, OSCAR does not have any backups for the following machine:")+ "
" + + ""+STR_MessageBox_Warning+": "+tr("For some reason, OSCAR does not have any backups for the following device:")+ "
" + ""+mach->brand() + " " + mach->model() + " " + mach->modelnumber() + " (" + mach->serial() + ")
"+ ""+tr("Provided you have made your own backups for ALL of your CPAP data, you can still complete this operation, but you will have to restore from your backups manually.")+"
" + ""+tr("Are you really sure you want to do this?")+"
", @@ -1870,14 +1870,14 @@ void MainWindow::on_actionRebuildCPAP(QAction *action) QString path = mach->getBackupPath(); MachineLoader *loader = lookupLoader(mach); - purgeMachine(mach); // purge destroys machine record + purgeMachine(mach); // purge destroys device record if (backups) { importCPAP(ImportPath(path, loader), tr("Please wait, importing from backup folder(s)...")); } else { if (QMessageBox::information(this, STR_MessageBox_Warning, tr("Because there are no internal backups to rebuild from, you will have to restore from your own.")+"\n\n"+ - tr("Would you like to import from your own backups now? (you will have no data visible for this machine until you do)"), + tr("Would you like to import from your own backups now? (you will have no data visible for this device until you do)"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { on_action_Import_Data_triggered(); } else { @@ -1928,14 +1928,14 @@ void MainWindow::on_actionPurgeMachine(QAction *action) if (backups) { backupnotice = "" + tr("Note as a precaution, the backup folder will be left in place.") + "
"; } else { - backupnotice = "" + tr("OSCAR does not have any backups for this machine!") + "
" + - "" + tr("Unless you have made your own backups for ALL of your data for this machine, " - "you will lose this machine's data permanently!") + "
"; + backupnotice = "" + tr("OSCAR does not have any backups for this device!") + "
" + + "" + tr("Unless you have made your own backups for ALL of your data for this device, " + "you will lose this device's data permanently!") + "
"; } if (QMessageBox::question(this, STR_MessageBox_Warning, ""+STR_MessageBox_Warning+": " + - tr("You are about to obliterate OSCAR's machine database for the following machine:
") + + tr("You are about to obliterate OSCAR's device database for the following device:") + "" + machname + "
" + backupnotice+ ""+tr("Are you absolutely sure you want to proceed?")+"
", @@ -1958,7 +1958,7 @@ void MainWindow::purgeMachine(Machine * mach) QDir dir; QString path = mach->getDataPath(); path.chop(1); - qDebug() << "path to machine" << path; + qDebug() << "path to device" << path; p_profile->DelMachine(mach); delete mach; @@ -2496,7 +2496,7 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered() delete sess; } - // We have to update the summary cache for the affected machine(s), + // We have to update the summary cache for the affected device(s), // otherwise OSCAR will still think this day has oximetry data at next launch. for (auto & mach : machines) { mach->SaveSummaryCache(); diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index 14702fac..2393bb76 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -41,7 +41,7 @@ class MainWindow; Open Source CPAP Analysis Reporter (OSCAR) is a program derived from the SleepyHead program written by Mark Watkins. - SleepyHead was a Cross-Platform Open-Source software for reviewing data from %CPAP machines, which are used in the treatment of Sleep Disorders. + SleepyHead was a Cross-Platform Open-Source software for reviewing data from %CPAP devices, which are used in the treatment of Sleep Disorders. SleepyHead was created by Mark Watkins (JediMark), an Australian software developer. @@ -60,7 +60,7 @@ class MainWindow; \section structure Program Structure OSCAR is written in C++ using Qt Toolkit library, and comprises of 3 main components \list - \li The SleepLib Database, a specialized database for working with multiple sources of Sleep machine data. + \li The SleepLib Database, a specialized database for working with multiple sources of Sleep device data. \li A custom designed, high performance and interactive OpenGL Graphing Library. \li and the main Application user interface. \endlist @@ -408,7 +408,7 @@ private: void PopulatePurgeMenu(); - //! \brief Destroy ALL the CPAP data for the selected machine + //! \brief Destroy ALL the CPAP data for the selected device void purgeMachine(Machine *); int warnidx; diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui index 2f69f266..144f1010 100644 --- a/oscar/mainwindow.ui +++ b/oscar/mainwindow.ui @@ -2492,7 +2492,7 @@ p, li { white-space: pre-wrap; }" + tr("This software is being designed to assist you in reviewing the data produced by your CPAP machines and related equipment.") + "
" + tr("This software is being designed to assist you in reviewing the data produced by your CPAP Devices and related equipment.") + "
" "" + tr("OSCAR has been released freely under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.")
diff --git a/oscar/overview.cpp b/oscar/overview.cpp
index e1375378..7d67547e 100644
--- a/oscar/overview.cpp
+++ b/oscar/overview.cpp
@@ -212,7 +212,7 @@ void Overview::CreateAllGraphs() {
ChannelID code = chan->id();
QString name = chan->fullname();
if (name.length() > 16) name = chan->label();
-// qDebug() << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype();
+// qDebug() << "Channel" << name << "type" << chan->type() << "device type" << chan->machtype();
gGraph *G = createGraph(chan->code(), name, chan->description());
if ((chan->type() == schema::FLAG) || (chan->type() == schema::MINOR_FLAG)) {
gSummaryChart * sc = new gSummaryChart(chan->code(), chan->machtype()); // gts was MT_CPAP
@@ -501,7 +501,7 @@ void Overview::ResetGraphOrder(int type)
// Process new range selection from combo button
void Overview::on_rangeCombo_activated(int index)
{
- ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type
+ ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY device type
ui->dateEnd->setMaximumDate(p_profile->LastDay());
// Exclude Journal in calculating the last day
@@ -591,7 +591,7 @@ void Overview::on_rangeCombo_activated(int index)
progress->close();
delete progress;
- // first and last dates for ANY machine type
+ // first and last dates for ANY device type
setRange(start, end);
}
diff --git a/oscar/oximeterimport.cpp b/oscar/oximeterimport.cpp
index 230934ab..726574a7 100644
--- a/oscar/oximeterimport.cpp
+++ b/oscar/oximeterimport.cpp
@@ -1005,7 +1005,7 @@ void OximeterImport::on_saveButton_clicked()
calcSPO2Drop(session);
calcPulseChange(session);
- qDebug() << "oximod - Setting up machine and session";
+ qDebug() << "oximod - Setting up device and session";
mach->setModel(oximodule->getModel());
mach->setBrand(oximodule->getVendor());
@@ -1040,9 +1040,9 @@ void OximeterImport::on_saveButton_clicked()
session->setOpened(true);
- qDebug() << "oximod - Adding session to machine";
+ qDebug() << "oximod - Adding session to device";
mach->AddSession(session);
- qDebug() << "oximod - Saving machine";
+ qDebug() << "oximod - Saving device";
mach->Save();
mach->SaveSummaryCache();
p_profile->StoreMachines();
diff --git a/oscar/oximeterimport.ui b/oscar/oximeterimport.ui
index 7c7c1e8e..4114f457 100644
--- a/oscar/oximeterimport.ui
+++ b/oscar/oximeterimport.ui
@@ -345,7 +345,7 @@ border-radius: 0px;
Please Note: OSCAR's advanced session splitting capabilities are not possible with ResMed machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile. On ResMed machines, days will split at noon like in ResMed's commercial software. Please Note: OSCAR's advanced session splitting capabilities are not possible with ResMed devices due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile. On ResMed devices, days will split at noon like in ResMed's commercial software. " + tr("It would be a good idea to check File->Preferences first,") + " " + tr("Note that some preferences are forced when a ResMed machine is detected") + " " + tr("Note that some preferences are forced when a ResMed device is detected") + " " + tr("First import can take a few minutes.") + "");
html += "";
- html += "
" + tr("Machine Information") + " " + tr("Device Information") + " %1 %2 %3 %4 %5
";
html += QString("");
html += "";
- html += "
" + tr("Changes to Machine Settings") + " " + tr("Changes to Device Settings") + "
" +
tr("as there are some options that affect import.")+"
";
+ if (hours > compliance_min) html += tr("Your device was on for %1.").arg(timestr)+"
";
else html += tr("You only had the mask on for %1.").arg(timestr)+"
";
@@ -254,7 +254,7 @@ QString Welcome::GenerateCPAPHTML()
pressSettingChanID = CPAP_Pressure; // DreamStation ventilators report EPAP/IPAP data, but the setting is Pressure
EventDataType pressure = day->settings_max(pressSettingChanID);
qDebug() << pressSettingChanID << pressure;
- html += tr("Your CPAP machine used a constant %1 %2 of air")
+ html += tr("Your CPAP device used a constant %1 %2 of air")
.arg(pressure)
.arg(schema::channel[pressChanID].units());
} else if (cpapmode == MODE_APAP) {
@@ -267,14 +267,14 @@ QString Welcome::GenerateCPAPHTML()
// pressSettingChanID = CPAP_IPAP;
// EventDataType ipap = day->settings_max(pressSettingChanID);
// EventDataType epap = day->settings_min(CPAP_EPAP);
- html += tr("Your machine used a constant %1-%2 %3 of air.")
+ html += tr("Your device used a constant %1-%2 %3 of air.")
.arg(day->validPressure(day->settings_min(CPAP_EPAP)))
.arg(day->validPressure(day->settings_max(CPAP_IPAP)))
.arg(schema::channel[CPAP_IPAP].units());
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(epapDataChanID, perc/100.0);
- html += tr("Your machine was under %1-%2 %3 for %4% of the time.")
+ html += tr("Your device was under %1-%2 %3 for %4% of the time.")
.arg(epap)
.arg(ipap)
.arg(schema::channel[pressChanID].units())
diff --git a/oscar/welcome.ui b/oscar/welcome.ui
index 8e0b5484..d4ac2b91 100644
--- a/oscar/welcome.ui
+++ b/oscar/welcome.ui
@@ -577,7 +577,7 @@ p, li { white-space: pre-wrap; }