[Stacomir-commits] r265 - in pkg/stacomir: R inst/po/fr/LC_MESSAGES po

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Jan 31 18:12:12 CET 2017


Author: timothee_besse
Date: 2017-01-31 18:12:11 +0100 (Tue, 31 Jan 2017)
New Revision: 265

Modified:
   pkg/stacomir/R/BilanAnnuels.r
   pkg/stacomir/R/BilanMigrationInterAnnuelle.r
   pkg/stacomir/R/Bilan_stades_pigm.r
   pkg/stacomir/R/stacomi.r
   pkg/stacomir/inst/po/fr/LC_MESSAGES/R-stacomiR.mo
   pkg/stacomir/po/R-stacomiR.pot
   pkg/stacomir/po/R-stacomiR_fr_FR.mo
   pkg/stacomir/po/R-stacomiR_fr_FR.po
Log:
Mise ?\195?\131?\194?\160 jour des menus + autres corrections de messages

Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/R/BilanAnnuels.r	2017-01-31 17:12:11 UTC (rev 265)
@@ -420,7 +420,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					} else if (length(lestax)==1 & length(lesstd)==1){
 						
@@ -429,7 +429,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					} else if (length(lestax)==1 & length(lesdic)==1){
 						
@@ -438,7 +438,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					} else if (length(lesdic)==1 & length(lesstd)==1){
 						
@@ -447,7 +447,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 						
 					} else if (length(lestax)==1){
@@ -457,7 +457,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					} else if (length(lesstd)==1){
 						
@@ -466,7 +466,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					} else if (length(lesdic)==1){
 						
@@ -475,7 +475,7 @@
 								theme_bw() 
 						print(g)
 						assign("g",g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))							
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))							
 						
 					} else {
 						if (length(lesdic)<3){
@@ -493,7 +493,7 @@
 							print(g)	
 							
 							assign("g",g,envir_stacomi)
-							if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))	
+							if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))	
 						}
 					}
 				}

Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r	2017-01-31 17:12:11 UTC (rev 265)
@@ -256,7 +256,7 @@
 							scale_x_datetime(name="date")
 					print(g)
 					assign("g",g,envir=envir_stacomi)
-					if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+					if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 					#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 				} else if (plot.type=="standard"){
 					dat=bilanMigrationInterAnnuelle at data
@@ -348,7 +348,7 @@
 					g<-g+scale_colour_hue(name=gettext("year",domain="R-stacomiR"),l=70, c=150)# annee
 					print(g) 
 					assign("g",g,envir_stacomi)
-					if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))	
+					if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))	
 					#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 				} else if (plot.type=="barchart"){	
 					dat=bilanMigrationInterAnnuelle at data
@@ -434,7 +434,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
 					
@@ -509,7 +509,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
 					#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -557,7 +557,7 @@
 						g<-g+ theme_minimal() 
 						print(g)
 						assign(paste("g",sep=""),g,envir_stacomi)
-						if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
+						if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
 						
 					}    else     {
 						if (!silent) funout(gettext("Warning : you have to complete a migration summary for at least one of the selected year before launching a inter-annual summary",domain="R-stacomiR"))

Modified: pkg/stacomir/R/Bilan_stades_pigm.r
===================================================================
--- pkg/stacomir/R/Bilan_stades_pigm.r	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/R/Bilan_stades_pigm.r	2017-01-31 17:12:11 UTC (rev 265)
@@ -815,7 +815,7 @@
 		dispose(wintitle)
 	}
 	group1<-gWidgets::ggroup(horizontal=FALSE,container=wintitle)
-	titre1 <- gWidgets::glabel(text= gettext("Titre du graphique de stades pigmentaires (graphstades = TRUE)"), editable=FALSE,container=group1)
+	titre1 <- gWidgets::glabel(text= gettext("Pigmentary sages graph title (graphstades = TRUE)",domain="R-stacomiR"), editable=FALSE,container=group1)
 	titre2 <- gWidgets::gtext( text= bilan_stades_pigm at labelgraphstades,font.attr= c(foreground.colors="blueblue"),height=40,container=group1)  
 	titre3 <- gWidgets::glabel(text= "Titre du graphique de retrocalcul quand il est seul (graphstades = FALSE)", editable=FALSE,container=group1) 
 	titre4 <- gWidgets::gtext(text= bilan_stades_pigm at labelretro, editable=TRUE,height=40,container=group1) 
@@ -842,9 +842,9 @@
 	funout(gettext("Summary of pigmentation stages\n",domain="R-stacomiR"))
 	bilan_stades_pigm at dc=charge(bilan_stades_pigm at dc)
 	bilan_stades_pigm at stationMesure=charge(bilan_stades_pigm at stationMesure)
-	bilan_stades_pigm at lmax<-charge(bilan_stades_pigm at lmax,vecteur=c("0.6","0.8","1","1.2"),label="choice de la largeur des distributions",selected=as.integer(2))
+	bilan_stades_pigm at lmax<-charge(bilan_stades_pigm at lmax,vecteur=c("0.6","0.8","1","1.2"),label=gettext("distributions width choice",domain="R-stacomiR"),selected=as.integer(2))
 	bilan_stades_pigm at options<-charge(bilan_stades_pigm at options,title="options du graphique",labels=c("graphstades","retrocalcul","points","nb"),checked=c(TRUE,FALSE,TRUE,TRUE))
-	bilan_stades_pigm at salinite<-charge(bilan_stades_pigm at salinite,title= "Valeur de la salinite moyenne, cliquer pour editer",label="15")
+	bilan_stades_pigm at salinite<-charge(bilan_stades_pigm at salinite,title= gettext("Mean salinity value, click to edit",domain="R-stacomiR"),label="15")
 	
 	quitte() # vidange de l'interface
 	group <- gWidgets::ggroup(horizontal=FALSE)   # doit toujours s'appeller group
@@ -864,14 +864,14 @@
 			funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
 			decal=-2,
 			affichecal=FALSE)
-	choice(bilan_stades_pigm at horodate,label=gettext("Last timestamp"),
+	choice(bilan_stades_pigm at horodate,label=gettext("Last timestamp",domain="R-stacomiR"),
 			nomassign="bilan_stades_pigm_date_fin",
-			funoutlabel=gettext("Ending date has been chosen\n"),
+			funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
 			decal=-1,
 			affichecal=FALSE)
 	choice(bilan_stades_pigm at dc,objectBilan=bilan_stades_pigm,is.enabled=TRUE)
 	#getStockIcons(toolkit=guiToolkit())
-	aCalcul=gWidgets::gaction(label="calcul",icon="gtk-execute",handler=funcalcbilan_stades_pigm,tooltip="Chargement des donnees")         
+	aCalcul=gWidgets::gaction(label="calcul",icon="gtk-execute",handler=funcalcbilan_stades_pigm,tooltip=gettext("Data loading",domain="R-stacomiR"))         
 	aSetTitle=gWidgets::gaction(label="title",icon="rename",handler=funtitle_bilan_stades_pigm,tooltip=gettext("Title choice",domain="R-stacomiR"))
 	aGraph=gWidgets::gaction(label="graph",icon="gWidgetsRGtk2-contour",handler=hfungraphstades,tooltip="Graphique Principal")
 	aGraphgg=gWidgets::gaction(label="graphgg",icon="gWidgetsRGtk2-bubbles",handler=fungraphgg,tooltip="Graphique supplementaire avec ggplot")

Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/R/stacomi.r	2017-01-31 17:12:11 UTC (rev 265)
@@ -415,7 +415,7 @@
 	nbligne=0
 	assign("nbligne",nbligne,.GlobalEnv)
 	
-	win <- gWidgets::gwindow(gettext("Migratory treatment"), name="main",parent=c(0,0,domain="R-stacomiR"),width=100,height=100)
+	win <- gWidgets::gwindow(gettext("Migratory treatment",domain="R-stacomiR"), name="main",parent=c(0,0),width=100,height=100)
 	assign("win",win,envir=.GlobalEnv)
 	
 	## Menubar is defined by a list
@@ -430,42 +430,42 @@
 	menubarlist[[gettext("Station")]][[gettext("Fishway without counting device (TODO)",domain="R-stacomiR")]]$handler=hDFDC
 	menubarlist[[gettext("Station")]][[gettext("Fishway without counting device (TODO)",domain="R-stacomiR")]]$icon="gtk-cancel"
 	
-	menubarlist[[gettext("Summary")]][[gettext("Migration",domain="R-stacomiR")]]$handler=hBilanMigration
-	menubarlist[[gettext("Summary")]][[gettext("Migration",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-curve"
-	menubarlist[[gettext("Summary")]][[gettext("Multiple migrations",domain="R-stacomiR")]]$handler=hBilanMigrationMult
-	menubarlist[[gettext("Summary")]][[gettext("Multiple migrations",domain="R-stacomiR")]]$icon="gtk-dnd-multiple"
-	menubarlist[[gettext("Summary")]][[gettext("Yearly",domain="R-stacomiR")]]$handler=hbilA
-	menubarlist[[gettext("Summary")]][[gettext("Yearly",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-barplot"
-	menubarlist[[gettext("Summary")]][[gettext("Inter annual migration",domain="R-stacomiR")]]$handler=hBilanMigrationInterAnnuelle
-	menubarlist[[gettext("Summary")]][[gettext("Inter annual migration",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-hist"
-	menubarlist[[gettext("Summary")]][[gettext("Sample characteristics",domain="R-stacomiR")]]$handler=hBilan_carlot
-	menubarlist[[gettext("Summary")]][[gettext("Sample characteristics",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-newplot"#"gWidgetsRGtk2-logical"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration",domain="R-stacomiR")]]$handler=hBilanMigration
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-curve"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Multiple migrations",domain="R-stacomiR")]]$handler=hBilanMigrationMult
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Multiple migrations",domain="R-stacomiR")]]$icon="gtk-dnd-multiple"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Yearly",domain="R-stacomiR")]]$handler=hbilA
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Yearly",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-barplot"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Inter annual migration",domain="R-stacomiR")]]$handler=hBilanMigrationInterAnnuelle
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Inter annual migration",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-hist"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Sample characteristics",domain="R-stacomiR")]]$handler=hBilan_carlot
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Sample characteristics",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-newplot"#"gWidgetsRGtk2-logical"
 	
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.2]]$handler=hBilanConditionEnv
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.2]]$icon="gWidgetsRGtk2-curve"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.3]]$handler=hBilanMigrationConditionEnv
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.3]]$icon="gWidgetsRGtk2-plot1"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.4]]$handler=hBilanMigrationPar
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.4]]$icon="gWidgetsRGtk2-curve"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.13]]$handler=hBilanEspeces	
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.13]]$icon="gWidgetsRGtk2-polar"#"gWidgetsRGtk2-boxplot"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.7]]$handler=hpds
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.7]]$icon="gWidgetsRGtk2-cloud"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.8]]$handler=hTail
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.8]]$icon="gWidgetsRGtk2-scatterplot3d"#"gWidgetsRGtk2-boxplot"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.9]]$handler=hSt
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.9]]$icon="gWidgetsRGtk2-contour"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.10]]$handler=hsilver
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.10]]$icon="gWidgetsRGtk2-bubbles"
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.11]]$handler=htodo
-	menubarlist[[gettext("Summary")]][[msg$interface_graphique_menu.2.11]]$icon="gtk-cancel"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Environnemental conditions",domain="R-stacomiR")]]$handler=hBilanConditionEnv
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Environnemental conditions",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-curve"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration. ~Environnemental conditions",domain="R-stacomiR")]]$handler=hBilanMigrationConditionEnv
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration. ~Environnemental conditions",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-plot1"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration / quant. param. / qual. param.",domain="R-stacomiR")]]$handler=hBilanMigrationPar
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Migration / quant. param. / qual. param.",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-curve"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Species",domain="R-stacomiR")]]$handler=hBilanEspeces	
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Species",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-polar"#"gWidgetsRGtk2-boxplot"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Average weight glass eel",domain="R-stacomiR")]]$handler=hpds
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Average weight glass eel",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-cloud"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Lenghts",domain="R-stacomiR")]]$handler=hTail
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Lenghts",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-scatterplot3d"#"gWidgetsRGtk2-boxplot"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Pigmentary stages",domain="R-stacomiR")]]$handler=hSt
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Pigmentary stages",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-contour"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Silver eel",domain="R-stacomiR")]]$handler=hsilver
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Silver eel",domain="R-stacomiR")]]$icon="gWidgetsRGtk2-bubbles"
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Treatment size - age salmonids",domain="R-stacomiR")]]$handler=htodo
+	menubarlist[[gettext("Summary",domain="R-stacomiR")]][[gettext("Treatment size - age salmonids",domain="R-stacomiR")]]$icon="gtk-cancel"
 
-	menubarlist[[gettext("Help")]]$About$handler = hX11
-	menubarlist[[gettext("Help")]]$About$icon="newplot"
-	menubarlist[[gettext("Help")]]$About$handler = hhelp
-	menubarlist[[gettext("Help")]]$About$icon="dialog-info"
-	menubarlist[[gettext("Help")]]$lang$handler = hlang
-	menubarlist[[gettext("Help")]]$lang$icon="dialog-info"
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$About$handler = hX11
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$About$icon="newplot"
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$About$handler = hhelp
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$About$icon="dialog-info"
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$lang$handler = hlang
+	menubarlist[[gettext("Help",domain="R-stacomiR")]]$lang$icon="dialog-info"
 	gWidgets::add(win, gmenu(menubarlist))
 	ggrouptotal<- gWidgets::ggroup(horizontal=FALSE)         # this one stacks from bottom to up
 	# gsortie is above the window

Modified: pkg/stacomir/inst/po/fr/LC_MESSAGES/R-stacomiR.mo
===================================================================
(Binary files differ)

Modified: pkg/stacomir/po/R-stacomiR.pot
===================================================================
--- pkg/stacomir/po/R-stacomiR.pot	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/po/R-stacomiR.pot	2017-01-31 17:12:11 UTC (rev 265)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: stacomiR 0.5.0\n"
-"POT-Creation-Date: 2017-01-31 17:33\n"
+"POT-Creation-Date: 2017-01-31 18:07\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"
@@ -97,7 +97,7 @@
 msgid "No data"
 msgstr ""
 
-msgid "\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\""
+msgid "Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)"
 msgstr ""
 
 msgid "No data of silver or yellow eel on the selected period"
@@ -415,9 +415,12 @@
 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 "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"
 msgstr ""
 
@@ -457,9 +460,6 @@
 msgid "This shouldn't be possible"
 msgstr ""
 
-msgid "Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)"
-msgstr ""
-
 msgid "Loading data for operations"
 msgstr ""
 
@@ -598,7 +598,7 @@
 msgid "title edit"
 msgstr ""
 
-msgid "Titre du graphique de stades pigmentaires (graphstades = TRUE)"
+msgid "Pigmentary sages graph title (graphstades = TRUE)"
 msgstr ""
 
 msgid "Exit"
@@ -607,6 +607,12 @@
 msgid "Summary of pigmentation stages"
 msgstr ""
 
+msgid "distributions width choice"
+msgstr ""
+
+msgid "Mean salinity value, click to edit"
+msgstr ""
+
 msgid "temperature choice"
 msgstr ""
 
@@ -616,6 +622,9 @@
 msgid "Last timestamp"
 msgstr ""
 
+msgid "Data loading"
+msgstr ""
+
 msgid "Title choice"
 msgstr ""
 
@@ -1318,6 +1327,33 @@
 msgid "Sample characteristics"
 msgstr ""
 
+msgid "Environnemental conditions"
+msgstr ""
+
+msgid "Migration. ~Environnemental conditions"
+msgstr ""
+
+msgid "Migration / quant. param. / qual. param."
+msgstr ""
+
+msgid "Species"
+msgstr ""
+
+msgid "Average weight glass eel"
+msgstr ""
+
+msgid "Lenghts"
+msgstr ""
+
+msgid "Pigmentary stages"
+msgstr ""
+
+msgid "Silver eel"
+msgstr ""
+
+msgid "Treatment size - age salmonids"
+msgstr ""
+
 msgid "Help"
 msgstr ""
 

Modified: pkg/stacomir/po/R-stacomiR_fr_FR.mo
===================================================================
(Binary files differ)

Modified: pkg/stacomir/po/R-stacomiR_fr_FR.po
===================================================================
--- pkg/stacomir/po/R-stacomiR_fr_FR.po	2017-01-31 16:40:06 UTC (rev 264)
+++ pkg/stacomir/po/R-stacomiR_fr_FR.po	2017-01-31 17:12:11 UTC (rev 265)
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: stacomiR 0.5.0\n"
-"POT-Creation-Date: 2017-01-31 17:33+0100\n"
-"PO-Revision-Date: 2017-01-31 17:38+0100\n"
+"POT-Creation-Date: 2017-01-31 18:07+0100\n"
+"PO-Revision-Date: 2017-01-31 18:09+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -108,9 +108,11 @@
 msgstr "Pas de données"
 
 msgid ""
-"\"Writing the graphical object into envir_stacomi environment : write g=get(g"
-"\",envir_stacomi)\""
+"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 "No data of silver or yellow eel on the selected period"
 msgstr ""
@@ -474,11 +476,20 @@
 msgstr "année"
 
 msgid ""
-"\"Writing the graphical object into envir_stacomi environment : write "
-"g=get(gi\",envir_stacomi) with \" i=%s"
+"Writing the graphical object into envir_stacomi environment : write "
+"g=get(\"gi\",envir_stacomi) with \" i=%s"
 msgstr ""
+"Ecriture de l'objet graphique dans l'environnement envir_stacomi : écrire "
+"g=get('gi',envir_stacomi) avec i=%s"
 
 msgid ""
+"writing the graphical object into envir_stacomi environment : write "
+"g=get(\"gi\",envir_stacomi) with i=%s"
+msgstr ""
+"Ecriture de l'objet graphique dans l'environnement envir_stacomi : écrire "
+"g=get('gi',envir_stacomi) avec i=%s"
+
+msgid ""
 "Warning : you have to complete a migration summary for at least one of the "
 "selected year before launching a inter-annual summary"
 msgstr ""
@@ -514,6 +525,7 @@
 
 msgid "Careful sum=0, you didn't enter the coefficient of conversion"
 msgstr ""
+"Attention somme =0,vous n'avez pas encore rentre les coef de conversion"
 
 msgid "You need to choose a quantitative parameter"
 msgstr "Il faut choisir un paramètre quantitatif"
@@ -538,13 +550,6 @@
 msgid "This shouldn't be possible"
 msgstr "Normalement c'est impossible"
 
-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 "Loading data for operations"
 msgstr "Chargement des données des opérations:"
 
@@ -718,8 +723,8 @@
 msgid "title edit"
 msgstr "Modification du titre"
 
-msgid "Titre du graphique de stades pigmentaires (graphstades = TRUE)"
-msgstr ""
+msgid "Pigmentary sages graph title (graphstades = TRUE)"
+msgstr "Titre du graphe des stades pigmentaires (graphstades = TRUE)"
 
 msgid "Exit"
 msgstr "Quitter"
@@ -727,6 +732,12 @@
 msgid "Summary of pigmentation stages"
 msgstr "Bilan des stades pigmentaires"
 
+msgid "distributions width choice"
+msgstr "Choix de la largeur des distributions"
+
+msgid "Mean salinity value, click to edit"
+msgstr "Valeur moyenne de salinité, cliquer pour modifier"
+
 msgid "temperature choice"
 msgstr "Choix de la température"
 
@@ -736,6 +747,9 @@
 msgid "Last timestamp"
 msgstr "Dernière horodate"
 
+msgid "Data loading"
+msgstr "Chargement des données"
+
 msgid "Title choice"
 msgstr "Choix du titre"
 
@@ -1129,7 +1143,7 @@
 msgstr "calcul des bilans mensuels"
 
 msgid "Conversion weight / number"
-msgstr ""
+msgstr "Conversion poids effectif "
 
 msgid "Attention sum=0, you didn't enter the coefficient of conversion"
 msgstr ""
@@ -1201,7 +1215,7 @@
 msgstr "Autre graphe mensuel"
 
 msgid "Boxplot"
-msgstr ""
+msgstr "Diagramme en boites"
 
 msgid "table"
 msgstr "tableau"
@@ -1234,7 +1248,7 @@
 msgstr "graphique"
 
 msgid "Balance graphic"
-msgstr ""
+msgstr "Graphe bilan"
 
 msgid "grcum"
 msgstr "graphique cumulé"
@@ -1246,7 +1260,7 @@
 msgstr ""
 
 msgid "Balance sheet in .csv"
-msgstr ""
+msgstr "Tables bilan en .csv"
 
 msgid "write"
 msgstr "écrire"
@@ -1341,7 +1355,7 @@
 msgstr "horodate de debut"
 
 msgid "dotplot"
-msgstr ""
+msgstr "nuage de points"
 
 msgid "density"
 msgstr "densité"
@@ -1511,6 +1525,33 @@
 msgid "Sample characteristics"
 msgstr "Caractéristiques du lot"
 
+msgid "Environnemental conditions"
+msgstr "Conditions environnementales"
+
+msgid "Migration. ~Environnemental conditions"
+msgstr "Migr.~Cond. Env."
+
+msgid "Migration / quant. param. / qual. param."
+msgstr "Migr./ parm. quant / parm. qual"
+
+msgid "Species"
+msgstr "Espèces"
+
+msgid "Average weight glass eel"
+msgstr "Poids Moyen civelle"
+
+msgid "Lenghts"
+msgstr "Tailles"
+
+msgid "Pigmentary stages"
+msgstr "Stades pigmentaires"
+
+msgid "Silver eel"
+msgstr "Anguilles argentées"
+
+msgid "Treatment size - age salmonids"
+msgstr "Analyse taille - âge des salmonidés"
+
 msgid "Help"
 msgstr "Aide"
 



More information about the Stacomir-commits mailing list