From 349efba0b52adfb24e6f830cfce54ccfdab84443 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 10 Dec 2019 12:45:43 -0500 Subject: [PATCH] 2019-12-10 Fred Gleason * Fixed typos in UI strings in rdlogmanager(1)'s 'Pick Report Dates' dialog. --- ChangeLog | 3 +++ rdlogmanager/pick_report_dates.cpp | 33 +++++++++++++++--------------- rdlogmanager/rdlogmanager_cs.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_de.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_es.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_fr.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_nb.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_nn.ts | 16 +++++++++++++++ rdlogmanager/rdlogmanager_pt_BR.ts | 16 +++++++++++++++ 9 files changed, 132 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index cab868a9..a7340b7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19325,3 +19325,6 @@ 2019-12-10 Fred Gleason * Fixed a regression in rdadmin(1) that caused controls to be hidden in the 'Edit Report' dialog. +2019-12-10 Fred Gleason + * Fixed typos in UI strings in rdlogmanager(1)'s 'Pick Report Dates' + dialog. diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp index b9574473..46bbbe33 100644 --- a/rdlogmanager/pick_report_dates.cpp +++ b/rdlogmanager/pick_report_dates.cpp @@ -166,7 +166,7 @@ void PickReportDates::selectEndDateData() void PickReportDates::generateData() { if(edit_startdate_edit->date()>edit_enddate_edit->date()) { - QMessageBox::warning(this,tr("Invalid Date Range"), + QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"), tr("The end date cannot be earlier than the start date!")); return; } @@ -174,14 +174,14 @@ void PickReportDates::generateData() new RDReport(edit_report_box->currentText(),rda->station(),rda->config(),this); if((edit_startdate_edit->date()!=edit_enddate_edit->date())&& (!RDReport::multipleDaysAllowed(report->filter()))) { - QMessageBox::warning(this,tr("Invalid Date Range"), + QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"), tr("This report type cannot span multiple dates!")); delete report; return; } if((edit_startdate_edit->date().month()!=edit_enddate_edit->date().month())&& (!RDReport::multipleMonthsAllowed(report->filter()))) { - QMessageBox::warning(this,tr("Invalid Date Range"), + QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"), tr("This report type cannot span multiple months!")); delete report; return; @@ -192,8 +192,8 @@ void PickReportDates::generateData() edit_svcname); QFile file(filename); if(file.exists()) { - if(QMessageBox::question(this,"File Exists", - "The report file already exists. Overwrite?", + if(QMessageBox::question(this,"RDLogManager - "+tr("File Exists"), + tr("The report file already exists. Overwrite?"), QMessageBox::Yes,QMessageBox::No)!= QMessageBox::Yes) { delete report; @@ -204,19 +204,20 @@ void PickReportDates::generateData() report->generateReport(edit_startdate_edit->date(), edit_enddate_edit->date(),rda->station(),&out_path); switch(report->errorCode()) { - case RDReport::ErrorOk: - QMessageBox::information(this,tr("Report Complete"), - tr("Report generated in")+" \""+out_path+ - "\"."); - break; + case RDReport::ErrorOk: + QMessageBox::information(this,"RDLogManager - "+tr("Report Complete"), + tr("Report generated in")+" \""+out_path+ + "\"."); + break; - case RDReport::ErrorCantOpen: - QMessageBox::warning(this,"File Error","Unable to open report file at"+ - QString("\"")+out_path+"\"!"); - break; + case RDReport::ErrorCantOpen: + QMessageBox::warning(this,"RDLogManager - "+tr("File Error"), + tr("Unable to open report file at")+ + QString("\"")+out_path+"\"!"); + break; - case RDReport::ErrorCanceled: - break; + case RDReport::ErrorCanceled: + break; } delete report; } diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index f5305f72..267f58ef 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -1507,6 +1507,22 @@ zprávu Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index ce23762d..6c359174 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -1497,6 +1497,22 @@ Report Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index fd492459..710d7621 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -1510,6 +1510,22 @@ Reporte Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index 2630b4e6..341197f3 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -1324,6 +1324,22 @@ Report Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index 0df253ad..a2a5e465 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -1500,6 +1500,22 @@ rapport Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index 0df253ad..a2a5e465 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -1500,6 +1500,22 @@ rapport Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index 77449b6e..44aee743 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -1501,6 +1501,22 @@ Relatório Report generated in + + File Exists + + + + File Error + + + + Unable to open report file at + + + + The report file already exists. Overwrite? + + RenameItem