Updated english translation ans push joshua script to rotate angle text to 270° if conductor is vertical, interaction his not prefect at this time but is work

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2179 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2013-05-25 15:57:03 +00:00
parent c9f6ef8ea3
commit b5cdfb233d
2 changed files with 36 additions and 35 deletions

View File

@@ -82,7 +82,7 @@
<message>
<location filename="../sources/aboutqet.cpp" line="115"/>
<source>Collection d&apos;éléments &amp; Développement</source>
<translation type="unfinished"></translation>
<translation>Elements collection &amp; Development</translation>
</message>
<message>
<location filename="../sources/aboutqet.cpp" line="131"/>
@@ -595,7 +595,7 @@ Apply a text to all of these drivers?</translation>
<location filename="../sources/diagramview.cpp" line="51"/>
<source>Ceci est la zone dans laquelle vous concevez vos schémas en y ajoutant des éléments et en posant des conducteurs entre leurs bornes. Il est également possible d&apos;ajouter des textes indépendants.</source>
<comment>&quot;What&apos;s this?&quot; tip</comment>
<translation type="unfinished">In this area you conceive your diagrams by adding elements and conductors between their terminals. You may also add independent texts.</translation>
<translation>In this area you conceive your diagrams by adding elements and conductors between their terminals. You may also add independent texts.</translation>
</message>
<message>
<location filename="../sources/diagramview.cpp" line="188"/>
@@ -731,7 +731,7 @@ Apply a text to all of these drivers?</translation>
<location filename="../sources/diagramview.cpp" line="1018"/>
<source>Voulez-vous appliquer le nouveau texte
à l&apos;ensemble des conducteurs de ce potentiel ?</source>
<translation type="unfinished">Do you want to apply the new text
<translation>Do you want to apply the new text
to all conductors of this potential?</translation>
</message>
<message>
@@ -758,7 +758,7 @@ to all conductors of this potential?</translation>
<message>
<location filename="../sources/ui/dialogautonum.ui" line="28"/>
<source>Configuration</source>
<translation type="unfinished"></translation>
<translation>Settings</translation>
</message>
<message>
<location filename="../sources/ui/dialogautonum.ui" line="42"/>
@@ -2475,32 +2475,32 @@ Changes will be definitive.</translation>
<message>
<location filename="../sources/ui/numparteditorw.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
<translation>Form</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/numparteditorw.ui" line="29"/>
<source>Unité</source>
<translation type="unfinished"></translation>
<translation>Unit</translation>
</message>
<message>
<location filename="../sources/ui/numparteditorw.ui" line="34"/>
<source>Dizaine</source>
<translation type="unfinished"></translation>
<translation>Tens</translation>
</message>
<message>
<location filename="../sources/ui/numparteditorw.ui" line="39"/>
<source>Centaine</source>
<translation type="unfinished"></translation>
<translation>Centaine</translation>
</message>
<message>
<location filename="../sources/ui/numparteditorw.ui" line="44"/>
<source>Texte</source>
<translation type="unfinished">Text</translation>
<translation>Text</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/numparteditorw.ui" line="49"/>
<source>N° folio</source>
<translation type="unfinished"></translation>
<translation>N° scheme</translation>
</message>
</context>
<context>
@@ -3466,7 +3466,7 @@ Available options:
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="227"/>
<source>Annoter les schémas</source>
<translation type="unfinished"></translation>
<translation>Numbering scheme</translation>
</message>
<message>
<location filename="../sources/qetdiagrameditor.cpp" line="228"/>
@@ -5257,7 +5257,7 @@ Que désirez vous faire ?</source>
<location filename="../sources/editor/editorcommands.cpp" line="668"/>
<source>modification informations complementaires</source>
<comment>undo caption</comment>
<translation type="unfinished">modify author information</translation>
<translation>Modification complementary information</translation>
</message>
<message>
<location filename="../sources/editor/editorcommands.cpp" line="783"/>
@@ -5640,52 +5640,52 @@ Que désirez vous faire ?</source>
<message>
<location filename="../sources/ui/selectautonumw.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
<translation>Form</translation>
</message>
<message>
<location filename="../sources/ui/selectautonumw.ui" line="25"/>
<source>Folio: </source>
<translation type="unfinished"></translation>
<translation>Scheme:.</translation>
</message>
<message>
<location filename="../sources/ui/selectautonumw.ui" line="32"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choisir le folio&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose the scheme&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/selectautonumw.ui" line="55"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Supprimer une variable de numérotation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Delete a variable numbering&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/selectautonumw.ui" line="72"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ajouter une variable de numérotation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add a variable numbering&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/selectautonumw.ui" line="91"/>
<source>Définition</source>
<translation type="unfinished"></translation>
<translation>Définition</translation>
</message>
<message>
<location filename="../sources/ui/selectautonumw.ui" line="107"/>
<source>Type</source>
<translation type="unfinished"></translation>
<translation>Type</translation>
</message>
<message>
<location filename="../sources/ui/selectautonumw.ui" line="117"/>
<source>Valeur</source>
<translation type="unfinished">Value</translation>
<translation>Value</translation>
</message>
<message utf8="true">
<location filename="../sources/ui/selectautonumw.ui" line="133"/>
<source>Incrémentation</source>
<translation type="unfinished"></translation>
<translation>Incrementing</translation>
</message>
<message>
<location filename="../sources/ui/selectautonumw.cpp" line="34"/>
<source>Schéma sans titre</source>
<translation type="unfinished">Untitled diagram</translation>
<translation>Untitled diagram</translation>
</message>
</context>
<context>
@@ -6680,47 +6680,47 @@ Maximum width: %2px
<message>
<location filename="../sources/ui/diagramselection.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
<translation>Form</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.ui" line="22"/>
<source>TextLabel</source>
<translation type="unfinished">TextLabel</translation>
<translation>TextLabel</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="30"/>
<source>Projet sans titre</source>
<translation type="unfinished">Untitled project</translation>
<translation>Untitled project</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="32"/>
<source>Projet : </source>
<translation type="unfinished"></translation>
<translation>project : </translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="60"/>
<source>Sélection</source>
<translation type="unfinished">Choice</translation>
<translation>Choice</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="60"/>
<source>Nom</source>
<translation type="unfinished">Name</translation>
<translation>Name</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="69"/>
<source>Schéma sans titre</source>
<translation type="unfinished">Untitled diagram</translation>
<translation>Untitled diagram</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="102"/>
<source>Désélectionner tout</source>
<translation type="unfinished">Select none</translation>
<translation>Select none</translation>
</message>
<message>
<location filename="../sources/ui/diagramselection.cpp" line="103"/>
<source>Sélectionner tout</source>
<translation type="unfinished"></translation>
<translation>Select all</translation>
</message>
</context>
<context>
@@ -6840,17 +6840,17 @@ Maximum width: %2px
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="362"/>
<source>Texte en gras</source>
<translation type="unfinished">bold</translation>
<translation>Bold</translation>
</message>
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="368"/>
<source>Texte en italique</source>
<translation type="unfinished">italic</translation>
<translation>Italic</translation>
</message>
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="374"/>
<source>Texte souligé</source>
<translation type="unfinished">underline</translation>
<translation>Underline</translation>
</message>
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="375"/>
@@ -6890,7 +6890,7 @@ Maximum width: %2px
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="433"/>
<source>Insérer un lien</source>
<translation type="unfinished">insert line</translation>
<translation>Insert line</translation>
</message>
<message>
<location filename="../sources/richtext/richtexteditor.cpp" line="437"/>

View File

@@ -1124,6 +1124,7 @@ void Conductor::calculateTextItemPosition() {
} else {
// positionnement automatique basique
text_item -> setPos(middleSegment() -> middle());
middleSegment() -> isVertical()? text_item -> setRotationAngle(270): text_item -> setRotationAngle(0);
}
}