[PATCH 1/8] Typos: use subscript for pO2 in divelogimportdialog.cpp

[Dirk Hohndel]

Miika,

will this patch mess with your changes to the CSV import code? It seems
correct to me, but I wanted to double check. Additionally, while we are at
it, we might consider spelling "depth" correctly (look for stopdetph).

/D

On Sun, Jan 25, 2015 at 05:00:18PM +0200, Lubomir I. Ivanov wrote:
> From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
> 
> Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
> ---
>  qt-ui/divelogimportdialog.cpp | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
> index ada1fc4..57faf5f 100644
> --- a/qt-ui/divelogimportdialog.cpp
> +++ b/qt-ui/divelogimportdialog.cpp
> @@ -24,7 +24,7 @@ ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(par
>  {
>  	columnNames << tr("Dive #") << tr("Date") << tr("Time") << tr("Duration") << tr("Location") << tr("GPS") << tr("Weight") << tr("Cyl. size") << tr("Start pressure") <<
>  		       tr("End pressure") << tr("Max depth") << tr("Avg depth") << tr("Divemaster") << tr("Buddy") << tr("Notes") << tr("Tags") << tr("Air temp.") << tr("Water temp.") <<
> -		       tr("O₂") << tr("He") << tr("Sample time") << tr("Sample depth") << tr("Sample temperature") << tr("Sample po2") << tr("Sample cns") << tr("Sample ndl") <<
> +		       tr("O₂") << tr("He") << tr("Sample time") << tr("Sample depth") << tr("Sample temperature") << tr("Sample pO₂") << tr("Sample cns") << tr("Sample ndl") <<
>  		       tr("Sample tts") << tr("Sample stopdepth") << tr("Sample pressure");
>  }
>  
> @@ -388,7 +388,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
>  
>  	// Special handling for APD Log Viewer
>  	if (triggeredBy == KNOWNTYPES && value == 1) {
> -		firstLine = "Sample time\tSample depth\t\t\t\t\tSample po2\t\t\t\t\t\t\t\t\tSample temperature\t\tSample cns\tSample stopdetph";
> +		firstLine = "Sample time\tSample depth\t\t\t\t\tSample pO₂\t\t\t\t\t\t\t\t\tSample temperature\t\tSample cns\tSample stopdetph";
>  		blockSignals(true);
>  		ui->CSVSeparator->setCurrentText(tr("Tab"));
>  		blockSignals(false);
> @@ -476,7 +476,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
>  		if (CSVApps[value].temperature != -1 && CSVApps[value].temperature < currColumns.count())
>  			headers.replace(CSVApps[value].temperature, tr("Sample temperature"));
>  		if (CSVApps[value].po2 != -1 && CSVApps[value].po2 < currColumns.count())
> -			headers.replace(CSVApps[value].po2, tr("Sample po2"));
> +			headers.replace(CSVApps[value].po2, tr("Sample pO₂"));
>  		if (CSVApps[value].cns != -1 && CSVApps[value].cns < currColumns.count())
>  			headers.replace(CSVApps[value].cns, tr("Sample cns"));
>  		if (CSVApps[value].ndl != -1 && CSVApps[value].ndl < currColumns.count())
> @@ -530,7 +530,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
>  						       r.indexOf(tr("Sample time")),
>  						       r.indexOf(tr("Sample depth")),
>  						       r.indexOf(tr("Sample temperature")),
> -						       r.indexOf(tr("Sample po2")),
> +						       r.indexOf(tr("Sample pO₂")),
>  						       r.indexOf(tr("Sample cns")),
>  						       r.indexOf(tr("Sample ndl")),
>  						       r.indexOf(tr("Sample tts")),
> @@ -553,7 +553,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
>  					       r.indexOf(tr("Sample time")),
>  					       r.indexOf(tr("Sample depth")),
>  					       r.indexOf(tr("Sample temperature")),
> -					       r.indexOf(tr("Sample po2")),
> +					       r.indexOf(tr("Sample pO₂")),
>  					       r.indexOf(tr("Sample cns")),
>  					       r.indexOf(tr("Sample ndl")),
>  					       r.indexOf(tr("Sample tts")),
> @@ -599,7 +599,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
>  					       r.indexOf(tr("Sample time")),
>  					       r.indexOf(tr("Sample depth")),
>  					       r.indexOf(tr("Sample temperature")),
> -					       r.indexOf(tr("Sample po2")),
> +					       r.indexOf(tr("Sample pO₂")),
>  					       r.indexOf(tr("Sample cns")),
>  					       r.indexOf(tr("Sample ndl")),
>  					       r.indexOf(tr("Sample tts")),
> -- 
> 1.7.11.msysgit.0
> 
> _______________________________________________
> subsurface mailing list
> subsurface at subsurface-divelog.org
> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface