[Stacomir-commits] r389 - in pkg/stacomir: R R/po man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jun 9 10:29:45 CEST 2017
Author: briand
Date: 2017-06-09 10:29:45 +0200 (Fri, 09 Jun 2017)
New Revision: 389
Modified:
pkg/stacomir/R/BilanFonctionnementDC.r
pkg/stacomir/R/BilanFonctionnementDF.r
pkg/stacomir/R/BilanMigrationCar.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/BilanMigrationMultConditionEnv.r
pkg/stacomir/R/Bilan_poids_moyen.r
pkg/stacomir/R/RefDC.r
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/po/R-stacomiR.pot
pkg/stacomir/R/po/R-stacomiR_fr_FR.mo
pkg/stacomir/R/po/R-stacomiR_fr_FR.po
pkg/stacomir/R/stacomi.r
pkg/stacomir/man/BilanMigrationInterAnnuelle-class.Rd
Log:
Edits for bug in frames and documentation (not finished)
Modified: pkg/stacomir/R/BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDC.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/BilanFonctionnementDC.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -457,7 +457,7 @@
bilanFonctionnementDC=charge(bilanFonctionnementDC)
bilanFonctionnementDC<-connect(bilanFonctionnementDC)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n"), arret=TRUE)
+ funout(gettext("No Shutdowns types for this pass\n"), arret=TRUE)
}
plot(bilanFonctionnementDC,plot.type=2,silent=FALSE)
}
Modified: pkg/stacomir/R/BilanFonctionnementDF.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDF.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/BilanFonctionnementDF.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -418,7 +418,7 @@
bilanFonctionnementDF=charge(bilanFonctionnementDF)
bilanFonctionnementDF<-connect(bilanFonctionnementDF)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n",domain="R-stacomiR"), arret=TRUE)
+ funout(gettext("No data for this fishway\n",domain="R-stacomiR"), arret=TRUE)
}
plot(bilanFonctionnementDF,plot.type=1,silent=FALSE)
}
@@ -435,7 +435,7 @@
bilanFonctionnementDF=charge(bilanFonctionnementDF)
bilanFonctionnementDF<-connect(bilanFonctionnementDF)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n",domain="R-stacomiR"), arret=TRUE)
+ funout(gettext("No data for this fishway\n",domain="R-stacomiR"), arret=TRUE)
}
plot(bilanFonctionnementDF,plot.type=2,silent=FALSE)
}
@@ -450,7 +450,7 @@
bilanFonctionnementDF<-connect(bilanFonctionnementDF)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n",domain="R-stacomiR"), arret=TRUE)
+ funout(gettext("No data for this fishway\n",domain="R-stacomiR"), arret=TRUE)
}
plot(bilanFonctionnementDF,plot.type=3,silent=FALSE)
@@ -466,7 +466,7 @@
bilanFonctionnementDF<-connect(bilanFonctionnementDF)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n",domain="R-stacomiR"), arret=TRUE)
+ funout(gettext("No data for this fishway\n",domain="R-stacomiR"), arret=TRUE)
}
plot(bilanFonctionnementDF,plot.type=4,silent=FALSE)
@@ -482,7 +482,7 @@
bilanFonctionnementDF<-connect(bilanFonctionnementDF)
if( nrow(bilanFonctionnementDF at data)==0 ) {
- funout(gettext("Shutdowns types for this counting device\n",domain="R-stacomiR"), arret=TRUE)
+ funout(gettext("No data for this fishway\n",domain="R-stacomiR"), arret=TRUE)
}
summary(bilanFonctionnementDF)
}
Modified: pkg/stacomir/R/BilanMigrationCar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationCar.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/BilanMigrationCar.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -414,7 +414,7 @@
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
setMethod("plot",signature=signature(x="BilanMigrationCar",y="missing"),definition=function(x,color_parm=NULL,plot.type="qual",silent=FALSE,...){
bmC<-x
- if (nrow(bmC at calcdata)==0) stop("no data in calcdata, have you forgotten to run calculations")
+ if (nrow(bmC at calcdata)==0) stop("no data in calcdata, have you forgotten to run calculations ?")
# transformation du tableau de donnees
# color_parm<-c("age 1"="red","age 2"="blue","age 3"="green")
# color_parm<-c("C001"="red")
Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -620,7 +620,7 @@
g<-g+theme_bw()+ theme(legend.key = element_blank())
print(g, vp=vplayout(1,1))
assign(paste("g",1,sep=""),g,envir_stacomi)
- if (!silent) funout(gettextf("Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with i=%s",paste(1:length(the_choice),collapse=",")))
+ if (!silent) funout(gettextf("Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s",paste(1:length(the_choice),collapse=",")))
} # end if
@@ -754,7 +754,7 @@
g<-g+ theme_minimal()
print(g, vp=vplayout(1,1))
assign(paste("g",1,sep=""),g,envir_stacomi)
- if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with \" i=%s",paste(1:length(the_choice),collapse=",")))
+ if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s",paste(1:length(the_choice),collapse=",")))
} # end if
@@ -829,7 +829,7 @@
g<-g+ theme_minimal()
print(g, vp=vplayout(1,1))
assign(paste("g",1,sep=""),g,envir_stacomi)
- if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with \" i=%s",paste(1:length(the_choice),collapse=",")))
+ if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s",paste(1:length(the_choice),collapse=",")))
} # end if
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: pkg/stacomir/R/BilanMigrationMultConditionEnv.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMultConditionEnv.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/BilanMigrationMultConditionEnv.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -187,8 +187,8 @@
tableauCEquan<-tableauCE[!qualitative,]
tableauCEqual<-tableauCE[qualitative,]
if (nrow(unique(cbind(tableauCE$date,tableauCE$stm_libelle)))!= nrow(tableauCE)) {
- funout(gettextf("Attention, on one station :%s there are several entries for the same day :%s we will calculate average for numeric
- and use the first value for qualitative parameter",
+ # do not cut character chain below...
+ funout(gettextf("Attention, on one station :%s there are several entries for the same day :%s we will calculate average for numeric and use the first value for qualitative parameter",
sta,
paste(unique(tableauCEst$env_date_debut[duplicated(tableauCEst$env_date_debut)]),sep="")),
arret=FALSE)
Modified: pkg/stacomir/R/Bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/Bilan_poids_moyen.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/Bilan_poids_moyen.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -464,8 +464,7 @@
# need to repass colnames
colnames(summary_harmonic)=c("source","$\\gamma$","$s_0(cm)$","$\\phi$")
xt_summary_harmonic<-xtable( summary_harmonic,
- caption=gettext("Comparison of the coefficients obtained by \\citet{desaunay_seasonal_1997} and in the present modelling
- of estuarine samples.",domain="R-stacomiR"),
+ caption=gettext("Comparison of the coefficients obtained by \\citet{desaunay_seasonal_1997} and in the present modelling of estuarine samples.",domain="R-stacomiR"),
label=gettext("summary_harmonic",domain="R-stacomiR"),
digits=c(0,0,3,3,0))
tabname<-stringr::str_c(get("datawd",envir=envir_stacomi),"/summary_harmonic.tex")
@@ -508,7 +507,7 @@
funout(paste(gettextf("data directory :%s",fileout,domain="R-stacomiR")))
}
assign("import_coe",import_coe,envir=envir_stacomi)
- funout(gettext("To obtain the table, type : import_coe=get(import_coe\",envir_stacomi",domain="R-stacomiR"))
+ funout(gettext("To obtain the table, type : import_coe=get(\"import_coe\",envir_stacomi)",domain="R-stacomiR"))
bilPM at calcdata[["import_coe"]]<-import_coe
}
return(bilPM)
Modified: pkg/stacomir/R/RefDC.r
===================================================================
--- pkg/stacomir/R/RefDC.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/RefDC.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -152,6 +152,7 @@
}
group<-get("group",envir=envir_stacomi)
frame_DC<-gframe(gettext("Counting devices choice",domain="R-stacomiR"))
+ assign("frame_DC",frame_DC,envir_stacomi)
add(group,frame_DC)
DC_identifiant=object at data$dc
choice=gdroplist(DC_identifiant,container=frame_DC,handler=hDC)
Modified: pkg/stacomir/R/RefStades.r
===================================================================
--- pkg/stacomir/R/RefStades.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/RefStades.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -140,7 +140,8 @@
}
}
group<-get("group",envir=envir_stacomi)
- frame_std<<-gframe(gettext("Stage selection",domain="R-stacomiR"))
+ frame_std<-gframe(gettext("Stage selection",domain="R-stacomiR"))
+ assign("frame_std",frame_std,envir_stacomi)
add(group,frame_std)
std_libelle=fun_char_spe(object at data$std_libelle)
choice=gcombobox(std_libelle,container=frame_std,handler=hstd)
Modified: pkg/stacomir/R/RefTaxon.r
===================================================================
--- pkg/stacomir/R/RefTaxon.r 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/RefTaxon.r 2017-06-09 08:29:45 UTC (rev 389)
@@ -84,13 +84,13 @@
if (exists("frame_std",envir_stacomi)){
delete(group,get("frame_std",envir_stacomi))
}
- if (exists("frame_par")) {
+ if (exists("frame_par",envir_stacomi)) {
delete(group,get("frame_par",envir_stacomi))
}
- if (exists("frame_parquan")) {
+ if (exists("frame_parquan",envir_stacomi)) {
delete(group,get("frame_parquan",envir_stacomi))
}
- if (exists("frame_parqual")) {
+ if (exists("frame_parqual",envir_stacomi)) {
delete(group,get("frame_parqual",envir_stacomi))
}
choice(objectBilan at stades,objectBilan,is.enabled=TRUE)
@@ -98,6 +98,9 @@
}
group<-get("group",envir=envir_stacomi)
frame_tax<-gframe(gettext("Taxon selection",domain="R-stacomiR"))
+ # assignment in envir_stacomi to get it back and delete it when previous
+ # object (dc) is selected
+ assign("frame_tax",frame_tax,envir_stacomi)
add(group,frame_tax)
tax_libelle=fun_char_spe(object at data$tax_nom_latin)
choice=gdroplist(tax_libelle,container=frame_tax,handler=htax)
Modified: pkg/stacomir/R/po/R-stacomiR.pot
===================================================================
--- pkg/stacomir/R/po/R-stacomiR.pot 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/po/R-stacomiR.pot 2017-06-09 08:29:45 UTC (rev 389)
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: stacomiR 0.5.1\n"
-"POT-Creation-Date: 2017-04-03 15:18\n"
+"Project-Id-Version: stacomiR 0.5.2\n"
+"POT-Creation-Date: 2017-06-09 09:27\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -31,6 +31,12 @@
msgid "You need to choose the ending date"
msgstr ""
+msgid "you need to choose a value for limit1hm"
+msgstr ""
+
+msgid "you need to choose a value for limit2hm"
+msgstr ""
+
msgid "limit1hm should be numeric or integer"
msgstr ""
@@ -49,7 +55,7 @@
msgid "internal error"
msgstr ""
-msgid "plot.type must be 1,2,3 or 4"
+msgid "plot.type must be 1,2"
msgstr ""
msgid "You need to launch computation first, clic on calc"
@@ -100,6 +106,9 @@
msgid "No data of silver or yellow eel on the selected period"
msgstr ""
+msgid "plot.type must be 1,2,3 or 4"
+msgstr ""
+
msgid "size (BL mm)"
msgstr ""
@@ -115,7 +124,7 @@
msgid "Number"
msgstr ""
-msgid "Number by pigmentation stage"
+msgid "Number by silvering stage"
msgstr ""
msgid "Size (mm)"
@@ -253,6 +262,9 @@
msgid "Shutdowns types for this counting device"
msgstr ""
+msgid "No Shutdowns types for this pass"
+msgstr ""
+
msgid "Writing of %s"
msgstr ""
@@ -361,21 +373,66 @@
msgid "Writing daily summary in the database"
msgstr ""
-msgid "Summary object is stocked into envir_stacomi environment"
+msgid "with"
msgstr ""
-msgid "You don't have any environmental conditions within the time period"
+msgid "without"
msgstr ""
-msgid "no selected station => simple graph"
+msgid "This bilan should be for just one taxa"
msgstr ""
-msgid "Attention, on one station :%s there are several entries for the same day :%s only the first value will be incuded in the summary"
+msgid "length(object at parqual)==1|length(object at parquan)==1 not TRUE"
msgstr ""
-msgid "The number of lines of the environmental conditions table (%s) doesn't fit the duration of the migration summary (%s)"
+msgid "You need to choose at least one parameter qualitative or quantitative"
msgstr ""
+msgid "You need to choose at least one quantitative or qualitative attribute"
+msgstr ""
+
+msgid "par should be a character"
+msgstr ""
+
+msgid "No data for quantitative parameter, perhaps you forgot to run the calcule method"
+msgstr ""
+
+msgid "The parameter %s is not in the selected parameters"
+msgstr ""
+
+msgid "No data for this parameter, nothing to do"
+msgstr ""
+
+msgid "%s lines have been converted from quantitative to qualitative parameters"
+msgstr ""
+
+msgid "cannot perform calcule method, no data in either qualitative or quantitative parameters"
+msgstr ""
+
+msgid "The calculated data are in slot calcdata"
+msgstr ""
+
+msgid "no data in calcdata, have you forgotten to run calculations"
+msgstr ""
+
+msgid "Classes"
+msgstr ""
+
+msgid "Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)"
+msgstr ""
+
+msgid "Param"
+msgstr ""
+
+msgid "No data in slot calcdata, did you forget to run the calcule method ?"
+msgstr ""
+
+msgid "Sum"
+msgstr ""
+
+msgid "Summary for dc %s, taxa %s, stage %s."
+msgstr ""
+
msgid "BilanMigrationInterannuelle can only take one taxa"
msgstr ""
@@ -451,9 +508,12 @@
msgid "Attention : you have to complete a migration summary for at least one of the selected year before launching a inter-annual summary"
msgstr ""
-msgid "Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with i=%s"
+msgid "Migration for years"
msgstr ""
+msgid "Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s"
+msgstr ""
+
msgid "%s %s, Cumulated numbers %s"
msgstr ""
@@ -466,7 +526,7 @@
msgid "year"
msgstr ""
-msgid "\"Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with \" i=%s"
+msgid "\"Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s"
msgstr ""
msgid "Warning : you have to complete a migration summary for at least one of the selected year before launching a inter-annual summary"
@@ -481,12 +541,24 @@
msgid "plot.type argument invalid"
msgstr ""
+msgid "Choice made, and object bilanMigrationMult assigned in envir_stacomi"
+msgstr ""
+
msgid "The summary object is stored in environment envir_stacomi, write bilanMigrationMult=get(\"bilanMigrationMult\",envir_stacomi)"
msgstr ""
msgid "Raw data are stored in bilanMigrationMult at data, processed data in bilanMigrationMult at calcdata\\n"
msgstr ""
+msgid "DC has length zero, are you connected to the right schema, do you use the right dc number ?"
+msgstr ""
+
+msgid "Taxa has length zero, are you connected to the right schema, do you use the right taxa ?"
+msgstr ""
+
+msgid "Stage has length zero, are you connected to the right schema, do you use the right stage ?"
+msgstr ""
+
msgid "The plot has been assigned to p in envir_stacomi,write p<-get('p',envir_stacomi) to retreive the object"
msgstr ""
@@ -499,27 +571,39 @@
msgid "Careful sum=0, you didn't enter the coefficient of conversion"
msgstr ""
-msgid "You need to choose a quantitative parameter"
+msgid "This function must have for argument an object of class BilanMigrationMult"
msgstr ""
-msgid "You need to choose a qualitative parameter"
+msgid "bmmCE object is stocked into envir_stacomi environment"
msgstr ""
-msgid "You need to choose at least one quantitative or qualitative attribute"
+msgid "You don't have any environmental conditions within the time period"
msgstr ""
-msgid "Be careful, the processing doesnt take lot\"s quantities into account"
+msgid "Attention, on one station :%s there are several entries for the same day :%s we will calculate average for numeric\n\t\t\t\t\t\t\t\t\t\tand use the first value for qualitative parameter"
msgstr ""
-msgid "Writing data into envir_stacomi environment : write data=get(\"data\",envir_stacomi)"
+msgid "Number, %s, %s"
msgstr ""
-msgid "This shouldn't be possible"
+msgid "you have %s taxa in the bilan, those will be aggregated"
msgstr ""
-msgid "Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)"
+msgid "you have %s stages in the bilan, those will be aggregated"
msgstr ""
+msgid "DC"
+msgstr ""
+
+msgid "stations"
+msgstr ""
+
+msgid "Qualitative parm"
+msgstr ""
+
+msgid "the ggplot object has been assigned to envir_stacomi, type g<-get('g',envir_stacomi)"
+msgstr ""
+
msgid "Loading data for operations"
msgstr ""
@@ -601,7 +685,7 @@
msgid "gam model g2 assigned to envir_stacomi"
msgstr ""
-msgid "Comparison of the coefficients obtained by \\citet{desaunay_seasonal_1997} and in the present modelling\n\t\t\t\t\t\t\t\t\t\tof estuarine samples."
+msgid "Comparison of the coefficients obtained by \\citet{desaunay_seasonal_1997} and in the present modelling of estuarine samples."
msgstr ""
msgid "summary_harmonic"
@@ -721,6 +805,21 @@
msgid "les longeur de 'labels' et 'checked' sont differentes"
msgstr ""
+msgid "valeurchoisie should be a vector of length 1"
+msgstr ""
+
+msgid "The selected valeur,"
+msgstr ""
+
+msgid "not in the list of possible values :"
+msgstr ""
+
+msgid "choice made"
+msgstr ""
+
+msgid "options"
+msgstr ""
+
msgid "%s rows deleted from table tj_coefficientconversion_coe"
msgstr ""
@@ -745,6 +844,9 @@
msgid "Error : no counting device in the database (the query returns 0 entry)"
msgstr ""
+msgid "Counting device not selected"
+msgstr ""
+
msgid "drop here"
msgstr ""
@@ -769,21 +871,15 @@
msgid "horodate should not be null"
msgstr ""
-msgid "Formatting problem, the character vector you are trying to pass as horodate could not\nbe parsed. Check example or documentation"
+msgid "Formatting problem, the character vector you are trying to pass as horodate could not\n\t\t\t\t\t\t\t\t\tbe parsed. Check example or documentation"
msgstr ""
-msgid "valeurchoisie should be a vector of length 1"
+msgid "Formatting problem, the character vector you are trying to pass as horodate could not\n\t\t\t\t\t\t\t\tbe parsed. Check example or documentation"
msgstr ""
-msgid "The selected valeur,"
+msgid "Horodate selected"
msgstr ""
-msgid "not in the list of possible values :"
-msgstr ""
-
-msgid "internal error, check messager and messagerlang length, they should match"
-msgstr ""
-
msgid "No data for this counting device and this taxon"
msgstr ""
@@ -802,6 +898,21 @@
msgid "Stop internal error : load data to make a choice"
msgstr ""
+msgid "Parm."
+msgstr ""
+
+msgid "Qualit. parm."
+msgstr ""
+
+msgid "Quant. parm."
+msgstr ""
+
+msgid "No Stage selected"
+msgstr ""
+
+msgid "Error : no stages in the database (the query returns 0 entry)"
+msgstr ""
+
msgid "No value for argument stage"
msgstr ""
@@ -838,9 +949,12 @@
msgid "Taxon selection"
msgstr ""
-msgid "The taxa(s) have been selected"
+msgid "Taxa selected"
msgstr ""
+msgid "No taxa selected"
+msgstr ""
+
msgid "No value for argument taxon"
msgstr ""
@@ -868,21 +982,45 @@
msgid "No data for par %s"
msgstr ""
-msgid "Internal error : there must have one line in Refparqual at data, or nbligne= %s"
+msgid "Sample characteristic"
msgstr ""
+msgid "Parameter selected"
+msgstr ""
+
+msgid "Select here"
+msgstr ""
+
+msgid "Error : no parameters in the database (the query returns 0 entry)"
+msgstr ""
+
msgid "Choice of a sample characteristic"
msgstr ""
+msgid "Features have been selected"
+msgstr ""
+
+msgid "Qualitative"
+msgstr ""
+
+msgid "No Parameter selected"
+msgstr ""
+
+msgid "Error : no qualitative parameters in the database (the query returns 0 entry)"
+msgstr ""
+
msgid "Writing monthly summary in the database"
msgstr ""
-msgid "Date"
+msgid "The length of color must be 11"
msgstr ""
-msgid "estimated number, %s, %s, %s, %s"
+msgid "Glass eels graph %s, %s, %s, %s"
msgstr ""
+msgid "Number of glass eels (x1000)"
+msgstr ""
+
msgid "Sum of numbers =%s"
msgstr ""
@@ -907,34 +1045,31 @@
msgid "minimum term = %s"
msgstr ""
-msgid "working"
+msgid "Unknown working"
msgstr ""
-msgid "stopped"
+msgid "Unknow operation type"
msgstr ""
-msgid "normal operation"
-msgstr ""
-
msgid "stop"
msgstr ""
msgid "CD"
msgstr ""
-msgid "Op"
+msgid "working"
msgstr ""
-msgid "Number (x1000)"
+msgid "stopped"
msgstr ""
-msgid "Glass eels graph %s"
+msgid "Op"
msgstr ""
-msgid "Number of glass eels (x1000)"
+msgid "Number (x1000)"
msgstr ""
-msgid "Glass eels graph %s, %s, %s, %s,..."
+msgid "Glass eels graph %s"
msgstr ""
msgid "weight of the daily number"
@@ -955,18 +1090,6 @@
msgid "minimum term = %sdays"
msgstr ""
-msgid "work"
-msgstr ""
-
-msgid "Number %s"
-msgstr ""
-
-msgid "Number %s, %s, %s, %s"
-msgstr ""
-
-msgid "Writing of the graphical object in the environment envir_stacomi : write g=get(g,envir_stacomi)"
-msgstr ""
-
msgid "Calculation of the monthly balance sheet"
msgstr ""
@@ -1093,12 +1216,33 @@
msgid "quit"
msgstr ""
-msgid "Loading of the lists for taxons, stages, counting devices and monitoring stations"
+msgid "Loading of the lists for taxons, stages, counting devices, qualitative and quantitative parameters"
msgstr ""
-msgid "Calculation of environnemental conditions by time step"
+msgid "Choice of batch type, inclusion of samples ?"
msgstr ""
+msgid "from"
+msgstr ""
+
+msgid "to"
+msgstr ""
+
+msgid "calculation"
+msgstr ""
+
+msgid "Plot for qualitative parm"
+msgstr ""
+
+msgid "plot for quantitative parm"
+msgstr ""
+
+msgid "Crossed graph for qualitative and quantitative parameter"
+msgstr ""
+
+msgid "Summary"
+msgstr ""
+
msgid "Loading of the existing daily summaries"
msgstr ""
@@ -1135,30 +1279,12 @@
msgid "gr(all)"
msgstr ""
-msgid "Loading of the lists for taxons, stages, counting devices, qualitative and quantitative parameters"
+msgid "Loading of the lists for taxons, stages, counting devices and monitoring stations"
msgstr ""
-msgid "with"
+msgid "Calculation of environnemental conditions by time step"
msgstr ""
-msgid "without"
-msgstr ""
-
-msgid "Choice of batch type, inclusion of samples ?"
-msgstr ""
-
-msgid "calculation"
-msgstr ""
-
-msgid "Monthly graphic"
-msgstr ""
-
-msgid "Daily graphic"
-msgstr ""
-
-msgid "Summary in .csv"
-msgstr ""
-
msgid "Loading of the view vue_ope_lot, and choice of the counting device and of the time steps"
msgstr ""
@@ -1183,15 +1309,6 @@
msgid "dataframe"
msgstr ""
-msgid "Size report"
-msgstr ""
-
-msgid "First timestamp"
-msgstr ""
-
-msgid "crossed query length / qualitative feature"
-msgstr ""
-
msgid "all"
msgstr ""
@@ -1243,9 +1360,6 @@
msgid "export"
msgstr ""
-msgid "choose language"
-msgstr ""
-
msgid "Calculation of the operating fishway"
msgstr ""
@@ -1285,7 +1399,7 @@
msgid "Summary of average weight for the calculation of the relation between length and number."
msgstr ""
-msgid "Not adapted yet to version 0.5"
+msgid "Not adapted yet to version 0.5.2"
msgstr ""
msgid "Species summary of the counting device"
@@ -1315,7 +1429,7 @@
msgid "Problem when testing the ODBC connection"
msgstr ""
-msgid "For help, contact Cedric Briand - 0033 29 99 08 844 - cedric.briand at eptb-vilaine.fr or stacomi at googlegroups.com."
+msgid "Connection"
msgstr ""
msgid "Login"
@@ -1336,9 +1450,6 @@
msgid "Fishway without counting device (TODO)"
msgstr ""
-msgid "Summary"
-msgstr ""
-
msgid "Migration"
msgstr ""
@@ -1381,18 +1492,30 @@
msgid "Treatment size - age salmonids"
msgstr ""
-msgid "Help"
+msgid "Output of the program"
msgstr ""
-msgid "Output of the program"
+msgid "The vector passed to vector_to_listsql should not be null"
msgstr ""
+msgid "The vector passed to vector_to_listsql should not be NA"
+msgstr ""
+
+msgid "The vector passed to vector_to_listsql should not be of lenght zero"
+msgstr ""
+
msgid "horodatedebut not in column names for data"
msgstr ""
msgid "horodatefin not column names for data"
msgstr ""
+msgid "The color argument should have length %s"
+msgstr ""
+
+msgid "The following name(s) %s do not match vector name: %s"
+msgstr ""
+
msgid "%d operation \n"
msgid_plural "%d operations \n"
msgstr[0] ""
Modified: pkg/stacomir/R/po/R-stacomiR_fr_FR.mo
===================================================================
(Binary files differ)
Modified: pkg/stacomir/R/po/R-stacomiR_fr_FR.po
===================================================================
--- pkg/stacomir/R/po/R-stacomiR_fr_FR.po 2017-06-08 11:36:34 UTC (rev 388)
+++ pkg/stacomir/R/po/R-stacomiR_fr_FR.po 2017-06-09 08:29:45 UTC (rev 389)
@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: stacomiR 0.5.0\n"
-"POT-Creation-Date: 2017-04-03 15:22+0200\n"
-"PO-Revision-Date: 2017-04-11 15:37+0200\n"
+"POT-Creation-Date: 2017-06-09 09:46+0200\n"
+"PO-Revision-Date: 2017-06-09 10:17+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.2\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
msgid "Data loaded"
@@ -33,6 +33,12 @@
msgid "You need to choose the ending date"
msgstr "Vous devez choisir une date de fin"
+msgid "you need to choose a value for limit1hm"
+msgstr "vous devez choisir une valeur pour limit1hm"
+
+msgid "you need to choose a value for limit2hm"
+msgstr "vous devez choisir une valeur pour limit2hm"
+
msgid "limit1hm should be numeric or integer"
msgstr "limit1hm doit être un nombre ou un entier"
@@ -51,8 +57,8 @@
msgid "internal error"
msgstr "Erreur interne"
-msgid "plot.type must be 1,2,3 or 4"
-msgstr "plot.type doit être 1,2,3 ou 4"
+msgid "plot.type must be 1,2"
+msgstr "plot.type doit être 1 ou 2"
msgid "You need to launch computation first, clic on calc"
msgstr "Il faut d'abord lancer le calcul, cliquer sur calc"
@@ -65,7 +71,7 @@
"envir=envir_stacomi)"
msgid "the bilan_adm should be of class BilanAgedemer"
-msgstr ""
+msgstr "Le bilan_adm devrait avoir pour class BilanAgedemer"
msgid "the silent argument should be a logical"
msgstr "l’argument silent doit être booleen"
@@ -75,12 +81,15 @@
"limit between 1 sea winter and 2 sea winter fish, and %s for the limit "
"between 2 sea winter fish and 3 sea winter fish"
msgstr ""
+"Age calculé à partir de la taille des poissons comparée à une valeur de "
+"référence %s pour la limite entre des poissons de un hiver de mer et de deux "
+"hiver, et %s pour la limite entre deux hiver de mer et trois hiver de mer."
msgid "Writing %s age values in the database"
-msgstr ""
+msgstr "Ecriture de %s valeur d'âge dans la base de données"
msgid "No data to remove"
-msgstr ""
+msgstr "Aucun donnée à enlever"
msgid "You need to choose the starting year"
msgstr "Il faut choisir l'annee de debut"
@@ -118,6 +127,9 @@
msgstr ""
"Pas de données d'argentées ou d'anguilles jaunes sur la période demandée"
+msgid "plot.type must be 1,2,3 or 4"
+msgstr "plot.type doit être 1,2,3 ou 4"
+
msgid "size (BL mm)"
msgstr "taille (LT mm)"
@@ -133,7 +145,9 @@
msgid "Number"
msgstr "Effectif"
-msgid "Number by pigmentation stage"
+#, fuzzy
+#| msgid "Number by pigmentation stage"
+msgid "Number by silvering stage"
msgstr "Effectif par stade d'Argenture"
msgid "Size (mm)"
@@ -154,6 +168,8 @@
msgid "Some monitoring stations lack associated values (no environmental data)"
msgstr ""
+"Certaines stations de mesure n'ont pas de valeur associée (pas de données "
+"environnementales)"
msgid ""
"No environmental conditions values for selected monitoring stations "
@@ -284,11 +300,14 @@
msgid "Shutdowns types for this counting device"
msgstr "Types d'arrêts du DC"
+msgid "No Shutdowns types for this pass"
+msgstr "Pas de données pour ce DF"
+
msgid "Writing of %s"
msgstr "Ecriture de %s"
msgid "Writing of %s this might take a while, please be patient ..."
-msgstr ""
+msgstr "Ecriture de %s ceci peut être long, de grace soyez patient..."
msgid "t_periodefonctdispositif_per_DC_%s_%s"
msgstr "t_periodefonctdispositif_per_DC_%s_%s"
@@ -358,7 +377,7 @@
"bilanMigration=get('bilanMigration',envir_stacomi)"
msgstr ""
"L'objet Bilan est stocke dans l'environnement envir_stacomi, écrire "
-"bilanMigration=get('bilanMigration',envir_stacomi (...)"
+"bilanMigration=get('bilanMigration',envir_stacomi)"
msgid "To access calculated data, type bilanMigration at calcdata"
msgstr "Pour accéder aux données calculées, écrire : bilanMigration at calcdata"
@@ -407,65 +426,130 @@
msgid "Writing daily summary in the database"
msgstr "Ecriture du bilan journalier dans la base"
-msgid "Summary object is stocked into envir_stacomi environment"
-msgstr "L'objet Bilan est stocke dans l'environnement envir_stacomi"
+msgid "with"
+msgstr "avec"
-msgid "You don't have any environmental conditions within the time period"
+msgid "without"
+msgstr "sans"
+
+msgid "This bilan should be for just one taxa"
+msgstr "Ce bilan ne devrait être que pour un taxon"
+
+msgid "length(object at parqual)==1|length(object at parquan)==1 not TRUE"
msgstr ""
-"Vous n'avez pas de conditions environnementales sur la periode de temps"
-msgid "no selected station => simple graph"
-msgstr "pas station sélectionnée => graphe simple"
+msgid "You need to choose at least one parameter qualitative or quantitative"
+msgstr ""
+"Il faut choisir au moins une caractéristique quantitative ou qualitative"
+msgid "You need to choose at least one quantitative or qualitative attribute"
+msgstr ""
+"Il faut choisir au moins une caractéristique quantitative ou qualitative"
+
+msgid "par should be a character"
+msgstr "pardoit être une chaine de caractères"
+
msgid ""
-"Attention, on one station :%s there are several entries for the same day :%s "
-"only the first value will be incuded in the summary"
+"No data for quantitative parameter, perhaps you forgot to run the calcule "
+"method"
msgstr ""
-"Attention, sur une station : %s il y a plusieurs entrées pour le même jour : "
-"%s. Le bilan n'inclura que la première valeur."
+"Pas de données pour les caractères quantitatifs, avez vous oublié de lancer "
+"la méthode calcule ?"
+msgid "The parameter %s is not in the selected parameters"
+msgstr "Le paramètre %s n'est pas dans les paramètres sélectionnés"
+
+msgid "No data for this parameter, nothing to do"
+msgstr "Pas de données pour ce paramètre, rien à faire"
+
msgid ""
-"The number of lines of the environmental conditions table (%s) doesn't fit "
-"the duration of the migration summary (%s)"
+"%s lines have been converted from quantitative to qualitative parameters"
msgstr ""
-"Le nombre de lignes dans le tableau des conditions environnementales (%s) ne "
-"correspond pas à la durée du bilan de migration (%s)"
+"%s lignes ont été converties de caractéristique quantitative vers "
+"caractéristique qualitative"
-msgid "BilanMigrationInterannuelle can only take one taxa"
+msgid ""
+"cannot perform calcule method, no data in either qualitative or quantitative "
+"parameters"
msgstr ""
+"Ne peut pas lancer la méthode calcule, aucune données pour les paramètres "
+"quantitatifs ou qualitatifs"
-msgid "BilanMigrationInterannuelle can only take one stage"
+msgid "The calculated data are in slot calcdata"
+msgstr "Les données calculées sont dans le slot calcdata"
+
+msgid "no data in calcdata, have you forgotten to run calculations"
+msgstr "pas de données dans calcdata, auriez vous oublié de lancer le calcul ?"
+
+msgid "Classes"
+msgstr "Classes"
+
+msgid ""
+"Writing the graphical object into envir_stacomi environment : write g=get(\"g"
+"\",envir_stacomi)"
msgstr ""
+"Ecriture de l'objet graphique dans l'environnement envir_stacomi : écrire "
+"g=get('g',envir_stacomi) "
-msgid "DC with missing values : %s"
+msgid "Param"
+msgstr "Param"
+
+msgid "No data in slot calcdata, did you forget to run the calcule method ?"
msgstr ""
+"Pas de donnée dans le slot calcdata, avez-vous oublié de lancer la méthode "
+"calcule"
+msgid "Sum"
+msgstr "Bilan"
+
+msgid "Summary for dc %s, taxa %s, stage %s."
+msgstr "Summary pour dc %s, taxon %s, stade %s."
+
+msgid "BilanMigrationInterannuelle can only take one taxa"
+msgstr "la classe BilanMigrationInterannuelle ne peut prendre qu'un taxon"
+
+msgid "BilanMigrationInterannuelle can only take one stage"
+msgstr "la classe BilanMigrationInterannuelle ne peut prendre qu'un stade"
+
+msgid "DC with missing values : %s"
+msgstr "DC avec valeurs manquantes : %s"
+
msgid "Years with no value : %s"
-msgstr ""
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 389
More information about the Stacomir-commits
mailing list