Merge pull request #419 from IKhonakhbeeva/gyro

Small fixes with waitGyro parameters

Author: iakov

plugins/robots/editor/trik/generated/elements.h

@@ -1986,14 +1986,14 @@
 			setName("TrikWaitForGyroscope");
 			setFriendlyName(QObject::tr("Wait for Gyroscope"));
 			setDiagram("RobotsDiagram");
-			setDescription(QObject::tr("Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the 'Degrees/sec' parameter value."));
+			setDescription(QObject::tr("Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the 'milliDegrees/sec' parameter value."));
 			qReal::LabelProperties label_1(1, 1.1, 1.2, "Degrees", false, 0);
 			label_1.setBackground(Qt::white);
 			label_1.setScalingX(false);
 			label_1.setScalingY(false);
 			label_1.setHard(false);
 			label_1.setPlainTextMode(false);
-			label_1.setPrefix(QObject::tr("Degrees/sec:"));
+			label_1.setPrefix(QObject::tr("milliDegrees/sec:"));
 			addLabel(label_1);
 			qReal::LabelProperties label_2(2, 1.1, 1.8, "Sign", false, 0);
 			label_2.setBackground(Qt::white);
@@ -2026,7 +2026,7 @@
 
 		void initProperties()
 		{
-			addProperty("Degrees", "string", QObject::tr("0"), QObject::tr("Degrees/sec"), QObject::tr(""), false);
+			addProperty("Degrees", "string", QObject::tr("0"), QObject::tr("milliDegrees/sec"), QObject::tr(""), false);
 			addProperty("Sign", "DistanceSign", QString::fromUtf8("greater"), QObject::tr("Sign"), QObject::tr(""), false);
 		}
 	};

plugins/robots/editor/trik/trikMetamodel.xml

@@ -621,21 +621,21 @@
 				</logic>
 			</node>
 
-			<node displayedName="Wait for Gyroscope" path="101, 106 : 212, 106 :  | 156, 183 : 156, 107 :  | 12, 183 : 156, 183 :  | 12, 12 : 12, 183 :  | 12, 12 : 164, 12 : " name="TrikWaitForGyroscope" description="Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the 'Degrees/sec' parameter value.">
+			<node displayedName="Wait for Gyroscope" path="101, 106 : 212, 106 :  | 156, 183 : 156, 107 :  | 12, 183 : 156, 183 :  | 12, 12 : 12, 183 :  | 12, 12 : 164, 12 : " name="TrikWaitForGyroscope" description="Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the 'milliDegrees/sec' parameter value.">
 				<graphics>
 					<picture sizex="50" sizey="50">
 						<image y1="0" name="images/waitForGyroscopeBlock.png" x1="0" y2="50" x2="50"/>
 					</picture>
 					<labels>
-						<label x="55" y="60" textBinded="Degrees" prefix="Degrees/sec:"/>
+						<label x="55" y="60" textBinded="Degrees" prefix="milliDegrees/sec:"/>
 						<label x="55" y="90" textBinded="Sign" prefix="Sign:"/>
 					</labels>
 					<nonResizeable/>
 				</graphics>
 				<logic>
 					<container/>
 					<properties>
-						<property displayedName="Degrees/sec" type="string" name="Degrees">
+						<property displayedName="milliDegrees/sec" type="string" name="Degrees">
 							<default>0</default>
 						</property>
 						<property displayedName="Sign" type="DistanceSign" name="Sign">

qrtranslations/fr/plugins/robots/trikMetamodel_fr.ts

@@ -904,17 +904,17 @@
     </message>
     <message>
         <location line="+2"/>
-        <source>Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the &apos;Degrees/sec&apos; parameter value.</source>
+        <source>Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the &apos;milliDegrees/sec&apos; parameter value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>Degrees/sec:</source>
+        <source>milliDegrees/sec:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
-        <source>Degrees/sec</source>
+        <source>milliDegrees/sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

qrtranslations/ru/plugins/robots/trikMetamodel_ru.ts

@@ -477,12 +477,12 @@
     <message>
         <location line="-739"/>
         <source>Calibrate gyroscope</source>
-        <translation type="unfinished"></translation>
+        <translation>Калибровка  гироскопа</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Sets gyroscope&apos;s angle to zero in current position.</source>
-        <translation type="unfinished"></translation>
+        <translation>Устанавливает гироскоп в 0 в текущей позиции.</translation>
     </message>
     <message>
         <location line="+572"/>
@@ -904,18 +904,30 @@
     </message>
     <message>
         <location line="+2"/>
+        <source>Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the &apos;milliDegrees/sec&apos; parameter value.</source>
+        <translation>Ждать, пока значение, возвращаемое гиродатчиком на указанном порту, не будет сравнимо с указанным в значении параметра &apos;миллиГрадусы/сек&apos;.</translation>
+    </message>
+    <message>
         <source>Waits till the value returned by the gyroscope on the given port will be greater or less than the given in the &apos;Degrees/sec&apos; parameter value.</source>
-        <translation>Ждать, пока значение, возвращаемое гиродатчиком на указанном порту, не будет сравнимо с указанным в значении параметра &apos;Градусы/сек&apos;.</translation>
+        <translation type="vanished">Ждать, пока значение, возвращаемое гиродатчиком на указанном порту, не будет сравнимо с указанным в значении параметра &apos;Градусы/сек&apos;.</translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>Degrees/sec:</source>
-        <translation>Градусы/сек:</translation>
+        <source>milliDegrees/sec:</source>
+        <translation>миллиГрадусы/сек:</translation>
     </message>
     <message>
         <location line="+33"/>
+        <source>milliDegrees/sec</source>
+        <translation>миллиГрадусы/сек</translation>
+    </message>
+    <message>
+        <source>Degrees/sec:</source>
+        <translation type="vanished">Градусы/сек:</translation>
+    </message>
+    <message>
         <source>Degrees/sec</source>
-        <translation>Градусы/сек</translation>
+        <translation type="vanished">Градусы/сек</translation>
     </message>
     <message>
         <location line="+12"/>