[Stacomir-commits] r260 - in pkg/stacomir: R po
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 10:36:45 CET 2017
Author: timothee_besse
Date: 2017-01-31 10:36:45 +0100 (Tue, 31 Jan 2017)
New Revision: 260
Modified:
pkg/stacomir/R/BilanFonctionnementDF.r
pkg/stacomir/R/BilanMigration.r
pkg/stacomir/R/BilanMigrationMult.r
pkg/stacomir/R/BilanMigrationPar.r
pkg/stacomir/R/Bilan_carlot.r
pkg/stacomir/R/Bilan_stades_pigm.r
pkg/stacomir/R/funSousListeBilanMigrationPar.r
pkg/stacomir/R/stacomi.r
pkg/stacomir/po/R-stacomiR.pot
Log:
Mise ?\195?\131?\194?\160 jour des traductions, suppression de messages FR restants, corrections des double ""
Modified: pkg/stacomir/R/BilanFonctionnementDF.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDF.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/BilanFonctionnementDF.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -306,7 +306,7 @@
border = NA,
lwd = 1)
legend( x= "bottom",
- legend= gettext("Fonc","Arr","Fonc normal"),
+ legend= gettext("Func.","Stop","Normal func."),
pch=c(16,16),
col=c(mypalette[4],mypalette[6],mypalette[1]),
#horiz=TRUE,
Modified: pkg/stacomir/R/BilanMigration.r
===================================================================
--- pkg/stacomir/R/BilanMigration.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/BilanMigration.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -273,7 +273,7 @@
bilanMigration at calcdata<-lestableaux
assign("bilanMigration",bilanMigration,envir_stacomi)
if (!silent){
- funout(gettext("\"Summary object is stocked into envir_stacomi environment : write bilanMigration=get(bilanMigration\",envir_stacomi)\"\n"))
+ funout(gettext("Summary object is stocked into envir_stacomi environment : write bilanMigration=get('bilanMigration',envir_stacomi) \n"))
funout(gettext("To access calculated data, type bilanMigration at calcdata\n"))
}
Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/BilanMigrationMult.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -248,7 +248,7 @@
bilanMigrationMult at calcdata<-lestableaux
assign("bilanMigrationMult",bilanMigrationMult,envir_stacomi)
if (!silent){
- funout(gettext("\"The summary object is stored in environment envir_stacomi, write bilanMigrationMult=get('bilanMigrationMult',envir_stacomi)\\n\"\"\n"))
+ funout(gettext("The summary object is stored in environment envir_stacomi, write bilanMigrationMult=get(\"bilanMigrationMult\",envir_stacomi) \n"))
funout(gettext("Raw data are stored in bilanMigrationMult at data, processed data in bilanMigrationMult at calcdata\\n\n"))
}
return(bilanMigrationMult)
Modified: pkg/stacomir/R/BilanMigrationPar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationPar.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/BilanMigrationPar.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -147,9 +147,9 @@
if (bilanMigrationPar at taxons@data$tax_nom_commun=="Anguilla anguilla"& bilanMigrationPar at stades@data$std_libelle=="civelle")
{
- funout(gettext("\"Be careful, the processing doesnt take lot\"s quantities into account\"\n"))
+ funout(gettext("Be careful, the processing doesnt take lot\"s quantities into account \n"))
}
- funout(gettext("\"Writing data into envir_stacomi environment : write data=get(data\",envir_stacomi)\"\n"))
+ funout(gettext("Writing data into envir_stacomi environment : write data=get(\"data\",envir_stacomi) \n"))
bilanMigrationPar at data<-data
assign("bilanMigrationPar",bilanMigrationPar,envir_stacomi)
assign("data",data,envir_stacomi)
@@ -219,7 +219,7 @@
colnames(bilanMigrationPar at data)<-gsub("quantite",nmvarqan,colnames(bilanMigrationPar at data)) # je renomme la variable quant
mb=reshape2::melt(bilanMigrationPar at data,id.vars=c(1:4),measure.vars=grep(nmvarqan,colnames(bilanMigrationPar at data))) # valeurs quantitatives (il n'y a qu'une)
} else if (bilanMigrationPar at parquan@data$par_nom=="aucune"&bilanMigrationPar at parqual@data$par_nom=="aucune"){
- stop("normalement ce cas est impossible")
+ stop("This shouldn't be possible")
# ce cas est impossible
}
mb=stacomirtools::chnames(mb,"value","sum")
@@ -232,7 +232,7 @@
g<-g+geom_bar(aes(x=mois,y=sum,fill=variable),stat='identity',
stack=TRUE)
assign("g",g,envir_stacomi)
- funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi) \n"))
print(g)
} #end plot.type = "barplot"
if (plot.type=="xyplot") {
@@ -240,7 +240,7 @@
g<-ggplot(mb)
g<-g+geom_point(aes(x=Date,y=sum,col=variable),stat='identity',stack=TRUE)
assign("g",g,envir_stacomi)
- funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi) \n"))
print(g)
} #end plot.type="xyplot"
#TODO create summary method
Modified: pkg/stacomir/R/Bilan_carlot.r
===================================================================
--- pkg/stacomir/R/Bilan_carlot.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/Bilan_carlot.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -235,21 +235,21 @@
coord_flip()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help\"n"))
+ if (!silent) funout(gettext("To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help \n"))
} else if (plot.type==2){
g<-ggplot(bilan_carlot at data)
g<-g+geom_boxplot(aes(x=mois,y=car_valeur_quantitatif,fill=std_libelle))+
facet_grid(annee ~ .)
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help\n"))
+ if (!silent) funout(gettext("To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help \n"))
}else if (plot.type==3){
g<-ggplot(bilan_carlot at data)
g<-g+geom_point(aes(x=ope_date_debut,y=car_valeur_quantitatif))
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help\n"))
+ if (!silent) funout(gettext("To obtain the graphical object, type : g<-get(\"g\",envir_stacomi), see http://trac.eptb-vilaine.fr:8066/tracstacomi/wiki/Recette%20BilanLot for help \n"))
}
return(invisible(NULL))
})
Modified: pkg/stacomir/R/Bilan_stades_pigm.r
===================================================================
--- pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -664,8 +664,7 @@
tps[j,k]=phidates[length(phidates)]
if (cherchenuls[j,k]!=0 ){
# teste si il a des stades dans la case selectionnee
- warning(paste(strdates[j],colnames(tps)[k],"le tableau des temperatures et salinites",
- "ne remonte pas assez loin dans le temps","\n"))
+ warning(paste(strdates[j],colnames(tps)[k],"The temperature and salinity table doesn't go back enough in time","\n"))
}
}
}
Modified: pkg/stacomir/R/funSousListeBilanMigrationPar.r
===================================================================
--- pkg/stacomir/R/funSousListeBilanMigrationPar.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/funSousListeBilanMigrationPar.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -268,7 +268,7 @@
echantillons=""
}
if (bilanMigrationPar at parquan@data$par_nom=="aucune" & bilanMigrationPar at parqual@data$par_nom=="aucune") {
- stop("il faut choisir au moins une caracteristique quantitative ou qualitative")
+ stop("You need to choose at least one quantitative or qualitative attribute")
} else if (bilanMigrationPar at parquan@data$par_nom=="aucune") {
#caracteristique qualitative uniquement
req at sql=paste("SELECT ope_date_debut, ope_date_fin, lot_methode_obtention, SUM(lot_effectif) AS effectif,",
Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/R/stacomi.r 2017-01-31 09:36:45 UTC (rev 260)
@@ -179,7 +179,7 @@
if (nrow(requete at query)==0){
# the odbc link does not work and might be pointing to a wrong schema
# this time the argument login_window will be ignored
- gWidgets::gmessage(message=paste(gettext("\"\"Problem during the test, the ODBC link works but doesn't point to the database 0.5, check the ODBC link\"\""),
+ gWidgets::gmessage(message=paste(gettext("Problem during the test, the ODBC link works but doesn't point to the database 0.5, check the ODBC link"),
"\n",
gettext("ODBC link"),
" :",
Modified: pkg/stacomir/po/R-stacomiR.pot
===================================================================
--- pkg/stacomir/po/R-stacomiR.pot 2017-01-31 08:19:06 UTC (rev 259)
+++ pkg/stacomir/po/R-stacomiR.pot 2017-01-31 09:36:45 UTC (rev 260)
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: stacomiR 0.5.0\n"
-"POT-Creation-Date: 2017-01-30 16:54\n"
+"POT-Creation-Date: 2017-01-31 10:13\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"
@@ -301,15 +301,6 @@
msgid "Fishway"
msgstr ""
-msgid "Fonc"
-msgstr ""
-
-msgid "Arr"
-msgstr ""
-
-msgid "Fonc normal"
-msgstr ""
-
msgid "Fishway operation"
msgstr ""
@@ -328,7 +319,7 @@
msgid "Starting migration summary ... be patient"
msgstr ""
-msgid "\"Summary object is stocked into envir_stacomi environment : write bilanMigration=get(bilanMigration\",envir_stacomi)\""
+msgid "Summary object is stocked into envir_stacomi environment : write bilanMigration=get('bilanMigration',envir_stacomi)"
msgstr ""
msgid "To access calculated data, type bilanMigration at calcdata"
@@ -436,7 +427,7 @@
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 "\"The summary object is stored in environment envir_stacomi, write bilanMigrationMult=get('bilanMigrationMult',envir_stacomi)\\n\"\""
+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"
@@ -457,13 +448,13 @@
msgid "You need to choose at least one quantitative or qualitative attribute"
msgstr ""
-msgid "\"Be careful, the processing doesnt take lot\"s quantities into account\""
+msgid "Be careful, the processing doesnt take lot\"s quantities into account"
msgstr ""
-msgid "\"Writing data into envir_stacomi environment : write data=get(data\",envir_stacomi)\""
+msgid "Writing data into envir_stacomi environment : write data=get(\"data\",envir_stacomi)"
msgstr ""
-msgid "normalement ce cas est impossible"
+msgid "This shouldn't be possible"
msgstr ""
msgid "Loading data for operations"
@@ -598,12 +589,9 @@
msgid "incoming dates in estuary"
msgstr ""
-msgid "le tableau des temperatures et salinites"
+msgid "The temperature and salinity table doesn't go back enough in time"
msgstr ""
-msgid "ne remonte pas assez loin dans le temps"
-msgstr ""
-
msgid "The graphic object is available in the main environment, write g<-get('g',envir=envir_stacomi)"
msgstr ""
@@ -874,9 +862,6 @@
msgid "Writing monthly summary in the database"
msgstr ""
-msgid "il faut choisir au moins une caracteristique quantitative ou qualitative"
-msgstr ""
-
msgid "Date"
msgstr ""
@@ -1267,7 +1252,7 @@
msgid "Error when using the method connect of the ConnectionODBC class"
msgstr ""
-msgid "\"\"Problem during the test, the ODBC link works but doesn't point to the database 0.5, check the ODBC link\"\""
+msgid "Problem during the test, the ODBC link works but doesn't point to the database 0.5, check the ODBC link"
msgstr ""
msgid "ODBC link"
@@ -1318,6 +1303,9 @@
msgid "Inter annual migration"
msgstr ""
+msgid "Sample characteristics"
+msgstr ""
+
msgid "Help"
msgstr ""
More information about the Stacomir-commits
mailing list