diff --git a/fl_i18n/Makefile b/fl_i18n/Makefile index bf5bc14..3824f35 100644 --- a/fl_i18n/Makefile +++ b/fl_i18n/Makefile @@ -9,8 +9,8 @@ XINERAMA_LIB = -lXinerama X11_LIB_PATH = -L/usr/X11R6/lib$(BARCH) -L/usr/lib$(BARCH) -L$(libdir) X11_LIBS=$(X11_LIB_PATH) -lX11 $(XF86VMODE_LIB) -lXpm -lXext $(XINERAMA_LIB) FLTK = 1 -FLTK_H = -I/usr/include/freetype2 -march=i586 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fno-strict-aliasing -FLTK_LIBS = -lfltk_images -lpng -lz -ljpeg -lfltk_gl -lGLU -lGL -lfltk -lXft -lXinerama -lpthread -lm -lXext -lX11 +FLTK_H = -I/opt/test1/include -I/usr/include/freetype2 -I/usr/X11R6/include +FLTK_LIBS = -L/opt/test1/lib -L/usr/X11R6/lib -lfltk_images -lpng -lz -ljpeg -lfltk_gl -lGLU -lGL -lfltk -lXft -lXinerama -lpthread -lm -lXext -lX11 dl = -ldl GETTEXT = -DUSE_GETTEXT DEBUG = -Wall -g -DDEBUG --pedantic diff --git a/icc_helfer_osx.cpp b/icc_helfer_osx.cpp index d0682b6..366dc32 100644 --- a/icc_helfer_osx.cpp +++ b/icc_helfer_osx.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Aufbereitung von osX internen Informationen - werkzeugabhängig + * preparation of osX internal informations - toolkitdependent * */ @@ -70,7 +70,7 @@ leseGrafikKartenGamma (std::string display_name, texte[2] = _("Blue"); texte[3] = "gamma_start_ende"; - texte.push_back(_("Hersteller: ")); + texte.push_back(_("Manufacturer: ")); //texte[texte.size()-1].append(monitor.vendor); texte.push_back(_("Model: ")); //texte[texte.size()-1].append(monitor.model); @@ -117,7 +117,7 @@ leseGrafikKartenGamma (std::string display_name, } } - } else DBG_NUM_S( "kein vcgt in X anzeigbar" ) + } else DBG_NUM_S( "no vcgt in X displayable" ) bail: @@ -159,7 +159,7 @@ namespace icc_examin_ns { DBG_PROG_S( adresse ) CFRelease(cfstring); if(text) free (text); - } else { WARN_S( "Für "< #include -// Helferfunktionen -// definiert in icc_helfer_x.cpp / icc_helfer_osx.cpp +// helper functions +// defined in icc_helfer_x.cpp / icc_helfer_osx.cpp std::vector >leseGrafikKartenGamma(std::string display_name, std::vector &texte, int x, int y ); diff --git a/icc_icc.h b/icc_icc.h index 128ac59..e7b3589 100644 --- a/icc_icc.h +++ b/icc_icc.h @@ -32,7 +32,7 @@ #include -// Zusaetze - nicht definiert in icc34.h +// additionals - not defined in icc34.h #ifndef icSigChromaticityType #define icSigChromaticityType 0x6368726D // chrm diff --git a/icc_info.h b/icc_info.h index 2238970..5d36a4a 100644 --- a/icc_info.h +++ b/icc_info.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Die Infos + * infos * */ diff --git a/icc_kette.cpp b/icc_kette.cpp index a17f5e2..c8cf8e6 100644 --- a/icc_kette.cpp +++ b/icc_kette.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Die Kette von Profilen Klasse. + * the chain of profiles. * */ @@ -51,29 +51,28 @@ ICCkette::init () { DBG_PROG_START aktuelles_profil_ = -1; # if USE_THREADS - // Es gibt drei threads. - // Der erste Neben-thread started eine while Schleife zum Beobachten - // der göffneten Dateien. - // Im Haupthread laeuft ICCexamin. - // Ein weiterer Thread übernimmt das Laden von neuen Daten. + // There are three basic threads for ICC Examin. + // iThe first one starts a while loop to observe the opened files + // In the main thread runs ICCexamin. + // A additional thread loads new files. int fehler = fl_create_thread( getThreadId(THREAD_WACHE), &waechter, (void *)this ); if(!fehler) - DBG_PROG_S( "neuer Thread" ); + DBG_PROG_S( "new thread" ); if( fehler == EAGAIN) { - WARN_S( "Waechter Thread nicht gestartet Fehler: " << fehler ); + WARN_S( "Observer thread not started. Error: " << fehler ); } else # if !APPLE && !WIN32 && PTHREAD_THREADS_MAX if( fehler == (int)PTHREAD_THREADS_MAX ) { - WARN_S( "zu viele Waechter Threads Fehler: " << fehler ); + WARN_S( "Too many observer threads. Error: " << fehler ); } else # endif if( fehler != 0 ) { - WARN_S( "unbekannter Fehler beim Start eines Waechter Threads Fehler: " << fehler ); + WARN_S( "Unknown error at start of observer threads. Error: " << fehler ); } # else @@ -119,7 +118,7 @@ ICCkette::einfuegen (const Speicher & prof, int pos) DBG_PROG_V( pos ) - // Laden TODO: test auf Korrektheit des Profiles (oyranos?) + // Load TODO: test for correctnes of a profile (oyranos?) if (pos < 0 || pos >= (int)profile_.size() ) { @@ -148,7 +147,7 @@ ICCkette::einfuegen (const Speicher & prof, int pos) DBG_PROG_V( dtype ) int extra_benachrichtigen = -1; - // Messdaten sollten dem ersten Profil, so es normal ist, angehangen werden + // measurement data should be appended after the first profile, as normal if(profile_[0].data_type == ICCprofile::ICCprofileDATA) { //ICCmeasurement m; @@ -240,7 +239,7 @@ ICCkette::waechter (void* zeiger) { DBG_MEM_V( obj->profil_mzeit_[i] ) if( obj->profil_mzeit_[i] != 0 ) { - // lade in LADEN und warte auf Ergebnis + // load in LADEN and wait for result icc_examin->erneuern(i); } obj->profil_mzeit_[i] = m_zeit; diff --git a/icc_kette.h b/icc_kette.h index d62ad62..12ee8f0 100644 --- a/icc_kette.h +++ b/icc_kette.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Die Kette von Profilen Klasse + * chain of profiles * */ @@ -54,14 +54,14 @@ class ICCkette : public icc_examin_ns::ThreadDaten, aktiv_.clear(); profil_mzeit_.clear(); } private: int aktuelles_profil_; - /** Liste der geladenen Profile */ + /** list of loaded profiles */ std::vector profile_; std::vector profilnamen_; std::vector aktiv_; std::vector profil_mzeit_; - /** Starte einen pthread Wächter und lasse Ihn alle unsere Beobachter - informieren, welches Profile gerade geändert wurde. + /** Start a pthread observer, and let him inform all our observers, + which profile was just changed. */ static # if USE_THREADS diff --git a/icc_main.cpp b/icc_main.cpp index 423d34c..09477db 100644 --- a/icc_main.cpp +++ b/icc_main.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Start Funktion. + * start function * */ diff --git a/icc_measurement.cpp b/icc_measurement.cpp index 7bf861a..0bd3fe7 100644 --- a/icc_measurement.cpp +++ b/icc_measurement.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Qualtitaetspruefung anhand von Messdaten welche im Profil vorhanden sind. + * qualtity check from measurements, possibly from inside profile itself * */ @@ -43,7 +43,7 @@ #include "icc_utils.h" -#include // fuer CGATS lesen +//#include // for CGATS reading #include "icc_profile.h" #include "icc_oyranos.h" #include "icc_examin_version.h" @@ -57,7 +57,7 @@ using namespace icc_examin_ns; /** - * @brief ICCmeasurement Funktionen + * @brief ICCmeasurement functions */ int icc_measurement_id_ = 0; @@ -90,7 +90,7 @@ ICCmeasurement::ICCmeasurement (const ICCmeasurement& m) ICCmeasurement::ICCmeasurement () { DBG_PROG_START - WARN_S( "----------------------- den default Konstruktor nicht benutzen --------------------------" ) + WARN_S( "----------------------- dont use the default constructor --------------------------" ) id_ = icc_measurement_id_++; DBG_MEM_V( id_ ) defaults(); @@ -156,18 +156,18 @@ ICCmeasurement::copy (const ICCmeasurement& m) XYZ_measurement_ = m.XYZ_measurement_; RGB_measurement_ = m.RGB_measurement_; CMYK_measurement_ = m.CMYK_measurement_; - // Messwerte + // measurments XYZ_Satz_ = m.XYZ_Satz_; Lab_Satz_ = m.Lab_Satz_; RGB_Satz_ = m.RGB_Satz_; CMYK_Satz_ = m.CMYK_Satz_; - // Profilwerte + // profile values Feldnamen_ = m.Feldnamen_; XYZ_Ergebnis_ = m.XYZ_Ergebnis_; Lab_Ergebnis_ = m.Lab_Ergebnis_; RGB_MessFarben_ = m.RGB_MessFarben_; RGB_ProfilFarben_ = m.RGB_ProfilFarben_; - // Ergebnisse + // results Lab_Differenz_ = m.Lab_Differenz_; Lab_Differenz_max_ = m.Lab_Differenz_max_; Lab_Differenz_min_ = m.Lab_Differenz_min_; @@ -215,7 +215,7 @@ ICCmeasurement::load ( ICCprofile *profil, ICCtag& tag ) { DBG_PROG_START profile_ = profil; - if (!profile_) WARN_S( "kann nicht initialisieren, Profilreferenz fehlt" ) + if (!profile_) WARN_S( "cant initialise, profile referenz is missed" ) //DBG_MEM_V( profile_->hasTagName("targ") << profile_->printLongHeader() ) sig_ = tag._sig; @@ -224,7 +224,7 @@ ICCmeasurement::load ( ICCprofile *profil, else size_ = 0; DBG_PROG_V( size_ ) - // einfach austauschen + // simply exchange if (data_ != NULL) { free (data_); data_ = NULL; } if(size_) { @@ -241,13 +241,13 @@ ICCmeasurement::load ( ICCprofile *profil, size_t size ) { DBG_PROG_START profile_ = profil; - if (!profile_) WARN_S( "kann nicht initialisieren, Profilreferenz fehlt" ) + if (!profile_) WARN_S( "cant initialise, profile referenz is missed" ) if (sig_ != icMaxEnumTag) sig_ = icSigCharTargetTag; size_ = size; - // einfach austauschen + // simply exchange if (!data_) free (data_); data_ = (char*) calloc ( size_+1 , sizeof (char) ); memcpy ( data_ , data , size_ ); @@ -267,18 +267,18 @@ ICCmeasurement::leseTag (void) std::string data = cgats.lcms_gefiltert (); DBG_NUM_V( (int*)data_ <<" "<< size_ ) - // locale - Kommas unterscheiden (Vorsicht: CgatsFilter veraendert LC_NUMERIC) + // locale - differentiate commas (Attention: CgatsFilter changes LC_NUMERIC) doLocked_m( const char* loc_alt = setlocale(LC_NUMERIC, NULL);,NULL) //getenv("LANG"); if(loc_alt) { DBG_NUM_V( loc_alt ) } else { - DBG_NUM_S( "keine LANG Variable gefunden" ) + DBG_NUM_S( "LANG variable not found" ) } setlocale(LC_NUMERIC,"C"); if(data.size()) { - // korrigierte CGATS Daten -> data_ + // correct CGATS data -> data_ if (data_ != NULL) { free (data_); data_ = NULL; } data_ = (char*) calloc (sizeof(char), data.size()+1); @@ -293,15 +293,15 @@ ICCmeasurement::leseTag (void) //LCMSHANDLE _lcms_it8 = cmsIT8LoadFromMem ( data_, size_ ); DBG_MEM_V( (int*)data_) const char **SampleNames; DBG_MEM - int m = 0; // aktuelle Messung + int m = 0; // actual measurement - // Messfeldanzahl + // measurement spot number if (nFelder_ == 0 || nFelder_ == cgats.messungen[m].block_zeilen) { DBG_NUM nFelder_ = cgats.messungen[m].block_zeilen; DBG_NUM } else { - WARN_S( "Messfeldanzahl sollte schon uebereinstimmen! " << nFelder_ << "|" << (int)cgats.messungen[m].block_zeilen ) + WARN_S( "number of measurements should corespond! " << nFelder_ << "|" << (int)cgats.messungen[m].block_zeilen ) clear(); return; } @@ -323,7 +323,7 @@ ICCmeasurement::leseTag (void) SampleNames[i] = cgats.messungen[m].felder[0][i].c_str(); - // Was ist alles da? Wollen wir spaeter die Namen tauschen? + // What is all here? Do we want do exchange the names later? for (int i = 0; i < _nKanaele; i++) { if (strstr(cgats.messungen[m].felder[0][i].c_str(),"SAMPLE_ID") != 0) _sample_id = true; @@ -338,9 +338,9 @@ ICCmeasurement::leseTag (void) # endif } - // Auslesen und Aufbereiten + // reding and parsing std::vector farbkanaele; - // muessen lokal bleiben ! + // locals ! bool has_Lab = false; bool has_XYZ = false; bool has_CMYK = false; @@ -351,32 +351,32 @@ ICCmeasurement::leseTag (void) if ((strstr (SampleNames[i], "LAB_L") != 0) || (strstr (SampleNames[i], "LAB_A") != 0) || (strstr (SampleNames[i], "LAB_B") != 0)) { - DBG_PROG_S( "Lab Daten " ) + DBG_PROG_S( "Lab data " ) has_Lab = true; farbkanaele.push_back(SampleNames[i]); } else if ((strstr (SampleNames[i], "XYZ_X") != 0) || (strstr (SampleNames[i], "XYZ_Y") != 0) || (strstr (SampleNames[i], "XYZ_Z") != 0)) { - DBG_PROG_S( "XYZ Daten " ) + DBG_PROG_S( "XYZ data " ) has_XYZ = true; farbkanaele.push_back(SampleNames[i]); } else if ((strstr (SampleNames[i], "CMYK_C") != 0) || (strstr (SampleNames[i], "CMYK_M") != 0) || (strstr (SampleNames[i], "CMYK_Y") != 0) || (strstr (SampleNames[i], "CMYK_K") != 0)) { - DBG_PROG_S( "CMYK Daten " ) + DBG_PROG_S( "CMYK data " ) has_CMYK = true; farbkanaele.push_back(SampleNames[i]); } else if ((strstr (SampleNames[i], "RGB_R") != 0) || (strstr (SampleNames[i], "RGB_G") != 0) || (strstr (SampleNames[i], "RGB_B") != 0)) { - DBG_PROG_S( "RGB Daten " ) + DBG_PROG_S( "RGB data " ) has_RGB = true; farbkanaele.push_back(SampleNames[i]); } else if ((strstr (SampleNames[i], "XYY_X") != 0) || (strstr (SampleNames[i], "XYY_Y") != 0) || (strstr (SampleNames[i], "XYY_CAPY") != 0)) { - DBG_PROG_S( "xyY Daten " ) + DBG_PROG_S( "xyY data " ) has_xyY = true; farbkanaele.push_back(SampleNames[i]); } else { @@ -385,7 +385,7 @@ ICCmeasurement::leseTag (void) } DBG_PROG - // Variablen + // variables int farben = 0; if (has_Lab) {farben++; LAB_measurement_ = true; } if (has_XYZ) {farben++; XYZ_measurement_ = true; } @@ -394,12 +394,12 @@ ICCmeasurement::leseTag (void) if (has_xyY) farben++; - // vorlaeufige lcms Farbnamen listen + // list lcms colour names Feldnamen_.resize(nFelder_); DBG_PROG_V( nFelder_ ) for (int k = 0; k < nFelder_; k++) { if (_id_vor_name - && (getTagName() != "DevD")) {// Name ignorieren + && (getTagName() != "DevD")) {// ignore names char *text = (char*) calloc (sizeof(char), 12); sprintf (text, "%d", k+1); Feldnamen_[k] = text; @@ -418,9 +418,9 @@ ICCmeasurement::leseTag (void) DBG_NUM_V( has_XYZ << has_Lab << has_RGB << has_CMYK ) - // Farben auslesen + // read colours if (has_XYZ) - { DBG_PROG // keine Umrechnung noetig + { DBG_PROG // no calculation required XYZ_Satz_.resize(nFelder_); for (int i = 0; i < nFelder_; i++) { for (int j = 0; j < _nKanaele; ++j) { @@ -434,7 +434,7 @@ ICCmeasurement::leseTag (void) } } if (has_Lab) - { DBG_PROG // keine Umrechnung noetig + { DBG_PROG // no calculation required Lab_Satz_.resize(nFelder_); for (int i = 0; i < nFelder_; i++) { for (int j = 0; j < _nKanaele; ++j) { @@ -447,7 +447,7 @@ ICCmeasurement::leseTag (void) } } } - if (has_RGB) { DBG_PROG // keine Umrechnung noetig + if (has_RGB) { DBG_PROG // no calculation required RGB_Satz_.resize(nFelder_); for (int i = 0; i < nFelder_; i++) { for (int j = 0; j < _nKanaele; ++j) { @@ -460,7 +460,7 @@ ICCmeasurement::leseTag (void) } } } - if (has_CMYK) { DBG_PROG // keine Umrechnung noetig + if (has_CMYK) { DBG_PROG // no calculation required CMYK_Satz_.resize(nFelder_); for (int i = 0; i < nFelder_; i++) { for (int j = 0; j < _nKanaele; ++j) { @@ -477,14 +477,14 @@ ICCmeasurement::leseTag (void) } - // Farbnamen nach Geschmack (unmittelbar vor cmsIT8Free !) + // colour names of taste if (_id_vor_name) { for (int i = 0; i < nFelder_; i++) { for (int j = 0; j < _nKanaele; ++j) { if( SampleNames[j] == "SAMPLE_NAME" ) Feldnamen_[i] = cgats.messungen[m].block[i][j].c_str(); } - } DBG_NUM_S (Feldnamen_[0] <<" bis "<< Feldnamen_[nFelder_-1] <<" "<< nFelder_) + } DBG_NUM_S (Feldnamen_[0] <<" to "<< Feldnamen_[nFelder_-1] <<" "<< nFelder_) } DBG_NUM_V( XYZ_Satz_.size() ) @@ -509,7 +509,7 @@ ICCmeasurement::init (void) if( profile_->data_type == ICCprofile::ICCcorruptedprofileDATA ) return; - if (!profile_) WARN_S( "kann nicht initialisieren, Profilreferenz fehlt; id: "<hasTagName("targ")) { load (profile_, profile_->getTag(profile_->getTagIDByName("targ"))); @@ -742,13 +742,13 @@ ICCmeasurement::init_umrechnen (void) { int maxFeld=0, minFeld=0; const char *maxFN=0, *minFN=0; if (nFelder_ != (int)XYZ_Satz_.size()) { - DBG_PROG_S("Messfeldanzahl divergiert"); + DBG_PROG_S("divergine measurement count"); } int m = nFelder_ < (int)XYZ_Satz_.size() ? nFelder_ : (int)XYZ_Satz_.size(); if(!m && isICCDisplay_) WARN_S("No XYZ data available. Dont support this display profile?"); - DBG_PROG_S( "Felder: " << m ) + DBG_PROG_S( "fields: " << m ) for (int i = 0; i < m; i++) { @@ -789,11 +789,11 @@ ICCmeasurement::init_umrechnen (void) if (getColorSpaceName(profile_->header.colorSpace()) != "Rgb" && getColorSpaceName(profile_->header.colorSpace()) != "Cmyk") { - WARN_S("unterschiedliche Messdaten und Profilfarbraum ") + WARN_S("different mesurement- and profile colour space ") DBG_PROG_V( getColorSpaceName(profile_->header.colorSpace()) ) } - // ein passendes Bildschirm- / Darstellungsprofil aussuchen + // select a fitting monitor- / displayprofile if(!export_farben) { # ifdef HAVE_OY @@ -807,7 +807,7 @@ ICCmeasurement::init_umrechnen (void) hsRGB = cmsOpenProfileFromMem(const_cast(block), groesse); DBG_PROG_S( icc_oyranos.moni_name( x,y ) << " Farben" ) # endif - } else { DBG_PROG_S( "Export Farben" ); } + } else { DBG_PROG_S( "Export colours" ); } if(!hsRGB) { @@ -817,9 +817,9 @@ ICCmeasurement::init_umrechnen (void) hLab = cmsCreateLabProfile (cmsD50_xyY()); hXYZ = cmsCreateXYZProfile (); - if( !hXYZ ) WARN_S("hXYZ ist leer") - if( !hLab ) WARN_S("hLab ist leer") - if( !hsRGB ) WARN_S("hsRGB ist leer") + if( !hXYZ ) WARN_S("hXYZ is empty") + if( !hLab ) WARN_S("hLab is empty") + if( !hsRGB ) WARN_S("hsRGB is empty") # if 0 # define BW_COMP cmsFLAGS_WHITEBLACKCOMPENSATION @@ -832,7 +832,7 @@ ICCmeasurement::init_umrechnen (void) const char* block = 0; block = const_cast( icc_oyranos.proof(groesse) ); hProof = cmsOpenProfileFromMem(const_cast(block), groesse); - if( !hProof ) WARN_S("hProof ist leer") + if( !hProof ) WARN_S("hProof is empty") } if ((RGB_measurement_ || @@ -847,7 +847,7 @@ ICCmeasurement::init_umrechnen (void) if( profile_->size() ) hCOLOUR = cmsOpenProfileFromMem (const_cast(profile_->data_), profile_->size_); - else { // Alternative + else { // alternative size_t groesse = 0; const char* block = 0; # ifdef HAVE_OY @@ -860,28 +860,28 @@ ICCmeasurement::init_umrechnen (void) DBG_PROG_V( groesse ) if( !groesse ) { - WARN_S("kein passendes voreingestelltes Profil gefunden") + WARN_S("no suitable default profile found") goto Kein_Profil; //TODO } else hCOLOUR = cmsOpenProfileFromMem(const_cast(block), groesse); } if( !hCOLOUR ) - WARN_S("hCOLOUR ist leer") + WARN_S("hCOLOUR is empty") fortschritt(0.1 , 0.2); - // Wie sieht das Profil die Messfarbe? -> XYZ + // How dees the profile the measurement colour? -> XYZ hCOLOURtoXYZ = cmsCreateTransform (hCOLOUR, TYPE_nCOLOUR_DBL, hXYZ, TYPE_XYZ_DBL, INTENT_ABSOLUTE_COLORIMETRIC, PRECALC|BW_COMP); fortschritt(0.1, 0.2); - // Wie sieht das Profil die Messfarbe? -> Lab + // How dees the profile the measurement colour? -> Lab hCOLOURtoLab = cmsCreateTransform (hCOLOUR, TYPE_nCOLOUR_DBL, hLab, TYPE_Lab_DBL, INTENT_ABSOLUTE_COLORIMETRIC, PRECALC|BW_COMP); fortschritt(0.15, 0.2); - // Wie sieht das Profil die Messfarbe? -> Bildschirmdarstellung + // How dees the profile the measurement colour? -> monitor hCOLOURtoRGB = cmsCreateProofingTransform (hCOLOUR, TYPE_nCOLOUR_DBL, hsRGB, TYPE_RGB_DBL, hProof, @@ -895,13 +895,13 @@ ICCmeasurement::init_umrechnen (void) Kein_Profil: if (XYZ_measurement_ || LAB_measurement_) { - // Wie sieht das Messgeraet die Messfarbe? -> Lab + // How sees the measurement device the measurement colour? -> Lab hXYZtoLab = cmsCreateTransform (hXYZ, TYPE_XYZ_DBL, hLab, TYPE_Lab_DBL, INTENT_ABSOLUTE_COLORIMETRIC, PRECALC|BW_COMP); - // Wie sieht die CMM die Messfarbe? -> Bildschirmdarstellung + // How sees the CMM the measurement colour? -> monitor hLabtoRGB = cmsCreateProofingTransform (hLab, TYPE_Lab_DBL, hsRGB, TYPE_RGB_DBL, hProof, @@ -938,13 +938,13 @@ ICCmeasurement::init_umrechnen (void) RGB_ProfilFarben_.resize(nFelder_); if( (int)XYZ_Satz_.size() != nFelder_ ) - DBG_PROG_S("XYZ_Satz_.size() und nFelder_ sind ungleich") + DBG_PROG_S("XYZ_Satz_.size() and nFelder_ are unequal") if( (int)Lab_Satz_.size() != nFelder_ ) - DBG_PROG_S("Lab_Satz_.size() und nFelder_ sind ungleich") + DBG_PROG_S("Lab_Satz_.size() and nFelder_ are unequal") if( RGB_Satz_.size() && (int)RGB_Satz_.size() != nFelder_ ) - WARN_S("RGB_Satz_.size() und nFelder_ sind ungleich") + WARN_S("RGB_Satz_.size() and nFelder_ are unequal") if( CMYK_Satz_.size() && (int)CMYK_Satz_.size() != nFelder_ ) - WARN_S("CMYK_Satz_.size() und nFelder_ sind ungleich") + WARN_S("CMYK_Satz_.size() and nFelder_ are unequal") for (int i = 0; i < nFelder_; i++) { if (XYZ_measurement_ || LAB_measurement_) @@ -952,7 +952,7 @@ ICCmeasurement::init_umrechnen (void) if (XYZ_measurement_) { if (isICCDisplay_) { - // Messfarben auf Weiss und Schwarz addaptiert + // adapt measurement to white and black XYZ[0] = (XYZ_Satz_[i].X-min[0])/(max[0]-min[0])*WP[0]; XYZ[1] = (XYZ_Satz_[i].Y-min[1])/(max[1]-min[1])*WP[1]; XYZ[2] = (XYZ_Satz_[i].Z-min[2])/(max[2]-min[2])*WP[2]; @@ -985,7 +985,7 @@ ICCmeasurement::init_umrechnen (void) CMYK_measurement_)) { - // Profilfarben + // profile colours if (RGB_measurement_) { //for (int n = 0; n < channels_; n++) Farbe[0] = RGB_Satz_[i].R*100.0; DBG_MESS_V( RGB_Satz_[i].R ) @@ -1009,7 +1009,7 @@ ICCmeasurement::init_umrechnen (void) if(Lab_Satz_.size()) { - // geometrische Farbortdifferenz - dE CIE*Lab + // geometric colour differenze - dE CIE*Lab double cie_erg[3], cie_satz[3]; LabToCIELab( Lab_Ergebnis_[i], cie_erg ); LabToCIELab( Lab_Satz_[i], cie_satz ); @@ -1056,7 +1056,7 @@ ICCmeasurement::init_umrechnen (void) if(hXYZ) cmsCloseProfile (hXYZ); if(hProof) cmsCloseProfile (hProof); } else - WARN_S("keine RGB/CMYK und XYZ Messdaten gefunden") + WARN_S("no RGB/CMYK and XYZ measurements found") for (unsigned int i = 0; i < Lab_Differenz_.size(); i++) { Lab_Differenz_Durchschnitt_ += Lab_Differenz_[i]; @@ -1078,12 +1078,12 @@ ICCmeasurement::init_umrechnen (void) std::string ICCmeasurement::getHtmlReport (bool aussen) { DBG_PROG_START - char SF[] = "#cccccc"; // standard Hintergrundfarbe - char HF[] = "#aaaaaa"; // hervorgehoben + char SF[] = "#cccccc"; // standard background colours + char HF[] = "#aaaaaa"; // emphasised # define LAYOUTFARBE if (layout[l++] == true) \ html << HF; \ else \ - html << SF; //Farbe nach Layoutoption auswaehlen + html << SF; // select colour after layout option int l = 0; std::stringstream html; DBG_NUM_V( RGB_MessFarben_.size() ) @@ -1106,12 +1106,12 @@ ICCmeasurement::getHtmlReport (bool aussen) html << "\n"; html << "" << endl << endl; - int kopf = (int)reportTabelle_.size() - nFelder_; // Kopf ueber Tabelle + int kopf = (int)reportTabelle_.size() - nFelder_; // head over table if (kopf < 0) kopf = (int)reportTabelle_.size(); - int tkopf = 1; // Tabellenkopf + int tkopf = 1; // tablen head if (reportTabelle_.size() <= 1) tkopf = 0; - // Allgemeine Informationen + // common informations html << dateiName( profile_->filename() ) << ":
"; for (int i = 0; i < kopf - tkopf ; i++) { DBG_NUM_S (nFelder_<<"|"<"; @@ -1126,15 +1126,15 @@ ICCmeasurement::getHtmlReport (bool aussen) html << "\n"; html << " \n"; html << " \n"; - // Tabellenkopf - int s = 0; // Spalten - int f = 0; // Spalten fuer Farben + // tablen head + int s = 0; // cols + int f = 0; // cols for colours if (XYZ_Satz_.size() && RGB_MessFarben_.size() == XYZ_Satz_.size()) { f = 2; } DBG_PROG_V( reportTabelle_.size() ) DBG_PROG_V( reportTabelle_[reportTabelle_.size()-1][0]<<" "<\n"; html << "\n\n"; - // Messfelder + // measurements fields # define NACH_HTML(satz,kanal) \ sprintf (farbe, "%x", (int)(satz[z].kanal*mult+0.5)); \ if (strlen (farbe) == 1) \ @@ -1161,12 +1161,12 @@ ICCmeasurement::getHtmlReport (bool aussen) char farbe[17]; double mult = 256.0; - if(tkopf) // ohne Tabellenkopf keine Tabelle + if(tkopf) // without table head no table for (int z = 0; z < nFelder_; z++) { html << " \n"; l = 0; for (s = 0; s < (int)reportTabelle_[kopf - tkopf].size() + f; s++) { - if (s < f) { // Farbdarstellung + if (s < f) { // colour representation html << "
> tabelle (1); std::stringstream s; - int z = 0; // Zeilen + int z = 0; // rows tabelle[0].resize(1); tabelle[0][0] = _("no measurment data or correct profile conversion available"); if ((CMYK_measurement_ || RGB_measurement_) && (XYZ_measurement_ || LAB_measurement_)) { - tabelle.resize(nFelder_+5); // push_back ist zu langsam - // Tabellenueberschrift + tabelle.resize(nFelder_+5); // push_back is too slow + // table head line tabelle[0].resize(1); tabelle[0][0] = _("Measurment- and profile colours from "); if (RGB_measurement_) @@ -1235,14 +1235,14 @@ ICCmeasurement::getText (void) s << "___________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________"; tabelle[z][0] = s.str(); z++; - // Tabellenkopf + // table head int spalten, sp = 0, xyz_erg_sp = 0; int h = false; if (XYZ_Ergebnis_.size() == XYZ_Satz_.size()) xyz_erg_sp = 3; -# define HI (h == true) ? h-- : h++ // invertieren +# define HI (h == true) ? h-- : h++ // invert layout.clear(); - layout.push_back (HI); // Messfeld + layout.push_back (HI); // measurement layout.push_back (HI); // dE Lab layout.push_back (HI); // dE2000 layout.push_back (h); layout.push_back (h); layout.push_back (HI); // Lab @@ -1286,7 +1286,7 @@ ICCmeasurement::getText (void) tabelle[z][sp++] = _("K"); } DBG_PROG_V( z <<" "<< nFelder_ <<" "<< tabelle.size() ) z++; - // Messwerte + // measurements s.str(""); # define DBG_TAB_V(txt) for (int i = 0; i < nFelder_; i++) { @@ -1376,7 +1376,7 @@ ICCmeasurement::getMessRGB (int patch) init (); if (patch > nFelder_) { - WARN_S( "Patch Nr: " << patch << " ausserhalb des Messfarbsatzes" ) + WARN_S( "Patch No: " << patch << " outside the measurment set" ) DBG_MESS_ENDE return punkte; } @@ -1398,7 +1398,7 @@ ICCmeasurement::getCmmRGB (int patch) init (); if (patch > nFelder_) { - WARN_S( "Patch Nr: " << patch << " ausserhalb des Messfarbsatzes" ) + WARN_S( "Patch No: " << patch << " outside the measurement set" ) DBG_MESS_ENDE return punkte; } @@ -1420,7 +1420,7 @@ ICCmeasurement::getMessLab (int patch) init (); if (patch > nFelder_) { - WARN_S( "Patch Nr: " << patch << " ausserhalb des Messfarbsatzes" ) + WARN_S( "Patch No: " << patch << " ausserhalb des Messfarbsatzes" ) DBG_MESS_ENDE return punkte; } @@ -1442,7 +1442,7 @@ ICCmeasurement::getCmmLab (int patch) init (); if (patch > nFelder_) { - WARN_S( "Patch Nr: " << patch << " ausserhalb des Messfarbsatzes" ) + WARN_S( "Patch Nr: " << patch << " outside the measurement set" ) DBG_MESS_ENDE return punkte; } diff --git a/icc_measurement.h b/icc_measurement.h index eabde50..8a3ed46 100644 --- a/icc_measurement.h +++ b/icc_measurement.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -38,10 +38,10 @@ #include "icc_profile_tags.h" /** - * @brief liest CGATS aus einem Profil + * @brief reads CGATS from a profile * - * Typischerweise wird ICCmeasurement einem ICCprofile zugeordnet. - * CIE* Lab, CIE* XYZ, RGB und CMYK werden unterstützt. + * typicaly a ICCmeasurement is associated to a ICCprofile. + * CIE* Lab, CIE* XYZ, RGB and CMYK are supported. Spectal can be added. **/ @@ -64,13 +64,13 @@ class ICCmeasurement { ICCmeasurement& operator= (const ICCmeasurement& m); private: - // laden und auswerten + // load and analyse void leseTag (); - // Berechnen aller Mess- und Profilwerte + // calculate of all measurement- and profile values void init_umrechnen (void); // ?? void pruefen (void); - // lcms cgats Leser + // lcms cgats reader void lcms_parse (); private: @@ -84,23 +84,23 @@ class ICCmeasurement { int nFelder_; - //! wird nur gesetzt wenn in CGATS vorhanden + //! is only set when in CGATS available bool XYZ_measurement_; bool LAB_measurement_; bool RGB_measurement_; bool CMYK_measurement_; - // Messwerte + // measurement values std::vector XYZ_Satz_; std::vector Lab_Satz_; std::vector RGB_Satz_; std::vector CMYK_Satz_; - // Profilwerte + // profile values std::vector Feldnamen_; std::vector XYZ_Ergebnis_; std::vector Lab_Ergebnis_; std::vector RGB_MessFarben_; std::vector RGB_ProfilFarben_; - // Ergebnisse + // results std::vector Lab_Differenz_; double Lab_Differenz_max_; double Lab_Differenz_min_; @@ -118,7 +118,7 @@ class ICCmeasurement { void load (ICCprofile* profil , const char *data, size_t size); public: - // grundlegende Infos + // basic infos bool has_data (void) {DBG_PROG return (XYZ_Satz_.size() || ( data_ && size_ ) ); } bool valid (void) {DBG_PROG return ((XYZ_measurement_ @@ -135,9 +135,9 @@ class ICCmeasurement { bool hasLab () {DBG_PROG return LAB_measurement_; } size_t getSize() {DBG_PROG return size_; } int getPatchCount() {DBG_PROG return nFelder_; } - // Werte - std::vector getMessRGB (int patch); //!< Darstellungsfarben - std::vector getCmmRGB (int patch); //!< Darstellungsfarben + // values + std::vector getMessRGB (int patch); //!< displaying colours + std::vector getCmmRGB (int patch); //!< displaying colours std::vector getMessLab (int patch); std::vector getCmmLab (int patch); std::vector getMessXYZ () {DBG_PROG return XYZ_Satz_; } @@ -146,7 +146,7 @@ class ICCmeasurement { std::vector getMessCMYK () {DBG_PROG return CMYK_Satz_; } std::vector getFeldNamen () {DBG_PROG return Feldnamen_; } - // Report + // report std::vector > getText (); std::vector getDescription(); std::string getHtmlReport (bool export_ausserhalb); @@ -154,11 +154,11 @@ class ICCmeasurement { std::string getCGATS (); std::string getMaxCGATS (); - // Herkunft + // source std::string getTagName() {return getSigTagName (sig_); } std::string getInfo() {DBG_PROG return getSigTagDescription(sig_); } - // Schalter + // switch bool export_farben; }; diff --git a/icc_modell_beobachter.cpp b/icc_modell_beobachter.cpp index e8b6362..4048b47 100644 --- a/icc_modell_beobachter.cpp +++ b/icc_modell_beobachter.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Implementation des Modell/Betrachter Musters (observer pattern) + * Implementation of the model/observer pattern * */ @@ -38,7 +38,7 @@ using namespace icc_examin_ns; -// --- Beobachter --- +// --- observer --- Beobachter::Beobachter() { @@ -82,11 +82,11 @@ Beobachter::modellFort(Modell* modell) DBG_PROG_ENDE } -/** @brief Empfänger von Modell +/** @brief observer of news from model - Diese Funktion übernimmt die Informationen aus dem Modell und veranlasst - eine entsprechende Reaktion. \n - in der abgeleiteten Klasse konkretisieren + This function recieves the informations from the model and can cause + a according reaktion. \n + in the derived class to implement */ void Beobachter::nachricht ( Modell* modell , int infos ) @@ -95,7 +95,7 @@ Beobachter::nachricht ( Modell* modell , int infos ) } -// --- Modell --- +// --- model --- Modell::Modell() { @@ -106,7 +106,7 @@ Modell::Modell() Modell::~Modell() { DBG_PROG_START - // bei allen Beobachtern abmelden + // unregister with all observers std::list::iterator it; for(it = beobachter_.begin(); it != beobachter_.end(); ++it) { @@ -130,7 +130,7 @@ Modell::beobachterFort(Beobachter* beo) if(!beobachter_.size()) return; - // einzelnen Beobachter aus der Liste entfernen + // delete single observer from the list std::list::iterator it = beobachter_.begin(); intptr_t isis = (intptr_t)*it; if(isis > 0) @@ -149,7 +149,7 @@ Modell::beobachterFort(Beobachter* beo) } -/** @brief alle meine Beobachter informieren */ +/** @brief inform all my observers */ void Modell::benachrichtigen(int infos) { diff --git a/icc_modell_beobachter.h b/icc_modell_beobachter.h index c5b0dd5..769c313 100644 --- a/icc_modell_beobachter.h +++ b/icc_modell_beobachter.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Implementation des Modell/Betrachter Musters (observer pattern) + * Implementation of the model/observer pattern * */ @@ -34,23 +34,23 @@ #include /* - * Arbeitsweise + * mode of work * - * Die Klasse modell stellt einen beobachtbaren Zustand dar. - * Beobachter der Klasse beobachter können sich über den Zustand von modell - * informieren lassen. - * Eine einfache Ganzzahl informiert über den sich geänderten Zustand. - * Dabei ist es wichtig sein Modell zu kennen und den übergebenen Wert zu - * interpretieren. - * Die Festlegung auf einen Argumenttyp reduziert die Instanzierungen und - * erhöht den Interpretationsaufwand. - * Modelle und Beobachter wissen alle Ãœbereinander. (Es wäre alternativ möglich - * einen Händling zu übergeben, an dem abgelesen werden könnte ob die - * Beobachterklasse noch existiert.) + * The class modell provides the means to observe a condition. + * Observers of the class beobachter can subscribe to changes in modell. + * A simple whole number informs about the changing state. + * It is important to know what kind the model is and to interprete the + * obtained number, possibly as a enumeration. + * The reduction to one argument type reduses the instanciations and + * increases the effort of interpretation. + * Models and observers should know each about the other. (Alternatively + * it would be possible to provide a reference to the model to know whether the + * observer still exists. But with destroying of the observer class a + * information can easily sent to the model.) * - * Benutzung: - * Von den folgenden Klassen muss abgeleitet - * und die virtuellen Funktionen konkretisiert werden. + * Usage: + * It is needed to derive from the following classes and implement the + * virtual functions. */ namespace icc_examin_ns { diff --git a/icc_oyranos.cpp b/icc_oyranos.cpp index d91e0ad..385a071 100644 --- a/icc_oyranos.cpp +++ b/icc_oyranos.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Der CMS Sortierer. + * The CMS sorter. * */ @@ -66,16 +66,16 @@ void* myAllocFunc(size_t size) Oyranos icc_oyranos; - /* Konzepte: + /* concepts: * o - oyInit() initialisiert die Bibliothek und erlaubt das lesen von * Zeigern * - oyQuit() beraeumt all diese - * o ein Objekt pro Profil (void* cmsOpen(...) ; cmsClose(void*)) - * dies bleibt ein CMM Architektur vorbehalten - * o ein C++ Wrapper fuer liboyranos wie mit Oyranos oyranos - * oyranos als C++ Header exportieren - * o alles dem Benutzer ueberlassen (C free()) - * im Prototyp hier + * o one object per profile (void* cmsOpen(...) ; cmsClose(void*)) + * this will wait until a CMM architecture is ready + * o a C++ wrapper for liboyranos as with Oyranos oyranos + * export oyranos with a C++ header + * o leave all to the user (C free()) + * in prototyp here * o sich auf reine Namensnennung beschraenken -- */ @@ -92,7 +92,7 @@ Oyranos::~Oyranos() DBG_PROG_ENDE } -// nur in icc_oyranos.cpp zu verwendende Typen +// local types in icc_oyranos.cpp typedef std::map Prof_map; typedef std::map::iterator Prof_mapIt; typedef std::pair Prof_Map_elem; @@ -123,12 +123,12 @@ Oyranos::profil_test_ (const char* profil_name) fehler = oyCheckProfile( profil_name, 0 ); if( !fehler ) { - // leeren Block einfuegen + // insert empty block Prof_Map_elem teil (profil_name, Speicher()); Prof_mapIt_bool erg = pspeicher_ .insert( teil ); if( erg.second = true ) { - // Referenz auf Block holen + // get referenz to block Speicher *v_block = &pspeicher_[profil_name]; *v_block = profil_name; size_t size; @@ -137,7 +137,7 @@ Oyranos::profil_test_ (const char* profil_name) v_block->ladeNew(block, size); } } - } else // Profil in Liste + } else // profile in list { //Speicher *v_block = &pspeicher_[profil_name]; // ... @@ -202,7 +202,7 @@ MyFlattenProfileProc ( void *data, void *refCon) { - // Alle Bestandteile einsammeln + // collect all parts if(*size) { refcon *ref = (refcon*) refCon; @@ -231,7 +231,7 @@ MyFlattenProfileProcSize ( void *data, void *refCon) { - // Alle Bestandteile einsammeln + // collect all parts if(*size) { refcon *ref = (refcon*) refCon; @@ -351,9 +351,9 @@ Oyranos::moni_test_ (int x, int y) DBG_MEM_V( v_block.size() ) const char *profil_name=_("Monitor Profile"); DBG_PROG_V( (int*)profil_name <<" "<< profil_name ) - // Wir holen das Profil wenn es sich geaendert hat. - // a) neuer Name - schwierig zu identifizieren ueber oyDeviceProfil - // b) Benachrichtigung - vorausgesetzt Oyranos (X?) aendert das Profil + // We take the profile only if it had changed. + // a) new name - difficult to identify with oyDeviceProfil + // b) notification - provided Oyranos (X?) changes the profile { if (size) { @@ -365,12 +365,12 @@ Oyranos::moni_test_ (int x, int y) v_block.ladeNew(block, size); } } else - DBG_S(_("Could not load profile.")) + DBG_S("Could not load profile.") v_block = (const char*)profil_name; DBG_MEM } } - DBG_NUM_S( "Monitorprofil = "<< moni_.name() <<" "<< moni_.size() <<"\n" ) + DBG_NUM_S( "monitor profile = "<< moni_.name() <<" "<< moni_.size() <<"\n" ) # else # ifdef APPLE @@ -448,7 +448,7 @@ Oyranos::moni_test_ (int x, int y) } } else WARN_S(_("WARNING: Could not load profile.")) - // "Monitor Profile" wird woanders speziell behandelt + // "Monitor Profile" will be handled special on other places v_block = _("Monitor Profile");//profil_name; //if(profil_name) free(profil_name); DBG_PROG_V( v_block.name() ) @@ -660,7 +660,7 @@ Oyranos::setzeMonitorProfil (const char* profil_name , int x, int y ) //if( !display ) //display = XOpenDisplay(0); - display_name = XDisplayString( fl_display ); // gehoert X + display_name = XDisplayString( fl_display ); // belongs to X DBG_PROG_V( display_name <<" "<< strlen(display_name) ) # ifndef HAVE_FLTK @@ -698,7 +698,7 @@ Oyranos::moniInfo (int x, int y, int *num) # ifdef HAVE_X //static Display *display=0; - display_name = XDisplayString( fl_display ); // gehoert FLTK + display_name = XDisplayString( fl_display ); // belongs to FLTK DBG_PROG_V( display_name <<" "<< strlen(display_name) ) # endif infos = (char**) new char* [6]; @@ -741,25 +741,25 @@ Oyranos::moniInfo (int x, int y, int *num) return infos; } -/** erzeugt eine Farbhuelle */ +/** generates a gamut hull */ std::string Oyranos::netzVonProfil_ (std::vector & netze, Speicher & profil, int intent, int bpc) { DBG_PROG_START - // eine Flaeche aus sechs Quadraten mit den Flaechen das Lab Wuerfels - // wird in den Profilfarbraum imgewandelt und in ein Netz umgewandelt - int a = 12; // Aufloesung : 10 - schnell; 20 - genauer + // a cubus from six squares with the range of the Lab cube + // will be transformed to a profile colour space and converted to a mesh + int a = 12; // resolution : 10 - more quick; 20 - more precise size_t size = 4*a*(a+1) + 2*(a-1)*(a-1); int kanaele = 3; double *lab = new double [size*kanaele]; double min = 0.01, max = 0.99; - // Mantel + // side quares for(int y = 0; y <= a; ++y) for(int x = 0; x < 4 * a; ++x) { - int b = 0; // Bereich + int b = 0; // area int pos = (y * 4 * a + x) * kanaele; lab[pos + 0] = 1.0 - (double)y/(double)a; @@ -778,12 +778,12 @@ Oyranos::netzVonProfil_ (std::vector & netze, lab[pos + 2] = max - (x - (b - 1) * a)/(double)a * (max-min); } } - // Deckel und Boden + // buttom and top square for(int y = 0; y < (a - 1); ++y) for(int x = 0; x < 2 * (a - 1); ++x) { int pos = (4 * a * (a + 1) + y * 2 * (a - 1) + x) * kanaele; - int b = 0; // Bereich + int b = 0; // area int x_pos = x + 1, y_pos = y + 1; double val = (double)y_pos/(double)a * (max-min); @@ -802,9 +802,9 @@ Oyranos::netzVonProfil_ (std::vector & netze, return std::string("oyranos"); double * rgb = wandelLabNachBildschirmFarben( lab, size, 0, 0 ); - // Netz initialisieren + // initialise mesh netze.resize(1); - // Farbpunkte sammeln + // collect colour points netze[0].punkte. resize( size ); for(size_t i = 0; i < size; ++i) { @@ -815,7 +815,7 @@ Oyranos::netzVonProfil_ (std::vector & netze, } netze[0].punkte[i].farbe[kanaele] = 1.0; } - // Netze bauen + // build mesh char *liste = new char [size]; memset( liste, 1, size ); @@ -878,7 +878,7 @@ Oyranos::netzVonProfil_ (std::vector & netze, for(int x = 0; x < 2 * a; ++x) { int x_ = x + off; - int b = 0; // Bereich + int b = 0; // area // 1 0 0 (L a b) index_p.second.i[0] = 4*a-1; index_p.second.i[1] = off; @@ -953,7 +953,7 @@ Oyranos::netzVonProfil_ (std::vector & netze, index_p.second.i[2] = off-3*a+0; netze[0].indexe. insert( index_p ); - // unterer Rand + // lower border if( y == 0 ) { if(x == 0) { @@ -996,14 +996,14 @@ Oyranos::netzVonProfil_ (std::vector & netze, index_p.second.i[2] = 4*a*(a+1)-4*a + x-a-1; index_p.second.i[0] = 4*a*(a+1)-4*a + x-a; netze[0].indexe. insert( index_p ); } - // oberer Rand + // upper border } else if( y == a - 1 ) { if(x == 0) { } } else if(b * (a - b) <= x && x < ++b * a - b - 1) { - // oberes Mittelfeld (*L=0.0) + // upper middle field (*L=0.0) index_p.second.i[0] = (y-1) * 2*(a-1)+x_; index_p.second.i[2] = (y-1)*2*(a-1)+x_+1; index_p.second.i[1] = (y+0)*2*(a-1)+x_; netze[0].indexe. insert( index_p ); @@ -1013,7 +1013,7 @@ Oyranos::netzVonProfil_ (std::vector & netze, netze[0].indexe. insert( index_p ); } else if(b * (a - b) <= x && x < ++b * a - b - 1) { - // unteres Mittelfeld (*L=1.0) + // lower middle field (*L=1.0) index_p.second.i[0] = (y-1) * 2*(a-1)+x_; index_p.second.i[1] = (y-1)*2*(a-1)+x_+1; index_p.second.i[2] = (y+0)*2*(a-1)+x_; netze[0].indexe. insert( index_p ); @@ -1157,7 +1157,7 @@ Oyranos::gamutCheckAbstract(Speicher & s, Speicher & abstract, fortschritt(0.2, 0.2); hLab = cmsCreateLabProfile(cmsD50_xyY()); - if(!hLab) WARN_S( "hLab Profil nicht geoeffnet" ) + if(!hLab) WARN_S( "hLab profil not opened" ) fortschritt(0.2, 0.2); profil = cmsOpenProfileFromMem(const_cast(block), groesse); @@ -1179,7 +1179,7 @@ Oyranos::gamutCheckAbstract(Speicher & s, Speicher & abstract, _cmsSaveProfile ( gmt,"proof_gamut.icc"); DBG #endif - // Wir berechnen die Farbhuellwarnung fuer ein abstraktes Profil + // We calculate the gamut warning for a abstract profile cmsHPROFILE tmp = cmsTransform2DeviceLink(tr1,0); fortschritt(0.2,0.2); LPLUT gmt_lut = cmsAllocLUT(), @@ -1221,7 +1221,7 @@ Oyranos::wandelProfilNachLabUndZurueck(double *lab, // 0.0 - 1.0 DBG_PROG_V( size <<" "<< intent <<" "<< flags ) - // lcms Typen + // lcms types cmsHPROFILE hProfil = 0, hLab = 0; cmsHTRANSFORM form = 0; @@ -1235,7 +1235,7 @@ Oyranos::wandelProfilNachLabUndZurueck(double *lab, // 0.0 - 1.0 { flags_ = flags & ~cmsFLAGS_GAMUTCHECK; - // Initialisierung fuer lcms + // initialising for lcms DBG_MEM_V( (int*) block <<" "<text, text); } const char* show() const { return text; } - char *text; // Schluessel + char *text; // key char *cmm; char **props; // properties char *block; @@ -67,7 +67,7 @@ class Oyranos ~Oyranos(); void init() {; } - // Standard Profile + // standard profiles std::string lab () { lab_test_(); return lab_.name(); } const char* lab (size_t &g) { lab_test_(); g = lab_.size(); @@ -83,7 +83,7 @@ class Oyranos const char* proof (size_t &g) { proof_test_(); g = proof_.size(); return proof_; } - // Geraete Profile + // device profiles std::string moni_name (int x,int y){ moni_test_(x,y); return moni_.name(); } const char* moni (int x, int y, size_t &g) { moni_test_(x,y); g = moni_.size(); @@ -91,7 +91,7 @@ class Oyranos const Speicher & moni (int x,int y){ moni_test_(x,y); return moni_; } int setzeMonitorProfil (const char *name, int x, int y ); char** moniInfo (int x, int y, int *num); - // allgemeine Profile + // common profiles std::string profil (const char* n) { if(profil_test_(n)) return profil_(n);} const char* profil (const char* n, size_t &g) { return profil_(n,g); } @@ -124,7 +124,7 @@ class Oyranos public: void clear(); - // uebergangsweise + // intermediate int wandelProfilNachLabUndZurueck(double *lab, // 0.0 - 1.0 size_t size, int intent, int flags, Speicher & profil); @@ -140,7 +140,7 @@ class Oyranos std::string vrmlVonProfil ( ICCprofile &profil, int intent); - // Farbtransformationen + // colour transformations ColourTransformKey erzeugeTrafo ( const char* eingangs_profil__geraet, int byte, @@ -150,7 +150,7 @@ class Oyranos int kanaele, int farb_intent, const char* cmm, // 4 bytes 'lcms' 'APPL' - int cmm_optionen); // BPC, Praezission + int cmm_optionen); // BPC, precission ColourTransformKey erzeugeTrafo ( const char* eingangs_profil__geraet, int byte, @@ -197,7 +197,7 @@ class Oyranos extern Oyranos icc_oyranos; -// Benutzeroberflächenfunktionen +// user GUI helpers void oyranos_pfade_einlesen(); void oyranos_pfade_auffrischen(); void oyranos_pfade_loeschen(); diff --git a/icc_profile.cpp b/icc_profile.cpp index 634a753..78e2ea0 100644 --- a/icc_profile.cpp +++ b/icc_profile.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -44,7 +44,7 @@ /** - * @brief ICCprofile Funktionen + * @brief ICCprofile functions */ ICCprofile::ICCprofile (void) @@ -69,7 +69,7 @@ ICCprofile::ICCprofile (const Speicher & s) data_ = NULL; size_ = 0; - // delegieren + // delegate filename_ = s.name(); load(s); DBG_PROG_ENDE @@ -80,7 +80,7 @@ ICCprofile::~ICCprofile (void) this->clear(); # ifdef DEBUG_PROFILE - DBG__PROG_S ( "~ICCprofile beendet" ) + DBG__PROG_S ( "~ICCprofile ended" ) # endif DBG_PROG_ENDE } @@ -114,7 +114,7 @@ ICCprofile::copy_ ( const ICCprofile & p ) void ICCprofile::clear (void) { DBG_PROG_START - DBG_PROG_S( "Profil wird geleert" ) + DBG_PROG_S( "Profil will be cleared" ) if (data_ && size_) free(data_); data_ = NULL; @@ -126,7 +126,7 @@ ICCprofile::clear (void) tags.clear(); measurement.clear(); - DBG_NUM_S( "data_, tags und measurement geloescht" ) + DBG_NUM_S( "data_, tags and measurement freed" ) DBG_PROG_ENDE } @@ -134,7 +134,7 @@ ICCprofile::clear (void) ICCprofile::ICCDataType ICCprofile::load (const Speicher & prof) { - DBG_PROG_START // ICC Profil laden + DBG_PROG_START // ICC Profil load std::string file = prof.name(); changing_ = true; @@ -142,7 +142,7 @@ ICCprofile::load (const Speicher & prof) this->clear(); - // Mindestgroesse fuer sinnvolle Daten abfragen + // check minimum size for plausible data if (prof.size() > 64) { //WARN_S( _("!!!! Profil wird wiederbenutzt !!!! ") ) size_ = prof.size(); @@ -160,9 +160,9 @@ ICCprofile::load (const Speicher & prof) return ICCnullDATA; } - // Test > 132 byte, ansonsten erst einmal als Messdaten aufnehmen + // test > 132 byte, otherwise interprete as measurement if (size_ < 132) { - WARN_S( _("Kein Profil")<<" "<<_("Size")<<" "< v; v.push_back( leer ); @@ -557,7 +557,7 @@ ICCprofile::getTagIDByName (std::string name) if ( (*it).getTagName() == name && (*it).getSize() ) { # ifdef DEBUG_ICCPROFILE - DBG_PROG_S( item << " = " << (*it).getTagName() << " gefunden" ) + DBG_PROG_S( item << " = " << (*it).getTagName() << " found" ) # endif DBG_PROG_ENDE return item; @@ -586,7 +586,7 @@ ICCprofile::hasTagName (std::string name) if ( (*it).getTagName() == name && (*it).getSize() ) { # ifdef DEBUG_ICCPROFILE - DBG_NUM_S( (*it).getTagName() << " gefunden" ) + DBG_NUM_S( (*it).getTagName() << " found" ) # endif DBG_PROG_ENDE return true; @@ -1005,7 +1005,7 @@ ICCprofile::removeTag (int item) } /** - * allgemeine Funktionen + * general functions */ void @@ -1031,7 +1031,7 @@ const char* cp_nchar (char* text, int n) string[1023] = '\000'; # ifdef DEBUG - DBG_MEM_V( n << " Buchstaben kopieren " << (intptr_t)text << " " << string) + DBG_MEM_V( n << " letters copy " << (intptr_t)text << " " << string) # endif DBG_MEM_ENDE return string; diff --git a/icc_profile.h b/icc_profile.h index 7c36b82..7274d58 100644 --- a/icc_profile.h +++ b/icc_profile.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -50,12 +50,12 @@ #include /** - * @brief interne ICC Profilstruktur + * @brief internal ICC profile struktur **/ class ICCprofile; -// definiert in icc_profile.cpp +// defined in icc_profile.cpp class ICCprofile { friend class ICCtag; friend class ICCmeasurement; @@ -78,14 +78,14 @@ class ICCprofile { void clear (void); ICCDataType load (const Speicher & profil); - ICCDataType data_type; //!< wird zumindest beim Laden gesetzt + ICCDataType data_type; //!< is set at least at load time bool changing() { return changing_; } private: bool changing_; std::string filename_; - // icc34.h Definitionen + // icc34.h definitions char* data_; size_t size_; @@ -96,7 +96,7 @@ class ICCprofile { public: void measurementReparent() { measurement.profile_ = this; } - public: // Informationen + public: // informations const char* filename (); void filename (const char* s); size_t size (); @@ -104,7 +104,7 @@ class ICCprofile { //void cmm (const char* s) {DBG_PROG header.cmmName (s); } //int version () {DBG_PROG return (int) header.version(); } //const char* creator () {DBG_PROG return header.creatorName(); } - //! Uebertragungsart; siehe auch @see: ICCexamin.intent() + //! rendering intent; see as well @see: ICCexamin.intent() int intent () {return icValue(((const icHeader*)header .headerRaw())-> renderingIntent ); } icColorSpaceSignature colorSpace() {return header.colorSpace(); } @@ -113,11 +113,11 @@ class ICCprofile { std::string printLongHeader (); std::vector getPCSNames(); - // Tag Infos + // tag infos int tagCount(); - std::vector printTags (); //!< Liste der einzelnen Tags (5) - std::vector printTagInfo (int item); //!< Name,Typ - std::vector getTagText (int item); //!< Inhalt + std::vector printTags (); //!< list of tags (5) + std::vector printTagInfo (int item); //!< name,typ + std::vector getTagText (int item); //!< content std::vector getTagDescription (int item); std::vector getTagCIEXYZ (int item); @@ -128,29 +128,29 @@ class ICCprofile { getTagTable (int item, ICCtag::MftChain typ); std::vector getTagNumbers (int item, ICCtag::MftChain typ); std::vector getTagChannelNames(int item, ICCtag::MftChain typ); - bool hasTagName (std::string name); //!< Name - int getTagIDByName (std::string name); //!< Name + bool hasTagName (std::string name); //!< name + int getTagIDByName (std::string name); //!< name int getTagCount (); - //! Profil Infos + //! profile infos //char* getProfileInfo (); char* getProfileDescription (); std::vector getWhitePkt (void); int getColourChannelsCount (); int hasCLUT (); bool valid (); - public: // Datei I/O + public: // file I/O int checkProfileDevice (char* type, icProfileClassSignature deviceClass); - public: // Messwertinfos + public: // measurement infos bool hasMeasurement (); std::string report (bool auss); ICCmeasurement& getMeasurement (); std::string cgats (); std::string cgats_max (); - public: // Profilerstellung + public: // profile generation void setHeader (const void* h); ICCheader getHeader () { return header; }; void addTag (ICCtag & tag); diff --git a/icc_profile_header.cpp b/icc_profile_header.cpp index 406c7a3..e50d799 100644 --- a/icc_profile_header.cpp +++ b/icc_profile_header.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -43,7 +43,7 @@ #define g_message printf /** - * @brief ICCheader Funktionen + * @brief ICCheader functions */ ICCheader::ICCheader() @@ -254,6 +254,7 @@ ICCheader::print() const { DBG_PROG_START std::string s = _("File header invalid"); if (valid) + // format sensible, as this string is the header in the tag browser table s = _(" head head 128 File header"); DBG_PROG_ENDE return s; diff --git a/icc_profile_header.h b/icc_profile_header.h index 0f21737..2370a9f 100644 --- a/icc_profile_header.h +++ b/icc_profile_header.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -43,17 +43,17 @@ /** - * @brief interne ICC Profilstruktur + * @brief internal ICC profile strukture **/ -// definiert in icc_profile.cpp +// defined in icc_profile.cpp class ICCheader { public: ICCheader (); void clear(); private: - icHeader header; //!sig << " " ) + DBG_MEM_S( "ICCtag reused: " << (char*)tag->sig << " " ) DBG_MEM free(data_); DBG_MEM // delete [] data_; data_ = NULL; - DBG_MEM_S( "ICCtag wiederverwendet: " << (char*)tag->sig << " " ) + DBG_MEM_S( "ICCtag reused: " << (char*)tag->sig << " " ) } DBG_MEM size_ = icValue(tag->size); DBG_MEM_V( size_ ) @@ -200,7 +200,7 @@ ICCtag::load ( ICCprofile *profil, # ifdef DEBUG_ICCTAG_ char* text = data_; - DBG_MEM_S( _sig << "=" << tag->sig << " offset " << icValue(tag->offset) << " size " << size_ << " nächster tag " << size_ + icValue(tag->offset) << " " << text << " " ) + DBG_MEM_S( _sig << "=" << tag->sig << " offset " << icValue(tag->offset) << " size " << size_ << " next tag " << size_ + icValue(tag->offset) << " " << text << " " ) # endif DBG_MEM_ENDE } @@ -418,7 +418,7 @@ ICCtag::getText (void) delete [] t; DBG_PROG_V( g <<" "<< dversatz ) } } - if (!texte.size()) // erster Eintrag + if (!texte.size()) // first entry { int g = icValue(*(icUInt32Number*)&data_[20]), dversatz = icValue(*(icUInt32Number*)&data_[24]); char *t = (char*) new char [g]; @@ -472,14 +472,14 @@ ICCtag::getText (void) DBG_MEM_V( sizeof(Ncl2) ) for (int i = 0; i < farben_n; ++i) { - Ncl2Farbe *f = (Ncl2Farbe*) ((char*)ncl2 + 76 + // Basisgröße von Ncl2 - (i * (38 + // Basisgröße von Ncl2Farbe - geraetefarben_n // Anzahl Gerätefarben + Ncl2Farbe *f = (Ncl2Farbe*) ((char*)ncl2 + 76 + // base site of Ncl2 + (i * (38 + // base size of Ncl2Farbe + geraetefarben_n // number of device colours * sizeof(icUInt16Number))));//Ncl2Farbe::geraetefarbe DBG_MEM_V( sizeof(icUInt16Number) <<"|"<< geraetefarben_n ) DBG_MEM_V( i <<" "<<(int*)f <<" "<< (int*)ncl2 ) s << "" << - ncl2->vorname << f->name << ncl2->nachname<<" ";// maximal 31 Zeichen + ncl2->vorname << f->name << ncl2->nachname<<" ";// max 31 byte s << icValue(f->pcsfarbe[0]) << " " << icValue(f->pcsfarbe[1]) << " " << icValue(f->pcsfarbe[2]) << " | "; @@ -553,7 +553,7 @@ ICCtag::getCIEXYZ (void) # endif DBG_S(getChromaticityColorantType( icValue(*(icUInt16Number*)&data_[10]))) for (int i = 0; i < count ; ++i) { // Table 35 -- chromaticityType encoding - // TODO lcms braucht einen 16 Byte Offset (statt 12 Byte) + // TODO lcms needs a 16 Byte Offset (instead of 12 Byte ?) icU16Fixed16Number* channel = (icU16Fixed16Number*)&data_[12+(8*i)]; double xyY[3] = { icUFValue( channel[0] ), icUFValue( channel[1] ), @@ -602,7 +602,7 @@ ICCtag::getCurves (MftChain typ) { DBG_PROG_START std::vector kurve; std::vector > kurven; DBG_PROG - // Wer sind wir? + // Who are we? if (getTypName() == "mft2") { icLut16* lut16 = (icLut16*) &data_[8]; int inputChan, outputChan, clutPoints, inputEnt, outputEnt; @@ -613,13 +613,13 @@ ICCtag::getCurves (MftChain typ) outputEnt = icValue(lut16->outputEnt); int feldPunkte = (int)pow((double)clutPoints, inputChan); # ifdef DEBUG_ICCTAG - DBG_NUM_S( feldPunkte << " Feldpunkte " << clutPoints << " clutPoints" ) + DBG_NUM_S( feldPunkte << " array points " << clutPoints << " clutPoints" ) # endif int start = 52, byte = 2; double div = 65536.0; DBG_PROG - // Was wird verlangt? + // What is requested? switch (typ) { case MATRIX: break; @@ -638,7 +638,7 @@ ICCtag::getCurves (MftChain typ) } kurven.push_back (kurve); # ifdef DEBUG_ICCTAG - DBG_NUM_S( kurve.size() << " Einträge" ) + DBG_NUM_S( kurve.size() << " entries" ) # endif } DBG_PROG break; @@ -659,7 +659,7 @@ ICCtag::getCurves (MftChain typ) / div ); kurven.push_back (kurve); # ifdef DEBUG_ICCTAG - DBG_NUM_S( kurve.size() << "|" << outputEnt << " Einträge" ) + DBG_NUM_S( kurve.size() << "|" << outputEnt << " entries" ) # endif } break; @@ -675,7 +675,7 @@ ICCtag::getCurves (MftChain typ) byte = 1; double div = 255.0; - // Was wird verlangt? + // What is requested? switch (typ) { case MATRIX: break; @@ -690,7 +690,7 @@ ICCtag::getCurves (MftChain typ) / div ); kurven.push_back (kurve); # ifdef DEBUG_ICCTAG - DBG_NUM_S( kurve.size() << " Einträge" ) + DBG_NUM_S( kurve.size() << " entries" ) # endif } break; @@ -714,7 +714,7 @@ ICCtag::getCurves (MftChain typ) / div ); kurven.push_back (kurve); # ifdef DEBUG_ICCTAG - DBG_NUM_S( kurve.size() << " Einträge" ) + DBG_NUM_S( kurve.size() << " entries" ) # endif } break; @@ -726,7 +726,7 @@ ICCtag::getCurves (MftChain typ) icUInt16Number byte = icValue(*(icUInt16Number*) &data_[16]); # ifdef DEBUG_ICCTAG - DBG_NUM_S( data_ << " parametrisch " << parametrisch << " nkurven " << nkurven << " segmente " << segmente << " byte " << byte ) + DBG_NUM_S( data_ << " parametric " << parametrisch << " ncurves " << nkurven << " segments " << segmente << " byte " << byte ) # endif if (parametrisch) { //icU16Fixed16Number @@ -762,7 +762,7 @@ ICCtag::getCurves (MftChain typ) / div ); kurven.push_back (kurve); //#ifdef DEBUG_ICCTAG - DBG_NUM_S( kurve.size() << " Einträge" ) + DBG_NUM_S( kurve.size() << " entries" ) //#endif } } @@ -791,13 +791,13 @@ ICCtag::getTable (MftChain typ) outputEnt = icValue(lut16->outputEnt); # ifdef DEBUG_ICCTAG int feldPunkte = (int)pow((double)clutPoints, inputChan); - DBG_NUM_S( feldPunkte << " Feldpunkte " << clutPoints << " clutPoints" ) + DBG_NUM_S( feldPunkte << " array points " << clutPoints << " clutPoints" ) # endif int start = 52, byte = 2; double div = 65536.0; DBG_PROG - // Was wird verlangt? + // What is requested? if (inputChan == 3) { switch (typ) { @@ -844,13 +844,13 @@ ICCtag::getTable (MftChain typ) clutPoints = (int)lut8->clutPoints; # ifdef DEBUG_ICCTAG int feldPunkte = (int)pow((double)clutPoints, inputChan); - DBG_NUM_S( feldPunkte << " Feldpunkte " << clutPoints << " clutPoints" ) + DBG_NUM_S( feldPunkte << " array points " << clutPoints << " clutPoints" ) # endif int start = 48, byte = 1; double div= 255.0; - // Was wird verlangt? + // What is requested? switch (typ) { case TABLE_IN: case TABLE_OUT: @@ -901,7 +901,7 @@ std::vector ICCtag::getNumbers (MftChain typ) { DBG_PROG_START std::vector nummern; - // Wer sind wir? + // Who are we? if (getTypName() == "mft2") { icLut16* lut16 = (icLut16*) &data_[8]; int inputChan, outputChan, clutPoints, inputEnt, outputEnt; @@ -911,7 +911,7 @@ ICCtag::getNumbers (MftChain typ) inputEnt = icValue(lut16->inputEnt); outputEnt = icValue(lut16->outputEnt); - // Was wird verlangt? + // What is requested? switch (typ) { case MATRIX: for (int i = 0; i < 9; i++) { @@ -938,7 +938,7 @@ ICCtag::getNumbers (MftChain typ) outputChan = (int)lut8->outputChan; clutPoints = (int)lut8->clutPoints; - // Was wird verlangt? + // What is requested? switch (typ) { case MATRIX: for (int i = 0; i < 9; i++) { @@ -960,9 +960,9 @@ ICCtag::getNumbers (MftChain typ) } else if ( getTypName() == "ncl2" ) { - // 0: Anzahl Farben - // 1...n: CIE*Lab Farbwerte - // n = 3 * FarbAnzahl + // 0: number of colours + // 1...n: CIE*Lab colour values + // n = 3 * colour number Ncl2 *ncl2 = (Ncl2*) &data_[8]; @@ -975,8 +975,8 @@ ICCtag::getNumbers (MftChain typ) DBG_PROG_V( nummern[0] ) for (int i = 0; i < farben_n; ++i) { - Ncl2Farbe *f = (Ncl2Farbe*) ((char*)ncl2 + 76 + // Basisgröße von Ncl2 - (i * (38 + // Basisgröße von Ncl2Farbe + Ncl2Farbe *f = (Ncl2Farbe*) ((char*)ncl2 + 76 + // basie size of Ncl2 + (i * (38 + // base size of Ncl2Farbe geraetefarben_n // n Ncl2Farbe::geraetefarbe * sizeof(icUInt16Number)))); nummern[i*3 +0] = icValue(f->pcsfarbe[0])/65280.0; @@ -1003,8 +1003,8 @@ ICCtag::getText (MftChain typ) char n[6]; - // TODO: prüfen auf icColorSpaceSignature <-> Kanalanzahl - // Was wird verlangt? + // TODO: check for icColorSpaceSignature <-> channel count + // What is requested? switch (typ) { case TABLE: case MATRIX: @@ -1027,14 +1027,14 @@ ICCtag::getText (MftChain typ) if (kanaele.size() && (texte.size() < (unsigned int)kanaele[0])) { - // falls "keine Farbe" zu erwarten währe + // in case no colour is expected if (texte.size() == 1) { sprintf(n,"%d",1); texte[0] = _("Colour"); texte[0] = texte[0] + n; } - // Auffüllen + // fill for (int i = texte.size(); i < kanaele[0]; i++) { sprintf(n,"%d",i+1); diff --git a/icc_profile_tags.h b/icc_profile_tags.h index bb96750..53f6232 100644 --- a/icc_profile_tags.h +++ b/icc_profile_tags.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Profilinterpretation + * profile interpretation * */ @@ -43,7 +43,7 @@ /** - * @brief interne ICC Profilstruktur + * @brief internal ICC profile structure **/ class ICCprofile; @@ -71,7 +71,7 @@ class ICCtag { int size_; char* data_; - int _intent; // für mft1/2 + int _intent; // for mft1/2 icColorSpaceSignature _color_in; icColorSpaceSignature _color_out; bool _to_pcs; @@ -114,7 +114,7 @@ class ICCtag { std::vector getText (); std::vector getText (MftChain typ); - //std::vector getDescription(); veraltet + //std::vector getDescription(); deprecated std::string getVrml(); public: // I/O void load (ICCprofile* profil ,icTag* tag, char* data); diff --git a/icc_schnell.cpp b/icc_schnell.cpp index ea2eee2..7693793 100644 --- a/icc_schnell.cpp +++ b/icc_schnell.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Schnell kompilieren. + * put something here in to compile more quick. * */ diff --git a/icc_speicher.cpp b/icc_speicher.cpp index 6234801..29c64a4 100644 --- a/icc_speicher.cpp +++ b/icc_speicher.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Die Speicher Klasse + * the Speicher class * */ diff --git a/icc_speicher.h b/icc_speicher.h index 2dd3882..71abf5f 100644 --- a/icc_speicher.h +++ b/icc_speicher.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Die Speicher Klasse + * the Speicher (memory) class * */ @@ -38,26 +38,26 @@ #define DBG_SPEICHER_ENDE if(icc_debug >= 3) DBG_PROG_ENDE /* - * Die Speicher Klasse ist ein Beobachter eines Speicherblocks mit Referenz + * The Speicher class is a observer of a memory block with references * - * ref_n_ : Referenz - * zeiger_ : new [] Speicher - * lade() : loescht den alten Speicher und kopiert oder fordert neuen an - * Forderung: zeiger_, groesse_, ref_n_ müssen von allen Kopien von Speicher aus - * sichtbar sein + * ref_n_ : reference + * zeiger_ : new [] allocated memory + * lade() : erases the old block and copies or allocates new memory + * Forderung: zeiger_, groesse_, ref_n_ must be visible from all copies of the + * class */ class Speicher { - // Zeigermaschine + // pointer machine char** zeiger_; size_t* groesse_; int* ref_n_; int id_; static int globale_id_; - std::string *name_; // z.B. Profilname - double *letze_aen_zeit_; // letztes mal geaendert - double *letze_ben_zeit_; // letztes mal benutzt + std::string *name_; // z.B. profile name + double *letze_aen_zeit_; // lest time changed + double *letze_ben_zeit_; // lest time used void init () { DBG_MEM_START @@ -155,11 +155,11 @@ class Speicher zeiger_clear_(); DBG_MEM_ENDE } - // Bequemlickkeitsfunktionen + // convenience functions void ladeNew (char* zeiger, size_t & groesse) { DBG_MEM_START if(zeiger && groesse) { - // mit new angelegt : einfach uebernehmen + // allocated with new : simply take over lade_(zeiger,groesse); } DBG_MEM_ENDE @@ -167,7 +167,8 @@ class Speicher void ladeUndFreePtr(char** zeiger, size_t & groesse) { DBG_MEM_START if(*zeiger && groesse) { - // mit *alloc angelegt : erst kopieren durch "lade" + // allocated with *alloc : copy first through + // "lade" lade(*zeiger,groesse); free(*zeiger); zeiger = 0; @@ -175,7 +176,7 @@ class Speicher } DBG_MEM_ENDE } - // Laden mit Kopie in einen mit new bereitgestellten Block + // load with copy in a block allocated with new void lade (const char* zeiger, size_t groesse) { DBG_MEM_START char *block = (char*) new char [groesse+1]; diff --git a/icc_thread_daten.cpp b/icc_thread_daten.cpp index fb8237b..ee6e5b8 100644 --- a/icc_thread_daten.cpp +++ b/icc_thread_daten.cpp @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -/* eine Klasse mit thread Ueberwachungsmöglichkeit +/* a class with thread observer capabilities * */ @@ -40,7 +40,7 @@ icc_examin_ns::ThreadDaten::frei(int freigeben) { frei_ = true; --zahl_; - DBG_THREAD_S( "freigeben " << zahl_ ) + DBG_THREAD_S( "unlock " << zahl_ ) } else { @@ -66,7 +66,7 @@ icc_examin_ns::ThreadDaten::frei(int freigeben) frei_ = false; ++zahl_; - DBG_THREAD_S( "sperren " << zahl_ ) + DBG_THREAD_S( "lock " << zahl_ ) } DBG_PROG_ENDE diff --git a/icc_thread_daten.h b/icc_thread_daten.h index 70a0ac6..e70958b 100644 --- a/icc_thread_daten.h +++ b/icc_thread_daten.h @@ -22,7 +22,7 @@ * ----------------------------------------------------------------------------- */ -/** @brief eine Klasse mit thread Ueberwachungsmöglichkeit +/** @brief a class with thread observer capabilities * */ @@ -34,24 +34,24 @@ #include "icc_utils.h" -/** @brief * Die Klasse mit Anmeldung und Freigabe +/** @brief * the class with locking * - * erlaubt threadsicheren Datenzugang + * allowes thread save daten handling */ namespace icc_examin_ns { class ThreadDaten { - bool frei_; //!<@brief wird nicht von weiterem Prozess benutzt - int zahl_; //!<@brief Anzahl der Wartenden + bool frei_; //!<@brief is not used from further process + int zahl_; //!<@brief count of waiters Fl_Thread pth; protected: ThreadDaten() { frei_ = true; zahl_ = 0; pth = 0; } ~ThreadDaten() {;} public: - bool frei() { return frei_; } //!<@brief ist nicht gesperrt - void frei(int freigeben); //!@brief Sperren mit Warten/Freigeben + bool frei() { return frei_; } //!<@brief is not locked + void frei(int freigeben); //!@brief lock with wait/unlock }; } diff --git a/icc_ueber.cpp b/icc_ueber.cpp index 513a94d..5dbf2b4 100644 --- a/icc_ueber.cpp +++ b/icc_ueber.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Inhalt fuer das informative "Ãœber" Fenster. + * content for the informative "About" window. * */ @@ -34,12 +34,12 @@ #define DEBUG_ICCUEBER -#define SF "#cccccc" // Standard hintergrundFarbe +#define SF "#cccccc" // standard background colour # define LAYOUTFARBE if (layout[l++] == true) \ html << HF; \ else \ - html << SF; //Farbe nach Layoutoption auswaehlen + html << SF; // select colour according to layout options std::string getHtmlKopf(const char* titel) @@ -61,12 +61,12 @@ std::string getUeberHtml() { DBG_PROG_START - //char HF[] = "#aaaaaa"; // Hervorgehoben + //char HF[] = "#aaaaaa"; // emphasised std::stringstream html; html << getHtmlKopf( _("About ICC Examin") ); - // Allgemeine Informationen + // general informations html << " \ \ diff --git a/icc_ueber.h b/icc_ueber.h index bdc011a..c17bfcc 100644 --- a/icc_ueber.h +++ b/icc_ueber.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Inhalt fuer das informative "Ãœber" Fenster. + * content for the informative "About" window. * */ diff --git a/icc_utils.cpp b/icc_utils.cpp index 8426271..7fd8de7 100644 --- a/icc_utils.cpp +++ b/icc_utils.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Werkzeuge. + * tools. * */ @@ -78,7 +78,7 @@ dbgWriteF (/*std::ostringstream & ss*/) f.close(); } else { data = 0; - WARN_S( _("Dateigroesse 0 fuer ") << dateiname ) + WARN_S( _("file size 0 for ") << dateiname ) } #else cout << debug_s_/*ss*/.str(); @@ -86,13 +86,13 @@ dbgWriteF (/*std::ostringstream & ss*/) } -// Threads identifizieren +// threads identify Fl_Thread icc_thread_liste[12] = {0,0,0,0,0,0,0,0,0,0,0,0}; /** - * Steuerschnipsel - * Beschreibung entnommen aus SuSE's /etc/rc.status + * console formating snippets + * description taken over from SuSE's /etc/rc.status * # \033 ascii ESCape # \033[G move to column (linux console, xterm, not vt100) @@ -157,7 +157,7 @@ dbgThreadId() //printf("%d\n", (int*)s.c_str()); switch (dbg_id) { - // in icc_thread_liste eingetragene Fl_Thread's lassen sich identifizieren + // in icc_thread_liste registred Fl_Thread's can be identified case THREAD_HAUPT: dbgWrite( "\033[30m\033[1m[HAUPT]\033[m" ); break; case THREAD_GL1: diff --git a/icc_utils.h b/icc_utils.h index c3b8d03..3b60299 100644 --- a/icc_utils.h +++ b/icc_utils.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Werkzeuge + * tools * */ @@ -91,7 +91,7 @@ Fl_Thread & getThreadId ( int pos ); void registerThreadId ( Fl_Thread id, int pos ); -// Statusmeldungen zur Fehlersuche +// status messages for error tracking void dbgWriteF (/*std::ostringstream & ss*/); extern std::ostringstream debug_s_; @@ -136,18 +136,18 @@ int iccLevel_PROG(int plus_minus_null); #define icc_level_PROG_minus iccLevel_PROG(-1) extern int icc_debug; -/* icc_debug wird mit der Umgebungsvariable ICCEXAMIN_DEBUG in main() gesetzt - * Niveaus: - * 0: DBG // nur zwischenzeitlich verwenden - * 1: DBG_NUM - * 2: DBG_PROG - * 3: DBG_MEM - * 4: DBG_THREAD; Datei E/A - * 9: DBG_PROG_START & DBG_PROG_ENDE +/* icc_debug is controled be the environment variale ICCEXAMIN_DEBUG in main() + * levels: + * 0: DBG // use only intermediate and then remove, standard + * 1: DBG_NUM // tell about important states + * 2: DBG_PROG // tell about program state + * 3: DBG_MEM // observe memory + * 4: DBG_THREAD; file E/A + * 9: DBG_PROG_START & DBG_PROG_ENDE only function tracing * - * [1,2,...,9] diese und alle kleineren Kategorien - * 10+[1,2,...,9] einzig diese Kategorie , z.B. ICCEXAMIN_DEBUG=13 waehlt alle - * Speicherinformationen aus + * [1,2,...,9] this and all lower levels + * 10+[1,2,...,9] only this level , z.B. ICCEXAMIN_DEBUG=13 selects only + * memory informations * */ diff --git a/icc_vrml.cpp b/icc_vrml.cpp index 63be03e..0e50b83 100644 --- a/icc_vrml.cpp +++ b/icc_vrml.cpp @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Farbumfang betrachten im WWW-3D Format vrml. + * visualise colour gamut in WWW-3D format vrml. * */ @@ -53,7 +53,7 @@ erase_file (const char *file) return 0; } - DBG_PROG_S( _("Datei ") << file << _(" konnte nicht geloescht werden") ) + DBG_PROG_S( "file " << file << " could not be erased" ) return 1; } @@ -75,7 +75,7 @@ icc_create_vrml( const char* p, int size, int intent ) DBG_PROG_V( profil_temp_name.str() ) std::string ptn = profil_temp_name.str(); ptn.append(".icc"); - // Speichern + // save { std::ofstream f; f.clear(); @@ -87,7 +87,7 @@ icc_create_vrml( const char* p, int size, int intent ) } f.close(); } - // vrml produzieren - argyll Variante + // generate vrml - argyll variant int ret; # if APPLE std::string argyll_bundle_pfad = icc_examin_ns::holeBundleResource("iccgamut", @@ -121,7 +121,7 @@ icc_create_vrml( const char* p, int size, int intent ) ptn = profil_temp_name.str(); ptn.append(".gam"); erase_file (ptn.c_str()); - // Datei Oeffnen + // open file { ptn = profil_temp_name.str(); ptn.append(".wrl"); @@ -135,15 +135,15 @@ icc_create_vrml( const char* p, int size, int intent ) data = ladeDatei (ptn.c_str(), &size); # if HAVE_EXCEPTION } - catch (Ausnahme & a) { // faengt alles von Ausnahme Abstammende - DBG_NUM_V (_("Ausnahme aufgetreten: ") << a.what()); + catch (Ausnahme & a) { // catches all from exception + DBG_NUM_V (_("exception occured: ") << a.what()); a.report(); } - catch (std::exception & e) { // faengt alles von exception Abstammende - DBG_NUM_V (_("Std-Ausnahme aufgetreten: ") << e.what()); + catch (std::exception & e) { // catches all from exception + DBG_NUM_V (_("Std-exception occured: ") << e.what()); } - catch (...) { // faengt alles Uebriggebliebene - DBG_NUM_V (_("Huch, unbekannte Ausnahme")); + catch (...) { // catches all from exception + DBG_NUM_V (_("Huch, unknown exception")); } # endif @@ -199,7 +199,7 @@ create_vrml ( const char *profilA, char *profilB, char *vrml) erase_file ("/tmp/tmp.wrl"); } - // Unterschiede + // differences if (profilA && profilB) { r = system ("smthtest /tmp/tmpA.gam /tmp/tmpB.gam /tmp/tmp.wrl"); sprintf (system_befehl ,"cat /tmp/tmp.wrl >> \"%s\"", vrml); diff --git a/icc_vrml.h b/icc_vrml.h index 030039f..ea0e204 100644 --- a/icc_vrml.h +++ b/icc_vrml.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Farbumfang betrachten im WWW-3D Format vrml. + * watch colour gamut in WWW-3D format vrml. * */ diff --git a/icc_vrml_parser.cpp b/icc_vrml_parser.cpp index e5d95e1..52fde2f 100644 --- a/icc_vrml_parser.cpp +++ b/icc_vrml_parser.cpp @@ -21,11 +21,11 @@ * * ----------------------------------------------------------------------------- * - * Farbumfang betrachten im WWW-3D Format vrml: Parser + * visualise colour gamut in WWW-3D format vrml: parser * */ -// Beginn Datum: Februar 2005 +// start date: Februar 2005 #include "icc_helfer.h" @@ -86,15 +86,15 @@ ICCvrmlParser::lesen_ () int debug_alt = icc_debug; //icc_debug = 1; DBG_PROG_START - int netz_n = 0; // das n-the Netz - std::vector zeilen; // Editierzeilen - std::vector werte; // Zwischenrückgabewert - char trennzeichen[12]; // zu verwendende Trennzeichen + int netz_n = 0; // the n-th net/mesh + std::vector zeilen; // editing row + std::vector werte; // intermediate return value + char trennzeichen[12]; // to be used separating signs trennzeichen[0] = ','; sprintf(&trennzeichen[1], leer_zeichen); - const bool anfuehrungstriche = false; // keine Anführungsstriche setzen - unsigned int dimensionen; // Anzahl der zusammmengehörenden Werte - int achse; // ausgewählter Wert aus dimensionen + const bool anfuehrungstriche = false; // set no quotation marks + unsigned int dimensionen; // number of belonging values + int achse; // selected value from dimensionen DBG_PROG_V( original_.size() ) std::string::size_type pos=0, netz_pos=0; @@ -108,33 +108,33 @@ ICCvrmlParser::lesen_ () } # endif - // locale - Kommas unterscheiden + // locale - differenciate commas char* loc_alt = strdup(setlocale(LC_NUMERIC, NULL)); //getenv("LANG"); if(loc_alt) DBG_NUM_V( loc_alt ) else - DBG_NUM_S( "keine LANG Variable gefunden" ) + DBG_NUM_S( "did not find LANG variable" ) setlocale(LC_NUMERIC,"C"); - // nach Netzen in der vrml Datei suchen + // search for mesh in vrml file while( (netz_pos = original_.find( "IndexedFaceSet", netz_pos )) != std::string::npos ) { ++netz_pos; - // Bereich des Netzes eingrenzen + // get the area of the mesh if( (netz_ende = original_.find( "IndexedFaceSet", netz_pos )) == std::string::npos ) netz_ende = original_.size(); if( netz_pos == std::string::npos ) break; - DBG_VRML_PARSER_S( "IndexedFaceSet gefunden auf Position " << netz_pos <<"-"<< netz_ende ); + DBG_VRML_PARSER_S( "IndexedFaceSet found at position " << netz_pos <<"-"<< netz_ende ); arbeit_ = original_.substr (netz_pos-1, netz_ende-netz_pos+1); zeilen = zeilenNachVector (arbeit_); DBG_PROG_V( zeilen.size() <<"|"<< arbeit_.size() ) - // ab nun zeilenweise + // from now row wise int flaeche_klammer = false; //int in_coordinate = false; bool in_punkte = false; @@ -148,7 +148,7 @@ ICCvrmlParser::lesen_ () wert_n = 0; for(unsigned int z = 0; z < zeilen .size(); z++) { - // Hole eine kommentarfreie Zeile + // take a comment free line/row zeile = zeilen[z].substr( 0, zeilen[z].find( "#" ) ); pos = 0; @@ -200,9 +200,9 @@ ICCvrmlParser::lesen_ () werte = unterscheideZiffernWorte( zeile, anfuehrungstriche, trennzeichen ); - // ausgelesene Werte sortieren + // sort the read values for(unsigned int w = 0; w < werte.size(); ++w) - { DBG_VRML_PARSER_S( "w [" << w <<"]" << werte.size() <<" Netz: "<< endnetz <<" punkte "<< netze_[endnetz].punkte.size() ) + { DBG_VRML_PARSER_S( "w [" << w <<"]" << werte.size() <<" net: "<< endnetz <<" poinkts "<< netze_[endnetz].punkte.size() ) if(werte[w].zahl.first) { dimensionen = 3; @@ -242,7 +242,7 @@ ICCvrmlParser::lesen_ () werte = unterscheideZiffernWorte( zeile, anfuehrungstriche, trennzeichen ); - // ausgelesene Werte sortieren + // sort the read values for(unsigned int w = 0; w < werte.size(); ++w) { if(werte[w].zahl.first) @@ -279,7 +279,7 @@ ICCvrmlParser::lesen_ () werte = unterscheideZiffernWorte( zeile, anfuehrungstriche, trennzeichen ); - // ausgelesene Werte sortieren + // sort the read values std::pair index_p; for(unsigned int w = 0; w < werte.size(); ++w) { diff --git a/icc_vrml_parser.h b/icc_vrml_parser.h index ac7106f..be74685 100644 --- a/icc_vrml_parser.h +++ b/icc_vrml_parser.h @@ -21,7 +21,7 @@ * * ----------------------------------------------------------------------------- * - * Farbumfang betrachten im WWW-3D Format vrml: Parser + * visualise colour gamut in WWW-3D format vrml: parser * */ @@ -33,28 +33,28 @@ #include #include -/** ein Punkt im Raum mit berechneter Farbe */ +/** a point in space with calculated colour */ struct ICCnetzPunkt { - double koord[3]; //!< immer Lab 0..1 - double farbe[4]; //!< entweder aus VRML geparst oder anders berechnet + double koord[3]; //!< allways Lab 0..1 + double farbe[4]; //!< eigther from VRML parsed or calculated otherwise }; -/** Punktindexe zu einer darstellbaren Flaeche */ +/** point indexes for a representable plain */ struct DreiecksIndexe { - int i[4]; //!< bezieht sich auf std::vectorpunkte + int i[4]; //!< referes to std::vectorpunkte }; -/** darstellbare Informationen zu einer Farbraumhuelle */ +/** displayable informations to a colour space gamut */ struct ICCnetz { - std::vector punkte; //!< einzelne Netzpunkte - std::multimap indexe; //!< Zuordnen der Punkte - std::vector umriss; //!< Netzumriss, eine Linie - std::string name; //!< Anzeigename - int aktiv; //!< zeigen? - int grau; //!< keine farbe? - double undurchsicht; //!< Undurchlaessigkeit 0..1 - double schattierung; //!< L* Farbton fuer Grau 0..1 - int kubus; //!< aus einem Kubus generiert + std::vector punkte; //!< single netz points + std::multimap indexe; //!< assigning the points + std::vector umriss; //!< mesh hull, a line + std::string name; //!< name + int aktiv; //!< show? + int grau; //!< no colour? + double undurchsicht; //!< alpha 0..1 + double schattierung; //!< L* colour for gray 0..1 + int kubus; //!< generated from a cubus ICCnetz() { aktiv = 1; grau = 0; diff --git a/po/de.po b/po/de.po index 5f7a72f..3137be6 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: ku.b@gmx.de\n" -"POT-Creation-Date: 2007-04-21 11:05+0200\n" +"POT-Creation-Date: 2007-04-23 19:31+0200\n" "PO-Revision-Date: 2005-08-13 17:35+0200\n" "Last-Translator: Kai-Uwe Behrmann\n" "Language-Team: \n" @@ -1060,11 +1060,11 @@ msgstr "Bildschirmprofil" msgid "file size 0 for " msgstr "" -#: icc_kette.cpp:174 +#: icc_kette.cpp:173 msgid "noName" msgstr "kein Name" -#: icc_kette.cpp:194 +#: icc_kette.cpp:193 msgid "File not loaded!" msgstr "Datei nicht geladen!" @@ -1727,8 +1727,9 @@ msgid "Huch, unbekannte Ausnahme" msgstr "" #: icc_helfer_osx.cpp:73 -msgid "Hersteller: " -msgstr "" +#, fuzzy +msgid "Manufacturer: " +msgstr "Hersteller: " #: icc_helfer_osx.cpp:75 msgid "Model: " @@ -1758,20 +1759,12 @@ msgstr "Bildschirm:" msgid "XineramaScreen:" msgstr "XineramaSchirm:" -#: icc_helfer_x.cpp:184 -msgid "Keine Monitor Information erhalten" -msgstr "" - -#: icc_helfer_x.cpp:189 -msgid "Keine Gamma Information erhalten" -msgstr "" - #: icc_helfer_x.cpp:200 msgid "Gamma Green:" msgstr "Gamma Grün: " -#: icc_helfer_x.cpp:215 icc_helfer_x.cpp:224 -msgid "Kein Gammagradient Information erhalten" +#: icc_helfer_x.cpp:224 +msgid "no gammagradient information obtained" msgstr "" #: icc_helfer_fltk.cpp:320 diff --git a/po/eo.po b/po/eo.po index 9c8802d..3a52543 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: ku.b@gmx.de\n" -"POT-Creation-Date: 2007-04-21 11:05+0200\n" +"POT-Creation-Date: 2007-04-23 19:31+0200\n" "PO-Revision-Date: 2005-08-13 17:35+0200\n" "Last-Translator: Kai-Uwe Behrmann\n" "Language-Team: \n" @@ -1058,11 +1058,11 @@ msgstr "" msgid "file size 0 for " msgstr "" -#: icc_kette.cpp:174 +#: icc_kette.cpp:173 msgid "noName" msgstr "" -#: icc_kette.cpp:194 +#: icc_kette.cpp:193 msgid "File not loaded!" msgstr "" @@ -1688,7 +1688,7 @@ msgid "Huch, unbekannte Ausnahme" msgstr "" #: icc_helfer_osx.cpp:73 -msgid "Hersteller: " +msgid "Manufacturer: " msgstr "" #: icc_helfer_osx.cpp:75 @@ -1720,20 +1720,12 @@ msgstr "verda" msgid "XineramaScreen:" msgstr "" -#: icc_helfer_x.cpp:184 -msgid "Keine Monitor Information erhalten" -msgstr "" - -#: icc_helfer_x.cpp:189 -msgid "Keine Gamma Information erhalten" -msgstr "" - #: icc_helfer_x.cpp:200 msgid "Gamma Green:" msgstr "" -#: icc_helfer_x.cpp:215 icc_helfer_x.cpp:224 -msgid "Kein Gammagradient Information erhalten" +#: icc_helfer_x.cpp:224 +msgid "no gammagradient information obtained" msgstr "" #: icc_helfer_fltk.cpp:320 diff --git a/po/fr.po b/po/fr.po index 94e5088..d240081 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ICC Examin 0.41\n" "Report-Msgid-Bugs-To: ku.b@gmx.de\n" -"POT-Creation-Date: 2007-04-21 11:05+0200\n" +"POT-Creation-Date: 2007-04-23 19:31+0200\n" "PO-Revision-Date: 2006-06-29 19:31+0200\n" "Last-Translator: Pascal LACROIX \n" "Language-Team: ALL \n" @@ -1056,11 +1056,11 @@ msgstr "Écran Profil" msgid "file size 0 for " msgstr "" -#: icc_kette.cpp:174 +#: icc_kette.cpp:173 msgid "noName" msgstr "" -#: icc_kette.cpp:194 +#: icc_kette.cpp:193 msgid "File not loaded!" msgstr "" @@ -1686,8 +1686,9 @@ msgid "Huch, unbekannte Ausnahme" msgstr "" #: icc_helfer_osx.cpp:73 -msgid "Hersteller: " -msgstr "" +#, fuzzy +msgid "Manufacturer: " +msgstr "Fabricant: " #: icc_helfer_osx.cpp:75 msgid "Model: " @@ -1717,20 +1718,12 @@ msgstr "" msgid "XineramaScreen:" msgstr "" -#: icc_helfer_x.cpp:184 -msgid "Keine Monitor Information erhalten" -msgstr "" - -#: icc_helfer_x.cpp:189 -msgid "Keine Gamma Information erhalten" -msgstr "" - #: icc_helfer_x.cpp:200 msgid "Gamma Green:" msgstr "Gamma Vert:" -#: icc_helfer_x.cpp:215 icc_helfer_x.cpp:224 -msgid "Kein Gammagradient Information erhalten" +#: icc_helfer_x.cpp:224 +msgid "no gammagradient information obtained" msgstr "" #: icc_helfer_fltk.cpp:320 diff --git a/po/icc_examin.pot b/po/icc_examin.pot index 5c92a0b..f183e73 100644 --- a/po/icc_examin.pot +++ b/po/icc_examin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: ku.b@gmx.de\n" -"POT-Creation-Date: 2007-04-21 11:24+0200\n" +"POT-Creation-Date: 2007-04-24 17:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1054,11 +1054,11 @@ msgstr "" msgid "file size 0 for " msgstr "" -#: icc_kette.cpp:174 +#: icc_kette.cpp:173 msgid "noName" msgstr "" -#: icc_kette.cpp:194 +#: icc_kette.cpp:193 msgid "File not loaded!" msgstr "" @@ -1684,7 +1684,7 @@ msgid "Huch, unbekannte Ausnahme" msgstr "" #: icc_helfer_osx.cpp:73 -msgid "Hersteller: " +msgid "Manufacturer: " msgstr "" #: icc_helfer_osx.cpp:75 @@ -1715,20 +1715,12 @@ msgstr "" msgid "XineramaScreen:" msgstr "" -#: icc_helfer_x.cpp:184 -msgid "Keine Monitor Information erhalten" -msgstr "" - -#: icc_helfer_x.cpp:189 -msgid "Keine Gamma Information erhalten" -msgstr "" - #: icc_helfer_x.cpp:200 msgid "Gamma Green:" msgstr "" -#: icc_helfer_x.cpp:215 icc_helfer_x.cpp:224 -msgid "Kein Gammagradient Information erhalten" +#: icc_helfer_x.cpp:224 +msgid "no gammagradient information obtained" msgstr "" #: icc_helfer_fltk.cpp:320