razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into stop_motion_improvements

Browse source
This commit is contained in:
Jeremy Bullock 2020-04-29 23:01:22 -06:00
commit 30491ab413
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toonz/sources/toonz/levelcreatepopup.cpp
View file

@ -345,11 +345,15 @@ void LevelCreatePopup::showEvent(QShowEvent *) {
m_dpiLabel->hide(); m_dpiLabel->hide();
m_widthFld->setDecimals(0); m_widthFld->setDecimals(0);
m_heightFld->setDecimals(0); m_heightFld->setDecimals(0);
m_widthFld->setMeasure("camera.lx");
m_heightFld->setMeasure("camera.ly");
} else { } else {
m_dpiFld->show(); m_dpiFld->show();
m_dpiLabel->show(); m_dpiLabel->show();
m_widthFld->setDecimals(4); m_widthFld->setDecimals(4);
m_heightFld->setDecimals(4); m_heightFld->setDecimals(4);
m_widthFld->setMeasure("level.lx");
m_heightFld->setMeasure("level.ly");
} }
} }

16
toonz/sources/translations/french/tnzcore.ts
View file

@ -5,26 +5,26 @@
<name>BmpWriterProperties</name> <name>BmpWriterProperties</name>
<message> <message>
<source>Bits Per Pixel</source> <source>Bits Per Pixel</source>
<translation type="unfinished"></translation> <translation>Bits par pixels</translation>
</message> </message>
<message> <message>
<source>24 bits</source> <source>24 bits</source>
<translation type="unfinished"></translation> <translation>24 bits</translation>
</message> </message>
<message> <message>
<source>8 bits (Greyscale)</source> <source>8 bits (Greyscale)</source>
<translation type="unfinished"></translation> <translation>8 bits (niveaux de gris)</translation>
</message> </message>
</context> </context>
<context> <context>
<name>JpgWriterProperties</name> <name>JpgWriterProperties</name>
<message> <message>
<source>Quality</source> <source>Quality</source>
<translation type="unfinished"></translation> <translation>Qualité</translation>
</message> </message>
<message> <message>
<source>Smoothing</source> <source>Smoothing</source>
<translation type="unfinished"></translation> <translation>Lissage</translation>
</message> </message>
</context> </context>
<context> <context>
@ -35,11 +35,11 @@
</message> </message>
<message> <message>
<source>Unidentified Action</source> <source>Unidentified Action</source>
<translation type="unfinished"></translation> <translation>Action non identifiée</translation>
</message> </message>
<message> <message>
<source>Skipping frame.</source> <source>Skipping frame.</source>
<translation type="unfinished"></translation> <translation>Ignorer l'image.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -50,7 +50,7 @@
</message> </message>
<message> <message>
<source>Thickness</source> <source>Thickness</source>
<translation>Epaisseur</translation> <translation>Épaisseur</translation>
</message> </message>
</context> </context>
<context> <context>