Commit 6fd1f8ba authored by Georges Khaznadar's avatar Georges Khaznadar

Merge branch 'upstream'

parents e7c083f1 9be26332
......@@ -133,12 +133,12 @@
<translation>&amp;Ouvrir</translation>
</message>
<message>
<location filename="../main.py" line="519"/>
<location filename="../main.py" line="517"/>
<source>video t = </source>
<translation>vidéo t = </translation>
</message>
<message>
<location filename="../main.py" line="424"/>
<location filename="../main.py" line="422"/>
<source>The simulation is finished</source>
<translation>La simulation est finie</translation>
</message>
......@@ -173,12 +173,12 @@
<translation>Ouvrir un fichier</translation>
</message>
<message>
<location filename="../main.py" line="597"/>
<location filename="../main.py" line="595"/>
<source>Indentation error</source>
<translation>Erreur d&apos;indentation</translation>
</message>
<message>
<location filename="../main.py" line="607"/>
<location filename="../main.py" line="605"/>
<source>line # {l} column # {c}
{t}
</source>
......@@ -187,29 +187,29 @@
</translation>
</message>
<message>
<location filename="../main.py" line="607"/>
<location filename="../main.py" line="605"/>
<source>Syntax error</source>
<translation>Erreur de syntaxe</translation>
</message>
<message>
<location filename="../main.py" line="616"/>
<location filename="../main.py" line="614"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../main.py" line="627"/>
<location filename="../main.py" line="625"/>
<source>Compilation successful</source>
<translation>Compilation réussie</translation>
</message>
<message>
<location filename="../main.py" line="627"/>
<location filename="../main.py" line="625"/>
<source>Defined functions:
</source>
<translation>Fonctions définies :
</translation>
</message>
<message>
<location filename="../main.py" line="519"/>
<location filename="../main.py" line="517"/>
<source>(# %d)</source>
<translation>(N° %d)</translation>
</message>
......
......@@ -286,14 +286,12 @@ class MainWindow(QtWidgets.QMainWindow):
self, self.tr("Open a file"), defaultDir, "*.py"
)
if ok:
self.ui.progEdit.setPlainText(io.open(
self.ui.progEdit.setText(io.open(
self.progFileName, encoding="utf-8"
).read())
self.nameTabProg()
# recompilation forcée
self.simulated = False
self.ui.simulButton.setEnabled(True)
self.startStop()
return
def SVGObjets(self, objDict=None):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment