Merge pull request LMMS#2725 from liushuyu/master

Minor changes for i18n
Teuthis · Apr 10, 2016 · 13595bb · 13595bb
2 parents 356135b + d50553e
commit 13595bb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/data/locale/en.ts b/data/locale/en.ts
@@ -6326,6 +6326,14 @@ Remember to also save your project manually.</source>
         <source>This %1 was created with LMMS version %2, but version %3 is installed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>project</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongEditorWindow</name>
@@ -8334,10 +8342,6 @@ Double clicking any of the plugins will bring up information on the ports.</sour
         <source>ADSR:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bowed</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
@@ -8346,14 +8350,6 @@ Double clicking any of the plugins will bring up information on the ports.</sour
         <source>Pressure:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Motion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Motion:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
@@ -8362,14 +8358,6 @@ Double clicking any of the plugins will bring up information on the ports.</sour
         <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Vibrato</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vibrato:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Missing files</source>
         <translation type="unfinished"></translation>

diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
@@ -957,8 +957,8 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
 								"LMMS version %2, but version %3 "
 								"is installed")
 								.arg( _sourceFile.endsWith( ".mpt" ) ?
-									"template" : 
-									"project" )
+                                                                        SongEditor::tr("template") :
+                                                                        SongEditor::tr("project") )
 								.arg( root.attribute( "creatorversion" ) )
 								.arg( LMMS_VERSION ) );
 				}

diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp
@@ -76,15 +76,15 @@ void TimeDisplayWidget::setDisplayMode( DisplayMode displayMode )
 	switch( m_displayMode )
 	{
 		case MinutesSeconds:
-			m_majorLCD.setLabel( "MIN" );
-			m_minorLCD.setLabel( "SEC" );
-			m_milliSecondsLCD.setLabel( "MSEC" );
+			m_majorLCD.setLabel( tr( "MIN" ) );
+			m_minorLCD.setLabel( tr( "SEC" ) );
+			m_milliSecondsLCD.setLabel( tr( "MSEC" ) );
 			break;
 
 		case BarsTicks:
-			m_majorLCD.setLabel( "BAR" );
-			m_minorLCD.setLabel( "BEAT" );
-			m_milliSecondsLCD.setLabel( "TICK" );
+			m_majorLCD.setLabel( tr( "BAR" ) );
+			m_minorLCD.setLabel( tr( "BEAT" ) );
+			m_milliSecondsLCD.setLabel( tr( "TICK" ) );
 			break;
 
 		default: break;