[Lprof-devel] lprof/src/lprofqt lprofmain.cpp,1.66,1.67
Brought to you by:
hvengel
Menu
▾
▴
[Lprof-devel] lprof/src/lprofqt lprofmain.cpp,1.66,1.67
|
From: Hal E. <hv...@us...> - 2006-03-27 03:47:25
|
Update of /cvsroot/lprof/lprof/src/lprofqt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25369/src/lprofqt Modified Files: lprofmain.cpp Log Message: Bug #1455094 translation errors. Fixed all of these that I could find. Might still be a few more that need to be fixed. Will have to wait for the Russian translation to be more complete to find out. Index: lprofmain.cpp =================================================================== RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** lprofmain.cpp 26 Mar 2006 23:03:22 -0000 1.66 --- lprofmain.cpp 27 Mar 2006 03:47:22 -0000 1.67 *************** *** 561,566 **** if (!vigra::isImage(file)) { ! QMessageBox mb( QTranslator::tr("Load image failure"), ! QTranslator::tr("This image format is unsupported by LPROF\n" "on your system. Sorry. Supported ones \n" "are BMP, GIF, JPEG, PNG, PBM, PGM,\n" --- 561,566 ---- if (!vigra::isImage(file)) { ! QMessageBox mb( QTranslator::tr((QString)"Load image failure"), ! QTranslator::tr((QString)"This image format is unsupported by LPROF\n" "on your system. Sorry. Supported ones \n" "are BMP, GIF, JPEG, PNG, PBM, PGM,\n" *************** *** 578,583 **** if (!(image_data->isColor())) { ! QMessageBox mb( QTranslator::tr("Load image failure"), ! QTranslator::tr("This image is not a color RGB image.\n" "Only color images are supported at this time."), QMessageBox::Critical, --- 578,583 ---- if (!(image_data->isColor())) { ! QMessageBox mb( QTranslator::tr((QString)"Load image failure"), ! QTranslator::tr((QString)"This image is not a color RGB image.\n" "Only color images are supported at this time."), QMessageBox::Critical, *************** *** 1122,1129 **** fn = QFileDialog::getOpenFileName( dir.homeDirPath(), ! tr("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)"), this, "", ! tr("Select target image")); if (fn == QString::null) return; --- 1122,1129 ---- fn = QFileDialog::getOpenFileName( dir.homeDirPath(), ! tr((QString)"Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)"), this, "", ! tr((QString)"Select target image")); if (fn == QString::null) return; *************** *** 1483,1487 **** // qDebug("lprofMain::DoScannerProfile"); Console -> setText(""); ! SetGoButton(tr("Profiling... please wait"), FALSE); /* TRANSLATOR Text displayed in the messages widget */ ConsolePrintf(tr("Working hard..."), 0, 'c'); --- 1483,1487 ---- // qDebug("lprofMain::DoScannerProfile"); Console -> setText(""); ! SetGoButton(tr((QString)"Profiling... please wait"), FALSE); /* TRANSLATOR Text displayed in the messages widget */ ConsolePrintf(tr("Working hard..."), 0, 'c'); *************** *** 1512,1516 **** } ! SetGoButton(tr("Ready to GO!"), TRUE); } --- 1512,1516 ---- } ! SetGoButton(tr((QString)"Ready to GO!"), TRUE); } *************** *** 1521,1525 **** OutputFileNameChangedMon(); Console -> setText(""); ! SetGoButton(tr("Profiling... please wait"), FALSE); /* TRANSLATOR Text displayed in the messages widget */ ConsolePrintf(tr("Working hard..."), 0, 'c'); --- 1521,1525 ---- OutputFileNameChangedMon(); Console -> setText(""); ! SetGoButton(tr((QString)"Profiling... please wait"), FALSE); /* TRANSLATOR Text displayed in the messages widget */ ConsolePrintf(tr("Working hard..."), 0, 'c'); *************** *** 1548,1552 **** } ! SetGoButton(tr("Ready to GO!"), TRUE); // sys.lLocalConvergenceExtrapolation = extrap; } --- 1548,1552 ---- } ! SetGoButton(tr((QString)"Ready to GO!"), TRUE); // sys.lLocalConvergenceExtrapolation = extrap; } *************** *** 1739,1746 **** QString fn = QFileDialog::getSaveFileName( outprofile, ! tr("icc profiles (*.icc *.icm)\nAll files (*.*)"), this, "", ! tr("Select output profile filename")); if (fn != QString::null) SetOutputFile(fn); --- 1739,1746 ---- QString fn = QFileDialog::getSaveFileName( outprofile, ! tr((QString)"icc profiles (*.icc *.icm)\nAll files (*.*)"), this, "", ! tr((QString)"Select output profile filename")); if (fn != QString::null) SetOutputFile(fn); *************** *** 1759,1777 **** case 0: if (TargetSelector -> getFilename() == QString::null) ! SetGoButton(tr("You still have to select the target reference file"), FALSE); else if (OutputFileEdit -> text() == "") ! SetGoButton(tr("You need to specify output profile!"), FALSE); else { // OutputFileNameChanged(); if (!(Marks.ul_x>0 && Marks.ur_x>0 && Marks.ll_x>0 && Marks.lr_x>0)) ! SetGoButton(tr("You need to load a target image and select it's corners!"), FALSE); else ! SetGoButton(tr("Ready to GO!"), TRUE); } break; case 1: if (OutputFileEdit_Mon -> text().length() == 0) ! SetGoButton_2(tr("You need to specify output profile!"), FALSE); else { --- 1759,1777 ---- case 0: if (TargetSelector -> getFilename() == QString::null) ! SetGoButton(tr((QString)"You still have to select the target reference file"), FALSE); else if (OutputFileEdit -> text() == "") ! SetGoButton(tr((QString)"You need to specify output profile!"), FALSE); else { // OutputFileNameChanged(); if (!(Marks.ul_x>0 && Marks.ur_x>0 && Marks.ll_x>0 && Marks.lr_x>0)) ! SetGoButton(tr((QString)"You need to load a target image and select it's corners!"), FALSE); else ! SetGoButton(tr((QString)"Ready to GO!"), TRUE); } break; case 1: if (OutputFileEdit_Mon -> text().length() == 0) ! SetGoButton_2(tr((QString)"You need to specify output profile!"), FALSE); else { *************** *** 1780,1791 **** { if (monitorValues.items.valid_mon) ! SetGoButton_2(tr("Ready to GO!"), TRUE); else ! SetGoButton_2(tr("You need to enter monitor values."), FALSE); } else if (MonMeasurementSheet->getFilename()=="") ! SetGoButton_2(tr("You need to specify a measurement sheet!"), FALSE); else ! SetGoButton_2(tr("Ready to GO!"), TRUE); } break; --- 1780,1791 ---- { if (monitorValues.items.valid_mon) ! SetGoButton_2(tr((QString)"Ready to GO!"), TRUE); else ! SetGoButton_2(tr((QString)"You need to enter monitor values."), FALSE); } else if (MonMeasurementSheet->getFilename()=="") ! SetGoButton_2(tr((QString)"You need to specify a measurement sheet!"), FALSE); else ! SetGoButton_2(tr((QString)"Ready to GO!"), TRUE); } break; *************** *** 1926,1980 **** { QString Buff; // qDebug("lprofMain::setProfileParmsText"); ! Buff = "Resolution (CLUT points): %i"; ! Buff.sprintf(tr(Buff), sys.hdr.CLUTPoints ); ! textEditProfileParms->setText(Buff); switch (sys.hdr.ProfileVerbosityLevel) { case 0: ! textEditProfileParms->insertParagraph(tr("Profile verbosity: Only required tags"), 3); break; case 1: ! textEditProfileParms->insertParagraph(tr("Profile verbosity: Store additional tags"), 3); break; case 2: ! textEditProfileParms->insertParagraph(tr("Profile verbosity: Store anything"), 3); break; } ! textEditProfileParms->insertParagraph(tr("Regression:"), 5); ! Buff = lprofMain::tr(" Smoothness: %g"); ! Buff.sprintf(tr(Buff),sys.RsplSmoothness); ! textEditProfileParms->insertParagraph(Buff, 6); ! Buff = lprofMain::tr(" Deviation: %g"); ! Buff.sprintf(tr(Buff),sys.AvgDev); ! textEditProfileParms->insertParagraph(Buff, 7); if (sys.hdr.lUseCIECAM97s) { ! textEditProfileParms->insertParagraph(tr("CIECAM97s: "), 8); switch (sys.hdr.device.surround) { case 0: ! textEditProfileParms->insertParagraph(tr(" Average surround (>4)"),9); break; case 1: ! textEditProfileParms->insertParagraph(tr(" Average surround"), 9); break; case 2: ! textEditProfileParms->insertParagraph(tr(" Dim surround"), 9); break; case 3: ! textEditProfileParms->insertParagraph(tr(" Dark surround"), 9); break; case 4: ! textEditProfileParms->insertParagraph(tr(" Cutsheet surround"), 9); break; default: ! textEditProfileParms->insertParagraph(tr(" Average surround (>4)"), 9); } Buff = " La: %g"; --- 1926,1993 ---- { QString Buff; + const QString + res = lprofMain::tr("Resolution (CLUT points)"), + verb1 = lprofMain::tr("Profile verbosity: Only required tags"), + verb2 = lprofMain::tr("Profile verbosity: Store additional tags"), + verb3 = lprofMain::tr("Profile verbosity: Store anything"), + reg = lprofMain::tr("Regression:"), + sm = lprofMain::tr("Smoothness:"), + dev = lprofMain::tr("Deviation:"), + av4 = lprofMain::tr(" Average surround (>4)"), + av = lprofMain::tr(" Average surround"), + dim = lprofMain::tr(" Dim surround"), + dark = lprofMain::tr(" Dark surround"), + cut = lprofMain::tr(" Cutsheet surround"), + lb = lprofMain::tr("Linear Bradford "); + // qDebug("lprofMain::setProfileParmsText"); ! Buff.sprintf(": %i", sys.hdr.CLUTPoints ); ! // Buff.sprintf(Buff, sys.hdr.CLUTPoints ); ! textEditProfileParms->setText(tr((QString)"Resolution (CLUT points)") + Buff); switch (sys.hdr.ProfileVerbosityLevel) { case 0: ! textEditProfileParms->insertParagraph(tr((QString)"Profile verbosity: Only required tags"), 3); break; case 1: ! textEditProfileParms->insertParagraph(tr((QString)"Profile verbosity: Store additional tags"), 3); break; case 2: ! textEditProfileParms->insertParagraph(tr((QString)"Profile verbosity: Store anything"), 3); break; } ! textEditProfileParms->insertParagraph(tr((QString)"Regression:"), 5); ! Buff = (QString) " " + tr((QString)"Smoothness:") + Buff.sprintf(tr((QString)" %g") ,sys.RsplSmoothness); ! textEditProfileParms->insertParagraph(Buff, 6); ! Buff = (QString) " " + tr((QString)"Deviation:") + Buff.sprintf(tr((QString)" %g"),sys.AvgDev); ! textEditProfileParms->insertParagraph(Buff, 7); if (sys.hdr.lUseCIECAM97s) { ! textEditProfileParms->insertParagraph(tr("CIECAM97s: "), 8); switch (sys.hdr.device.surround) { case 0: ! textEditProfileParms->insertParagraph(tr((QString)" Average surround (>4)"),9); break; case 1: ! textEditProfileParms->insertParagraph(tr((QString)" Average surround"), 9); break; case 2: ! textEditProfileParms->insertParagraph(tr((QString)" Dim surround"), 9); break; case 3: ! textEditProfileParms->insertParagraph(tr((QString)" Dark surround"), 9); break; case 4: ! textEditProfileParms->insertParagraph(tr((QString)" Cutsheet surround"), 9); break; default: ! textEditProfileParms->insertParagraph(tr((QString)" Average surround (>4)"), 9); } Buff = " La: %g"; *************** *** 1986,1990 **** } ! else textEditProfileParms->insertParagraph(tr("Linear Bradford "), 8); } --- 1999,2003 ---- } ! else textEditProfileParms->insertParagraph(tr((QString)"Linear Bradford "), 8); } |