Merge lp:~lesuisse-dev/joliebulle/outil-alcool into lp:joliebulle

Proposed by Le suisse
Status: Merged
Merged at revision: 311
Proposed branch: lp:~lesuisse-dev/joliebulle/outil-alcool
Merge into: lp:joliebulle
Diff against target: 1461 lines (+382/-203)
4 files modified
joliebulle_en.ts (+293/-170)
outilAlc.py (+4/-1)
outilAlc.ui (+28/-7)
outilAlc_ui.py (+57/-25)
To merge this branch: bzr merge lp:~lesuisse-dev/joliebulle/outil-alcool
Reviewer Review Type Date Requested Status
314r Pending
Review via email: mp+141941@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'joliebulle_en.ts'
--- joliebulle_en.ts 2012-09-14 15:09:42 +0000
+++ joliebulle_en.ts 2013-01-04 15:42:21 +0000
@@ -4,7 +4,7 @@
4<context>4<context>
5 <name>AppWindow</name>5 <name>AppWindow</name>
6 <message>6 <message>
7 <location filename="main.py" line="2262"/>7 <location filename="main.py" line="2376"/>
8 <source>A propos</source>8 <source>A propos</source>
9 <translation>About</translation>9 <translation>About</translation>
10 </message>10 </message>
@@ -14,52 +14,52 @@
14 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.0&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>14 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.0&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>
15 </message>15 </message>
16 <message>16 <message>
17 <location filename="main.py" line="2408"/>17 <location filename="main.py" line="2533"/>
18 <source>Nouvelle Recette</source>18 <source>Nouvelle Recette</source>
19 <translation>New Recipe</translation>19 <translation>New Recipe</translation>
20 </message>20 </message>
21 <message utf8="true">21 <message utf8="true">
22 <location filename="main.py" line="2412"/>22 <location filename="main.py" line="2537"/>
23 <source>Générique</source>23 <source>Générique</source>
24 <translation>Generic</translation>24 <translation>Generic</translation>
25 </message>25 </message>
26 <message utf8="true">26 <message utf8="true">
27 <location filename="main.py" line="661"/>27 <location filename="main.py" line="704"/>
28 <source>Ingrédients</source>28 <source>Ingrédients</source>
29 <translation>Ingredients</translation>29 <translation>Ingredients</translation>
30 </message>30 </message>
31 <message utf8="true">31 <message utf8="true">
32 <location filename="main.py" line="661"/>32 <location filename="main.py" line="704"/>
33 <source>Quantité (g)</source>33 <source>Quantité (g)</source>
34 <translation>Amount (g)</translation>34 <translation>Amount (g)</translation>
35 </message>35 </message>
36 <message>36 <message>
37 <location filename="main.py" line="661"/>37 <location filename="main.py" line="704"/>
38 <source>Temps (min)</source>38 <source>Temps (min)</source>
39 <translation>Time (min)</translation>39 <translation>Time (min)</translation>
40 </message>40 </message>
41 <message>41 <message>
42 <location filename="main.py" line="661"/>42 <location filename="main.py" line="704"/>
43 <source>Acide Alpha (%)</source>43 <source>Acide Alpha (%)</source>
44 <translation>Alpha Acid (%)</translation>44 <translation>Alpha Acid (%)</translation>
45 </message>45 </message>
46 <message>46 <message>
47 <location filename="main.py" line="661"/>47 <location filename="main.py" line="704"/>
48 <source>Type</source>48 <source>Type</source>
49 <translation>Type</translation>49 <translation>Type</translation>
50 </message>50 </message>
51 <message>51 <message>
52 <location filename="main.py" line="2231"/>52 <location filename="main.py" line="2345"/>
53 <source>Ouvrir un fichier</source>53 <source>Ouvrir un fichier</source>
54 <translation>Open file</translation>54 <translation>Open file</translation>
55 </message>55 </message>
56 <message>56 <message>
57 <location filename="main.py" line="2374"/>57 <location filename="main.py" line="2499"/>
58 <source>Enregistrer dans un fichier</source>58 <source>Enregistrer dans un fichier</source>
59 <translation>Save in a file</translation>59 <translation>Save in a file</translation>
60 </message>60 </message>
61 <message>61 <message>
62 <location filename="main.py" line="661"/>62 <location filename="main.py" line="704"/>
63 <source>Proportion</source>63 <source>Proportion</source>
64 <translation>Ratio</translation>64 <translation>Ratio</translation>
65 </message>65 </message>
@@ -74,22 +74,22 @@
74 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.2&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt; JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence :GPL v3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons come from the Faenza pack by Tiheum (Matthieu James), also provided under GPL&lt;/p&gt;</translation>74 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.2&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt; JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence :GPL v3&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons come from the Faenza pack by Tiheum (Matthieu James), also provided under GPL&lt;/p&gt;</translation>
75 </message>75 </message>
76 <message>76 <message>
77 <location filename="main.py" line="1103"/>77 <location filename="main.py" line="1147"/>
78 <source>Supprimer</source>78 <source>Supprimer</source>
79 <translation>Remove</translation>79 <translation>Remove</translation>
80 </message>80 </message>
81 <message utf8="true">81 <message utf8="true">
82 <location filename="main.py" line="1103"/>82 <location filename="main.py" line="1147"/>
83 <source>La recette sera définitivement supprimée &lt;br/&gt; Continuer ?</source>83 <source>La recette sera définitivement supprimée &lt;br/&gt; Continuer ?</source>
84 <translation>The recipe will be removed.&lt;br/&gt; Continue ?</translation>84 <translation>The recipe will be removed.&lt;br/&gt; Continue ?</translation>
85 </message>85 </message>
86 <message>86 <message>
87 <location filename="main.py" line="1267"/>87 <location filename="main.py" line="1311"/>
88 <source>Remplacer la base ?</source>88 <source>Remplacer la base ?</source>
89 <translation>Restore database</translation>89 <translation>Restore database</translation>
90 </message>90 </message>
91 <message utf8="true">91 <message utf8="true">
92 <location filename="main.py" line="1267"/>92 <location filename="main.py" line="1311"/>
93 <source>La base des ingrédients actuelle va être effacée et remplacée par la base originale. Toutes vos modifications vont être effacées. Un redémarrage de l&apos;application sera nécessaire.&lt;br&gt; Continuer ?</source>93 <source>La base des ingrédients actuelle va être effacée et remplacée par la base originale. Toutes vos modifications vont être effacées. Un redémarrage de l&apos;application sera nécessaire.&lt;br&gt; Continuer ?</source>
94 <translation>The ingredients database is going to be removed and replaced by the original one. All changes you made will be removed. You will have to reboot JolieBulle. &lt;br/&gt; Continue ?</translation>94 <translation>The ingredients database is going to be removed and replaced by the original one. All changes you made will be removed. You will have to reboot JolieBulle. &lt;br/&gt; Continue ?</translation>
95 </message>95 </message>
@@ -104,12 +104,12 @@
104 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.4&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>104 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.4&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2011 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>
105 </message>105 </message>
106 <message utf8="true">106 <message utf8="true">
107 <location filename="main.py" line="661"/>107 <location filename="main.py" line="704"/>
108 <source>Étape</source>108 <source>Étape</source>
109 <translation>Step</translation>109 <translation>Step</translation>
110 </message>110 </message>
111 <message>111 <message>
112 <location filename="main.py" line="1061"/>112 <location filename="main.py" line="1107"/>
113 <source>Renommer</source>113 <source>Renommer</source>
114 <translation>Rename</translation>114 <translation>Rename</translation>
115 </message>115 </message>
@@ -134,62 +134,62 @@
134 <translation type="obsolete">Up</translation>134 <translation type="obsolete">Up</translation>
135 </message>135 </message>
136 <message>136 <message>
137 <location filename="main.py" line="1132"/>137 <location filename="main.py" line="1176"/>
138 <source>nouveau dossier</source>138 <source>nouveau dossier</source>
139 <translation>new folder</translation>139 <translation>new folder</translation>
140 </message>140 </message>
141 <message utf8="true">141 <message utf8="true">
142 <location filename="main.py" line="1947"/>142 <location filename="main.py" line="2029"/>
143 <source>Ébullition</source>143 <source>Ébullition</source>
144 <translation>Boil</translation>144 <translation>Boil</translation>
145 </message>145 </message>
146 <message>146 <message>
147 <location filename="main.py" line="1818"/>147 <location filename="main.py" line="1900"/>
148 <source>Feuille</source>148 <source>Feuille</source>
149 <translation>Leaf</translation>149 <translation>Leaf</translation>
150 </message>150 </message>
151 <message>151 <message>
152 <location filename="main.py" line="1812"/>152 <location filename="main.py" line="1894"/>
153 <source>Pellet</source>153 <source>Pellet</source>
154 <translation>Pellet</translation>154 <translation>Pellet</translation>
155 </message>155 </message>
156 <message utf8="true">156 <message utf8="true">
157 <location filename="main.py" line="1816"/>157 <location filename="main.py" line="1898"/>
158 <source>Cône</source>158 <source>Cône</source>
159 <translation>Plug</translation>159 <translation>Plug</translation>
160 </message>160 </message>
161 <message>161 <message>
162 <location filename="main.py" line="1836"/>162 <location filename="main.py" line="1918"/>
163 <source>Dry Hop</source>163 <source>Dry Hop</source>
164 <translation>Dry Hop</translation>164 <translation>Dry Hop</translation>
165 </message>165 </message>
166 <message utf8="true">166 <message utf8="true">
167 <location filename="main.py" line="1935"/>167 <location filename="main.py" line="2017"/>
168 <source>Empâtage</source>168 <source>Empâtage</source>
169 <translation>Mash</translation>169 <translation>Mash</translation>
170 </message>170 </message>
171 <message utf8="true">171 <message utf8="true">
172 <location filename="main.py" line="1840"/>172 <location filename="main.py" line="1922"/>
173 <source>Premier Moût</source>173 <source>Premier Moût</source>
174 <translation>First Wort</translation>174 <translation>First Wort</translation>
175 </message>175 </message>
176 <message utf8="true">176 <message utf8="true">
177 <location filename="main.py" line="1842"/>177 <location filename="main.py" line="1924"/>
178 <source>Arôme</source>178 <source>Arôme</source>
179 <translation>Aroma</translation>179 <translation>Aroma</translation>
180 </message>180 </message>
181 <message>181 <message>
182 <location filename="main.py" line="1938"/>182 <location filename="main.py" line="2020"/>
183 <source>Primaire</source>183 <source>Primaire</source>
184 <translation>Primary</translation>184 <translation>Primary</translation>
185 </message>185 </message>
186 <message>186 <message>
187 <location filename="main.py" line="1941"/>187 <location filename="main.py" line="2023"/>
188 <source>Secondaire</source>188 <source>Secondaire</source>
189 <translation>Secondary</translation>189 <translation>Secondary</translation>
190 </message>190 </message>
191 <message>191 <message>
192 <location filename="main.py" line="1944"/>192 <location filename="main.py" line="2026"/>
193 <source>Embouteillage</source>193 <source>Embouteillage</source>
194 <translation>Bottling</translation>194 <translation>Bottling</translation>
195 </message>195 </message>
@@ -204,75 +204,90 @@
204 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.6&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2012 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>204 <translation type="obsolete">&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.6&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2012 Pierre Tavares&lt;p&gt;JolieBulle is a beer brewing software.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Some icons are from the Faenza pack by Tiheum (Matthieu James), released under GPL.&lt;/p&gt;</translation>
205 </message>205 </message>
206 <message>206 <message>
207 <location filename="main.py" line="412"/>207 <location filename="main.py" line="452"/>
208 <source>Enregistrer</source>208 <source>Enregistrer</source>
209 <translation>Save</translation>209 <translation>Save</translation>
210 </message>210 </message>
211 <message>211 <message>
212 <location filename="main.py" line="419"/>212 <location filename="main.py" line="459"/>
213 <source>Nouvelle recette</source>213 <source>Nouvelle recette</source>
214 <translation>New recipe</translation>214 <translation>New recipe</translation>
215 </message>215 </message>
216 <message>216 <message>
217 <location filename="main.py" line="456"/>217 <location filename="main.py" line="496"/>
218 <source>Fichier</source>218 <source>Fichier</source>
219 <translation>File</translation>219 <translation>File</translation>
220 </message>220 </message>
221 <message>221 <message>
222 <location filename="main.py" line="477"/>222 <location filename="main.py" line="522"/>
223 <source>Outils</source>223 <source>Outils</source>
224 <translation>Tools</translation>224 <translation>Tools</translation>
225 </message>225 </message>
226 <message>226 <message>
227 <location filename="main.py" line="1065"/>227 <location filename="main.py" line="1111"/>
228 <source>Nouveau dossier</source>228 <source>Nouveau dossier</source>
229 <translation>New folder</translation>229 <translation>New folder</translation>
230 </message>230 </message>
231 <message utf8="true">231 <message utf8="true">
232 <location filename="main.py" line="2342"/>232 <location filename="main.py" line="2467"/>
233 <source>Recette déjà existante</source>233 <source>Recette déjà existante</source>
234 <translation>Recipe name exists </translation>234 <translation>Recipe name exists </translation>
235 </message>235 </message>
236 <message utf8="true">236 <message utf8="true">
237 <location filename="main.py" line="2342"/>237 <location filename="main.py" line="2467"/>
238 <source>Ce nom de recette existe déjà. L&apos;enregistrement a été annulé. Vous pouvez choisir un nouveau nom.</source>238 <source>Ce nom de recette existe déjà. L&apos;enregistrement a été annulé. Vous pouvez choisir un nouveau nom.</source>
239 <translation>Recipe name already exists. You should choose another name.</translation>239 <translation>Recipe name already exists. You should choose another name.</translation>
240 </message>240 </message>
241 <message>241 <message>
242 <location filename="main.py" line="524"/>242 <location filename="main.py" line="570"/>
243 <source>Tout grain</source>243 <source>Tout grain</source>
244 <translation>All grain</translation>244 <translation>All grain</translation>
245 </message>245 </message>
246 <message>246 <message>
247 <location filename="main.py" line="524"/>247 <location filename="main.py" line="570"/>
248 <source>Extrait</source>248 <source>Extrait</source>
249 <translation type="unfinished">Extract</translation>249 <translation type="unfinished">Extract</translation>
250 </message>250 </message>
251 <message>251 <message>
252 <location filename="main.py" line="524"/>252 <location filename="main.py" line="570"/>
253 <source>Partial mash</source>253 <source>Partial mash</source>
254 <translation type="unfinished"></translation>254 <translation type="unfinished"></translation>
255 </message>255 </message>
256 <message utf8="true">256 <message utf8="true">
257 <location filename="main.py" line="2262"/>257 <location filename="main.py" line="2376"/>
258 <source>&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.7&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2012 Pierre Tavares&lt;p&gt; JolieBulle est un logiciel de lecture et de formulation de recettes de brassage.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Certaines icônes proviennent du pack Faenza par Tiheum (Matthieu James), également distribué sous licence GPL.&lt;/p&gt;</source>258 <source>&lt;h1&gt;JolieBulle&lt;/h1&gt; &lt;b&gt;version 2.7&lt;/b&gt;&lt;br/&gt;copyright (c) 2010-2012 Pierre Tavares&lt;p&gt; JolieBulle est un logiciel de lecture et de formulation de recettes de brassage.&lt;/p&gt;&lt;p&gt;&lt;a href =http://www.gnu.org/licenses/gpl-3.0.html&gt;Licence : Version 3 de la Licence Générale Publique GNU&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Certaines icônes proviennent du pack Faenza par Tiheum (Matthieu James), également distribué sous licence GPL.&lt;/p&gt;</source>
259 <translation type="unfinished"></translation>259 <translation type="unfinished"></translation>
260 </message>260 </message>
261 <message>
262 <location filename="main.py" line="518"/>
263 <source>Profils de brassage</source>
264 <translation type="unfinished"></translation>
265 </message>
266 <message>
267 <location filename="main.py" line="1858"/>
268 <source>Brassage</source>
269 <translation type="unfinished">Mash</translation>
270 </message>
271 <message utf8="true">
272 <location filename="main.py" line="2223"/>
273 <source>Après ébullition</source>
274 <translation type="unfinished"></translation>
275 </message>
261</context>276</context>
262<context>277<context>
263 <name>ComboBoxDelegate</name>278 <name>ComboBoxDelegate</name>
264 <message>279 <message>
265 <location filename="main.py" line="263"/>280 <location filename="main.py" line="299"/>
266 <source>Pellet</source>281 <source>Pellet</source>
267 <translation>Pellet</translation>282 <translation>Pellet</translation>
268 </message>283 </message>
269 <message>284 <message>
270 <location filename="main.py" line="257"/>285 <location filename="main.py" line="293"/>
271 <source>Feuille</source>286 <source>Feuille</source>
272 <translation>Leaf</translation>287 <translation>Leaf</translation>
273 </message>288 </message>
274 <message utf8="true">289 <message utf8="true">
275 <location filename="main.py" line="265"/>290 <location filename="main.py" line="301"/>
276 <source>Cône</source>291 <source>Cône</source>
277 <translation>Plug</translation>292 <translation>Plug</translation>
278 </message>293 </message>
@@ -601,11 +616,6 @@
601</context>616</context>
602<context>617<context>
603 <name>DialogAlc</name>618 <name>DialogAlc</name>
604 <message>
605 <location filename="outilAlc.ui" line="14"/>
606 <source>Dialog</source>
607 <translation></translation>
608 </message>
609 <message utf8="true">619 <message utf8="true">
610 <location filename="outilAlc.ui" line="22"/>620 <location filename="outilAlc.ui" line="22"/>
611 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;621 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -650,6 +660,24 @@
650 <source>0</source>660 <source>0</source>
651 <translation></translation>661 <translation></translation>
652 </message>662 </message>
663 <message>
664 <location filename="outilAlc.ui" line="14"/>
665 <source>Calcul taux alcool</source>
666 <translation>Alcohol by volume calculator</translation>
667 </message>
668 <message utf8="true">
669 <location filename="outilAlc.ui" line="120"/>
670 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
671&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
672p, li { white-space: pre-wrap; }
673&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
674&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sucre ajouté (g/L)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
675 <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
676&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
677p, li { white-space: pre-wrap; }
678&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
679&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sugar addition (g/L)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
680 </message>
653</context>681</context>
654<context>682<context>
655 <name>DialogD</name>683 <name>DialogD</name>
@@ -1225,7 +1253,7 @@
1225<context>1253<context>
1226 <name>DialogPref</name>1254 <name>DialogPref</name>
1227 <message>1255 <message>
1228 <location filename="preferences.py" line="76"/>1256 <location filename="preferences.py" line="78"/>
1229 <source>Choisir un dossier</source>1257 <source>Choisir un dossier</source>
1230 <translation>Choose a folder</translation>1258 <translation>Choose a folder</translation>
1231 </message>1259 </message>
@@ -1309,7 +1337,7 @@
1309 <translation>Plug</translation>1337 <translation>Plug</translation>
1310 </message>1338 </message>
1311 <message utf8="true">1339 <message utf8="true">
1312 <location filename="export.py" line="193"/>1340 <location filename="export.py" line="200"/>
1313 <source>Ébullition</source>1341 <source>Ébullition</source>
1314 <translation>Boil</translation>1342 <translation>Boil</translation>
1315 </message>1343 </message>
@@ -1319,7 +1347,7 @@
1319 <translation>Dry Hop</translation>1347 <translation>Dry Hop</translation>
1320 </message>1348 </message>
1321 <message utf8="true">1349 <message utf8="true">
1322 <location filename="export.py" line="195"/>1350 <location filename="export.py" line="202"/>
1323 <source>Empâtage</source>1351 <source>Empâtage</source>
1324 <translation>Mash</translation>1352 <translation>Mash</translation>
1325 </message>1353 </message>
@@ -1334,20 +1362,30 @@
1334 <translation>Aroma</translation>1362 <translation>Aroma</translation>
1335 </message>1363 </message>
1336 <message>1364 <message>
1337 <location filename="export.py" line="197"/>1365 <location filename="export.py" line="204"/>
1338 <source>Primaire</source>1366 <source>Primaire</source>
1339 <translation>Primary</translation>1367 <translation>Primary</translation>
1340 </message>1368 </message>
1341 <message>1369 <message>
1342 <location filename="export.py" line="199"/>1370 <location filename="export.py" line="206"/>
1343 <source>Secondaire</source>1371 <source>Secondaire</source>
1344 <translation>Secondary</translation>1372 <translation>Secondary</translation>
1345 </message>1373 </message>
1346 <message>1374 <message>
1347 <location filename="export.py" line="201"/>1375 <location filename="export.py" line="208"/>
1348 <source>Embouteillage</source>1376 <source>Embouteillage</source>
1349 <translation>Bottling</translation>1377 <translation>Bottling</translation>
1350 </message>1378 </message>
1379 <message>
1380 <location filename="export.py" line="170"/>
1381 <source>Brassage</source>
1382 <translation type="unfinished">Mash</translation>
1383 </message>
1384 <message utf8="true">
1385 <location filename="export.py" line="172"/>
1386 <source>Après ébullition</source>
1387 <translation type="unfinished"></translation>
1388 </message>
1351</context>1389</context>
1352<context>1390<context>
1353 <name>ExportBBCode</name>1391 <name>ExportBBCode</name>
@@ -1436,14 +1474,14 @@
1436 <translation type="obsolete">&lt;h3&gt;Grains&lt;/h3&gt; </translation>1474 <translation type="obsolete">&lt;h3&gt;Grains&lt;/h3&gt; </translation>
1437 </message>1475 </message>
1438 <message>1476 <message>
1439 <location filename="exportHTML.py" line="81"/>1477 <location filename="exportHTML.py" line="85"/>
1440 <source>&lt;h3&gt;Houblons&lt;/h3&gt; </source>1478 <source>&lt;h3&gt;Houblons&lt;/h3&gt; </source>
1441 <translation>&lt;h3&gt;Hops&lt;/h3&gt; </translation>1479 <translation>&lt;h3&gt;Hops&lt;/h3&gt; </translation>
1442 </message>1480 </message>
1443 <message>1481 <message>
1444 <location filename="exportHTML.py" line="78"/>1482 <location filename="exportHTML.py" line="127"/>
1445 <source> pendant </source>1483 <source> pendant </source>
1446 <translation type="obsolete"> for </translation>1484 <translation type="unfinished"> for </translation>
1447 </message>1485 </message>
1448 <message utf8="true">1486 <message utf8="true">
1449 <location filename="exportHTML.py" line="78"/>1487 <location filename="exportHTML.py" line="78"/>
@@ -1451,12 +1489,12 @@
1451 <translation type="obsolete">minutes</translation>1489 <translation type="obsolete">minutes</translation>
1452 </message>1490 </message>
1453 <message utf8="true">1491 <message utf8="true">
1454 <location filename="exportHTML.py" line="88"/>1492 <location filename="exportHTML.py" line="92"/>
1455 <source>&lt;h3&gt;Ingrédients divers&lt;/h3&gt; </source>1493 <source>&lt;h3&gt;Ingrédients divers&lt;/h3&gt; </source>
1456 <translation>&lt;h3&gt;Miscellaneous&lt;/h3&gt; </translation>1494 <translation>&lt;h3&gt;Miscellaneous&lt;/h3&gt; </translation>
1457 </message>1495 </message>
1458 <message>1496 <message>
1459 <location filename="exportHTML.py" line="96"/>1497 <location filename="exportHTML.py" line="100"/>
1460 <source>&lt;h3&gt;Levures&lt;/h3&gt; </source>1498 <source>&lt;h3&gt;Levures&lt;/h3&gt; </source>
1461 <translation>&lt;h3&gt;Yeasts&lt;/h3&gt; </translation>1499 <translation>&lt;h3&gt;Yeasts&lt;/h3&gt; </translation>
1462 </message>1500 </message>
@@ -1512,7 +1550,7 @@
1512&lt;/html&gt;</translation>1550&lt;/html&gt;</translation>
1513 </message>1551 </message>
1514 <message>1552 <message>
1515 <location filename="exportHTML.py" line="108"/>1553 <location filename="exportHTML.py" line="131"/>
1516 <source> &lt;h2&gt;Notes&lt;/h2&gt;</source>1554 <source> &lt;h2&gt;Notes&lt;/h2&gt;</source>
1517 <translation> &lt;h2&gt;Notes&lt;/h2&gt;</translation>1555 <translation> &lt;h2&gt;Notes&lt;/h2&gt;</translation>
1518 </message>1556 </message>
@@ -1527,47 +1565,47 @@
1527 <translation>&lt;h3&gt;Grains and sugars&lt;/h3&gt;</translation>1565 <translation>&lt;h3&gt;Grains and sugars&lt;/h3&gt;</translation>
1528 </message>1566 </message>
1529 <message utf8="true">1567 <message utf8="true">
1530 <location filename="exportHTML.py" line="103"/>1568 <location filename="exportHTML.py" line="107"/>
1531 <source> &lt;h2&gt;Ingrédients pour un brassin de </source>1569 <source> &lt;h2&gt;Ingrédients pour un brassin de </source>
1532 <translation> &lt;h2&gt; Ingredients. Mash size : </translation>1570 <translation> &lt;h2&gt; Ingredients. Mash size : </translation>
1533 </message>1571 </message>
1534 <message>1572 <message>
1535 <location filename="exportHTML.py" line="103"/>1573 <location filename="exportHTML.py" line="107"/>
1536 <source> litres</source>1574 <source> litres</source>
1537 <translation> liters</translation>1575 <translation> liters</translation>
1538 </message>1576 </message>
1539 <message>1577 <message>
1540 <location filename="exportHTML.py" line="106"/>1578 <location filename="exportHTML.py" line="110"/>
1541 <source>&lt;tr&gt;&lt;td&gt;Rendement&lt;/td&gt; </source>1579 <source>&lt;tr&gt;&lt;td&gt;Rendement&lt;/td&gt; </source>
1542 <translation>&lt;tr&gt;&lt;td&gt;Yield&lt;/td&gt;</translation>1580 <translation>&lt;tr&gt;&lt;td&gt;Yield&lt;/td&gt;</translation>
1543 </message>1581 </message>
1544 <message utf8="true">1582 <message utf8="true">
1545 <location filename="exportHTML.py" line="106"/>1583 <location filename="exportHTML.py" line="110"/>
1546 <source>&lt;tr&gt;&lt;td&gt;Densité initiale&lt;/td&gt;</source>1584 <source>&lt;tr&gt;&lt;td&gt;Densité initiale&lt;/td&gt;</source>
1547 <translation>&lt;tr&gt;&lt;td&gt;Original gravity&lt;/td&gt;</translation>1585 <translation>&lt;tr&gt;&lt;td&gt;Original gravity&lt;/td&gt;</translation>
1548 </message>1586 </message>
1549 <message utf8="true">1587 <message utf8="true">
1550 <location filename="exportHTML.py" line="106"/>1588 <location filename="exportHTML.py" line="110"/>
1551 <source>&lt;tr&gt;&lt;td&gt;Densité finale&lt;/td&gt;</source>1589 <source>&lt;tr&gt;&lt;td&gt;Densité finale&lt;/td&gt;</source>
1552 <translation>&lt;tr&gt;&lt;td&gt;Final gravity&lt;/td&gt;</translation>1590 <translation>&lt;tr&gt;&lt;td&gt;Final gravity&lt;/td&gt;</translation>
1553 </message>1591 </message>
1554 <message>1592 <message>
1555 <location filename="exportHTML.py" line="106"/>1593 <location filename="exportHTML.py" line="110"/>
1556 <source>&lt;tr&gt;&lt;td&gt;Teinte&lt;/td&gt;</source>1594 <source>&lt;tr&gt;&lt;td&gt;Teinte&lt;/td&gt;</source>
1557 <translation>&lt;tr&gt;&lt;td&gt;Color&lt;/td&gt;</translation>1595 <translation>&lt;tr&gt;&lt;td&gt;Color&lt;/td&gt;</translation>
1558 </message>1596 </message>
1559 <message>1597 <message>
1560 <location filename="exportHTML.py" line="106"/>1598 <location filename="exportHTML.py" line="110"/>
1561 <source>&lt;tr&gt;&lt;td&gt;Amertume&lt;/td&gt;</source>1599 <source>&lt;tr&gt;&lt;td&gt;Amertume&lt;/td&gt;</source>
1562 <translation>&lt;tr&gt;&lt;td&gt;Bitterness&lt;/td&gt;</translation>1600 <translation>&lt;tr&gt;&lt;td&gt;Bitterness&lt;/td&gt;</translation>
1563 </message>1601 </message>
1564 <message>1602 <message>
1565 <location filename="exportHTML.py" line="106"/>1603 <location filename="exportHTML.py" line="110"/>
1566 <source>&lt;tr&gt;&lt;td&gt;Alcool (vol)&lt;/td&gt;</source>1604 <source>&lt;tr&gt;&lt;td&gt;Alcool (vol)&lt;/td&gt;</source>
1567 <translation>&lt;tr&gt;&lt;td&gt;Alcohol (by vol)&lt;/td&gt;</translation>1605 <translation>&lt;tr&gt;&lt;td&gt;Alcohol (by vol)&lt;/td&gt;</translation>
1568 </message>1606 </message>
1569 <message utf8="true">1607 <message utf8="true">
1570 <location filename="exportHTML.py" line="110"/>1608 <location filename="exportHTML.py" line="133"/>
1571 <source>1609 <source>
1572# &lt;footer class=&quot;footer&quot;&gt;Une recette générée par JolieBulle, logiciel de brassage libre.&lt;/footer&gt;1610# &lt;footer class=&quot;footer&quot;&gt;Une recette générée par JolieBulle, logiciel de brassage libre.&lt;/footer&gt;
1573&lt;/body&gt;1611&lt;/body&gt;
@@ -1576,6 +1614,66 @@
1576&lt;/body&gt;1614&lt;/body&gt;
1577&lt;/html&gt;</translation>1615&lt;/html&gt;</translation>
1578 </message>1616 </message>
1617 <message utf8="true">
1618 <location filename="exportHTML.py" line="78"/>
1619 <source>Après ébullition</source>
1620 <translation type="unfinished"></translation>
1621 </message>
1622 <message utf8="true">
1623 <location filename="exportHTML.py" line="79"/>
1624 <source>Ajout après ébullition</source>
1625 <translation type="unfinished"></translation>
1626 </message>
1627 <message>
1628 <location filename="exportHTML.py" line="110"/>
1629 <source>&lt;tr&gt;&lt;td&gt;Ratio BU/GU&lt;/td&gt;</source>
1630 <translation type="unfinished"></translation>
1631 </message>
1632 <message>
1633 <location filename="exportHTML.py" line="112"/>
1634 <source> &lt;h2&gt;Brassage&lt;/h2&gt;</source>
1635 <translation type="unfinished"></translation>
1636 </message>
1637 <message>
1638 <location filename="exportHTML.py" line="112"/>
1639 <source> Etapes : </source>
1640 <translation type="unfinished"></translation>
1641 </message>
1642 <message>
1643 <location filename="exportHTML.py" line="118"/>
1644 <source>Infusion</source>
1645 <translation type="unfinished">Infusion</translation>
1646 </message>
1647 <message utf8="true">
1648 <location filename="exportHTML.py" line="120"/>
1649 <source>Température</source>
1650 <translation type="unfinished">Temperature</translation>
1651 </message>
1652 <message utf8="true">
1653 <location filename="exportHTML.py" line="122"/>
1654 <source>Décoction</source>
1655 <translation type="unfinished">Decoction</translation>
1656 </message>
1657 <message>
1658 <location filename="exportHTML.py" line="127"/>
1659 <source> palier de type </source>
1660 <translation type="unfinished"></translation>
1661 </message>
1662 <message utf8="true">
1663 <location filename="exportHTML.py" line="127"/>
1664 <source> à </source>
1665 <translation type="unfinished"></translation>
1666 </message>
1667 <message>
1668 <location filename="exportHTML.py" line="127"/>
1669 <source> minutes </source>
1670 <translation type="unfinished"></translation>
1671 </message>
1672 <message utf8="true">
1673 <location filename="exportHTML.py" line="128"/>
1674 <source> Rinçage : </source>
1675 <translation type="unfinished"></translation>
1676 </message>
1579</context>1677</context>
1580<context>1678<context>
1581 <name>MainWindow</name>1679 <name>MainWindow</name>
@@ -1677,7 +1775,7 @@
1677&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pre-boil specific gravity :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>1775&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Pre-boil specific gravity :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
1678 </message>1776 </message>
1679 <message>1777 <message>
1680 <location filename="reader.ui" line="1709"/>1778 <location filename="reader.ui" line="1723"/>
1681 <source>0</source>1779 <source>0</source>
1682 <translation></translation>1780 <translation></translation>
1683 </message>1781 </message>
@@ -1700,7 +1798,7 @@
1700&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ingredients : &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>1798&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ingredients : &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
1701 </message>1799 </message>
1702 <message>1800 <message>
1703 <location filename="reader.ui" line="1224"/>1801 <location filename="reader.ui" line="1238"/>
1704 <source>Enlever</source>1802 <source>Enlever</source>
1705 <translation>Remove</translation>1803 <translation>Remove</translation>
1706 </message>1804 </message>
@@ -1790,112 +1888,112 @@
1790&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Alc :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>1888&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Alc :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
1791 </message>1889 </message>
1792 <message>1890 <message>
1793 <location filename="reader.ui" line="1866"/>1891 <location filename="reader.ui" line="1880"/>
1794 <source>toolBar</source>1892 <source>toolBar</source>
1795 <translation></translation>1893 <translation></translation>
1796 </message>1894 </message>
1797 <message>1895 <message>
1798 <location filename="reader.ui" line="1895"/>1896 <location filename="reader.ui" line="1909"/>
1799 <source>Fichier</source>1897 <source>Fichier</source>
1800 <translation>File</translation>1898 <translation>File</translation>
1801 </message>1899 </message>
1802 <message>1900 <message>
1803 <location filename="reader.ui" line="1930"/>1901 <location filename="reader.ui" line="1944"/>
1804 <source>Edition</source>1902 <source>Edition</source>
1805 <translation>Edit</translation>1903 <translation>Edit</translation>
1806 </message>1904 </message>
1807 <message>1905 <message>
1808 <location filename="reader.ui" line="1920"/>1906 <location filename="reader.ui" line="1934"/>
1809 <source>Outils</source>1907 <source>Outils</source>
1810 <translation>Tools</translation>1908 <translation>Tools</translation>
1811 </message>1909 </message>
1812 <message>1910 <message>
1813 <location filename="reader.ui" line="1952"/>1911 <location filename="reader.ui" line="1973"/>
1814 <source>Ouvrir</source>1912 <source>Ouvrir</source>
1815 <translation>Open</translation>1913 <translation>Open</translation>
1816 </message>1914 </message>
1817 <message>1915 <message>
1818 <location filename="reader.ui" line="1985"/>1916 <location filename="reader.ui" line="2006"/>
1819 <source>Quitter</source>1917 <source>Quitter</source>
1820 <translation>Quit</translation>1918 <translation>Quit</translation>
1821 </message>1919 </message>
1822 <message>1920 <message>
1823 <location filename="reader.ui" line="1970"/>1921 <location filename="reader.ui" line="1991"/>
1824 <source>A propos</source>1922 <source>A propos</source>
1825 <translation>About</translation>1923 <translation>About</translation>
1826 </message>1924 </message>
1827 <message>1925 <message>
1828 <location filename="reader.ui" line="2129"/>1926 <location filename="reader.ui" line="2150"/>
1829 <source>&amp;Enregistrer</source>1927 <source>&amp;Enregistrer</source>
1830 <translation>Save</translation>1928 <translation>Save</translation>
1831 </message>1929 </message>
1832 <message>1930 <message>
1833 <location filename="reader.ui" line="1980"/>1931 <location filename="reader.ui" line="2001"/>
1834 <source>Enregistrer &amp;sous</source>1932 <source>Enregistrer &amp;sous</source>
1835 <translation>Save as</translation>1933 <translation>Save as</translation>
1836 </message>1934 </message>
1837 <message>1935 <message>
1838 <location filename="reader.ui" line="1990"/>1936 <location filename="reader.ui" line="2011"/>
1839 <source>&amp;Ouvrir</source>1937 <source>&amp;Ouvrir</source>
1840 <translation>Open</translation>1938 <translation>Open</translation>
1841 </message>1939 </message>
1842 <message>1940 <message>
1843 <location filename="reader.ui" line="1995"/>1941 <location filename="reader.ui" line="2016"/>
1844 <source>Editer la base de Grains</source>1942 <source>Editer la base de Grains</source>
1845 <translation>Edit Grains database</translation>1943 <translation>Edit Grains database</translation>
1846 </message>1944 </message>
1847 <message>1945 <message>
1848 <location filename="reader.ui" line="2000"/>1946 <location filename="reader.ui" line="2021"/>
1849 <source>Editer la base de Houblons</source>1947 <source>Editer la base de Houblons</source>
1850 <translation>Edit Hops database</translation>1948 <translation>Edit Hops database</translation>
1851 </message>1949 </message>
1852 <message>1950 <message>
1853 <location filename="reader.ui" line="2005"/>1951 <location filename="reader.ui" line="2026"/>
1854 <source>Editer la base de Divers</source>1952 <source>Editer la base de Divers</source>
1855 <translation>Edit Miscs database</translation>1953 <translation>Edit Miscs database</translation>
1856 </message>1954 </message>
1857 <message>1955 <message>
1858 <location filename="reader.ui" line="2010"/>1956 <location filename="reader.ui" line="2031"/>
1859 <source>Editer la base de Levures</source>1957 <source>Editer la base de Levures</source>
1860 <translation>Edit Yeasts database</translation>1958 <translation>Edit Yeasts database</translation>
1861 </message>1959 </message>
1862 <message>1960 <message>
1863 <location filename="reader.ui" line="2162"/>1961 <location filename="reader.ui" line="2183"/>
1864 <source>Nouvelle recette</source>1962 <source>Nouvelle recette</source>
1865 <translation>New recipe</translation>1963 <translation>New recipe</translation>
1866 </message>1964 </message>
1867 <message utf8="true">1965 <message utf8="true">
1868 <location filename="reader.ui" line="2024"/>1966 <location filename="reader.ui" line="2045"/>
1869 <source>Correction densimètre</source>1967 <source>Correction densimètre</source>
1870 <translation>Hydrometer correction</translation>1968 <translation>Hydrometer correction</translation>
1871 </message>1969 </message>
1872 <message>1970 <message>
1873 <location filename="reader.ui" line="2029"/>1971 <location filename="reader.ui" line="2050"/>
1874 <source>Calcul taux d&apos;alcool</source>1972 <source>Calcul taux d&apos;alcool</source>
1875 <translation>Alcohol percentage</translation>1973 <translation>Alcohol percentage</translation>
1876 </message>1974 </message>
1877 <message>1975 <message>
1878 <location filename="reader.ui" line="2038"/>1976 <location filename="reader.ui" line="2059"/>
1879 <source>Imprimer</source>1977 <source>Imprimer</source>
1880 <translation>Print</translation>1978 <translation>Print</translation>
1881 </message>1979 </message>
1882 <message>1980 <message>
1883 <location filename="reader.ui" line="2043"/>1981 <location filename="reader.ui" line="2064"/>
1884 <source>Dilution</source>1982 <source>Dilution</source>
1885 <translation>Dilution</translation>1983 <translation>Dilution</translation>
1886 </message>1984 </message>
1887 <message>1985 <message>
1888 <location filename="reader.ui" line="2048"/>1986 <location filename="reader.ui" line="2069"/>
1889 <source>Evaporation</source>1987 <source>Evaporation</source>
1890 <translation>Boil off</translation>1988 <translation>Boil off</translation>
1891 </message>1989 </message>
1892 <message>1990 <message>
1893 <location filename="reader.ui" line="2053"/>1991 <location filename="reader.ui" line="2074"/>
1894 <source>Exporter vers html</source>1992 <source>Exporter vers html</source>
1895 <translation>Export to html</translation>1993 <translation>Export to html</translation>
1896 </message>1994 </message>
1897 <message>1995 <message>
1898 <location filename="reader.ui" line="2058"/>1996 <location filename="reader.ui" line="2079"/>
1899 <source>Assistant paliers</source>1997 <source>Assistant paliers</source>
1900 <translation>Step assistant</translation>1998 <translation>Step assistant</translation>
1901 </message>1999 </message>
@@ -1905,22 +2003,22 @@
1905 <translation type="obsolete">View</translation>2003 <translation type="obsolete">View</translation>
1906 </message>2004 </message>
1907 <message>2005 <message>
1908 <location filename="reader.ui" line="1936"/>2006 <location filename="reader.ui" line="1950"/>
1909 <source>Aide</source>2007 <source>Aide</source>
1910 <translation>Help</translation>2008 <translation>Help</translation>
1911 </message>2009 </message>
1912 <message utf8="true">2010 <message utf8="true">
1913 <location filename="reader.ui" line="2063"/>2011 <location filename="reader.ui" line="2084"/>
1914 <source>Restaurer la base des ingrédients</source>2012 <source>Restaurer la base des ingrédients</source>
1915 <translation>Restore ingredients database</translation>2013 <translation>Restore ingredients database</translation>
1916 </message>2014 </message>
1917 <message>2015 <message>
1918 <location filename="reader.ui" line="2072"/>2016 <location filename="reader.ui" line="2093"/>
1919 <source>Recharger</source>2017 <source>Recharger</source>
1920 <translation>Reload</translation>2018 <translation>Reload</translation>
1921 </message>2019 </message>
1922 <message>2020 <message>
1923 <location filename="reader.ui" line="2077"/>2021 <location filename="reader.ui" line="2098"/>
1924 <source>switch</source>2022 <source>switch</source>
1925 <translation>switch</translation>2023 <translation>switch</translation>
1926 </message>2024 </message>
@@ -1935,17 +2033,17 @@
1935 <translation type="obsolete">Library</translation>2033 <translation type="obsolete">Library</translation>
1936 </message>2034 </message>
1937 <message utf8="true">2035 <message utf8="true">
1938 <location filename="reader.ui" line="2120"/>2036 <location filename="reader.ui" line="2141"/>
1939 <source>Bibiliothèque de recettes</source>2037 <source>Bibiliothèque de recettes</source>
1940 <translation>Library</translation>2038 <translation>Library</translation>
1941 </message>2039 </message>
1942 <message>2040 <message>
1943 <location filename="reader.ui" line="2105"/>2041 <location filename="reader.ui" line="2126"/>
1944 <source>Editeur</source>2042 <source>Editeur</source>
1945 <translation>Editor</translation>2043 <translation>Editor</translation>
1946 </message>2044 </message>
1947 <message utf8="true">2045 <message utf8="true">
1948 <location filename="reader.ui" line="2117"/>2046 <location filename="reader.ui" line="2138"/>
1949 <source>Bibiliothèque</source>2047 <source>Bibiliothèque</source>
1950 <translation>Library</translation>2048 <translation>Library</translation>
1951 </message>2049 </message>
@@ -1963,7 +2061,7 @@
1963&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Brewer :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2061&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Brewer :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
1964 </message>2062 </message>
1965 <message>2063 <message>
1966 <location filename="reader.ui" line="1291"/>2064 <location filename="reader.ui" line="1305"/>
1967 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2065 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
1968&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2066&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
1969p, li { white-space: pre-wrap; }2067p, li { white-space: pre-wrap; }
@@ -2147,7 +2245,7 @@
2147&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Droid Sans&apos;; font-size:9pt;&quot;&gt;Alc :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2245&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Droid Sans&apos;; font-size:9pt;&quot;&gt;Alc :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2148 </message>2246 </message>
2149 <message>2247 <message>
2150 <location filename="reader.ui" line="775"/>2248 <location filename="reader.ui" line="789"/>
2151 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2249 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2152&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2250&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2153p, li { white-space: pre-wrap; }2251p, li { white-space: pre-wrap; }
@@ -2160,7 +2258,7 @@
2160&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:9pt; font-weight:600;&quot;&gt;TINT&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2258&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:9pt; font-weight:600;&quot;&gt;TINT&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2161 </message>2259 </message>
2162 <message utf8="true">2260 <message utf8="true">
2163 <location filename="reader.ui" line="2134"/>2261 <location filename="reader.ui" line="2155"/>
2164 <source>Préférences</source>2262 <source>Préférences</source>
2165 <translation>Preferences</translation>2263 <translation>Preferences</translation>
2166 </message>2264 </message>
@@ -2188,7 +2286,7 @@
2188&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Mash :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2286&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Mash :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2189 </message>2287 </message>
2190 <message>2288 <message>
2191 <location filename="reader.ui" line="1035"/>2289 <location filename="reader.ui" line="1049"/>
2192 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2290 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2193&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2291&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2194p, li { white-space: pre-wrap; }2292p, li { white-space: pre-wrap; }
@@ -2201,42 +2299,42 @@
2201&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Mash profiles :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2299&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Mash profiles :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2202 </message>2300 </message>
2203 <message>2301 <message>
2204 <location filename="reader.ui" line="1078"/>2302 <location filename="reader.ui" line="1092"/>
2205 <source>Nouveau profil</source>2303 <source>Nouveau profil</source>
2206 <translation>New profile</translation>2304 <translation>New profile</translation>
2207 </message>2305 </message>
2208 <message>2306 <message>
2209 <location filename="reader.ui" line="1120"/>2307 <location filename="reader.ui" line="1134"/>
2210 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Nom :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2308 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Nom :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2211 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Name :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2309 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Name :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2212 </message>2310 </message>
2213 <message>2311 <message>
2214 <location filename="reader.ui" line="1302"/>2312 <location filename="reader.ui" line="1316"/>
2215 <source>Aucun</source>2313 <source>Aucun</source>
2216 <translation>None</translation>2314 <translation>None</translation>
2217 </message>2315 </message>
2218 <message>2316 <message>
2219 <location filename="reader.ui" line="1134"/>
2220 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;pH :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2221 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;pH :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2222 </message>
2223 <message utf8="true">
2224 <location filename="reader.ui" line="1148"/>2317 <location filename="reader.ui" line="1148"/>
2318 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;pH :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2319 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;pH :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2320 </message>
2321 <message utf8="true">
2322 <location filename="reader.ui" line="1162"/>
2225 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Rinçage :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2323 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Rinçage :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2226 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sparge :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2324 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sparge :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2227 </message>2325 </message>
2228 <message utf8="true">2326 <message utf8="true">
2229 <location filename="reader.ui" line="1338"/>2327 <location filename="reader.ui" line="1352"/>
2230 <source>0 °C</source>2328 <source>0 °C</source>
2231 <translation>0 °C</translation>2329 <translation>0 °C</translation>
2232 </message>2330 </message>
2233 <message>2331 <message>
2234 <location filename="reader.ui" line="1348"/>2332 <location filename="reader.ui" line="1362"/>
2235 <source>Modifier</source>2333 <source>Modifier</source>
2236 <translation>Edit</translation>2334 <translation>Edit</translation>
2237 </message>2335 </message>
2238 <message>2336 <message>
2239 <location filename="reader.ui" line="1194"/>2337 <location filename="reader.ui" line="1208"/>
2240 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2338 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2241&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2339&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2242p, li { white-space: pre-wrap; }2340p, li { white-space: pre-wrap; }
@@ -2249,12 +2347,12 @@
2249&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Steps :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2347&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Steps :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2250 </message>2348 </message>
2251 <message>2349 <message>
2252 <location filename="reader.ui" line="1231"/>2350 <location filename="reader.ui" line="1245"/>
2253 <source>Nouveau palier</source>2351 <source>Nouveau palier</source>
2254 <translation>New step</translation>2352 <translation>New step</translation>
2255 </message>2353 </message>
2256 <message>2354 <message>
2257 <location filename="reader.ui" line="1273"/>2355 <location filename="reader.ui" line="1287"/>
2258 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2356 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2259&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2357&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2260p, li { white-space: pre-wrap; }2358p, li { white-space: pre-wrap; }
@@ -2267,7 +2365,7 @@
2267&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Name :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2365&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Name :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2268 </message>2366 </message>
2269 <message utf8="true">2367 <message utf8="true">
2270 <location filename="reader.ui" line="1309"/>2368 <location filename="reader.ui" line="1323"/>
2271 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2369 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2272&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2370&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2273p, li { white-space: pre-wrap; }2371p, li { white-space: pre-wrap; }
@@ -2280,12 +2378,12 @@
2280&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Time :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2378&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Time :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2281 </message>2379 </message>
2282 <message>2380 <message>
2283 <location filename="reader.ui" line="1320"/>2381 <location filename="reader.ui" line="1334"/>
2284 <source>0 min</source>2382 <source>0 min</source>
2285 <translation>0 min</translation>2383 <translation>0 min</translation>
2286 </message>2384 </message>
2287 <message utf8="true">2385 <message utf8="true">
2288 <location filename="reader.ui" line="1327"/>2386 <location filename="reader.ui" line="1341"/>
2289 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;2387 <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
2290&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;2388&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
2291p, li { white-space: pre-wrap; }2389p, li { white-space: pre-wrap; }
@@ -2298,117 +2396,117 @@
2298&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Temperature :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2396&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Temperature :&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2299 </message>2397 </message>
2300 <message>2398 <message>
2301 <location filename="reader.ui" line="1374"/>2399 <location filename="reader.ui" line="1388"/>
2302 <source>Enregistrer les profils</source>2400 <source>Enregistrer les profils</source>
2303 <translation>Save profiles</translation>2401 <translation>Save profiles</translation>
2304 </message>2402 </message>
2305 <message utf8="true">2403 <message utf8="true">
2306 <location filename="reader.ui" line="1611"/>2404 <location filename="reader.ui" line="1625"/>
2307 <source>Rinçage</source>2405 <source>Rinçage</source>
2308 <translation>Sparge</translation>2406 <translation>Sparge</translation>
2309 </message>2407 </message>
2310 <message utf8="true">2408 <message utf8="true">
2311 <location filename="reader.ui" line="1619"/>2409 <location filename="reader.ui" line="1633"/>
2312 <source>Volume de rinçage :</source>2410 <source>Volume de rinçage :</source>
2313 <translation>Sparge volume</translation>2411 <translation>Sparge volume</translation>
2314 </message>2412 </message>
2315 <message utf8="true">2413 <message utf8="true">
2316 <location filename="reader.ui" line="1626"/>2414 <location filename="reader.ui" line="1640"/>
2317 <source>Température de rinçage :</source>2415 <source>Température de rinçage :</source>
2318 <translation>Sparge temperature</translation>2416 <translation>Sparge temperature</translation>
2319 </message>2417 </message>
2320 <message utf8="true">2418 <message utf8="true">
2321 <location filename="reader.ui" line="1656"/>2419 <location filename="reader.ui" line="1670"/>
2322 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt; Pas de rinçage en BIAB&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2420 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt; Pas de rinçage en BIAB&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2323 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt; No sparge when BIAB&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2421 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt; No sparge when BIAB&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2324 </message>2422 </message>
2325 <message utf8="true">2423 <message utf8="true">
2326 <location filename="reader.ui" line="1719"/>2424 <location filename="reader.ui" line="1733"/>
2327 <source>Pré-ébullition</source>2425 <source>Pré-ébullition</source>
2328 <translation>Preboil</translation>2426 <translation>Preboil</translation>
2329 </message>2427 </message>
2330 <message utf8="true">2428 <message utf8="true">
2331 <location filename="reader.ui" line="1727"/>2429 <location filename="reader.ui" line="1741"/>
2332 <source>Volume théorique pré-ébullition :</source>2430 <source>Volume théorique pré-ébullition :</source>
2333 <translation>Preboil target volume</translation>2431 <translation>Preboil target volume</translation>
2334 </message>2432 </message>
2335 <message utf8="true">2433 <message utf8="true">
2336 <location filename="reader.ui" line="1734"/>2434 <location filename="reader.ui" line="1748"/>
2337 <source>Densité pré-ébullition :</source>2435 <source>Densité pré-ébullition :</source>
2338 <translation>Preboil gravity</translation>2436 <translation>Preboil gravity</translation>
2339 </message>2437 </message>
2340 <message>2438 <message>
2341 <location filename="reader.ui" line="1741"/>2439 <location filename="reader.ui" line="1755"/>
2342 <source>1.000</source>2440 <source>1.000</source>
2343 <translation>1.000</translation>2441 <translation>1.000</translation>
2344 </message>2442 </message>
2345 <message>2443 <message>
2346 <location filename="reader.ui" line="1441"/>2444 <location filename="reader.ui" line="1455"/>
2347 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Volumes d&apos;eau&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2445 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Volumes d&apos;eau&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2348 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Water volumes&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2446 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Water volumes&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2349 </message>2447 </message>
2350 <message>2448 <message>
2351 <location filename="reader.ui" line="1491"/>2449 <location filename="reader.ui" line="1505"/>
2352 <source>Palier</source>2450 <source>Palier</source>
2353 <translation>Step</translation>2451 <translation>Step</translation>
2354 </message>2452 </message>
2355 <message>2453 <message>
2356 <location filename="reader.ui" line="1496"/>2454 <location filename="reader.ui" line="1510"/>
2357 <source>Volume d&apos;eau</source>2455 <source>Volume d&apos;eau</source>
2358 <translation>Water volume</translation>2456 <translation>Water volume</translation>
2359 </message>2457 </message>
2360 <message utf8="true">2458 <message utf8="true">
2361 <location filename="reader.ui" line="1501"/>2459 <location filename="reader.ui" line="1515"/>
2362 <source>Température de l&apos;eau</source>2460 <source>Température de l&apos;eau</source>
2363 <translation>Water temperature</translation>2461 <translation>Water temperature</translation>
2364 </message>2462 </message>
2365 <message>2463 <message>
2366 <location filename="reader.ui" line="1506"/>2464 <location filename="reader.ui" line="1520"/>
2367 <source>Ratio</source>2465 <source>Ratio</source>
2368 <translation>Ratio</translation>2466 <translation>Ratio</translation>
2369 </message>2467 </message>
2370 <message>2468 <message>
2371 <location filename="reader.ui" line="1511"/>2469 <location filename="reader.ui" line="1525"/>
2372 <source>Infos</source>2470 <source>Infos</source>
2373 <translation>Infos</translation>2471 <translation>Infos</translation>
2374 </message>2472 </message>
2375 <message utf8="true">2473 <message utf8="true">
2376 <location filename="reader.ui" line="1528"/>2474 <location filename="reader.ui" line="1542"/>
2377 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Le profil de brassage que vous utilisez n&apos;est pas adapté au BIAB. Vous ne devriez utiliser qu&apos;un seul palier d&apos;infusion.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2475 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Le profil de brassage que vous utilisez n&apos;est pas adapté au BIAB. Vous ne devriez utiliser qu&apos;un seul palier d&apos;infusion.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2378 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Bad mash profile for BIAB. You should use only one infusion step.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2476 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Bad mash profile for BIAB. You should use only one infusion step.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2379 </message>2477 </message>
2380 <message utf8="true">2478 <message utf8="true">
2381 <location filename="reader.ui" line="1544"/>2479 <location filename="reader.ui" line="1558"/>
2382 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;JolieBulle ne prend pas encore en charge les décoctions. Pas encore !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>2480 <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;JolieBulle ne prend pas encore en charge les décoctions. Pas encore !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
2383 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;JolieBulle can&apos;t manage decoctions. Not yet !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2481 <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;JolieBulle can&apos;t manage decoctions. Not yet !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2384 </message>2482 </message>
2385 <message>2483 <message>
2386 <location filename="reader.ui" line="1566"/>2484 <location filename="reader.ui" line="1580"/>
2387 <source>Ajuster</source>2485 <source>Ajuster</source>
2388 <translation>Adjust</translation>2486 <translation>Adjust</translation>
2389 </message>2487 </message>
2390 <message utf8="true">2488 <message utf8="true">
2391 <location filename="reader.ui" line="1391"/>2489 <location filename="reader.ui" line="1405"/>
2392 <source>Méthode de brassage</source>2490 <source>Méthode de brassage</source>
2393 <translation>Brewing process</translation>2491 <translation>Brewing process</translation>
2394 </message>2492 </message>
2395 <message>2493 <message>
2396 <location filename="reader.ui" line="1402"/>2494 <location filename="reader.ui" line="1416"/>
2397 <source>Classique</source>2495 <source>Classique</source>
2398 <translation>Classical</translation>2496 <translation>Classical</translation>
2399 </message>2497 </message>
2400 <message>2498 <message>
2401 <location filename="reader.ui" line="1412"/>2499 <location filename="reader.ui" line="1426"/>
2402 <source>Volume complet (BIAB)</source>2500 <source>Volume complet (BIAB)</source>
2403 <translation>Full volume (BIAB)</translation>2501 <translation>Full volume (BIAB)</translation>
2404 </message>2502 </message>
2405 <message>2503 <message>
2406 <location filename="reader.ui" line="2082"/>2504 <location filename="reader.ui" line="2103"/>
2407 <source>Editeur de recettes</source>2505 <source>Editeur de recettes</source>
2408 <translation>Recipe editor</translation>2506 <translation>Recipe editor</translation>
2409 </message>2507 </message>
2410 <message utf8="true">2508 <message utf8="true">
2411 <location filename="reader.ui" line="2087"/>2509 <location filename="reader.ui" line="2108"/>
2412 <source>Bibliothèque de recettes</source>2510 <source>Bibliothèque de recettes</source>
2413 <translation>Recipe library</translation>2511 <translation>Recipe library</translation>
2414 </message>2512 </message>
@@ -2418,57 +2516,57 @@
2418 <translation type="obsolete">Brewday Mode</translation>2516 <translation type="obsolete">Brewday Mode</translation>
2419 </message>2517 </message>
2420 <message>2518 <message>
2421 <location filename="reader.ui" line="839"/>2519 <location filename="reader.ui" line="853"/>
2422 <source>Annuler</source>2520 <source>Annuler</source>
2423 <translation>Cancel</translation>2521 <translation>Cancel</translation>
2424 </message>2522 </message>
2425 <message>2523 <message>
2426 <location filename="reader.ui" line="846"/>2524 <location filename="reader.ui" line="860"/>
2427 <source>Enregistrer</source>2525 <source>Enregistrer</source>
2428 <translation>Save</translation>2526 <translation>Save</translation>
2429 </message>2527 </message>
2430 <message>2528 <message>
2431 <location filename="reader.ui" line="853"/>2529 <location filename="reader.ui" line="867"/>
2432 <source>Enregistrer &amp;&amp; Fermer</source>2530 <source>Enregistrer &amp;&amp; Fermer</source>
2433 <translation>Save &amp;&amp; Close</translation>2531 <translation>Save &amp;&amp; Close</translation>
2434 </message>2532 </message>
2435 <message>2533 <message>
2436 <location filename="reader.ui" line="917"/>2534 <location filename="reader.ui" line="931"/>
2437 <source>about:blank</source>2535 <source>about:blank</source>
2438 <translation>about:blank</translation>2536 <translation>about:blank</translation>
2439 </message>2537 </message>
2440 <message>2538 <message>
2441 <location filename="reader.ui" line="952"/>2539 <location filename="reader.ui" line="966"/>
2442 <source>Editer</source>2540 <source>Editer</source>
2443 <translation>Edit</translation>2541 <translation>Edit</translation>
2444 </message>2542 </message>
2445 <message>2543 <message>
2446 <location filename="reader.ui" line="962"/>2544 <location filename="reader.ui" line="976"/>
2447 <source>Brasser</source>2545 <source>Brasser</source>
2448 <translation>Brewday</translation>2546 <translation>Brewday</translation>
2449 </message>2547 </message>
2450 <message>2548 <message>
2451 <location filename="reader.ui" line="1668"/>2549 <location filename="reader.ui" line="1682"/>
2452 <source>Volumes</source>2550 <source>Volumes</source>
2453 <translation>Volumes</translation>2551 <translation>Volumes</translation>
2454 </message>2552 </message>
2455 <message>2553 <message>
2456 <location filename="reader.ui" line="1674"/>2554 <location filename="reader.ui" line="1688"/>
2457 <source>Volume de grains :</source>2555 <source>Volume de grains :</source>
2458 <translation>Grain volume :</translation>2556 <translation>Grain volume :</translation>
2459 </message>2557 </message>
2460 <message utf8="true">2558 <message utf8="true">
2461 <location filename="reader.ui" line="1688"/>2559 <location filename="reader.ui" line="1702"/>
2462 <source>Volume total (empâtage) :</source>2560 <source>Volume total (empâtage) :</source>
2463 <translation>Total volume (initial strike) :</translation>2561 <translation>Total volume (initial strike) :</translation>
2464 </message>2562 </message>
2465 <message>2563 <message>
2466 <location filename="reader.ui" line="1702"/>2564 <location filename="reader.ui" line="1716"/>
2467 <source>Volume total (dernier palier) :</source>2565 <source>Volume total (dernier palier) :</source>
2468 <translation>Total volume (last step) :</translation>2566 <translation>Total volume (last step) :</translation>
2469 </message>2567 </message>
2470 <message>2568 <message>
2471 <location filename="reader.ui" line="1793"/>2569 <location filename="reader.ui" line="1807"/>
2472 <source>Fermer</source>2570 <source>Fermer</source>
2473 <translation>Close</translation>2571 <translation>Close</translation>
2474 </message>2572 </message>
@@ -2578,45 +2676,60 @@
2578&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; color:#8d8d8d;&quot;&gt;Adjust and brew&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>2676&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; color:#8d8d8d;&quot;&gt;Adjust and brew&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
2579 </message>2677 </message>
2580 <message utf8="true">2678 <message utf8="true">
2581 <location filename="reader.ui" line="1910"/>2679 <location filename="reader.ui" line="1924"/>
2582 <source>Ingrédients</source>2680 <source>Ingrédients</source>
2583 <translation>Ingredients</translation>2681 <translation>Ingredients</translation>
2584 </message>2682 </message>
2585 <message>2683 <message>
2586 <location filename="reader.ui" line="2146"/>2684 <location filename="reader.ui" line="2167"/>
2587 <source>Brassage</source>2685 <source>Brassage</source>
2588 <translation>Mash</translation>2686 <translation>Mash</translation>
2589 </message>2687 </message>
2590 <message>2688 <message>
2591 <location filename="reader.ui" line="2149"/>2689 <location filename="reader.ui" line="2170"/>
2592 <source>Mode brassage</source>2690 <source>Mode brassage</source>
2593 <translation>Brewday mode</translation>2691 <translation>Brewday mode</translation>
2594 </message>2692 </message>
2595 <message>2693 <message>
2596 <location filename="reader.ui" line="2154"/>2694 <location filename="reader.ui" line="2175"/>
2597 <source>Nouveau dossier</source>2695 <source>Nouveau dossier</source>
2598 <translation>New folder</translation>2696 <translation>New folder</translation>
2599 </message>2697 </message>
2600 <message utf8="true">2698 <message utf8="true">
2601 <location filename="reader.ui" line="2157"/>2699 <location filename="reader.ui" line="2178"/>
2602 <source>Créer un nouveau dossier dans la bibliothèque</source>2700 <source>Créer un nouveau dossier dans la bibliothèque</source>
2603 <translation>Create a new folder in library</translation>2701 <translation>Create a new folder in library</translation>
2604 </message>2702 </message>
2605 <message utf8="true">2703 <message utf8="true">
2606 <location filename="reader.ui" line="2165"/>2704 <location filename="reader.ui" line="2186"/>
2607 <source>Créer une nouvelle recette</source>2705 <source>Créer une nouvelle recette</source>
2608 <translation>Create a new recipe</translation>2706 <translation>Create a new recipe</translation>
2609 </message>2707 </message>
2610 <message utf8="true">2708 <message utf8="true">
2611 <location filename="reader.ui" line="2170"/>2709 <location filename="reader.ui" line="2191"/>
2612 <source>Importer dans la bibliothèque</source>2710 <source>Importer dans la bibliothèque</source>
2613 <translation>Import in library</translation>2711 <translation>Import in library</translation>
2614 </message>2712 </message>
2615 <message>2713 <message>
2616 <location filename="reader.ui" line="2175"/>2714 <location filename="reader.ui" line="2196"/>
2617 <source>Copier le BBCode dans le presse papier</source>2715 <source>Copier le BBCode dans le presse papier</source>
2618 <translation>Copy BBCode into clipboard</translation>2716 <translation>Copy BBCode into clipboard</translation>
2619 </message>2717 </message>
2718 <message>
2719 <location filename="reader.ui" line="768"/>
2720 <source>Ratio BU/GU :</source>
2721 <translation type="unfinished"></translation>
2722 </message>
2723 <message>
2724 <location filename="reader.ui" line="1956"/>
2725 <source>Profils de brassage</source>
2726 <translation type="unfinished"></translation>
2727 </message>
2728 <message utf8="true">
2729 <location filename="reader.ui" line="2201"/>
2730 <source>Gérer les profils</source>
2731 <translation type="unfinished"></translation>
2732 </message>
2620</context>2733</context>
2621<context>2734<context>
2622 <name>Preferences</name>2735 <name>Preferences</name>
@@ -2702,44 +2815,54 @@
2702<context>2815<context>
2703 <name>UseDelegate</name>2816 <name>UseDelegate</name>
2704 <message utf8="true">2817 <message utf8="true">
2705 <location filename="main.py" line="341"/>2818 <location filename="main.py" line="389"/>
2706 <source>Ébullition</source>2819 <source>Ébullition</source>
2707 <translation>Boil</translation>2820 <translation>Boil</translation>
2708 </message>2821 </message>
2709 <message>2822 <message>
2710 <location filename="main.py" line="329"/>2823 <location filename="main.py" line="377"/>
2711 <source>Dry Hop</source>2824 <source>Dry Hop</source>
2712 <translation>Dry Hop</translation>2825 <translation>Dry Hop</translation>
2713 </message>2826 </message>
2714 <message utf8="true">2827 <message utf8="true">
2715 <location filename="main.py" line="343"/>2828 <location filename="main.py" line="391"/>
2716 <source>Empâtage</source>2829 <source>Empâtage</source>
2717 <translation>Mash</translation>2830 <translation>Mash</translation>
2718 </message>2831 </message>
2719 <message utf8="true">2832 <message utf8="true">
2720 <location filename="main.py" line="333"/>2833 <location filename="main.py" line="381"/>
2721 <source>Premier Moût</source>2834 <source>Premier Moût</source>
2722 <translation>First Wort</translation>2835 <translation>First Wort</translation>
2723 </message>2836 </message>
2724 <message utf8="true">2837 <message utf8="true">
2725 <location filename="main.py" line="335"/>2838 <location filename="main.py" line="383"/>
2726 <source>Arôme</source>2839 <source>Arôme</source>
2727 <translation>Aroma</translation>2840 <translation>Aroma</translation>
2728 </message>2841 </message>
2729 <message>2842 <message>
2730 <location filename="main.py" line="345"/>2843 <location filename="main.py" line="393"/>
2731 <source>Primaire</source>2844 <source>Primaire</source>
2732 <translation>Primary</translation>2845 <translation>Primary</translation>
2733 </message>2846 </message>
2734 <message>2847 <message>
2735 <location filename="main.py" line="347"/>2848 <location filename="main.py" line="395"/>
2736 <source>Secondaire</source>2849 <source>Secondaire</source>
2737 <translation>Secondary</translation>2850 <translation>Secondary</translation>
2738 </message>2851 </message>
2739 <message>2852 <message>
2740 <location filename="main.py" line="349"/>2853 <location filename="main.py" line="397"/>
2741 <source>Embouteillage</source>2854 <source>Embouteillage</source>
2742 <translation>Bottling</translation>2855 <translation>Bottling</translation>
2743 </message>2856 </message>
2857 <message>
2858 <location filename="main.py" line="367"/>
2859 <source>Brassage</source>
2860 <translation type="unfinished">Mash</translation>
2861 </message>
2862 <message utf8="true">
2863 <location filename="main.py" line="369"/>
2864 <source>Après ébullition</source>
2865 <translation type="unfinished"></translation>
2866 </message>
2744</context>2867</context>
2745</TS>2868</TS>
27462869
=== modified file 'outilAlc.py'
--- outilAlc.py 2012-09-04 22:31:19 +0000
+++ outilAlc.py 2013-01-04 15:42:21 +0000
@@ -42,10 +42,13 @@
42 42
43 self.ui.doubleSpinBoxDI.valueChanged.connect(self.calcAlc)43 self.ui.doubleSpinBoxDI.valueChanged.connect(self.calcAlc)
44 self.ui.doubleSpinBoxDF.valueChanged.connect(self.calcAlc)44 self.ui.doubleSpinBoxDF.valueChanged.connect(self.calcAlc)
45 self.ui.doubleSpinBoxSucre.valueChanged.connect(self.calcAlc)
45 46
46 def calcAlc(self) :47 def calcAlc(self) :
47 self.OG = self.ui.doubleSpinBoxDI.value()48 self.OG = self.ui.doubleSpinBoxDI.value()
48 self.FG = self.ui.doubleSpinBoxDF.value()49 self.FG = self.ui.doubleSpinBoxDF.value()
49 self.ABV = 0.130*((self.OG-1) -(self.FG-1))*100050 self.Sucre = self.ui.doubleSpinBoxSucre.value()
51
52 self.ABV = ((((self.OG - self.FG) * 1.05) / self.FG) * 100) / 0.795 + ((self.Sucre * 0.5) / 0.795) / 10
50 53
51 self.ui.labelAlc.setText("%.1f" %self.ABV)54 self.ui.labelAlc.setText("%.1f" %self.ABV)
5255
=== modified file 'outilAlc.ui'
--- outilAlc.ui 2011-03-07 15:40:50 +0000
+++ outilAlc.ui 2013-01-04 15:42:21 +0000
@@ -6,12 +6,12 @@
6 <rect>6 <rect>
7 <x>0</x>7 <x>0</x>
8 <y>0</y>8 <y>0</y>
9 <width>236</width>9 <width>270</width>
10 <height>142</height>10 <height>219</height>
11 </rect>11 </rect>
12 </property>12 </property>
13 <property name="windowTitle">13 <property name="windowTitle">
14 <string>Dialog</string>14 <string>Calcul taux alcool</string>
15 </property>15 </property>
16 <layout class="QGridLayout" name="gridLayout">16 <layout class="QGridLayout" name="gridLayout">
17 <item row="0" column="0">17 <item row="0" column="0">
@@ -38,7 +38,7 @@
38 </property>38 </property>
39 </widget>39 </widget>
40 </item>40 </item>
41 <item row="3" column="0">41 <item row="4" column="0">
42 <widget class="QLabel" name="label_3">42 <widget class="QLabel" name="label_3">
43 <property name="text">43 <property name="text">
44 <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;44 <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -49,7 +49,7 @@
49 </property>49 </property>
50 </widget>50 </widget>
51 </item>51 </item>
52 <item row="3" column="1">52 <item row="4" column="1">
53 <widget class="QLabel" name="labelAlc">53 <widget class="QLabel" name="labelAlc">
54 <property name="text">54 <property name="text">
55 <string>0</string>55 <string>0</string>
@@ -88,7 +88,7 @@
88 </property>88 </property>
89 </widget>89 </widget>
90 </item>90 </item>
91 <item row="2" column="0">91 <item row="3" column="0">
92 <spacer name="verticalSpacer">92 <spacer name="verticalSpacer">
93 <property name="orientation">93 <property name="orientation">
94 <enum>Qt::Vertical</enum>94 <enum>Qt::Vertical</enum>
@@ -101,7 +101,7 @@
101 </property>101 </property>
102 </spacer>102 </spacer>
103 </item>103 </item>
104 <item row="4" column="0">104 <item row="5" column="0">
105 <spacer name="verticalSpacer_2">105 <spacer name="verticalSpacer_2">
106 <property name="orientation">106 <property name="orientation">
107 <enum>Qt::Vertical</enum>107 <enum>Qt::Vertical</enum>
@@ -114,6 +114,27 @@
114 </property>114 </property>
115 </spacer>115 </spacer>
116 </item>116 </item>
117 <item row="2" column="0">
118 <widget class="QLabel" name="label_4">
119 <property name="text">
120 <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
121&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
122p, li { white-space: pre-wrap; }
123&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
124&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sucre ajouté (g/L)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
125 </property>
126 </widget>
127 </item>
128 <item row="2" column="1">
129 <widget class="QDoubleSpinBox" name="doubleSpinBoxSucre">
130 <property name="singleStep">
131 <double>0.100000000000000</double>
132 </property>
133 <property name="value">
134 <double>7.000000000000000</double>
135 </property>
136 </widget>
137 </item>
117 </layout>138 </layout>
118 </item>139 </item>
119 <item row="1" column="0">140 <item row="1" column="0">
120141
=== modified file 'outilAlc_ui.py'
--- outilAlc_ui.py 2011-03-07 15:40:50 +0000
+++ outilAlc_ui.py 2013-01-04 15:42:21 +0000
@@ -2,8 +2,8 @@
22
3# Form implementation generated from reading ui file 'outilAlc.ui'3# Form implementation generated from reading ui file 'outilAlc.ui'
4#4#
5# Created: Wed Mar 2 23:05:18 20115# Created: Fri Jan 4 15:56:16 2013
6# by: PyQt4 UI code generator 4.8.36# by: PyQt4 UI code generator 4.9.6
7#7#
8# WARNING! All changes made in this file will be lost!8# WARNING! All changes made in this file will be lost!
99
@@ -12,12 +12,21 @@
12try:12try:
13 _fromUtf8 = QtCore.QString.fromUtf813 _fromUtf8 = QtCore.QString.fromUtf8
14except AttributeError:14except AttributeError:
15 _fromUtf8 = lambda s: s15 def _fromUtf8(s):
16 return s
17
18try:
19 _encoding = QtGui.QApplication.UnicodeUTF8
20 def _translate(context, text, disambig):
21 return QtGui.QApplication.translate(context, text, disambig, _encoding)
22except AttributeError:
23 def _translate(context, text, disambig):
24 return QtGui.QApplication.translate(context, text, disambig)
1625
17class Ui_DialogAlc(object):26class Ui_DialogAlc(object):
18 def setupUi(self, DialogAlc):27 def setupUi(self, DialogAlc):
19 DialogAlc.setObjectName(_fromUtf8("DialogAlc"))28 DialogAlc.setObjectName(_fromUtf8("DialogAlc"))
20 DialogAlc.resize(236, 142)29 DialogAlc.resize(270, 219)
21 self.gridLayout = QtGui.QGridLayout(DialogAlc)30 self.gridLayout = QtGui.QGridLayout(DialogAlc)
22 self.gridLayout.setObjectName(_fromUtf8("gridLayout"))31 self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
23 self.formLayout = QtGui.QFormLayout()32 self.formLayout = QtGui.QFormLayout()
@@ -30,10 +39,10 @@
30 self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_2)39 self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_2)
31 self.label_3 = QtGui.QLabel(DialogAlc)40 self.label_3 = QtGui.QLabel(DialogAlc)
32 self.label_3.setObjectName(_fromUtf8("label_3"))41 self.label_3.setObjectName(_fromUtf8("label_3"))
33 self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_3)42 self.formLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.label_3)
34 self.labelAlc = QtGui.QLabel(DialogAlc)43 self.labelAlc = QtGui.QLabel(DialogAlc)
35 self.labelAlc.setObjectName(_fromUtf8("labelAlc"))44 self.labelAlc.setObjectName(_fromUtf8("labelAlc"))
36 self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.labelAlc)45 self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.labelAlc)
37 self.doubleSpinBoxDI = QtGui.QDoubleSpinBox(DialogAlc)46 self.doubleSpinBoxDI = QtGui.QDoubleSpinBox(DialogAlc)
38 self.doubleSpinBoxDI.setDecimals(3)47 self.doubleSpinBoxDI.setDecimals(3)
39 self.doubleSpinBoxDI.setMinimum(1.0)48 self.doubleSpinBoxDI.setMinimum(1.0)
@@ -49,9 +58,17 @@
49 self.doubleSpinBoxDF.setObjectName(_fromUtf8("doubleSpinBoxDF"))58 self.doubleSpinBoxDF.setObjectName(_fromUtf8("doubleSpinBoxDF"))
50 self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.doubleSpinBoxDF)59 self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.doubleSpinBoxDF)
51 spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)60 spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
52 self.formLayout.setItem(2, QtGui.QFormLayout.LabelRole, spacerItem)61 self.formLayout.setItem(3, QtGui.QFormLayout.LabelRole, spacerItem)
53 spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)62 spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
54 self.formLayout.setItem(4, QtGui.QFormLayout.LabelRole, spacerItem1)63 self.formLayout.setItem(5, QtGui.QFormLayout.LabelRole, spacerItem1)
64 self.label_4 = QtGui.QLabel(DialogAlc)
65 self.label_4.setObjectName(_fromUtf8("label_4"))
66 self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_4)
67 self.doubleSpinBoxSucre = QtGui.QDoubleSpinBox(DialogAlc)
68 self.doubleSpinBoxSucre.setSingleStep(0.1)
69 self.doubleSpinBoxSucre.setProperty("value", 7.0)
70 self.doubleSpinBoxSucre.setObjectName(_fromUtf8("doubleSpinBoxSucre"))
71 self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.doubleSpinBoxSucre)
55 self.gridLayout.addLayout(self.formLayout, 0, 0, 1, 1)72 self.gridLayout.addLayout(self.formLayout, 0, 0, 1, 1)
56 self.buttonBox = QtGui.QDialogButtonBox(DialogAlc)73 self.buttonBox = QtGui.QDialogButtonBox(DialogAlc)
57 self.buttonBox.setOrientation(QtCore.Qt.Horizontal)74 self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
@@ -65,21 +82,36 @@
65 QtCore.QMetaObject.connectSlotsByName(DialogAlc)82 QtCore.QMetaObject.connectSlotsByName(DialogAlc)
6683
67 def retranslateUi(self, DialogAlc):84 def retranslateUi(self, DialogAlc):
68 DialogAlc.setWindowTitle(QtGui.QApplication.translate("DialogAlc", "Dialog", None, QtGui.QApplication.UnicodeUTF8))85 DialogAlc.setWindowTitle(_translate("DialogAlc", "Calcul taux alcool", None))
69 self.label.setText(QtGui.QApplication.translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"86 self.label.setText(_translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
70"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"87"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
71"p, li { white-space: pre-wrap; }\n"88"p, li { white-space: pre-wrap; }\n"
72"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"89"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
73"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Densité initiale</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))90"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Densité initiale</span></p></body></html>", None))
74 self.label_2.setText(QtGui.QApplication.translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"91 self.label_2.setText(_translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
75"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"92"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
76"p, li { white-space: pre-wrap; }\n"93"p, li { white-space: pre-wrap; }\n"
77"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"94"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
78"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Densité finale</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))95"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Densité finale</span></p></body></html>", None))
79 self.label_3.setText(QtGui.QApplication.translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"96 self.label_3.setText(_translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
80"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"97"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
81"p, li { white-space: pre-wrap; }\n"98"p, li { white-space: pre-wrap; }\n"
82"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"99"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
83"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Alcool par volume (%) :</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))100"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Alcool par volume (%) :</span></p></body></html>", None))
84 self.labelAlc.setText(QtGui.QApplication.translate("DialogAlc", "0", None, QtGui.QApplication.UnicodeUTF8))101 self.labelAlc.setText(_translate("DialogAlc", "0", None))
102 self.label_4.setText(_translate("DialogAlc", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
103"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
104"p, li { white-space: pre-wrap; }\n"
105"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
106"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Sucre ajouté (g/L)</span></p></body></html>", None))
107
108
109if __name__ == "__main__":
110 import sys
111 app = QtGui.QApplication(sys.argv)
112 DialogAlc = QtGui.QDialog()
113 ui = Ui_DialogAlc()
114 ui.setupUi(DialogAlc)
115 DialogAlc.show()
116 sys.exit(app.exec_())
85117

Subscribers

People subscribed via source and target branches

to all changes: