[qet] qet/qet: [4850] Update *TS files, French and English translations |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4850
Author: scorpio810
Date: 2017-01-15 20:36:40 +0100 (Sun, 15 Jan 2017)
Log Message:
-----------
Update *TS files, French and English translations
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_da.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_fr.qm
trunk/lang/qet_fr.ts
trunk/lang/qet_hr.ts
trunk/lang/qet_hu.ts
trunk/lang/qet_it.ts
trunk/lang/qet_nl.ts
trunk/lang/qet_pl.ts
trunk/lang/qet_pt.ts
trunk/lang/qet_pt_br.ts
trunk/lang/qet_ro.ts
trunk/lang/qet_ru.ts
trunk/lang/qet_sl.ts
trunk/lang/qet_sr.ts
trunk/lang/qet_zh.ts
Modified: trunk/lang/qet_ar.ts
===================================================================
--- trunk/lang/qet_ar.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_ar.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -517,13 +517,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>تغيير خاصيات موصلات متعددة</translation>
@@ -587,17 +587,17 @@
<translation>نص</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>عمودي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>أفقي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>أحادي السلك</translation>
</message>
@@ -617,17 +617,17 @@
<translation>نص ظاهر</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>تفعيل خيار نص لكلّ كمون</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>طور</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translatorcomment>نمط الموصل: خط مستمرّ</translatorcomment>
@@ -634,7 +634,7 @@
<translation>خط مستمرّ</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translatorcomment>نمط الموصل: خط مُتقطّع</translatorcomment>
@@ -641,7 +641,7 @@
<translation>خط متقطع</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translatorcomment>نمط الموصل : نقاط و خطوط</translatorcomment>
@@ -648,12 +648,12 @@
<translation>خطوط و نقاط</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>أرضي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>محايد</translation>
</message>
@@ -663,80 +663,85 @@
<translation>شكل</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>عرض نص كمون لكلّ صفحة.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>دوران نص الموصل:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>عدد الأطوار </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>محايد</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>طور</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>حماية الأرضي -المحايد</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>قلم</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>أرضي</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>علامة نصيّة</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>نوع الموصل</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>مقاس :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>لون الموصل</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>المظهر</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>اللون:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>نمط :</translation>
</message>
@@ -1352,12 +1357,12 @@
<translation>موضع : %1</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>إيجاد في اللوحة</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>تحرير العنصر</translation>
</message>
@@ -1365,7 +1370,7 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translatorcomment>عنوان النافذة</translatorcomment>
@@ -1372,12 +1377,12 @@
<translation>تحرير معلومات المؤلف</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>يمكنكم استعمال هذا الحقل الحر لذكر المؤلفين , العنصر, ترخيصه أو أي معلومة أخرى ترونها ضرورية .</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translatorcomment>عنوان النافذة</translatorcomment>
@@ -1384,13 +1389,13 @@
<translation>تحرير الأسماء</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>يمكنكم تعيين إسم العنصر بلغات متعدّدة .</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translatorcomment>رسالة خطأ</translatorcomment>
@@ -2145,6 +2150,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">علامة نصيّة</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2381,37 +2404,37 @@
<translation>هذا مشروع QElectrotech,بمعنى ملفا بامتداد .qet يحتوي على عدّة صفحات ويتضمّن كذلك العناصر و كذلك إطارات التعريف المستخدمة في هذه الصفحات .</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>صفحة بدون عنوان</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>نماذج إطار التعريف</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>نموذج "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>هذا نموذج لإطار تعريف , والممكن تطبيقه للصفحة .</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [غير مستعمل قي المخطط]</translation>
</message>
@@ -3129,17 +3152,25 @@
<translation>أنت تُحاول توصيل نُقطتين معا ذوات كُمون مُختلف .</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>الكمون برقم السلك رقم %1 موجود %2 مرّة </translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>تغيير خاصيات عدّة موصلات</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3198,16 +3229,13 @@
<translation>صفحة ترقيم آلي</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>بدون إسم</translation>
</message>
@@ -3217,13 +3245,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>اسم الترقيم الجديد</translation>
</message>
@@ -3386,222 +3414,227 @@
<translation>RTL</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>علامة</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>تعليق</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>تعيين</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>مُصنّع</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>مرجع مُصنّع</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>كتلة إضافية 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>كتلة إضافية 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>مرجع مُصنّع الآلة</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>تحديد موقع</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>وظيفة</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>إطارات تعريف QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>إطارات تعريف المستعمل</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>مخطط</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>كهربائي</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>إعدادات برنامج QElectrotech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>تحميل ...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>تحميل ...ايقونة systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&إنهاء</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&حجب</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>ا&سترجاع</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&حجب كلّ محرري المخططات</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&استرجاع كل محرري المخطط</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&احجب كلّ محرري العنصر</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&استرجع كلّ محرري العنصر</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&احجب كلّ محرري إطار التعريف</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&استرجع كلّ محرري إطار التعريف</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&محرر تخطييط جديد</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&محرّر عنصر جديد</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>إغلاق تطبيق QElectrotech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>خفض QElectrotech في systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>إسترجاع QElectrotech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>محرري المخططات</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>محرري العناصر</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>محرري إطار التعريف</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>إستعمال :</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3608,7 +3641,7 @@
<translation>[خيارات] [ rملف]...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3624,7 +3657,7 @@
- الترخيص ......................... عرض الترخيص</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR عرّف مجلد صنف العناصر
@@ -3631,19 +3664,19 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR عرّف مجلد مجموعة نماذج إطارات التعريف</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR عرّف مجلد الإعدادات</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR عرّف المجلد المحتوي على ملفات اللغة</translation>
@@ -4382,7 +4415,7 @@
<translation>مشاريع QElectroTech (*.qet);ملفات XML (*.xml);;كلّ الملفات (*)</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>تنشيط المشروع « %1 »</translation>
</message>
@@ -4434,37 +4467,37 @@
<translation>يبدو أنّ الملف %1 ليس بملف مشروع QElectrotech. ;وبالتالي لا يمكن فتحه.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>تحرير العنصر</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>تحرير الحقل النصّي</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>تحرير الصورة</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>تحرير الموصل</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>تحرير الكائن المُحدّد</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>خطأ</translation>
@@ -5402,54 +5435,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>مشروع « %1 »</translation>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>مشروع %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>مشروع بدون عنوان</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [قراءة فقط]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [مُتغيّر]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>حدث خطأ أثناء الإدماج.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>قائمة الصفحات</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>تنبيه</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5457,7 +5490,7 @@
ما تُريد فعله ؟</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>فتح المشروع الجاري ....</b></translation>
</message>
@@ -5818,7 +5851,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>: تحذير حّفظ العنصر بإصدار لاحق من QElectrotech.</translation>
</message>
@@ -6445,13 +6478,13 @@
<translation>تحرير المراجع المتقاطعة</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>تغيير خاصيات الموصل</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>تغيير خاصيات عدّة موصلات</translation>
Modified: trunk/lang/qet_be.ts
===================================================================
--- trunk/lang/qet_be.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_be.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -512,13 +512,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Wijzig de eigenschappen van meerdere geleiders</translation>
@@ -582,17 +582,17 @@
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertikaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Enkele geleider</translation>
</message>
@@ -612,40 +612,40 @@
<translation>Tekst zichtbaar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Volle lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>Nul</translation>
</message>
@@ -655,80 +655,85 @@
<translation>Vorm</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotatie van de geleider tekst :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Aantal fase geleideers</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Nul geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Aarde en Nul samen</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Aarding</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Geleiders</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Geleider stijl</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Groote:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Geleider kleur</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Weergave</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Kleur:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Stijl:</translation>
</message>
@@ -1340,12 +1345,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Vind terug in verzameliing</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Bewerken element</translation>
</message>
@@ -1353,30 +1358,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Bewerk auteur informatie</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>U kunt deze ruimte gebruiken om de auteurs van het element, de licentie, of enige andere informatie die u van belang acht te vermelden.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>U mag de elementnaam ingeven voor diverse talen.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Dit XML document is geen element definitie.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Bewerkende namen</translation>
@@ -2121,6 +2126,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2366,37 +2389,37 @@
<translation>Dit is een QElectroTech project, een bestandsnaam met de extensie qet bevat meerdere schema baldzijden.Het bevat ook schema elementen en titelhoeken welke gebruikt worden op de verschillende schema bladzijden.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Schema/bladzijde zonder titel</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Titel blok sjablonen</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>"%1" sjabloon</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Dit is een titelhoek welke u kan toepassen op een schema bladzijde.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [niet gebruikt in dit project]</translation>
</message>
@@ -3118,17 +3141,25 @@
Selecteer de eigenschappen die moeten worden toegepast op een nieuw potentiaal.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Het potentiaal met draad nr %1 bestaat reeds %2 maal</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Wijzig de eigenschappen van meerdere geleiders</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3187,16 +3218,13 @@
<translation>Automatisch bladzijde nummering</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Zonder naam</translation>
</message>
@@ -3206,13 +3234,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Naam van de nieuwe nummering</translation>
</message>
@@ -3351,100 +3379,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Afsluiten</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Verbergen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Herstellen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Verberg alle bewerkingen van het schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Herstellen alle bewerkingen van het schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Verberg alle bewerkingen van dit element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Herstel alle bewerkingen van dit element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Verberg alle bewerkingen van dit titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Herstel alle bewerkingen van dit titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nieuwe uitgever van het schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nieuwe uitgever van het element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Sluit QElectroTech programma</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Verklein QElectroTech naar systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Vergroot QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Bewerk de schema's</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Bewerk het element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Bewerk het titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Gebruik: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3461,7 +3489,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3470,32 +3498,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Fabrikant</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referentie fabrikant</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Hulpblok 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Hulpblok 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Fabrikant machine referentie</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --gemeenschappelijke-map voor elementen-=MAP definieer de elementen collectie map
@@ -3502,13 +3530,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --gemeenschappelijke-tbt-map=MAP Definieer de titel blok sjablonen collectie map</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-map=MAP Definieer configuratie map
@@ -3515,7 +3543,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --ltaal map=MAP Definieer de taalbestanden map</translation>
@@ -3545,98 +3573,103 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etiket</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Commentaar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Aanwijzen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Plaats</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Functie</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET titel blok sjablonen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Gebruiker titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Electrisch</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configureer QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Laden ... </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Laden... Systray icon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4394,42 +4427,42 @@
<translation>Open het bestand als alleen lezen</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Element bewerken</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Tekst veld bewerken</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Afbeelding bewerken</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Bewerk geleiders</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Het geselecteerde object bewerken</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Activeer project " %1 "</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Fout</translation>
@@ -5388,13 +5421,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Project " %1 "</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5402,48 +5429,54 @@
Wat wilt u doen?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b> Openen van het project ... </ b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Waarschuwing</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projectbestandsnaam %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Naamloos project</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [alleen lezen]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [gewijzigd]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Fout bij invoegen van het sjabloon.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Lijst van schema bladzijden</translation>
</message>
@@ -5822,7 +5855,7 @@
<translation>Het tekstbestand met de GNU / GPL licentie bestaat, maar kan niet worden geopend - goed, maar hoe dan ook, u kent deze toch van buiten (uit het hoofd)?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Waarschuwing: het element is bewaard in een nieuwere versie van QElectroTech.</translation>
</message>
@@ -6408,13 +6441,13 @@
<translation>Kruisverwijzing bewerken</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_ca.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modificar les propietats d'un conductor</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modificar les propietats de diversos conductors</translation>
@@ -581,17 +581,17 @@
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horitzontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Unifilar</translation>
</message>
@@ -611,40 +611,40 @@
<translation>Text visible</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>Activar l'opció d'un text per potencial</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Línia contínua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Línia de puntets</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Línies i punts</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutre</translation>
</message>
@@ -654,80 +654,85 @@
<translation>Formulari</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Mostrar un text de potencial per full.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotació de text del conductor:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Nombre de fases</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutre</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Terra per protecció personal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Etiqueta de text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Estil del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>mida:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Color del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Aparença</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Estil:</translation>
</message>
@@ -976,13 +981,17 @@
</message>
<message>
<location filename="../sources/autoNum/ui/dialogautonum.cpp" line="68"/>
- <source>Voulez-vous vraiment supprimer les annotations conducteurs de: %1 ?</source>
- <translation>Vol eliminar les anotacions dels conductors: %1?</translation>
+ <source>Voulez-vous vraiment supprimer les annotations conducteurs de :
+
+%1 ?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/autoNum/ui/dialogautonum.cpp" line="101"/>
- <source>Voulez-vous vraiment annoter les conducteurs de: %1 ?</source>
- <translation>Vol anotar els conductors de: %1?</translation>
+ <source>Voulez-vous vraiment annoter les conducteurs de :
+
+%1 ?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/autoNum/ui/dialogautonum.cpp" line="99"/>
@@ -1287,46 +1296,56 @@
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="265"/>
- <source>Nom: %1</source>
- <translation>Nom: %1</translation>
+ <source>Nom : %1
+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="268"/>
- <source>Folio: %1</source>
- <translation>Full: %1</translation>
+ <source>Folio : %1
+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="270"/>
- <source>Position: %1</source>
- <translation>Posició: %1</translation>
+ <source>Position : %1
+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="271"/>
- <source>Dimensions : %1*%2</source>
- <translation>Mida: %1*%2</translation>
+ <source>Dimensions : %1*%2
+</source>
+ <translation type="unfinished">Mida: %1*%2
+</translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="272"/>
- <source>Bornes: %1</source>
- <translation>Borns: %1</translation>
+ <source>Bornes : %1
+</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="273"/>
- <source>Champs de texte : %1</source>
- <translation>Camps de text: %1</translation>
+ <source>Champs de texte : %1
+</source>
+ <translation type="unfinished">Camps de text: %1
+</translation>
</message>
<message>
<location filename="../sources/ui/elementpropertieswidget.cpp" line="276"/>
- <source>Emplacement : %1</source>
- <translation>Ubicació: %1</translation>
+ <source>Emplacement : %1
+</source>
+ <translation type="unfinished">Ubicació: %1
+</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Cercar al panell</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Modificar el símbol</translation>
</message>
@@ -1334,30 +1353,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Canviar les dades de l'autor</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Pot fer servir aquest camp lliure per indicar els autors del símbol, la llicència, o qualsevol informació que consideri útil.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Modificar els noms</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Pot indicar el nom del símbol en diferentes llengües.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Aquest document XML no conté la definició d'un símbol.</translation>
@@ -1564,9 +1583,10 @@
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="333"/>
- <source>Êtes-vous sûr de vouloir supprimer cet élément ?</source>
+ <source>Êtes-vous sûr de vouloir supprimer cet élément ?
+</source>
<comment>message box content</comment>
- <translation>Està segur que desitja eliminar aquest símbol?</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="344"/>
@@ -1611,6 +1631,22 @@
<source>Le dossier %1 contient</source>
<translation>La carpeta %1 conté</translation>
</message>
+ <message numerus="yes">
+ <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="504"/>
+ <source>%n élément(s), répartie(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="505"/>
+ <source>dans %n dossier(s).</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="506"/>
<source>Chemin de la collection : %1</source>
@@ -2088,6 +2124,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Etiqueta de text</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2333,14 +2387,14 @@
<translation>Això és un projecte QElectroTech, és a dir, un arxiu amb extensió .qet integrat per diversos fulls. També incorpora els elements i models utilitzats en aquests fulls.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Full sense títol</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translatorcomment>etiqueta d'un diagrama al panell; %1 és el foli i %2 és el títol del diagrama</translatorcomment>
@@ -2347,12 +2401,12 @@
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Models de caixetí</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translatorcomment>s'usa per mostrar una plantilla de bloc de títol</translatorcomment>
@@ -2359,13 +2413,13 @@
<translation>Model "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Això és un model de caixetí de QElectroTech, que es pot aplicar a un full.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [no usat al projecte]</translation>
</message>
@@ -3087,17 +3141,25 @@
Per favor, seleccioni les propietats que s'aplicaran al nou potencial.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>El potencial amb nombre de fil %1 està present %2 vegades</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modificar les propietats de diversos conductors</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3156,16 +3218,13 @@
<translation>Numeració del full automàtic</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Sense nom</translation>
</message>
@@ -3175,13 +3234,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Nom de la nova numeració</translation>
</message>
@@ -3344,222 +3403,227 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Comentari</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Designació</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Fabricant</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referència del fabricant</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Bloc auxiliar 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Bloc auxiliar 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Referència del fabricant de la màquina</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Localització</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funció</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Caixetins QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Caixetins personals</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elèctric</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Carregant...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Carregant... icona de la safata del sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Sortir</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Amagar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Restaurar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>Amagar tots els editors d'&esquemes</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>Restaurar tots els editors d'&esquemes</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Amagar tots els editors de símbols</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Restaurar tots els editors de símbols</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Amagar tots els editors de &caixetins</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Restaurar tots els editors de &caixetins</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nou editor d'esquemes</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nou editor de símbols</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Tancar el programa QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimitzar QEletectroTech a la safata del sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restaurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editor d'esquemes</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editors de símbols</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Editors de caixetins</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Ús:</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3568,7 +3632,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3585,19 +3649,19 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Definir la carpeta de la col·lecció de símbols</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definir la carpeta de la col·lecció de caixetins</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definir la carpeta de configuració
@@ -3604,7 +3668,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Definir la carpeta amb els fitxers de llengua</translation>
@@ -4137,12 +4201,12 @@
<translation>Obertura en mode només lectura</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Activar el projecte « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Error</translation>
@@ -4401,31 +4465,31 @@
<translation>Sembla que el fitxer %1 no conté un projecte QElectroTech. Per tant no pot ésser obert.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Editar l'element</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Editar el camp de text</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Editar la imatge</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Editar el conductor</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Editar l'objecte seleccionat</translation>
@@ -5351,31 +5415,37 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projecte %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projecte sense títol</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [només lectura]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [modificat]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5383,30 +5453,24 @@
Què vol fer?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projecte « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>S'ha produït un error mentre s'integrava el model.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Llista de fulls</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Avís</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Obrir el projecte actual...</b></translation>
</message>
@@ -5768,7 +5832,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Avís: el símbol ha estat desat amb una versió posterior del QElectroTech.</translation>
</message>
@@ -6367,13 +6431,13 @@
<translation>Edita la referència creuada</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modificar les propietats d'un conductor</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modificar les propietats de diversos conductors</translation>
Modified: trunk/lang/qet_cs.ts
===================================================================
--- trunk/lang/qet_cs.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_cs.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -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>
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti více vodičů</translation>
@@ -576,17 +576,17 @@
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Svisle</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Vodorovně</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Jednopólově</translation>
</message>
@@ -606,40 +606,40 @@
<translation>Viditelný text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>Fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Plná čára</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>uzemnění</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>nulový</translation>
</message>
@@ -649,80 +649,85 @@
<translation>Formulář</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Natočení textů vodičů:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Číslo fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Nulový</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fáze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Ochranný vodič nulový</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Země</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Styl vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Velikost:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Barva vodiče</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Vzhled</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Barva: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Styl:</translation>
</message>
@@ -1334,12 +1339,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Najít v panelu</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Upravit prvek</translation>
</message>
@@ -1347,30 +1352,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Upravit údaje o autorovi</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Toto pole můžete použít volně, abyste zmínil autory prvku, jeho licenci, nebo jakékoli další sdělení, které byste považoval za užitečné.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Název prvku můžete zadat v několika jazycích.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Tento XML dokument není vymezením prvku.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Upravit názvy</translation>
@@ -2108,6 +2113,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Textový štítek</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2353,37 +2376,37 @@
<translation>Toto je projekt QElectroTech, to jest soubor s příponou .qet, který obsahuje několik listů. Jsou v něm také sbaleny prvky a vzory záhlaví výkresů, které jsou použity v těchto výkresech/listech.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>List bez názvu</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Vzory záhlaví výkresu</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Vzor "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Toto je vzor záhlaví výkresů, který lze použít v listu.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [v projektu nepoužívaný]</translation>
</message>
@@ -3102,17 +3125,25 @@
Vyberte, prosím, vlastnosti, které se mají použít na nový potenciál.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Potenciál s číslem drátu %1 je přítomen %2krát</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Upravit vlastnosti více vodičů</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3171,16 +3202,13 @@
<translation>Automatické číslování listů</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Bez názvu</translation>
</message>
@@ -3190,13 +3218,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Název nového číslování</translation>
</message>
@@ -3335,100 +3363,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Ukončit</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Skrýt</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Ukázat</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Skrýt všechny editory výkresů</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Ukázat všechny editory výkresů</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Skrýt všechny editory prvků</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Ukázat všechny editory prvků</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Skrýt všechny editory záhlaví výkresu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Ukázat všechny editory záhlaví výkresu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nový editor výkresu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nový editor prvku</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Uzavřít QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Zmenší QElectroTech do systémové oblasti panelu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Ukázat QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editory výkresů</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editory prvků</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Editory záhlaví výkresu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Použití: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3445,7 +3473,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3454,32 +3482,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Výrobce</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Odkaz na výrobce</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Pomocný blok 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Pomocný blok 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Odkaz na výrobce stroje</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Stanovit adresář pro sbírku s prvky
@@ -3486,7 +3514,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Stanovit adresář pro sbírku se vzory záhlaví výkresů
@@ -3493,7 +3521,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Stanovit adresář s nastavením
@@ -3500,7 +3528,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Stanovit adresář s jazykovými soubory
@@ -3531,98 +3559,103 @@
<translation>Zleva doprava</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Štítek</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Poznámka</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Označení</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Umístění</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funkce</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Záhlaví výkresů QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Vlastní záhlaví výkresů</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Výkres</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elektrický</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Nastavit QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Nahrává se...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Nahrává se... Ikona v systémové oblasti panelu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4374,42 +4407,42 @@
<translation>Otevření souboru pouze pro čtení</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Upravit prvek</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Upravit textové pole</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Upravit obrázek</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Upravit vodič</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Upravit vybraný předmět</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Spustí projekt « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Chyba</translation>
@@ -5372,13 +5405,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projekt « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5386,48 +5413,54 @@
Co chcete dělat?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Otevírá se projekt...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Varování</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projekt %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Nepojmenovaný projekt</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [pouze pro čtení]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [změněno]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Během začleňování vzoru se vyskytla chyba.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Seznam listů</translation>
</message>
@@ -5805,7 +5838,7 @@
<translation>Textový soubor obsahující licenci GNU/GPL existuje, ale nepodařilo se jej otevřít - nicméně, znáte ji srdcem, že ano?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Varování: prvek byl uložen se starší verzí QElectroTechu.</translation>
</message>
@@ -6396,13 +6429,13 @@
<translation>Upravit křížový odkaz</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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_da.ts
===================================================================
--- trunk/lang/qet_da.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_da.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Rediger leder egenskab</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Rediger egenskab for flere ledere</translation>
@@ -581,17 +581,17 @@
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Lodret</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Vandret</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Enkelt leder</translation>
</message>
@@ -611,40 +611,40 @@
<translation>Synlig tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>aktiver tekst ved potentiale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Fuld streg</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Stiplet streg</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Stiplet streg og punkt</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>jord</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutral</translation>
</message>
@@ -654,80 +654,85 @@
<translation>Form</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Vis potentiale tekst på ark.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Roter leder tekst:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Fase nummer</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Beskyttende Jord Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Jord</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Tekst etiket</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Leder typografi</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Størrelse:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Leder farve</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Udseende</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Farve:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Typografi:</translation>
</message>
@@ -1339,12 +1344,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Find i panel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Rediger symbol</translation>
</message>
@@ -1352,30 +1357,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Rediger forfatter informationer</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Feltet kan bruges til symbol forfatter, licens eller andre relevante informationer.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Angiv symbol navn på flere sprog.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>XML dokument er ikke en symbol definition.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Rediger navne</translation>
@@ -2121,6 +2126,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Tekst etiket</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2365,37 +2388,37 @@
<translation>Dette er et QElectroTech projekt, dvs filtype .qet indeholdende ark. Den indlæser også symboler og titelblokke skabeloner der anvendes af diagrammer/ark.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Ikke navngivet ark</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Titelblok skabelon</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Skabelon "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Titelblok skabelon der kan anvendes på ark.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [ikke brugt i projekt]</translation>
</message>
@@ -3114,17 +3137,25 @@
Vælg egenskab som tilføjes ny potentiale.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Potentiale med leder nummer %1 er brugt %2 gange</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Rediger egenskab for flere leder</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3184,16 +3215,13 @@
<translation>Ark autonummerering</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Ikke navngivet</translation>
</message>
@@ -3203,13 +3231,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Navngiv ny nummerering</translation>
</message>
@@ -3349,100 +3377,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Afslut</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Skjul</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Vis</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Skjul diagram redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Vis diagram redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Skjul symbol redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Vis symbol redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Skjul titelblok redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Vis titelblok redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nyt diagram redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nyt symbol redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Luk QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimer QElectroTech i statusfelt</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Vis QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Diagram redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Symbol redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Titelblok redigering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Anvender: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3458,7 +3486,7 @@
--license Vis licens</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3467,32 +3495,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Producent</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Producent varenummer</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Ekstra felt 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Ekstra felt 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Maskin producent varenummer</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Angiv mappe for element samling
@@ -3499,7 +3527,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Angiv mappe for titelblokke skabelon samling
@@ -3506,7 +3534,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Angiv mappe for opsætning
@@ -3537,104 +3565,109 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etiket</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Kommentar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Betegnelse</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Placering</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funktion</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET titelblokke</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Brugertilpasset titelblokke</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Diagram</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elektrisk</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Opsæt QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Indlæser...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Indlæser... Ikon til statusfelt</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Mappe med sprogfiler
@@ -4389,42 +4422,42 @@
<translation>Projekt åbnes skrivebeskyttet</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Rediger symbol</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Rediger tekstfelt</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Rediger billede</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Rediger leder</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Rediger objekt</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Aktiver projekt « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Fejl</translation>
@@ -5386,13 +5419,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projekt « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5400,48 +5427,54 @@
Hvad skal ske?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Åbner projekt...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Advarsel</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projekt %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Ikke navngivet projekt</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [skrivebeskyttet]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [ændret]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Der opstod fejl under integration af skabelon.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Ark liste</translation>
</message>
@@ -5820,7 +5853,7 @@
<translation>Tekst fil indeholdende GNU/GPL licens kunne ikke findes?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Advarsel: symbol er gemt med nyere version af QElectroTech.</translation>
</message>
@@ -6404,13 +6437,13 @@
<translation>Rediger referencekors</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Rediger egenskab for leder</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Rediger egenskab for flere leder</translation>
Modified: trunk/lang/qet_de.ts
===================================================================
--- trunk/lang/qet_de.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_de.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -515,13 +515,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Eigenschaften von mehreren Leitern ändern</translation>
@@ -580,32 +580,32 @@
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertikal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Einpolig</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>Erde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>Neutralleiter</translation>
</message>
@@ -630,70 +630,75 @@
<translation>Sichtbarer Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Orientierung der Leiterbeschriftung: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Phasenanzahl</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutralleiter</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>PEN-Leiter (protective earth neutral)</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Erde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Leiterstil</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Größe:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Leiterfarbe</translation>
</message>
@@ -703,34 +708,34 @@
<translation>Typ</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Darstellung</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Farbe:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Stil:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Durchgezogene Linie</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Strichpunkt-Linie</translation>
@@ -1343,12 +1348,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Im Panel zurückfinden</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Bauteil bearbeiten</translation>
</message>
@@ -1356,30 +1361,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Informationen über Autoren bearbeiten</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Sie können dieses freie Textfeld benutzen, um die Autoren, die Lizenz, oder jede weitere nützliche Information zu speichern.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Namen bearbeiten</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Sie können den Namen des Bauteiles in verschiedenen Sprachen eingeben.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Dieses XML-Dokument ist keine gültige Bauteildefinition.</translation>
@@ -2115,6 +2120,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2360,37 +2383,37 @@
<translation>Das ist ein QElectroTech-Projekt : eine *.qet Datei, in der Folien, eingebettete Bauteile und eingebettete Zeichnungsköpfe gespeichert sind.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Folie ohne Titel</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Zeichnungskopf-Vorlagen</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Vorlage "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Das ist eine Zeichnungskopf-Vorlage, die auf eine Folie angewendet werden kann.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [im Projekt nicht verwendet]</translation>
</message>
@@ -3109,17 +3132,25 @@
Wählen Sie die anzuwendenden Eigenschaften für das neue Potenzial.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Das Potenzial mit der Nummer %1 ist %2 Mal vorhanden</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Eigenschaften von mehreren Leitern ändern</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3178,16 +3209,13 @@
<translation>Folien-Auto-Nummerierung</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Unbenannt</translation>
</message>
@@ -3197,13 +3225,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Name der neuen Nummerierungsregel</translation>
</message>
@@ -3365,222 +3393,227 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Betriebsmittelkennzeichen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Kommentar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Beschreibung</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Hersteller</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Artikelnummer Hersteller</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Zusatzfeld 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Zusatzfeld 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Artikelnummer Maschinenhersteller</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Ort</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funktionstext</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET-Zeichnungsköpfe</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Benutzer-Zeichnungsköpfe</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Folie</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elektrik</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>QElectroTech Einstellungen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Lade...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Lade... Symbole des Systemsbenachrichtigungsfelds</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Beenden</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Verstecken</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Zeigen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Verstecke alle Schaltplaneditoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Zeige alle Schaltplaneditoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Verstecke alle Bauteileditoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Zeige alle Bauteileditoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Verstecke alle Zeichnungskopf-Editoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Zeige alle Zeichnungskopf-Editoren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Neuer Schaltplaneditor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Neuer Bauteileditor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Anwendung QElectroTech schließen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>QElectroTech in Systembenachrichtigungsfeld minimieren</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>QElectroTech wiederherstellen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Schaltplaneditor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Bauteileditor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Zeichnungskopf-Editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Verwendung: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3588,7 +3621,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3605,25 +3638,25 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Setzt Pfad zur Bauteilsammlung</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Pfad zur Zeichnungskopf-Sammlung setzen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Setzt Pfad zur Konfiguration</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Setzt Pfad zu den Sprachdateien</translation>
@@ -4296,7 +4329,7 @@
<translation>QElectroTech-Projekte (*.qet);;XML-Dateien (*.xml);;Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Aktiviert das Projekt "%1"</translation>
</message>
@@ -4414,37 +4447,37 @@
<translation>Die Datei %1 ist vermutlich keine QElectroTech-Projektdatei. Sie kann nicht geöffnet werden.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Bauteil bearbeiten</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Textfeld bearbeiten</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Bild bearbeiten</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Leitereigenschaften bearbeiten</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Auswahl bearbeiten</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Fehler</translation>
@@ -5369,54 +5402,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projekt "%1"</translation>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projekt %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projekt ohne Titel</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [schreibgeschützt]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [geändert]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Ein Fehler ist beim Einfügen der Vorlage aufgetretten.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Inhaltsverzeichnis</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Warnung</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5423,7 +5456,7 @@
<translation>Das Dokument wurde vermutlich mit einer nachfolgenden Version von QElectroTech erstellt. Möglicherweise wird das Öffnen ganz oder teilweise scheitern. Wie möchten Sie vorgehen?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Projekt wird geöffnet...</b></translation>
</message>
@@ -5785,7 +5818,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Warnung: das Bauteil wurde mit einer nachfolgenden Version von QElectroTech gespeichert.</translation>
</message>
@@ -6384,13 +6417,13 @@
<translation>Querverweise bearbeiten</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_el.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Επεξεργασία των ιδιοτήτων πολλών αγωγών</translation>
@@ -576,17 +576,17 @@
<translation>Κείμενο</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Κάθετα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Οριζόντια</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Μονογραμμικό</translation>
</message>
@@ -606,40 +606,40 @@
<translation>Ορατό κείμενο</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>Ενεργοποιεί την επιλογή, ένα κείμενο ανά δυναμικό</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>φάση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Συνεχόμενη</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Διακεκομμένη</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Παύλες και τελείες</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>γείωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>ουδέτερος</translation>
</message>
@@ -649,80 +649,85 @@
<translation>Φόρμα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Προβολή ενός κειμένου δυναμικού ανά σελίδα</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Γωνία του κειμένου των αγωγών</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Αριθμός φάσεων</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Ουδέτερος</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Φάση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Ουδετέρωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Γείωση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>ΕτικέταΚειμένου</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Στυλ αγωγού</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Μέγεθος:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Χρώμα αγωγού</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Εμφάνιση</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Χρώμα:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Τεχνοτροπία: </translation>
</message>
@@ -1334,12 +1339,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Εύρεση στο πλαίσιο</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Επεξεργασία του στοιχείου</translation>
</message>
@@ -1347,30 +1352,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Επεξεργασία των πληροφοριών του συγγραφέα</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Σε αυτό το πεδίο μπορείτε να ορίσετε, τον συγγραφέα αυτού του στοιχείου, την άδεια χρήσης, ή όποια άλλη πληροφορία θεωρείτε χρήσιμη.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Μπορείτε να εισάγετε το όνομα του στοιχείου σε πολλές γλώσσες.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Αυτό το αρχείο XML δεν είναι προσδιορισμός κάποιου στοιχείου.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Επεξεργασία των ονομάτων</translation>
@@ -2107,6 +2112,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2344,37 +2367,37 @@
<translation>Αυτό είναι ένα αρχείο έργο του QElectroTech με επέκταση .qet. αποτελούμενο από διάφορες σελίδες. Εμπεριέχει επίσης τα στοιχεία και τις πινακίδες που αποτελούν αυτές τις σελίδες.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Ανώνυμη σελίδα</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Πρότυπα πινακίδων</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Πρότυπο "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Αυτό είναι ένα πρότυπο πινακίδας, το οποίο μπορεί να εφαρμοστεί σε μια σελίδα.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [δεν χρησιμοποιείται στο έργο]</translation>
</message>
@@ -3093,17 +3116,25 @@
Παρακαλώ επέλεξε τις ιδιότητες που θα εφαρμοστούν στο νέο δυναμικό.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Το δυναμικό με αριθμό αγωγού %1 υπάρχει %2 φορές</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Επεξεργασία των ιδιοτήτων πολλών αγωγών</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3162,16 +3193,13 @@
<translation>Αυτόματη Αρίθμηση Σελίδων</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Ανώνυμο</translation>
</message>
@@ -3181,13 +3209,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Όνομα νέας αρίθμησης</translation>
</message>
@@ -3326,100 +3354,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Τερματισμός</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>Από&κρυψη</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Εμφάνιση</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Απόκρυψη όλων των επεξεργαστών διαγραμμάτων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>Εμ&φάνιση όλων των επεξεργαστών διαγραμμάτων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>Από&κρυψη όλων των επεξεργαστών στοιχείων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>Προ&βολή όλων των επεξεργαστών στοιχείων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Α&πόκρυψη όλων των επεξεργαστών πινακίδων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Ε&μφάνιση όλων των επεξεργαστών πινακίδων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Νέος επεξεργαστής διαγραμμάτων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Νέος επεξεργαστής στοιχείου</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Κλείσιμο του QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Ελαχιστοποιεί το QElectroTech στο πλαίσιο συστήματος</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Επαναφορά του QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Επεξεργαστές διαγραμμάτων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Επεξεργαστές στοιχείων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Επεξεργαστές πινακίδων</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Χρήση: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3435,7 +3463,7 @@
--license προβολή της άδειας χρήσης</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3444,38 +3472,38 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Κατασκευαστής</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Κωδικός κατασκευαστή</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Βοηθητικό μπλοκ 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Βοηθητικό μπλοκ 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Πλήρης κωδικός κατασκευαστή</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Ρύθμιση του QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=ΚΑΤΑΛΟΓΟΣ Προσδιορίστε τον κατάλογο της συλλογής στοιχείων
@@ -3482,7 +3510,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-elements-dir=ΚΑΤΑΛΟΓΟΣ Προσδιορίστε τον κατάλογο της συλλογής πινακίδων
@@ -3489,7 +3517,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=ΚΑΤΑΛΟΓΟΣ Προσδιορίστε τον κατάλογο των ρυθμίσεων
@@ -3496,7 +3524,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=ΚΑΤΑΛΟΓΟΣ Προσδιορίστε τον κατάλογο των αρχείων γλώσσας</translation>
@@ -3526,92 +3554,97 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Ετικέτα</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Σχόλιο</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Περιγραφή</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Θέση</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Λειτουργία</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Πινακίδες QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Πινακίδες χρήστη</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Διάγρα</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Ηλεκτρικ</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Φόρτωση...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Φόρτωση ... Εικονίδιο πλαισίου συστήματος</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4134,42 +4167,42 @@
<translation>Προσθήκη</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Επεξεργασία του στοιχείου</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Επεξεργασία του πλαισίου κειμένου</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Επεξεργασία εικόνας</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Επεξεργασία αγωγού</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Επεξεργασία του επιλεγμένου αντικειμένου</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Ενεργοποιεί το έργο « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Σφάλμα</translation>
@@ -5358,19 +5391,13 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Έργο « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Παρουσιάστηκε σφάλμα κατά την ενσωμάτωση του προτύπου.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5378,42 +5405,48 @@
Τι θα θέλατε να γίνει;</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Άνοιγμα έργου...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Προειδοποίηση</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Έργο %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Ανώνυμο έργο</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [μόνο-για-ανάγνωση]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [Αλλαγμένο]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Λίστα αρχείων</translation>
</message>
@@ -5791,7 +5824,7 @@
<translation>Το αρχείο κειμένου που περιέχει την άδεια GNU/GPL υπάρχει αλλά δεν μπορεί να ανοιχτεί - αλλα ούτως ή άλλως την έχετε στην καρδιά σας, έτσι δεν είναι;</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Προσοχή: Το στοιχείο έχει αποθηκευτεί με μια νεότερη έκδοση του QElectroTech.</translation>
</message>
@@ -6375,13 +6408,13 @@
<translation>Επεξεργασία διαταυρούμενων αναφορών</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Επεξεργασία των ιδιοτήτων ενός αγωγού</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Επεξεργασία των ιδιοτήτων πολλών αγωγών</translation>
Modified: trunk/lang/qet_en.qm
===================================================================
(Binary files differ)
Modified: trunk/lang/qet_en.ts
===================================================================
--- trunk/lang/qet_en.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_en.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Edit the properties of several conductors</translation>
@@ -581,17 +581,17 @@
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Single line</translation>
</message>
@@ -611,40 +611,40 @@
<translation>Visible text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Solid line</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>ground</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutral</translation>
</message>
@@ -654,80 +654,85 @@
<translation>Form</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation>Text Formula :</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Angle of conductor labels:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Number of phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Phase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Protective Earth Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Ground</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Conductor style</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Width:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Conductor color</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Appearance</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Style:</translation>
</message>
@@ -1339,12 +1344,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Find in the panel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Edit element</translation>
</message>
@@ -1352,30 +1357,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Edit author information</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>You can use this field to specify the authors of this element, its license, or any other information you may find useful.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>You may enter the element name in several languages.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>This XML document is not an element definition.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Edit names</translation>
@@ -2122,6 +2127,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation>Formula Wizard</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation>Formula</translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2358,37 +2381,37 @@
<translation>This is a QElectroTech project, ie. a .qet file containing several folios. It also embeds elements and title block templates used in the folios.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Untitled folio</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Title block templates</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>"%1" template</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>This is a title block template, which can be applied to a folio.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [unused in the project]</translation>
</message>
@@ -3107,17 +3130,28 @@
Please select the properties to be applied to new potential.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<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/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Edit the properties of several conductors</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation>The new potential formula contains variables incompatible with the folio reports.
+Please enter a compatible formula for this potential.
+The following variables are incompatible:
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3176,16 +3210,13 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>No name</translation>
</message>
@@ -3195,13 +3226,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Name the new numbering</translation>
</message>
@@ -3340,100 +3371,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Quit</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Hide</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Show</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Hide diagram editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Show diagram editors</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Hide element editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Show element editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Hide title block template editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Show title block template editors</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&New diagram editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&New element editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Closes QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Reduces QElectroTech into the systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restore QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Diagram editors</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Element editors</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Title block template editors</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Usage: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3450,7 +3481,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3459,32 +3490,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Manufacturer</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Manufacturer reference</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Auxiliary block 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Auxiliary block 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Machine manufacturer reference</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Define the elements collection directory
@@ -3491,13 +3522,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Define the title block templates collection directory</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Define configuration directory
@@ -3504,7 +3535,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Define the language files directory</translation>
@@ -3534,98 +3565,103 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation>Label formula</translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Label</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Annotation</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Designation</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Location</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Function</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET title blocks</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>User title blocks</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Diagram</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Electric</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configure QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Loading...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Loading... Systray icon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4378,42 +4414,42 @@
<translation>Opening the file read-only</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Edit the element</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Edit the text field</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Edit the image</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Edit conductor</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Edit the selected object</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Activates the project « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Error</translation>
@@ -5373,13 +5409,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Project « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5386,48 +5416,54 @@
<translation>This document appears to have been saved with a newer version of QElectroTech. All or a part of its opening may fail. What do you wish to do?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b> Opening project ... </ b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Warning</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation>Project « %1 : %2»</translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Project %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Untitled project</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [read-only]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [modified]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>An error occured during the template integration.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>List of Folios</translation>
</message>
@@ -5805,7 +5841,7 @@
<translation>The text file containing the GNU/GPL license exists but could not be opened - however, you know it by heart, don't you?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Warning: the element has been saved with a more recent version of QElectroTech.</translation>
</message>
@@ -6389,13 +6425,13 @@
<translation>Edit the cross reference</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_es.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -513,13 +513,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modificar las propiedades de un conductor</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modificar las propiedades de varios conductores</translation>
@@ -583,17 +583,17 @@
<translation>Texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Monolínea</translation>
</message>
@@ -613,40 +613,40 @@
<translation>Texto visible</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>Activar la opción de un texto por potencial</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Línea continua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>tierra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -657,81 +657,86 @@
<translation>Forma</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Mostrar un texto de potencial por folio. </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotación de texto del conductor:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Número de fases</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Protección tierra neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translatorcomment>Protección tierra neutral</translatorcomment>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Tierra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Estilo del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>tamaño:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Color del conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Apariencia</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Color:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Estilo:</translation>
</message>
@@ -1336,12 +1341,12 @@
<translation>Ubicación : %1</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Encuentra en el panel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Edita el elemento</translation>
</message>
@@ -1349,30 +1354,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Edita la información sobre el autor</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Puede utilizar este campo en blanco para indicar los autores de los elementos, su licencia, o cualquier otra información que considere útil.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Puede especificar el nombre del elemento en varios idiomas.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Este documento XML no es una definición de elemento.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Edita los nombres</translation>
@@ -1628,6 +1633,22 @@
<source>Le dossier %1 contient</source>
<translation>La carpeta %1 contiene</translation>
</message>
+ <message numerus="yes">
+ <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="504"/>
+ <source>%n élément(s), répartie(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="505"/>
+ <source>dans %n dossier(s).</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="506"/>
<source>Chemin de la collection : %1</source>
@@ -1635,8 +1656,8 @@
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="509"/>
- <source>Chemin dans le système de fichiers: %1</source>
- <translation>Ruta en el sistema de archivos: %1</translation>
+ <source>Chemin dans le système de fichiers : %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../sources/ElementsCollection/elementscollectionwidget.cpp" line="512"/>
@@ -2104,6 +2125,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Etiqueta de texto</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2350,38 +2389,38 @@
<translation>Este es un proyecto QElectroTech, es decir, un archivo con extensión .qet integrado por varios folios. También incorpora los elementos y modelos utilizados en estos folios.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Folio sin título</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translatorcomment>Rótulos</translatorcomment>
<translation>Rótulos</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Modelo "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Este es un modelo de rótulo de QElectroTech, que se puede aplicar a una hoja.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [No se utiliza en el proyecto]</translation>
</message>
@@ -3103,17 +3142,25 @@
Por favor, seleccione las propiedades que se aplicarán al nuevo potencial.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>El potencial con número de hilo %1 está presente %2 veces</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Edite las propiedades de varios conductores</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3173,16 +3220,13 @@
<translation>Numeración de folio automático</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Sin nombre</translation>
</message>
@@ -3192,13 +3236,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Nombre de la nueva numeración</translation>
</message>
@@ -3337,125 +3381,125 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Fabricante</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referencia del fabricante</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Referencia del fabricante de la maquina</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Localización</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Función</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Salir</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Esconder</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Restaurar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Esconder todos los editores de esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Restaura todos los editores de esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Esconder todos los editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Restaura todos los editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Esconder los editores de rótulos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Restaura los editores de rótulos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nuevo editor de esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nuevo editor de elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Cierre el programa QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimiza QElectroTech a la bandeja del sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restaura QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Editores de rótulos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Uso:</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3464,7 +3508,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3481,7 +3525,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation>--common-elements-dir=DIR Definir la carpeta de la colección de elementos
@@ -3488,13 +3532,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation>--common-tbt-dir=DIR Definir la carpeta de la colección de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definir la carpeta de configuración
@@ -3501,7 +3545,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Definir la carpeta con los archivos de idioma
@@ -3532,38 +3576,43 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Comentario</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Designación</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Bloque auxiliar 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Bloque auxiliar 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Rótulos QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translatorcomment>Elementos o proyectos de usuario</translatorcomment>
@@ -3570,61 +3619,61 @@
<translation>Rótulos de usuario</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Eléctrico</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Cargando...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Cargando.... icono de la bandeja del sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4146,42 +4195,42 @@
<translation>Parece que el proyecto que intenta abrir no es accesible en escritura. Por eso se abrira en sólo lectura.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Editar el elemento</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Editar el campo de texto</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Editar la imagen</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Editar el conductor</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Editar el objeto seleccionado</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Activar el proyecto « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Error</translation>
@@ -5371,13 +5420,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Proyecto « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5384,48 +5427,54 @@
<translation>Parece que se ha guaradado este documento con una versión antigua de QElectroTech. Puede ser que no se pueda abrir una parte o la totalidad del documento. ¿Que quiere hacer?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Abrir el proyecto actual...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Advertencia</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Proyecto %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Proyecto sín título</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [sólo lectura]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [modificado]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Un error ocurrió durante la integración del modelo.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Lista de folios</translation>
</message>
@@ -5795,7 +5844,7 @@
<translation>Exportar al portapapeles</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Aviso: el elemento fue guardado con una versión mas reciente de QElectroTech.</translation>
</message>
@@ -6391,13 +6440,13 @@
<translation>Editar la referencia cruzada</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Modificar las propiedades de un conductor</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modificar las propiedades de varios conductores</translation>
Modified: trunk/lang/qet_fr.qm
===================================================================
(Binary files differ)
Modified: trunk/lang/qet_fr.ts
===================================================================
--- trunk/lang/qet_fr.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_fr.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation></translation>
@@ -601,132 +601,137 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Taille:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation></translation>
@@ -1328,12 +1333,12 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation></translation>
</message>
@@ -1341,30 +1346,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation></translation>
@@ -2099,6 +2104,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2344,37 +2367,37 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation></translation>
</message>
@@ -3092,17 +3115,25 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3134,13 +3165,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation></translation>
</message>
@@ -3177,16 +3208,13 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation></translation>
</message>
@@ -3348,222 +3376,227 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3570,7 +3603,7 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3581,25 +3614,25 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation></translation>
@@ -4385,42 +4418,42 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation></translation>
@@ -5345,54 +5378,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5399,7 +5432,7 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation></translation>
</message>
@@ -5937,13 +5970,13 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation></translation>
@@ -6407,7 +6440,7 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation></translation>
</message>
Modified: trunk/lang/qet_hr.ts
===================================================================
--- trunk/lang/qet_hr.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_hr.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -576,17 +576,17 @@
<translation type="unfinished">Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Jednofazno</translation>
</message>
@@ -606,40 +606,40 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>faza</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>uzemljenje</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>nula</translation>
</message>
@@ -649,80 +649,85 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished">Izgled</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Boje:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -1324,12 +1329,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished">Nađi na ploči</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished">Uredi element</translation>
</message>
@@ -1337,30 +1342,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Uredi informacije o autoru</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Možete koristiti ovaj prostor za navođenje autora elementa, njegovu licencu ili bilo koje druge informacije koje smatrate korisnima.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Uredi naziv</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Možete upisati naziv elementa na nekoliko jezika.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Ovaj XML dokument nije definicija elementa.</translation>
@@ -2097,6 +2102,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2333,37 +2356,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation type="unfinished">Primjer grupe</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>"%1"- predložak</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [nekorišteno u projektu]</translation>
</message>
@@ -3081,17 +3104,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3150,16 +3181,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3169,13 +3197,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3337,222 +3365,227 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET naslov grupe</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Korisnikov naslov grupe</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Shema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Električna</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished">Podesite.QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Učitavam...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Učitavam... Ikona trake sustava</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Gotovo</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Sakrij</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Pokaži</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Sakrij uređivač shema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Prikaži uređivač shema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Sakrij uređivač elemenata</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Prikaži uređivač elemenata</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Sakrij uređivač naslova grupe predloška</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Prikaži uređivač naslova grupe predložaka</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Novi uređivač shema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Novi uređivač elemenata</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Zatvori QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimiziraj QElectroTech u traku sustava</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Vrati QElectrotech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Uređivač shema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Uređivač elemenata</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Uređivač naslova grupe predložaka</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Upotrijebljeno:</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3561,7 +3594,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3577,25 +3610,25 @@
--licenca Prikaži licencu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dirr=DIR Definiraj zajednički direktorij za elemente</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definiraj direktorij naslova grupe predložaka</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definiraj direktorij konfiguracije</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Definiraj direktorij za jezične datoteke</translation>
@@ -4334,7 +4367,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
@@ -4386,37 +4419,37 @@
<translation></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished">Greška</translation>
@@ -5344,54 +5377,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projekt %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projekt bez naslova</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [samo za čitanje]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Greška nastala tijekom integracije predloška.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Upozorenje</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5398,7 +5431,7 @@
<translation>Dokument je vjerojatno spremljen s novijom verzijom QElectroTech-a. Otvaranje cijelog ili dijelova može biti neuspješno. Što želite učiniti?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
@@ -5761,7 +5794,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Upozorenje: Element će biti spremljen sa više trenutnih verzija QElectroTech-a.</translation>
</message>
@@ -6368,13 +6401,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_hu.ts
===================================================================
--- trunk/lang/qet_hu.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_hu.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -596,132 +596,137 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
@@ -1323,12 +1328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished"></translation>
</message>
@@ -1336,30 +1341,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
@@ -2092,6 +2097,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2328,37 +2351,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation type="unfinished"></translation>
</message>
@@ -3076,17 +3099,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3118,13 +3149,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3161,16 +3192,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3332,222 +3360,227 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3554,7 +3587,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3565,25 +3598,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation type="unfinished"></translation>
@@ -4369,42 +4402,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
@@ -5326,54 +5359,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5380,7 +5413,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
@@ -5739,13 +5772,13 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -6183,7 +6216,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/lang/qet_it.ts
===================================================================
--- trunk/lang/qet_it.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_it.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di più conduttori</translation>
@@ -581,17 +581,17 @@
<translation>Testo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Verticale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Orizzontale</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Unifilare</translation>
</message>
@@ -611,40 +611,40 @@
<translation>Testo visibile</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Linea continua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -654,80 +654,85 @@
<translation>Modulo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotazione del testo del conduttore:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Numero di fasi</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fasi</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Neutro con funzione di terra (sistema TN-C)</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Etichetta</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Stile del conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Spessore:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Colore del conduttore</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Aspetto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Colore:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Stile:</translation>
</message>
@@ -1339,12 +1344,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Mostra nello schema</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Modifica l'elemento</translation>
</message>
@@ -1352,30 +1357,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Modificare le informazioni sull'autore</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Usare questo campo per specificare l'autore dell'elemento, la sua licenza, o qualunque altra informazione utile.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Inserire il nome dell'elemento in più lingue.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Questo documento XML non è la definizione di un elemento.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Modificare i nomi</translation>
@@ -2121,6 +2126,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2365,37 +2388,37 @@
<translation>Questo è un progetto QElectroTech, cioè un file con estensione .qet che raggruppa diverse pagine. Incorpora anche elementi e modelli di cartigli usati negli schemi.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Pagina senza titolo</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Modelli di cartiglio</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Modello "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Questo è un modello di cartiglio, che può essere applicato ad una pagina.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [non utilizzato nel progetto]</translation>
</message>
@@ -3115,17 +3138,25 @@
Scegliere le proprietà da applicare al nuovo potenziale.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Il potenziale con numero di filo %1 è presente %2 volte</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Modifica le proprietà di più conduttori</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3184,16 +3215,13 @@
<translation>Auto Numerazione Pagina</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Senza nome</translation>
</message>
@@ -3203,13 +3231,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Nome della nuova numerazione</translation>
</message>
@@ -3348,100 +3376,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>Esci (&Q)</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>Nascondi (&M)</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>Visualizza (&R)</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>Nascondi i &modificatori di schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>Most&ra i modificatori di schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>Nascondi i &modificatori d'elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>Most&ra i modificatori d'elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Nascondi i &modificatori di cartiglio</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Most&ra i modificatori di cartiglio</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nuovo modificatore di schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nuovo modificatore d'elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Chiudi QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Riduci QElectroTech nella systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Ripristina QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Modificatori di schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Modificatori d'elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Modificatori di cartiglio</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Uso: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3458,7 +3486,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3467,32 +3495,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Costruttore</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Riferimento costruttore</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Blocco ausiliario 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Blocco ausiliario 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Riferimento costruttore macchina</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Definisce la directory della collezione degli elementi
@@ -3499,13 +3527,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definisce la directory della collezione dei modelli di cartiglio</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definisce la directory di configurazione
@@ -3512,7 +3540,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Definisce la directory dei file della lingua</translation>
@@ -3542,98 +3570,103 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etichetta</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Commento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Descrizione</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Posizione</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funzione</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Cartiglio QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Cartigli utente</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Schema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elettrico</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configurazione QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Caricamento...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Caricamento... icona Systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4385,42 +4418,42 @@
<translation>Apertura del progetto in sola lettura</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Modifica l'elemento</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Modifica il campo di testo</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Modifica l'immagine</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Modificare il conduttore</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Modifica l'oggetto selezionato</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Attiva il progetto « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Errore</translation>
@@ -5380,13 +5413,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Progetto « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5394,48 +5421,54 @@
Cosa vuoi fare?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Apertura progetto in corso...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Avviso</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Progetto %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Progetto senza titolo</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [sola lettura]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [modificato]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Si è verificato un errore durante l'integrazione del modello.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Elenco delle pagine</translation>
</message>
@@ -5813,7 +5846,7 @@
<translation>Non posso aprire il file di testo che contiene la licenza GNU/GPL - comunque sia la conosci a menadito, o no?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Attenzione: l'elemento è stato salvato con una versione più recente di QElectroTech.</translation>
</message>
@@ -6397,13 +6430,13 @@
<translation>Modificare i riferimenti incrociati</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_nl.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -576,17 +576,17 @@
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertikaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontaal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Enkele geleiders</translation>
</message>
@@ -606,40 +606,40 @@
<translation>zichtbare tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>activeer potentiaal tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Dichte lijn</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>Nul</translation>
</message>
@@ -649,80 +649,85 @@
<translation>Vorm</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Toon tekst per pagina .</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotatie van tekst van geleider :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>fase nummer</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutraal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Aarde en Nul samen</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Aarde</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>TekstLabel</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Type Geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Kleur Geleider</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished">Verschijning</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Kleur:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Stijl:</translation>
</message>
@@ -1327,12 +1332,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished">Zoek in paneel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished">Bewerken element</translation>
</message>
@@ -1340,30 +1345,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Bewerk auteur informatie</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>U kunt deze ruimte gebruiken om de auteurs van het element, de licentie, of enige andere informatie die u van belang acht te vermelden.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>U mag de elementnaam geven voor diverse talen.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Dit XML document is geen element definitie.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Bewerk de namen</translation>
@@ -2098,6 +2103,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">TekstLabel</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2334,37 +2357,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Titel blok sjablonen</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>"%1" sjabloon</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [ongebruikt in dit project]</translation>
</message>
@@ -3082,17 +3105,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3151,16 +3182,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Zonder Naam</translation>
</message>
@@ -3170,13 +3198,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Naam nieuwe nummering</translation>
</message>
@@ -3315,125 +3343,125 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Fabrikant</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referentie</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Referentie fabricant machine</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Einde</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Verbergen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Herstellen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>Verberg &alle bewerkingen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>Herstel alle bewerkingen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>Verberg alle bewerkingen van element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>Herstel alle bewerkingen van element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Verberg alle bewerkingen van titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>Herstel alle bewerkingen van titel blok sjabloon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>nieuw diagram editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>nieuw element editor</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>EINDE QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Verklein QElectroTech naar systray</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Vergroot QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Diagram bewerken</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Element bewerken</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Titel blok sjabloon bewerken</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Gebruik: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elementen-dir=DIR definieer de elementen collectie map
@@ -3440,13 +3468,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definieer de titel blok sjablonen collectie map</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definieer configuratie map
@@ -3453,7 +3481,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Definieer de taalbestanden map</translation>
@@ -3483,104 +3511,109 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Label</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Commentaar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Benaming</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>QET titel blok sjablonen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Gebruiker titel blok sjablonen</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Diagram</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Electrisch</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configureer QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Laden ... </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Laden... Systray icon</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3587,7 +3620,7 @@
<translation>[opties] .....</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -4351,42 +4384,42 @@
<translation>Open bestand, alleen lezen</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Bewerk element</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Bewerk tekst veld</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Bewerk afbeelding</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Bewerk geselecteerd object</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Fout</translation>
@@ -5346,7 +5379,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5353,54 +5386,54 @@
<translation>Dit document is met een nieuwere versie van QElectroTech bewaard. Openen kan deels of geheel foutgaan. Wat wilt u doen?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b> Openen project ... </ b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Waarschuwing</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projectbestandsnaam %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Naamloos project</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [alleen lezen]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [gewijzigd]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Fout bij sjabloon invoegen.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
@@ -5778,7 +5811,7 @@
<translation>De tekst met de GNU/GPL licentie is wel gevonden, maar openen lukt niet. hopelijk kent u het?.. computer will explode......?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Waarschuwing: het element is bewaard in een nieuwere versie van QElectroTech.</translation>
</message>
@@ -6362,13 +6395,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_pl.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>zmiana właściwości kilku przewodów</translation>
@@ -581,17 +581,17 @@
<translation>Tekst</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Poziomo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Pionowo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Jednoliniowy</translation>
</message>
@@ -611,40 +611,40 @@
<translation>Tekst widoczny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fazowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Ciągła</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Kreskowa</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>ochronny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutralny</translation>
</message>
@@ -654,80 +654,85 @@
<translation>Forma</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Obrót oznaczenia przewodu:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Ilość przewodów fazowych</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutralny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fazowy</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Ochronno-neutralny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Ochronny</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Typ przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Rozmiar:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Kolor przewodu</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Wygląd</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Kolor: </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Typ:</translation>
</message>
@@ -1333,12 +1338,12 @@
<translation>Położenie: %1</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Znajdź w panelu</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Edytuj element</translation>
</message>
@@ -1346,30 +1351,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Edycja informacji autora</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Możesz wykorzystać to puste pole na informacje o autorze, licencji i inne przydatne informacje.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Można podać nazwę elementu w kilku językach.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Niniejszy dokument XML, nie jest definicją elementu.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Edytuj nazwę</translation>
@@ -2121,6 +2126,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Etykieta</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2366,37 +2389,37 @@
<translation>Projekt QElectroTech o rozszerzeniu .qet może zawierać wiele arkuszy. Wraz z projektem zapisane są również używane elementy i szablony tabliczek rysunkowych.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Arkusz bez tytułu</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Szablon tabliczki rysunkowej</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Szablon "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Szablony tabliczek rysunkowych, które mogą być zastosowane w schemacie.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [nieużywany w projekcie]</translation>
</message>
@@ -3115,17 +3138,25 @@
Wybierz właściwości i zastosuj nowy potencjał..</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>Potencjał dla przewodu o numerze %1 występuje %2 razy</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>zmiana właściwości kilku przewodów</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3184,16 +3215,13 @@
<translation>Automatyczna numeracja arkuszy</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Bez nazwy</translation>
</message>
@@ -3203,13 +3231,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Nazwa nowej numeracji</translation>
</message>
@@ -3348,100 +3376,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Zakończ</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Ukryj</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Pokaż</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Ukryj wszystkie edytory schematów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Pokaż wszystkie edytory schematów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Ukryj wszystkie edytory elementów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Pokaż wszystkie edytory elementów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Ukryj wszystkie edytory tabliczek rysunkowych</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Pokaż wszystkie edytory tabliczek rysunkowych</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Nowy edytor schematów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Nowy edytor elementów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Zamknij QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Zminimalizuj QElectroTech do systemowego zasobnika</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Pokaż QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Edytory schematów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Edytory elementów</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Edytory tabliczek rysunkowych</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Użyć: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3458,7 +3486,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3467,32 +3495,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Producent</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Numer referencyjny</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Zestyki pomocnicze 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Zestyki pomocnicze 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Numer referencyjny urządzenia</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Określ katalog elementów
@@ -3499,7 +3527,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> -common-tbt-dir=DIR Określ katalog kolekcji szablonów tabliczek rysunkowych
@@ -3506,7 +3534,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Określ konfigurację katalogu
@@ -3513,7 +3541,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Określ katalog zawierający pliki językowe
@@ -3544,98 +3572,103 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etykieta</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Komentarz</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Oznaczenie</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Lokalizacja</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Funkcja</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Tabliczki rysunkowe QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Tabliczki rysunkowe użytkownika</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Schemat</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elektryczny</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Konfiguracja QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Ładowanie ...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Ładowanie ... Ikona w zasobniku systemowym</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4387,42 +4420,42 @@
<translation>Otwórz plik tylko do odczytu</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Edycja elementu</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Edycja pola tekstowego</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Edycja obrazu</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Edycja właściwości przewodu</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Edycja zaznaczonego objektu</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Aktywny projekt « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Błąd</translation>
@@ -5385,13 +5418,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projet « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5399,48 +5426,54 @@
Co chcesz zrobić?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Trwa otwieranie projektu...</b></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Uwaga</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projekt %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projekt bez tytułu</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [tylko do odczytu]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [zmieniony]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Wystąpił błąd podczas integracji szablonu.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Lista Arkuszy</translation>
</message>
@@ -5818,7 +5851,7 @@
<translation>Plik tekstowy zawierający licencję GNU / GPL istnieje, ale nie można go otworzyć - na pewno znasz ją sercem, prawda?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Uwaga: element został zapisany w nowszej wersji QElectroTech.</translation>
</message>
@@ -6409,13 +6442,13 @@
<translation>Edytuj odsyłacz</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_pt.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -511,13 +511,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -581,17 +581,17 @@
<translation type="unfinished">Texto</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Unifilar</translation>
</message>
@@ -611,40 +611,40 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
@@ -654,80 +654,85 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished">Aparência</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Côr:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -1328,12 +1333,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished">Encontrar no painel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished">Editar elemento</translation>
</message>
@@ -1341,30 +1346,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Editar informações sobre o autor</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Pode utilizar este campo em branco para indicar os autores do elemento, a licença do mesmo, ou qualquer outra informação que considere útil.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Pode especificar o nome do elemento em diversas línguas.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Este documento XML não é uma definição de elemento.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Editar nomes</translation>
@@ -2099,6 +2104,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2335,37 +2358,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Modelos de moldura</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Modelo "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [não utilizado no projecto]</translation>
</message>
@@ -3083,17 +3106,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3152,16 +3183,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3171,13 +3199,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3315,100 +3343,100 @@
<context>
<name>QETApp</name>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Sair</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Esconder</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Ver</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Esconder os editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Mostrar os editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Esconder os editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Mostrar os editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Esconder todos os editores de moldura</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Mostrar todos os editores de molduras</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Novo editor de esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Novo editor de elemento</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Fechar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimizar QElectroTech para a bandeja de sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restaurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Editores de molduras</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Utilização: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3425,7 +3453,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3434,32 +3462,32 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Define a directoria da colecção de elementos
@@ -3466,13 +3494,13 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definir a pasta da colecção de modelos de molduras¶</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Define a directoria de configuração
@@ -3479,7 +3507,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Define a directoria dos ficheiros de linguagem</translation>
@@ -3509,98 +3537,103 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Molduras QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Molduras do utilizador</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Eléctrico</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished">Configurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>A carregar...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>A carregar... Ícone da bandeja de sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
@@ -4352,42 +4385,42 @@
<translation type="unfinished">Abrir o ficheiro em modo só de leitura</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished">Erro</translation>
@@ -5347,13 +5380,7 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5361,48 +5388,54 @@
O que deseja fazer?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Aviso</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projecto %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projecto sem título</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [só leitura]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Aconteceu um erro durante a integração do modelo.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
@@ -5780,7 +5813,7 @@
<translation>O ficheiro de texto que contém a licença GNU/GPL existe mas não pôde ser aberto - ah, de qualquer modo conhece-a de cor, não é?</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Aviso: o elemento foi guardado usando uma versão mais recente de QElectroTech.</translation>
</message>
@@ -6364,13 +6397,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_pt_br.ts
===================================================================
--- trunk/lang/qet_pt_br.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_pt_br.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Editar as propriedades de um condutor</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Editar as propriedades de vários condutores</translation>
@@ -596,132 +596,137 @@
<translation>Texto visível</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>Ativar a opção de texto por potencial</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Mostrar um texto de potencial por página. </translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Horizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Ângulo do texto do condutor:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Unifilar</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Número de fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>neutro</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>fase</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Protective Earth Neutral</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>terra</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Rótulo</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Aparência</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Cor do condutor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Côr:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Estilo do condutor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Estilo:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>tamanho:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Linha contínua</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Linha pontilhada</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Pontos e traços</translation>
@@ -1330,12 +1335,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Procurar no painel</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Editar o elemento</translation>
</message>
@@ -1343,30 +1348,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Editar as informações sobre o autor</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Você pode utilizar este campo para indicar os autores do elemento, a licença do mesmo, ou qualquer outra informação que considere útil.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Editar nomes</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Você pode especificar o nome do elemento em diversos idiomas.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Este documento XML não é uma definição de elemento.</translation>
@@ -2103,6 +2108,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Rótulo</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2339,37 +2362,37 @@
<translation type="unfinished">Este é um projeto QElectroTech, isto é, um arquivo de extensão .qet contendo inúmeras páginas de diagramas e esquemas elétricos. Ele também incorpora os elementos e modelos de blocos de título utilizados em suas páginas.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Página sem título</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Modelos de blocos de título</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Modelo "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Este é um modelo de bloco de título, que pode ser aplicada a uma página.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [não utilizado neste projeto]</translation>
</message>
@@ -3088,17 +3111,25 @@
Por favor, selecione as propriedades a serem aplicadas ao novo potencial.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>O potencial com número de fio %1 está presente %2 vezes</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Editar as propriedades de vários condutores</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3130,13 +3161,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Nome da nova numeração</translation>
</message>
@@ -3173,16 +3204,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Sem Nome</translation>
</message>
@@ -3345,222 +3373,227 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Rótulo</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Comentário</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Designação</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Fabricante</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referência do fabricante</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Bloco auxiliar 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Bloco auxiliar 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Referência do fabricante da máquina</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Localização</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Função</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Blocos de título do QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Blocos de título do usuário</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Elétrico</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Carregando...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Carregando... Ícone da bandeja do sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>Sai&r</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Esconder</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Mostrar</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Esconder todos os editores de esquema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Mostrar todos os editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Esconder os editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Mostrar todos os editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Esconder todos os editores de blocos de título</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Mostrar todos os editores de blocos de título</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Novo editor de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Novo editor de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Fechar o aplicativo QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimizar QElectroTech para a bandeja do sistema</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restaurar QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editores de esquemas</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editores de elementos</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation>Editores de blocos de título</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Utilização: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3567,7 +3600,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3578,7 +3611,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Define a pasta da coleção de elementos
@@ -3585,7 +3618,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definir a pasta da coleção de modelos de blocos de título
@@ -3592,7 +3625,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Define a pasta de configuração
@@ -3599,7 +3632,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Define a pasta dos arquivos de idioma
@@ -4386,42 +4419,42 @@
<translation>Parece que o arquivo %1 não é um arquivo de projeto QElectroTech. Portanto, ele não pode ser aberto.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Editar o elemento</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Editar o campo de texto</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Editar a imagem</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Editar o fio</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Editar o objeto selecionado</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Ativar o projeto « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Erro</translation>
@@ -5347,54 +5380,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Projeto « %1 »</translation>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Projeto %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Projeto sem título</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [somente leitura]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [Modificado]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Ocorreu um erro durante a integração do modelo.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Lista de páginas</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Aviso</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5402,7 +5435,7 @@
O que você deseja fazer?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Abrindo o projeto...</b></translation>
</message>
@@ -5765,13 +5798,13 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Editar as propriedades de um condutor</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Editar as propriedades de vários condutores</translation>
@@ -6317,7 +6350,7 @@
<translation>Não é possível abrir o arquivo %1 para escrita, encontrado erro %2.</translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Aviso: o elemento foi salvo por uma versão mais recente do QElectroTech.</translation>
</message>
Modified: trunk/lang/qet_ro.ts
===================================================================
--- trunk/lang/qet_ro.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_ro.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -576,17 +576,17 @@
<translation>Text</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Vertical</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Orizontal</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Monofilar</translation>
</message>
@@ -606,40 +606,40 @@
<translation>Text vizibil</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<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="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>faza</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Linie continuă</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>împământare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation>nul</translation>
</message>
@@ -649,80 +649,85 @@
<translation>Formular</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<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="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation>Rotația textului conductorului :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Număr de faze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Neutru</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Faze</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation>Împământare neutră de protecție</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Împământare</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation>Text etichetă</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Stil conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Culoare conductor</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished">Aspect</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Culoare :</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Stil :</translation>
</message>
@@ -1327,12 +1332,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished">Găsește în panou</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished">Editare element</translation>
</message>
@@ -1340,30 +1345,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Editați informația despre autor</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Puteți utiliza acest câmp pentru a menționa autorii elementului, licența acestuia sau toate celelalte informații pe care le considerați utile.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Editați denumirile</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Puteți specifica numele elementului in mai multe limbi.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Acest fișier XML nu este o definiție de element.</translation>
@@ -2100,6 +2105,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Text etichetă</translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2336,37 +2359,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Modele de cartușe</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Model "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [nu sunt utilizate în proiect]</translation>
</message>
@@ -3084,17 +3107,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3153,16 +3184,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Fără nume</translation>
</message>
@@ -3172,13 +3200,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Numele noii numerotări</translation>
</message>
@@ -3341,222 +3369,227 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Etichetă</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Comentariu</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Denumire</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Producător</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Referință producător</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation>Referință producător mașină</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation>Cartușe QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Cartușe utilizator</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Schemă</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Electric</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Configurare QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Se încarcă...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Se încarcă... Pictograma din bara de sistem</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Termină</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Ascunde</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Arată</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Ascunde editoarele de schemă</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Arată toate editoarele de schemă</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Ascunde toate editoarele de elemente</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Arată toate editoarele de elemente</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Ascunde toate editoarele de cartuș</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Arată toate editoarele de cartuș</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>Editor de schemă &nou</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>Editor de element &nou</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Închide aplicația QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Minimizează QElectroTech în bara de sistem</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Restaurează QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Editoare de schemă</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Editoare element</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation type="unfinished">Editoare cartuș</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Utilizare : </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3565,7 +3598,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3582,7 +3615,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation>--common-elements-dir=DIR Definește dosarul colecției de elemente
@@ -3589,19 +3622,19 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Definește dosarul colecției de cartușe</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Definește dosarul de configurare</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation>--config-dir=DIR Definește dosarul care conține fișierele de limbă</translation>
@@ -4104,12 +4137,12 @@
<translation>Deschide proiectul numai pentru citire</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Eroare</translation>
@@ -4398,31 +4431,31 @@
<translation>Se pare că fișierul %1 nu este un proiect QElectroTech. În consecință, nu a putut fi deschis.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Editare element</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Editare câmp text</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Editare imagine</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Editează obiectele selectate</translation>
@@ -5351,31 +5384,37 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Proiect %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Proiect fără titlu</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [doar citire]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [modificat]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5382,30 +5421,24 @@
<translation>Acest document apare că a fost salvat cu o nouă versiune de QElectroTech. Tot sau o parte din el poate eșua la deschidere. Ce doriți să faceți ?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>A intervenit o eroare în timpul introducerii modelului.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Avertisment</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b>Se deschide proiectul... </ b></translation>
</message>
@@ -5767,7 +5800,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Atenție : elementul a fost salvat cu o versiune mai nouă de QElectroTech.</translation>
</message>
@@ -6373,13 +6406,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_ru.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -521,13 +521,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Редактировать свойства нескольких проводников</translation>
@@ -591,17 +591,17 @@
<translation>Текст</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation>Вертикальный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation>Горизонтальный</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation>Однолинейный</translation>
</message>
@@ -621,40 +621,40 @@
<translation>Видимый текст</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation>Активировать опциональный текст потенциала</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation>фаза</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation>Сплошная линия</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<source>Trait en pointillés</source>
<comment>conductor style: dashed line</comment>
<translation>Пунктирная линия</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation>Точки и тире</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation>заземление</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translatorcomment>нейтраль?</translatorcomment>
<translation>нейтраль</translation>
@@ -666,84 +666,89 @@
<translation>Форма</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation>Показывать для потенциала один текст на страницу.</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translatorcomment>context dependent</translatorcomment>
<translation>Угол надписи проводника:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation>Номер фазы</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation>Нейтраль</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation>Фаза</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translatorcomment>dont know what is this</translatorcomment>
<translation>Глухо заземлённая нейтраль</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translatorcomment>?</translatorcomment>
<translation>PEN</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation>Заземление</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translatorcomment>context dependent</translatorcomment>
<translation>Текстовая метка</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation>Стиль проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation>Размер:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation>Цвет проводника</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation>Внешний вид</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation>Цвет:</translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation>Стиль:</translation>
</message>
@@ -1360,12 +1365,12 @@
</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation>Найти в панели</translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation>Редактировать элемент</translation>
</message>
@@ -1373,30 +1378,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation>Правка информации об авторе</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation>Вы можете использовать это поле, чтобы указать авторов этого элемента, его лицензии, или любую другую информацию, которую вы сочтете полезной.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation>Редактировать имена</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation>Вы можете задать имя элемента на разных языках.</translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation>Этот XML-документ не является определением элемента.</translation>
@@ -2146,6 +2151,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2384,37 +2407,37 @@
<translation>Это проект QElectroTech, т.е. файл .qet, содержащий несколько страниц. В него также включены элементы и шаблоны, используемые на схемах/страницах.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation>Страница без имени</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation>%1 - %2</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation>Шаблоны штампов</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation>Шаблон "%1"</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation>Это - шаблон, который может быть применен к странице.</translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation>%1 [не используется в проекте]</translation>
</message>
@@ -3147,17 +3170,25 @@
Пожалуйста выберите свойства, которые будут применены к новому потенциалу.</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation>"Потенциал провода %1 присутствует %2 раз."</translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation>Редактировать свойства нескольких проводников</translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3216,16 +3247,13 @@
<translation>Автонумерация страниц</translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation>Без имени</translation>
</message>
@@ -3235,13 +3263,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation>Назовите новую нумерацию</translation>
</message>
@@ -3404,58 +3432,63 @@
<translation>LTR</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation>Метка</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation>Аннотация</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation>Назначение</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation>Производитель</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation>Информация производителя</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation>Внешний блок 1</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation>Внешний блок 2</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translatorcomment>поставщика оборудования?</translatorcomment>
<translation>Информация производителя машины/оборудования</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation>Расположение</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation>Функция</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translatorcomment>?</translatorcomment>
@@ -3462,155 +3495,155 @@
<translation>Штампы QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation>Штампы пользователя</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation>Q</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation>QET</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Схема</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation>Электрическая</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation>Настройка QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation>Загрузка...</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation>Загрузка...Значок в трее</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation>&Выход</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation>&Скрыть</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation>&Показать</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation>&Скрыть редактор схем</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation>&Показать редактор схем</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation>&Скрыть редактор элементов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation>&Показать редактор элементов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Скрыть редактор штампов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation>&Показать редактор штампов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation>&Новый редактор схем</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation>&Новый редактор элементов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation>Закрыть QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation>Свернуть QElectroTech в трей</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation>Восстановить QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation>QElectroTech</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation>Редакторы схем</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation>Редакторы элементов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translatorcomment>??</translatorcomment>
@@ -3617,12 +3650,12 @@
<translation>Редакторы штампов</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation>Использование: </translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3631,7 +3664,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3648,7 +3681,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation> --common-elements-dir=DIR Задаёт каталог с коллекцией элементов
@@ -3655,7 +3688,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation> --common-tbt-dir=DIR Задаёт каталог с коллекцией штампов
@@ -3662,7 +3695,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation> --config-dir=DIR Задаёт каталог конфигураций
@@ -3669,7 +3702,7 @@
</translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation> --lang-dir=DIR Задаёт каталог с языковыми файлами
@@ -4173,12 +4206,12 @@
<translation>Открытие файла в режиме "только чтение"</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation>Активирует проект « %1 »</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation>Ошибка</translation>
@@ -4467,31 +4500,31 @@
<translation>Файл %1 не является проектом QElectroTech. Он не может быть открыт.</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation>Редактировать элемент</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation>Редактировать текстовое поле</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation>Редактировать изображение</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation>Редактировать проводник</translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation>Редактировать выбранный объект</translation>
@@ -5420,31 +5453,37 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation>Проект %1</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation>Проект без имени</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation>%1 [только чтение]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation>%1 [изменён]</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5451,30 +5490,24 @@
<translation>Похоже, что этот документ был сохранён более новой версией QElectroTech. Открытие может завершиться неудачно. Что вы хотите сделать?</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
- <translation>Проект « %1 »</translation>
- </message>
- <message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation>Во время интеграции шаблона произошла ошибка.</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation>Список страниц</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation>Предупреждение</translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation><b> Открытие проекта ... </ b></translation>
</message>
@@ -5838,7 +5871,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation>Предупреждение: элементы были сохранены более поздней версии QElectroTech.</translation>
</message>
@@ -6446,13 +6479,13 @@
<translation>Редактировать перекрестную ссылку</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<source>Modifier les propriétés d'un conducteur</source>
<comment>undo caption</comment>
<translation>Редактировать свойства проводника</translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<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 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_sl.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -576,17 +576,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
@@ -606,40 +606,40 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<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="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
@@ -649,80 +649,85 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
@@ -1323,12 +1328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished"></translation>
</message>
@@ -1336,30 +1341,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
@@ -2098,6 +2103,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2334,37 +2357,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation type="unfinished"></translation>
</message>
@@ -3082,17 +3105,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3151,16 +3182,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3170,13 +3198,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3338,222 +3366,227 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3560,7 +3593,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3571,25 +3604,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation type="unfinished"></translation>
@@ -4328,7 +4361,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
@@ -4380,37 +4413,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
@@ -5341,54 +5374,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5395,7 +5428,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
@@ -5754,7 +5787,7 @@
<context>
<name>QObject</name>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation type="unfinished"></translation>
</message>
@@ -6367,13 +6400,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
Modified: trunk/lang/qet_sr.ts
===================================================================
--- trunk/lang/qet_sr.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_sr.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -596,132 +596,137 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
@@ -1323,12 +1328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished"></translation>
</message>
@@ -1336,30 +1341,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
@@ -2096,6 +2101,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2332,37 +2355,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation type="unfinished"></translation>
</message>
@@ -3080,17 +3103,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3122,13 +3153,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3165,16 +3196,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3336,222 +3364,227 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3558,7 +3591,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3569,25 +3602,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation type="unfinished"></translation>
@@ -4373,42 +4406,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
@@ -5336,54 +5369,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5390,7 +5423,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
@@ -5764,13 +5797,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -6321,7 +6354,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/lang/qet_zh.ts
===================================================================
--- trunk/lang/qet_zh.ts 2017-01-15 19:29:10 UTC (rev 4849)
+++ trunk/lang/qet_zh.ts 2017-01-15 19:36:40 UTC (rev 4850)
@@ -506,13 +506,13 @@
<context>
<name>Conductor</name>
<message>
- <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1479"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1396"/>
<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="1483"/>
+ <location filename="../sources/qetgraphicsitem/conductor.cpp" line="1401"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
@@ -576,22 +576,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="135"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="145"/>
<source>activer l'option un texte par potentiel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="138"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="148"/>
<source>Afficher un texte de potentiel par folio. </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="179"/>
<source>Rotation du texte de conducteur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="149"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
<source>Vertical</source>
<translation type="unfinished"></translation>
</message>
@@ -616,112 +616,117 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="159"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="131"/>
+ <source>Formule du texte :</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="169"/>
<source>Horizontal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="194"/>
<source>Unifilaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="251"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="261"/>
<source>Nombre de phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="223"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="233"/>
<source>Neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="226"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="236"/>
<source>neutre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="237"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="247"/>
<source>Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="240"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="250"/>
<source>phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="264"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
<source>Protective Earth Neutral</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="267"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
<source>PEN</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="274"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="284"/>
<source>Terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="277"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="287"/>
<source>terre</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="288"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="298"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
<location filename="../sources/ui/conductorpropertieswidget.ui" line="337"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="347"/>
<source>Style du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="376"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="386"/>
<source>size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="317"/>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="344"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="327"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="354"/>
<source>Couleur du conducteur</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="311"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="321"/>
<source>Apparence</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="320"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
<source>Couleur :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.ui" line="330"/>
+ <location filename="../sources/ui/conductorpropertieswidget.ui" line="340"/>
<source>Style :</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="183"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="185"/>
<source>Trait plein</source>
<comment>conductor style: solid line</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/conductorpropertieswidget.cpp" line="184"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="186"/>
<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="185"/>
+ <location filename="../sources/ui/conductorpropertieswidget.cpp" line="187"/>
<source>Traits et points</source>
<comment>conductor style: dashed and dotted line</comment>
<translation type="unfinished"></translation>
@@ -1323,12 +1328,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="296"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="295"/>
<source>Retrouver dans le panel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/elementpropertieswidget.cpp" line="298"/>
+ <location filename="../sources/ui/elementpropertieswidget.cpp" line="297"/>
<source>Éditer l'élément</source>
<translation type="unfinished"></translation>
</message>
@@ -1336,30 +1341,30 @@
<context>
<name>ElementScene</name>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="569"/>
+ <location filename="../sources/editor/elementscene.cpp" line="577"/>
<source>Éditer les informations sur l'auteur</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="573"/>
+ <location filename="../sources/editor/elementscene.cpp" line="581"/>
<source>Vous pouvez utiliser ce champ libre pour mentionner les auteurs de l'élément, sa licence, ou tout autre renseignement que vous jugerez utile.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="626"/>
+ <location filename="../sources/editor/elementscene.cpp" line="634"/>
<source>Éditer les noms</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="630"/>
+ <location filename="../sources/editor/elementscene.cpp" line="638"/>
<source>Vous pouvez spécifier le nom de l'élément dans plusieurs langues.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/editor/elementscene.cpp" line="826"/>
- <location filename="../sources/editor/elementscene.cpp" line="866"/>
+ <location filename="../sources/editor/elementscene.cpp" line="838"/>
+ <location filename="../sources/editor/elementscene.cpp" line="878"/>
<source>Ce document XML n'est pas une définition d'élément.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
@@ -2092,6 +2097,24 @@
</message>
</context>
<context>
+ <name>FormulaAssistantDialog</name>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="14"/>
+ <source>Assistant de formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/ui/formulaassistantdialog.ui" line="27"/>
+ <source>Formule</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FormulaAutonumberingW</name>
<message>
<location filename="../sources/autoNum/ui/formulaautonumberingw.ui" line="26"/>
@@ -2328,37 +2351,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="289"/>
+ <location filename="../sources/genericpanel.cpp" line="290"/>
<source>Folio sans titre</source>
<comment>Fallback label when a diagram has no title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="296"/>
- <location filename="../sources/genericpanel.cpp" line="309"/>
+ <location filename="../sources/genericpanel.cpp" line="300"/>
+ <location filename="../sources/genericpanel.cpp" line="316"/>
<source>%1 - %2</source>
<comment>label displayed for a diagram in the panel ; %1 is the folio index, %2 is the diagram title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="389"/>
+ <location filename="../sources/genericpanel.cpp" line="394"/>
<source>Modèles de cartouche</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="479"/>
+ <location filename="../sources/genericpanel.cpp" line="484"/>
<source>Modèle "%1"</source>
<comment>used to display a title block template</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="480"/>
+ <location filename="../sources/genericpanel.cpp" line="485"/>
<source>Ceci est un modèle de cartouche, qui peut être appliqué à un folio.</source>
<comment>"What's this" tip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/genericpanel.cpp" line="722"/>
+ <location filename="../sources/genericpanel.cpp" line="727"/>
<source>%1 [non utilisé dans le projet]</source>
<translation type="unfinished"></translation>
</message>
@@ -3076,17 +3099,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="200"/>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="201"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="218"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="219"/>
<source>Le potentiel avec numero de fil %1 est présent %2 fois</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/ui/potentialselectordialog.cpp" line="244"/>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="270"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../sources/ui/potentialselectordialog.cpp" line="306"/>
+ <source>La formule du nouveau potentiel contient des variables incompatibles avec les reports de folio.
+Veuillez saisir une formule compatible pour ce potentiel.
+Les variables suivantes sont incompatibles :
+%sequf_ %seqtf_ %seqhf_ %id %F %M %LM</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PrintConfigPage</name>
@@ -3118,13 +3149,13 @@
<location filename="../sources/projectconfigpages.cpp" line="305"/>
<location filename="../sources/projectconfigpages.cpp" line="453"/>
<location filename="../sources/projectconfigpages.cpp" line="463"/>
- <location filename="../sources/projectconfigpages.cpp" line="473"/>
- <location filename="../sources/projectconfigpages.cpp" line="484"/>
- <location filename="../sources/projectconfigpages.cpp" line="513"/>
- <location filename="../sources/projectconfigpages.cpp" line="537"/>
- <location filename="../sources/projectconfigpages.cpp" line="683"/>
- <location filename="../sources/projectconfigpages.cpp" line="695"/>
- <location filename="../sources/projectconfigpages.cpp" line="707"/>
+ <location filename="../sources/projectconfigpages.cpp" line="474"/>
+ <location filename="../sources/projectconfigpages.cpp" line="492"/>
+ <location filename="../sources/projectconfigpages.cpp" line="522"/>
+ <location filename="../sources/projectconfigpages.cpp" line="535"/>
+ <location filename="../sources/projectconfigpages.cpp" line="564"/>
+ <location filename="../sources/projectconfigpages.cpp" line="704"/>
+ <location filename="../sources/projectconfigpages.cpp" line="716"/>
<source>Nom de la nouvelle numérotation</source>
<translation type="unfinished"></translation>
</message>
@@ -3161,16 +3192,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/projectconfigpages.cpp" line="485"/>
- <location filename="../sources/projectconfigpages.cpp" line="486"/>
- <location filename="../sources/projectconfigpages.cpp" line="487"/>
- <location filename="../sources/projectconfigpages.cpp" line="488"/>
- <location filename="../sources/projectconfigpages.cpp" line="514"/>
- <location filename="../sources/projectconfigpages.cpp" line="515"/>
+ <location filename="../sources/projectconfigpages.cpp" line="494"/>
+ <location filename="../sources/projectconfigpages.cpp" line="498"/>
+ <location filename="../sources/projectconfigpages.cpp" line="537"/>
<location filename="../sources/projectconfigpages.cpp" line="538"/>
<location filename="../sources/projectconfigpages.cpp" line="539"/>
- <location filename="../sources/projectconfigpages.cpp" line="540"/>
- <location filename="../sources/projectconfigpages.cpp" line="541"/>
+ <location filename="../sources/projectconfigpages.cpp" line="565"/>
+ <location filename="../sources/projectconfigpages.cpp" line="566"/>
<source>Sans nom</source>
<translation type="unfinished"></translation>
</message>
@@ -3332,222 +3360,227 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="308"/>
+ <location filename="../sources/qetapp.cpp" line="311"/>
+ <source>formule du label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sources/qetapp.cpp" line="312"/>
<source>Label</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="309"/>
+ <location filename="../sources/qetapp.cpp" line="313"/>
<source>Commentaire</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="310"/>
+ <location filename="../sources/qetapp.cpp" line="314"/>
<source>Désignation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="311"/>
+ <location filename="../sources/qetapp.cpp" line="315"/>
<source>Fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="312"/>
+ <location filename="../sources/qetapp.cpp" line="316"/>
<source>Référence fabricant</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="313"/>
+ <location filename="../sources/qetapp.cpp" line="317"/>
<source>Bloc auxiliaire 1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="314"/>
+ <location filename="../sources/qetapp.cpp" line="318"/>
<source>Bloc auxiliaire 2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="315"/>
+ <location filename="../sources/qetapp.cpp" line="319"/>
<source>Référence fabricant machine</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="316"/>
+ <location filename="../sources/qetapp.cpp" line="320"/>
<source>Localisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="317"/>
+ <location filename="../sources/qetapp.cpp" line="321"/>
<source>Fonction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="328"/>
+ <location filename="../sources/qetapp.cpp" line="332"/>
<source>Cartouches QET</source>
<comment>title of the title block templates collection provided by QElectroTech</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="342"/>
+ <location filename="../sources/qetapp.cpp" line="346"/>
<source>Cartouches utilisateur</source>
<comment>title of the user's title block templates collection</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="805"/>
+ <location filename="../sources/qetapp.cpp" line="809"/>
<source>Q</source>
<comment>Single-letter example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="806"/>
+ <location filename="../sources/qetapp.cpp" line="810"/>
<source>QET</source>
<comment>Small example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="807"/>
+ <location filename="../sources/qetapp.cpp" line="811"/>
<source>Schema</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="808"/>
+ <location filename="../sources/qetapp.cpp" line="812"/>
<source>Electrique</source>
<comment>Normal example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="809"/>
+ <location filename="../sources/qetapp.cpp" line="813"/>
<source>QElectroTech</source>
<comment>Long example text - translate length, not meaning</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1213"/>
+ <location filename="../sources/qetapp.cpp" line="1217"/>
<source>Configurer QElectroTech</source>
<comment>window title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1339"/>
+ <location filename="../sources/qetapp.cpp" line="1343"/>
<source>Chargement...</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1404"/>
+ <location filename="../sources/qetapp.cpp" line="1408"/>
<source>Chargement... icône du systray</source>
<comment>splash screen caption</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1406"/>
+ <location filename="../sources/qetapp.cpp" line="1410"/>
<source>QElectroTech</source>
<comment>systray menu title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1408"/>
+ <location filename="../sources/qetapp.cpp" line="1412"/>
<source>&Quitter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1409"/>
+ <location filename="../sources/qetapp.cpp" line="1413"/>
<source>&Masquer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1410"/>
+ <location filename="../sources/qetapp.cpp" line="1414"/>
<source>&Restaurer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1411"/>
+ <location filename="../sources/qetapp.cpp" line="1415"/>
<source>&Masquer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1412"/>
+ <location filename="../sources/qetapp.cpp" line="1416"/>
<source>&Restaurer tous les éditeurs de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1413"/>
+ <location filename="../sources/qetapp.cpp" line="1417"/>
<source>&Masquer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1414"/>
+ <location filename="../sources/qetapp.cpp" line="1418"/>
<source>&Restaurer tous les éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1415"/>
+ <location filename="../sources/qetapp.cpp" line="1419"/>
<source>&Masquer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1416"/>
+ <location filename="../sources/qetapp.cpp" line="1420"/>
<source>&Restaurer tous les éditeurs de cartouche</source>
<comment>systray submenu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1417"/>
+ <location filename="../sources/qetapp.cpp" line="1421"/>
<source>&Nouvel éditeur de schéma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1418"/>
+ <location filename="../sources/qetapp.cpp" line="1422"/>
<source>&Nouvel éditeur d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1420"/>
+ <location filename="../sources/qetapp.cpp" line="1424"/>
<source>Ferme l'application QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1421"/>
+ <location filename="../sources/qetapp.cpp" line="1425"/>
<source>Réduire QElectroTech dans le systray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1422"/>
+ <location filename="../sources/qetapp.cpp" line="1426"/>
<source>Restaurer QElectroTech</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1438"/>
+ <location filename="../sources/qetapp.cpp" line="1442"/>
<source>QElectroTech</source>
<comment>systray icon tooltip</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1507"/>
+ <location filename="../sources/qetapp.cpp" line="1511"/>
<source>Éditeurs de schémas</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1516"/>
+ <location filename="../sources/qetapp.cpp" line="1520"/>
<source>Éditeurs d'élément</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1526"/>
+ <location filename="../sources/qetapp.cpp" line="1530"/>
<source>Éditeurs de cartouche</source>
<comment>systray menu entry</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source>Usage : </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1591"/>
+ <location filename="../sources/qetapp.cpp" line="1595"/>
<source> [options] [fichier]...
</source>
@@ -3554,7 +3587,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1592"/>
+ <location filename="../sources/qetapp.cpp" line="1596"/>
<source>QElectroTech, une application de réalisation de schémas électriques.
Options disponibles :
@@ -3565,25 +3598,25 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1598"/>
+ <location filename="../sources/qetapp.cpp" line="1602"/>
<source> --common-elements-dir=DIR Definir le dossier de la collection d'elements
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1601"/>
+ <location filename="../sources/qetapp.cpp" line="1605"/>
<source> --common-tbt-dir=DIR Definir le dossier de la collection de modeles de cartouches
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1604"/>
+ <location filename="../sources/qetapp.cpp" line="1608"/>
<source> --config-dir=DIR Definir le dossier de configuration
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetapp.cpp" line="1606"/>
+ <location filename="../sources/qetapp.cpp" line="1610"/>
<source> --lang-dir=DIR Definir le dossier contenant les fichiers de langue
</source>
<translation type="unfinished"></translation>
@@ -4369,42 +4402,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1419"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1420"/>
<source>Éditer l'élement</source>
<comment>edit element</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1425"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1426"/>
<source>Éditer le champ de texte</source>
<comment>edit text field</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1431"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1432"/>
<source>Éditer l'image</source>
<comment>edit image</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1437"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1438"/>
<source>Éditer le conducteur</source>
<comment>edit conductor</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1444"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1445"/>
<source>Éditer l'objet sélectionné</source>
<comment>edit selected item</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="1648"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="1649"/>
<source>Active le projet « %1 »</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetdiagrameditor.cpp" line="2108"/>
+ <location filename="../sources/qetdiagrameditor.cpp" line="2109"/>
<source>Erreur</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
@@ -5326,54 +5359,54 @@
<context>
<name>QETProject</name>
<message>
- <location filename="../sources/qetproject.cpp" line="238"/>
- <source>Projet « %1 »</source>
- <comment>displayed title for a ProjectView - %1 is the project title</comment>
+ <location filename="../sources/qetproject.cpp" line="239"/>
+ <source>Projet « %1 : %2»</source>
+ <comment>displayed title for a ProjectView - %1 is the project title, -%2 is the project path</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="245"/>
+ <location filename="../sources/qetproject.cpp" line="246"/>
<source>Projet %1</source>
<comment>displayed title for a title-less project - %1 is the file name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="252"/>
+ <location filename="../sources/qetproject.cpp" line="253"/>
<source>Projet sans titre</source>
<comment>displayed title for a project-less, file-less project</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="261"/>
+ <location filename="../sources/qetproject.cpp" line="262"/>
<source>%1 [lecture seule]</source>
<comment>displayed title for a read-only project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="269"/>
+ <location filename="../sources/qetproject.cpp" line="270"/>
<source>%1 [modifié]</source>
<comment>displayed title for a modified project - %1 is a displayable title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1062"/>
+ <location filename="../sources/qetproject.cpp" line="976"/>
<source>Une erreur s'est produite durant l'intégration du modèle.</source>
<comment>error message</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1172"/>
+ <location filename="../sources/qetproject.cpp" line="1086"/>
<source>Liste des Folios</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1277"/>
+ <location filename="../sources/qetproject.cpp" line="1192"/>
<source>Avertissement</source>
<comment>message box title</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1278"/>
+ <location filename="../sources/qetproject.cpp" line="1193"/>
<source>Ce document semble avoir été enregistré avec une version ultérieure de QElectroTech. Il est possible que l'ouverture de tout ou partie de ce document échoue.
Que désirez vous faire ?</source>
<comment>message box content</comment>
@@ -5380,7 +5413,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetproject.cpp" line="1337"/>
+ <location filename="../sources/qetproject.cpp" line="1252"/>
<source><b>Ouverture du projet en cours...</b></source>
<translation type="unfinished"></translation>
</message>
@@ -6161,7 +6194,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/qetgraphicsitem/customelement.cpp" line="103"/>
+ <location filename="../sources/qetgraphicsitem/customelement.cpp" line="104"/>
<source>Avertissement : l'élément a été enregistré avec une version ultérieure de QElectroTech.</source>
<translation type="unfinished"></translation>
</message>
@@ -6331,13 +6364,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sources/conductorautonumerotation.cpp" line="69"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="80"/>
<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="73"/>
+ <location filename="../sources/conductorautonumerotation.cpp" line="86"/>
<source>Modifier les propriétés de plusieurs conducteurs</source>
<comment>undo caption</comment>
<translation type="unfinished"></translation>