[qet] [1175] Merged trunk into 0.3 branch: rev1002 to rev1052

[subversion@xxxxxxxxxxxxx]

Revision: 1175
Author:   xavier
Date:     2011-03-01 23:34:39 +0100 (Tue, 01 Mar 2011)
Log Message:
-----------
Merged trunk into 0.3 branch: rev1002 to rev1052

Modified Paths:
--------------
    branches/0.3/elements/bornes/borniers/borne_bornier_fusible.elmt
    branches/0.3/elements/protections/disjoncteur_magneto_thermique/disjoncteur_magneto-thermique.elmt
    branches/0.3/lang/qet_cs.ts

Property Changed:
----------------
    branches/0.3/
    branches/0.3/elements/appareils_de_mesure/
    branches/0.3/sources/

Property changes on: branches/0.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:840-853,856-1002
   + /trunk:840-853,856-1002,1052


Property changes on: branches/0.3/elements/appareils_de_mesure
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /trunk/elements/appareils_de_mesure:1052

Modified: branches/0.3/elements/bornes/borniers/borne_bornier_fusible.elmt
===================================================================
--- branches/0.3/elements/bornes/borniers/borne_bornier_fusible.elmt	2011-02-26 17:15:05 UTC (rev 1174)
+++ branches/0.3/elements/bornes/borniers/borne_bornier_fusible.elmt	2011-03-01 22:34:39 UTC (rev 1175)
@@ -2,6 +2,7 @@
     <names>
         <name lang="fr" >Borne de bornier FUSIBLE</name>
         <name lang="pl" >Zacisk bezpiecznikowy</name>
+        <name lang="cs" >Svorka tavného svorkoviště</name>
     </names>
     <description>
         <rect width="6" x="-3" y="-5" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" />

Modified: branches/0.3/elements/protections/disjoncteur_magneto_thermique/disjoncteur_magneto-thermique.elmt
===================================================================
--- branches/0.3/elements/protections/disjoncteur_magneto_thermique/disjoncteur_magneto-thermique.elmt	2011-02-26 17:15:05 UTC (rev 1174)
+++ branches/0.3/elements/protections/disjoncteur_magneto_thermique/disjoncteur_magneto-thermique.elmt	2011-03-01 22:34:39 UTC (rev 1175)
@@ -1,8 +1,9 @@
 <definition width="130" version="0.22" hotspot_x="85" hotspot_y="55" height="110" type="element" orientation="dyyy" >
     <names>
         <name lang="pl" >Wyłącznik silnikowy</name>
-	<name lang="en">Magneto-thermal circuit breaker GV</name>
+	    <name lang="en">Magneto-thermal circuit breaker GV</name>
         <name lang="fr">Disjoncteur Magnéto-thermique GV</name>
+        <name lang="cs">Magnetotepelný jistič GV</name>
     </names>
     <informations></informations>
     <description>

Modified: branches/0.3/lang/qet_cs.ts
===================================================================
--- branches/0.3/lang/qet_cs.ts	2011-02-26 17:15:05 UTC (rev 1174)
+++ branches/0.3/lang/qet_cs.ts	2011-03-01 22:34:39 UTC (rev 1175)
@@ -92,7 +92,7 @@
     <message>
         <location filename="../sources/aboutqet.cpp" line="125"/>
         <source>Traduction en allemand</source>
-        <translation type="unfinished"></translation>
+        <translation>Překlad do němčiny</translation>
     </message>
     <message>
         <location filename="../sources/aboutqet.cpp" line="139"/>


Property changes on: branches/0.3/sources
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/sources:833-853,856-1002
   + /trunk/sources:833-853,856-1002,1052