| [qet] [4186] Update TS files |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4186
Author: scorpio810
Date: 2015-09-01 00:59:17 +0200 (Tue, 01 Sep 2015)
Log Message:
-----------
Update TS files
Modified Paths:
--------------
trunk/lang/qet_ar.ts
trunk/lang/qet_be.ts
trunk/lang/qet_ca.ts
trunk/lang/qet_cs.ts
trunk/lang/qet_de.ts
trunk/lang/qet_el.ts
trunk/lang/qet_en.qm
trunk/lang/qet_en.ts
trunk/lang/qet_es.ts
trunk/lang/qet_hr.ts
trunk/lang/qet_it.ts
trunk/lang/qet_nl.ts
trunk/lang/qet_pl.ts
trunk/lang/qet_pt.ts
trunk/lang/qet_ro.ts
trunk/lang/qet_ru.ts
trunk/lang/qet_sl.ts
trunk/lang/qet_zh.ts
Modified: trunk/lang/qet_ar.ts
===================================================================
--- trunk/lang/qet_ar.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_ar.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -344,19 +344,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>نصوص الموصلات</translation>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>هل ترغب في إعتماد النص الجديد على مجموع الموصلات لهذا الكمون ؟</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -369,7 +364,7 @@
<translation type="unfinished">تحرير خاصيات الموصل</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished">تطبيق الخواص على مجموع الموصلات لهذا الكمون</translation>
</message>
@@ -380,7 +375,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -389,90 +384,103 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>نوع الموصل</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>متعدد الأسلاك</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished">نص :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished">نص</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>عمودي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>أفقي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>أحادي السلك</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">نوع</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>طور</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translatorcomment>نمط الموصل: خط مستمرّ</translatorcomment>
<translation>خط مستمرّ</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translatorcomment>نمط الموصل: خط مُتقطّع</translatorcomment>
<translation>خط متقطع</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translatorcomment>نمط الموصل : نقاط و خطوط</translatorcomment>
<translation>خطوط و نقاط</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>أرضي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>محايد</translation>
</message>
@@ -482,85 +490,75 @@
<translation type="unfinished">شكل</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished">ظاهر</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished">حماية الأرضي -المحايد</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished">قلم</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished">علامة نصيّة</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>ظهور الموصل</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">المظهر</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>اللون:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished">نمط :</translation>
</message>
@@ -2957,28 +2955,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation type="unfinished">نصوص الكمون</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation type="unfinished">نصوص هذا الكمون الكهربائي ليست متطابقة .
-اعتمد النصّ على مجموع هذه الموصلات ؟</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation type="unfinished">: موجود</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation type="unfinished">مرّة.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6208,19 +6207,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_be.ts
===================================================================
--- trunk/lang/qet_be.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_be.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -339,22 +339,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Geleider tekst</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Wil je de nieuwe tekst toe passen op alle geleiders met het zelfde potentiaal?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Bewerk de eigenschappen van een geleider</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Wijzig de eigenschappen van meerdere geleiders</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -364,7 +359,7 @@
<translation>Bewerk de eigenschappen van een geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Toepassen van deze eigenschappen op alle gelieders met hetzelfde potentiaal</translation>
</message>
@@ -375,7 +370,7 @@
<translation>Wijzig de eigenschappen van een geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Wijzig de eigenschappen van meerdere geleiders</translation>
@@ -384,87 +379,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Soort geleider</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Meerdere geleiders</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Tekst:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertikaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Horizontaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Enkele geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Tekst hoogte</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Tekst zichtbaar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Één tekst per potentiaal (experimenteel) activeren</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Volle lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Streep lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Punten en strepen lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>Nul</translation>
</message>
@@ -474,85 +482,75 @@
<translation>Vorm</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Hoogte:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Zichtbaar</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Geef een text voor geleider per bladzijde. </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotatie van de geleider tekst :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Aantal fase geleideers</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Nul geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Aarde en Nul samen</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Aarding</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Geleiders</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Geleider weergave</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Geleider stijl</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Geleider kleur</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Verschijning</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Kleur:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Stijl:</translation>
</message>
@@ -2942,28 +2940,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Geleidernummers</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>De nummering van deze geleiders zijn niet gelijk.
-Wilt u de tekst gelijk maken voor alle geleiders met hezelfde potentiaal?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : Dit is </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> keer.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Wijzig de eigenschappen van meerdere geleiders</translation>
</message>
</context>
<context>
@@ -6165,19 +6164,19 @@
<translation>Wijzigen informatie van element %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Kruisverwijzing bewerken</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Wijzig een eigenschap van een geleider</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Wijzig de eigenschappen van meerdere geleiders</translation>
Modified: trunk/lang/qet_ca.ts
===================================================================
--- trunk/lang/qet_ca.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_ca.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation type="unfinished">Modificar les propietats d'un conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished"></translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -383,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Tipus de conductor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished">Text:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished">Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Unifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation type="unfinished">Línia de puntets</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutre</translation>
</message>
@@ -473,85 +481,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished">Terra per protecció personal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished">Terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Aspecte del conductor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Aparença</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -2938,26 +2936,28 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -6158,19 +6158,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_cs.ts
===================================================================
--- trunk/lang/qet_cs.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_cs.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
<context>
<name>AboutQET</name>
<message>
@@ -338,23 +338,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Texty vodičů</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Chcete nový text použít na všechny
-vodiče s tímto potenciálem?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti vodiče</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Upravit vlastnosti více vodičů</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -364,7 +358,7 @@
<translation>Upravit vlastnosti vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Použít vlastnosti na všechny vodiče o tomto potenciálu</translation>
</message>
@@ -375,7 +369,7 @@
<translation>Upravit vlastnosti vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti více vodičů</translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Typ vodiče</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Několik vedení</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Text:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Svisle</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Vodorovně</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Jednopólově</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Velikost textu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Viditelný text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Zapnout volbu text podle potenciálu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>Fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Plná čára</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Tečkovaná čára</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Čárky a tečky</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>uzemnění</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>nulový</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Formulář</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Velikost:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Viditelný</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Zobrazit jeden text potenciálu na list.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Natočení textů vodičů:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Číslo fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Nulový</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Ochranný vodič nulový</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Země</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Vzhled vodiče</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Styl vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Barva vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Vzhled</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Barva: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Styl:</translation>
</message>
@@ -2934,28 +2931,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Označení potenciálu</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Označení elektrického potenciálu nejsou totožné.
-Použít označení na všechny tyto vodiče?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation>: Je toto</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> krát.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Upravit vlastnosti více vodičů</translation>
</message>
</context>
<context>
@@ -6161,19 +6159,19 @@
<translation>Upravit údaje o prvku: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Upravit křížový odkaz</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti vodiče</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti více vodičů</translation>
Modified: trunk/lang/qet_de.ts
===================================================================
--- trunk/lang/qet_de.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_de.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -341,23 +341,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Leiterbeschriftung</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Möchten Sie den neuen Text auf alle
-Verbindungen dieses Potenzials anwenden?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Leitereigenschaften ändern</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Eigenschaften von mehreren Leitern ändern</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -367,7 +361,7 @@
<translation>Leitereigenschaften bearbeiten</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Eigenschaften auf alle Verbindungen dieses Potenzials übertragen</translation>
</message>
@@ -378,7 +372,7 @@
<translation>Leitereigenschaften ändern</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Eigenschaften von mehreren Leitern ändern</translation>
@@ -392,169 +386,172 @@
<translation>Form</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Leitertyp</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Mehrpolig</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Text:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Nur eine Potenzialbeschriftung je Folie anzeigen.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertikal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Einpolig</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>Erde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>Neutralleiter</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Größe: </translation>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
+ <source>Taille du texte</source>
+ <translation>Textgröße</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Sichtbar</translation>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
- <source>Taille du texte</source>
- <translation>Textgröße</translation>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Sichtbarer Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Option "ein Text je Potenzial" aktivieren</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Orientierung der Leiterbeschriftung: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Phasenanzahl</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutralleiter</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>PEN-Leiter (protective earth neutral)</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Erde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Leiterdarstellung</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Leiterstil</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Leiterfarbe</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Darstellung</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Farbe:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Stil:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Durchgezogene Linie</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Gestrichelte Linie</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Strichpunkt-Linie</translation>
@@ -2937,28 +2934,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Potenzialbeschriftung</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Die Texte von diesem Potenzial unterscheiden sich voneinander. Möchten Sie einen neuen Text auf alle
-Verbindungen dieses Potenzials anwenden?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : ist vorhanden </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> mal.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Eigenschaften von mehreren Leitern ändern</translation>
</message>
</context>
<context>
@@ -6145,19 +6143,19 @@
<translation>Ändern der Informationen vom Bauteil: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Querverweise bearbeiten</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Leitereigenschaften ändern</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Eigenschaften von mehreren Leitern ändern</translation>
Modified: trunk/lang/qet_el.ts
===================================================================
--- trunk/lang/qet_el.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_el.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,20 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Κείμενα αγωγών</translation>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Θέλετε να εφαρμοστεί το νέο κείμενο
-σε όλους τους αγωγούς αυτού του δυναμικού;</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -364,7 +358,7 @@
<translation>Επεξεργασία των ιδιοτήτων του αγωγού</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Εφαρμογή ιδιοτήτων σε όλους τους αγωγούς αυτού του δυναμικού</translation>
</message>
@@ -375,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Τύπος αγωγού</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Πολυγραμμικό</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Κείμενο:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Κείμενο</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Κάθετα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Οριζόντια</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Μονογραμμικό</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>μέγεθος κειμένου</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Τύπος</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Ορατό κείμενο</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Ενεργοποιεί την επιλογή, ένα κείμενο ανά δυναμικό</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>φάση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Συνεχόμενη</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Διακεκομμένη</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Παύλες και τελείες</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>γείωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>ουδέτερος</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Φόρμα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Μέγεθος: </translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Ορατό</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Προβολή ενός κειμένου δυναμικού ανά σελίδα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Γωνία του κειμένου των αγωγών</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Αριθμός φάσεων</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Ουδέτερος</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Φάση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Ουδετέρωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Γείωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>ΕτικέταΚειμένου</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Εμφάνιση του αγωγού</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Στυλ αγωγού</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Χρώμα αγωγού</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Εμφάνιση</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Χρώμα:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Τεχνοτροπία: </translation>
</message>
@@ -2939,28 +2936,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Κείμενα δυναμικού</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Τα κείμενα αυτού του ηλεκτρικού δυναμικού δεν είναι ίδια.
-Εφαρμογή ενός κειμένου σε όλη την ομάδα αγωγών;</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : αυτό υπάρχει </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> φορές.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6154,19 +6152,19 @@
<translation>Επεξεργασία των πληροφοριών του στοιχείου: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Επεξεργασία διαταυρούμενων αναφορών</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_en.qm
===================================================================
(Binary files differ)
Modified: trunk/lang/qet_en.ts
===================================================================
--- trunk/lang/qet_en.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_en.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="en">
+<TS version="2.1" language="en">
<context>
<name>AboutQET</name>
<message>
@@ -338,23 +338,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Conductors text</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Do you want to apply the new text
-to all the conductors of this potential?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Edit conductor properties</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation>Edit the properties of several conductors</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -364,7 +358,7 @@
<translation>Edit conductor properties</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Apply properties to all conductors of this potential</translation>
</message>
@@ -375,7 +369,7 @@
<translation>Edit conductor properties</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Edit the properties of several conductors</translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Conductor Type</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multiline</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation>Text size :</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation>Voltage / Protocol :</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Text:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation>Function :</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Single line</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Text size</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation>Type</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Visible text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Activate the option text by potential</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Solid line</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Dashed line</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Dots and dashes</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>ground</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutral</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Form</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Size :</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Visible</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Show one text per folio potential.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Angle of conductor labels:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Number of phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Protective Earth Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Ground</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Conductor appearance</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Conductor style</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Conductor color</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation>Appearance</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Style:</translation>
</message>
@@ -2935,28 +2932,30 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Potential texts</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation>Select the electric potential</translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>The texts of the electric potential are not identical.
-Apply a text to all of these drivers?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation>You try to link two different potentials together.
+Please select the properties to be applied to new potential.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation>: Is this</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation>The potential with wire %1 of this number is %2 times</translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation>correct.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation>Edit the properties of several conductors</translation>
</message>
</context>
<context>
@@ -6150,19 +6149,19 @@
<translation>Edit information of the element : %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Edit the cross reference</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Edit conductor properties</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Edit the properties of several conductors</translation>
Modified: trunk/lang/qet_es.ts
===================================================================
--- trunk/lang/qet_es.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_es.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -340,19 +340,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Texto de los conductores</translation>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>¿Quiere aplicar el nuevo texto a los conductores de este potencial?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -365,7 +360,7 @@
<translation>Edita las propiedades de un conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Aplica las propiedades a todos los conductores de este potencial</translation>
</message>
@@ -376,7 +371,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -385,87 +380,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Tipo de conductor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multilínea</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Texto:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Monolínea</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Tamaño del texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Texto visible</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Activa la opción de un texto por potencial</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Línea continua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Línea en puntos</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Líneas y puntos</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>tierra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -476,86 +484,76 @@
<translation>Forma</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Tamaño:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Visible</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Muestra un texto de potencial por folio. </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotación de texto del conductor:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Número de fases</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Protección tierra neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translatorcomment>Protección tierra neutral</translatorcomment>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Tierra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Aspecto del conductor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Estilo del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Color del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Apariencia</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Estilo:</translation>
</message>
@@ -2936,28 +2934,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Textos de potencial</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Los textos del potencial eléctrico no son idénticos.
-¿Aplicar un texto a cada uno de estos conductores?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation>: está presente</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation>valor.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6157,19 +6156,19 @@
<translation>Modifica las propiedades del elemento : %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Editar la referencia cruzada</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_hr.ts
===================================================================
--- trunk/lang/qet_hr.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_hr.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation type="unfinished">Uredi svojstva vodiča</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished"></translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -383,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Vrsta vodiča</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Višefazno</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished">Tekst:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished">Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Jednofazno</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>faza</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation type="unfinished">Isprekidane linije</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>uzemljenje</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>nula</translation>
</message>
@@ -473,85 +481,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Izgled vodiča</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Izgled</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Boje:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -2921,26 +2919,28 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -6140,19 +6140,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_it.ts
===================================================================
--- trunk/lang/qet_it.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_it.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,23 +338,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Testi dei conduttori</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Applicare il nuovo testo a tutti
-i conduttori di questo potenziale?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di un conduttore</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Modifica le proprietà di più conduttori</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -364,7 +358,7 @@
<translation>Modifica delle proprietà di un conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Applicare le proprietà a tutti i conduttori connessi a questo potenziale</translation>
</message>
@@ -375,7 +369,7 @@
<translation>Modifica le proprietà di un solo conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di più conduttori</translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Tipo di conduttore</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multifilare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Testo:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Testo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Verticale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Orizzontale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Unifilare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Dimensione del testo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Tipo</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Testo visibile</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>abilitare l'opzione di un solo testo per potenziale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Linea continua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Linea tratteggiata</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Punto e linea</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Modulo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Dimensione:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Visibile</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Mostra un solo testo per ogni potenziale nella pagina </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotazione del testo del conduttore:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Numero di fasi</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fasi</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Neutro con funzione di terra (sistema TN-C)</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Etichetta</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Aspetto del conduttore</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Stile del conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Colore del conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Aspetto</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Colore:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Stile:</translation>
</message>
@@ -2934,28 +2931,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Testo dei conduttori</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>I testi associati a questo potenziale non sono tutti uguali.
-Applicare un testo all'insieme dei conduttori?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : è presente </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> volte.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Modifica le proprietà di più conduttori</translation>
</message>
</context>
<context>
@@ -6149,19 +6147,19 @@
<translation>modificare le informazioni dell'elemento: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Modificare i riferimenti incrociati</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di un conduttore</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di più conduttori</translation>
Modified: trunk/lang/qet_nl.ts
===================================================================
--- trunk/lang/qet_nl.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_nl.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Geleider tekst</translation>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Wil je de nieuwe tekst toe passen op alle geleiders met het zelfde potentiaal?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation>Bewerk de eigenschappen van een geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Toepassen van deze eigenschappen op alle gelieders van hetzelfde potentiaal</translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -383,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Soort geleider</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Meerdere geleiders</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Tekst:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertikaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Horizontaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Enkele geleiders</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>tekst kleiner</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Type</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>zichtbare tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>activeer potentiaal tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Dichte lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Streep lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Punten en strepen lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>Nul</translation>
</message>
@@ -473,85 +481,75 @@
<translation>Vorm</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Grootte:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Zichtbaar</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Toon tekst per pagina .</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotatie van tekst van geleider :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>fase nummer</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutraal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Aarde en Nul samen</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>TekstLabel</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Geleider weergave</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Type Geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Kleur Geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Verschijning</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Kleur:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Stijl:</translation>
</message>
@@ -2925,28 +2923,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Geleidernummers</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>De nummering van deze geleiders zijn niet gelijk.
-Wilt u de tekst gelijk maken voor alle geleiders met hezelfde potentiaal?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation>: Dit is </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> keer.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6138,19 +6137,19 @@
<translation>Wijzig de informatie van element : %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_pl.ts
===================================================================
--- trunk/lang/qet_pl.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_pl.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,23 +338,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Oznaczenia przewodów</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Czy chcesz zastosować nowe oznaczenie
-dla przewodów o tym samym potencjale?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>zmiana właściwości przewodu</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">zmiana właściwości kilku przewodów</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -364,7 +358,7 @@
<translation>Edycja właściwości przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Zastosuj właściwości do wszystkich połączeń tego potencjału</translation>
</message>
@@ -375,7 +369,7 @@
<translation>zmiana właściwości jednego przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>zmiana właściwości kilku przewodów</translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Typ przewodu</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Wieloliniowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Tekst:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Poziomo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Pionowo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Jednoliniowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Rozmiar tekstu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Typ</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Tekst widoczny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Aktywacja opcji jednego tekstu dla potencjału</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>fazowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Ciągła</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Kreskowa</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Kreskowo-kropkowa</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>ochronny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutralny</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Forma</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Rozmiar:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Widoczny</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Pokaż jeden tekst dla potencjału w arkuszu. </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Obrót oznaczenia przewodu:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Ilość przewodów fazowych</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutralny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Fazowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Ochronno-neutralny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Ochronny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Wygląd przewodu</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Typ przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Kolor przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Wygląd</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Kolor: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Typ:</translation>
</message>
@@ -2927,28 +2924,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Oznaczenia dla potencjału</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Oznaczenia dla potencjału elektrycznego nie są identyczne.
-Jakie oznaczenia przewodów chcesz zastosować?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : występuje </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation>- krotnie.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">zmiana właściwości kilku przewodów</translation>
</message>
</context>
<context>
@@ -6154,19 +6152,19 @@
<translation>Zmień informacje dla elementu: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Edytuj odsyłacz</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Zmiana właściwości przewodu</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>zmiana właściwości kilku przewodów</translation>
Modified: trunk/lang/qet_pt.ts
===================================================================
--- trunk/lang/qet_pt.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_pt.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation type="unfinished">Editar as propriedades do condutor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished"></translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -383,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Tipo de condutor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished">Texto:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished">Texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Unifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation type="unfinished">Traço tracejado</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -473,85 +481,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Aparência do condutor</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Aparência</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Côr:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -2920,26 +2918,28 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -6133,19 +6133,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_ro.ts
===================================================================
--- trunk/lang/qet_ro.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_ro.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,20 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translation>Text conductori</translation>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Doriți să aplicați noul text
-tuturor conductorilor cu același potențial ?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -364,7 +358,7 @@
<translation>Editați proprietățile unui conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Aplică proprietățile tuturor conductorilor cu acest potențial</translation>
</message>
@@ -375,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -384,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Tipul conductorului</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Multifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Text :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Orizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Monofilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Dimensiune text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Tip</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Text vizibil</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Activează opțiunea un text pe potențial</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>faza</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Linie continuă</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Linie punctată</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Puncte și linii</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>împământare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation>nul</translation>
</message>
@@ -474,85 +481,75 @@
<translation>Formular</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Dimensiune :</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Vizibil</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Afișează un text pe potențial pe folio.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotația textului conductorului :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Număr de faze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Neutru</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Faze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation>Împământare neutră de protecție</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Împământare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation>Text etichetă</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Aspectul conductorului</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Stil conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Culoare conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Aspect</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Culoare :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Stil :</translation>
</message>
@@ -2925,28 +2922,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translation>Texte potențial</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Textele potențialului electric nu sunt identice.
-Se aplică un text tutror acestor driveri?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translation> : este prezent </translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation> corect.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6147,19 +6145,19 @@
<translation>Modifică informațiile elementului : %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_ru.ts
===================================================================
--- trunk/lang/qet_ru.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_ru.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -353,24 +353,17 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
- <translatorcomment>context dependent</translatorcomment>
- <translation>Текст проводника</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation>Вы хотите присвоить новый текст
-всем проводникам этого потенциала?</translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Редактировать свойства проводника</translation>
</message>
+ <message>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Редактировать свойства нескольких проводников</translation>
+ </message>
</context>
<context>
<name>ConductorPropertiesDialog</name>
@@ -380,7 +373,7 @@
<translation>Правка свойств проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation>Применить свойства ко всем проводникам этого потенциала</translation>
</message>
@@ -391,7 +384,7 @@
<translation>Редактировать свойства проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Редактировать свойства нескольких проводников</translation>
@@ -400,87 +393,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation>Тип проводника</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation>Многолинейный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation>Текст:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation>Текст</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation>Вертикальный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation>Горизонтальный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation>Однолинейный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation>Размер текста</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished">Тип</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation>Видимый текст</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation>Активировать опциональный текст потенциала</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation>фаза</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Сплошная линия</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Пунктирная линия</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Точки и тире</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation>заземление</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translatorcomment>нейтраль?</translatorcomment>
<translation>нейтраль</translation>
@@ -492,89 +498,79 @@
<translation>Форма</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation>Размер:</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation>Видимый</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Показывать для потенциала один текст на страницу.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translatorcomment>context dependent</translatorcomment>
<translation>Угол надписи проводника:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation>Номер фазы</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation>Нейтраль</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation>Фаза</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translatorcomment>dont know what is this</translatorcomment>
<translation>Глухо заземлённая нейтраль</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translatorcomment>?</translatorcomment>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation>Заземление</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translatorcomment>context dependent</translatorcomment>
<translation>Текстовая метка</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
- <translation>Представление проводника</translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
<source>Style du conducteur</source>
<translation>Стиль проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
<source>Couleur du conducteur</source>
<translation>Цвет проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
+ <translation type="unfinished">Внешний вид</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation>Цвет:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation>Стиль:</translation>
</message>
@@ -2979,30 +2975,29 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
- <translatorcomment>??</translatorcomment>
- <translation>Тексты потенциалов</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
- <translation>Тексты электрических потенциалов не совпадают.
-Применить текст ко всем проводникам?</translation>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
- <translatorcomment>??????????</translatorcomment>
- <translation type="unfinished">: это</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
- <translation>верно.</translation>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
+ <translation type="unfinished">Редактировать свойства нескольких проводников</translation>
</message>
</context>
<context>
@@ -6213,19 +6208,19 @@
<translation>Редактировать информацию элемента: %1</translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation>Редактировать перекрестную ссылку</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Редактировать свойства проводника</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Редактировать свойства нескольких проводников</translation>
Modified: trunk/lang/qet_sl.ts
===================================================================
--- trunk/lang/qet_sl.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_sl.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished"></translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -383,87 +378,100 @@
<context>
<name>ConductorPropertiesWidget</name>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
+ <source>Multifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
- <source>Multifilaire</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
@@ -473,85 +481,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
+ <source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
- <source>Style du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
+ <source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
- <source>Couleur du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -2920,26 +2918,28 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -6137,19 +6137,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_zh.ts
===================================================================
--- trunk/lang/qet_zh.ts 2015-08-31 22:22:31 UTC (rev 4185)
+++ trunk/lang/qet_zh.ts 2015-08-31 22:59:17 UTC (rev 4186)
@@ -338,19 +338,14 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1408"/>
- <source>Textes de conducteurs</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1426"/>
+ <source>Modifier les propriétés d'un conducteur</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1409"/>
- <source>Voulez-vous appliquer le nouveau texte
-à l'ensemble des conducteurs de ce potentiel ?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1428"/>
- <source>Modifier les propriétés d'un conducteur</source>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1430"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
@@ -363,7 +358,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.ui" line="33"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.ui" line="20"/>
<source>Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel</source>
<translation type="unfinished"></translation>
</message>
@@ -374,7 +369,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="76"/>
+ <location filename="../sources/ui/conductorpropertiesdialog.cpp" line="75"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -388,169 +383,172 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="20"/>
- <source>Type de conducteur</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="26"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="30"/>
<source>Multifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="53"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="86"/>
<source>Texte :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="100"/>
<source>Texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
- <source>Taille :</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="77"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="54"/>
<source>Taille du texte</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="90"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
<source>Texte visible</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
- <source>Visible</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="107"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="127"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="110"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="130"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="119"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="161"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="141"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="24"/>
+ <source>Type</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="44"/>
+ <source>Taille du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="79"/>
+ <source>Tension / Protocole :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="93"/>
+ <source>Fonction :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="151"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="156"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="176"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="195"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="239"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="199"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="243"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="211"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="215"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="214"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="218"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="225"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="229"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="232"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="252"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="256"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="255"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="259"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="266"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="265"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="269"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="280"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="301"/>
- <source>Apparence du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="319"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="329"/>
+ <source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="307"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="343"/>
- <source>Style du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="309"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="336"/>
+ <source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="314"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="324"/>
- <source>Couleur du conducteur</source>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="303"/>
+ <source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="312"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="346"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="322"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="175"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="181"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="176"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="182"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="177"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
@@ -2920,26 +2918,28 @@
</message>
</context>
<context>
- <name>PotentialTextsDialog</name>
+ <name>PotentialSelectorDialog</name>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="14"/>
- <source>Textes de potentiel</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="14"/>
+ <source>Sélectionner le potentiel éléctrique</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.ui" line="22"/>
- <source>Les textes de ce potentiel électrique ne sont pas identiques.
-Appliquer un texte à l'ensemble de ces conducteurs?</source>
+ <location filename="../sources/ui/potentialselectordialog.ui" line="38"/>
+ <source>Vous tentez de lier deux potentiels différents ensemble.
+Veuillez choisir les propriétées à appliquer au nouveau potentiel.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> : est présent </source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="156"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="157"/>
+ <source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialtextsdialog.cpp" line="68"/>
- <source> fois.</source>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
+ <source>Modifier les propriétés de plusieurs conducteurs</source>
+ <comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
</context>
@@ -6107,19 +6107,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/undocommand/linkelementcommand.cpp" line="35"/>
+ <location filename="../sources/undocommand/linkelementcommand.cpp" line="37"/>
<source>Éditer les référence croisé</source>
<comment>edite the cross reference</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="94"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="98"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>