[qet] [3217] Update TS files

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 3217
Author:   scorpio810
Date:     2014-07-18 01:58:40 +0200 (Fri, 18 Jul 2014)
Log Message:
-----------
Update TS files

Modified Paths:
--------------
    trunk/lang/qet_ar.ts
    trunk/lang/qet_be.ts
    trunk/lang/qet_ca.ts
    trunk/lang/qet_cs.ts
    trunk/lang/qet_de.ts
    trunk/lang/qet_el.ts
    trunk/lang/qet_en.ts
    trunk/lang/qet_es.ts
    trunk/lang/qet_hr.ts
    trunk/lang/qet_it.ts
    trunk/lang/qet_nl.ts
    trunk/lang/qet_pl.ts
    trunk/lang/qet_pt.ts
    trunk/lang/qet_ro.ts
    trunk/lang/qet_ru.ts
    trunk/lang/qet_sl.ts

Modified: trunk/lang/qet_ar.ts
===================================================================
--- trunk/lang/qet_ar.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_ar.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -312,7 +312,7 @@
         <extracomment>pixel
 ----------
 pixel</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">px بيكسل</translation>
     </message>
     <message>
         <location filename="../sources/ui/borderpropertieswidget.ui" line="29"/>
@@ -476,115 +476,127 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>نوع الموصل</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>مفردة</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>متعدد الأسلاك</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>نص :</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>حجم</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>دوران نص فوق الموصل</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>عمودي</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>أفقي</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>أحادي السلك</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>قلم</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>حماية الأرضي -المحايد</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>طور</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translatorcomment>نمط خط الموصل</translatorcomment>
-        <translation>نمط :</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translatorcomment>نمط الموصل: خط مستمرّ</translatorcomment>
         <translation>خط مستمرّ</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translatorcomment>نمط الموصل: خط مُتقطّع</translatorcomment>
         <translation>خط متقطع</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translatorcomment>نمط الموصل : نقاط و خطوط</translatorcomment>
         <translation>خطوط و نقاط</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>أرضي</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>محايد</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">شكل</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">حماية الأرضي -المحايد</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">قلم</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">علامة نصيّة</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>ظهور الموصل</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>اللون:</translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">نمط :</translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -735,50 +747,50 @@
         <translation>خاصيات المخطط</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>خصائص التحديد</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translatorcomment> %1.سرد الكائنات المحددة</translatorcomment>
         <translation>يحتوي التحديد %1</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>تطبيق الخواص على مجموع الموصلات لهذا الكمون</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>تحرير خاصيات الموصل</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>إختيار اللون الجديد لهذا الموصل</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>تحديد الصورة</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>ملفات صورة  (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>خطأ</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>نأسف لعدم إمكانية تحميل الصورة</translation>
     </message>
@@ -6802,24 +6814,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>نموذج افتراضي</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>تحرير هذا النموذج</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>تكرار و تحرير هذا النموذج</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>عنوان كتلة قوالب الإجراءات</translation>
     </message>

Modified: trunk/lang/qet_be.ts
===================================================================
--- trunk/lang/qet_be.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_be.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Soort geleider</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Meerdere geleiders</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Tekst:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Dikte</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Hoek van tekst ten opzichte van de geleider :</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Vertikaal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Horizontaal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Enkele geleider</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Aarde en Nul samen</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>Fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Stijl:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Volle lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Streep lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Punten en strepen lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>Aarde</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>Nul</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Vorm</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Aarde en Nul samen</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">TekstLabel</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Geleider weergave</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Kleur:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Stijl:</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Enkel</translation>
     </message>
@@ -723,49 +736,49 @@
         <translation>Schema eigenschappen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Selectie eigenschappen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>De selectie bevat %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Toepassen van deze eigenschappen op alle gelieders van hetzelfde potentiaal</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Bewerk de eigenschappen van een geleider</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Kies een nieuwe kleur voor de geleider</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Selecteer een afbeelding...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Afbeelding bestanden (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Kan de afbeelding niet inladen... Sorry: (</translation>
     </message>
@@ -6754,24 +6767,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Standaard sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Wijzig dit sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Kopieer en wijzig dit sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Titel blok sjablonen acties</translation>
     </message>

Modified: trunk/lang/qet_ca.ts
===================================================================
--- trunk/lang/qet_ca.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_ca.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,112 +468,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Tipus de conductor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Unifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Unifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translatorcomment>Conductor de terra</translatorcomment>
-        <translation>Terra</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Terra per protecció personal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished">Línia de puntets</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>terra</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutre</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Terra per protecció personal</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">Terra</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Aspecte del conductor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Color:</translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -726,50 +738,50 @@
         <translation>Propietats de l&apos;esquema</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Propietats de la selecció</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translatorcomment>%1 conté la llista d&apos;objectes marcats</translatorcomment>
         <translation>La selecció conté %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Modificar les propietats d&apos;un conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Triar un nou color per a aquest conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6742,24 +6754,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Model per defecte</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Editar aquest model</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Duplicar i editar aquest model</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Accions sobre blocs de títol</translation>
     </message>

Modified: trunk/lang/qet_cs.ts
===================================================================
--- trunk/lang/qet_cs.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_cs.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Typ vodiče</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Několik vedení</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Velikost</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Natočení textu u vodiče:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Svisle</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Vodorovně</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Jednoduché vedení</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Protective Earth Neutral (ochranné uzemnění nulovéí)</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>fáze</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Styl:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Plná čára</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Tečkovaná čára</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Čárky a tečky</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>uzemnění</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>nulový</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Formulář</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Protective Earth Neutral (ochranné uzemnění nulovéí)</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Textový štítek</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Vzhled vodiče</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Barva: </translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Styl:</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Jednoduchý</translation>
     </message>
@@ -723,49 +736,49 @@
         <translation>Vlastnosti výkresu</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Vlastnosti výběru</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Výběr obsahuje %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Použít vlastnosti na všechny vodiče tohoto potenciálu</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Upravit vlastnosti vodiče</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Vybrat novou barvu pro tento vodič</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Vybrat obrázek...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Obrázkové soubory (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Obrázek nelze nahrát... Promiňte</translation>
     </message>
@@ -6748,24 +6761,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Výchozí vzor</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Upravit tento vzor</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Zdvojit a upravit tento vzor</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Činnosti pro vzory záhlaví výkresu</translation>
     </message>

Modified: trunk/lang/qet_de.ts
===================================================================
--- trunk/lang/qet_de.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_de.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -473,107 +473,120 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Leitertyp</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Einzelleiter</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Mehrpolig</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Winkel der Leiterbeschriftung: </translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Vertikal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Horizontal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Einpolig</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>Erde</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>Neutralleiter</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>PEN-Leiter (protective earth neutral)</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>Phase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">PEN-Leiter (protective earth neutral)</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Leiterdarstellung</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Farbe:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
         <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Stil:</translation>
+        <translation type="unfinished">Stil:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Durchgezogene Linie</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Gestrichelte Linie</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Strichpunkt-Linie</translation>
@@ -726,49 +739,49 @@
         <translation>Schaltplan Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Auswahl Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Die Auswahl enthält %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Eigenschaften auf alle Verbindungen dieses Potenzials übertragen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Leitereigenschaften bearbeiten</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Neue Leiterfarbe wählen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Wählen Sie ein Bild aus...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Bilder (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Bild konnte nicht geladen werden... Entschuldigung : (</translation>
     </message>
@@ -6732,24 +6745,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Standardvorlage</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Vorlage bearbeiten</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Vorlage kopieren und bearbeiten</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Aktionen zum Plotrahmen</translation>
     </message>

Modified: trunk/lang/qet_el.ts
===================================================================
--- trunk/lang/qet_el.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_el.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Τύπος αγωγού</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Πολυγραμμικό</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Κείμενο:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Μέγεθος</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Γωνία των ετικετών των αγωγών:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Κάθετα</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Οριζόντια</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Μονογραμμικό</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Ουδετέρωση</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>φάση</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Τεχνοτροπία: </translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Συνεχόμενη</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Διακεκομμένη</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Παύλες και τελείες</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>γείωση</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>ουδέτερος</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Ουδετέρωση</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Εμφάνιση του αγωγού</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Χρώμα:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Τεχνοτροπία: </translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Απλό</translation>
     </message>
@@ -723,49 +736,49 @@
         <translation>Ιδιότητες του διαγράμματος</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Ιδιότητες της επιλογής</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Η επιλογή εμπεριέχει %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Εφαρμογή ιδιοτήτων σε όλους τους αγωγούς αυτού του δυναμικού</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Επεξεργασία των ιδιοτήτων του αγωγού</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Επιλέξτε το νέο χρώμα αυτού του αγωγού</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Επιλογή εικόνας...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Αρχεία εικόνων (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Αδύνατη η φόρτωση της εικόνας...Λυπάμαι :(</translation>
     </message>
@@ -6742,24 +6755,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Προεπιλεγμένο πρότυπο</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Επεξεργασία αυτού του προτύπου</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Αναπαραγωγή και επεξεργασία αυτού του προτύπου</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Ενέργειες προτύπων πινακίδων</translation>
     </message>

Modified: trunk/lang/qet_en.ts
===================================================================
--- trunk/lang/qet_en.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_en.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Conductor Type</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multiline</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Angle of conductor labels:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Vertical</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Horizontal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Single line</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Protective Earth Neutral</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>phase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Style:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Solid line</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Dashed line</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Dots and dashes</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>ground</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutral</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Protective Earth Neutral</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Conductor appearance</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Color:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Style:</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Simple</translation>
     </message>
@@ -723,49 +736,49 @@
         <translation>Diagram properties</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Selection properties</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>The selection contains %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Apply properties to all drivers of this potential</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Edit conductor properties</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Choose the new color for this conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Select an image ...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Image Files (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Unable to load image ... Sorry: (</translation>
     </message>
@@ -6738,24 +6751,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Default template</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Edit this template</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Duplicate and edit this template</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Title block templates actions</translation>
     </message>

Modified: trunk/lang/qet_es.ts
===================================================================
--- trunk/lang/qet_es.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_es.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -471,111 +471,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Tipo de conductor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Simple</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multilínea</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Texto:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Tamaño</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Girar el texto del conductor:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Vertical</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Horizontal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Monolínea</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Protección tierra neutral</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Estilo:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Línea continua</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Línea en puntos</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Líneas y puntos</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>tierra</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutro</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Forma</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Protección tierra neutral</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Etiqueta de texto</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Aspecto del conductor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Color:</translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Estilo:</translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -724,49 +737,49 @@
         <translation>Propiedades del esquema</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Propiedades de la selección</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>La selección contiene %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Aplicar las propiedades a todos los conductores de este potencial</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Editar las propiedades de un conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Elegir el nuevo color de este conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Seleccione una imagen ...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Archivos de imagen (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>No se puede cargar la imagen...Lo siento :(</translation>
     </message>
@@ -6741,24 +6754,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Modelo por defecto</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Editar este modelo</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Duplicar y editar este modelo</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Bloque de titulo plantillas acciones</translation>
     </message>

Modified: trunk/lang/qet_hr.ts
===================================================================
--- trunk/lang/qet_hr.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_hr.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,111 +468,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Vrsta vodiča</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Jednostavno</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Višefazno</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Tekst:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Jednofazno</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>faza</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished">Isprekidane linije</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>uzemljenje</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>nula</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Izgled vodiča</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Boje:</translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -722,49 +735,49 @@
         <translation>Svojstva sheme</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Odabir svojstva</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Odabir sadrži %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Uredi svojstva vodiča</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Izaberi novu boju za ovaj vodič</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished">Greška</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6717,24 +6730,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Temeljni predložak</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Uredi ovaj predložak</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Dupliciraj i uredi predložak</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Akcije naslova grupe predloška</translation>
     </message>

Modified: trunk/lang/qet_it.ts
===================================================================
--- trunk/lang/qet_it.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_it.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Tipo di conduttore</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multifilare</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Testo:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Dimensione</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Rotazione del testo del conduttore:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Verticale</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Orizzontale</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Unifilare</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Neutro con funzione di terra (sistema TN-C)</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Stile:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Linea continua</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Linea tratteggiata</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Punto e linea</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>terra</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutro</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Modulo</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Neutro con funzione di terra (sistema TN-C)</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Aspetto del conduttore</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Colore:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Stile:</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Semplice</translation>
     </message>
@@ -717,38 +730,38 @@
         <translation>Proprietà dello schema</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Proprietà della selezione</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>La selezione contiene %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Applicare le proprietà a tutti i conduttori di questo potenziale</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Selezionare un&apos;immagine...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>File immagine (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Impossibile caricare l&apos;immagine... Spiacente :-(</translation>
     </message>
@@ -759,13 +772,13 @@
         <translation>Senza titolo</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Modifica le proprietà di un conduttore</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Scegliere il nuovo colore di questo conduttore</translation>
     </message>
@@ -6736,24 +6749,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Modello predefinito</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Modifica questo modello</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Copia e modifica questo modello</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Azioni del blocco titoli</translation>
     </message>

Modified: trunk/lang/qet_nl.ts
===================================================================
--- trunk/lang/qet_nl.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_nl.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -469,108 +469,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Soort geleider</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Meerdere geleiders</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Tekst:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Dikte</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Hoek van tekst ten opzichte van de geleider :</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Vertikaal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Horizontaal</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Enkele geleiders</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Aarde en Nul samen</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>Fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Stijl:</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Dichte lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Streep lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Punten en strepen lijn</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>Aarde</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>Nul</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Vorm</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Aarde en Nul samen</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">TekstLabel</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Geleider weergave</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Kleur:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Stijl:</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Enkel</translation>
     </message>
@@ -722,49 +735,49 @@
         <translation>diagram eigenschappen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Selectie eigenschappen</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>De selectie bevat %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Toepassen van deze eigenschappen op alle gelieders van hetzelfde potentiaal</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Bewerk de eigenschappen van een geleider</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Kies een nieuwe kleur voor de geleider</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Selecteer een afbeelding...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Afbeelding bestanden (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Kan de afbeelding niet inladen... Sorry: (</translation>
     </message>
@@ -6710,24 +6723,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Standaard sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Wijzig dit sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Kopieer en wijzig dit sjabloon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Titel blok sjablonen acties</translation>
     </message>

Modified: trunk/lang/qet_pl.ts
===================================================================
--- trunk/lang/qet_pl.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_pl.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -470,108 +470,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Typ przewodu</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Wieloliniowy</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Tekst :</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation>Rozmiar</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation>Obrót oznaczenia przewodu :</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation>Poziomo</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation>Pionowo</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Jednoliniowy</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation>PEN</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation>Protective Earth Neutral</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>liniowy</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation>Rodzaj :</translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation>Ciągła</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation>Kreskowa</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation>Kreskowo-kropkowa</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>ochronny</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutralny</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Forma</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished">Protective Earth Neutral</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished">PEN</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Etykieta</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Wygląd przewodu</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Kolor : </translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished">Rodzaj :</translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Prosty</translation>
     </message>
@@ -723,49 +736,49 @@
         <translation>Właściwości schematu</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Właściwości zaznaczenia</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Zaznaczenie zawiera %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation>Zastosuj właściwości do wszystkich połączeń tego potencjału</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Edycja właściwości przewodu</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Wybierz nowy kolor przewodu</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation>Wybierz obraz...</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation>Pliki obrazów (*.png *.jpg *.bmp *.svg)</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation>Nie można załadować obrazu... :(</translation>
     </message>
@@ -6748,24 +6761,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Domyślny szablon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Edytuj szablon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Powiel i edytuj szablon</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Działanie szablonu bloku tytułowego</translation>
     </message>

Modified: trunk/lang/qet_pt.ts
===================================================================
--- trunk/lang/qet_pt.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_pt.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,108 +468,121 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Tipo de condutor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Texto:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Unifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>fase</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished">Traço tracejado</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>terra</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>neutro</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Aparência do condutor</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Côr:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Simples</translation>
     </message>
@@ -721,49 +734,49 @@
         <translation>Propriedades do esquema</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Propriedades da selecção</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>A selecção contém %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Editar as propriedades do condutor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation>Escolher a nova cor do condutor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished">Erro</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6712,24 +6725,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation>Modelo padrão</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Editar este modelo</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation>Duplicar e editar este modelo</translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation>Acções dos modelos dos blocos de titulo</translation>
     </message>

Modified: trunk/lang/qet_ro.ts
===================================================================
--- trunk/lang/qet_ro.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_ro.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,111 +468,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Tipul conductorului</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Simplu</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Multifilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Text:</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Monofilar</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>faza</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished">Linie punctată</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>împământare</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>nul</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Aspectul conductorului</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Culoare:</translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -721,49 +734,49 @@
         <translation>Proprietatile schemei</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Proprietatile selectiei</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Selectia contine %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Editati proprietatile unui conductor</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished">Eroare</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6718,24 +6731,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation type="unfinished"></translation>
     </message>

Modified: trunk/lang/qet_ru.ts
===================================================================
--- trunk/lang/qet_ru.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_ru.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,111 +468,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation>Тип проводника</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation>Простой</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation>Многолинейный</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation>Текст :</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation>Однолинейный</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation>фаза</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished">Пунктирная линия</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation>земля</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation>нейтраль</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation>Стиль проводника</translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation>Цвет : </translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -703,13 +716,13 @@
         <translation>Свойства схемы</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation>Редактирование своств проводника</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation>Свойства выделения</translation>
     </message>
@@ -732,38 +745,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation>Выделение содержит %1.</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6718,24 +6731,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation type="unfinished"></translation>
     </message>

Modified: trunk/lang/qet_sl.ts
===================================================================
--- trunk/lang/qet_sl.ts	2014-07-17 09:20:21 UTC (rev 3216)
+++ trunk/lang/qet_sl.ts	2014-07-17 23:58:40 UTC (rev 3217)
@@ -468,111 +468,124 @@
 <context>
     <name>ConductorPropertiesWidget</name>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="54"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="23"/>
         <source>Type de conducteur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="60"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="29"/>
         <source>Simple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="61"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="36"/>
         <source>Multifilaire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="64"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="60"/>
         <source>Texte :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="66"/>
-        <source>Taille</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="75"/>
-        <source>Rotation du texte sur conducteur :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="78"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="101"/>
         <source>Vertical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="84"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="111"/>
         <source>Horizontal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="90"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="126"/>
         <source>Unifilaire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="96"/>
-        <source>PEN</source>
-        <comment>Protective Earth Neutral</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="97"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="17"/>
         <source>Protective Earth Neutral</source>
         <comment>Tooltip displaying the meaning of the &apos;PEN&apos; acronym</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="108"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="186"/>
         <source>phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="141"/>
-        <source>Style :</source>
-        <comment>conductor line style</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="143"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="127"/>
         <source>Trait plein</source>
         <comment>conductor style: solid line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="144"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="128"/>
         <source>Trait en pointillés</source>
         <comment>conductor style: dashed line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="145"/>
+        <location filename="../sources/ui/conductorpropertieswidget.cpp" line="129"/>
         <source>Traits et points</source>
         <comment>conductor style: dashed and dotted line</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="92"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="217"/>
         <source>terre</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="94"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="175"/>
         <source>neutre</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="128"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="70"/>
+        <source>Taille :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="89"/>
+        <source>Rotation du texte de conducteur :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="207"/>
+        <source>Protective Earth Neutral</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="210"/>
+        <source>PEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="228"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="253"/>
         <source>Apparence du conducteur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/conductorpropertieswidget.cpp" line="135"/>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="262"/>
         <source>Couleur :</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/ui/conductorpropertieswidget.ui" line="276"/>
+        <source>Style :</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DiagramContextWidget</name>
@@ -721,49 +734,49 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="949"/>
+        <location filename="../sources/diagramview.cpp" line="947"/>
         <source>Propriétés de la sélection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="951"/>
+        <location filename="../sources/diagramview.cpp" line="949"/>
         <source>La sélection contient %1.</source>
         <comment>%1 is a sentence listing the selected objects</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1007"/>
+        <location filename="../sources/diagramview.cpp" line="1005"/>
         <source>Appliquer les propriétés à l&apos;ensemble des conducteurs de ce potentiel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1004"/>
+        <location filename="../sources/diagramview.cpp" line="1002"/>
         <source>Éditer les propriétés d&apos;un conducteur</source>
         <comment>window title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1069"/>
+        <location filename="../sources/diagramview.cpp" line="1067"/>
         <source>Choisir la nouvelle couleur de ce conducteur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Selectionner une image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1231"/>
+        <location filename="../sources/diagramview.cpp" line="1229"/>
         <source>Image Files (*.png *.jpg *.bmp *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Erreur</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/diagramview.cpp" line="1239"/>
+        <location filename="../sources/diagramview.cpp" line="1237"/>
         <source>Impossible de charger l&apos;image...Désoler :(</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6711,24 +6724,24 @@
 <context>
     <name>TitleBlockPropertiesWidget</name>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="196"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="217"/>
         <source>Modèle par défaut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="214"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="235"/>
         <source>Éditer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="215"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="236"/>
         <source>Dupliquer et editer ce modèle</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="220"/>
+        <location filename="../sources/ui/titleblockpropertieswidget.cpp" line="241"/>
         <source>Title block templates actions</source>
         <translation type="unfinished"></translation>
     </message>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/